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 /scripting/source/inc | |
parent | Typo in comment in resmgr.hxx (diff) | |
download | core-1946794ae09ba732022fe6a74ea45e304ab70b84.tar.gz core-1946794ae09ba732022fe6a74ea45e304ab70b84.zip |
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 'scripting/source/inc')
-rw-r--r-- | scripting/source/inc/util/MiscUtils.hxx | 20 | ||||
-rw-r--r-- | scripting/source/inc/util/scriptingconstants.hxx | 12 |
2 files changed, 16 insertions, 16 deletions
diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx index 5c7218e8f100..ccb44f895678 100644 --- a/scripting/source/inc/util/MiscUtils.hxx +++ b/scripting/source/inc/util/MiscUtils.hxx @@ -45,9 +45,9 @@ namespace sf_misc class MiscUtils { public: - static css::uno::Sequence< ::rtl::OUString > allOpenTDocUrls( const css::uno::Reference< css::uno::XComponentContext >& xCtx) + static css::uno::Sequence< OUString > allOpenTDocUrls( const css::uno::Reference< css::uno::XComponentContext >& xCtx) { - css::uno::Sequence< ::rtl::OUString > result; + css::uno::Sequence< OUString > result; try { if ( !xCtx.is() ) @@ -63,7 +63,7 @@ public: return result; } - static ::rtl::OUString xModelToTdocUrl( const css::uno::Reference< css::frame::XModel >& xModel, + static OUString xModelToTdocUrl( const css::uno::Reference< css::frame::XModel >& xModel, const css::uno::Reference< css::uno::XComponentContext >& xContext ) { css::uno::Reference< css::lang::XMultiComponentFactory > xMCF( @@ -76,7 +76,7 @@ public: css::uno::Reference< css::frame::XTransientDocumentsDocumentContentFactory >( xMCF->createInstanceWithContext( - rtl::OUString( + OUString( "com.sun.star.frame.TransientDocumentsDocumentContentFactory" ), xContext ), css::uno::UNO_QUERY ); @@ -101,16 +101,16 @@ public: } OSL_FAIL( "Unable to obtain URL for document model!" ); - return rtl::OUString(); + return OUString(); } - static css::uno::Reference< css::frame::XModel > tDocUrlToModel( const ::rtl::OUString& url ) + static css::uno::Reference< css::frame::XModel > tDocUrlToModel( const OUString& url ) { css::uno::Any result; try { ::ucbhelper::Content root( url, NULL, comphelper::getProcessComponentContext() ); - ::rtl::OUString propName = "DocumentModel"; + OUString propName = "DocumentModel"; result = getUCBProperty( root, propName ); } catch ( css::ucb::ContentCreationException& ) @@ -129,7 +129,7 @@ public: } - static css::uno::Any getUCBProperty( ::ucbhelper::Content& content, ::rtl::OUString& prop ) + static css::uno::Any getUCBProperty( ::ucbhelper::Content& content, OUString& prop ) { css::uno::Any result; try @@ -143,11 +143,11 @@ public: } private: -static ::rtl::OUString parseLocationName( const ::rtl::OUString& location ) +static OUString parseLocationName( const OUString& location ) { // strip out the last leaf of location name // e.g. file://dir1/dir2/Blah.sxw - > Blah.sxw - ::rtl::OUString temp = location; + OUString temp = location; INetURLObject aURLObj( temp ); if ( !aURLObj.HasError() ) temp = aURLObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); diff --git a/scripting/source/inc/util/scriptingconstants.hxx b/scripting/source/inc/util/scriptingconstants.hxx index 47889dc095b8..8fcf16577473 100644 --- a/scripting/source/inc/util/scriptingconstants.hxx +++ b/scripting/source/inc/util/scriptingconstants.hxx @@ -25,12 +25,12 @@ namespace scripting_constants class ScriptingConstantsPool { public: - const ::rtl::OUString DOC_REF; - const ::rtl::OUString DOC_STORAGE_ID; - const ::rtl::OUString DOC_URI; - const ::rtl::OUString RESOLVED_STORAGE_ID; - const ::rtl::OUString SCRIPT_INFO; - const ::rtl::OUString SCRIPTSTORAGEMANAGER_SERVICE; + const OUString DOC_REF; + const OUString DOC_STORAGE_ID; + const OUString DOC_URI; + const OUString RESOLVED_STORAGE_ID; + const OUString SCRIPT_INFO; + const OUString SCRIPTSTORAGEMANAGER_SERVICE; const sal_Int32 SHARED_STORAGE_ID; const sal_Int32 USER_STORAGE_ID; const sal_Int32 DOC_STORAGE_ID_NOT_SET; |