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 | |
| 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')
134 files changed, 2426 insertions, 2435 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); }; diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 3acc3f0faef4..ff9d51ca88ac 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -247,12 +247,12 @@ const SfxFilter* SfxFilterContainer::GetDefaultFilter_Impl( const String& rName class SfxFilterMatcher_Impl { public: - ::rtl::OUString aName; + OUString aName; SfxFilterList_Impl* pList; // is created on demand void InitForIterating() const; void Update(); - SfxFilterMatcher_Impl(const ::rtl::OUString &rName) + SfxFilterMatcher_Impl(const OUString &rName) : aName(rName) , pList(0) { @@ -269,18 +269,18 @@ namespace public std::unary_function<SfxFilterMatcher_Impl, bool> { private: - const rtl::OUString& mrName; + const OUString& mrName; public: - hasName(const rtl::OUString &rName) : mrName(rName) {} + hasName(const OUString &rName) : mrName(rName) {} bool operator() (const SfxFilterMatcher_Impl& rImpl) const { return rImpl.aName == mrName; } }; - SfxFilterMatcher_Impl & getSfxFilterMatcher_Impl(const rtl::OUString &rName) + SfxFilterMatcher_Impl & getSfxFilterMatcher_Impl(const OUString &rName) { - rtl::OUString aName; + OUString aName; if (!rName.isEmpty()) aName = SfxObjectShell::GetServiceNameFromFactory(rName); @@ -307,7 +307,7 @@ SfxFilterMatcher::SfxFilterMatcher( const OUString& rName ) } SfxFilterMatcher::SfxFilterMatcher() - : m_rImpl( getSfxFilterMatcher_Impl(::rtl::OUString()) ) + : m_rImpl( getSfxFilterMatcher_Impl(OUString()) ) { // global FilterMatcher always uses global filter array (also created on // demand) @@ -380,8 +380,8 @@ sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent( SfxFilterFlags nMust, SfxFilterFlags nDont ) const { - Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.document.TypeDetection")), UNO_QUERY ); - ::rtl::OUString sTypeName; + Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(OUString("com.sun.star.document.TypeDetection")), UNO_QUERY ); + OUString sTypeName; try { sTypeName = xDetection->queryTypeByURL( rMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); @@ -415,19 +415,19 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c const SfxFilter* pOldFilter = *ppFilter; // no detection service -> nothing to do ! - Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.document.TypeDetection")), UNO_QUERY ); + Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(OUString("com.sun.star.document.TypeDetection")), UNO_QUERY ); if (!xDetection.is()) return ERRCODE_ABORT; - ::rtl::OUString sTypeName; + OUString sTypeName; try { // open the stream one times only ... // Otherwhise it will be tried more then once and show the same interaction more then once ... - ::rtl::OUString sURL( rMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); + OUString sURL( rMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ); ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInStream = rMedium.GetInputStream(); - rtl::OUString aFilterName; + OUString aFilterName; // stream exists => deep detection (with preselection ... if possible) if (xInStream.is()) @@ -443,8 +443,8 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c if ( pOldFilter ) { - aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME() ] <<= ::rtl::OUString( pOldFilter->GetTypeName() ); - aDescriptor[::comphelper::MediaDescriptor::PROP_FILTERNAME()] <<= ::rtl::OUString( pOldFilter->GetFilterName() ); + aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME() ] <<= OUString( pOldFilter->GetTypeName() ); + aDescriptor[::comphelper::MediaDescriptor::PROP_FILTERNAME()] <<= OUString( pOldFilter->GetFilterName() ); } ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > lDescriptor = aDescriptor.getAsConstPropertyValueList(); @@ -454,7 +454,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c { if (lDescriptor[i].Name == "FilterName") // Type detection picked a preferred filter for this format. - aFilterName = lDescriptor[i].Value.get<rtl::OUString>(); + aFilterName = lDescriptor[i].Value.get<OUString>(); } } // no stream exists => try flat detection without preselection as fallback @@ -476,7 +476,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c // The DocumentService property is only a preselection, and all preselections are considered as optional! // This "wrong" type will be sorted out now because we match only allowed filters to the detected type ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lQuery(1); - lQuery[0].Name = ::rtl::OUString("Name"); + lQuery[0].Name = OUString("Name"); lQuery[0].Value <<= sTypeName; pFilter = GetFilterForProps(lQuery, nMust, nDont); @@ -618,10 +618,10 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno: while ( xEnum->hasMoreElements() ) { ::comphelper::SequenceAsHashMap aProps( xEnum->nextElement() ); - ::rtl::OUString aValue; + OUString aValue; // try to get the preferred filter (works without loading all filters!) - if ( (aProps[::rtl::OUString("PreferredFilter")] >>= aValue) && !aValue.isEmpty() ) + if ( (aProps[OUString("PreferredFilter")] >>= aValue) && !aValue.isEmpty() ) { const SfxFilter* pFilter = SfxFilter::GetFilterByName( aValue ); if ( !pFilter || (pFilter->GetFilterFlags() & nMust) != nMust || (pFilter->GetFilterFlags() & nDont ) ) @@ -636,7 +636,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno: { // preferred filter belongs to another document type; now we must search the filter m_rImpl.InitForIterating(); - aProps[::rtl::OUString("Name")] >>= aValue; + aProps[OUString("Name")] >>= aValue; pFilter = GetFilter4EA( aValue, nMust, nDont ); if ( pFilter ) return pFilter; @@ -653,7 +653,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno: return 0; } -const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const ::rtl::OUString& rMediaType, SfxFilterFlags nMust, SfxFilterFlags nDont ) const +const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const OUString& rMediaType, SfxFilterFlags nMust, SfxFilterFlags nDont ) const { if ( m_rImpl.pList ) { @@ -669,7 +669,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const ::rtl::OUString& rMedia } com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString("MediaType"); + aSeq[0].Name = OUString("MediaType"); aSeq[0].Value <<= rMediaType; return GetFilterForProps( aSeq, nMust, nDont ); } @@ -698,8 +698,8 @@ const SfxFilter* SfxFilterMatcher::GetFilter4EA( const String& rType,SfxFilterFl } com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString("Name"); - aSeq[0].Value <<= ::rtl::OUString( rType ); + aSeq[0].Name = OUString("Name"); + aSeq[0].Value <<= OUString( rType ); return GetFilterForProps( aSeq, nMust, nDont ); } @@ -737,8 +737,8 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Extension( const String& rExt, SfxF sExt.Erase(0,1); com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); - aSeq[0].Name = ::rtl::OUString("Extensions"); - ::com::sun::star::uno::Sequence < ::rtl::OUString > aExts(1); + aSeq[0].Name = OUString("Extensions"); + ::com::sun::star::uno::Sequence < OUString > aExts(1); aExts[0] = sExt; aSeq[0].Value <<= aExts; return GetFilterForProps( aSeq, nMust, nDont ); @@ -750,8 +750,8 @@ const SfxFilter* SfxFilterMatcher::GetFilter4ClipBoardId( sal_uInt32 nId, SfxFil return 0; com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1); - ::rtl::OUString aName = SotExchange::GetFormatName( nId ); - aSeq[0].Name = ::rtl::OUString("ClipboardFormat"); + OUString aName = SotExchange::GetFormatName( nId ); + aSeq[0].Name = OUString("ClipboardFormat"); aSeq[0].Value <<= aName; return GetFilterForProps( aSeq, nMust, nDont ); } @@ -891,11 +891,11 @@ const SfxFilter* SfxFilterMatcherIter::Next() helper to build own formated string from given stringlist by using given seperator ---------------------------------------------------------------*/ -::rtl::OUString implc_convertStringlistToString( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& lList , +OUString implc_convertStringlistToString( const ::com::sun::star::uno::Sequence< OUString >& lList , const sal_Unicode& cSeperator, - const ::rtl::OUString& sPrefix ) + const OUString& sPrefix ) { - ::rtl::OUStringBuffer sString ( 1000 ) ; + OUStringBuffer sString ( 1000 ) ; sal_Int32 nCount = lList.getLength(); sal_Int32 nItem = 0 ; for( nItem=0; nItem<nCount; ++nItem ) @@ -915,13 +915,13 @@ const SfxFilter* SfxFilterMatcherIter::Next() void SfxFilterContainer::ReadSingleFilter_Impl( - const ::rtl::OUString& rName, + const OUString& rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG, sal_Bool bUpdate ) { - ::rtl::OUString sFilterName( rName ); + OUString sFilterName( rName ); SfxFilterList_Impl& rList = *pFilterArr; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > lFilterProperties; ::com::sun::star::uno::Any aResult; @@ -942,15 +942,15 @@ void SfxFilterContainer::ReadSingleFilter_Impl( sal_Int32 nClipboardId = 0 ; sal_Int32 nDocumentIconId = 0 ; sal_Int32 nFormatVersion = 0 ; - ::rtl::OUString sMimeType ; - ::rtl::OUString sType ; - ::rtl::OUString sUIName ; - ::rtl::OUString sHumanName ; - ::rtl::OUString sDefaultTemplate ; - ::rtl::OUString sUserData ; - ::rtl::OUString sExtension ; - ::rtl::OUString sPattern ; - ::rtl::OUString sServiceName ; + OUString sMimeType ; + OUString sType ; + OUString sUIName ; + OUString sHumanName ; + OUString sDefaultTemplate ; + OUString sUserData ; + OUString sExtension ; + OUString sPattern ; + OUString sServiceName ; // first get directly available properties sal_Int32 nFilterPropertyCount = lFilterProperties.getLength(); @@ -975,9 +975,9 @@ void SfxFilterContainer::ReadSingleFilter_Impl( } else if ( lFilterProperties[nFilterProperty].Name == "UserData" ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > lUserData; + ::com::sun::star::uno::Sequence< OUString > lUserData; lFilterProperties[nFilterProperty].Value >>= lUserData; - sUserData = implc_convertStringlistToString( lUserData, ',', ::rtl::OUString() ); + sUserData = implc_convertStringlistToString( lUserData, ',', OUString() ); } else if ( lFilterProperties[nFilterProperty].Name == "DocumentService" ) { @@ -1028,16 +1028,16 @@ void SfxFilterContainer::ReadSingleFilter_Impl( { if (sExtension.isEmpty()) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > lExtensions; + ::com::sun::star::uno::Sequence< OUString > lExtensions; lTypeProperties[nTypeProperty].Value >>= lExtensions; sExtension = implc_convertStringlistToString( lExtensions, ';', "*." ); } } else if ( lTypeProperties[nTypeProperty].Name == "URLPattern" ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString > lPattern; + ::com::sun::star::uno::Sequence< OUString > lPattern; lTypeProperties[nTypeProperty].Value >>= lPattern; - sPattern = implc_convertStringlistToString( lPattern, ';', ::rtl::OUString() ); + sPattern = implc_convertStringlistToString( lPattern, ';', OUString() ); } } } @@ -1138,7 +1138,7 @@ void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate ) ) { // select right query to get right set of filters for search modul - ::com::sun::star::uno::Sequence< ::rtl::OUString > lFilterNames = xFilterCFG->getElementNames(); + ::com::sun::star::uno::Sequence< OUString > lFilterNames = xFilterCFG->getElementNames(); if ( lFilterNames.getLength() ) { // If list of filters already exist ... @@ -1163,7 +1163,7 @@ void SfxFilterContainer::ReadFilters_Impl( sal_Bool bUpdate ) { // Try to get filter .. but look for any exceptions! // May be filter was deleted by another thread ... - ::rtl::OUString sFilterName = lFilterNames[nFilter]; + OUString sFilterName = lFilterNames[nFilter]; ReadSingleFilter_Impl( sFilterName, xTypeCFG, xFilterCFG, bUpdate ); } } diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index bf79d7f4f924..1f24a5952288 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -72,7 +72,7 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, if( pIndent ) rStrm << pIndent; - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_meta).append(' ') .append(bHTTPEquiv ? OOO_STRING_SVTOOLS_HTML_O_httpequiv : OOO_STRING_SVTOOLS_HTML_O_name).append("=\""); rStrm << sOut.makeStringAndClear().getStr(); @@ -96,7 +96,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, if( pCharSet ) { - String aContentType = rtl::OUString(sHTML_MIME_text_html); + String aContentType = OUString(sHTML_MIME_text_html); aContentType.AppendAscii( pCharSet ); OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_content_type, aContentType, sal_True, eDestEnc, pNonConvertableChars ); @@ -125,7 +125,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, if( pIndent ) rStrm << pIndent; - rtl::OStringBuffer sOut; + OStringBuffer sOut; sOut.append('<').append(OOO_STRING_SVTOOLS_HTML_base).append(' ') .append(OOO_STRING_SVTOOLS_HTML_O_target).append("=\""); rStrm << sOut.makeStringAndClear().getStr(); @@ -136,7 +136,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, // Who we are String sGenerator( SfxResId(STR_HTML_GENERATOR).toString() ); - ::rtl::OUString os( "$_OS" ); + OUString os( "$_OS" ); ::rtl::Bootstrap::expandMacros(os); sGenerator.SearchAndReplaceAscii( "%1", os ); OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, sal_False, eDestEnc, pNonConvertableChars ); @@ -227,11 +227,11 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL, { try { - ::rtl::OUString name = props[i].Name; + OUString name = props[i].Name; uno::Any aStr = xConverter->convertToSimpleType( xUserDefinedProps->getPropertyValue(name), uno::TypeClass_STRING); - ::rtl::OUString str; + OUString str; aStr >>= str; String valstr(comphelper::string::stripEnd(str, ' ')); OutMeta( rStrm, pIndent, name, valstr, sal_False, @@ -252,9 +252,9 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( { try { - rtl::OStringBuffer sOut; - ::rtl::OUString aStr; - uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString("FrameURL") ); + OStringBuffer sOut; + OUString aStr; + uno::Any aAny = xSet->getPropertyValue( OUString("FrameURL") ); if ( (aAny >>= aStr) && !aStr.isEmpty() ) { String aURL = INetURLObject( aStr ).GetMainURL( INetURLObject::DECODE_TO_IURI ); @@ -270,7 +270,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( } } - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameName") ); + aAny = xSet->getPropertyValue( OUString("FrameName") ); if ( (aAny >>= aStr) && !aStr.isEmpty() ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name) @@ -281,13 +281,13 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( } sal_Int32 nVal = SIZE_NOT_SET; - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginWidth") ); + aAny = xSet->getPropertyValue( OUString("FrameMarginWidth") ); if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_marginwidth) .append('=').append(nVal); } - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginHeight") ); + aAny = xSet->getPropertyValue( OUString("FrameMarginHeight") ); if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET ) { sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_marginheight) @@ -295,10 +295,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( } sal_Bool bVal = sal_True; - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoScroll") ); + aAny = xSet->getPropertyValue( OUString("FrameIsAutoScroll") ); if ( (aAny >>= bVal) && !bVal ) { - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsScrollingMode") ); + aAny = xSet->getPropertyValue( OUString("FrameIsScrollingMode") ); if ( aAny >>= bVal ) { const sal_Char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no; @@ -308,10 +308,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( } // frame border (MS+Netscape-Extension) - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoBorder") ); + aAny = xSet->getPropertyValue( OUString("FrameIsAutoBorder") ); if ( (aAny >>= bVal) && !bVal ) { - aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsBorder") ); + aAny = xSet->getPropertyValue( OUString("FrameIsBorder") ); if ( aAny >>= bVal ) { const char* pStr = bVal ? sHTML_SC_yes : sHTML_SC_no; diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index 434d7a81e243..24b5de1b3a80 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -54,7 +54,6 @@ using namespace osl; using ::std::vector; -using ::rtl::OStringToOUString; std::vector<OUString> SfxContentHelper::GetResultSet( const OUString& rURL ) { diff --git a/sfx2/source/bastyp/mieclip.cxx b/sfx2/source/bastyp/mieclip.cxx index 7f6b9384f0b5..d9e50ea7c2fd 100644 --- a/sfx2/source/bastyp/mieclip.cxx +++ b/sfx2/source/bastyp/mieclip.cxx @@ -37,7 +37,7 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream ) if( pStrm ) delete pStrm, pStrm = 0; - rtl::OString sLine, sVersion; + OString sLine, sVersion; sal_Int32 nStt = -1, nEnd = -1, nFragStart = -1, nFragEnd = -1; sal_Int32 nIndex = 0; @@ -51,7 +51,7 @@ SvStream* MSE40HTMLClipFormatObj::IsValid( SvStream& rStream ) while( rStream.ReadLine( sLine ) ) { nIndex = 0; - rtl::OString sTmp(sLine.getToken(0, ':', nIndex)); + OString sTmp(sLine.getToken(0, ':', nIndex)); if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("StartHTML"))) nStt = sLine.copy(nIndex).toInt32(); else if (sTmp.equalsL(RTL_CONSTASCII_STRINGPARAM("EndHTML"))) diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index c7d5dd8989f3..bbbd5de96fad 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -254,7 +254,7 @@ sal_Bool SfxHTMLParser::FinishFileDownload( String& rStr ) : STRING_MAXLEN; aStream.Seek( 0 ); - rtl::OString sBuffer = read_uInt8s_ToOString(aStream, nLen); + OString sBuffer = read_uInt8s_ToOString(aStream, nLen); rStr = S2U(sBuffer); } diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 74b5f790eeb6..0bd334f7bd3d 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -161,17 +161,17 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) uno::Sequence < beans::PropertyValue > aProperties(3); beans::PropertyValue *pValues = aProperties.getArray(); - ::rtl::OUString aType(STAR_BASIC ); - ::rtl::OUString aLib = pMacro->GetLibName(); - ::rtl::OUString aMacro = pMacro->GetMacName(); + OUString aType(STAR_BASIC ); + OUString aLib = pMacro->GetLibName(); + OUString aMacro = pMacro->GetMacName(); - pValues[ 0 ].Name = ::rtl::OUString(PROP_EVENT_TYPE ); + pValues[ 0 ].Name = OUString(PROP_EVENT_TYPE ); pValues[ 0 ].Value <<= aType; - pValues[ 1 ].Name = ::rtl::OUString(PROP_LIBRARY ); + pValues[ 1 ].Name = OUString(PROP_LIBRARY ); pValues[ 1 ].Value <<= aLib; - pValues[ 2 ].Name = ::rtl::OUString(PROP_MACRO_NAME ); + pValues[ 2 ].Name = OUString(PROP_MACRO_NAME ); pValues[ 2 ].Value <<= aMacro; aEventData <<= aProperties; @@ -181,13 +181,13 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) uno::Sequence < beans::PropertyValue > aProperties(2); beans::PropertyValue *pValues = aProperties.getArray(); - ::rtl::OUString aLib = pMacro->GetLibName(); - ::rtl::OUString aMacro = pMacro->GetMacName(); + OUString aLib = pMacro->GetLibName(); + OUString aMacro = pMacro->GetMacName(); - pValues[ 0 ].Name = ::rtl::OUString(PROP_EVENT_TYPE ); + pValues[ 0 ].Name = OUString(PROP_EVENT_TYPE ); pValues[ 0 ].Value <<= aLib; - pValues[ 1 ].Name = ::rtl::OUString(PROP_SCRIPT ); + pValues[ 1 ].Name = OUString(PROP_SCRIPT ); pValues[ 1 ].Value <<= aMacro; aEventData <<= aProperties; @@ -197,12 +197,12 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) uno::Sequence < beans::PropertyValue > aProperties(2); beans::PropertyValue *pValues = aProperties.getArray(); - ::rtl::OUString aMacro = pMacro->GetMacName(); + OUString aMacro = pMacro->GetMacName(); - pValues[ 0 ].Name = ::rtl::OUString(PROP_EVENT_TYPE ); - pValues[ 0 ].Value <<= ::rtl::OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT); + pValues[ 0 ].Name = OUString(PROP_EVENT_TYPE ); + pValues[ 0 ].Value <<= OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT); - pValues[ 1 ].Name = ::rtl::OUString(PROP_MACRO_NAME ); + pValues[ 1 ].Name = OUString(PROP_MACRO_NAME ); pValues[ 1 ].Value <<= aMacro; aEventData <<= aProperties; @@ -222,7 +222,7 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro ) } //-------------------------------------------------------------------------- -void PropagateEvent_Impl( SfxObjectShell *pDoc, rtl::OUString aEventName, const SvxMacro* pMacro ) +void PropagateEvent_Impl( SfxObjectShell *pDoc, OUString aEventName, const SvxMacro* pMacro ) { uno::Reference < document::XEventsSupplier > xSupplier; if ( pDoc ) @@ -263,7 +263,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, rtl::OUString aEventName, const } //-------------------------------------------------------------------------------------------------------- -void SfxEventConfiguration::ConfigureEvent( rtl::OUString aName, const SvxMacro& rMacro, SfxObjectShell *pDoc ) +void SfxEventConfiguration::ConfigureEvent( OUString aName, const SvxMacro& rMacro, SfxObjectShell *pDoc ) { boost::scoped_ptr<SvxMacro> pMacro; if ( rMacro.HasMacro() ) diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 457f70e70214..d2981d44371b 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1943,13 +1943,13 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState ) ::com::sun::star::util::URL aURL; OUString aCmd( ".uno:" ); aURL.Protocol = aCmd; - aURL.Path = ::rtl::OUString::createFromAscii(pSlot->GetUnoName()); + aURL.Path = OUString::createFromAscii(pSlot->GetUnoName()); aCmd += aURL.Path; aURL.Complete = aCmd; aURL.Main = aCmd; if ( !xDisp.is() ) - xDisp = pImp->xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); + xDisp = pImp->xProv->queryDispatch( aURL, OUString(), 0 ); if ( xDisp.is() ) { @@ -2003,9 +2003,9 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState ) aAny >>= nTemp ; pItem = new SfxUInt32Item( nSlot, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; aAny >>= sTemp ; pItem = new SfxStringItem( nSlot, sTemp ); } @@ -2191,7 +2191,7 @@ sal_Bool SfxBindings::ExecuteCommand_Impl( const String& rCommand ) aURL.Complete = rCommand; Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aURL ); - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = pImp->xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = pImp->xProv->queryDispatch( aURL, OUString(), 0 ); if ( xDisp.is() ) { new SfxAsyncExec_Impl( aURL, xDisp ); diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 17394c7a0679..d7f259285284 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -219,7 +219,7 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest if ( xSet.is() ) { - com::sun::star::uno::Any aProp = xSet->getPropertyValue(::rtl::OUString("DispatchRecorderSupplier")); + com::sun::star::uno::Any aProp = xSet->getPropertyValue(OUString("DispatchRecorderSupplier")); com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier; com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder; aProp >>= xSupplier; @@ -246,7 +246,7 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest pView = SfxViewFrame::Current(); if ( pView ) { - rtl::OString aCmd(".uno:"); + OString aCmd(".uno:"); aCmd += rSlot.GetUnoName(); SfxHelp::OpenHelpAgent( &pView->GetFrame(), aCmd ); } @@ -379,7 +379,7 @@ SfxDispatcher::~SfxDispatcher() { #ifdef DBG_UTIL - rtl::OStringBuffer sTemp(RTL_CONSTASCII_STRINGPARAM("Delete Dispatcher ")); + OStringBuffer sTemp(RTL_CONSTASCII_STRINGPARAM("Delete Dispatcher ")); sTemp.append(reinterpret_cast<sal_Int64>(this)); OSL_TRACE("%s", sTemp.getStr()); DBG_ASSERT( !pImp->bActive, "deleting active Dispatcher" ); @@ -689,7 +689,7 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ ) if ( bMDI ) { #ifdef DBG_UTIL - rtl::OStringBuffer sTemp( + OStringBuffer sTemp( RTL_CONSTASCII_STRINGPARAM("Activate Dispatcher ")); sTemp.append(reinterpret_cast<sal_Int64>(this)); OSL_TRACE("%s", sTemp.getStr()); @@ -707,7 +707,7 @@ void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ ) else { #ifdef DBG_UTIL - rtl::OStringBuffer sTemp( + OStringBuffer sTemp( RTL_CONSTASCII_STRINGPARAM("Non-MDI-Activate Dispatcher")); sTemp.append(reinterpret_cast<sal_Int64>(this)); OSL_TRACE("%s", sTemp.getStr()); @@ -771,7 +771,7 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew ) if ( bMDI ) { - OSL_TRACE(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Deactivate Dispatcher")).append(reinterpret_cast<sal_Int64>(this)).getStr()); + OSL_TRACE(OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Deactivate Dispatcher")).append(reinterpret_cast<sal_Int64>(this)).getStr()); DBG_ASSERT( pImp->bActive, "Deactivate error" ); pImp->bActive = sal_False; @@ -792,7 +792,7 @@ void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew ) } } else { - OSL_TRACE(rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Non-MDI-DeActivate Dispatcher")).append(reinterpret_cast<sal_Int64>(this)).getStr()); + OSL_TRACE(OStringBuffer(RTL_CONSTASCII_STRINGPARAM("Non-MDI-DeActivate Dispatcher")).append(reinterpret_cast<sal_Int64>(this)).getStr()); } if ( IsAppDispatcher() && !pSfxApp->IsDowning() ) @@ -1261,11 +1261,11 @@ void SfxDispatcher::SetMenu_Impl() if ( xPropSet.is() ) { com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; if ( xLayoutManager.is() ) { - rtl::OUString aMenuBarURL( "private:resource/menubar/menubar" ); + OUString aMenuBarURL( "private:resource/menubar/menubar" ); if ( !xLayoutManager->isElementVisible( aMenuBarURL ) ) xLayoutManager->createElement( aMenuBarURL ); } @@ -1325,7 +1325,7 @@ void SfxDispatcher::Update_Impl( sal_Bool bForce ) { try { - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" ) ); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; } catch (const com::sun::star::uno::Exception&) @@ -2041,7 +2041,7 @@ sal_Bool SfxDispatcher::_FillState sal_uInt16 nSlotId = rState.GetPool()->GetSlotId(pItem->Which()); if ( !pItem->IsA(pIF->GetSlot(nSlotId)->GetType()->Type()) ) { - rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM( "item-type unequal to IDL (=> no BASIC)")); aMsg.append(RTL_CONSTASCII_STRINGPARAM("\nwith SID: ")); aMsg.append(static_cast<sal_Int32>(nSlotId)); @@ -2170,7 +2170,7 @@ void SfxDispatcher::HideUI( sal_Bool bHide ) if ( xPropSet.is() ) { com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; - com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + com::sun::star::uno::Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; if ( xLayoutManager.is() ) xLayoutManager->setVisible( !bHide ); diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index 1d97ea532484..855d4f1942e3 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -50,16 +50,16 @@ sal_uInt16 SfxSlot::GetWhich( const SfxItemPool &rPool ) const return nMasterSlotId; } -::rtl::OString SfxSlot::GetCommand() const +OString SfxSlot::GetCommand() const { - rtl::OString sRet(".uno:"); + OString sRet(".uno:"); sRet += pUnoName; return sRet; } -::rtl::OUString SfxSlot::GetCommandString() const +OUString SfxSlot::GetCommandString() const { - return rtl::OStringToOUString(GetCommand(), RTL_TEXTENCODING_UTF8); + return OStringToOUString(GetCommand(), RTL_TEXTENCODING_UTF8); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index a43e5c95e8f7..e8946e10cf20 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -172,13 +172,13 @@ String SfxSlotPool::SeekGroup( sal_uInt16 nNo ) if ( !aResId.GetResMgr()->IsAvailable(aResId) ) { OSL_FAIL( "GroupId-Name not defined in SFX!" ); - return rtl::OUString(); + return OUString(); } return aResId.toString(); } - return rtl::OUString(); + return OUString(); } diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index caf46f7c893d..90be4b585acc 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -227,7 +227,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount ) { if ( pSlave->pLinkedSlot != pMasterSlot ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Wrong Master/Slave- link: ")); aStr.append(static_cast<sal_Int32>( pMasterSlot->GetSlotId())); @@ -239,7 +239,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount ) if ( pSlave->nMasterSlotId != pMasterSlot->GetSlotId() ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Wrong Master/Slave-Ids: ")); aStr.append(static_cast<sal_Int32>( pMasterSlot->GetSlotId())); @@ -259,7 +259,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount ) { if ( pIter->pLinkedSlot->GetKind() != SFX_KIND_ENUM ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Slave is no enum: ")); aStr.append(static_cast<sal_Int32>(pIter->GetSlotId())); aStr.append(RTL_CONSTASCII_STRINGPARAM(" , ")); @@ -275,7 +275,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount ) pCurSlot = pCurSlot->pNextSlot; if ( pCurSlot->GetStateFnc() != pIter->GetStateFnc() ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Linked Slots with different State Methods : ")); aStr.append(static_cast<sal_Int32>( pCurSlot->GetSlotId())); diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index d9fab1820e13..c978b42cede3 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/frame/status/ItemState.hpp> #include <com/sun/star/frame/status/Visibility.hpp> -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -50,7 +49,7 @@ class SfxQueryStatus_Impl : public ::com::sun::star::frame::XStatusListener , public: SFX_DECL_XINTERFACE_XTYPEPROVIDER - SfxQueryStatus_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const rtl::OUString& aCommand ); + SfxQueryStatus_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand ); virtual ~SfxQueryStatus_Impl(); // Query method @@ -90,7 +89,7 @@ SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >& Reference< XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( m_aCommand ); if ( rDispatchProvider.is() ) - m_xDispatch = rDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 ); + m_xDispatch = rDispatchProvider->queryDispatch( m_aCommand, OUString(), 0 ); m_aCondition.reset(); } @@ -136,9 +135,9 @@ throw( RuntimeException ) rEvent.State >>= nTemp ; m_pItem = new SfxUInt32Item( m_nSlotID, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; rEvent.State >>= sTemp ; m_pItem = new SfxStringItem( m_nSlotID, sTemp ); } diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 8170a0480ded..d2a8a104130a 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -201,7 +201,7 @@ SfxRequest::SfxRequest #ifdef DBG_UTIL else { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Recording unsupported slot: ")); aStr.append(static_cast<sal_Int32>(pImp->pPool->GetSlotId(nSlotId))); OSL_FAIL(aStr.getStr()); @@ -331,9 +331,9 @@ void SfxRequest_Impl::Record */ { - String aCommand = rtl::OUString(".uno:"); + String aCommand = OUString(".uno:"); aCommand.AppendAscii( pSlot->GetUnoName() ); - ::rtl::OUString aCmd( aCommand ); + OUString aCmd( aCommand ); if(xRecorder.is()) { uno::Reference< container::XIndexReplace > xReplace( xRecorder, uno::UNO_QUERY ); @@ -346,8 +346,8 @@ void SfxRequest_Impl::Record uno::Any aElement = xReplace->getByIndex(nCount-1); if ( (aElement >>= aStatement) && aStatement.aCommand == aCmd ) { - ::rtl::OUString aStr; - ::rtl::OUString aNew; + OUString aStr; + OUString aNew; aStatement.aArgs[0].Value >>= aStr; rArgs[0].Value >>= aNew; aStr += aNew; @@ -689,7 +689,7 @@ void SfxRequest::Done_Impl // new Recording uses UnoName! if ( !pImp->pSlot->pUnoName ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Recording not exported slot: ")); aStr.append(static_cast<sal_Int32>(pImp->pSlot->GetSlotId())); OSL_FAIL(aStr.getStr()); @@ -711,7 +711,7 @@ void SfxRequest::Done_Impl #ifdef DBG_UTIL if ( SFX_ITEM_SET != eState ) { - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "Recording property not available: ")); aStr.append(static_cast<sal_Int32>(pImp->pSlot->GetSlotId())); OSL_FAIL(aStr.getStr()); @@ -812,7 +812,7 @@ com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRe if(xSet.is()) { - com::sun::star::uno::Any aProp = xSet->getPropertyValue(rtl::OUString("DispatchRecorderSupplier")); + com::sun::star::uno::Any aProp = xSet->getPropertyValue(OUString("DispatchRecorderSupplier")); com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier > xSupplier; aProp >>= xSupplier; if(xSupplier.is()) diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index bb4bad355126..b44dd04ca48e 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -41,7 +41,6 @@ #include <sfx2/unoctitm.hxx> #include <sfx2/msgpool.hxx> -using ::rtl::OUString; using namespace ::cppu; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; @@ -61,7 +60,7 @@ SfxStatusListener::SfxStatusListener( const Reference< XDispatchProvider >& rDis Reference< XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( m_aCommand ); if ( rDispatchProvider.is() ) - m_xDispatch = rDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 ); + m_xDispatch = rDispatchProvider->queryDispatch( m_aCommand, OUString(), 0 ); } SfxStatusListener::~SfxStatusListener() @@ -93,7 +92,7 @@ void SfxStatusListener::ReBind() { try { - m_xDispatch = m_xDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 ); + m_xDispatch = m_xDispatchProvider->queryDispatch( m_aCommand, OUString(), 0 ); if ( m_xDispatch.is() ) m_xDispatch->addStatusListener( aStatusListener, m_aCommand ); } @@ -198,9 +197,9 @@ throw( RuntimeException ) rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( m_nSlotID, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; rEvent.State >>= sTemp ; pItem = new SfxStringItem( m_nSlotID, sTemp ); } diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index ed2e628c2451..836becb6b171 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -82,14 +82,14 @@ bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uIn return false; } - rVal <<= ::rtl::OUString( aValue ); + rVal <<= OUString( aValue ); return true; } bool SfxScriptOrganizerItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { - ::rtl::OUString aValue; + OUString aValue; sal_Bool bRet = false; nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 82df20df6a55..5b42f5fb8b8e 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -124,9 +124,9 @@ void SAL_CALL BindDispatch_Impl::statusChanged( const ::com::sun::star::frame:: aAny >>= nTemp ; pItem = new SfxUInt32Item( nId, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; aAny >>= sTemp ; pItem = new SfxStringItem( nId, sTemp ); } @@ -272,13 +272,13 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons ::com::sun::star::util::URL aURL; OUString aCmd = ".uno:"; aURL.Protocol = aCmd; - aURL.Path = ::rtl::OUString::createFromAscii( pSlot->GetUnoName() ); + aURL.Path = OUString::createFromAscii( pSlot->GetUnoName() ); aCmd += aURL.Path; aURL.Complete = aCmd; aURL.Main = aCmd; // try to get a dispatch object for this command - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); if ( xDisp.is() ) { // test the dispatch object if it is just a wrapper for a SfxDispatcher diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 69be29dbc251..ae9a343754d9 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -325,9 +325,9 @@ BitmapEx TemplateAbstractView::fetchThumbnail (const OUString &msURL, long width { OSL_TRACE ( "caught exception while trying to access Thumbnail/thumbnail.png of %s: %s", - ::rtl::OUStringToOString(msURL, + OUStringToOString(msURL, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } @@ -355,9 +355,9 @@ BitmapEx TemplateAbstractView::fetchThumbnail (const OUString &msURL, long width { OSL_TRACE ( "caught exception while trying to access Thumbnails/thumbnail.png of %s: %s", - ::rtl::OUStringToOString(msURL, + OUStringToOString(msURL, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } } @@ -365,9 +365,9 @@ BitmapEx TemplateAbstractView::fetchThumbnail (const OUString &msURL, long width { OSL_TRACE ( "caught exception while trying to access tuhmbnail of %s: %s", - ::rtl::OUStringToOString(msURL, + OUStringToOString(msURL, RTL_TEXTENCODING_UTF8).getStr(), - ::rtl::OUStringToOString(rException.Message, + OUStringToOString(rException.Message, RTL_TEXTENCODING_UTF8).getStr()); } diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 9ceb12809e15..28b51cd79c53 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -806,7 +806,7 @@ bool TemplateLocalView::isTemplateNameUnique(const sal_uInt16 nRegionItemId, con return true; } -bool TemplateLocalView::renameItem(ThumbnailViewItem* pItem, rtl::OUString sNewTitle) +bool TemplateLocalView::renameItem(ThumbnailViewItem* pItem, OUString sNewTitle) { sal_uInt16 nRegionId = 0; sal_uInt16 nDocId = USHRT_MAX; diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 39b1ce8f0511..051d828fd0ca 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -1252,7 +1252,7 @@ void ThumbnailView::sortItems (const boost::function<bool (const ThumbnailViewIt Invalidate(); } -bool ThumbnailView::renameItem(ThumbnailViewItem*, rtl::OUString) +bool ThumbnailView::renameItem(ThumbnailViewItem*, OUString) { // Do nothing by default return false; diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index cabd9ec05adb..2d21a5bc7f5a 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -200,20 +200,20 @@ sal_Int16 SAL_CALL ThumbnailViewAcc::getAccessibleRole() : accessibility::AccessibleRole::LIST ); } -::rtl::OUString SAL_CALL ThumbnailViewAcc::getAccessibleDescription() +OUString SAL_CALL ThumbnailViewAcc::getAccessibleDescription() throw (uno::RuntimeException) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - return rtl::OUString("ThumbnailView"); + return OUString("ThumbnailView"); } -::rtl::OUString SAL_CALL ThumbnailViewAcc::getAccessibleName() +OUString SAL_CALL ThumbnailViewAcc::getAccessibleName() throw (uno::RuntimeException) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - rtl::OUString aRet; + OUString aRet; if ( mpParent ) aRet = mpParent->GetAccessibleName(); @@ -260,7 +260,7 @@ lang::Locale SAL_CALL ThumbnailViewAcc::getLocale() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - const ::rtl::OUString aEmptyStr; + const OUString aEmptyStr; uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() ); lang::Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr ); @@ -601,7 +601,7 @@ void ThumbnailViewAcc::ThrowIfDisposed (void) { OSL_TRACE ("Calling disposed object. Throwing exception:"); throw lang::DisposedException ( - ::rtl::OUString("object has been already disposed"), + OUString("object has been already disposed"), static_cast<uno::XWeak*>(this)); } else @@ -712,17 +712,17 @@ sal_Int16 SAL_CALL ThumbnailViewItemAcc::getAccessibleRole() return accessibility::AccessibleRole::LIST_ITEM; } -::rtl::OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleDescription() +OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleDescription() throw (uno::RuntimeException) { - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleName() +OUString SAL_CALL ThumbnailViewItemAcc::getAccessibleName() throw (uno::RuntimeException) { const SolarMutexGuard aSolarGuard; - rtl::OUString aRet; + OUString aRet; if( mpParent ) { @@ -730,7 +730,7 @@ sal_Int16 SAL_CALL ThumbnailViewItemAcc::getAccessibleRole() if( aRet.isEmpty() ) { - rtl::OUStringBuffer aBuffer("Item "); + OUStringBuffer aBuffer("Item "); aBuffer.append(static_cast<sal_Int32>(mpParent->mnId)); aRet = aBuffer.makeStringAndClear(); } @@ -779,7 +779,7 @@ lang::Locale SAL_CALL ThumbnailViewItemAcc::getLocale() throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException) { const SolarMutexGuard aSolarGuard; - const ::rtl::OUString aEmptyStr; + const OUString aEmptyStr; uno::Reference< accessibility::XAccessible > xParent( getAccessibleParent() ); lang::Locale aRet( aEmptyStr, aEmptyStr, aEmptyStr ); diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 612cf7dfcba6..6794ceca11bc 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -97,8 +97,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); @@ -206,8 +206,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index 2a83bc175774..4dac397439f1 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -185,7 +185,7 @@ void ThumbnailViewItem::updateTitleEditSize() mpTitleED->SetPosSizePixel(aPos, aSize); } -void ThumbnailViewItem::setTitle (const rtl::OUString& rTitle) +void ThumbnailViewItem::setTitle (const OUString& rTitle) { if (mrParent.renameItem(this, rTitle)) maTitle = rTitle; @@ -288,13 +288,13 @@ void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProc pProcessor->process(aSeq); } -void ThumbnailViewItem::addTextPrimitives (const rtl::OUString& rText, const ThumbnailItemAttributes *pAttrs, Point aPos, Primitive2DSequence& rSeq) +void ThumbnailViewItem::addTextPrimitives (const OUString& rText, const ThumbnailItemAttributes *pAttrs, Point aPos, Primitive2DSequence& rSeq) { drawinglayer::primitive2d::TextLayouterDevice aTextDev; aPos.setY(aPos.getY() + aTextDev.getTextHeight()); - rtl::OUString aText (rText); + OUString aText (rText); TextEngine aTextEngine; aTextEngine.SetMaxTextWidth(maDrawArea.getWidth()); @@ -314,7 +314,7 @@ void ThumbnailViewItem::addTextPrimitives (const rtl::OUString& rText, const Thu if (bTooLong && (nLineLength + nLineStart) < rText.getLength()) { // Add the '...' to the last line to show, even though it may require to shorten the line - double nDotsWidth = aTextDev.getTextWidth(rtl::OUString("..."),0,3); + double nDotsWidth = aTextDev.getTextWidth(OUString("..."),0,3); sal_uInt16 nLength = nLineLength - 1; while ( nDotsWidth + aTextDev.getTextWidth(aText, nLineStart, nLength) > maDrawArea.getWidth() && nLength > 0) diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 11047ab1e8c7..9f30889f9310 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -161,9 +161,9 @@ void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame: rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( pCtrlItem->GetId(), nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; rEvent.State >>= sTemp ; pItem = new SfxStringItem( pCtrlItem->GetId(), sTemp ); } @@ -219,7 +219,7 @@ void SfxUnoControllerItem::GetNewDispatch() ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = rFrame.GetFrameInterface(); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, ::com::sun::star::uno::UNO_QUERY ); if ( xProv.is() ) - xDispatch = xProv->queryDispatch( aCommand, ::rtl::OUString(), 0 ); + xDispatch = xProv->queryDispatch( aCommand, OUString(), 0 ); } if ( xDispatch.is() ) @@ -243,7 +243,7 @@ void SfxUnoControllerItem::GetNewDispatch() ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame = pFrame->GetFrameInterface(); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, ::com::sun::star::uno::UNO_QUERY ); if ( xProv.is() ) - xDisp = xProv->queryDispatch( aCommand, ::rtl::OUString(), 0 ); + xDisp = xProv->queryDispatch( aCommand, OUString(), 0 ); } return xDisp; @@ -423,9 +423,9 @@ sal_Bool SfxOfficeDispatch::IsMasterUnoCommand( const ::com::sun::star::util::UR return sal_False; } -rtl::OUString SfxOfficeDispatch::GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL ) +OUString SfxOfficeDispatch::GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL ) { - rtl::OUString aMasterCommand; + OUString aMasterCommand; if ( IsMasterUnoCommand( aURL )) { sal_Int32 nIndex = aURL.Path.indexOf( '.' ); @@ -454,9 +454,9 @@ SfxDispatchController_Impl::SfxDispatchController_Impl( { if ( aDispatchURL.Protocol == "slot:" && pUnoName ) { - rtl::OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM(".uno:")); + OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM(".uno:")); aTmp.append(pUnoName); - aDispatchURL.Complete = ::rtl::OStringToOUString(aTmp.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); + aDispatchURL.Complete = OStringToOUString(aTmp.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US); Reference< XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aDispatchURL ); } @@ -516,23 +516,23 @@ void SfxDispatchController_Impl::addParametersToArgs( const com::sun::star::util sal_Int32 nQueryIndex = aURL.Complete.indexOf( '?' ); if ( nQueryIndex > 0 ) { - rtl::OUString aParamString( aURL.Complete.copy( nQueryIndex+1 )); + OUString aParamString( aURL.Complete.copy( nQueryIndex+1 )); sal_Int32 nIndex = 0; do { - rtl::OUString aToken = aParamString.getToken( 0, '&', nIndex ); + OUString aToken = aParamString.getToken( 0, '&', nIndex ); sal_Int32 nParmIndex = 0; - rtl::OUString aParamType; - rtl::OUString aParamName = aToken.getToken( 0, '=', nParmIndex ); - rtl::OUString aValue = (nParmIndex!=-1) ? aToken.getToken( 0, '=', nParmIndex ) : ::rtl::OUString(); + OUString aParamType; + OUString aParamName = aToken.getToken( 0, '=', nParmIndex ); + OUString aValue = (nParmIndex!=-1) ? aToken.getToken( 0, '=', nParmIndex ) : OUString(); if ( !aParamName.isEmpty() ) { nParmIndex = 0; aToken = aParamName; - aParamName = (nParmIndex!=-1) ? aToken.getToken( 0, ':', nParmIndex ) : ::rtl::OUString(); - aParamType = (nParmIndex!=-1) ? aToken.getToken( 0, ':', nParmIndex ) : ::rtl::OUString(); + aParamName = (nParmIndex!=-1) ? aToken.getToken( 0, ':', nParmIndex ) : OUString(); + aParamType = (nParmIndex!=-1) ? aToken.getToken( 0, ':', nParmIndex ) : OUString(); } sal_Int32 nLen = rArgs.getLength(); @@ -577,7 +577,7 @@ void SfxDispatchController_Impl::addParametersToArgs( const com::sun::star::util else if ( aParamType.equalsAsciiL( URLTypeNames[URLType_STRING], 6 )) { // STRING support - rArgs[nLen].Value <<= rtl::OUString( INetURLObject::decode( aValue, '%', INetURLObject::DECODE_WITH_CHARSET )); + rArgs[nLen].Value <<= OUString( INetURLObject::decode( aValue, '%', INetURLObject::DECODE_WITH_CHARSET )); } else if ( aParamType.equalsAsciiL( URLTypeNames[URLType_DOUBLE], 6)) { @@ -595,9 +595,9 @@ SfxMapUnit SfxDispatchController_Impl::GetCoreMetric( SfxItemPool& rPool, sal_uI return rPool.GetMetric( nWhich ); } -rtl::OUString SfxDispatchController_Impl::getSlaveCommand( const ::com::sun::star::util::URL& rURL ) +OUString SfxDispatchController_Impl::getSlaveCommand( const ::com::sun::star::util::URL& rURL ) { - rtl::OUString aSlaveCommand; + OUString aSlaveCommand; sal_Int32 nIndex = rURL.Path.indexOf( '.' ); if (( nIndex > 0 ) && ( nIndex < rURL.Path.getLength() )) aSlaveCommand = rURL.Path.copy( nIndex+1 ); @@ -676,7 +676,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util // so we must retrieve this as an argument from the parsed URL lNewArgs.realloc( lNewArgs.getLength()+1 ); nMarkArg = lNewArgs.getLength()-1; - lNewArgs[nMarkArg].Name = ::rtl::OUString("Bookmark"); + lNewArgs[nMarkArg].Name = OUString("Bookmark"); lNewArgs[nMarkArg].Value <<= aURL.Mark; } @@ -710,7 +710,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util // have a argument that has the same name as the master slot and type is SfxStringItem. sal_Int32 nIndex = lNewArgs.getLength(); lNewArgs.realloc( nIndex+1 ); - lNewArgs[nIndex].Name = rtl::OUString::createFromAscii( pSlot->pUnoName ); + lNewArgs[nIndex].Name = OUString::createFromAscii( pSlot->pUnoName ); lNewArgs[nIndex].Value = makeAny( SfxDispatchController_Impl::getSlaveCommand( aDispatchURL )); } diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 65f393496ed3..5fedbc3ff620 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -48,7 +48,7 @@ using namespace ::rtl; class SfxModelessDialog_Impl : public SfxListener { public: - rtl::OString aWinState; + OString aWinState; SfxChildWindow* pMgr; sal_Bool bConstructed; void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); @@ -72,7 +72,7 @@ void SfxModelessDialog_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) class SfxFloatingWindow_Impl : public SfxListener { public: - rtl::OString aWinState; + OString aWinState; SfxChildWindow* pMgr; sal_Bool bConstructed; Timer aMoveTimer; @@ -120,7 +120,7 @@ void SfxModalDialog::GetDialogData_Impl() if ( aDlgOpt.Exists() ) { // load settings - SetWindowState( rtl::OUStringToOString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); + SetWindowState( OUStringToOString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); Any aUserItem = aDlgOpt.GetUserItem( USERITEM_NAME ); OUString aTemp; if ( aUserItem >>= aTemp ) @@ -153,7 +153,7 @@ SfxModalDialog::SfxModalDialog(Window* pParent, const ResId &rResId ) init(); } -SfxModalDialog::SfxModalDialog(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription ) +SfxModalDialog::SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) : ModalDialog(pParent, rID, rUIXMLDescription), nUniqId(0), //todo pInputSet(0), @@ -332,8 +332,8 @@ SfxModelessDialog::SfxModelessDialog(SfxBindings *pBindinx, } SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx, - SfxChildWindow *pCW, Window *pParent, const rtl::OString& rID, - const rtl::OUString& rUIXMLDescription) + SfxChildWindow *pCW, Window *pParent, const OString& rID, + const OUString& rUIXMLDescription) : ModelessDialog(pParent, rID, rUIXMLDescription) { Init(pBindinx, pCW); @@ -368,7 +368,7 @@ long SfxModelessDialog::Notify( NotifyEvent& rEvt ) pBindings->SetActiveFrame( pImp->pMgr->GetFrame() ); pImp->pMgr->Activate_Impl(); Window* pWindow = rEvt.GetWindow(); - rtl::OString sHelpId; + OString sHelpId; while ( sHelpId.isEmpty() && pWindow ) { sHelpId = pWindow->GetHelpId(); @@ -466,7 +466,7 @@ long SfxFloatingWindow::Notify( NotifyEvent& rEvt ) pBindings->SetActiveFrame( pImp->pMgr->GetFrame() ); pImp->pMgr->Activate_Impl(); Window* pWindow = rEvt.GetWindow(); - rtl::OString sHelpId; + OString sHelpId; while ( sHelpId.isEmpty() && pWindow ) { sHelpId = pWindow->GetHelpId(); diff --git a/sfx2/source/dialog/bluthsnd.cxx b/sfx2/source/dialog/bluthsnd.cxx index e7266622ce8d..6b6f1773f9cf 100644 --- a/sfx2/source/dialog/bluthsnd.cxx +++ b/sfx2/source/dialog/bluthsnd.cxx @@ -38,13 +38,13 @@ #include "bluthsndapi.hxx" SfxBluetoothModel::SendMailResult SfxBluetoothModel::SaveAndSend( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, - const rtl::OUString& rType ) + const OUString& rType ) { SaveResult eSaveResult; SendMailResult eResult = SEND_MAIL_ERROR; - rtl::OUString aFileName; + OUString aFileName; - eSaveResult = SaveDocumentAsFormat( rtl::OUString(), xFrame, rType, aFileName ); + eSaveResult = SaveDocumentAsFormat( OUString(), xFrame, rType, aFileName ); if( eSaveResult == SAVE_SUCCESSFULL ) { maAttachedDocuments.push_back( aFileName ); @@ -60,8 +60,8 @@ SfxBluetoothModel::SendMailResult SfxBluetoothModel::Send( const ::com::sun::sta { char bthsend[300]; SendMailResult eResult = SEND_MAIL_OK; - rtl::OUString aFileName = maAttachedDocuments[0]; - snprintf(bthsend,300,"bluetooth-sendto %s",rtl::OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8).getStr() ); + OUString aFileName = maAttachedDocuments[0]; + snprintf(bthsend,300,"bluetooth-sendto %s",OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8).getStr() ); if( !system( bthsend ) ) eResult = SEND_MAIL_ERROR; return eResult; diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx index a2bac2570771..cbe1c620eaec 100644 --- a/sfx2/source/dialog/checkin.cxx +++ b/sfx2/source/dialog/checkin.cxx @@ -20,7 +20,7 @@ SfxCheckinDialog::SfxCheckinDialog( Window* pParent ) : m_pOKBtn->SetClickHdl( LINK( this, SfxCheckinDialog, OKHdl ) ); } -rtl::OUString SfxCheckinDialog::GetComment( ) +OUString SfxCheckinDialog::GetComment( ) { return m_pCommentED->GetText( ); } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 86461460f2aa..b198ca24822b 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -79,10 +79,10 @@ const sal_uInt16 FONT_PAGE_ID = 99; struct CustomProperty { - ::rtl::OUString m_sName; + OUString m_sName; com::sun::star::uno::Any m_aValue; - CustomProperty( const ::rtl::OUString& sName, + CustomProperty( const OUString& sName, const com::sun::star::uno::Any& rValue ) : m_sName( sName ), m_aValue( rValue ) {} @@ -117,7 +117,7 @@ namespace { String CreateSizeText( sal_Int64 nSize ) { - String aUnitStr = rtl::OUString(' '); + String aUnitStr = OUString(' '); aUnitStr += SfxResId(STR_BYTES).toString(); sal_Int64 nSize1 = nSize; sal_Int64 nSize2 = nSize1; @@ -179,7 +179,7 @@ String ConvertDateTime_Impl( const String& rName, String aStr( rWrapper.getDate( aD ) ); aStr += pDelim; aStr += rWrapper.getTime( aT, sal_True, sal_False ); - rtl::OUString aAuthor = comphelper::string::stripStart(rName, ' '); + OUString aAuthor = comphelper::string::stripStart(rName, ' '); if (!aAuthor.isEmpty()) { aStr += pDelim; @@ -347,15 +347,15 @@ int SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const } //------------------------------------------------------------------------ -void SfxDocumentInfoItem::resetUserData(const ::rtl::OUString & i_rAuthor) +void SfxDocumentInfoItem::resetUserData(const OUString & i_rAuthor) { setAuthor(i_rAuthor); DateTime now( DateTime::SYSTEM ); setCreationDate( util::DateTime( now.Get100Sec(), now.GetSec(), now.GetMin(), now.GetHour(), now.GetDay(), now.GetMonth(), now.GetYear() ) ); - setModifiedBy(::rtl::OUString()); - setPrintedBy(::rtl::OUString()); + setModifiedBy(OUString()); + setPrintedBy(OUString()); setModificationDate(util::DateTime()); setPrintDate(util::DateTime()); setEditingDuration(0); @@ -372,7 +372,7 @@ void SfxDocumentInfoItem::UpdateDocumentInfo( i_xDocProps->setAutoloadURL(getAutoloadURL()); } else { i_xDocProps->setAutoloadSecs(0); - i_xDocProps->setAutoloadURL(::rtl::OUString()); + i_xDocProps->setAutoloadURL(OUString()); } i_xDocProps->setDefaultTarget(getDefaultTarget()); i_xDocProps->setAuthor(getAuthor()); @@ -475,7 +475,7 @@ void SfxDocumentInfoItem::ClearCustomProperties() m_aCustomProperties.clear(); } -void SfxDocumentInfoItem::AddCustomProperty( const ::rtl::OUString& sName, const Any& rValue ) +void SfxDocumentInfoItem::AddCustomProperty( const OUString& sName, const Any& rValue ) { CustomProperty* pProp = new CustomProperty( sName, rValue ); m_aCustomProperties.push_back( pProp ); @@ -534,7 +534,7 @@ bool SfxDocumentInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const } if ( bIsString ) - rVal <<= ::rtl::OUString( aValue ); + rVal <<= OUString( aValue ); else if ( bIsInt ) rVal <<= nValue; else @@ -544,7 +544,7 @@ bool SfxDocumentInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId ) { - ::rtl::OUString aValue; + OUString aValue; sal_Int32 nValue=0; sal_Bool bValue = sal_False; bool bRet = false; @@ -784,7 +784,7 @@ SfxDocumentPage::SfxDocumentPage(Window* pParent, const SfxItemSet& rItemSet) // on the main list enable/disable the pushbutton accordingly SvtCommandOptions aCmdOptions; if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( DOCUMENT_SIGNATURE_MENU_CMD ) ) ) ) + OUString( RTL_CONSTASCII_USTRINGPARAM( DOCUMENT_SIGNATURE_MENU_CMD ) ) ) ) m_pSignatureBtn->Disable(); } @@ -806,7 +806,7 @@ IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl) m_pPrintValFt->SetText( aEmpty ); const Time aTime( 0 ); m_pTimeLogValFt->SetText( rLocaleWrapper.getDuration( aTime ) ); - m_pDocNoValFt->SetText(rtl::OUString('1')); + m_pDocNoValFt->SetText(OUString('1')); bHandleDelete = sal_True; return 0; } @@ -838,7 +838,7 @@ IMPL_LINK_NOARG(SfxDocumentPage, ChangePassHdl) if (!pFilter) break; - rtl::OUString aDocName; + OUString aDocName; sfx2::RequestPassword(pFilter, aDocName, pMedSet); pShell->SetModified(true); } @@ -865,7 +865,7 @@ void SfxDocumentPage::ImplUpdateSignatures() s = m_aMultiSignedStr; else if ( aInfos.getLength() == 1 ) { - rtl::OUString aCN_Id("CN"); + OUString aCN_Id("CN"); const security::DocumentSignatureInformation& rInfo = aInfos[ 0 ]; s = GetDateTimeString( rInfo.SignatureDate, rInfo.SignatureTime ); s.AppendAscii( ", " ); @@ -952,7 +952,7 @@ sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) SfxDocumentInfoItem newItem( *m_pInfoItem ); newItem.resetUserData( bUseAuthor ? SvtUserOptions().GetFullName() - : ::rtl::OUString() ); + : OUString() ); m_pInfoItem->SetUseUserData( STATE_CHECK == m_pUseUserDataCB->GetState() ); newItem.SetUseUserData( STATE_CHECK == m_pUseUserDataCB->GetState() ); @@ -1290,14 +1290,14 @@ void CustomPropertiesDurationField::RequestHelp( const HelpEvent& rHEvt ) void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration ) { m_aDuration = rDuration; - String sText(rDuration.Negative ? rtl::OUString('-') : rtl::OUString('+')); + String sText(rDuration.Negative ? OUString('-') : OUString('+')); sText += m_pLine->m_sDurationFormat; - sText.SearchAndReplace(rtl::OUString("%1"), OUString::number( rDuration.Years ) ); - sText.SearchAndReplace(rtl::OUString("%2"), OUString::number( rDuration.Months ) ); - sText.SearchAndReplace(rtl::OUString("%3"), OUString::number( rDuration.Days ) ); - sText.SearchAndReplace(rtl::OUString("%4"), OUString::number( rDuration.Hours ) ); - sText.SearchAndReplace(rtl::OUString("%5"), OUString::number( rDuration.Minutes) ); - sText.SearchAndReplace(rtl::OUString("%6"), OUString::number( rDuration.Seconds) ); + sText.SearchAndReplace(OUString("%1"), OUString::number( rDuration.Years ) ); + sText.SearchAndReplace(OUString("%2"), OUString::number( rDuration.Months ) ); + sText.SearchAndReplace(OUString("%3"), OUString::number( rDuration.Days ) ); + sText.SearchAndReplace(OUString("%4"), OUString::number( rDuration.Hours ) ); + sText.SearchAndReplace(OUString("%5"), OUString::number( rDuration.Minutes) ); + sText.SearchAndReplace(OUString("%6"), OUString::number( rDuration.Seconds) ); SetText( sText ); } @@ -1666,7 +1666,7 @@ void CustomPropertiesWindow::updateLineWidth() } } -void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny ) +void CustomPropertiesWindow::AddLine( const OUString& sName, Any& rAny ) { CustomPropertyLine* pNewLine = new CustomPropertyLine( this ); pNewLine->m_aTypeBox.SetSelectHdl( LINK( this, CustomPropertiesWindow, TypeHdl ) ); @@ -1711,7 +1711,7 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny ) double nTmpValue = 0; bool bTmpValue = false; - ::rtl::OUString sTmpValue; + OUString sTmpValue; util::DateTime aTmpDateTime; util::Date aTmpDate; util::Duration aTmpDuration; @@ -1883,7 +1883,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c } else { - ::rtl::OUString sValue( pLine->m_aValueEdit.GetText() ); + OUString sValue( pLine->m_aValueEdit.GetText() ); aPropertiesSeq[i].Value <<= makeAny( sValue ); } } @@ -1992,7 +1992,7 @@ IMPL_LINK_NOARG(CustomPropertiesControl, RemovedHdl) return 0; } -void CustomPropertiesControl::AddLine( const ::rtl::OUString& sName, Any& rAny, bool bInteractive ) +void CustomPropertiesControl::AddLine( const OUString& sName, Any& rAny, bool bInteractive ) { m_pPropertiesWin->AddLine( sName, rAny ); m_pVertScroll->SetRangeMax( m_pPropertiesWin->GetVisibleLineCount() + 1 ); @@ -2012,7 +2012,7 @@ SfxCustomPropertiesPage::SfxCustomPropertiesPage( Window* pParent, const SfxItem IMPL_LINK_NOARG(SfxCustomPropertiesPage, AddHdl) { Any aAny; - m_pPropertiesCtrl->AddLine( ::rtl::OUString(), aAny, true ); + m_pPropertiesCtrl->AddLine( OUString(), aAny, true ); return 0; } diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 9c126122f7c9..4affce8ea377 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -89,11 +89,11 @@ namespace { struct WindowState { - ::rtl::OUString sTitle; + OUString sTitle; }; } -static bool lcl_getWindowState( const uno::Reference< container::XNameAccess >& xWindowStateMgr, const ::rtl::OUString& rResourceURL, WindowState& rWindowState ) +static bool lcl_getWindowState( const uno::Reference< container::XNameAccess >& xWindowStateMgr, const OUString& rResourceURL, WindowState& rWindowState ) { bool bResult = false; @@ -130,7 +130,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , : SfxChildWindow( pParentWnd , nId ) { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - const rtl::OUString aDockWindowResourceURL( "private:resource/dockingwindow/" ); + const OUString aDockWindowResourceURL( "private:resource/dockingwindow/" ); SfxTitleDockingWindow* pTitleDockWindow = new SfxTitleDockingWindow( pBindings, this, pParentWnd, WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE); @@ -145,14 +145,14 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , uno::Reference< frame::XFrame > xFrame( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); uno::Sequence< uno::Any > aArgs(2); beans::PropertyValue aPropValue; - aPropValue.Name = rtl::OUString( "Frame" ); + aPropValue.Name = OUString( "Frame" ); aPropValue.Value = uno::makeAny( xFrame ); aArgs[0] <<= aPropValue; - aPropValue.Name = rtl::OUString( "ResourceURL" ); + aPropValue.Name = OUString( "ResourceURL" ); // create a resource URL from the nId provided by the sfx2 - ::rtl::OUString aResourceURL( aDockWindowResourceURL ); - aResourceURL += ::rtl::OUString::valueOf(sal_Int32(nId)); + OUString aResourceURL( aDockWindowResourceURL ); + aResourceURL += OUString::valueOf(sal_Int32(nId)); aPropValue.Value = uno::makeAny( aResourceURL ); aArgs[1] <<= aPropValue; @@ -181,7 +181,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , m_xWindowStateConfiguration = xWindowStateConfiguration; } - ::rtl::OUString sModuleIdentifier = xModuleManager->identify( xFrame ); + OUString sModuleIdentifier = xModuleManager->identify( xFrame ); uno::Reference< container::XNameAccess > xModuleWindowState( xWindowStateConfiguration->getByName( sModuleIdentifier ), @@ -350,7 +350,7 @@ static SfxWorkWindow* lcl_getWorkWindowFromXFrame( const uno::Reference< frame:: The string rDockingWindowName MUST BE a valid ID! The ID is pre-defined by a certain slot range located in sfxsids.hrc (currently SID_DOCKWIN_START = 9800). */ -void SAL_CALL SfxDockingWindowFactory( const uno::Reference< frame::XFrame >& rFrame, const rtl::OUString& rDockingWindowName ) +void SAL_CALL SfxDockingWindowFactory( const uno::Reference< frame::XFrame >& rFrame, const OUString& rDockingWindowName ) { SolarMutexGuard aGuard; sal_uInt16 nID = sal_uInt16(rDockingWindowName.toInt32()); @@ -376,7 +376,7 @@ void SAL_CALL SfxDockingWindowFactory( const uno::Reference< frame::XFrame >& rF a special name. The string rDockingWindowName MUST BE a valid ID! The ID is pre-defined by a certain slot range located in sfxsids.hrc (currently SID_DOCKWIN_START = 9800). */ -bool SAL_CALL IsDockingWindowVisible( const uno::Reference< frame::XFrame >& rFrame, const rtl::OUString& rDockingWindowName ) +bool SAL_CALL IsDockingWindowVisible( const uno::Reference< frame::XFrame >& rFrame, const OUString& rDockingWindowName ) { SolarMutexGuard aGuard; @@ -421,7 +421,7 @@ friend class SfxDockingWindow; sal_uInt16 nDockPos; sal_Bool bNewLine; sal_Bool bDockingPrevented; - rtl::OString aWinState; + OString aWinState; SfxChildAlignment GetLastAlignment() const { return eLastAlignment; } @@ -874,7 +874,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); if ( pSlot ) { - rtl::OString aCmd("SFXDOCKINGWINDOW_"); + OString aCmd("SFXDOCKINGWINDOW_"); aCmd += pSlot->GetUnoName(); SetUniqueId( aCmd ); } @@ -925,7 +925,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); if ( pSlot ) { - rtl::OString aCmd("SFXDOCKINGWINDOW_"); + OString aCmd("SFXDOCKINGWINDOW_"); aCmd += pSlot->GetUnoName(); SetUniqueId( aCmd ); } @@ -1782,7 +1782,7 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt ) pMgr->Activate_Impl(); Window* pWindow = rEvt.GetWindow(); - rtl::OString sHelpId; + OString sHelpId; while ( sHelpId.isEmpty() && pWindow ) { sHelpId = pWindow->GetHelpId(); diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 1712f5108561..ee8da3dc9b8f 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -218,7 +218,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve { //!!! todo: cache the help strings (here or TRA) - rtl::OString sHelpId; + OString sHelpId; // mapping from element id -> help id switch ( aEvent.ElementId ) { @@ -276,7 +276,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve OUString aHelpText; Help* pHelp = Application::GetHelp(); if ( pHelp ) - aHelpText = String( pHelp->GetHelpText( rtl::OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), NULL ) ); + aHelpText = String( pHelp->GetHelpText( OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), NULL ) ); return aHelpText; } @@ -422,7 +422,7 @@ sal_Bool FileDialogHelper_Impl::CheckFilterOptionsCapability( const SfxFilter* _ Any aAny = mxFilterCFG->getByName( _pFilter->GetName() ); if ( aAny >>= aProps ) { - ::rtl::OUString aServiceName; + OUString aServiceName; sal_Int32 nPropertyCount = aProps.getLength(); for( sal_Int32 nProperty=0; nProperty < nPropertyCount; ++nProperty ) { @@ -524,7 +524,7 @@ void FileDialogHelper_Impl::updateSelectionBox() uno::Reference< XControlInformation > xCtrlInfo( mxFileDlg, UNO_QUERY ); if ( xCtrlInfo.is() ) { - Sequence< ::rtl::OUString > aCtrlList = xCtrlInfo->getSupportedControls(); + Sequence< OUString > aCtrlList = xCtrlInfo->getSupportedControls(); sal_uInt32 nCount = aCtrlList.getLength(); for ( sal_uInt32 nCtrl = 0; nCtrl < nCount; ++nCtrl ) if ( aCtrlList[ nCtrl ] == "SelectionBox" ) @@ -890,7 +890,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( sal_Int16 nDialog, Window* _pPreferredParentWindow, const String& sStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) :m_nDialogType ( nDialogType ) ,meContext ( FileDialogHelper::UNKNOWN_CONTEXT ) @@ -902,7 +902,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( pServiceName = FILE_OPEN_SERVICE_NAME_OOO; else pServiceName = "com.sun.star.ui.dialogs.FilePicker"; - OUString aService = ::rtl::OUString::createFromAscii( pServiceName ); + OUString aService = OUString::createFromAscii( pServiceName ); uno::Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); @@ -1065,26 +1065,26 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( else { aInitArguments[0] <<= NamedValue( - ::rtl::OUString( "TemplateDescription" ), + OUString( "TemplateDescription" ), makeAny( nTemplateDescription ) ); - ::rtl::OUString sStandardDirTemp = ::rtl::OUString( sStandardDir ); + OUString sStandardDirTemp = OUString( sStandardDir ); aInitArguments[1] <<= NamedValue( - ::rtl::OUString( "StandardDir" ), + OUString( "StandardDir" ), makeAny( sStandardDirTemp ) ); aInitArguments[2] <<= NamedValue( - ::rtl::OUString( "BlackList" ), + OUString( "BlackList" ), makeAny( rBlackList ) ); if ( mpPreferredParentWindow ) aInitArguments[3] <<= NamedValue( - ::rtl::OUString( "ParentWindow" ), + OUString( "ParentWindow" ), makeAny( VCLUnoHelper::GetInterface( mpPreferredParentWindow ) ) ); } @@ -1207,16 +1207,16 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con // forward these ids to the file picker try { - const ::rtl::OUString sHelpIdPrefix( INET_HID_SCHEME ); + const OUString sHelpIdPrefix( INET_HID_SCHEME ); // the ids for the single controls uno::Reference< XFilePickerControlAccess > xControlAccess( mxFileDlg, UNO_QUERY ); if ( xControlAccess.is() ) { while ( *_pControlId ) { - DBG_ASSERT( INetURLObject( rtl::OStringToOUString( *_pHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); - ::rtl::OUString sId( sHelpIdPrefix ); - sId += ::rtl::OUString( *_pHelpId, strlen( *_pHelpId ), RTL_TEXTENCODING_UTF8 ); + DBG_ASSERT( INetURLObject( OStringToOUString( *_pHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); + OUString sId( sHelpIdPrefix ); + sId += OUString( *_pHelpId, strlen( *_pHelpId ), RTL_TEXTENCODING_UTF8 ); xControlAccess->setValue( *_pControlId, ControlActions::SET_HELP_URL, makeAny( sId ) ); ++_pControlId; ++_pHelpId; @@ -1372,20 +1372,20 @@ void FileDialogHelper_Impl::implStartExecute() } // ------------------------------------------------------------------------ -void lcl_saveLastURLs(std::vector<rtl::OUString>& rpURLList, - ::comphelper::SequenceAsVector< ::rtl::OUString >& lLastURLs ) +void lcl_saveLastURLs(std::vector<OUString>& rpURLList, + ::comphelper::SequenceAsVector< OUString >& lLastURLs ) { lLastURLs.clear(); - for(std::vector<rtl::OUString>::iterator i = rpURLList.begin(); i != rpURLList.end(); ++i) + for(std::vector<OUString>::iterator i = rpURLList.begin(); i != rpURLList.end(); ++i) lLastURLs.push_back(*i); } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterface >& xPicker, std::vector<rtl::OUString>& rpURLList, const SfxFilter* pFilter) +void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterface >& xPicker, std::vector<OUString>& rpURLList, const SfxFilter* pFilter) { rpURLList.clear(); - rtl::OUString sExtension; + OUString sExtension; if (pFilter) { sExtension = pFilter->GetDefaultExtension (); @@ -1434,7 +1434,7 @@ void FileDialogHelper_Impl::implGetAndCacheFiles(const uno::Reference< XInterfac } // ------------------------------------------------------------------------ -ErrCode FileDialogHelper_Impl::execute( std::vector<rtl::OUString>& rpURLList, +ErrCode FileDialogHelper_Impl::execute( std::vector<OUString>& rpURLList, SfxItemSet *& rpSet, String& rFilter ) { @@ -1565,7 +1565,7 @@ ErrCode FileDialogHelper_Impl::execute( std::vector<rtl::OUString>& rpURLList, if ( ( aValue >>= bPassWord ) && bPassWord ) { // ask for a password - rtl::OUString aDocName(rpURLList[0]); + OUString aDocName(rpURLList[0]); ErrCode errCode = RequestPassword(pCurrentFilter, aDocName, rpSet); if (errCode != ERRCODE_NONE) return errCode; @@ -1662,7 +1662,7 @@ void FileDialogHelper_Impl::verifyPath() url.insertName( maFileName, false, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL); - rtl::OUString sysPathU; + OUString sysPathU; osl::FileBase::RC e = osl::FileBase::getSystemPathFromFileURL( url.GetMainURL(INetURLObject::NO_DECODE), sysPathU); if (e != osl::FileBase::E_None) { @@ -1673,7 +1673,7 @@ void FileDialogHelper_Impl::verifyPath() << +e); return; } - rtl::OString sysPathC; + OString sysPathC; if (!sysPathU.convertToString( &sysPathC, osl_getThreadTextEncoding(), (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR @@ -1700,7 +1700,7 @@ void FileDialogHelper_Impl::verifyPath() } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath ) +void FileDialogHelper_Impl::displayFolder( const OUString& _rPath ) { if ( _rPath.isEmpty() ) // nothing to do @@ -1722,7 +1722,7 @@ void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString& _rPath ) } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::setFileName( const ::rtl::OUString& _rFile ) +void FileDialogHelper_Impl::setFileName( const OUString& _rFile ) { maFileName = _rFile; if ( mxFileDlg.is() ) @@ -1798,7 +1798,7 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory, uno::Reference< XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); uno::Reference< XContainerQuery > xFilterCont( - xSMGR->createInstance(::rtl::OUString("com.sun.star.document.FilterFactory")), + xSMGR->createInstance(OUString("com.sun.star.document.FilterFactory")), UNO_QUERY); if ( ! xFilterCont.is() ) return; @@ -1807,14 +1807,14 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory, m_nDontFlags |= nDont; // create the list of filters - ::rtl::OUStringBuffer sQuery(256); + OUStringBuffer sQuery(256); sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM("getSortedFilterList()")); sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":module=")); sQuery.append(rFactory); // use long name here ! sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":iflags=")); - sQuery.append(::rtl::OUString::valueOf((sal_Int32)m_nMustFlags)); + sQuery.append(OUString::valueOf((sal_Int32)m_nMustFlags)); sQuery.appendAscii(RTL_CONSTASCII_STRINGPARAM(":eflags=")); - sQuery.append(::rtl::OUString::valueOf((sal_Int32)m_nDontFlags)); + sQuery.append(OUString::valueOf((sal_Int32)m_nDontFlags)); uno::Reference< XEnumeration > xResult; try @@ -1832,7 +1832,7 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory, mbDeleteMatcher = sal_False; // append the filters - ::rtl::OUString sFirstFilter; + OUString sFirstFilter; if (OPEN == lcl_OpenOrSave(m_nDialogType)) ::sfx2::appendFiltersForOpen( aIter, xFltMgr, sFirstFilter, *this ); else if ( mbExport ) @@ -2052,7 +2052,7 @@ void FileDialogHelper_Impl::saveConfig() // ------------------------------------------------------------------------ namespace { - static ::rtl::OUString getInitPath( const String& _rFallback, const xub_StrLen _nFallbackToken ) + static OUString getInitPath( const String& _rFallback, const xub_StrLen _nFallbackToken ) { SfxApplication *pSfxApp = SFX_APP(); String sPath = pSfxApp->GetLastDir_Impl(); @@ -2291,7 +2291,7 @@ FileDialogHelper::FileDialogHelper( SfxFilterFlags nMust, SfxFilterFlags nDont, const String& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList) + const ::com::sun::star::uno::Sequence< OUString >& rBlackList) { mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags, nDialog, NULL, rStandardDir, rBlackList ); mxImp = mpImp; @@ -2315,28 +2315,28 @@ FileDialogHelper::FileDialogHelper( FileDialogHelper::FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, - const ::rtl::OUString& aFilterUIName, - const ::rtl::OUString& aExtName, - const ::rtl::OUString& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList, + const OUString& aFilterUIName, + const OUString& aExtName, + const OUString& rStandardDir, + const ::com::sun::star::uno::Sequence< OUString >& rBlackList, Window* _pPreferredParent ) { mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags, SFX2_IMPL_DIALOG_CONFIG, _pPreferredParent,rStandardDir, rBlackList ); mxImp = mpImp; // the wildcard here is expected in form "*.extension" - ::rtl::OUString aWildcard; + OUString aWildcard; if ( aExtName.indexOf( (sal_Unicode)'*' ) != 0 ) { if ( !aExtName.isEmpty() && aExtName.indexOf( (sal_Unicode)'.' ) != 0 ) - aWildcard = ::rtl::OUString( "*." ); + aWildcard = OUString( "*." ); else - aWildcard = ::rtl::OUString( "*" ); + aWildcard = OUString( "*" ); } aWildcard += aExtName; - ::rtl::OUString const aUIString = ::sfx2::addExtension( aFilterUIName, + OUString const aUIString = ::sfx2::addExtension( aFilterUIName, aWildcard, (OPEN == lcl_OpenOrSave(mpImp->m_nDialogType)), *mpImp); AddFilter( aUIString, aWildcard ); } @@ -2377,7 +2377,7 @@ IMPL_LINK_NOARG(FileDialogHelper, ExecuteSystemFilePicker) // ------------------------------------------------------------------------ // rDirPath has to be a directory -ErrCode FileDialogHelper::Execute( std::vector<rtl::OUString>& rpURLList, +ErrCode FileDialogHelper::Execute( std::vector<OUString>& rpURLList, SfxItemSet *& rpSet, String& rFilter, const String& rDirPath ) @@ -2398,7 +2398,7 @@ ErrCode FileDialogHelper::Execute( SfxItemSet *& rpSet, String& rFilter ) { ErrCode nRet; - std::vector<rtl::OUString> rURLList; + std::vector<OUString> rURLList; nRet = mpImp->execute(rURLList, rpSet, rFilter); return nRet; } @@ -2481,10 +2481,10 @@ Sequence < OUString > FileDialogHelper::GetMPath() const } // ------------------------------------------------------------------------ -Sequence< ::rtl::OUString > FileDialogHelper::GetSelectedFiles() const +Sequence< OUString > FileDialogHelper::GetSelectedFiles() const { // a) the new way (optional!) - uno::Sequence< ::rtl::OUString > aResultSeq; + uno::Sequence< OUString > aResultSeq; uno::Reference< XFilePicker2 > xPickNew(mpImp->mxFileDlg, UNO_QUERY); if (xPickNew.is()) { @@ -2498,7 +2498,7 @@ Sequence< ::rtl::OUString > FileDialogHelper::GetSelectedFiles() const ::sal_Int32 nFiles = lFiles.getLength(); if ( nFiles > 1 ) { - aResultSeq = Sequence< ::rtl::OUString >( nFiles-1 ); + aResultSeq = Sequence< OUString >( nFiles-1 ); INetURLObject aPath( lFiles[0] ); aPath.setFinalSlash(); @@ -2510,7 +2510,7 @@ Sequence< ::rtl::OUString > FileDialogHelper::GetSelectedFiles() const else aPath.setName( lFiles[i] ); - aResultSeq[i-1] = ::rtl::OUString(aPath.GetMainURL( INetURLObject::NO_DECODE )); + aResultSeq[i-1] = OUString(aPath.GetMainURL( INetURLObject::NO_DECODE )); } } else @@ -2569,9 +2569,9 @@ void FileDialogHelper::SetDisplayDirectory( const String& _rPath ) INetURLObject aObj( _rPath ); - ::rtl::OUString sFileName = aObj.GetName( INetURLObject::DECODE_WITH_CHARSET ); + OUString sFileName = aObj.GetName( INetURLObject::DECODE_WITH_CHARSET ); aObj.removeSegment(); - ::rtl::OUString sPath = aObj.GetMainURL( INetURLObject::NO_DECODE ); + OUString sPath = aObj.GetMainURL( INetURLObject::NO_DECODE ); int nIsFolder = impl_isFolder( _rPath ); if ( nIsFolder == 0 || @@ -2583,7 +2583,7 @@ void FileDialogHelper::SetDisplayDirectory( const String& _rPath ) else { INetURLObject aObjPathName( _rPath ); - ::rtl::OUString sFolder( aObjPathName.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString sFolder( aObjPathName.GetMainURL( INetURLObject::NO_DECODE ) ); if ( sFolder.isEmpty() ) { // _rPath is not a valid path -> fallback to home directory @@ -2673,13 +2673,13 @@ void SAL_CALL FileDialogHelper::DialogClosed( const DialogClosedEvent& _rEvent ) ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, sal_Int64 nFlags, const String& rFact, - std::vector<rtl::OUString>& rpURLList, + std::vector<OUString>& rpURLList, String& rFilter, SfxItemSet *& rpSet, const String* pPath, sal_Int16 nDialog, const String& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList ) + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) { ErrCode nRet; FileDialogHelper aDialog( nDialogType, nFlags, @@ -2695,7 +2695,7 @@ ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, return nRet; } -ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, SfxItemSet* pSet) +ErrCode RequestPassword(const SfxFilter* pCurrentFilter, OUString& aURL, SfxItemSet* pSet) { uno::Reference < task::XInteractionHandler2 > xInteractionHandler = task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 ); // TODO: need a save way to distinguish MS filters from other filters @@ -2723,8 +2723,8 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, Sf if ( aEncryptionKey.getLength() ) { ::comphelper::SequenceAsHashMap aHashData; - aHashData[ ::rtl::OUString( "STD97EncryptionKey" ) ] <<= aEncryptionKey; - aHashData[ ::rtl::OUString( "STD97UniqueID" ) ] <<= aUniqueID; + aHashData[ OUString( "STD97EncryptionKey" ) ] <<= aEncryptionKey; + aHashData[ OUString( "STD97UniqueID" ) ] <<= aUniqueID; pSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aHashData.getAsConstNamedValueList() ) ) ); } @@ -2743,7 +2743,7 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, Sf if ( bMSType ) { // the empty password has 0 as Hash - sal_Int32 nHash = SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( "com.sun.star.text.TextDocument" ).equals( pCurrentFilter->GetServiceName() ) ); + sal_Int32 nHash = SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), OUString( "com.sun.star.text.TextDocument" ).equals( pCurrentFilter->GetServiceName() ) ); if ( nHash ) pSet->Put( SfxUnoAnyItem( SID_MODIFYPASSWORDINFO, uno::makeAny( nHash ) ) ); } diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 10b8bac3d8cb..2662de1bb53d 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -56,13 +56,13 @@ namespace sfx2 FileDialogHelper* mpAntiImpl; Window* mpPreferredParentWindow; - ::comphelper::SequenceAsVector< ::rtl::OUString > mlLastURLs; + ::comphelper::SequenceAsVector< OUString > mlLastURLs; - ::rtl::OUString maPath; - ::rtl::OUString maFileName; - ::rtl::OUString maCurFilter; - ::rtl::OUString maSelectFilter; - ::rtl::OUString maButtonLabel; + OUString maPath; + OUString maFileName; + OUString maCurFilter; + OUString maSelectFilter; + OUString maButtonLabel; Timer maPreViewTimer; Graphic maGraphic; @@ -103,8 +103,8 @@ namespace sfx2 void addFilters( const String& rFactory, SfxFilterFlags nMust, SfxFilterFlags nDont ); - void addFilter( const ::rtl::OUString& rFilterName, - const ::rtl::OUString& rExtension ); + void addFilter( const OUString& rFilterName, + const OUString& rExtension ); void addGraphicFilter(); void enablePasswordBox( sal_Bool bInit ); void updateFilterOptionsBox(); @@ -120,7 +120,7 @@ namespace sfx2 const SfxFilter* getCurentSfxFilter(); sal_Bool updateExtendedControl( sal_Int16 _nExtendedControlId, sal_Bool _bEnable ); - ErrCode getGraphic( const ::rtl::OUString& rURL, Graphic& rGraphic ) const; + ErrCode getGraphic( const OUString& rURL, Graphic& rGraphic ) const; void setDefaultValues(); void preExecute(); @@ -137,8 +137,8 @@ namespace sfx2 sal_Bool isInOpenMode() const; String getCurrentFilterUIName() const; - void LoadLastUsedFilter( const ::rtl::OUString& _rContextIdentifier ); - void SaveLastUsedFilter( const ::rtl::OUString& _rContextIdentifier ); + void LoadLastUsedFilter( const OUString& _rContextIdentifier ); + void SaveLastUsedFilter( const OUString& _rContextIdentifier ); void SaveLastUsedFilter( void ); void implInitializeFileName( ); @@ -146,7 +146,7 @@ namespace sfx2 void verifyPath( ); void implGetAndCacheFiles( const ::com::sun::star::uno::Reference< XInterface >& xPicker , - std::vector<rtl::OUString>& rpURLList, + std::vector<OUString>& rpURLList, const SfxFilter* pFilter ); DECL_LINK(TimeOutHdl_Impl, void *); @@ -157,7 +157,7 @@ namespace sfx2 // XFilePickerListener methods virtual void SAL_CALL fileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL directoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL helpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL helpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL controlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL dialogSizeChanged() throw( ::com::sun::star::uno::RuntimeException ); @@ -170,7 +170,7 @@ namespace sfx2 // handle XFilePickerListener events void handleFileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); void handleDirectoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); - ::rtl::OUString handleHelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); + OUString handleHelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); void handleControlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); void handleDialogSizeChanged(); @@ -181,38 +181,38 @@ namespace sfx2 sal_Int64 nFlags, sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG, Window* _pPreferredParentWindow = NULL, - const String& sStandardDir = rtl::OUString(), - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList = ::com::sun::star::uno::Sequence< ::rtl::OUString >() + const String& sStandardDir = OUString(), + const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >() ); virtual ~FileDialogHelper_Impl(); - ErrCode execute( std::vector<rtl::OUString>& rpURLList, + ErrCode execute( std::vector<OUString>& rpURLList, SfxItemSet *& rpSet, String& rFilter ); ErrCode execute(); - void setFilter( const ::rtl::OUString& rFilter ); + void setFilter( const OUString& rFilter ); /** sets the directory which should be browsed <p>If the given path does not point to a valid (existent and accessible) folder, the request is silently dropped</p> */ - void displayFolder( const ::rtl::OUString& rPath ); - void setFileName( const ::rtl::OUString& _rFile ); + void displayFolder( const OUString& rPath ); + void setFileName( const OUString& _rFile ); - ::rtl::OUString getPath() const; - ::rtl::OUString getFilter() const; + OUString getPath() const; + OUString getFilter() const; void getRealFilter( String& _rFilter ) const; ErrCode getGraphic( Graphic& rGraphic ) const; void createMatcher( const String& rFactory ); sal_Bool isShowFilterExtensionEnabled() const; - void addFilterPair( const ::rtl::OUString& rFilter, - const ::rtl::OUString& rFilterWithExtension ); - ::rtl::OUString getFilterName( const ::rtl::OUString& rFilterWithExtension ) const; - ::rtl::OUString getFilterWithExtension( const ::rtl::OUString& rFilter ) const; + void addFilterPair( const OUString& rFilter, + const OUString& rFilterWithExtension ); + OUString getFilterName( const OUString& rFilterWithExtension ) const; + OUString getFilterWithExtension( const OUString& rFilter ) const; void SetContext( FileDialogHelper::Context _eNewContext ); diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 7add2fc0f180..4987d07dd9cf 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -125,35 +125,35 @@ namespace sfx2 typedef ::std::list< FilterGroup > GroupedFilterList; // a list of all filters, already grouped /// the logical name of a filter - typedef ::rtl::OUString FilterName; + typedef OUString FilterName; // a struct which holds references from a logical filter name to a filter group entry // used for quick lookup of classes (means class entries - entries representing a class) // which a given filter may belong to - typedef ::std::map< ::rtl::OUString, FilterGroup::iterator > FilterGroupEntryReferrer; + typedef ::std::map< OUString, FilterGroup::iterator > FilterGroupEntryReferrer; /// a descriptor for a filter class (which in the final dialog is represented by one filter entry) typedef struct _tagFilterClass { - ::rtl::OUString sDisplayName; // the display name + OUString sDisplayName; // the display name Sequence< FilterName > aSubFilters; // the (logical) names of the filter which belong to the class } FilterClass; typedef ::std::list< FilterClass > FilterClassList; - typedef ::std::map< ::rtl::OUString, FilterClassList::iterator > FilterClassReferrer; + typedef ::std::map< OUString, FilterClassList::iterator > FilterClassReferrer; - typedef ::std::vector< ::rtl::OUString > StringArray; + typedef ::std::vector< OUString > StringArray; // ======================================================================= // = reading of configuration data // ======================================================================= //-------------------------------------------------------------------- - void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const ::rtl::OUString& _rLogicalClassName, + void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const OUString& _rLogicalClassName, FilterClass& /* [out] */ _rClass ) { - static const ::rtl::OUString sDisplaNameNodeName( "DisplayName" ); - static const ::rtl::OUString sSubFiltersNodeName( "Filters" ); + static const OUString sDisplaNameNodeName( "DisplayName" ); + static const OUString sSubFiltersNodeName( "Filters" ); // the description node for the current class OConfigurationNode aClassDesc = _rClassesNode.openNode( _rLogicalClassName ); @@ -231,11 +231,11 @@ namespace sfx2 //================================================================ // get the list describing the order of all global classes - Sequence< ::rtl::OUString > aGlobalClasses; + Sequence< OUString > aGlobalClasses; _rFilterClassification.getNodeValue( "GlobalFilters/Order" ) >>= aGlobalClasses; - const ::rtl::OUString* pNames = aGlobalClasses.getConstArray(); - const ::rtl::OUString* pNamesEnd = pNames + aGlobalClasses.getLength(); + const OUString* pNames = aGlobalClasses.getConstArray(); + const OUString* pNamesEnd = pNames + aGlobalClasses.getLength(); // copy the logical names _rGlobalClassNames.resize( aGlobalClasses.getLength() ); @@ -259,7 +259,7 @@ namespace sfx2 // go for all the single class entries OConfigurationNode aFilterClassesNode = _rFilterClassification.openNode( "GlobalFilters/Classes" ); - Sequence< ::rtl::OUString > aFilterClasses = aFilterClassesNode.getNodeNames(); + Sequence< OUString > aFilterClasses = aFilterClassesNode.getNodeNames(); ::std::for_each( aFilterClasses.getConstArray(), aFilterClasses.getConstArray() + aFilterClasses.getLength(), @@ -301,7 +301,7 @@ namespace sfx2 // the node for the local classes OConfigurationNode aFilterClassesNode = _rFilterClassification.openNode( "LocalFilters/Classes" ); - Sequence< ::rtl::OUString > aFilterClasses = aFilterClassesNode.getNodeNames(); + Sequence< OUString > aFilterClasses = aFilterClassesNode.getNodeNames(); ::std::for_each( aFilterClasses.getConstArray(), @@ -404,20 +404,20 @@ namespace sfx2 static const sal_Unicode s_cWildcardSeparator( ';' ); //==================================================================== - const ::rtl::OUString& getSeparatorString() + const OUString& getSeparatorString() { - static ::rtl::OUString s_sSeparatorString( &s_cWildcardSeparator, 1 ); + static OUString s_sSeparatorString( &s_cWildcardSeparator, 1 ); return s_sSeparatorString; } //==================================================================== - struct CheckAppendSingleWildcard : public ::std::unary_function< ::rtl::OUString, void > + struct CheckAppendSingleWildcard : public ::std::unary_function< OUString, void > { - ::rtl::OUString& _rToBeExtended; + OUString& _rToBeExtended; - CheckAppendSingleWildcard( ::rtl::OUString& _rBase ) : _rToBeExtended( _rBase ) { } + CheckAppendSingleWildcard( OUString& _rBase ) : _rToBeExtended( _rBase ) { } - void operator() ( const ::rtl::OUString& _rWC ) + void operator() ( const OUString& _rWC ) { // check for double wildcards sal_Int32 nExistentPos = _rToBeExtended.indexOf( _rWC ); @@ -451,7 +451,7 @@ namespace sfx2 struct AppendWildcardToDescriptor : public ::std::unary_function< FilterGroupEntryReferrer::value_type, void > { protected: - ::std::vector< ::rtl::OUString > aWildCards; + ::std::vector< OUString > aWildCards; public: AppendWildcardToDescriptor( const String& _rWildCard ); @@ -485,7 +485,7 @@ namespace sfx2 { if ( ( s_cWildcardSeparator == *pTokenLoop ) && ( pTokenLoop > pTokenStart ) ) { // found a new token separator (and a non-empty token) - aWildCards.push_back( ::rtl::OUString( pTokenStart, pTokenLoop - pTokenStart ) ); + aWildCards.push_back( OUString( pTokenStart, pTokenLoop - pTokenStart ) ); // search the start of the next token while ( ( pTokenStart != pTokenLoopEnd ) && ( *pTokenStart != s_cWildcardSeparator ) ) @@ -501,7 +501,7 @@ namespace sfx2 } if ( pTokenLoop > pTokenStart ) // the last one .... - aWildCards.push_back( ::rtl::OUString( pTokenStart, pTokenLoop - pTokenStart ) ); + aWildCards.push_back( OUString( pTokenStart, pTokenLoop - pTokenStart ) ); } //-------------------------------------------------------------------- @@ -613,7 +613,7 @@ namespace sfx2 String aCurrentServiceName; String sFilterWildcard; - ::rtl::OUString sFilterName; + OUString sFilterName; // loop through all the filters for ( const SfxFilter* pFilter = _rFilterMatcher.First(); pFilter; pFilter = _rFilterMatcher.Next() ) { @@ -629,7 +629,7 @@ namespace sfx2 if ( aServiceName != aCurrentServiceName ) { // we reached a new group - ::rtl::OUString sDocServName = aServiceName; + OUString sDocServName = aServiceName; // look for the place in _rAllFilters where this ne group belongs - this is determined // by the order of classes in aGlobalClassNames @@ -838,7 +838,7 @@ namespace sfx2 for ( ; pFilters != pEnd; ++pFilters ) pFilters->First = addExtension( pFilters->First, pFilters->Second, sal_True, *m_pFileDlgImpl ); } - m_xFilterGroupManager->appendFilterGroup( ::rtl::OUString(), aFilters ); + m_xFilterGroupManager->appendFilterGroup( OUString(), aFilters ); } } else @@ -873,9 +873,9 @@ namespace sfx2 while(xFilterList->hasMoreElements()) { ::comphelper::SequenceAsHashMap lFilterProps (xFilterList->nextElement()); - ::rtl::OUString sFilterName = lFilterProps.getUnpackedValueOrDefault( - ::rtl::OUString("Name"), - ::rtl::OUString()); + OUString sFilterName = lFilterProps.getUnpackedValueOrDefault( + OUString("Name"), + OUString()); if (!sFilterName.isEmpty()) m_lFilters.push_back(sFilterName); } @@ -900,7 +900,7 @@ namespace sfx2 { if (nIndex<0 || nIndex>=(sal_Int32)m_lFilters.size()) return 0; - const ::rtl::OUString& sFilterName = m_lFilters[nIndex]; + const OUString& sFilterName = m_lFilters[nIndex]; if (sFilterName.isEmpty()) return 0; return SfxFilter::GetFilterByName(String(sFilterName)); @@ -909,15 +909,15 @@ namespace sfx2 //-------------------------------------------------------------------- void appendFiltersForSave( TSortedFilterList& _rFilterMatcher, const Reference< XFilterManager >& _rxFilterManager, - ::rtl::OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl, - const ::rtl::OUString& _rFactory ) + OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl, + const OUString& _rFactory ) { DBG_ASSERT( _rxFilterManager.is(), "sfx2::appendFiltersForSave: invalid manager!" ); if ( !_rxFilterManager.is() ) return; - ::rtl::OUString sUIName; - ::rtl::OUString sExtension; + OUString sUIName; + OUString sExtension; // retrieve the default filter for this application module. // It must be set as first of the generated filter list. @@ -962,17 +962,17 @@ namespace sfx2 struct ExportFilter { - ExportFilter( const rtl::OUString& _aUIName, const rtl::OUString& _aWildcard ) : + ExportFilter( const OUString& _aUIName, const OUString& _aWildcard ) : aUIName( _aUIName ), aWildcard( _aWildcard ) {} - rtl::OUString aUIName; - rtl::OUString aWildcard; + OUString aUIName; + OUString aWildcard; }; //-------------------------------------------------------------------- void appendExportFilters( TSortedFilterList& _rFilterMatcher, const Reference< XFilterManager >& _rxFilterManager, - ::rtl::OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ) + OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ) { DBG_ASSERT( _rxFilterManager.is(), "sfx2::appendExportFilters: invalid manager!" ); if ( !_rxFilterManager.is() ) @@ -982,17 +982,17 @@ namespace sfx2 sal_Int32 nXHTMLIndex = -1; sal_Int32 nPDFIndex = -1; sal_Int32 nFlashIndex = -1; - ::rtl::OUString sUIName; - ::rtl::OUString sExtensions; + OUString sUIName; + OUString sExtensions; std::vector< ExportFilter > aImportantFilterGroup; std::vector< ExportFilter > aFilterGroup; Reference< XFilterGroupManager > xFilterGroupManager( _rxFilterManager, UNO_QUERY ); - ::rtl::OUString sTypeName; - const ::rtl::OUString sWriterHTMLType( "generic_HTML" ); - const ::rtl::OUString sGraphicHTMLType( "graphic_HTML" ); - const ::rtl::OUString sXHTMLType( "XHTML_File" ); - const ::rtl::OUString sPDFType( "pdf_Portable_Document_Format" ); - const ::rtl::OUString sFlashType( "graphic_SWF" ); + OUString sTypeName; + const OUString sWriterHTMLType( "generic_HTML" ); + const OUString sGraphicHTMLType( "graphic_HTML" ); + const OUString sXHTMLType( "XHTML_File" ); + const OUString sPDFType( "pdf_Portable_Document_Format" ); + const OUString sFlashType( "graphic_SWF" ); for ( const SfxFilter* pFilter = _rFilterMatcher.First(); pFilter; pFilter = _rFilterMatcher.Next() ) { @@ -1058,7 +1058,7 @@ namespace sfx2 try { - xFilterGroupManager->appendFilterGroup( ::rtl::OUString(), aFilters ); + xFilterGroupManager->appendFilterGroup( OUString(), aFilters ); } catch( const IllegalArgumentException& ) { @@ -1078,7 +1078,7 @@ namespace sfx2 try { - xFilterGroupManager->appendFilterGroup( ::rtl::OUString(), aFilters ); + xFilterGroupManager->appendFilterGroup( OUString(), aFilters ); } catch( const IllegalArgumentException& ) { @@ -1094,7 +1094,7 @@ namespace sfx2 { try { - rtl::OUString aUIName = addExtension( aImportantFilterGroup[n].aUIName, + OUString aUIName = addExtension( aImportantFilterGroup[n].aUIName, aImportantFilterGroup[n].aWildcard, sal_False, _rFileDlgImpl ); _rxFilterManager->appendFilter( aUIName, aImportantFilterGroup[n].aWildcard ); @@ -1112,7 +1112,7 @@ namespace sfx2 { try { - rtl::OUString aUIName = addExtension( aFilterGroup[n].aUIName, + OUString aUIName = addExtension( aFilterGroup[n].aUIName, aFilterGroup[n].aWildcard, sal_False, _rFileDlgImpl ); _rxFilterManager->appendFilter( aUIName, aFilterGroup[n].aWildcard ); @@ -1131,7 +1131,7 @@ namespace sfx2 //-------------------------------------------------------------------- void appendFiltersForOpen( TSortedFilterList& _rFilterMatcher, const Reference< XFilterManager >& _rxFilterManager, - ::rtl::OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ) + OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ) { DBG_ASSERT( _rxFilterManager.is(), "sfx2::appendFiltersForOpen: invalid manager!" ); if ( !_rxFilterManager.is() ) @@ -1171,14 +1171,14 @@ namespace sfx2 } } - ::rtl::OUString addExtension( const ::rtl::OUString& _rDisplayText, - const ::rtl::OUString& _rExtension, + OUString addExtension( const OUString& _rDisplayText, + const OUString& _rExtension, sal_Bool _bForOpen, FileDialogHelper_Impl& _rFileDlgImpl ) { - static ::rtl::OUString sAllFilter( "(*.*)" ); - static ::rtl::OUString sOpenBracket( " (" ); - static ::rtl::OUString sCloseBracket( ")" ); - ::rtl::OUString sRet = _rDisplayText; + static OUString sAllFilter( "(*.*)" ); + static OUString sOpenBracket( " (" ); + static OUString sCloseBracket( ")" ); + OUString sRet = _rDisplayText; if ( sRet.indexOf( sAllFilter ) == -1 ) { diff --git a/sfx2/source/dialog/filtergrouping.hxx b/sfx2/source/dialog/filtergrouping.hxx index 4b35f87ef219..2112f6a58fb7 100644 --- a/sfx2/source/dialog/filtergrouping.hxx +++ b/sfx2/source/dialog/filtergrouping.hxx @@ -33,7 +33,7 @@ namespace sfx2 { private: - ::std::vector< ::rtl::OUString > m_lFilters; + ::std::vector< OUString > m_lFilters; sal_Int32 m_nIterator; public: @@ -53,15 +53,15 @@ namespace sfx2 void appendFiltersForSave( TSortedFilterList& _rFilterMatcher, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilterManager >& _rFilterManager, - ::rtl::OUString& /* [out] */ _rFirstNonEmpty, + OUString& /* [out] */ _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl, - const ::rtl::OUString& _rFactory + const OUString& _rFactory ); void appendExportFilters( TSortedFilterList& _rFilterMatcher, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilterManager >& _rFilterManager, - ::rtl::OUString& /* [out] */ _rFirstNonEmpty, + OUString& /* [out] */ _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ); @@ -72,7 +72,7 @@ namespace sfx2 void appendFiltersForOpen( TSortedFilterList& _rFilterMatcher, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilterManager >& _rFilterManager, - ::rtl::OUString& /* [out] */ _rFirstNonEmpty, + OUString& /* [out] */ _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl ); @@ -80,9 +80,9 @@ namespace sfx2 /** adds the given extension to the display text. <p>To be used when opening or save generic files.</p> */ - ::rtl::OUString addExtension( - const ::rtl::OUString& _rDisplayText, - const ::rtl::OUString& _rExtension, + OUString addExtension( + const OUString& _rDisplayText, + const OUString& _rExtension, sal_Bool _bForOpen, FileDialogHelper_Impl& _rFileDlgImpl ); diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index f92e836abe1d..82c2c3a56cea 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -94,8 +94,8 @@ namespace } } -SfxInfoBarWindow::SfxInfoBarWindow( Window* pParent, const rtl::OUString& sId, - const rtl::OUString& sMessage, vector< PushButton* > aButtons ) : +SfxInfoBarWindow::SfxInfoBarWindow( Window* pParent, const OUString& sId, + const OUString& sMessage, vector< PushButton* > aButtons ) : Window( pParent, 0 ), m_sId( sId ), m_pMessage( NULL ), @@ -244,7 +244,7 @@ SfxInfoBarContainerWindow::~SfxInfoBarContainerWindow( ) m_pInfoBars.clear( ); } -void SfxInfoBarContainerWindow::appendInfoBar( const rtl::OUString& sId, const rtl::OUString& sMessage, vector< PushButton* > aButtons ) +void SfxInfoBarContainerWindow::appendInfoBar( const OUString& sId, const OUString& sMessage, vector< PushButton* > aButtons ) { Size aSize = GetSizePixel( ); @@ -257,7 +257,7 @@ void SfxInfoBarContainerWindow::appendInfoBar( const rtl::OUString& sId, const r SetSizePixel( aSize ); } -SfxInfoBarWindow* SfxInfoBarContainerWindow::getInfoBar( const rtl::OUString& sId ) +SfxInfoBarWindow* SfxInfoBarContainerWindow::getInfoBar( const OUString& sId ) { SfxInfoBarWindow* pRet = NULL; for ( vector< SfxInfoBarWindow* >::iterator it = m_pInfoBars.begin( ); diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx index c1bd5055a0a5..a205684dfc14 100644 --- a/sfx2/source/dialog/inputdlg.cxx +++ b/sfx2/source/dialog/inputdlg.cxx @@ -18,7 +18,7 @@ #define LABEL_TEXT_SPACE 5 -InputDialog::InputDialog (const rtl::OUString &rLabelText, Window *pParent) +InputDialog::InputDialog (const OUString &rLabelText, Window *pParent) : ModalDialog(pParent,SfxResId(DLG_INPUT_BOX)), mpEntry(new Edit(this,SfxResId(EDT_INPUT_FIELD))), mpLabel(new FixedText(this,SfxResId(LABEL_INPUT_TEXT))), @@ -68,7 +68,7 @@ InputDialog::~InputDialog() delete mpCancel; } -rtl::OUString InputDialog::getEntryText () const +OUString InputDialog::getEntryText () const { return mpEntry->GetText(); } diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index f56b4bcf7d44..2605119eef50 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -149,7 +149,7 @@ sal_Bool HasDocumentValidSignature( const css::uno::Reference< css::frame::XMode css::uno::Reference< css::beans::XPropertySet > xPropSet( xModel, css::uno::UNO_QUERY ); if ( xPropSet.is() ) { - Any a = xPropSet->getPropertyValue( rtl::OUString( "HasValidSignatures" )); + Any a = xPropSet->getPropertyValue( OUString( "HasValidSignatures" )); sal_Bool bReturn = sal_Bool(); if ( a >>= bReturn ) return bReturn; @@ -169,8 +169,8 @@ sal_Bool HasDocumentValidSignature( const css::uno::Reference< css::frame::XMode SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( uno::Reference< lang::XMultiServiceFactory > xSMGR, uno::Reference< frame::XModel > xModel, - const rtl::OUString& rFilterName, - const rtl::OUString& rType, + const OUString& rFilterName, + const OUString& rType, bool bModified, sal_Int32& rNumArgs, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ) @@ -183,7 +183,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xFilterCFG = uno::Reference< container::XNameAccess >( xSMGR->createInstance( - ::rtl::OUString("com.sun.star.document.FilterFactory") ), uno::UNO_QUERY ); + OUString("com.sun.star.document.FilterFactory") ), uno::UNO_QUERY ); css::uno::Reference< css::util::XModifiable > xModifiable( xModel, css::uno::UNO_QUERY ); if ( !xFilterCFG.is() ) @@ -198,7 +198,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( { if( aProps[nProperty].Name == "UIComponent" ) { - ::rtl::OUString aServiceName; + OUString aServiceName; aProps[nProperty].Value >>= aServiceName; if( !aServiceName.isEmpty() ) { @@ -218,11 +218,11 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( //string for the ok button //used in filter/source/pdf/impdialog.cxx uno::Sequence< beans::PropertyValue > aFilterDataValue(1); - aFilterDataValue[0].Name = ::rtl::OUString( "_OkButtonString" ); + aFilterDataValue[0].Name = OUString( "_OkButtonString" ); aFilterDataValue[0].Value = css::uno::makeAny(SfxResId(STR_PDF_EXPORT_SEND ).toString()); //add to the filterdata property, the only one the PDF export filter dialog will care for - aPropsForDialog[0].Name = ::rtl::OUString( "FilterData" ); + aPropsForDialog[0].Name = OUString( "FilterData" ); aPropsForDialog[0].Value = css::uno::makeAny( aFilterDataValue ); //when executing the dialog will merge the persistent FilterData properties @@ -294,10 +294,10 @@ sal_Bool SfxMailModel::IsEmpty() const } SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( - const rtl::OUString& aSaveFileName, + const OUString& aSaveFileName, const css::uno::Reference< css::uno::XInterface >& xFrameOrModel, - const rtl::OUString& rType, - rtl::OUString& rFileNamePath ) + const OUString& rType, + OUString& rFileNamePath ) { SaveResult eRet( SAVE_ERROR ); bool bSendAsPDF = (rType.equalsAsciiL( PDF_DOCUMENT_TYPE, PDF_DOCUMENT_TYPE_LEN )); @@ -309,7 +309,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( css::uno::Reference< css::frame::XModuleManager2 > xModuleManager( css::frame::ModuleManager::create(xContext) ); - rtl::OUString aModule; + OUString aModule; try { aModule = xModuleManager->identify( xFrameOrModel ); @@ -345,7 +345,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( bModified = xModifiable->isModified(); if ( xStorable.is() ) { - rtl::OUString aLocation = xStorable->getLocation(); + OUString aLocation = xStorable->getLocation(); INetURLObject aFileObj( aLocation ); bool bPrivateProtocol = ( aFileObj.GetProtocol() == INET_PROT_PRIV_SOFFICE ); @@ -358,13 +358,13 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( if ( xStorable.is() ) { - rtl::OUString aFilterName; - rtl::OUString aTypeName( rType ); - rtl::OUString aFileName; - rtl::OUString aExtension; + OUString aFilterName; + OUString aTypeName( rType ); + OUString aFileName; + OUString aExtension; css::uno::Reference< css::container::XContainerQuery > xContainerQuery( - xSMGR->createInstance( rtl::OUString( + xSMGR->createInstance( OUString( "com.sun.star.document.FilterFactory" )), css::uno::UNO_QUERY ); @@ -372,9 +372,9 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { // Retrieve filter from type css::uno::Sequence< css::beans::NamedValue > aQuery( bSendAsPDF ? 3 : 2 ); - aQuery[0].Name = rtl::OUString( "Type" ); + aQuery[0].Name = OUString( "Type" ); aQuery[0].Value = css::uno::makeAny( aTypeName ); - aQuery[1].Name = rtl::OUString( "DocumentService" ); + aQuery[1].Name = OUString( "DocumentService" ); aQuery[1].Value = css::uno::makeAny( aModule ); if( bSendAsPDF ) { @@ -383,7 +383,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( // exact flag value as detailed in the filter configuration to get it // this seems to be a bug // without flags we get an import filter here, which is also unwanted - aQuery[2].Name = rtl::OUString( "Flags" ); + aQuery[2].Name = OUString( "Flags" ); aQuery[2].Value = css::uno::makeAny( sal_Int32(0x80042) ); // EXPORT ALIEN 3RDPARTY } @@ -394,17 +394,17 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { ::comphelper::SequenceAsHashMap aFilterPropsHM( xEnumeration->nextElement() ); aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Name"), - ::rtl::OUString() ); + OUString("Name"), + OUString() ); } if ( bHasLocation ) { // Retrieve filter from media descriptor ::comphelper::SequenceAsHashMap aMediaDescrPropsHM( xModel->getArgs() ); - rtl::OUString aOrgFilterName = aMediaDescrPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString( "FilterName" ), - ::rtl::OUString() ); + OUString aOrgFilterName = aMediaDescrPropsHM.getUnpackedValueOrDefault( + OUString( "FilterName" ), + OUString() ); if ( aOrgFilterName == aFilterName ) { // We should save the document in the original format. Therefore this @@ -421,8 +421,8 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( // Retrieve filter from media descriptor ::comphelper::SequenceAsHashMap aMediaDescrPropsHM( xModel->getArgs() ); aFilterName = aMediaDescrPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString( "FilterName" ), - ::rtl::OUString() ); + OUString( "FilterName" ), + OUString() ); } if ( !bHasLocation || aFilterName.isEmpty()) @@ -432,16 +432,16 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { ::comphelper::SequenceAsHashMap aFilterPropsHM( xModuleManager->getByName( aModule ) ); aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("ooSetupFactoryDefaultFilter"), - ::rtl::OUString() ); + OUString("ooSetupFactoryDefaultFilter"), + OUString() ); css::uno::Reference< css::container::XNameAccess > xNameAccess( xContainerQuery, css::uno::UNO_QUERY ); if ( xNameAccess.is() ) { ::comphelper::SequenceAsHashMap aFilterPropsHM2( xNameAccess->getByName( aFilterName ) ); aTypeName = aFilterPropsHM2.getUnpackedValueOrDefault( - ::rtl::OUString("Type"), - ::rtl::OUString() ); + OUString("Type"), + OUString() ); } } catch ( css::container::NoSuchElementException& ) @@ -463,12 +463,12 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( if ( bHasLocation && !bStoreTo ) { INetURLObject aFileObj( xStorable->getLocation() ); - aExtension = (rtl::OUString)aFileObj.getExtension(); + aExtension = (OUString)aFileObj.getExtension(); } else { css::uno::Reference< container::XNameAccess > xTypeDetection( - xSMGR->createInstance( ::rtl::OUString( + xSMGR->createInstance( OUString( "com.sun.star.document.TypeDetection" )), css::uno::UNO_QUERY ); @@ -478,9 +478,9 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( try { ::comphelper::SequenceAsHashMap aTypeNamePropsHM( xTypeDetection->getByName( aTypeName ) ); - uno::Sequence< ::rtl::OUString > aExtensions = aTypeNamePropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Extensions"), - ::uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString > aExtensions = aTypeNamePropsHM.getUnpackedValueOrDefault( + OUString("Extensions"), + ::uno::Sequence< OUString >() ); if ( aExtensions.getLength() ) aExtension = aExtensions[0]; } @@ -497,7 +497,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( if ( !bHasLocation ) { // Create a noname file name with the correct extension - const rtl::OUString aNoNameFileName( "noname" ); + const OUString aNoNameFileName( "noname" ); aFileName = aNoNameFileName; } else @@ -525,18 +525,18 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( aFilePathObj.insertName( aFileName ); aFilePathObj.setExtension( aExtension ); - rtl::OUString aFileURL = aFilePathObj.GetMainURL( INetURLObject::NO_DECODE ); + OUString aFileURL = aFilePathObj.GetMainURL( INetURLObject::NO_DECODE ); sal_Int32 nNumArgs(0); - const rtl::OUString aPasswordPropName( "Password" ); + const OUString aPasswordPropName( "Password" ); css::uno::Sequence< css::beans::PropertyValue > aArgs( ++nNumArgs ); - aArgs[nNumArgs-1].Name = rtl::OUString( "FilterName" ); + aArgs[nNumArgs-1].Name = OUString( "FilterName" ); aArgs[nNumArgs-1].Value = css::uno::makeAny( aFilterName ); ::comphelper::SequenceAsHashMap aMediaDescrPropsHM( xModel->getArgs() ); - rtl::OUString aPassword = aMediaDescrPropsHM.getUnpackedValueOrDefault( + OUString aPassword = aMediaDescrPropsHM.getUnpackedValueOrDefault( aPasswordPropName, - ::rtl::OUString() ); + OUString() ); if ( !aPassword.isEmpty() ) { aArgs.realloc( ++nNumArgs ); @@ -555,13 +555,13 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { // check if the document needs to be prepared for sending as mail (embedding of links, removal of invisible content) - aPrepareURL.Complete = rtl::OUString( ".uno:PrepareMailExport" ); + aPrepareURL.Complete = OUString( ".uno:PrepareMailExport" ); xURLTransformer->parseStrict( aPrepareURL ); if ( xDispatchProvider.is() ) { xPrepareDispatch = css::uno::Reference< css::frame::XDispatch >( - xDispatchProvider->queryDispatch( aPrepareURL, ::rtl::OUString(), 0 )); + xDispatchProvider->queryDispatch( aPrepareURL, OUString(), 0 )); if ( xPrepareDispatch.is() ) { PrepareListener_Impl* pPrepareListener; @@ -624,13 +624,13 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { css::util::URL aURL; // #i30432# notify that export is finished - the Writer may want to restore removed content - aURL.Complete = rtl::OUString( ".uno:MailExportFinished" ); + aURL.Complete = OUString( ".uno:MailExportFinished" ); xURLTransformer->parseStrict( aURL ); if ( xDispatchProvider.is() ) { css::uno::Reference< css::frame::XDispatch > xDispatch = css::uno::Reference< css::frame::XDispatch >( - xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 )); + xDispatchProvider->queryDispatch( aURL, OUString(), 0 )); if ( xDispatch.is() ) { try @@ -671,7 +671,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( { // We need 1:1 copy of the document to preserve an added signature. aArgs.realloc( ++nNumArgs ); - aArgs[nNumArgs-1].Name = ::rtl::OUString( "CopyStreamIfPossible" ); + aArgs[nNumArgs-1].Name = OUString( "CopyStreamIfPossible" ); aArgs[nNumArgs-1].Value = css::uno::makeAny( (sal_Bool)sal_True ); try @@ -752,11 +752,11 @@ void SfxMailModel::AddAddress( const String& rAddress, AddressRole eRole ) } SfxMailModel::SendMailResult SfxMailModel::AttachDocument( - const ::rtl::OUString& sDocumentType, + const OUString& sDocumentType, const css::uno::Reference< css::uno::XInterface >& xFrameOrModel, - const ::rtl::OUString& sAttachmentTitle ) + const OUString& sAttachmentTitle ) { - rtl::OUString sFileName; + OUString sFileName; SaveResult eSaveResult = SaveDocumentAsFormat( sAttachmentTitle, xFrameOrModel, sDocumentType, sFileName ); if ( eSaveResult == SAVE_SUCCESSFULL && !sFileName.isEmpty() ) @@ -908,13 +908,13 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css: return eResult; } -SfxMailModel::SendMailResult SfxMailModel::SaveAndSend( const css::uno::Reference< css::frame::XFrame >& xFrame, const rtl::OUString& rTypeName ) +SfxMailModel::SendMailResult SfxMailModel::SaveAndSend( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& rTypeName ) { SaveResult eSaveResult; SendMailResult eResult = SEND_MAIL_ERROR; - rtl::OUString aFileName; + OUString aFileName; - eSaveResult = SaveDocumentAsFormat( rtl::OUString(), xFrame, rTypeName, aFileName ); + eSaveResult = SaveDocumentAsFormat( OUString(), xFrame, rTypeName, aFileName ); if ( eSaveResult == SAVE_SUCCESSFULL ) { diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index 173d44f3bb89..4530ecf3b3e2 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -114,13 +114,13 @@ SfxPartDockWnd_Impl::SfxPartDockWnd_Impl xFrame, ::com::sun::star::uno::UNO_QUERY ); try { - const ::rtl::OUString aLayoutManager( "LayoutManager" ); + const OUString aLayoutManager( "LayoutManager" ); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xLMPropSet; ::com::sun::star::uno::Any a = xPropSet->getPropertyValue( aLayoutManager ); if ( a >>= xLMPropSet ) { - const ::rtl::OUString aAutomaticToolbars( "AutomaticToolbars" ); + const OUString aAutomaticToolbars( "AutomaticToolbars" ); xLMPropSet->setPropertyValue( aAutomaticToolbars, ::com::sun::star::uno::Any( sal_False )); } } diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index ec10f80824b9..27cb93c50cea 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -40,10 +40,10 @@ using namespace ::com::sun::star; -static rtl::OUString GetLabelFromCommandURL( const rtl::OUString& rCommandURL, const uno::Reference< frame::XFrame >& xFrame ) +static OUString GetLabelFromCommandURL( const OUString& rCommandURL, const uno::Reference< frame::XFrame >& xFrame ) { - rtl::OUString aLabel; - rtl::OUString aModuleIdentifier; + OUString aLabel; + OUString aModuleIdentifier; uno::Reference< container::XNameAccess > xUICommandLabels; uno::Reference< uno::XComponentContext > xContext; uno::Reference< container::XNameAccess > xUICommandDescription; @@ -172,7 +172,7 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl( { // Retrieve label from helper function uno::Reference< frame::XFrame > xFrame = GetBindings().GetActiveFrame(); - rtl::OUString aCommandStr( ".uno:StopRecording" ); + OUString aCommandStr( ".uno:StopRecording" ); aTbx.SetItemText( SID_STOP_RECORDING, GetLabelFromCommandURL( aCommandStr, xFrame )); // Determine size of toolbar diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index e5b08586cc97..5a3ddd7b4ad1 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -232,7 +232,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, if ( bWithButtons ) { // Read Configuration - String aWindowId = rtl::OUString("SplitWindow"); + String aWindowId = OUString("SplitWindow"); aWindowId += OUString::number( (sal_Int32) eTbxAlign ); SvtViewOptions aWinOpt( E_WINDOW, aWindowId ); String aWinData; @@ -306,7 +306,7 @@ SfxSplitWindow::~SfxSplitWindow() void SfxSplitWindow::SaveConfig_Impl() { // Save configuration - rtl::OUStringBuffer aWinData; + OUStringBuffer aWinData; aWinData.append('V'); aWinData.append(static_cast<sal_Int32>(VERSION)); aWinData.append(','); @@ -335,7 +335,7 @@ void SfxSplitWindow::SaveConfig_Impl() aWinData.append(static_cast<sal_Int32>(pDock->nType)); } - String aWindowId = rtl::OUString("SplitWindow"); + String aWindowId = OUString("SplitWindow"); aWindowId += OUString::number( (sal_Int32) GetAlign() ); SvtViewOptions aWinOpt( E_WINDOW, aWindowId ); aWinOpt.SetUserItem( USERITEM_NAME, makeAny( aWinData.makeStringAndClear() ) ); diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index c5745f09da26..40e5027d7fb7 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -40,7 +40,7 @@ namespace sfx2 { // SearchDialog // ============================================================================ -SearchDialog::SearchDialog( Window* pWindow, const ::rtl::OUString& rConfigName ) : +SearchDialog::SearchDialog( Window* pWindow, const OUString& rConfigName ) : ModelessDialog( pWindow, SfxResId( RID_DLG_SEARCH ) ), @@ -82,9 +82,9 @@ void SearchDialog::LoadConfig() SvtViewOptions aViewOpt( E_DIALOG, m_sConfigName ); if ( aViewOpt.Exists() ) { - m_sWinState = rtl::OUStringToOString(aViewOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US); + m_sWinState = OUStringToOString(aViewOpt.GetWindowState(), RTL_TEXTENCODING_ASCII_US); Any aUserItem = aViewOpt.GetUserItem( "UserItem" ); - ::rtl::OUString aTemp; + OUString aTemp; if ( aUserItem >>= aTemp ) { String sUserData( aTemp ); @@ -109,7 +109,7 @@ void SearchDialog::LoadConfig() void SearchDialog::SaveConfig() { SvtViewOptions aViewOpt( E_DIALOG, m_sConfigName ); - aViewOpt.SetWindowState(rtl::OStringToOUString(m_sWinState, RTL_TEXTENCODING_ASCII_US)); + aViewOpt.SetWindowState(OStringToOUString(m_sWinState, RTL_TEXTENCODING_ASCII_US)); String sUserData; sal_uInt16 i = 0, nCount = Min( m_aSearchEdit.GetEntryCount(), MAX_SAVE_COUNT ); for ( ; i < nCount; ++i ) @@ -127,7 +127,7 @@ void SearchDialog::SaveConfig() sUserData += ';'; sUserData += OUString::number( m_aBackwardsBox.IsChecked() ? 1 : 0 ); - Any aUserItem = makeAny( ::rtl::OUString( sUserData ) ); + Any aUserItem = makeAny( OUString( sUserData ) ); aViewOpt.SetUserItem( "UserItem", aUserItem ); } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index bec9cc1a4ee7..ac88e91e8afd 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -234,7 +234,7 @@ SfxTabPage::SfxTabPage( Window *pParent, } -SfxTabPage::SfxTabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) +SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) : TabPage(pParent, rID, rUIXMLDescription) , pSet ( &rAttrSet ) , bHasExchangeSupport ( sal_False ) @@ -785,7 +785,7 @@ void SfxTabDialog::Start_Impl() SvtViewOptions aDlgOpt( E_TABDIALOG, OUString::number( nResId ) ); if ( aDlgOpt.Exists() ) { - SetWindowState(rtl::OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); + SetWindowState(OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US)); // initial TabPage from Program/Help/config nActPage = (sal_uInt16)aDlgOpt.GetPageID(); @@ -1642,7 +1642,7 @@ long SfxTabDialog::Notify( NotifyEvent& rNEvt ) if ( pViewFrame ) { Window* pWindow = rNEvt.GetWindow(); - rtl::OString sHelpId; + OString sHelpId; while ( sHelpId.isEmpty() && pWindow ) { sHelpId = pWindow->GetHelpId(); diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index c4bb67fd9a52..cb57746fa0b1 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -95,17 +95,17 @@ namespace sfx2 namespace { //-------------------------------------------------------------------------------------------------------------- - ::utl::OConfigurationTreeRoot lcl_getModuleUIElementStatesConfig( const ::rtl::OUString& i_rModuleIdentifier, - const ::rtl::OUString& i_rResourceURL = ::rtl::OUString() ) + ::utl::OConfigurationTreeRoot lcl_getModuleUIElementStatesConfig( const OUString& i_rModuleIdentifier, + const OUString& i_rResourceURL = OUString() ) { const Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); - ::rtl::OUStringBuffer aPathComposer; + OUStringBuffer aPathComposer; try { const Reference< XModuleManager2 > xModuleAccess( ModuleManager::create(xContext) ); const ::comphelper::NamedValueCollection aModuleProps( xModuleAccess->getByName( i_rModuleIdentifier ) ); - const ::rtl::OUString sWindowStateRef( aModuleProps.getOrDefault( "ooSetupFactoryWindowStateConfigRef", ::rtl::OUString() ) ); + const OUString sWindowStateRef( aModuleProps.getOrDefault( "ooSetupFactoryWindowStateConfigRef", OUString() ) ); aPathComposer.appendAscii(RTL_CONSTASCII_STRINGPARAM( "org.openoffice.Office.UI.")); @@ -124,9 +124,9 @@ namespace sfx2 } //-------------------------------------------------------------------------------------------------------------- - ::rtl::OUString lcl_identifyModule( const Reference< XFrame >& i_rDocumentFrame ) + OUString lcl_identifyModule( const Reference< XFrame >& i_rDocumentFrame ) { - ::rtl::OUString sModuleName; + OUString sModuleName; try { const Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -150,16 +150,16 @@ namespace sfx2 } //-------------------------------------------------------------------------------------------------------------- - ::rtl::OUString lcl_getPanelHelpURL( const ::utl::OConfigurationNode& i_rPanelConfigNode ) + OUString lcl_getPanelHelpURL( const ::utl::OConfigurationNode& i_rPanelConfigNode ) { - const ::rtl::OUString sHelpURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "HelpURL" ) ) ); + const OUString sHelpURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "HelpURL" ) ) ); return sHelpURL; } //-------------------------------------------------------------------------------------------------------------- Image lcl_getPanelImage( const Reference< XFrame >& i_rDocFrame, const ::utl::OConfigurationNode& i_rPanelConfigNode ) { - const ::rtl::OUString sImageURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "ImageURL" ) ) ); + const OUString sImageURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "ImageURL" ) ) ); if ( !sImageURL.isEmpty() ) { try @@ -172,10 +172,10 @@ namespace sfx2 const sal_Int32 nCommandImagePrefixLen = strlen( pCommandImagePrefix ); if ( sImageURL.startsWith( pCommandImagePrefix ) ) { - ::rtl::OUStringBuffer aCommandName; + OUStringBuffer aCommandName; aCommandName.appendAscii(RTL_CONSTASCII_STRINGPARAM(".uno:")); aCommandName.append( sImageURL.copy( nCommandImagePrefixLen ) ); - const ::rtl::OUString sCommandName( aCommandName.makeStringAndClear() ); + const OUString sCommandName( aCommandName.makeStringAndClear() ); const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, sal_False ) ); return aPanelImage.GetXGraphic(); @@ -211,7 +211,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - void TaskPaneDockingWindow::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) + void TaskPaneDockingWindow::ActivateToolPanel( const OUString& i_rPanelURL ) { m_aPaneController.ActivateToolPanel( i_rPanelURL ); } @@ -253,7 +253,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - void TaskPaneWrapper::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) + void TaskPaneWrapper::ActivateToolPanel( const OUString& i_rPanelURL ) { TaskPaneDockingWindow* pDockingWindow = dynamic_cast< TaskPaneDockingWindow* >( GetWindow() ); ENSURE_OR_RETURN_VOID( pDockingWindow, "TaskPaneWrapper::ActivateToolPanel: invalid docking window implementation!" ); @@ -300,9 +300,9 @@ namespace sfx2 public: CustomToolPanel( const ::utl::OConfigurationNode& i_rPanelWindowState, const Reference< XFrame >& i_rFrame ); - virtual ::rtl::OUString GetDisplayName() const; + virtual OUString GetDisplayName() const; virtual Image GetImage() const; - virtual rtl::OString GetHelpID() const; + virtual OString GetHelpID() const; virtual void Activate( Window& i_rParentWindow ); virtual void Deactivate(); virtual void SetSizePixel( const Size& i_rPanelWindowSize ); @@ -311,7 +311,7 @@ namespace sfx2 virtual Reference< XAccessible > CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible ); - const ::rtl::OUString& + const OUString& GetResourceURL() const { return m_sResourceURL; } protected: @@ -322,11 +322,11 @@ namespace sfx2 void impl_updatePanelConfig( const bool i_bVisible ) const; private: - const ::rtl::OUString m_sUIName; + const OUString m_sUIName; const Image m_aPanelImage; - const ::rtl::OUString m_aPanelHelpURL; - const ::rtl::OUString m_sResourceURL; - const ::rtl::OUString m_sPanelConfigPath; + const OUString m_aPanelHelpURL; + const OUString m_sResourceURL; + const OUString m_sPanelConfigPath; Reference< XFrame > m_xFrame; CustomPanelUIElement m_aCustomPanel; bool m_bAttemptedCreation; @@ -388,7 +388,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString CustomToolPanel::GetDisplayName() const + OUString CustomToolPanel::GetDisplayName() const { return m_sUIName; } @@ -399,17 +399,17 @@ namespace sfx2 return m_aPanelImage; } - static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL ) + static OString lcl_getHelpId( const OUString& _rHelpURL ) { INetURLObject aHID( _rHelpURL ); if ( aHID.GetProtocol() == INET_PROT_HID ) - return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ); else - return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); + return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------------------------------------------------ - rtl::OString CustomToolPanel::GetHelpID() const + OString CustomToolPanel::GetHelpID() const { return lcl_getHelpId( m_aPanelHelpURL ); } @@ -523,14 +523,14 @@ namespace sfx2 void OnResize(); void OnGetFocus(); - static bool ModuleHasToolPanels( const ::rtl::OUString& i_rModuleIdentifier ); + static bool ModuleHasToolPanels( const OUString& i_rModuleIdentifier ); ::svt::ToolPanelDeck& GetPanelDeck() { return m_aPanelDeck; } const ::svt::ToolPanelDeck& GetPanelDeck() const { return m_aPanelDeck; } ::boost::optional< size_t > - GetPanelPos( const ::rtl::OUString& i_rResourceURL ); - ::rtl::OUString + GetPanelPos( const OUString& i_rResourceURL ); + OUString GetPanelResourceURL( const size_t i_nPanelPos ) const; void SetDrawersLayout(); @@ -540,13 +540,13 @@ namespace sfx2 void impl_initFromConfiguration( const IToolPanelCompare* i_pPanelCompare ); static bool - impl_isToolPanelResource( const ::rtl::OUString& i_rResourceURL ); + impl_isToolPanelResource( const OUString& i_rResourceURL ); DECL_LINK( OnActivatePanel, void* ); private: ModuleTaskPane& m_rAntiImpl; - const ::rtl::OUString m_sModuleIdentifier; + const OUString m_sModuleIdentifier; const Reference< XFrame > m_xFrame; ::svt::ToolPanelDeck m_aPanelDeck; }; @@ -571,7 +571,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - bool ModuleTaskPane_Impl::impl_isToolPanelResource( const ::rtl::OUString& i_rResourceURL ) + bool ModuleTaskPane_Impl::impl_isToolPanelResource( const OUString& i_rResourceURL ) { return i_rResourceURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:resource/toolpanel/" ) ); } @@ -583,11 +583,11 @@ namespace sfx2 if ( !aWindowStateConfig.isValid() ) return; - ::rtl::OUString sFirstVisiblePanelResource; - ::rtl::OUString sFirstPanelResource; + OUString sFirstVisiblePanelResource; + OUString sFirstPanelResource; - const Sequence< ::rtl::OUString > aUIElements( aWindowStateConfig.getNodeNames() ); - for ( const ::rtl::OUString* resource = aUIElements.getConstArray(); + const Sequence< OUString > aUIElements( aWindowStateConfig.getNodeNames() ); + for ( const OUString* resource = aUIElements.getConstArray(); resource != aUIElements.getConstArray() + aUIElements.getLength(); ++resource ) @@ -636,14 +636,14 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - bool ModuleTaskPane_Impl::ModuleHasToolPanels( const ::rtl::OUString& i_rModuleIdentifier ) + bool ModuleTaskPane_Impl::ModuleHasToolPanels( const OUString& i_rModuleIdentifier ) { const ::utl::OConfigurationTreeRoot aWindowStateConfig( lcl_getModuleUIElementStatesConfig( i_rModuleIdentifier ) ); if ( !aWindowStateConfig.isValid() ) return false; - const Sequence< ::rtl::OUString > aUIElements( aWindowStateConfig.getNodeNames() ); - for ( const ::rtl::OUString* resource = aUIElements.getConstArray(); + const Sequence< OUString > aUIElements( aWindowStateConfig.getNodeNames() ); + for ( const OUString* resource = aUIElements.getConstArray(); resource != aUIElements.getConstArray() + aUIElements.getLength(); ++resource ) @@ -655,7 +655,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - ::boost::optional< size_t > ModuleTaskPane_Impl::GetPanelPos( const ::rtl::OUString& i_rResourceURL ) + ::boost::optional< size_t > ModuleTaskPane_Impl::GetPanelPos( const OUString& i_rResourceURL ) { ::boost::optional< size_t > aPanelPos; for ( size_t i = 0; i < m_aPanelDeck.GetPanelCount(); ++i ) @@ -678,12 +678,12 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString ModuleTaskPane_Impl::GetPanelResourceURL( const size_t i_nPanelPos ) const + OUString ModuleTaskPane_Impl::GetPanelResourceURL( const size_t i_nPanelPos ) const { - ENSURE_OR_RETURN( i_nPanelPos < m_aPanelDeck.GetPanelCount(), "ModuleTaskPane_Impl::GetPanelResourceURL: illegal panel position!", ::rtl::OUString() ); + ENSURE_OR_RETURN( i_nPanelPos < m_aPanelDeck.GetPanelCount(), "ModuleTaskPane_Impl::GetPanelResourceURL: illegal panel position!", OUString() ); const ::svt::PToolPanel pPanel( m_aPanelDeck.GetPanel( i_nPanelPos ) ); const CustomToolPanel* pCustomPanel = dynamic_cast< const CustomToolPanel* >( pPanel.get() ); - ENSURE_OR_RETURN( pCustomPanel != NULL, "ModuleTaskPane_Impl::GetPanelPos: illegal panel implementation!", ::rtl::OUString() ); + ENSURE_OR_RETURN( pCustomPanel != NULL, "ModuleTaskPane_Impl::GetPanelPos: illegal panel implementation!", OUString() ); return pCustomPanel->GetResourceURL(); } @@ -776,13 +776,13 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - ::boost::optional< size_t > ModuleTaskPane::GetPanelPos( const ::rtl::OUString& i_rResourceURL ) + ::boost::optional< size_t > ModuleTaskPane::GetPanelPos( const OUString& i_rResourceURL ) { return m_pImpl->GetPanelPos( i_rResourceURL ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString ModuleTaskPane::GetPanelResourceURL( const size_t i_nPanelPos ) const + OUString ModuleTaskPane::GetPanelResourceURL( const size_t i_nPanelPos ) const { return m_pImpl->GetPanelResourceURL( i_nPanelPos ); } @@ -870,7 +870,7 @@ namespace sfx2 virtual ~TaskPaneController_Impl(); void SetDefaultTitle( const String& i_rTitle ); - void ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ); + void ActivateToolPanel( const OUString& i_rPanelURL ); protected: // IToolPanelDeckListener overridables @@ -918,7 +918,7 @@ namespace sfx2 PanelSelectorLayout m_eCurrentLayout; PanelDescriptors m_aPanelRepository; bool m_bTogglingPanelVisibility; - ::rtl::OUString m_sDefaultTitle; + OUString m_sDefaultTitle; }; //------------------------------------------------------------------------------------------------------------------ @@ -978,7 +978,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - void TaskPaneController_Impl::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) + void TaskPaneController_Impl::ActivateToolPanel( const OUString& i_rPanelURL ) { ::boost::optional< size_t > aPanelPos( m_rTaskPane.GetPanelPos( i_rPanelURL ) ); ENSURE_OR_RETURN_VOID( !!aPanelPos, "TaskPaneController_Impl::ActivateToolPanel: no such panel!" ); @@ -1238,9 +1238,9 @@ namespace sfx2 pMenu->InsertSeparator(); #if OSL_DEBUG_LEVEL > 0 - pMenu->InsertItem( MID_LAYOUT_TABS, rtl::OUString("Tab-Layout (exp.)"), MIB_CHECKABLE ); + pMenu->InsertItem( MID_LAYOUT_TABS, OUString("Tab-Layout (exp.)"), MIB_CHECKABLE ); pMenu->CheckItem( MID_LAYOUT_TABS, impl_getLayout() != LAYOUT_DRAWERS ); - pMenu->InsertItem( MID_LAYOUT_DRAWERS, rtl::OUString("Drawer-Layout"), MIB_CHECKABLE ); + pMenu->InsertItem( MID_LAYOUT_DRAWERS, OUString("Drawer-Layout"), MIB_CHECKABLE ); pMenu->CheckItem( MID_LAYOUT_DRAWERS, impl_getLayout() == LAYOUT_DRAWERS ); pMenu->InsertSeparator(); @@ -1279,7 +1279,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - void TaskPaneController::ActivateToolPanel( const ::rtl::OUString& i_rPanelURL ) + void TaskPaneController::ActivateToolPanel( const OUString& i_rPanelURL ) { m_pImpl->ActivateToolPanel( i_rPanelURL ); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 5cf22dae50f4..4459a2e796de 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -385,7 +385,7 @@ void SfxTemplateDialogWrapper::SetParagraphFamily() } //========================================================================= -typedef std::vector<rtl::OUString> ExpandedEntries_t; +typedef std::vector<OUString> ExpandedEntries_t; /* [Description] @@ -681,7 +681,7 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr) inline sal_Bool IsExpanded_Impl( const ExpandedEntries_t& rEntries, - const rtl::OUString &rStr) + const OUString &rStr) { for (size_t n = 0; n < rEntries.size(); ++n) { @@ -1268,7 +1268,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) SfxStyleSheetBase *pStyle = pStyleSheetPool->First(); SvTreeListEntry* pEntry = aFmtLb.First(); - std::vector<rtl::OUString> aStrings; + std::vector<OUString> aStrings; comphelper::string::NaturalStringSorter aSorter( ::comphelper::getProcessComponentContext(), @@ -1287,7 +1287,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) size_t nCount = aStrings.size(); size_t nPos = 0; while(nPos < nCount && pEntry && - aStrings[nPos] == rtl::OUString(aFmtLb.GetEntryText(pEntry))) + aStrings[nPos] == OUString(aFmtLb.GetEntryText(pEntry))) { ++nPos; pEntry = aFmtLb.Next( pEntry ); @@ -1845,12 +1845,12 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry) //------------------------------------------------------------------------- -static rtl::OUString getModuleIdentifier( const Reference< XModuleManager2 >& i_xModMgr, SfxObjectShell* i_pObjSh ) +static OUString getModuleIdentifier( const Reference< XModuleManager2 >& i_xModMgr, SfxObjectShell* i_pObjSh ) { OSL_ENSURE( i_xModMgr.is(), "getModuleIdentifier(): no XModuleManager" ); OSL_ENSURE( i_pObjSh, "getModuleIdentifier(): no ObjectShell" ); - ::rtl::OUString sIdentifier; + OUString sIdentifier; try { @@ -2321,7 +2321,7 @@ void SfxTemplateDialog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const SfxStyleFamilyItem *pItem) { - rtl::OString sHelpId; + OString sHelpId; switch( (sal_uInt16) pItem->GetFamily() ) { case SFX_STYLE_FAMILY_CHAR: sHelpId = ".uno:CharStyle"; break; @@ -2557,9 +2557,9 @@ IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox ) //------------------------------------------------------------------------- -static ::rtl::OUString lcl_GetLabel(uno::Any& rAny) +static OUString lcl_GetLabel(uno::Any& rAny) { - ::rtl::OUString sRet; + OUString sRet; uno::Sequence< beans::PropertyValue >aPropSeq; if ( rAny >>= aPropSeq ) { @@ -2597,7 +2597,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) frame::UICommandDescription::create( ::comphelper::getProcessComponentContext()) ); uno::Reference< container::XNameAccess > xUICommands; - rtl::OUString sTextDoc("com.sun.star.text.TextDocument"); + OUString sTextDoc("com.sun.star.text.TextDocument"); if(xNameAccess->hasByName(sTextDoc)) { uno::Any a = xNameAccess->getByName( sTextDoc ); @@ -2608,18 +2608,18 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) try { uno::Sequence< beans::PropertyValue > aPropSeq; - uno::Any aCommand = xUICommands->getByName(::rtl::OUString(".uno:StyleNewByExample")); - ::rtl::OUString sLabel = lcl_GetLabel( aCommand ); + uno::Any aCommand = xUICommands->getByName(OUString(".uno:StyleNewByExample")); + OUString sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, sLabel ); pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE); - aCommand = xUICommands->getByName(::rtl::OUString(".uno:StyleUpdateByExample")); + aCommand = xUICommands->getByName(OUString(".uno:StyleUpdateByExample")); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel ); pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE); - aCommand = xUICommands->getByName(::rtl::OUString(".uno:LoadStyles")); + aCommand = xUICommands->getByName(OUString(".uno:LoadStyles")); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel ); pMenu->SetHelpId(SID_TEMPLATE_LOAD, ".uno:LoadStyles"); diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 02d7446e7ee9..a8cb0a1610c9 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -237,7 +237,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const String& i_rItemText, const rtl::OString& i_nHelpId, const Link& i_rCallback ) + sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const String& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ) { // Add the menu before the closer button. const sal_uInt16 nItemCount( m_aToolbox.GetItemCount() ); diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index c85c452d74b1..623aa843ea91 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -79,10 +79,10 @@ using namespace ::com::sun::star; namespace sfx2 { -bool isValidNCName(::rtl::OUString const & i_rIdref) +bool isValidNCName(OUString const & i_rIdref) { - const ::rtl::OString id( - ::rtl::OUStringToOString(i_rIdref, RTL_TEXTENCODING_UTF8) ); + const OString id( + OUStringToOString(i_rIdref, RTL_TEXTENCODING_UTF8) ); return !(xmlValidateNCName( reinterpret_cast<const unsigned char*>(id.getStr()), 0)); } @@ -97,24 +97,24 @@ static const char s_rdfxml [] = "application/rdf+xml"; static const char s_odfmime [] = "application/vnd.oasis.opendocument."; -static bool isContentFile(::rtl::OUString const & i_rPath) +static bool isContentFile(OUString const & i_rPath) { return i_rPath == s_content; } -static bool isStylesFile (::rtl::OUString const & i_rPath) +static bool isStylesFile (OUString const & i_rPath) { return i_rPath == s_styles; } -bool isValidXmlId(::rtl::OUString const & i_rStreamName, - ::rtl::OUString const & i_rIdref) +bool isValidXmlId(OUString const & i_rStreamName, + OUString const & i_rIdref) { return isValidNCName(i_rIdref) && (isContentFile(i_rStreamName) || isStylesFile(i_rStreamName)); } -static bool isReservedFile(::rtl::OUString const & i_rPath) +static bool isReservedFile(OUString const & i_rPath) { return isContentFile(i_rPath) || isStylesFile(i_rPath) || i_rPath == s_meta || i_rPath == s_settings; } @@ -123,7 +123,7 @@ static bool isReservedFile(::rtl::OUString const & i_rPath) uno::Reference<rdf::XURI> createBaseURI( uno::Reference<uno::XComponentContext> const & i_xContext, uno::Reference<embed::XStorage> const & i_xStorage, - ::rtl::OUString const & i_rPkgURI, ::rtl::OUString const & i_rSubDocument) + OUString const & i_rPkgURI, OUString const & i_rSubDocument) { if (!i_xContext.is() || !i_xStorage.is() || i_rPkgURI.isEmpty()) { throw uno::RuntimeException(); @@ -131,7 +131,7 @@ uno::Reference<rdf::XURI> createBaseURI( // #i108078# workaround non-hierarchical vnd.sun.star.expand URIs // this really should be done somewhere else, not here. - ::rtl::OUString pkgURI(i_rPkgURI); + OUString pkgURI(i_rPkgURI); if (pkgURI.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.expand:"))) { @@ -161,13 +161,13 @@ uno::Reference<rdf::XURI> createBaseURI( if (true) { xBaseURI.set( xPkgURI, uno::UNO_SET_THROW ); } - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if (!xBaseURI->getUriReference().endsWithAsciiL("/", 1)) { const sal_Int32 count( xBaseURI->getPathSegmentCount() ); if (count > 0) { - const ::rtl::OUString last( xBaseURI->getPathSegment(count - 1) ); + const OUString last( xBaseURI->getPathSegment(count - 1) ); buf.append(last); } buf.append(static_cast<sal_Unicode>('/')); @@ -177,7 +177,7 @@ uno::Reference<rdf::XURI> createBaseURI( buf.append(i_rSubDocument); buf.append(static_cast<sal_Unicode>('/')); } - const ::rtl::OUString Path(buf.makeStringAndClear()); + const OUString Path(buf.makeStringAndClear()); if (!Path.isEmpty()) { const uno::Reference< uri::XUriReference > xPathURI( @@ -225,13 +225,13 @@ getURI(uno::Reference< uno::XComponentContext > const & i_xContext) /** would storing the file to a XStorage succeed? */ -static bool isFileNameValid(const ::rtl::OUString & i_rFileName) +static bool isFileNameValid(const OUString & i_rFileName) { if (i_rFileName.isEmpty()) return false; if (i_rFileName[0] == '/') return false; // no absolute paths! sal_Int32 idx(0); do { - const ::rtl::OUString segment( + const OUString segment( i_rFileName.getToken(0, static_cast<sal_Unicode> ('/'), idx) ); if (segment.isEmpty() || // no empty segments segment == "." || // no . segments @@ -245,12 +245,12 @@ static bool isFileNameValid(const ::rtl::OUString & i_rFileName) /** split a uri hierarchy into first segment and rest */ static bool -splitPath(::rtl::OUString const & i_rPath, - ::rtl::OUString & o_rDir, ::rtl::OUString& o_rRest) +splitPath(OUString const & i_rPath, + OUString & o_rDir, OUString& o_rRest) { const sal_Int32 idx(i_rPath.indexOf(static_cast<sal_Unicode>('/'))); if (idx < 0 || idx >= i_rPath.getLength()) { - o_rDir = ::rtl::OUString(); + o_rDir = OUString(); o_rRest = i_rPath; return true; } else if (idx == 0 || idx == i_rPath.getLength() - 1) { @@ -264,8 +264,8 @@ splitPath(::rtl::OUString const & i_rPath, } static bool -splitXmlId(::rtl::OUString const & i_XmlId, - ::rtl::OUString & o_StreamName, ::rtl::OUString& o_Idref ) +splitXmlId(OUString const & i_XmlId, + OUString & o_StreamName, OUString& o_Idref ) { const sal_Int32 idx(i_XmlId.indexOf(static_cast<sal_Unicode>('#'))); if ((idx <= 0) || (idx >= i_XmlId.getLength() - 1)) { @@ -280,7 +280,7 @@ splitXmlId(::rtl::OUString const & i_XmlId, static uno::Reference<rdf::XURI> getURIForStream(struct DocumentMetadataAccess_Impl& i_rImpl, - ::rtl::OUString const& i_rPath) + OUString const& i_rPath) { const uno::Reference<rdf::XURI> xURI( rdf::URI::createNS( i_rImpl.m_xContext, @@ -294,7 +294,7 @@ getURIForStream(struct DocumentMetadataAccess_Impl& i_rImpl, static void addFile(struct DocumentMetadataAccess_Impl & i_rImpl, uno::Reference<rdf::XURI> const& i_xType, - ::rtl::OUString const & i_rPath, + OUString const & i_rPath, const uno::Sequence < uno::Reference< rdf::XURI > > * i_pTypes = 0) { try { @@ -318,7 +318,7 @@ addFile(struct DocumentMetadataAccess_Impl & i_rImpl, throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "addFile: exception"), /*this*/0, uno::makeAny(e)); } } @@ -326,7 +326,7 @@ addFile(struct DocumentMetadataAccess_Impl & i_rImpl, /** add content.xml or styles.xml to manifest */ static bool addContentOrStylesFileImpl(struct DocumentMetadataAccess_Impl & i_rImpl, - const ::rtl::OUString & i_rPath) + const OUString & i_rPath) { uno::Reference<rdf::XURI> xType; if (isContentFile(i_rPath)) { @@ -343,7 +343,7 @@ addContentOrStylesFileImpl(struct DocumentMetadataAccess_Impl & i_rImpl, /** add metadata file to manifest */ static void addMetadataFileImpl(struct DocumentMetadataAccess_Impl & i_rImpl, - const ::rtl::OUString & i_rPath, + const OUString & i_rPath, const uno::Sequence < uno::Reference< rdf::XURI > > & i_rTypes) { addFile(i_rImpl, @@ -367,7 +367,7 @@ removeFile(struct DocumentMetadataAccess_Impl & i_rImpl, throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString("removeFile: exception"), + OUString("removeFile: exception"), 0, uno::makeAny(e)); } } @@ -396,7 +396,7 @@ getAllParts(struct DocumentMetadataAccess_Impl & i_rImpl) throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString("getAllParts: exception"), + OUString("getAllParts: exception"), 0, uno::makeAny(e)); } } @@ -418,26 +418,26 @@ isPartOfType(struct DocumentMetadataAccess_Impl & i_rImpl, throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString("isPartOfType: exception"), + OUString("isPartOfType: exception"), 0, uno::makeAny(e)); } } static ucb::InteractiveAugmentedIOException -mkException( ::rtl::OUString const & i_rMessage, +mkException( OUString const & i_rMessage, ucb::IOErrorCode const i_ErrorCode, - ::rtl::OUString const & i_rUri, ::rtl::OUString const & i_rResource) + OUString const & i_rUri, OUString const & i_rResource) { ucb::InteractiveAugmentedIOException iaioe; iaioe.Message = i_rMessage; iaioe.Classification = task::InteractionClassification_ERROR; iaioe.Code = i_ErrorCode; - const beans::PropertyValue uriProp(::rtl::OUString("Uri"), + const beans::PropertyValue uriProp(OUString("Uri"), -1, uno::makeAny(i_rUri), static_cast<beans::PropertyState>(0)); const beans::PropertyValue rnProp( - ::rtl::OUString("ResourceName"), + OUString("ResourceName"), -1, uno::makeAny(i_rResource), static_cast<beans::PropertyState>(0)); iaioe.Arguments = ::comphelper::makeSequence( uno::makeAny(uriProp), uno::makeAny(rnProp)); @@ -457,7 +457,7 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException, const uno::Reference<task::XInteractionHandler> & i_xHandler) { if (!i_xHandler.is()) { - throw lang::WrappedTargetException(::rtl::OUString( + throw lang::WrappedTargetException(OUString( "DocumentMetadataAccess::loadMetadataFromStorage: exception"), /* *this*/ 0, uno::makeAny(i_rException)); } @@ -481,7 +481,7 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException, return false; } else { OSL_ENSURE(pAbort->wasSelected(), "no continuation selected?"); - throw lang::WrappedTargetException(::rtl::OUString( + throw lang::WrappedTargetException(OUString( "DocumentMetadataAccess::loadMetadataFromStorage: exception"), /* *this*/ 0, uno::makeAny(i_rException)); } @@ -491,11 +491,11 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException, e.g. ODB files seem to only have content.xml */ static void collectFilesFromStorage(uno::Reference<embed::XStorage> const& i_xStorage, - ::rtl::OUString i_Path, - std::set< ::rtl::OUString > & o_rFiles) + OUString i_Path, + std::set< OUString > & o_rFiles) { - static ::rtl::OUString content(s_content); - static ::rtl::OUString styles(s_styles ); + static OUString content(s_content); + static OUString styles(s_styles ); try { if (i_xStorage->hasByName(content) && i_xStorage->isStreamElement(content)) @@ -516,11 +516,11 @@ collectFilesFromStorage(uno::Reference<embed::XStorage> const& i_xStorage, static void readStream(struct DocumentMetadataAccess_Impl & i_rImpl, uno::Reference< embed::XStorage > const & i_xStorage, - ::rtl::OUString const & i_rPath, - ::rtl::OUString const & i_rBaseURI) + OUString const & i_rPath, + OUString const & i_rBaseURI) { - ::rtl::OUString dir; - ::rtl::OUString rest; + OUString dir; + OUString rest; try { if (!splitPath(i_rPath, dir, rest)) throw uno::RuntimeException(); if (dir.isEmpty()) { @@ -538,7 +538,7 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl, i_rImpl.m_xRepository->importGraph(rdf::FileFormat::RDF_XML, xInStream, xURI, xBaseURI); } else { - throw mkException(::rtl::OUString( + throw mkException(OUString( "readStream: is not a stream"), ucb::IOErrorCode_NO_FILE, i_rBaseURI + i_rPath, i_rPath); } @@ -550,7 +550,7 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl, const uno::Reference< beans::XPropertySet > xDirProps(xDir, uno::UNO_QUERY_THROW); try { - ::rtl::OUString mimeType; + OUString mimeType; xDirProps->getPropertyValue( ::comphelper::MediaDescriptor::PROP_MEDIATYPE() ) >>= mimeType; @@ -561,11 +561,11 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl, return; } } catch (const uno::Exception &) { } - ::rtl::OUStringBuffer buf(i_rBaseURI); + OUStringBuffer buf(i_rBaseURI); buf.append(dir).append(static_cast<sal_Unicode>('/')); readStream(i_rImpl, xDir, rest, buf.makeStringAndClear() ); } else { - throw mkException(::rtl::OUString( + throw mkException(OUString( "readStream: is not a directory"), ucb::IOErrorCode_NO_DIRECTORY, i_rBaseURI + dir, dir); } @@ -586,9 +586,9 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl, static void importFile(struct DocumentMetadataAccess_Impl & i_rImpl, uno::Reference<embed::XStorage> const & i_xStorage, - ::rtl::OUString const & i_rBaseURI, + OUString const & i_rBaseURI, uno::Reference<task::XInteractionHandler> const & i_xHandler, - ::rtl::OUString i_rPath) + OUString i_rPath) { retry: try { @@ -599,7 +599,7 @@ retry: throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString("importFile: exception"), + OUString("importFile: exception"), 0, uno::makeAny(e)); } } @@ -609,8 +609,8 @@ static void exportStream(struct DocumentMetadataAccess_Impl & i_rImpl, uno::Reference< embed::XStorage > const & i_xStorage, uno::Reference<rdf::XURI> const & i_xGraphName, - ::rtl::OUString const & i_rFileName, - ::rtl::OUString const & i_rBaseURI) + OUString const & i_rFileName, + OUString const & i_rBaseURI) { const uno::Reference<io::XStream> xStream( i_xStorage->openStreamElement(i_rFileName, @@ -620,8 +620,8 @@ exportStream(struct DocumentMetadataAccess_Impl & i_rImpl, uno::UNO_QUERY); if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage xStreamProps->setPropertyValue( - ::rtl::OUString("MediaType"), - uno::makeAny(::rtl::OUString(s_rdfxml))); + OUString("MediaType"), + uno::makeAny(OUString(s_rdfxml))); } const uno::Reference<io::XOutputStream> xOutStream( xStream->getOutputStream(), uno::UNO_SET_THROW ); @@ -636,11 +636,11 @@ static void writeStream(struct DocumentMetadataAccess_Impl & i_rImpl, uno::Reference< embed::XStorage > const & i_xStorage, uno::Reference<rdf::XURI> const & i_xGraphName, - ::rtl::OUString const & i_rPath, - ::rtl::OUString const & i_rBaseURI) + OUString const & i_rPath, + OUString const & i_rBaseURI) { - ::rtl::OUString dir; - ::rtl::OUString rest; + OUString dir; + OUString rest; if (!splitPath(i_rPath, dir, rest)) throw uno::RuntimeException(); try { if (dir.isEmpty()) { @@ -653,7 +653,7 @@ writeStream(struct DocumentMetadataAccess_Impl & i_rImpl, const uno::Reference< beans::XPropertySet > xDirProps(xDir, uno::UNO_QUERY_THROW); try { - ::rtl::OUString mimeType; + OUString mimeType; xDirProps->getPropertyValue( ::comphelper::MediaDescriptor::PROP_MEDIATYPE() ) >>= mimeType; @@ -663,7 +663,7 @@ writeStream(struct DocumentMetadataAccess_Impl & i_rImpl, return; } } catch (const uno::Exception &) { } - ::rtl::OUStringBuffer buf(i_rBaseURI); + OUStringBuffer buf(i_rBaseURI); buf.append(dir).append(static_cast<sal_Unicode>('/')); writeStream(i_rImpl, xDir, i_xGraphName, rest, buf.makeStringAndClear()); @@ -697,9 +697,9 @@ retry: i_rImpl.m_xRepository.set(rdf::Repository::create(i_rImpl.m_xContext), uno::UNO_SET_THROW); - const ::rtl::OUString manifest ( - ::rtl::OUString::createFromAscii(s_manifest)); - const ::rtl::OUString baseURI( i_xBaseURI->getStringValue() ); + const OUString manifest ( + OUString::createFromAscii(s_manifest)); + const OUString baseURI( i_xBaseURI->getStringValue() ); // try to delay raising errors until after initialization is done uno::Any rterr; ucb::InteractiveAugmentedIOException iaioe; @@ -740,7 +740,7 @@ retry: if (rterr.hasValue()) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::loadMetadataFromStorage: " "exception"), 0, rterr); } @@ -757,7 +757,7 @@ static void init(struct DocumentMetadataAccess_Impl & i_rImpl) i_rImpl.m_xManifest.set(i_rImpl.m_xRepository->createGraph( getURIForStream(i_rImpl, - ::rtl::OUString::createFromAscii(s_manifest))), + OUString::createFromAscii(s_manifest))), uno::UNO_SET_THROW); // insert the document statement @@ -766,17 +766,17 @@ static void init(struct DocumentMetadataAccess_Impl & i_rImpl) getURI<rdf::URIs::PKG_DOCUMENT>(i_rImpl.m_xContext).get()); } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString("init: unexpected exception"), 0, + OUString("init: unexpected exception"), 0, uno::makeAny(e)); } // add top-level content files if (!addContentOrStylesFileImpl(i_rImpl, - ::rtl::OUString::createFromAscii(s_content))) { + OUString::createFromAscii(s_content))) { throw uno::RuntimeException(); } if (!addContentOrStylesFileImpl(i_rImpl, - ::rtl::OUString::createFromAscii(s_styles))) { + OUString::createFromAscii(s_styles))) { throw uno::RuntimeException(); } } @@ -794,7 +794,7 @@ DocumentMetadataAccess::DocumentMetadataAccess( DocumentMetadataAccess::DocumentMetadataAccess( uno::Reference< uno::XComponentContext > const & i_xContext, const IXmlIdRegistrySupplier & i_rRegistrySupplier, - ::rtl::OUString const & i_rURI) + OUString const & i_rURI) : m_pImpl(new DocumentMetadataAccess_Impl(i_xContext, i_rRegistrySupplier)) { OSL_ENSURE(!i_rURI.isEmpty(), "DMA::DMA: no URI given!"); @@ -825,20 +825,20 @@ DocumentMetadataAccess::getRDFRepository() throw (uno::RuntimeException) } // ::com::sun::star::rdf::XNode: -::rtl::OUString SAL_CALL +OUString SAL_CALL DocumentMetadataAccess::getStringValue() throw (uno::RuntimeException) { return m_pImpl->m_xBaseURI->getStringValue(); } // ::com::sun::star::rdf::XURI: -::rtl::OUString SAL_CALL +OUString SAL_CALL DocumentMetadataAccess::getNamespace() throw (uno::RuntimeException) { return m_pImpl->m_xBaseURI->getNamespace(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL DocumentMetadataAccess::getLocalName() throw (uno::RuntimeException) { return m_pImpl->m_xBaseURI->getLocalName(); @@ -853,7 +853,7 @@ throw (uno::RuntimeException) const IXmlIdRegistry * pReg( m_pImpl->m_rXmlIdRegistrySupplier.GetXmlIdRegistry() ); if (!pReg) { - throw uno::RuntimeException(::rtl::OUString( + throw uno::RuntimeException(OUString( "DocumentMetadataAccess::getElementByXmlId: no registry"), *this); } return pReg->GetElementByMetadataReference(i_rReference); @@ -865,18 +865,18 @@ DocumentMetadataAccess::getElementByURI( throw (uno::RuntimeException, lang::IllegalArgumentException) { if (!i_xURI.is()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::getElementByURI: URI is null"), *this, 0); } - const ::rtl::OUString baseURI( m_pImpl->m_xBaseURI->getStringValue() ); - const ::rtl::OUString name( i_xURI->getStringValue() ); + const OUString baseURI( m_pImpl->m_xBaseURI->getStringValue() ); + const OUString name( i_xURI->getStringValue() ); if (!name.match(baseURI)) { return 0; } - const ::rtl::OUString relName( name.copy(baseURI.getLength()) ); - ::rtl::OUString path; - ::rtl::OUString idref; + const OUString relName( name.copy(baseURI.getLength()) ); + OUString path; + OUString idref; if (!splitXmlId(relName, path, idref)) { return 0; } @@ -891,7 +891,7 @@ DocumentMetadataAccess::getMetadataGraphsWithType( throw (uno::RuntimeException, lang::IllegalArgumentException) { if (!i_xType.is()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::getMetadataGraphsWithType: " "type is null"), *this, 0); } @@ -908,25 +908,25 @@ throw (uno::RuntimeException, lang::IllegalArgumentException) } uno::Reference<rdf::XURI> SAL_CALL -DocumentMetadataAccess::addMetadataFile(const ::rtl::OUString & i_rFileName, +DocumentMetadataAccess::addMetadataFile(const OUString & i_rFileName, const uno::Sequence < uno::Reference< rdf::XURI > > & i_rTypes) throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException) { if (!isFileNameValid(i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::addMetadataFile: invalid FileName"), *this, 0); } if (isReservedFile(i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::addMetadataFile:" "invalid FileName: reserved"), *this, 0); } for (sal_Int32 i = 0; i < i_rTypes.getLength(); ++i) { if (!i_rTypes[i].is()) { throw lang::IllegalArgumentException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::addMetadataFile: " "null type"), *this, 2); } @@ -939,7 +939,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, m_pImpl->m_xRepository->createGraph(xGraphName); } catch (const rdf::RepositoryException & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::addMetadataFile: exception"), *this, uno::makeAny(e)); // note: all other exceptions are propagated @@ -952,7 +952,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, uno::Reference<rdf::XURI> SAL_CALL DocumentMetadataAccess::importMetadataFile(::sal_Int16 i_Format, const uno::Reference< io::XInputStream > & i_xInStream, - const ::rtl::OUString & i_rFileName, + const OUString & i_rFileName, const uno::Reference< rdf::XURI > & i_xBaseURI, const uno::Sequence < uno::Reference< rdf::XURI > > & i_rTypes) throw (uno::RuntimeException, lang::IllegalArgumentException, @@ -960,19 +960,19 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException, rdf::ParseException, io::IOException) { if (!isFileNameValid(i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::importMetadataFile: invalid FileName"), *this, 0); } if (isReservedFile(i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::importMetadataFile:" "invalid FileName: reserved"), *this, 0); } for (sal_Int32 i = 0; i < i_rTypes.getLength(); ++i) { if (!i_rTypes[i].is()) { throw lang::IllegalArgumentException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::importMetadataFile: null type"), *this, 5); } @@ -986,7 +986,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, i_Format, i_xInStream, xGraphName, i_xBaseURI); } catch (const rdf::RepositoryException & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::importMetadataFile: " "RepositoryException"), *this, uno::makeAny(e)); // note: all other exceptions are propagated @@ -1007,7 +1007,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, m_pImpl->m_xRepository->destroyGraph(i_xGraphName); } catch (const rdf::RepositoryException & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::removeMetadataFile: " "RepositoryException"), *this, uno::makeAny(e)); // note: all other exceptions are propagated @@ -1019,18 +1019,18 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, void SAL_CALL DocumentMetadataAccess::addContentOrStylesFile( - const ::rtl::OUString & i_rFileName) + const OUString & i_rFileName) throw (uno::RuntimeException, lang::IllegalArgumentException, container::ElementExistException) { if (!isFileNameValid(i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::addContentOrStylesFile: " "invalid FileName"), *this, 0); } if (!addContentOrStylesFileImpl(*m_pImpl, i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::addContentOrStylesFile: " "invalid FileName: must end with content.xml or styles.xml"), *this, 0); @@ -1039,12 +1039,12 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, void SAL_CALL DocumentMetadataAccess::removeContentOrStylesFile( - const ::rtl::OUString & i_rFileName) + const OUString & i_rFileName) throw (uno::RuntimeException, lang::IllegalArgumentException, container::NoSuchElementException) { if (!isFileNameValid(i_rFileName)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::removeContentOrStylesFile: " "invalid FileName"), *this, 0); } @@ -1059,7 +1059,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, uno::UNO_SET_THROW); if (!xEnum->hasMoreElements()) { throw container::NoSuchElementException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::removeContentOrStylesFile: " "cannot find stream in manifest graph: ") + i_rFileName, *this); @@ -1072,7 +1072,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::removeContentOrStylesFile: exception"), *this, uno::makeAny(e)); } @@ -1086,34 +1086,34 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, lang::WrappedTargetException) { if (!i_xStorage.is()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::loadMetadataFromStorage: " "storage is null"), *this, 0); } if (!i_xBaseURI.is()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::loadMetadataFromStorage: " "base URI is null"), *this, 1); } - const ::rtl::OUString baseURI( i_xBaseURI->getStringValue()); + const OUString baseURI( i_xBaseURI->getStringValue()); if (baseURI.indexOf('#') >= 0) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::loadMetadataFromStorage: " "base URI not absolute"), *this, 1); } if (baseURI.isEmpty() || !baseURI.endsWithAsciiL("/", 1)) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::loadMetadataFromStorage: " "base URI does not end with slash"), *this, 1); } initLoading(*m_pImpl, i_xStorage, i_xBaseURI, i_xHandler); - std::set< ::rtl::OUString > StgFiles; + std::set< OUString > StgFiles; collectFilesFromStorage(i_xStorage, - ::rtl::OUString(""), StgFiles); + OUString(""), StgFiles); - std::vector< ::rtl::OUString > MfstMetadataFiles; + std::vector< OUString > MfstMetadataFiles; try { const ::std::vector< uno::Reference< rdf::XURI > > parts( @@ -1125,19 +1125,19 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, const uno::Reference<rdf::XURI> xMetadataFile( getURI<rdf::URIs::PKG_METADATAFILE>(m_pImpl->m_xContext)); const sal_Int32 len( baseURI.getLength() ); - const ::rtl::OUString manifest ( - ::rtl::OUString::createFromAscii(s_manifest)); + const OUString manifest ( + OUString::createFromAscii(s_manifest)); for (::std::vector< uno::Reference< rdf::XURI > >::const_iterator it = parts.begin(); it != parts.end(); ++it) { - const ::rtl::OUString name((*it)->getStringValue()); + const OUString name((*it)->getStringValue()); if (!name.match(baseURI)) { OSL_TRACE("loadMetadataFromStorage: graph not in document: %s", - ::rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8) + OUStringToOString(name, RTL_TEXTENCODING_UTF8) .getStr()); continue; } - const ::rtl::OUString relName( name.copy(len) ); + const OUString relName( name.copy(len) ); if (relName == manifest) { OSL_TRACE("loadMetadataFromStorage: " "found ourselves a recursive manifest!"); @@ -1178,7 +1178,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::loadMetadataFromStorage: " "exception"), *this, uno::makeAny(e)); } @@ -1197,27 +1197,27 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, lang::WrappedTargetException) { if (!i_xStorage.is()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::storeMetadataToStorage: " "storage is null"), *this, 0); } // export manifest - const ::rtl::OUString manifest ( - ::rtl::OUString::createFromAscii(s_manifest)); + const OUString manifest ( + OUString::createFromAscii(s_manifest)); const uno::Reference <rdf::XURI> xManifest( getURIForStream(*m_pImpl, manifest) ); - const ::rtl::OUString baseURI( m_pImpl->m_xBaseURI->getStringValue() ); + const OUString baseURI( m_pImpl->m_xBaseURI->getStringValue() ); try { writeStream(*m_pImpl, i_xStorage, xManifest, manifest, baseURI); } catch (const uno::RuntimeException &) { throw; } catch (const io::IOException & e) { - throw lang::WrappedTargetException( ::rtl::OUString( + throw lang::WrappedTargetException( OUString( "storeMetadataToStorage: IO exception"), *this, uno::makeAny(e)); } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "storeMetadataToStorage: exception"), *this, uno::makeAny(e)); } @@ -1228,20 +1228,20 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, const sal_Int32 len( baseURI.getLength() ); for (sal_Int32 i = 0; i < graphs.getLength(); ++i) { const uno::Reference<rdf::XURI> xName(graphs[i]); - const ::rtl::OUString name(xName->getStringValue()); + const OUString name(xName->getStringValue()); if (!name.match(baseURI)) { OSL_TRACE("storeMetadataToStorage: graph not in document: %s", - ::rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8) + OUStringToOString(name, RTL_TEXTENCODING_UTF8) .getStr()); continue; } - const ::rtl::OUString relName( name.copy(len) ); + const OUString relName( name.copy(len) ); if (relName == manifest) { continue; } if (!isFileNameValid(relName) || isReservedFile(relName)) { OSL_TRACE("storeMetadataToStorage: invalid file name: %s", - ::rtl::OUStringToOString(relName, RTL_TEXTENCODING_UTF8) + OUStringToOString(relName, RTL_TEXTENCODING_UTF8) .getStr()); continue; } @@ -1251,19 +1251,19 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, throw; } catch (const io::IOException & e) { throw lang::WrappedTargetException( - ::rtl::OUString( + OUString( "storeMetadataToStorage: IO exception"), *this, uno::makeAny(e)); } catch (const uno::Exception & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "storeMetadataToStorage: exception"), *this, uno::makeAny(e)); } } } catch (const rdf::RepositoryException & e) { throw lang::WrappedTargetRuntimeException( - ::rtl::OUString( + OUString( "storeMetadataToStorage: exception"), *this, uno::makeAny(e)); } } @@ -1276,15 +1276,15 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, { uno::Reference<io::XInputStream> xIn; ::comphelper::MediaDescriptor md(i_rMedium); - ::rtl::OUString URL; + OUString URL; md[ ::comphelper::MediaDescriptor::PROP_URL() ] >>= URL; - ::rtl::OUString BaseURL; + OUString BaseURL; md[ ::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL() ] >>= BaseURL; if (md.addInputStream()) { md[ ::comphelper::MediaDescriptor::PROP_INPUTSTREAM() ] >>= xIn; } if (!xIn.is() && URL.isEmpty()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::loadMetadataFromMedium: " "inalid medium: no URL, no input stream"), *this, 0); } @@ -1303,12 +1303,12 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, throw; } catch (const uno::Exception & e) { throw lang::WrappedTargetException( - ::rtl::OUString( + OUString( "DocumentMetadataAccess::loadMetadataFromMedium: " "exception"), *this, uno::makeAny(e)); } if (!xStorage.is()) { - throw uno::RuntimeException(::rtl::OUString( + throw uno::RuntimeException(OUString( "DocumentMetadataAccess::loadMetadataFromMedium: " "cannot get Storage"), *this); } @@ -1335,10 +1335,10 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, lang::WrappedTargetException) { ::comphelper::MediaDescriptor md(i_rMedium); - ::rtl::OUString URL; + OUString URL; md[ ::comphelper::MediaDescriptor::PROP_URL() ] >>= URL; if (URL.isEmpty()) { - throw lang::IllegalArgumentException(::rtl::OUString( + throw lang::IllegalArgumentException(OUString( "DocumentMetadataAccess::storeMetadataToMedium: " "invalid medium: no URL"), *this, 0); } @@ -1355,7 +1355,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, } if (!xStorage.is()) { - throw uno::RuntimeException(::rtl::OUString( + throw uno::RuntimeException(OUString( "DocumentMetadataAccess::storeMetadataToMedium: " "cannot get Storage"), *this); } @@ -1382,9 +1382,9 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, if ( nError == ERRCODE_NONE ) { nError = ERRCODE_IO_GENERAL; } - task::ErrorCodeIOException ex( ::rtl::OUString(), + task::ErrorCodeIOException ex( OUString(), uno::Reference< uno::XInterface >(), nError); - throw lang::WrappedTargetException(::rtl::OUString(), *this, + throw lang::WrappedTargetException(OUString(), *this, uno::makeAny(ex)); } } diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 4d830dcc9e2c..7387baba5255 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -357,9 +357,9 @@ typedef ::cppu::ImplInheritanceHelper1< SfxDocumentMetaData, css::document::XCom class CompatWriterDocPropsImpl : public CompatWriterDocPropsImpl_BASE { - rtl::OUString msManager; - rtl::OUString msCategory; - rtl::OUString msCompany; + OUString msManager; + OUString msCategory; + OUString msCompany; protected: virtual SfxDocumentMetaData* createMe( css::uno::Reference< css::uno::XComponentContext > const & context ) { return new CompatWriterDocPropsImpl( context ); }; public: @@ -380,10 +380,10 @@ public: virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException) { - css::uno::Sequence< rtl::OUString > sServiceNames= getSupportedServiceNames(); + css::uno::Sequence< OUString > sServiceNames= getSupportedServiceNames(); sal_Int32 nLen = sServiceNames.getLength(); - rtl::OUString* pIt = sServiceNames.getArray(); - rtl::OUString* pEnd = ( pIt + nLen ); + OUString* pIt = sServiceNames.getArray(); + OUString* pEnd = ( pIt + nLen ); sal_Bool bRes = sal_False; for ( ; pIt != pEnd; ++pIt ) { @@ -2337,8 +2337,8 @@ namespace comp_CompatWriterDocProps { css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() { - css::uno::Sequence< rtl::OUString > aServiceNames(1); - aServiceNames[ 0 ] = rtl::OUString( "com.sun.star.writer.DocumentProperties" ); + css::uno::Sequence< OUString > aServiceNames(1); + aServiceNames[ 0 ] = OUString( "com.sun.star.writer.DocumentProperties" ); return aServiceNames; } diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index d0e305895868..25254aa49951 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -69,7 +69,7 @@ struct SfxObjectFactory_Impl { SfxViewFactoryArr_Impl aViewFactoryArr;// List of <SfxViewFactory>s ResId* pNameResId; - ::rtl::OUString aServiceName; + OUString aServiceName; SfxFilterContainer* pFilterContainer; SfxModule* pModule; sal_uInt16 nImageId; @@ -105,9 +105,9 @@ SfxObjectFactory::SfxObjectFactory nFlags( nFlagsP ) { DBG_CTOR(SfxObjectFactory, 0); - pImpl->pFilterContainer = new SfxFilterContainer( rtl::OUString::createFromAscii( pName ) ); + pImpl->pFilterContainer = new SfxFilterContainer( OUString::createFromAscii( pName ) ); - String aShortName( rtl::OUString::createFromAscii( pShortName ) ); + String aShortName( OUString::createFromAscii( pShortName ) ); aShortName.ToLowerAscii(); pImpl->aClassName = rName; if ( aShortName.EqualsAscii( "swriter" ) ) @@ -151,9 +151,9 @@ void SfxObjectFactory::RegisterViewFactory { if ( !pImpl->aViewFactoryArr[i]->GetAPIViewName().Equals( sViewName ) ) continue; - rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM( "SfxObjectFactory::RegisterViewFactory: duplicate view name '")); - aStr.append(rtl::OUStringToOString(sViewName, RTL_TEXTENCODING_ASCII_US)); + aStr.append(OUStringToOString(sViewName, RTL_TEXTENCODING_ASCII_US)); aStr.append(RTL_CONSTASCII_STRINGPARAM("'!")); OSL_FAIL(aStr.getStr()); break; @@ -198,24 +198,24 @@ void SfxObjectFactory::SetModule_Impl( SfxModule *pMod ) void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const String& rTemplateName ) { static const int nMaxPathSize = 16000; - static ::rtl::OUString SERVICE_FILTER_FACTORY("com.sun.star.document.FilterFactory"); - static ::rtl::OUString SERVICE_TYPE_DECTECTION("com.sun.star.document.TypeDetection"); + static OUString SERVICE_FILTER_FACTORY("com.sun.star.document.FilterFactory"); + static OUString SERVICE_TYPE_DECTECTION("com.sun.star.document.TypeDetection"); - static ::rtl::OUString CONF_ROOT("/org.openoffice.Setup"); - static ::rtl::OUString CONF_PATH = ::rtl::OUString("Office/Factories/" ) + ::rtl::OUString( rServiceName ); - static ::rtl::OUString PROP_DEF_TEMPL_CHANGED("ooSetupFactorySystemDefaultTemplateChanged"); - static ::rtl::OUString PROP_ACTUAL_FILTER("ooSetupFactoryActualFilter"); + static OUString CONF_ROOT("/org.openoffice.Setup"); + static OUString CONF_PATH = OUString("Office/Factories/" ) + OUString( rServiceName ); + static OUString PROP_DEF_TEMPL_CHANGED("ooSetupFactorySystemDefaultTemplateChanged"); + static OUString PROP_ACTUAL_FILTER("ooSetupFactoryActualFilter"); - static ::rtl::OUString DEF_TPL_STR("/soffice."); + static OUString DEF_TPL_STR("/soffice."); - rtl::OUString sURL; + OUString sURL; String sPath; sal_Unicode aPathBuffer[nMaxPathSize]; if ( SystemPath::GetUserTemplateLocation( aPathBuffer, nMaxPathSize )) - sPath = rtl::OUString( aPathBuffer ); + sPath = OUString( aPathBuffer ); ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sPath, sURL ); - ::rtl::OUString aUserTemplateURL( sURL ); + OUString aUserTemplateURL( sURL ); if ( !aUserTemplateURL.isEmpty()) { try @@ -224,7 +224,7 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri uno::Reference< uno::XInterface > xConfig = ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), CONF_ROOT, ::comphelper::ConfigurationHelper::E_STANDARD ); - ::rtl::OUString aActualFilter; + OUString aActualFilter; ::comphelper::ConfigurationHelper::readRelativeKey( xConfig, CONF_PATH, PROP_ACTUAL_FILTER ) >>= aActualFilter; sal_Bool bChanged(sal_False); ::comphelper::ConfigurationHelper::readRelativeKey( xConfig, CONF_PATH, PROP_DEF_TEMPL_CHANGED ) >>= bChanged; @@ -234,17 +234,17 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri uno::Reference< container::XNameAccess > xTypeDetection( xFactory->createInstance( SERVICE_TYPE_DECTECTION ), uno::UNO_QUERY_THROW ); - ::rtl::OUString aActualFilterTypeName; + OUString aActualFilterTypeName; uno::Sequence< beans::PropertyValue > aActuralFilterData; xFilterFactory->getByName( aActualFilter ) >>= aActuralFilterData; for ( sal_Int32 nInd = 0; nInd < aActuralFilterData.getLength(); nInd++ ) if ( aActuralFilterData[nInd].Name == "Type" ) aActuralFilterData[nInd].Value >>= aActualFilterTypeName; ::comphelper::SequenceAsHashMap aProps1( xTypeDetection->getByName( aActualFilterTypeName ) ); - uno::Sequence< ::rtl::OUString > aAllExt = - aProps1.getUnpackedValueOrDefault( ::rtl::OUString("Extensions"), uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString > aAllExt = + aProps1.getUnpackedValueOrDefault( OUString("Extensions"), uno::Sequence< OUString >() ); //To-do: check if aAllExt is empty first - ::rtl::OUString aExt = aAllExt[0]; + OUString aExt = aAllExt[0]; aUserTemplateURL += DEF_TPL_STR; aUserTemplateURL += aExt; @@ -252,9 +252,9 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri uno::Reference<ucb::XSimpleFileAccess3> xSimpleFileAccess( ucb::SimpleFileAccess::create( ::comphelper::getComponentContext(xFactory) ) ); - ::rtl::OUString aBackupURL; + OUString aBackupURL; ::osl::Security().getConfigDir(aBackupURL); - aBackupURL += ::rtl::OUString("/temp"); + aBackupURL += OUString("/temp"); if ( !xSimpleFileAccess->exists( aBackupURL ) ) xSimpleFileAccess->createFolder( aBackupURL ); @@ -269,22 +269,22 @@ void SfxObjectFactory::SetSystemTemplate( const String& rServiceName, const Stri uno::Reference< document::XTypeDetection > xTypeDetector( xTypeDetection, uno::UNO_QUERY ); ::comphelper::SequenceAsHashMap aProps2( xTypeDetection->getByName( xTypeDetector->queryTypeByURL( rTemplateName ) ) ); - ::rtl::OUString aFilterName = - aProps2.getUnpackedValueOrDefault( ::rtl::OUString("PreferredFilter"), ::rtl::OUString() ); + OUString aFilterName = + aProps2.getUnpackedValueOrDefault( OUString("PreferredFilter"), OUString() ); uno::Sequence< beans::PropertyValue > aArgs( 3 ); - aArgs[0].Name = ::rtl::OUString("FilterName"); + aArgs[0].Name = OUString("FilterName"); aArgs[0].Value <<= aFilterName; - aArgs[1].Name = ::rtl::OUString("AsTemplate"); + aArgs[1].Name = OUString("AsTemplate"); aArgs[1].Value <<= sal_True; - aArgs[2].Name = ::rtl::OUString("URL"); - aArgs[2].Value <<= ::rtl::OUString( rTemplateName ); + aArgs[2].Name = OUString("URL"); + aArgs[2].Value <<= OUString( rTemplateName ); - uno::Reference< frame::XLoadable > xLoadable( xFactory->createInstance( ::rtl::OUString( rServiceName ) ), uno::UNO_QUERY ); + uno::Reference< frame::XLoadable > xLoadable( xFactory->createInstance( OUString( rServiceName ) ), uno::UNO_QUERY ); xLoadable->load( aArgs ); aArgs.realloc( 2 ); - aArgs[1].Name = ::rtl::OUString("Overwrite"); + aArgs[1].Name = OUString("Overwrite"); aArgs[1].Value <<= sal_True; uno::Reference< frame::XStorable > xStorable( xLoadable, uno::UNO_QUERY ); @@ -336,7 +336,7 @@ String SfxObjectFactory::GetStandardTemplate( const String& rServiceName ) const SfxFilter* SfxObjectFactory::GetTemplateFilter() const { sal_uInt16 nVersion=0; - SfxFilterMatcher aMatcher ( rtl::OUString::createFromAscii( pShortName ) ); + SfxFilterMatcher aMatcher ( OUString::createFromAscii( pShortName ) ); SfxFilterMatcherIter aIter( aMatcher ); const SfxFilter *pFilter = 0; const SfxFilter *pTemp = aIter.First(); @@ -354,12 +354,12 @@ const SfxFilter* SfxObjectFactory::GetTemplateFilter() const return pFilter; } -void SfxObjectFactory::SetDocumentServiceName( const ::rtl::OUString& rServiceName ) +void SfxObjectFactory::SetDocumentServiceName( const OUString& rServiceName ) { pImpl->aServiceName = rServiceName; } -const ::rtl::OUString& SfxObjectFactory::GetDocumentServiceName() const +const OUString& SfxObjectFactory::GetDocumentServiceName() const { return pImpl->aServiceName; } @@ -371,7 +371,7 @@ const SvGlobalName& SfxObjectFactory::GetClassId() const String SfxObjectFactory::GetFactoryURL() const { - ::rtl::OUStringBuffer aURLComposer; + OUStringBuffer aURLComposer; aURLComposer.appendAscii(RTL_CONSTASCII_STRINGPARAM("private:factory/")); aURLComposer.appendAscii(GetShortName()); return aURLComposer.makeStringAndClear(); @@ -386,9 +386,9 @@ String SfxObjectFactory::GetModuleName() const css::uno::Reference< css::frame::XModuleManager2 > xModuleManager( css::frame::ModuleManager::create(xContext)); - ::rtl::OUString sDocService(GetDocumentServiceName()); + OUString sDocService(GetDocumentServiceName()); ::comphelper::SequenceAsHashMap aPropSet( xModuleManager->getByName(sDocService) ); - ::rtl::OUString sModuleName = aPropSet.getUnpackedValueOrDefault("ooSetupFactoryUIName", ::rtl::OUString()); + OUString sModuleName = aPropSet.getUnpackedValueOrDefault("ooSetupFactoryUIName", OUString()); return String(sModuleName); } catch(const css::uno::RuntimeException&) diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 59ccfd069aad..5a2f391c4b03 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -148,15 +148,15 @@ bool IsSystemFileLockingUsed() uno::Reference< uno::XInterface > xCommonConfig = ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - ::rtl::OUString( "/org.openoffice.Office.Common" ), + OUString( "/org.openoffice.Office.Common" ), ::comphelper::ConfigurationHelper::E_STANDARD ); if ( !xCommonConfig.is() ) throw uno::RuntimeException(); ::comphelper::ConfigurationHelper::readRelativeKey( xCommonConfig, - ::rtl::OUString( "Misc/" ), - ::rtl::OUString( "UseDocumentSystemFileLocking" ) ) >>= bUseSystemLock; + OUString( "Misc/" ), + OUString( "UseDocumentSystemFileLocking" ) ) >>= bUseSystemLock; } catch( const uno::Exception& ) { @@ -175,15 +175,15 @@ bool IsOOoLockFileUsed() uno::Reference< uno::XInterface > xCommonConfig = ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - ::rtl::OUString( "/org.openoffice.Office.Common" ), + OUString( "/org.openoffice.Office.Common" ), ::comphelper::ConfigurationHelper::E_STANDARD ); if ( !xCommonConfig.is() ) throw uno::RuntimeException(); ::comphelper::ConfigurationHelper::readRelativeKey( xCommonConfig, - ::rtl::OUString( "Misc/" ), - ::rtl::OUString( "UseDocumentOOoLockFile" ) ) >>= bOOoLockFileUsed; + OUString( "Misc/" ), + OUString( "UseDocumentOOoLockFile" ) ) >>= bOOoLockFileUsed; } catch( const uno::Exception& ) { @@ -286,7 +286,7 @@ public: SvStream* m_pOutStream; const SfxFilter* pOrigFilter; - rtl::OUString aOrigURL; + OUString aOrigURL; DateTime aExpireTime; SfxFrameWeak wLoadTargetFrame; SvKeyValueIteratorRef xAttributes; @@ -307,7 +307,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > xInteraction; - ::rtl::OUString m_aBackupURL; + OUString m_aBackupURL; // the following member is changed and makes sence only during saving // TODO/LATER: in future the signature state should be controlled by the medium not by the document @@ -388,7 +388,7 @@ sal_uInt32 SfxMedium::GetLastStorageCreationState() } //------------------------------------------------------------------ -void SfxMedium::AddLog( const ::rtl::OUString& aMessage ) +void SfxMedium::AddLog( const OUString& aMessage ) { if ( !pImp->m_xLogRing.is() ) { @@ -406,7 +406,7 @@ void SfxMedium::AddLog( const ::rtl::OUString& aMessage ) } //------------------------------------------------------------------ -void SfxMedium::SetError( sal_uInt32 nError, const ::rtl::OUString& aLogMessage ) +void SfxMedium::SetError( sal_uInt32 nError, const OUString& aLogMessage ) { pImp->m_eError = nError; if ( pImp->m_eError != ERRCODE_NONE && !aLogMessage.isEmpty() ) @@ -453,7 +453,7 @@ void SfxMedium::CheckFileDate( const util::DateTime& aInitDate ) ::rtl::Reference< ::ucbhelper::InteractionContinuation > xSelected = xInteractionRequestImpl->getSelection(); if ( uno::Reference< task::XInteractionAbort >( xSelected.get(), uno::UNO_QUERY ).is() ) { - SetError( ERRCODE_ABORT, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_ABORT, OUString( OSL_LOG_PREFIX ) ); } } catch ( const uno::Exception& ) @@ -478,7 +478,7 @@ util::DateTime SfxMedium::GetInitFileDate( sal_Bool bIgnoreOldValue ) uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, comphelper::getProcessComponentContext() ); - aContent.getPropertyValue( ::rtl::OUString("DateModified" ) ) >>= pImp->m_aDateTime; + aContent.getPropertyValue( OUString("DateModified" ) ) >>= pImp->m_aDateTime; pImp->m_bGotDateTime = true; } catch ( const ::com::sun::star::uno::Exception& ) @@ -514,7 +514,7 @@ Reference < XContent > SfxMedium::GetContent() const else { // TODO: OSL_FAIL("SfxMedium::GetContent()\nCreate Content? This code exists as fallback only. Please clarify, why its used."); - rtl::OUString aURL; + OUString aURL; if ( !pImp->m_aName.isEmpty() ) ::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aURL ); else if ( !pImp->m_aLogicName.isEmpty() ) @@ -528,9 +528,9 @@ Reference < XContent > SfxMedium::GetContent() const } //------------------------------------------------------------------ -::rtl::OUString SfxMedium::GetBaseURL( bool bForSaving ) +OUString SfxMedium::GetBaseURL( bool bForSaving ) { - ::rtl::OUString aBaseURL; + OUString aBaseURL; const SfxStringItem* pBaseURLItem = static_cast<const SfxStringItem*>( GetItemSet()->GetItem(SID_DOC_BASEURL) ); if ( pBaseURLItem ) aBaseURL = pBaseURLItem->GetValue(); @@ -538,7 +538,7 @@ Reference < XContent > SfxMedium::GetContent() const { try { - Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString("BaseURI" ) ); + Any aAny = pImp->aContent.getPropertyValue( OUString("BaseURI" ) ); aAny >>= aBaseURL; } catch ( const ::com::sun::star::uno::Exception& ) @@ -554,7 +554,7 @@ Reference < XContent > SfxMedium::GetContent() const SvtSaveOptions aOpt; bool bIsRemote = IsRemote(); if( (bIsRemote && !aOpt.IsSaveRelINet()) || (!pImp->m_bRemote && !aOpt.IsSaveRelFSys()) ) - return ::rtl::OUString(); + return OUString(); } return aBaseURL; @@ -694,7 +694,7 @@ sal_Bool SfxMedium::CloseOutStream_Impl() } //------------------------------------------------------------------ -const rtl::OUString& SfxMedium::GetPhysicalName() const +const OUString& SfxMedium::GetPhysicalName() const { if ( pImp->m_aName.isEmpty() && !pImp->m_aLogicName.isEmpty() ) (( SfxMedium*)this)->CreateFileStream(); @@ -753,7 +753,7 @@ sal_Bool SfxMedium::IsStorage() if ( pImp->pTempFile ) { - rtl::OUString aURL; + OUString aURL; if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aURL ) ) { OSL_FAIL("Physical name not convertable!"); @@ -810,12 +810,12 @@ void SfxMedium::StorageBackup_Impl() { DoInternalBackup_Impl( aOriginalContent ); if( pImp->m_aBackupURL.isEmpty() ) - SetError( ERRCODE_SFX_CANTCREATEBACKUP, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_SFX_CANTCREATEBACKUP, OUString( OSL_LOG_PREFIX ) ); } } //------------------------------------------------------------------ -::rtl::OUString SfxMedium::GetBackup_Impl() +OUString SfxMedium::GetBackup_Impl() { if ( pImp->m_aBackupURL.isEmpty() ) StorageBackup_Impl(); @@ -869,14 +869,14 @@ void SfxMedium::SetEncryptionDataToStorage_Impl() { OSL_FAIL( "It must be possible to set a common password for the storage" ); // TODO/LATER: set the error code in case of problem - // SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + // SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } } } //------------------------------------------------------------------ -sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< ::rtl::OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock ) +sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock ) { sal_Int8 nResult = LOCK_UI_NOLOCK; @@ -885,8 +885,8 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< ::rtl::OUStri if ( ::svt::DocumentLockFile::IsInteractionAllowed() && xHandler.is() && ( bIsLoading || bOwnLock ) ) { - ::rtl::OUString aDocumentURL = GetURLObject().GetLastName(); - ::rtl::OUString aInfo; + OUString aDocumentURL = GetURLObject().GetLastName(); + OUString aInfo; ::rtl::Reference< ::ucbhelper::InteractionRequest > xInteractionRequestImpl; if ( bOwnLock ) @@ -895,7 +895,7 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< ::rtl::OUStri aInfo = aData[LOCKFILE_EDITTIME_ID]; xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::makeAny( - document::OwnLockOnDocumentRequest( ::rtl::OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo, !bIsLoading ) ) ); + document::OwnLockOnDocumentRequest( OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo, !bIsLoading ) ) ); } else { @@ -908,21 +908,21 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< ::rtl::OUStri if ( !aInfo.isEmpty() && !aData[LOCKFILE_EDITTIME_ID].isEmpty() ) { - aInfo += ::rtl::OUString( " ( " ); + aInfo += OUString( " ( " ); aInfo += aData[LOCKFILE_EDITTIME_ID]; - aInfo += ::rtl::OUString( " )" ); + aInfo += OUString( " )" ); } } if ( bIsLoading ) { xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::makeAny( - document::LockedDocumentRequest( ::rtl::OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo ) ) ); + document::LockedDocumentRequest( OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo ) ) ); } else { xInteractionRequestImpl = new ::ucbhelper::InteractionRequest( uno::makeAny( - document::LockedOnSavingRequest( ::rtl::OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo ) ) ); + document::LockedOnSavingRequest( OUString(), uno::Reference< uno::XInterface >(), aDocumentURL, aInfo ) ) ); } } @@ -938,7 +938,7 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< ::rtl::OUStri ::rtl::Reference< ::ucbhelper::InteractionContinuation > xSelected = xInteractionRequestImpl->getSelection(); if ( uno::Reference< task::XInteractionAbort >( xSelected.get(), uno::UNO_QUERY ).is() ) { - SetError( ERRCODE_ABORT, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_ABORT, OUString( OSL_LOG_PREFIX ) ); } else if ( uno::Reference< task::XInteractionDisapprove >( xSelected.get(), uno::UNO_QUERY ).is() ) { @@ -977,7 +977,7 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< ::rtl::OUStri GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); } else - SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_ACCESSDENIED, OUString( OSL_LOG_PREFIX ) ); } @@ -1051,7 +1051,7 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) // MediaDescriptor does this check also, the duplication should be avoided in future Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; ::ucbhelper::Content aContent( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, comphelper::getProcessComponentContext() ); - aContent.getPropertyValue( ::rtl::OUString( "IsReadOnly" ) ) >>= bContentReadonly; + aContent.getPropertyValue( OUString( "IsReadOnly" ) ) >>= bContentReadonly; } catch( const uno::Exception& ) {} @@ -1165,7 +1165,7 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) if ( !bResult ) { - uno::Sequence< ::rtl::OUString > aData; + uno::Sequence< OUString > aData; try { // impossibility to get data is no real problem @@ -1179,7 +1179,7 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) if ( !bHandleSysLocked ) { - uno::Sequence< ::rtl::OUString > aOwnData = aLockFile.GenerateOwnEntry(); + uno::Sequence< OUString > aOwnData = aLockFile.GenerateOwnEntry(); bOwnLock = ( aData.getLength() > LOCKFILE_USERURL_ID && aOwnData.getLength() > LOCKFILE_USERURL_ID && aOwnData[LOCKFILE_SYSUSERNAME_ID].equals( aData[LOCKFILE_SYSUSERNAME_ID] ) ); @@ -1228,7 +1228,7 @@ bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) SFX_ITEMSET_ARG( pImp->m_pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, false ); if ( !bLoading || (pReadOnlyItem && !pReadOnlyItem->GetValue()) ) - SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_ACCESSDENIED, OUString( OSL_LOG_PREFIX ) ); else GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, true ) ); } @@ -1281,9 +1281,9 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf new utl::ProgressHandlerWrap( xStatusIndicator ) ); uno::Sequence< beans::PropertyValue > aAddProps( 2 ); - aAddProps[0].Name = ::rtl::OUString("RepairPackage"); + aAddProps[0].Name = OUString("RepairPackage"); aAddProps[0].Value <<= (sal_Bool)true; - aAddProps[1].Name = ::rtl::OUString("StatusIndicator"); + aAddProps[1].Name = OUString("StatusIndicator"); aAddProps[1].Value <<= xProgressHandler; // the first arguments will be filled later @@ -1384,7 +1384,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf pImp->m_nStorOpenMode = SFX_STREAM_READONLY; pImp->xStorage = comphelper::OStorageHelper::GetStorageFromURL( aTmpName, embed::ElementModes::READ ); pImp->bStorageBasedOnInStream = false; - rtl::OUString aTemp; + OUString aTemp; ::utl::LocalFileHelper::ConvertURLToPhysicalName( aTmpName, aTemp ); SetPhysicalName_Impl( aTemp ); @@ -1582,13 +1582,13 @@ sal_Bool SfxMedium::StorageCommit_Impl() } if ( !GetError() ) - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } catch ( const uno::Exception& ) { //TODO/LATER: improve error handling - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } } @@ -1724,7 +1724,7 @@ sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource, } //------------------------------------------------------------------ -sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet& aTargetSet ) +sal_Bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet ) { if ( GetError() ) return false; @@ -1774,7 +1774,7 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet& Any aCmdArg; aCmdArg <<= aInsertArg; - aTargetContent.executeCommand( ::rtl::OUString( "insert" ), + aTargetContent.executeCommand( OUString( "insert" ), aCmdArg ); if ( xSeek.is() ) @@ -1795,7 +1795,7 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet& void SfxMedium::Transfer_Impl() { // The transfer is required only in two cases: either if there is a temporary file or if there is a salvage item - rtl::OUString aNameURL; + OUString aNameURL; if ( pImp->pTempFile ) aNameURL = pImp->pTempFile->GetURL(); else if ( !pImp->m_aLogicName.isEmpty() && pImp->m_bSalvageMode ) @@ -1864,7 +1864,7 @@ void SfxMedium::Transfer_Impl() else { OSL_FAIL( "Illegal Output stream parameter!\n" ); - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } // free the reference @@ -1896,7 +1896,7 @@ void SfxMedium::Transfer_Impl() aAny <<= pSegmentSize->GetValue(); uno::Reference < beans::XPropertySet > xSet( pImp->xStorage, uno::UNO_QUERY ); - xSet->setPropertyValue( rtl::OUString("SegmentSize"), aAny ); + xSet->setPropertyValue( OUString("SegmentSize"), aAny ); // copy the temporary storage into the disk spanned package GetStorage()->copyToStorage( xStor ); @@ -1925,7 +1925,7 @@ void SfxMedium::Transfer_Impl() xComEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, Reference< ::com::sun::star::ucb::XProgressHandler >() ); - rtl::OUString aDestURL( aDest.GetMainURL( INetURLObject::NO_DECODE ) ); + OUString aDestURL( aDest.GetMainURL( INetURLObject::NO_DECODE ) ); if ( ::utl::LocalFileHelper::IsLocalFile( aDestURL ) || !aDest.removeSegment() ) { @@ -1937,7 +1937,7 @@ void SfxMedium::Transfer_Impl() { aFile.sync(); OSL_TRACE("fsync'd saved file '%s'\n", - rtl::OUStringToOString( aDestURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( aDestURL, RTL_TEXTENCODING_UTF8 ).getStr() ); aFile.close(); } } @@ -1955,7 +1955,7 @@ void SfxMedium::Transfer_Impl() // Get the parent URL from the XChild if possible: why would the URL necessarily have // a hierarchical path? It's not always the case for CMIS. Reference< ::com::sun::star::container::XChild> xChild( aDestContent.get(), uno::UNO_QUERY ); - rtl::OUString sParentUrl; + OUString sParentUrl; if ( xChild.is( ) ) { Reference< ::com::sun::star::ucb::XContent > xParent( xChild->getParent( ), uno::UNO_QUERY ); @@ -1976,8 +1976,8 @@ void SfxMedium::Transfer_Impl() // LongName wasn't defined anywhere, only used here... get the Title instead // as it's less probably empty - rtl::OUString aFileName; - Any aAny = aDestContent.getPropertyValue( ::rtl::OUString("Title" ) ); + OUString aFileName; + Any aAny = aDestContent.getPropertyValue( OUString("Title" ) ); aAny >>= aFileName; if ( aFileName.isEmpty() ) aFileName = GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); @@ -2028,10 +2028,10 @@ void SfxMedium::Transfer_Impl() try { - rtl::OUString aMimeType = pImp->getFilterMimeType(); + OUString aMimeType = pImp->getFilterMimeType(); ::ucbhelper::InsertOperation eOperation = ::ucbhelper::InsertOperation_COPY; bool bMajor = false; - rtl::OUString sComment; + OUString sComment; if ( IsInCheckIn( ) ) { eOperation = ::ucbhelper::InsertOperation_CHECKIN; @@ -2041,7 +2041,7 @@ void SfxMedium::Transfer_Impl() if ( pComments ) sComment = pComments->GetValue( ); } - rtl::OUString sResultURL; + OUString sResultURL; if (!aTransferContent.transferContent( aSourceContent, eOperation, aFileName, nNameClash, aMimeType, bMajor, sComment, &sResultURL )) pImp->m_eError = ERRCODE_IO_GENERAL; @@ -2101,7 +2101,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont aTransactTemp.EnableKillingFile( false ); INetURLObject aBackObj( aTransactTemp.GetURL() ); - ::rtl::OUString aBackupName = aBackObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString aBackupName = aBackObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); Reference < ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; ::ucbhelper::Content aBackupCont; @@ -2109,7 +2109,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont { try { - rtl::OUString sMimeType = pImp->getFilterMimeType(); + OUString sMimeType = pImp->getFilterMimeType(); if( aBackupCont.transferContent( aOriginalContent, ::ucbhelper::InsertOperation_COPY, aBackupName, @@ -2134,7 +2134,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont if ( !pImp->m_aBackupURL.isEmpty() ) return; // the backup was done already - ::rtl::OUString aFileName = GetURLObject().getName( INetURLObject::LAST_SEGMENT, + OUString aFileName = GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::NO_DECODE ); @@ -2197,7 +2197,7 @@ void SfxMedium::DoBackup_Impl() try { // do the transfer ( copy source file to backup dir ) - rtl::OUString sMimeType = pImp->getFilterMimeType(); + OUString sMimeType = pImp->getFilterMimeType(); bSuccess = aContent.transferContent( aSourceContent, ::ucbhelper::InsertOperation_COPY, aFileName, @@ -2234,7 +2234,7 @@ void SfxMedium::ClearBackup_Impl() if ( ::utl::UCBContentHelper::Kill( pImp->m_aBackupURL ) ) { pImp->m_bRemoveBackup = false; - pImp->m_aBackupURL = ::rtl::OUString(); + pImp->m_aBackupURL = OUString(); } else { @@ -2244,7 +2244,7 @@ void SfxMedium::ClearBackup_Impl() } } else - pImp->m_aBackupURL = ::rtl::OUString(); + pImp->m_aBackupURL = OUString(); } //---------------------------------------------------------------- @@ -2314,7 +2314,7 @@ void SfxMedium::GetMedium_Impl() else { uno::Sequence < beans::PropertyValue > xProps; - rtl::OUString aFileName; + OUString aFileName; if (!pImp->m_aName.isEmpty()) { if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aFileName ) ) @@ -2359,7 +2359,7 @@ void SfxMedium::GetMedium_Impl() { if ( bFromTempFile ) { - aMedium[comphelper::MediaDescriptor::PROP_URL()] <<= ::rtl::OUString( aFileName ); + aMedium[comphelper::MediaDescriptor::PROP_URL()] <<= OUString( aFileName ); aMedium.erase( comphelper::MediaDescriptor::PROP_READONLY() ); aMedium.addInputStream(); } @@ -2396,7 +2396,7 @@ void SfxMedium::GetMedium_Impl() //TODO/MBA: ErrorHandling - how to transport error from MediaDescriptor if ( !GetError() && !pImp->xStream.is() && !pImp->xInputStream.is() ) - SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_ACCESSDENIED, OUString( OSL_LOG_PREFIX ) ); if ( !GetError() ) { @@ -2607,7 +2607,7 @@ const SfxFilter* SfxMedium::GetOrigFilter( sal_Bool bNotCurrent ) const //---------------------------------------------------------------- -sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const ::rtl::OUString& aPasswd, sal_Bool bWriter ) +sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, sal_Bool bWriter ) { sal_uInt32 nHash = 0; @@ -2788,7 +2788,7 @@ const OUString& SfxMedium::GetOrigURL() const //---------------------------------------------------------------- -void SfxMedium::SetPhysicalName_Impl( const rtl::OUString& rNameP ) +void SfxMedium::SetPhysicalName_Impl( const OUString& rNameP ) { if ( rNameP != pImp->m_aName ) { @@ -2890,7 +2890,7 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b SFX_ITEMSET_ARG( pImp->m_pSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, false ); if (!pFileNameItem) throw uno::RuntimeException(); - ::rtl::OUString aNewTempFileURL = SfxMedium::CreateTempCopyWithExt( pFileNameItem->GetValue() ); + OUString aNewTempFileURL = SfxMedium::CreateTempCopyWithExt( pFileNameItem->GetValue() ); if ( !aNewTempFileURL.isEmpty() ) { pImp->m_pSet->Put( SfxStringItem( SID_FILE_NAME, aNewTempFileURL ) ); @@ -2965,7 +2965,7 @@ SfxMedium::~SfxMedium() if( pImp->bIsTemp && !pImp->m_aName.isEmpty() ) { - rtl::OUString aTemp; + OUString aTemp; if ( !::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->m_aName, aTemp )) { OSL_FAIL("Physical name not convertable!"); @@ -3062,11 +3062,11 @@ SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl() { try { - Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString("MediaType") ); - ::rtl::OUString aContentType; + Any aAny = pImp->aContent.getPropertyValue( OUString("MediaType") ); + OUString aContentType; aAny >>= aContentType; - pImp->xAttributes->Append( SvKeyValue( ::rtl::OUString("content-type"), aContentType ) ); + pImp->xAttributes->Append( SvKeyValue( OUString("content-type"), aContentType ) ); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -3155,7 +3155,7 @@ sal_uInt16 SfxMedium::AddVersion_Impl( util::RevisionTag& rRevision ) return 0; } -sal_Bool SfxMedium::RemoveVersion_Impl( const ::rtl::OUString& rName ) +sal_Bool SfxMedium::RemoveVersion_Impl( const OUString& rName ) { if ( !pImp->aVersions.getLength() ) return false; @@ -3238,7 +3238,7 @@ bool SfxMedium::IsOriginallyReadOnly() const } //---------------------------------------------------------------- -sal_Bool SfxMedium::SetWritableForUserOnly( const ::rtl::OUString& aURL ) +sal_Bool SfxMedium::SetWritableForUserOnly( const OUString& aURL ) { // UCB does not allow to allow write access only for the user, // use osl API @@ -3282,10 +3282,10 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace ) pImp->pTempFile = new ::utl::TempFile(); pImp->pTempFile->EnableKillingFile( true ); pImp->m_aName = pImp->pTempFile->GetFileName(); - ::rtl::OUString aTmpURL = pImp->pTempFile->GetURL(); + OUString aTmpURL = pImp->pTempFile->GetURL(); if ( pImp->m_aName.isEmpty() || aTmpURL.isEmpty() ) { - SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_CANTWRITE, OUString( OSL_LOG_PREFIX ) ); return; } @@ -3303,13 +3303,13 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace ) { uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv; INetURLObject aTmpURLObj( aTmpURL ); - ::rtl::OUString aFileName = aTmpURLObj.getName( INetURLObject::LAST_SEGMENT, + OUString aFileName = aTmpURLObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); if ( !aFileName.isEmpty() && aTmpURLObj.removeSegment() ) { ::ucbhelper::Content aTargetContent( aTmpURLObj.GetMainURL( INetURLObject::NO_DECODE ), xComEnv, comphelper::getProcessComponentContext() ); - rtl::OUString sMimeType = pImp->getFilterMimeType(); + OUString sMimeType = pImp->getFilterMimeType(); if ( aTargetContent.transferContent( pImp->aContent, ::ucbhelper::InsertOperation_COPY, aFileName, NameClash::OVERWRITE, sMimeType ) ) { SetWritableForUserOnly( aTmpURL ); @@ -3363,7 +3363,7 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace ) if ( !bTransferSuccess ) { - SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_CANTWRITE, OUString( OSL_LOG_PREFIX ) ); return; } } @@ -3383,7 +3383,7 @@ void SfxMedium::CreateTempFileNoCopy() pImp->m_aName = pImp->pTempFile->GetFileName(); if ( pImp->m_aName.isEmpty() ) { - SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_CANTWRITE, OUString( OSL_LOG_PREFIX ) ); return; } @@ -3391,7 +3391,7 @@ void SfxMedium::CreateTempFileNoCopy() CloseStorage(); } -sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl::OUString& aODFVersion, sal_Bool bHasValidDocumentSignature ) +sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const OUString& aODFVersion, sal_Bool bHasValidDocumentSignature ) { bool bChanges = false; @@ -3421,7 +3421,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl:: throw uno::RuntimeException(); uno::Reference< embed::XStorage > xMetaInf = xWriteableZipStor->openStorageElement( - ::rtl::OUString( "META-INF" ), + OUString( "META-INF" ), embed::ElementModes::READWRITE ); if ( !xMetaInf.is() ) throw uno::RuntimeException(); @@ -3438,7 +3438,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl:: if ( xSigner->signScriptingContent( GetZipStorageToSign_Impl(), xStream ) ) { // remove the document signature if any - ::rtl::OUString aDocSigName = xSigner->getDocumentContentSignatureDefaultStreamName(); + OUString aDocSigName = xSigner->getDocumentContentSignatureDefaultStreamName(); if ( !aDocSigName.isEmpty() && xMetaInf->hasByName( aDocSigName ) ) xMetaInf->removeElement( aDocSigName ); @@ -3522,21 +3522,21 @@ sal_Bool SfxMedium::IsOpen() const return pImp->m_pInStream || pImp->m_pOutStream || pImp->xStorage.is(); } -::rtl::OUString SfxMedium::CreateTempCopyWithExt( const ::rtl::OUString& aURL ) +OUString SfxMedium::CreateTempCopyWithExt( const OUString& aURL ) { - ::rtl::OUString aResult; + OUString aResult; if ( !aURL.isEmpty() ) { sal_Int32 nPrefixLen = aURL.lastIndexOf( '.' ); String aExt = ( nPrefixLen == -1 ) ? String() : String( aURL.copy( nPrefixLen ) ); - ::rtl::OUString aNewTempFileURL = ::utl::TempFile( String(), &aExt ).GetURL(); + OUString aNewTempFileURL = ::utl::TempFile( String(), &aExt ).GetURL(); if ( !aNewTempFileURL.isEmpty() ) { INetURLObject aSource( aURL ); INetURLObject aDest( aNewTempFileURL ); - ::rtl::OUString aFileName = aDest.getName( INetURLObject::LAST_SEGMENT, + OUString aFileName = aDest.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); if ( !aFileName.isEmpty() && aDest.removeSegment() ) @@ -3594,17 +3594,17 @@ sal_Bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteraction return bResult; } -::rtl::OUString SfxMedium::SwitchDocumentToTempFile() +OUString SfxMedium::SwitchDocumentToTempFile() { // the method returns empty string in case of failure - ::rtl::OUString aResult; - ::rtl::OUString aOrigURL = pImp->m_aLogicName; + OUString aResult; + OUString aOrigURL = pImp->m_aLogicName; if ( !aOrigURL.isEmpty() ) { sal_Int32 nPrefixLen = aOrigURL.lastIndexOf( '.' ); String aExt = ( nPrefixLen == -1 ) ? String() : String( aOrigURL.copy( nPrefixLen ) ); - ::rtl::OUString aNewURL = ::utl::TempFile( String(), &aExt ).GetURL(); + OUString aNewURL = ::utl::TempFile( String(), &aExt ).GetURL(); // TODO/LATER: In future the aLogicName should be set to shared folder URL // and a temporary file should be created. Transport_Impl should be impossible then. @@ -3667,11 +3667,11 @@ sal_Bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteraction return aResult; } -sal_Bool SfxMedium::SwitchDocumentToFile( const rtl::OUString& aURL ) +sal_Bool SfxMedium::SwitchDocumentToFile( const OUString& aURL ) { // the method is only for storage based documents bool bResult = false; - ::rtl::OUString aOrigURL = pImp->m_aLogicName; + OUString aOrigURL = pImp->m_aLogicName; if ( !aURL.isEmpty() && !aOrigURL.isEmpty() ) { diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx index 1028f85a5a92..a6ed5aa6f84b 100644 --- a/sfx2/source/doc/docfilt.cxx +++ b/sfx2/source/doc/docfilt.cxx @@ -127,26 +127,26 @@ const SfxFilter* SfxFilter::GetFilterByName( const String& rName ) OUString SfxFilter::GetTypeFromStorage( const SotStorage& rStg ) { const char* pType=0; - if ( rStg.IsStream( rtl::OUString("WordDocument") ) ) + if ( rStg.IsStream( OUString("WordDocument") ) ) { - if ( rStg.IsStream( rtl::OUString("0Table") ) || rStg.IsStream( rtl::OUString("1Table") ) ) + if ( rStg.IsStream( OUString("0Table") ) || rStg.IsStream( OUString("1Table") ) ) pType = "writer_MS_Word_97"; else pType = "writer_MS_Word_95"; } - else if ( rStg.IsStream( rtl::OUString("Book") ) ) + else if ( rStg.IsStream( OUString("Book") ) ) { pType = "calc_MS_Excel_95"; } - else if ( rStg.IsStream( rtl::OUString("Workbook" ) ) ) + else if ( rStg.IsStream( OUString("Workbook" ) ) ) { pType = "calc_MS_Excel_97"; } - else if ( rStg.IsStream( rtl::OUString("PowerPoint Document") ) ) + else if ( rStg.IsStream( OUString("PowerPoint Document") ) ) { pType = "impress_MS_PowerPoint_97"; } - else if ( rStg.IsStream( rtl::OUString("Equation Native") ) ) + else if ( rStg.IsStream( OUString("Equation Native") ) ) { pType = "math_MathType_3x"; } @@ -161,7 +161,7 @@ OUString SfxFilter::GetTypeFromStorage( const SotStorage& rStg ) } } - return pType ? rtl::OUString::createFromAscii(pType) : rtl::OUString(); + return pType ? OUString::createFromAscii(pType) : OUString(); } OUString SfxFilter::GetTypeFromStorage( diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx index d1b156164cd8..5dbb9dd97f29 100644 --- a/sfx2/source/doc/docinf.cxx +++ b/sfx2/source/doc/docinf.cxx @@ -82,7 +82,7 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet( if( xGlobSect->GetStringValue( aStrValue, PROPID_AUTHOR) ) i_xDocProps->setAuthor( aStrValue ); else - i_xDocProps->setAuthor( ::rtl::OUString() ); + i_xDocProps->setAuthor( OUString() ); if( xGlobSect->GetFileTimeValue( aDateTime, PROPID_CREATED ) ) i_xDocProps->setCreationDate( aDateTime ); else @@ -91,13 +91,13 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet( if( xGlobSect->GetStringValue( aStrValue, PROPID_LASTAUTHOR) ) i_xDocProps->setModifiedBy( aStrValue ); else - i_xDocProps->setModifiedBy( ::rtl::OUString() ); + i_xDocProps->setModifiedBy( OUString() ); if( xGlobSect->GetFileTimeValue( aDateTime, PROPID_LASTSAVED ) ) i_xDocProps->setModificationDate( aDateTime ); else i_xDocProps->setModificationDate( aInvalid ); - i_xDocProps->setPrintedBy( ::rtl::OUString() ); + i_xDocProps->setPrintedBy( OUString() ); if( xGlobSect->GetFileTimeValue( aDateTime, PROPID_LASTPRINTED ) ) i_xDocProps->setPrintDate( aDateTime ); else @@ -149,7 +149,7 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet( for( ::std::vector< sal_Int32 >::const_iterator aIt = aPropIds.begin(), aEnd = aPropIds.end(); aIt != aEnd; ++aIt ) { - ::rtl::OUString aPropName = xCustomSect->GetPropertyName( *aIt ); + OUString aPropName = xCustomSect->GetPropertyName( *aIt ); uno::Any aPropValue = xCustomSect->GetAnyValue( *aIt ); if( !aPropName.isEmpty() && aPropValue.hasValue() ) { @@ -232,13 +232,13 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet( rGlobSect.SetFileTimeValue( PROPID_EDITTIME, aEditTime ); rGlobSect.SetStringValue( PROPID_REVNUMBER, - rtl::OUString::valueOf( static_cast<sal_Int32>(i_xDocProps->getEditingCycles()) ) ); + OUString::valueOf( static_cast<sal_Int32>(i_xDocProps->getEditingCycles()) ) ); if ( i_pThumb && i_pThumb->getLength() ) rGlobSect.SetThumbnailValue( PROPID_THUMBNAIL, *i_pThumb ); // save the property set ErrCode nGlobError = aGlobSet.SavePropertySet(i_pStorage, - ::rtl::OUString(STREAM_SUMMARYINFO)); + OUString(STREAM_SUMMARYINFO)); // *** custom properties into stream "005DocumentSummaryInformation" *** @@ -255,7 +255,7 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet( const sal_Int32 nPropId = rCustomSect.GetFreePropertyId(); rCustomSect.SetBlobValue( nPropId, *i_pGuid ); rCustomSect.SetPropertyName( nPropId, - ::rtl::OUString("_PID_GUID") ); + OUString("_PID_GUID") ); } // write hyperlinks @@ -263,7 +263,7 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet( const sal_Int32 nPropId = rCustomSect.GetFreePropertyId(); rCustomSect.SetBlobValue( nPropId, *i_pHyperlinks ); rCustomSect.SetPropertyName( nPropId, - ::rtl::OUString("_PID_HLINKS") ); + OUString("_PID_HLINKS") ); } uno::Reference<beans::XPropertySet> xUserDefinedProps( @@ -280,7 +280,7 @@ bool SFX2_DLLPUBLIC SaveOlePropertySet( // skip transient properties if (~props[i].Attributes & beans::PropertyAttribute::TRANSIENT) { - const ::rtl::OUString name = props[i].Name; + const OUString name = props[i].Name; const sal_Int32 nPropId = rCustomSect.GetFreePropertyId(); if (rCustomSect.SetAnyValue( nPropId, xUserDefinedProps->getPropertyValue(name))) { diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index c76372121a21..a59b43506823 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -118,7 +118,7 @@ SfxMediumList* DocumentInserter::CreateMediumList() SfxMediumList* pMediumList = new SfxMediumList; if (!m_nError && m_pItemSet && !m_pURLList.empty()) { - for(std::vector<rtl::OUString>::const_iterator i = m_pURLList.begin(); i != m_pURLList.end(); ++i) + for(std::vector<OUString>::const_iterator i = m_pURLList.begin(); i != m_pURLList.end(); ++i) { SfxMedium* pMedium = new SfxMedium( *i, SFX_STREAM_READONLY, @@ -144,11 +144,11 @@ SfxMediumList* DocumentInserter::CreateMediumList() return pMediumList; } -void impl_FillURLList( sfx2::FileDialogHelper* _pFileDlg, std::vector<rtl::OUString>& _rpURLList ) +void impl_FillURLList( sfx2::FileDialogHelper* _pFileDlg, std::vector<OUString>& _rpURLList ) { DBG_ASSERT( _pFileDlg, "DocumentInserter::fillURLList(): invalid file dialog" ); - Sequence < ::rtl::OUString > aPathSeq = _pFileDlg->GetSelectedFiles(); + Sequence < OUString > aPathSeq = _pFileDlg->GetSelectedFiles(); if ( aPathSeq.getLength() ) { diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index f002f23239ca..83d557203d62 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -121,7 +121,7 @@ namespace sfx2 //................................................................ sal_Bool lcl_showMacroWarning( const Reference< XInteractionHandler >& rxHandler, - const ::rtl::OUString& rDocumentLocation ) + const OUString& rDocumentLocation ) { DocumentMacroConfirmationRequest aRequest; aRequest.DocumentURL = rDocumentLocation; @@ -217,14 +217,14 @@ namespace sfx2 try { - ::rtl::OUString sReferrer( m_pData->m_rDocumentAccess.getDocumentLocation() ); + OUString sReferrer( m_pData->m_rDocumentAccess.getDocumentLocation() ); // get document location from medium name and check whether it is a trusted one // the service is created ohne document version, since it is not of interest here Reference< XDocumentDigitalSignatures > xSignatures(DocumentDigitalSignatures::createDefault(::comphelper::getProcessComponentContext())); INetURLObject aURLReferer( sReferrer ); - ::rtl::OUString aLocation; + OUString aLocation; if ( aURLReferer.removeSegment() ) aLocation = aURLReferer.GetMainURL( INetURLObject::NO_DECODE ); @@ -295,9 +295,9 @@ namespace sfx2 if ( eAutoConfirm == eNoAutoConfirm ) { - ::rtl::OUString sReferrer( m_pData->m_rDocumentAccess.getDocumentLocation() ); + OUString sReferrer( m_pData->m_rDocumentAccess.getDocumentLocation() ); - ::rtl::OUString aSystemFileURL; + OUString aSystemFileURL; if ( osl::FileBase::getSystemPathFromFileURL( sReferrer, aSystemFileURL ) == osl::FileBase::E_None ) sReferrer = aSystemFileURL; @@ -331,8 +331,8 @@ namespace sfx2 bHasMacroLib = sal_False; else { - ::rtl::OUString aStdLibName( "Standard" ); - Sequence< ::rtl::OUString > aElements = xContainer->getElementNames(); + OUString aStdLibName( "Standard" ); + Sequence< OUString > aElements = xContainer->getElementNames(); if ( aElements.getLength() ) { if ( aElements.getLength() > 1 || !aElements[0].equals( aStdLibName ) ) @@ -393,8 +393,8 @@ namespace sfx2 { try { - const ::rtl::OUString s_sBasicStorageName( ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "Basic" ) ) ); - const ::rtl::OUString s_sScriptsStorageName( ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "Scripts" ) ) ); + const OUString s_sBasicStorageName( OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "Basic" ) ) ); + const OUString s_sScriptsStorageName( OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "Scripts" ) ) ); bHasMacros =( ( rxStorage->hasByName( s_sBasicStorageName ) && rxStorage->isStorageElement( s_sBasicStorageName ) diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 5132e70384d0..802882fea206 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -483,8 +483,8 @@ String SfxDocumentTemplates::GetPath //------------------------------------------------------------------------ -::rtl::OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const ::rtl::OUString& aGroupName, - const ::rtl::OUString& aTitle ) +OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const OUString& aGroupName, + const OUString& aTitle ) { DocTemplLocker_Impl aLocker( *pImp ); @@ -499,7 +499,7 @@ String SfxDocumentTemplates::GetPath INetURLObject::ENCODE_ALL ); - ::rtl::OUString aResult; + OUString aResult; Content aTemplate; uno::Reference< XCommandEnvironment > aCmdEnv; if ( Content::create( aTemplateObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) ) @@ -611,7 +611,7 @@ sal_Bool SfxDocumentTemplates::CopyOrMove INetURLObject aSourceObj( pSource->GetTargetURL() ); - ::rtl::OUString aNewTargetURL = GetTemplateTargetURLFromComponent( pTargetRgn->GetTitle(), aTitle ); + OUString aNewTargetURL = GetTemplateTargetURLFromComponent( pTargetRgn->GetTitle(), aTitle ); if ( aNewTargetURL.isEmpty() ) return sal_False; @@ -833,7 +833,7 @@ sal_Bool SfxDocumentTemplates::CopyFrom uno::Reference< XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString("Hidden"); + aArgs[0].Name = OUString("Hidden"); aArgs[0].Value <<= sal_True; INetURLObject aTemplURL( rName ); diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 130777f09121..6d993e8515c5 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -210,29 +210,29 @@ class SfxDocTplService_Impl sal_Bool bFsysFolder, Content &rNewFolder ); - sal_Bool CreateNewUniqueFolderWithPrefix( const ::rtl::OUString& aPath, - const ::rtl::OUString& aPrefix, - ::rtl::OUString& aNewFolderName, - ::rtl::OUString& aNewFolderURL, + sal_Bool CreateNewUniqueFolderWithPrefix( const OUString& aPath, + const OUString& aPrefix, + OUString& aNewFolderName, + OUString& aNewFolderURL, Content& aNewFolder ); - ::rtl::OUString CreateNewUniqueFileWithPrefix( const ::rtl::OUString& aPath, - const ::rtl::OUString& aPrefix, - const ::rtl::OUString& aExt ); - - uno::Sequence< beans::StringPair > ReadUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath ); - sal_Bool UpdateUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, - const ::rtl::OUString& aGroupName, - const ::rtl::OUString& aNewFolderName ); - sal_Bool ReplaceUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, - const ::rtl::OUString& aFsysGroupName, - const ::rtl::OUString& aOldGroupName, - const ::rtl::OUString& aNewGroupName ); - sal_Bool RemoveUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, - const ::rtl::OUString& aGroupName ); - sal_Bool WriteUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, + OUString CreateNewUniqueFileWithPrefix( const OUString& aPath, + const OUString& aPrefix, + const OUString& aExt ); + + uno::Sequence< beans::StringPair > ReadUINamesForTemplateDir_Impl( const OUString& aUserPath ); + sal_Bool UpdateUINamesForTemplateDir_Impl( const OUString& aUserPath, + const OUString& aGroupName, + const OUString& aNewFolderName ); + sal_Bool ReplaceUINamesForTemplateDir_Impl( const OUString& aUserPath, + const OUString& aFsysGroupName, + const OUString& aOldGroupName, + const OUString& aNewGroupName ); + sal_Bool RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath, + const OUString& aGroupName ); + sal_Bool WriteUINamesForTemplateDir_Impl( const OUString& aUserPath, const uno::Sequence< beans::StringPair >& aUINames ); - ::rtl::OUString CreateNewGroupFsys( const ::rtl::OUString& rGroupName, Content& aGroup ); + OUString CreateNewGroupFsys( const OUString& rGroupName, Content& aGroup ); sal_Bool removeContent( Content& rContent ); sal_Bool removeContent( const OUString& rContentURL ); @@ -413,12 +413,12 @@ void SfxDocTplService_Impl::init_Impl() maRootURL += OUString( '/' ); maRootURL += aLang; - ::rtl::OUString aTemplVersPropName( TEMPLATE_VERSION ); - ::rtl::OUString aTemplVers( TEMPLATE_VERSION_VALUE ); + OUString aTemplVersPropName( TEMPLATE_VERSION ); + OUString aTemplVers( TEMPLATE_VERSION_VALUE ); if ( Content::create( maRootURL, maCmdEnv, comphelper::getProcessComponentContext(), maRootContent ) ) { uno::Any aValue; - ::rtl::OUString aPropValue; + OUString aPropValue; if ( getProperty( maRootContent, aTemplVersPropName, aValue ) && ( aValue >>= aPropValue ) && aPropValue.equals( aTemplVers ) ) @@ -491,7 +491,7 @@ void SfxDocTplService_Impl::getDefaultLocale() ::osl::MutexGuard aGuard( maMutex ); if ( !mbLocaleSet ) { - rtl::OUString aLocale( utl::ConfigManager::getLocale() ); + OUString aLocale( utl::ConfigManager::getLocale() ); if ( !aLocale.isEmpty() ) { sal_Int32 nPos = aLocale.indexOf( sal_Unicode( '-' ) ); @@ -579,7 +579,7 @@ void SfxDocTplService_Impl::getDirList() maTemplateDirs = Sequence< OUString >( nCount ); uno::Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(mxContext); - const rtl::OUString aPrefix( + const OUString aPrefix( "vnd.sun.star.expand:" ); for ( sal_uInt16 i=0; i<nCount; i++ ) @@ -593,7 +593,7 @@ void SfxDocTplService_Impl::getDirList() { maTemplateDirs[i] = maTemplateDirs[i].replaceAt(nIndex, aPrefix.getLength(), - rtl::OUString()); + OUString()); maTemplateDirs[i] = xExpander->expandMacros( maTemplateDirs[i] ); } } @@ -643,9 +643,9 @@ sal_Bool SfxDocTplService_Impl::setTitleForURL( const OUString& rURL, const OUSt rURL, embed::ElementModes::READWRITE); uno::Sequence<beans::PropertyValue> medium(2); - medium[0].Name = ::rtl::OUString("DocumentBaseURL"); + medium[0].Name = OUString("DocumentBaseURL"); medium[0].Value <<= rURL; - medium[1].Name = ::rtl::OUString("URL"); + medium[1].Name = OUString("URL"); medium[1].Value <<= rURL; m_xDocProps->storeToStorage(xStorage, medium); @@ -677,15 +677,15 @@ sal_Bool SfxDocTplService_Impl::getTitleFromURL( const OUString& rURL, OUString& if ( aType.isEmpty() && mxType.is() ) { - ::rtl::OUString aDocType = mxType->queryTypeByURL( rURL ); + OUString aDocType = mxType->queryTypeByURL( rURL ); if ( !aDocType.isEmpty() ) try { uno::Reference< container::XNameAccess > xTypeDetection( mxType, uno::UNO_QUERY_THROW ); SequenceAsHashMap aTypeProps( xTypeDetection->getByName( aDocType ) ); aType = aTypeProps.getUnpackedValueOrDefault( - ::rtl::OUString("MediaType"), - ::rtl::OUString() ); + OUString("MediaType"), + OUString() ); } catch( uno::Exception& ) {} @@ -817,10 +817,10 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL, } // ----------------------------------------------------------------------- -sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const ::rtl::OUString& aPath, - const ::rtl::OUString& aPrefix, - ::rtl::OUString& aNewFolderName, - ::rtl::OUString& aNewFolderURL, +sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString& aPath, + const OUString& aPrefix, + OUString& aNewFolderName, + OUString& aNewFolderURL, Content& aNewFolder ) { sal_Bool bCreated = sal_False; @@ -832,9 +832,9 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const ::rtl::OU { for ( sal_Int32 nInd = 0; nInd < 32000; nInd++ ) { - ::rtl::OUString aTryName = aPrefix; + OUString aTryName = aPrefix; if ( nInd ) - aTryName += ::rtl::OUString::valueOf( nInd ); + aTryName += OUString::valueOf( nInd ); try { @@ -879,11 +879,11 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const ::rtl::OU } // ----------------------------------------------------------------------- -::rtl::OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const ::rtl::OUString& aPath, - const ::rtl::OUString& aPrefix, - const ::rtl::OUString& aExt ) +OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& aPath, + const OUString& aPrefix, + const OUString& aExt ) { - ::rtl::OUString aNewFileURL; + OUString aNewFileURL; INetURLObject aDirPath( aPath ); Content aParent; @@ -895,11 +895,11 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const ::rtl::OU { Content aNewFile; sal_Bool bCreated = sal_False; - ::rtl::OUString aTryName = aPrefix; + OUString aTryName = aPrefix; if ( nInd ) - aTryName += ::rtl::OUString::valueOf( nInd ); + aTryName += OUString::valueOf( nInd ); if ( aExt.toChar() != '.' ) - aTryName += ::rtl::OUString( "." ); + aTryName += OUString( "." ); aTryName += aExt; try @@ -1105,7 +1105,7 @@ sal_Bool SfxDocTplService_Impl::getProperty( Content& rContent, // ----------------------------------------------------------------------- // static bool SfxURLRelocator_Impl::propertyCanContainOfficeDir( - const rtl::OUString & rPropName ) + const OUString & rPropName ) { // Note: TargetURL is handled by UCB itself (because it is a property // with a predefined semantic). Additional Core properties introduced @@ -1270,10 +1270,10 @@ void SfxDocTplService_Impl::doUpdate() } //----------------------------------------------------------------------------- -uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath ) +uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplateDir_Impl( const OUString& aUserPath ) { INetURLObject aLocObj( aUserPath ); - aLocObj.insertName( ::rtl::OUString( "groupuinames.xml" ), false, + aLocObj.insertName( OUString( "groupuinames.xml" ), false, INetURLObject::LAST_SEGMENT, true, INetURLObject::ENCODE_ALL ); Content aLocContent; @@ -1296,9 +1296,9 @@ uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplate } //----------------------------------------------------------------------------- -sal_Bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, - const ::rtl::OUString& aGroupName, - const ::rtl::OUString& aNewFolderName ) +sal_Bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const OUString& aUserPath, + const OUString& aGroupName, + const OUString& aNewFolderName ) { uno::Sequence< beans::StringPair > aUINames = ReadUINamesForTemplateDir_Impl( aUserPath ); sal_Int32 nLen = aUINames.getLength(); @@ -1316,10 +1316,10 @@ sal_Bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const ::rtl::O } //----------------------------------------------------------------------------- -sal_Bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, - const ::rtl::OUString& aDefaultFsysGroupName, - const ::rtl::OUString& aOldGroupName, - const ::rtl::OUString& aNewGroupName ) +sal_Bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const OUString& aUserPath, + const OUString& aDefaultFsysGroupName, + const OUString& aOldGroupName, + const OUString& aNewGroupName ) { uno::Sequence< beans::StringPair > aUINames = ReadUINamesForTemplateDir_Impl( aUserPath ); sal_Int32 nLen = aUINames.getLength(); @@ -1342,8 +1342,8 @@ sal_Bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const ::rtl:: } //----------------------------------------------------------------------------- -sal_Bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, - const ::rtl::OUString& aGroupName ) +sal_Bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath, + const OUString& aGroupName ) { uno::Sequence< beans::StringPair > aUINames = ReadUINamesForTemplateDir_Impl( aUserPath ); sal_Int32 nLen = aUINames.getLength(); @@ -1368,7 +1368,7 @@ sal_Bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const ::rtl::O //----------------------------------------------------------------------------- -sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OUString& aUserPath, +sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const OUString& aUserPath, const uno::Sequence< beans::StringPair >& aUINames ) { sal_Bool bResult = sal_False; @@ -1377,8 +1377,8 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU io::TempFile::create(mxContext), uno::UNO_QUERY_THROW ); - ::rtl::OUString aTempURL; - uno::Any aUrl = xTempFile->getPropertyValue( ::rtl::OUString("Uri") ); + OUString aTempURL; + uno::Any aUrl = xTempFile->getPropertyValue( OUString("Uri") ); aUrl >>= aTempURL; uno::Reference< io::XStream > xStream( xTempFile, uno::UNO_QUERY_THROW ); @@ -1397,9 +1397,9 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU Content aSourceContent( aTempURL, maCmdEnv, comphelper::getProcessComponentContext() ); aTargetContent.transferContent( aSourceContent, InsertOperation_COPY, - ::rtl::OUString( "groupuinames.xml" ), + OUString( "groupuinames.xml" ), ucb::NameClash::OVERWRITE, - ::rtl::OUString( "text/xml" ) ); + OUString( "text/xml" ) ); bResult = sal_True; } catch ( uno::Exception& ) @@ -1410,17 +1410,17 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU } //----------------------------------------------------------------------------- -::rtl::OUString SfxDocTplService_Impl::CreateNewGroupFsys( const ::rtl::OUString& rGroupName, Content& aGroup ) +OUString SfxDocTplService_Impl::CreateNewGroupFsys( const OUString& rGroupName, Content& aGroup ) { - ::rtl::OUString aResultURL; + OUString aResultURL; if ( maTemplateDirs.getLength() ) { - ::rtl::OUString aTargetPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ]; + OUString aTargetPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ]; // create a new folder with the given name Content aNewFolder; - ::rtl::OUString aNewFolderName; + OUString aNewFolderName; // the Fsys name instead of GroupName should be used, the groupuinames must be added also if ( !CreateNewUniqueFolderWithPrefix( aTargetPath, @@ -1429,19 +1429,19 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU aResultURL, aNewFolder ) && !CreateNewUniqueFolderWithPrefix( aTargetPath, - ::rtl::OUString( "UserGroup" ), + OUString( "UserGroup" ), aNewFolderName, aResultURL, aNewFolder ) ) - return ::rtl::OUString(); + return OUString(); if ( !UpdateUINamesForTemplateDir_Impl( aTargetPath, rGroupName, aNewFolderName ) ) { // we could not create the groupuinames for the folder, so we delete the group in the // the folder and return removeContent( aNewFolder ); - return ::rtl::OUString(); + return OUString(); } // Now set the target url for this group and we are done @@ -1451,7 +1451,7 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const ::rtl::OU if ( ! setProperty( aGroup, aPropName, aValue ) ) { removeContent( aNewFolder ); - return ::rtl::OUString(); + return OUString(); } } @@ -1507,7 +1507,7 @@ sal_Bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName ) aNewFolderURL, aNewFolder ) && !CreateNewUniqueFolderWithPrefix( aUserPath, - ::rtl::OUString( "UserGroup" ), + OUString( "UserGroup" ), aNewFolderName, aNewFolderURL, aNewFolder ) ) @@ -1575,7 +1575,7 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) if ( !maTemplateDirs.getLength() ) return sal_False; - ::rtl::OUString aGeneralTempPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ]; + OUString aGeneralTempPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ]; // check that the fs location is in writeble folder and this is not a "My templates" folder INetURLObject aGroupParentFolder( aGroupTargetURL ); @@ -1636,7 +1636,7 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) || !::utl::UCBContentHelper::Exists( aGroupTargetURL ) ) { RemoveUINamesForTemplateDir_Impl( aGeneralTempPath, rGroupName ); - setProperty( aGroup, aPropName, uno::makeAny( ::rtl::OUString() ) ); + setProperty( aGroup, aPropName, uno::makeAny( OUString() ) ); } } } @@ -1689,7 +1689,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, if ( !maTemplateDirs.getLength() ) return sal_False; - ::rtl::OUString aGeneralTempPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ]; + OUString aGeneralTempPath = maTemplateDirs[ maTemplateDirs.getLength() - 1 ]; // check that the fs location is in writeble folder and this is not a "My templates" folder INetURLObject aGroupParentFolder( aGroupTargetURL ); @@ -1730,7 +1730,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, if ( bCanBeRenamed ) { INetURLObject aGroupTargetObj( aGroupTargetURL ); - ::rtl::OUString aFsysName = aGroupTargetObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString aFsysName = aGroupTargetObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); if ( aGroupTargetObj.removeSegment() && ReplaceUINamesForTemplateDir_Impl( aGroupTargetObj.GetMainURL( INetURLObject::NO_DECODE ), @@ -1763,7 +1763,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, OUString aGroupURL, aTemplateURL, aTemplateToRemoveTargetURL; INetURLObject aGroupObj( maRootURL ); sal_Bool bRemoveOldTemplateContent = sal_False; - ::rtl::OUString sDocServiceName; + OUString sDocServiceName; aGroupObj.insertName( rGroupName, false, INetURLObject::LAST_SEGMENT, true, @@ -1773,8 +1773,8 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, if ( ! Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) ) return sal_False; - ::rtl::OUString aGroupTargetURL; - ::rtl::OUString aPropName( TARGET_DIR_URL ); + OUString aGroupTargetURL; + OUString aPropName( TARGET_DIR_URL ); Any aValue; if ( getProperty( aGroup, aPropName, aValue ) ) aValue >>= aGroupTargetURL; @@ -1814,20 +1814,20 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, throw uno::RuntimeException(); // get the actual filter name - ::rtl::OUString aFilterName; + OUString aFilterName; uno::Reference< lang::XMultiServiceFactory > xConfigProvider = configuration::theDefaultProvider::get( xContext ); uno::Sequence< uno::Any > aArgs( 1 ); beans::PropertyValue aPathProp; - aPathProp.Name = ::rtl::OUString("nodepath"); - aPathProp.Value <<= ::rtl::OUString( "/org.openoffice.Setup/Office/Factories/" ); + aPathProp.Name = OUString("nodepath"); + aPathProp.Value <<= OUString( "/org.openoffice.Setup/Office/Factories/" ); aArgs[0] <<= aPathProp; uno::Reference< container::XNameAccess > xSOFConfig( xConfigProvider->createInstanceWithArguments( - ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"), + OUString("com.sun.star.configuration.ConfigurationAccess"), aArgs ), uno::UNO_QUERY_THROW ); @@ -1836,14 +1836,14 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, if ( !xApplConfig.is() ) throw uno::RuntimeException(); - xApplConfig->getByName( ::rtl::OUString( "ooSetupFactoryActualTemplateFilter" ) ) >>= aFilterName; + xApplConfig->getByName( OUString( "ooSetupFactoryActualTemplateFilter" ) ) >>= aFilterName; if ( aFilterName.isEmpty() ) throw uno::RuntimeException(); // find the related type name - ::rtl::OUString aTypeName; + OUString aTypeName; uno::Reference< container::XNameAccess > xFilterFactory( - xFactory->createInstance( ::rtl::OUString("com.sun.star.document.FilterFactory") ), + xFactory->createInstance( OUString("com.sun.star.document.FilterFactory") ), uno::UNO_QUERY_THROW ); uno::Sequence< beans::PropertyValue > aFilterData; @@ -1862,17 +1862,17 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, mxType.is() ? uno::Reference< container::XNameAccess >( mxType, uno::UNO_QUERY_THROW ) : uno::Reference< container::XNameAccess >( - xFactory->createInstance( ::rtl::OUString("com.sun.star.document.TypeDetection") ), + xFactory->createInstance( OUString("com.sun.star.document.TypeDetection") ), uno::UNO_QUERY_THROW ); SequenceAsHashMap aTypeProps( xTypeDetection->getByName( aTypeName ) ); - uno::Sequence< ::rtl::OUString > aAllExt = - aTypeProps.getUnpackedValueOrDefault( ::rtl::OUString("Extensions"), Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString > aAllExt = + aTypeProps.getUnpackedValueOrDefault( OUString("Extensions"), Sequence< OUString >() ); if ( !aAllExt.getLength() ) throw uno::RuntimeException(); - ::rtl::OUString aMediaType = aTypeProps.getUnpackedValueOrDefault( ::rtl::OUString("MediaType"), ::rtl::OUString() ); - ::rtl::OUString aExt = aAllExt[0]; + OUString aMediaType = aTypeProps.getUnpackedValueOrDefault( OUString("MediaType"), OUString() ); + OUString aExt = aAllExt[0]; if ( aMediaType.isEmpty() || aExt.isEmpty() ) throw uno::RuntimeException(); @@ -1886,10 +1886,10 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, throw uno::RuntimeException(); } - ::rtl::OUString aNewTemplateTargetURL = CreateNewUniqueFileWithPrefix( aGroupTargetURL, rTemplateName, aExt ); + OUString aNewTemplateTargetURL = CreateNewUniqueFileWithPrefix( aGroupTargetURL, rTemplateName, aExt ); if ( aNewTemplateTargetURL.isEmpty() ) { - aNewTemplateTargetURL = CreateNewUniqueFileWithPrefix( aGroupTargetURL, ::rtl::OUString( "UserTemplate" ), aExt ); + aNewTemplateTargetURL = CreateNewUniqueFileWithPrefix( aGroupTargetURL, OUString( "UserTemplate" ), aExt ); if ( aNewTemplateTargetURL.isEmpty() ) throw uno::RuntimeException(); @@ -1897,9 +1897,9 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, // store template uno::Sequence< PropertyValue > aStoreArgs( 2 ); - aStoreArgs[0].Name = ::rtl::OUString("FilterName"); + aStoreArgs[0].Name = OUString("FilterName"); aStoreArgs[0].Value <<= aFilterName; - aStoreArgs[1].Name = ::rtl::OUString("DocumentTitle"); + aStoreArgs[1].Name = OUString("DocumentTitle"); aStoreArgs[1].Value <<= rTemplateName; if( !::utl::UCBContentHelper::EqualURLs( aNewTemplateTargetURL, rStorable->getLocation() )) @@ -2016,11 +2016,11 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, INetURLObject aTmpURL( aSourceObj ); aTmpURL.CutExtension(); - ::rtl::OUString aPattern = aTmpURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString aPattern = aTmpURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - ::rtl::OUString aNewTemplateTargetURL = CreateNewUniqueFileWithPrefix( aTargetURL, aPattern, aSourceObj.getExtension() ); + OUString aNewTemplateTargetURL = CreateNewUniqueFileWithPrefix( aTargetURL, aPattern, aSourceObj.getExtension() ); INetURLObject aNewTemplateTargetObj( aNewTemplateTargetURL ); - ::rtl::OUString aNewTemplateTargetName = aNewTemplateTargetObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString aNewTemplateTargetName = aNewTemplateTargetObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); if ( aNewTemplateTargetURL.isEmpty() || aNewTemplateTargetName.isEmpty() ) return sal_False; @@ -2048,7 +2048,7 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, Content aResultContent; if ( Content::create( aNewTemplateTargetURL, xEnv, comphelper::getProcessComponentContext(), aResultContent ) ) { - ::rtl::OUString aPropertyName( "IsReadOnly" ); + OUString aPropertyName( "IsReadOnly" ); uno::Any aProperty; sal_Bool bReadOnly = sal_False; if ( getProperty( aResultContent, aPropertyName, aProperty ) && ( aProperty >>= bReadOnly ) && bReadOnly ) @@ -2473,7 +2473,7 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList, const OUString& rOwnURL, sal_Bool bWriteableGroup ) { - ::rtl::OUString aTitle; + OUString aTitle; if ( rUITitle.isEmpty() ) { @@ -2569,7 +2569,7 @@ void SfxDocTplService_Impl::createFromContent( GroupList_Impl& rList, if ( ! bHierarchy ) { OUString aUIStdTitle = getLongName( OUString( STANDARD_FOLDER ) ); - addFsysGroup( rList, ::rtl::OUString(), aUIStdTitle, aTargetURL, bWriteableContent ); + addFsysGroup( rList, OUString(), aUIStdTitle, aTargetURL, bWriteableContent ); } // search for predefined UI names @@ -2608,7 +2608,7 @@ void SfxDocTplService_Impl::createFromContent( GroupList_Impl& rList, addHierGroup( rList, aTitle, aTargetSubfolderURL ); else { - ::rtl::OUString aUITitle; + OUString aUITitle; for ( sal_Int32 nInd = 0; nInd < aUINames.getLength(); nInd++ ) if ( aUINames[nInd].First.equals( aTitle ) ) { @@ -2828,7 +2828,7 @@ void SfxURLRelocator_Impl::initOfficeInstDirs() } // ----------------------------------------------------------------------- -void SfxURLRelocator_Impl::implExpandURL( ::rtl::OUString& io_url ) +void SfxURLRelocator_Impl::implExpandURL( OUString& io_url ) { const INetURLObject aParser( io_url ); if ( aParser.GetProtocol() != INET_PROT_VND_SUN_STAR_EXPAND ) @@ -2850,7 +2850,7 @@ void SfxURLRelocator_Impl::implExpandURL( ::rtl::OUString& io_url ) } // ----------------------------------------------------------------------- -void SfxURLRelocator_Impl::makeRelocatableURL( rtl::OUString & rURL ) +void SfxURLRelocator_Impl::makeRelocatableURL( OUString & rURL ) { if ( !rURL.isEmpty() ) { @@ -2861,7 +2861,7 @@ void SfxURLRelocator_Impl::makeRelocatableURL( rtl::OUString & rURL ) } // ----------------------------------------------------------------------- -void SfxURLRelocator_Impl::makeAbsoluteURL( rtl::OUString & rURL ) +void SfxURLRelocator_Impl::makeAbsoluteURL( OUString & rURL ) { if ( !rURL.isEmpty() ) { diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index 770625aa2900..33ddb3341dbf 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; uno::Sequence< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { - ::rtl::OUString aStringID = ::rtl::OUString( "groupuinames.xml" ); + OUString aStringID = OUString( "groupuinames.xml" ); return ReadLocalizationSequence_Impl( xInStream, aStringID, xContext ); } @@ -52,20 +52,20 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R xWriterHandler->setOutputStream( xOutStream ); - ::rtl::OUString aGroupListElement( "groupuinames:template-group-list" ); - ::rtl::OUString aGroupElement( "groupuinames:template-group" ); - ::rtl::OUString aNameAttr( "groupuinames:name" ); - ::rtl::OUString aUINameAttr( "groupuinames:default-ui-name" ); - ::rtl::OUString aCDATAString( "CDATA" ); - ::rtl::OUString aWhiteSpace( " " ); + OUString aGroupListElement( "groupuinames:template-group-list" ); + OUString aGroupElement( "groupuinames:template-group" ); + OUString aNameAttr( "groupuinames:name" ); + OUString aUINameAttr( "groupuinames:default-ui-name" ); + OUString aCDATAString( "CDATA" ); + OUString aWhiteSpace( " " ); // write the namespace ::comphelper::AttributeList* pRootAttrList = new ::comphelper::AttributeList; uno::Reference< xml::sax::XAttributeList > xRootAttrList( pRootAttrList ); pRootAttrList->AddAttribute( - ::rtl::OUString( "xmlns" ), + OUString( "xmlns" ), aCDATAString, - ::rtl::OUString( "http://openoffice.org/2006/groupuinames" ) ); + OUString( "http://openoffice.org/2006/groupuinames" ) ); xWriterHandler->startDocument(); xWriterHandler->startElement( aGroupListElement, xRootAttrList ); @@ -90,7 +90,7 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R // ================================================================================== // ----------------------------------- -uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, const uno::Reference< uno::XComponentContext > xContext ) +uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { if ( !xContext.is() || !xInStream.is() ) @@ -148,7 +148,7 @@ void SAL_CALL DocTemplLocaleHelper::endDocument() } // ----------------------------------- -void SAL_CALL DocTemplLocaleHelper::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) +void SAL_CALL DocTemplLocaleHelper::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw( xml::sax::SAXException, uno::RuntimeException ) { if ( aName == m_aGroupListElement ) @@ -175,11 +175,11 @@ void SAL_CALL DocTemplLocaleHelper::startElement( const ::rtl::OUString& aName, sal_Int32 nNewEntryNum = m_aResultSeq.getLength() + 1; m_aResultSeq.realloc( nNewEntryNum ); - ::rtl::OUString aNameValue = xAttribs->getValueByName( m_aNameAttr ); + OUString aNameValue = xAttribs->getValueByName( m_aNameAttr ); if ( aNameValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the ID value must present - ::rtl::OUString aUINameValue = xAttribs->getValueByName( m_aUINameAttr ); + OUString aUINameValue = xAttribs->getValueByName( m_aUINameAttr ); if ( aUINameValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the ID value must present @@ -200,7 +200,7 @@ void SAL_CALL DocTemplLocaleHelper::startElement( const ::rtl::OUString& aName, } // ----------------------------------- -void SAL_CALL DocTemplLocaleHelper::endElement( const ::rtl::OUString& aName ) +void SAL_CALL DocTemplLocaleHelper::endElement( const OUString& aName ) throw( xml::sax::SAXException, uno::RuntimeException ) { sal_Int32 nLength = m_aElementsSeq.getLength(); @@ -214,19 +214,19 @@ void SAL_CALL DocTemplLocaleHelper::endElement( const ::rtl::OUString& aName ) } // ----------------------------------- -void SAL_CALL DocTemplLocaleHelper::characters( const ::rtl::OUString& /*aChars*/ ) +void SAL_CALL DocTemplLocaleHelper::characters( const OUString& /*aChars*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } // ----------------------------------- -void SAL_CALL DocTemplLocaleHelper::ignorableWhitespace( const ::rtl::OUString& /*aWhitespaces*/ ) +void SAL_CALL DocTemplLocaleHelper::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } // ----------------------------------- -void SAL_CALL DocTemplLocaleHelper::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) +void SAL_CALL DocTemplLocaleHelper::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx index b6f7fc286b0a..e1e413856fa4 100644 --- a/sfx2/source/doc/doctemplateslocal.hxx +++ b/sfx2/source/doc/doctemplateslocal.hxx @@ -30,18 +30,18 @@ class DocTemplLocaleHelper : public cppu::WeakImplHelper1 < com::sun::star::xml::sax::XDocumentHandler > { // Relations info related strings - ::rtl::OUString m_aGroupListElement; - ::rtl::OUString m_aGroupElement; - ::rtl::OUString m_aNameAttr; - ::rtl::OUString m_aUINameAttr; + OUString m_aGroupListElement; + OUString m_aGroupElement; + OUString m_aNameAttr; + OUString m_aUINameAttr; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > m_aResultSeq; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aElementsSeq; // stack of elements being parsed + ::com::sun::star::uno::Sequence< OUString > m_aElementsSeq; // stack of elements being parsed DocTemplLocaleHelper(); // must not be created directly ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > GetParsingResult(); - static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL ReadLocalizationSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) + static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > SAL_CALL ReadLocalizationSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const OUString& aStringID, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext ) throw( ::com::sun::star::uno::Exception ); public: @@ -66,11 +66,11 @@ public: // XDocumentHandler virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); }; diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index a3f046c9d719..086eca2217c6 100644 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -117,7 +117,7 @@ namespace sfx2 if ( pObjectShell != NULL ) pUndoManager = pObjectShell->GetUndoManager(); if ( !pUndoManager ) - throw NotInitializedException( ::rtl::OUString(), *&i_baseModel ); + throw NotInitializedException( OUString(), *&i_baseModel ); return pUndoManager; } }; @@ -265,7 +265,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL DocumentUndoManager::enterUndoContext( const ::rtl::OUString& i_title ) throw (RuntimeException) + void SAL_CALL DocumentUndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException) { // SYNCHRONIZED ---> UndoManagerGuard aGuard( *this ); @@ -339,28 +339,28 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL DocumentUndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL DocumentUndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getCurrentUndoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL DocumentUndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL DocumentUndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getCurrentRedoActionTitle(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL DocumentUndoManager::getAllUndoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DocumentUndoManager::getAllUndoActionTitles( ) throw (RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getAllUndoActionTitles(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL DocumentUndoManager::getAllRedoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DocumentUndoManager::getAllRedoActionTitles( ) throw (RuntimeException) { UndoManagerGuard aGuard( *this ); return m_pImpl->aUndoHelper.getAllRedoActionTitles(); @@ -442,7 +442,7 @@ namespace sfx2 void SAL_CALL DocumentUndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException) { (void)i_parent; - throw NoSupportException( ::rtl::OUString(), m_pImpl->getThis() ); + throw NoSupportException( OUString(), m_pImpl->getThis() ); } //...................................................................................................................... diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 392840e5d8d9..8f3a5b528421 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -108,15 +108,15 @@ void* GraphicHelper::getEnhMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta ) #ifdef WNT if ( pGDIMeta ) { - String aStr = ::rtl::OUString(".emf"); - ::utl::TempFile aTempFile( ::rtl::OUString(), + String aStr = OUString(".emf"); + ::utl::TempFile aTempFile( OUString(), &aStr, NULL, sal_False ); - ::rtl::OUString aMetaFile = aTempFile.GetFileName(); - ::rtl::OUString aMetaURL = aTempFile.GetURL(); - ::rtl::OString aWinFile = ::rtl::OUStringToOString( aMetaFile, osl_getThreadTextEncoding() ); + OUString aMetaFile = aTempFile.GetFileName(); + OUString aMetaURL = aTempFile.GetURL(); + OString aWinFile = OUStringToOString( aMetaFile, osl_getThreadTextEncoding() ); SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( aMetaURL, STREAM_STD_READWRITE ); if ( pStream ) @@ -450,8 +450,8 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un try { uno::Reference< graphic::XGraphicProvider > xGraphProvider(graphic::GraphicProvider::create(xContext)); - ::rtl::OUString aURL("private:resource/sfx/bitmapex/"); - aURL += ::rtl::OUString::valueOf( nResID ); + OUString aURL("private:resource/sfx/bitmapex/"); + aURL += OUString::valueOf( nResID ); uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); aMediaProps[0].Name = "URL"; @@ -464,7 +464,7 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un aStoreProps[0].Name = "OutputStream"; aStoreProps[0].Value <<= xStream; aStoreProps[1].Name = "MimeType"; - aStoreProps[1].Value <<= ::rtl::OUString("image/png"); + aStoreProps[1].Value <<= OUString("image/png"); xGraphProvider->storeGraphic( xGraphic, aStoreProps ); bResult = sal_True; @@ -480,7 +480,7 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un //--------------------------------------------------------------- // static -sal_uInt16 GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( const ::rtl::OUString& aFactoryShortName, sal_Bool /*bIsTemplate*/ ) +sal_uInt16 GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( const OUString& aFactoryShortName, sal_Bool /*bIsTemplate*/ ) { sal_uInt16 nResult = 0; diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx index 0c4eeb9825c1..0dc980d38a00 100644 --- a/sfx2/source/doc/graphhelp.hxx +++ b/sfx2/source/doc/graphhelp.hxx @@ -56,7 +56,7 @@ public: const BitmapEx& aBitmap, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ); - static sal_uInt16 getThumbnailReplacementIDByFactoryName_Impl( const ::rtl::OUString& aFactoryShortName, + static sal_uInt16 getThumbnailReplacementIDByFactoryName_Impl( const OUString& aFactoryShortName, sal_Bool bIsTemplate ); static sal_Bool getThumbnailReplacement_Impl( diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index e1834b3c809c..d795ea8228d8 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -139,7 +139,7 @@ static sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode ) } //------------------------------------------------------------------------- -static sal_uInt8 getStoreModeFromSlotName( const ::rtl::OUString& aSlotName ) +static sal_uInt8 getStoreModeFromSlotName( const OUString& aSlotName ) { sal_uInt8 nResult = 0; if ( aSlotName == "ExportTo" ) @@ -155,7 +155,7 @@ static sal_uInt8 getStoreModeFromSlotName( const ::rtl::OUString& aSlotName ) else if ( aSlotName == "SaveACopy" ) nResult = SAVEACOPY_REQUESTED; else - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER ); @@ -199,10 +199,10 @@ public: uno::Reference< lang::XMultiServiceFactory > xDocSettingsSupplier( xModel, uno::UNO_QUERY_THROW ); m_xDocumentSettings.set( xDocSettingsSupplier->createInstance( - ::rtl::OUString( "com.sun.star.document.Settings" ) ), + OUString( "com.sun.star.document.Settings" ) ), uno::UNO_QUERY_THROW ); - ::rtl::OUString aLoadReadonlyString( "LoadReadonly" ); + OUString aLoadReadonlyString( "LoadReadonly" ); try { @@ -224,7 +224,7 @@ public: { if ( m_bRestoreSettings ) { - ::rtl::OUString aLoadReadonlyString( "LoadReadonly" ); + OUString aLoadReadonlyString( "LoadReadonly" ); try { @@ -251,7 +251,7 @@ class ModelData_Impl uno::Reference< frame::XStorable2 > m_xStorable2; uno::Reference< util::XModifiable > m_xModifiable; - ::rtl::OUString m_aModuleName; + OUString m_aModuleName; ::comphelper::SequenceAsHashMap* m_pDocumentPropsHM; ::comphelper::SequenceAsHashMap* m_pModulePropsHM; @@ -279,43 +279,43 @@ public: const ::comphelper::SequenceAsHashMap& GetDocProps(); - ::rtl::OUString GetModuleName(); + OUString GetModuleName(); const ::comphelper::SequenceAsHashMap& GetModuleProps(); void CheckInteractionHandler(); - ::rtl::OUString GetDocServiceName(); + OUString GetDocServiceName(); uno::Sequence< beans::PropertyValue > GetDocServiceDefaultFilterCheckFlags( sal_Int32 nMust, sal_Int32 nDont ); uno::Sequence< beans::PropertyValue > GetDocServiceAnyFilter( sal_Int32 nMust, sal_Int32 nDont ); uno::Sequence< beans::PropertyValue > GetPreselectedFilter_Impl( sal_Int8 nStoreMode ); uno::Sequence< beans::PropertyValue > GetDocServiceDefaultFilter(); - sal_Bool ExecuteFilterDialog_Impl( const ::rtl::OUString& aFilterName ); + sal_Bool ExecuteFilterDialog_Impl( const OUString& aFilterName ); sal_Int8 CheckSaveAcceptable( sal_Int8 nCurStatus ); sal_Int8 CheckStateForSave(); - sal_Int8 CheckFilter( const ::rtl::OUString& ); + sal_Int8 CheckFilter( const OUString& ); sal_Bool CheckFilterOptionsDialogExistence(); sal_Bool OutputFileDialog( sal_Int8 nStoreMode, const ::comphelper::SequenceAsHashMap& aPreselectedFilterPropsHM, sal_Bool bSetStandardName, - ::rtl::OUString& aSuggestedName, + OUString& aSuggestedName, sal_Bool bPreselectPassword, - ::rtl::OUString& aSuggestedDir, + OUString& aSuggestedDir, sal_Int16 nDialog, - const ::rtl::OUString& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList + const OUString& rStandardDir, + const ::com::sun::star::uno::Sequence< OUString >& rBlackList ); sal_Bool ShowDocumentInfoDialog(); - ::rtl::OUString GetRecommendedDir( const ::rtl::OUString& aSuggestedDir ); - ::rtl::OUString GetRecommendedName( const ::rtl::OUString& aSuggestedName, - const ::rtl::OUString& aTypeName ); + OUString GetRecommendedDir( const OUString& aSuggestedDir ); + OUString GetRecommendedName( const OUString& aSuggestedName, + const OUString& aTypeName ); }; @@ -331,7 +331,7 @@ ModelData_Impl::ModelData_Impl( SfxStoringHelper& aOwner, , m_bRecommendReadOnly( sal_False ) { CheckInteractionHandler(); - rtl::OUString sModuleName; + OUString sModuleName; try { uno::Reference< lang::XComponent > xCurrentComponent = frame::Desktop::create( comphelper::getProcessComponentContext() )->getCurrentComponent(); @@ -435,7 +435,7 @@ const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetDocProps() } //------------------------------------------------------------------------- -::rtl::OUString ModelData_Impl::GetModuleName() +OUString ModelData_Impl::GetModuleName() { if ( m_aModuleName.isEmpty() ) { @@ -463,21 +463,21 @@ const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetModuleProps() } //------------------------------------------------------------------------- -::rtl::OUString ModelData_Impl::GetDocServiceName() +OUString ModelData_Impl::GetDocServiceName() { - return GetModuleProps().getUnpackedValueOrDefault(::rtl::OUString("ooSetupFactoryDocumentService"), ::rtl::OUString()); + return GetModuleProps().getUnpackedValueOrDefault(OUString("ooSetupFactoryDocumentService"), OUString()); } //------------------------------------------------------------------------- void ModelData_Impl::CheckInteractionHandler() { ::comphelper::SequenceAsHashMap::const_iterator aInteractIter = - m_aMediaDescrHM.find( ::rtl::OUString("InteractionHandler") ); + m_aMediaDescrHM.find( OUString("InteractionHandler") ); if ( aInteractIter == m_aMediaDescrHM.end() ) { try { - m_aMediaDescrHM[ ::rtl::OUString("InteractionHandler") ] + m_aMediaDescrHM[ OUString("InteractionHandler") ] <<= task::InteractionHandler::createWithParent( comphelper::getProcessComponentContext(), 0); } catch( const uno::Exception& ) @@ -496,9 +496,9 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter { uno::Sequence< beans::PropertyValue > aProps; - ::rtl::OUString aFilterName = GetModuleProps().getUnpackedValueOrDefault( - ::rtl::OUString("ooSetupFactoryDefaultFilter"), - ::rtl::OUString() ); + OUString aFilterName = GetModuleProps().getUnpackedValueOrDefault( + OUString("ooSetupFactoryDefaultFilter"), + OUString() ); m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aProps; @@ -514,7 +514,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter if ( aProps.getLength() ) { ::comphelper::SequenceAsHashMap aFiltHM( aProps ); - sal_Int32 nFlags = aFiltHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), + sal_Int32 nFlags = aFiltHM.getUnpackedValueOrDefault( OUString("Flags"), (sal_Int32)0 ); if ( ( ( nFlags & nMust ) == nMust ) && !( nFlags & nDont ) ) aFilterProps = aProps; @@ -528,7 +528,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( sal_Int32 nMust, sal_Int32 nDont ) { uno::Sequence< beans::NamedValue > aSearchRequest( 1 ); - aSearchRequest[0].Name = ::rtl::OUString("DocumentService"); + aSearchRequest[0].Name = OUString("DocumentService"); aSearchRequest[0].Value <<= GetDocServiceName(); return ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); @@ -546,9 +546,9 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( { // Preselect PDF-Filter for EXPORT uno::Sequence< beans::NamedValue > aSearchRequest( 2 ); - aSearchRequest[0].Name = ::rtl::OUString("Type"); - aSearchRequest[0].Value <<= ::rtl::OUString("pdf_Portable_Document_Format"); - aSearchRequest[1].Name = ::rtl::OUString("DocumentService"); + aSearchRequest[0].Name = OUString("Type"); + aSearchRequest[0].Value <<= OUString("pdf_Portable_Document_Format"); + aSearchRequest[1].Name = OUString("DocumentService"); aSearchRequest[1].Value <<= GetDocServiceName(); aFilterProps = ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont ); @@ -568,7 +568,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( } //------------------------------------------------------------------------- -sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const ::rtl::OUString& aFilterName ) +sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName ) { sal_Bool bDialogUsed = sal_False; @@ -581,7 +581,7 @@ sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const ::rtl::OUString& aFilte for( sal_Int32 nProperty=0; nProperty < nPropertyCount; ++nProperty ) if( aProps[nProperty].Name == "UIComponent" ) { - ::rtl::OUString aServiceName; + OUString aServiceName; aProps[nProperty].Value >>= aServiceName; if( !aServiceName.isEmpty() ) { @@ -611,7 +611,7 @@ sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const ::rtl::OUString& aFilte } else { - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); } @@ -625,7 +625,7 @@ sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const ::rtl::OUString& aFilte catch( const container::NoSuchElementException& ) { // the filter name is unknown - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER ); } @@ -652,7 +652,7 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus ) // it is done only for documents that have persistence already uno::Reference< uno::XInterface > xCommonConfig = ::comphelper::ConfigurationHelper::openConfig( comphelper::getProcessComponentContext(), - ::rtl::OUString( "/org.openoffice.Office.Common" ), + OUString( "/org.openoffice.Office.Common" ), ::comphelper::ConfigurationHelper::E_STANDARD ); if ( !xCommonConfig.is() ) throw uno::RuntimeException(); // should the saving proceed as usual instead? @@ -664,11 +664,11 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus ) // the saving is acceptable // in case the configuration entry is not set or set to false // or in case of version creation - ::rtl::OUString aVersionCommentString = ::rtl::OUString("VersionComment"); + OUString aVersionCommentString = OUString("VersionComment"); if ( ( ::comphelper::ConfigurationHelper::readRelativeKey( xCommonConfig, - ::rtl::OUString( "Save/Document/" ), - ::rtl::OUString( "AlwaysSaveAs" ) ) >>= bAlwaysSaveAs ) + OUString( "Save/Document/" ), + OUString( "AlwaysSaveAs" ) ) >>= bAlwaysSaveAs ) && bAlwaysSaveAs && GetMediaDescr().find( aVersionCommentString ) == GetMediaDescr().end() ) { @@ -701,11 +701,11 @@ sal_Int8 ModelData_Impl::CheckStateForSave() sal_Bool bVersInfoNeedsStore = sal_False; ::comphelper::SequenceAsHashMap aAcceptedArgs; - ::rtl::OUString aVersionCommentString("VersionComment"); - ::rtl::OUString aAuthorString("Author"); - ::rtl::OUString aInteractionHandlerString("InteractionHandler"); - ::rtl::OUString aStatusIndicatorString("StatusIndicator"); - ::rtl::OUString aFailOnWarningString("FailOnWarning"); + OUString aVersionCommentString("VersionComment"); + OUString aAuthorString("Author"); + OUString aInteractionHandlerString("InteractionHandler"); + OUString aStatusIndicatorString("StatusIndicator"); + OUString aFailOnWarningString("FailOnWarning"); if ( GetMediaDescr().find( aVersionCommentString ) != GetMediaDescr().end() ) { @@ -737,9 +737,9 @@ sal_Int8 ModelData_Impl::CheckStateForSave() } // check that the old filter is acceptable - ::rtl::OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( - rtl::OUString(aFilterNameString), - ::rtl::OUString() ); + OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( + OUString(aFilterNameString), + OUString() ); sal_Int8 nResult = CheckFilter( aOldFilterName ); return nResult; @@ -758,7 +758,7 @@ sal_Bool hasMacros( const uno::Reference< frame::XModel >& xModel ) return bHasMacros; } -sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) +sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName ) { ::comphelper::SequenceAsHashMap aFiltPropsHM; sal_Int32 nFiltFlags = 0; @@ -770,13 +770,13 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps; aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps ); - nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), (sal_Int32)0 ); + nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( OUString("Flags"), (sal_Int32)0 ); } // only a temporary solution until default filter retrieving feature is implemented // then GetDocServiceDefaultFilter() must be used ::comphelper::SequenceAsHashMap aDefFiltPropsHM = GetDocServiceDefaultFilterCheckFlags( 3, 0 ); - sal_Int32 nDefFiltFlags = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), (sal_Int32)0 ); + sal_Int32 nDefFiltFlags = aDefFiltPropsHM.getUnpackedValueOrDefault( OUString("Flags"), (sal_Int32)0 ); // if the old filter is not acceptable // and there is no default filter or it is not acceptable for requested parameters then proceed with saveAs @@ -796,13 +796,13 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) { // the default filter is acceptable and the old filter is alian one // so ask to make a saveAs operation - ::rtl::OUString aUIName = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("UIName"), - ::rtl::OUString() ); - ::rtl::OUString aDefUIName = aDefFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("UIName"), - ::rtl::OUString() ); - ::rtl::OUString aPreusedFilterName = GetDocProps().getUnpackedValueOrDefault( - ::rtl::OUString("PreusedFilterName"), - ::rtl::OUString() ); + OUString aUIName = aFiltPropsHM.getUnpackedValueOrDefault( OUString("UIName"), + OUString() ); + OUString aDefUIName = aDefFiltPropsHM.getUnpackedValueOrDefault( OUString("UIName"), + OUString() ); + OUString aPreusedFilterName = GetDocProps().getUnpackedValueOrDefault( + OUString("PreusedFilterName"), + OUString() ); if ( !aPreusedFilterName.equals( aFilterName ) && !aUIName.equals( aDefUIName ) ) { // is it possible to get these names from somewhere and not just @@ -852,7 +852,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const ::rtl::OUString& aFilterName ) sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() { uno::Sequence< beans::NamedValue > aSearchRequest( 1 ); - aSearchRequest[0].Name = ::rtl::OUString("DocumentService"); + aSearchRequest[0].Name = OUString("DocumentService"); aSearchRequest[0].Value <<= GetDocServiceName(); uno::Reference< container::XEnumeration > xFilterEnum = @@ -864,9 +864,9 @@ sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() if ( xFilterEnum->nextElement() >>= pProps ) { ::comphelper::SequenceAsHashMap aPropsHM( pProps ); - ::rtl::OUString aUIServName = aPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("UIComponent"), - ::rtl::OUString() ); + OUString aUIServName = aPropsHM.getUnpackedValueOrDefault( + OUString("UIComponent"), + OUString() ); if ( !aUIServName.isEmpty() ) return sal_True; } @@ -879,21 +879,21 @@ sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, const ::comphelper::SequenceAsHashMap& aPreselectedFilterPropsHM, sal_Bool bSetStandardName, - ::rtl::OUString& aSuggestedName, + OUString& aSuggestedName, sal_Bool bPreselectPassword, - ::rtl::OUString& aSuggestedDir, + OUString& aSuggestedDir, sal_Int16 nDialog, - const ::rtl::OUString& rStandardDir, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rBlackList) + const OUString& rStandardDir, + const ::com::sun::star::uno::Sequence< OUString >& rBlackList) { sal_Bool bUseFilterOptions = sal_False; ::comphelper::SequenceAsHashMap::const_iterator aOverwriteIter = - GetMediaDescr().find( ::rtl::OUString("Overwrite") ); + GetMediaDescr().find( OUString("Overwrite") ); // the file name must be specified if overwrite option is set if ( aOverwriteIter != GetMediaDescr().end() ) - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER ); @@ -934,7 +934,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, boost::scoped_ptr<sfx2::FileDialogHelper> pFileDlg; - ::rtl::OUString aDocServiceName = GetDocServiceName(); + OUString aDocServiceName = GetDocServiceName(); DBG_ASSERT( !aDocServiceName.isEmpty(), "No document service for this module set!" ); sal_Int32 nMust = getMustFlags( nStoreMode ); @@ -947,11 +947,11 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, { // this is a PDF export // the filter options has been shown already - ::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("UIName"), - ::rtl::OUString() ); + OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( + OUString("UIName"), + OUString() ); - pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, ::rtl::OUString( "pdf" ), rStandardDir, rBlackList )); + pFileDlg.reset(new sfx2::FileDialogHelper( aDialogMode, aDialogFlags, aFilterUIName, OUString( "pdf" ), rStandardDir, rBlackList )); pFileDlg->SetCurrentFilter( aFilterUIName ); } else @@ -978,7 +978,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, if ( xControlAccess.is() ) { - ::rtl::OUString aCtrlText = SfxResId(STR_EXPORTBUTTON).toString(); + OUString aCtrlText = SfxResId(STR_EXPORTBUTTON).toString(); xControlAccess->setLabel( ui::dialogs::CommonFilePickerElementIds::PUSHBUTTON_OK, aCtrlText ); aCtrlText = SfxResId(STR_LABEL_FILEFORMAT).toString(); @@ -992,62 +992,62 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, pFileDlg->CreateMatcher( aDocServiceName ); } - ::rtl::OUString aAdjustToType; + OUString aAdjustToType; - const ::rtl::OUString sFilterNameString(aFilterNameString); + const OUString sFilterNameString(aFilterNameString); if ( ( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode & WIDEEXPORT_REQUESTED ) ) { // it is export, set the preselected filter - ::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("UIName"), - ::rtl::OUString() ); + OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( + OUString("UIName"), + OUString() ); pFileDlg->SetCurrentFilter( aFilterUIName ); } // it is no export, bSetStandardName == true means that user agreed to store document in the default (default default ;-)) format else if ( bSetStandardName || GetStorable()->hasLocation() ) { uno::Sequence< beans::PropertyValue > aOldFilterProps; - ::rtl::OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( + OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( sFilterNameString, - ::rtl::OUString() ); + OUString() ); if ( !aOldFilterName.isEmpty() ) m_pOwner->GetFilterConfiguration()->getByName( aOldFilterName ) >>= aOldFilterProps; ::comphelper::SequenceAsHashMap aOldFiltPropsHM( aOldFilterProps ); - sal_Int32 nOldFiltFlags = aOldFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), (sal_Int32)0 ); + sal_Int32 nOldFiltFlags = aOldFiltPropsHM.getUnpackedValueOrDefault( OUString("Flags"), (sal_Int32)0 ); if ( bSetStandardName || ( nOldFiltFlags & nMust ) != nMust || nOldFiltFlags & nDont ) { // the suggested type will be changed, the extension should be adjusted aAdjustToType = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Type"), - ::rtl::OUString() ); + OUString("Type"), + OUString() ); - ::rtl::OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("UIName"), - ::rtl::OUString() ); + OUString aFilterUIName = aPreselectedFilterPropsHM.getUnpackedValueOrDefault( + OUString("UIName"), + OUString() ); pFileDlg->SetCurrentFilter( aFilterUIName ); } else { pFileDlg->SetCurrentFilter( aOldFiltPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("UIName"), - ::rtl::OUString() ) ); + OUString("UIName"), + OUString() ) ); } } - ::rtl::OUString aRecommendedDir = GetRecommendedDir( aSuggestedDir ); + OUString aRecommendedDir = GetRecommendedDir( aSuggestedDir ); if ( !aRecommendedDir.isEmpty() ) pFileDlg->SetDisplayFolder( aRecommendedDir ); - ::rtl::OUString aRecommendedName = GetRecommendedName( aSuggestedName, aAdjustToType ); + OUString aRecommendedName = GetRecommendedName( aSuggestedName, aAdjustToType ); if ( !aRecommendedName.isEmpty() ) pFileDlg->SetFileName( aRecommendedName ); uno::Reference < view::XSelectionSupplier > xSel( GetModel()->getCurrentController(), uno::UNO_QUERY ); if ( xSel.is() && xSel->getSelection().hasValue() ) - GetMediaDescr()[::rtl::OUString("SelectionOnly")] <<= sal_True; + GetMediaDescr()[OUString("SelectionOnly")] <<= sal_True; // This is a temporary hardcoded solution must be removed when // dialogs do not need parameters in SidSet representation any more @@ -1076,10 +1076,10 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, String aStringTypeFN; if ( pFileDlg->Execute( pDialogParams, aStringTypeFN ) != ERRCODE_NONE ) { - throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); } - ::rtl::OUString aFilterName = aStringTypeFN; + OUString aFilterName = aStringTypeFN; // the following two arguments can not be converted in MediaDescriptor, // so they should be removed from the ItemSet after retrieving @@ -1099,15 +1099,15 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, // old filter options should be cleared in case different filter is used - ::rtl::OUString aFilterFromMediaDescr = GetMediaDescr().getUnpackedValueOrDefault( + OUString aFilterFromMediaDescr = GetMediaDescr().getUnpackedValueOrDefault( sFilterNameString, - ::rtl::OUString() ); - ::rtl::OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( + OUString() ); + OUString aOldFilterName = GetDocProps().getUnpackedValueOrDefault( sFilterNameString, - ::rtl::OUString() ); + OUString() ); - const ::rtl::OUString sFilterOptionsString(aFilterOptionsString); - const ::rtl::OUString sFilterDataString(aFilterDataString); + const OUString sFilterOptionsString(aFilterOptionsString); + const OUString sFilterDataString(aFilterDataString); if ( aFilterName.equals( aFilterFromMediaDescr ) ) { @@ -1176,8 +1176,8 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, } // merge in results of the dialog execution - GetMediaDescr()[::rtl::OUString("URL")] <<= - ::rtl::OUString( aURL.GetMainURL( INetURLObject::NO_DECODE )); + GetMediaDescr()[OUString("URL")] <<= + OUString( aURL.GetMainURL( INetURLObject::NO_DECODE )); GetMediaDescr()[sFilterNameString] <<= aFilterName; return bUseFilterOptions; @@ -1196,14 +1196,14 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() if ( xFrameDispatch.is() ) { util::URL aURL; - aURL.Complete = ::rtl::OUString(".uno:SetDocumentProperties"); + aURL.Complete = OUString(".uno:SetDocumentProperties"); uno::Reference < util::XURLTransformer > xTransformer( util::URLTransformer::create( comphelper::getProcessComponentContext() ) ); if ( xTransformer->parseStrict( aURL ) ) { uno::Reference< frame::XDispatch > xDispatch = xFrameDispatch->queryDispatch( aURL, - ::rtl::OUString("_self"), + OUString("_self"), 0 ); if ( xDispatch.is() ) { @@ -1222,12 +1222,12 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() } //------------------------------------------------------------------------- -::rtl::OUString ModelData_Impl::GetRecommendedDir( const ::rtl::OUString& aSuggestedDir ) +OUString ModelData_Impl::GetRecommendedDir( const OUString& aSuggestedDir ) { - ::rtl::OUString aRecommendedDir; + OUString aRecommendedDir; if ( ( !aSuggestedDir.isEmpty() || GetStorable()->hasLocation() ) - && !GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString("RepairPackage"), + && !GetMediaDescr().getUnpackedValueOrDefault( OUString("RepairPackage"), sal_False ) ) { INetURLObject aLocation; @@ -1235,7 +1235,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() aLocation = INetURLObject( aSuggestedDir ); else { - ::rtl::OUString aOldURL = GetStorable()->getLocation(); + OUString aOldURL = GetStorable()->getLocation(); if ( !aOldURL.isEmpty() ) { INetURLObject aTmp( aOldURL ); @@ -1260,10 +1260,10 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() } //------------------------------------------------------------------------- -::rtl::OUString ModelData_Impl::GetRecommendedName( const ::rtl::OUString& aSuggestedName, const ::rtl::OUString& aTypeName ) +OUString ModelData_Impl::GetRecommendedName( const OUString& aSuggestedName, const OUString& aTypeName ) { // the last used name might be provided by aSuggestedName from the old selection, or from the MediaDescriptor - ::rtl::OUString aRecommendedName; + OUString aRecommendedName; if ( !aSuggestedName.isEmpty() ) aRecommendedName = aSuggestedName; @@ -1282,19 +1282,19 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() { // adjust the extension to the type uno::Reference< container::XNameAccess > xTypeDetection = uno::Reference< container::XNameAccess >( - comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.document.TypeDetection") ), + comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.document.TypeDetection") ), uno::UNO_QUERY ); if ( xTypeDetection.is() ) { - INetURLObject aObj( ::rtl::OUString( "file:///c:/" ) + aRecommendedName ); + INetURLObject aObj( OUString( "file:///c:/" ) + aRecommendedName ); uno::Sequence< beans::PropertyValue > aTypeNameProps; if ( ( xTypeDetection->getByName( aTypeName ) >>= aTypeNameProps ) && aTypeNameProps.getLength() ) { ::comphelper::SequenceAsHashMap aTypeNamePropsHM( aTypeNameProps ); - uno::Sequence< ::rtl::OUString > aExtensions = aTypeNamePropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Extensions"), - ::uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString > aExtensions = aTypeNamePropsHM.getUnpackedValueOrDefault( + OUString("Extensions"), + ::uno::Sequence< OUString >() ); if ( aExtensions.getLength() ) aObj.SetExtension( aExtensions[0] ); } @@ -1322,7 +1322,7 @@ uno::Reference< container::XNameAccess > SfxStoringHelper::GetFilterConfiguratio if ( !m_xFilterCFG.is() ) { m_xFilterCFG = uno::Reference< container::XNameAccess >( - comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString("com.sun.star.document.FilterFactory") ), + comphelper::getProcessServiceFactory()->createInstance( OUString("com.sun.star.document.FilterFactory") ), uno::UNO_QUERY ); if ( !m_xFilterCFG.is() ) @@ -1359,10 +1359,10 @@ uno::Reference< ::com::sun::star::frame::XModuleManager2 > SfxStoringHelper::Get //------------------------------------------------------------------------- sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel, - const ::rtl::OUString& aSlotName, + const OUString& aSlotName, uno::Sequence< beans::PropertyValue >& aArgsSequence, sal_Bool bPreselectPassword, - ::rtl::OUString aSuggestedName, + OUString aSuggestedName, sal_uInt16 nDocumentSignatureState ) { ModelData_Impl aModelData( *this, xModel, aArgsSequence ); @@ -1381,7 +1381,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel if ( nStoreMode & SAVEAS_REQUESTED ) { ::comphelper::SequenceAsHashMap::const_iterator aSaveToIter = - aModelData.GetMediaDescr().find( ::rtl::OUString("SaveTo") ); + aModelData.GetMediaDescr().find( OUString("SaveTo") ); if ( aSaveToIter != aModelData.GetMediaDescr().end() ) { sal_Bool bWideExport = sal_False; @@ -1392,7 +1392,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel // if saving is not acceptable the warning must be shown even in case of SaveAs operation if ( ( nStoreMode & SAVEAS_REQUESTED ) && aModelData.CheckSaveAcceptable( STATUS_SAVEAS ) == STATUS_NO_ACTION ) - throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); } else if ( nStoreMode & SAVE_REQUESTED ) { @@ -1400,7 +1400,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel nStatusSave = aModelData.CheckSaveAcceptable( STATUS_SAVE ); if ( nStatusSave == STATUS_NO_ACTION ) - throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); else if ( nStatusSave == STATUS_SAVE ) { // check whether it is possible to use save operation @@ -1409,7 +1409,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel if ( nStatusSave == STATUS_NO_ACTION ) { - throw task::ErrorCodeIOException( ::rtl::OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); } else if ( nStatusSave != STATUS_SAVE ) { @@ -1431,7 +1431,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel if ( QueryBox( NULL, SfxResId( RID_XMLSEC_QUERY_LOSINGSIGNATURE ) ).Execute() != RET_YES ) { // the user has decided not to store the document - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); } @@ -1469,30 +1469,30 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel DBG_ASSERT( aFilterProps.getLength(), "No filter for storing!\n" ); if ( !aFilterProps.getLength() ) - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER ); ::comphelper::SequenceAsHashMap aFilterPropsHM( aFilterProps ); - ::rtl::OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Name"), - ::rtl::OUString() ); + OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( + OUString("Name"), + OUString() ); - const ::rtl::OUString sFilterNameString(aFilterNameString); + const OUString sFilterNameString(aFilterNameString); - ::rtl::OUString aFilterFromMediaDescr = aModelData.GetMediaDescr().getUnpackedValueOrDefault( + OUString aFilterFromMediaDescr = aModelData.GetMediaDescr().getUnpackedValueOrDefault( sFilterNameString, - ::rtl::OUString() ); - ::rtl::OUString aOldFilterName = aModelData.GetDocProps().getUnpackedValueOrDefault( + OUString() ); + OUString aOldFilterName = aModelData.GetDocProps().getUnpackedValueOrDefault( sFilterNameString, - ::rtl::OUString() ); + OUString() ); sal_Bool bUseFilterOptions = sal_False; - ::comphelper::SequenceAsHashMap::const_iterator aFileNameIter = aModelData.GetMediaDescr().find( ::rtl::OUString("URL") ); + ::comphelper::SequenceAsHashMap::const_iterator aFileNameIter = aModelData.GetMediaDescr().find( OUString("URL") ); - const ::rtl::OUString sFilterOptionsString(aFilterOptionsString); - const ::rtl::OUString sFilterDataString(aFilterDataString); - const ::rtl::OUString sFilterFlagsString(aFilterFlagsString); + const OUString sFilterOptionsString(aFilterOptionsString); + const OUString sFilterDataString(aFilterDataString); + const OUString sFilterFlagsString(aFilterFlagsString); if ( ( nStoreMode & EXPORT_REQUESTED ) && ( nStoreMode & PDFEXPORT_REQUESTED ) && !( nStoreMode & PDFDIRECTEXPORT_REQUESTED ) ) { @@ -1512,7 +1512,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel { sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG; ::comphelper::SequenceAsHashMap::const_iterator aDlgIter = - aModelData.GetMediaDescr().find( ::rtl::OUString("UseSystemDialog") ); + aModelData.GetMediaDescr().find( OUString("UseSystemDialog") ); if ( aDlgIter != aModelData.GetMediaDescr().end() ) { sal_Bool bUseSystemDialog = sal_True; @@ -1526,28 +1526,28 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel } // The Dispatch supports parameter FolderName that overwrites SuggestedSaveAsDir - ::rtl::OUString aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString( "FolderName" ), ::rtl::OUString() ); + OUString aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( OUString( "FolderName" ), OUString() ); if ( aSuggestedDir.isEmpty() ) { - aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString( "SuggestedSaveAsDir" ), ::rtl::OUString() ); + aSuggestedDir = aModelData.GetMediaDescr().getUnpackedValueOrDefault( OUString( "SuggestedSaveAsDir" ), OUString() ); if ( aSuggestedDir.isEmpty() ) - aSuggestedDir = aModelData.GetDocProps().getUnpackedValueOrDefault( ::rtl::OUString( "SuggestedSaveAsDir" ), ::rtl::OUString() ); + aSuggestedDir = aModelData.GetDocProps().getUnpackedValueOrDefault( OUString( "SuggestedSaveAsDir" ), OUString() ); } - aSuggestedName = aModelData.GetMediaDescr().getUnpackedValueOrDefault( ::rtl::OUString( "SuggestedSaveAsName" ), ::rtl::OUString() ); + aSuggestedName = aModelData.GetMediaDescr().getUnpackedValueOrDefault( OUString( "SuggestedSaveAsName" ), OUString() ); if ( aSuggestedName.isEmpty() ) - aSuggestedName = aModelData.GetDocProps().getUnpackedValueOrDefault( ::rtl::OUString( "SuggestedSaveAsName" ), ::rtl::OUString() ); + aSuggestedName = aModelData.GetDocProps().getUnpackedValueOrDefault( OUString( "SuggestedSaveAsName" ), OUString() ); - ::rtl::OUString sStandardDir; + OUString sStandardDir; ::comphelper::SequenceAsHashMap::const_iterator aStdDirIter = - aModelData.GetMediaDescr().find( ::rtl::OUString("StandardDir") ); + aModelData.GetMediaDescr().find( OUString("StandardDir") ); if ( aStdDirIter != aModelData.GetMediaDescr().end() ) aStdDirIter->second >>= sStandardDir; - ::com::sun::star::uno::Sequence< ::rtl::OUString > aBlackList; + ::com::sun::star::uno::Sequence< OUString > aBlackList; ::comphelper::SequenceAsHashMap::const_iterator aBlackListIter = - aModelData.GetMediaDescr().find( ::rtl::OUString("BlackList") ); + aModelData.GetMediaDescr().find( OUString("BlackList") ); if ( aBlackListIter != aModelData.GetMediaDescr().end() ) aBlackListIter->second >>= aBlackList; @@ -1559,9 +1559,9 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel if ( nStoreMode == SAVEAS_REQUESTED ) { // in case of saving check filter for possible alien warning - ::rtl::OUString aSelFilterName = aModelData.GetMediaDescr().getUnpackedValueOrDefault( + OUString aSelFilterName = aModelData.GetMediaDescr().getUnpackedValueOrDefault( sFilterNameString, - ::rtl::OUString() ); + OUString() ); sal_Int8 nStatusFilterSave = aModelData.CheckFilter( aSelFilterName ); if ( nStatusFilterSave == STATUS_SAVEAS_STANDARDNAME ) { @@ -1579,7 +1579,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel } bDialogUsed = sal_True; - aFileNameIter = aModelData.GetMediaDescr().find( ::rtl::OUString("URL") ); + aFileNameIter = aModelData.GetMediaDescr().find( OUString("URL") ); } else { @@ -1602,7 +1602,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel if ( aFileNameIter != aModelData.GetMediaDescr().end() ) { - ::rtl::OUString aFileName; + OUString aFileName; aFileNameIter->second >>= aFileName; aURL.SetURL( aFileName ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "Illegal URL!" ); @@ -1620,13 +1620,13 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel else { DBG_ASSERT( sal_False, "This code must be unreachable!\n" ); - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER ); } ::comphelper::SequenceAsHashMap::const_iterator aIter = - aModelData.GetMediaDescr().find( ::rtl::OUString("FilterFlags") ); + aModelData.GetMediaDescr().find( OUString("FilterFlags") ); sal_Bool bFilterFlagsSet = ( aIter != aModelData.GetMediaDescr().end() ); if( !( nStoreMode & PDFEXPORT_REQUESTED ) && !bFilterFlagsSet @@ -1645,7 +1645,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel DocumentSettingsGuard aSettingsGuard( aModelData.GetModel(), aModelData.IsRecommendReadOnly(), nStoreMode & EXPORT_REQUESTED ); - OSL_ENSURE( aModelData.GetMediaDescr().find( ::rtl::OUString( "Password" ) ) == aModelData.GetMediaDescr().end(), "The Password property of MediaDescriptor should not be used here!" ); + OSL_ENSURE( aModelData.GetMediaDescr().find( OUString( "Password" ) ) == aModelData.GetMediaDescr().end(), "The Password property of MediaDescriptor should not be used here!" ); if ( aOptions.IsDocInfoSave() && ( !aModelData.GetStorable()->hasLocation() || INetURLObject( aModelData.GetStorable()->getLocation() ) != aURL ) ) @@ -1711,7 +1711,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel // static sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence( const uno::Reference< container::XNameAccess >& xFilterCFG, - const ::rtl::OUString& aFilterName ) + const OUString& aFilterName ) { sal_Bool bUseFilterOptions = sal_False; @@ -1724,9 +1724,9 @@ sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence( if ( aAny >>= aProps ) { ::comphelper::SequenceAsHashMap aPropsHM( aProps ); - ::rtl::OUString aServiceName = aPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("UIComponent"), - ::rtl::OUString() ); + OUString aServiceName = aPropsHM.getUnpackedValueOrDefault( + OUString("UIComponent"), + OUString() ); if( !aServiceName.isEmpty() ) bUseFilterOptions = sal_True; } @@ -1822,8 +1822,8 @@ void SfxStoringHelper::SetDocInfoState( //------------------------------------------------------------------------- // static sal_Bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame::XModel >& xModel, - ::rtl::OUString aOldUIName, - ::rtl::OUString /*aDefUIName*/, + OUString aOldUIName, + OUString /*aDefUIName*/, sal_Bool /*bCanProceedFurther*/ ) { if ( !SvtSaveOptions().IsWarnAlienFormat() ) diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 757c2a089030..a93d5bc301dc 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -85,8 +85,8 @@ const SfxItemPropertyMapEntry* lcl_GetIFramePropertyMap_Impl() { MAP_CHAR_LEN("FrameIsScrollingMode"), WID_FRAME_IS_SCROLLING_MODE, &::getBooleanCppuType(), PROPERTY_UNBOUND, 0 }, { MAP_CHAR_LEN("FrameMarginHeight"), WID_FRAME_MARGIN_HEIGHT, &::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 }, { MAP_CHAR_LEN("FrameMarginWidth"), WID_FRAME_MARGIN_WIDTH, &::getCppuType( (sal_Int32*)0 ), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("FrameName"), WID_FRAME_NAME, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("FrameURL"), WID_FRAME_URL, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("FrameName"), WID_FRAME_NAME, &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("FrameURL"), WID_FRAME_URL, &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, {0,0,0,0,0,0} }; return aIFramePropertyMap_Impl; @@ -144,7 +144,7 @@ throw( uno::RuntimeException ) uno::Reference< frame::XDispatchProvider > xProv( mxFrame, uno::UNO_QUERY ); util::URL aTargetURL; - aTargetURL.Complete = ::rtl::OUString( maFrmDescr.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ); + aTargetURL.Complete = OUString( maFrmDescr.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ); uno::Reference < util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getComponentContext(mxFact) ) ); xTrans->parseStrict( aTargetURL ); @@ -200,7 +200,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL IFrameObject::getPropertySetI return xInfo; } -void SAL_CALL IFrameObject::setPropertyValue(const ::rtl::OUString& aPropertyName, const uno::Any& aAny) +void SAL_CALL IFrameObject::setPropertyValue(const OUString& aPropertyName, const uno::Any& aAny) throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName ); @@ -210,14 +210,14 @@ void SAL_CALL IFrameObject::setPropertyValue(const ::rtl::OUString& aPropertyNam { case WID_FRAME_URL: { - ::rtl::OUString aURL; + OUString aURL; aAny >>= aURL; maFrmDescr.SetURL( String(aURL) ); } break; case WID_FRAME_NAME: { - ::rtl::OUString aName; + OUString aName; if ( aAny >>= aName ) maFrmDescr.SetName( aName ); } @@ -281,7 +281,7 @@ void SAL_CALL IFrameObject::setPropertyValue(const ::rtl::OUString& aPropertyNam } } -uno::Any SAL_CALL IFrameObject::getPropertyValue(const ::rtl::OUString& aPropertyName) +uno::Any SAL_CALL IFrameObject::getPropertyValue(const OUString& aPropertyName) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName ); @@ -292,12 +292,12 @@ uno::Any SAL_CALL IFrameObject::getPropertyValue(const ::rtl::OUString& aPropert { case WID_FRAME_URL: { - aAny <<= ::rtl::OUString( maFrmDescr.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ); + aAny <<= OUString( maFrmDescr.GetURL().GetMainURL( INetURLObject::NO_DECODE ) ); } break; case WID_FRAME_NAME: { - aAny <<= ::rtl::OUString( maFrmDescr.GetName() ); + aAny <<= OUString( maFrmDescr.GetName() ); } break; case WID_FRAME_IS_AUTO_SCROLL: @@ -338,19 +338,19 @@ uno::Any SAL_CALL IFrameObject::getPropertyValue(const ::rtl::OUString& aPropert return aAny; } -void SAL_CALL IFrameObject::addPropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::addPropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } -void SAL_CALL IFrameObject::removePropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::removePropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } -void SAL_CALL IFrameObject::addVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::addVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } -void SAL_CALL IFrameObject::removeVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL IFrameObject::removeVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } @@ -363,7 +363,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const ::rtl::OUString&, return 0; } -void SAL_CALL IFrameObject::setTitle( const ::rtl::OUString& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL IFrameObject::setTitle( const OUString& ) throw (::com::sun::star::uno::RuntimeException) { } diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index e0de9eec5799..cb25ce948373 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -227,7 +227,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update) { // temp. fix until Templates are managed by UCB compatible service // does NOT work with locally cached components ! - rtl::OUString aTemp; + OUString aTemp; utl::LocalFileHelper::ConvertPhysicalNameToURL( aFileName, aTemp ); aFileName = aTemp; } diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 950e669c101d..e6722b7f9af1 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -181,7 +181,7 @@ void SfxObjectShell::UpdateDocInfoForSave() if ( SvtSecurityOptions().IsOptionSet( SvtSecurityOptions::E_DOCWARN_REMOVEPERSONALINFO ) ) { - xDocProps->resetUserData( ::rtl::OUString() ); + xDocProps->resetUserData( OUString() ); } else if ( IsModified() ) { @@ -190,11 +190,11 @@ void SfxObjectShell::UpdateDocInfoForSave() { // remove all data pointing to the current user if (xDocProps->getAuthor().equals(aUserName)) { - xDocProps->setAuthor( ::rtl::OUString() ); + xDocProps->setAuthor( OUString() ); } - xDocProps->setModifiedBy( ::rtl::OUString() ); + xDocProps->setModifiedBy( OUString() ); if (xDocProps->getPrintedBy().equals(aUserName)) { - xDocProps->setPrintedBy( ::rtl::OUString() ); + xDocProps->setPrintedBy( OUString() ); } } else @@ -693,8 +693,8 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) // created from template? uno::Reference<document::XDocumentProperties> xDocProps(getDocProperties()); - ::rtl::OUString aTemplName( xDocProps->getTemplateName() ); - ::rtl::OUString aTemplURL( xDocProps->getTemplateURL() ); + OUString aTemplName( xDocProps->getTemplateName() ); + OUString aTemplURL( xDocProps->getTemplateURL() ); String aFoundName; if ( !aTemplName.isEmpty() || (!aTemplURL.isEmpty() && !IsReadOnly()) ) @@ -762,7 +762,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) else if ( bCanUpdateFromTemplate == document::UpdateDocMode::ACCORDING_TO_CONFIG ) { String sMessage( SfxResId(STR_QRYTEMPL_MESSAGE).toString() ); - sMessage.SearchAndReplace( rtl::OUString("$(ARG1)"), aTemplName ); + sMessage.SearchAndReplace( OUString("$(ARG1)"), aTemplName ); sfx2::QueryTemplateBox aBox( GetDialogParent(), sMessage ); if ( RET_YES == aBox.Execute() ) bLoad = sal_True; @@ -816,10 +816,10 @@ void SfxObjectShell::ResetFromTemplate( const String& rTemplateName, const Strin if ( IsOwnStorageFormat_Impl( *GetMedium()) ) { uno::Reference<document::XDocumentProperties> xDocProps(getDocProperties()); - xDocProps->setTemplateURL( ::rtl::OUString() ); - xDocProps->setTemplateName( ::rtl::OUString() ); + xDocProps->setTemplateURL( OUString() ); + xDocProps->setTemplateName( OUString() ); xDocProps->setTemplateDate( util::DateTime() ); - xDocProps->resetUserData( ::rtl::OUString() ); + xDocProps->resetUserData( OUString() ); // TODO/REFACTOR: // Title? diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 853eddb2b034..33c9c180307c 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -213,7 +213,7 @@ void SfxObjectShell::FlushDocInfo() SetModified(sal_True); uno::Reference<document::XDocumentProperties> xDocProps(getDocProperties()); DoFlushDocInfo(); // call template method - ::rtl::OUString url(xDocProps->getAutoloadURL()); + OUString url(xDocProps->getAutoloadURL()); sal_Int32 delay(xDocProps->getAutoloadSecs()); SetAutoLoad( INetURLObject(url), delay * 1000, (delay > 0) || !url.isEmpty() ); @@ -221,7 +221,7 @@ void SfxObjectShell::FlushDocInfo() //------------------------------------------------------------------------- -void SfxObjectShell::SetError( sal_uInt32 lErr, const ::rtl::OUString& aLogMessage ) +void SfxObjectShell::SetError( sal_uInt32 lErr, const OUString& aLogMessage ) { if(pImp->lErr==ERRCODE_NONE) { @@ -254,7 +254,7 @@ sal_uInt32 SfxObjectShell::GetErrorCode() const void SfxObjectShell::ResetError() { if( pImp->lErr != ERRCODE_NONE ) - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Resetting Error." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Resetting Error." ) ); pImp->lErr=0; SfxMedium * pMed = GetMedium(); @@ -302,7 +302,7 @@ sal_Bool SfxObjectShell::IsModified() return sal_False; } - uno::Sequence < ::rtl::OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames(); + uno::Sequence < OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames(); for ( sal_Int32 n=0; n<aNames.getLength(); n++ ) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObjectContainer().GetEmbeddedObject( aNames[n] ); @@ -504,7 +504,7 @@ sal_Bool SfxObjectShell::SwitchToShared( sal_Bool bShared, sal_Bool bSave ) if ( bShared != IsDocShared() ) { - ::rtl::OUString aOrigURL = GetMedium()->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); + OUString aOrigURL = GetMedium()->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); if ( aOrigURL.isEmpty() && bSave ) { @@ -567,9 +567,9 @@ sal_Bool SfxObjectShell::SwitchToShared( sal_Bool bShared, sal_Bool bSave ) } else { - ::rtl::OUString aTempFileURL = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); + OUString aTempFileURL = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); GetMedium()->SwitchDocumentToFile( GetSharedFileURL() ); - pImp->m_aSharedFileURL = ::rtl::OUString(); + pImp->m_aSharedFileURL = OUString(); // now remove the temporary file the document was based on ::utl::UCBContentHelper::Kill( aTempFileURL ); @@ -620,7 +620,7 @@ void SfxObjectShell::FreeSharedFile() } //-------------------------------------------------------------------- -void SfxObjectShell::FreeSharedFile( const ::rtl::OUString& aTempFileURL ) +void SfxObjectShell::FreeSharedFile( const OUString& aTempFileURL ) { SetSharedXMLFlag( sal_False ); @@ -645,7 +645,7 @@ void SfxObjectShell::FreeSharedFile( const ::rtl::OUString& aTempFileURL ) // now remove the temporary file the document is based currently on ::utl::UCBContentHelper::Kill( aTempFileURL ); - pImp->m_aSharedFileURL = ::rtl::OUString(); + pImp->m_aSharedFileURL = OUString(); } } @@ -676,7 +676,7 @@ sal_Bool SfxObjectShell::IsDocShared() const //-------------------------------------------------------------------- -::rtl::OUString SfxObjectShell::GetSharedFileURL() const +OUString SfxObjectShell::GetSharedFileURL() const { return pImp->m_aSharedFileURL; } @@ -868,18 +868,18 @@ String SfxObjectShell::GetTitle return X(pImp->aTitle); // must it be numbered? - rtl::OUString aNoName(SFX2_RESSTR(STR_NONAME)); + OUString aNoName(SFX2_RESSTR(STR_NONAME)); if (pImp->bIsNamedVisible) { // Append number - aNoName += rtl::OUString::valueOf(static_cast<sal_Int32>(pImp->nVisualDocumentNumber)); + aNoName += OUString::valueOf(static_cast<sal_Int32>(pImp->nVisualDocumentNumber)); } // Document called "noname" for the time being return X(aNoName); } - const INetURLObject aURL( IsDocShared() ? GetSharedFileURL() : ::rtl::OUString( GetMedium()->GetName() ) ); + const INetURLObject aURL( IsDocShared() ? GetSharedFileURL() : OUString( GetMedium()->GetName() ) ); if ( nMaxLength > SFX_TITLE_CAPTION && nMaxLength <= SFX_TITLE_HISTORY ) { sal_uInt16 nRemote; @@ -980,7 +980,7 @@ void SfxObjectShell::SetNoName() { bHasName = 0; bIsTmp = sal_True; - GetModel()->attachResource( ::rtl::OUString(), GetModel()->getArgs() ); + GetModel()->attachResource( OUString(), GetModel()->getArgs() ); } //-------------------------------------------------------------------- @@ -1102,16 +1102,16 @@ void SfxObjectShell::CheckSecurityOnLoading_Impl() //------------------------------------------------------------------------- void SfxObjectShell::CheckEncryption_Impl( const uno::Reference< task::XInteractionHandler >& xHandler ) { - ::rtl::OUString aVersion; + OUString aVersion; sal_Bool bIsEncrypted = sal_False; sal_Bool bHasNonEncrypted = sal_False; try { uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( ::rtl::OUString( "Version" ) ) >>= aVersion; - xPropSet->getPropertyValue( ::rtl::OUString( "HasEncryptedEntries" ) ) >>= bIsEncrypted; - xPropSet->getPropertyValue( ::rtl::OUString( "HasNonEncryptedEntries" ) ) >>= bHasNonEncrypted; + xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aVersion; + xPropSet->getPropertyValue( OUString( "HasEncryptedEntries" ) ) >>= bIsEncrypted; + xPropSet->getPropertyValue( OUString( "HasNonEncryptedEntries" ) ) >>= bHasNonEncrypted; } catch( uno::Exception& ) { @@ -1195,7 +1195,7 @@ void SfxObjectShell::InitOwnModel_Impl() uno::Reference< frame::XModel > xModel ( GetModel(), uno::UNO_QUERY ); if ( xModel.is() ) { - ::rtl::OUString aURL = GetMedium()->GetOrigURL(); + OUString aURL = GetMedium()->GetOrigURL(); SfxItemSet *pSet = GetMedium()->GetItemSet(); if ( !GetMedium()->IsReadOnly() ) pSet->ClearItem( SID_INPUTSTREAM ); @@ -1249,7 +1249,7 @@ void SfxObjectShell::FinishedLoading( sal_uInt16 nFlags ) pImp->nFlagsInProgress |= SFX_LOADED_IMAGES; uno::Reference<document::XDocumentProperties> xDocProps( getDocProperties()); - ::rtl::OUString url(xDocProps->getAutoloadURL()); + OUString url(xDocProps->getAutoloadURL()); sal_Int32 delay(xDocProps->getAutoloadSecs()); SetAutoLoad( INetURLObject(url), delay * 1000, (delay > 0) || !url.isEmpty() ); @@ -1356,7 +1356,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad() ForgetMedium(); if( !DoSaveCompleted( pTmpMedium ) ) - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); else { SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False ); @@ -1521,7 +1521,7 @@ namespace } } -ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const ::rtl::OUString& _rScriptURL, +ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptContext, const OUString& _rScriptURL, const Sequence< Any >& aParams, Any& aRet, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam, bool bRaiseError, const ::com::sun::star::uno::Any* pCaller ) { OSL_TRACE( "in CallXScript" ); @@ -1562,7 +1562,7 @@ ErrCode SfxObjectShell::CallXScript( const Reference< XInterface >& _rxScriptCon { Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] = *pCaller; - xProps->setPropertyValue( rtl::OUString("Caller"), uno::makeAny( aArgs ) ); + xProps->setPropertyValue( OUString("Caller"), uno::makeAny( aArgs ) ); } } aRet = xScript->invoke( aParams, aOutParamIndex, aOutParam ); @@ -1733,7 +1733,7 @@ void SfxObjectShell::SetWaitCursor( sal_Bool bSet ) const String SfxObjectShell::GetAPIName() const { - INetURLObject aURL( IsDocShared() ? GetSharedFileURL() : ::rtl::OUString( GetMedium()->GetName() ) ); + INetURLObject aURL( IsDocShared() ? GetSharedFileURL() : OUString( GetMedium()->GetName() ) ); String aName( aURL.GetBase() ); if( !aName.Len() ) aName = aURL.GetURLNoPass(); @@ -1900,9 +1900,9 @@ sal_Bool SfxObjectShell_Impl::setCurrentMacroExecMode( sal_uInt16 nMacroMode ) return sal_False; } -::rtl::OUString SfxObjectShell_Impl::getDocumentLocation() const +OUString SfxObjectShell_Impl::getDocumentLocation() const { - ::rtl::OUString sLocation; + OUString sLocation; const SfxMedium* pMedium( rDocShell.GetMedium() ); OSL_PRECOND( pMedium, "SfxObjectShell_Impl::getDocumentLocation: no medium!" ); @@ -1959,11 +1959,11 @@ sal_Bool SfxObjectShell_Impl::hasTrustedScriptingSignature( sal_Bool bAllowUIToA try { - ::rtl::OUString aVersion; + OUString aVersion; try { uno::Reference < beans::XPropertySet > xPropSet( rDocShell.GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( ::rtl::OUString( "Version" ) ) >>= aVersion; + xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aVersion; } catch( uno::Exception& ) { @@ -2026,7 +2026,7 @@ void SfxObjectShell_Impl::showBrokenSignatureWarning( const uno::Reference< task } } -void SfxObjectShell::AddLog( const ::rtl::OUString& aMessage ) +void SfxObjectShell::AddLog( const OUString& aMessage ) { if ( !pImp->m_xLogRing.is() ) { @@ -2045,11 +2045,11 @@ void SfxObjectShell::AddLog( const ::rtl::OUString& aMessage ) namespace { -void WriteStringInStream( const uno::Reference< io::XOutputStream >& xOutStream, const ::rtl::OUString& aString ) +void WriteStringInStream( const uno::Reference< io::XOutputStream >& xOutStream, const OUString& aString ) { if ( xOutStream.is() ) { - ::rtl::OString aStrLog = ::rtl::OUStringToOString( aString, RTL_TEXTENCODING_UTF8 ); + OString aStrLog = OUStringToOString( aString, RTL_TEXTENCODING_UTF8 ); uno::Sequence< sal_Int8 > aLogData( (const sal_Int8*)aStrLog.getStr(), aStrLog.getLength() ); xOutStream->writeBytes( aLogData ); @@ -2077,24 +2077,24 @@ void SfxObjectShell::StoreLog() if ( pImp->m_xLogRing.is() ) { #ifdef WNT - ::rtl::OUString aFileURL = ::rtl::OUString( "${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}" ); + OUString aFileURL = OUString( "${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}" ); #else - ::rtl::OUString aFileURL = ::rtl::OUString( "${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}" ); + OUString aFileURL = OUString( "${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}" ); #endif ::rtl::Bootstrap::expandMacros( aFileURL ); #ifdef WNT - ::rtl::OUString aBuildID = ::rtl::OUString( "${$BRAND_BASE_DIR/program/setup.ini:buildid}" ); + OUString aBuildID = OUString( "${$BRAND_BASE_DIR/program/setup.ini:buildid}" ); #else - ::rtl::OUString aBuildID = ::rtl::OUString( "${$BRAND_BASE_DIR/program/setuprc:buildid}" ); + OUString aBuildID = OUString( "${$BRAND_BASE_DIR/program/setuprc:buildid}" ); #endif ::rtl::Bootstrap::expandMacros( aBuildID ); if ( !aFileURL.isEmpty() ) { - aFileURL += ::rtl::OUString( "/user/temp/document_io_logring.txt" ); + aFileURL += OUString( "/user/temp/document_io_logring.txt" ); try { uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -2107,7 +2107,7 @@ void SfxObjectShell::StoreLog() if ( !aBuildID.isEmpty() ) WriteStringInStream( xOutStream, aBuildID ); - uno::Sequence< ::rtl::OUString > aLogSeq = pImp->m_xLogRing->getCollectedLog(); + uno::Sequence< OUString > aLogSeq = pImp->m_xLogRing->getCollectedLog(); for ( sal_Int32 nInd = 0; nInd < aLogSeq.getLength(); nInd++ ) WriteStringInStream( xOutStream, aLogSeq[nInd] ); } diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 6c5b6d2f5cd2..ef09a7efb972 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -306,7 +306,7 @@ sal_Bool SfxObjectShell::APISaveAs_Impl SFX_ITEMSET_ARG( aParams, pContentTypeItem, SfxStringItem, SID_CONTENTTYPE, sal_False ); if ( pContentTypeItem ) { - const SfxFilter* pFilter = SfxFilterMatcher( rtl::OUString::createFromAscii(GetFactory().GetShortName()) ).GetFilter4Mime( pContentTypeItem->GetValue(), SFX_FILTER_EXPORT ); + const SfxFilter* pFilter = SfxFilterMatcher( OUString::createFromAscii(GetFactory().GetShortName()) ).GetFilter4Mime( pContentTypeItem->GetValue(), SFX_FILTER_EXPORT ); if ( pFilter ) aFilterName = pFilter->GetName(); } @@ -389,7 +389,7 @@ void SfxObjectShell::CheckIn( ) SfxCheckinDialog checkinDlg( &GetFrame( )->GetWindow( ) ); if ( checkinDlg.Execute( ) == RET_OK ) { - rtl::OUString sComment = checkinDlg.GetComment( ); + OUString sComment = checkinDlg.GetComment( ); sal_Bool bMajor = checkinDlg.IsMajor( ); xCmisDoc->checkIn( bMajor, sComment ); uno::Reference< util::XModifiable > xModifiable( GetModel( ), uno::UNO_QUERY ); @@ -669,7 +669,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if ( QueryHiddenInformation( bIsPDFExport ? WhenCreatingPDF : WhenSaving, NULL ) == RET_YES ) { bDialogUsed = aHelper.GUIStoreModel( GetModel(), - ::rtl::OUString::createFromAscii( pSlot->GetUnoName() ), + OUString::createFromAscii( pSlot->GetUnoName() ), aDispatchArgs, bPreselectPassword, GetSharedFileURL(), @@ -678,7 +678,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) else { // the user has decided not to store the document - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), uno::Reference< uno::XInterface >(), ERRCODE_IO_ABORT ); } @@ -692,8 +692,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) rReq.SetArgs( aResultParams ); SFX_REQUEST_ARG( rReq, pFilterNameItem, SfxStringItem, SID_FILTER_NAME, sal_False ); - ::rtl::OUString aFilterName = pFilterNameItem ? ::rtl::OUString( pFilterNameItem->GetValue() ) - : ::rtl::OUString(); + OUString aFilterName = pFilterNameItem ? OUString( pFilterNameItem->GetValue() ) + : OUString(); const SfxFilter* pFilt = GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName ); OSL_ENSURE( nId == SID_SAVEDOC || pFilt, "The filter can not be zero since it was used for storing!\n" ); @@ -1143,21 +1143,21 @@ void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq) case SID_DOCINFO_AUTHOR : { - ::rtl::OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue(); + OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue(); getDocProperties()->setAuthor( aStr ); break; } case SID_DOCINFO_COMMENTS : { - ::rtl::OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue(); + OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue(); getDocProperties()->setDescription( aStr ); break; } case SID_DOCINFO_KEYWORDS : { - ::rtl::OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue(); + OUString aStr = ( (SfxStringItem&)rReq.GetArgs()->Get(rReq.GetSlot())).GetValue(); getDocProperties()->setKeywords( ::comphelper::string::convertCommaSeparated(aStr) ); break; @@ -1339,7 +1339,7 @@ uno::Sequence< security::DocumentSignatureInformation > SfxObjectShell::ImplAnal try { uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( ::rtl::OUString( "Version" ) ) >>= aVersion; + xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aVersion; } catch( uno::Exception& ) { @@ -1412,12 +1412,12 @@ void SfxObjectShell::ImplSign( sal_Bool bScriptingContent ) SvtSaveOptions::ODFDefaultVersion nVersion = aSaveOpt.GetODFDefaultVersion(); // the document is not new and is not modified - ::rtl::OUString aODFVersion; + OUString aODFVersion; try { // check the version of the document uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( ::rtl::OUString( "Version" ) ) >>= aODFVersion; + xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aODFVersion; } catch( uno::Exception& ) {} diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index fbc392180d26..223ae5e90720 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -201,7 +201,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::Named SFX_ITEMSET_ARG( pSet, pPasswordItem, SfxStringItem, SID_PASSWORD, sal_False); if ( pPasswordItem ) { - ::rtl::OUString aPassword = pPasswordItem->GetValue(); + OUString aPassword = pPasswordItem->GetValue(); o_rEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPassword ); bResult = true; } @@ -213,15 +213,15 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::Named //------------------------------------------------------------------------- sal_Bool SfxObjectShell::PutURLContentsToVersionStream_Impl( - ::rtl::OUString aURL, + OUString aURL, const uno::Reference< embed::XStorage >& xDocStorage, - ::rtl::OUString aStreamName ) + OUString aStreamName ) { sal_Bool bResult = sal_False; try { uno::Reference< embed::XStorage > xVersion = xDocStorage->openStorageElement( - ::rtl::OUString("Versions"), + OUString("Versions"), embed::ElementModes::READWRITE ); DBG_ASSERT( xVersion.is(), @@ -262,16 +262,16 @@ sal_Bool SfxObjectShell::PutURLContentsToVersionStream_Impl( catch( uno::Exception& ) { // TODO/LATER: handle the error depending on exception - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } return bResult; } //------------------------------------------------------------------------- -::rtl::OUString SfxObjectShell::CreateTempCopyOfStorage_Impl( const uno::Reference< embed::XStorage >& xStorage ) +OUString SfxObjectShell::CreateTempCopyOfStorage_Impl( const uno::Reference< embed::XStorage >& xStorage ) { - ::rtl::OUString aTempURL = ::utl::TempFile().GetURL(); + OUString aTempURL = ::utl::TempFile().GetURL(); DBG_ASSERT( !aTempURL.isEmpty(), "Can't create a temporary file!\n" ); if ( !aTempURL.isEmpty() ) @@ -291,10 +291,10 @@ sal_Bool SfxObjectShell::PutURLContentsToVersionStream_Impl( OSL_FAIL( "Creation of a storage copy is failed!" ); ::utl::UCBContentHelper::Kill( aTempURL ); - aTempURL = ::rtl::OUString(); + aTempURL = OUString(); // TODO/LATER: may need error code setting based on exception - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } @@ -364,20 +364,20 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto { try { - xProps->setPropertyValue( ::rtl::OUString("MediaType"), uno::makeAny( aDataFlavor.MimeType ) ); + xProps->setPropertyValue( OUString("MediaType"), uno::makeAny( aDataFlavor.MimeType ) ); } catch( uno::Exception& ) { - const_cast<SfxObjectShell*>( this )->SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + const_cast<SfxObjectShell*>( this )->SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } SvtSaveOptions aSaveOpt; SvtSaveOptions::ODFDefaultVersion nDefVersion = aSaveOpt.GetODFDefaultVersion(); uno::Sequence< beans::NamedValue > aEncryptionAlgs( 3 ); - aEncryptionAlgs[0].Name = ::rtl::OUString( "StartKeyGenerationAlgorithm" ); - aEncryptionAlgs[1].Name = ::rtl::OUString( "EncryptionAlgorithm" ); - aEncryptionAlgs[2].Name = ::rtl::OUString( "ChecksumAlgorithm" ); + aEncryptionAlgs[0].Name = OUString( "StartKeyGenerationAlgorithm" ); + aEncryptionAlgs[1].Name = OUString( "EncryptionAlgorithm" ); + aEncryptionAlgs[2].Name = OUString( "ChecksumAlgorithm" ); // the default values, that should be used for ODF1.1 and older formats aEncryptionAlgs[0].Value <<= xml::crypto::DigestID::SHA1; aEncryptionAlgs[1].Value <<= xml::crypto::CipherID::BLOWFISH_CFB_8; @@ -388,7 +388,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto try { // older versions can not have this property set, it exists only starting from ODF1.2 - xProps->setPropertyValue( ::rtl::OUString("Version" ), uno::makeAny( ODFVER_012_TEXT ) ); + xProps->setPropertyValue( OUString("Version" ), uno::makeAny( ODFVER_012_TEXT ) ); } catch( uno::Exception& ) { @@ -413,7 +413,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto } catch( uno::Exception& ) { - const_cast<SfxObjectShell*>( this )->SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + const_cast<SfxObjectShell*>( this )->SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } @@ -445,13 +445,13 @@ sal_Bool SfxObjectShell::GeneralInit_Impl( const uno::Reference< embed::XStorage try { uno::Reference < beans::XPropertySet > xPropSet( xStorage, uno::UNO_QUERY_THROW ); - Any a = xPropSet->getPropertyValue( ::rtl::OUString("MediaType" ) ); - ::rtl::OUString aMediaType; + Any a = xPropSet->getPropertyValue( OUString("MediaType" ) ); + OUString aMediaType; if ( !(a>>=aMediaType) || aMediaType.isEmpty() ) { if ( bTypeMustBeSetAlready ) { - SetError( ERRCODE_IO_BROKENPACKAGE, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_BROKENPACKAGE, OUString( OSL_LOG_PREFIX ) ); return sal_False; } @@ -535,8 +535,8 @@ sal_Bool SfxObjectShell::DoInitNew( SfxMedium* pMed ) sal_Int32 nLength = aArgs.getLength(); aArgs.realloc( nLength + 1 ); aArgs[nLength].Name = "Title"; - aArgs[nLength].Value <<= ::rtl::OUString( GetTitle( SFX_TITLE_DETECT ) ); - xModel->attachResource( ::rtl::OUString(), aArgs ); + aArgs[nLength].Value <<= OUString( GetTitle( SFX_TITLE_DETECT ) ); + xModel->attachResource( OUString(), aArgs ); impl_addToModelCollection(xModel); } @@ -629,7 +629,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) SFX_ITEMSET_ARG( pSet, pBaseItem, SfxStringItem, SID_BASEURL, sal_False); - rtl::OUString aBaseURL; + OUString aBaseURL; SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, sal_False); if( pBaseItem ) aBaseURL = pBaseItem->GetValue(); @@ -637,7 +637,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { if ( pSalvageItem ) { - rtl::OUString aName( pMed->GetPhysicalName() ); + OUString aName( pMed->GetPhysicalName() ); ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aName, aBaseURL ); } else @@ -655,7 +655,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { sal_uInt32 nError = HandleFilter( pMedium, this ); if ( nError != ERRCODE_NONE ) - SetError( nError, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( nError, OUString( OSL_LOG_PREFIX ) ); if (pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_STARTPRESENTATION) pSet->Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, sal_True) ); @@ -681,7 +681,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) // treat the package as broken if the mediatype was retrieved as a fallback uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW ); - xStorProps->getPropertyValue( ::rtl::OUString( "MediaTypeFallbackUsed" ) ) + xStorProps->getPropertyValue( OUString( "MediaTypeFallbackUsed" ) ) >>= bWarnMediaTypeFallback; if ( pRepairPackageItem && pRepairPackageItem->GetValue() ) @@ -695,12 +695,12 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) } if ( bWarnMediaTypeFallback || !xStorage->getElementNames().getLength() ) - SetError( ERRCODE_IO_BROKENPACKAGE, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_BROKENPACKAGE, OUString( OSL_LOG_PREFIX ) ); } catch( uno::Exception& ) { // TODO/LATER: may need error code setting based on exception - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } // Load @@ -717,11 +717,11 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) bHasName = sal_True; } else - SetError( ERRCODE_ABORT, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_ABORT, OUString( OSL_LOG_PREFIX ) ); } } else - SetError( pMed->GetLastStorageCreationState(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pMed->GetLastStorageCreationState(), OUString( OSL_LOG_PREFIX ) ); } else if ( GetError() == ERRCODE_NONE && InitNew(0) ) { @@ -741,7 +741,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( pMedium->GetFilter() && ( pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) { uno::Reference < beans::XPropertySet > xSet( GetModel(), uno::UNO_QUERY ); - ::rtl::OUString sLockUpdates("LockUpdates"); + OUString sLockUpdates("LockUpdates"); bool bSetProperty = true; try { @@ -783,11 +783,11 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) com::sun::star::uno::Reference < XPropertySetInfo > xProps = aContent.getProperties(); if ( xProps.is() ) { - ::rtl::OUString aAuthor( "Author" ); - ::rtl::OUString aKeywords( "Keywords" ); - ::rtl::OUString aSubject( "Subject" ); + OUString aAuthor( "Author" ); + OUString aKeywords( "Keywords" ); + OUString aSubject( "Subject" ); Any aAny; - ::rtl::OUString aValue; + OUString aValue; uno::Reference<document::XDocumentPropertiesSupplier> xDPS( GetModel(), uno::UNO_QUERY_THROW); uno::Reference<document::XDocumentProperties> xDocProps @@ -877,7 +877,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo if( xServiceManager.is() ) { xFilterCFG = com::sun::star::uno::Reference< XNameAccess >( - xServiceManager->createInstance( ::rtl::OUString("com.sun.star.document.FilterFactory") ), + xServiceManager->createInstance( OUString("com.sun.star.document.FilterFactory") ), UNO_QUERY ); } @@ -894,7 +894,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo for( sal_Int32 nProperty=0; nProperty < nPropertyCount; ++nProperty ) if( aProps[nProperty].Name == "UIComponent" ) { - ::rtl::OUString aServiceName; + OUString aServiceName; aProps[nProperty].Value >>= aServiceName; if( !aServiceName.isEmpty() ) { @@ -1017,7 +1017,7 @@ sal_Bool SfxObjectShell::DoSave() } catch( uno::Exception& ) { - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } DBG_ASSERT( bOk, "The root storage must allow to set common password!\n" ); @@ -1037,8 +1037,8 @@ sal_Bool SfxObjectShell::DoSave() if ( !xTmpStorage.is() ) throw uno::RuntimeException(); - ::rtl::OUString aBasicStorageName( "Basic" ); - ::rtl::OUString aDialogsStorageName( "Dialogs" ); + OUString aBasicStorageName( "Basic" ); + OUString aDialogsStorageName( "Dialogs" ); if ( GetMedium()->GetStorage()->hasByName( aBasicStorageName ) ) GetMedium()->GetStorage()->copyElementTo( aBasicStorageName, xTmpStorage, aBasicStorageName ); if ( GetMedium()->GetStorage()->hasByName( aDialogsStorageName ) ) @@ -1057,7 +1057,7 @@ sal_Bool SfxObjectShell::DoSave() } catch( uno::Exception& ) { - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); bOk = sal_False; } } @@ -1106,12 +1106,12 @@ sal_Bool SfxObjectShell::SaveTo_Impl RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "PERFORMANCE SfxObjectShell::SaveTo_Impl" ); if( RTL_LOGFILE_HASLOGFILE() ) { - rtl::OString aString( - rtl::OUStringToOString(rMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aString( + OUStringToOString(rMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_PRODUCT_CONTEXT_TRACE1(aLog, "saving \"%s\"", aString.getStr()); } - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Begin" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Begin" ) ); ModifyBlocker_Impl aMod(this); @@ -1134,7 +1134,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // protected libraries exceed the size we can handler if ( bOwnTarget && !QuerySaveSizeExceededModules_Impl( rMedium.GetInteractionHandler() ) ) { - SetError( ERRCODE_IO_ABORT, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_ABORT, OUString( OSL_LOG_PREFIX ) ); return sal_False; } @@ -1151,7 +1151,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl || pImp->nScriptingSignatureState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED || pImp->nScriptingSignatureState == SIGNATURESTATE_SIGNATURES_INVALID ) ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "MacroSignaturePreserving" ) ); + AddLog( OUString( OSL_LOG_PREFIX "MacroSignaturePreserving" ) ); // the checking of the library modified state iterates over the libraries, should be done only when required // currently the check is commented out since it is broken, we have to check the signature every time we save @@ -1163,11 +1163,11 @@ sal_Bool SfxObjectShell::SaveTo_Impl SvtSaveOptions aSaveOpt; SvtSaveOptions::ODFDefaultVersion nVersion = aSaveOpt.GetODFDefaultVersion(); - ::rtl::OUString aODFVersion; + OUString aODFVersion; try { uno::Reference < beans::XPropertySet > xPropSet( GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( ::rtl::OUString( "Version" ) ) >>= aODFVersion; + xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aODFVersion; } catch( uno::Exception& ) {} @@ -1198,7 +1198,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl && ::utl::UCBContentHelper::EqualURLs( pMedium->GetName(), rMedium.GetName() ) ) { bStoreToSameLocation = sal_True; - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Save" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Save" ) ); if ( pMedium->DocNeedsFileDateCheck() ) rMedium.CheckFileDate( pMedium->GetInitFileDate( sal_False ) ); @@ -1206,7 +1206,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl if ( bCopyTo && GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) { // export to the same location is forbidden - SetError( ERRCODE_IO_CANTWRITE, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_CANTWRITE, OUString( OSL_LOG_PREFIX ) ); } else { @@ -1215,11 +1215,11 @@ sal_Bool SfxObjectShell::SaveTo_Impl const sal_Bool bDoBackup = SvtSaveOptions().IsBackup(); if ( bDoBackup ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "DoBackup" ) ); + AddLog( OUString( OSL_LOG_PREFIX "DoBackup" ) ); rMedium.DoBackup_Impl(); if ( rMedium.GetError() ) { - SetError( rMedium.GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( rMedium.GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); rMedium.ResetError(); } } @@ -1243,7 +1243,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // if the last step is failed the stream should stay to be transacted and should be commited on any flush // so we can forget the stream in any way and the next storage commit will flush it - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Save: Own to Own" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Save: Own to Own" ) ); bNeedsDisconnectionOnFail = DisconnectStorage_Impl( *pMedium, rMedium ); @@ -1266,7 +1266,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // just disconnect the stream from the source format // so that the target medium can use it - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Save: Alien to Alien" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Save: Alien to Alien" ) ); pMedium->CloseAndRelease(); rMedium.CloseAndRelease(); @@ -1279,7 +1279,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // format is an own one so just disconnect the source // medium - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Save: Alien to Own" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Save: Alien to Own" ) ); pMedium->CloseAndRelease(); rMedium.CloseAndRelease(); @@ -1291,7 +1291,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // an alien format, just connect the source to temporary // storage - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Save: Own to Alien" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Save: Own to Alien" ) ); bNeedsDisconnectionOnFail = DisconnectStorage_Impl( *pMedium, rMedium ); @@ -1313,7 +1313,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // but for now the framework has to be ready for it // TODO/LATER: let the medium be prepared for alien formats as well - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "SaveAs/Export" ) ); + AddLog( OUString( OSL_LOG_PREFIX "SaveAs/Export" ) ); rMedium.CloseAndRelease(); if ( bStorageBasedTarget ) @@ -1326,7 +1326,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl if( rMedium.GetErrorCode() || pMedium->GetErrorCode() || GetErrorCode() ) return sal_False; - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Locking" ) ); + AddLog( OUString( OSL_LOG_PREFIX "Locking" ) ); rMedium.LockOrigFileOnDemand( sal_False, sal_False ); @@ -1355,7 +1355,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl if ( !xProps.is() ) throw uno::RuntimeException(); - xProps->setPropertyValue( ::rtl::OUString("MediaType"), + xProps->setPropertyValue( OUString("MediaType"), uno::makeAny( aDataFlavor.MimeType ) ); } catch( uno::Exception& ) @@ -1380,14 +1380,14 @@ sal_Bool SfxObjectShell::SaveTo_Impl if( bOwnTarget && !( pFilter->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing in own format." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Storing in own format." ) ); uno::Reference< embed::XStorage > xMedStorage = rMedium.GetStorage(); if ( !xMedStorage.is() ) { // no saving without storage, unlock UI and return Lock_Impl( this, sal_False ); pImp->bForbidReload = bOldStat; - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing failed, still no error set." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Storing failed, still no error set." ) ); return sal_False; } @@ -1404,7 +1404,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl catch( uno::Exception& ) { OSL_FAIL( "Setting of common encryption key failed!" ); - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } else @@ -1414,7 +1414,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl const SfxStringItem *pVersionItem = ( !rMedium.IsInCheckIn( ) && pSet ) ? (const SfxStringItem*) SfxRequest::GetItem( pSet, SID_DOCINFO_COMMENTS, sal_False, TYPE(SfxStringItem) ) : NULL; - ::rtl::OUString aTmpVersionURL; + OUString aTmpVersionURL; if ( bOk ) { @@ -1423,18 +1423,18 @@ sal_Bool SfxObjectShell::SaveTo_Impl if ( xMedStorage == GetStorage() ) { OSL_ENSURE( !pVersionItem, "This scenario is impossible currently!\n" ); - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Should be impossible." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Should be impossible." ) ); // usual save procedure bOk = Save(); } else { // save to target - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Save as own format." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Save as own format." ) ); bOk = SaveAsOwnFormat( rMedium ); if ( bOk && pVersionItem ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "pVersionItem != NULL" ) ); + AddLog( OUString( OSL_LOG_PREFIX "pVersionItem != NULL" ) ); aTmpVersionURL = CreateTempCopyOfStorage_Impl( xMedStorage ); bOk = !aTmpVersionURL.isEmpty(); } @@ -1446,7 +1446,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl { // store the thumbnail representation image // the thumbnail is not stored in case of encrypted document - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Thumbnail creation." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Thumbnail creation." ) ); if ( !GenerateAndStoreThumbnail( bPasswdProvided, sal_False, pFilter->IsOwnTemplateFormat(), @@ -1461,14 +1461,14 @@ sal_Bool SfxObjectShell::SaveTo_Impl { if ( pImp->bIsSaving || pImp->bPreserveVersions ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Preserve versions." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Preserve versions." ) ); try { Sequence < util::RevisionTag > aVersions = rMedium.GetVersionList(); if ( aVersions.getLength() ) { // copy the version streams - ::rtl::OUString aVersionsName( "Versions" ); + OUString aVersionsName( "Versions" ); uno::Reference< embed::XStorage > xNewVerStor = xMedStorage->openStorageElement( aVersionsName, embed::ElementModes::READWRITE ); @@ -1491,7 +1491,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl } catch( uno::Exception& ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Preserve versions has failed." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Preserve versions has failed." ) ); OSL_FAIL( "Couldn't copy versions!\n" ); bOk = sal_False; // TODO/LATER: a specific error could be set @@ -1543,7 +1543,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl } else { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing in alien format." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Storing in alien format." ) ); // it's a "SaveAs" in an alien format if ( rMedium.GetFilter() && ( rMedium.GetFilter()->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) bOk = ExportTo( rMedium ); @@ -1572,7 +1572,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl uno::Reference< security::XDocumentDigitalSignatures > xDDSigns; if ( bOk && bTryToPreserveScriptSignature ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Copying scripting signature." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Copying scripting signature." ) ); // if the scripting code was not changed and it is signed the signature should be preserved // unfortunately at this point we have only information whether the basic code has changed or not @@ -1584,7 +1584,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl try { uno::Reference < beans::XPropertySet > xPropSet( rMedium.GetStorage(), uno::UNO_QUERY_THROW ); - xPropSet->getPropertyValue( ::rtl::OUString( "Version" ) ) >>= aVersion; + xPropSet->getPropertyValue( OUString( "Version" ) ) >>= aVersion; } catch( uno::Exception& ) { @@ -1592,7 +1592,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl xDDSigns = security::DocumentDigitalSignatures::createWithVersion(comphelper::getProcessComponentContext(), aVersion); - ::rtl::OUString aScriptSignName = xDDSigns->getScriptingContentSignatureDefaultStreamName(); + OUString aScriptSignName = xDDSigns->getScriptingContentSignatureDefaultStreamName(); if ( !aScriptSignName.isEmpty() ) { @@ -1607,14 +1607,14 @@ sal_Bool SfxObjectShell::SaveTo_Impl if ( !xReadOrig.is() ) throw uno::RuntimeException(); uno::Reference< embed::XStorage > xMetaInf = xReadOrig->openStorageElement( - ::rtl::OUString( "META-INF" ), + OUString( "META-INF" ), embed::ElementModes::READ ); uno::Reference< embed::XStorage > xTarget = rMedium.GetZipStorageToSign_Impl( sal_False ); if ( !xTarget.is() ) throw uno::RuntimeException(); uno::Reference< embed::XStorage > xTargetMetaInf = xTarget->openStorageElement( - ::rtl::OUString( "META-INF" ), + OUString( "META-INF" ), embed::ElementModes::READWRITE ); if ( xMetaInf.is() && xTargetMetaInf.is() ) @@ -1659,18 +1659,18 @@ sal_Bool SfxObjectShell::SaveTo_Impl rMedium.CloseZipStorage_Impl(); } - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Medium commit." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Medium commit." ) ); - rtl::OUString sName( rMedium.GetName( ) ); + OUString sName( rMedium.GetName( ) ); bOk = rMedium.Commit(); - rtl::OUString sNewName( rMedium.GetName( ) ); + OUString sNewName( rMedium.GetName( ) ); if ( sName != sNewName ) GetMedium( )->SwitchDocumentToFile( sNewName ); if ( bOk ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing is successful." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Storing is successful." ) ); // if the target medium is an alien format and the "old" medium was an own format and the "old" medium // has a name, the object storage must be exchanged, because now we need a new temporary storage @@ -1691,7 +1691,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl // copy storage of old medium to new temporary storage and take this over if( !ConnectTmpStorage_Impl( pMedium->GetStorage(), pMedium ) ) { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Process after storing has failed." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Process after storing has failed." ) ); bOk = sal_False; } } @@ -1699,7 +1699,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl } else { - AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing has failed." ) ); + AddLog( OUString( OSL_LOG_PREFIX "Storing has failed." ) ); // in case the document storage was connected to backup temporarely it must be disconnected now if ( bNeedsDisconnectionOnFail ) @@ -1719,9 +1719,9 @@ sal_Bool SfxObjectShell::SaveTo_Impl com::sun::star::uno::Reference < XPropertySetInfo > xProps = aContent.getProperties(); if ( xProps.is() ) { - ::rtl::OUString aAuthor( "Author" ); - ::rtl::OUString aKeywords( "Keywords" ); - ::rtl::OUString aSubject( "Subject" ); + OUString aAuthor( "Author" ); + OUString aKeywords( "Keywords" ); + OUString aSubject( "Subject" ); Any aAny; uno::Reference<document::XDocumentPropertiesSupplier> xDPS( @@ -1770,7 +1770,7 @@ sal_Bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMediu try { uno::Reference< embed::XOptimizedStorage > xOptStorage( xStorage, uno::UNO_QUERY_THROW ); - ::rtl::OUString aBackupURL = rTargetMedium.GetBackup_Impl(); + OUString aBackupURL = rTargetMedium.GetBackup_Impl(); if ( aBackupURL.isEmpty() ) { // the backup could not be created, try to disconnect the storage and close the source SfxMedium @@ -1879,7 +1879,7 @@ sal_Bool SfxObjectShell::ConnectTmpStorage_Impl( if ( !bResult ) { // TODO/LATER: may need error code setting based on exception - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_GENERAL, OUString( OSL_LOG_PREFIX ) ); } } @@ -1901,8 +1901,8 @@ sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit ) uno::Reference < beans::XPropertySet > xPropSet( xNewStor, uno::UNO_QUERY ); if ( xPropSet.is() ) { - Any a = xPropSet->getPropertyValue( ::rtl::OUString("MediaType" ) ); - ::rtl::OUString aMediaType; + Any a = xPropSet->getPropertyValue( OUString("MediaType" ) ); + OUString aMediaType; if ( !(a>>=aMediaType) || aMediaType.isEmpty() ) { OSL_FAIL( "The mediatype must be set already!\n" ); @@ -1935,7 +1935,7 @@ sal_Bool SfxObjectShell::DoSaveAs( SfxMedium& rMedium ) { // here only root storages are included, which are stored via temp file rMedium.CreateTempFileNoCopy(); - SetError(rMedium.GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError(rMedium.GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); if ( GetError() ) return sal_False; @@ -1945,7 +1945,7 @@ sal_Bool SfxObjectShell::DoSaveAs( SfxMedium& rMedium ) sal_Bool bRet = SaveTo_Impl( rMedium, NULL ); if ( !bRet ) - SetError(rMedium.GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError(rMedium.GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); return bRet; } @@ -2057,7 +2057,7 @@ sal_Bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed ) uno::Reference< frame::XModel > xModel = GetModel(); if ( xModel.is() ) { - ::rtl::OUString aURL = pNewMed->GetOrigURL(); + OUString aURL = pNewMed->GetOrigURL(); uno::Sequence< beans::PropertyValue > aMediaDescr; TransformItems( SID_OPENDOC, *pNewMed->GetItemSet(), aMediaDescr ); try @@ -2108,7 +2108,7 @@ void SfxObjectShell::AddToRecentlyUsedList() { const SfxFilter* pOrgFilter = pMedium->GetOrigFilter(); Application::AddToRecentDocumentList( aUrl.GetURLNoPass( INetURLObject::NO_DECODE ), - (pOrgFilter) ? pOrgFilter->GetMimeType() : ::rtl::OUString() ); + (pOrgFilter) ? pOrgFilter->GetMimeType() : OUString() ); } } @@ -2170,7 +2170,7 @@ sal_Bool SfxObjectShell::ConvertFrom sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert ) { - ::rtl::OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); + OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); uno::Reference< lang::XMultiServiceFactory > xMan = ::comphelper::getProcessServiceFactory(); uno::Reference < lang::XMultiServiceFactory > xFilterFact ( @@ -2184,7 +2184,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert ) rMedium.GetItemSet()->Put( SfxStringItem( SID_FILTER_NAME, aFilterName ) ); } - ::rtl::OUString aFilterImplName; + OUString aFilterImplName; sal_Int32 nFilterProps = aProps.getLength(); for ( sal_Int32 nFilterProp = 0; nFilterProp<nFilterProps; nFilterProp++ ) { @@ -2246,13 +2246,13 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert ) if ( !bHasBaseURL ) { aArgs.realloc ( ++nEnd ); - aArgs[nEnd-1].Name = ::rtl::OUString( "DocumentBaseURL" ); + aArgs[nEnd-1].Name = OUString( "DocumentBaseURL" ); aArgs[nEnd-1].Value <<= rMedium.GetBaseURL(); } if ( bInsert ) { aArgs.realloc( ++nEnd ); - aArgs[nEnd-1].Name = ::rtl::OUString( "InsertMode" ); + aArgs[nEnd-1].Name = OUString( "InsertMode" ); aArgs[nEnd-1].Value <<= (sal_Bool) sal_True; } @@ -2280,7 +2280,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert ) sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) { - ::rtl::OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); + OUString aFilterName( rMedium.GetFilter()->GetFilterName() ); uno::Reference< document::XExporter > xExporter; { @@ -2293,7 +2293,7 @@ sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) if ( xFilters->hasByName( aFilterName ) ) xFilters->getByName( aFilterName ) >>= aProps; - ::rtl::OUString aFilterImplName; + OUString aFilterImplName; sal_Int32 nFilterProps = aProps.getLength(); for ( sal_Int32 nFilterProp = 0; nFilterProp<nFilterProps; nFilterProp++ ) { @@ -2370,7 +2370,7 @@ sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium ) if ( !bHasBaseURL ) { aArgs.realloc ( ++nEnd ); - aArgs[nEnd-1].Name = ::rtl::OUString( "DocumentBaseURL" ); + aArgs[nEnd-1].Name = OUString( "DocumentBaseURL" ); aArgs[nEnd-1].Value <<= rMedium.GetBaseURL( sal_True ); } @@ -2472,7 +2472,7 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) pMediumTmp->SetLongName( pRetrMedium->GetLongName() ); if ( pMediumTmp->GetErrorCode() != ERRCODE_NONE ) { - SetError( pMediumTmp->GetError(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pMediumTmp->GetError(), OUString( OSL_LOG_PREFIX ) ); delete pMediumTmp; return sal_False; } @@ -2498,7 +2498,7 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) pMediumTmp->GetItemSet()->ClearItem( SID_PROGRESS_STATUSBAR_CONTROL ); } - SetError(pMediumTmp->GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError(pMediumTmp->GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); sal_Bool bOpen( sal_False ); bOpen = DoSaveCompleted( pMediumTmp ); @@ -2509,7 +2509,7 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) else { // transfer error code from medium to objectshell - SetError( pMediumTmp->GetError(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pMediumTmp->GetError(), OUString( OSL_LOG_PREFIX ) ); // reconnect to object storage DoSaveCompleted( 0 ); @@ -2533,7 +2533,7 @@ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) { if ( IsReadOnly() ) { - SetError( ERRCODE_SFX_DOCUMENTREADONLY, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_SFX_DOCUMENTREADONLY, OUString( OSL_LOG_PREFIX ) ); return sal_False; } @@ -2548,7 +2548,7 @@ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) String aFilterName; const SfxFilter *pFilter = NULL; if ( pFilterItem ) - pFilter = SfxFilterMatcher( rtl::OUString::createFromAscii( GetFactory().GetShortName()) ).GetFilter4FilterName( aFilterName ); + pFilter = SfxFilterMatcher( OUString::createFromAscii( GetFactory().GetShortName()) ).GetFilter4FilterName( aFilterName ); SfxMedium *pMed = new SfxMedium( pSalvageItem->GetValue(), STREAM_READWRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC, pFilter ); @@ -2579,11 +2579,11 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl { if( aURL.HasError() ) { - SetError( ERRCODE_IO_INVALIDPARAMETER, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_INVALIDPARAMETER, OUString( OSL_LOG_PREFIX ) ); return sal_False; } - if ( aURL != INetURLObject( ::rtl::OUString( "private:stream" ) ) ) + if ( aURL != INetURLObject( OUString( "private:stream" ) ) ) { // Is there already a Document with this name? SfxObjectShell* pDoc = 0; @@ -2601,7 +2601,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl if ( pDoc ) { // Then error message: "already opened" - SetError(ERRCODE_SFX_ALREADYOPEN, ::rtl::OUString( OSL_LOG_PREFIX )); + SetError(ERRCODE_SFX_ALREADYOPEN, OUString( OSL_LOG_PREFIX )); return sal_False; } } @@ -2617,7 +2617,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl || !pFilter->CanExport() || (!bSaveTo && !pFilter->CanImport()) ) { - SetError( ERRCODE_IO_INVALIDPARAMETER, ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( ERRCODE_IO_INVALIDPARAMETER, OUString( OSL_LOG_PREFIX ) ); return sal_False; } @@ -2639,14 +2639,14 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl if ( aURL == aActName && aURL != INetURLObject( OUString("private:stream") ) && IsReadOnly() ) { - SetError(ERRCODE_SFX_DOCUMENTREADONLY, ::rtl::OUString( OSL_LOG_PREFIX )); + SetError(ERRCODE_SFX_DOCUMENTREADONLY, OUString( OSL_LOG_PREFIX )); return sal_False; } if( SFX_ITEM_SET != aParams->GetItemState(SID_UNPACK) && SvtSaveOptions().IsSaveUnpacked() ) aParams->Put( SfxBoolItem( SID_UNPACK, sal_False ) ); - ::rtl::OUString aTempFileURL; + OUString aTempFileURL; if ( IsDocShared() ) aTempFileURL = pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ); @@ -2770,7 +2770,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl if ( pNewFile->GetErrorCode() != ERRCODE_NONE ) { // creating temporary file failed ( f.e. floppy disk not inserted! ) - SetError( pNewFile->GetError(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pNewFile->GetError(), OUString( OSL_LOG_PREFIX ) ); delete pNewFile; return sal_False; } @@ -2793,7 +2793,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl bOk = sal_True; // transfer a possible error from the medium to the document - SetError( pNewFile->GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pNewFile->GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); // notify the document that saving was done successfully if ( !bCopyTo ) @@ -2814,7 +2814,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl // and the DoSaveCompleted call should not be able to fail in general DBG_ASSERT( !bCopyTo, "Error while reconnecting to medium, can't be handled!"); - SetError( pNewFile->GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pNewFile->GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); if ( !bCopyTo ) { @@ -2833,7 +2833,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl } else { - SetError( pNewFile->GetErrorCode(), ::rtl::OUString( OSL_LOG_PREFIX ) ); + SetError( pNewFile->GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); // reconnect to the old storage DoSaveCompleted( 0 ); @@ -2861,8 +2861,8 @@ sal_Bool SfxObjectShell::LoadFrom( SfxMedium& /*rMedium*/ ) sal_Bool SfxObjectShell::IsInformationLost() { Sequence< PropertyValue > aProps = GetModel()->getArgs(); - ::rtl::OUString aFilterName; - ::rtl::OUString aPreusedFilterName; + OUString aFilterName; + OUString aPreusedFilterName; for ( sal_Int32 nInd = 0; nInd < aProps.getLength(); nInd++ ) { if ( aProps[nInd].Name == "FilterName" ) @@ -3006,8 +3006,8 @@ sal_Bool SfxObjectShell::LoadOwnFormat( SfxMedium& rMedium ) RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "PERFORMANCE SfxObjectShell::LoadOwnFormat" ); if( RTL_LOGFILE_HASLOGFILE() ) { - rtl::OString aString( - rtl::OUStringToOString(rMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); + OString aString( + OUStringToOString(rMedium.GetName(), RTL_TEXTENCODING_ASCII_US)); RTL_LOGFILE_PRODUCT_CONTEXT_TRACE1(aLog, "loading \"%s\"", aString.getStr()); } @@ -3146,7 +3146,7 @@ sal_Bool SfxObjectShell::SaveCompletedChildren( sal_Bool bSuccess ) if ( pImp->mpObjectContainer ) { - uno::Sequence < ::rtl::OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames(); + uno::Sequence < OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames(); for ( sal_Int32 n=0; n<aNames.getLength(); n++ ) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObjectContainer().GetEmbeddedObject( aNames[n] ); @@ -3262,13 +3262,13 @@ sal_Bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed:: try { - uno::Sequence< ::rtl::OUString > aSubElements = xSource->getElementNames(); + uno::Sequence< OUString > aSubElements = xSource->getElementNames(); for ( sal_Int32 nInd = 0; nInd < aSubElements.getLength(); nInd++ ) { if ( xSource->isStorageElement( aSubElements[nInd] ) ) { - ::rtl::OUString aMediaType; - ::rtl::OUString aMediaTypePropName( "MediaType" ); + OUString aMediaType; + OUString aMediaTypePropName( "MediaType" ); sal_Bool bGotMediaType = sal_False; try @@ -3390,7 +3390,7 @@ sal_Bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< e try { - uno::Sequence< ::rtl::OUString > aSubElements = xSource->getElementNames(); + uno::Sequence< OUString > aSubElements = xSource->getElementNames(); for ( sal_Int32 nInd = 0; nInd < aSubElements.getLength(); nInd++ ) { if ( aSubElements[nInd] == "Configurations" ) @@ -3406,8 +3406,8 @@ sal_Bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< e } else if ( xSource->isStorageElement( aSubElements[nInd] ) ) { - ::rtl::OUString aMediaType; - ::rtl::OUString aMediaTypePropName( "MediaType" ); + OUString aMediaType; + OUString aMediaTypePropName( "MediaType" ); sal_Bool bGotMediaType = sal_False; try @@ -3504,12 +3504,12 @@ sal_Bool SfxObjectShell::GenerateAndStoreThumbnail( sal_Bool bEncrypted, try { uno::Reference< embed::XStorage > xThumbnailStor = - xStor->openStorageElement( ::rtl::OUString("Thumbnails"), + xStor->openStorageElement( OUString("Thumbnails"), embed::ElementModes::READWRITE ); if ( xThumbnailStor.is() ) { uno::Reference< io::XStream > xStream = xThumbnailStor->openStreamElement( - ::rtl::OUString("thumbnail.png"), + OUString("thumbnail.png"), embed::ElementModes::READWRITE ); if ( xStream.is() && WriteThumbnail( bEncrypted, bSigned, bIsTemplate, xStream ) ) @@ -3542,12 +3542,12 @@ sal_Bool SfxObjectShell::WriteThumbnail( sal_Bool bEncrypted, uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY ); if ( xSet.is() ) - xSet->setPropertyValue( ::rtl::OUString("MediaType"), - uno::makeAny( ::rtl::OUString("image/png") ) ); + xSet->setPropertyValue( OUString("MediaType"), + uno::makeAny( OUString("image/png") ) ); if ( bEncrypted ) { sal_uInt16 nResID = GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( - ::rtl::OUString::createFromAscii( GetFactory().GetShortName() ), + OUString::createFromAscii( GetFactory().GetShortName() ), bIsTemplate ); if ( nResID ) { @@ -3618,7 +3618,7 @@ sal_Bool SfxObjectShell::QuerySaveSizeExceededModules_Impl( const uno::Reference if ( !pImp->pBasicManager->isValid() ) GetBasicManager(); - uno::Sequence< rtl::OUString > sModules; + uno::Sequence< OUString > sModules; if ( xHandler.is() ) { if( pImp->pBasicManager->LegacyPsswdBinaryLimitExceeded( sModules ) ) diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index b0a021330609..b699be98a85e 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -121,10 +121,10 @@ class theCurrentComponent : public rtl::Static< WeakReference< XInterface >, the #ifndef DISABLE_SCRIPTING // remember all registered components for VBA compatibility, to be able to remove them on disposing the model -typedef ::std::map< XInterface*, ::rtl::OString > VBAConstantNameMap; +typedef ::std::map< XInterface*, OString > VBAConstantNameMap; static VBAConstantNameMap s_aRegisteredVBAConstants; -::rtl::OString lclGetVBAGlobalConstName( const Reference< XInterface >& rxComponent ) +OString lclGetVBAGlobalConstName( const Reference< XInterface >& rxComponent ) { OSL_ENSURE( rxComponent.is(), "lclGetVBAGlobalConstName - missing component" ); @@ -135,14 +135,14 @@ static VBAConstantNameMap s_aRegisteredVBAConstants; uno::Reference< beans::XPropertySet > xProps( rxComponent, uno::UNO_QUERY ); if( xProps.is() ) try { - ::rtl::OUString aConstName; - xProps->getPropertyValue( ::rtl::OUString( "ThisVBADocObj" ) ) >>= aConstName; - return ::rtl::OUStringToOString( aConstName, RTL_TEXTENCODING_ASCII_US ); + OUString aConstName; + xProps->getPropertyValue( OUString( "ThisVBADocObj" ) ) >>= aConstName; + return OUStringToOString( aConstName, RTL_TEXTENCODING_ASCII_US ); } catch (const uno::Exception&) // not supported { } - return ::rtl::OString(); + return OString(); } #endif @@ -401,7 +401,7 @@ SfxObjectShell::~SfxObjectShell() // The removing of the temporary file must be done as the latest step in the document destruction if ( pImp->aTempName.Len() ) { - rtl::OUString aTmp; + OUString aTmp; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( pImp->aTempName, aTmp ); ::utl::UCBContentHelper::Kill( aTmp ); } @@ -627,7 +627,7 @@ sal_uInt16 SfxObjectShell::PrepareClose SfxHelp::OpenHelpAgent( &pFirst->GetFrame(), HID_CLOSE_WARNING ); } const Reference< XTitle > xTitle( *pImp->pBaseModel.get(), UNO_QUERY_THROW ); - const ::rtl::OUString sTitle = xTitle->getTitle (); + const OUString sTitle = xTitle->getTitle (); nRet = ExecuteQuerySaveDocument(&pFrame->GetWindow(),sTitle); } /*HACK for plugin::destroy()*/ @@ -880,16 +880,16 @@ SfxObjectShell* SfxObjectShell::GetObjectShell() //-------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SfxObjectShell::GetEventNames() +uno::Sequence< OUString > SfxObjectShell::GetEventNames() { - static uno::Sequence< ::rtl::OUString >* pEventNameContainer = NULL; + static uno::Sequence< OUString >* pEventNameContainer = NULL; if ( !pEventNameContainer ) { SolarMutexGuard aGuard; if ( !pEventNameContainer ) { - static uno::Sequence< ::rtl::OUString > aEventNameContainer = GlobalEventConfig().getElementNames(); + static uno::Sequence< OUString > aEventNameContainer = GlobalEventConfig().getElementNames(); pEventNameContainer = &aEventNameContainer; } } @@ -956,7 +956,7 @@ void SfxObjectShell::SetCurrentComponent( const Reference< XInterface >& _rxComp // set new current component for VBA compatibility if ( _rxComponent.is() ) { - ::rtl::OString aVBAConstName = lclGetVBAGlobalConstName( _rxComponent ); + OString aVBAConstName = lclGetVBAGlobalConstName( _rxComponent ); if ( !aVBAConstName.isEmpty() ) { pAppMgr->SetGlobalUNOConstant( aVBAConstName.getStr(), Any( _rxComponent ) ); @@ -966,7 +966,7 @@ void SfxObjectShell::SetCurrentComponent( const Reference< XInterface >& _rxComp // no new component passed -> remove last registered VBA component else if ( xOldCurrentComp.is() ) { - ::rtl::OString aVBAConstName = lclGetVBAGlobalConstName( xOldCurrentComp ); + OString aVBAConstName = lclGetVBAGlobalConstName( xOldCurrentComp ); if ( !aVBAConstName.isEmpty() ) { pAppMgr->SetGlobalUNOConstant( aVBAConstName.getStr(), Any( Reference< XInterface >() ) ); @@ -987,7 +987,7 @@ String SfxObjectShell::GetServiceNameFromFactory( const String& rFact ) { //! Remove everything behind name! String aFact( rFact ); - String aPrefix = rtl::OUString("private:factory/"); + String aPrefix = OUString("private:factory/"); if ( aPrefix.Len() == aFact.Match( aPrefix ) ) aFact.Erase( 0, aPrefix.Len() ); sal_uInt16 nPos = aFact.Search( '?' ); @@ -1005,50 +1005,50 @@ String SfxObjectShell::GetServiceNameFromFactory( const String& rFact ) // a factory short name. Set return value directly to this service name as fallback // in case next lines of code does nothing ... // use rFact instead of normed aFact value ! - ::rtl::OUString aServiceName = rFact; + OUString aServiceName = rFact; if ( aFact.EqualsAscii("swriter") ) { - aServiceName = ::rtl::OUString("com.sun.star.text.TextDocument"); + aServiceName = OUString("com.sun.star.text.TextDocument"); } else if ( aFact.EqualsAscii("sweb") || aFact.EqualsAscii("swriter/web") ) { - aServiceName = ::rtl::OUString("com.sun.star.text.WebDocument"); + aServiceName = OUString("com.sun.star.text.WebDocument"); } else if ( aFact.EqualsAscii("sglobal") || aFact.EqualsAscii("swriter/globaldocument") ) { - aServiceName = ::rtl::OUString("com.sun.star.text.GlobalDocument"); + aServiceName = OUString("com.sun.star.text.GlobalDocument"); } else if ( aFact.EqualsAscii("scalc") ) { - aServiceName = ::rtl::OUString("com.sun.star.sheet.SpreadsheetDocument"); + aServiceName = OUString("com.sun.star.sheet.SpreadsheetDocument"); } else if ( aFact.EqualsAscii("sdraw") ) { - aServiceName = ::rtl::OUString("com.sun.star.drawing.DrawingDocument"); + aServiceName = OUString("com.sun.star.drawing.DrawingDocument"); } else if ( aFact.EqualsAscii("simpress") ) { - aServiceName = ::rtl::OUString("com.sun.star.presentation.PresentationDocument"); + aServiceName = OUString("com.sun.star.presentation.PresentationDocument"); } else if ( aFact.EqualsAscii("schart") ) { - aServiceName = ::rtl::OUString("com.sun.star.chart.ChartDocument"); + aServiceName = OUString("com.sun.star.chart.ChartDocument"); } else if ( aFact.EqualsAscii("smath") ) { - aServiceName = ::rtl::OUString("com.sun.star.formula.FormulaProperties"); + aServiceName = OUString("com.sun.star.formula.FormulaProperties"); } #ifndef DISABLE_SCRIPTING else if ( aFact.EqualsAscii("sbasic") ) { - aServiceName = ::rtl::OUString("com.sun.star.script.BasicIDE"); + aServiceName = OUString("com.sun.star.script.BasicIDE"); } #endif #ifndef DISABLE_DBCONNECTIVITY else if ( aFact.EqualsAscii("sdatabase") ) { - aServiceName = ::rtl::OUString("com.sun.star.sdb.OfficeDatabaseDocument"); + aServiceName = OUString("com.sun.star.sdb.OfficeDatabaseDocument"); } #endif @@ -1090,8 +1090,8 @@ Reference<lang::XComponent> SfxObjectShell::CreateAndLoadComponent( const SfxIte TransformItems( SID_OPENDOC, rSet, aProps ); SFX_ITEMSET_ARG(&rSet, pFileNameItem, SfxStringItem, SID_FILE_NAME, sal_False); SFX_ITEMSET_ARG(&rSet, pTargetItem, SfxStringItem, SID_TARGETNAME, sal_False); - ::rtl::OUString aURL; - ::rtl::OUString aTarget("_blank"); + OUString aURL; + OUString aTarget("_blank"); if ( pFileNameItem ) aURL = pFileNameItem->GetValue(); if ( pTargetItem ) diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index 0524f5993277..48f19c324a16 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -34,7 +34,6 @@ #define STREAM_BUFFER_SIZE 2048 // usings -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::makeAny; @@ -314,7 +313,7 @@ String SfxOleStringHelper::ImplLoadString8( SvStream& rStrm ) const rStrm >> nSize; // size field includes trailing NUL character DBG_ASSERT( (0 < nSize) && (nSize <= 0xFFFF), - rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM( + OStringBuffer(RTL_CONSTASCII_STRINGPARAM( "SfxOleStringHelper::ImplLoadString8 - invalid string of len ")). append(nSize).getStr() ); if( (0 < nSize) && (nSize <= 0xFFFF) ) @@ -352,7 +351,7 @@ String SfxOleStringHelper::ImplLoadString16( SvStream& rStrm ) const rStrm.SeekRel( 2 ); // create string from character array aBuffer.push_back( 0 ); - aValue = rtl::OUString( &aBuffer.front() ); + aValue = OUString( &aBuffer.front() ); } return aValue; } @@ -360,7 +359,7 @@ String SfxOleStringHelper::ImplLoadString16( SvStream& rStrm ) const void SfxOleStringHelper::ImplSaveString8( SvStream& rStrm, const String& rValue ) const { // encode to byte string - rtl::OString aEncoded(rtl::OUStringToOString(rValue, GetTextEncoding())); + OString aEncoded(OUStringToOString(rValue, GetTextEncoding())); // write size field (including trailing NUL character) sal_Int32 nSize = aEncoded.getLength() + 1; rStrm << nSize; diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx index 1cb518141d8a..3cad59816e8a 100644 --- a/sfx2/source/doc/ownsubfilterservice.cxx +++ b/sfx2/source/doc/ownsubfilterservice.cxx @@ -40,18 +40,18 @@ OwnSubFilterService::~OwnSubFilterService() } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OwnSubFilterService::impl_getStaticSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OwnSubFilterService::impl_getStaticSupportedServiceNames() { - uno::Sequence< ::rtl::OUString > aRet(2); - aRet[0] = ::rtl::OUString("com.sun.star.document.OwnSubFilter"); - aRet[1] = ::rtl::OUString("com.sun.star.comp.document.OwnSubFilter"); + uno::Sequence< OUString > aRet(2); + aRet[0] = OUString("com.sun.star.document.OwnSubFilter"); + aRet[1] = OUString("com.sun.star.comp.document.OwnSubFilter"); return aRet; } //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OwnSubFilterService::impl_getStaticImplementationName() +OUString SAL_CALL OwnSubFilterService::impl_getStaticImplementationName() { - return ::rtl::OUString("com.sun.star.comp.document.OwnSubFilter"); + return OUString("com.sun.star.comp.document.OwnSubFilter"); } //------------------------------------------------------------------------- @@ -125,17 +125,17 @@ void SAL_CALL OwnSubFilterService::initialize( const uno::Sequence< uno::Any >& // XServiceInfo //------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OwnSubFilterService::getImplementationName() +OUString SAL_CALL OwnSubFilterService::getImplementationName() throw ( uno::RuntimeException ) { return impl_getStaticImplementationName(); } //------------------------------------------------------------------------- -sal_Bool SAL_CALL OwnSubFilterService::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL OwnSubFilterService::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 ) @@ -145,7 +145,7 @@ sal_Bool SAL_CALL OwnSubFilterService::supportsService( const ::rtl::OUString& S } //------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OwnSubFilterService::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OwnSubFilterService::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_getStaticSupportedServiceNames(); diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx index 3df5b426dfee..07857565212c 100644 --- a/sfx2/source/doc/plugin.cxx +++ b/sfx2/source/doc/plugin.cxx @@ -63,8 +63,8 @@ const SfxItemPropertyMapEntry* lcl_GetPluginPropertyMap_Impl() static SfxItemPropertyMapEntry aPluginPropertyMap_Impl[] = { { MAP_CHAR_LEN("PluginCommands"), WID_COMMANDS, &::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), PROPERTY_UNBOUND, 0}, - { MAP_CHAR_LEN("PluginMimeType"), WID_MIMETYPE, &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("PluginURL"), WID_URL , &::getCppuType((const ::rtl::OUString*)0), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("PluginMimeType"), WID_MIMETYPE, &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, + { MAP_CHAR_LEN("PluginURL"), WID_URL , &::getCppuType((const OUString*)0), PROPERTY_UNBOUND, 0 }, {0,0,0,0,0,0} }; return aPluginPropertyMap_Impl; @@ -105,8 +105,8 @@ throw( uno::RuntimeException ) pWin->Show(); size_t nCount = maCmdList.size(); - uno::Sequence < ::rtl::OUString > aCmds( nCount ), aArgs( nCount ); - ::rtl::OUString *pCmds = aCmds.getArray(), *pArgs = aArgs.getArray(); + uno::Sequence < OUString > aCmds( nCount ), aArgs( nCount ); + OUString *pCmds = aCmds.getArray(), *pArgs = aArgs.getArray(); for( size_t i = 0; i < nCount; i++ ) { pCmds[i] = maCmdList[ i ].GetCommand(); @@ -136,9 +136,9 @@ throw( uno::RuntimeException ) uno::Reference< beans::XPropertySet > xProp( xModel, ::uno::UNO_QUERY ); if( xProp.is() ) { - uno::Any aValue = xProp->getPropertyValue( ::rtl::OUString( "URL" ) ); + uno::Any aValue = xProp->getPropertyValue( OUString( "URL" ) ); aValue >>= maURL; - aValue = xProp->getPropertyValue( ::rtl::OUString( "TYPE" ) ); + aValue = xProp->getPropertyValue( OUString( "TYPE" ) ); aValue >>= maMimeType; } } @@ -190,7 +190,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL PluginObject::getPropertySetI return xInfo; } -void SAL_CALL PluginObject::setPropertyValue(const ::rtl::OUString& aPropertyName, const uno::Any& aAny) +void SAL_CALL PluginObject::setPropertyValue(const OUString& aPropertyName, const uno::Any& aAny) throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if ( aPropertyName == "PluginURL" ) @@ -212,7 +212,7 @@ void SAL_CALL PluginObject::setPropertyValue(const ::rtl::OUString& aPropertyNam throw beans::UnknownPropertyException(); } -uno::Any SAL_CALL PluginObject::getPropertyValue(const ::rtl::OUString& aPropertyName) +uno::Any SAL_CALL PluginObject::getPropertyValue(const OUString& aPropertyName) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aAny; @@ -235,19 +235,19 @@ uno::Any SAL_CALL PluginObject::getPropertyValue(const ::rtl::OUString& aPropert return aAny; } -void SAL_CALL PluginObject::addPropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::addPropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } -void SAL_CALL PluginObject::removePropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::removePropertyChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } -void SAL_CALL PluginObject::addVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::addVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } -void SAL_CALL PluginObject::removeVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL PluginObject::removeVetoableChangeListener(const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) { } diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 8b78c9b15e82..85ddf0d3c366 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -300,7 +300,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() thro aPrinter.getArray()[0].Name = "Name"; String sStringTemp = pPrinter->GetName() ; - aPrinter.getArray()[0].Value <<= ::rtl::OUString( sStringTemp ); + aPrinter.getArray()[0].Value <<= OUString( sStringTemp ); return aPrinter; } @@ -334,7 +334,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > // Name-Property? if ( rProp.Name.compareToAscii( "Name" ) == 0 ) { - ::rtl::OUString aPrinterName; + OUString aPrinterName; if ( ! ( rProp.Value >>= aPrinterName ) ) throw ::com::sun::star::lang::IllegalArgumentException(); @@ -408,13 +408,13 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > // PrinterTray-Property else if ( rProp.Name.compareToAscii( "PrinterPaperTray" ) == 0 ) { - rtl::OUString aTmp; + OUString aTmp; if ( ( rProp.Value >>= aTmp ) == sal_False ) throw ::com::sun::star::lang::IllegalArgumentException(); sal_uInt16 nCount = pPrinter->GetPaperBinCount(); for (sal_uInt16 nBin=0; nBin<nCount; nBin++) { - ::rtl::OUString aName( pPrinter->GetPaperBinName(nBin) ); + OUString aName( pPrinter->GetPaperBinName(nBin) ); if ( aName == aTmp ) { pPrinter->SetPaperBin(nBin); @@ -533,19 +533,19 @@ class ImplUCBPrintWatcher : public ::osl::Thread if (aSplitter.removeSegment() && sFileName.Len()>0) { ::ucbhelper::Content aSource( - ::rtl::OUString((*ppTempFile)->GetURL()), + OUString((*ppTempFile)->GetURL()), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext()); ::ucbhelper::Content aTarget( - ::rtl::OUString(aSplitter.GetMainURL(INetURLObject::NO_DECODE)), + OUString(aSplitter.GetMainURL(INetURLObject::NO_DECODE)), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext()); aTarget.transferContent( aSource, ::ucbhelper::InsertOperation_COPY, - ::rtl::OUString(sFileName), + OUString(sFileName), ::com::sun::star::ucb::NameClash::OVERWRITE); } } @@ -618,9 +618,9 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& if ( rProp.Name.compareToAscii( "FileName" ) == 0 ) { // unpack th URL and check for a valid and well known protocol - ::rtl::OUString sTemp; + OUString sTemp; if ( - ( rProp.Value.getValueType()!=::getCppuType((const ::rtl::OUString*)0)) || + ( rProp.Value.getValueType()!=::getCppuType((const OUString*)0)) || (!(rProp.Value>>=sTemp)) ) { @@ -640,16 +640,16 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& // No ucb or thread will be necessary then. In case it couldnt be // converted its not an URL nor a system path. Then we can't accept // this parameter and have to throw an exception. - ::rtl::OUString sSystemPath(sTemp); - ::rtl::OUString sFileURL; + OUString sSystemPath(sTemp); + OUString sFileURL; if (::osl::FileBase::getFileURLFromSystemPath(sSystemPath,sFileURL)!=::osl::FileBase::E_None) throw ::com::sun::star::lang::IllegalArgumentException(); aCheckedArgs[nProps].Name = rProp.Name; aCheckedArgs[nProps++].Value <<= sFileURL; // and append the local filename aCheckedArgs.realloc( aCheckedArgs.getLength()+1 ); - aCheckedArgs[nProps].Name = rtl::OUString("LocalFileName"); - aCheckedArgs[nProps++].Value <<= ::rtl::OUString( sTemp ); + aCheckedArgs[nProps].Name = OUString("LocalFileName"); + aCheckedArgs[nProps++].Value <<= OUString( sTemp ); } else // It's a valid URL. but now we must know, if it is a local one or not. @@ -664,7 +664,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& aCheckedArgs[nProps++].Value <<= sTemp; // and append the local filename aCheckedArgs.realloc( aCheckedArgs.getLength()+1 ); - aCheckedArgs[nProps].Name = rtl::OUString("LocalFileName"); + aCheckedArgs[nProps].Name = OUString("LocalFileName"); aCheckedArgs[nProps++].Value <<= sPath; } else @@ -683,7 +683,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& //FIXME: does it work? aCheckedArgs[nProps].Name = "LocalFileName"; - aCheckedArgs[nProps++].Value <<= ::rtl::OUString( pUCBPrintTempFile->GetFileName() ); + aCheckedArgs[nProps++].Value <<= OUString( pUCBPrintTempFile->GetFileName() ); sUcbUrl = sURL; } } @@ -707,7 +707,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& sal_Bool bTemp = sal_Bool(); if ( rProp.Value >>= bTemp ) { - aCheckedArgs[nProps].Name = rtl::OUString("Collate"); + aCheckedArgs[nProps].Name = OUString("Collate"); aCheckedArgs[nProps++].Value <<= bTemp; } else @@ -717,7 +717,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& // Pages-Property else if ( rProp.Name.compareToAscii( "Pages" ) == 0 ) { - ::rtl::OUString sTemp; + OUString sTemp; if( rProp.Value >>= sTemp ) { aCheckedArgs[nProps].Name = rProp.Name; diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 974fab629555..3cfec8c97554 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -183,9 +183,9 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument // counter for SfxBaseModel instances created. static sal_Int64 g_nInstanceCounter ; SfxObjectShellRef m_pObjectShell ; - ::rtl::OUString m_sURL ; - ::rtl::OUString m_sRuntimeUID ; - ::rtl::OUString m_aPreusedFilterName; + OUString m_sURL ; + OUString m_sRuntimeUID ; + OUString m_aPreusedFilterName; ::cppu::OMultiTypeInterfaceContainerHelper m_aInterfaceContainer ; Reference< XInterface > m_xParent ; Reference< frame::XController > m_xCurrent ; @@ -207,7 +207,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument Reference< script::provider::XScriptProvider > m_xScriptProvider; Reference< ui::XUIConfigurationManager2 > m_xUIConfigurationManager; ::rtl::Reference< ::sfx2::DocumentStorageModifyListener > m_pStorageModifyListen; - ::rtl::OUString m_sModuleIdentifier; + OUString m_sModuleIdentifier; Reference< frame::XTitle > m_xTitleHelper; Reference< frame::XUntitledNumbers > m_xNumberedControllers; Reference< rdf::XDocumentMetadataAccess> m_xDocumentMetadata; @@ -238,7 +238,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument // increase global instance counter. ++g_nInstanceCounter; // set own Runtime UID - m_sRuntimeUID = rtl::OUString::valueOf( g_nInstanceCounter ); + m_sRuntimeUID = OUString::valueOf( g_nInstanceCounter ); } virtual ~IMPL_SfxBaseModel_DataContainer() @@ -267,7 +267,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument const Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext()); - ::rtl::OUString uri; + OUString uri; const Reference<frame::XModel> xModel( m_pObjectShell->GetModel()); const Reference<lang::XMultiComponentFactory> xMsf( @@ -275,7 +275,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument const Reference<frame:: XTransientDocumentsDocumentContentFactory> xTDDCF( xMsf->createInstanceWithContext( - ::rtl::OUString("com.sun.star.frame." + OUString("com.sun.star.frame." "TransientDocumentsDocumentContentFactory"), xContext), UNO_QUERY_THROW); @@ -290,7 +290,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument OSL_ENSURE(!uri.isEmpty(), "GetDMA: empty uri?"); if (!uri.isEmpty() && !uri.endsWithAsciiL("/", 1)) { - uri = uri + ::rtl::OUString("/"); + uri = uri + OUString("/"); } m_xDocumentMetadata = new ::sfx2::DocumentMetadataAccess( @@ -466,7 +466,7 @@ SfxSaveGuard::SfxSaveGuard(const Reference< frame::XModel >& xModel { if ( m_pData->m_bClosed ) throw lang::DisposedException( - ::rtl::OUString("Object already disposed."), + OUString("Object already disposed."), Reference< XInterface >()); if ( @@ -474,7 +474,7 @@ SfxSaveGuard::SfxSaveGuard(const Reference< frame::XModel >& xModel m_pData->m_bSaving ) throw io::IOException( - ::rtl::OUString("Concurrent save requests on the same document are not possible."), + OUString("Concurrent save requests on the same document are not possible."), Reference< XInterface >()); m_pData->m_bSaving = sal_True; @@ -686,8 +686,8 @@ Reference< container::XNameContainer > SAL_CALL SfxBaseModel::getLibraryContaine /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ -void SAL_CALL SfxBaseModel::createLibrary( const ::rtl::OUString& LibName, const ::rtl::OUString& Password, - const ::rtl::OUString& ExternalSourceURL, const ::rtl::OUString& LinkTargetURL ) +void SAL_CALL SfxBaseModel::createLibrary( const OUString& LibName, const OUString& Password, + const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) throw(container::ElementExistException, RuntimeException) { #ifdef DISABLE_SCRIPTING @@ -710,8 +710,8 @@ void SAL_CALL SfxBaseModel::createLibrary( const ::rtl::OUString& LibName, const /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ -void SAL_CALL SfxBaseModel::addModule( const ::rtl::OUString& LibraryName, const ::rtl::OUString& ModuleName, - const ::rtl::OUString& Language, const ::rtl::OUString& Source ) +void SAL_CALL SfxBaseModel::addModule( const OUString& LibraryName, const OUString& ModuleName, + const OUString& Language, const OUString& Source ) throw( container::NoSuchElementException, RuntimeException) { #ifdef DISABLE_SCRIPTING @@ -734,7 +734,7 @@ void SAL_CALL SfxBaseModel::addModule( const ::rtl::OUString& LibraryName, const /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ -void SAL_CALL SfxBaseModel::addDialog( const ::rtl::OUString& LibraryName, const ::rtl::OUString& DialogName, +void SAL_CALL SfxBaseModel::addDialog( const OUString& LibraryName, const OUString& DialogName, const Sequence< sal_Int8 >& Data ) throw(container::NoSuchElementException, RuntimeException) { @@ -907,7 +907,7 @@ void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject ) // frame::XModel //________________________________________________________________________________________________________ -sal_Bool SAL_CALL SfxBaseModel::attachResource( const ::rtl::OUString& rURL , +sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& rURL , const Sequence< beans::PropertyValue >& rArgs ) throw(RuntimeException) { @@ -994,7 +994,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const ::rtl::OUString& // frame::XModel //________________________________________________________________________________________________________ -::rtl::OUString SAL_CALL SfxBaseModel::getURL() throw(RuntimeException) +OUString SAL_CALL SfxBaseModel::getURL() throw(RuntimeException) { SfxModelGuard aGuard( *this ); return m_pData->m_sURL ; @@ -1038,13 +1038,13 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE aRectSeq[3] = aTmpRect.Bottom(); seqArgsNew.realloc( ++nNewLength ); - seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString("WinExtent"); + seqArgsNew[ nNewLength - 1 ].Name = OUString("WinExtent"); seqArgsNew[ nNewLength - 1 ].Value <<= aRectSeq; if ( !m_pData->m_aPreusedFilterName.isEmpty() ) { seqArgsNew.realloc( ++nNewLength ); - seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString("PreusedFilterName"); + seqArgsNew[ nNewLength - 1 ].Name = OUString("PreusedFilterName"); seqArgsNew[ nNewLength - 1 ].Value <<= m_pData->m_aPreusedFilterName; } @@ -1060,7 +1060,7 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE aBorderSeq[3] = aBorder.Bottom(); seqArgsNew.realloc( ++nNewLength ); - seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString("DocumentBorder"); + seqArgsNew[ nNewLength - 1 ].Name = OUString("DocumentBorder"); seqArgsNew[ nNewLength - 1 ].Value <<= aBorderSeq; } @@ -1170,7 +1170,7 @@ namespace } // XUndoAction - virtual ::rtl::OUString SAL_CALL getTitle() throw (RuntimeException); + virtual OUString SAL_CALL getTitle() throw (RuntimeException); virtual void SAL_CALL undo( ) throw (UndoFailedException, RuntimeException); virtual void SAL_CALL redo( ) throw (UndoFailedException, RuntimeException); @@ -1179,10 +1179,10 @@ namespace const bool m_bUndoIsUnlock; }; - ::rtl::OUString SAL_CALL ControllerLockUndoAction::getTitle() throw (RuntimeException) + OUString SAL_CALL ControllerLockUndoAction::getTitle() throw (RuntimeException) { // this action is intended to be used within an UndoContext only, so nobody will ever see this title ... - return ::rtl::OUString(); + return OUString(); } void SAL_CALL ControllerLockUndoAction::undo( ) throw (UndoFailedException, RuntimeException) @@ -1422,7 +1422,7 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo if (bDeliverOwnership) m_pData->m_bSuicide = sal_True; throw util::CloseVetoException( - ::rtl::OUString("Cant close while saving."), + OUString("Cant close while saving."), static_cast< util::XCloseable* >(this)); } @@ -1520,7 +1520,7 @@ sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException) // XStorable //________________________________________________________________________________________________________ -::rtl::OUString SAL_CALL SfxBaseModel::getLocation() throw(RuntimeException) +OUString SAL_CALL SfxBaseModel::getLocation() throw(RuntimeException) { SfxModelGuard aGuard( *this ); @@ -1530,7 +1530,7 @@ sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException) if ( m_pData->m_pObjectShell->IsDocShared() ) return m_pData->m_pObjectShell->GetSharedFileURL(); else - return ::rtl::OUString(m_pData->m_pObjectShell->GetMedium()->GetName()); + return OUString(m_pData->m_pObjectShell->GetMedium()->GetName()); } return m_pData->m_sURL; @@ -1562,7 +1562,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > if ( m_pData->m_pObjectShell.Is() ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "storeSelf" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeSelf" ) ); SfxSaveGuard aSaveGuard(this, m_pData, sal_False); sal_Bool bCheckIn = sal_False; @@ -1573,10 +1573,10 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > && aSeqArgs[nInd].Name != "InteractionHandler" && aSeqArgs[nInd].Name != "StatusIndicator" && aSeqArgs[nInd].Name != "VersionMajor" && aSeqArgs[nInd].Name != "CheckIn" ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "unexpected parameter for storeSelf, might be no problem if SaveAs is executed." ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "unexpected parameter for storeSelf, might be no problem if SaveAs is executed." ) ); m_pData->m_pObjectShell->StoreLog(); - ::rtl::OUString aMessage( "Unexpected MediaDescriptor parameter: " ); + OUString aMessage( "Unexpected MediaDescriptor parameter: " ); aMessage += aSeqArgs[nInd].Name; throw lang::IllegalArgumentException( aMessage, Reference< XInterface >(), 1 ); } @@ -1647,20 +1647,20 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > if ( bRet ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "successful saving." ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "successful saving." ) ); m_pData->m_aPreusedFilterName = GetMediumFilterName_Impl(); SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_SAVEDOCDONE, GlobalEventConfig::GetEventName(STR_EVENT_SAVEDOCDONE), m_pData->m_pObjectShell ) ); } else { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing failed!" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "Storing failed!" ) ); m_pData->m_pObjectShell->StoreLog(); // write the contents of the logger to the file SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_SAVEDOCFAILED, GlobalEventConfig::GetEventName(STR_EVENT_SAVEDOCFAILED), m_pData->m_pObjectShell ) ); - throw task::ErrorCodeIOException( ::rtl::OUString(), Reference< XInterface >(), nErrCode ); + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nErrCode ); } } @@ -1679,7 +1679,7 @@ void SAL_CALL SfxBaseModel::store() throw (io::IOException, RuntimeException) // XStorable //________________________________________________________________________________________________________ -void SAL_CALL SfxBaseModel::storeAsURL( const ::rtl::OUString& rURL , +void SAL_CALL SfxBaseModel::storeAsURL( const OUString& rURL , const Sequence< beans::PropertyValue >& rArgs ) throw (io::IOException, RuntimeException) { @@ -1689,7 +1689,7 @@ void SAL_CALL SfxBaseModel::storeAsURL( const ::rtl::OUString& if ( m_pData->m_pObjectShell.Is() ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "storeAsURL" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeAsURL" ) ); SfxSaveGuard aSaveGuard(this, m_pData, sal_False); impl_store( rURL, rArgs, sal_False ); @@ -1722,7 +1722,7 @@ Reference< XUndoManager > SAL_CALL SfxBaseModel::getUndoManager( ) throw (Runti // XStorable //________________________________________________________________________________________________________ -void SAL_CALL SfxBaseModel::storeToURL( const ::rtl::OUString& rURL , +void SAL_CALL SfxBaseModel::storeToURL( const OUString& rURL , const Sequence< beans::PropertyValue >& rArgs ) throw (io::IOException, RuntimeException) { @@ -1730,7 +1730,7 @@ void SAL_CALL SfxBaseModel::storeToURL( const ::rtl::OUString& if ( m_pData->m_pObjectShell.Is() ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "storeToURL" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeToURL" ) ); SfxSaveGuard aSaveGuard(this, m_pData, sal_False); impl_store( rURL, rArgs, sal_True ); } @@ -1742,7 +1742,7 @@ void SAL_CALL SfxBaseModel::storeToURL( const ::rtl::OUString& return m_pData->m_bModifiedSinceLastSave; } -void SAL_CALL SfxBaseModel::storeToRecoveryFile( const ::rtl::OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException ) +void SAL_CALL SfxBaseModel::storeToRecoveryFile( const OUString& i_TargetLocation, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException ) { SfxModelGuard aGuard( *this ); @@ -1754,7 +1754,7 @@ void SAL_CALL SfxBaseModel::storeToRecoveryFile( const ::rtl::OUString& i_Target m_pData->m_bModifiedSinceLastSave = sal_False; } -void SAL_CALL SfxBaseModel::recoverFromFile( const ::rtl::OUString& i_SourceLocation, const ::rtl::OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException ) +void SAL_CALL SfxBaseModel::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException ) { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); @@ -1762,12 +1762,12 @@ void SAL_CALL SfxBaseModel::recoverFromFile( const ::rtl::OUString& i_SourceLoca ::comphelper::NamedValueCollection aMediaDescriptor( i_MediaDescriptor ); // our load implementation expects the SalvagedFile to be in the media descriptor - OSL_ENSURE( !aMediaDescriptor.has( "SalvagedFile" ) || ( aMediaDescriptor.getOrDefault( "SalvagedFile", ::rtl::OUString() ) == i_SalvagedFile ), + OSL_ENSURE( !aMediaDescriptor.has( "SalvagedFile" ) || ( aMediaDescriptor.getOrDefault( "SalvagedFile", OUString() ) == i_SalvagedFile ), "SfxBaseModel::recoverFromFile: inconsistent information!" ); aMediaDescriptor.put( "SalvagedFile", i_SalvagedFile ); // similar for the to-be-loaded file - OSL_ENSURE( !aMediaDescriptor.has( "URL" ) || ( aMediaDescriptor.getOrDefault( "URL", ::rtl::OUString() ) == i_SourceLocation ), + OSL_ENSURE( !aMediaDescriptor.has( "URL" ) || ( aMediaDescriptor.getOrDefault( "URL", OUString() ) == i_SourceLocation ), "SfxBaseModel::recoverFromFile: inconsistent information!" ); aMediaDescriptor.put( "URL", i_SourceLocation ); @@ -1793,7 +1793,7 @@ void SAL_CALL SfxBaseModel::initNew() { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); if ( IsInitialized() ) - throw frame::DoubleInitializationException( ::rtl::OUString(), *this ); + throw frame::DoubleInitializationException( OUString(), *this ); // the object shell should exist always DBG_ASSERT( m_pData->m_pObjectShell.Is(), "Model is useless without an ObjectShell" ); @@ -1808,7 +1808,7 @@ void SAL_CALL SfxBaseModel::initNew() m_pData->m_pObjectShell->ResetError(); if ( !bRes ) - throw task::ErrorCodeIOException( ::rtl::OUString(), Reference< XInterface >(), nErrCode ); + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nErrCode ); } } @@ -1838,7 +1838,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); if ( IsInitialized() ) - throw frame::DoubleInitializationException( ::rtl::OUString(), *this ); + throw frame::DoubleInitializationException( OUString(), *this ); // the object shell should exist always DBG_ASSERT( m_pData->m_pObjectShell.Is(), "Model is useless without an ObjectShell" ); @@ -1887,7 +1887,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA nError = m_pData->m_pObjectShell->GetErrorCode(); if ( nError == ERRCODE_IO_BROKENPACKAGE && xHandler.is() ) { - ::rtl::OUString aDocName = pMedium->GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); + OUString aDocName = pMedium->GetURLObject().getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); SFX_ITEMSET_ARG( pMedium->GetItemSet(), pRepairItem, SfxBoolItem, SID_REPAIRPACKAGE, sal_False ); if ( !pRepairItem || !pRepairItem->GetValue() ) { @@ -1972,7 +1972,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA if ( !bWarning ) // #i30711# don't abort loading if it's only a warning { - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nError ? nError : ERRCODE_IO_CANTREAD ); } @@ -2248,55 +2248,55 @@ Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavo Sequence< datatransfer::DataFlavor > aFlavorSeq( nSuppFlavors ); aFlavorSeq[0].MimeType = - ::rtl::OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ); - aFlavorSeq[0].HumanPresentableName = ::rtl::OUString( "GDIMetaFile" ); + OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ); + aFlavorSeq[0].HumanPresentableName = OUString( "GDIMetaFile" ); aFlavorSeq[0].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[1].MimeType = - ::rtl::OUString( "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" ); - aFlavorSeq[1].HumanPresentableName = ::rtl::OUString( "GDIMetaFile" ); + OUString( "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" ); + aFlavorSeq[1].HumanPresentableName = OUString( "GDIMetaFile" ); aFlavorSeq[1].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[2].MimeType = - ::rtl::OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ); - aFlavorSeq[2].HumanPresentableName = ::rtl::OUString( "Enhanced Windows MetaFile" ); + OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ); + aFlavorSeq[2].HumanPresentableName = OUString( "Enhanced Windows MetaFile" ); aFlavorSeq[2].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[3].MimeType = - ::rtl::OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ); - aFlavorSeq[3].HumanPresentableName = ::rtl::OUString( "Windows MetaFile" ); + OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ); + aFlavorSeq[3].HumanPresentableName = OUString( "Windows MetaFile" ); aFlavorSeq[3].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[4].MimeType = - ::rtl::OUString( "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" ); - aFlavorSeq[4].HumanPresentableName = ::rtl::OUString( "Star Object Descriptor (XML)" ); + OUString( "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"" ); + aFlavorSeq[4].HumanPresentableName = OUString( "Star Object Descriptor (XML)" ); aFlavorSeq[4].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[5].MimeType = - ::rtl::OUString( "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"" ); - aFlavorSeq[5].HumanPresentableName = ::rtl::OUString( "Star Embed Source (XML)" ); + OUString( "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"" ); + aFlavorSeq[5].HumanPresentableName = OUString( "Star Embed Source (XML)" ); aFlavorSeq[5].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[6].MimeType = - ::rtl::OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ); - aFlavorSeq[6].HumanPresentableName = ::rtl::OUString( "Bitmap" ); + OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ); + aFlavorSeq[6].HumanPresentableName = OUString( "Bitmap" ); aFlavorSeq[6].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); aFlavorSeq[7].MimeType = - ::rtl::OUString( "image/png" ); - aFlavorSeq[7].HumanPresentableName = ::rtl::OUString( "PNG" ); + OUString( "image/png" ); + aFlavorSeq[7].HumanPresentableName = OUString( "PNG" ); aFlavorSeq[7].DataType = getCppuType( (const Sequence< sal_Int8 >*) 0 ); if ( nSuppFlavors == 10 ) { aFlavorSeq[8].MimeType = - ::rtl::OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ); - aFlavorSeq[8].HumanPresentableName = ::rtl::OUString( "Enhanced Windows MetaFile" ); + OUString( "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ); + aFlavorSeq[8].HumanPresentableName = OUString( "Enhanced Windows MetaFile" ); aFlavorSeq[8].DataType = getCppuType( (const sal_uInt64*) 0 ); aFlavorSeq[9].MimeType = - ::rtl::OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ); - aFlavorSeq[9].HumanPresentableName = ::rtl::OUString( "Windows MetaFile" ); + OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ); + aFlavorSeq[9].HumanPresentableName = OUString( "Windows MetaFile" ); aFlavorSeq[9].DataType = getCppuType( (const sal_uInt64*) 0 ); } @@ -2491,10 +2491,10 @@ void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< docume } // --------------------------------- -void SAL_CALL SfxBaseModel::notifyDocumentEvent( const ::rtl::OUString&, const Reference< frame::XController2 >&, const Any& ) +void SAL_CALL SfxBaseModel::notifyDocumentEvent( const OUString&, const Reference< frame::XController2 >&, const Any& ) throw ( lang::IllegalArgumentException, lang::NoSupportException, RuntimeException ) { - throw lang::NoSupportException( ::rtl::OUString( "SfxBaseModel controlls all the sent notifications itself!" ), Reference< XInterface >() ); + throw lang::NoSupportException( OUString( "SfxBaseModel controlls all the sent notifications itself!" ), Reference< XInterface >() ); } Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getCmisPropertiesValues() @@ -2533,7 +2533,7 @@ void SAL_CALL SfxBaseModel::checkOut( ) throw ( RuntimeException ) comphelper::getProcessComponentContext() ); Any aResult = aContent.executeCommand( "checkout", Any( ) ); - rtl::OUString sURL; + OUString sURL; aResult >>= sURL; m_pData->m_pObjectShell->GetMedium( )->SwitchDocumentToFile( sURL ); @@ -2564,7 +2564,7 @@ void SAL_CALL SfxBaseModel::cancelCheckOut( ) throw ( RuntimeException ) comphelper::getProcessComponentContext() ); Any aResult = aContent.executeCommand( "cancelCheckout", Any( ) ); - rtl::OUString sURL; + OUString sURL; aResult >>= sURL; m_pData->m_pObjectShell->GetMedium( )->SwitchDocumentToFile( sURL ); @@ -2583,7 +2583,7 @@ void SAL_CALL SfxBaseModel::cancelCheckOut( ) throw ( RuntimeException ) } } -void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const rtl::OUString& rMessage ) throw ( RuntimeException ) +void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const OUString& rMessage ) throw ( RuntimeException ) { SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); if ( pMedium ) @@ -2598,12 +2598,12 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const rtl::OUString& rMe aProps[2].Name = "CheckIn"; aProps[2].Value = makeAny( sal_True ); - rtl::OUString sName( pMedium->GetName( ) ); + OUString sName( pMedium->GetName( ) ); storeSelf( aProps ); // Refresh pMedium as it has probably changed during the storeSelf call pMedium = m_pData->m_pObjectShell->GetMedium( ); - rtl::OUString sNewName( pMedium->GetName( ) ); + OUString sNewName( pMedium->GetName( ) ); // URL has changed, update the document if ( sName != sNewName ) @@ -2624,7 +2624,7 @@ void SAL_CALL SfxBaseModel::checkIn( sal_Bool bIsMajor, const rtl::OUString& rMe } } -sal_Bool SfxBaseModel::getBoolPropertyValue( const rtl::OUString& rName ) throw ( RuntimeException ) +sal_Bool SfxBaseModel::getBoolPropertyValue( const OUString& rName ) throw ( RuntimeException ) { sal_Bool bValue = sal_False; if ( m_pData->m_pObjectShell ) @@ -2684,8 +2684,8 @@ void SfxBaseModel::loadCmisProperties( ) Reference<ucb::XCommandEnvironment>(), comphelper::getProcessComponentContext() ); Reference < beans::XPropertySetInfo > xProps = aContent.getProperties(); - ::rtl::OUString aCmisPropsValues( "CmisPropertiesValues" ); - ::rtl::OUString aCmisPropsNames( "CmisPropertiesDisplayNames" ); + OUString aCmisPropsValues( "CmisPropertiesValues" ); + OUString aCmisPropsNames( "CmisPropertiesDisplayNames" ); if ( xProps->hasPropertyByName( aCmisPropsValues ) ) { beans::PropertyValues aCmisValues; @@ -2712,7 +2712,7 @@ void SfxBaseModel::loadCmisProperties( ) // SfxListener //________________________________________________________________________________________________________ -void addTitle_Impl( Sequence < beans::PropertyValue >& rSeq, const ::rtl::OUString& rTitle ) +void addTitle_Impl( Sequence < beans::PropertyValue >& rSeq, const OUString& rTitle ) { sal_Int32 nCount = rSeq.getLength(); sal_Int32 nArg; @@ -2730,7 +2730,7 @@ void addTitle_Impl( Sequence < beans::PropertyValue >& rSeq, const ::rtl::OUStri if ( nArg == nCount ) { rSeq.realloc( nCount+1 ); - rSeq[nCount].Name = ::rtl::OUString( "Title" ); + rSeq[nCount].Name = OUString( "Title" ); rSeq[nCount].Value <<= rTitle; } } @@ -2759,7 +2759,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC , && m_pData->m_pObjectShell->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) { Reference< embed::XStorage > xConfigStorage; - rtl::OUString aUIConfigFolderName( "Configurations2" ); + OUString aUIConfigFolderName( "Configurations2" ); xConfigStorage = getDocumentSubStorage( aUIConfigFolderName, embed::ElementModes::READWRITE ); if ( !xConfigStorage.is() ) @@ -2794,7 +2794,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC , SfxItemSet *pSet = m_pData->m_pObjectShell->GetMedium()->GetItemSet(); Sequence< beans::PropertyValue > aArgs; - ::rtl::OUString aTitle = m_pData->m_pObjectShell->GetTitle(); + OUString aTitle = m_pData->m_pObjectShell->GetTitle(); TransformItems( SID_SAVEASDOC, *pSet, aArgs ); addTitle_Impl( aArgs, aTitle ); attachResource( m_pData->m_pObjectShell->GetMedium()->GetName(), aArgs ); @@ -2824,7 +2824,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC , { if ( pSimpleHint->GetId() == SFX_HINT_TITLECHANGED ) { - ::rtl::OUString aTitle = m_pData->m_pObjectShell->GetTitle(); + OUString aTitle = m_pData->m_pObjectShell->GetTitle(); addTitle_Impl( m_pData->m_seqArguments, aTitle ); postEvent_Impl( GlobalEventConfig::GetEventName( STR_EVENT_TITLECHANGED ) ); } @@ -2892,9 +2892,9 @@ sal_Bool SfxBaseModel::IsInitialized() const void SfxBaseModel::MethodEntryCheck( const bool i_mustBeInitialized ) const { if ( impl_isDisposed() ) - throw lang::DisposedException( ::rtl::OUString(), *const_cast< SfxBaseModel* >( this ) ); + throw lang::DisposedException( OUString(), *const_cast< SfxBaseModel* >( this ) ); if ( i_mustBeInitialized && !IsInitialized() ) - throw lang::NotInitializedException( ::rtl::OUString(), *const_cast< SfxBaseModel* >( this ) ); + throw lang::NotInitializedException( OUString(), *const_cast< SfxBaseModel* >( this ) ); } sal_Bool SfxBaseModel::impl_isDisposed() const @@ -2906,7 +2906,7 @@ sal_Bool SfxBaseModel::impl_isDisposed() const // private impl. //________________________________________________________________________________________________________ -::rtl::OUString SfxBaseModel::GetMediumFilterName_Impl() +OUString SfxBaseModel::GetMediumFilterName_Impl() { const SfxFilter* pFilter = NULL; SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); @@ -2916,10 +2916,10 @@ sal_Bool SfxBaseModel::impl_isDisposed() const if ( pFilter ) return pFilter->GetName(); - return ::rtl::OUString(); + return OUString(); } -void SfxBaseModel::impl_store( const ::rtl::OUString& sURL , +void SfxBaseModel::impl_store( const OUString& sURL , const Sequence< beans::PropertyValue >& seqArguments , sal_Bool bSaveTo ) { @@ -2934,8 +2934,8 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL // this is the same file URL as the current document location, try to use storeOwn if possible ::comphelper::SequenceAsHashMap aArgHash( seqArguments ); - ::rtl::OUString aFilterString( "FilterName" ); - ::rtl::OUString aFilterName = aArgHash.getUnpackedValueOrDefault( aFilterString, ::rtl::OUString() ); + OUString aFilterString( "FilterName" ); + OUString aFilterName = aArgHash.getUnpackedValueOrDefault( aFilterString, OUString() ); if ( !aFilterName.isEmpty() ) { SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); @@ -2945,7 +2945,7 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL if ( pFilter && aFilterName.equals( pFilter->GetFilterName() ) ) { aArgHash.erase( aFilterString ); - aArgHash.erase( ::rtl::OUString( "URL" ) ); + aArgHash.erase( OUString( "URL" ) ); try { @@ -2961,13 +2961,13 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL // TODO/LATER: need a new interaction for this case if ( m_pData->m_pObjectShell->IsDocShared() ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Can't store shared document!" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "Can't store shared document!" ) ); m_pData->m_pObjectShell->StoreLog(); - Sequence< beans::NamedValue > aNewEncryptionData = aArgHash.getUnpackedValueOrDefault( ::rtl::OUString( "EncryptionData" ), Sequence< beans::NamedValue >() ); + Sequence< beans::NamedValue > aNewEncryptionData = aArgHash.getUnpackedValueOrDefault( OUString( "EncryptionData" ), Sequence< beans::NamedValue >() ); if ( !aNewEncryptionData.getLength() ) { - ::rtl::OUString aNewPassword = aArgHash.getUnpackedValueOrDefault( ::rtl::OUString( "Password" ), ::rtl::OUString() ); + OUString aNewPassword = aArgHash.getUnpackedValueOrDefault( OUString( "Password" ), OUString() ); aNewEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( aNewPassword ); } @@ -2979,7 +2979,7 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL else { // if the password is changed a special error should be used in case of shared document - throw task::ErrorCodeIOException( ::rtl::OUString( "Cant change password for shared document." ), Reference< XInterface >(), ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ); + throw task::ErrorCodeIOException( OUString( "Cant change password for shared document." ), Reference< XInterface >(), ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ); } } #endif @@ -3005,11 +3005,11 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL if ( pCopyStreamItem && pCopyStreamItem->GetValue() && !bSaveTo ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Misuse of CopyStreamIfPossible!" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "Misuse of CopyStreamIfPossible!" ) ); m_pData->m_pObjectShell->StoreLog(); throw frame::IllegalArgumentIOException( - ::rtl::OUString( "CopyStreamIfPossible parameter is not acceptable for storeAsURL() call!"), + OUString( "CopyStreamIfPossible parameter is not acceptable for storeAsURL() call!"), Reference< XInterface >() ); } @@ -3065,7 +3065,7 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL sal_uInt32 nErrCode = m_pData->m_pObjectShell->GetErrorCode(); if ( !bRet && !nErrCode ) { - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing has failed, no error is set!" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "Storing has failed, no error is set!" ) ); nErrCode = ERRCODE_IO_CANTWRITE; } m_pData->m_pObjectShell->ResetError(); @@ -3086,7 +3086,7 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL } } - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing succeeded!" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "Storing succeeded!" ) ); if ( !bSaveTo ) { m_pData->m_aPreusedFilterName = GetMediumFilterName_Impl(); @@ -3105,7 +3105,7 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL else { // let the logring be stored to the related file - m_pData->m_pObjectShell->AddLog( ::rtl::OUString( OSL_LOG_PREFIX "Storing failed!" ) ); + m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "Storing failed!" ) ); m_pData->m_pObjectShell->StoreLog(); m_pData->m_pObjectShell->SetModifyPasswordHash( nOldModifyPasswordHash ); @@ -3115,7 +3115,7 @@ void SfxBaseModel::impl_store( const ::rtl::OUString& sURL SFX_APP()->NotifyEvent( SfxEventHint( bSaveTo ? SFX_EVENT_SAVETODOCFAILED : SFX_EVENT_SAVEASDOCFAILED, GlobalEventConfig::GetEventName( bSaveTo ? STR_EVENT_SAVETODOCFAILED : STR_EVENT_SAVEASDOCFAILED), m_pData->m_pObjectShell ) ); - throw task::ErrorCodeIOException( ::rtl::OUString(), Reference< XInterface >(), nErrCode ); + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nErrCode ); } } } @@ -3146,7 +3146,7 @@ public: }; } // anonymous namespace -void SfxBaseModel::postEvent_Impl( const ::rtl::OUString& aName, const Reference< frame::XController2 >& xController ) +void SfxBaseModel::postEvent_Impl( const OUString& aName, const Reference< frame::XController2 >& xController ) { // object already disposed? if ( impl_isDisposed() ) @@ -3336,7 +3336,7 @@ void SfxBaseModel::ListenForStorage_Impl( const Reference< embed::XStorage >& xS } } -Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentSubStorage( const ::rtl::OUString& aStorageName, sal_Int32 nMode ) +Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw ( RuntimeException) { SfxModelGuard aGuard( *this ); @@ -3360,13 +3360,13 @@ Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentSubStorage( const return xResult; } -Sequence< ::rtl::OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames() +Sequence< OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames() throw ( io::IOException, RuntimeException ) { SfxModelGuard aGuard( *this ); - Sequence< ::rtl::OUString > aResult; + Sequence< OUString > aResult; sal_Bool bSuccess = sal_False; if ( m_pData->m_pObjectShell.Is() ) { @@ -3374,7 +3374,7 @@ Sequence< ::rtl::OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames() Reference < container::XNameAccess > xAccess( xStorage, UNO_QUERY ); if ( xAccess.is() ) { - Sequence< ::rtl::OUString > aTemp = xAccess->getElementNames(); + Sequence< OUString > aTemp = xAccess->getElementNames(); sal_Int32 nResultSize = 0; for ( sal_Int32 n = 0; n < aTemp.getLength(); n++ ) { @@ -3427,7 +3427,7 @@ Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getScriptP // XUIConfigurationManagerSupplier //____________________________________________________________________________________________________ -rtl::OUString SfxBaseModel::getRuntimeUID() const +OUString SfxBaseModel::getRuntimeUID() const { OSL_ENSURE( !m_pData->m_sRuntimeUID.isEmpty(), "SfxBaseModel::getRuntimeUID - ID is empty!" ); @@ -3442,7 +3442,7 @@ sal_Bool SfxBaseModel::hasValidSignatures() const return sal_False; } -static void GetCommandFromSequence( rtl::OUString& rCommand, sal_Int32& nIndex, const Sequence< beans::PropertyValue >& rSeqPropValue ) +static void GetCommandFromSequence( OUString& rCommand, sal_Int32& nIndex, const Sequence< beans::PropertyValue >& rSeqPropValue ) { nIndex = -1; @@ -3463,27 +3463,27 @@ static void ConvertSlotsToCommands( SfxObjectShell* pDoc, Reference< container:: { Any aAny; SfxModule* pModule( pDoc->GetFactory().GetModule() ); - rtl::OUString aSlotCmd( "slot:" ); - rtl::OUString aUnoCmd( ".uno:" ); + OUString aSlotCmd( "slot:" ); + OUString aUnoCmd( ".uno:" ); Sequence< beans::PropertyValue > aSeqPropValue; for ( sal_Int32 i = 0; i < rToolbarDefinition->getCount(); i++ ) { sal_Int32 nIndex( -1 ); - rtl::OUString aCommand; + OUString aCommand; if ( rToolbarDefinition->getByIndex( i ) >>= aSeqPropValue ) { GetCommandFromSequence( aCommand, nIndex, aSeqPropValue ); if ( nIndex >= 0 && ( aCommand.indexOf( aSlotCmd ) == 0 )) { - rtl::OUString aSlot( aCommand.copy( 5 )); + OUString aSlot( aCommand.copy( 5 )); // We have to replace the old "slot-Command" with our new ".uno:-Command" const SfxSlot* pSlot = pModule->GetSlotPool()->GetSlot( sal_uInt16( aSlot.toInt32() )); if ( pSlot ) { - rtl::OUStringBuffer aStrBuf( aUnoCmd ); + OUStringBuffer aStrBuf( aUnoCmd ); aStrBuf.appendAscii( pSlot->GetUnoName() ); aCommand = aStrBuf.makeStringAndClear(); @@ -3514,15 +3514,15 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage Reference< embed::XStorage > xConfigStorage; - rtl::OUString aUIConfigFolderName( "Configurations2" ); + OUString aUIConfigFolderName( "Configurations2" ); // First try to open with READWRITE and then READ xConfigStorage = getDocumentSubStorage( aUIConfigFolderName, embed::ElementModes::READWRITE ); if ( xConfigStorage.is() ) { - rtl::OUString aMediaTypeProp( "MediaType" ); - rtl::OUString aUIConfigMediaType( + OUString aMediaTypeProp( "MediaType" ); + OUString aUIConfigMediaType( "application/vnd.sun.xml.ui.configuration" ); - rtl::OUString aMediaType; + OUString aMediaType; Reference< beans::XPropertySet > xPropSet( xConfigStorage, UNO_QUERY ); Any a = xPropSet->getPropertyValue( aMediaTypeProp ); if ( !( a >>= aMediaType ) || aMediaType.isEmpty()) @@ -3543,7 +3543,7 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage { // Import old UI configuration from OOo 1.x Reference< embed::XStorage > xOOo1ConfigStorage; - rtl::OUString aOOo1UIConfigFolderName( "Configurations" ); + OUString aOOo1UIConfigFolderName( "Configurations" ); // Try to open with READ xOOo1ConfigStorage = getDocumentSubStorage( aOOo1UIConfigFolderName, embed::ElementModes::READ ); @@ -3558,12 +3558,12 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage { SfxObjectShell* pObjShell = SfxBaseModel::GetObjectShell(); - rtl::OUString aNum( "private:resource/toolbar/custom_OOo1x_" ); - rtl::OUString aTitle( "Toolbar " ); + OUString aNum( "private:resource/toolbar/custom_OOo1x_" ); + OUString aTitle( "Toolbar " ); for ( sal_Int32 i = 0; i < rToolbars.getLength(); i++ ) { - rtl::OUString aCustomTbxName = aNum + rtl::OUString::valueOf( i + 1 ); - rtl::OUString aCustomTbxTitle = aTitle + rtl::OUString::valueOf( i + 1 ); + OUString aCustomTbxName = aNum + OUString::valueOf( i + 1 ); + OUString aCustomTbxTitle = aTitle + OUString::valueOf( i + 1 ); Reference< container::XIndexContainer > xToolbar = rToolbars[i]; ConvertSlotsToCommands( pObjShell, xToolbar ); @@ -3575,7 +3575,7 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage { try { - rtl::OUString aPropName( "UIName" ); + OUString aPropName( "UIName" ); Any aAny( aCustomTbxTitle ); xPropSet->setPropertyValue( aPropName, aAny ); } @@ -3672,8 +3672,8 @@ embed::VisualRepresentation SAL_CALL SfxBaseModel::getPreferredVisualRepresentat SfxModelGuard aGuard( *this ); datatransfer::DataFlavor aDataFlavor( - ::rtl::OUString("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ), - ::rtl::OUString("GDIMetaFile"), + OUString("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ), + OUString("GDIMetaFile"), ::getCppuType( (const Sequence< sal_Int8 >*) NULL ) ); embed::VisualRepresentation aVisualRepresentation; @@ -3697,7 +3697,7 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >& { SfxModelGuard aGuard( *this, SfxModelGuard::E_INITIALIZING ); if ( IsInitialized() ) - throw frame::DoubleInitializationException( ::rtl::OUString(), *this ); + throw frame::DoubleInitializationException( OUString(), *this ); // after i36090 is fixed the pool from object shell can be used // SfxAllItemSet aSet( m_pData->m_pObjectShell->GetPool() ); @@ -3720,7 +3720,7 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >& if ( !m_pData->m_pObjectShell->DoLoad(pMedium) ) { sal_uInt32 nError = m_pData->m_pObjectShell->GetErrorCode(); - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nError ? nError : ERRCODE_IO_CANTREAD ); } @@ -3783,7 +3783,7 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >& // the warnings are currently not transported if ( !bSuccess ) { - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nError ? nError : ERRCODE_IO_GENERAL ); } @@ -3807,7 +3807,7 @@ void SAL_CALL SfxBaseModel::switchToStorage( const Reference< embed::XStorage >& if ( !m_pData->m_pObjectShell->SwitchPersistance( xStorage ) ) { sal_uInt32 nError = m_pData->m_pObjectShell->GetErrorCode(); - throw task::ErrorCodeIOException( ::rtl::OUString(), + throw task::ErrorCodeIOException( OUString(), Reference< XInterface >(), nError ? nError : ERRCODE_IO_GENERAL ); } @@ -3871,7 +3871,7 @@ bool SfxBaseModel::impl_getPrintHelper() //============================================================================= // css.frame.XModule - void SAL_CALL SfxBaseModel::setIdentifier(const ::rtl::OUString& Identifier) + void SAL_CALL SfxBaseModel::setIdentifier(const OUString& Identifier) throw (RuntimeException) { SfxModelGuard aGuard( *this ); @@ -3880,7 +3880,7 @@ bool SfxBaseModel::impl_getPrintHelper() //============================================================================= // css.frame.XModule - ::rtl::OUString SAL_CALL SfxBaseModel::getIdentifier() + OUString SAL_CALL SfxBaseModel::getIdentifier() throw (RuntimeException) { SfxModelGuard aGuard( *this ); @@ -3888,7 +3888,7 @@ bool SfxBaseModel::impl_getPrintHelper() return m_pData->m_sModuleIdentifier; if (m_pData->m_pObjectShell) return m_pData->m_pObjectShell->GetFactory().GetDocumentServiceName(); - return ::rtl::OUString(); + return OUString(); } //============================================================================= @@ -3924,7 +3924,7 @@ Reference< frame::XUntitledNumbers > SfxBaseModel::impl_getUntitledHelper () m_pData->m_xNumberedControllers = Reference< frame::XUntitledNumbers >(static_cast< ::cppu::OWeakObject* >(pHelper), UNO_QUERY_THROW); pHelper->setOwner (xThis); - pHelper->setUntitledPrefix (::rtl::OUString(" : ")); + pHelper->setUntitledPrefix (OUString(" : ")); } return m_pData->m_xNumberedControllers; @@ -3932,13 +3932,13 @@ Reference< frame::XUntitledNumbers > SfxBaseModel::impl_getUntitledHelper () //============================================================================= // css.frame.XTitle -::rtl::OUString SAL_CALL SfxBaseModel::getTitle() +OUString SAL_CALL SfxBaseModel::getTitle() throw (RuntimeException) { // SYNCHRONIZED -> SfxModelGuard aGuard( *this ); - ::rtl::OUString aResult = impl_getTitleHelper()->getTitle (); + OUString aResult = impl_getTitleHelper()->getTitle (); if ( !m_pData->m_bExternalTitle && m_pData->m_pObjectShell ) { SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); @@ -3952,7 +3952,7 @@ Reference< frame::XUntitledNumbers > SfxBaseModel::impl_getUntitledHelper () = aContent.getProperties(); if ( xProps.is() ) { - ::rtl::OUString aServerTitle( "TitleOnServer" ); + OUString aServerTitle( "TitleOnServer" ); if ( xProps->hasPropertyByName( aServerTitle ) ) { Any aAny = aContent.getPropertyValue( aServerTitle ); @@ -3985,7 +3985,7 @@ Reference< frame::XUntitledNumbers > SfxBaseModel::impl_getUntitledHelper () //============================================================================= // css.frame.XTitle -void SAL_CALL SfxBaseModel::setTitle( const ::rtl::OUString& sTitle ) +void SAL_CALL SfxBaseModel::setTitle( const OUString& sTitle ) throw (RuntimeException) { // SYNCHRONIZED -> @@ -4054,7 +4054,7 @@ void SAL_CALL SfxBaseModel::releaseNumberForComponent( const Reference< XInterfa //============================================================================= // css.frame.XUntitledNumbers -::rtl::OUString SAL_CALL SfxBaseModel::getUntitledPrefix() +OUString SAL_CALL SfxBaseModel::getUntitledPrefix() throw (RuntimeException) { SfxModelGuard aGuard( *this ); @@ -4081,7 +4081,7 @@ Reference< container::XEnumeration > SAL_CALL SfxBaseModel::getControllers() //============================================================================= // frame::XModel2 -Sequence< ::rtl::OUString > SAL_CALL SfxBaseModel::getAvailableViewControllerNames() +Sequence< OUString > SAL_CALL SfxBaseModel::getAvailableViewControllerNames() throw (RuntimeException) { SfxModelGuard aGuard( *this ); @@ -4089,7 +4089,7 @@ Sequence< ::rtl::OUString > SAL_CALL SfxBaseModel::getAvailableViewControllerNam const SfxObjectFactory& rDocumentFactory = GetObjectShell()->GetFactory(); const sal_Int16 nViewFactoryCount = rDocumentFactory.GetViewFactoryCount(); - Sequence< ::rtl::OUString > aViewNames( nViewFactoryCount ); + Sequence< OUString > aViewNames( nViewFactoryCount ); for ( sal_Int16 nViewNo = 0; nViewNo < nViewFactoryCount; ++nViewNo ) aViewNames[nViewNo] = rDocumentFactory.GetViewFactory( nViewNo ).GetAPIViewName(); return aViewNames; @@ -4105,7 +4105,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createDefaultViewControl SfxModelGuard aGuard( *this ); const SfxObjectFactory& rDocumentFactory = GetObjectShell()->GetFactory(); - const ::rtl::OUString sDefaultViewName = rDocumentFactory.GetViewFactory( 0 ).GetAPIViewName(); + const OUString sDefaultViewName = rDocumentFactory.GetViewFactory( 0 ).GetAPIViewName(); aGuard.clear(); @@ -4213,7 +4213,7 @@ SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame //============================================================================= // frame::XModel2 Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( - const ::rtl::OUString& i_rViewName, const Sequence< PropertyValue >& i_rArguments, const Reference< XFrame >& i_rFrame ) + const OUString& i_rViewName, const Sequence< PropertyValue >& i_rArguments, const Reference< XFrame >& i_rFrame ) throw (RuntimeException , lang::IllegalArgumentException, Exception ) @@ -4221,12 +4221,12 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( SfxModelGuard aGuard( *this ); if ( !i_rFrame.is() ) - throw lang::IllegalArgumentException( ::rtl::OUString(), *this, 3 ); + throw lang::IllegalArgumentException( OUString(), *this, 3 ); // find the proper SFX view factory SfxViewFactory* pViewFactory = GetObjectShell()->GetFactory().GetViewFactoryByViewName( i_rViewName ); if ( !pViewFactory ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); // determine previous shell (used in some special cases) Reference< XController > xPreviousController( i_rFrame->getController() ); @@ -4308,7 +4308,7 @@ SfxBaseModel::getRDFRepository() throw (RuntimeException) const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4316,14 +4316,14 @@ SfxBaseModel::getRDFRepository() throw (RuntimeException) } // rdf::XNode: -::rtl::OUString SAL_CALL +OUString SAL_CALL SfxBaseModel::getStringValue() throw (RuntimeException) { SfxModelGuard aGuard( *this ); const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4331,28 +4331,28 @@ SfxBaseModel::getStringValue() throw (RuntimeException) } // rdf::XURI: -::rtl::OUString SAL_CALL +OUString SAL_CALL SfxBaseModel::getNamespace() throw (RuntimeException) { SfxModelGuard aGuard( *this ); const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } return xDMA->getNamespace(); } -::rtl::OUString SAL_CALL +OUString SAL_CALL SfxBaseModel::getLocalName() throw (RuntimeException) { SfxModelGuard aGuard( *this ); const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4369,7 +4369,7 @@ throw (RuntimeException) const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4384,7 +4384,7 @@ throw (RuntimeException, lang::IllegalArgumentException) const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4400,7 +4400,7 @@ throw (RuntimeException, lang::IllegalArgumentException) const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4408,7 +4408,7 @@ throw (RuntimeException, lang::IllegalArgumentException) } Reference<rdf::XURI> SAL_CALL -SfxBaseModel::addMetadataFile(const ::rtl::OUString & i_rFileName, +SfxBaseModel::addMetadataFile(const OUString & i_rFileName, const Sequence < Reference< rdf::XURI > > & i_rTypes) throw (RuntimeException, lang::IllegalArgumentException, container::ElementExistException) @@ -4417,7 +4417,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4427,7 +4427,7 @@ throw (RuntimeException, lang::IllegalArgumentException, Reference<rdf::XURI> SAL_CALL SfxBaseModel::importMetadataFile(::sal_Int16 i_Format, const Reference< io::XInputStream > & i_xInStream, - const ::rtl::OUString & i_rFileName, + const OUString & i_rFileName, const Reference< rdf::XURI > & i_xBaseURI, const Sequence < Reference< rdf::XURI > > & i_rTypes) throw (RuntimeException, lang::IllegalArgumentException, @@ -4438,7 +4438,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4456,7 +4456,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4464,7 +4464,7 @@ throw (RuntimeException, lang::IllegalArgumentException, } void SAL_CALL -SfxBaseModel::addContentOrStylesFile(const ::rtl::OUString & i_rFileName) +SfxBaseModel::addContentOrStylesFile(const OUString & i_rFileName) throw (RuntimeException, lang::IllegalArgumentException, container::ElementExistException) { @@ -4472,7 +4472,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4480,7 +4480,7 @@ throw (RuntimeException, lang::IllegalArgumentException, } void SAL_CALL -SfxBaseModel::removeContentOrStylesFile(const ::rtl::OUString & i_rFileName) +SfxBaseModel::removeContentOrStylesFile(const OUString & i_rFileName) throw (RuntimeException, lang::IllegalArgumentException, container::NoSuchElementException) { @@ -4488,7 +4488,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4508,7 +4508,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference<rdf::XDocumentMetadataAccess> xDMA( m_pData->CreateDMAUninitialized()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4535,7 +4535,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4553,7 +4553,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference<rdf::XDocumentMetadataAccess> xDMA( m_pData->CreateDMAUninitialized()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } @@ -4579,7 +4579,7 @@ throw (RuntimeException, lang::IllegalArgumentException, const Reference<rdf::XDocumentMetadataAccess> xDMA(m_pData->GetDMA()); if (!xDMA.is()) { - throw RuntimeException( ::rtl::OUString( + throw RuntimeException( OUString( "model has no document metadata"), *this ); } diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index 4adb3b96c077..bb6b1d68745c 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -69,9 +69,9 @@ namespace sfx2 public: SfxModelFactory( const Reference< XMultiServiceFactory >& _rxServiceFactory, - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, - const Sequence< ::rtl::OUString >& _rServiceNames + const Sequence< OUString >& _rServiceNames ); // XSingleServiceFactory @@ -79,9 +79,9 @@ namespace sfx2 virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); protected: virtual ~SfxModelFactory(); @@ -91,8 +91,8 @@ namespace sfx2 private: const Reference< XMultiServiceFactory > m_xServiceFactory; - const ::rtl::OUString m_sImplementationName; - const Sequence< ::rtl::OUString > m_aServiceNames; + const OUString m_sImplementationName; + const Sequence< OUString > m_aServiceNames; const SfxModelFactoryFunc m_pComponentFactoryFunc; }; @@ -101,8 +101,8 @@ namespace sfx2 //==================================================================== //-------------------------------------------------------------------- SfxModelFactory::SfxModelFactory( const Reference< XMultiServiceFactory >& _rxServiceFactory, - const ::rtl::OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, - const Sequence< ::rtl::OUString >& _rServiceNames ) + const OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, + const Sequence< OUString >& _rServiceNames ) :m_xServiceFactory( _rxServiceFactory ) ,m_sImplementationName( _rImplementationName ) ,m_aServiceNames( _rServiceNames ) @@ -132,7 +132,7 @@ namespace sfx2 { struct IsSpecialArgument : public ::std::unary_function< Any, bool > { - static bool isSpecialArgumentName( const ::rtl::OUString& _rValueName ) + static bool isSpecialArgumentName( const OUString& _rValueName ) { return _rValueName == "EmbeddedObject" || _rValueName == "EmbeddedScriptSupport" || _rValueName == "DocumentRecoverySupport"; } @@ -189,13 +189,13 @@ namespace sfx2 } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL SfxModelFactory::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL SfxModelFactory::getImplementationName( ) throw (RuntimeException) { return m_sImplementationName; } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL SfxModelFactory::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL SfxModelFactory::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return ::std::find( m_aServiceNames.getConstArray(), @@ -205,15 +205,15 @@ namespace sfx2 } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL SfxModelFactory::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL SfxModelFactory::getSupportedServiceNames( ) throw (RuntimeException) { return m_aServiceNames; } //-------------------------------------------------------------------- Reference< XSingleServiceFactory > createSfxModelFactory( const Reference< XMultiServiceFactory >& _rxServiceFactory, - const ::rtl::OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, - const Sequence< ::rtl::OUString >& _rServiceNames ) + const OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc, + const Sequence< OUString >& _rServiceNames ) { return new SfxModelFactory( _rxServiceFactory, _rImplementationName, _pComponentFactoryFunc, _rServiceNames ); } diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index 888272a72642..939141b5f957 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -113,11 +113,11 @@ bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberI assert(nMemberId == 0); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOM_PARAMS ); - aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUE )); + aSeq[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUE )); aSeq[0].Value <<= sal_Int32( GetValue() ); - aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUESET )); + aSeq[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_VALUESET )); aSeq[1].Value <<= sal_Int16( nValueSet ); - aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE )); + aSeq[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOM_PARAM_TYPE )); aSeq[2].Value <<= sal_Int16( eType ); rVal <<= aSeq; diff --git a/sfx2/source/inc/SfxDocumentMetaData.hxx b/sfx2/source/inc/SfxDocumentMetaData.hxx index 080713a2efeb..2f7ad4ad12f5 100644 --- a/sfx2/source/inc/SfxDocumentMetaData.hxx +++ b/sfx2/source/inc/SfxDocumentMetaData.hxx @@ -28,8 +28,8 @@ namespace comp_SfxDocumentMetaData { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); @@ -38,8 +38,8 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL _create( namespace comp_CompatWriterDocProps { // component and service helper functions: -::rtl::OUString SAL_CALL _getImplementationName(); -css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames(); +OUString SAL_CALL _getImplementationName(); +css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); css::uno::Reference< css::uno::XInterface > SAL_CALL _create( css::uno::Reference< css::uno::XComponentContext > const & context ); diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx index e45205e23566..afec42ee9107 100644 --- a/sfx2/source/inc/appbaslib.hxx +++ b/sfx2/source/inc/appbaslib.hxx @@ -84,7 +84,7 @@ public: /** checks if any modules in the SfxLibraryContainer exceed the binary limits. */ - sal_Bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< rtl::OUString >& sModules ); + sal_Bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< OUString >& sModules ); private: @@ -99,8 +99,8 @@ class SfxApplicationScriptLibraryContainer { public: // Service - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); - static ::rtl::OUString impl_getStaticImplementationName(); + static ::com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); + static OUString impl_getStaticImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance ( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::Exception ); @@ -113,8 +113,8 @@ class SfxApplicationDialogLibraryContainer { public: // Service - static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames(); - static ::rtl::OUString impl_getStaticImplementationName(); + static ::com::sun::star::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); + static OUString impl_getStaticImplementationName(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance ( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ) throw( ::com::sun::star::uno::Exception ); diff --git a/sfx2/source/inc/doctemplates.hxx b/sfx2/source/inc/doctemplates.hxx index a363f9e1c391..99a1b94863e4 100644 --- a/sfx2/source/inc/doctemplates.hxx +++ b/sfx2/source/inc/doctemplates.hxx @@ -56,21 +56,21 @@ public: // --- XDocumentTemplates --- css::uno::Reference< css::ucb::XContent > SAL_CALL getContent() throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL storeTemplate( const ::rtl::OUString& GroupName, - const ::rtl::OUString& TemplateName, + sal_Bool SAL_CALL storeTemplate( const OUString& GroupName, + const OUString& TemplateName, const css::uno::Reference< css::frame::XStorable >& Storable ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL addTemplate( const ::rtl::OUString& GroupName, - const ::rtl::OUString& TemplateName, - const ::rtl::OUString& SourceURL ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL removeTemplate( const ::rtl::OUString& GroupName, - const ::rtl::OUString& TemplateName ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL renameTemplate( const ::rtl::OUString& GroupName, - const ::rtl::OUString& OldTemplateName, - const ::rtl::OUString& NewTemplateName ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL addGroup( const ::rtl::OUString& GroupName ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL removeGroup( const ::rtl::OUString& GroupName ) throw( css::uno::RuntimeException ); - sal_Bool SAL_CALL renameGroup( const ::rtl::OUString& OldGroupName, - const ::rtl::OUString& NewGroupName ) throw( css::uno::RuntimeException ); + sal_Bool SAL_CALL addTemplate( const OUString& GroupName, + const OUString& TemplateName, + const OUString& SourceURL ) throw( css::uno::RuntimeException ); + sal_Bool SAL_CALL removeTemplate( const OUString& GroupName, + const OUString& TemplateName ) throw( css::uno::RuntimeException ); + sal_Bool SAL_CALL renameTemplate( const OUString& GroupName, + const OUString& OldTemplateName, + const OUString& NewTemplateName ) throw( css::uno::RuntimeException ); + sal_Bool SAL_CALL addGroup( const OUString& GroupName ) throw( css::uno::RuntimeException ); + sal_Bool SAL_CALL removeGroup( const OUString& GroupName ) throw( css::uno::RuntimeException ); + sal_Bool SAL_CALL renameGroup( const OUString& OldGroupName, + const OUString& NewGroupName ) throw( css::uno::RuntimeException ); void SAL_CALL update() throw( css::uno::RuntimeException ); }; diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index 2ac1da4b33d4..569fdb7ff509 100644 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -64,7 +64,7 @@ namespace sfx2 virtual void SAL_CALL release( ) throw (); // XUndoManager - virtual void SAL_CALL enterUndoContext( const ::rtl::OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); @@ -72,10 +72,10 @@ namespace sfx2 virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 9380cbd980e3..84209181266b 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -57,7 +57,7 @@ class SvxMacro; class SfxEvents_Impl : public ::cppu::WeakImplHelper2< css::container::XNameReplace, css::document::XEventListener > { - css::uno::Sequence< ::rtl::OUString > maEventNames; + css::uno::Sequence< OUString > maEventNames; css::uno::Sequence< css::uno::Any > maEventData; css::uno::Reference< css::document::XEventBroadcaster > mxBroadcaster; ::osl::Mutex maMutex; @@ -71,16 +71,16 @@ public: ~SfxEvents_Impl(); // --- XNameReplace --- - virtual void SAL_CALL replaceByName( const ::rtl::OUString & aName, const css::uno::Any & aElement ) + virtual void SAL_CALL replaceByName( const OUString & aName, const css::uno::Any & aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException ); // --- XNameAccess ( parent of XNameReplace ) --- - virtual css::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() throw ( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw ( css::uno::RuntimeException ); + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw ( css::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw ( css::uno::RuntimeException ); // --- XElementAccess ( parent of XNameAccess ) --- virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException ); @@ -181,7 +181,7 @@ public: // css.document.XDocumentEventBroadcaster virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException); virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException); - virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException); + virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException); // css.document.XEventListener virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) diff --git a/sfx2/source/inc/iframe.hxx b/sfx2/source/inc/iframe.hxx index 1e3174fea9b7..0dfc1c3c5a53 100644 --- a/sfx2/source/inc/iframe.hxx +++ b/sfx2/source/inc/iframe.hxx @@ -67,15 +67,15 @@ class IFrameObject : public ::cppu::WeakImplHelper6 < virtual void SAL_CALL addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); public: SFX_DECL_XSERVICEINFO diff --git a/sfx2/source/inc/inputdlg.hxx b/sfx2/source/inc/inputdlg.hxx index 1dce2fb2baa9..cf7b3a3b8872 100644 --- a/sfx2/source/inc/inputdlg.hxx +++ b/sfx2/source/inc/inputdlg.hxx @@ -20,11 +20,11 @@ class InputDialog : public ModalDialog { public: - InputDialog (const rtl::OUString &labelText, Window *pParent = NULL); + InputDialog (const OUString &labelText, Window *pParent = NULL); virtual ~InputDialog(); - rtl::OUString getEntryText () const; + OUString getEntryText () const; private: diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index 868995f24c65..251d24222c24 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -57,7 +57,7 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess xBasicLibraries; ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > xDialogLibraries; - com::sun::star::uno::Sequence < rtl::OUString > xEventNames; + com::sun::star::uno::Sequence < OUString > xEventNames; ::sfx2::DocumentMacroMode aMacroMode; SfxProgress* pProgress; @@ -130,7 +130,7 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess sal_Bool m_bIsInit; - ::rtl::OUString m_aSharedFileURL; + OUString m_aSharedFileURL; ::com::sun::star::uno::Reference< ::com::sun::star::logging::XSimpleLogRing > m_xLogRing; @@ -147,7 +147,7 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess // IMacroDocumentAccess overridables virtual sal_Int16 getCurrentMacroExecMode() const; virtual sal_Bool setCurrentMacroExecMode( sal_uInt16 nMacroMode ); - virtual ::rtl::OUString getDocumentLocation() const; + virtual OUString getDocumentLocation() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getZipStorageToSign(); virtual sal_Bool documentStorageHasMacros() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const; diff --git a/sfx2/source/inc/openuriexternally.hxx b/sfx2/source/inc/openuriexternally.hxx index 79a05a86b03d..baf7e1761ce8 100644 --- a/sfx2/source/inc/openuriexternally.hxx +++ b/sfx2/source/inc/openuriexternally.hxx @@ -48,7 +48,7 @@ namespace sfx2 { /// /// @return true iff execution was successful bool openUriExternally( - rtl::OUString const & uri, bool handleSystemShellExecuteException); + OUString const & uri, bool handleSystemShellExecuteException); } diff --git a/sfx2/source/inc/ownsubfilterservice.hxx b/sfx2/source/inc/ownsubfilterservice.hxx index fb02505f1d86..baea7d948171 100644 --- a/sfx2/source/inc/ownsubfilterservice.hxx +++ b/sfx2/source/inc/ownsubfilterservice.hxx @@ -46,10 +46,10 @@ public: OwnSubFilterService(const ::com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > &xNewFactory); virtual ~OwnSubFilterService(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + 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::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( @@ -68,9 +68,9 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::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); }; diff --git a/sfx2/source/inc/plugin.hxx b/sfx2/source/inc/plugin.hxx index 2846e0ca2c57..ee1fe4adb278 100644 --- a/sfx2/source/inc/plugin.hxx +++ b/sfx2/source/inc/plugin.hxx @@ -54,8 +54,8 @@ class PluginObject : public ::cppu::WeakImplHelper5 < com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > mxObj; SfxItemPropertyMap maPropMap; SvCommandList maCmdList; - ::rtl::OUString maURL; - ::rtl::OUString maMimeType; + OUString maURL; + OUString maMimeType; PluginObject( const com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory >& rFact ); ~PluginObject(); @@ -68,12 +68,12 @@ class PluginObject : public ::cppu::WeakImplHelper5 < virtual void SAL_CALL removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); public: SFX_DECL_XSERVICEINFO diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index 932750c2e951..443e85df4491 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -33,13 +33,13 @@ class SfxPickList : public SfxListener { struct PickListEntry { - PickListEntry( const ::rtl::OUString& _aName, const ::rtl::OUString& _aFilter, const ::rtl::OUString& _aTitle ) : + PickListEntry( const OUString& _aName, const OUString& _aFilter, const OUString& _aTitle ) : aName( _aName ), aFilter( _aFilter ), aTitle( _aTitle ) {} - ::rtl::OUString aName; - ::rtl::OUString aFilter; - ::rtl::OUString aTitle; - ::rtl::OUString aOptions; + OUString aName; + OUString aFilter; + OUString aTitle; + OUString aOptions; }; std::vector< PickListEntry* > m_aPicklistVector; @@ -49,7 +49,7 @@ class SfxPickList : public SfxListener SfxPickList( sal_uInt32 nMenuSize ); ~SfxPickList(); - void CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const ::rtl::OUString& aURL, sal_uInt32 nNo ); + void CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const OUString& aURL, sal_uInt32 nNo ); PickListEntry* GetPickListEntry( sal_uInt32 nIndex ); void CreatePickListEntries(); void RemovePickListEntries(); diff --git a/sfx2/source/inc/sfxurlrelocator.hxx b/sfx2/source/inc/sfxurlrelocator.hxx index 1406d60e9cf8..51a4fb767fca 100644 --- a/sfx2/source/inc/sfxurlrelocator.hxx +++ b/sfx2/source/inc/sfxurlrelocator.hxx @@ -34,16 +34,16 @@ class SfxURLRelocator_Impl ::com::sun::star::uno::Reference< ::com::sun::star::util::XMacroExpander > mxMacroExpander; public: - static bool propertyCanContainOfficeDir( const rtl::OUString & rPropName ); + static bool propertyCanContainOfficeDir( const OUString & rPropName ); void initOfficeInstDirs(); - void makeRelocatableURL( rtl::OUString & rURL ); - void makeAbsoluteURL( rtl::OUString & rURL ); + void makeRelocatableURL( OUString & rURL ); + void makeAbsoluteURL( OUString & rURL ); SfxURLRelocator_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext ); ~SfxURLRelocator_Impl(); private: - void implExpandURL( ::rtl::OUString& io_url ); + void implExpandURL( OUString& io_url ); }; #endif diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 4bb52fa0c8bd..dfe6975c7dcd 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -211,7 +211,7 @@ class LayoutManagerListener : public ::com::sun::star::frame::XLayoutManagerList sal_Bool m_bHasFrame; SfxWorkWindow* m_pWrkWin; ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > m_xFrame; - rtl::OUString m_aLayoutManagerPropName; + OUString m_aLayoutManagerPropName; }; class SfxWorkWindow @@ -242,10 +242,10 @@ protected: sal_Bool bIsFullScreen : 1; sal_Bool bShowStatusBar : 1; sal_Int32 m_nLock; - rtl::OUString m_aStatusBarResName; - rtl::OUString m_aLayoutManagerPropName; - rtl::OUString m_aTbxTypeName; - rtl::OUString m_aProgressBarResName; + OUString m_aStatusBarResName; + OUString m_aLayoutManagerPropName; + OUString m_aTbxTypeName; + OUString m_aProgressBarResName; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xLayoutManagerListener; protected: diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 14737d7d084e..b882ff0b8dd8 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -67,7 +67,7 @@ SfxURLToolBoxControl_Impl::SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uI : SfxToolBoxControl( nSlotId, nId, rBox ), pAccExec( 0 ) { - addStatusListener( rtl::OUString( ".uno:CurrentURL" )); + addStatusListener( OUString( ".uno:CurrentURL" )); } SfxURLToolBoxControl_Impl::~SfxURLToolBoxControl_Impl() @@ -104,7 +104,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, sal_Bool /*bNew*/ if ( xDispatchProvider.is() && m_xServiceManager.is() ) { URL aTargetURL; - ::rtl::OUString aTarget( ::rtl::OUString("_default")); + OUString aTarget( OUString("_default")); aTargetURL.Complete = aName; @@ -113,18 +113,18 @@ void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, sal_Bool /*bNew*/ if ( xDispatch.is() ) { Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = ::rtl::OUString("Referer"); - aArgs[0].Value = makeAny( ::rtl::OUString(SFX_REFERER_USER )); - aArgs[1].Name = ::rtl::OUString( "FileName" ); - aArgs[1].Value = makeAny( ::rtl::OUString( aName )); + aArgs[0].Name = OUString("Referer"); + aArgs[0].Value = makeAny( OUString(SFX_REFERER_USER )); + aArgs[1].Name = OUString( "FileName" ); + aArgs[1].Value = makeAny( OUString( aName )); if ( aFilter.Len() ) { aArgs.realloc( 4 ); - aArgs[2].Name = ::rtl::OUString("FilterOptions"); - aArgs[2].Value = makeAny( ::rtl::OUString( aOptions )); - aArgs[3].Name = ::rtl::OUString("FilterName"); - aArgs[3].Value = makeAny( ::rtl::OUString( aFilter )); + aArgs[2].Name = OUString("FilterOptions"); + aArgs[2].Value = makeAny( OUString( aOptions )); + aArgs[3].Name = OUString("FilterName"); + aArgs[3].Value = makeAny( OUString( aFilter )); } SfxURLToolBoxControl_Impl::ExecuteInfo* pExecuteInfo = new SfxURLToolBoxControl_Impl::ExecuteInfo; @@ -235,7 +235,7 @@ void SfxURLToolBoxControl_Impl::StateChanged if (lProps[p].Name != HISTORY_PROPERTYNAME_URL) continue; - ::rtl::OUString sURL; + OUString sURL; if (!(lProps[p].Value>>=sURL) || sURL.isEmpty()) continue; diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index c4e0ee26e092..db8c498e3d2c 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -134,11 +134,11 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen //-------------------------------------------------------------------- -static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl ) +static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl ) { Image aRes; - ::rtl::OUString aTmp; + OUString aTmp; osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp ); Graphic aGraphic; @@ -171,9 +171,9 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) if (aThesLookUpStr.Len() > 0 && nDelimPos != STRING_NOTFOUND) { // get synonym list for sub menu - std::vector< ::rtl::OUString > aSynonyms; + std::vector< OUString > aSynonyms; SfxThesSubMenuHelper aHelper; - ::rtl::OUString aText( aHelper.GetText( aThesLookUpStr, nDelimPos ) ); + OUString aText( aHelper.GetText( aThesLookUpStr, nDelimPos ) ); lang::Locale aLocale; aHelper.GetLocale( aLocale, aThesLookUpStr, nDelimPos ); const bool bHasMoreSynonyms = aHelper.GetMeanings( aSynonyms, aText, aLocale, 7 /*max number of synonyms to retrieve*/ ); @@ -188,7 +188,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) Image aImage; String sThesImplName( aHelper.GetThesImplName( aLocale ) ); - ::rtl::OUString aSynonymsImageUrl( aCfg.GetSynonymsContextImage( sThesImplName ) ); + OUString aSynonymsImageUrl( aCfg.GetSynonymsContextImage( sThesImplName ) ); if (sThesImplName.Len() > 0 && !aSynonymsImageUrl.isEmpty()) aImage = Image( lcl_GetImageFromPngUrl( aSynonymsImageUrl ) ); @@ -199,7 +199,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) String aItemText( linguistic::GetThesaurusReplaceText( aSynonyms[i] ) ); pThesSubMenu->InsertItem( nId, aItemText ); - ::rtl::OUString aCmd(".uno:ThesaurusFromContext?WordReplace:string=" ); + OUString aCmd(".uno:ThesaurusFromContext?WordReplace:string=" ); aCmd += aItemText; pThesSubMenu->SetItemCommand( nId, aCmd ); @@ -209,16 +209,16 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) } else // nNumSynonyms == 0 { - const rtl::OUString aItemText( SfxResId(STR_MENU_NO_SYNONYM_FOUND).toString() ); + const OUString aItemText( SfxResId(STR_MENU_NO_SYNONYM_FOUND).toString() ); pThesSubMenu->InsertItem( 1, aItemText, MIB_NOSELECT ); } pThesSubMenu->InsertSeparator(); - const rtl::OUString sThesaurus( SfxResId(STR_MENU_THESAURUS).toString() ); + const OUString sThesaurus( SfxResId(STR_MENU_THESAURUS).toString() ); pThesSubMenu->InsertItem( 100, sThesaurus ); - pThesSubMenu->SetItemCommand( 100, ::rtl::OUString(".uno:ThesaurusDialog") ); + pThesSubMenu->SetItemCommand( 100, OUString(".uno:ThesaurusDialog") ); pSVMenu->InsertSeparator(); - const rtl::OUString sSynonyms( SfxResId(STR_MENU_SYNONYMS).toString() ); + const OUString sSynonyms( SfxResId(STR_MENU_SYNONYMS).toString() ); pSVMenu->InsertItem( SID_THES, sSynonyms ); pSVMenu->SetPopupMenu( SID_THES, pThesSubMenu ); } @@ -331,7 +331,7 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra aEvent.SourceWindow = VCLUnoHelper::GetInterface( pWindow ); aEvent.ExecutePosition.X = rPoint.X(); aEvent.ExecutePosition.Y = rPoint.Y(); - ::rtl::OUString sDummyMenuName; + OUString sDummyMenuName; if ( pFrame->GetViewShell()->TryContextMenuInterception( *pSVMenu, sDummyMenuName, pMenu, aEvent ) ) { if ( pMenu ) @@ -381,7 +381,7 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram aEvent.SourceWindow = VCLUnoHelper::GetInterface( pWindow ); aEvent.ExecutePosition.X = rPoint.X(); aEvent.ExecutePosition.Y = rPoint.Y(); - ::rtl::OUString sDummyMenuName; + OUString sDummyMenuName; if ( pFrame->GetViewShell()->TryContextMenuInterception( *pSVMenu, sDummyMenuName, pMenu, aEvent ) ) { if ( pMenu ) diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx index b1075f42640a..287ed2000546 100644 --- a/sfx2/source/menu/thessubmenu.cxx +++ b/sfx2/source/menu/thessubmenu.cxx @@ -38,7 +38,6 @@ #include "thessubmenu.hxx" using namespace ::com::sun::star; -using ::rtl::OUString; OUString SfxThesSubMenuHelper::GetText( const String &rLookUpString, diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx index a6a274fa5d40..2a12c6ae1728 100644 --- a/sfx2/source/menu/thessubmenu.hxx +++ b/sfx2/source/menu/thessubmenu.hxx @@ -42,7 +42,7 @@ public: SfxThesSubMenuHelper(); ~SfxThesSubMenuHelper(); - static ::rtl::OUString GetText( const String &rLookUpString, xub_StrLen nDelimPos ); + static OUString GetText( const String &rLookUpString, xub_StrLen nDelimPos ); // returns the Locale to be used for the selected text when the thesaurus is to be called static void GetLocale( css::lang::Locale /*out */ &rLocale, const String &rLookUpString, xub_StrLen nDelimPos ); @@ -51,7 +51,7 @@ public: bool IsSupportedLocale( const css::lang::Locale & rLocale ) const; // get the first nMax Synonym entries, even if different meanings need to be evaluated - bool GetMeanings( std::vector< ::rtl::OUString > & rSynonyms, const ::rtl::OUString & rWord, const css::lang::Locale & rLocale, sal_Int16 nMaxSynonms ); + bool GetMeanings( std::vector< OUString > & rSynonyms, const OUString & rWord, const css::lang::Locale & rLocale, sal_Int16 nMaxSynonms ); String GetThesImplName( const css::lang::Locale &rLocale ) const; }; diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index d052c39240d1..ac5f07b20600 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -112,8 +112,8 @@ void SfxMenuImageControl_Impl::Update() //========================================================================= static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFrame, - const rtl::OUString& aImageId, - const rtl::OUString& aURL, + const OUString& aImageId, + const OUString& aURL, bool bBigImage ) { @@ -391,8 +391,8 @@ void SfxVirtualMenu::CreateFromSVMenu() if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() ) { - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nSlotId )); Image aImage = GetImage( xFrame, aSlotURL, false ); pSVMenu->SetItemImage( nSlotId, aImage ); } @@ -455,7 +455,7 @@ void SfxVirtualMenu::CreateFromSVMenu() Image aImage; if ( bIsAddonPopupMenu || framework::AddonMenuManager::IsAddonMenuId( nSlotId )) { - rtl::OUString aImageId; + OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pSVMenu->GetUserValue( nSlotId ); @@ -467,8 +467,8 @@ void SfxVirtualMenu::CreateFromSVMenu() } else { - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nSlotId )); aImage = GetImage( xFrame, aSlotURL, false ); } @@ -535,8 +535,8 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged) if ( framework::AddonMenuManager::IsAddonMenuId( nSlotId )) { // Special code for Add-On menu items. They can appear inside the help menu. - rtl::OUString aCmd( pSVMenu->GetItemCommand( nSlotId ) ); - rtl::OUString aImageId; + OUString aCmd( pSVMenu->GetItemCommand( nSlotId ) ); + OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pSVMenu->GetUserValue( nSlotId ); @@ -548,8 +548,8 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged) } else { - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( nSlotId )); pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, false )); } } @@ -604,7 +604,7 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu ) PopupMenu* pPopup = pMenu->GetPopupMenu( nSlotId ); if ( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR ) { - rtl::OUString aImageId; + OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nSlotId ); @@ -671,7 +671,7 @@ bool SfxVirtualMenu::Bind_Impl( Menu *pMenu ) // Check if the popup is an Add-On popup menu // Either the popup menu has a special ID or a special command URL prefix! - rtl::OUString aCommand = pSVMenu->GetItemCommand( nSID ); + OUString aCommand = pSVMenu->GetItemCommand( nSID ); if ( ( nSID == SID_ADDONS ) || ( nSID == SID_ADDONHELP ) || (( (sal_uInt32)aCommand.getLength() > nAddonsPopupPrefixLen ) && @@ -782,7 +782,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) if ( pAddonMenu && pAddonMenu->GetItemCount() > 0 ) { sal_uInt16 nItemCount = pMenu->GetItemCount(); - rtl::OUString aAddonsTitle(SfxResId(STR_MENU_ADDONS).toString()); + OUString aAddonsTitle(SfxResId(STR_MENU_ADDONS).toString()); if ( nItemCount > 0 && pMenu->GetItemType( nItemCount-1 ) != MENUITEM_SEPARATOR ) pMenu->InsertSeparator(); pMenu->InsertItem( SID_ADDONS, aAddonsTitle ); @@ -790,8 +790,8 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu ) if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() ) { - rtl::OUString aSlotURL( "slot:" ); - aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_ADDONS )); + OUString aSlotURL( "slot:" ); + aSlotURL += OUString::valueOf( sal_Int32( SID_ADDONS )); pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, false )); } } @@ -840,7 +840,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) if ( pParent && pSVMenu == pParent->pWindowMenu ) { // update window list - ::std::vector< ::rtl::OUString > aNewWindowListVector; + ::std::vector< OUString > aNewWindowListVector; Reference< XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );; sal_uInt16 nActiveItemId = 0; diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index a71788e08706..d760a30385e4 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -58,7 +58,7 @@ using namespace css; //-------------------------------------------------------------------------------------------------------- // --- XNameReplace --- //-------------------------------------------------------------------------------------------------------- -void SAL_CALL SfxEvents_Impl::replaceByName( const rtl::OUString & aName, const uno::Any & rElement ) +void SAL_CALL SfxEvents_Impl::replaceByName( const OUString & aName, const uno::Any & rElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -83,7 +83,7 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const rtl::OUString & aName, const ::comphelper::NamedValueCollection aNormalizedDescriptor; NormalizeMacro( aEventDescriptor, aNormalizedDescriptor, mpObjShell ); - ::rtl::OUString sType; + OUString sType; if ( ( aNormalizedDescriptor.size() == 1 ) && ( aNormalizedDescriptor.has( PROP_EVENT_TYPE) == 0 ) && ( aNormalizedDescriptor.get( PROP_EVENT_TYPE ) >>= sType ) @@ -116,7 +116,7 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const rtl::OUString & aName, const //-------------------------------------------------------------------------------------------------------- // --- XNameAccess --- //-------------------------------------------------------------------------------------------------------- -uno::Any SAL_CALL SfxEvents_Impl::getByName( const rtl::OUString& aName ) +uno::Any SAL_CALL SfxEvents_Impl::getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { @@ -136,13 +136,13 @@ uno::Any SAL_CALL SfxEvents_Impl::getByName( const rtl::OUString& aName ) } //-------------------------------------------------------------------------------------------------------- -uno::Sequence< rtl::OUString > SAL_CALL SfxEvents_Impl::getElementNames() throw ( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SfxEvents_Impl::getElementNames() throw ( uno::RuntimeException ) { return maEventNames; } //-------------------------------------------------------------------------------------------------------- -sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const rtl::OUString& aName ) throw ( uno::RuntimeException ) +sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName ) throw ( uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); @@ -184,10 +184,10 @@ static void Execute( uno::Any& aEventData, const document::DocumentEvent& aTrigg uno::Sequence < beans::PropertyValue > aProperties; if ( aEventData >>= aProperties ) { - rtl::OUString aType; - rtl::OUString aScript; - rtl::OUString aLibrary; - rtl::OUString aMacroName; + OUString aType; + OUString aScript; + OUString aLibrary; + OUString aMacroName; sal_Int32 nCount = aProperties.getLength(); @@ -249,7 +249,7 @@ static void Execute( uno::Any& aEventData, const document::DocumentEvent& aTrigg uno::Reference < frame::XDispatch > xDisp; if ( xProv.is() ) - xDisp = xProv->queryDispatch( aURL, ::rtl::OUString(), 0 ); + xDisp = xProv->queryDispatch( aURL, OUString(), 0 ); if ( xDisp.is() ) { @@ -281,7 +281,7 @@ void SAL_CALL SfxEvents_Impl::notifyEvent( const document::EventObject& aEvent ) // get the event name, find the coresponding data, execute the data - rtl::OUString aName = aEvent.EventName; + OUString aName = aEvent.EventName; long nCount = maEventNames.getLength(); long nIndex = 0; sal_Bool bFound = sal_False; @@ -354,10 +354,10 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const uno::Any& rElement, SfxObjectShe if ( aAny >>= aProperties ) { - rtl::OUString aType; - rtl::OUString aScriptURL; - rtl::OUString aLibrary; - rtl::OUString aMacroName; + OUString aType; + OUString aScriptURL; + OUString aLibrary; + OUString aMacroName; long nCount = aProperties.getLength(); long nIndex = 0; @@ -398,7 +398,7 @@ SvxMacro* SfxEvents_Impl::ConvertToMacro( const uno::Any& rElement, SfxObjectShe if ( aLibrary == "application" ) aLibrary = SFX_APP()->GetName(); else - aLibrary = ::rtl::OUString(); + aLibrary = OUString(); pMacro = new SvxMacro( aMacroName, aLibrary, eType ); } else if ( eType == EXTENDED_STYPE ) @@ -425,10 +425,10 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i if ( !pDoc ) pDoc = SfxObjectShell::Current(); - ::rtl::OUString aType = i_eventDescriptor.getOrDefault( PROP_EVENT_TYPE, ::rtl::OUString() ); - ::rtl::OUString aScript = i_eventDescriptor.getOrDefault( PROP_SCRIPT, ::rtl::OUString() ); - ::rtl::OUString aLibrary = i_eventDescriptor.getOrDefault( PROP_LIBRARY, ::rtl::OUString() ); - ::rtl::OUString aMacroName = i_eventDescriptor.getOrDefault( PROP_MACRO_NAME, ::rtl::OUString() ); + OUString aType = i_eventDescriptor.getOrDefault( PROP_EVENT_TYPE, OUString() ); + OUString aScript = i_eventDescriptor.getOrDefault( PROP_SCRIPT, OUString() ); + OUString aLibrary = i_eventDescriptor.getOrDefault( PROP_LIBRARY, OUString() ); + OUString aMacroName = i_eventDescriptor.getOrDefault( PROP_MACRO_NAME, OUString() ); if ( !aType.isEmpty() ) o_normalizedDescriptor.put( PROP_EVENT_TYPE, aType ); @@ -445,7 +445,7 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i sal_Int32 nArgsPos = aScript.indexOf( '(' ); if ( ( nHashPos != STRING_NOTFOUND ) && ( nHashPos < nArgsPos ) ) { - rtl::OUString aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET ) ); + OUString aBasMgrName( INetURLObject::decode( aScript.copy( 8, nHashPos-8 ), INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET ) ); if ( aBasMgrName == "." ) aLibrary = pDoc->GetTitle(); else @@ -462,13 +462,13 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i } else if ( !aMacroName.isEmpty() ) { - aScript = rtl::OUString( MACRO_PRFIX ); + aScript = OUString( MACRO_PRFIX ); if ( aLibrary.compareTo( SFX_APP()->GetName() ) != 0 && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StarDesktop")) && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application")) ) - aScript += rtl::OUString('.'); + aScript += OUString('.'); - aScript += rtl::OUString('/'); + aScript += OUString('/'); aScript += aMacroName; - aScript += rtl::OUString( MACRO_POSTFIX ); + aScript += OUString( MACRO_POSTFIX ); } else // wrong properties @@ -477,9 +477,9 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i if (!aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("document"))) { if ( aLibrary.isEmpty() || (pDoc && ( String(aLibrary) == pDoc->GetTitle( SFX_TITLE_APINAME ) || String(aLibrary) == pDoc->GetTitle() )) ) - aLibrary = rtl::OUString("document"); + aLibrary = OUString("document"); else - aLibrary = rtl::OUString("application"); + aLibrary = OUString("application"); } o_normalizedDescriptor.put( PROP_SCRIPT, aScript ); @@ -526,7 +526,7 @@ uno::Any SAL_CALL ModelCollectionEnumeration::nextElement() ::osl::ResettableMutexGuard aLock(m_aLock); if (m_pEnumerationIt == m_lModels.end()) throw container::NoSuchElementException( - ::rtl::OUString("End of model enumeration reached."), + OUString("End of model enumeration reached."), static_cast< container::XEnumeration* >(this)); uno::Reference< frame::XModel > xModel(*m_pEnumerationIt, uno::UNO_QUERY); ++m_pEnumerationIt; @@ -600,12 +600,12 @@ void SAL_CALL SfxGlobalEvents_Impl::removeDocumentEventListener( const uno::Refe } //----------------------------------------------------------------------------- -void SAL_CALL SfxGlobalEvents_Impl::notifyDocumentEvent( const ::rtl::OUString& /*_EventName*/, +void SAL_CALL SfxGlobalEvents_Impl::notifyDocumentEvent( const OUString& /*_EventName*/, const uno::Reference< frame::XController2 >& /*_ViewController*/, const uno::Any& /*_Supplement*/ ) throw (lang::IllegalArgumentException, lang::NoSupportException, uno::RuntimeException) { // we're a multiplexer only, no chance to generate artifical events here - throw lang::NoSupportException(::rtl::OUString(), *this); + throw lang::NoSupportException(OUString(), *this); } //----------------------------------------------------------------------------- @@ -672,7 +672,7 @@ void SAL_CALL SfxGlobalEvents_Impl::insert( const uno::Any& aElement ) aElement >>= xDoc; if (!xDoc.is()) throw lang::IllegalArgumentException( - ::rtl::OUString("Cant locate at least the model parameter."), + OUString("Cant locate at least the model parameter."), static_cast< container::XSet* >(this), 0); @@ -681,7 +681,7 @@ void SAL_CALL SfxGlobalEvents_Impl::insert( const uno::Any& aElement ) TModelList::iterator pIt = impl_searchDoc(xDoc); if (pIt != m_lModels.end()) throw container::ElementExistException( - ::rtl::OUString(), + OUString(), static_cast< container::XSet* >(this)); m_lModels.push_back(xDoc); aLock.clear(); @@ -709,7 +709,7 @@ void SAL_CALL SfxGlobalEvents_Impl::remove( const uno::Any& aElement ) aElement >>= xDoc; if (!xDoc.is()) throw lang::IllegalArgumentException( - ::rtl::OUString("Cant locate at least the model parameter."), + OUString("Cant locate at least the model parameter."), static_cast< container::XSet* >(this), 0); @@ -718,7 +718,7 @@ void SAL_CALL SfxGlobalEvents_Impl::remove( const uno::Any& aElement ) TModelList::iterator pIt = impl_searchDoc(xDoc); if (pIt == m_lModels.end()) throw container::NoSuchElementException( - ::rtl::OUString(), + OUString(), static_cast< container::XSet* >(this)); m_lModels.erase(pIt); aLock.clear(); diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 027ec944a5ca..63c1cdcc219b 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -72,7 +72,7 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( const uno::Reference< frame::XFrame >& rFrame, StatusBar* pStatusBar, unsigned short nID, - const ::rtl::OUString& aCommandURL ) + const OUString& aCommandURL ) { SolarMutexGuard aGuard; @@ -118,7 +118,7 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( sal_uInt16 nSlotId = pSlot->GetSlotId(); if ( nSlotId > 0 ) { - rtl::OString aCmd(".uno:"); + OString aCmd(".uno:"); aCmd += pSlot->GetUnoName(); pStatusBar->SetHelpId( nSlotId, aCmd ); return SfxStatusBarControl::CreateControl( nSlotId, nID, pStatusBar, pModule ); @@ -222,7 +222,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) uno::Reference < frame::XDispatchProvider > xProvider( xController, uno::UNO_QUERY ); if ( xProvider.is() ) { - uno::Reference < frame::XDispatch > xDisp = xProvider->queryDispatch( rEvent.FeatureURL, ::rtl::OUString(), 0 ); + uno::Reference < frame::XDispatch > xDisp = xProvider->queryDispatch( rEvent.FeatureURL, OUString(), 0 ); if ( xDisp.is() ) { uno::Reference< lang::XUnoTunnel > xTunnel( xDisp, uno::UNO_QUERY ); @@ -280,9 +280,9 @@ throw ( ::com::sun::star::uno::RuntimeException ) rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( nSlotID, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; rEvent.State >>= sTemp ; pItem = new SfxStringItem( nSlotID, sTemp ); } diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 007c17e479f9..8ed58cab5eba 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -129,7 +129,7 @@ static Window* GetTopMostParentSystemWindow( Window* pWindow ) return NULL; } -svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const ::rtl::OUString& aCommandURL ) +svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL ) { SolarMutexGuard aGuard; @@ -422,7 +422,7 @@ SfxItemState SfxToolBoxControl::GetItemState( void SfxToolBoxControl::Dispatch( const Reference< XDispatchProvider >& rProvider, - const rtl::OUString& rCommand, + const OUString& rCommand, Sequence< ::PropertyValue >& aArgs ) { if ( rProvider.is() ) @@ -432,13 +432,13 @@ void SfxToolBoxControl::Dispatch( Reference < XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); xTrans->parseStrict( aTargetURL ); - Reference < XDispatch > xDispatch = rProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + Reference < XDispatch > xDispatch = rProvider->queryDispatch( aTargetURL, OUString(), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( aTargetURL, aArgs ); } } -void SfxToolBoxControl::Dispatch( const ::rtl::OUString& aCommand, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) +void SfxToolBoxControl::Dispatch( const OUString& aCommand, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) { Reference < XController > xController; @@ -453,7 +453,7 @@ void SfxToolBoxControl::Dispatch( const ::rtl::OUString& aCommand, ::com::sun::s aTargetURL.Complete = aCommand; getURLTransformer()->parseStrict( aTargetURL ); - Reference < XDispatch > xDispatch = xProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + Reference < XDispatch > xDispatch = xProvider->queryDispatch( aTargetURL, OUString(), 0 ); if ( xDispatch.is() ) xDispatch->dispatch( aTargetURL, aArgs ); } @@ -499,7 +499,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) Reference < XDispatchProvider > xProvider( xController, UNO_QUERY ); if ( xProvider.is() ) { - Reference < XDispatch > xDisp = xProvider->queryDispatch( rEvent.FeatureURL, ::rtl::OUString(), 0 ); + Reference < XDispatch > xDisp = xProvider->queryDispatch( rEvent.FeatureURL, OUString(), 0 ); if ( xDisp.is() ) { Reference< XUnoTunnel > xTunnel( xDisp, UNO_QUERY ); @@ -559,9 +559,9 @@ throw ( ::com::sun::star::uno::RuntimeException ) rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( nSlotId, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; rEvent.State >>= sTemp ; pItem = new SfxStringItem( nSlotId, sTemp ); } @@ -604,12 +604,12 @@ throw ( ::com::sun::star::uno::RuntimeException ) return sal_False; } -::rtl::OUString SAL_CALL SfxToolBoxControl::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL SfxToolBoxControl::getSubToolbarName() throw (::com::sun::star::uno::RuntimeException) { - return rtl::OUString(); + return OUString(); } -void SAL_CALL SfxToolBoxControl::functionSelected( const ::rtl::OUString& /*aCommand*/ ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL SfxToolBoxControl::functionSelected( const OUString& /*aCommand*/ ) throw (::com::sun::star::uno::RuntimeException) { // must be implemented by sub-class } @@ -690,7 +690,7 @@ throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; - ::rtl::OUString aSubToolBarResName; + OUString aSubToolBarResName; if ( pImpl->mxUIElement.is() ) { Reference< XPropertySet > xPropSet( pImpl->mxUIElement, UNO_QUERY ); @@ -698,7 +698,7 @@ throw (::com::sun::star::uno::RuntimeException) { try { - xPropSet->getPropertyValue( ::rtl::OUString( "ResourceURL" )) >>= aSubToolBarResName; + xPropSet->getPropertyValue( OUString( "ResourceURL" )) >>= aSubToolBarResName; } catch ( com::sun::star::beans::UnknownPropertyException& ) { @@ -732,7 +732,7 @@ throw (::com::sun::star::uno::RuntimeException) Reference< ::com::sun::star::beans::XPropertySet > xProp( xUIElement, UNO_QUERY ); if ( xSubToolBar.is() && xProp.is() ) { - rtl::OUString aPersistentString( "Persistent" ); + OUString aPersistentString( "Persistent" ); try { Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); @@ -748,7 +748,7 @@ throw (::com::sun::star::uno::RuntimeException) xLayoutManager->setElementPos( aSubToolBarResName, aEvent.FloatingPosition ); xLayoutManager->showElement( aSubToolBarResName ); - xProp->setPropertyValue( rtl::OUString( "Persistent" ), a ); + xProp->setPropertyValue( OUString( "Persistent" ), a ); } } catch ( ::com::sun::star::uno::RuntimeException& ) @@ -763,13 +763,13 @@ throw (::com::sun::star::uno::RuntimeException) } } -::Size SfxToolBoxControl::getPersistentFloatingSize( const Reference< XFrame >& /*xFrame*/, const ::rtl::OUString& /*rSubToolBarResName*/ ) +::Size SfxToolBoxControl::getPersistentFloatingSize( const Reference< XFrame >& /*xFrame*/, const OUString& /*rSubToolBarResName*/ ) { ::Size aToolboxSize; return aToolboxSize; } -void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSubToolBarResName ) +void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBarResName ) { SolarMutexGuard aGuard; @@ -796,11 +796,11 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSub } Sequence< PropertyValue > aPropSeq( 3 ); - aPropSeq[0].Name = rtl::OUString( "Frame" ); + aPropSeq[0].Name = OUString( "Frame" ); aPropSeq[0].Value <<= xFrame; - aPropSeq[1].Name = rtl::OUString( "Persistent" ); + aPropSeq[1].Name = OUString( "Persistent" ); aPropSeq[1].Value <<= sal_False; - aPropSeq[2].Name = rtl::OUString( "PopupMode" ); + aPropSeq[2].Name = OUString( "PopupMode" ); aPropSeq[2].Value <<= sal_True; try @@ -1045,7 +1045,7 @@ throw ( ::com::sun::star::uno::RuntimeException ) Reference < XDispatchProvider > xProvider( xController, UNO_QUERY ); if ( xProvider.is() ) { - Reference < XDispatch > xDisp = xProvider->queryDispatch( rEvent.FeatureURL, ::rtl::OUString(), 0 ); + Reference < XDispatch > xDisp = xProvider->queryDispatch( rEvent.FeatureURL, OUString(), 0 ); if ( xDisp.is() ) { Reference< XUnoTunnel > xTunnel( xDisp, UNO_QUERY ); @@ -1106,9 +1106,9 @@ throw ( ::com::sun::star::uno::RuntimeException ) rEvent.State >>= nTemp ; pItem = new SfxUInt32Item( nSlotId, nTemp ); } - else if ( pType == ::getCppuType((const ::rtl::OUString*)0) ) + else if ( pType == ::getCppuType((const OUString*)0) ) { - ::rtl::OUString sTemp ; + OUString sTemp ; rEvent.State >>= sTemp ; pItem = new SfxStringItem( nSlotId, sTemp ); } @@ -1253,7 +1253,7 @@ void SfxPopupWindow::UnbindListener() //-------------------------------------------------------------------- -void SfxPopupWindow::AddStatusListener( const rtl::OUString& rCommandURL ) +void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL ) { GetOrCreateStatusListener(); if ( m_xStatusListener.is() ) @@ -1582,7 +1582,7 @@ void SfxAppToolBoxControl_Impl::Select( sal_Bool bMod1 ) aTargetURL.Complete = aLastURL; getURLTransformer()->parseStrict( aTargetURL ); - ::rtl::OUString aTarget( ::rtl::OUString("_default")); + OUString aTarget( OUString("_default")); if ( pMenu ) { ::framework::MenuConfiguration::Attributes* pMenuAttributes = @@ -1598,8 +1598,8 @@ void SfxAppToolBoxControl_Impl::Select( sal_Bool bMod1 ) { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString("Referer"); - aArgs[0].Value = makeAny( ::rtl::OUString(SFX_REFERER_USER ) ); + aArgs[0].Name = OUString("Referer"); + aArgs[0].Value = makeAny( OUString(SFX_REFERER_USER ) ); ExecuteInfo* pExecuteInfo = new ExecuteInfo; pExecuteInfo->xDispatch = xDispatch; @@ -1632,10 +1632,10 @@ long Select_Impl( void* /*pHdl*/, void* pVoid ) Reference < XDispatch > xDisp; if ( aTargetURL.Protocol.compareToAscii("slot:") == COMPARE_EQUAL ) - xDisp = xDesktop->queryDispatch( aTargetURL, ::rtl::OUString(), 0 ); + xDisp = xDesktop->queryDispatch( aTargetURL, OUString(), 0 ); else { - ::rtl::OUString aTargetFrame( ::rtl::OUString("_blank") ); + OUString aTargetFrame( OUString("_blank") ); ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( pMenu->GetCurItemId() ); @@ -1680,7 +1680,7 @@ IMPL_LINK( SfxAppToolBoxControl_Impl, Activate, Menu *, pActMenu ) if ( bShowMenuImages ) { sal_Bool bImageSet = sal_False; - ::rtl::OUString aImageId; + OUString aImageId; ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nId ); diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 75964a5deeb3..8d3507f468ef 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -117,7 +117,7 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) // TODO/LATER: do we still need this code? Window* pWindow = rNEvt.GetWindow(); - rtl::OString sHelpId; + OString sHelpId; while ( sHelpId.isEmpty() && pWindow ) { sHelpId = pWindow->GetHelpId(); @@ -268,11 +268,11 @@ SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nV aLoadArgs = aArgs.getPropertyValues(); // load the doc into that frame - ::rtl::OUString sLoaderURL( "private:object" ); + OUString sLoaderURL( "private:object" ); Reference< XComponentLoader > xLoader( xFrame, UNO_QUERY_THROW ); xLoader->loadComponentFromURL( sLoaderURL, - ::rtl::OUString( "_self" ), + OUString( "_self" ), 0, aLoadArgs ); @@ -339,7 +339,7 @@ void SfxFrame::SetPresentationMode( sal_Bool bSet ) if ( xPropSet.is() ) { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; } @@ -391,13 +391,13 @@ void SfxFrame::SetMenuBarOn_Impl( sal_Bool bOn ) if ( xPropSet.is() ) { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; } if ( xLayoutManager.is() ) { - rtl::OUString aMenuBarURL( "private:resource/menubar/menubar" ); + OUString aMenuBarURL( "private:resource/menubar/menubar" ); if ( bOn ) xLayoutManager->showElement( aMenuBarURL ); diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 1ebdc4dc5116..03f242bd8b3c 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -105,10 +105,10 @@ SfxFrameLoader_Impl::~SfxFrameLoader_Impl() } // -------------------------------------------------------------------------------------------------------------------- -const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const ::rtl::OUString& sURL, +const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const OUString& sURL, const ::comphelper::NamedValueCollection& i_rDescriptor, const SfxFilterMatcher& rMatcher ) const { - ::rtl::OUString sFilter; + OUString sFilter; try { if ( sURL.isEmpty() ) @@ -127,7 +127,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const ::rtl::OUSt aNewArgs.put( "StatusIndicator", i_rDescriptor.get( "StatusIndicator" ) ); Sequence< PropertyValue > aQueryArgs( aNewArgs.getPropertyValues() ); - ::rtl::OUString sType = xDetect->queryTypeByDescriptor( aQueryArgs, sal_True ); + OUString sType = xDetect->queryTypeByDescriptor( aQueryArgs, sal_True ); if ( !sType.isEmpty() ) { const SfxFilter* pFilter = rMatcher.GetFilter4EA( sType ); @@ -142,7 +142,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const ::rtl::OUSt catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); - sFilter = ::rtl::OUString(); + sFilter = OUString(); } const SfxFilter* pFilter = 0; @@ -152,7 +152,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const ::rtl::OUSt } // -------------------------------------------------------------------------------------------------------------------- -const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( const ::rtl::OUString& i_rServiceName ) const +const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( const OUString& i_rServiceName ) const { try { @@ -172,7 +172,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( con while ( xEnum->hasMoreElements() ) { ::comphelper::NamedValueCollection aType( xEnum->nextElement() ); - ::rtl::OUString sFilterName = aType.getOrDefault( "Name", ::rtl::OUString() ); + OUString sFilterName = aType.getOrDefault( "Name", OUString() ); if ( sFilterName.isEmpty() ) continue; @@ -197,12 +197,12 @@ const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( con } // -------------------------------------------------------------------------------------------------------------------- -::rtl::OUString SfxFrameLoader_Impl::impl_askForFilter_nothrow( const Reference< XInteractionHandler >& i_rxHandler, - const ::rtl::OUString& i_rDocumentURL ) const +OUString SfxFrameLoader_Impl::impl_askForFilter_nothrow( const Reference< XInteractionHandler >& i_rxHandler, + const OUString& i_rDocumentURL ) const { ENSURE_OR_THROW( i_rxHandler.is(), "invalid interaction handler" ); - ::rtl::OUString sFilterName; + OUString sFilterName; try { ::framework::RequestFilterSelect aRequest( i_rDocumentURL ); @@ -254,10 +254,10 @@ sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _ // -------------------------------------------------------------------------------------------------------------------- void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollection& io_rDescriptor ) const { - const ::rtl::OUString sURL = io_rDescriptor.getOrDefault( "URL", ::rtl::OUString() ); - const ::rtl::OUString sTypeName = io_rDescriptor.getOrDefault( "TypeName", ::rtl::OUString() ); - const ::rtl::OUString sFilterName = io_rDescriptor.getOrDefault( "FilterName", ::rtl::OUString() ); - const ::rtl::OUString sServiceName = io_rDescriptor.getOrDefault( "DocumentService", ::rtl::OUString() ); + const OUString sURL = io_rDescriptor.getOrDefault( "URL", OUString() ); + const OUString sTypeName = io_rDescriptor.getOrDefault( "TypeName", OUString() ); + const OUString sFilterName = io_rDescriptor.getOrDefault( "FilterName", OUString() ); + const OUString sServiceName = io_rDescriptor.getOrDefault( "DocumentService", OUString() ); const Reference< XInteractionHandler > xInteraction = io_rDescriptor.getOrDefault( "InteractionHandler", Reference< XInteractionHandler >() ); @@ -279,14 +279,14 @@ void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollecti // or use interaction to ask user for right filter. if ( !pFilter && xInteraction.is() && !sURL.isEmpty() ) { - ::rtl::OUString sSelectedFilter = impl_askForFilter_nothrow( xInteraction, sURL ); + OUString sSelectedFilter = impl_askForFilter_nothrow( xInteraction, sURL ); if ( !sSelectedFilter.isEmpty() ) pFilter = rMatcher.GetFilter4FilterName( sSelectedFilter ); } if ( pFilter ) { - io_rDescriptor.put( "FilterName", ::rtl::OUString( pFilter->GetFilterName() ) ); + io_rDescriptor.put( "FilterName", OUString( pFilter->GetFilterName() ) ); // If detected filter indicates using of an own template format // add property "AsTemplate" to descriptor. But suppress this step @@ -296,7 +296,7 @@ void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollecti // The DocumentService property will finally be used to determine the document type to create, so // override it with the service name as indicated by the found filter. - io_rDescriptor.put( "DocumentService", ::rtl::OUString( pFilter->GetServiceName() ) ); + io_rDescriptor.put( "DocumentService", OUString( pFilter->GetServiceName() ) ); } } @@ -318,10 +318,10 @@ SfxObjectShellRef SfxFrameLoader_Impl::impl_findObjectShell( const Reference< XM // -------------------------------------------------------------------------------------------------------------------- bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedValueCollection& io_rDescriptor ) const { - const ::rtl::OUString sTemplateRegioName = io_rDescriptor.getOrDefault( "TemplateRegionName", ::rtl::OUString() ); - const ::rtl::OUString sTemplateName = io_rDescriptor.getOrDefault( "TemplateName", ::rtl::OUString() ); - const ::rtl::OUString sServiceName = io_rDescriptor.getOrDefault( "DocumentService", ::rtl::OUString() ); - const ::rtl::OUString sURL = io_rDescriptor.getOrDefault( "URL", ::rtl::OUString() ); + const OUString sTemplateRegioName = io_rDescriptor.getOrDefault( "TemplateRegionName", OUString() ); + const OUString sTemplateName = io_rDescriptor.getOrDefault( "TemplateName", OUString() ); + const OUString sServiceName = io_rDescriptor.getOrDefault( "DocumentService", OUString() ); + const OUString sURL = io_rDescriptor.getOrDefault( "URL", OUString() ); // determine the full URL of the template to use, if any String sTemplateURL; @@ -346,14 +346,14 @@ bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedVal if ( pTemplateFilter ) { // load the template document, but, well, "as template" - io_rDescriptor.put( "FilterName", ::rtl::OUString( pTemplateFilter->GetName() ) ); - io_rDescriptor.put( "FileName", ::rtl::OUString( sTemplateURL ) ); + io_rDescriptor.put( "FilterName", OUString( pTemplateFilter->GetName() ) ); + io_rDescriptor.put( "FileName", OUString( sTemplateURL ) ); io_rDescriptor.put( "AsTemplate", sal_True ); // #i21583# // the DocumentService property will finally be used to create the document. Thus, override any possibly // present value with the document service of the template. - io_rDescriptor.put( "DocumentService", ::rtl::OUString( pTemplateFilter->GetServiceName() ) ); + io_rDescriptor.put( "DocumentService", OUString( pTemplateFilter->GetServiceName() ) ); return true; } } @@ -361,9 +361,9 @@ bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedVal } // -------------------------------------------------------------------------------------------------------------------- -sal_uInt16 SfxFrameLoader_Impl::impl_findSlotParam( const ::rtl::OUString& i_rFactoryURL ) const +sal_uInt16 SfxFrameLoader_Impl::impl_findSlotParam( const OUString& i_rFactoryURL ) const { - ::rtl::OUString sSlotParam; + OUString sSlotParam; const sal_Int32 nParamPos = i_rFactoryURL.indexOf( '?' ); if ( nParamPos >= 0 ) { @@ -461,7 +461,7 @@ sal_Int16 SfxFrameLoader_Impl::impl_determineEffectiveViewId_nothrow( const SfxO break; ::comphelper::NamedValueCollection aNamedViewData( aViewData ); - ::rtl::OUString sViewId = aNamedViewData.getOrDefault( "ViewId", ::rtl::OUString() ); + OUString sViewId = aNamedViewData.getOrDefault( "ViewId", OUString() ); if ( sViewId.isEmpty() ) break; @@ -487,7 +487,7 @@ sal_Int16 SfxFrameLoader_Impl::impl_determineEffectiveViewId_nothrow( const SfxO // -------------------------------------------------------------------------------------------------------------------- Reference< XController2 > SfxFrameLoader_Impl::impl_createDocumentView( const Reference< XModel2 >& i_rModel, const Reference< XFrame >& i_rFrame, const ::comphelper::NamedValueCollection& i_rViewFactoryArgs, - const ::rtl::OUString& i_rViewName ) + const OUString& i_rViewName ) { // let the model create a new controller const Reference< XController2 > xController( i_rModel->createViewController( @@ -521,19 +521,19 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA // ensure the descriptor contains a referrer if ( !aDescriptor.has( "Referer" ) ) - aDescriptor.put( "Referer", ::rtl::OUString() ); + aDescriptor.put( "Referer", OUString() ); // did the caller already pass a model? Reference< XModel2 > xModel = aDescriptor.getOrDefault( "Model", Reference< XModel2 >() ); const bool bExternalModel = xModel.is(); // check for factory URLs to create a new doc, instead of loading one - const ::rtl::OUString sURL = aDescriptor.getOrDefault( "URL", ::rtl::OUString() ); + const OUString sURL = aDescriptor.getOrDefault( "URL", OUString() ); const bool bIsFactoryURL = sURL.startsWith( "private:factory/" ); bool bInitNewModel = bIsFactoryURL; if ( bIsFactoryURL && !bExternalModel ) { - const ::rtl::OUString sFactory = sURL.copy( sizeof( "private:factory/" ) -1 ); + const OUString sFactory = sURL.copy( sizeof( "private:factory/" ) -1 ); // special handling for some weird factory URLs a la private:factory/swriter?slot=21053 const sal_uInt16 nSlotParam = impl_findSlotParam( sFactory ); if ( nSlotParam != 0 ) @@ -551,7 +551,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA } else { - const ::rtl::OUString sServiceName = SfxObjectShell::GetServiceNameFromFactory( sFactory ); + const OUString sServiceName = SfxObjectShell::GetServiceNameFromFactory( sFactory ); aDescriptor.put( "DocumentService", sServiceName ); } } @@ -581,7 +581,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA } // create the new doc - const ::rtl::OUString sServiceName = aDescriptor.getOrDefault( "DocumentService", ::rtl::OUString() ); + const OUString sServiceName = aDescriptor.getOrDefault( "DocumentService", OUString() ); xModel.set( m_aContext->getServiceManager()->createInstanceWithContext(sServiceName, m_aContext), UNO_QUERY_THROW ); // load resp. init it @@ -591,7 +591,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA xLoadable->initNew(); impl_removeLoaderArguments( aDescriptor ); - xModel->attachResource( ::rtl::OUString(), aDescriptor.getPropertyValues() ); + xModel->attachResource( OUString(), aDescriptor.getPropertyValues() ); } else { @@ -614,7 +614,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA // ensure the ID of the to-be-created view is in the descriptor, if possible const sal_Int16 nViewId = impl_determineEffectiveViewId_nothrow( *xDoc, aDescriptor ); const sal_Int16 nViewNo = xDoc->GetFactory().GetViewNo_Impl( nViewId, 0 ); - const ::rtl::OUString sViewName( xDoc->GetFactory().GetViewFactory( nViewNo ).GetAPIViewName() ); + const OUString sViewName( xDoc->GetFactory().GetViewFactory( nViewNo ).GetAPIViewName() ); // plug the document into the frame impl_createDocumentView( xModel, _rTargetFrame, aViewCreationArgs, sViewName ); @@ -651,16 +651,16 @@ void SfxFrameLoader_Impl::cancel() throw( RuntimeException ) SFX_IMPL_SINGLEFACTORY( SfxFrameLoader_Impl ) /* XServiceInfo */ -rtl::OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName() throw( RuntimeException ) { return impl_getStaticImplementationName(); } \ /* XServiceInfo */ -sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const rtl::OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const OUString& sServiceName ) throw( RuntimeException ) { - Sequence< rtl::OUString > seqServiceNames = getSupportedServiceNames(); - const rtl::OUString* pArray = seqServiceNames.getConstArray(); + Sequence< OUString > seqServiceNames = getSupportedServiceNames(); + const OUString* pArray = seqServiceNames.getConstArray(); for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) { if ( pArray[nCounter] == sServiceName ) @@ -672,24 +672,24 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const rtl::OUString& sSe } /* XServiceInfo */ -Sequence< rtl::OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() throw( RuntimeException ) { return impl_getStaticSupportedServiceNames(); } /* Helper for XServiceInfo */ -Sequence< rtl::OUString > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames() +Sequence< OUString > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames() { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - Sequence< rtl::OUString > seqServiceNames( 1 ); - seqServiceNames.getArray() [0] = ::rtl::OUString( "com.sun.star.frame.SynchronousFrameLoader" ); + Sequence< OUString > seqServiceNames( 1 ); + seqServiceNames.getArray() [0] = OUString( "com.sun.star.frame.SynchronousFrameLoader" ); return seqServiceNames ; } /* Helper for XServiceInfo */ -rtl::OUString SfxFrameLoader_Impl::impl_getStaticImplementationName() +OUString SfxFrameLoader_Impl::impl_getStaticImplementationName() { - return ::rtl::OUString( "com.sun.star.comp.office.FrameLoader" ); + return OUString( "com.sun.star.comp.office.FrameLoader" ); } /* Helper for registry */ diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 336bcb309900..9816437de6b1 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -210,16 +210,16 @@ public: --m_refCount; } - virtual void SAL_CALL start(const ::rtl::OUString& aText, sal_Int32 nRange) throw(RuntimeException); + virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException); virtual void SAL_CALL end(void) throw(RuntimeException); - virtual void SAL_CALL setText(const ::rtl::OUString& aText) throw(RuntimeException); + virtual void SAL_CALL setText(const OUString& aText) throw(RuntimeException); virtual void SAL_CALL setValue(sal_Int32 nValue) throw(RuntimeException); virtual void SAL_CALL reset() throw(RuntimeException); virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw(RuntimeException); }; -void SAL_CALL SfxStatusIndicator::start(const ::rtl::OUString& aText, sal_Int32 nRange) throw(RuntimeException) +void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException) { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -253,7 +253,7 @@ void SAL_CALL SfxStatusIndicator::end(void) throw(RuntimeException) } } -void SAL_CALL SfxStatusIndicator::setText(const ::rtl::OUString& aText) throw(RuntimeException) +void SAL_CALL SfxStatusIndicator::setText(const OUString& aText) throw(RuntimeException) { SolarMutexGuard aGuard; if ( xOwner.is() ) @@ -376,7 +376,7 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const la pShell->TakeFrameOwnership_Impl(); } - throw util::CloseVetoException(::rtl::OUString("Controller disagree ..."),static_cast< ::cppu::OWeakObject*>(this)); + throw util::CloseVetoException(OUString("Controller disagree ..."),static_cast< ::cppu::OWeakObject*>(this)); } } } @@ -505,7 +505,7 @@ Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (Run return Reference< XWindow >( GetViewFrame_Impl().GetFrame().GetWindow().GetComponentInterface(), UNO_QUERY_THROW ); } -::rtl::OUString SAL_CALL SfxBaseController::getViewControllerName() throw (RuntimeException) +OUString SAL_CALL SfxBaseController::getViewControllerName() throw (RuntimeException) { SolarMutexGuard aGuard; if ( !m_pData->m_pViewShell || !m_pData->m_pViewShell->GetObjectShell() ) @@ -515,7 +515,7 @@ Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (Run sal_uInt16 nViewNo = rDocFac.GetViewNo_Impl( GetViewFrame_Impl().GetCurViewId(), rDocFac.GetViewFactoryCount() ); OSL_ENSURE( nViewNo < rDocFac.GetViewFactoryCount(), "SfxBaseController::getViewControllerName: view ID not found in view factories!" ); - ::rtl::OUString sViewName; + OUString sViewName; if ( nViewNo < rDocFac.GetViewFactoryCount() ) sViewName = rDocFac.GetViewFactory( nViewNo ).GetAPIViewName(); @@ -672,7 +672,7 @@ uno::Any SfxBaseController::getViewData() throw( RuntimeException ) if ( m_pData->m_pViewShell ) { m_pData->m_pViewShell->WriteUserData( sData1 ) ; - ::rtl::OUString sData( sData1 ); + OUString sData( sData1 ); aAny <<= sData ; } @@ -688,7 +688,7 @@ void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw SolarMutexGuard aGuard; if ( m_pData->m_pViewShell ) { - ::rtl::OUString sData; + OUString sData; aValue >>= sData ; m_pData->m_pViewShell->ReadUserData( sData ) ; } @@ -719,7 +719,7 @@ Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( Runtime //________________________________________________________________________________________________________ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const util::URL& aURL , - const ::rtl::OUString& sTargetFrameName, + const OUString& sTargetFrameName, sal_Int32 eSearchFlags ) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -748,7 +748,7 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const if ( aURL.Protocol == ".uno:" ) { - rtl::OUString aMasterCommand = SfxOfficeDispatch::GetMasterUnoCommand( aURL ); + OUString aMasterCommand = SfxOfficeDispatch::GetMasterUnoCommand( aURL ); sal_Bool bMasterCommand( !aMasterCommand.isEmpty() ); pAct = m_pData->m_pViewShell->GetViewFrame() ; @@ -1180,7 +1180,7 @@ throw (RuntimeException) SfxViewFrame* pViewFrame( m_pData->m_pViewShell->GetFrame() ); SfxSlotPool* pPool( &SfxSlotPool::GetSlotPool( pViewFrame )); - rtl::OUString aCmdPrefix( ".uno:" ); + OUString aCmdPrefix( ".uno:" ); SfxSlotPool* pSlotPool = pPool ? pPool : &SFX_SLOTPOOL(); for ( sal_uInt16 i=0; i<pSlotPool->GetGroupCount(); i++ ) @@ -1197,7 +1197,7 @@ throw (RuntimeException) if ( pSfxSlot->GetMode() & nMode ) { frame::DispatchInformation aCmdInfo; - ::rtl::OUStringBuffer aBuf( aCmdPrefix ); + OUStringBuffer aBuf( aCmdPrefix ); aBuf.appendAscii( pSfxSlot->GetUnoName() ); aCmdInfo.Command = aBuf.makeStringAndClear(); aCmdInfo.GroupId = nCommandGroup; @@ -1260,8 +1260,8 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) { Reference< beans::XPropertySet > xFrameProps( m_pData->m_xFrame, uno::UNO_QUERY_THROW ); Reference< beans::XPropertySet > xLayouterProps( - xFrameProps->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ), uno::UNO_QUERY_THROW ); - xLayouterProps->setPropertyValue( ::rtl::OUString( "PreserveContentSize" ), uno::makeAny( sal_True ) ); + xFrameProps->getPropertyValue( OUString( "LayoutManager" ) ), uno::UNO_QUERY_THROW ); + xLayouterProps->setPropertyValue( OUString( "PreserveContentSize" ), uno::makeAny( sal_True ) ); } catch (const uno::Exception&) { @@ -1345,7 +1345,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) // if there's a JumpMark given, then, well, jump to it ::comphelper::NamedValueCollection aViewArgs( getCreationArguments() ); - const ::rtl::OUString sJumpMark = aViewArgs.getOrDefault( "JumpMark", ::rtl::OUString() ); + const OUString sJumpMark = aViewArgs.getOrDefault( "JumpMark", OUString() ); const bool bHasJumpMark = !sJumpMark.isEmpty(); OSL_ENSURE( ( !m_pData->m_pViewShell->GetObjectShell()->IsLoading() ) || ( sJumpMark.isEmpty() ), @@ -1385,7 +1385,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) for ( sal_Int32 i=0; i<nCount; ++i ) { const ::comphelper::NamedValueCollection aViewData( xViewData->getByIndex(i) ); - ::rtl::OUString sViewId( aViewData.getOrDefault( "ViewId", ::rtl::OUString() ) ); + OUString sViewId( aViewData.getOrDefault( "ViewId", OUString() ) ); if ( sViewId.isEmpty() ) continue; @@ -1492,7 +1492,7 @@ Reference< frame::XTitle > SfxBaseController::impl_getTitleHelper () //============================================================================= // frame::XTitle -::rtl::OUString SAL_CALL SfxBaseController::getTitle() +OUString SAL_CALL SfxBaseController::getTitle() throw (RuntimeException) { return impl_getTitleHelper()->getTitle (); @@ -1500,7 +1500,7 @@ Reference< frame::XTitle > SfxBaseController::impl_getTitleHelper () //============================================================================= // frame::XTitle -void SAL_CALL SfxBaseController::setTitle(const ::rtl::OUString& sTitle) +void SAL_CALL SfxBaseController::setTitle(const OUString& sTitle) throw (RuntimeException) { impl_getTitleHelper()->setTitle (sTitle); diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx index d1b9528fbdbd..52e418046f9f 100644 --- a/sfx2/source/view/viewfac.cxx +++ b/sfx2/source/view/viewfac.cxx @@ -33,7 +33,7 @@ SfxViewShell *SfxViewFactory::CreateInstance(SfxViewFrame *pFrame, SfxViewShell String SfxViewFactory::GetLegacyViewName() const { - ::rtl::OUStringBuffer aViewName; + OUStringBuffer aViewName; aViewName.appendAscii(RTL_CONSTASCII_STRINGPARAM("view")); aViewName.append( sal_Int32( GetOrdinal() ) ); return aViewName.makeStringAndClear(); @@ -45,7 +45,7 @@ String SfxViewFactory::GetAPIViewName() const return m_sViewName; if ( GetOrdinal() == 0 ) - return rtl::OUString( "Default" ); + return OUString( "Default" ); return GetLegacyViewName(); } @@ -56,7 +56,7 @@ SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, sal_uInt16 nOrdinal, const sal_Char* asciiViewName ): fnCreate(fnC), nOrd(nOrdinal), - m_sViewName( rtl::OUString::createFromAscii( asciiViewName ) ) + m_sViewName( OUString::createFromAscii( asciiViewName ) ) { DBG_CTOR(SfxViewFactory, 0); } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 526c45aac83f..3de0b3655b6c 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -179,7 +179,7 @@ namespace } //------------------------------------------------------------------------- -static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHandler >& xHandler, const ::rtl::OUString& aPath, const SfxFilter* pFilter, sal_uInt32 nPasswordHash, const uno::Sequence< beans::PropertyValue > aInfo ) +static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHandler >& xHandler, const OUString& aPath, const SfxFilter* pFilter, sal_uInt32 nPasswordHash, const uno::Sequence< beans::PropertyValue > aInfo ) { // TODO/LATER: In future the info should replace the direct hash completely sal_Bool bResult = ( !nPasswordHash && !aInfo.getLength() ); @@ -214,7 +214,7 @@ static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteracti else { // the binary format - bResult = ( SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( "com.sun.star.text.TextDocument" ).equals( pFilter->GetServiceName() ) ) == nPasswordHash ); + bResult = ( SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), OUString( "com.sun.star.text.TextDocument" ).equals( pFilter->GetServiceName() ) ) == nPasswordHash ); } } else @@ -363,7 +363,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxAllItemSet aSet( pApp->GetPool() ); aSet.Put( SfxStringItem( SID_FILE_NAME, pMed->GetURLObject().GetMainURL(INetURLObject::NO_DECODE) ) ); aSet.Put( SfxBoolItem( SID_TEMPLATE, sal_True ) ); - aSet.Put( SfxStringItem( SID_TARGETNAME, rtl::OUString("_blank") ) ); + aSet.Put( SfxStringItem( SID_TARGETNAME, OUString("_blank") ) ); SFX_ITEMSET_ARG( pMed->GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False ); if ( pReferer ) aSet.Put( *pReferer ); @@ -411,7 +411,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) && ( pSh->GetModifyPasswordHash() || pSh->GetModifyPasswordInfo().getLength() ) && !pSh->IsModifyPasswordEntered() ) { - ::rtl::OUString aDocumentName = INetURLObject( pMed->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ); + OUString aDocumentName = INetURLObject( pMed->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET ); if( !AskPasswordToModify_Impl( pMed->GetInteractionHandler(), aDocumentName, pMed->GetOrigFilter(), pSh->GetModifyPasswordHash(), pSh->GetModifyPasswordInfo() ) ) { // this is a read-only document, if it has "Password to modify" @@ -449,7 +449,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // doing - rtl::OUString aTemp; + OUString aTemp; utl::LocalFileHelper::ConvertPhysicalNameToURL( pMed->GetPhysicalName(), aTemp ); INetURLObject aPhysObj( aTemp ); SFX_ITEMSET_ARG( pSh->GetMedium()->GetItemSet(), @@ -768,7 +768,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) { SfxAllItemSet aSet( pApp->GetPool() ); aSet.Put( SfxStringItem( SID_FILE_NAME, pMedium->GetName() ) ); - aSet.Put( SfxStringItem( SID_TARGETNAME, rtl::OUString("_blank") ) ); + aSet.Put( SfxStringItem( SID_TARGETNAME, OUString("_blank") ) ); if ( pSavedOptions ) aSet.Put( *pSavedOptions ); if ( pSavedReferer ) @@ -1953,12 +1953,12 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc else aTransformLoadArgs.remove( "Hidden" ); - ::rtl::OUString sURL( "private:object" ); + OUString sURL( "private:object" ); if ( sURL.isEmpty() ) sURL = i_rDoc.GetFactory().GetFactoryURL(); Reference< XComponentLoader > xLoader( i_rFrame, UNO_QUERY_THROW ); - xLoader->loadComponentFromURL( sURL, ::rtl::OUString("_self"), 0, + xLoader->loadComponentFromURL( sURL, OUString("_self"), 0, aTransformLoadArgs.getPropertyValues() ); SfxViewShell* pViewShell = SfxViewShell::Get( i_rFrame->getController() ); @@ -2085,7 +2085,7 @@ void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId ) for ( sal_Int32 i=0; i<nCount; ++i ) { const ::comphelper::NamedValueCollection aCurViewData( xViewData->getByIndex(i) ); - ::rtl::OUString sViewId( aCurViewData.getOrDefault( "ViewId", ::rtl::OUString() ) ); + OUString sViewId( aCurViewData.getOrDefault( "ViewId", OUString() ) ); if ( sViewId.isEmpty() ) continue; @@ -2332,9 +2332,9 @@ sal_Bool impl_maxOpenDocCountReached() css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey( xContext, - ::rtl::OUString("org.openoffice.Office.Common/"), - ::rtl::OUString("Misc"), - ::rtl::OUString("MaxOpenDocuments"), + OUString("org.openoffice.Office.Common/"), + OUString("Misc"), + OUString("MaxOpenDocuments"), ::comphelper::ConfigurationHelper::E_READONLY); // NIL means: count of allowed documents = infinite ! @@ -2551,7 +2551,7 @@ void SfxViewFrame::Resize( sal_Bool bForce ) #define LINE_SEP 0x0A -void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sal_Bool bEraseTrailingEmptyLines ) +void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sal_Bool bEraseTrailingEmptyLines ) { sal_Int32 nStartPos = 0; sal_Int32 nLine = 0; @@ -2577,7 +2577,7 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sa else nEndPos++; - ::rtl::OUString aEndStr = rStr.copy( nEndPos ); + OUString aEndStr = rStr.copy( nEndPos ); rStr = rStr.copy( 0, nStartPos ); rStr += aEndStr; } @@ -2590,7 +2590,7 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sa if ( n > nStartPos ) { - ::rtl::OUString aEndStr = rStr.copy( n ); + OUString aEndStr = rStr.copy( n ); rStr = rStr.copy( 0, nStartPos ); rStr += aEndStr; } @@ -2602,7 +2602,7 @@ void CutLines( ::rtl::OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sa lib container. It generates a new unique id for it and insert the macro by using this number as name for the modul */ -void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) +void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) { #ifdef DISABLE_SCRIPTING (void) sMacro; @@ -2631,7 +2631,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) if ( xUrl.is() ) { // get name - ::rtl::OUString aName = xUrl->getName(); + OUString aName = xUrl->getName(); sal_Unicode cTok = '.'; sal_Int32 nIndex = 0; aLibName = aName.getToken( 0, cTok, nIndex ); @@ -2641,7 +2641,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) aMacroName = aName.getToken( 0, cTok, nIndex ); // get location - ::rtl::OUString aLocKey("location"); + OUString aLocKey("location"); if ( xUrl->hasParameter( aLocKey ) ) aLocation = xUrl->getParameter( aLocKey ); } @@ -2657,7 +2657,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) pBasMgr = GetObjectShell()->GetBasicManager(); } - ::rtl::OUString aOUSource; + OUString aOUSource; if ( pBasMgr) { StarBASIC* pBasic = pBasMgr->GetLib( aLibName ); @@ -2700,7 +2700,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) xLibCont, com::sun::star::uno::UNO_QUERY); - ::rtl::OUString sLib( aLibName ); + OUString sLib( aLibName ); com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xLib; if(xRoot->hasByName(sLib)) { @@ -2717,13 +2717,13 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro ) } // pack the macro as direct usable "sub" routine - ::rtl::OUString sCode; - ::rtl::OUStringBuffer sRoutine(10000); - ::rtl::OUString sMacroName( aMacroName ); + OUString sCode; + OUStringBuffer sRoutine(10000); + OUString sMacroName( aMacroName ); sal_Bool bReplace = sal_False; // get module - ::rtl::OUString sModule( aModuleName ); + OUString sModule( aModuleName ); if(xLib->hasByName(sModule)) { if ( !aOUSource.isEmpty() ) @@ -2794,7 +2794,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) case SID_RECORDMACRO : { // try to find any active recorder on this frame - ::rtl::OUString sProperty("DispatchRecorderSupplier"); + OUString sProperty("DispatchRecorderSupplier"); com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame( GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY); @@ -2865,7 +2865,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) { try { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; } catch ( Exception& ) @@ -2875,7 +2875,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) if ( xLayoutManager.is() ) { - rtl::OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); + OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); // Evaluate parameter. SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot(), sal_False); sal_Bool bShow( sal_True ); @@ -2919,7 +2919,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) { try { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; } catch ( Exception& ) @@ -2936,7 +2936,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) try { xLMPropSet->setPropertyValue( - ::rtl::OUString( "HideCurrentUI" ), + OUString( "HideCurrentUI" ), makeAny( bNewFullScreenMode )); } catch ( ::com::sun::star::beans::UnknownPropertyException& ) @@ -2995,7 +2995,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) break; } - ::rtl::OUString sProperty("DispatchRecorderSupplier"); + OUString sProperty("DispatchRecorderSupplier"); com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet( GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY); @@ -3020,7 +3020,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) break; } - ::rtl::OUString sProperty("DispatchRecorderSupplier"); + OUString sProperty("DispatchRecorderSupplier"); com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet( GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY); @@ -3039,13 +3039,13 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) GetFrame().GetFrameInterface(), com::sun::star::uno::UNO_QUERY); com::sun::star::uno::Any aProp = xSet->getPropertyValue( - rtl::OUString( "LayoutManager" ) ); + OUString( "LayoutManager" ) ); if ( !( aProp >>= xLayoutManager )) rSet.Put( SfxBoolItem( nWhich, sal_False )); else { - rtl::OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); + OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); sal_Bool bShow = xLayoutManager->isElementVisible( aStatusbarResString ); rSet.Put( SfxBoolItem( nWhich, bShow )); } @@ -3124,7 +3124,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) else { ::com::sun::star::util::URL aTargetURL; - aTargetURL.Complete = ::rtl::OUString(".component:DB/DataSourceBrowser"); + aTargetURL.Complete = OUString(".component:DB/DataSourceBrowser"); Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::com::sun::star::util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) ); @@ -3133,13 +3133,13 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY ); Reference < ::com::sun::star::frame::XDispatch > xDisp; if ( xProv.is() ) - xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString("_beamer"), 31 ); + xDisp = xProv->queryDispatch( aTargetURL, OUString("_beamer"), 31 ); if ( xDisp.is() ) { Sequence < ::com::sun::star::beans::PropertyValue > aArgs(1); ::com::sun::star::beans::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"); xDisp->dispatch( aTargetURL, aArgs ); } } @@ -3313,7 +3313,7 @@ void SfxViewFrame::SetViewFrame( SfxViewFrame* pFrame ) } // --------------------------------------------------------------------------------------------------------------------- -void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const ::rtl::OUString& i_rPanelURL ) +void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL ) { SolarMutexGuard aGuard; @@ -3331,7 +3331,7 @@ void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< :: } // --------------------------------------------------------------------------------------------------------------------- -void SfxViewFrame::ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL ) +void SfxViewFrame::ActivateToolPanel_Impl( const OUString& i_rPanelURL ) { // ensure the task pane is visible ENSURE_OR_RETURN_VOID( KnowsChildWindow( SID_TASKPANE ), "SfxViewFrame::ActivateToolPanel: this frame/module does not allow for a task pane!" ); @@ -3346,7 +3346,7 @@ void SfxViewFrame::ActivateToolPanel_Impl( const ::rtl::OUString& i_rPanelURL ) pPanelAccess->ActivateToolPanel( i_rPanelURL ); } -void SfxViewFrame::AppendInfoBar( const rtl::OUString& sId, const rtl::OUString& sMessage, std::vector< PushButton* > aButtons ) +void SfxViewFrame::AppendInfoBar( const OUString& sId, const OUString& sMessage, std::vector< PushButton* > aButtons ) { const sal_uInt16 nId = SfxInfoBarContainerChild::GetChildWindowId(); @@ -3362,7 +3362,7 @@ void SfxViewFrame::AppendInfoBar( const rtl::OUString& sId, const rtl::OUString& } } -void SfxViewFrame::RemoveInfoBar( const rtl::OUString& sId ) +void SfxViewFrame::RemoveInfoBar( const OUString& sId ) { const sal_uInt16 nId = SfxInfoBarContainerChild::GetChildWindowId(); diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index 86ce6401bc10..f84b209a6784 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -122,7 +122,7 @@ void SfxViewFrame::UpdateTitle() DBG_CHKTHIS(SfxViewFrame, 0); const SfxObjectFactory &rFact = GetObjectShell()->GetFactory(); - pImp->aFactoryName = rtl::OUString::createFromAscii(rFact.GetShortName()); + pImp->aFactoryName = OUString::createFromAscii(rFact.GetShortName()); SfxObjectShell *pObjSh = GetObjectShell(); if ( !pObjSh ) @@ -221,11 +221,11 @@ void SfxViewFrame::Exec_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( "_blank" ) ) ); + aReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString( "_blank" ) ) ); SFX_APP()->ExecuteSlot( aReq ); const SfxViewFrameItem* pItem = PTR_CAST( SfxViewFrameItem, aReq.GetReturnValue() ); if ( pItem ) @@ -298,7 +298,7 @@ void SfxViewFrame::GetState_Impl( SfxItemSet &rSet ) { if ( pImp->aFactoryName.Len() ) { - String aFact = rtl::OUString("private:factory/"); + String aFact = OUString("private:factory/"); aFact += pImp->aFactoryName; rSet.Put( SfxStringItem( nWhich, aFact ) ); } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index cc3add543a17..f518bae40dbb 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -72,7 +72,7 @@ class SfxPrinterController : public vcl::PrinterController, public SfxListener sal_Bool m_bApi; sal_Bool m_bTempPrinter; util::DateTime m_aLastPrinted; - ::rtl::OUString m_aLastPrintedBy; + OUString m_aLastPrintedBy; Sequence< beans::PropertyValue > getMergedOptions() const; const Any& getSelectionObject() const; @@ -132,10 +132,10 @@ SfxPrinterController::SfxPrinterController( const boost::shared_ptr<Printer>& i_ setValue( rProps[nProp].Name, rProps[nProp].Value ); Sequence< beans::PropertyValue > aRenderOptions( 3 ); - aRenderOptions[0].Name = rtl::OUString( "ExtraPrintUIOptions" ); - aRenderOptions[1].Name = rtl::OUString( "View" ); + aRenderOptions[0].Name = OUString( "ExtraPrintUIOptions" ); + aRenderOptions[1].Name = OUString( "View" ); aRenderOptions[1].Value = i_rViewProp; - aRenderOptions[2].Name = rtl::OUString( "IsPrinter" ); + aRenderOptions[2].Name = OUString( "IsPrinter" ); aRenderOptions[2].Value <<= sal_True; try { @@ -163,10 +163,10 @@ SfxPrinterController::SfxPrinterController( const boost::shared_ptr<Printer>& i_ } // set some job parameters - setValue( rtl::OUString( "IsApi" ), makeAny( i_bApi ) ); - setValue( rtl::OUString( "IsDirect" ), makeAny( i_bDirect ) ); - setValue( rtl::OUString( "IsPrinter" ), makeAny( sal_True ) ); - setValue( rtl::OUString( "View" ), i_rViewProp ); + setValue( OUString( "IsApi" ), makeAny( i_bApi ) ); + setValue( OUString( "IsDirect" ), makeAny( i_bDirect ) ); + setValue( OUString( "IsPrinter" ), makeAny( sal_True ) ); + setValue( OUString( "View" ), i_rViewProp ); } void SfxPrinterController::Notify( SfxBroadcaster& , const SfxHint& rHint ) @@ -189,7 +189,7 @@ SfxPrinterController::~SfxPrinterController() const Any& SfxPrinterController::getSelectionObject() const { - const beans::PropertyValue* pVal = getValue( rtl::OUString( "PrintSelectionOnly" ) ); + const beans::PropertyValue* pVal = getValue( OUString( "PrintSelectionOnly" ) ); if( pVal ) { sal_Bool bSel = sal_False; @@ -198,7 +198,7 @@ const Any& SfxPrinterController::getSelectionObject() const } sal_Int32 nChoice = 0; - pVal = getValue( rtl::OUString( "PrintContent" ) ); + pVal = getValue( OUString( "PrintContent" ) ); if( pVal ) pVal->Value >>= nChoice; return (nChoice > 1) ? maSelection : maCompleteSelection; @@ -216,7 +216,7 @@ Sequence< beans::PropertyValue > SfxPrinterController::getMergedOptions() const } Sequence< beans::PropertyValue > aRenderOptions( 1 ); - aRenderOptions[ 0 ].Name = rtl::OUString( "RenderDevice" ); + aRenderOptions[ 0 ].Name = OUString( "RenderDevice" ); aRenderOptions[ 0 ].Value <<= mxDevice; aRenderOptions = getJobProperties( aRenderOptions ); @@ -312,8 +312,8 @@ void SfxPrinterController::jobStarted() m_aLastPrinted = xDocProps->getPrintDate(); xDocProps->setPrintedBy( mpObjectShell->IsUseUserData() - ? ::rtl::OUString( SvtUserOptions().GetFullName() ) - : ::rtl::OUString() ); + ? OUString( SvtUserOptions().GetFullName() ) + : OUString() ); ::DateTime now( ::DateTime::SYSTEM ); xDocProps->setPrintDate( util::DateTime( @@ -338,7 +338,7 @@ void SfxPrinterController::jobFinished( com::sun::star::view::PrintableState nSt case view::PrintableState_JOB_FAILED : { // "real" problem (not simply printing cancelled by user) - rtl::OUString aMsg( SfxResId(STR_NOSTARTPRINTER).toString() ); + OUString aMsg( SfxResId(STR_NOSTARTPRINTER).toString() ); if ( !m_bApi ) ErrorBox( mpViewShell->GetWindow(), WB_OK | WB_DEF_OK, aMsg ).Execute(); // intentionally no break @@ -510,7 +510,7 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter ) bSizeToDoc; // Message and Flags for page format, summaries changes - rtl::OUString aMsg; + OUString aMsg; sal_uInt16 nNewOpt=0; if( bOriChg && bPgSzChg ) { @@ -599,7 +599,7 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro { if ( pVal[i].Name == "PrinterName" ) { - rtl::OUString aPrinterName; + OUString aPrinterName; pVal[i].Value >>= aPrinterName; aPrt.reset( new Printer( aPrinterName ) ); break; @@ -620,8 +620,8 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro pImp->m_pPrinterController = pController; SfxObjectShell *pObjShell = GetObjectShell(); - pController->setValue( rtl::OUString( "JobName" ), - makeAny( rtl::OUString( pObjShell->GetTitle(0) ) ) ); + pController->setValue( OUString( "JobName" ), + makeAny( OUString( pObjShell->GetTitle(0) ) ) ); // FIXME: job setup SfxPrinter* pDocPrt = GetPrinter(sal_False); @@ -713,22 +713,22 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) { if ( aProps[nProp].Name == "Copies" ) { - aProps[nProp]. Name = rtl::OUString("CopyCount"); + aProps[nProp]. Name = OUString("CopyCount"); } else if ( aProps[nProp].Name == "RangeText" ) { - aProps[nProp]. Name = rtl::OUString("Pages"); + aProps[nProp]. Name = OUString("Pages"); } else if ( aProps[nProp].Name == "Asynchron" ) { - aProps[nProp]. Name = rtl::OUString("Wait"); + aProps[nProp]. Name = OUString("Wait"); sal_Bool bAsynchron = sal_False; aProps[nProp].Value >>= bAsynchron; aProps[nProp].Value <<= (sal_Bool) (!bAsynchron); } else if ( aProps[nProp].Name == "Silent" ) { - aProps[nProp]. Name = rtl::OUString("MonitorVisible"); + aProps[nProp]. Name = OUString("MonitorVisible"); sal_Bool bPrintSilent = sal_False; aProps[nProp].Value >>= bPrintSilent; aProps[nProp].Value <<= (sal_Bool) (!bPrintSilent); @@ -748,13 +748,13 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) // it would be better if writer handled this internally if( nId == SID_PRINTDOCDIRECT ) { - aProps[nLen].Name = rtl::OUString( "PrintSelectionOnly" ); + aProps[nLen].Name = OUString( "PrintSelectionOnly" ); aProps[nLen].Value = makeAny( bSelection ); } else // if nId == SID_PRINTDOC ; nothing to do with the previous HACK { // should the printer selection and properties dialogue display an help button - aProps[nLen].Name = rtl::OUString( "HideHelpButton" ); + aProps[nLen].Name = OUString( "HideHelpButton" ); aProps[nLen].Value = makeAny( bPrintOnHelp ); } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index d5c778e56aa6..d0d299cfa100 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -217,14 +217,14 @@ void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::c //========================================================================= -static ::rtl::OUString RetrieveLabelFromCommand( - const ::rtl::OUString& rCommandURL, +static OUString RetrieveLabelFromCommand( + const OUString& rCommandURL, const css::uno::Reference< css::frame::XFrame >& rFrame ) { static css::uno::WeakReference< frame::XModuleManager2 > s_xModuleManager; static css::uno::WeakReference< container::XNameAccess > s_xNameAccess; - ::rtl::OUString aLabel; + OUString aLabel; css::uno::Reference< css::frame::XModuleManager2 > xModuleManager( s_xModuleManager ); css::uno::Reference< css::container::XNameAccess > xNameAccess( s_xNameAccess ); css::uno::Reference< css::uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -237,7 +237,7 @@ static ::rtl::OUString RetrieveLabelFromCommand( s_xModuleManager = xModuleManager; } - ::rtl::OUString aModuleIdentifier = xModuleManager->identify( rFrame ); + OUString aModuleIdentifier = xModuleManager->identify( rFrame ); if ( !xNameAccess.is() ) { @@ -251,7 +251,7 @@ static ::rtl::OUString RetrieveLabelFromCommand( css::uno::Reference< css::container::XNameAccess > xUICommands; a >>= xUICommands; - rtl::OUString aStr; + OUString aStr; css::uno::Sequence< css::beans::PropertyValue > aPropSeq; a = xUICommands->getByName( rCommandURL ); @@ -303,32 +303,32 @@ TYPEINIT2(SfxViewShell,SfxShell,SfxListener); /** search for a filter name dependent on type and module */ -static ::rtl::OUString impl_retrieveFilterNameFromTypeAndModule( +static OUString impl_retrieveFilterNameFromTypeAndModule( const css::uno::Reference< css::container::XContainerQuery >& rContainerQuery, - const ::rtl::OUString& rType, - const ::rtl::OUString& rModuleIdentifier, + const OUString& rType, + const OUString& rModuleIdentifier, const sal_Int32 nFlags ) { // Retrieve filter from type css::uno::Sequence< css::beans::NamedValue > aQuery( 2 ); - aQuery[0].Name = rtl::OUString( "Type" ); + aQuery[0].Name = OUString( "Type" ); aQuery[0].Value = css::uno::makeAny( rType ); - aQuery[1].Name = rtl::OUString( "DocumentService" ); + aQuery[1].Name = OUString( "DocumentService" ); aQuery[1].Value = css::uno::makeAny( rModuleIdentifier ); css::uno::Reference< css::container::XEnumeration > xEnumeration = rContainerQuery->createSubSetEnumerationByProperties( aQuery ); - ::rtl::OUString aFoundFilterName; + OUString aFoundFilterName; while ( xEnumeration->hasMoreElements() ) { ::comphelper::SequenceAsHashMap aFilterPropsHM( xEnumeration->nextElement() ); - ::rtl::OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Name"), - ::rtl::OUString() ); + OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( + OUString("Name"), + OUString() ); sal_Int32 nFilterFlags = aFilterPropsHM.getUnpackedValueOrDefault( - ::rtl::OUString("Flags"), + OUString("Flags"), sal_Int32( 0 ) ); if ( nFilterFlags & nFlags ) @@ -351,7 +351,7 @@ enum ETypeFamily E_OOO_DOC }; -::rtl::OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFrame >& xFrame , +OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFrame >& xFrame , ETypeFamily eTypeFamily) { try @@ -359,40 +359,40 @@ enum ETypeFamily css::uno::Reference< css::uno::XComponentContext > xContext (::comphelper::getProcessComponentContext()); css::uno::Reference< css::frame::XModuleManager2 > xModuleManager(css::frame::ModuleManager::create(xContext)); - ::rtl::OUString sModule = xModuleManager->identify(xFrame); - ::rtl::OUString sType ; + OUString sModule = xModuleManager->identify(xFrame); + OUString sType ; switch(eTypeFamily) { case E_MS_DOC: { if ( sModule == "com.sun.star.text.TextDocument" ) - sType = ::rtl::OUString( "writer_MS_Word_97" ); + sType = OUString( "writer_MS_Word_97" ); else if ( sModule == "com.sun.star.sheet.SpreadsheetDocument" ) - sType = ::rtl::OUString( "calc_MS_Excel_97" ); + sType = OUString( "calc_MS_Excel_97" ); else if ( sModule == "com.sun.star.drawing.DrawingDocument" ) - sType = ::rtl::OUString( "impress_MS_PowerPoint_97" ); + sType = OUString( "impress_MS_PowerPoint_97" ); else if ( sModule == "com.sun.star.presentation.PresentationDocument" ) - sType = ::rtl::OUString( "impress_MS_PowerPoint_97" ); + sType = OUString( "impress_MS_PowerPoint_97" ); } break; case E_OOO_DOC: { if ( sModule == "com.sun.star.text.TextDocument" ) - sType = ::rtl::OUString( "writer8" ); + sType = OUString( "writer8" ); else if ( sModule == "com.sun.star.sheet.SpreadsheetDocument" ) - sType = ::rtl::OUString( "calc8" ); + sType = OUString( "calc8" ); else if ( sModule == "com.sun.star.drawing.DrawingDocument" ) - sType = ::rtl::OUString( "draw8" ); + sType = OUString( "draw8" ); else if ( sModule == "com.sun.star.presentation.PresentationDocument" ) - sType = ::rtl::OUString( "impress8" ); + sType = OUString( "impress8" ); } break; } @@ -407,7 +407,7 @@ enum ETypeFamily { } - return ::rtl::OUString(); + return OUString(); } //-------------------------------------------------------------------- @@ -456,20 +456,20 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { try { - Any aValue = xPropSet->getPropertyValue( rtl::OUString( "LayoutManager" )); + Any aValue = xPropSet->getPropertyValue( OUString( "LayoutManager" )); aValue >>= xLayoutManager; if ( xLayoutManager.is() ) { - rtl::OUString aTextResString( "private:resource/toolbar/textobjectbar" ); + OUString aTextResString( "private:resource/toolbar/textobjectbar" ); uno::Reference< ui::XUIElement > xElement = xLayoutManager->getElement( aTextResString ); if(!xElement.is()) { - rtl::OUString aFrameResString( "private:resource/toolbar/frameobjectbar" ); + OUString aFrameResString( "private:resource/toolbar/frameobjectbar" ); xElement = xLayoutManager->getElement( aFrameResString ); } if(!xElement.is()) { - rtl::OUString aOleResString( "private:resource/toolbar/oleobjectbar" ); + OUString aOleResString( "private:resource/toolbar/oleobjectbar" ); xElement = xLayoutManager->getElement( aOleResString ); } if(xElement.is()) @@ -519,7 +519,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { SfxMailModel aModel; - rtl::OUString aDocType; + OUString aDocType; SFX_REQUEST_ARG(rReq, pMailSubject, SfxStringItem, SID_MAIL_SUBJECT, sal_False ); if ( pMailSubject ) @@ -529,7 +529,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) if ( pMailRecipient ) { String aRecipient( pMailRecipient->GetValue() ); - String aMailToStr(rtl::OUString("mailto:")); + String aMailToStr(OUString("mailto:")); if ( aRecipient.Search( aMailToStr ) == 0 ) aRecipient = aRecipient.Erase( 0, aMailToStr.Len() ); @@ -543,9 +543,9 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) SfxMailModel::SendMailResult eResult = SfxMailModel::SEND_MAIL_ERROR; if ( nId == SID_MAIL_SENDDOC ) - eResult = aModel.SaveAndSend( xFrame, rtl::OUString() ); + eResult = aModel.SaveAndSend( xFrame, OUString() ); else if ( nId == SID_MAIL_SENDDOCASPDF ) - eResult = aModel.SaveAndSend( xFrame, rtl::OUString( "pdf_Portable_Document_Format" )); + eResult = aModel.SaveAndSend( xFrame, OUString( "pdf_Portable_Document_Format" )); else if ( nId == SID_MAIL_SENDDOCASMS ) { aDocType = impl_searchFormatTypeForApp(xFrame, E_MS_DOC); @@ -580,7 +580,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) WhenSaving, &GetViewFrame()->GetWindow() ) != RET_YES ) break; uno::Reference < frame::XFrame > xFrame( pFrame->GetFrame().GetFrameInterface() ); - SfxMailModel::SendMailResult eResult = aModel.SaveAndSend( xFrame, rtl::OUString() ); + SfxMailModel::SendMailResult eResult = aModel.SaveAndSend( xFrame, OUString() ); if( eResult == SfxMailModel::SEND_MAIL_ERROR ) { InfoBox aBox( SFX_APP()->GetTopWindow(), SfxResId( MSG_ERROR_SEND_MAIL )); @@ -606,7 +606,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) css::uno::Reference< css::frame::XModuleManager2 > xModuleManager( css::frame::ModuleManager::create(xContext) ); - rtl::OUString aModule; + OUString aModule; try { aModule = xModuleManager->identify( xFrame ); @@ -630,19 +630,19 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) css::uno::Reference< css::frame::XStorable > xStorable( xModel, css::uno::UNO_QUERY ); if ( xModel.is() && xStorable.is() ) { - rtl::OUString aFilterName; - rtl::OUString aTypeName( HTML_DOCUMENT_TYPE ); - rtl::OUString aFileName; - rtl::OUString aExtension( "htm" ); + OUString aFilterName; + OUString aTypeName( HTML_DOCUMENT_TYPE ); + OUString aFileName; + OUString aExtension( "htm" ); - rtl::OUString aLocation = xStorable->getLocation(); + OUString aLocation = xStorable->getLocation(); INetURLObject aFileObj( aLocation ); bool bPrivateProtocol = ( aFileObj.GetProtocol() == INET_PROT_PRIV_SOFFICE ); bool bHasLocation = !aLocation.isEmpty() && !bPrivateProtocol; css::uno::Reference< css::container::XContainerQuery > xContainerQuery( - xSMGR->createInstance( rtl::OUString( + xSMGR->createInstance( OUString( "com.sun.star.document.FilterFactory" )), css::uno::UNO_QUERY_THROW ); @@ -653,7 +653,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { // Draw/Impress uses a different type. 2nd chance try to use alternative type name aFilterName = impl_retrieveFilterNameFromTypeAndModule( - xContainerQuery, ::rtl::OUString( HTML_GRAPHIC_TYPE ), aModule, nFilterFlags ); + xContainerQuery, OUString( HTML_GRAPHIC_TYPE ), aModule, nFilterFlags ); } // No filter found => error @@ -668,7 +668,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) if ( !bHasLocation ) { // Create a default file name with the correct extension - const rtl::OUString aPreviewFileName( "webpreview" ); + const OUString aPreviewFileName( "webpreview" ); aFileName = aPreviewFileName; } else @@ -688,10 +688,10 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) aFilePathObj.insertName( aFileName ); aFilePathObj.setExtension( aExtension ); - rtl::OUString aFileURL = aFilePathObj.GetMainURL( INetURLObject::NO_DECODE ); + OUString aFileURL = aFilePathObj.GetMainURL( INetURLObject::NO_DECODE ); css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( "FilterName" ); + aArgs[0].Name = OUString( "FilterName" ); aArgs[0].Value = css::uno::makeAny( aFilterName ); // Store document in the html format @@ -806,7 +806,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) if ( SID_PRINTDOCDIRECT == nSID ) { - rtl::OUString aPrinterName; + OUString aPrinterName; if ( pPrinter != NULL ) aPrinterName = pPrinter->GetName(); else @@ -815,9 +815,9 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) { uno::Reference < frame::XFrame > xFrame( pFrame->GetFrame().GetFrameInterface() ); - ::rtl::OUStringBuffer aBuffer( 60 ); + OUStringBuffer aBuffer( 60 ); aBuffer.append( RetrieveLabelFromCommand( - ::rtl::OUString( ".uno:PrintDefault" ), + OUString( ".uno:PrintDefault" ), xFrame )); aBuffer.appendAscii(RTL_CONSTASCII_STRINGPARAM(" (")); aBuffer.append( aPrinterName ); @@ -1961,7 +1961,7 @@ void Change( Menu* pMenu, SfxViewShell* pView ) } -sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const ::rtl::OUString& rMenuIdentifier, Menu*& rpOut, ui::ContextMenuExecuteEvent aEvent ) +sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, Menu*& rpOut, ui::ContextMenuExecuteEvent aEvent ) { rpOut = NULL; sal_Bool bModified = sal_False; |