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 /framework/source/inc/pattern | |
| 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 'framework/source/inc/pattern')
| -rw-r--r-- | framework/source/inc/pattern/configuration.hxx | 10 | ||||
| -rw-r--r-- | framework/source/inc/pattern/window.hxx | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx index 01d97c1d5456..1e684825f30f 100644 --- a/framework/source/inc/pattern/configuration.hxx +++ b/framework/source/inc/pattern/configuration.hxx @@ -89,8 +89,8 @@ class ConfigurationHelper see enum EOpenMode for further informations. */ static css::uno::Reference< css::uno::XInterface > openConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sPackage , - const ::rtl::OUString& sRelPath , + const OUString& sPackage , + const OUString& sRelPath , sal_Int32 nOpenFlags) { css::uno::Reference< css::uno::XInterface > xCFG; @@ -100,7 +100,7 @@ class ConfigurationHelper css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider = css::configuration::theDefaultProvider::get( rxContext ); - ::rtl::OUStringBuffer sPath(1024); + OUStringBuffer sPath(1024); sPath.append(sPackage ); sPath.append(static_cast<sal_Unicode>('/')); sPath.append(sRelPath ); @@ -115,13 +115,13 @@ class ConfigurationHelper css::uno::Sequence< css::uno::Any > lParams(c); css::beans::PropertyValue aParam; - aParam.Name = ::rtl::OUString("nodepath"); + aParam.Name = OUString("nodepath"); aParam.Value <<= sPath.makeStringAndClear(); lParams[0] <<= aParam; if (bAllLocales) { - aParam.Name = ::rtl::OUString("*"); + aParam.Name = OUString("*"); aParam.Value <<= sal_True; lParams[1] <<= aParam; } diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 0510b86495ea..9a4399215ae8 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -44,12 +44,12 @@ class WindowHelper public: //----------------------------------------------- -static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow) +static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow) { if (!xWindow.is()) - return ::rtl::OUString(); + return OUString(); - rtl::OString sWindowState; + OString sWindowState; // SOLAR SAFE -> ---------------------------- { SolarMutexGuard aSolarGuard; @@ -65,12 +65,12 @@ static ::rtl::OUString getWindowState(const css::uno::Reference< css::awt::XWind } // <- SOLAR SAFE ---------------------------- - return rtl::OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8); + return OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8); } //----------------------------------------------- static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow , - const ::rtl::OUString& sWindowState) + const OUString& sWindowState) { if ( (!xWindow.is() ) || |