diff options
author | Krisztian Pinter <pin.terminator@gmail.com> | 2013-03-08 03:07:46 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-03-08 02:45:23 +0000 |
commit | fd4380759d67bcfa582dd8880077ea8445ab8a06 (patch) | |
tree | 606dee7c3f7e0b6987976302865dfc2a4ac77570 /framework/source/services | |
parent | Translate german comments in sw/source/filter/ww8/wrtww8.cxx (diff) | |
download | core-fd4380759d67bcfa582dd8880077ea8445ab8a06.tar.gz core-fd4380759d67bcfa582dd8880077ea8445ab8a06.zip |
RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals
Change-Id: Ief6418425676d6943993513c4d05c8d22e4740cf
Reviewed-on: https://gerrit.libreoffice.org/2470
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'framework/source/services')
-rw-r--r-- | framework/source/services/backingwindow.cxx | 80 | ||||
-rw-r--r-- | framework/source/services/pathsettings.cxx | 100 | ||||
-rw-r--r-- | framework/source/services/substitutepathvars.cxx | 183 | ||||
-rw-r--r-- | framework/source/services/taskcreatorsrv.cxx | 30 |
4 files changed, 196 insertions, 197 deletions
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 819ec5e3d6ee..5e2ca264767a 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -122,7 +122,7 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper1< ::com::sun::star virtual ~RecentFilesStringLength() {} // 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(); @@ -160,16 +160,16 @@ BackingWindow::BackingWindow( Window* i_pParent ) : Reference<lang::XMultiServiceFactory> xConfig = configuration::theDefaultProvider::get( comphelper::getProcessComponentContext() ); Sequence<Any> args(1); PropertyValue val( - rtl::OUString( "nodepath" ), + OUString( "nodepath" ), 0, - Any(rtl::OUString( "/org.openoffice.Office.Common/Help/StartCenter")), + Any(OUString( "/org.openoffice.Office.Common/Help/StartCenter")), PropertyState_DIRECT_VALUE); args.getArray()[0] <<= val; Reference<container::XNameAccess> xNameAccess(xConfig->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,args), UNO_QUERY); if( xNameAccess.is() ) { //throws css::container::NoSuchElementException, css::lang::WrappedTargetException - Any value( xNameAccess->getByName(rtl::OUString("StartCenterHideExternalLinks")) ); + Any value( xNameAccess->getByName(OUString("StartCenterHideExternalLinks")) ); mnHideExternalLinks = value.get<sal_Int32>(); } } @@ -298,7 +298,7 @@ void BackingWindow::prepareRecentFileMenu() for ( sal_Int32 i = 0; i < nPickListMenuItems; i++ ) { Sequence< PropertyValue >& rPickListEntry = aHistoryList[i]; - rtl::OUString aURL, aFilter, aFilterOpt, aTitle; + OUString aURL, aFilter, aFilterOpt, aTitle; for ( sal_Int32 j = 0; j < rPickListEntry.getLength(); j++ ) { @@ -328,27 +328,27 @@ void BackingWindow::prepareRecentFileMenu() rArgsList.realloc( nArgs ); nArgs--; - rArgsList[nArgs].Name = rtl::OUString( "FilterName" ); + rArgsList[nArgs].Name = OUString( "FilterName" ); rArgsList[nArgs].Value = makeAny( aFilter ); if( !aFilterOpt.isEmpty() ) { nArgs--; - rArgsList[nArgs].Name = rtl::OUString( "FilterOptions" ); + rArgsList[nArgs].Name = OUString( "FilterOptions" ); rArgsList[nArgs].Value = makeAny( aFilterOpt ); } // documents in the picklist will never be opened as templates nArgs--; - rArgsList[nArgs].Name = rtl::OUString( "AsTemplate" ); + rArgsList[nArgs].Name = OUString( "AsTemplate" ); rArgsList[nArgs].Value = makeAny( (sal_Bool) sal_False ); nArgs--; - rArgsList[nArgs].Name = rtl::OUString( "Referer" ); - rArgsList[nArgs].Value = makeAny( rtl::OUString( "private:user" ) ); + rArgsList[nArgs].Name = OUString( "Referer" ); + rArgsList[nArgs].Value = makeAny( OUString( "private:user" ) ); // and finally create an entry in the popupmenu - rtl::OUString aMenuTitle; + OUString aMenuTitle; INetURLObject aURLObj( aURL ); if ( aURLObj.GetProtocol() == INET_PROT_FILE ) @@ -357,8 +357,8 @@ void BackingWindow::prepareRecentFileMenu() // path and abbreviate it with a special function: String aFileSystemPath( aURLObj.getFSysPath( INetURLObject::FSYS_DETECT ) ); - rtl::OUString aSystemPath( aFileSystemPath ); - rtl::OUString aCompactedSystemPath; + OUString aSystemPath( aFileSystemPath ); + OUString aCompactedSystemPath; oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL ); if ( !nError ) @@ -372,7 +372,7 @@ void BackingWindow::prepareRecentFileMenu() Reference< util::XStringWidth > xStringLength( new RecentFilesStringLength() ); aMenuTitle = aURLObj.getAbbreviated( xStringLength, 46, INetURLObject::DECODE_UNAMBIGUOUS ); } - rtl::OUStringBuffer aBuf( aMenuTitle.getLength() + 5 ); + OUStringBuffer aBuf( aMenuTitle.getLength() + 5 ); if( i < 9 ) { aBuf.append( sal_Unicode( '~' ) ); @@ -492,17 +492,17 @@ void BackingWindow::initControls() // collect the URLs of the entries in the File/New menu SvtModuleOptions aModuleOptions; - 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.isEmpty() ) aFileNewAppsAvailable.insert( sURL ); } @@ -622,14 +622,14 @@ void BackingWindow::loadImage( const ResId& i_rId, PushButton& i_rButton ) void BackingWindow::layoutButton( const char* i_pURL, int nColumn, int i_nExtraWidth, - const std::set<rtl::OUString>& i_rURLS, + const std::set<OUString>& i_rURLS, SvtModuleOptions& i_rOpt, SvtModuleOptions::EModule i_eMod, PushButton& i_rBtn, MnemonicGenerator& i_rMnemns, const String& i_rStr ) { - rtl::OUString aURL( i_pURL ? rtl::OUString::createFromAscii( i_pURL ) : rtl::OUString() ); + OUString aURL( i_pURL ? OUString::createFromAscii( i_pURL ) : OUString() ); // setup button i_rBtn.SetPaintTransparent( sal_True ); i_rBtn.SetClickHdl( LINK( this, BackingWindow, ClickHdl ) ); @@ -880,24 +880,24 @@ IMPL_LINK_NOARG(BackingWindow, ToolboxHdl) Reference<lang::XMultiServiceFactory> xConfig = configuration::theDefaultProvider::get( comphelper::getProcessComponentContext() ); Sequence<Any> args(1); PropertyValue val( - rtl::OUString( "nodepath" ), + OUString( "nodepath" ), 0, - Any(rtl::OUString::createFromAscii(pNodePath)), + Any(OUString::createFromAscii(pNodePath)), PropertyState_DIRECT_VALUE); args.getArray()[0] <<= val; Reference<container::XNameAccess> xNameAccess(xConfig->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,args), UNO_QUERY); if( xNameAccess.is() ) { - rtl::OUString sURL; + OUString sURL; //throws css::container::NoSuchElementException, css::lang::WrappedTargetException - Any value( xNameAccess->getByName(rtl::OUString::createFromAscii(pNode)) ); - sURL = value.get<rtl::OUString> (); + Any value( xNameAccess->getByName(OUString::createFromAscii(pNode)) ); + sURL = value.get<OUString> (); localizeWebserviceURI(sURL); Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( com::sun::star::system::SystemShellExecute::create(comphelper::getProcessComponentContext())); //throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException - xSystemShellExecute->execute( sURL, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); + xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); } } catch (const Exception&) @@ -912,27 +912,27 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) { // dispatch the appropriate URL and end the dialog if( pButton == &maWriterButton ) - dispatchURL( rtl::OUString( WRITER_URL ) ); + dispatchURL( OUString( WRITER_URL ) ); else if( pButton == &maCalcButton ) - dispatchURL( rtl::OUString( CALC_URL ) ); + dispatchURL( OUString( CALC_URL ) ); else if( pButton == &maImpressButton ) - dispatchURL( rtl::OUString( IMPRESS_WIZARD_URL ) ); + dispatchURL( OUString( IMPRESS_WIZARD_URL ) ); else if( pButton == &maDrawButton ) - dispatchURL( rtl::OUString( DRAW_URL ) ); + dispatchURL( OUString( DRAW_URL ) ); else if( pButton == &maDBButton ) - dispatchURL( rtl::OUString( BASE_URL ) ); + dispatchURL( OUString( BASE_URL ) ); else if( pButton == &maMathButton ) - dispatchURL( rtl::OUString( MATH_URL ) ); + dispatchURL( OUString( MATH_URL ) ); else if( pButton == &maOpenButton ) { Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY ); Sequence< com::sun::star::beans::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"); - dispatchURL( rtl::OUString( OPEN_URL ), rtl::OUString(), xFrame, aArgs ); + dispatchURL( OUString( OPEN_URL ), OUString(), xFrame, aArgs ); } else if( pButton == &maTemplateButton ) { @@ -940,10 +940,10 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) Sequence< com::sun::star::beans::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"); - dispatchURL( rtl::OUString( TEMPLATE_URL ), rtl::OUString(), xFrame, aArgs ); + dispatchURL( OUString( TEMPLATE_URL ), OUString(), xFrame, aArgs ); } return 0; } @@ -956,7 +956,7 @@ IMPL_LINK( BackingWindow, SelectHdl, Button*, pButton ) if( nItem >= 0 && nItem < sal_Int32(maRecentFiles.size()) ) { Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY ); - dispatchURL( maRecentFiles[nItem].aTargetURL, rtl::OUString(), xFrame, maRecentFiles[nItem].aArgSeq ); + dispatchURL( maRecentFiles[nItem].aTargetURL, OUString(), xFrame, maRecentFiles[nItem].aArgSeq ); } } return 0; @@ -1003,8 +1003,8 @@ static long implDispatchDelayed( void*, void* pArg ) return 0; } -void BackingWindow::dispatchURL( const rtl::OUString& i_rURL, - const rtl::OUString& rTarget, +void BackingWindow::dispatchURL( const OUString& i_rURL, + const OUString& rTarget, const Reference< XDispatchProvider >& i_xProv, const Sequence< PropertyValue >& i_rArgs ) { diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index a015114f96d6..6f52a62bebc7 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -47,8 +47,8 @@ #include <fwkdllapi.h> -#define CFGPROP_USERPATHS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserPaths")) -#define CFGPROP_WRITEPATH rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WritePath")) +#define CFGPROP_USERPATHS OUString("UserPaths") +#define CFGPROP_WRITEPATH OUString("WritePath") /* 0 : old style "Template" string using ";" as seperator @@ -57,9 +57,9 @@ 3 : write path "Template_write" string */ -#define POSTFIX_INTERNAL_PATHS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_internal")) -#define POSTFIX_USER_PATHS rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_user")) -#define POSTFIX_WRITE_PATH rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_writable")) +#define POSTFIX_INTERNAL_PATHS OUString("_internal") +#define POSTFIX_USER_PATHS OUString("_user") +#define POSTFIX_WRITE_PATH OUString("_writable") const sal_Int32 IDGROUP_OLDSTYLE = 0; const sal_Int32 IDGROUP_INTERNAL_PATHS = 1; @@ -162,10 +162,10 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven { const css::util::ElementChange& aChange = aEvent.Changes[i]; - ::rtl::OUString sChanged; + OUString sChanged; aChange.Accessor >>= sChanged; - ::rtl::OUString sPath = ::utl::extractFirstFromConfigurationPath(sChanged); + OUString sPath = ::utl::extractFirstFromConfigurationPath(sChanged); if (!sPath.isEmpty()) { PathSettings::EChangeOp eOp = impl_updatePath(sPath, sal_True); @@ -204,12 +204,12 @@ void PathSettings::impl_readAll() { // TODO think about me css::uno::Reference< css::container::XNameAccess > xCfg = fa_getCfgNew(); - css::uno::Sequence< ::rtl::OUString > lPaths = xCfg->getElementNames(); + css::uno::Sequence< OUString > lPaths = xCfg->getElementNames(); sal_Int32 c = lPaths.getLength(); for (sal_Int32 i = 0; i < c; ++i) { - const ::rtl::OUString& sPath = lPaths[i]; + const OUString& sPath = lPaths[i]; impl_updatePath(sPath, sal_False); } } @@ -222,7 +222,7 @@ void PathSettings::impl_readAll() //----------------------------------------------------------------------------- // NO substitution here ! It's done outside ... -OUStringList PathSettings::impl_readOldFormat(const ::rtl::OUString& sPath) +OUStringList PathSettings::impl_readOldFormat(const OUString& sPath) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::impl_readOldFormat" ); css::uno::Reference< css::container::XNameAccess > xCfg( fa_getCfgOld() ); @@ -232,8 +232,8 @@ OUStringList PathSettings::impl_readOldFormat(const ::rtl::OUString& sPath) { css::uno::Any aVal( xCfg->getByName(sPath) ); - ::rtl::OUString sStringVal; - css::uno::Sequence< ::rtl::OUString > lStringListVal; + OUString sStringVal; + css::uno::Sequence< OUString > lStringListVal; if (aVal >>= sStringVal) { @@ -250,10 +250,10 @@ OUStringList PathSettings::impl_readOldFormat(const ::rtl::OUString& sPath) //----------------------------------------------------------------------------- // NO substitution here ! It's done outside ... -PathSettings::PathInfo PathSettings::impl_readNewFormat(const ::rtl::OUString& sPath) +PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) { - const ::rtl::OUString CFGPROP_INTERNALPATHS(RTL_CONSTASCII_USTRINGPARAM("InternalPaths")); - const ::rtl::OUString CFGPROP_ISSINGLEPATH(RTL_CONSTASCII_USTRINGPARAM("IsSinglePath")); + const OUString CFGPROP_INTERNALPATHS("InternalPaths"); + const OUString CFGPROP_ISSINGLEPATH("IsSinglePath"); css::uno::Reference< css::container::XNameAccess > xCfg = fa_getCfgNew(); @@ -351,7 +351,7 @@ void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, pIt != lOld.end() ; ++pIt ) { - const ::rtl::OUString& sOld = *pIt; + const OUString& sOld = *pIt; if (rPath.bIsSinglePath) { @@ -372,7 +372,7 @@ void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, } //----------------------------------------------------------------------------- -PathSettings::EChangeOp PathSettings::impl_updatePath(const ::rtl::OUString& sPath , +PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath , sal_Bool bNotifyListener) { // SAFE -> @@ -479,12 +479,12 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const ::rtl::OUString& sPa } //----------------------------------------------------------------------------- -css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const ::rtl::OUString& sPath) +css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUString& sPath) { - ::rtl::OUString sOldStyleProp = sPath; - ::rtl::OUString sInternalProp = sPath+POSTFIX_INTERNAL_PATHS; - ::rtl::OUString sUserProp = sPath+POSTFIX_USER_PATHS; - ::rtl::OUString sWriteProp = sPath+POSTFIX_WRITE_PATH; + OUString sOldStyleProp = sPath; + OUString sInternalProp = sPath+POSTFIX_INTERNAL_PATHS; + OUString sUserProp = sPath+POSTFIX_USER_PATHS; + OUString sWriteProp = sPath+POSTFIX_WRITE_PATH; // Attention: The default set of IDs is fix and must follow these schema. // Otherwhise the outside code ant work for new added properties. @@ -524,7 +524,7 @@ css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const ::rt //----------------------------------------------------------------------------- void PathSettings::impl_notifyPropListener( PathSettings::EChangeOp /*eOp*/ , - const ::rtl::OUString& sPath , + const OUString& sPath , const PathSettings::PathInfo* pPathOld, const PathSettings::PathInfo* pPathNew) { @@ -553,12 +553,12 @@ void PathSettings::impl_notifyPropListener( PathSettings::EChangeOp /*eOp*/ { if (pPathOld) { - ::rtl::OUString sVal = impl_convertPath2OldStyle(*pPathOld); + OUString sVal = impl_convertPath2OldStyle(*pPathOld); lOldVals[0] <<= sVal; } if (pPathNew) { - ::rtl::OUString sVal = impl_convertPath2OldStyle(*pPathNew); + OUString sVal = impl_convertPath2OldStyle(*pPathNew); lNewVals[0] <<= sVal; } } @@ -611,8 +611,8 @@ void PathSettings::impl_subst( OUStringList& pIt != lVals.end() ; ++pIt ) { - const ::rtl::OUString& sOld = *pIt; - ::rtl::OUString sNew ; + const OUString& sOld = *pIt; + OUString sNew ; if (bReSubst) sNew = xSubst->reSubstituteVariables(sOld); else @@ -637,7 +637,7 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath , } //----------------------------------------------------------------------------- -::rtl::OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath) const +OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath) const { OUStringList::const_iterator pIt; OUStringList lTemp; @@ -659,7 +659,7 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath , if (!rPath.sWritePath.isEmpty()) lTemp.push_back(rPath.sWritePath); - ::rtl::OUStringBuffer sPathVal(256); + OUStringBuffer sPathVal(256); for ( pIt = lTemp.begin(); pIt != lTemp.end() ; ) @@ -674,13 +674,13 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath , } //----------------------------------------------------------------------------- -OUStringList PathSettings::impl_convertOldStyle2Path(const ::rtl::OUString& sOldStylePath) const +OUStringList PathSettings::impl_convertOldStyle2Path(const OUString& sOldStylePath) const { OUStringList lList; sal_Int32 nToken = 0; do { - ::rtl::OUString sToken = sOldStylePath.getToken(0, ';', nToken); + OUString sToken = sOldStylePath.getToken(0, ';', nToken); if (!sToken.isEmpty()) lList.push_back(sToken); } @@ -698,7 +698,7 @@ void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath, pIt != rPath.lInternalPaths.end() ; ++pIt ) { - const ::rtl::OUString& rItem = *pIt; + const OUString& rItem = *pIt; OUStringList::iterator pItem = lList.find(rItem); if (pItem != lList.end()) lList.erase(pItem); @@ -707,7 +707,7 @@ void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath, pIt != rPath.lUserPaths.end() ; ++pIt ) { - const ::rtl::OUString& rItem = *pIt; + const OUString& rItem = *pIt; OUStringList::iterator pItem = lList.find(rItem); if (pItem != lList.end()) lList.erase(pItem); @@ -739,7 +739,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() pProp = &(m_lPropDesc[i]); pProp->Name = rPath.sPathName; pProp->Handle = i; - pProp->Type = ::getCppuType((::rtl::OUString*)0); + pProp->Type = ::getCppuType((OUString*)0); pProp->Attributes = css::beans::PropertyAttribute::BOUND; if (rPath.bIsReadonly) pProp->Attributes |= css::beans::PropertyAttribute::READONLY; @@ -748,7 +748,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() pProp = &(m_lPropDesc[i]); pProp->Name = rPath.sPathName+POSTFIX_INTERNAL_PATHS; pProp->Handle = i; - pProp->Type = ::getCppuType((css::uno::Sequence< ::rtl::OUString >*)0); + pProp->Type = ::getCppuType((css::uno::Sequence< OUString >*)0); pProp->Attributes = css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY; ++i; @@ -756,7 +756,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() pProp = &(m_lPropDesc[i]); pProp->Name = rPath.sPathName+POSTFIX_USER_PATHS; pProp->Handle = i; - pProp->Type = ::getCppuType((css::uno::Sequence< ::rtl::OUString >*)0); + pProp->Type = ::getCppuType((css::uno::Sequence< OUString >*)0); pProp->Attributes = css::beans::PropertyAttribute::BOUND; if (rPath.bIsReadonly) pProp->Attributes |= css::beans::PropertyAttribute::READONLY; @@ -765,7 +765,7 @@ void PathSettings::impl_rebuildPropertyDescriptor() pProp = &(m_lPropDesc[i]); pProp->Name = rPath.sPathName+POSTFIX_WRITE_PATH; pProp->Handle = i; - pProp->Type = ::getCppuType((::rtl::OUString*)0); + pProp->Type = ::getCppuType((OUString*)0); pProp->Attributes = css::beans::PropertyAttribute::BOUND; if (rPath.bIsReadonly) pProp->Attributes |= css::beans::PropertyAttribute::READONLY; @@ -792,7 +792,7 @@ css::uno::Any PathSettings::impl_getPathValue(sal_Int32 nID) const { case IDGROUP_OLDSTYLE : { - ::rtl::OUString sVal = impl_convertPath2OldStyle(*pPath); + OUString sVal = impl_convertPath2OldStyle(*pPath); aVal <<= sVal; } break; @@ -835,7 +835,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , { case IDGROUP_OLDSTYLE : { - ::rtl::OUString sVal; + OUString sVal; aVal >>= sVal; OUStringList lList = impl_convertOldStyle2Path(sVal); impl_subst(lList, fa_getSubstitution(), sal_False); @@ -849,7 +849,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , if ( !lList.empty() ) aChangePath.sWritePath = *(lList.begin()); else - aChangePath.sWritePath = ::rtl::OUString(); + aChangePath.sWritePath = OUString(); } else { @@ -868,7 +868,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , { if (aChangePath.bIsSinglePath) { - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("The path '" ); sMsg.append (aChangePath.sPathName); sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal paths cant be set."); @@ -888,7 +888,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , { if (aChangePath.bIsSinglePath) { - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("The path '" ); sMsg.append (aChangePath.sPathName); sMsg.appendAscii("' is defined as SINGLE_PATH. It's sub set of internal paths cant be set."); @@ -906,7 +906,7 @@ void PathSettings::impl_setPathValue( sal_Int32 nID , case IDGROUP_WRITE_PATH : { - ::rtl::OUString sVal; + OUString sVal; aVal >>= sVal; if (! impl_isValidPath(sVal)) throw css::lang::IllegalArgumentException(); @@ -934,7 +934,7 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const pIt != lPath.end() ; ++pIt ) { - const ::rtl::OUString& rVal = *pIt; + const OUString& rVal = *pIt; if (! impl_isValidPath(rVal)) return sal_False; } @@ -943,7 +943,7 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const } //----------------------------------------------------------------------------- -sal_Bool PathSettings::impl_isValidPath(const ::rtl::OUString& sPath) const +sal_Bool PathSettings::impl_isValidPath(const OUString& sPath) const { // allow empty path to reset a path. // idea by LLA to support empty paths @@ -956,7 +956,7 @@ sal_Bool PathSettings::impl_isValidPath(const ::rtl::OUString& sPath) const } //----------------------------------------------------------------------------- -::rtl::OUString impl_extractBaseFromPropName(const ::rtl::OUString& sPropName) +OUString impl_extractBaseFromPropName(const OUString& sPropName) { sal_Int32 i = sPropName.indexOf(POSTFIX_INTERNAL_PATHS); if (i > -1) @@ -981,7 +981,7 @@ PathSettings::PathInfo* PathSettings::impl_getPathAccess(sal_Int32 nHandle) return 0; const css::beans::Property& rProp = m_lPropDesc[nHandle]; - ::rtl::OUString sProp = impl_extractBaseFromPropName(rProp.Name); + OUString sProp = impl_extractBaseFromPropName(rProp.Name); PathSettings::PathHash::iterator rPath = m_lPaths.find(sProp); if (rPath != m_lPaths.end()) @@ -1001,7 +1001,7 @@ const PathSettings::PathInfo* PathSettings::impl_getPathAccessConst(sal_Int32 nH return 0; const css::beans::Property& rProp = m_lPropDesc[nHandle]; - ::rtl::OUString sProp = impl_extractBaseFromPropName(rProp.Name); + OUString sProp = impl_extractBaseFromPropName(rProp.Name); PathSettings::PathHash::const_iterator rPath = m_lPaths.find(sProp); if (rPath != m_lPaths.end()) @@ -1088,7 +1088,7 @@ css::uno::Reference< css::util::XStringSubstitution > PathSettings::fa_getSubsti //----------------------------------------------------------------------------- css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld() { - const ::rtl::OUString CFG_NODE_OLD(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/Path/Current")); + const OUString CFG_NODE_OLD("org.openoffice.Office.Common/Path/Current"); // SAFE -> ReadGuard aReadLock(m_aLock); @@ -1118,7 +1118,7 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld() //----------------------------------------------------------------------------- css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgNew() { - const ::rtl::OUString CFG_NODE_NEW(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths/Paths")); + const OUString CFG_NODE_NEW("org.openoffice.Office.Paths/Paths"); // SAFE -> ReadGuard aReadLock(m_aLock); diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 4896af387322..baca72d3153a 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -198,7 +198,7 @@ static FixedVariable aFixedVarTable[] = // Implementation helper classes //_________________________________________________________________________________________________________________ -OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystemFromString( const rtl::OUString& aOSString ) +OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystemFromString( const OUString& aOSString ) { for ( int i = 0; i < OS_COUNT; i++ ) { @@ -209,7 +209,7 @@ OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystemFromString( cons return OS_UNKNOWN; } -EnvironmentType SubstitutePathVariables_Impl::GetEnvTypeFromString( const rtl::OUString& aEnvTypeString ) +EnvironmentType SubstitutePathVariables_Impl::GetEnvTypeFromString( const OUString& aEnvTypeString ) { for ( int i = 0; i < ET_COUNT; i++ ) { @@ -221,22 +221,22 @@ EnvironmentType SubstitutePathVariables_Impl::GetEnvTypeFromString( const rtl::O } SubstitutePathVariables_Impl::SubstitutePathVariables_Impl( const Link& aNotifyLink ) : - utl::ConfigItem( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Substitution" ))), + utl::ConfigItem( OUString( "Office.Substitution" )), m_bYPDomainRetrieved( false ), m_bDNSDomainRetrieved( false ), m_bNTDomainRetrieved( false ), m_bHostRetrieved( false ), m_bOSRetrieved( false ), m_aListenerNotify( aNotifyLink ), - m_aSharePointsNodeName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SharePoints" ))), - m_aDirPropertyName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/Directory" ))), - m_aEnvPropertyName( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/Environment" ))), - m_aLevelSep( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ))) + m_aSharePointsNodeName( OUString( "SharePoints" )), + m_aDirPropertyName( OUString( "/Directory" )), + m_aEnvPropertyName( OUString( "/Environment" )), + m_aLevelSep( OUString( "/" )) { // Enable notification mechanism // We need it to get information about changes outside these class on our configuration branch - Sequence< rtl::OUString > aNotifySeq( 1 ); - aNotifySeq[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SharePoints" )); + Sequence< OUString > aNotifySeq( 1 ); + aNotifySeq[0] = OUString( "SharePoints" ); EnableNotification( aNotifySeq, sal_True ); } @@ -246,7 +246,7 @@ SubstitutePathVariables_Impl::~SubstitutePathVariables_Impl() void SubstitutePathVariables_Impl::GetSharePointsRules( SubstituteVariables& aSubstVarMap ) { - Sequence< rtl::OUString > aSharePointNames; + Sequence< OUString > aSharePointNames; ReadSharePointsFromConfiguration( aSharePointNames ); if ( aSharePointNames.getLength() > 0 ) @@ -256,8 +256,8 @@ void SubstitutePathVariables_Impl::GetSharePointsRules( SubstituteVariables& aSu // Read SharePoints container from configuration while ( nSharePoints < aSharePointNames.getLength() ) { - rtl::OUString aSharePointNodeName( m_aSharePointsNodeName ); - aSharePointNodeName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + OUString aSharePointNodeName( m_aSharePointsNodeName ); + aSharePointNodeName += OUString("/"); aSharePointNodeName += aSharePointNames[ nSharePoints ]; SubstituteRuleVector aRuleSet; @@ -280,7 +280,7 @@ void SubstitutePathVariables_Impl::GetSharePointsRules( SubstituteVariables& aSu } } -void SubstitutePathVariables_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& /*aPropertyNames*/ ) +void SubstitutePathVariables_Impl::Notify( const com::sun::star::uno::Sequence< OUString >& /*aPropertyNames*/ ) { // NOT implemented yet! } @@ -315,7 +315,7 @@ OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem() return m_eOSType; } -const rtl::OUString& SubstitutePathVariables_Impl::GetYPDomainName() +const OUString& SubstitutePathVariables_Impl::GetYPDomainName() { if ( !m_bYPDomainRetrieved ) { @@ -326,15 +326,15 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetYPDomainName() return m_aYPDomain; } -const rtl::OUString& SubstitutePathVariables_Impl::GetDNSDomainName() +const OUString& SubstitutePathVariables_Impl::GetDNSDomainName() { if ( !m_bDNSDomainRetrieved ) { - rtl::OUString aTemp; + OUString aTemp; osl::SocketAddr aSockAddr; oslSocketResult aResult; - rtl::OUString aHostName = GetHostName(); + OUString aHostName = GetHostName(); osl::SocketAddr::resolveHostname( aHostName, aSockAddr ); aTemp = aSockAddr.getHostname( &aResult ); @@ -343,7 +343,7 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetDNSDomainName() if ( nIndex >= 0 && aTemp.getLength() > nIndex+1 ) m_aDNSDomain = aTemp.copy( nIndex+1 ).toAsciiLowerCase(); else - m_aDNSDomain = rtl::OUString(); + m_aDNSDomain = OUString(); m_bDNSDomainRetrieved = sal_True; } @@ -351,7 +351,7 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetDNSDomainName() return m_aDNSDomain; } -const rtl::OUString& SubstitutePathVariables_Impl::GetNTDomainName() +const OUString& SubstitutePathVariables_Impl::GetNTDomainName() { if ( !m_bNTDomainRetrieved ) { @@ -362,7 +362,7 @@ const rtl::OUString& SubstitutePathVariables_Impl::GetNTDomainName() return m_aNTDomain; } -const rtl::OUString& SubstitutePathVariables_Impl::GetHostName() +const OUString& SubstitutePathVariables_Impl::GetHostName() { if (!m_bHostRetrieved) { @@ -394,8 +394,8 @@ bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector& aR { case ET_HOST: { - rtl::OUString aHost = GetHostName(); - rtl::OUString aHostStr; + OUString aHost = GetHostName(); + OUString aHostStr; aRule.aEnvValue >>= aHostStr; aHostStr = aHostStr.toAsciiLowerCase(); @@ -415,8 +415,8 @@ bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector& aR case ET_DNSDOMAIN: case ET_NTDOMAIN: { - rtl::OUString aDomain; - rtl::OUString aDomainStr; + OUString aDomain; + OUString aDomainStr; aRule.aEnvValue >>= aDomainStr; aDomainStr = aDomainStr.toAsciiLowerCase(); @@ -474,33 +474,33 @@ bool SubstitutePathVariables_Impl::FilterRuleSet( const SubstituteRuleVector& aR return bResult; } -void SubstitutePathVariables_Impl::ReadSharePointsFromConfiguration( Sequence< rtl::OUString >& aSharePointsSeq ) +void SubstitutePathVariables_Impl::ReadSharePointsFromConfiguration( Sequence< OUString >& aSharePointsSeq ) { //returns all the names of all share point nodes aSharePointsSeq = GetNodeNames( m_aSharePointsNodeName ); } void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration( - const rtl::OUString& aSharePointName, - const rtl::OUString& aSharePointNodeName, + const OUString& aSharePointName, + const OUString& aSharePointNodeName, SubstituteRuleVector& rRuleSet ) { - Sequence< rtl::OUString > aSharePointMappingsNodeNames = GetNodeNames( aSharePointNodeName, utl::CONFIG_NAME_LOCAL_PATH ); + Sequence< OUString > aSharePointMappingsNodeNames = GetNodeNames( aSharePointNodeName, utl::CONFIG_NAME_LOCAL_PATH ); sal_Int32 nSharePointMapping = 0; while ( nSharePointMapping < aSharePointMappingsNodeNames.getLength() ) { - rtl::OUString aSharePointMapping( aSharePointNodeName ); + OUString aSharePointMapping( aSharePointNodeName ); aSharePointMapping += m_aLevelSep; aSharePointMapping += aSharePointMappingsNodeNames[ nSharePointMapping ]; // Read SharePointMapping - rtl::OUString aDirValue; - rtl::OUString aDirProperty( aSharePointMapping ); + OUString aDirValue; + OUString aDirProperty( aSharePointMapping ); aDirProperty += m_aDirPropertyName; // Read only the directory property - Sequence< rtl::OUString > aDirPropertySeq( 1 ); + Sequence< OUString > aDirPropertySeq( 1 ); aDirPropertySeq[0] = aDirProperty; Sequence< Any > aValueSeq = GetProperties( aDirPropertySeq ); @@ -508,24 +508,24 @@ void SubstitutePathVariables_Impl::ReadSharePointRuleSetFromConfiguration( aValueSeq[0] >>= aDirValue; // Read the environment setting - rtl::OUString aEnvUsed; - rtl::OUString aEnvProperty( aSharePointMapping ); + OUString aEnvUsed; + OUString aEnvProperty( aSharePointMapping ); aEnvProperty += m_aEnvPropertyName; - Sequence< rtl::OUString > aEnvironmentVariable = GetNodeNames( aEnvProperty ); + Sequence< OUString > aEnvironmentVariable = GetNodeNames( aEnvProperty ); // Filter the property which has a value set - Sequence< rtl::OUString > aEnvUsedPropertySeq( aEnvironmentVariable.getLength() ); + Sequence< OUString > aEnvUsedPropertySeq( aEnvironmentVariable.getLength() ); - rtl::OUString aEnvUsePropNameTemplate( aEnvProperty ); + OUString aEnvUsePropNameTemplate( aEnvProperty ); aEnvUsePropNameTemplate += m_aLevelSep; for ( sal_Int32 nProperty = 0; nProperty < aEnvironmentVariable.getLength(); nProperty++ ) - aEnvUsedPropertySeq[nProperty] = rtl::OUString( aEnvUsePropNameTemplate + aEnvironmentVariable[nProperty] ); + aEnvUsedPropertySeq[nProperty] = OUString( aEnvUsePropNameTemplate + aEnvironmentVariable[nProperty] ); Sequence< Any > aEnvUsedValueSeq; aEnvUsedValueSeq = GetProperties( aEnvUsedPropertySeq ); - rtl::OUString aEnvUsedValue; + OUString aEnvUsedValue; for ( sal_Int32 nIndex = 0; nIndex < aEnvironmentVariable.getLength(); nIndex++ ) { if ( aEnvUsedValueSeq[nIndex] >>= aEnvUsedValue ) @@ -582,7 +582,7 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XMultiService for ( i = 0; i < PREDEFVAR_COUNT; i++ ) { // Store variable name into struct of predefined/fixed variables - m_aPreDefVars.m_FixedVarNames[i] = rtl::OUString::createFromAscii( aFixedVarTable[i].pVarName ); + m_aPreDefVars.m_FixedVarNames[i] = OUString::createFromAscii( aFixedVarTable[i].pVarName ); // Create hash map entry m_aPreDefVarMap.insert( VarNameToIndexMap::value_type( @@ -611,7 +611,7 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XMultiService for ( pIter = m_aSubstVarMap.begin(); pIter != m_aSubstVarMap.end(); ++pIter ) { ReSubstUserVarOrder aUserOrderVar; - rtl::OUStringBuffer aStrBuffer( pIter->second.aSubstVariable.getLength() ); + OUStringBuffer aStrBuffer( pIter->second.aSubstVariable.getLength() ); aStrBuffer.append( m_aVarStart ); aStrBuffer.append( pIter->second.aSubstVariable ); aStrBuffer.append( m_aVarEnd ); @@ -627,7 +627,7 @@ SubstitutePathVariables::~SubstitutePathVariables() } // XStringSubstitution -rtl::OUString SAL_CALL SubstitutePathVariables::substituteVariables( const ::rtl::OUString& aText, sal_Bool bSubstRequired ) +OUString SAL_CALL SubstitutePathVariables::substituteVariables( const OUString& aText, sal_Bool bSubstRequired ) throw ( NoSuchElementException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::substituteVariables" ); @@ -635,7 +635,7 @@ throw ( NoSuchElementException, RuntimeException ) return impl_substituteVariable( aText, bSubstRequired ); } -rtl::OUString SAL_CALL SubstitutePathVariables::reSubstituteVariables( const ::rtl::OUString& aText ) +OUString SAL_CALL SubstitutePathVariables::reSubstituteVariables( const OUString& aText ) throw ( RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::reSubstituteVariables" ); @@ -643,7 +643,7 @@ throw ( RuntimeException ) return impl_reSubstituteVariables( aText ); } -rtl::OUString SAL_CALL SubstitutePathVariables::getSubstituteVariableValue( const ::rtl::OUString& aVariable ) +OUString SAL_CALL SubstitutePathVariables::getSubstituteVariableValue( const OUString& aVariable ) throw ( NoSuchElementException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::getSubstituteVariableValue" ); @@ -663,11 +663,11 @@ IMPL_LINK_NOARG(SubstitutePathVariables, implts_ConfigurationNotify) return 0; } -rtl::OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const rtl::OUString& aOSLCompliantURL ) const +OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const OUString& aOSLCompliantURL ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::ConvertOSLtoUCBURL" ); - rtl::OUString aResult; - rtl::OUString aTemp; + OUString aResult; + OUString aTemp; osl::FileBase::getSystemPathFromFileURL( aOSLCompliantURL, aTemp ); utl::LocalFileHelper::ConvertPhysicalNameToURL( aTemp, aResult ); @@ -679,18 +679,18 @@ rtl::OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const rtl::OUString& return aResult; } -rtl::OUString SubstitutePathVariables::GetWorkPath() const +OUString SubstitutePathVariables::GetWorkPath() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetWorkPath" ); - rtl::OUString aWorkPath; + OUString aWorkPath; try { ::comphelper::ConfigurationHelper::readDirectKey( comphelper::getComponentContext(m_xServiceManager), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Paths/Work")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WritePath")), + OUString("org.openoffice.Office.Paths"), + OUString("Paths/Work"), + OUString("WritePath"), ::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath; } catch(const RuntimeException &) @@ -704,18 +704,18 @@ rtl::OUString SubstitutePathVariables::GetWorkPath() const return aWorkPath; } -rtl::OUString SubstitutePathVariables::GetWorkVariableValue() const +OUString SubstitutePathVariables::GetWorkVariableValue() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetWorkVariableValue" ); - ::rtl::OUString aWorkPath; + OUString aWorkPath; try { ::comphelper::ConfigurationHelper::readDirectKey( comphelper::getComponentContext(m_xServiceManager), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Paths")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Variables")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Work")), + OUString("org.openoffice.Office.Paths"), + OUString("Variables"), + OUString("Work"), ::comphelper::ConfigurationHelper::E_READONLY) >>= aWorkPath; } catch(const RuntimeException &) @@ -732,35 +732,35 @@ rtl::OUString SubstitutePathVariables::GetWorkVariableValue() const return ConvertOSLtoUCBURL( aWorkPath ); } -rtl::OUString SubstitutePathVariables::GetHomeVariableValue() const +OUString SubstitutePathVariables::GetHomeVariableValue() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetHomeVariableValue" ); osl::Security aSecurity; - rtl::OUString aHomePath; + OUString aHomePath; aSecurity.getHomeDir( aHomePath ); return ConvertOSLtoUCBURL( aHomePath ); } -rtl::OUString SubstitutePathVariables::GetPathVariableValue() const +OUString SubstitutePathVariables::GetPathVariableValue() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::GetPathVariableValue" ); - rtl::OUString aRetStr; + OUString aRetStr; const char* pEnv = getenv( "PATH" ); if ( pEnv ) { const int PATH_EXTEND_FACTOR = 120; - rtl::OUString aTmp; - rtl::OUString aPathList( pEnv, strlen( pEnv ), osl_getThreadTextEncoding() ); - rtl::OUStringBuffer aPathStrBuffer( aPathList.getLength() * PATH_EXTEND_FACTOR / 100 ); + OUString aTmp; + OUString aPathList( pEnv, strlen( pEnv ), osl_getThreadTextEncoding() ); + OUStringBuffer aPathStrBuffer( aPathList.getLength() * PATH_EXTEND_FACTOR / 100 ); bool bAppendSep = false; sal_Int32 nToken = 0; do { - ::rtl::OUString sToken = aPathList.getToken(0, SAL_PATHSEPARATOR, nToken); + OUString sToken = aPathList.getToken(0, SAL_PATHSEPARATOR, nToken); if (!sToken.isEmpty()) { osl::FileBase::getFileURLFromSystemPath( sToken, aTmp ); @@ -778,18 +778,18 @@ rtl::OUString SubstitutePathVariables::GetPathVariableValue() const return aRetStr; } -rtl::OUString SubstitutePathVariables::impl_substituteVariable( const ::rtl::OUString& rText, bool bSubstRequired ) +OUString SubstitutePathVariables::impl_substituteVariable( const OUString& rText, bool bSubstRequired ) throw ( NoSuchElementException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::impl_substituteVariable" ); // This is maximal recursive depth supported! const sal_Int32 nMaxRecursiveDepth = 8; - rtl::OUString aWorkText = rText; - rtl::OUString aResult; + OUString aWorkText = rText; + OUString aResult; // Use vector with strings to detect endless recursions! - std::vector< rtl::OUString > aEndlessRecursiveDetector; + std::vector< OUString > aEndlessRecursiveDetector; // Search for first occure of "$(...". sal_Int32 nDepth = 0; @@ -817,9 +817,9 @@ throw ( NoSuchElementException, RuntimeException ) { // YES; Get the next variable for replace. sal_Int32 nReplaceLength = 0; - rtl::OUString aReplacement; - rtl::OUString aSubString = aWorkText.copy( nPosition, nLength ); - rtl::OUString aSubVarString; + OUString aReplacement; + OUString aSubString = aWorkText.copy( nPosition, nLength ); + OUString aSubVarString; // Path variables are not case sensitive! aSubVarString = aSubString.toAsciiLowerCase(); @@ -856,7 +856,7 @@ throw ( NoSuchElementException, RuntimeException ) else { // Extract the variable name and try to find in the user defined variable set - rtl::OUString aVarName = aSubString.copy( 2, nLength-3 ); + OUString aVarName = aSubString.copy( 2, nLength-3 ); SubstituteVariables::const_iterator pIter = m_aSubstVarMap.find( aVarName ); if ( pIter != m_aSubstVarMap.end() ) { @@ -956,7 +956,7 @@ throw ( NoSuchElementException, RuntimeException ) // recursion depth reached! if ( bSubstRequired ) { - rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM( "Endless recursion detected. Cannot substitute variables!" )); + OUString aMsg( "Endless recursion detected. Cannot substitute variables!" ); throw NoSuchElementException( aMsg, (cppu::OWeakObject *)this ); } else @@ -967,7 +967,7 @@ throw ( NoSuchElementException, RuntimeException ) // variable in text but unknown! if ( bSubstRequired ) { - rtl::OUString aMsg( RTL_CONSTASCII_USTRINGPARAM( "Unknown variable found!" )); + OUString aMsg( "Unknown variable found!" ); throw NoSuchElementException( aMsg, (cppu::OWeakObject *)this ); } else @@ -978,10 +978,10 @@ throw ( NoSuchElementException, RuntimeException ) return aResult; } -rtl::OUString SubstitutePathVariables::impl_reSubstituteVariables( const ::rtl::OUString& rURL ) +OUString SubstitutePathVariables::impl_reSubstituteVariables( const OUString& rURL ) throw ( RuntimeException ) { - rtl::OUString aURL; + OUString aURL; INetURLObject aUrl( rURL ); if ( !aUrl.HasError() ) @@ -989,7 +989,7 @@ throw ( RuntimeException ) else { // Convert a system path to a UCB compliant URL before resubstitution - rtl::OUString aTemp; + OUString aTemp; if ( osl::FileBase::getFileURLFromSystemPath( rURL, aTemp ) == osl::FileBase::E_None ) { aTemp = ConvertOSLtoUCBURL( aTemp ); @@ -1021,7 +1021,7 @@ throw ( RuntimeException ) ReSubstFixedVarOrderVector::const_iterator pIterFixed; for ( pIterFixed = m_aReSubstFixedVarOrder.begin(); pIterFixed != m_aReSubstFixedVarOrder.end(); ++pIterFixed ) { - rtl::OUString aValue = m_aPreDefVars.m_FixedVar[ (sal_Int32)pIterFixed->eVariable ]; + OUString aValue = m_aPreDefVars.m_FixedVar[ (sal_Int32)pIterFixed->eVariable ]; sal_Int32 nPos = aURL.indexOf( aValue ); if ( nPos >= 0 ) { @@ -1046,7 +1046,7 @@ throw ( RuntimeException ) if ( bMatch ) { - rtl::OUStringBuffer aStrBuffer( aURL.getLength() ); + OUStringBuffer aStrBuffer( aURL.getLength() ); aStrBuffer.append( aURL.copy( 0, nPos ) ); aStrBuffer.append( m_aPreDefVars.m_FixedVarNames[ (sal_Int32)pIterFixed->eVariable ] ); // Get the variable name for struct var name array! aStrBuffer.append( aURL.copy( nPos + aValue.getLength(), ( aURL.getLength() - ( nPos + aValue.getLength() )) )); @@ -1061,11 +1061,11 @@ throw ( RuntimeException ) ReSubstUserVarOrderVector::const_iterator pIterUser; for ( pIterUser = m_aReSubstUserVarOrder.begin(); pIterUser != m_aReSubstUserVarOrder.end(); ++pIterUser ) { - rtl::OUString aVarValue = pIterUser->aVarName; + OUString aVarValue = pIterUser->aVarName; sal_Int32 nPos = aURL.indexOf( aVarValue ); if ( nPos >= 0 ) { - rtl::OUStringBuffer aStrBuffer( aURL.getLength() ); + OUStringBuffer aStrBuffer( aURL.getLength() ); aStrBuffer.append( aURL.copy( 0, nPos ) ); aStrBuffer.append( m_aVarStart ); aStrBuffer.append( aVarValue ); @@ -1086,17 +1086,17 @@ throw ( RuntimeException ) } // This method support both request schemes "$("<varname>")" or "<varname>". -::rtl::OUString SubstitutePathVariables::impl_getSubstituteVariableValue( const ::rtl::OUString& rVariable ) +OUString SubstitutePathVariables::impl_getSubstituteVariableValue( const OUString& rVariable ) throw ( NoSuchElementException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::impl_getSubstituteVariableValue" ); - rtl::OUString aVariable; + OUString aVariable; sal_Int32 nPos = rVariable.indexOf( m_aVarStart ); if ( nPos == -1 ) { // Prepare variable name before hash map access - rtl::OUStringBuffer aStrBuffer( rVariable.getLength() + m_aVarStart.getLength() + m_aVarEnd.getLength() ); + OUStringBuffer aStrBuffer( rVariable.getLength() + m_aVarStart.getLength() + m_aVarEnd.getLength() ); aStrBuffer.append( m_aVarStart ); aStrBuffer.append( rVariable ); aStrBuffer.append( m_aVarEnd ); @@ -1144,8 +1144,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "SubstitutePathVariables::SetPredefinedPathVariables" ); - aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR")); + aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = OUString("$BRAND_BASE_DIR"); rtl::Bootstrap::expandMacros( aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]); @@ -1153,7 +1152,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Get inspath and userpath from bootstrap mechanism in every case as file URL ::utl::Bootstrap::PathStatus aState; - ::rtl::OUString sVal ; + OUString sVal ; aState = utl::Bootstrap::locateUserData( sVal ); //There can be the valid case that there is no user installation. @@ -1181,7 +1180,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Set $(prog), $(progpath), $(progurl) INetURLObject aProgObj( aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] ); - if ( !aProgObj.HasError() && aProgObj.insertName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("program")) ) ) + if ( !aProgObj.HasError() && aProgObj.insertName( OUString("program") ) ) { aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::NO_DECODE); aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ]; @@ -1190,7 +1189,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Detect the language type of the current office aPreDefPathVariables.m_eLanguageType = LANGUAGE_ENGLISH_US; - rtl::OUString aLocaleStr( utl::ConfigManager::getLocale() ); + OUString aLocaleStr( utl::ConfigManager::getLocale() ); aPreDefPathVariables.m_eLanguageType = LanguageTag( aLocaleStr ).getLanguageType(); // We used to have an else branch here with a LOG_ERROR, but that // always fired in some unit tests when this code was built with @@ -1200,13 +1199,13 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Set $(lang) aPreDefPathVariables.m_FixedVar[ PREDEFVAR_LANG ] = ConvertOSLtoUCBURL( - rtl::OUString::createFromAscii( ResMgr::GetLang( aPreDefPathVariables.m_eLanguageType, 0 ) )); + OUString::createFromAscii( ResMgr::GetLang( aPreDefPathVariables.m_eLanguageType, 0 ) )); // Set $(vlang) aPreDefPathVariables.m_FixedVar[ PREDEFVAR_VLANG ] = aLocaleStr; // Set $(langid) - aPreDefPathVariables.m_FixedVar[ PREDEFVAR_LANGID ] = rtl::OUString::valueOf( (sal_Int32)aPreDefPathVariables.m_eLanguageType ); + aPreDefPathVariables.m_FixedVar[ PREDEFVAR_LANGID ] = OUString::valueOf( (sal_Int32)aPreDefPathVariables.m_eLanguageType ); // Set the other pre defined path variables // Set $(work) diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx index 5935c512974c..b90ef2cef4ab 100644 --- a/framework/source/services/taskcreatorsrv.cxx +++ b/framework/source/services/taskcreatorsrv.cxx @@ -107,15 +107,15 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI { ::comphelper::SequenceAsHashMap lArgs(lArguments); - css::uno::Reference< css::frame::XFrame > xParentFrame = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_PARENTFRAME) , css::uno::Reference< css::frame::XFrame >()); - ::rtl::OUString sFrameName = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_FRAMENAME) , ::rtl::OUString() ); - sal_Bool bVisible = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_MAKEVISIBLE) , sal_False ); - sal_Bool bCreateTopWindow = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_CREATETOPWINDOW) , sal_True ); + css::uno::Reference< css::frame::XFrame > xParentFrame = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_PARENTFRAME) , css::uno::Reference< css::frame::XFrame >()); + OUString sFrameName = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_FRAMENAME) , OUString() ); + sal_Bool bVisible = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_MAKEVISIBLE) , sal_False ); + sal_Bool bCreateTopWindow = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_CREATETOPWINDOW) , sal_True ); // only possize=[0,0,0,0] triggers default handling of vcl ! - css::awt::Rectangle aPosSize = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_POSSIZE) , css::awt::Rectangle(0, 0, 0, 0) ); - css::uno::Reference< css::awt::XWindow > xContainerWindow = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_CONTAINERWINDOW) , css::uno::Reference< css::awt::XWindow >() ); - sal_Bool bSupportPersistentWindowState = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE) , sal_False ); - sal_Bool bEnableTitleBarUpdate = lArgs.getUnpackedValueOrDefault(rtl::OUString(ARGUMENT_ENABLE_TITLEBARUPDATE) , sal_True ); + css::awt::Rectangle aPosSize = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_POSSIZE) , css::awt::Rectangle(0, 0, 0, 0) ); + css::uno::Reference< css::awt::XWindow > xContainerWindow = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_CONTAINERWINDOW) , css::uno::Reference< css::awt::XWindow >() ); + sal_Bool bSupportPersistentWindowState = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE) , sal_False ); + sal_Bool bEnableTitleBarUpdate = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_ENABLE_TITLEBARUPDATE) , sal_True ); /* SAFE { */ ReadGuard aReadLock( m_aLock ); @@ -125,7 +125,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI // We use FrameName property to set it as API name of the new created frame later. // But those frame names must be different from the set of special target names as e.g. _blank, _self etcpp ! - ::rtl::OUString sRightName = impl_filterNames(sFrameName); + OUString sRightName = impl_filterNames(sFrameName); // if no external frame window was given ... create a new one. if ( ! xContainerWindow.is()) @@ -229,7 +229,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai if (bTopWindow) { aDescriptor.Type = css::awt::WindowClass_TOP ; - aDescriptor.WindowServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("window")); + aDescriptor.WindowServiceName = OUString("window"); aDescriptor.ParentIndex = -1 ; aDescriptor.Parent = css::uno::Reference< css::awt::XWindowPeer >() ; aDescriptor.Bounds = aPosSize ; @@ -242,7 +242,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai else { aDescriptor.Type = css::awt::WindowClass_TOP ; - aDescriptor.WindowServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dockingwindow")); + aDescriptor.WindowServiceName = OUString("dockingwindow"); aDescriptor.ParentIndex = 1 ; aDescriptor.Parent = xParentWindowPeer ; aDescriptor.Bounds = aPosSize ; @@ -253,7 +253,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai css::uno::Reference< css::awt::XWindowPeer > xPeer = xToolkit->createWindow( aDescriptor ); css::uno::Reference< css::awt::XWindow > xWindow ( xPeer, css::uno::UNO_QUERY ); if ( ! xWindow.is()) - throw css::uno::Exception(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TaskCreator service was not able to create suitable frame window.")), + throw css::uno::Exception(OUString("TaskCreator service was not able to create suitable frame window."), static_cast< ::cppu::OWeakObject* >(this)); if (bTopWindow) xPeer->setBackground(::svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor); @@ -266,7 +266,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai //----------------------------------------------- css::uno::Reference< css::frame::XFrame > TaskCreatorService::implts_createFrame( const css::uno::Reference< css::frame::XFrame >& xParentFrame , const css::uno::Reference< css::awt::XWindow >& xContainerWindow, - const ::rtl::OUString& sName ) + const OUString& sName ) { // SAFE -> ReadGuard aReadLock( m_aLock ); @@ -357,9 +357,9 @@ void TaskCreatorService::implts_establishTitleBarUpdate( const css::uno::Referen } //----------------------------------------------- -::rtl::OUString TaskCreatorService::impl_filterNames( const ::rtl::OUString& sName ) +OUString TaskCreatorService::impl_filterNames( const OUString& sName ) { - ::rtl::OUString sFiltered; + OUString sFiltered; if (TargetHelper::isValidNameForFrame(sName)) sFiltered = sName; return sFiltered; |