You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/11/30 11:36:56 UTC
svn commit: r1546716 [3/14] - in /openoffice/branches/capstone2013: ./ main/
main/accessibility/inc/accessibility/extended/
main/accessibility/inc/accessibility/standard/
main/accessibility/source/extended/ main/accessibility/source/helper/
main/access...
Modified: openoffice/branches/capstone2013/main/editeng/source/uno/unoedhlp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/source/uno/unoedhlp.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/editeng/source/uno/unoedhlp.cxx (original)
+++ openoffice/branches/capstone2013/main/editeng/source/uno/unoedhlp.cxx Sat Nov 30 10:36:46 2013
@@ -28,10 +28,8 @@
#include <editeng/unoedhlp.hxx>
#include <editeng/editdata.hxx>
#include <editeng/editeng.hxx>
-//IAccessibility2 Implementation 2009-----
#include <svl/itemset.hxx>
-//-----IAccessibility2 Implementation 2009
//------------------------------------------------------------------------
TYPEINIT1( SvxEditSourceHint, TextHint );
@@ -79,9 +77,7 @@ void SvxEditSourceHint::SetEndValue( sal
{
mnEnd = n;
}
-//IAccessibility2 Implementation 2009-----
TYPEINIT1( SvxEditSourceHintEndPara , SvxEditSourceHint );
-//-----IAccessibility2 Implementation 2009
//------------------------------------------------------------------------
::std::auto_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify )
@@ -122,10 +118,8 @@ TYPEINIT1( SvxEditSourceHintEndPara , Sv
case EE_NOTIFY_INPUT_END:
return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_INPUT_END, 0 ) );
- //IAccessibility2 Implementation 2009-----
case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA:
return ::std::auto_ptr<SfxHint>( new SvxEditSourceHintEndPara( EDITSOURCE_HINT_SELECTIONCHANGED ) );
- //-----IAccessibility2 Implementation 2009
default:
DBG_ERROR( "SvxEditSourceHelper::EENotification2Hint unknown notification" );
break;
@@ -140,8 +134,7 @@ sal_Bool SvxEditSourceHelper::GetAttribu
// Need to verify implementation with AT (IA2 and ATK)
// Old implementation at the end of the method for reference...
-#if 1 // IA2 CWS
-
+#if 1
//added dummy attributes for the default text
EECharAttribArray aCharAttribs, aTempCharAttribs;
rEE.GetCharAttribs( nPara, aTempCharAttribs );
Modified: openoffice/branches/capstone2013/main/editeng/source/uno/unoedprx.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/source/uno/unoedprx.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/editeng/source/uno/unoedprx.cxx (original)
+++ openoffice/branches/capstone2013/main/editeng/source/uno/unoedprx.cxx Sat Nov 30 10:36:46 2013
@@ -508,24 +508,6 @@ String SvxAccessibleTextAdapter::GetText
EBulletInfo aBulletInfo1 = GetBulletInfo( static_cast< sal_uInt16 >(aStartIndex.GetParagraph()) );
EBulletInfo aBulletInfo2 = GetBulletInfo( static_cast< sal_uInt16 >(aEndIndex.GetParagraph()) );
- //IAccessibility2 Implementation 2009-----
- // MT: This was done in OOo, commented out in IA2 CWS...
- /*
- if( aStartIndex.InBullet() )
- {
- // prepend leading bullet
- String sBullet = aBulletInfo1.aText;
-
- DBG_ASSERT(aStartIndex.GetBulletOffset() >= 0 &&
- aStartIndex.GetBulletOffset() <= USHRT_MAX,
- "SvxAccessibleTextIndex::GetText: index value overflow");
-
- sBullet.Erase(0, static_cast< sal_uInt16 > (aStartIndex.GetBulletOffset()) );
-
- sBullet += sStr;
- sStr = sBullet;
- }*/
- //-----IAccessibility2 Implementation 2009
if( aEndIndex.InBullet() )
{
// append trailing bullet
@@ -754,7 +736,6 @@ EBulletInfo SvxAccessibleTextAdapter::Ge
return mrTextForwarder->GetBulletInfo( nPara );
}
-//IAccessible2 Implementation 2009----
void SvxAccessibleTextAdapter::SetUpdateModeForAcc( sal_Bool bUp)
{
return mrTextForwarder->SetUpdateModeForAcc( bUp );
@@ -763,7 +744,6 @@ sal_Bool SvxAccessibleTextAdapter::GetUp
{
return mrTextForwarder->GetUpdateModeForAcc( );
}
-//-----IAccessible2 Implementation 2009
Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const
{
DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
Modified: openoffice/branches/capstone2013/main/editeng/source/uno/unonrule.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/editeng/source/uno/unonrule.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/editeng/source/uno/unonrule.cxx (original)
+++ openoffice/branches/capstone2013/main/editeng/source/uno/unonrule.cxx Sat Nov 30 10:36:46 2013
@@ -221,9 +221,7 @@ Sequence<beans::PropertyValue> SvxUnoNum
}
{
- //IAccessibility2 Implementation 2009-----
if(SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType())
- //-----IAccessibility2 Implementation 2009
{
sal_Unicode nCode = rFmt.GetBulletChar();
OUString aStr( &nCode, 1 );
Modified: openoffice/branches/capstone2013/main/embeddedobj/source/msole/olepersist.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/embeddedobj/source/msole/olepersist.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/embeddedobj/source/msole/olepersist.cxx (original)
+++ openoffice/branches/capstone2013/main/embeddedobj/source/msole/olepersist.cxx Sat Nov 30 10:36:46 2013
@@ -1118,7 +1118,7 @@ void OleEmbeddedObject::StoreObjectToStr
m_pOleComponent->StoreOwnTmpIfNecessary();
// now all the changes should be in temporary location
- if ( !m_aTempURL )
+ if( m_aTempURL.isEmpty() )
throw uno::RuntimeException();
// open temporary file for reading
@@ -2087,7 +2087,7 @@ void SAL_CALL OleEmbeddedObject::breakLi
catch ( uno::Exception& )
{
delete pNewOleComponent;
- if ( m_aTempURL )
+ if( !m_aTempURL.isEmpty() )
KillFile_Impl( m_aTempURL, m_xFactory );
m_aTempURL = aOldTempURL;
throw;
@@ -2099,7 +2099,7 @@ void SAL_CALL OleEmbeddedObject::breakLi
catch( uno::Exception& )
{
delete pNewOleComponent;
- if ( m_aTempURL )
+ if( !m_aTempURL.isEmpty() )
KillFile_Impl( m_aTempURL, m_xFactory );
m_aTempURL = aOldTempURL;
throw;
Modified: openoffice/branches/capstone2013/main/extensions/source/bibliography/general.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/extensions/source/bibliography/general.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/extensions/source/bibliography/general.cxx (original)
+++ openoffice/branches/capstone2013/main/extensions/source/bibliography/general.cxx Sat Nov 30 10:36:46 2013
@@ -508,7 +508,7 @@ uno::Reference< awt::XControlModel > Bi
{
::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME );
DBG_ASSERT( INetURLObject( rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
- sId += ::rtl::OUString( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+ sId += ::rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 );
xPropSet->setPropertyValue( uProp, makeAny( sId ) );
}
Modified: openoffice/branches/capstone2013/main/extensions/source/config/ldap/ldapaccess.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/extensions/source/config/ldap/ldapaccess.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/extensions/source/config/ldap/ldapaccess.cxx (original)
+++ openoffice/branches/capstone2013/main/extensions/source/config/ldap/ldapaccess.cxx Sat Nov 30 10:36:46 2013
@@ -150,8 +150,8 @@ void LdapConnection::connectSimple()
// Do the bind
LdapErrCode retCode = (*s_p_simple_bind_s)(mConnection,
- mLdapDefinition.mAnonUser ,
- mLdapDefinition.mAnonCredentials) ;
+ mLdapDefinition.mAnonUser.getStr(),
+ mLdapDefinition.mAnonCredentials.getStr()) ;
checkLdapReturnCode("SimpleBind", retCode, mConnection) ;
}
@@ -170,14 +170,14 @@ void LdapConnection::initConnection()
if (mLdapDefinition.mPort == 0) mLdapDefinition.mPort = LDAP_PORT;
- mConnection = (*s_p_init)(mLdapDefinition.mServer,
+ mConnection = (*s_p_init)( mLdapDefinition.mServer.getStr(),
mLdapDefinition.mPort) ;
if (mConnection == NULL)
{
rtl::OUStringBuffer message ;
message.appendAscii("Cannot initialise connection to LDAP server ") ;
- message.appendAscii(mLdapDefinition.mServer) ;
+ message.appendAscii( mLdapDefinition.mServer.getStr());
message.appendAscii(":") ;
message.append(mLdapDefinition.mPort) ;
throw ldap::LdapConnectionException(message.makeStringAndClear(),
@@ -197,7 +197,7 @@ void LdapConnection::initConnection()
LdapMessageHolder result;
LdapErrCode retCode = (*s_p_search_s)(mConnection,
- aUserDn,
+ aUserDn.getStr(),
LDAP_SCOPE_BASE,
"(objectclass=*)",
0,
@@ -231,7 +231,7 @@ void LdapConnection::initConnection()
{
throw lang::IllegalArgumentException(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
- ("LdapConnection::findUserDn -User id is empty")),
+ ("LdapConnection::findUserDn -User id is empty")).getStr(),
NULL, 0) ;
}
@@ -247,9 +247,9 @@ void LdapConnection::initConnection()
attributes[0]= const_cast<sal_Char *>(LDAP_NO_ATTRS);
attributes[1]= NULL;
LdapErrCode retCode = (*s_p_search_s)(mConnection,
- mLdapDefinition.mBaseDN,
+ mLdapDefinition.mBaseDN.getStr(),
LDAP_SCOPE_SUBTREE,
- filter.makeStringAndClear(), attributes, 0, &result.msg) ;
+ filter.getStr(), attributes, 0, &result.msg) ;
checkLdapReturnCode("FindUserDn", retCode,mConnection) ;
rtl::OString userDn ;
Modified: openoffice/branches/capstone2013/main/extensions/source/logging/filehandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/extensions/source/logging/filehandler.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/extensions/source/logging/filehandler.cxx (original)
+++ openoffice/branches/capstone2013/main/extensions/source/logging/filehandler.cxx Sat Nov 30 10:36:46 2013
@@ -203,7 +203,7 @@ namespace logging
sMessage.append( ::rtl::OString( m_sFileURL.getStr(), m_sFileURL.getLength(), osl_getThreadTextEncoding() ) );
sMessage.append( "\nerror code: " );
sMessage.append( (sal_Int32)res );
- OSL_ENSURE( false, sMessage.makeStringAndClear() );
+ OSL_ENSURE( false, sMessage.getStr() );
}
#endif
if ( m_eFileValidity == eValid )
Modified: openoffice/branches/capstone2013/main/extensions/source/propctrlr/pcrcommon.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/extensions/source/propctrlr/pcrcommon.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/extensions/source/propctrlr/pcrcommon.cxx (original)
+++ openoffice/branches/capstone2013/main/extensions/source/propctrlr/pcrcommon.cxx Sat Nov 30 10:36:46 2013
@@ -61,7 +61,7 @@ namespace pcr
::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId )
{
::rtl::OUStringBuffer aBuffer;
- ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+ ::rtl::OUString aTmp( rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ));
INetURLObject aHID( aTmp );
if ( aHID.GetProtocol() == INET_PROT_NOT_VALID )
aBuffer.appendAscii( INET_HID_SCHEME );
Modified: openoffice/branches/capstone2013/main/extensions/source/update/check/updatecheckconfig.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/extensions/source/update/check/updatecheckconfig.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/extensions/source/update/check/updatecheckconfig.cxx (original)
+++ openoffice/branches/capstone2013/main/extensions/source/update/check/updatecheckconfig.cxx Sat Nov 30 10:36:46 2013
@@ -183,7 +183,7 @@ UpdateCheckROModel::getUpdateEntry(Updat
rtl::OString aStr(RELEASE_NOTE);
for(sal_Int32 n=1; n < 6; ++n )
{
- rtl::OUString aUStr = getStringValue(aStr + rtl::OString::valueOf(n));
+ rtl::OUString aUStr = getStringValue( (aStr + rtl::OString::valueOf(n)).getStr());
if( aUStr.getLength() > 0 )
rInfo.ReleaseNotes.push_back(ReleaseNote((sal_Int8) n, aUStr));
}
Modified: openoffice/branches/capstone2013/main/filter/source/msfilter/eschesdo.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/filter/source/msfilter/eschesdo.hxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/filter/source/msfilter/eschesdo.hxx (original)
+++ openoffice/branches/capstone2013/main/filter/source/msfilter/eschesdo.hxx Sat Nov 30 10:36:46 2013
@@ -61,6 +61,9 @@ public:
sal_Int32 ImplGetInt32PropertyValue( const sal_Unicode* pStr, sal_uInt32 nDef = 0 )
{ return ImplGetPropertyValue( pStr ) ? *(sal_Int32*)mAny.getValue() : nDef; }
+ sal_Bool ImplGetPropertyValue( const rtl::OUString& rStr ) { return ImplGetPropertyValue( rStr.getStr() ); }
+ sal_Bool ImplGetInt32PropertyValue( const rtl::OUString& rStr ) { return ImplGetInt32PropertyValue( rStr.getStr() ); }
+
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& GetShapeRef() const { return mXShape; }
const ::com::sun::star::uno::Any& GetUsrAny() const { return mAny; }
const String& GetType() const { return mType; }
Modified: openoffice/branches/capstone2013/main/filter/source/msfilter/msocximex.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/filter/source/msfilter/msocximex.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/filter/source/msfilter/msocximex.cxx (original)
+++ openoffice/branches/capstone2013/main/filter/source/msfilter/msocximex.cxx Sat Nov 30 10:36:46 2013
@@ -131,7 +131,7 @@ bool storePictureInFileSystem( OUString&
uno::Reference<lang::XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory(),
uno::UNO_QUERY_THROW );
uno::Reference< com::sun::star::ucb::XSimpleFileAccess> xSFA( xMSF->createInstance(
- S2U("com.sun.star.ucb.SimpleFileAccess" ) ),
+ OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess") ),
uno::UNO_QUERY_THROW );
OUString ext;
sal_Int32 index = 0;
Modified: openoffice/branches/capstone2013/main/forms/source/misc/services.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/forms/source/misc/services.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/forms/source/misc/services.cxx (original)
+++ openoffice/branches/capstone2013/main/forms/source/misc/services.cxx Sat Nov 30 10:36:46 2013
@@ -347,7 +347,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL comp
for (sal_Int32 i=0; i<nClasses; ++i, ++pClasses, ++pServices, ++pFunctionsAsInts)
{
- if (rtl_ustr_ascii_compare(*pClasses, _pImplName) == 0)
+ if( pClasses->compareToAscii( _pImplName) == 0)
{
::cppu::ComponentInstantiation aCurrentCreateFunction =
reinterpret_cast< ::cppu::ComponentInstantiation>(*pFunctionsAsInts);
Modified: openoffice/branches/capstone2013/main/formula/source/ui/dlg/formdlgs.src
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/formula/source/ui/dlg/formdlgs.src?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/formula/source/ui/dlg/formdlgs.src (original)
+++ openoffice/branches/capstone2013/main/formula/source/ui/dlg/formdlgs.src Sat Nov 30 10:36:46 2013
@@ -225,17 +225,12 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
Right = TRUE ;
Text [ en-US ] = "Function result" ;
};
-//IAccessibility2 Implementation 2009-----
- //Window WND_RESULT
FixedText WND_RESULT
-//-----IAccessibility2 Implementation 2009
{
Border = TRUE ;
Pos = MAP_APPFONT ( 255 , 4 ) ;
Size = MAP_APPFONT ( 60 , 12 ) ;
-//IAccessibility2 Implementation 2009-----
Text [ en-US ] = "Function result" ;
-//-----IAccessibility2 Implementation 2009
};
FixedText FT_FORMULA_RESULT
{
Modified: openoffice/branches/capstone2013/main/formula/source/ui/dlg/formula.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/formula/source/ui/dlg/formula.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/formula/source/ui/dlg/formula.cxx (original)
+++ openoffice/branches/capstone2013/main/formula/source/ui/dlg/formula.cxx Sat Nov 30 10:36:46 2013
@@ -309,11 +309,9 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog*
aRefBtn.Hide();
pMEdit = aMEFormula.GetEdit();
- //IAccessibility2 Implementation 2009-----
aMEFormula.SetAccessibleName(aFtFormula.GetText());
if (pMEdit)
pMEdit->SetAccessibleName(aFtFormula.GetText());
- //-----IAccessibility2 Implementation 2009
m_aEditHelpId = pMEdit->GetHelpId();
pMEdit->SetUniqueId( m_aEditHelpId );
Modified: openoffice/branches/capstone2013/main/formula/source/ui/dlg/funcutl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/formula/source/ui/dlg/funcutl.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/formula/source/ui/dlg/funcutl.cxx (original)
+++ openoffice/branches/capstone2013/main/formula/source/ui/dlg/funcutl.cxx Sat Nov 30 10:36:46 2013
@@ -34,9 +34,7 @@
#include "ControlHelper.hxx"
#include "ModuleHelper.hxx"
#include "ForResId.hrc"
-// IAccessibility2 implementation 2009. ------
#include "com/sun/star/accessibility/AccessibleRole.hpp"
-// ------ IAccessibility2 implementation 2009.
namespace formula
@@ -476,7 +474,6 @@ void ArgInput::Show()
pRefBtn->Show();
}
}
-//IAccessibility2 Implementation 2009-----
void ArgInput::UpdateAccessibleNames()
{
String aArgName = String::CreateFromAscii(":");
Modified: openoffice/branches/capstone2013/main/formula/source/ui/resource/ModuleHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/formula/source/ui/resource/ModuleHelper.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/formula/source/ui/resource/ModuleHelper.cxx (original)
+++ openoffice/branches/capstone2013/main/formula/source/ui/resource/ModuleHelper.cxx Sat Nov 30 10:36:46 2013
@@ -87,8 +87,7 @@ ResMgr* OModuleImpl::getResManager()
if (!m_pRessources)
{
// create a manager with a fixed prefix
- rtl::OString sName = rtl::OString( "forui" );
- m_pRessources = ResMgr::CreateResMgr(sName);
+ m_pRessources = ResMgr::CreateResMgr( "forui");
}
return m_pRessources;
}
Modified: openoffice/branches/capstone2013/main/fpicker/source/aqua/FilterHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/fpicker/source/aqua/FilterHelper.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/fpicker/source/aqua/FilterHelper.cxx (original)
+++ openoffice/branches/capstone2013/main/fpicker/source/aqua/FilterHelper.cxx Sat Nov 30 10:36:46 2013
@@ -105,7 +105,7 @@ shrinkFilterName( const rtl::OUString aF
int nBracketLen = -1;
int nBracketEnd = -1;
rtl::OUString rFilterName = aFilterName;
- const sal_Unicode *pStr = rFilterName;
+ const sal_Unicode* pStr = rFilterName.getStr();
rtl::OUString aRealName = rFilterName;
for( i = aRealName.getLength() - 1; i > 0; i-- )
Modified: openoffice/branches/capstone2013/main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx (original)
+++ openoffice/branches/capstone2013/main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx Sat Nov 30 10:36:46 2013
@@ -286,11 +286,11 @@ SalGtkFilePicker::SalGtkFilePicker( cons
case 0:
break;
case 1:
- gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), sal_True);
+ gtk_expander_set_expanded( GTK_EXPANDER(m_pFilterExpander), sal_True);
break;
case 2:
expandexpanders(GTK_CONTAINER(m_pDialog));
- gtk_expander_set_expanded(GTK_EXPANDER(m_pFilterExpander), sal_True);
+ gtk_expander_set_expanded( GTK_EXPANDER(m_pFilterExpander), sal_True);
break;
}
@@ -530,7 +530,7 @@ shrinkFilterName( const rtl::OUString &r
int i;
int nBracketLen = -1;
int nBracketEnd = -1;
- const sal_Unicode *pStr = rFilterName;
+ const sal_Unicode* pStr = rFilterName.getStr();
OUString aRealName = rFilterName;
for( i = aRealName.getLength() - 1; i > 0; i-- )
@@ -1905,7 +1905,7 @@ GtkFileFilter* SalGtkFilePicker::implAdd
OUString aShrunkName = shrinkFilterName( rFilter );
OString aFilterName = rtl::OUStringToOString( aShrunkName, RTL_TEXTENCODING_UTF8 );
- gtk_file_filter_set_name( filter, aFilterName );
+ gtk_file_filter_set_name( filter, aFilterName.getStr() );
static const OUString aStarDot = OUString::createFromAscii( "*." );
OUString aTokens;
@@ -1929,7 +1929,7 @@ GtkFileFilter* SalGtkFilePicker::implAdd
aTokens = aTokens += aToken;
gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI,
case_insensitive_filter,
- g_strdup( rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ) ),
+ g_strdup( rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8).getStr() ),
(GDestroyNotify) g_free );
OSL_TRACE( "fustering with %s\n", rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr());
@@ -1938,8 +1938,7 @@ GtkFileFilter* SalGtkFilePicker::implAdd
else
{
g_warning( "Duff filter token '%s'\n",
- (const sal_Char *) rtl::OUStringToOString(
- rType.getToken( 0, ';', nIndex ), RTL_TEXTENCODING_UTF8 ) );
+ rtl::OUStringToOString( rType.getToken( 0, ';', nIndex ), RTL_TEXTENCODING_UTF8 ).getStr());
}
#endif
}
Modified: openoffice/branches/capstone2013/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx (original)
+++ openoffice/branches/capstone2013/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx Sat Nov 30 10:36:46 2013
@@ -701,7 +701,7 @@ void VistaFilePickerImpl::impl_sta_SetDi
#ifdef __MINGW32__
HRESULT hResult = SHCreateItemFromParsingName ( reinterpret_cast<LPCTSTR>(sDirectory.getStr()), NULL, IID_IShellItem, reinterpret_cast<void**>(&pFolder) );
#else
- HRESULT hResult = SHCreateItemFromParsingName ( sDirectory, NULL, IID_PPV_ARGS(&pFolder) );
+ HRESULT hResult = SHCreateItemFromParsingName( sDirectory.getStr(), NULL, IID_PPV_ARGS(&pFolder) );
#endif
if ( FAILED(hResult) )
return;
@@ -894,7 +894,7 @@ void VistaFilePickerImpl::impl_sta_ShowD
#ifdef __MINGW32__
HRESULT hResult = SHCreateItemFromParsingName ( reinterpret_cast<LPCTSTR>(m_sDirectory.getStr()), NULL, IID_IShellItem, reinterpret_cast<void**>(&pFolder) );
#else
- HRESULT hResult = SHCreateItemFromParsingName ( m_sDirectory, NULL, IID_PPV_ARGS(&pFolder) );
+ HRESULT hResult = SHCreateItemFromParsingName( m_sDirectory.getStr(), NULL, IID_PPV_ARGS(&pFolder) );
#endif
if ( SUCCEEDED(hResult) )
{
Modified: openoffice/branches/capstone2013/main/fpicker/source/win32/filepicker/filepickerstate.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/fpicker/source/win32/filepicker/filepickerstate.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/fpicker/source/win32/filepicker/filepickerstate.cxx (original)
+++ openoffice/branches/capstone2013/main/fpicker/source/win32/filepicker/filepickerstate.cxx Sat Nov 30 10:36:46 2013
@@ -208,7 +208,7 @@ OUString MatchFixBrokenPath(const OUStri
if (path[1] == ':' && path[2] == '.' && path[3] == '\\')
{
// skip the '.'
- return OUString(path, 2) + path.copy(3, path.getLength() - 3);
+ return (path.copy(0,2) + path.copy(3));
}
return path;
}
Modified: openoffice/branches/capstone2013/main/framework/inc/macros/debug/assertion.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/framework/inc/macros/debug/assertion.hxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/framework/inc/macros/debug/assertion.hxx (original)
+++ openoffice/branches/capstone2013/main/framework/inc/macros/debug/assertion.hxx Sat Nov 30 10:36:46 2013
@@ -154,7 +154,7 @@
_sAssertBuffer.append( "\n\t\"" ); \
_sAssertBuffer.append( STEXT ); \
_sAssertBuffer.append( "\"\n" ); \
- OSL_ENSURE( !( BCONDITION ), _sAssertBuffer.makeStringAndClear() ); \
+ OSL_ENSURE( !( BCONDITION ), _sAssertBuffer.getStr() ); \
}
#endif
Modified: openoffice/branches/capstone2013/main/framework/inc/macros/debug/logmechanism.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/framework/inc/macros/debug/logmechanism.hxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/framework/inc/macros/debug/logmechanism.hxx (original)
+++ openoffice/branches/capstone2013/main/framework/inc/macros/debug/logmechanism.hxx Sat Nov 30 10:36:46 2013
@@ -52,7 +52,7 @@
are handled wrong.
_____________________________________________________________________________________________________________*/
- #define WRITE_LOGFILE( SFILENAME, STEXT ) \
+ inline void writeToLogFile( const char* SFILENAME, const char* STEXT )
{ \
::rtl::OString _swriteLogfileFileName ( SFILENAME ); \
::rtl::OString _swriteLogfileText ( STEXT ); \
@@ -61,6 +61,10 @@
fclose ( pFile ); \
}
+ inline void writeToLogFile( const char* pFILENAME, const rtl::OString& rTEXT ) { writeToLogFile( pFILENAME, rTEXT.getStr()); }
+
+ #define WRITE_LOGFILE( SFILENAME, STEXT ) { writeToLogFile( (SFILENAME), (STEXT) ); }
+
/*_____________________________________________________________________________________________________________
LOGTYPE
Modified: openoffice/branches/capstone2013/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx (original)
+++ openoffice/branches/capstone2013/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx Sat Nov 30 10:36:46 2013
@@ -1187,7 +1187,7 @@ void ToolbarLayoutManager::implts_create
uno::Reference< ui::XUIElement > xUIElement;
implts_createToolBar( aTbxResName, bNotify, xUIElement );
- if ( aTitle && xUIElement.is() )
+ if ( !aTitle.isEmpty() && xUIElement.is() )
{
vos::OGuard aGuard( Application::GetSolarMutex() );
Modified: openoffice/branches/capstone2013/main/framework/source/loadenv/loadenv.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/framework/source/loadenv/loadenv.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/framework/source/loadenv/loadenv.cxx (original)
+++ openoffice/branches/capstone2013/main/framework/source/loadenv/loadenv.cxx Sat Nov 30 10:36:46 2013
@@ -187,11 +187,9 @@ css::uno::Reference< css::lang::XCompone
css::io::IOException ,
css::uno::RuntimeException )
{
- //IAccessibility2 Implementation 2009-----
#ifdef WNT
CEnableAccessInterface e;
#endif
- //-----IAccessibility2 Implementation 2009
css::uno::Reference< css::lang::XComponent > xComponent;
try
Modified: openoffice/branches/capstone2013/main/framework/source/services/license.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/framework/source/services/license.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/framework/source/services/license.cxx (original)
+++ openoffice/branches/capstone2013/main/framework/source/services/license.cxx Sat Nov 30 10:36:46 2013
@@ -282,7 +282,7 @@ css::uno::Any SAL_CALL License::execute(
::rtl::OString aMgrName = ::rtl::OString("fwe");
AllSettings aSettings(Application::GetSettings());
aLocale = aSettings.GetUILocale();
- ResMgr* pResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);
+ ResMgr* pResMgr = ResMgr::SearchCreateResMgr( aMgrName.getStr(), aLocale);
aLangString = aLocale.Language;
if ( aLocale.Country.getLength() != 0 )
Modified: openoffice/branches/capstone2013/main/framework/source/uielement/controlmenucontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/framework/source/uielement/controlmenucontroller.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/framework/source/uielement/controlmenucontroller.cxx (original)
+++ openoffice/branches/capstone2013/main/framework/source/uielement/controlmenucontroller.cxx Sat Nov 30 10:36:46 2013
@@ -228,7 +228,7 @@ void ControlMenuController::updateImages
{
rtl::OUString aResName( RTL_CONSTASCII_USTRINGPARAM( "svx" ));
- ResMgr* pResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US ));
+ ResMgr* pResMgr = ResMgr::CreateResMgr( rtl::OUStringToOString( aResName, RTL_TEXTENCODING_ASCII_US ).getStr() );
ResId aResId( m_bWasHiContrast ? RID_SVXIMGLIST_FMEXPL_HC : RID_SVXIMGLIST_FMEXPL, *pResMgr );
aResId.SetRT( RSC_IMAGELIST );
Modified: openoffice/branches/capstone2013/main/graphite/graphite-2.3.1.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/graphite/graphite-2.3.1.patch?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/graphite/graphite-2.3.1.patch (original)
+++ openoffice/branches/capstone2013/main/graphite/graphite-2.3.1.patch Sat Nov 30 10:36:46 2013
@@ -2360,6 +2360,17 @@
{
}
+--- misc/silgraphite-2.3.1/engine/include/graphite/Segment.h 2009-01-29 09:33:19.000000000 +0100
++++ misc/build/silgraphite-2.3.1/engine/include/graphite/Segment.h 2013-08-14 15:10:53.363864046 +0200
+@@ -64,7 +64,7 @@
+ virtual ~Segment();
+
+ // Basic copy constructor:
+- Segment(Segment & seg);
++ Segment( const Segment&);
+
+ // For making modified copies of segments:
+ static Segment * LineContextSegment(Segment & seg, bool fStartLine, bool fEndLine);
--- misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp.bak 2010-06-23 19:59:54.611660400 +0700
+++ misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp 2010-06-23 21:30:16.335460400 +0700
@@ -246,6 +246,8 @@
@@ -2371,6 +2382,15 @@
// m_psstrm = NULL;
m_prgslout = NULL;
+@@ -435,7 +435,7 @@
+ /*----------------------------------------------------------------------------------------------
+ Basic copy method.
+ ----------------------------------------------------------------------------------------------*/
+-Segment::Segment(Segment & seg)
++Segment::Segment( const Segment& seg)
+ {
+ int islout;
+
@@ -2988,9 +2988,10 @@
return kresOk;
}
Modified: openoffice/branches/capstone2013/main/i18npool/source/indexentry/indexentrysupplier_default.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/i18npool/source/indexentry/indexentrysupplier_default.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/i18npool/source/indexentry/indexentrysupplier_default.cxx (original)
+++ openoffice/branches/capstone2013/main/i18npool/source/indexentry/indexentrysupplier_default.cxx Sat Nov 30 10:36:46 2013
@@ -174,7 +174,7 @@ void Index::makeIndexKeys(const lang::Lo
if (!keyStr.getLength()) {
keyStr = LocaleData().getIndexKeysByAlgorithm(LOCALE_EN,
LocaleData().getDefaultIndexAlgorithm(LOCALE_EN));
- if (!keyStr)
+ if( keyStr.isEmpty() )
throw RuntimeException();
}
Modified: openoffice/branches/capstone2013/main/i18npool/source/localedata/saxparser.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/i18npool/source/localedata/saxparser.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/i18npool/source/localedata/saxparser.cxx (original)
+++ openoffice/branches/capstone2013/main/i18npool/source/localedata/saxparser.cxx Sat Nov 30 10:36:46 2013
@@ -271,7 +271,7 @@ public: // ExtendedDocumentHandler
source.sPublicId = sPublicId;
source.aInputStream = createStreamFromFile(
- OUStringToOString( sSystemId , RTL_TEXTENCODING_ASCII_US) );
+ OUStringToOString( sSystemId.getStr(), RTL_TEXTENCODING_ASCII_US).getStr() );
return source;
}
Modified: openoffice/branches/capstone2013/main/idlc/source/idlccompile.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/idlc/source/idlccompile.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/idlc/source/idlccompile.cxx (original)
+++ openoffice/branches/capstone2013/main/idlc/source/idlccompile.cxx Sat Nov 30 10:36:46 2013
@@ -145,7 +145,7 @@ OString makeTempName(const OString& pref
#if defined(SAL_W32) || defined(SAL_UNX) || defined(SAL_OS2)
- OSL_ASSERT( sizeof(tmpFilePattern) > ( strlen(tmpPath)
+ OSL_ASSERT( sizeof(tmpFilePattern) > ( tmpPath.getLength()
+ RTL_CONSTASCII_LENGTH(
PATH_SEPARATOR )
+ prefix.getLength()
@@ -153,7 +153,7 @@ OString makeTempName(const OString& pref
"XXXXXX") ) );
tmpFilePattern[ sizeof(tmpFilePattern)-1 ] = '\0';
- strncpy(tmpFilePattern, tmpPath, sizeof(tmpFilePattern)-1);
+ strncpy(tmpFilePattern, tmpPath.getStr(), sizeof(tmpFilePattern)-1);
strncat(tmpFilePattern, PATH_SEPARATOR, sizeof(tmpFilePattern)-1-strlen(tmpFilePattern));
strncat(tmpFilePattern, prefix.getStr(), sizeof(tmpFilePattern)-1-strlen(tmpFilePattern));
strncat(tmpFilePattern, "XXXXXX", sizeof(tmpFilePattern)-1-strlen(tmpFilePattern));
@@ -377,7 +377,7 @@ sal_Int32 compileFile(const OString * pa
if ( pOptions->isValid("-E") )
{
- if (unlink(preprocFile) != 0)
+ if( unlink( preprocFile.getStr()) != 0)
{
fprintf(stderr, "%s: Could not remove parser input file %s\n",
pOptions->getProgramName().getStr(), preprocFile.getStr());
Modified: openoffice/branches/capstone2013/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx (original)
+++ openoffice/branches/capstone2013/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Sat Nov 30 10:36:46 2013
@@ -105,7 +105,7 @@ int SunInfo::compareVersions(const rtl::
rtl::OUString sFirst = getVersion();
SunVersion version1(sFirst);
- JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION
+ JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION
" does not know the version: ")
+ sFirst + OUSTR(" as valid for a SUN/Oracle JRE."));
SunVersion version2(sSecond);
Modified: openoffice/branches/capstone2013/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx (original)
+++ openoffice/branches/capstone2013/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx Sat Nov 30 10:36:46 2013
@@ -879,7 +879,7 @@ rtl::Reference<VendorBase> getJREInfoByP
SameOrSubDirJREMap(sResolvedDir));
if (entry2 != mapJREs.end())
{
- JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION ": ")
+ JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ": ")
+ OUSTR("JRE found again (detected before): ") + sResolvedDir
+ OUSTR(".\n"));
return entry2->second;
@@ -930,7 +930,7 @@ rtl::Reference<VendorBase> getJREInfoByP
MapIt entry = mapJREs.find(sFilePath);
if (entry != mapJREs.end())
{
- JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION ": ")
+ JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ": ")
+ OUSTR("JRE found again (detected before): ") + sFilePath
+ OUSTR(".\n"));
@@ -1018,7 +1018,7 @@ rtl::Reference<VendorBase> getJREInfoByP
vecBadPaths.push_back(sFilePath);
else
{
- JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION ": ")
+ JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ": ")
+ OUSTR("Found JRE: ") + sResolvedDir
+ OUSTR(" \n at: ") + path + OUSTR(".\n"));
Modified: openoffice/branches/capstone2013/main/offapi/com/sun/star/accessibility/AccessibleEventId.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/offapi/com/sun/star/accessibility/AccessibleEventId.idl?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/offapi/com/sun/star/accessibility/AccessibleEventId.idl (original)
+++ openoffice/branches/capstone2013/main/offapi/com/sun/star/accessibility/AccessibleEventId.idl Sat Nov 30 10:36:46 2013
@@ -377,7 +377,6 @@ published constants AccessibleEventId
*/
const short LISTBOX_ENTRY_COLLAPSED = 33;
- //IAccessibility2 Implementation 2009-----
const short ACTIVE_DESCENDANT_CHANGED_NOFOCUS = 34;
const short SELECTION_CHANGED_ADD =35;
const short SELECTION_CHANGED_REMOVE =36;
@@ -385,7 +384,6 @@ published constants AccessibleEventId
const short PAGE_CHANGED =38;
const short SECTION_CHANGED =39;
const short COLUMN_CHANGED =40;
- //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/capstone2013/main/package/source/xstor/owriteablestream.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/package/source/xstor/owriteablestream.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/package/source/xstor/owriteablestream.cxx (original)
+++ openoffice/branches/capstone2013/main/package/source/xstor/owriteablestream.cxx Sat Nov 30 10:36:46 2013
@@ -565,7 +565,7 @@ uno::Reference< lang::XMultiServiceFacto
::rtl::OUString aTempURL = GetNewTempFileURL( GetServiceFactory() );
try {
- if ( aTempURL && xStream.is() )
+ if ( !aTempURL.isEmpty() && xStream.is() )
{
uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
GetServiceFactory()->createInstance (
Modified: openoffice/branches/capstone2013/main/pyuno/source/module/pyuno_impl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/pyuno/source/module/pyuno_impl.hxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/pyuno/source/module/pyuno_impl.hxx (original)
+++ openoffice/branches/capstone2013/main/pyuno/source/module/pyuno_impl.hxx Sat Nov 30 10:36:46 2013
@@ -56,6 +56,9 @@
#define PYSTR_CHECK PyBytes_Check
#endif
+#include <rtl/string.hxx>
+inline void PyErr_SetString( PyObject* pyObj, const rtl::OString& rName) { PyErr_SetString( pyObj, rName.getStr());}
+
namespace pyuno
{
Modified: openoffice/branches/capstone2013/main/rat-excludes
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/rat-excludes?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/rat-excludes (original)
+++ openoffice/branches/capstone2013/main/rat-excludes Sat Nov 30 10:36:46 2013
@@ -1353,6 +1353,7 @@ main/unixODBC/inc/sqlext.h
main/unixODBC/inc/sqltypes.h
main/unixODBC/inc/sqlucode.h
+main/winaccessibility/source/UAccCOMIDL/ia2_api_all.idl
##############################################################################
#
Modified: openoffice/branches/capstone2013/main/rdbmaker/source/codemaker/global.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/rdbmaker/source/codemaker/global.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/rdbmaker/source/codemaker/global.cxx (original)
+++ openoffice/branches/capstone2013/main/rdbmaker/source/codemaker/global.cxx Sat Nov 30 10:36:46 2013
@@ -130,7 +130,7 @@ void FileStream::open(const OString& nam
if ( name.getLength() > 0 )
{
m_name = name;
- m_pFile = fopen(m_name, checkAccessMode(mode));
+ m_pFile = fopen( m_name.getStr(), checkAccessMode(mode));
}
}
Modified: openoffice/branches/capstone2013/main/registry/source/regimpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/registry/source/regimpl.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/registry/source/regimpl.cxx (original)
+++ openoffice/branches/capstone2013/main/registry/source/regimpl.cxx Sat Nov 30 10:36:46 2013
@@ -561,7 +561,7 @@ RegError ORegistry::destroyRegistry(cons
systemName = regName;
OString name( OUStringToOString(systemName, osl_getThreadTextEncoding()) );
- if (unlink(name) != 0)
+ if( unlink( name.getStr()) != 0)
{
return REG_DESTROY_REGISTRY_FAILED;
}
@@ -819,7 +819,7 @@ RegError ORegistry::eraseKey(ORegKey* pK
if (sFullKeyName.getLength() > 1)
sFullKeyName += keyName;
else
- sFullKeyName += (keyName+1);
+ sFullKeyName += keyName.getStr() + 1;
sFullPath = sFullKeyName.copy(0, keyName.lastIndexOf('/') + 1);
} else
Modified: openoffice/branches/capstone2013/main/registry/tools/checksingleton.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/registry/tools/checksingleton.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/registry/tools/checksingleton.cxx (original)
+++ openoffice/branches/capstone2013/main/registry/tools/checksingleton.cxx Sat Nov 30 10:36:46 2013
@@ -116,7 +116,7 @@ bool Options_Impl::initOptions_Impl(std:
{
return badOption("invalid", option.c_str());
}
- m_typeRegName = OString((*first).c_str(), (*first).size());
+ m_typeRegName = *first;
break;
}
case 'o':
Modified: openoffice/branches/capstone2013/main/reportdesign/source/core/resource/core_resource.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/reportdesign/source/core/resource/core_resource.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/reportdesign/source/core/resource/core_resource.cxx (original)
+++ openoffice/branches/capstone2013/main/reportdesign/source/core/resource/core_resource.cxx Sat Nov 30 10:36:46 2013
@@ -64,7 +64,7 @@ namespace reportdesign
::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILocale();
rtl::OString sResLibName = rtl::OString( "rpt" );
- m_pImpl = SimpleResMgr::Create(sResLibName, aLocale);
+ m_pImpl = SimpleResMgr::Create( sResLibName.getStr(), aLocale);
}
}
Modified: openoffice/branches/capstone2013/main/reportdesign/source/core/sdr/ModuleHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/reportdesign/source/core/sdr/ModuleHelper.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/reportdesign/source/core/sdr/ModuleHelper.cxx (original)
+++ openoffice/branches/capstone2013/main/reportdesign/source/core/sdr/ModuleHelper.cxx Sat Nov 30 10:36:46 2013
@@ -88,7 +88,7 @@ ResMgr* OModuleImpl::getResManager()
{
// create a manager with a fixed prefix
rtl::OString sName = rtl::OString( "rptui" );
- m_pRessources = ResMgr::CreateResMgr(sName);
+ m_pRessources = ResMgr::CreateResMgr( sName.getStr());
}
return m_pRessources;
}
Modified: openoffice/branches/capstone2013/main/reportdesign/source/ui/inspection/DefaultInspection.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/reportdesign/source/ui/inspection/DefaultInspection.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/reportdesign/source/ui/inspection/DefaultInspection.cxx (original)
+++ openoffice/branches/capstone2013/main/reportdesign/source/ui/inspection/DefaultInspection.cxx Sat Nov 30 10:36:46 2013
@@ -47,7 +47,7 @@ namespace rptui
::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId )
{
::rtl::OUStringBuffer aBuffer;
- ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+ const ::rtl::OUString aTmp( ::rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ));
DBG_ASSERT( INetURLObject( aTmp ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
aBuffer.appendAscii( INET_HID_SCHEME );
aBuffer.append( aTmp.getStr() );
Modified: openoffice/branches/capstone2013/main/rsc/inc/rscerror.h
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/rsc/inc/rscerror.h?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/rsc/inc/rscerror.h (original)
+++ openoffice/branches/capstone2013/main/rsc/inc/rscerror.h Sat Nov 30 10:36:46 2013
@@ -27,6 +27,8 @@
#include <tools/solar.h>
#endif
+#include <rtl/string.hxx>
+
/****************** D E F I N I T I O N S ********************************/
/******************* R e t u r n E r r o r s *******************/
#define ERR_OK 0xFFFFFFFF
@@ -153,6 +155,8 @@ public:
// das Programm wird mit exit() verlassen
virtual void FatalError( const ERRTYPE& rError, const RscId &aId,
const char * pMessage = NULL );
+ void Error( const ERRTYPE& rError, RscTop* pClass, const RscId& rId, const rtl::OString& rStr ) { this->Error( rError, pClass, rId, rStr.getStr()); }
+ void FatalError( const ERRTYPE& rError, const RscId& rId, const rtl::OString& rStr ) { this->FatalError( rError,rId, rStr.getStr()); }
};
#endif // _RSCERROR_H
Modified: openoffice/branches/capstone2013/main/rsc/source/parser/rscdb.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/rsc/source/parser/rscdb.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/rsc/source/parser/rscdb.cxx (original)
+++ openoffice/branches/capstone2013/main/rsc/source/parser/rscdb.cxx Sat Nov 30 10:36:46 2013
@@ -112,7 +112,7 @@ static sal_uInt32 getLangIdAndShortenLoc
sal_uInt32 nRet = GetLangId( aL );
if( nRet == 0 )
{
- pTypCont->AddLanguage( aL );
+ pTypCont->AddLanguage( aL.getStr() );
nRet = GetLangId( aL );
}
if( rVariant.getLength() )
Modified: openoffice/branches/capstone2013/main/sal/inc/osl/profile.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sal/inc/osl/profile.hxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sal/inc/osl/profile.hxx (original)
+++ openoffice/branches/capstone2013/main/sal/inc/osl/profile.hxx Sat Nov 30 10:36:46 2013
@@ -75,17 +75,17 @@ namespace osl {
{
sal_Char aBuf[1024];
return osl_readProfileString( profile,
- rSection,
- rEntry,
+ rSection.getStr(),
+ rEntry.getStr(),
aBuf,
sizeof( aBuf ),
- rDefault ) ? rtl::OString( aBuf ) : rtl::OString();
+ rDefault.getStr() ) ? rtl::OString( aBuf ) : rtl::OString();
}
sal_Bool readBool( const rtl::OString& rSection, const rtl::OString& rEntry, sal_Bool bDefault )
{
- return osl_readProfileBool( profile, rSection, rEntry, bDefault );
+ return osl_readProfileBool( profile, rSection.getStr(), rEntry.getStr(), bDefault );
}
sal_uInt32 readIdent(const rtl::OString& rSection, const rtl::OString& rEntry,
@@ -98,11 +98,11 @@ namespace osl {
nItems = 0;
while( it != rStrings.end() )
{
- pStrings[ nItems++ ] = *it;
+ pStrings[ nItems++ ] = (*it).getStr();
++it;
}
pStrings[ nItems ] = NULL;
- sal_uInt32 nRet = osl_readProfileIdent(profile, rSection, rEntry, nFirstId, pStrings, nDefault);
+ sal_uInt32 nRet = osl_readProfileIdent( profile, rSection.getStr(), rEntry.getStr(), nFirstId, pStrings, nDefault);
delete pStrings;
return nRet;
}
@@ -110,12 +110,12 @@ namespace osl {
sal_Bool writeString(const rtl::OString& rSection, const rtl::OString& rEntry,
const rtl::OString& rString)
{
- return osl_writeProfileString(profile, rSection, rEntry, rString);
+ return osl_writeProfileString( profile, rSection.getStr(), rEntry.getStr(), rString.getStr());
}
sal_Bool writeBool(const rtl::OString& rSection, const rtl::OString& rEntry, sal_Bool Value)
{
- return osl_writeProfileBool(profile, rSection, rEntry, Value);
+ return osl_writeProfileBool( profile, rSection.getStr(), rEntry.getStr(), Value);
}
sal_Bool writeIdent(const rtl::OString& rSection, const rtl::OString& rEntry,
@@ -128,12 +128,12 @@ namespace osl {
nItems = 0;
while( it != rStrings.end() )
{
- pStrings[ nItems++ ] = *it;
+ pStrings[ nItems++ ] = (*it).getStr();
++it;
}
pStrings[ nItems ] = NULL;
sal_Bool bRet =
- osl_writeProfileIdent(profile, rSection, rEntry, nFirstId, pStrings, nValue );
+ osl_writeProfileIdent( profile, rSection.getStr(), rEntry.getStr(), nFirstId, pStrings, nValue );
delete pStrings;
return bRet;
}
@@ -144,7 +144,7 @@ namespace osl {
*/
sal_Bool removeEntry(const rtl::OString& rSection, const rtl::OString& rEntry)
{
- return osl_removeProfileEntry(profile, rSection, rEntry);
+ return osl_removeProfileEntry( profile, rSection.getStr(), rEntry.getStr());
}
/** Get all entries belonging to the specified section.
@@ -156,11 +156,11 @@ namespace osl {
std::list< rtl::OString > aEntries;
// count buffer size necessary
- int n = osl_getProfileSectionEntries( profile, rSection, NULL, 0 );
+ int n = osl_getProfileSectionEntries( profile, rSection.getStr(), NULL, 0 );
if( n > 1 )
{
sal_Char* pBuf = new sal_Char[ n+1 ];
- osl_getProfileSectionEntries( profile, rSection, pBuf, n+1 );
+ osl_getProfileSectionEntries( profile, rSection.getStr(), pBuf, n+1 );
int nLen;
for( n = 0; ( nLen = strlen( pBuf+n ) ); n += nLen+1 )
aEntries.push_back( rtl::OString( pBuf+n ) );
Modified: openoffice/branches/capstone2013/main/sal/inc/rtl/locale.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sal/inc/rtl/locale.hxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sal/inc/rtl/locale.hxx (original)
+++ openoffice/branches/capstone2013/main/sal/inc/rtl/locale.hxx Sat Nov 30 10:36:46 2013
@@ -181,7 +181,7 @@ public:
static OLocale registerLocale( const OUString & language, const OUString & country,
const OUString & variant )
{
- return rtl_locale_register( language, country, variant );
+ return rtl_locale_register( language.getStr(), country.getStr(), variant.getStr() );
}
/**
@@ -191,7 +191,7 @@ public:
*/
static OLocale registerLocale( const OUString & language, const OUString & country )
{
- return rtl_locale_register( language, country, NULL );
+ return rtl_locale_register( language.getStr(), country.getStr(), NULL );
}
/** @deprecated
@@ -202,7 +202,7 @@ public:
*/
static void setDefault( const OUString & language, const OUString & country,
const OUString & variant )
- { rtl_locale_setDefault(language, country, variant); }
+ { rtl_locale_setDefault( language.getStr(), country.getStr(), variant.getStr()); }
/**
Getter for programmatic name of field,
Modified: openoffice/branches/capstone2013/main/sal/inc/rtl/string.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sal/inc/rtl/string.hxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sal/inc/rtl/string.hxx (original)
+++ openoffice/branches/capstone2013/main/sal/inc/rtl/string.hxx Sat Nov 30 10:36:46 2013
@@ -219,9 +219,13 @@ public:
*/
sal_Int32 getLength() const SAL_THROW(()) { return pData->length; }
+private:
/**
Returns a pointer to the characters of this string.
+ NOTE: the implicit cast to a char pointer is obsolete
+ because it is too dangerous #i123068#
+
<p>The returned pointer is not guaranteed to point to a null-terminated
byte string. Note that this string object may contain embedded null
characters, which will thus also be embedded in the returned byte
@@ -231,6 +235,13 @@ public:
representing the characters of this string object.
*/
operator const sal_Char *() const SAL_THROW(()) { return pData->buffer; }
+public:
+ /** Returns a reference to a character of this string. */
+ sal_Char& operator[]( int n ) { return pData->buffer[n]; }
+ /** Returns a const reference to a character of this string. */
+ const sal_Char& operator[]( int n ) const { return pData->buffer[n]; }
+ /** Returns a bool indicating whether this string is empty. */
+ bool isEmpty() const { return (pData->length == 0); }
/**
Returns a pointer to the characters of this string.
@@ -954,6 +965,12 @@ struct CStringHash
} /* Namespace */
+/* Helper methods to support OString messages in OSL_ENSURE, DBG_ERROR, DBG_WARN, DBG_TRACE, etc. */
+inline sal_Bool SAL_CALL osl_assertFailedLine( const sal_Char* pszFileName, sal_Int32 nLine, const ::rtl::OString& rMessage)
+ { return osl_assertFailedLine( pszFileName, nLine, rMessage.getStr()); }
+inline void DbgOut( const rtl::OString& rMessage, sal_uInt16 nOutType, const sal_Char* pFileName, sal_uInt16 nLineNum )
+ { DbgOut( rMessage.getStr(), nOutType, pFileName, nLineNum); }
+
#endif /* __cplusplus */
#endif /* _RTL_STRING_HXX_ */
Modified: openoffice/branches/capstone2013/main/sal/inc/rtl/ustring.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sal/inc/rtl/ustring.hxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sal/inc/rtl/ustring.hxx (original)
+++ openoffice/branches/capstone2013/main/sal/inc/rtl/ustring.hxx Sat Nov 30 10:36:46 2013
@@ -274,14 +274,26 @@ public:
*/
sal_Int32 getLength() const SAL_THROW(()) { return pData->length; }
+private:
/**
Returns a pointer to the Unicode character buffer from this string.
+ NOTE: the implicit cast to a UTF-16 pointer is obsolete
+ because it is too dangerous #i123068#
+
It isn't necessarily NULL terminated.
@return a pointer to the Unicode characters buffer from this object.
*/
operator const sal_Unicode *() const SAL_THROW(()) { return pData->buffer; }
+public:
+ /** Returns a reference to a UTF-16 element of this string. */
+ sal_Unicode& operator[]( int n ) { return pData->buffer[n]; }
+ /** Returns a const reference to a UTF-16 element of this string. */
+ const sal_Unicode& operator[]( int n ) const { return pData->buffer[n]; }
+ /** Returns a bool indicating whether this string is empty. */
+ bool isEmpty() const { return (pData->length == 0); }
+
/**
Returns a pointer to the Unicode character buffer from this string.
Modified: openoffice/branches/capstone2013/main/sal/osl/w32/signal.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sal/osl/w32/signal.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sal/osl/w32/signal.cxx (original)
+++ openoffice/branches/capstone2013/main/sal/osl/w32/signal.cxx Sat Nov 30 10:36:46 2013
@@ -36,6 +36,8 @@
#endif
#include <ErrorRep.h>
#include <systools/win32/uwinapi.h>
+#include <eh.h>
+#include <stdexcept>
typedef struct _oslSignalHandlerImpl
{
@@ -423,10 +425,53 @@ oslSignalAction SAL_CALL osl_raiseSignal
/*****************************************************************************/
/* osl_setErrorReporting */
/*****************************************************************************/
+
+void win_seh_translator( unsigned nSEHCode, _EXCEPTION_POINTERS* pExcPtrs)
+{
+ (void*)pExcPtrs; // currently unused, but useful inside a debugger
+ const char* pSEHName = NULL;
+ switch( nSEHCode)
+ {
+ case EXCEPTION_ACCESS_VIOLATION: pSEHName = "SEH Exception: ACCESS VIOLATION"; break;
+ case EXCEPTION_DATATYPE_MISALIGNMENT: pSEHName = "SEH Exception: DATATYPE MISALIGNMENT"; break;
+ case EXCEPTION_BREAKPOINT: /*pSEHName = "SEH Exception: BREAKPOINT";*/ break;
+ case EXCEPTION_SINGLE_STEP: /*pSEHName = "SEH Exception: SINGLE STEP";*/ break;
+ case EXCEPTION_ARRAY_BOUNDS_EXCEEDED: pSEHName = "SEH Exception: ARRAY BOUNDS EXCEEDED"; break;
+ case EXCEPTION_FLT_DENORMAL_OPERAND: pSEHName = "SEH Exception: DENORMAL FLOAT OPERAND"; break;
+ case EXCEPTION_FLT_DIVIDE_BY_ZERO: pSEHName = "SEH Exception: FLOAT DIVIDE_BY_ZERO"; break;
+ case EXCEPTION_FLT_INEXACT_RESULT: pSEHName = "SEH Exception: FLOAT INEXACT RESULT"; break;
+ case EXCEPTION_FLT_INVALID_OPERATION: pSEHName = "SEH Exception: INVALID FLOAT OPERATION"; break;
+ case EXCEPTION_FLT_OVERFLOW: pSEHName = "SEH Exception: FLOAT OVERFLOW"; break;
+ case EXCEPTION_FLT_STACK_CHECK: pSEHName = "SEH Exception: FLOAT STACK_CHECK"; break;
+ case EXCEPTION_FLT_UNDERFLOW: pSEHName = "SEH Exception: FLOAT UNDERFLOW"; break;
+ case EXCEPTION_INT_DIVIDE_BY_ZERO: pSEHName = "SEH Exception: INTEGER DIVIDE_BY_ZERO"; break;
+ case EXCEPTION_INT_OVERFLOW: pSEHName = "SEH Exception: INTEGER OVERFLOW"; break;
+ case EXCEPTION_PRIV_INSTRUCTION: pSEHName = "SEH Exception: PRIVILEDGED INSTRUCTION"; break;
+ case EXCEPTION_IN_PAGE_ERROR: pSEHName = "SEH Exception: IN_PAGE_ERROR"; break;
+ case EXCEPTION_ILLEGAL_INSTRUCTION: pSEHName = "SEH Exception: ILLEGAL INSTRUCTION"; break;
+ case EXCEPTION_NONCONTINUABLE_EXCEPTION: pSEHName = "SEH Exception: NONCONTINUABLE EXCEPTION"; break;
+ case EXCEPTION_STACK_OVERFLOW: pSEHName = "SEH Exception: STACK OVERFLOW"; break;
+ case EXCEPTION_INVALID_DISPOSITION: pSEHName = "SEH Exception: INVALID DISPOSITION"; break;
+ case EXCEPTION_GUARD_PAGE: pSEHName = "SEH Exception: GUARD PAGE"; break;
+ case EXCEPTION_INVALID_HANDLE: pSEHName = "SEH Exception: INVALID HANDLE"; break;
+// case EXCEPTION_POSSIBLE_DEADLOCK: pSEHName = "SEH Exception: POSSIBLE DEADLOCK"; break;
+ default: pSEHName = "Unknown SEH Exception"; break;
+ }
+
+ if( pSEHName)
+ throw std::runtime_error( pSEHName);
+}
+
sal_Bool SAL_CALL osl_setErrorReporting( sal_Bool bEnable )
{
sal_Bool bOld = bErrorReportingEnabled;
bErrorReportingEnabled = bEnable;
+ if( !bEnable) // if the crash reporter is disabled
+ {
+ // fall back to handle Window's SEH events as C++ exceptions
+ _set_se_translator( win_seh_translator);
+ }
+
return bOld;
}
Modified: openoffice/branches/capstone2013/main/sal/rtl/source/alloc_arena.c
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sal/rtl/source/alloc_arena.c?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sal/rtl/source/alloc_arena.c (original)
+++ openoffice/branches/capstone2013/main/sal/rtl/source/alloc_arena.c Sat Nov 30 10:36:46 2013
@@ -1212,16 +1212,9 @@ SAL_CALL rtl_machdep_alloc (
#elif defined(SAL_W32)
addr = VirtualAlloc (NULL, (SIZE_T)(size), MEM_COMMIT, PAGE_READWRITE);
#elif defined(SAL_OS2)
- {
- APIRET rc;
- addr = 0;
- // Use DosAlloc* to get a 4KB page aligned address.
- rc = DosAllocMem( &addr, size, PAG_COMMIT | PAG_READ | PAG_WRITE | OBJ_ANY);
- if (rc) {
- fprintf( stderr, "sal3::DosAllocMem failed rc=%d\n", rc);
- addr = 0;
- }
- }
+ /* Use valloc() to use libc 16MB chunks when allocating high memory, to reduce
+ virtual address fragmentation. */
+ addr = valloc( size);
#endif /* (SAL_UNX || SAL_W32 || SAL_OS2) */
if (addr != MAP_FAILED)
@@ -1256,7 +1249,7 @@ SAL_CALL rtl_machdep_free (
#elif defined(SAL_W32)
(void) VirtualFree ((LPVOID)(pAddr), (SIZE_T)(0), MEM_RELEASE);
#elif defined(SAL_OS2)
- (void) DosFreeMem( pAddr);
+ free(pAddr);
#endif /* (SAL_UNX || SAL_W32) */
}
Modified: openoffice/branches/capstone2013/main/sax/source/tools/fastserializer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sax/source/tools/fastserializer.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sax/source/tools/fastserializer.cxx (original)
+++ openoffice/branches/capstone2013/main/sax/source/tools/fastserializer.cxx Sat Nov 30 10:36:46 2013
@@ -78,7 +78,7 @@ namespace sax_fastparser {
OUString FastSaxSerializer::escapeXml( const OUString& s )
{
::rtl::OUStringBuffer sBuf( s.getLength() );
- const sal_Unicode* pStr = s;
+ const sal_Unicode* pStr = s.getStr();
sal_Int32 nLen = s.getLength();
for( sal_Int32 i = 0; i < nLen; ++i)
{
Modified: openoffice/branches/capstone2013/main/sc/inc/chgtrack.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/inc/chgtrack.hxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/inc/chgtrack.hxx (original)
+++ openoffice/branches/capstone2013/main/sc/inc/chgtrack.hxx Sat Nov 30 10:36:46 2013
@@ -44,7 +44,6 @@
#endif
#define DEBUG_CHANGETRACK 0
-//IAccessibility2 Implementation 2009-----
class ScChangeAction;
class ScAppOptions;
class ScActionColorChanger
@@ -62,7 +61,6 @@ public:
void Update( const ScChangeAction& rAction );
ColorData GetColor() const { return nColor; }
};
-//-----IAccessibility2 Implementation 2009
class ScBaseCell;
class ScDocument;
Modified: openoffice/branches/capstone2013/main/sc/inc/detfunc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/inc/detfunc.hxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/inc/detfunc.hxx (original)
+++ openoffice/branches/capstone2013/main/sc/inc/detfunc.hxx Sat Nov 30 10:36:46 2013
@@ -155,9 +155,7 @@ public:
static ColorData GetCommentColor();
static void InitializeColors();
static sal_Bool IsColorsInitialized();
-//IAccessibility2 Implementation 2009-----
static void AppendChangTrackNoteSeparator(String &str);
-//-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/capstone2013/main/sc/inc/document.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/inc/document.hxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/inc/document.hxx (original)
+++ openoffice/branches/capstone2013/main/sc/inc/document.hxx Sat Nov 30 10:36:46 2013
@@ -440,7 +440,6 @@ private:
sal_Int16 mnNamedRangesLockCount;
-//IAccessibility2 Implementation 2009-----
String msDocAccTitle;
public:
// SC_DLLPUBLIC sal_Bool RowHidden( SCROW nRow, SCTAB nTab );
@@ -456,7 +455,6 @@ public:
virtual sal_Bool getDocReadOnly() const { return bReadOnly; }
sal_Bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
void GetCellChangeTrackNote( const ScAddress &cell,String &strTrackText,sal_Bool &pbLeftEdge);
-//-----IAccessibility2 Implementation 2009
SC_DLLPUBLIC sal_uLong GetCellCount() const; // alle Zellen
SCSIZE GetCellCount(SCTAB nTab, SCCOL nCol) const;
sal_uLong GetWeightedCount() const; // Formeln und Edit staerker gewichtet
@@ -482,9 +480,7 @@ public:
SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = NULL );
XColorListSharedPtr GetColorTable();
-//IAccessibility2 Implementation 2009-----
ScTable* GetTableByIndex(sal_Int32 nIndex);
-//-----IAccessibility2 Implementation 2009
SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager() const;
SC_DLLPUBLIC const ScDocOptions& GetDocOptions() const;
Modified: openoffice/branches/capstone2013/main/sc/inc/drwlayer.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/inc/drwlayer.hxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/inc/drwlayer.hxx (original)
+++ openoffice/branches/capstone2013/main/sc/inc/drwlayer.hxx Sat Nov 30 10:36:46 2013
@@ -230,10 +230,8 @@ public:
const Point& rWinPoint, const Window& rCmpWnd );
static ScMacroInfo* GetMacroInfo( SdrObject* pObj, sal_Bool bCreate = sal_False );
-//IAccessibility2 Implementation 2009-----
virtual ImageMap* GetImageMapForObject(SdrObject* pObj);
virtual sal_Int32 GetHyperlinkCount(SdrObject* pObj);
-//-----IAccessibility2 Implementation 2009
private:
static SfxObjectShell* pGlobalDrawPersist; // fuer AllocModel
Modified: openoffice/branches/capstone2013/main/sc/inc/sc.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/inc/sc.hrc?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/inc/sc.hrc (original)
+++ openoffice/branches/capstone2013/main/sc/inc/sc.hrc Sat Nov 30 10:36:46 2013
@@ -998,13 +998,11 @@
#define STR_ACC_DATAPILOT_DATA_DESCR (STR_START + 180)
#define STR_ACC_DATAPILOT_SEL_DESCR (STR_START + 181)
-//IAccessibility2 Implementation 2009-----
#define STR_ACC_TOOLBAR_FORMULA (STR_START + 182)
#define STR_ACC_DOC_SPREADSHEET (STR_START + 185)
#define STR_ACC_DOC_PREVIEW_SUFFIX (STR_START + 186)
#define STR_ACC_DOC_SPREADSHEET_READONLY (STR_START + 187)
-//-----IAccessibility2 Implementation 2009
// --------------------------------------------------
Modified: openoffice/branches/capstone2013/main/sc/inc/table.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/inc/table.hxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/inc/table.hxx (original)
+++ openoffice/branches/capstone2013/main/sc/inc/table.hxx Sat Nov 30 10:36:46 2013
@@ -938,10 +938,8 @@ private:
SCROW mnUBound;
};
-//IAccessibility2 Implementation 2009-----
public :
ScColumn* GetColumnByIndex(sal_Int32 index);
-//-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/capstone2013/main/sc/source/core/data/documen2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/source/core/data/documen2.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/source/core/data/documen2.cxx (original)
+++ openoffice/branches/capstone2013/main/sc/source/core/data/documen2.cxx Sat Nov 30 10:36:46 2013
@@ -87,11 +87,9 @@
#include "recursionhelper.hxx"
#include "lookupcache.hxx"
#include "externalrefmgr.hxx"
-//IAccessibility2 Implementation 2009-----
#include "appoptio.hxx"
#include "scmod.hxx"
#include "../../ui/inc/viewutil.hxx"
-//-----IAccessibility2 Implementation 2009
#include "tabprotection.hxx"
#include "formulaparserpool.hxx"
#include "clipparam.hxx"
@@ -216,15 +214,13 @@ ScDocument::ScDocument( ScDocumentMode e
eGrammar( formula::FormulaGrammar::GRAM_NATIVE ),
bStyleSheetUsageInvalid( sal_True ),
mbUndoEnabled( true ),
-//IAccessibility2 Implementation 2009-----
- bReadOnly(sal_False),
-//-----IAccessibility2 Implementation 2009
mbAdjustHeightEnabled( true ),
mbExecuteLinkEnabled( true ),
mbChangeReadOnlyEnabled( false ),
mbStreamValidLocked( false ),
mbIsTemporary(false), // #118840#
- mnNamedRangesLockCount( 0 )
+ mnNamedRangesLockCount( 0 ),
+ bReadOnly(sal_False)
{
SetStorageGrammar( formula::FormulaGrammar::GRAM_STORAGE_DEFAULT);
@@ -1303,7 +1299,6 @@ void ScDocument::ClearLookupCaches()
if( pLookupCacheMapImpl )
pLookupCacheMapImpl->clear();
}
-//IAccessibility2 Implementation 2009-----
sal_Bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder)
{
ScChangeTrack* pTrack = GetChangeTrack();
@@ -1457,4 +1452,3 @@ void ScDocument::GetCellChangeTrackNote(
}
}
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/capstone2013/main/sc/source/core/data/document.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/source/core/data/document.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/source/core/data/document.cxx (original)
+++ openoffice/branches/capstone2013/main/sc/source/core/data/document.cxx Sat Nov 30 10:36:46 2013
@@ -200,7 +200,6 @@ sal_Bool ScDocument::GetTable( const Str
return sal_False;
}
-//IAccessibility2 Implementation 2009-----
ScTable* ScDocument::GetTableByIndex(sal_Int32 nIndex)
{
if ( nIndex <= MAXTAB && nIndex >= 0)
@@ -208,7 +207,6 @@ ScTable* ScDocument::GetTableByIndex(sal
return NULL;
}
-//-----IAccessibility2 Implementation 2009
sal_Bool ScDocument::ValidTabName( const String& rName ) const
{
Modified: openoffice/branches/capstone2013/main/sc/source/core/data/drwlayer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/source/core/data/drwlayer.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/source/core/data/drwlayer.cxx (original)
+++ openoffice/branches/capstone2013/main/sc/source/core/data/drwlayer.cxx Sat Nov 30 10:36:46 2013
@@ -2027,7 +2027,6 @@ ScMacroInfo* ScDrawLayer::GetMacroInfo(
}
return 0;
}
-//IAccessibility2 Implementation 2009-----
ImageMap* ScDrawLayer::GetImageMapForObject(SdrObject* pObj)
{
ScIMapInfo* pIMapInfo = const_cast<ScIMapInfo*>( GetIMapInfo( pObj ) );
@@ -2047,7 +2046,6 @@ sal_Int32 ScDrawLayer::GetHyperlinkCount
nHLCount = 0; // pMacroInfo->GetHlink().getLength() > 0 ? 1 : 0;
return nHLCount;
}
-//-----IAccessibility2 Implementation 2009
void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist) // static
{
DBG_ASSERT(!pGlobalDrawPersist,"SetGlobalDrawPersist mehrfach");
Modified: openoffice/branches/capstone2013/main/sc/source/core/data/table2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/source/core/data/table2.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/source/core/data/table2.cxx (original)
+++ openoffice/branches/capstone2013/main/sc/source/core/data/table2.cxx Sat Nov 30 10:36:46 2013
@@ -3308,7 +3308,6 @@ sal_uLong ScTable::GetColOffset( SCCOL n
return n;
}
-//IAccessibility2 Implementation 2009-----
ScColumn* ScTable::GetColumnByIndex(sal_Int32 index)
{
if( index <= MAXCOL && index >= 0 )
@@ -3317,5 +3316,4 @@ ScColumn* ScTable::GetColumnByIndex(sal_
}
return NULL;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/capstone2013/main/sc/source/core/tool/detfunc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/source/core/tool/detfunc.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/source/core/tool/detfunc.cxx (original)
+++ openoffice/branches/capstone2013/main/sc/source/core/tool/detfunc.cxx Sat Nov 30 10:36:46 2013
@@ -1706,10 +1706,8 @@ sal_Bool ScDetectiveFunc::IsColorsInitia
return bColorsInitialized;
}
-//IAccessibility2 Implementation 2009-----
void ScDetectiveFunc::AppendChangTrackNoteSeparator(String &aDisplay)
{
aDisplay.AppendAscii( RTL_CONSTASCII_STRINGPARAM("\n--------\n") );
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/capstone2013/main/sc/source/filter/excel/xecontent.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/source/filter/excel/xecontent.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/source/filter/excel/xecontent.cxx (original)
+++ openoffice/branches/capstone2013/main/sc/source/filter/excel/xecontent.cxx Sat Nov 30 10:36:46 2013
@@ -526,7 +526,7 @@ void XclExpHyperlink::SaveXml( XclExpXml
OUString sId = rStrm.addRelation( rStrm.GetCurrentStream()->getOutputStream(),
XclXmlUtils::ToOUString( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink" ),
msTarget,
- XclXmlUtils::ToOUString( "External" ) );
+ true );
rStrm.GetCurrentStream()->singleElement( XML_hyperlink,
XML_ref, XclXmlUtils::ToOString( maScPos ).getStr(),
FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(),
Modified: openoffice/branches/capstone2013/main/sc/source/filter/excel/xestream.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/source/filter/excel/xestream.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/source/filter/excel/xestream.cxx (original)
+++ openoffice/branches/capstone2013/main/sc/source/filter/excel/xestream.cxx Sat Nov 30 10:36:46 2013
@@ -961,7 +961,7 @@ sax_fastparser::FSHelperPtr& XclExpXmlSt
// OOXTODO: XML_theme, index into <clrScheme/>
// OOXTODO: XML_tint, double
FSEND );
- lcl_WriteValue( rStream, XML_sz, OString::valueOf( (double) (rFontData.mnHeight / 20.0) ) ); // Twips->Pt
+ lcl_WriteValue( rStream, XML_sz, OString::valueOf( (double) (rFontData.mnHeight / 20.0) ).getStr() ); // Twips->Points
lcl_WriteValue( rStream, XML_u, bHaveUnderline ? pUnderline : NULL );
lcl_WriteValue( rStream, XML_vertAlign, bHaveVertAlign ? pVertAlign : NULL );
Modified: openoffice/branches/capstone2013/main/sc/source/ui/Accessibility/AccessibleCell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/source/ui/Accessibility/AccessibleCell.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/source/ui/Accessibility/AccessibleCell.cxx (original)
+++ openoffice/branches/capstone2013/main/sc/source/ui/Accessibility/AccessibleCell.cxx Sat Nov 30 10:36:46 2013
@@ -40,9 +40,7 @@
#include "editsrc.hxx"
#include "dociter.hxx"
#include "cell.hxx"
-//IAccessibility2 Implementation 2009-----
#include "validat.hxx"
-//-----IAccessibility2 Implementation 2009
#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX
#include <unotools/accessiblestatesethelper.hxx>
#endif
@@ -60,9 +58,7 @@
#include <comphelper/sequence.hxx>
#include <float.h>
-//IAccessibility2 Implementation 2009-----
#include "AccessibleSpreadsheet.hxx"
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -245,7 +241,6 @@ uno::Reference<XAccessibleStateSet> SAL_
pStateSet->AddState(AccessibleStateType::DEFUNC);
else
{
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
pStateSet->AddState(AccessibleStateType::ENABLED);
@@ -263,7 +258,6 @@ uno::Reference<XAccessibleStateSet> SAL_
pStateSet->AddState(AccessibleStateType::VISIBLE);
return pStateSet;
}
-//-----IAccessibility2 Implementation 2009
if (IsEditable(xParentStates))
{
pStateSet->AddState(AccessibleStateType::EDITABLE);
@@ -272,9 +266,7 @@ uno::Reference<XAccessibleStateSet> SAL_
pStateSet->AddState(AccessibleStateType::ENABLED);
pStateSet->AddState(AccessibleStateType::MULTI_LINE);
pStateSet->AddState(AccessibleStateType::MULTI_SELECTABLE);
-//IAccessibility2 Implementation 2009-----
pStateSet->AddState(AccessibleStateType::FOCUSABLE);
-//-----IAccessibility2 Implementation 2009
if (IsOpaque(xParentStates))
pStateSet->AddState(AccessibleStateType::OPAQUE);
pStateSet->AddState(AccessibleStateType::SELECTABLE);
@@ -371,7 +363,6 @@ sal_Bool ScAccessibleCell::IsOpaque(
sal_Bool ScAccessibleCell::IsSelected()
{
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
const ScAccessibleSpreadsheet *pSheet =static_cast<const ScAccessibleSpreadsheet*>(mxParent.get());
@@ -381,7 +372,6 @@ sal_Bool ScAccessibleCell::IsSelected()
}
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
sal_Bool bResult(sal_False);
if (mpViewShell && mpViewShell->GetViewData())
{
@@ -401,12 +391,10 @@ ScDocument* ScAccessibleCell::GetDocumen
::std::auto_ptr< SvxEditSource > ScAccessibleCell::CreateEditSource(ScTabViewShell* pViewShell, ScAddress aCell, ScSplitPos eSplitPos)
{
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
return ::std::auto_ptr< SvxEditSource >();
}
-//-----IAccessibility2 Implementation 2009
::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData
( new ScAccessibleCellTextData( pViewShell, aCell, eSplitPos, this ) );
::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessibleCellTextData));
@@ -497,7 +485,6 @@ void ScAccessibleCell::AddRelation(const
pRelationSet->AddRelation(aRelation);
}
}
-//IAccessibility2 Implementation 2009-----
::rtl::OUString ReplaceOneChar(::rtl::OUString oldOUString, ::rtl::OUString replacedChar, ::rtl::OUString replaceStr)
{
int iReplace = -1;
@@ -591,7 +578,6 @@ sal_Bool ScAccessibleCell::IsDropdown()
sal_uInt16 nPosX = maCellAddress.Col();
sal_uInt16 nPosY = sal_uInt16(maCellAddress.Row());
sal_uInt16 nTab = maCellAddress.Tab();
- //IAccessibility2 Implementation 2009-----
sal_uInt32 nValidation = static_cast< const SfxUInt32Item* >( mpDoc->GetAttr( nPosX, nPosY, nTab, ATTR_VALIDDATA ) )->GetValue();
if( nValidation )
{
@@ -599,7 +585,6 @@ sal_Bool ScAccessibleCell::IsDropdown()
if( pData && pData->HasSelectionList() )
return sal_True;
}
- //-----IAccessibility2 Implementation 2009
ScMergeFlagAttr* pAttr;
pAttr = (ScMergeFlagAttr*)mpDoc->GetAttr( nPosX, nPosY, nTab, ATTR_MERGE_FLAG );
if( pAttr->HasAutoFilter() )
@@ -639,4 +624,3 @@ sal_Bool ScAccessibleCell::IsDropdown()
}
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/capstone2013/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx?rev=1546716&r1=1546715&r2=1546716&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx (original)
+++ openoffice/branches/capstone2013/main/sc/source/ui/Accessibility/AccessibleCellBase.cxx Sat Nov 30 10:36:46 2013
@@ -38,10 +38,8 @@
#include "sc.hrc"
#endif
#include "unonames.hxx"
-//IAccessibility2 Implementation 2009-----
#include "detfunc.hxx"
#include "chgtrack.hxx"
-//-----IAccessibility2 Implementation 2009
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#endif
@@ -55,11 +53,9 @@
#include <rtl/uuid.h>
#include <comphelper/sequence.hxx>
#include <sfx2/objsh.hxx>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/sheet/XSheetAnnotation.hpp>
#include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp>
#include <com/sun/star/text/XSimpleText.hpp>
-//-----IAccessibility2 Implementation 2009
#include <float.h>
@@ -234,8 +230,6 @@ sal_Int32
ScAccessibleCellBase::createAccessibleName(void)
throw (uno::RuntimeException)
{
-//IAccessibility2 Implementation 2009-----
- //String sName( ScResId(STR_ACC_CELL_NAME) );
String sAddress;
// Document not needed, because only the cell address, but not the tablename is needed
// always us OOO notation
@@ -244,10 +238,7 @@ sal_Int32
/* #i65103# ZoomText merges cell address and contents, e.g. if value 2 is
contained in cell A1, ZT reads "cell A twelve" instead of "cell A1 - 2".
Simple solution: Append a space character to the cell address. */
- //sName.Append( ' ' );
- //return rtl::OUString(sName);
return rtl::OUString(sAddress);
-//-----IAccessibility2 Implementation 2009
}
//===== XAccessibleValue ================================================
@@ -260,14 +251,11 @@ uno::Any SAL_CALL
IsObjectValid();
uno::Any aAny;
if (mpDoc)
-//IAccessibility2 Implementation 2009-----
- //aAny <<= mpDoc->GetValue(maCellAddress);
{
String valStr;
mpDoc->GetString(maCellAddress.Col(),maCellAddress.Row(),maCellAddress.Tab(), valStr);
aAny <<= rtl::OUString(valStr);
}
-//-----IAccessibility2 Implementation 2009
return aAny;
}
@@ -356,7 +344,6 @@ sal_Bool ScAccessibleCellBase::IsEditabl
bEditable = sal_True;
return bEditable;
}
-//IAccessibility2 Implementation 2009-----
::rtl::OUString SAL_CALL ScAccessibleCellBase::GetNote(void)
throw (::com::sun::star::uno::RuntimeException)
{
@@ -657,4 +644,3 @@ sal_Bool ScAccessibleCellBase::IsEditabl
strNote += GetNote();
return strNote;
}
-//-----IAccessibility2 Implementation 2009