diff options
24 files changed, 97 insertions, 124 deletions
diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp index f9b4e7ce3223..0efe0929b320 100644 --- a/crashrep/source/win32/soreport.cpp +++ b/crashrep/source/win32/soreport.cpp @@ -184,12 +184,12 @@ static FILE *_tmpfile(void) static BOOL GetCrashDataPath( LPTSTR szBuffer ) { - ::rtl::OUString ustrValue = ::rtl::OUString::createFromAscii("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"); + ::rtl::OUString ustrValue(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}")); ::rtl::Bootstrap::expandMacros( ustrValue ); if ( ustrValue.getLength() ) { - ustrValue += ::rtl::OUString::createFromAscii("/user/crashdata"); + ustrValue += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata")); ::osl::FileBase::RC result = ::osl::Directory::createPath( ustrValue ); diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 02e8d01bf9b7..db918fdc0dcf 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -396,7 +396,7 @@ HRESULT DocumentHolder::InPlaceActivate( if( xPS.is() ) { aAny = xPS->getPropertyValue( - rtl::OUString::createFromAscii("LayoutManager")); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))); aAny >>= m_xLayoutManager; } @@ -418,8 +418,8 @@ HRESULT DocumentHolder::InPlaceActivate( if(m_xLayoutManager.is()) { uno::Reference< ::com::sun::star::ui::XUIElement > xUIEl( m_xLayoutManager->getElement( - rtl::OUString::createFromAscii( - "private:resource/menubar/menubar"))); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + "private:resource/menubar/menubar")))); OSL_ENSURE(xUIEl.is(),"no menubar"); uno::Reference<awt::XSystemDependentMenuPeer> xSDMP( xUIEl->getRealInterface(), @@ -786,7 +786,7 @@ void DocumentHolder::SetDocument( const uno::Reference< frame::XModel >& xDoc, s { // set the document mode to embedded uno::Sequence< beans::PropertyValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString::createFromAscii( "SetEmbedded" ); + aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SetEmbedded" )); aSeq[0].Value <<= sal_True; m_xDocument->attachResource(::rtl::OUString(),aSeq); } @@ -929,11 +929,11 @@ void DocumentHolder::show() if ( xProps.is() ) { uno::Reference< frame::XLayoutManager > xLayoutManager; - xProps->getPropertyValue( rtl::OUString::createFromAscii( "LayoutManager" ) ) >>= xLayoutManager; + xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) ) >>= xLayoutManager; uno::Reference< beans::XPropertySet > xLMProps( xLayoutManager, uno::UNO_QUERY ); if ( xLMProps.is() ) { - xLMProps->setPropertyValue( ::rtl::OUString::createFromAscii( "MenuBarCloser" ), + xLMProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "MenuBarCloser" )), uno::makeAny( uno::Reference< frame::XStatusListener >() ) ); } } diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx index 08a01020510d..0d0856c0a2cb 100644 --- a/embedserv/source/embed/intercept.cxx +++ b/embedserv/source/embed/intercept.cxx @@ -224,12 +224,12 @@ Interceptor::dispatch( if ( nInd == aNewArgs.getLength() ) { aNewArgs.realloc( nInd + 1 ); - aNewArgs[nInd].Name = ::rtl::OUString::createFromAscii( "SaveTo" ); + aNewArgs[nInd].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SaveTo" )); aNewArgs[nInd].Value <<= sal_True; } uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch( - URL, ::rtl::OUString::createFromAscii( "_self" ), 0 ); + URL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "_self" )), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( URL, aNewArgs ); } diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 41eda708fd19..622c913201d0 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -85,14 +85,14 @@ namespace abp // the parent window Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface(m_pMessageParent); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow")), -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); // the title of the dialog String sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE)); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii("Title"), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), -1, makeAny(::rtl::OUString(sAdminDialogTitle)), PropertyState_DIRECT_VALUE); // the name of the new data source - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii("InitialSelection"), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InitialSelection")), -1, makeAny(m_xDataSource), PropertyState_DIRECT_VALUE); // create the dialog Reference< XExecutableDialog > xDialog; @@ -110,7 +110,7 @@ namespace abp // context needs to be freshly created // Thus, we access the context here (within the WaitCursor), which means the user sees a waitcursor // while his/her office blocks a few seconds .... - m_xORB->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.sdbc.DriverManager" ) ); + m_xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.DriverManager" )) ); } if (xDialog.is()) diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index eb024565a840..328f7513fd5f 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -81,7 +81,7 @@ namespace abp //--------------------------------------------------------------------- static Reference< XNameAccess > lcl_getDataSourceContext( const Reference< XMultiServiceFactory >& _rxORB ) SAL_THROW (( Exception )) { - Reference< XNameAccess > xContext( _rxORB->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.sdb.DatabaseContext" ) ), UNO_QUERY ); + Reference< XNameAccess > xContext( _rxORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.DatabaseContext" )) ), UNO_QUERY ); DBG_ASSERT(xContext.is(), "lcl_getDataSourceContext: could not access the data source context!"); return xContext; } @@ -136,7 +136,7 @@ namespace abp if (xNewDataSource.is()) { xNewDataSource->setPropertyValue( - ::rtl::OUString::createFromAscii( "URL" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "URL" )), makeAny( ::rtl::OUString::createFromAscii( _pInitialAsciiURL ) ) ); } @@ -524,7 +524,7 @@ namespace abp // ................................................................ // create the interaction handler (needed for authentication and error handling) - static ::rtl::OUString s_sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler"); + static ::rtl::OUString s_sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")); Reference< XInteractionHandler > xInteractions; try { diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index c7af76636362..88c6c4747d71 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -61,16 +61,14 @@ namespace abp //--------------------------------------------------------------------- static const ::rtl::OUString& lcl_getDriverSettingsNodeName() { - static const ::rtl::OUString s_sDriverSettingsNodeName = - ::rtl::OUString::createFromAscii( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" ); + static const ::rtl::OUString s_sDriverSettingsNodeName(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" )); return s_sDriverSettingsNodeName; } //--------------------------------------------------------------------- static const ::rtl::OUString& lcl_getAddressBookNodeName() { - static const ::rtl::OUString s_sAddressBookNodeName = - ::rtl::OUString::createFromAscii( "/org.openoffice.Office.DataAccess/AddressBook" ); + static const ::rtl::OUString s_sAddressBookNodeName(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/AddressBook" )); return s_sAddressBookNodeName; } @@ -99,22 +97,22 @@ namespace abp // the parent window Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent ); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "ParentWindow" ), -1, makeAny( xDialogParent ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )), -1, makeAny( xDialogParent ), PropertyState_DIRECT_VALUE); // the data source to use - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "DataSource" ), -1, makeAny( _rxDataSource ), PropertyState_DIRECT_VALUE); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "DataSourceName" ), -1, makeAny( (sal_Bool)_rSettings.bRegisterDataSource ? _rSettings.sRegisteredDataSourceName : _rSettings.sDataSourceName ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSource" )), -1, makeAny( _rxDataSource ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceName" )), -1, makeAny( (sal_Bool)_rSettings.bRegisterDataSource ? _rSettings.sRegisteredDataSourceName : _rSettings.sDataSourceName ), PropertyState_DIRECT_VALUE); // the table to use - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "Command" ), -1, makeAny( _rSettings.sSelectedTable ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )), -1, makeAny( _rSettings.sSelectedTable ), PropertyState_DIRECT_VALUE); // the title ::rtl::OUString sTitle = String( ModuleRes( RID_STR_FIELDDIALOGTITLE ) ); - *pArguments++ <<= PropertyValue(::rtl::OUString::createFromAscii( "Title" ), -1, makeAny( sTitle ), PropertyState_DIRECT_VALUE); + *pArguments++ <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )), -1, makeAny( sTitle ), PropertyState_DIRECT_VALUE); // ........................................................ // create an instance of the dialog service - static ::rtl::OUString s_sAdressBookFieldAssignmentServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.ui.AddressBookSourceDialog" ); + static ::rtl::OUString s_sAdressBookFieldAssignmentServiceName(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.AddressBookSourceDialog" )); Reference< XExecutableDialog > xDialog( _rxORB->createInstanceWithArguments( s_sAdressBookFieldAssignmentServiceName, aArguments ), UNO_QUERY @@ -135,7 +133,7 @@ namespace abp #ifdef DBG_UTIL sal_Bool bSuccess = #endif - xDialogProps->getPropertyValue( ::rtl::OUString::createFromAscii( "FieldMapping" ) ) >>= aMapping; + xDialogProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FieldMapping" )) ) >>= aMapping; DBG_ASSERT( bSuccess, "fieldmapping::invokeDialog: invalid property type for FieldMapping!" ); // and copy it into the map @@ -201,7 +199,7 @@ namespace abp // access the configuration information which the driver uses for determining it's column names ::rtl::OUString sDriverAliasesNodeName = lcl_getDriverSettingsNodeName(); - sDriverAliasesNodeName += ::rtl::OUString::createFromAscii( "/ColumnAliases" ); + sDriverAliasesNodeName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/ColumnAliases" )); // create a config node for this OConfigurationTreeRoot aDriverFieldAliasing = OConfigurationTreeRoot::createWithServiceFactory( @@ -261,15 +259,15 @@ namespace abp OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithServiceFactory( _rxORB, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); - OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString::createFromAscii( "Fields" ) ); + OConfigurationNode aFields = aAddressBookSettings.openNode( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Fields" )) ); // loop through all existent fields Sequence< ::rtl::OUString > aExistentFields = aFields.getNodeNames(); const ::rtl::OUString* pExistentFields = aExistentFields.getConstArray(); const ::rtl::OUString* pExistentFieldsEnd = pExistentFields + aExistentFields.getLength(); - const ::rtl::OUString sProgrammaticNodeName = ::rtl::OUString::createFromAscii( "ProgrammaticFieldName" ); - const ::rtl::OUString sAssignedNodeName = ::rtl::OUString::createFromAscii( "AssignedFieldName" ); + const ::rtl::OUString sProgrammaticNodeName(RTL_CONSTASCII_USTRINGPARAM( "ProgrammaticFieldName" )); + const ::rtl::OUString sAssignedNodeName(RTL_CONSTASCII_USTRINGPARAM( "AssignedFieldName" )); for ( ; pExistentFields != pExistentFieldsEnd; ++pExistentFields ) { @@ -338,9 +336,9 @@ namespace abp OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithServiceFactory( _rxORB, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); - aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "DataSourceName" ), makeAny( _rDataSourceName ) ); - aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "Command" ), makeAny( _rTableName ) ); - aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "CommandType" ), makeAny( (sal_Int32)CommandType::TABLE ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceName" )), makeAny( _rDataSourceName ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Command" )), makeAny( _rTableName ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CommandType" )), makeAny( (sal_Int32)CommandType::TABLE ) ); // commit the changes done aAddressBookSettings.commit(); @@ -357,7 +355,7 @@ namespace abp _rxORB, sAddressBookNodeName, -1, OConfigurationTreeRoot::CM_UPDATABLE); // set the flag - aAddressBookSettings.setNodeValue( ::rtl::OUString::createFromAscii( "AutoPilotCompleted" ), makeAny( (sal_Bool)sal_True ) ); + aAddressBookSettings.setNodeValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "AutoPilotCompleted" )), makeAny( (sal_Bool)sal_True ) ); // commit the changes done aAddressBookSettings.commit(); diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index 2d7c8633489c..5eb4b1d7681a 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -120,7 +120,7 @@ namespace abp //--------------------------------------------------------------------- ::rtl::OUString OABSPilotUno::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.abp.OAddressBookSourcePilot"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.abp.OAddressBookSourcePilot")); } //--------------------------------------------------------------------- @@ -133,7 +133,7 @@ namespace abp ::comphelper::StringSequence OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.ui.dialogs.AddressBookSourcePilot"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.dialogs.AddressBookSourcePilot")); return aSupported; } @@ -177,7 +177,7 @@ namespace abp // (or he can start it again by using wizard-menu!) // So we should deregister it on our general job execution service by using right protocol parameters. ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lProtocol(1); - lProtocol[0].Name = ::rtl::OUString::createFromAscii("Deactivate"); + lProtocol[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Deactivate")); lProtocol[0].Value <<= sal_True; return makeAny( lProtocol ); } diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 7bdc62f1588e..c4e8d93aa193 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -227,13 +227,12 @@ extern "C" { try { - rtl::OUString sKey = rtl::OUString::createFromAscii("/"); + rtl::OUString sKey(RTL_CONSTASCII_USTRINGPARAM("/")); sKey += BibliographyLoader::getImplementationName_Static(); //creates the impl key: /com.sun.star.extensions.Bibliography Reference< registry::XRegistryKey > xImplKey = pRegistryKey->createKey(sKey); - //sKey += rtl::OUString::createFromAscii("/UNO/SERVICES"); Reference< registry::XRegistryKey > xNewKey = xImplKey->createKey( C2U("/UNO/SERVICES") ); Sequence< rtl::OUString > aServices = BibliographyLoader::getSupportedServiceNames_Static(); for( INT32 i = 0; i < aServices.getLength(); i++ ) diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index d6282cdbe142..93d3a06ee687 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -1399,7 +1399,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo(); if (xPropInfo->hasPropertyByName(uProp)) { - ::rtl::OUString sId = ::rtl::OUString::createFromAscii( "HID:" ); + ::rtl::OUString sId(RTL_CONSTASCII_USTRINGPARAM( "HID:" )); sId += ::rtl::OUString::valueOf( (sal_Int32) HID_BIB_DB_GRIDCTRL ); xPropSet->setPropertyValue( uProp, makeAny( ::rtl::OUString( sId ) ) ); } diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index f3e3030af7dc..ff9f40229de9 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -218,7 +218,7 @@ BibFrameController_Impl::~BibFrameController_Impl() ::rtl::OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.extensions.Bibliography"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.Bibliography")); } sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException) @@ -234,7 +234,7 @@ sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUStrin // return only top level services ... // base services are included there and should be asked by uno-rtti. ::com::sun::star::uno::Sequence< ::rtl::OUString > lNames(1); - lNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.Bibliography"); + lNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Bibliography")); return lNames; } @@ -511,27 +511,27 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen Sequence< Any > aDialogCreationArgs( 3 ); Any* pDialogCreationArgs = aDialogCreationArgs.getArray(); // the query composer - *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "QueryComposer" ), + *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "QueryComposer" )), -1, makeAny( pDatMan->getParser() ), beans::PropertyState_DIRECT_VALUE ); // the rowset - *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "RowSet" ), + *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowSet" )), -1, makeAny( pDatMan->getForm() ), beans::PropertyState_DIRECT_VALUE ); // the parent window for the dialog - *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString::createFromAscii( "ParentWindow" ), + *pDialogCreationArgs++ <<= beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" )), -1, makeAny( xWindow ), beans::PropertyState_DIRECT_VALUE ); // create the dialog object - const ::rtl::OUString sDialogServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.sdb.FilterDialog" ); + const ::rtl::OUString sDialogServiceName(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.FilterDialog" )); uno::Reference< uno::XInterface > xDialog = xORB->createInstanceWithArguments( sDialogServiceName, aDialogCreationArgs diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 9a4747b74811..0d50f32ce945 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -297,20 +297,20 @@ void LdapConnection::loadModule() s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0); if ( s_Ldap_Module != NULL ) { - s_p_unbind_s = (t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_unbind_s").pData)); - s_p_simple_bind_s = (t_ldap_simple_bind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_simple_bind_s").pData)); - s_p_set_option = (t_ldap_set_option)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_set_option").pData)); - s_p_err2string = (t_ldap_err2string)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_err2string").pData)); - s_p_init = (t_ldap_init)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_init").pData)); - s_p_msgfree = (t_ldap_msgfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_msgfree").pData)); - s_p_get_dn = (t_ldap_get_dn)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_get_dn").pData)); - s_p_first_entry = (t_ldap_first_entry)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_first_entry").pData)); - s_p_first_attribute = (t_ldap_first_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_first_attribute").pData)); - s_p_next_attribute = (t_ldap_next_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_next_attribute").pData)); - s_p_search_s = (t_ldap_search_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_search_s").pData)); - s_p_value_free = (t_ldap_value_free)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_value_free").pData)); - s_p_get_values = (t_ldap_get_values)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_get_values").pData)); - s_p_memfree = (t_ldap_memfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_memfree").pData)); + s_p_unbind_s = (t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_unbind_s")).pData)); + s_p_simple_bind_s = (t_ldap_simple_bind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_simple_bind_s")).pData)); + s_p_set_option = (t_ldap_set_option)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_set_option")).pData)); + s_p_err2string = (t_ldap_err2string)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_err2string")).pData)); + s_p_init = (t_ldap_init)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_init")).pData)); + s_p_msgfree = (t_ldap_msgfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_msgfree")).pData)); + s_p_get_dn = (t_ldap_get_dn)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_get_dn")).pData)); + s_p_first_entry = (t_ldap_first_entry)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_first_entry")).pData)); + s_p_first_attribute = (t_ldap_first_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_first_attribute")).pData)); + s_p_next_attribute = (t_ldap_next_attribute)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_next_attribute")).pData)); + s_p_search_s = (t_ldap_search_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_search_s")).pData)); + s_p_value_free = (t_ldap_value_free)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_value_free")).pData)); + s_p_get_values = (t_ldap_get_values)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_get_values")).pData)); + s_p_memfree = (t_ldap_memfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_memfree")).pData)); } } } diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index c87c5935fee9..0a1c3a4bec6d 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -74,7 +74,7 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex &aDefinition, &loggedOnUser)) { throw css::uno::RuntimeException( - rtl::OUString::createFromAscii("LdapUserProfileBe- LDAP not configured"), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LdapUserProfileBe- LDAP not configured")), NULL); } @@ -126,7 +126,7 @@ bool LdapUserProfileBe::readLdapConfiguration( if (!xCfgProvider.is()) return false; - css::beans::NamedValue aPath(rtl::OUString::createFromAscii("nodepath"), uno::makeAny(kComponent) ); + css::beans::NamedValue aPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), uno::makeAny(kComponent) ); uno::Sequence< uno::Any > aArgs(1); aArgs[0] <<= aPath; @@ -234,7 +234,7 @@ css::uno::Any LdapUserProfileBe::getPropertyValue( //------------------------------------------------------------------------------ rtl::OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) { - return rtl::OUString::createFromAscii("com.sun.star.comp.configuration.backend.LdapUserProfileBe") ; + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.backend.LdapUserProfileBe")); } //------------------------------------------------------------------------------ @@ -276,5 +276,4 @@ SAL_CALL LdapUserProfileBe::getSupportedServiceNames(void) }}} // --------------------------------------------------------------------------------------- - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index fe8321be9cdd..35daf0e83799 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -264,7 +264,7 @@ namespace COMPMOD_NAMESPACE { ::rtl::OUString aMainKeyName(sRootKey); aMainKeyName += *pImplName; - aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); + aMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); try { diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index f6320c22f33e..742bedecc0e7 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -70,7 +70,6 @@ using namespace com::sun::star; char SoPluginInstance::sSO_Dir[] = {0}; Reference< XMultiServiceFactory > SoPluginInstance::mxRemoteMSF = Reference< XMultiServiceFactory >(NULL); - SoPluginInstance::SoPluginInstance(long pParent, Reference< XMultiServiceFactory > xMSF): m_xUnoWin(NULL), m_xComponent(NULL), @@ -86,7 +85,6 @@ SoPluginInstance::SoPluginInstance(long pParent, Reference< XMultiServiceFactory m_nY = 0; m_nFlag = 15; m_bInit = sal_False; - m_sURL = rtl::OUString::createFromAscii(""); m_hParent = 0; m_pParent = pParent; m_dParentStyl = 0; @@ -136,7 +134,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) { // try to create netscape plugin window Reference< awt::XToolkit > xToolkit( - mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), + mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")) ), uno::UNO_QUERY ); if( !xToolkit.is() ) { @@ -189,7 +187,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // create frame m_xFrame = Reference< frame::XFrame >( - mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.Frame") ), + mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame") )), uno::UNO_QUERY ); if (!m_xFrame.is()) { @@ -205,16 +203,16 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // currently ignore errors in this code uno::Reference< beans::XPropertySet > xFrameProps( m_xFrame, uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xLMProps; - xFrameProps->getPropertyValue( ::rtl::OUString::createFromAscii("LayoutManager") ) >>= xLMProps; + xFrameProps->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ) >>= xLMProps; if ( xLMProps.is() ) - xLMProps->setPropertyValue( ::rtl::OUString::createFromAscii("AutomaticToolbars"), uno::makeAny( (sal_Bool)sal_False ) ); + xLMProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticToolbars")), uno::makeAny( (sal_Bool)sal_False ) ); } catch( uno::Exception& ) {} // get frames supplier Reference< frame::XFramesSupplier > m_xFramesSupplier( - mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop") ), + mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), uno::UNO_QUERY ); if ( !m_xFramesSupplier.is() ) { @@ -243,7 +241,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) //create stream for the document Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess( - mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess") ), + mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccessw")) ), uno::UNO_QUERY ); if(!xSimpleFileAccess.is()) { @@ -275,14 +273,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) ::rtl::OUStringToOString( m_sURL, RTL_TEXTENCODING_ASCII_US ).getStr( ), m_sURL.getLength() ); - // load document -/* - m_xComponent = xLoader->loadComponentFromURL( - OUString(RTL_CONSTASCII_USTRINGPARAM("private:stream")), //m_sURL, - m_xFrame->getName(), 0, setPropValues ); - */ - Sequence< ::com::sun::star::beans::PropertyValue > setPropValues2(3); setPropValues2[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ViewOnly") ); setPropValues2[0].Value <<= sal_True; @@ -316,7 +307,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) // create frame::XDispatchHelper and frame::XDispatchProvider m_xDispatcher = Reference< frame::XDispatchHelper > ( - mxRemoteMSF->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.DispatchHelper")), + mxRemoteMSF->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchHelper"))), uno::UNO_QUERY ); if(!m_xDispatcher.is()) { @@ -335,7 +326,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent) propertyValue[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("FunctionBarVisible") ); propertyValue[0].Value <<= sal_True; m_xDispatcher->executeDispatch(m_xDispatchProvider, - ::rtl::OUString::createFromAscii(".uno:FunctionBarVisible"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FunctionBarVisible")), m_xFrame->getName(), 0, propertyValue ); @@ -419,12 +410,6 @@ sal_Bool SoPluginInstance::Destroy(void) if(m_dParentStyl != 0) NSP_RestoreWinStyl(m_hParent, m_dParentStyl); #endif -// if(m_xDispatcher.is()){ -// m_xDispatcher->executeDispatch(m_xDispatchProvider, -// ::rtl::OUString::createFromAscii(".uno:CloseFrame"), -// ::rtl::OUString::createFromAscii("_top"), 0, -// Sequence< ::com::sun::star::beans::PropertyValue >() ); -// } uno::Reference< util::XCloseable > xCloseable( m_xFrame, uno::UNO_QUERY ); @@ -489,7 +474,7 @@ sal_Bool SoPluginInstance::Print(void) Sequence< ::com::sun::star::beans::PropertyValue > propertyValue(1); m_xDispatcher->executeDispatch(m_xDispatchProvider, - ::rtl::OUString::createFromAscii(".uno:PrintDefault"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:PrintDefault")), m_xFrame->getName(), 0, propertyValue ); return sal_True; diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 847ce89ce4f9..5696375a5971 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -491,7 +491,7 @@ Any SAL_CALL IUnknownWrapper_Impl::getValue( const OUString& aPropertyName ) // Instead here I chose a name that should be illegal both in COM and // UNO ( from an IDL point of view ) therefore I think this is a safe // hack - if ( aPropertyName.equals( rtl::OUString::createFromAscii("$GetTypeName") )) + if ( aPropertyName.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$GetTypeName")) )) { if ( pInfo && m_sTypeName.getLength() == 0 ) { diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index cae9ecb5caa3..91e154dd190f 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -1125,7 +1125,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s sal_Bool bStruct= sal_False; - Reference<XInterface> xIntCore= m_smgr->createInstance( OUString::createFromAscii("com.sun.star.reflection.CoreReflection")); + Reference<XInterface> xIntCore= m_smgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection"))); Reference<XIdlReflection> xRefl( xIntCore, UNO_QUERY); if( xRefl.is() ) { diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index c44728b9def5..eff03c8aedd4 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.cxx @@ -1639,7 +1639,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac if( any.getValueTypeClass() == TypeClass_STRUCT) { SimpleStruct* pStruct= ( SimpleStruct*) any.getValue(); - pStruct->message= OUString::createFromAscii("This struct was created in OleTest"); + pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest")); SimpleStruct aStruct; any >>= aStruct; @@ -1788,7 +1788,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac if( any.getValueTypeClass() == TypeClass_STRUCT) { SimpleStruct* pStruct= ( SimpleStruct*) any.getValue(); - pStruct->message= OUString::createFromAscii("This struct was created in OleTest"); + pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest")); any >>= aStruct; } } @@ -1959,7 +1959,7 @@ void SAL_CALL OComponent::testInterface( const Reference< XCallback >& xCallbac if( any.getValueTypeClass() == TypeClass_STRUCT) { SimpleStruct* pStruct= ( SimpleStruct*) any.getValue(); - pStruct->message= OUString::createFromAscii("This struct was created in OleTest"); + pStruct->message= OUString(RTL_CONSTASCII_USTRINGPARAM("This struct was created in OleTest")); any >>= aStruct; } } diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx index 705d451da5be..9ba161f9eea8 100644 --- a/extensions/workben/testcomponent.cxx +++ b/extensions/workben/testcomponent.cxx @@ -84,15 +84,10 @@ int __LOADONCALLAPI main (int argc, char **argv) try { // Create registration service XInterfaceRef x = xSMgr->createInstance( - UString::createFromAscii( "com.sun.star.registry.ImplementationRegistration" ) ); + UString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.registry.ImplementationRegistration" )) ); x->queryInterface( XImplementationRegistration::getSmartUik() , xReg ); -/* x = xSMgr->createInstance( L"stardiv.uno.repos.SimpleRegistry" ); - OSL_ASSERT( x.is() ); - x->queryInterface( XSimpleRegistry::getSmartUik() , xSimpleReg ); - OSL_ASSERT( xSimpleReg.is() ); - xSimpleReg->open( L"testcomp.rdb" , FALSE , TRUE ); -*/ } + } catch( Exception& e ) { printf( "%s\n" , OWStringToOString( e.getName() , CHARSET_SYSTEM ).getStr() ); exit(1); @@ -108,7 +103,7 @@ int __LOADONCALLAPI main (int argc, char **argv) UString aDllName( OStringToOWString( szBuf, CHARSET_SYSTEM ) ); xReg->registerImplementation( - UString::createFromAscii( "com.sun.star.loader.SharedLibrary" ), + UString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.SharedLibrary" )), aDllName, xSimpleReg ); } @@ -129,7 +124,7 @@ int __LOADONCALLAPI main (int argc, char **argv) ORealDynamicLoader::computeModuleName( sTestName.getStr() , szBuf, 1024 ); UString aDllName = OStringToOWString( szBuf, CHARSET_SYSTEM ); xReg->registerImplementation( - UString::createFromAscii( "com.sun.star.loader.SharedLibrary" ) , + UString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.loader.SharedLibrary" )) , aDllName, xSimpleReg ); } diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index deafc88cb5e9..aece48afe574 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -665,7 +665,7 @@ Reference< XDocumentFragment > Submission::createSubmissionDocument(const Refere { using namespace com::sun::star::xml::xpath; Reference< XDocumentBuilder > aDocBuilder(m_aFactory->createInstance( - OUString::createFromAscii("com.sun.star.xml.dom.DocumentBuilder")), UNO_QUERY); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.DocumentBuilder"))), UNO_QUERY); Reference< XDocument > aDocument = aDocBuilder->newDocument(); Reference< XDocumentFragment > aFragment = aDocument->createDocumentFragment(); diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index 95d1ce3ce2be..c8e87fa68a04 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -71,7 +71,7 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< pHelper->m_aInteractionHandler = aInteractionHandler; else pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >(m_aFactory->createInstance( - OUString::createFromAscii("com.sun.star.task.InteractionHandler")), UNO_QUERY); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"))), UNO_QUERY); OSL_ENSURE(pHelper->m_aInteractionHandler.is(), "failed to create IntreractionHandler"); CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; pHelper->m_aProgressHandler = CSS::uno::Reference< XProgressHandler >(pProgressHelper); @@ -98,7 +98,7 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< OUString aQueryURL = OStringToOUString(aUTF8QueryURL.makeStringAndClear(), RTL_TEXTENCODING_UTF8); ucbhelper::Content aContent(aQueryURL, aEnvironment); CSS::uno::Reference< XOutputStream > aPipe(m_aFactory->createInstance( - OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY_THROW); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe"))), UNO_QUERY_THROW); aContent.openStream(aPipe); // get reply try { diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx index fc2fde7d3668..c76d492873d9 100644 --- a/forms/source/xforms/submission/submission_post.cxx +++ b/forms/source/xforms/submission/submission_post.cxx @@ -67,15 +67,12 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference< // use post command - OUString aCommandName = OUString::createFromAscii("post"); + OUString aCommandName(RTL_CONSTASCII_USTRINGPARAM("post")); PostCommandArgument2 aPostArgument; aPostArgument.Source = apSerialization->getInputStream(); - //CSS::uno::Reference< XInterface > aSink( m_aFactory->createInstance( - // OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY_THROW); CSS::uno::Reference< XActiveDataSink > aSink(new ucbhelper::ActiveDataSink); - // OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY_THROW); aPostArgument.Sink = aSink; - aPostArgument.MediaType = OUString::createFromAscii("application/xml"); + aPostArgument.MediaType = OUString(RTL_CONSTASCII_USTRINGPARAM("application/xml")); aPostArgument.Referer = OUString(); Any aCommandArgument; aCommandArgument <<= aPostArgument; diff --git a/package/source/manifest/UnoRegister.cxx b/package/source/manifest/UnoRegister.cxx index 8a234a750d8b..51b7ea431de5 100644 --- a/package/source/manifest/UnoRegister.cxx +++ b/package/source/manifest/UnoRegister.cxx @@ -50,9 +50,9 @@ static sal_Bool writeInfo( void * pRegistryKey, const OUString & rImplementationName, Sequence< OUString > const & rServiceNames ) { - OUString aKeyName( OUString::createFromAscii( "/" ) ); + OUString aKeyName( OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) ); aKeyName += rImplementationName; - aKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); + aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )); Reference< XRegistryKey > xKey; try diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 969fa64d1720..475bcea9af7c 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -291,7 +291,7 @@ Reference< XInputStream > ZipFile::StaticGetDataFromRawStream( const Reference< throw ( packages::WrongPasswordException, ZipIOException, RuntimeException ) { if ( !rData.is() ) - throw ZipIOException( OUString::createFromAscii( "Encrypted stream without encryption data!\n" ), + throw ZipIOException( OUString(RTL_CONSTASCII_USTRINGPARAM( "Encrypted stream without encryption data!\n" )), Reference< XInterface >() ); if ( !rData->aKey.getLength() ) @@ -299,7 +299,7 @@ Reference< XInputStream > ZipFile::StaticGetDataFromRawStream( const Reference< Reference< XSeekable > xSeek( xStream, UNO_QUERY ); if ( !xSeek.is() ) - throw ZipIOException( OUString::createFromAscii( "The stream must be seekable!\n" ), + throw ZipIOException( OUString(RTL_CONSTASCII_USTRINGPARAM( "The stream must be seekable!\n" )), Reference< XInterface >() ); @@ -559,7 +559,7 @@ Reference< XInputStream > SAL_CALL ZipFile::getDataStream( ZipEntry& rEntry, // in case no digest is provided there is no way // to detect password correctness if ( !rData.is() ) - throw ZipException( OUString::createFromAscii( "Encrypted stream without encryption data!\n" ), + throw ZipException( OUString(RTL_CONSTASCII_USTRINGPARAM( "Encrypted stream without encryption data!\n" )), Reference< XInterface >() ); // if we have a digest, then this file is an encrypted one and we should diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 4af932d6999c..e445b9ea0bb1 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -596,18 +596,18 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments ) do { ::rtl::OUString aCommand = aParam.getToken( 0, '&', nIndex ); - if ( aCommand.equals( OUString::createFromAscii( "repairpackage" ) ) ) + if ( aCommand.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "repairpackage" )) ) ) { m_bForceRecovery = sal_True; break; } - else if ( aCommand.equals( OUString::createFromAscii( "purezip" ) ) ) + else if ( aCommand.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "purezip" )) ) ) { m_nFormat = embed::StorageFormats::ZIP; m_pRootFolder->setPackageFormat_Impl( m_nFormat ); break; } - else if ( aCommand.equals( OUString::createFromAscii( "ofopxml" ) ) ) + else if ( aCommand.equals( OUString(RTL_CONSTASCII_USTRINGPARAM( "ofopxml" )) ) ) { m_nFormat = embed::StorageFormats::OFOPXML; m_pRootFolder->setPackageFormat_Impl( m_nFormat ); @@ -620,7 +620,7 @@ void SAL_CALL ZipPackage::initialize( const Sequence< Any >& aArguments ) m_aURL = aParamUrl; Content aContent ( m_aURL, uno::Reference < XCommandEnvironment >() ); - Any aAny = aContent.getPropertyValue( OUString::createFromAscii( "Size" ) ); + Any aAny = aContent.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Size" )) ); sal_uInt64 aSize = 0; // kind of optimisation: treat empty files as nonexistent files // and write to such files directly. Note that "Size" property is optional. @@ -1313,7 +1313,7 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput() { Exception aDetect; sal_Int64 aSize = 0; - Any aAny = aOriginalContent.setPropertyValue( OUString::createFromAscii( "Size" ), makeAny( aSize ) ); + Any aAny = aOriginalContent.setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "Size" )), makeAny( aSize ) ); if( !( aAny >>= aDetect ) ) bTruncSuccess = sal_True; } @@ -1336,7 +1336,7 @@ uno::Reference< XActiveDataStreamer > ZipPackage::openOriginalForOutput() aArg.Sink = xSink; aArg.Properties = Sequence< Property >( 0 ); // unused - aOriginalContent.executeCommand( OUString::createFromAscii( "open" ), makeAny( aArg ) ); + aOriginalContent.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM( "open" )), makeAny( aArg ) ); } catch( Exception& ) { |