Author: hdu
Date: Wed Aug 21 11:13:45 2013
New Revision: 1516138
URL: http://svn.apache.org/r1516138
Log:
#i123068# remove more implicit conversions from rtl strings to their elements
also allow OSL_ENSURE with rtl::OString messages as they are frequently used
for dynamic error infos. It permits to keep these harmless lines unaltered.
Modified:
openoffice/branches/rejuvenate01/main/cli_ure/source/climaker/climaker_app.cxx
openoffice/branches/rejuvenate01/main/cli_ure/source/uno_bridge/cli_data.cxx
openoffice/branches/rejuvenate01/main/comphelper/source/misc/documentinfo.cxx
openoffice/branches/rejuvenate01/main/connectivity/source/commontools/parameters.cxx
openoffice/branches/rejuvenate01/main/connectivity/source/drivers/macab/MacabDriver.cxx
openoffice/branches/rejuvenate01/main/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
openoffice/branches/rejuvenate01/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
openoffice/branches/rejuvenate01/main/desktop/source/deployment/registry/dp_registry.cxx
openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx
openoffice/branches/rejuvenate01/main/embeddedobj/source/msole/olepersist.cxx
openoffice/branches/rejuvenate01/main/extensions/source/config/ldap/ldapaccess.cxx
openoffice/branches/rejuvenate01/main/extensions/source/propctrlr/propcontroller.cxx
openoffice/branches/rejuvenate01/main/filter/source/msfilter/msocximex.cxx
openoffice/branches/rejuvenate01/main/formula/source/ui/resource/ModuleHelper.cxx
openoffice/branches/rejuvenate01/main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
openoffice/branches/rejuvenate01/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
openoffice/branches/rejuvenate01/main/fpicker/source/win32/filepicker/filepickerstate.cxx
openoffice/branches/rejuvenate01/main/reportdesign/source/filter/xml/xmlControlProperty.cxx
openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx
openoffice/branches/rejuvenate01/main/sfx2/source/appl/shutdowniconunx.cxx
openoffice/branches/rejuvenate01/main/stoc/source/inspect/introspection.cxx
openoffice/branches/rejuvenate01/main/sw/source/core/swg/SwXMLTextBlocks1.cxx
openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unodraw.cxx
openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unoframe.cxx
openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unotext.cxx
openoffice/branches/rejuvenate01/main/tools/inc/tools/diagnose_ex.h
openoffice/branches/rejuvenate01/main/ucb/source/ucp/gvfs/gvfs_content.cxx
openoffice/branches/rejuvenate01/main/ucb/source/ucp/gvfs/gvfs_provider.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/generic/dtrans/X11_selection.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printer/cupsmgr.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/printerjob.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/psputil.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/psputil.hxx
openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkaction.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkimage.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atktable.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkwrapper.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkwrapper.hxx
openoffice/branches/rejuvenate01/main/vcl/unx/gtk/app/gtkdata.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/gtk/app/gtkinst.cxx
openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
Modified:
openoffice/branches/rejuvenate01/main/cli_ure/source/climaker/climaker_app.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cli_ure/source/climaker/climaker_app.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/cli_ure/source/climaker/climaker_app.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/cli_ure/source/climaker/climaker_app.cxx
Wed Aug 21 11:13:45 2013
@@ -567,7 +567,7 @@ SAL_IMPLEMENT_MAIN()
// setup assembly info: xxx todo set more? e.g. avoid strong versioning
AssemblyName * assembly_name = new AssemblyName();
assembly_name->set_CodeBase( output_dir );
- assembly_name->set_Name( name );
+ assembly_name->set_Name( name.getStr() );
if (kp != NULL)
assembly_name->set_KeyPair(kp);
Modified:
openoffice/branches/rejuvenate01/main/cli_ure/source/uno_bridge/cli_data.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cli_ure/source/uno_bridge/cli_data.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/cli_ure/source/uno_bridge/cli_data.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/cli_ure/source/uno_bridge/cli_data.cxx
Wed Aug 21 11:13:45 2013
@@ -598,7 +598,7 @@ System::String* mapPolymorphicName(Syste
index = cur;
if (bCliToUno)
{
- builder->Append(mapCliTypeName(sParam));
+ builder->Append( mapCliTypeName(sParam).getStr());
}
else
{
Modified:
openoffice/branches/rejuvenate01/main/comphelper/source/misc/documentinfo.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/comphelper/source/misc/documentinfo.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/comphelper/source/misc/documentinfo.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/comphelper/source/misc/documentinfo.cxx
Wed Aug 21 11:13:45 2013
@@ -182,7 +182,7 @@ namespace comphelper {
sMessage += "\nin function:\n";
sMessage += BOOST_CURRENT_FUNCTION;
sMessage += "\n";
- OSL_ENSURE( false, sMessage.getStr() );
+ OSL_ENSURE( false, sMessage );
}
return sTitle;
Modified:
openoffice/branches/rejuvenate01/main/connectivity/source/commontools/parameters.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/source/commontools/parameters.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/connectivity/source/commontools/parameters.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/connectivity/source/commontools/parameters.cxx
Wed Aug 21 11:13:45 2013
@@ -617,9 +617,9 @@ namespace dbtools
catch( const Exception& )
{
OSL_ENSURE( sal_False,
-
(::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail
parameter number " )
+
::rtl::OString( "ParameterManager::fillLinkedParameters: master-detail
parameter number " )
+=
::rtl::OString::valueOf( sal_Int32( *aPosition + 1 ) )
- += ::rtl::OString( " could not be filled!"
)).getStr() );
+ += ::rtl::OString( " could not be filled!" )
);
}
}
}
Modified:
openoffice/branches/rejuvenate01/main/connectivity/source/drivers/macab/MacabDriver.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/source/drivers/macab/MacabDriver.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/connectivity/source/drivers/macab/MacabDriver.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/connectivity/source/drivers/macab/MacabDriver.cxx
Wed Aug 21 11:13:45 2013
@@ -79,7 +79,7 @@ namespace
if ( !_rFunction )
{ // did not find the symbol
- OSL_ENSURE( false, (::rtl::OString(
"lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) +
::rtl::OString( _pAsciiSymbolName )).getStr() );
+ OSL_ENSURE( false, ::rtl::OString(
"lcl_getFunctionFromModuleOrUnload: could not find the symbol " ) +
::rtl::OString( _pAsciiSymbolName ) );
osl_unloadModule( _rModule );
_rModule = NULL;
}
Modified:
openoffice/branches/rejuvenate01/main/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
Wed Aug 21 11:13:45 2013
@@ -33,8 +33,7 @@ using namespace connectivity::mozab;
// -------------------------------------------------------------------------
void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString
&nss)
{
- // Convert to ::rtl::OString (utf-8 encoding).
- ::rtl::OString os(ous,ous.getLength(), RTL_TEXTENCODING_UTF8);
+ const ::rtl::OString os( rtl::OUStringToOString( ous,
RTL_TEXTENCODING_UTF8));
const char *cs = os.getStr();
PRUint32 csLen = os.getLength();
@@ -94,19 +93,14 @@ void MTypeConverter::prUnicharToOUString
// -------------------------------------------------------------------------
char *MTypeConverter::ouStringToCCharStringUtf8(::rtl::OUString const &ous)
{
- // Convert to ::rtl::OString,
- ::rtl::OString os(ous,ous.getLength(), RTL_TEXTENCODING_UTF8);
-
+ const ::rtl::OString os( rtl::OUStringToOString( ous,
RTL_TEXTENCODING_UTF8));
const char *cs = os.getStr();
-
return(strdup(cs));
}
// -------------------------------------------------------------------------
char *MTypeConverter::ouStringToCCharStringAscii(::rtl::OUString const &ous)
{
- // Convert ::rtl::OUString to ::rtl::OString,
- ::rtl::OString os(ous,ous.getLength(), RTL_TEXTENCODING_ASCII_US);
-
+ const ::rtl::OString os( rtl::OUStringToOString( ous,
RTL_TEXTENCODING_UTF8));
return(strdup(os.getStr()));
}
// -------------------------------------------------------------------------
@@ -120,8 +114,7 @@ char *MTypeConverter::nsStringToCCharStr
// -------------------------------------------------------------------------
::std::string MTypeConverter::ouStringToStlString(::rtl::OUString const &ous)
{
- // Convert ::rtl::OUString to ::rtl::OString.
- ::rtl::OString os(ous,ous.getLength(),RTL_TEXTENCODING_ASCII_US);
+ const ::rtl::OString os( rtl::OUStringToOString( ous,
RTL_TEXTENCODING_UTF8));
return( ::std::string(os.getStr()));
}
#if 0
Modified:
openoffice/branches/rejuvenate01/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
Wed Aug 21 11:13:45 2013
@@ -209,9 +209,9 @@ Any OXMLDataSourceSetting::convertString
#endif
rImporter.GetMM100UnitConverter().convertBool(bValue,
_rReadCharacters);
OSL_ENSURE(bSuccess,
-
(::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
+
::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
+=
::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(),
RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("\" into a
boolean!")).getStr());
+ += ::rtl::OString("\" into a boolean!"));
aReturn <<= bValue;
}
break;
@@ -224,9 +224,9 @@ Any OXMLDataSourceSetting::convertString
#endif
rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
-
(::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
+
::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
+=
::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(),
RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("\" into an
integer!")).getStr());
+ += ::rtl::OString("\" into an
integer!"));
if (TypeClass_SHORT ==
_rExpectedType.getTypeClass())
aReturn <<= (sal_Int16)nValue;
else
@@ -246,9 +246,9 @@ Any OXMLDataSourceSetting::convertString
#endif
rImporter.GetMM100UnitConverter().convertDouble(nValue,
_rReadCharacters);
OSL_ENSURE(bSuccess,
-
(::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
+
::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
+=
::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(),
RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("\" into a
double!")).getStr());
+ += ::rtl::OString("\" into a double!"));
aReturn <<= (double)nValue;
}
break;
Modified:
openoffice/branches/rejuvenate01/main/desktop/source/deployment/registry/dp_registry.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/deployment/registry/dp_registry.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/desktop/source/deployment/registry/dp_registry.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/desktop/source/deployment/registry/dp_registry.cxx
Wed Aug 21 11:13:45 2013
@@ -294,7 +294,7 @@ void PackageRegistryImpl::insertBackend(
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"!") );
OSL_ENSURE( 0, ::rtl::OUStringToOString(
buf.makeStringAndClear(),
- RTL_TEXTENCODING_UTF8 ).getStr() );
+ RTL_TEXTENCODING_UTF8 ) );
}
#endif
}
Modified:
openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/migration/wizard.cxx
Wed Aug 21 11:13:45 2013
@@ -110,7 +110,7 @@ ResMgr *FirstStartWizard::GetResManager(
if ( !FirstStartWizard::pResMgr )
{
String aMgrName = String::CreateFromAscii( "dkt" );
- FirstStartWizard::pResMgr = ResMgr::CreateResMgr( OUStringToOString(
aMgrName, RTL_TEXTENCODING_UTF8 ).getStr() );
+ FirstStartWizard::pResMgr = ResMgr::CreateResMgr( OUStringToOString(
aMgrName, RTL_TEXTENCODING_UTF8 ));
}
return FirstStartWizard::pResMgr;
}
Modified:
openoffice/branches/rejuvenate01/main/embeddedobj/source/msole/olepersist.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/embeddedobj/source/msole/olepersist.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/embeddedobj/source/msole/olepersist.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/embeddedobj/source/msole/olepersist.cxx
Wed Aug 21 11:13:45 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/rejuvenate01/main/extensions/source/config/ldap/ldapaccess.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/extensions/source/config/ldap/ldapaccess.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/extensions/source/config/ldap/ldapaccess.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/extensions/source/config/ldap/ldapaccess.cxx
Wed Aug 21 11:13:45 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/rejuvenate01/main/extensions/source/propctrlr/propcontroller.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/extensions/source/propctrlr/propcontroller.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/extensions/source/propctrlr/propcontroller.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/extensions/source/propctrlr/propcontroller.cxx
Wed Aug 21 11:13:45 2013
@@ -1259,7 +1259,7 @@ namespace pcr
::rtl::OString sMessage(
"OPropertyBrowserController::UpdateUI: empty category provided for property '"
);
sMessage += ::rtl::OString(
property->second.Name.getStr(), property->second.Name.getLength(),
osl_getThreadTextEncoding() );
sMessage += "'!";
- OSL_ENSURE( false, sMessage.getStr() );
+ OSL_ENSURE( false, sMessage );
}
#endif
// finally insert this property control
Modified:
openoffice/branches/rejuvenate01/main/filter/source/msfilter/msocximex.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/filter/source/msfilter/msocximex.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/filter/source/msfilter/msocximex.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/filter/source/msfilter/msocximex.cxx
Wed Aug 21 11:13:45 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/rejuvenate01/main/formula/source/ui/resource/ModuleHelper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/formula/source/ui/resource/ModuleHelper.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/formula/source/ui/resource/ModuleHelper.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/formula/source/ui/resource/ModuleHelper.cxx
Wed Aug 21 11:13:45 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/rejuvenate01/main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx
Wed Aug 21 11:13:45 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/rejuvenate01/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
Wed Aug 21 11:13:45 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/rejuvenate01/main/fpicker/source/win32/filepicker/filepickerstate.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/fpicker/source/win32/filepicker/filepickerstate.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/fpicker/source/win32/filepicker/filepickerstate.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/fpicker/source/win32/filepicker/filepickerstate.cxx
Wed Aug 21 11:13:45 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/rejuvenate01/main/reportdesign/source/filter/xml/xmlControlProperty.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/reportdesign/source/filter/xml/xmlControlProperty.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/reportdesign/source/filter/xml/xmlControlProperty.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/reportdesign/source/filter/xml/xmlControlProperty.cxx
Wed Aug 21 11:13:45 2013
@@ -206,9 +206,9 @@ Any OXMLControlProperty::convertString(c
#endif
rImporter.GetMM100UnitConverter().convertBool(bValue,
_rReadCharacters);
OSL_ENSURE(bSuccess,
-
(::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
+
::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
+=
::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(),
RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("\" into a
boolean!")).getStr());
+ += ::rtl::OString("\" into a boolean!"));
aReturn <<= bValue;
}
break;
@@ -221,9 +221,9 @@ Any OXMLControlProperty::convertString(c
#endif
rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
-
(::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
+
::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
+=
::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(),
RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("\" into an
integer!")).getStr());
+ += ::rtl::OString("\" into an
integer!"));
if (TypeClass_SHORT ==
_rExpectedType.getTypeClass())
aReturn <<= (sal_Int16)nValue;
else
@@ -243,9 +243,9 @@ Any OXMLControlProperty::convertString(c
#endif
rImporter.GetMM100UnitConverter().convertDouble(nValue,
_rReadCharacters);
OSL_ENSURE(bSuccess,
-
(::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
+
::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
+=
::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(),
RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("\" into a
double!")).getStr());
+ += ::rtl::OString("\" into a double!"));
aReturn <<= (double)nValue;
}
break;
@@ -274,9 +274,9 @@ Any OXMLControlProperty::convertString(c
#endif
rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
-
(::rtl::OString("OPropertyImport::convertString: could not convert \"")
+
::rtl::OString("OPropertyImport::convertString: could not convert \"")
+=
::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(),
RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("\" into
a double!")).getStr());
+ += ::rtl::OString("\" into
a double!"));
// then convert it into the target type
switch (nType)
Modified: openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sal/inc/rtl/string.hxx Wed Aug 21
11:13:45 2013
@@ -965,6 +965,10 @@ struct CStringHash
} /* Namespace */
+/* Helper method to support OString messages in OSL_ENSURE */
+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()); }
+
#endif /* __cplusplus */
#endif /* _RTL_STRING_HXX_ */
Modified:
openoffice/branches/rejuvenate01/main/sfx2/source/appl/shutdowniconunx.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/appl/shutdowniconunx.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/appl/shutdowniconunx.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/appl/shutdowniconunx.cxx
Wed Aug 21 11:13:45 2013
@@ -176,7 +176,7 @@ static void add_item( GtkMenuShell *pMen
GtkWidget *pImage = gtk_image_new_from_pixbuf( pPixbuf );
g_object_unref( G_OBJECT( pPixbuf ) );
- GtkWidget *pMenuItem = gtk_image_menu_item_new_with_label( aLabel );
+ GtkWidget* pMenuItem = gtk_image_menu_item_new_with_label(
aLabel.getStr() );
gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM( pMenuItem ), pImage
);
g_signal_connect_data( pMenuItem, "activate", pFnCallback, pURL,
oustring_delete,
GConnectFlags(0));
@@ -224,11 +224,9 @@ add_image_menu_item( GtkMenuShell *pMenu
{
OString aUtfLabel = rtl::OUStringToOString (aLabel,
RTL_TEXTENCODING_UTF8 );
- GtkWidget *pImage;
- pImage = gtk_image_new_from_stock( stock_id, GTK_ICON_SIZE_MENU );
+ GtkWidget* pImage = gtk_image_new_from_stock( stock_id,
GTK_ICON_SIZE_MENU );
- GtkWidget *pMenuItem;
- pMenuItem = gtk_image_menu_item_new_with_label( aUtfLabel );
+ GtkWidget* pMenuItem = gtk_image_menu_item_new_with_label(
aUtfLabel.getStr() );
gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM( pMenuItem ), pImage
);
gtk_menu_shell_append( pMenuShell, pMenuItem );
Modified:
openoffice/branches/rejuvenate01/main/stoc/source/inspect/introspection.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/stoc/source/inspect/introspection.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/stoc/source/inspect/introspection.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/stoc/source/inspect/introspection.cxx
Wed Aug 21 11:13:45 2013
@@ -2304,9 +2304,9 @@ IntrospectionAccessStatic_Impl* ImplIntr
else
{
OSL_ENSURE( sal_False,
- (::rtl::OString(
"Introspection: Property \"" ) +
+ ::rtl::OString( "Introspection:
Property \"" ) +
::rtl::OUStringToOString(
aPropName, RTL_TEXTENCODING_ASCII_US ) +
- ::rtl::OString( "\" found more than once in
PropertySet" )).getStr() );
+ ::rtl::OString( "\" found more than once in
PropertySet" ) );
}
// Count pflegen
Modified:
openoffice/branches/rejuvenate01/main/sw/source/core/swg/SwXMLTextBlocks1.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/swg/SwXMLTextBlocks1.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/sw/source/core/swg/SwXMLTextBlocks1.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/sw/source/core/swg/SwXMLTextBlocks1.cxx
Wed Aug 21 11:13:45 2013
@@ -70,7 +70,7 @@ sal_uLong SwXMLTextBlocks::GetDoc( sal_u
try
{
xRoot = xBlkRoot->openStorageElement( aFolderName,
embed::ElementModes::READ );
- xMedium = new SfxMedium(xRoot, GetBaseURL(), S2U("writer8"));
+ xMedium = new SfxMedium(xRoot, GetBaseURL(),
OUString::createFromAscii("writer8"));
SwReader aReader(*xMedium,aFolderName, pDoc );
ReadXML->SetBlockMode( sal_True );
aReader.Read( *ReadXML );
Modified:
openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unodraw.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unodraw.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unodraw.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unodraw.cxx
Wed Aug 21 11:13:45 2013
@@ -2068,7 +2068,7 @@ void SwXShape::attach(const uno::Referen
{
uno::Any aPos;
aPos <<= xTextRange;
- setPropertyValue(S2U("TextRange"), aPos);
+ setPropertyValue( C2U("TextRange"), aPos);
uno::Reference< drawing::XShape > xTemp( (cppu::OWeakObject*)
this, uno::UNO_QUERY );
xDP->add( xTemp );
}
Modified:
openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unoframe.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unoframe.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unoframe.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unoframe.cxx
Wed Aug 21 11:13:45 2013
@@ -2593,7 +2593,7 @@ uno::Reference< text::XTextCursor > SwX
if(!pNewStartNode || pNewStartNode != pOwnStartNode)
{
uno::RuntimeException aExcept;
- aExcept.Message = S2U("no text available");
+ aExcept.Message = C2U("no text available");
throw aExcept;
}
Modified:
openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unotext.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unotext.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unotext.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/sw/source/core/unocore/unotext.cxx
Wed Aug 21 11:13:45 2013
@@ -2874,7 +2874,7 @@ SwXHeadFootText::createTextCursor() thro
if (!pNewStartNode || (pNewStartNode != pOwnStartNode))
{
uno::RuntimeException aExcept;
- aExcept.Message = S2U("no text available");
+ aExcept.Message = C2U("no text available");
throw aExcept;
}
xRet = static_cast<text::XWordCursor*>(pXCursor);
Modified: openoffice/branches/rejuvenate01/main/tools/inc/tools/diagnose_ex.h
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/tools/inc/tools/diagnose_ex.h?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/tools/inc/tools/diagnose_ex.h
(original)
+++ openoffice/branches/rejuvenate01/main/tools/inc/tools/diagnose_ex.h Wed Aug
21 11:13:45 2013
@@ -70,7 +70,7 @@
sMessage += pContext; \
} \
sMessage += "\n"; \
- OSL_ENSURE( false, sMessage.getStr() )
+ OSL_ENSURE( false, sMessage )
#else // OSL_DEBUG_LEVEL
Modified:
openoffice/branches/rejuvenate01/main/ucb/source/ucp/gvfs/gvfs_content.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/ucb/source/ucp/gvfs/gvfs_content.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/ucb/source/ucp/gvfs/gvfs_content.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/ucb/source/ucp/gvfs/gvfs_content.cxx
Wed Aug 21 11:13:45 2013
@@ -98,7 +98,7 @@ static char *
OUStringToGnome( const rtl::OUString &str )
{
rtl::OString aTempStr = rtl::OUStringToOString( str, RTL_TEXTENCODING_UTF8
);
- return g_strdup( (const sal_Char *) aTempStr );
+ return g_strdup( aTempStr.getStr() );
}
static rtl::OUString
@@ -403,7 +403,7 @@ uno::Any SAL_CALL Content::execute(
aCommand.Argument >>= bDeletePhysical;
::rtl::OString aURI = getOURI();
- GnomeVFSResult result = gnome_vfs_unlink ((const sal_Char *) aURI);
+ GnomeVFSResult result = gnome_vfs_unlink( aURI.getStr());
if (result != GNOME_VFS_OK)
cancelCommandExecution( result, xEnv, sal_True );
@@ -554,8 +554,7 @@ rtl::OUString Content::getParentURL()
#ifdef DEBUG
g_warning ("getParentURL '%s' -> '%s'",
- getURI(), (const sal_Char *) rtl::OUStringToOString
- ( aParentURL, RTL_TEXTENCODING_UTF8 ) );
+ getURI(), rtl::OUStringToOString( aParentURL,
RTL_TEXTENCODING_UTF8).getStr() );
#endif
return aParentURL;
@@ -633,8 +632,7 @@ uno::Reference< sdbc::XRow > Content::ge
GnomeVFSFileInfo* fileInfo = gnome_vfs_file_info_new ();
::rtl::OString aURI = getOURI();
- gnome_vfs_get_file_info
- ( (const sal_Char *)aURI, fileInfo,
+ gnome_vfs_get_file_info( aURI.getStr(), fileInfo,
GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS );
if (fileInfo->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_ACCESS) {
@@ -735,7 +733,7 @@ Content::doSetFileInfo( const GnomeVFSFi
// The simple approach:
if( setMask != GNOME_VFS_SET_FILE_INFO_NONE )
result = gnome_vfs_set_file_info // missed a const in the API there
- ( (const sal_Char *) aURI, (GnomeVFSFileInfo *)newInfo, setMask );
+ ( aURI.getStr(), (GnomeVFSFileInfo *)newInfo, setMask );
if ( result == GNOME_VFS_ERROR_NOT_SUPPORTED &&
( setMask & GNOME_VFS_SET_FILE_INFO_NAME ) ) {
@@ -746,7 +744,7 @@ Content::doSetFileInfo( const GnomeVFSFi
char *newURI = OUStringToGnome( makeNewURL( newInfo->name ) );
- result = gnome_vfs_move ((const sal_Char *)aURI, newURI, FALSE);
+ result = gnome_vfs_move( aURI.getStr(), newURI, FALSE);
g_free (newURI);
}
@@ -958,7 +956,7 @@ void Content::insert(
#ifdef DEBUG
g_warning ("Make directory");
#endif
- result = gnome_vfs_make_directory( (const sal_Char *) aURI, perm );
+ result = gnome_vfs_make_directory( aURI.getStr(), perm );
if( result != GNOME_VFS_OK )
cancelCommandExecution( result, xEnv, sal_True );
@@ -982,7 +980,7 @@ void Content::insert(
result = GNOME_VFS_OK;
if ( bReplaceExisting ) {
Authentication aAuth( xEnv );
- result = gnome_vfs_open( &handle, (const sal_Char *)aURI,
+ result = gnome_vfs_open( &handle, aURI.getStr(),
GNOME_VFS_OPEN_WRITE );
}
@@ -994,7 +992,7 @@ void Content::insert(
( GNOME_VFS_PERM_GROUP_WRITE | GNOME_VFS_PERM_GROUP_READ ) );
result = gnome_vfs_create
- ( &handle, (const sal_Char *)aURI, GNOME_VFS_OPEN_WRITE, TRUE,
perm );
+ ( &handle, aURI.getStr(), GNOME_VFS_OPEN_WRITE, TRUE, perm );
}
if( result != GNOME_VFS_OK )
@@ -1134,7 +1132,7 @@ Content::getInfo( const uno::Reference<
::rtl::OString aURI = getOURI();
Authentication aAuth( xEnv );
result = gnome_vfs_get_file_info
- ( (const sal_Char *)aURI, &m_info, GNOME_VFS_FILE_INFO_DEFAULT );
+ ( aURI.getStr(), &m_info, GNOME_VFS_FILE_INFO_DEFAULT );
if (result != GNOME_VFS_OK)
gnome_vfs_file_info_clear( &m_info );
} else
@@ -1453,8 +1451,7 @@ Content::createTempStream(
if ( !xTempOut.is() )
cancelCommandExecution( GNOME_VFS_ERROR_IO, xEnv );
- result = gnome_vfs_open
- ( &handle, (const sal_Char *)aURI, GNOME_VFS_OPEN_READ );
+ result = gnome_vfs_open( &handle, aURI.getStr(), GNOME_VFS_OPEN_READ );
if (result != GNOME_VFS_OK)
cancelCommandExecution( result, xEnv );
@@ -1482,8 +1479,7 @@ Content::createInputStream(
if ( !(m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) )
return createTempStream( xEnv );
- result = gnome_vfs_open
- ( &handle, (const sal_Char *)aURI,
+ result = gnome_vfs_open( &handle, aURI.getStr(),
(GnomeVFSOpenMode) (GNOME_VFS_OPEN_READ | GNOME_VFS_OPEN_RANDOM ) );
if (result == GNOME_VFS_ERROR_INVALID_OPEN_MODE ||
Modified:
openoffice/branches/rejuvenate01/main/ucb/source/ucp/gvfs/gvfs_provider.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/ucb/source/ucp/gvfs/gvfs_provider.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/ucb/source/ucp/gvfs/gvfs_provider.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/ucb/source/ucp/gvfs/gvfs_provider.cxx
Wed Aug 21 11:13:45 2013
@@ -108,8 +108,7 @@ ContentProvider::queryContent(
{
#ifdef DEBUG
g_warning ("QueryContent: '%s'",
- (const sal_Char *)rtl::OUStringToOString
- (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8));
+ rtl::OUStringToOString(Identifier->getContentIdentifier(),
RTL_TEXTENCODING_UTF8).getStr());
#endif
osl::MutexGuard aGuard( m_aMutex );
Modified:
openoffice/branches/rejuvenate01/main/vcl/unx/generic/dtrans/X11_selection.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/generic/dtrans/X11_selection.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/vcl/unx/generic/dtrans/X11_selection.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/vcl/unx/generic/dtrans/X11_selection.cxx
Wed Aug 21 11:13:45 2013
@@ -740,7 +740,7 @@ Atom SelectionManager::getAtom( const OU
if( ( it = m_aStringToAtom.find( rString ) ) == m_aStringToAtom.end() )
{
static Atom nNoDisplayAtoms = 1;
- Atom aAtom = m_pDisplay ? XInternAtom( m_pDisplay,
OUStringToOString( rString, RTL_TEXTENCODING_ISO_8859_1 ), False ) :
nNoDisplayAtoms++;
+ Atom aAtom = m_pDisplay ? XInternAtom( m_pDisplay,
OUStringToOString( rString, RTL_TEXTENCODING_ISO_8859_1).getStr(), False ) :
nNoDisplayAtoms++;
m_aStringToAtom[ rString ] = aAtom;
m_aAtomToString[ aAtom ] = rString;
}
Modified:
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printer/cupsmgr.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/generic/printer/cupsmgr.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/generic/printer/cupsmgr.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/generic/printer/cupsmgr.cxx
Wed Aug 21 11:13:45 2013
@@ -274,7 +274,7 @@ struct GetPPDAttribs
{
// This CUPS method is not at all thread-safe we need
// to dup the pointer to a static buffer it returns ASAP
- OString aResult = m_pFunction( m_aParameter );
+ OString aResult = m_pFunction( m_aParameter.getStr() );
MutexGuard aGuard( *m_pSyncMutex );
m_aResult = aResult;
m_aCondition.set();
@@ -289,9 +289,7 @@ struct GetPPDAttribs
)
{
#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, "cupsGetPPD %s timed out\n",
- (const sal_Char *) m_aParameter
- );
+ fprintf( stderr, "cupsGetPPD %s timed out\n",
m_aParameter.getStr());
#endif
}
m_pSyncMutex->acquire();
Modified:
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/printerjob.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/printerjob.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/printerjob.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/printerjob.cxx
Wed Aug 21 11:13:45 2013
@@ -361,7 +361,7 @@ getLocalTime(sal_Char* pBuffer)
static bool isAscii( const rtl::OUString& rStr )
{
- const sal_Unicode* pStr = rStr;
+ const sal_Unicode* pStr = rStr.getStr();
sal_Int32 nLen = rStr.getLength();
for( sal_Int32 i = 0; i < nLen; i++ )
if( pStr[i] > 127 )
Modified:
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/psputil.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/psputil.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/psputil.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/psputil.cxx
Wed Aug 21 11:13:45 2013
@@ -181,7 +181,7 @@ WritePS (osl::File* pFile, const rtl::OS
sal_uInt64 nOutLength = 0;
if (nInLength > 0 && pFile)
- pFile->write (rString, nInLength, nOutLength);
+ pFile->write( rString.getStr(), nInLength, nOutLength);
return nInLength == nOutLength;
}
Modified:
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/psputil.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/psputil.hxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/psputil.hxx
(original)
+++
openoffice/branches/rejuvenate01/main/vcl/unx/generic/printergfx/psputil.hxx
Wed Aug 21 11:13:45 2013
@@ -45,6 +45,7 @@ sal_Int32 getAlignedHexValueOf (sal_In
sal_Int32 getValueOf (sal_Int32 nValue, sal_Char* pBuffer);
sal_Int32 appendStr (const sal_Char* pSrc, sal_Char* pDst);
sal_Int32 appendStr (const sal_Char* pSrc, sal_Char* pDst, sal_Int32
nBytes);
+inline sal_Int32 appendStr( const ::rtl::OString& rSrc, sal_Char* pDst) {
return appendStr( rSrc.getStr(), pDst);}
sal_Bool WritePS (osl::File* pFile, const sal_Char* pString);
sal_Bool WritePS (osl::File* pFile, const sal_Char* pString, sal_uInt64
nInLength);
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkaction.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkaction.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkaction.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkaction.cxx Wed
Aug 21 11:13:45 2013
@@ -49,7 +49,7 @@ getAsConst( const rtl::OString& rString
static int nIdx = 0;
nIdx = (nIdx + 1) % nMax;
aUgly[nIdx] = rString;
- return aUgly[ nIdx ];
+ return aUgly[ nIdx ].getStr();
}
static accessibility::XAccessibleAction*
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkimage.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkimage.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkimage.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkimage.cxx Wed Aug
21 11:13:45 2013
@@ -41,7 +41,7 @@ getAsConst( rtl::OUString rString )
static int nIdx = 0;
nIdx = (nIdx + 1) % nMax;
aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
- return aUgly[ nIdx ];
+ return aUgly[ nIdx ].getStr();
}
static accessibility::XAccessibleImage*
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atktable.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atktable.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atktable.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atktable.cxx Wed Aug
21 11:13:45 2013
@@ -58,7 +58,7 @@ getAsConst( rtl::OUString rString )
static int nIdx = 0;
nIdx = (nIdx + 1) % nMax;
aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
- return aUgly[ nIdx ];
+ return aUgly[ nIdx ].getStr();
}
/*****************************************************************************/
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkwrapper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkwrapper.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkwrapper.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkwrapper.cxx Wed
Aug 21 11:13:45 2013
@@ -784,7 +784,7 @@ ensureTypeFor( uno::XInterface *pAccessi
// pAccessible, aTypeTable[i].name, bTypes[i] );
}
- GType nType = g_type_from_name( aTypeName );
+ GType nType = g_type_from_name( aTypeName.getStr() );
if( nType == G_TYPE_INVALID )
{
GTypeInfo aTypeInfo = {
@@ -794,7 +794,7 @@ ensureTypeFor( uno::XInterface *pAccessi
0, NULL, NULL
} ;
nType = g_type_register_static( ATK_TYPE_OBJECT_WRAPPER,
- aTypeName, &aTypeInfo, (GTypeFlags)0 )
;
+ aTypeName.getStr(), &aTypeInfo,
(GTypeFlags)0 ) ;
for( int j = 0; j < aTypeTableSize; j++ )
if( bTypes[j] )
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkwrapper.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkwrapper.hxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkwrapper.hxx
(original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/gtk/a11y/atkwrapper.hxx Wed
Aug 21 11:13:45 2013
@@ -113,7 +113,7 @@ static inline gchar *
OUStringToGChar(const rtl::OUString& rString )
{
rtl::OString aUtf8 = rtl::OUStringToOString( rString,
RTL_TEXTENCODING_UTF8 );
- return g_strdup( aUtf8 );
+ return g_strdup( aUtf8.getStr() );
}
#define OUStringToConstGChar( string ) rtl::OUStringToOString( string,
RTL_TEXTENCODING_UTF8 ).getStr()
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/gtk/app/gtkdata.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/gtk/app/gtkdata.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/gtk/app/gtkdata.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/gtk/app/gtkdata.cxx Wed Aug
21 11:13:45 2013
@@ -638,7 +638,7 @@ void GtkXLib::Init()
if( aAppName.getLength() > 0 )
{
rtl::OString aPrgName = rtl::OUStringToOString(aAppName, aEnc);
- g_set_prgname(aPrgName);
+ g_set_prgname( aPrgName.getStr());
}
// init gtk/gdk
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/gtk/app/gtkinst.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/gtk/app/gtkinst.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/gtk/app/gtkinst.cxx (original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/gtk/app/gtkinst.cxx Wed Aug
21 11:13:45 2013
@@ -231,7 +231,7 @@ void GtkInstance::AddToRecentDocumentLis
}
#if GTK_CHECK_VERSION(2,10,0)
GtkRecentManager *manager = gtk_recent_manager_get_default ();
- gtk_recent_manager_add_item (manager, sGtkURL);
+ gtk_recent_manager_add_item( manager, sGtkURL.getStr());
(void)rMimeType;
#else
static getDefaultFnc sym_gtk_recent_manager_get_default =
Modified: openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/vcl/unx/gtk/window/gtkframe.cxx Wed
Aug 21 11:13:45 2013
@@ -984,7 +984,7 @@ void GtkSalFrame::SetExtendedFrameStyle(
}
else
gtk_window_set_wmclass( GTK_WINDOW(m_pWindow),
- X11SalData::getFrameResName( m_nExtStyle ),
+ X11SalData::getFrameResName(
m_nExtStyle).getStr(),
X11SalData::getFrameClassName() );
}
}
@@ -3785,7 +3785,7 @@ gboolean GtkSalFrame::IMHandler::signalI
if (!sAllText.getLength())
return sal_False;
rtl::OString sUTF = rtl::OUStringToOString(sAllText,
RTL_TEXTENCODING_UTF8);
- rtl::OUString sCursorText(sAllText, nPosition);
+ rtl::OUString sCursorText( sAllText.getStr(), nPosition);
gtk_im_context_set_surrounding(pContext, sUTF.getStr(),
sUTF.getLength(),
rtl::OUStringToOString(sCursorText,
RTL_TEXTENCODING_UTF8).getLength());
return sal_True;
Modified:
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx?rev=1516138&r1=1516137&r2=1516138&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx
Wed Aug 21 11:13:45 2013
@@ -62,7 +62,7 @@ cssu::Reference< cssxc::XXMLSecurityCont
//Initialize the crypto engine
if( sCertDB.getLength() > 0 )
{
- rtl::OString sCertDir(sCertDB, sCertDB.getLength(),
RTL_TEXTENCODING_ASCII_US);
+ rtl::OString sCertDir( OUStringToOString( sCertDB,
RTL_TEXTENCODING_ASCII_US));
n_pCertStore = sCertDir.getStr();
n_hStoreHandle = CertOpenSystemStore( NULL, n_pCertStore ) ;
if( n_hStoreHandle == NULL )
