diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /sfx2/source/appl | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'sfx2/source/appl')
31 files changed, 460 insertions, 464 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 3b31dbdad56f..b973bc41ea97 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -198,7 +198,7 @@ SfxApplication::SfxApplication() #ifdef DBG_UTIL if( !bOk ) { - rtl::OStringBuffer aStr( + OStringBuffer aStr( RTL_CONSTASCII_STRINGPARAM("No DDE-Service possible. Error: ")); if( GetDdeService() ) aStr.append(static_cast<sal_Int32>(GetDdeService()->GetError())); @@ -503,14 +503,14 @@ IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic ) #ifndef DISABLE_DYNLOADING // get basctl dllname - static ::rtl::OUString aLibName( SVLIBRARY( "basctl" ) ); + static OUString aLibName( SVLIBRARY( "basctl" ) ); // load module oslModule handleMod = osl_loadModuleRelative( &thisModule, aLibName.pData, 0 ); // get symbol - ::rtl::OUString aSymbol( "basicide_handle_basic_error" ); + OUString aSymbol( "basicide_handle_basic_error" ); basicide_handle_basic_error pSymbol = (basicide_handle_basic_error) osl_getFunctionSymbol( handleMod, aSymbol.pData ); // call basicide_handle_basic_error in basctl @@ -562,10 +562,10 @@ sal_Bool SfxApplication::IsXScriptURL( const String& rScriptURL ) return result; } -::rtl::OUString +OUString SfxApplication::ChooseScript() { - ::rtl::OUString aScriptURL; + OUString aScriptURL; #ifndef DISABLE_SCRIPTING SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); @@ -605,14 +605,14 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId ) #ifndef DISABLE_DYNLOADING // get basctl dllname - static ::rtl::OUString aLibName( SVLIBRARY( "basctl" ) ); + static OUString aLibName( SVLIBRARY( "basctl" ) ); // load module oslModule handleMod = osl_loadModuleRelative( &thisModule, aLibName.pData, 0 ); // get symbol - ::rtl::OUString aSymbol( "basicide_macro_organizer" ); + OUString aSymbol( "basicide_macro_organizer" ); basicide_macro_organizer pSymbol = (basicide_macro_organizer) osl_getFunctionSymbol( handleMod, aSymbol.pData ); // call basicide_macro_organizer in basctl diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 1c72b4476201..1dae64a69125 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -106,7 +106,7 @@ SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject, (void) eClassType; return 0; #else - SbxVariable *pVar = pBas->Make( rtl::OUString::createFromAscii(pName), eClassType, eType ); //SbxCLASS_PROPERTY + SbxVariable *pVar = pBas->Make( OUString::createFromAscii(pName), eClassType, eType ); //SbxCLASS_PROPERTY pVar->SetUserData( nSID ); pVar->SetFlag( SBX_DONTSTORE ); pObject->StartListening( pVar->GetBroadcaster() ); diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx index cd2f721aed8f..14125482f4f1 100644 --- a/sfx2/source/appl/appbaslib.cxx +++ b/sfx2/source/appl/appbaslib.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::script; using namespace ::com::sun::star::embed; -using ::rtl::OUString; using ::osl::MutexGuard; using ::osl::Mutex; @@ -142,7 +141,7 @@ void SfxBasicManagerHolder::impl_releaseContainers() } sal_Bool -SfxBasicManagerHolder::LegacyPsswdBinaryLimitExceeded( Sequence< rtl::OUString >& sModules ) +SfxBasicManagerHolder::LegacyPsswdBinaryLimitExceeded( Sequence< OUString >& sModules ) { #ifdef DISABLE_SCRIPTING (void) sModules; diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 061f697de81c..03aaf69c2e0b 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -135,8 +135,8 @@ IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer) #ifdef DBG_UTIL if (!xRef.Is()) { - rtl::OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxEvent: ")); - aTmp.append(rtl::OUStringToOString(aHint.GetEventName(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxEvent: ")); + aTmp.append(OUStringToOString(aHint.GetEventName(), RTL_TEXTENCODING_UTF8)); OSL_TRACE( "%s", aTmp.getStr() ); } #endif @@ -375,7 +375,7 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet ) bRet = sal_True; if (!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_SECUREURLS)) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs = aSecurityOptions.GetSecureURLs(); + ::com::sun::star::uno::Sequence< OUString > seqURLs = aSecurityOptions.GetSecureURLs(); std::vector<String> aList; sal_uInt32 nCount = seqURLs.getLength(); sal_uInt32 nURL; @@ -457,7 +457,7 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet ) nProp <= SvtPathOptions::PATH_WORK; nProp++ ) { aNames.InsertValue( nProp, SfxResId(CONFIG_PATH_START + nProp).toString() ); - rtl::OUString aValue; + OUString aValue; switch ( nProp ) { case SvtPathOptions::PATH_ADDIN: ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aPathCfg.GetAddinPath(), aValue ); break; @@ -783,7 +783,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) DBG_ASSERT(pItem->ISA(SfxStringListItem), "StringListItem expected"); const std::vector<String> &aList = ((SfxStringListItem*)pItem)->GetList(); sal_uInt32 nCount = aList.size(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > seqURLs(nCount); + ::com::sun::star::uno::Sequence< OUString > seqURLs(nCount); for( sal_uInt32 nPosition=0;nPosition<nCount;++nPosition) seqURLs[nPosition] = aList[nPosition]; @@ -822,17 +822,17 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) DBG_ASSERT(pItem->ISA(SfxAllEnumItem), "AllEnumItem expected"); const SfxAllEnumItem* pEnumItem = (const SfxAllEnumItem *)pItem; sal_uInt32 nCount = pEnumItem->GetValueCount(); - rtl::OUString aNoChangeStr( ' ' ); + OUString aNoChangeStr( ' ' ); for( sal_uInt32 nPath=0; nPath<nCount; ++nPath ) { - rtl::OUString sValue = pEnumItem->GetValueTextByPos((sal_uInt16)nPath); + OUString sValue = pEnumItem->GetValueTextByPos((sal_uInt16)nPath); if ( sValue != aNoChangeStr ) { switch( nPath ) { case SvtPathOptions::PATH_ADDIN: { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) ) aPathOptions.SetAddinPath( aTmp ); break; @@ -848,7 +848,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) case SvtPathOptions::PATH_FAVORITES: aPathOptions.SetFavoritesPath( sValue );break; case SvtPathOptions::PATH_FILTER: { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) ) aPathOptions.SetFilterPath( aTmp ); break; @@ -857,7 +857,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) case SvtPathOptions::PATH_GRAPHIC: aPathOptions.SetGraphicPath( sValue );break; case SvtPathOptions::PATH_HELP: { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) ) aPathOptions.SetHelpPath( aTmp ); break; @@ -866,7 +866,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) case SvtPathOptions::PATH_LINGUISTIC: aPathOptions.SetLinguisticPath( sValue );break; case SvtPathOptions::PATH_MODULE: { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) ) aPathOptions.SetModulePath( aTmp ); break; @@ -875,7 +875,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) case SvtPathOptions::PATH_PALETTE: aPathOptions.SetPalettePath( sValue );break; case SvtPathOptions::PATH_PLUGIN: { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) ) aPathOptions.SetPluginPath( aTmp ); break; @@ -883,7 +883,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet) case SvtPathOptions::PATH_STORAGE: { - rtl::OUString aTmp; + OUString aTmp; if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( sValue, aTmp ) ) aPathOptions.SetStoragePath( aTmp ); break; @@ -919,8 +919,8 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron #ifdef DBG_UTIL if (!pDoc) { - rtl::OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxEvent: ")); - aTmp.append(rtl::OUStringToOString(rEventHint.GetEventName(), RTL_TEXTENCODING_UTF8)); + OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxEvent: ")); + aTmp.append(OUStringToOString(rEventHint.GetEventName(), RTL_TEXTENCODING_UTF8)); OSL_TRACE( "%s", aTmp.getStr() ); } #endif diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 801a8a0fcf86..8080942b953d 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -67,7 +67,7 @@ public: ImplDdeService( const String& rNm ) : DdeService( rNm ) {} - virtual sal_Bool MakeTopic( const rtl::OUString& ); + virtual sal_Bool MakeTopic( const OUString& ); virtual String Topics(); @@ -111,7 +111,7 @@ namespace } } -sal_Bool ImplDdeService::MakeTopic( const rtl::OUString& rNm ) +sal_Bool ImplDdeService::MakeTopic( const OUString& rNm ) { // Workaround for Event after Main() under OS/2 // happens when exiting starts the App again @@ -224,7 +224,7 @@ public: virtual sal_Bool Put( const DdeData* ); virtual sal_Bool Execute( const String* ); virtual sal_Bool StartAdviseLoop(); - virtual sal_Bool MakeItem( const rtl::OUString& rItem ); + virtual sal_Bool MakeItem( const OUString& rItem ); }; @@ -254,7 +254,7 @@ sal_Bool SfxAppEvent_Impl( ApplicationEvent &rAppEvent, sEvent += "("; if (rCmd.startsWithIgnoreAsciiCase(sEvent)) { - ::rtl::OUStringBuffer aData( rCmd ); + OUStringBuffer aData( rCmd ); aData.remove(0, sEvent.getLength()); if ( aData.getLength() > 2 ) { @@ -665,7 +665,7 @@ sal_Bool SfxDdeDocTopic_Impl::Execute( const String* pStr ) return 0 != nRet; } -sal_Bool SfxDdeDocTopic_Impl::MakeItem( const rtl::OUString& rItem ) +sal_Bool SfxDdeDocTopic_Impl::MakeItem( const OUString& rItem ) { AddItem( DdeItem( rItem ) ); return sal_True; diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index cef12aaafbce..6dc25eed1908 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -81,9 +81,9 @@ public: virtual void SAL_CALL disposing( const EventObject& Source ) throw( RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) throw (RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException); }; void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& ) throw( RuntimeException ) @@ -122,14 +122,14 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a Application::Quit(); } -::rtl::OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName() throw (RuntimeException) +OUString SAL_CALL SfxTerminateListener_Impl::getImplementationName() throw (RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.sfx2.SfxTerminateListener"); + return OUString("com.sun.star.comp.sfx2.SfxTerminateListener"); } -::sal_Bool SAL_CALL SfxTerminateListener_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (RuntimeException) +::sal_Bool SAL_CALL SfxTerminateListener_Impl::supportsService( const OUString& sServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > lNames = getSupportedServiceNames(); + Sequence< OUString > lNames = getSupportedServiceNames(); ::sal_Int32 c = lNames.getLength(); ::sal_Int32 i = 0; @@ -142,7 +142,7 @@ void SAL_CALL SfxTerminateListener_Impl::notifyTermination( const EventObject& a return sal_False; } -Sequence< ::rtl::OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceNames() throw (RuntimeException) { // Note: That service does not realy exists .-) // But this implementation is not thought to be registered realy within our service.rdb. @@ -150,8 +150,8 @@ Sequence< ::rtl::OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServ // The desktop must know, which listener will terminate the SfxApplication in real ! // It must call this special listener as last one ... otherwise we shutdown the SfxApplication BEFORE other listener // can react ... - static const ::rtl::OUString SERVICENAME("com.sun.star.frame.TerminateListener"); - Sequence< ::rtl::OUString > lNames(1); + static const OUString SERVICENAME("com.sun.star.frame.TerminateListener"); + Sequence< OUString > lNames(1); lNames[0] = SERVICENAME; return lNames; } @@ -195,7 +195,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont) &thisModule, aLibName.pData, 0 ); // get symbol - ::rtl::OUString aSymbol( "GetSpecialCharsForEdit" ); + OUString aSymbol( "GetSpecialCharsForEdit" ); pfunc_getSpecialCharsForEdit = (PFunc_getSpecialCharsForEdit)osl_getFunctionSymbol( handleMod, aSymbol.pData ); DBG_ASSERT( pfunc_getSpecialCharsForEdit, "GetSpecialCharsForEdit() not found!" ); #else diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 8008e9071605..f6d1597148a9 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -187,15 +187,15 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid { // Load from disk // --------------------------------------------------------------------- - rtl::OUString aBaseName = ( rtl::OUString("/") + - rtl::OUString::createFromAscii( pName ) ); - rtl::OUString aSvg( ".svg" ); + OUString aBaseName = ( OUString("/") + + OUString::createFromAscii( pName ) ); + OUString aSvg( ".svg" ); rtl_Locale *pLoc = NULL; osl_getProcessLocale (&pLoc); LanguageTag aLanguageTag( *pLoc); - rtl::OUString uri = rtl::OUString::createFromAscii( "$BRAND_BASE_DIR/program" ) + aBaseName+aSvg; + OUString uri = OUString::createFromAscii( "$BRAND_BASE_DIR/program" ) + aBaseName+aSvg; rtl::Bootstrap::expandMacros( uri ); INetURLObject aObj( uri ); SvgData aSvgData(aObj.PathToFileName()); @@ -219,7 +219,7 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid // UNO dance to render from drawinglayer // --------------------------------------------------------------------- uno::Reference< lang::XMultiServiceFactory > xFactory(::comphelper::getProcessServiceFactory()); - const rtl::OUString aServiceName("com.sun.star.graphic.Primitive2DTools"); + const OUString aServiceName("com.sun.star.graphic.Primitive2DTools"); try { diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index cce73e64be4c..d88ecb7e9825 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -158,7 +158,7 @@ public: mxStorage( rxStorage ) {} virtual ::comphelper::DocPasswordVerifierResult - verifyPassword( const ::rtl::OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ); + verifyPassword( const OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ); virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData ); @@ -168,7 +168,7 @@ private: }; //-------------------------------------------------------------------- -::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyPassword( const ::rtl::OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) +::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyPassword( const OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) { o_rEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( rPassword ); return verifyEncryptionData( o_rEncryptionData ); @@ -187,7 +187,7 @@ private: ::comphelper::OStorageHelper::SetCommonStorageEncryptionData( mxStorage, rEncryptionData ); mxStorage->openStreamElement( - ::rtl::OUString( "content.xml" ), + OUString( "content.xml" ), embed::ElementModes::READ | embed::ElementModes::NOCREATE ); // no exception -> success @@ -237,7 +237,7 @@ sal_uInt32 CheckPasswd_Impl { sal_Bool bIsEncrypted = sal_False; try { - xStorageProps->getPropertyValue( ::rtl::OUString("HasEncryptedEntries") ) + xStorageProps->getPropertyValue( OUString("HasEncryptedEntries") ) >>= bIsEncrypted; } catch( uno::Exception& ) { @@ -261,7 +261,7 @@ sal_uInt32 CheckPasswd_Impl if( xInteractionHandler.is() ) { // use the comphelper password helper to request a password - ::rtl::OUString aPassword; + OUString aPassword; SFX_ITEMSET_ARG( pSet, pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False); if ( pPasswordItem ) aPassword = pPasswordItem->GetValue(); @@ -271,7 +271,7 @@ sal_uInt32 CheckPasswd_Impl if ( pEncryptionDataItem ) pEncryptionDataItem->GetValue() >>= aEncryptionData; - ::rtl::OUString aDocumentName = INetURLObject( pFile->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ); + OUString aDocumentName = INetURLObject( pFile->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ); SfxDocPasswordVerifier aVerifier( xStorage ); aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword( @@ -349,8 +349,8 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String DBG_ASSERT( !xDoc.Is(), "Sorry, not implemented!" ); delete pSet; SfxStringItem aName( SID_FILE_NAME, rFileName ); - SfxStringItem aReferer( SID_REFERER, rtl::OUString("private:user") ); - SfxStringItem aFlags( SID_OPTIONS, rtl::OUString("T") ); + SfxStringItem aReferer( SID_REFERER, OUString("private:user") ); + SfxStringItem aFlags( SID_OPTIONS, OUString("T") ); SfxBoolItem aHidden( SID_HIDDEN, sal_True ); const SfxPoolItem *pRet = GetDispatcher_Impl()->Execute( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, &aName, &aHidden, &aReferer, &aFlags, 0L ); const SfxObjectItem *pObj = PTR_CAST( SfxObjectItem, pRet ); @@ -431,8 +431,8 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String sal_Int32 nLength = aArgs.getLength(); aArgs.realloc( nLength + 1 ); aArgs[nLength].Name = "Title"; - aArgs[nLength].Value <<= ::rtl::OUString( xDoc->GetTitle( SFX_TITLE_DETECT ) ); - xModel->attachResource( ::rtl::OUString(), aArgs ); + aArgs[nLength].Value <<= OUString( xDoc->GetTitle( SFX_TITLE_DETECT ) ); + xModel->attachResource( OUString(), aArgs ); delete pNew; } @@ -452,11 +452,11 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq ) SfxRequest aReq( SID_OPENDOC, SFX_CALLMODE_SYNCHRON, GetPool() ); - String aFact = rtl::OUString("private:factory/"); + String aFact = OUString("private:factory/"); aFact += aFactName; aReq.AppendItem( SfxStringItem( SID_FILE_NAME, aFact ) ); aReq.AppendItem( SfxFrameItem( SID_DOCFRAME, GetFrame() ) ); - aReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString( "_default" ) ) ); + aReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString( "_default" ) ) ); // TODO/LATER: Should the other arguments be transferred as well? SFX_REQUEST_ARG( rReq, pDefaultPathItem, SfxStringItem, SID_DEFAULTFILEPATH, sal_False); @@ -593,7 +593,7 @@ bool lcl_isFilterNativelySupported(const SfxFilter& rFilter) if (rFilter.IsOwnFormat()) return true; - ::rtl::OUString aName = rFilter.GetFilterName(); + OUString aName = rFilter.GetFilterName(); if (aName.indexOf("MS Excel") == 0) // We can handle all Excel variants natively. return true; @@ -605,7 +605,7 @@ bool lcl_isFilterNativelySupported(const SfxFilter& rFilter) void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { - rtl::OUString aDocService; + OUString aDocService; SFX_REQUEST_ARG(rReq, pDocSrvItem, SfxStringItem, SID_DOC_SERVICE, false); if (pDocSrvItem) aDocService = pDocSrvItem->GetValue(); @@ -635,7 +635,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( !pFileNameItem ) { // get FileName from dialog - std::vector<rtl::OUString> pURLList; + std::vector<OUString> pURLList; String aFilter; SfxItemSet* pSet = NULL; String aPath; @@ -663,7 +663,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( pStandardDirItem ) sStandardDir = pStandardDirItem->GetValue(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aBlackList; + ::com::sun::star::uno::Sequence< OUString > aBlackList; SFX_REQUEST_ARG( rReq, pBlackListItem, SfxStringListItem, SID_BLACK_LIST, sal_False ); if ( pBlackListItem ) @@ -684,8 +684,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) rReq.SetArgs( *(SfxAllItemSet*)pSet ); if (aFilter.Len() >0 ) rReq.AppendItem( SfxStringItem( SID_FILTER_NAME, aFilter ) ); - rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) ); - rReq.AppendItem( SfxStringItem( SID_REFERER, rtl::OUString(SFX_REFERER_USER) ) ); + rReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) ); + rReq.AppendItem( SfxStringItem( SID_REFERER, OUString(SFX_REFERER_USER) ) ); delete pSet; if(!pURLList.empty()) @@ -725,7 +725,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) rReq.AppendItem(SfxStringItem(SID_DOC_SERVICE, aDocService)); } - for(std::vector<rtl::OUString>::const_iterator i = pURLList.begin(); i != pURLList.end(); ++i) + for(std::vector<OUString>::const_iterator i = pURLList.begin(); i != pURLList.end(); ++i) { rReq.RemoveItem( SID_FILE_NAME ); rReq.AppendItem( SfxStringItem( SID_FILE_NAME, *i ) ); @@ -844,12 +844,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { Reference< ::com::sun::star::document::XTypeDetection > xTypeDetection( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString("com.sun.star.document.TypeDetection")), + OUString("com.sun.star.document.TypeDetection")), UNO_QUERY ); if ( xTypeDetection.is() ) { URL aURL; - ::rtl::OUString aTypeName; + OUString aTypeName; aURL.Complete = aFileName; Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); @@ -880,7 +880,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { // don't dispatch mailto hyperlink to desktop dispatcher rReq.RemoveItem( SID_TARGETNAME ); - rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_self") ) ); + rReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_self") ) ); } else if ( aINetProtocol == INET_PROT_FTP || aINetProtocol == INET_PROT_HTTP || @@ -892,20 +892,20 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) else { // check for "internal" protocols that should not be forwarded to the system - Sequence < ::rtl::OUString > aProtocols(2); + Sequence < OUString > aProtocols(2); // add special protocols that always should be treated as internal - aProtocols[0] = ::rtl::OUString("private:*"); - aProtocols[1] = ::rtl::OUString("vnd.sun.star.*"); + aProtocols[0] = OUString("private:*"); + aProtocols[1] = OUString("vnd.sun.star.*"); try { // get registered protocol handlers from configuration Reference < XNameAccess > xAccess( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - ::rtl::OUString("org.openoffice.Office.ProtocolHandler/HandlerSet"), ::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY ); + OUString("org.openoffice.Office.ProtocolHandler/HandlerSet"), ::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY ); if ( xAccess.is() ) { - Sequence < ::rtl::OUString > aNames = xAccess->getElementNames(); + Sequence < OUString > aNames = xAccess->getElementNames(); for ( sal_Int32 nName = 0; nName < aNames.getLength(); nName ++) { Reference < XPropertySet > xSet; @@ -914,8 +914,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( xSet.is() ) { // copy protocols - aRet = xSet->getPropertyValue( ::rtl::OUString("Protocols") ); - Sequence < ::rtl::OUString > aTmp; + aRet = xSet->getPropertyValue( OUString("Protocols") ); + Sequence < OUString > aTmp; aRet >>= aTmp; // todo: add operator+= to SequenceAsVector class and use SequenceAsVector for aProtocols @@ -948,7 +948,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) sal_Bool bLoadInternal = sal_False; // security reservation: => we have to check the referer before executing - if (SFX_APP()->IsSecureURL(rtl::OUString(), &aReferer)) + if (SFX_APP()->IsSecureURL(OUString(), &aReferer)) { try { @@ -958,7 +958,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) catch ( ::com::sun::star::system::SystemShellExecuteException& ) { rReq.RemoveItem( SID_TARGETNAME ); - rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) ); + rReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) ); bLoadInternal = sal_True; } } @@ -977,7 +977,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { // hyperlink document must be loaded into a new frame rReq.RemoveItem( SID_TARGETNAME ); - rReq.AppendItem( SfxStringItem( SID_TARGETNAME, rtl::OUString("_default") ) ); + rReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) ); } } } @@ -1043,7 +1043,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) } // extract target name - ::rtl::OUString aTarget; + OUString aTarget; SFX_REQUEST_ARG(rReq, pTargetItem, SfxStringItem, SID_TARGETNAME, sal_False); if ( pTargetItem ) aTarget = pTargetItem->GetValue(); @@ -1051,12 +1051,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { SFX_REQUEST_ARG( rReq, pNewViewItem, SfxBoolItem, SID_OPEN_NEW_VIEW, sal_False ); if ( pNewViewItem && pNewViewItem->GetValue() ) - aTarget = rtl::OUString("_blank" ); + aTarget = OUString("_blank" ); } if ( bHidden ) { - aTarget = rtl::OUString("_blank"); + aTarget = OUString("_blank"); DBG_ASSERT( rReq.IsSynchronCall() || pLinkItem, "Hidden load process must be done synchronously!" ); } diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index d631b7beebdd..c80b4d4a2df4 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -163,9 +163,9 @@ namespace using namespace org::freedesktop::PackageKit; using namespace svtools; Reference< XSyncDbusSessionHelper > xSyncDbusSessionHelper(SyncDbusSessionHelper::create(comphelper::getProcessComponentContext())); - Sequence< ::rtl::OUString > vPackages(1); + Sequence< OUString > vPackages(1); vPackages[0] = "libreoffice-base"; - ::rtl::OUString sInteraction; + OUString sInteraction; xSyncDbusSessionHelper->InstallPackageNames(0, vPackages, sInteraction); // Ill be back (hopefully)! SolarMutexGuard aGuard; @@ -179,22 +179,22 @@ namespace } return; } - SfxStringItem aURL(SID_FILE_NAME, rtl::OUString(".component:Bibliography/View1")); - SfxStringItem aRef(SID_REFERER, rtl::OUString("private:user")); - SfxStringItem aTarget(SID_TARGETNAME, rtl::OUString("_blank")); + SfxStringItem aURL(SID_FILE_NAME, OUString(".component:Bibliography/View1")); + SfxStringItem aRef(SID_REFERER, OUString("private:user")); + SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank")); SfxViewFrame::Current()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aURL, &aRef, &aTarget, 0L); } } /// Find the correct location of the document (LICENSE.odt, etc.), and return /// it in rURL if found. -static sal_Bool checkURL( const char *pName, const char *pExt, rtl::OUString &rURL ) +static sal_Bool checkURL( const char *pName, const char *pExt, OUString &rURL ) { using namespace osl; DirectoryItem aDirItem; - rURL = rtl::OUString( "$BRAND_BASE_DIR/" ); - rURL += rtl::OUString::createFromAscii( pName ); - rURL += rtl::OUString::createFromAscii( pExt ); + rURL = OUString( "$BRAND_BASE_DIR/" ); + rURL += OUString::createFromAscii( pName ); + rURL += OUString::createFromAscii( pExt ); rtl::Bootstrap::expandMacros( rURL ); if (!rURL.isEmpty()) @@ -209,16 +209,16 @@ static void showDocument( const char* pBaseName ) try { Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() ); Sequence < com::sun::star::beans::PropertyValue > args(2); - args[0].Name = ::rtl::OUString("ViewOnly"); + args[0].Name = OUString("ViewOnly"); args[0].Value <<= sal_True; - args[1].Name = ::rtl::OUString("ReadOnly"); + args[1].Name = OUString("ReadOnly"); args[1].Value <<= sal_True; - rtl::OUString aURL; + OUString aURL; if ( checkURL ( pBaseName, ".odt", aURL ) || checkURL ( pBaseName, ".html", aURL ) || checkURL ( pBaseName, "", aURL ) ) { - xDesktop->loadComponentFromURL( aURL, ::rtl::OUString("_blank"), 0, args ); + xDesktop->loadComponentFromURL( aURL, OUString("_blank"), 0, args ); } } catch (const ::com::sun::star::uno::Exception &) { } @@ -286,7 +286,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) return; } - SfxStringItem aNameItem( SID_FILE_NAME, rtl::OUString("vnd.sun.star.cmd:logout") ); + SfxStringItem aNameItem( SID_FILE_NAME, OUString("vnd.sun.star.cmd:logout") ); SfxStringItem aReferer( SID_REFERER, "private/user" ); pAppData_Impl->pAppDispat->Execute( SID_OPENDOC, SFX_CALLMODE_SLOT, &aNameItem, &aReferer, 0L ); return; @@ -428,14 +428,14 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_SEND_FEEDBACK: { - ::rtl::OUString module = SfxHelp::GetCurrentModuleIdentifier(); - ::rtl::OUString sURL("http://hub.libreoffice.org/send-feedback/?LOversion=" + utl::ConfigManager::getAboutBoxProductVersion() + + OUString module = SfxHelp::GetCurrentModuleIdentifier(); + OUString sURL("http://hub.libreoffice.org/send-feedback/?LOversion=" + utl::ConfigManager::getAboutBoxProductVersion() + "&LOlocale=" + utl::ConfigManager::getLocale() + "&LOmodule=" + module.copy(module.lastIndexOf(".") + 1 ) ); try { uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) ); - xSystemShellExecute->execute( sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); } catch ( uno::Exception& ) { @@ -462,7 +462,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) Help* pHelp = Application::GetHelp(); if ( pHelp ) { - pHelp->Start( rtl::OUString(".uno:HelpIndex"), NULL ); // show start page + pHelp->Start( OUString(".uno:HelpIndex"), NULL ); // show start page bDone = true; } break; @@ -658,7 +658,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) { try { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; } catch ( const ::com::sun::star::uno::RuntimeException& ) @@ -672,12 +672,12 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) if ( xLayoutManager.is() ) { - rtl::OUString aToolbarResName( "private:resource/toolbar/" ); - rtl::OUStringBuffer aBuf( aToolbarResName ); + OUString aToolbarResName( "private:resource/toolbar/" ); + OUStringBuffer aBuf( aToolbarResName ); aBuf.append( pToolbarName->GetValue() ); // Evaluate Parameter - rtl::OUString aToolbarName( aBuf.makeStringAndClear() ); + OUString aToolbarName( aBuf.makeStringAndClear() ); sal_Bool bShow( !xLayoutManager->isElementVisible( aToolbarName )); if ( bShow ) @@ -843,18 +843,18 @@ extern "C" void basicide_macro_organizer( sal_Int16 ); #endif -::rtl::OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, sal_Bool bChooseOnly, const ::rtl::OUString& rMacroDesc = ::rtl::OUString() ) +OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, sal_Bool bChooseOnly, const OUString& rMacroDesc = OUString() ) { #ifndef DISABLE_DYNLOADING // get basctl dllname - static ::rtl::OUString aLibName( SVLIBRARY( "basctl" ) ); + static OUString aLibName( SVLIBRARY( "basctl" ) ); // load module oslModule handleMod = osl_loadModuleRelative( &thisModule, aLibName.pData, 0 ); // get symbol - ::rtl::OUString aSymbol( "basicide_choose_macro" ); + OUString aSymbol( "basicide_choose_macro" ); basicide_choose_macro pSymbol = (basicide_choose_macro) osl_getFunctionSymbol( handleMod, aSymbol.pData ); #else #define pSymbol basicide_choose_macro @@ -862,7 +862,7 @@ extern "C" void basicide_macro_organizer( sal_Int16 ); // call basicide_choose_macro in basctl rtl_uString* pScriptURL = pSymbol( rxLimitToDocument.get(), bChooseOnly, rMacroDesc.pData ); - ::rtl::OUString aScriptURL( pScriptURL ); + OUString aScriptURL( pScriptURL ); rtl_uString_release( pScriptURL ); return aScriptURL; @@ -875,14 +875,14 @@ void MacroOrganizer( sal_Int16 nTabId ) { #ifndef DISABLE_DYNLOADING // get basctl dllname - static ::rtl::OUString aLibName( SVLIBRARY( "basctl" ) ); + static OUString aLibName( SVLIBRARY( "basctl" ) ); // load module oslModule handleMod = osl_loadModuleRelative( &thisModule, aLibName.pData, 0 ); // get symbol - ::rtl::OUString aSymbol( "basicide_macro_organizer" ); + OUString aSymbol( "basicide_macro_organizer" ); basicide_macro_organizer pSymbol = (basicide_macro_organizer) osl_getFunctionSymbol( handleMod, aSymbol.pData ); // call basicide_macro_organizer in basctl pSymbol( nTabId ); @@ -928,9 +928,9 @@ namespace return _pFallback; } - const ::rtl::OUString& lcl_getBasicIDEServiceName() + const OUString& lcl_getBasicIDEServiceName() { - static const ::rtl::OUString s_sBasicName( "com.sun.star.script.BasicIDE" ); + static const OUString s_sBasicName( "com.sun.star.script.BasicIDE" ); return s_sBasicName; } @@ -960,7 +960,7 @@ namespace try { Reference < XFrame > xFrame( xContainer->getByIndex(i), UNO_QUERY_THROW ); - ::rtl::OUString sModule = xCheck->identify( xFrame ); + OUString sModule = xCheck->identify( xFrame ); if ( sModule == "com.sun.star.frame.StartModule" ) return xFrame; } @@ -984,13 +984,13 @@ namespace #endif // !DISABLE_SCRIPTING } -static ::rtl::OUString getConfigurationStringValue( - const ::rtl::OUString& rPackage, - const ::rtl::OUString& rRelPath, - const ::rtl::OUString& rKey, - const ::rtl::OUString& rDefaultValue ) +static OUString getConfigurationStringValue( + const OUString& rPackage, + const OUString& rRelPath, + const OUString& rKey, + const OUString& rDefaultValue ) { - ::rtl::OUString aDefVal( rDefaultValue ); + OUString aDefVal( rDefaultValue ); try { @@ -1060,29 +1060,29 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) css::system::SystemShellExecute::create(xContext) ); // read repository URL from configuration - ::rtl::OUString sTemplRepoURL = + OUString sTemplRepoURL = getConfigurationStringValue( - ::rtl::OUString("org.openoffice.Office.Common"), - ::rtl::OUString("Dictionaries"), - ::rtl::OUString("RepositoryURL"), - ::rtl::OUString()); + OUString("org.openoffice.Office.Common"), + OUString("Dictionaries"), + OUString("RepositoryURL"), + OUString()); if ( xSystemShell.is() && !sTemplRepoURL.isEmpty() ) { - ::rtl::OUStringBuffer aURLBuf( sTemplRepoURL ); + OUStringBuffer aURLBuf( sTemplRepoURL ); aURLBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM("?lang=")); // read locale from configuration - ::rtl::OUString sLocale = getConfigurationStringValue( - ::rtl::OUString("org.openoffice.Setup"), - ::rtl::OUString("L10N"), - ::rtl::OUString("ooLocale"), - ::rtl::OUString("en-US")); + OUString sLocale = getConfigurationStringValue( + OUString("org.openoffice.Setup"), + OUString("L10N"), + OUString("ooLocale"), + OUString("en-US")); aURLBuf.append( sLocale ); xSystemShell->execute( aURLBuf.makeStringAndClear(), - ::rtl::OUString(), + OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY ); } } @@ -1115,7 +1115,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) UNO_QUERY_THROW ); ::comphelper::NamedValueCollection aLoadArgs; aLoadArgs.put( "Model", pBasicIDE->GetModel() ); - aLoadArgs.put( "URL", ::rtl::OUString( "private:factory/sbasic" ) ); + aLoadArgs.put( "URL", OUString( "private:factory/sbasic" ) ); Reference< XFrame > xTargetFrame( lcl_findStartModuleFrame( xContext ) ); if ( !xTargetFrame.is() ) @@ -1264,8 +1264,8 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) aLanguage = ((SfxScriptOrganizerItem*)pItem)->getLanguage(); } - ::rtl::OUString aLang( aLanguage ); - OSL_TRACE("SfxApplication::OfaExec_Impl: about to create dialog for: %s", ::rtl::OUStringToOString( aLang , RTL_TEXTENCODING_ASCII_US ).pData->buffer); + OUString aLang( aLanguage ); + OSL_TRACE("SfxApplication::OfaExec_Impl: about to create dialog for: %s", OUStringToOString( aLang , RTL_TEXTENCODING_ASCII_US ).pData->buffer); // not sure about the Window* VclAbstractDialog* pDlg = pFact->CreateSvxScriptOrgDialog( GetTopWindow(), aLanguage ); if( pDlg ) @@ -1332,12 +1332,12 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< frame::XDispatchProvider > xProv = drawing::ModuleDispatcher::create( xContext ); - ::rtl::OUString aCmd = ::rtl::OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() ); + OUString aCmd = OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() ); Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) ); Sequence < beans::PropertyValue > aSeq; if ( rReq.GetArgs() ) TransformItems( rReq.GetSlot(), *rReq.GetArgs(), aSeq ); - Any aResult = xHelper->executeDispatch( xProv, aCmd, ::rtl::OUString(), 0, aSeq ); + Any aResult = xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aSeq ); frame::DispatchResultEvent aEvent; sal_Bool bSuccess = (aResult >>= aEvent) && (aEvent.State == frame::DispatchResultState::SUCCESS); @@ -1352,12 +1352,12 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< frame::XDispatchProvider > xProv = text::ModuleDispatcher::create( xContext ); - ::rtl::OUString aCmd = ::rtl::OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() ); + OUString aCmd = OUString::createFromAscii( GetInterface()->GetSlot( rReq.GetSlot() )->GetUnoName() ); Reference< frame::XDispatchHelper > xHelper( frame::DispatchHelper::create(xContext) ); Sequence < beans::PropertyValue > aSeq; if ( rReq.GetArgs() ) TransformItems( rReq.GetSlot(), *rReq.GetArgs(), aSeq ); - Any aResult = xHelper->executeDispatch( xProv, aCmd, ::rtl::OUString(), 0, aSeq ); + Any aResult = xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aSeq ); frame::DispatchResultEvent aEvent; sal_Bool bSuccess = (aResult >>= aEvent) && (aEvent.State == frame::DispatchResultState::SUCCESS); diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 62b2dfedc88b..9bc3e9e7578f 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -241,7 +241,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque if ( !pItem ) { #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "No creator method for item: ")); aStr.append(static_cast<sal_Int32>(nSlotId)); OSL_FAIL(aStr.getStr()); @@ -266,7 +266,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque #ifdef DBG_UTIL else { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); aStr.append(pSlot->pUnoName); OSL_FAIL( aStr.getStr() ); } @@ -276,8 +276,8 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque else if ( nSubCount == 0 ) { // for a simple property there can be only one parameter and its name *must* match - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property name does not match: ")); - aStr.append(rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8)); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property name does not match: ")); + aStr.append(OUStringToOString(aName, RTL_TEXTENCODING_UTF8)); OSL_FAIL( aStr.getStr() ); } #endif @@ -291,7 +291,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque // so this should be notified as a warning only if ( nCount != nSubCount ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "MacroPlayer: wrong number of parameters for slot: ")); aStr.append(static_cast<sal_Int32>(nSlotId)); DBG_WARNING(aStr.getStr()); @@ -306,7 +306,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque for ( nSub=0; nSub<nSubCount; nSub++ ) { // search sub item by name - rtl::OStringBuffer aStr; + OStringBuffer aStr; aStr.append(pSlot->pUnoName).append('.').append(pType->aAttrib[nSub].pName); if ( rPropValue.Name.equalsAsciiL(aStr.getStr(), aStr.getLength()) ) { @@ -318,7 +318,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque #ifdef DBG_UTIL else { - rtl::OStringBuffer aDbgStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); + OStringBuffer aDbgStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); aDbgStr.append(pSlot->pUnoName); OSL_FAIL( aDbgStr.getStr() ); } @@ -331,8 +331,8 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque if ( nSub >= nSubCount ) { // there was a parameter with a name that didn't match to any of the members - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property name does not match: ")); - aStr.append(rtl::OUStringToOString(rPropValue.Name, RTL_TEXTENCODING_UTF8)); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property name does not match: ")); + aStr.append(OUStringToOString(rPropValue.Name, RTL_TEXTENCODING_UTF8)); OSL_FAIL( aStr.getStr() ); } #endif @@ -361,7 +361,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque if ( !pItem ) { #ifdef DBG_UTIL - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("No creator method for argument: ")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("No creator method for argument: ")); aStr.append(rArg.pName); OSL_FAIL( aStr.getStr() ); #endif @@ -391,7 +391,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque #ifdef DBG_UTIL else { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); aStr.append(rArg.pName); OSL_FAIL( aStr.getStr() ); } @@ -420,7 +420,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque #ifdef DBG_UTIL else { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); aStr.append(rArg.pName); OSL_FAIL( aStr.getStr() ); } @@ -440,7 +440,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque for ( sal_uInt16 nSub=0; nSub<nSubCount; nSub++ ) { // search sub item by name - rtl::OStringBuffer aStr; + OStringBuffer aStr; aStr.append(rArg.pName).append('.').append(pType->aAttrib[nSub].pName); if ( rProp.Name.equalsAsciiL(aStr.getStr(), aStr.getLength()) ) { @@ -457,7 +457,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque // ... but it was not convertible bRet = sal_False; #ifdef DBG_UTIL - rtl::OStringBuffer aDbgStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); + OStringBuffer aDbgStr(RTL_CONSTASCII_STRINGPARAM("Property not convertable: ")); aDbgStr.append(rArg.pName); OSL_FAIL( aDbgStr.getStr() ); #endif @@ -488,7 +488,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque for ( sal_uInt16 n=0; n<nCount; n++ ) { const ::com::sun::star::beans::PropertyValue& rProp = pPropsVal[n]; - rtl::OUString aName = rProp.Name; + OUString aName = rProp.Name; if ( aName == sFrame ) { Reference< XFrame > xFrame; @@ -512,7 +512,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque ++nFoundArgs; #endif const ::com::sun::star::beans::PropertyValue& rProp = pPropsVal[n]; - rtl::OUString aName = rProp.Name; + OUString aName = rProp.Name; if ( aName == sModel ) rSet.Put( SfxUnoAnyItem( SID_DOCUMENT, rProp.Value ) ); else if ( aName == sComponentData ) @@ -721,7 +721,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sStandardDir ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for StandardDir" ); if (bOK) @@ -729,7 +729,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sBlackList ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > xVal; + ::com::sun::star::uno::Sequence< OUString > xVal; sal_Bool bOK = (rProp.Value >>= xVal); DBG_ASSERT( bOK, "invalid type or value for BlackList" ); if (bOK) @@ -741,7 +741,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sFileName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for FileName" ); if (bOK) @@ -749,7 +749,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sSalvagedFile ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = (rProp.Value >>= sVal); DBG_ASSERT( bOK, "invalid type or value for SalvagedFile" ); if (bOK) @@ -757,7 +757,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sFolderName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = (rProp.Value >>= sVal); DBG_ASSERT( bOK, "invalid type or value for FolderName" ); if (bOK) @@ -765,7 +765,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sFrameName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = (rProp.Value >>= sVal); DBG_ASSERT( bOK, "invalid type for FrameName" ); if (bOK && !sVal.isEmpty()) @@ -773,7 +773,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sMediaType ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for MediaType" ); if (bOK) @@ -781,7 +781,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sTemplateName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for TemplateName" ); if (bOK) @@ -789,7 +789,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sTemplateRegionName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for TemplateRegionName" ); if (bOK) @@ -797,7 +797,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sJumpMark ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for JumpMark" ); if (bOK) @@ -805,7 +805,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sCharacterSet ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for CharacterSet" ); if (bOK) @@ -813,7 +813,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sFilterFlags ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for FilterFlags" ); if (bOK) @@ -845,7 +845,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sDocumentTitle ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for DocumentTitle" ); if (bOK) @@ -853,7 +853,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sDocumentBaseURL ) { - ::rtl::OUString sVal; + OUString sVal; // the base url can be set to empty ( for embedded objects for example ) sal_Bool bOK = (rProp.Value >>= sVal); DBG_ASSERT( bOK, "invalid type or value for DocumentBaseURL" ); @@ -862,7 +862,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sHierarchicalDocumentName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for HierarchicalDocumentName" ); if (bOK) @@ -894,7 +894,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sSuggestedSaveAsDir ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for SuggestedSaveAsDir" ); if (bOK) @@ -902,7 +902,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if ( aName == sSuggestedSaveAsName ) { - ::rtl::OUString sVal; + OUString sVal; sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for SuggestedSaveAsName" ); if (bOK) @@ -910,7 +910,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque } else if (aName == sDocumentService) { - rtl::OUString aVal; + OUString aVal; bool bOK = ((rProp.Value >>= aVal) && !aVal.isEmpty()); if (bOK) rSet.Put(SfxStringItem(SID_DOC_SERVICE, aVal)); @@ -935,7 +935,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque String sName( rProp.Name ); if ( sName == sPropName ) { - ::rtl::OUString sURL; + OUString sURL; if ( rProp.Value >>= sURL ) rSet.Put( SfxStringItem( SID_OPTIONS_PAGEURL, sURL ) ); break; @@ -947,7 +947,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque if ( nFoundArgs == nCount ) { // except for the "special" slots: assure that every argument was convertible - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("MacroPlayer: Some properties didn't match to any formal argument for slot: ")); + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("MacroPlayer: Some properties didn't match to any formal argument for slot: ")); aStr.append(pSlot->pUnoName); DBG_WARNING( aStr.getStr() ); } @@ -996,7 +996,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta else { // we will not rely on the "toggle" ability of some property slots - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Processing property slot without argument: ")); aStr.append(static_cast<sal_Int32>(nSlotId)); OSL_FAIL(aStr.getStr()); @@ -1293,7 +1293,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta continue; } - rtl::OStringBuffer aDbg(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aDbg(RTL_CONSTASCII_STRINGPARAM( "Unknown item detected: ")); aDbg.append(static_cast<sal_Int32>(nId)); DBG_ASSERT(nArg<nFormalArgs, aDbg.getStr()); @@ -1321,10 +1321,10 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta sal_uInt16 nSubCount = pType->nAttribs; if ( !nSubCount ) { - pValue[nActProp].Name = rtl::OUString::createFromAscii(pSlot->pUnoName) ; + pValue[nActProp].Name = OUString::createFromAscii(pSlot->pUnoName) ; if ( !pItem->QueryValue( pValue[nActProp].Value ) ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Item not convertable: ")); aStr.append(static_cast<sal_Int32>(nSlotId)); OSL_FAIL(aStr.getStr()); @@ -1340,13 +1340,13 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta nSubId |= CONVERT_TWIPS; DBG_ASSERT(( pType->aAttrib[n-1].nAID ) <= 127, "Member ID out of range" ); - String aName( rtl::OUString::createFromAscii( pSlot->pUnoName ) ) ; + String aName( OUString::createFromAscii( pSlot->pUnoName ) ) ; aName += '.'; - aName += rtl::OUString::createFromAscii( pType->aAttrib[n-1].pName ) ; + aName += OUString::createFromAscii( pType->aAttrib[n-1].pName ) ; pValue[nActProp].Name = aName; if ( !pItem->QueryValue( pValue[nActProp++].Value, nSubId ) ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Sub item ")); aStr.append(static_cast<sal_Int32>( pType->aAttrib[n-1].nAID)); @@ -1374,10 +1374,10 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta sal_uInt16 nSubCount = rArg.pType->nAttribs; if ( !nSubCount ) { - pValue[nActProp].Name = rtl::OUString::createFromAscii( rArg.pName ) ; + pValue[nActProp].Name = OUString::createFromAscii( rArg.pName ) ; if ( !pItem->QueryValue( pValue[nActProp++].Value ) ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Item not convertable: ")); aStr.append(static_cast<sal_Int32>(rArg.nSlotId)); OSL_FAIL(aStr.getStr()); @@ -1393,13 +1393,13 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta nSubId |= CONVERT_TWIPS; DBG_ASSERT((rArg.pType->aAttrib[n-1].nAID) <= 127, "Member ID out of range" ); - String aName( rtl::OUString::createFromAscii( rArg.pName ) ) ; + String aName( OUString::createFromAscii( rArg.pName ) ) ; aName += '.'; - aName += rtl::OUString::createFromAscii( rArg.pType->aAttrib[n-1].pName ) ; + aName += OUString::createFromAscii( rArg.pType->aAttrib[n-1].pName ) ; pValue[nActProp].Name = aName; if ( !pItem->QueryValue( pValue[nActProp++].Value, nSubId ) ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Sub item ")); aStr.append(static_cast<sal_Int32>( rArg.pType->aAttrib[n-1].nAID)); @@ -1419,67 +1419,67 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta const SfxPoolItem *pItem=0; if ( rSet.GetItemState( SID_COMPONENTDATA, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sComponentData); + pValue[nActProp].Name = OUString(sComponentData); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_COMPONENTCONTEXT, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sComponentContext); + pValue[nActProp].Name = OUString(sComponentContext); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_PROGRESS_STATUSBAR_CONTROL, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sStatusInd); + pValue[nActProp].Name = OUString(sStatusInd); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_INTERACTIONHANDLER, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sInteractionHdl); + pValue[nActProp].Name = OUString(sInteractionHdl); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_VIEW_DATA, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sViewData); + pValue[nActProp].Name = OUString(sViewData); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_FILTER_DATA, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sFilterData); + pValue[nActProp].Name = OUString(sFilterData); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_DOCUMENT, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sModel); + pValue[nActProp].Name = OUString(sModel); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_CONTENT, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sUCBContent); + pValue[nActProp].Name = OUString(sUCBContent); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_INPUTSTREAM, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sInputStream); + pValue[nActProp].Name = OUString(sInputStream); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_STREAM, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sStream); + pValue[nActProp].Name = OUString(sStream); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_OUTPUTSTREAM, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sOutputStream); + pValue[nActProp].Name = OUString(sOutputStream); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_POSTDATA, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sPostData); + pValue[nActProp].Name = OUString(sPostData); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_FILLFRAME, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sFrame); + pValue[nActProp].Name = OUString(sFrame); if ( pItem->ISA( SfxUsrAnyItem ) ) { OSL_FAIL( "TransformItems: transporting an XFrame via an SfxUsrAnyItem is not deprecated!" ); @@ -1492,202 +1492,202 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta } if ( rSet.GetItemState( SID_TEMPLATE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sAsTemplate); + pValue[nActProp].Name = OUString(sAsTemplate); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_OPEN_NEW_VIEW, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sOpenNewView); + pValue[nActProp].Name = OUString(sOpenNewView); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_FAIL_ON_WARNING, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sFailOnWarning)); + pValue[nActProp].Name = OUString(RTL_CONSTASCII_USTRINGPARAM(sFailOnWarning)); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_VIEW_ID, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sViewId); + pValue[nActProp].Name = OUString(sViewId); pValue[nActProp++].Value <<= ( (sal_Int16) ((SfxUInt16Item*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_PLUGIN_MODE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sPluginMode); + pValue[nActProp].Name = OUString(sPluginMode); pValue[nActProp++].Value <<= ( (sal_Int16) ((SfxUInt16Item*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_DOC_READONLY, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sReadOnly); + pValue[nActProp].Name = OUString(sReadOnly); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_DDE_RECONNECT_ONLOAD, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sDdeReconnect); + pValue[nActProp].Name = OUString(sDdeReconnect); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_DOC_STARTPRESENTATION, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sStartPresentation); + pValue[nActProp].Name = OUString(sStartPresentation); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_SELECTION, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sSelectionOnly); + pValue[nActProp].Name = OUString(sSelectionOnly); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_HIDDEN, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sHidden); + pValue[nActProp].Name = OUString(sHidden); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_MINIMIZED, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sMinimized); + pValue[nActProp].Name = OUString(sMinimized); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_SILENT, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sSilent); + pValue[nActProp].Name = OUString(sSilent); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_PREVIEW, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sPreview); + pValue[nActProp].Name = OUString(sPreview); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_VIEWONLY, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sViewOnly); + pValue[nActProp].Name = OUString(sViewOnly); pValue[nActProp++].Value <<= (sal_Bool) (( ((SfxBoolItem*)pItem)->GetValue() )); } if ( rSet.GetItemState( SID_EDITDOC, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sDontEdit); + pValue[nActProp].Name = OUString(sDontEdit); pValue[nActProp++].Value <<= (sal_Bool) (!( ((SfxBoolItem*)pItem)->GetValue() )); } if ( rSet.GetItemState( SID_FILE_DIALOG, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sUseSystemDialog); + pValue[nActProp].Name = OUString(sUseSystemDialog); pValue[nActProp++].Value <<= (sal_Bool) ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_STANDARD_DIR, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sStandardDir); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sStandardDir); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_BLACK_LIST, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sBlackList); + pValue[nActProp].Name = OUString(sBlackList); - com::sun::star::uno::Sequence< rtl::OUString > aList; + com::sun::star::uno::Sequence< OUString > aList; ((SfxStringListItem*)pItem)->GetStringList( aList ); pValue[nActProp++].Value <<= aList ; } if ( rSet.GetItemState( SID_TARGETNAME, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sFrameName); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sFrameName); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_DOC_SALVAGE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sSalvagedFile); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sSalvagedFile); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_PATH, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sFolderName); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sFolderName); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_CONTENTTYPE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sMediaType); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sMediaType); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_TEMPLATE_NAME, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sTemplateName); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sTemplateName); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_TEMPLATE_REGIONNAME, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sTemplateRegionName); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sTemplateRegionName); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_JUMPMARK, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sJumpMark); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sJumpMark); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_CHARSET, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sCharacterSet); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sCharacterSet); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_MACROEXECMODE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sMacroExecMode); + pValue[nActProp].Name = OUString(sMacroExecMode); pValue[nActProp++].Value <<= ( (sal_Int16) ((SfxUInt16Item*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_UPDATEDOCMODE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sUpdateDocMode); + pValue[nActProp].Name = OUString(sUpdateDocMode); pValue[nActProp++].Value <<= ( (sal_Int16) ((SfxUInt16Item*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_REPAIRPACKAGE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sRepairPackage); + pValue[nActProp].Name = OUString(sRepairPackage); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_DOCINFO_TITLE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sDocumentTitle); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sDocumentTitle); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_DOC_BASEURL, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sDocumentBaseURL); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sDocumentBaseURL); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_DOC_HIERARCHICALNAME, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sHierarchicalDocumentName); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sHierarchicalDocumentName); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_COPY_STREAM_IF_POSSIBLE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sCopyStreamIfPossible); + pValue[nActProp].Name = OUString(sCopyStreamIfPossible); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_NOAUTOSAVE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sNoAutoSave); + pValue[nActProp].Name = OUString(sNoAutoSave); pValue[nActProp++].Value <<= ( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_MODIFYPASSWORDINFO, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sModifyPasswordInfo); + pValue[nActProp].Name = OUString(sModifyPasswordInfo); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_ENCRYPTIONDATA, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sEncryptionData); + pValue[nActProp].Name = OUString(sEncryptionData); pValue[nActProp++].Value = ( ((SfxUnoAnyItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_SUGGESTEDSAVEASDIR, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sSuggestedSaveAsDir); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sSuggestedSaveAsDir); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_SUGGESTEDSAVEASNAME, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sSuggestedSaveAsName); - pValue[nActProp++].Value <<= ( ::rtl::OUString(((SfxStringItem*)pItem)->GetValue()) ); + pValue[nActProp].Name = OUString(sSuggestedSaveAsName); + pValue[nActProp++].Value <<= ( OUString(((SfxStringItem*)pItem)->GetValue()) ); } if ( rSet.GetItemState( SID_DOC_SERVICE, sal_False, &pItem ) == SFX_ITEM_SET ) { - pValue[nActProp].Name = rtl::OUString(sDocumentService); - pValue[nActProp++].Value <<= rtl::OUString(static_cast<const SfxStringItem*>(pItem)->GetValue()); + pValue[nActProp].Name = OUString(sDocumentService); + pValue[nActProp++].Value <<= OUString(static_cast<const SfxStringItem*>(pItem)->GetValue()); } } } @@ -1733,7 +1733,7 @@ SfxObjectShell* SfxMacroLoader::GetObjectShell_Impl() // ----------------------------------------------------------------------- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SfxMacroLoader::queryDispatch( const ::com::sun::star::util::URL& aURL , - const ::rtl::OUString& /*sTargetFrameName*/, + const OUString& /*sTargetFrameName*/, sal_Int32 /*nSearchFlags*/ ) throw( ::com::sun::star::uno::RuntimeException ) { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatcher; @@ -1822,7 +1822,7 @@ void SAL_CALL SfxMacroLoader::removeStatusListener( { } -ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star::uno::Any& rRetval, SfxObjectShell* pSh ) +ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, com::sun::star::uno::Any& rRetval, SfxObjectShell* pSh ) throw ( ::com::sun::star::uno::RuntimeException ) { #ifdef DISABLE_SCRIPTING @@ -1960,7 +1960,7 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star:: else { // direct API call on a specified object - rtl::OUStringBuffer aCall; + OUStringBuffer aCall; aCall.append('[').append(INetURLObject::decode(aMacro.Copy(6), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET)); aCall.append(']'); @@ -1988,7 +1988,7 @@ void SAL_CALL SfxAppDispatchProvider::initialize( const ::com::sun::star::uno::S Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch( const ::com::sun::star::util::URL& aURL, - const ::rtl::OUString& /*sTargetFrameName*/, + const OUString& /*sTargetFrameName*/, FrameSearchFlags /*eSearchFlags*/ ) throw( RuntimeException ) { sal_uInt16 nId( 0 ); @@ -2080,7 +2080,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( pAppSlotPool ) { const sal_uIntPtr nMode( SFX_SLOT_TOOLBOXCONFIG|SFX_SLOT_ACCELCONFIG|SFX_SLOT_MENUCONFIG ); - rtl::OUString aCmdPrefix( ".uno:" ); + OUString aCmdPrefix( ".uno:" ); // Gruppe anw"ahlen ( Gruppe 0 ist intern ) for ( sal_uInt16 i=0; i<pAppSlotPool->GetGroupCount(); i++ ) @@ -2097,7 +2097,7 @@ throw (::com::sun::star::uno::RuntimeException) if ( pSfxSlot->GetMode() & nMode ) { ::com::sun::star::frame::DispatchInformation aCmdInfo; - ::rtl::OUStringBuffer aBuf( aCmdPrefix ); + OUStringBuffer aBuf( aCmdPrefix ); aBuf.appendAscii( pSfxSlot->GetUnoName() ); aCmdInfo.Command = aBuf.makeStringAndClear(); aCmdInfo.GroupId = nCommandGroup; @@ -2231,7 +2231,7 @@ SFX2_DLLPUBLIC void* SAL_CALL sfx_component_getFactory( IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::IFrameObject ) IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::OwnSubFilterService ) if ( ::comp_SfxDocumentMetaData::_getImplementationName().equals( - ::rtl::OUString::createFromAscii( pImplementationName ) ) ) + OUString::createFromAscii( pImplementationName ) ) ) { xFactory = ::cppu::createSingleComponentFactory( ::comp_SfxDocumentMetaData::_create, @@ -2239,7 +2239,7 @@ SFX2_DLLPUBLIC void* SAL_CALL sfx_component_getFactory( ::comp_SfxDocumentMetaData::_getSupportedServiceNames()); } if ( ::comp_CompatWriterDocProps::_getImplementationName().equals( - ::rtl::OUString::createFromAscii( pImplementationName ) ) ) + OUString::createFromAscii( pImplementationName ) ) ) { xFactory = ::cppu::createSingleComponentFactory( ::comp_CompatWriterDocProps::_create, @@ -2282,7 +2282,7 @@ void SAL_CALL FilterOptionsContinuation::setFilterOptions( RequestFilterOptions::RequestFilterOptions( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > rModel, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties ) { - ::rtl::OUString temp; + OUString temp; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2; ::com::sun::star::document::FilterOptionsRequest aOptionsRequest( temp, temp2, @@ -2321,16 +2321,16 @@ class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper1< ::com::sun comphelper::OInteractionDisapprove* m_pDisapprove; public: - RequestPackageReparation_Impl( ::rtl::OUString aName ); + RequestPackageReparation_Impl( OUString aName ); sal_Bool isApproved(); virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException ); }; -RequestPackageReparation_Impl::RequestPackageReparation_Impl( ::rtl::OUString aName ) +RequestPackageReparation_Impl::RequestPackageReparation_Impl( OUString aName ) { - ::rtl::OUString temp; + OUString temp; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2; ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp, temp2, @@ -2361,7 +2361,7 @@ sal_Bool RequestPackageReparation_Impl::isApproved() return m_lContinuations; } -RequestPackageReparation::RequestPackageReparation( ::rtl::OUString aName ) +RequestPackageReparation::RequestPackageReparation( OUString aName ) { pImp = new RequestPackageReparation_Impl( aName ); pImp->acquire(); @@ -2390,15 +2390,15 @@ class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper1< ::com::sun::sta comphelper::OInteractionAbort* m_pAbort; public: - NotifyBrokenPackage_Impl( ::rtl::OUString aName ); + NotifyBrokenPackage_Impl( OUString aName ); virtual ::com::sun::star::uno::Any SAL_CALL getRequest() throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( ::com::sun::star::uno::RuntimeException ); }; -NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( ::rtl::OUString aName ) +NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( OUString aName ) { - ::rtl::OUString temp; + OUString temp; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > temp2; ::com::sun::star::document::BrokenPackageRequest aBrokenPackageRequest( temp, temp2, @@ -2422,7 +2422,7 @@ NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( ::rtl::OUString aName ) return m_lContinuations; } -NotifyBrokenPackage::NotifyBrokenPackage( ::rtl::OUString aName ) +NotifyBrokenPackage::NotifyBrokenPackage( OUString aName ) { pImp = new NotifyBrokenPackage_Impl( aName ); pImp->acquire(); diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 0df98290416b..9740cad2b9ba 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -278,7 +278,7 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo) { sal_uInt16 nID = GetType(); - rtl::OUStringBuffer aWinData; + OUStringBuffer aWinData; aWinData.append('V').append(static_cast<sal_Int32>(nVersion)). append(',').append(rInfo.bVisible ? 'V' : 'H').append(','). append(static_cast<sal_Int32>(rInfo.nFlags)); @@ -289,10 +289,10 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo) } SvtViewOptions aWinOpt( E_WINDOW, OUString::number( nID ) ); - aWinOpt.SetWindowState(rtl::OStringToOUString(rInfo.aWinState, RTL_TEXTENCODING_UTF8)); + aWinOpt.SetWindowState(OStringToOUString(rInfo.aWinState, RTL_TEXTENCODING_UTF8)); ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString("Data"); + aSeq[0].Name = OUString("Data"); aSeq[0].Value <<= aWinData.makeStringAndClear(); aWinOpt.SetUserData( aSeq ); @@ -357,12 +357,12 @@ void SfxChildWindow::InitializeChildWinFactory_Impl( sal_uInt16 nId, SfxChildWin ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt.GetUserData(); - ::rtl::OUString aTmp; + OUString aTmp; if ( aSeq.getLength() ) aSeq[0].Value >>= aTmp; String aWinData( aTmp ); - rInfo.aWinState = rtl::OUStringToOString(aWinOpt.GetWindowState(), RTL_TEXTENCODING_UTF8); + rInfo.aWinState = OUStringToOString(aWinOpt.GetWindowState(), RTL_TEXTENCODING_UTF8); if ( aWinData.Len() ) diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index da4412e42421..3fc73f07be01 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -99,7 +99,7 @@ sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData, // The media in the application must be opened to lookup the // relative file links!! This is done through the link manager // of the Storage. - rData <<= rtl::OUString( sFileNm ); + rData <<= OUString( sFileNm ); } break; @@ -197,7 +197,7 @@ sal_Bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData, break; case FILETYPE_OBJECT: // TODO/LATER: possibility to insert a new object - rData <<= rtl::OUString( sFileNm ); + rData <<= OUString( sFileNm ); break; } return sal_True/*0 != aTypeList.Count()*/; @@ -381,15 +381,15 @@ String impl_getFilter( const String& _rURL ) { css::uno::Reference< ::com::sun::star::document::XTypeDetection > xTypeDetection( ::comphelper::getProcessServiceFactory()->createInstance( - ::rtl::OUString("com.sun.star.document.TypeDetection") ), + OUString("com.sun.star.document.TypeDetection") ), css::uno::UNO_QUERY ); if ( xTypeDetection.is() ) { ::comphelper::MediaDescriptor aDescr; - aDescr[ ::comphelper::MediaDescriptor::PROP_URL() ] <<= ::rtl::OUString( _rURL ); + aDescr[ ::comphelper::MediaDescriptor::PROP_URL() ] <<= OUString( _rURL ); css::uno::Sequence< css::beans::PropertyValue > aDescrList = aDescr.getAsConstPropertyValueList(); - ::rtl::OUString sType = xTypeDetection->queryTypeByDescriptor( aDescrList, sal_True ); + OUString sType = xTypeDetection->queryTypeByDescriptor( aDescrList, sal_True ); if ( !sType.isEmpty() ) { css::uno::Reference< css::container::XNameAccess > xTypeCont( xTypeDetection, @@ -398,7 +398,7 @@ String impl_getFilter( const String& _rURL ) { ::comphelper::SequenceAsHashMap lTypeProps( xTypeCont->getByName( sType ) ); sFilter = lTypeProps.getUnpackedValueOrDefault( - ::rtl::OUString("PreferredFilter"), ::rtl::OUString() ); + OUString("PreferredFilter"), OUString() ); } } } @@ -606,7 +606,7 @@ void SvFileObject::SendStateChg_Impl( sfx2::LinkManager::LinkState nState ) if( !bStateChangeCalled && HasDataLinks() ) { css::uno::Any aAny; - aAny <<= rtl::OUString::valueOf( (sal_Int32)nState ); + aAny <<= OUString::valueOf( (sal_Int32)nState ); DataChanged( SotExchange::GetFormatName( sfx2::LinkManager::RegisterStatusInfoId()), aAny ); bStateChangeCalled = sal_True; diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx index 3d9cbe8ee5fd..3073e896d366 100644 --- a/sfx2/source/appl/helpdispatch.cxx +++ b/sfx2/source/appl/helpdispatch.cxx @@ -66,7 +66,7 @@ void SAL_CALL HelpDispatch_Impl::dispatch( { if ( 0 == ( *pBegin ).Name.compareToAscii( "HelpKeyword" ) ) { - rtl::OUString sHelpKeyword; + OUString sHelpKeyword; if ( ( ( *pBegin ).Value >>= sHelpKeyword ) && !sHelpKeyword.isEmpty() ) { sKeyword = String( sHelpKeyword ); diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index cac32bf9f5c7..3be6436e5466 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -134,7 +134,7 @@ sal_Bool HelpInterceptor_Impl::HasHistorySucc() const Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( - const URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) + const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw( RuntimeException ) @@ -218,12 +218,12 @@ void SAL_CALL HelpInterceptor_Impl::setMasterDispatchProvider( const Reference< // ----------------------------------------------------------------------- // XInterceptorInfo -Sequence< ::rtl::OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs() +Sequence< OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs() throw( RuntimeException ) { - Sequence< ::rtl::OUString > aURLList( 1 ); + Sequence< OUString > aURLList( 1 ); aURLList[0] = "vnd.sun.star.help://*"; return aURLList; } diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx index 1bf5c3ae6ea9..8d8a0ff46fa7 100644 --- a/sfx2/source/appl/helpinterceptor.hxx +++ b/sfx2/source/appl/helpinterceptor.hxx @@ -87,7 +87,7 @@ public: // XDispatchProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL - queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); + queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException); @@ -100,7 +100,7 @@ public: virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMaster ) throw(::com::sun::star::uno::RuntimeException); // XInterceptorInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getInterceptedURLs( ) throw(::com::sun::star::uno::RuntimeException); // XDispatch diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx index 8f0447bf4689..67e440650f31 100644 --- a/sfx2/source/appl/imagemgr.cxx +++ b/sfx2/source/appl/imagemgr.cxx @@ -50,15 +50,15 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::com::sun::star::ui; -typedef boost::unordered_map< ::rtl::OUString, +typedef boost::unordered_map< OUString, WeakReference< XImageManager >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > ModuleIdToImagegMgr; + OUStringHash, + ::std::equal_to< OUString > > ModuleIdToImagegMgr; Image SAL_CALL GetImage( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - const ::rtl::OUString& aURL, + const OUString& aURL, bool bBig ) { @@ -76,7 +76,7 @@ Image SAL_CALL GetImage( if ( xController.is() ) xModel = xController->getModel(); - rtl::OUString aCommandURL( aURL ); + OUString aCommandURL( aURL ); if ( nProtocol == INET_PROT_SLOT ) { sal_uInt16 nId = ( sal_uInt16 ) String(aURL).Copy(5).ToInt32(); @@ -98,11 +98,11 @@ Image SAL_CALL GetImage( if ( pSlot ) { - aCommandURL = rtl::OUString( ".uno:" ); - aCommandURL += rtl::OUString::createFromAscii( pSlot->GetUnoName() ); + aCommandURL = OUString( ".uno:" ); + aCommandURL += OUString::createFromAscii( pSlot->GetUnoName() ); } else - aCommandURL = rtl::OUString(); + aCommandURL = OUString(); } Reference< XImageManager > xDocImgMgr; @@ -124,7 +124,7 @@ Image SAL_CALL GetImage( if ( xDocImgMgr.is() ) { Sequence< Reference< ::com::sun::star::graphic::XGraphic > > aGraphicSeq; - Sequence< rtl::OUString > aImageCmdSeq( 1 ); + Sequence< OUString > aImageCmdSeq( 1 ); aImageCmdSeq[0] = aCommandURL; try @@ -156,7 +156,7 @@ Image SAL_CALL GetImage( if ( !aCommandURL.isEmpty() ) { Reference< XImageManager > xModuleImageManager; - rtl::OUString aModuleId = xModuleManager->identify( rFrame ); + OUString aModuleId = xModuleManager->identify( rFrame ); static ModuleIdToImagegMgr m_aModuleIdToImageMgrMap; @@ -183,7 +183,7 @@ Image SAL_CALL GetImage( } Sequence< Reference< ::com::sun::star::graphic::XGraphic > > aGraphicSeq; - Sequence< rtl::OUString > aImageCmdSeq( 1 ); + Sequence< OUString > aImageCmdSeq( 1 ); aImageCmdSeq[0] = aCommandURL; aGraphicSeq = xModuleImageManager->getImages( nImageType, aImageCmdSeq ); diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index cd645b7da1b4..5644f7803edb 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -95,7 +95,7 @@ void ImeStatusWindow::init() { sal_Bool bShow = sal_Bool(); if (getConfig()->getPropertyValue( - rtl::OUString( + OUString( "ShowStatusWindow")) >>= bShow) Application::ShowImeStatusWindow(bShow); @@ -114,7 +114,7 @@ bool ImeStatusWindow::isShowing() { sal_Bool bShow = sal_Bool(); if (getConfig()->getPropertyValue( - rtl::OUString("ShowStatusWindow")) + OUString("ShowStatusWindow")) >>= bShow) return bShow; } @@ -133,7 +133,7 @@ void ImeStatusWindow::show(bool bShow) { css::uno::Reference< css::beans::XPropertySet > xConfig(getConfig()); xConfig->setPropertyValue( - rtl::OUString("ShowStatusWindow"), + OUString("ShowStatusWindow"), css::uno::makeAny(static_cast< sal_Bool >(bShow))); css::uno::Reference< css::util::XChangesBatch > xCommit( xConfig, css::uno::UNO_QUERY); @@ -162,7 +162,7 @@ ImeStatusWindow::~ImeStatusWindow() try { m_xConfig->removePropertyChangeListener( - rtl::OUString("ShowStatusWindow"), + OUString("ShowStatusWindow"), m_xConfigListener); } catch (css::uno::Exception &) @@ -201,15 +201,15 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() throw css::lang::DisposedException(); if (!m_xContext.is()) throw css::uno::RuntimeException( - rtl::OUString( + OUString( "null comphelper::getProcessServiceFactory"), 0); css::uno::Reference< css::lang::XMultiServiceFactory > xProvider = css::configuration::theDefaultProvider::get( m_xContext ); css::beans::PropertyValue aArg( - rtl::OUString("nodepath"), -1, + OUString("nodepath"), -1, css::uno::makeAny( - rtl::OUString( + OUString( "/org.openoffice.Office.Common/I18N/InputMethod")), css::beans::PropertyState_DIRECT_VALUE); css::uno::Sequence< css::uno::Any > aArgs(1); @@ -217,13 +217,13 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() m_xConfig = css::uno::Reference< css::beans::XPropertySet >( xProvider->createInstanceWithArguments( - rtl::OUString( + OUString( "com.sun.star.configuration.ConfigurationUpdateAccess"), aArgs), css::uno::UNO_QUERY); if (!m_xConfig.is()) throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString(RTL_CONSTASCII_USTRINGPARAM( "null com.sun.star.configuration." "ConfigurationUpdateAccess")), 0); @@ -238,7 +238,7 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig() // no dispose notifications): m_xConfigListener = new WeakPropertyChangeListener(this); xConfig->addPropertyChangeListener( - rtl::OUString("ShowStatusWindow"), + OUString("ShowStatusWindow"), m_xConfigListener); } return xConfig; diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 686ca3c28092..dfa3948862ae 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -186,7 +186,7 @@ sal_Bool SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/, pRequest->Execute(); } - ::rtl::OUString aEmptyStr; + OUString aEmptyStr; rData <<= aEmptyStr; } return 0 == pConnection->GetError(); @@ -230,7 +230,7 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink ) { sal_Bool bSysTopic; { - DdeConnection aTmp(sServer, rtl::OUString("SYSTEM")); + DdeConnection aTmp(sServer, OUString("SYSTEM")); bSysTopic = !aTmp.GetError(); } @@ -247,9 +247,9 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink ) // Server not up, try once more to start it. if( !bInWinExec ) { - rtl::OStringBuffer aCmdLine(rtl::OUStringToOString(sServer, RTL_TEXTENCODING_ASCII_US)); + OStringBuffer aCmdLine(OUStringToOString(sServer, RTL_TEXTENCODING_ASCII_US)); aCmdLine.append(RTL_CONSTASCII_STRINGPARAM(".exe ")); - aCmdLine.append(rtl::OUStringToOString(sTopic, RTL_TEXTENCODING_ASCII_US)); + aCmdLine.append(OUStringToOString(sTopic, RTL_TEXTENCODING_ASCII_US)); if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) < 32 ) nError = DDELINK_ERROR_APP; diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 182bed8cdf1b..d5e6451f77d2 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -49,8 +49,6 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Reference; using ::com::sun::star::lang::XComponent; using ::com::sun::star::util::XCloseable; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace sfx2 { @@ -285,8 +283,8 @@ bool LinkManager::GetDisplayNames( const SvBaseLink * pLink, } bool LinkManager::GetDisplayNames( - const SvBaseLink* pLink, rtl::OUString* pType, rtl::OUString* pFile, - rtl::OUString* pLinkStr, rtl::OUString* pFilter) const + const SvBaseLink* pLink, OUString* pType, OUString* pFile, + OUString* pLinkStr, OUString* pFilter) const { String aType, aFile, aLinkStr, aFilter; bool bRet = GetDisplayNames(pLink, &aType, &aFile, &aLinkStr, &aFilter); @@ -436,7 +434,7 @@ void LinkManager::ReconnectDdeLink(SfxObjectShell& rServer) // DDE connections between OOo apps are always named 'soffice'. continue; - rtl::OUString aTmp; + OUString aTmp; OUString aURL = aFile; if (utl::LocalFileHelper::ConvertPhysicalNameToURL(aFile, aTmp)) aURL = aTmp; @@ -486,13 +484,13 @@ bool LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink, } bool LinkManager::InsertFileLink( - sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const rtl::OUString& rFileNm, - const rtl::OUString* pFilterNm, const rtl::OUString* pRange) + sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const OUString& rFileNm, + const OUString* pFilterNm, const OUString* pRange) { if (!(OBJECT_CLIENT_SO & rLink.GetObjType())) return false; - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; aBuf.append(rFileNm); aBuf.append(sfx2::cTokenSeperator); @@ -535,7 +533,7 @@ sal_uIntPtr LinkManager::RegisterStatusInfoId() if( !nFormat ) { nFormat = SotExchange::RegisterFormatName( - rtl::OUString("StatusInfo from SvxInternalLink")); + OUString("StatusInfo from SvxInternalLink")); } return nFormat; } @@ -689,7 +687,7 @@ sal_Bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) SfxStringItem aName( SID_FILE_NAME, sTopic ); SfxBoolItem aMinimized(SID_MINIMIZED, sal_True); SfxBoolItem aHidden(SID_HIDDEN, sal_True); - SfxStringItem aTarget( SID_TARGETNAME, rtl::OUString("_blank") ); + SfxStringItem aTarget( SID_TARGETNAME, OUString("_blank") ); SfxStringItem aReferer( SID_REFERER, sReferer ); SfxUInt16Item aUpdate( SID_UPDATEDOCMODE, nUpdateMode ); SfxBoolItem aReadOnly(SID_DOC_READONLY, false); diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index f649c603f354..c3c2f39155e4 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -581,7 +581,7 @@ void ImplDdeItem::AdviseLoop( sal_Bool bOpen ) // A connection is re-established if( OBJECT_DDE_EXTERN == pLink->GetObjType() ) { - pLink->GetObj()->AddDataAdvise( pLink, rtl::OUString("text/plain;charset=utf-16"), ADVISEMODE_NODATA ); + pLink->GetObj()->AddDataAdvise( pLink, OUString("text/plain;charset=utf-16"), ADVISEMODE_NODATA ); pLink->GetObj()->AddConnectAdvise( pLink ); } } @@ -603,7 +603,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) String sNm( rLinkName ); sal_Int32 nTokenPos = 0; - rtl::OUString sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); + OUString sService( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); DdeServices& rSvc = DdeService::GetServices(); for (DdeServices::iterator aI = rSvc.begin(); aI != rSvc.end(); ++aI) @@ -612,7 +612,7 @@ static DdeTopic* FindTopic( const String & rLinkName, sal_uInt16* pItemStt ) if( pService->GetName() == sService ) { // then we search for the Topic - rtl::OUString sTopic( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); + OUString sTopic( sNm.GetToken( 0, cTokenSeperator, nTokenPos ) ); if( pItemStt ) *pItemStt = nTokenPos; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 052c7063a44d..b75168c91ca9 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -374,7 +374,7 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) { pEntry = InsertEntry( aTitle, aDocumentImage, aDocumentImage, pParent ); Any aAny( ::utl::UCBContentHelper::GetProperty( aURL, String("TargetURL" ) ) ); - rtl::OUString aTargetURL; + OUString aTargetURL; if ( aAny >>= aTargetURL ) pEntry->SetUserData( new ContentEntry_Impl( aTargetURL, sal_False ) ); } @@ -570,7 +570,7 @@ namespace sfx2 { struct equalOUString { - bool operator()( const ::rtl::OUString& rKey1, const ::rtl::OUString& rKey2 ) const + bool operator()( const OUString& rKey1, const OUString& rKey2 ) const { return !!( rKey1 == rKey2 ); } @@ -579,20 +579,20 @@ namespace sfx2 { struct hashOUString { - size_t operator()( const ::rtl::OUString& rName ) const + size_t operator()( const OUString& rName ) const { return rName.hashCode(); } }; - typedef ::boost::unordered_map< ::rtl::OUString, int, hashOUString, equalOUString > KeywordInfo; + typedef ::boost::unordered_map< OUString, int, hashOUString, equalOUString > KeywordInfo; } #define UNIFY_AND_INSERT_TOKEN( aToken ) \ it = \ aInfo.insert( sfx2::KeywordInfo::value_type( aToken, 0 ) ).first; \ if ( ( tmp = it->second++ ) != 0 ) \ - nPos = aIndexCB.InsertEntry( aToken + rtl::OUString( append, tmp ) ); \ + nPos = aIndexCB.InsertEntry( aToken + OUString( append, tmp ) ); \ else \ nPos = aIndexCB.InsertEntry( aToken ) @@ -629,7 +629,7 @@ void IndexTabPage_Impl::InitializeIndex() ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo = aCnt.getProperties(); if ( xInfo->hasPropertyByName( PROPERTY_ANCHORREF ) ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > aPropSeq( 4 ); + ::com::sun::star::uno::Sequence< OUString > aPropSeq( 4 ); aPropSeq[0] = PROPERTY_KEYWORDLIST; aPropSeq[1] = PROPERTY_KEYWORDREF; aPropSeq[2] = PROPERTY_ANCHORREF; @@ -639,10 +639,10 @@ void IndexTabPage_Impl::InitializeIndex() ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aAnySeq = aCnt.getPropertyValues( aPropSeq ); - ::com::sun::star::uno::Sequence< ::rtl::OUString > aKeywordList; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > aKeywordRefList; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > aAnchorRefList; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > aTitleRefList; + ::com::sun::star::uno::Sequence< OUString > aKeywordList; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > aKeywordRefList; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > aAnchorRefList; + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > aTitleRefList; if ( ( aAnySeq[0] >>= aKeywordList ) && ( aAnySeq[1] >>= aKeywordRefList ) && ( aAnySeq[2] >>= aAnchorRefList ) && ( aAnySeq[3] >>= aTitleRefList ) ) @@ -650,18 +650,18 @@ void IndexTabPage_Impl::InitializeIndex() sal_Bool insert; sal_uInt16 nPos; int ndx,tmp; - ::rtl::OUString aIndex, aTempString; - ::rtl::OUStringBuffer aData( 128 ); // Capacity of up to 128 characters + OUString aIndex, aTempString; + OUStringBuffer aData( 128 ); // Capacity of up to 128 characters sfx2::KeywordInfo::iterator it; for ( int i = 0; i < aKeywordList.getLength(); ++i ) { // abi: Do not copy, but use references - const ::rtl::OUString& aKeywordPair = aKeywordList[i]; + const OUString& aKeywordPair = aKeywordList[i]; DBG_ASSERT( !aKeywordPair.isEmpty(), "invalid help index" ); - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRefList = aKeywordRefList[i]; - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aAnchorList = aAnchorRefList[i]; - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aTitleList = aTitleRefList[i]; + const ::com::sun::star::uno::Sequence< OUString >& aRefList = aKeywordRefList[i]; + const ::com::sun::star::uno::Sequence< OUString >& aAnchorList = aAnchorRefList[i]; + const ::com::sun::star::uno::Sequence< OUString >& aTitleList = aTitleRefList[i]; DBG_ASSERT( aRefList.getLength() == aAnchorList.getLength(),"reference list and title list of different length" ); @@ -677,7 +677,7 @@ void IndexTabPage_Impl::InitializeIndex() } } else - aIndex = ::rtl::OUString(); + aIndex = OUString(); // Assume the token is trimed UNIFY_AND_INSERT_TOKEN( aKeywordPair ); @@ -976,7 +976,7 @@ SearchTabPage_Impl::SearchTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl { String aUserData; Any aUserItem = aViewOpt.GetUserItem( USERITEM_NAME ); - ::rtl::OUString aTemp; + OUString aTemp; if ( aUserItem >>= aTemp ) { aUserData = String( aTemp ); @@ -1012,7 +1012,7 @@ SearchTabPage_Impl::~SearchTabPage_Impl() for ( sal_uInt16 i = 0; i < nCount; ++i ) { - rtl::OUString aText = aSearchED.GetEntry(i); + OUString aText = aSearchED.GetEntry(i); aUserData += String(INetURLObject::encode( aText, INetURLObject::PART_UNO_PARAM_VALUE, '%', INetURLObject::ENCODE_ALL )); @@ -1020,7 +1020,7 @@ SearchTabPage_Impl::~SearchTabPage_Impl() } aUserData = comphelper::string::stripEnd(aUserData, ';'); - Any aUserItem = makeAny( ::rtl::OUString( aUserData ) ); + Any aUserItem = makeAny( OUString( aUserData ) ); aViewOpt.SetUserItem( USERITEM_NAME, aUserItem ); } @@ -1217,8 +1217,8 @@ sal_Bool SearchTabPage_Impl::OpenKeyword( const String& rKeyword ) void GetBookmarkEntry_Impl ( Sequence< PropertyValue >& aBookmarkEntry, - ::rtl::OUString& rTitle, - ::rtl::OUString& rURL + OUString& rTitle, + OUString& rURL ) { for ( int i = 0; i < aBookmarkEntry.getLength(); i++ ) @@ -1247,13 +1247,13 @@ BookmarksBox_Impl::~BookmarksBox_Impl() // save bookmarks to configuration SvtHistoryOptions aHistOpt; aHistOpt.Clear( eHELPBOOKMARKS ); - rtl::OUString sEmpty; + OUString sEmpty; sal_uInt16 nCount = GetEntryCount(); for ( sal_uInt16 i = 0; i < nCount; ++i ) { String aTitle = GetEntry(i); String* pURL = (String*)(sal_uIntPtr)GetEntryData(i); - aHistOpt.AppendItem( eHELPBOOKMARKS, rtl::OUString( *pURL ), sEmpty, rtl::OUString( aTitle ), sEmpty ); + aHistOpt.AppendItem( eHELPBOOKMARKS, OUString( *pURL ), sEmpty, OUString( aTitle ), sEmpty ); delete pURL; } } @@ -1279,7 +1279,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) { String* pURL = (String*)(sal_uIntPtr)GetEntryData( nPos ); RemoveEntry( nPos ); - rtl::OUString aImageURL = IMAGE_URL; + OUString aImageURL = IMAGE_URL; aImageURL += INetURLObject( *pURL ).GetHost(); nPos = InsertEntry( aDlg.GetTitle(), SvFileInformationManager::GetImage( aImageURL, false ) ); SetEntryData( nPos, (void*)(sal_uIntPtr)( new String( *pURL ) ) ); @@ -1366,8 +1366,8 @@ BookmarksTabPage_Impl::BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindo Sequence< Sequence< PropertyValue > > aBookmarkSeq; aBookmarkSeq = SvtHistoryOptions().GetList( eHELPBOOKMARKS ); - ::rtl::OUString aTitle; - ::rtl::OUString aURL; + OUString aTitle; + OUString aURL; sal_uInt32 i, nCount = aBookmarkSeq.getLength(); for ( i = 0; i < nCount; ++i ) @@ -1452,18 +1452,18 @@ String BookmarksTabPage_Impl::GetSelectEntry() const void BookmarksTabPage_Impl::AddBookmarks( const String& rTitle, const String& rURL ) { - rtl::OUString aImageURL = IMAGE_URL; + OUString aImageURL = IMAGE_URL; aImageURL += INetURLObject( rURL ).GetHost(); sal_uInt16 nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( aImageURL, false ) ); aBookmarksBox.SetEntryData( nPos, (void*)(sal_uIntPtr)( new String( rURL ) ) ); } -::rtl::OUString SfxHelpWindow_Impl::buildHelpURL(const ::rtl::OUString& sFactory , - const ::rtl::OUString& sContent , - const ::rtl::OUString& sAnchor , +OUString SfxHelpWindow_Impl::buildHelpURL(const OUString& sFactory , + const OUString& sContent , + const OUString& sAnchor , sal_Bool bUseQuestionMark) { - ::rtl::OUStringBuffer sHelpURL(256); + OUStringBuffer sHelpURL(256); sHelpURL.append(HELP_URL); sHelpURL.append(sFactory); sHelpURL.append(sContent); @@ -1473,7 +1473,7 @@ void BookmarksTabPage_Impl::AddBookmarks( const String& rTitle, const String& rU return sHelpURL.makeStringAndClear(); } -void SfxHelpWindow_Impl::loadHelpContent(const ::rtl::OUString& sHelpURL, sal_Bool bAddToHistory) +void SfxHelpWindow_Impl::loadHelpContent(const OUString& sHelpURL, sal_Bool bAddToHistory) { Reference< XComponentLoader > xLoader(getTextFrame(), UNO_QUERY); if (!xLoader.is()) @@ -2006,7 +2006,7 @@ long TextWin_Impl::Notify( NotifyEvent& rNEvt ) // remove docking area acceptor from layoutmanager, so it will not layout anything further .-) static void lcl_disableLayoutOfFrame(const Reference< XFrame >& xFrame) { - static const ::rtl::OUString PROP_LAYOUT_MANAGER("LayoutManager"); + static const OUString PROP_LAYOUT_MANAGER("LayoutManager"); Reference< XPropertySet > xPropSet(xFrame, UNO_QUERY_THROW); xPropSet->setPropertyValue(PROP_LAYOUT_MANAGER, makeAny(Reference< XLayoutManager >())); @@ -2160,9 +2160,9 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XInterface > xConfig; - ::rtl::OUString sPath( PATH_OFFICE_FACTORIES ); + OUString sPath( PATH_OFFICE_FACTORIES ); sPath += sCurrentFactory; - ::rtl::OUString sKey( KEY_HELP_ON_OPEN ); + OUString sKey( KEY_HELP_ON_OPEN ); // Attention: This check boy knows two states: // 1) Reading of the config key fails with an exception or by getting an empty Any (!) => check box must be hidden @@ -2195,7 +2195,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) if ( xConfiguration.is() ) { - ::rtl::OUString sTemp; + OUString sTemp; sKey = KEY_UI_NAME; try { @@ -2213,7 +2213,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) { // set module name in checkbox text String sText( aOnStartupText ); - sText.SearchAndReplace( rtl::OUString("%MODULENAME"), sModuleName ); + sText.SearchAndReplace( OUString("%MODULENAME"), sModuleName ); aOnStartupCB.SetText( sText ); // and show it aOnStartupCB.Show(); @@ -2479,7 +2479,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox ) if ( xConfiguration.is() ) { sal_Bool bChecked = pBox->IsChecked(); - ::rtl::OUString sPath( PATH_OFFICE_FACTORIES ); + OUString sPath( PATH_OFFICE_FACTORIES ); sPath += sCurrentFactory; try { @@ -2575,7 +2575,7 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) aURL.Complete = ".uno:SelectTextMode"; PARSE_URL( aURL ); Reference < XDispatch > xDisp = xProv.is() ? - xProv->queryDispatch( aURL, rtl::OUString(), 0 ) : Reference < XDispatch >(); + xProv->queryDispatch( aURL, OUString(), 0 ) : Reference < XDispatch >(); if(xDisp.is()) { HelpStatusListener_Impl* pStateListener; @@ -2720,7 +2720,7 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const { Reference < XText > xText = xRange->getText(); Reference < XPropertySet > xProps( xText->createTextCursorByRange( xRange ), UNO_QUERY ); - ::rtl::OUString sStyleName; + OUString sStyleName; if ( xProps->getPropertyValue( "PageStyleName" ) >>= sStyleName ) { Reference < XStyleFamiliesSupplier > xStyles( xController->getModel(), UNO_QUERY ); @@ -2936,7 +2936,7 @@ void SfxHelpWindow_Impl::LoadConfig() bIndex = aViewOpt.IsVisible(); String aUserData; Any aUserItem = aViewOpt.GetUserItem( USERITEM_NAME ); - rtl::OUString aTemp; + OUString aTemp; if ( aUserItem >>= aTemp ) { aUserData = String( aTemp ); @@ -2994,16 +2994,16 @@ void SfxHelpWindow_Impl::SaveConfig() aUserData += ';'; aUserData += OUString::number( aWinPos.Y() ); - aViewOpt.SetUserItem( USERITEM_NAME, makeAny( rtl::OUString( aUserData ) ) ); + aViewOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( aUserData ) ) ); } // ----------------------------------------------------------------------- void SfxHelpWindow_Impl::ShowStartPage() { - ::rtl::OUString sHelpURL = SfxHelpWindow_Impl::buildHelpURL(pIndexWin->GetFactory(), + OUString sHelpURL = SfxHelpWindow_Impl::buildHelpURL(pIndexWin->GetFactory(), "/start", - ::rtl::OUString(), + OUString(), sal_True); loadHelpContent(sHelpURL); } @@ -3031,16 +3031,16 @@ IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl) if ( aEntry.Len() < 1 ) return 0; - ::rtl::OUString sHelpURL; + OUString sHelpURL; - bool bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString("vnd.sun.star.help"),0); + bool bComplete = OUString(aEntry).toAsciiLowerCase().match(OUString("vnd.sun.star.help"),0); if (bComplete) - sHelpURL = ::rtl::OUString(aEntry); + sHelpURL = OUString(aEntry); else { String aId; - String aAnchor = rtl::OUString('#'); + String aAnchor = OUString('#'); if ( comphelper::string::getTokenCount(aEntry, '#') == 2 ) { aId = aEntry.GetToken( 0, '#' ); @@ -3093,7 +3093,7 @@ IMPL_LINK( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl*, pListener ) // ----------------------------------------------------------------------- -void SfxHelpWindow_Impl::openDone(const ::rtl::OUString& sURL , +void SfxHelpWindow_Impl::openDone(const OUString& sURL , sal_Bool bSuccess) { INetURLObject aObj( sURL ); @@ -3327,7 +3327,7 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId ) if ( xInfo->hasPropertyByName( PROPERTY_TITLE ) ) { ::com::sun::star::uno::Any aAny = aCnt.getPropertyValue( PROPERTY_TITLE ); - rtl::OUString aValue; + OUString aValue; if ( aAny >>= aValue ) { String aTitle( aValue ); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index a43477762a67..a3ed34e3ccb9 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -440,7 +440,7 @@ private: String aIndexOffText; String aSearchText; String aOnStartupText; - ::rtl::OUString sCurrentFactory; + OUString sCurrentFactory; SfxHelpWindow_Impl* pHelpWin; Window* pTextWin; @@ -568,15 +568,15 @@ public: sal_Bool HasHistoryPredecessor() const; // forward to interceptor sal_Bool HasHistorySuccessor() const; // forward to interceptor - void openDone(const ::rtl::OUString& sURL , + void openDone(const OUString& sURL , sal_Bool bSuccess); - static ::rtl::OUString buildHelpURL(const ::rtl::OUString& sFactory , - const ::rtl::OUString& sContent , - const ::rtl::OUString& sAnchor , + static OUString buildHelpURL(const OUString& sFactory , + const OUString& sContent , + const OUString& sAnchor , sal_Bool bUseQuestionMark); - void loadHelpContent(const ::rtl::OUString& sHelpURL , + void loadHelpContent(const OUString& sHelpURL , sal_Bool bAddToHistory = sal_True); }; @@ -598,7 +598,7 @@ public: }; /// Appends ?Language=xy&System=abc to the help URL in rURL -void AppendConfigToken(OUStringBuffer& rURL, sal_Bool bQuestionMark, const OUString &rLang = rtl::OUString()); +void AppendConfigToken(OUStringBuffer& rURL, sal_Bool bQuestionMark, const OUString &rLang = OUString()); #endif // #ifndef INCLUDED_SFX_NEWHELP_HXX diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx index b80a1678b4db..97a6a7812f1d 100644 --- a/sfx2/source/appl/openuriexternally.cxx +++ b/sfx2/source/appl/openuriexternally.cxx @@ -50,19 +50,19 @@ #include "app.hrc" bool sfx2::openUriExternally( - rtl::OUString const & uri, bool handleSystemShellExecuteException) + OUString const & uri, bool handleSystemShellExecuteException) { css::uno::Reference< css::system::XSystemShellExecute > exec( css::system::SystemShellExecute::create(comphelper::getProcessComponentContext())); try { exec->execute( - uri, rtl::OUString(), + uri, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY); return true; } catch (css::lang::IllegalArgumentException & e) { if (e.ArgumentPosition != 0) { throw css::uno::RuntimeException( - (rtl::OUString( + (OUString( "unexpected IllegalArgumentException: ") + e.Message), css::uno::Reference< css::uno::XInterface >()); diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 8bb2ffc6b3a1..1da4614d1255 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -66,40 +66,40 @@ class StringLength : public ::cppu::WeakImplHelper1< XStringWidth > virtual ~StringLength() {} // XStringWidth - sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString ) + sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) throw (::com::sun::star::uno::RuntimeException) { return aString.getLength(); } }; -void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const ::rtl::OUString& aURLString, sal_uInt32 nNo ) +void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const OUString& aURLString, sal_uInt32 nNo ) { - ::rtl::OUStringBuffer aPickEntry; + OUStringBuffer aPickEntry; if ( nNo < 9 ) { aPickEntry.append('~'); - aPickEntry.append(::rtl::OUString::valueOf(static_cast<sal_Int32>(nNo + 1))); + aPickEntry.append(OUString::valueOf(static_cast<sal_Int32>(nNo + 1))); } else if ( nNo == 9 ) aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM("1~0")); else - aPickEntry.append(::rtl::OUString::valueOf(static_cast<sal_Int32>(nNo + 1))); + aPickEntry.append(OUString::valueOf(static_cast<sal_Int32>(nNo + 1))); aPickEntry.appendAscii(RTL_CONSTASCII_STRINGPARAM(": ")); INetURLObject aURL( aURLString ); - rtl::OUString aTipHelpText; - rtl::OUString aAccessibleName = aPickEntry.toString(); + OUString aTipHelpText; + OUString aAccessibleName = aPickEntry.toString(); if ( aURL.GetProtocol() == INET_PROT_FILE ) { // Do handle file URL differently => convert it to a system // path and abbreviate it with a special function: - ::rtl::OUString aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); + OUString aFileSystemPath( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) ); - ::rtl::OUString aSystemPath( aFileSystemPath ); - ::rtl::OUString aCompactedSystemPath; + OUString aSystemPath( aFileSystemPath ); + OUString aCompactedSystemPath; aTipHelpText = aSystemPath; aAccessibleName += aSystemPath; @@ -118,7 +118,7 @@ void SfxPickList::CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, cons else { // Use INetURLObject to abbreviate all other URLs - ::rtl::OUString aShortURL; + OUString aShortURL; aShortURL = aURL.getAbbreviated( m_xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS ); aPickEntry.append(aShortURL); aTipHelpText = aURLString; @@ -167,7 +167,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) return; // Help not in History - INetURLObject aURL( pDocSh->IsDocShared() ? pDocSh->GetSharedFileURL() : ::rtl::OUString( pMed->GetOrigURL() ) ); + INetURLObject aURL( pDocSh->IsDocShared() ? pDocSh->GetSharedFileURL() : OUString( pMed->GetOrigURL() ) ); if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP ) return; @@ -183,8 +183,8 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) if ( !SfxViewFrame::GetFirst( pDocSh, sal_True ) ) return; - ::rtl::OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST); - ::rtl::OUString aFilter; + OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST); + OUString aFilter; const SfxFilter* pFilter = pMed->GetOrigFilter(); if ( pFilter ) aFilter = pFilter->GetFilterName(); @@ -197,7 +197,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) OUString() ); if ( aURL.GetProtocol() == INET_PROT_FILE ) - Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : ::rtl::OUString() ); + Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : OUString() ); } SfxPickList& SfxPickList::Get() @@ -234,9 +234,9 @@ void SfxPickList::CreatePickListEntries() Sequence< PropertyValue > seqPropertySet = seqPicklist[ nItem ]; INetURLObject aURL; - ::rtl::OUString sURL; - ::rtl::OUString sFilter; - ::rtl::OUString sTitle; + OUString sURL; + OUString sFilter; + OUString sTitle; sal_uInt32 nPropertyCount = seqPropertySet.getLength(); for( sal_uInt32 nProperty=0; nProperty<nPropertyCount; ++nProperty ) @@ -286,7 +286,7 @@ void SfxPickList::CreateMenuEntries( Menu* pMenu ) != MENUITEM_SEPARATOR && m_nAllowedMenuSize ) pMenu->InsertSeparator(); - rtl::OUString aEmptyString; + OUString aEmptyString; for ( sal_uInt32 i = 0; i < m_aPicklistVector.size(); i++ ) { PickListEntry* pEntry = GetPickListEntry( i ); @@ -316,7 +316,7 @@ void SfxPickList::ExecuteEntry( sal_uInt32 nIndex ) sal_uInt16 nPos=aFilter.Search('|'); if( nPos != STRING_NOTFOUND ) { - rtl::OUString aOptions(aFilter.Copy(nPos).GetBuffer()+1); + OUString aOptions(aFilter.Copy(nPos).GetBuffer()+1); aFilter.Erase( nPos ); aReq.AppendItem( SfxStringItem(SID_FILE_FILTEROPTIONS, aOptions)); } @@ -387,12 +387,12 @@ void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint ) return; // Help not in History - INetURLObject aURL( pDocSh->IsDocShared() ? pDocSh->GetSharedFileURL() : ::rtl::OUString( pMed->GetOrigURL() ) ); + INetURLObject aURL( pDocSh->IsDocShared() ? pDocSh->GetSharedFileURL() : OUString( pMed->GetOrigURL() ) ); if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP ) return; - ::rtl::OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST); - ::rtl::OUString aFilter; + OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST); + OUString aFilter; const SfxFilter* pFilter = pMed->GetOrigFilter(); if ( pFilter ) aFilter = pFilter->GetFilterName(); @@ -425,7 +425,7 @@ void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint ) // not a "new" document) to the "Recent Documents" list before we // switch to the new path. // If the current document is new, path will be empty. - rtl::OUString path = pMedium->GetOrigURL(); + OUString path = pMedium->GetOrigURL(); if (!path.isEmpty()) { AddDocumentToPickList(pDocSh); diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 59af38e54694..2fa5ba902b54 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -69,7 +69,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; using namespace ::com::sun::star::ui::dialogs; #ifdef WNT -using ::rtl::OUString; #else using namespace ::rtl; #endif @@ -280,7 +279,7 @@ ShutdownIcon::~ShutdownIcon() // --------------------------------------------------------------------------- -void ShutdownIcon::OpenURL( const ::rtl::OUString& aURL, const ::rtl::OUString& rTarget, const Sequence< PropertyValue >& aArgs ) +void ShutdownIcon::OpenURL( const OUString& aURL, const OUString& rTarget, const Sequence< PropertyValue >& aArgs ) { if ( getInstance() && getInstance()->m_xDesktop.is() ) { @@ -344,16 +343,16 @@ void ShutdownIcon::FromTemplate() if ( xProv.is() ) { if ( aTargetURL.Protocol.compareToAscii("slot:") == COMPARE_EQUAL ) - xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDisp = xProv->queryDispatch( aTargetURL, OUString(), 0 ); else - xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString("_blank"), 0 ); + xDisp = xProv->queryDispatch( aTargetURL, OUString("_blank"), 0 ); } if ( xDisp.is() ) { Sequence<PropertyValue> aArgs(1); PropertyValue* pArg = aArgs.getArray(); - pArg[0].Name = rtl::OUString("Referer"); - pArg[0].Value <<= ::rtl::OUString("private:user"); + pArg[0].Name = OUString("Referer"); + pArg[0].Value <<= OUString("private:user"); Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY ); if ( xNotifyer.is() ) { @@ -800,7 +799,7 @@ static OUString getAutostartDir( bool bCreate = false ) } #endif -rtl::OUString ShutdownIcon::getShortcutName() +OUString ShutdownIcon::getShortcutName() { #ifndef ENABLE_QUICKSTART_APPLET return OUString(); diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index bbcef09d31a8..958c59d3c267 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -85,7 +85,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase oslGenericFunction *pDeInit ); static void EnterModalMode(); static void LeaveModalMode(); - static rtl::OUString getShortcutName(); + static OUString getShortcutName(); friend class SfxNotificationListener_Impl; @@ -103,7 +103,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase static void addTerminateListener(); static void FileOpen(); - static void OpenURL( const ::rtl::OUString& aURL, const ::rtl::OUString& rTarget, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& = + static void OpenURL( const OUString& aURL, const OUString& rTarget, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& = ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >( 0 ) ); static void FromTemplate(); @@ -115,10 +115,10 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > GetWrapperFactory( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xSMgr ); - static ::rtl::OUString GetImplementationName_static(); + static OUString GetImplementationName_static(); - ::rtl::OUString GetResString( int id ); - ::rtl::OUString GetUrlDescription( const ::rtl::OUString& aUrl ); + OUString GetResString( int id ); + OUString GetUrlDescription( const OUString& aUrl ); void SetVeto( bool bVeto ) { m_bVeto = bVeto;} bool GetVeto() { return m_bVeto; } @@ -162,8 +162,8 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop2 > m_xDesktop; #ifdef WNT - static void EnableAutostartW32( const rtl::OUString &aShortcutName ); - static rtl::OUString GetAutostartFolderNameW32(); + static void EnableAutostartW32( const OUString &aShortcutName ); + static OUString GetAutostartFolderNameW32(); #endif }; diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 5d3fef78480d..2d3ecf7c0e8a 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -201,8 +201,8 @@ static void add_ugly_db_item( GtkMenuShell *pMenuShell, const char *pAsciiURL, Sequence < Sequence < PropertyValue > > aMenu = aOpt.GetMenu( E_NEWMENU ); for ( sal_Int32 n=0; n<aMenu.getLength(); n++ ) { - ::rtl::OUString aURL; - ::rtl::OUString aDescription; + OUString aURL; + OUString aDescription; Sequence < PropertyValue >& aEntry = aMenu[n]; for ( sal_Int32 m=0; m<aEntry.getLength(); m++ ) { @@ -223,10 +223,10 @@ static void add_ugly_db_item( GtkMenuShell *pMenuShell, const char *pAsciiURL, static GtkWidget * add_image_menu_item( GtkMenuShell *pMenuShell, const gchar *stock_id, - rtl::OUString aLabel, + OUString aLabel, GCallback activate_cb ) { - OString aUtfLabel = rtl::OUStringToOString (aLabel, RTL_TEXTENCODING_UTF8 ); + OString aUtfLabel = OUStringToOString (aLabel, RTL_TEXTENCODING_UTF8 ); GtkWidget *pImage; pImage = gtk_image_new_from_stock( stock_id, GTK_ICON_SIZE_MENU ); @@ -372,7 +372,7 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray() OString aLabel; ShutdownIcon *pShutdownIcon = ShutdownIcon::getInstance(); - aLabel = rtl::OUStringToOString ( + aLabel = OUStringToOString ( pShutdownIcon->GetResString( STR_QUICKSTART_TIP ), RTL_TEXTENCODING_UTF8 ); @@ -397,9 +397,9 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray() #ifdef ENABLE_GIO GFile* pFile = NULL; - rtl::OUString sLibraryFileUrl; + OUString sLibraryFileUrl; if (osl::Module::getUrlFromAddress(plugin_init_sys_tray, sLibraryFileUrl)) - pFile = g_file_new_for_uri(rtl::OUStringToOString(sLibraryFileUrl, RTL_TEXTENCODING_UTF8).getStr()); + pFile = g_file_new_for_uri(OUStringToOString(sLibraryFileUrl, RTL_TEXTENCODING_UTF8).getStr()); if (pFile) { diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 3220bb5c4a86..dbff12d75fb3 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -169,17 +169,17 @@ static HMENU createSystrayMenu( ) #if defined(USE_APP_SHORTCUTS) // collect the URLs of the entries in the File/New menu - ::std::set< ::rtl::OUString > aFileNewAppsAvailable; + ::std::set< OUString > aFileNewAppsAvailable; SvtDynamicMenuOptions aOpt; Sequence < Sequence < PropertyValue > > aNewMenu = aOpt.GetMenu( E_NEWMENU ); - const ::rtl::OUString sURLKey( "URL" ); + const OUString sURLKey( "URL" ); const Sequence< PropertyValue >* pNewMenu = aNewMenu.getConstArray(); const Sequence< PropertyValue >* pNewMenuEnd = aNewMenu.getConstArray() + aNewMenu.getLength(); for ( ; pNewMenu != pNewMenuEnd; ++pNewMenu ) { ::comphelper::SequenceAsHashMap aEntryItems( *pNewMenu ); - ::rtl::OUString sURL( aEntryItems.getUnpackedValueOrDefault( sURLKey, ::rtl::OUString() ) ); + OUString sURL( aEntryItems.getUnpackedValueOrDefault( sURLKey, OUString() ) ); if ( sURL.getLength() ) aFileNewAppsAvailable.insert( sURL ); } @@ -210,7 +210,7 @@ static HMENU createSystrayMenu( ) // the complete application is not even installed continue; - ::rtl::OUString sURL( ::rtl::OUString::createFromAscii( aMenuItems[i].pAsciiURLDescription ) ); + OUString sURL( OUString::createFromAscii( aMenuItems[i].pAsciiURLDescription ) ); if ( aFileNewAppsAvailable.find( sURL ) == aFileNewAppsAvailable.end() ) // the application is installed, but the entry has been configured to *not* appear in the File/New @@ -834,7 +834,7 @@ bool ShutdownIcon::IsQuickstarterInstalled() return FileExistsW( reinterpret_cast<LPCWSTR>(quickstartExe.getStr()) ); } -void ShutdownIcon::EnableAutostartW32( const rtl::OUString &aShortcut ) +void ShutdownIcon::EnableAutostartW32( const OUString &aShortcut ) { wchar_t aPath[_MAX_PATH]; GetModuleFileNameW( NULL, aPath, _MAX_PATH-1); diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 410810257777..2f43e60e81ba 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -195,7 +195,7 @@ void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFr if ( xPropSet.is() ) { aValue = xPropSet->getPropertyValue( - ::rtl::OUString( "LockCount" ) ); + OUString( "LockCount" ) ); aValue >>= m_pWrkWin->m_nLock; } } @@ -327,7 +327,7 @@ namespace class FilledToolBarResIdToResourceURLMap { private: - typedef boost::unordered_map< sal_Int32, rtl::OUString > ToolBarResIdToResourceURLMap; + typedef boost::unordered_map< sal_Int32, OUString > ToolBarResIdToResourceURLMap; ToolBarResIdToResourceURLMap m_aResIdToResourceURLMap; public: FilledToolBarResIdToResourceURLMap() @@ -335,19 +335,19 @@ namespace sal_Int32 nIndex( 0 ); while ( pToolBarResToName[nIndex].nId != 0 ) { - rtl::OUString aResourceURL( rtl::OUString::createFromAscii( pToolBarResToName[nIndex].pName )); + OUString aResourceURL( OUString::createFromAscii( pToolBarResToName[nIndex].pName )); m_aResIdToResourceURLMap.insert( ToolBarResIdToResourceURLMap::value_type( sal_Int32( pToolBarResToName[nIndex].nId ), aResourceURL )); ++nIndex; } } - rtl::OUString findURL(sal_uInt16 nResId) const + OUString findURL(sal_uInt16 nResId) const { ToolBarResIdToResourceURLMap::const_iterator aIter = m_aResIdToResourceURLMap.find( nResId ); if ( aIter != m_aResIdToResourceURLMap.end() ) return aIter->second; - return rtl::OUString(); + return OUString(); } }; @@ -358,7 +358,7 @@ namespace }; } -static rtl::OUString GetResourceURLFromResId( sal_uInt16 nResId ) +static OUString GetResourceURLFromResId( sal_uInt16 nResId ) { return theFilledToolBarResIdToResourceURLMap::get().findURL(nResId); } @@ -1387,14 +1387,14 @@ void SfxWorkWindow::UpdateObjectBars_Impl() bool bModesMatching = ( nUpdateMode && ( nTbxMode & nUpdateMode) == nUpdateMode ); if ( bDestroy ) { - rtl::OUString aTbxId( m_aTbxTypeName ); + OUString aTbxId( m_aTbxTypeName ); aTbxId += GetResourceURLFromResId( aObjBarList[n].nId ); xLayoutManager->destroyElement( aTbxId ); } else if ( nId != 0 && ( ( bModesMatching && !bIsFullScreen ) || ( bIsFullScreen && bFullScreenTbx ) ) ) { - rtl::OUString aTbxId( m_aTbxTypeName ); + OUString aTbxId( m_aTbxTypeName ); aTbxId += GetResourceURLFromResId( aObjBarList[n].nId ); if ( !IsDockingAllowed() && !xLayoutManager->isElementFloating( aTbxId )) xLayoutManager->destroyElement( aTbxId ); @@ -1408,7 +1408,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl() else if ( nId != 0 ) { // Delete the Toolbox at this Position if possible - rtl::OUString aTbxId( m_aTbxTypeName ); + OUString aTbxId( m_aTbxTypeName ); aTbxId += GetResourceURLFromResId( aObjBarList[n].nId ); xLayoutManager->destroyElement( aTbxId ); } diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx index 302833dc9658..c71d29120658 100644 --- a/sfx2/source/appl/xpackcreator.cxx +++ b/sfx2/source/appl/xpackcreator.cxx @@ -35,18 +35,18 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OPackageStructureCreator::impl_getStaticSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OPackageStructureCreator::impl_getStaticSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.embed.PackageStructureCreator"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.embed.PackageStructureCreator"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.embed.PackageStructureCreator"); + aRet[1] = OUString("com.sun.star.comp.embed.PackageStructureCreator"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OPackageStructureCreator::impl_getStaticImplementationName() +OUString SAL_CALL OPackageStructureCreator::impl_getStaticImplementationName() { - return ::rtl::OUString("com.sun.star.comp.embed.PackageStructureCreator"); + return OUString("com.sun.star.comp.embed.PackageStructureCreator"); } //------------------------------------------------------------------------- @@ -68,7 +68,7 @@ uno::Reference< uno::XInterface > SAL_CALL OPackageStructureCreator::impl_static //------------------------------------------------------------------------- -void SAL_CALL OPackageStructureCreator::convertToPackage( const ::rtl::OUString& aFolderUrl, +void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolderUrl, const uno::Reference< io::XOutputStream >& xTargetStream ) throw ( io::IOException, uno::RuntimeException ) @@ -84,7 +84,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const ::rtl::OUString& { SvStream* pTempStream = NULL; - ::rtl::OUString aTempURL = ::utl::TempFile().GetURL(); + OUString aTempURL = ::utl::TempFile().GetURL(); try { if ( aContent.isFolder() ) { @@ -165,17 +165,17 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const ::rtl::OUString& } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OPackageStructureCreator::getImplementationName() +OUString SAL_CALL OPackageStructureCreator::getImplementationName() throw ( uno::RuntimeException ) { return impl_getStaticImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OPackageStructureCreator::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL OPackageStructureCreator::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_getStaticSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_getStaticSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName.compareTo( aSeq[nInd] ) == 0 ) @@ -185,7 +185,7 @@ sal_Bool SAL_CALL OPackageStructureCreator::supportsService( const ::rtl::OUStri } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OPackageStructureCreator::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OPackageStructureCreator::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_getStaticSupportedServiceNames(); diff --git a/sfx2/source/appl/xpackcreator.hxx b/sfx2/source/appl/xpackcreator.hxx index fa204aac0e02..3691d12900ac 100644 --- a/sfx2/source/appl/xpackcreator.hxx +++ b/sfx2/source/appl/xpackcreator.hxx @@ -41,9 +41,9 @@ public: OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); } - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_getStaticSupportedServiceNames(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames(); - static ::rtl::OUString SAL_CALL impl_getStaticImplementationName(); + static OUString SAL_CALL impl_getStaticImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > SAL_CALL impl_createFactory( @@ -54,12 +54,12 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); // XPackageStructureCreator - virtual void SAL_CALL convertToPackage( const ::rtl::OUString& aFolderUrl, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xTargetStream ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL convertToPackage( const OUString& aFolderUrl, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xTargetStream ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); }; |