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 /unotools | |
| 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 'unotools')
74 files changed, 907 insertions, 932 deletions
diff --git a/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx index 23418dea9a4b..530fa3173b73 100644 --- a/unotools/inc/unotools/bootstrap.hxx +++ b/unotools/inc/unotools/bootstrap.hxx @@ -21,10 +21,7 @@ #ifndef _UTL_BOOTSTRAP_HXX #define _UTL_BOOTSTRAP_HXX -namespace rtl -{ - class OUString; -} +#include <rtl/ustring.hxx> namespace utl { @@ -41,16 +38,16 @@ namespace utl public: // some common information items /// retrieve the product key; defaults to executable name (without extension) - static rtl::OUString getProductKey(); + static OUString getProductKey(); /// retrieve the product key; uses the given default, if not found - static rtl::OUString getProductKey(rtl::OUString const& _sDefault); + static OUString getProductKey(OUString const& _sDefault); /// retrieve the BUILDID information item; uses the given default, if not found - static rtl::OUString getBuildIdData(rtl::OUString const& _sDefault); + static OUString getBuildIdData(OUString const& _sDefault); /// retrieve the BuildVersion information item; uses the given default, if not found - static rtl::OUString getBuildVersion(rtl::OUString const& _sDefault); + static OUString getBuildVersion(OUString const& _sDefault); /// reload cached data static void reloadData(); @@ -66,19 +63,19 @@ namespace utl }; /// get a file URL to the common base installation [${insturl}] - static PathStatus locateBaseInstallation(rtl::OUString& _rURL); + static PathStatus locateBaseInstallation(OUString& _rURL); /// get a file URL to the user installation [${userurl}] - static PathStatus locateUserInstallation(rtl::OUString& _rURL); + static PathStatus locateUserInstallation(OUString& _rURL); /// get a file URL to the user data directory [default is ${userurl}/user] - static PathStatus locateUserData(rtl::OUString& _rURL); + static PathStatus locateUserData(OUString& _rURL); // the next two items are mainly supported for diagnostic purposes. both items may be unused /// get a file URL to the bootstrap INI file used [e.g. ${insturl}/program/bootraprc] - static PathStatus locateBootstrapFile(rtl::OUString& _rURL); + static PathStatus locateBootstrapFile(OUString& _rURL); /// get a file URL to the version locator INI file used [e.g. ${SYSUSERCONFIG}/sversion.ini] - static PathStatus locateVersionFile(rtl::OUString& _rURL); + static PathStatus locateVersionFile(OUString& _rURL); public: // evaluate the validity of the installation /// high-level status of bootstrap success @@ -108,7 +105,7 @@ namespace utl /** Evaluates the status of the installation and returns a diagnostic message and error code corresponding to this status */ - static Status checkBootstrapStatus(rtl::OUString& _rDiagnosticMessage, FailureCode& _rErrCode); + static Status checkBootstrapStatus(OUString& _rDiagnosticMessage, FailureCode& _rErrCode); public: // singleton impl-class diff --git a/unotools/inc/unotools/componentresmodule.hxx b/unotools/inc/unotools/componentresmodule.hxx index 9437c156e8ea..0014794f3584 100644 --- a/unotools/inc/unotools/componentresmodule.hxx +++ b/unotools/inc/unotools/componentresmodule.hxx @@ -50,7 +50,7 @@ namespace utl ::std::auto_ptr< OComponentResModuleImpl > m_pImpl; public: - OComponentResourceModule( const ::rtl::OString& _rResFilePrefix ); + OComponentResourceModule( const OString& _rResFilePrefix ); ~OComponentResourceModule(); /// get the vcl res manager of the module @@ -161,7 +161,7 @@ namespace utl }; \ \ ModuleClass::ModuleClass() \ - :BaseClass( ::rtl::OString( resprefix ) ) \ + :BaseClass( OString( resprefix ) ) \ { \ } \ \ diff --git a/unotools/inc/unotools/configmgr.hxx b/unotools/inc/unotools/configmgr.hxx index 0e9a4505b192..9fc2c027ae78 100644 --- a/unotools/inc/unotools/configmgr.hxx +++ b/unotools/inc/unotools/configmgr.hxx @@ -39,27 +39,27 @@ namespace utl { class UNOTOOLS_DLLPUBLIC ConfigManager: private boost::noncopyable { public: - static rtl::OUString getAboutBoxProductVersion(); + static OUString getAboutBoxProductVersion(); - static rtl::OUString getAboutBoxProductVersionSuffix(); + static OUString getAboutBoxProductVersionSuffix(); - static rtl::OUString getDefaultCurrency(); + static OUString getDefaultCurrency(); - static rtl::OUString getLocale(); + static OUString getLocale(); - static rtl::OUString getProductExtension(); + static OUString getProductExtension(); - static rtl::OUString getProductName(); + static OUString getProductName(); - static rtl::OUString getProductXmlFileFormat(); + static OUString getProductXmlFileFormat(); - static rtl::OUString getProductXmlFileFormatVersion(); + static OUString getProductXmlFileFormatVersion(); - static rtl::OUString getProductVersion(); + static OUString getProductVersion(); - static rtl::OUString getVendor(); + static OUString getVendor(); - static rtl::OUString getWriterCompatibilityVersionOOo_1_1(); + static OUString getWriterCompatibilityVersionOOo_1_1(); static void storeConfigItems(); diff --git a/unotools/inc/unotools/confignode.hxx b/unotools/inc/unotools/confignode.hxx index 08e86429ede4..011229845215 100644 --- a/unotools/inc/unotools/confignode.hxx +++ b/unotools/inc/unotools/confignode.hxx @@ -61,10 +61,10 @@ namespace utl m_xDummy; sal_Bool m_bEscapeNames; /// escape names before accessing children ? - ::rtl::OUString + OUString m_sCompletePath; - OConfigurationNode insertNode(const ::rtl::OUString& _rName,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xNode) const throw(); + OConfigurationNode insertNode(const OUString& _rName,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xNode) const throw(); protected: /// constructs a node object with an interface representing a node @@ -88,19 +88,19 @@ namespace utl ~OConfigurationNode() {} /// returns the local name of the node - ::rtl::OUString getLocalName() const; + OUString getLocalName() const; /// returns the fully qualified path of the node - ::rtl::OUString getNodePath() const; + OUString getNodePath() const; /** open a sub node @param _rPath access path of the to-be-opened sub node. May be a hierarchical path. */ - OConfigurationNode openNode(const ::rtl::OUString& _rPath) const throw(); + OConfigurationNode openNode(const OUString& _rPath) const throw(); OConfigurationNode openNode( const sal_Char* _pAsciiPath ) const { - return openNode( ::rtl::OUString::createFromAscii( _pAsciiPath ) ); + return openNode( OUString::createFromAscii( _pAsciiPath ) ); } /** create a new child node @@ -111,11 +111,11 @@ namespace utl becomes a part of it's hierarchy, no explicit insertion is necessary. @param _rName name for the new child. Must be level-1-depth. */ - OConfigurationNode createNode(const ::rtl::OUString& _rName) const throw(); + OConfigurationNode createNode(const OUString& _rName) const throw(); OConfigurationNode createNode( const sal_Char* _pAsciiName ) const { - return createNode( ::rtl::OUString::createFromAscii( _pAsciiName ) ); + return createNode( OUString::createFromAscii( _pAsciiName ) ); } /** remove an existent child nod @@ -123,11 +123,11 @@ namespace utl If the object represents a set node, this method may be used to delete an existent child. For non-set-nodes, the method will fail. */ - sal_Bool removeNode(const ::rtl::OUString& _rName) const throw(); + sal_Bool removeNode(const OUString& _rName) const throw(); sal_Bool removeNode( const sal_Char* _pAsciiName ) const { - return removeNode( ::rtl::OUString::createFromAscii( _pAsciiName ) ); + return removeNode( OUString::createFromAscii( _pAsciiName ) ); } /** retrieves the content of a descendant @@ -138,12 +138,12 @@ namespace utl "the path does not exist" (besides the assertion made :), or if the value is really void. */ ::com::sun::star::uno::Any - getNodeValue(const ::rtl::OUString& _rPath) const throw(); + getNodeValue(const OUString& _rPath) const throw(); ::com::sun::star::uno::Any getNodeValue( const sal_Char* _pAsciiPath ) const { - return getNodeValue( ::rtl::OUString::createFromAscii( _pAsciiPath ) ); + return getNodeValue( OUString::createFromAscii( _pAsciiPath ) ); } /** write a node value<p/> @@ -152,15 +152,15 @@ namespace utl node. @return sal_True if and only if the write was successfull. */ - sal_Bool setNodeValue(const ::rtl::OUString& _rPath, const ::com::sun::star::uno::Any& _rValue) const throw(); + sal_Bool setNodeValue(const OUString& _rPath, const ::com::sun::star::uno::Any& _rValue) const throw(); sal_Bool setNodeValue( const sal_Char* _pAsciiPath, const ::com::sun::star::uno::Any& _rValue ) const { - return setNodeValue( ::rtl::OUString::createFromAscii( _pAsciiPath ), _rValue ); + return setNodeValue( OUString::createFromAscii( _pAsciiPath ), _rValue ); } /// return the names of the existing children - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > getNodeNames() const throw(); /** enables or disables name escaping when accessing direct children<p/> @@ -185,12 +185,12 @@ namespace utl sal_Bool isSetNode() const; /// checks whether or not a direct child with a given name exists - sal_Bool hasByName(const ::rtl::OUString& _rName) const throw(); - sal_Bool hasByName( const sal_Char* _pAsciiName ) const { return hasByName( ::rtl::OUString::createFromAscii( _pAsciiName ) ); } + sal_Bool hasByName(const OUString& _rName) const throw(); + sal_Bool hasByName( const sal_Char* _pAsciiName ) const { return hasByName( OUString::createFromAscii( _pAsciiName ) ); } /// checks whether or not a descendent (no matter if direct or indirect) with the given name exists - sal_Bool hasByHierarchicalName( const ::rtl::OUString& _rName ) const throw(); - sal_Bool hasByHierarchicalName( const sal_Char* _pAsciiName ) const { return hasByHierarchicalName( ::rtl::OUString::createFromAscii( _pAsciiName ) ); } + sal_Bool hasByHierarchicalName( const OUString& _rName ) const throw(); + sal_Bool hasByHierarchicalName( const sal_Char* _pAsciiName ) const { return hasByHierarchicalName( OUString::createFromAscii( _pAsciiName ) ); } /// check if the objects represents a valid configuration node sal_Bool isValid() const { return m_xHierarchyAccess.is(); } @@ -208,7 +208,7 @@ namespace utl NO_CONFIGURATION, /// the name came from a configuration node NO_CALLER /// the name came from a client of this class }; - ::rtl::OUString normalizeName(const ::rtl::OUString& _rName, NAMEORIGIN _eOrigin) const; + OUString normalizeName(const OUString& _rName, NAMEORIGIN _eOrigin) const; }; //======================================================================== @@ -250,7 +250,7 @@ namespace utl */ OConfigurationTreeRoot( const css::uno::Reference<css::uno::XComponentContext> & i_rContext, - const ::rtl::OUString& i_rNodePath, + const OUString& i_rNodePath, const bool i_bUpdatable ); @@ -275,7 +275,7 @@ namespace utl */ static OConfigurationTreeRoot createWithProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider, - const ::rtl::OUString& _rPath, + const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True @@ -294,7 +294,7 @@ namespace utl @param _eMode specifies which privileges should be applied when retrieving the node */ static OConfigurationTreeRoot createWithComponentContext(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::rtl::OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True); + const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True); /** tolerant version of the <member>createWithServiceFactory</member> @@ -303,7 +303,7 @@ namespace utl given node path does not exist) are still asserted.</p> */ static OConfigurationTreeRoot tryCreateWithComponentContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const ::rtl::OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True ); + const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True ); /** commit all changes made on the subtree the object is the root for<p/> All changes made on any <type>OConfigurationNode</type> object retrieved (maybe indirect) from this root diff --git a/unotools/inc/unotools/configpaths.hxx b/unotools/inc/unotools/configpaths.hxx index 9a19ba7c7454..d3e400ae1158 100644 --- a/unotools/inc/unotools/configpaths.hxx +++ b/unotools/inc/unotools/configpaths.hxx @@ -21,11 +21,7 @@ #ifndef UNOTOOLS_CONFIGPATHS_HXX_INCLUDED #define UNOTOOLS_CONFIGPATHS_HXX_INCLUDED #include <sal/types.h> - -namespace rtl -{ - class OUString; -} +#include <rtl/ustring.hxx> //---------------------------------------------------------------------------- namespace utl @@ -56,9 +52,9 @@ namespace utl <FALSE/>, if the path was a one-level path or an invalid path */ - UNOTOOLS_DLLPUBLIC sal_Bool splitLastFromConfigurationPath(::rtl::OUString const& _sInPath, - ::rtl::OUString& _rsOutPath, - ::rtl::OUString& _rsLocalName); + UNOTOOLS_DLLPUBLIC sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath, + OUString& _rsOutPath, + OUString& _rsLocalName); //---------------------------------------------------------------------------- /** extract the first nodename from a configuration path. @@ -78,8 +74,8 @@ namespace utl configuration path, it is returned unaltered. */ - UNOTOOLS_DLLPUBLIC ::rtl::OUString extractFirstFromConfigurationPath( - ::rtl::OUString const& _sInPath, ::rtl::OUString* _sOutPath = 0); + UNOTOOLS_DLLPUBLIC OUString extractFirstFromConfigurationPath( + OUString const& _sInPath, OUString* _sOutPath = 0); //---------------------------------------------------------------------------- /** check whether a path is to a nested node with respect to a parent path. @@ -102,8 +98,8 @@ namespace utl If both paths are equal <TRUE/> is returned. */ - sal_Bool isPrefixOfConfigurationPath(::rtl::OUString const& _sNestedPath, - ::rtl::OUString const& _sPrefixPath); + sal_Bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, + OUString const& _sPrefixPath); //---------------------------------------------------------------------------- /** get the relative path to a nested node with respect to a parent path. @@ -127,8 +123,8 @@ namespace utl <var>_sNestedPath</var> is returned unaltered. */ - UNOTOOLS_DLLPUBLIC ::rtl::OUString dropPrefixFromConfigurationPath(::rtl::OUString const& _sNestedPath, - ::rtl::OUString const& _sPrefixPath); + UNOTOOLS_DLLPUBLIC OUString dropPrefixFromConfigurationPath(OUString const& _sNestedPath, + OUString const& _sPrefixPath); //---------------------------------------------------------------------------- /** Create a one-level relative configuration path from a set element name @@ -143,7 +139,7 @@ namespace utl "*['<Name>']", where <Name> is properly escaped. */ - UNOTOOLS_DLLPUBLIC ::rtl::OUString wrapConfigurationElementName(::rtl::OUString const& _sElementName); + UNOTOOLS_DLLPUBLIC OUString wrapConfigurationElementName(OUString const& _sElementName); //---------------------------------------------------------------------------- /** Create a one-level relative configuration path from a set element name @@ -162,8 +158,8 @@ namespace utl "<Type>['<Name>']", where <Name> is properly escaped. */ - ::rtl::OUString wrapConfigurationElementName(::rtl::OUString const& _sElementName, - ::rtl::OUString const& _sTypeName); + OUString wrapConfigurationElementName(OUString const& _sElementName, + OUString const& _sTypeName); //---------------------------------------------------------------------------- } // namespace utl diff --git a/unotools/inc/unotools/configvaluecontainer.hxx b/unotools/inc/unotools/configvaluecontainer.hxx index b01eb9e8119c..2fa95c337bd0 100644 --- a/unotools/inc/unotools/configvaluecontainer.hxx +++ b/unotools/inc/unotools/configvaluecontainer.hxx @@ -165,7 +165,7 @@ namespace utl private: /// implements the ctors void implConstruct( - const ::rtl::OUString& _rConfigLocation, + const OUString& _rConfigLocation, const sal_uInt16 _nAccessFlags, const sal_Int32 _nLevels ); diff --git a/unotools/inc/unotools/docinfohelper.hxx b/unotools/inc/unotools/docinfohelper.hxx index 4de79c166816..be32c3bfc7c9 100644 --- a/unotools/inc/unotools/docinfohelper.hxx +++ b/unotools/inc/unotools/docinfohelper.hxx @@ -28,7 +28,7 @@ namespace utl class UNOTOOLS_DLLPUBLIC DocInfoHelper { public: - static ::rtl::OUString GetGeneratorString(); + static OUString GetGeneratorString(); }; diff --git a/unotools/inc/unotools/eventcfg.hxx b/unotools/inc/unotools/eventcfg.hxx index c18000807676..2ea72642805a 100644 --- a/unotools/inc/unotools/eventcfg.hxx +++ b/unotools/inc/unotools/eventcfg.hxx @@ -58,9 +58,9 @@ #define STR_EVENT_MODECHANGED 26 #define STR_EVENT_STORAGECHANGED 27 -typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > EventBindingHash; +typedef ::boost::unordered_map< OUString, OUString, OUStringHash, ::std::equal_to< OUString > > EventBindingHash; typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > > FrameVector; -typedef ::std::vector< ::rtl::OUString > SupportedEventsVector; +typedef ::std::vector< OUString > SupportedEventsVector; class GlobalEventConfig_Impl : public utl::ConfigItem { @@ -74,16 +74,16 @@ public: GlobalEventConfig_Impl( ); ~GlobalEventConfig_Impl( ); - void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); + void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); void Commit(); - void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); - ::rtl::OUString GetEventName( sal_Int32 nID ); + OUString GetEventName( sal_Int32 nID ); }; class UNOTOOLS_DLLPUBLIC GlobalEventConfig: @@ -95,13 +95,13 @@ class UNOTOOLS_DLLPUBLIC GlobalEventConfig: static ::osl::Mutex& GetOwnStaticMutex(); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents( ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); - static ::rtl::OUString GetEventName( sal_Int32 nID ); + static OUString GetEventName( sal_Int32 nID ); private: static GlobalEventConfig_Impl* m_pImpl; diff --git a/unotools/inc/unotools/fltrcfg.hxx b/unotools/inc/unotools/fltrcfg.hxx index 9a7adfe67a9f..0356aeeb5d12 100644 --- a/unotools/inc/unotools/fltrcfg.hxx +++ b/unotools/inc/unotools/fltrcfg.hxx @@ -29,12 +29,12 @@ class UNOTOOLS_DLLPUBLIC SvtFilterOptions : public utl::ConfigItem { SvtFilterOptions_Impl* pImp; - const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames(); + const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); public: SvtFilterOptions(); virtual ~SvtFilterOptions(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); virtual void Commit(); void Load(); diff --git a/unotools/inc/unotools/fontcfg.hxx b/unotools/inc/unotools/fontcfg.hxx index 39a4fc0c419c..23ea55140655 100644 --- a/unotools/inc/unotools/fontcfg.hxx +++ b/unotools/inc/unotools/fontcfg.hxx @@ -72,7 +72,7 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration { // the real string used in the configuration // used to get rid of upper/lower case problems - rtl::OUString aConfigLocaleString; + OUString aConfigLocaleString; // xAccess is mutable to be able to be filled on demand mutable com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xAccess; }; @@ -82,7 +82,7 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration utl::LocaleHash > m_aConfig; - rtl::OUString tryLocale( const com::sun::star::lang::Locale& rLocale, const rtl::OUString& rType ) const; + OUString tryLocale( const com::sun::star::lang::Locale& rLocale, const OUString& rType ) const; public: DefaultFontConfiguration(); @@ -90,8 +90,8 @@ class UNOTOOLS_DLLPUBLIC DefaultFontConfiguration static DefaultFontConfiguration& get(); - rtl::OUString getDefaultFont( const com::sun::star::lang::Locale& rLocale, int nType ) const; - rtl::OUString getUserInterfaceFont( const com::sun::star::lang::Locale& rLocale ) const; + OUString getDefaultFont( const com::sun::star::lang::Locale& rLocale, int nType ) const; + OUString getUserInterfaceFont( const com::sun::star::lang::Locale& rLocale ) const; }; // IMPL_FONT_ATTR_DEFAULT - Default-Font like Andale Sans UI, Palace Script, Albany, Thorndale, Cumberland, ... @@ -173,7 +173,7 @@ private: m_xConfigAccess; struct LocaleSubst { - rtl::OUString aConfigLocaleString; + OUString aConfigLocaleString; mutable bool bConfigRead; // note: aSubstAttributes must be sorted alphabetically by Name // searches on the substitutes are done with Name as key, where @@ -184,19 +184,19 @@ private: LocaleSubst() : bConfigRead( false ) {} }; boost::unordered_map< com::sun::star::lang::Locale, LocaleSubst, utl::LocaleHash > m_aSubst; - typedef boost::unordered_set< rtl::OUString, rtl::OUStringHash > UniqueSubstHash; + typedef boost::unordered_set< OUString, OUStringHash > UniqueSubstHash; mutable UniqueSubstHash maSubstHash; void fillSubstVector( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont, - const rtl::OUString& rType, + const OUString& rType, std::vector< String >& rSubstVector ) const; FontWeight getSubstWeight( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont, - const rtl::OUString& rType ) const; + const OUString& rType ) const; FontWidth getSubstWidth( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont, - const rtl::OUString& rType ) const; + const OUString& rType ) const; unsigned long getSubstType( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > xFont, - const rtl::OUString& rType ) const; + const OUString& rType ) const; void readLocaleSubst( const com::sun::star::lang::Locale& rLocale ) const; public: FontSubstConfiguration(); diff --git a/unotools/inc/unotools/historyoptions.hxx b/unotools/inc/unotools/historyoptions.hxx index f69fd1730d13..3340a3ae9fdc 100644 --- a/unotools/inc/unotools/historyoptions.hxx +++ b/unotools/inc/unotools/historyoptions.hxx @@ -163,10 +163,10 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtHistoryOptions : public utl::detail: *//*-*****************************************************************************************************/ void AppendItem( EHistoryType eHistory , - const ::rtl::OUString& sURL , - const ::rtl::OUString& sFilter , - const ::rtl::OUString& sTitle , - const ::rtl::OUString& sPassword ); + const OUString& sURL , + const OUString& sFilter , + const OUString& sTitle , + const OUString& sPassword ); private: diff --git a/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx index 085bcc0fe260..1dc24c605702 100644 --- a/unotools/inc/unotools/lingucfg.hxx +++ b/unotools/inc/unotools/lingucfg.hxx @@ -41,8 +41,8 @@ class SvtLinguConfigItem; struct UNOTOOLS_DLLPUBLIC SvtLinguOptions { - ::com::sun::star::uno::Sequence< rtl::OUString > aActiveDics; - ::com::sun::star::uno::Sequence< rtl::OUString > aActiveConvDics; + ::com::sun::star::uno::Sequence< OUString > aActiveDics; + ::com::sun::star::uno::Sequence< OUString > aActiveConvDics; sal_Bool bROActiveDics; sal_Bool bROActiveConvDics; @@ -136,11 +136,11 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions struct UNOTOOLS_DLLPUBLIC SvtLinguConfigDictionaryEntry { // the URL's pointing to the location of the files the dictionary consists of - com::sun::star::uno::Sequence< rtl::OUString > aLocations; + com::sun::star::uno::Sequence< OUString > aLocations; // the name of the dictionary format implement - rtl::OUString aFormatName; + OUString aFormatName; // the list of languages (ISO names) the dictionary can be used for - com::sun::star::uno::Sequence< rtl::OUString > aLocaleNames; + com::sun::star::uno::Sequence< OUString > aLocaleNames; }; ////////////////////////////////////////////////////////////////////// @@ -157,10 +157,10 @@ class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options com::sun::star::uno::Reference< com::sun::star::util::XChangesBatch > GetMainUpdateAccess() const; - com::sun::star::uno::Sequence< rtl::OUString > GetCurrentOrLastActiveDicts_Impl( const rtl::OUString &rPropName ) const; - void SetCurrentOrLastActiveDicts_Impl( const rtl::OUString &rPropName, const com::sun::star::uno::Sequence< rtl::OUString > &rDictionaries ) const; + com::sun::star::uno::Sequence< OUString > GetCurrentOrLastActiveDicts_Impl( const OUString &rPropName ) const; + void SetCurrentOrLastActiveDicts_Impl( const OUString &rPropName, const com::sun::star::uno::Sequence< OUString > &rDictionaries ) const; - rtl::OUString GetVendorImageUrl_Impl( const rtl::OUString &rServiceImplName, const rtl::OUString &rImageName ) const; + OUString GetVendorImageUrl_Impl( const OUString &rServiceImplName, const OUString &rImageName ) const; // disallow copy-constructor and assignment-operator for now SvtLinguConfig( const SvtLinguConfig & ); @@ -173,50 +173,50 @@ public: // // borrowed from utl::ConfigItem // - com::sun::star::uno::Sequence< rtl::OUString > - GetNodeNames( const rtl::OUString &rNode ); + com::sun::star::uno::Sequence< OUString > + GetNodeNames( const OUString &rNode ); // com::sun::star::uno::Sequence< com::sun::star::uno::Any > GetProperties( - const com::sun::star::uno::Sequence< rtl::OUString > &rNames ); + const com::sun::star::uno::Sequence< OUString > &rNames ); // sal_Bool ReplaceSetProperties( - const rtl::OUString &rNode, + const OUString &rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues ); com::sun::star::uno::Any - GetProperty( const rtl::OUString &rPropertyName ) const; + GetProperty( const OUString &rPropertyName ) const; com::sun::star::uno::Any GetProperty( sal_Int32 nPropertyHandle ) const; - sal_Bool SetProperty( const rtl::OUString &rPropertyName, + sal_Bool SetProperty( const OUString &rPropertyName, const com::sun::star::uno::Any &rValue ); sal_Bool SetProperty( sal_Int32 nPropertyHandle, const com::sun::star::uno::Any &rValue ); sal_Bool GetOptions( SvtLinguOptions &rOptions ) const; - sal_Bool IsReadOnly( const rtl::OUString &rPropertyName ) const; + sal_Bool IsReadOnly( const OUString &rPropertyName ) const; //! //! the following functions work on the 'ServiceManager' sub node of the //! linguistic configuration only //! - sal_Bool GetElementNamesFor( const rtl::OUString &rNodeName, com::sun::star::uno::Sequence< rtl::OUString > &rElementNames ) const; + sal_Bool GetElementNamesFor( const OUString &rNodeName, com::sun::star::uno::Sequence< OUString > &rElementNames ) const; // - sal_Bool GetSupportedDictionaryFormatsFor( const rtl::OUString &rSetName, const rtl::OUString &rSetEntry, com::sun::star::uno::Sequence< rtl::OUString > &rFormatList ) const; + sal_Bool GetSupportedDictionaryFormatsFor( const OUString &rSetName, const OUString &rSetEntry, com::sun::star::uno::Sequence< OUString > &rFormatList ) const; - sal_Bool GetDictionaryEntry( const rtl::OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const; + sal_Bool GetDictionaryEntry( const OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const; - com::sun::star::uno::Sequence< rtl::OUString > GetDisabledDictionaries() const; + com::sun::star::uno::Sequence< OUString > GetDisabledDictionaries() const; - std::vector< SvtLinguConfigDictionaryEntry > GetActiveDictionariesByFormat( const rtl::OUString &rFormatName ); + std::vector< SvtLinguConfigDictionaryEntry > GetActiveDictionariesByFormat( const OUString &rFormatName ); // functions returning file URLs to the respective images (if found) and empty string otherwise - ::rtl::OUString GetSpellAndGrammarContextSuggestionImage( const ::rtl::OUString &rServiceImplName ) const; - ::rtl::OUString GetSpellAndGrammarContextDictionaryImage( const ::rtl::OUString &rServiceImplName ) const; - ::rtl::OUString GetSynonymsContextImage( const ::rtl::OUString &rServiceImplName ) const; + OUString GetSpellAndGrammarContextSuggestionImage( const OUString &rServiceImplName ) const; + OUString GetSpellAndGrammarContextDictionaryImage( const OUString &rServiceImplName ) const; + OUString GetSynonymsContextImage( const OUString &rServiceImplName ) const; bool HasGrammarChecker() const; }; diff --git a/unotools/inc/unotools/localedatawrapper.hxx b/unotools/inc/unotools/localedatawrapper.hxx index 78321b6bbb2f..a198163831f7 100644 --- a/unotools/inc/unotools/localedatawrapper.hxx +++ b/unotools/inc/unotools/localedatawrapper.hxx @@ -62,14 +62,14 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper : private boost::noncopyable LanguageTag maLanguageTag; ::boost::shared_ptr< ::com::sun::star::i18n::Calendar2 > xDefaultCalendar; ::com::sun::star::i18n::LocaleDataItem aLocaleDataItem; - ::com::sun::star::uno::Sequence< ::rtl::OUString > aReservedWordSeq; - ::com::sun::star::uno::Sequence< ::rtl::OUString > aDateAcceptancePatterns; + ::com::sun::star::uno::Sequence< OUString > aReservedWordSeq; + ::com::sun::star::uno::Sequence< OUString > aDateAcceptancePatterns; ::com::sun::star::uno::Sequence< sal_Int32 > aGrouping; // cached items - rtl::OUString aLocaleItem[::com::sun::star::i18n::LocaleItem::COUNT]; - rtl::OUString aReservedWord[::com::sun::star::i18n::reservedWords::COUNT]; - rtl::OUString aCurrSymbol; - rtl::OUString aCurrBankSymbol; + OUString aLocaleItem[::com::sun::star::i18n::LocaleItem::COUNT]; + OUString aReservedWord[::com::sun::star::i18n::reservedWords::COUNT]; + OUString aCurrSymbol; + OUString aCurrBankSymbol; int nDateFormat; int nLongDateFormat; sal_uInt16 nCurrPositiveFormat; @@ -86,21 +86,21 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper : private boost::noncopyable void invalidateData(); void getOneLocaleItemImpl( sal_Int16 nItem ); - const rtl::OUString& getOneLocaleItem( sal_Int16 nItem ) const; + const OUString& getOneLocaleItem( sal_Int16 nItem ) const; void getOneReservedWordImpl( sal_Int16 nWord ); - const rtl::OUString& getOneReservedWord( sal_Int16 nWord ) const; + const OUString& getOneReservedWord( sal_Int16 nWord ) const; void getCurrSymbolsImpl(); void getCurrFormatsImpl(); - void scanCurrFormatImpl( const rtl::OUString& rCode, + void scanCurrFormatImpl( const OUString& rCode, sal_Int32 nStart, sal_Int32& nSign, sal_Int32& nPar, sal_Int32& nNum, sal_Int32& nBlank, sal_Int32& nSym ); void getDateFormatsImpl(); - DateFormat scanDateFormatImpl( const rtl::OUString& rCode ); + DateFormat scanDateFormatImpl( const OUString& rCode ); void getDefaultCalendarImpl(); @@ -149,14 +149,14 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 > getAllCurrencies() const; ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement > getAllFormats() const; ::com::sun::star::i18n::ForbiddenCharacters getForbiddenCharacters() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > getReservedWord() const; + ::com::sun::star::uno::Sequence< OUString > getReservedWord() const; ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > getAllInstalledLocaleNames() const; - ::com::sun::star::uno::Sequence< ::rtl::OUString > getDateAcceptancePatterns() const; + ::com::sun::star::uno::Sequence< OUString > getDateAcceptancePatterns() const; /** Override locale's date acceptance patterns. An empty sequence resets the patterns to the locale's pattern sequence. */ - void setDateAcceptancePatterns( const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rPatterns ); + void setDateAcceptancePatterns( const ::com::sun::star::uno::Sequence< OUString > & rPatterns ); /// same as the wrapper implementation but static static ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > getInstalledLocaleNames(); @@ -171,7 +171,7 @@ public: static ::com::sun::star::uno::Sequence< sal_uInt16 > getInstalledLanguageTypes(); /// maps the LocaleData string to the International enum - MeasurementSystem mapMeasurementStringToEnum( const rtl::OUString& rMS ) const; + MeasurementSystem mapMeasurementStringToEnum( const OUString& rMS ) const; /// Convenience method to obtain the default calendar. const ::boost::shared_ptr< ::com::sun::star::i18n::Calendar2 > getDefaultCalendar() const; @@ -196,46 +196,46 @@ public: // Functionality of class International methods, LocaleItem - const rtl::OUString& getDateSep() const + const OUString& getDateSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DATE_SEPARATOR ); } - const rtl::OUString& getNumThousandSep() const + const OUString& getNumThousandSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::THOUSAND_SEPARATOR ); } - const rtl::OUString& getNumDecimalSep() const + const OUString& getNumDecimalSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DECIMAL_SEPARATOR ); } - const rtl::OUString& getTimeSep() const + const OUString& getTimeSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_SEPARATOR ); } - const rtl::OUString& getTime100SecSep() const + const OUString& getTime100SecSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_100SEC_SEPARATOR ); } - const rtl::OUString& getListSep() const + const OUString& getListSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LIST_SEPARATOR ); } - const rtl::OUString& getQuotationMarkStart() const + const OUString& getQuotationMarkStart() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::SINGLE_QUOTATION_START ); } - const rtl::OUString& getQuotationMarkEnd() const + const OUString& getQuotationMarkEnd() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::SINGLE_QUOTATION_END ); } - const rtl::OUString& getDoubleQuotationMarkStart() const + const OUString& getDoubleQuotationMarkStart() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DOUBLE_QUOTATION_START ); } - const rtl::OUString& getDoubleQuotationMarkEnd() const + const OUString& getDoubleQuotationMarkEnd() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::DOUBLE_QUOTATION_END ); } - const rtl::OUString& getMeasurementSystem() const + const OUString& getMeasurementSystem() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::MEASUREMENT_SYSTEM ); } MeasurementSystem getMeasurementSystemEnum() const { return mapMeasurementStringToEnum( getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::MEASUREMENT_SYSTEM ) ); } - const rtl::OUString& getTimeAM() const + const OUString& getTimeAM() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_AM ); } - const rtl::OUString& getTimePM() const + const OUString& getTimePM() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::TIME_PM ); } - const rtl::OUString& getLongDateDayOfWeekSep() const + const OUString& getLongDateDayOfWeekSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_DAY_OF_WEEK_SEPARATOR ); } - const rtl::OUString& getLongDateDaySep() const + const OUString& getLongDateDaySep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_DAY_SEPARATOR ); } - const rtl::OUString& getLongDateMonthSep() const + const OUString& getLongDateMonthSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_MONTH_SEPARATOR ); } - const rtl::OUString& getLongDateYearSep() const + const OUString& getLongDateYearSep() const { return getOneLocaleItem( ::com::sun::star::i18n::LocaleItem::LONG_DATE_YEAR_SEPARATOR ); } // currency - const rtl::OUString& getCurrSymbol() const; - const rtl::OUString& getCurrBankSymbol() const; + const OUString& getCurrSymbol() const; + const OUString& getCurrBankSymbol() const; sal_uInt16 getCurrPositiveFormat() const; sal_uInt16 getCurrNegativeFormat() const; sal_uInt16 getCurrDigits() const; @@ -244,10 +244,10 @@ public: DateFormat getDateFormat() const; DateFormat getLongDateFormat() const; /// only numerical values of Gregorian calendar - rtl::OUString getDate( const Date& rDate ) const; - rtl::OUString getTime( const Time& rTime, sal_Bool bSec = sal_True, + OUString getDate( const Date& rDate ) const; + OUString getTime( const Time& rTime, sal_Bool bSec = sal_True, sal_Bool b100Sec = sal_False ) const; - rtl::OUString getDuration( const Time& rTime, + OUString getDuration( const Time& rTime, sal_Bool bSec = sal_True, sal_Bool b100Sec = sal_False ) const; /** The CalendarWrapper already <b>MUST</b> @@ -265,7 +265,7 @@ public: <FALSE/> := full year <TRUE/> := year % 100 */ - rtl::OUString getLongDate( const Date& rDate, + OUString getLongDate( const Date& rDate, CalendarWrapper& rCal, sal_Int16 nDisplayDayOfWeek = 1, sal_Bool bDayOfMonthWithLeadingZero = sal_False, @@ -282,18 +282,18 @@ public: </sal_False> := trailing zeros are only displayed if the value is not an integer value. */ - rtl::OUString getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, + OUString getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep = sal_True, sal_Bool bTrailingZeros = sal_True ) const; /// "Secure" currency formatted string. - rtl::OUString getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, - const rtl::OUString& rCurrencySymbol, + OUString getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, + const OUString& rCurrencySymbol, sal_Bool bUseThousandSep = sal_True ) const; /** Default currency formatted string, use with care as default currency may change in any locale, for example, DEM -> EUR */ - rtl::OUString getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, + OUString getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep = sal_True ) const { return getCurr( nNumber, nDecimals, getCurrSymbol(), bUseThousandSep ); } @@ -312,19 +312,19 @@ public: // reserved words - const rtl::OUString& getTrueWord() const + const OUString& getTrueWord() const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::TRUE_WORD ); } - const rtl::OUString& getFalseWord() const + const OUString& getFalseWord() const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::FALSE_WORD ); } /// return a quarter string matching nQuarter (0..3) => "1st quarter" .. "4th quarter" - const rtl::OUString& getQuarterWord( sal_Int16 nQuarter ) const + const OUString& getQuarterWord( sal_Int16 nQuarter ) const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::QUARTER1_WORD + nQuarter ); } - const rtl::OUString& getAboveWord() const + const OUString& getAboveWord() const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::ABOVE_WORD ); } - const rtl::OUString& getBelowWord() const + const OUString& getBelowWord() const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::BELOW_WORD ); } /// return a quarter abbreviation string matching nQuarter (0..3) => "Q1" .. "Q2" - const rtl::OUString& getQuarterAbbreviation( sal_Int16 nQuarter ) const + const OUString& getQuarterAbbreviation( sal_Int16 nQuarter ) const { return getOneReservedWord( ::com::sun::star::i18n::reservedWords::QUARTER1_ABBREVIATION + nQuarter ); } /** Return whether locale data checks are enabled. @@ -341,12 +341,12 @@ public: /** Append locale info to string, used with locale data checking. A string similar to "de_DE requested\n en_US loaded" is appended. */ - rtl::OUString appendLocaleInfo(const rtl::OUString& rDebugMsg) const; + OUString appendLocaleInfo(const OUString& rDebugMsg) const; /** Ouput a message during locale data checking. The (UTF-8) string is written to stderr and in a non-product build or if DBG_UTIL is enabled also raised as an assertion message box. */ - static void outputCheckMessage( const rtl::OUString& rMsg ); + static void outputCheckMessage( const OUString& rMsg ); static void outputCheckMessage( const char* pStr); private: diff --git a/unotools/inc/unotools/localfilehelper.hxx b/unotools/inc/unotools/localfilehelper.hxx index 963b6cadbb7d..4a1864b2f44f 100644 --- a/unotools/inc/unotools/localfilehelper.hxx +++ b/unotools/inc/unotools/localfilehelper.hxx @@ -35,7 +35,7 @@ namespace utl If no UCP is available for the local file system, sal_False and an empty URL is returned. Returning sal_True and an empty URL means that the URL doesn't point to a local file. */ - static bool ConvertPhysicalNameToURL(const rtl::OUString& rName, rtl::OUString& rReturn); + static bool ConvertPhysicalNameToURL(const OUString& rName, OUString& rReturn); static sal_Bool ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn ); /** @@ -44,14 +44,14 @@ namespace utl otherwise sal_True and a valid URL, because a file name can always be converted if a UCP for the local file system is present ( watch: this doesn't mean that this file really exists! ) */ - static bool ConvertURLToPhysicalName( const rtl::OUString& rName, rtl::OUString& rReturn ); + static bool ConvertURLToPhysicalName( const OUString& rName, OUString& rReturn ); static sal_Bool ConvertURLToSystemPath( const OUString& rName, OUString& rReturn ); - static sal_Bool IsLocalFile(const rtl::OUString& rName); - static sal_Bool IsFileContent(const rtl::OUString& rName); + static sal_Bool IsLocalFile(const OUString& rName); + static sal_Bool IsFileContent(const OUString& rName); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > - GetFolderContents( const ::rtl::OUString& rFolder, sal_Bool bFolder ); + static ::com::sun::star::uno::Sequence< OUString > + GetFolderContents( const OUString& rFolder, sal_Bool bFolder ); }; } diff --git a/unotools/inc/unotools/moduleoptions.hxx b/unotools/inc/unotools/moduleoptions.hxx index ba77ba008302..2bf41dc46773 100644 --- a/unotools/inc/unotools/moduleoptions.hxx +++ b/unotools/inc/unotools/moduleoptions.hxx @@ -104,33 +104,33 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: virtual ~SvtModuleOptions(); sal_Bool IsModuleInstalled ( EModule eModule ) const; - ::rtl::OUString GetModuleName ( EModule eModule ) const; - ::rtl::OUString GetFactoryName ( EFactory eFactory ) const; - ::rtl::OUString GetFactoryStandardTemplate( EFactory eFactory ) const; - ::rtl::OUString GetFactoryEmptyDocumentURL( EFactory eFactory ) const; - ::rtl::OUString GetFactoryDefaultFilter ( EFactory eFactory ) const; + OUString GetModuleName ( EModule eModule ) const; + OUString GetFactoryName ( EFactory eFactory ) const; + OUString GetFactoryStandardTemplate( EFactory eFactory ) const; + OUString GetFactoryEmptyDocumentURL( EFactory eFactory ) const; + OUString GetFactoryDefaultFilter ( EFactory eFactory ) const; sal_Bool IsDefaultFilterReadonly ( EFactory eFactory ) const; sal_Int32 GetFactoryIcon ( EFactory eFactory ) const; - static sal_Bool ClassifyFactoryByName ( const ::rtl::OUString& sName , + static sal_Bool ClassifyFactoryByName ( const OUString& sName , EFactory& eFactory ); void SetFactoryStandardTemplate( EFactory eFactory , - const ::rtl::OUString& sTemplate ); + const OUString& sTemplate ); void SetFactoryDefaultFilter ( EFactory eFactory , - const ::rtl::OUString& sFilter ); + const OUString& sFilter ); //_______________________________________ /** @short return the corresponding application ID for the given document service name. */ - static EFactory ClassifyFactoryByServiceName(const ::rtl::OUString& sName); + static EFactory ClassifyFactoryByServiceName(const OUString& sName); //_______________________________________ /** @short return the corresponding application ID for the given short name. */ - static EFactory ClassifyFactoryByShortName(const ::rtl::OUString& sName); + static EFactory ClassifyFactoryByShortName(const OUString& sName); //_______________________________________ @@ -152,7 +152,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: @return A suitable enum value. See EFactory above. */ - static EFactory ClassifyFactoryByURL(const ::rtl::OUString& sURL , + static EFactory ClassifyFactoryByURL(const OUString& sURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lMediaDescriptor); //_______________________________________ @@ -172,7 +172,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: */ static EFactory ClassifyFactoryByModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel); - ::rtl::OUString GetDefaultModuleName(); + OUString GetDefaultModuleName(); sal_Bool IsMath () const; sal_Bool IsChart () const; @@ -183,7 +183,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: sal_Bool IsBasicIDE () const; sal_Bool IsDataBase () const; - ::com::sun::star::uno::Sequence < ::rtl::OUString > GetAllServiceNames(); + ::com::sun::star::uno::Sequence < OUString > GetAllServiceNames(); private: UNOTOOLS_DLLPRIVATE static ::osl::Mutex& impl_GetOwnStaticMutex(); diff --git a/unotools/inc/unotools/nativenumberwrapper.hxx b/unotools/inc/unotools/nativenumberwrapper.hxx index dea1ee01e0f7..252a48d85a13 100644 --- a/unotools/inc/unotools/nativenumberwrapper.hxx +++ b/unotools/inc/unotools/nativenumberwrapper.hxx @@ -45,8 +45,8 @@ public: // Wrapper implementations of XNativeNumberSupplier - ::rtl::OUString getNativeNumberString( - const ::rtl::OUString& rNumberString, + OUString getNativeNumberString( + const OUString& rNumberString, const ::com::sun::star::lang::Locale& rLocale, sal_Int16 nNativeNumberMode ) const; diff --git a/unotools/inc/unotools/optionsdlg.hxx b/unotools/inc/unotools/optionsdlg.hxx index 86821832ece7..ba28032a49ea 100644 --- a/unotools/inc/unotools/optionsdlg.hxx +++ b/unotools/inc/unotools/optionsdlg.hxx @@ -34,12 +34,12 @@ public: SvtOptionsDialogOptions(); virtual ~SvtOptionsDialogOptions(); - sal_Bool IsGroupHidden ( const rtl::OUString& _rGroup ) const; - sal_Bool IsPageHidden ( const rtl::OUString& _rPage, - const rtl::OUString& _rGroup ) const; - sal_Bool IsOptionHidden ( const rtl::OUString& _rOption, - const rtl::OUString& _rPage, - const rtl::OUString& _rGroup ) const; + sal_Bool IsGroupHidden ( const OUString& _rGroup ) const; + sal_Bool IsPageHidden ( const OUString& _rPage, + const OUString& _rGroup ) const; + sal_Bool IsOptionHidden ( const OUString& _rOption, + const OUString& _rPage, + const OUString& _rGroup ) const; }; #endif diff --git a/unotools/inc/unotools/securityoptions.hxx b/unotools/inc/unotools/securityoptions.hxx index dd4548551e33..1c054e984bfe 100644 --- a/unotools/inc/unotools/securityoptions.hxx +++ b/unotools/inc/unotools/securityoptions.hxx @@ -89,15 +89,15 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail MA_RUN }; - typedef ::com::sun::star::uno::Sequence< ::rtl::OUString > Certificate; + typedef ::com::sun::star::uno::Sequence< OUString > Certificate; /* // MT: Doesn't work for sequence... struct Certificate { - ::rtl::OUString SubjectName; - ::rtl::OUString SerialNumber; - ::rtl::OUString RawData; + OUString SubjectName; + OUString SerialNumber; + OUString RawData; }; */ @@ -152,8 +152,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail @onerror No error should occurre! *//*-*****************************************************************************************************/ - ::com::sun::star::uno::Sequence< ::rtl::OUString > GetSecureURLs( ) const ; - void SetSecureURLs( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& seqURLList ) ; + ::com::sun::star::uno::Sequence< OUString > GetSecureURLs( ) const ; + void SetSecureURLs( const ::com::sun::star::uno::Sequence< OUString >& seqURLList ) ; /*-****************************************************************************************************//** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/StarOfficeBasic" @@ -194,8 +194,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail @onerror No error should occurre! *//*-*****************************************************************************************************/ - sal_Bool IsSecureURL( const ::rtl::OUString& sURL , - const ::rtl::OUString& sReferer ) const ; + sal_Bool IsSecureURL( const OUString& sURL , + const OUString& sReferer ) const ; ::com::sun::star::uno::Sequence< Certificate > GetTrustedAuthors ( ) const ; void SetTrustedAuthors ( const ::com::sun::star::uno::Sequence< Certificate >& rAuthors ) ; diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx index 2deffdc734ec..8c9378938ce0 100644 --- a/unotools/inc/unotools/syslocaleoptions.hxx +++ b/unotools/inc/unotools/syslocaleoptions.hxx @@ -97,8 +97,8 @@ public: // config value access methods /// The config string may be empty to denote the SYSTEM locale - const ::rtl::OUString& GetLocaleConfigString() const; - void SetLocaleConfigString( const ::rtl::OUString& rStr ); + const OUString& GetLocaleConfigString() const; + void SetLocaleConfigString( const OUString& rStr ); /** Get locale set, if empty denotes SYSTEM locale, not resolved to the real locale. */ LanguageTag GetLanguageTag() const; @@ -106,18 +106,18 @@ public: const LanguageTag& GetRealLanguageTag() const; /// The config string may be empty to denote the SYSTEM locale - void SetUILocaleConfigString( const ::rtl::OUString& rStr ); + void SetUILocaleConfigString( const OUString& rStr ); /** Get UI locale set, always resolved to the real locale. */ const LanguageTag& GetRealUILanguageTag() const; /// The config string may be empty to denote the default currency of the locale - const ::rtl::OUString& GetCurrencyConfigString() const; - void SetCurrencyConfigString( const ::rtl::OUString& rStr ); + const OUString& GetCurrencyConfigString() const; + void SetCurrencyConfigString( const OUString& rStr ); /** The config string may be empty to denote the default DateAcceptancePatterns of the locale */ - const ::rtl::OUString& GetDatePatternsConfigString() const; - void SetDatePatternsConfigString( const ::rtl::OUString& rStr ); + const OUString& GetDatePatternsConfigString() const; + void SetDatePatternsConfigString( const OUString& rStr ); // determine whether the decimal separator defined in the keyboard layout is used // or the one approriate to the locale @@ -135,10 +135,10 @@ public: static void GetCurrencyAbbrevAndLanguage( String& rAbbrev, LanguageType& eLang, - const ::rtl::OUString& rConfigString ); + const OUString& rConfigString ); /// Create an USD-en-US or EUR-de-DE string - static ::rtl::OUString CreateCurrencyConfigString( + static OUString CreateCurrencyConfigString( const String& rAbbrev, LanguageType eLang ); diff --git a/unotools/inc/unotools/textsearch.hxx b/unotools/inc/unotools/textsearch.hxx index 63ab0dece4e3..0b826102cb91 100644 --- a/unotools/inc/unotools/textsearch.hxx +++ b/unotools/inc/unotools/textsearch.hxx @@ -71,7 +71,7 @@ private: long nTransliterationFlags; public: - SearchParam( const rtl::OUString &rText, + SearchParam( const OUString &rText, SearchType eSrchType = SearchParam::SRCH_NORMAL, sal_Bool bCaseSensitive = sal_True, sal_Bool bWordOnly = sal_False, @@ -162,7 +162,7 @@ public: int SearchFrwrd( const String &rStr, xub_StrLen* pStart, xub_StrLen* pEnde, ::com::sun::star::util::SearchResult* pSrchResult = 0 ); - sal_Bool SearchForward( const ::rtl::OUString &rStr, + sal_Bool SearchForward( const OUString &rStr, sal_Int32* pStart, sal_Int32* pEnd, ::com::sun::star::util::SearchResult* pRes = 0 ); int SearchBkwrd( const String &rStr, diff --git a/unotools/inc/unotools/ucbhelper.hxx b/unotools/inc/unotools/ucbhelper.hxx index 084db947853f..eb171591d69a 100644 --- a/unotools/inc/unotools/ucbhelper.hxx +++ b/unotools/inc/unotools/ucbhelper.hxx @@ -34,41 +34,41 @@ namespace ucbhelper { class Content; } namespace utl { namespace UCBContentHelper { -UNOTOOLS_DLLPUBLIC bool IsDocument(rtl::OUString const & url); +UNOTOOLS_DLLPUBLIC bool IsDocument(OUString const & url); -UNOTOOLS_DLLPUBLIC bool IsFolder(rtl::OUString const & url); +UNOTOOLS_DLLPUBLIC bool IsFolder(OUString const & url); /// @param title must not be null /// @return true iff title has been set (i.e., if obtaining the "Title" property /// of the given content yields a non-void value without raising a /// non-RuntimeException; RuntimeExceptions are passed through) UNOTOOLS_DLLPUBLIC bool GetTitle( - rtl::OUString const & url, rtl::OUString * title); + OUString const & url, OUString * title); -UNOTOOLS_DLLPUBLIC bool Kill(rtl::OUString const & url); +UNOTOOLS_DLLPUBLIC bool Kill(OUString const & url); UNOTOOLS_DLLPUBLIC com::sun::star::uno::Any GetProperty( - rtl::OUString const & url, rtl::OUString const & property); + OUString const & url, OUString const & property); UNOTOOLS_DLLPUBLIC bool MakeFolder( - ucbhelper::Content & parent, rtl::OUString const & title, + ucbhelper::Content & parent, OUString const & title, ucbhelper::Content & result, bool exclusive = false); /// @return the value of the "Size" property of the given content, or zero if /// obtaining the property yields a void value or raises a /// non-RuntimeException (RuntimeExceptions are passed through) -UNOTOOLS_DLLPUBLIC sal_Int64 GetSize(rtl::OUString const & url); +UNOTOOLS_DLLPUBLIC sal_Int64 GetSize(OUString const & url); UNOTOOLS_DLLPUBLIC bool IsYounger( - rtl::OUString const & younger, rtl::OUString const & older); + OUString const & younger, OUString const & older); -UNOTOOLS_DLLPUBLIC bool Exists(rtl::OUString const & url); +UNOTOOLS_DLLPUBLIC bool Exists(OUString const & url); UNOTOOLS_DLLPUBLIC bool IsSubPath( - rtl::OUString const & parent, rtl::OUString const & child); + OUString const & parent, OUString const & child); UNOTOOLS_DLLPUBLIC bool EqualURLs( - rtl::OUString const & url1, rtl::OUString const & url2); + OUString const & url1, OUString const & url2); } } diff --git a/unotools/inc/unotools/useroptions.hxx b/unotools/inc/unotools/useroptions.hxx index f3752c54e73b..77b71ee90bd1 100644 --- a/unotools/inc/unotools/useroptions.hxx +++ b/unotools/inc/unotools/useroptions.hxx @@ -58,31 +58,31 @@ public: static osl::Mutex& GetInitMutex (); // get the address token - rtl::OUString GetCompany () const; - rtl::OUString GetFirstName () const; - rtl::OUString GetLastName () const; - rtl::OUString GetID () const; - rtl::OUString GetStreet () const; - rtl::OUString GetCity () const; - rtl::OUString GetState () const; - rtl::OUString GetZip () const; - rtl::OUString GetCountry () const; - rtl::OUString GetPosition () const; - rtl::OUString GetTitle () const; - rtl::OUString GetTelephoneHome () const; - rtl::OUString GetTelephoneWork () const; - rtl::OUString GetFax () const; - rtl::OUString GetEmail () const; - rtl::OUString GetCustomerNumber () const; + OUString GetCompany () const; + OUString GetFirstName () const; + OUString GetLastName () const; + OUString GetID () const; + OUString GetStreet () const; + OUString GetCity () const; + OUString GetState () const; + OUString GetZip () const; + OUString GetCountry () const; + OUString GetPosition () const; + OUString GetTitle () const; + OUString GetTelephoneHome () const; + OUString GetTelephoneWork () const; + OUString GetFax () const; + OUString GetEmail () const; + OUString GetCustomerNumber () const; - rtl::OUString GetFullName () const; + OUString GetFullName () const; // set the address token - void SetCustomerNumber (rtl::OUString const&); + void SetCustomerNumber (OUString const&); sal_Bool IsTokenReadonly (sal_uInt16 nToken) const; - rtl::OUString GetToken (sal_uInt16 nToken) const; - void SetToken (sal_uInt16 nToken, rtl::OUString const& rNewToken); + OUString GetToken (sal_uInt16 nToken) const; + void SetToken (sal_uInt16 nToken, OUString const& rNewToken); private: class Impl; diff --git a/unotools/inc/unotools/viewoptions.hxx b/unotools/inc/unotools/viewoptions.hxx index 39164c201255..1c173050d31b 100644 --- a/unotools/inc/unotools/viewoptions.hxx +++ b/unotools/inc/unotools/viewoptions.hxx @@ -131,7 +131,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op *//*-*****************************************************************************************************/ SvtViewOptions( EViewType eType , - const ::rtl::OUString& sViewName ); + const OUString& sViewName ); virtual ~SvtViewOptions(); /*-****************************************************************************************************//** @@ -194,8 +194,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op @onerror - *//*-*****************************************************************************************************/ - ::rtl::OUString GetWindowState( ) const; - void SetWindowState( const ::rtl::OUString& sState ); + OUString GetWindowState( ) const; + void SetWindowState( const OUString& sState ); /*-****************************************************************************************************//** @short use it to set/get the page number which was the last active one @@ -254,8 +254,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op @onerror In the non-product version, an assertion is made. In a product version, errors are silently ignored. *//*-*****************************************************************************************************/ - ::com::sun::star::uno::Any GetUserItem( const ::rtl::OUString& sName ) const; - void SetUserItem( const ::rtl::OUString& sName , + ::com::sun::star::uno::Any GetUserItem( const OUString& sName ) const; + void SetUserItem( const OUString& sName , const ::com::sun::star::uno::Any& aValue ); //------------------------------------------------------------------------------------------------------------- @@ -289,7 +289,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op /// specify which list of views in configuration is used! This can't be a static value!!! /// ... because we need this value to work with right static data container. EViewType m_eViewType ; - ::rtl::OUString m_sViewName ; + OUString m_sViewName ; /// - impl. data container as dynamic pointer for smaller memory requirements! /// - internal ref count mechanism diff --git a/unotools/inc/unotools/xmlaccelcfg.hxx b/unotools/inc/unotools/xmlaccelcfg.hxx index 48417b2a229a..d0e15dcfdbec 100644 --- a/unotools/inc/unotools/xmlaccelcfg.hxx +++ b/unotools/inc/unotools/xmlaccelcfg.hxx @@ -60,23 +60,23 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume virtual void SAL_CALL endDocument(void) throw ( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL startElement( - const ::rtl::OUString& aName, + 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 ::rtl::OUString& aName) throw + 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 ::rtl::OUString& aChars) + 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 ::rtl::OUString& aWhitespaces) + 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 ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) + 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 ); private: - ::rtl::OUString getErrorLineString(); + OUString getErrorLineString(); int m_nElementDepth; sal_Bool m_bAcceleratorMode; @@ -101,7 +101,7 @@ class OWriteAccelatorDocumentHandler ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > m_xWriteDocumentHandler; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > m_xEmptyList; - ::rtl::OUString m_aAttributeType; + OUString m_aAttributeType; const SvtAcceleratorItemList& m_aWriteAcceleratorList; }; diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 505cf240b8ae..1a9df9c3b749 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -59,9 +59,6 @@ typedef char const * AsciiString; namespace utl { // --------------------------------------------------------------------------------------- - using ::rtl::OUString; - using ::rtl::OUStringBuffer; - using ::rtl::OString; // --------------------------------------------------------------------------------------- // Implementation class: Bootstrap::Impl @@ -330,7 +327,7 @@ PathStatus getDerivedPath( { OSL_PRECOND(_aBaseURL[_aBaseURL.getLength()-1] != cURLSeparator,"Unexpected: base URL ends in slash"); - sDerivedURL = rtl::OUStringBuffer(_aBaseURL).append(cURLSeparator).append(_sRelativeURL).makeStringAndClear(); + sDerivedURL = OUStringBuffer(_aBaseURL).append(cURLSeparator).append(_sRelativeURL).makeStringAndClear(); // a derived (nested) URL can only exist or have a lesser status, if the parent exists if (aStatus == Bootstrap::PATH_EXISTS) @@ -661,7 +658,7 @@ PathStatus Bootstrap::locateVersionFile(OUString& _rURL) } // --------------------------------------------------------------------------------------- -Bootstrap::Status Bootstrap::checkBootstrapStatus(rtl::OUString& _rDiagnosticMessage, FailureCode& _rErrCode) +Bootstrap::Status Bootstrap::checkBootstrapStatus(OUString& _rDiagnosticMessage, FailureCode& _rErrCode) { Impl const& aData = data(); diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index cbdc0345386c..85cf76ea0ce0 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -106,10 +106,10 @@ class SvtCmdOptions } private: - class CommandHashMap : public ::boost::unordered_map< ::rtl::OUString , + class CommandHashMap : public ::boost::unordered_map< OUString , sal_Int32 , OUStringHashCode , - ::std::equal_to< ::rtl::OUString > > + ::std::equal_to< OUString > > { public: inline void free() diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index 0807e2726042..c7b1426e7e97 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -283,8 +283,8 @@ class SvtCompatibilityOptions_Impl : public ConfigItem void Clear(); Sequence< Sequence< PropertyValue > > GetList() const; - void AppendItem( const ::rtl::OUString& _sName, - const ::rtl::OUString& _sModule, + void AppendItem( const OUString& _sName, + const OUString& _sModule, bool _bUsePrtMetrics, bool _bAddSpacing, bool _bAddSpacingAtPages, @@ -532,8 +532,8 @@ Sequence< Sequence< PropertyValue > > SvtCompatibilityOptions_Impl::GetList() co // public method //***************************************************************************************************************** -void SvtCompatibilityOptions_Impl::AppendItem( const ::rtl::OUString& _sName, - const ::rtl::OUString& _sModule, +void SvtCompatibilityOptions_Impl::AppendItem( const OUString& _sName, + const OUString& _sModule, bool _bUsePrtMetrics, bool _bAddSpacing, bool _bAddSpacingAtPages, @@ -689,7 +689,7 @@ void SvtCompatibilityOptions::Clear() m_pDataContainer->Clear(); } -void SvtCompatibilityOptions::SetDefault( ::rtl::OUString sName, bool bValue ) +void SvtCompatibilityOptions::SetDefault( OUString sName, bool bValue ) { m_pDataContainer->SetDefault( sName, bValue ); } @@ -697,8 +697,8 @@ void SvtCompatibilityOptions::SetDefault( ::rtl::OUString sName, bool bValue ) //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtCompatibilityOptions::AppendItem( const ::rtl::OUString& sName, - const ::rtl::OUString& sModule, +void SvtCompatibilityOptions::AppendItem( const OUString& sName, + const OUString& sModule, bool bUsePrtMetrics, bool bAddSpacing, bool bAddSpacingAtPages, diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 501f66814015..7e89095e5e00 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -158,7 +158,7 @@ ConfigChangeListener_Impl::~ConfigChangeListener_Impl() } static sal_Bool lcl_Find( - const rtl::OUString& rTemp, + const OUString& rTemp, const OUString* pCheckPropertyNames, sal_Int32 nLength) { @@ -391,7 +391,7 @@ void ConfigItem::impl_unpackLocalizedProperties( const Sequence< OUString > } } -Sequence< sal_Bool > ConfigItem::GetReadOnlyStates(const com::sun::star::uno::Sequence< rtl::OUString >& rNames) +Sequence< sal_Bool > ConfigItem::GetReadOnlyStates(const com::sun::star::uno::Sequence< OUString >& rNames) { sal_Int32 i; @@ -1101,7 +1101,7 @@ sal_Bool ConfigItem::ReplaceSetProperties( return bRet; } -sal_Bool ConfigItem::getUniqueSetElementName( const ::rtl::OUString& _rSetNode, ::rtl::OUString& _rName) +sal_Bool ConfigItem::getUniqueSetElementName( const OUString& _rSetNode, OUString& _rName) { Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree(); sal_Bool bRet = sal_False; @@ -1122,8 +1122,8 @@ sal_Bool ConfigItem::getUniqueSetElementName( const ::rtl::OUString& _rSetNode, for (; 1 != nFieldElement; nFieldElement = (nFieldElement * nEngendering) % nPrime) { - ::rtl::OUString sThisRoundTrial = _rName; - sThisRoundTrial += ::rtl::OUString::valueOf((sal_Int32)nFieldElement); + OUString sThisRoundTrial = _rName; + sThisRoundTrial += OUString::valueOf((sal_Int32)nFieldElement); if (!xSetNode->hasByName(sThisRoundTrial)) { @@ -1139,7 +1139,7 @@ sal_Bool ConfigItem::getUniqueSetElementName( const ::rtl::OUString& _rSetNode, return bRet; } -sal_Bool ConfigItem::AddNode(const rtl::OUString& rNode, const rtl::OUString& rNewNode) +sal_Bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode) { ValueCounter_Impl aCounter(pImpl->nInValueChange); sal_Bool bRet = sal_True; diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index ab5de4b8790f..cac6b8babe3d 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -78,7 +78,7 @@ OUString getConfigurationString(OUString const & module, OUString const & path) OUString("com.sun.star.configuration.ConfigurationAccess"), args), css::uno::UNO_QUERY_THROW)-> - getByHierarchicalName(path).get< rtl::OUString >(); + getByHierarchicalName(path).get< OUString >(); } struct theConfigManager: diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 9692bb083baa..93220536110c 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -128,9 +128,9 @@ namespace utl } //------------------------------------------------------------------------ - ::rtl::OUString OConfigurationNode::getLocalName() const + OUString OConfigurationNode::getLocalName() const { - ::rtl::OUString sLocalName; + OUString sLocalName; try { Reference< XNamed > xNamed( m_xDirectAccess, UNO_QUERY_THROW ); @@ -144,9 +144,9 @@ namespace utl } //------------------------------------------------------------------------ - ::rtl::OUString OConfigurationNode::getNodePath() const + OUString OConfigurationNode::getNodePath() const { - ::rtl::OUString sNodePath; + OUString sNodePath; try { Reference< XHierarchicalName > xNamed( m_xDirectAccess, UNO_QUERY_THROW ); @@ -160,9 +160,9 @@ namespace utl } //------------------------------------------------------------------------ - ::rtl::OUString OConfigurationNode::normalizeName(const ::rtl::OUString& _rName, NAMEORIGIN _eOrigin) const + OUString OConfigurationNode::normalizeName(const OUString& _rName, NAMEORIGIN _eOrigin) const { - ::rtl::OUString sName(_rName); + OUString sName(_rName); if (getEscape()) { Reference< XStringEscape > xEscaper(m_xDirectAccess, UNO_QUERY); @@ -185,17 +185,17 @@ namespace utl } //------------------------------------------------------------------------ - Sequence< ::rtl::OUString > OConfigurationNode::getNodeNames() const throw() + Sequence< OUString > OConfigurationNode::getNodeNames() const throw() { OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::getNodeNames: object is invalid!"); - Sequence< ::rtl::OUString > aReturn; + Sequence< OUString > aReturn; if (m_xDirectAccess.is()) { try { aReturn = m_xDirectAccess->getElementNames(); // normalize the names - ::rtl::OUString* pNames = aReturn.getArray(); + OUString* pNames = aReturn.getArray(); for (sal_Int32 i=0; i<aReturn.getLength(); ++i, ++pNames) *pNames = normalizeName(*pNames, NO_CONFIGURATION); } @@ -209,23 +209,23 @@ namespace utl } //------------------------------------------------------------------------ - sal_Bool OConfigurationNode::removeNode(const ::rtl::OUString& _rName) const throw() + sal_Bool OConfigurationNode::removeNode(const OUString& _rName) const throw() { OSL_ENSURE(m_xContainerAccess.is(), "OConfigurationNode::removeNode: object is invalid!"); if (m_xContainerAccess.is()) { try { - ::rtl::OUString sName = normalizeName(_rName, NO_CALLER); + OUString sName = normalizeName(_rName, NO_CALLER); m_xContainerAccess->removeByName(sName); return sal_True; } catch (NoSuchElementException&) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aBuf( 256 ); + OStringBuffer aBuf( 256 ); aBuf.append("OConfigurationNode::removeNode: there is no element named!"); - aBuf.append( rtl::OUStringToOString( _rName, RTL_TEXTENCODING_ASCII_US ) ); + aBuf.append( OUStringToOString( _rName, RTL_TEXTENCODING_ASCII_US ) ); aBuf.append( "!" ); OSL_FAIL(aBuf.getStr()); #endif @@ -242,13 +242,13 @@ namespace utl return sal_False; } //------------------------------------------------------------------------ - OConfigurationNode OConfigurationNode::insertNode(const ::rtl::OUString& _rName,const Reference< XInterface >& _xNode) const throw() + OConfigurationNode OConfigurationNode::insertNode(const OUString& _rName,const Reference< XInterface >& _xNode) const throw() { if(_xNode.is()) { try { - ::rtl::OUString sName = normalizeName(_rName, NO_CALLER); + OUString sName = normalizeName(_rName, NO_CALLER); m_xContainerAccess->insertByName(sName, makeAny(_xNode)); // if we're here, all was ok ... return OConfigurationNode( _xNode ); @@ -267,7 +267,7 @@ namespace utl return OConfigurationNode(); } //------------------------------------------------------------------------ - OConfigurationNode OConfigurationNode::createNode(const ::rtl::OUString& _rName) const throw() + OConfigurationNode OConfigurationNode::createNode(const OUString& _rName) const throw() { Reference< XSingleServiceFactory > xChildFactory(m_xContainerAccess, UNO_QUERY); OSL_ENSURE(xChildFactory.is(), "OConfigurationNode::createNode: object is invalid or read-only!"); @@ -290,13 +290,13 @@ namespace utl } //------------------------------------------------------------------------ - OConfigurationNode OConfigurationNode::openNode(const ::rtl::OUString& _rPath) const throw() + OConfigurationNode OConfigurationNode::openNode(const OUString& _rPath) const throw() { OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::openNode: object is invalid!"); OSL_ENSURE(m_xHierarchyAccess.is(), "OConfigurationNode::openNode: object is invalid!"); try { - ::rtl::OUString sNormalized = normalizeName(_rPath, NO_CALLER); + OUString sNormalized = normalizeName(_rPath, NO_CALLER); Reference< XInterface > xNode; if (m_xDirectAccess.is() && m_xDirectAccess->hasByName(sNormalized)) @@ -315,9 +315,9 @@ namespace utl catch(const NoSuchElementException&) { #if OSL_DEBUG_LEVEL > 0 - rtl::OStringBuffer aBuf( 256 ); + OStringBuffer aBuf( 256 ); aBuf.append("OConfigurationNode::openNode: there is no element named "); - aBuf.append( rtl::OUStringToOString( _rPath, RTL_TEXTENCODING_ASCII_US ) ); + aBuf.append( OUStringToOString( _rPath, RTL_TEXTENCODING_ASCII_US ) ); aBuf.append("!"); OSL_FAIL(aBuf.getStr()); #endif @@ -342,20 +342,20 @@ namespace utl Reference< XServiceInfo > xSI(m_xHierarchyAccess, UNO_QUERY); if (xSI.is()) { - try { bIsSet = xSI->supportsService(::rtl::OUString("com.sun.star.configuration.SetAccess")); } + try { bIsSet = xSI->supportsService(OUString("com.sun.star.configuration.SetAccess")); } catch(Exception&) { } } return bIsSet; } - sal_Bool OConfigurationNode::hasByHierarchicalName( const ::rtl::OUString& _rName ) const throw() + sal_Bool OConfigurationNode::hasByHierarchicalName( const OUString& _rName ) const throw() { OSL_ENSURE( m_xHierarchyAccess.is(), "OConfigurationNode::hasByHierarchicalName: no hierarchy access!" ); try { if ( m_xHierarchyAccess.is() ) { - ::rtl::OUString sName = normalizeName( _rName, NO_CALLER ); + OUString sName = normalizeName( _rName, NO_CALLER ); return m_xHierarchyAccess->hasByHierarchicalName( sName ); } } @@ -366,12 +366,12 @@ namespace utl } //------------------------------------------------------------------------ - sal_Bool OConfigurationNode::hasByName(const ::rtl::OUString& _rName) const throw() + sal_Bool OConfigurationNode::hasByName(const OUString& _rName) const throw() { OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::hasByName: object is invalid!"); try { - ::rtl::OUString sName = normalizeName(_rName, NO_CALLER); + OUString sName = normalizeName(_rName, NO_CALLER); if (m_xDirectAccess.is()) return m_xDirectAccess->hasByName(sName); } @@ -382,7 +382,7 @@ namespace utl } //------------------------------------------------------------------------ - sal_Bool OConfigurationNode::setNodeValue(const ::rtl::OUString& _rPath, const Any& _rValue) const throw() + sal_Bool OConfigurationNode::setNodeValue(const OUString& _rPath, const Any& _rValue) const throw() { sal_Bool bResult = false; @@ -392,7 +392,7 @@ namespace utl try { // check if _rPath is a level-1 path - ::rtl::OUString sNormalizedName = normalizeName(_rPath, NO_CALLER); + OUString sNormalizedName = normalizeName(_rPath, NO_CALLER); if (m_xReplaceAccess->hasByName(sNormalizedName)) { m_xReplaceAccess->replaceByName(sNormalizedName, _rValue); @@ -404,7 +404,7 @@ namespace utl { OSL_ASSERT(!_rPath.isEmpty()); - ::rtl::OUString sParentPath, sLocalName; + OUString sParentPath, sLocalName; if ( splitLastFromConfigurationPath(_rPath, sParentPath, sLocalName) ) { @@ -443,14 +443,14 @@ namespace utl } //------------------------------------------------------------------------ - Any OConfigurationNode::getNodeValue(const ::rtl::OUString& _rPath) const throw() + Any OConfigurationNode::getNodeValue(const OUString& _rPath) const throw() { OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::hasByName: object is invalid!"); OSL_ENSURE(m_xHierarchyAccess.is(), "OConfigurationNode::hasByName: object is invalid!"); Any aReturn; try { - ::rtl::OUString sNormalizedPath = normalizeName(_rPath, NO_CALLER); + OUString sNormalizedPath = normalizeName(_rPath, NO_CALLER); if (m_xDirectAccess.is() && m_xDirectAccess->hasByName(sNormalizedPath) ) { aReturn = m_xDirectAccess->getByName(sNormalizedPath); @@ -498,7 +498,7 @@ namespace utl //-------------------------------------------------------------------- Reference< XInterface > lcl_createConfigurationRoot( const Reference< XMultiServiceFactory >& i_rxConfigProvider, - const ::rtl::OUString& i_rNodePath, const bool i_bUpdatable, const sal_Int32 i_nDepth, const bool i_bLazyWrite ) + const OUString& i_rNodePath, const bool i_bUpdatable, const sal_Int32 i_nDepth, const bool i_bLazyWrite ) { ENSURE_OR_RETURN( i_rxConfigProvider.is(), "invalid provider", NULL ); try @@ -508,9 +508,9 @@ namespace utl aArgs.put( "lazywrite", i_bLazyWrite ); aArgs.put( "depth", i_nDepth ); - ::rtl::OUString sAccessService( i_bUpdatable ? - ::rtl::OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ) : - ::rtl::OUString( "com.sun.star.configuration.ConfigurationAccess" )); + OUString sAccessService( i_bUpdatable ? + OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ) : + OUString( "com.sun.star.configuration.ConfigurationAccess" )); Reference< XInterface > xRoot( i_rxConfigProvider->createInstanceWithArguments( sAccessService, aArgs.getWrappedPropertyValues() ), @@ -534,7 +534,7 @@ namespace utl } //------------------------------------------------------------------------ - OConfigurationTreeRoot::OConfigurationTreeRoot( const Reference<XComponentContext> & i_rContext, const ::rtl::OUString& i_rNodePath, const bool i_bUpdatable ) + OConfigurationTreeRoot::OConfigurationTreeRoot( const Reference<XComponentContext> & i_rContext, const OUString& i_rNodePath, const bool i_bUpdatable ) :OConfigurationNode( lcl_createConfigurationRoot( lcl_getConfigProvider( i_rContext ), i_rNodePath, i_bUpdatable, -1, false ).get() ) ,m_xCommitter() @@ -576,7 +576,7 @@ namespace utl } //------------------------------------------------------------------------ - OConfigurationTreeRoot OConfigurationTreeRoot::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, const ::rtl::OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, sal_Bool _bLazyWrite) + OConfigurationTreeRoot OConfigurationTreeRoot::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, sal_Bool _bLazyWrite) { Reference< XInterface > xRoot( lcl_createConfigurationRoot( _rxConfProvider, _rPath, _eMode != CM_READONLY, _nDepth, _bLazyWrite ) ); @@ -586,14 +586,14 @@ namespace utl } //------------------------------------------------------------------------ - OConfigurationTreeRoot OConfigurationTreeRoot::createWithComponentContext( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, sal_Bool _bLazyWrite ) + OConfigurationTreeRoot OConfigurationTreeRoot::createWithComponentContext( const Reference< XComponentContext >& _rxContext, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, sal_Bool _bLazyWrite ) { return createWithProvider( lcl_getConfigProvider( _rxContext ), _rPath, _nDepth, _eMode, _bLazyWrite ); } //------------------------------------------------------------------------ OConfigurationTreeRoot OConfigurationTreeRoot::tryCreateWithComponentContext( const Reference< XComponentContext >& rxContext, - const ::rtl::OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode , sal_Bool _bLazyWrite ) + const OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode , sal_Bool _bLazyWrite ) { OSL_ENSURE( rxContext.is(), "OConfigurationTreeRoot::tryCreateWithComponentContext: invalid XComponentContext!" ); try diff --git a/unotools/source/config/configpaths.cxx b/unotools/source/config/configpaths.cxx index 53f6d1c9a458..7ff97d403f60 100644 --- a/unotools/source/config/configpaths.cxx +++ b/unotools/source/config/configpaths.cxx @@ -28,8 +28,6 @@ namespace utl { //---------------------------------------------------------------------------- - using ::rtl::OUString; - using ::rtl::OUStringBuffer; //---------------------------------------------------------------------------- @@ -253,7 +251,7 @@ OUString lcl_wrapName(const OUString& _sContent, const OUString& _sType) if (pBeginContent == pEndContent) return _sType; - rtl::OUStringBuffer aNormalized(_sType.getLength() + _sContent.getLength() + 4); // reserve approximate size initially + OUStringBuffer aNormalized(_sType.getLength() + _sContent.getLength() + 4); // reserve approximate size initially // prefix: type, opening bracket and quote aNormalized.append( _sType ).append( "['" ); diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index d41083b6cd21..4ec5810f24eb 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.cxx @@ -50,18 +50,18 @@ namespace utl struct NodeValueAccessor { private: - ::rtl::OUString sRelativePath; // the relative path of the node + OUString sRelativePath; // the relative path of the node LocationType eLocationType; // the type of location where the value is stored void* pLocation; // the pointer to the location Type aDataType; // the type object pointed to by pLocation public: - NodeValueAccessor( const ::rtl::OUString& _rNodePath ); + NodeValueAccessor( const OUString& _rNodePath ); void bind( void* _pLocation, const Type& _rType ); bool isBound( ) const { return ( ltUnbound != eLocationType ) && ( NULL != pLocation ); } - const ::rtl::OUString& getPath( ) const { return sRelativePath; } + const OUString& getPath( ) const { return sRelativePath; } LocationType getLocType( ) const { return eLocationType; } void* getLocation( ) const { return pLocation; } const Type& getDataType( ) const { return aDataType; } @@ -70,7 +70,7 @@ namespace utl bool operator != ( const NodeValueAccessor& rhs ) const { return !operator == ( rhs ); } }; - NodeValueAccessor::NodeValueAccessor( const ::rtl::OUString& _rNodePath ) + NodeValueAccessor::NodeValueAccessor( const OUString& _rNodePath ) :sRelativePath( _rNodePath ) ,eLocationType( ltUnbound ) ,pLocation( NULL ) @@ -117,9 +117,9 @@ namespace utl (uno_QueryInterfaceFunc)cpp_queryInterface, (uno_AcquireFunc)cpp_acquire, (uno_ReleaseFunc)cpp_release ); #ifdef DBG_UTIL - rtl::OStringBuffer aBuf( 256 ); + OStringBuffer aBuf( 256 ); aBuf.append("::utl::lcl_copyData( Accessor, Any ): could not assign the data (node path: "); - aBuf.append( rtl::OUStringToOString( _rAccessor.getPath(), RTL_TEXTENCODING_ASCII_US ) ); + aBuf.append( OUStringToOString( _rAccessor.getPath(), RTL_TEXTENCODING_ASCII_US ) ); aBuf.append( " !" ); DBG_ASSERT( bSuccess, aBuf.getStr() ); #endif @@ -234,7 +234,7 @@ namespace utl const sal_Char* _pConfigLocation, const sal_uInt16 _nAccessFlags, const sal_Int32 _nLevels ) :m_pImpl( new OConfigurationValueContainerImpl( _rxORB, _rAccessSafety ) ) { - implConstruct( ::rtl::OUString::createFromAscii( _pConfigLocation ), _nAccessFlags, _nLevels ); + implConstruct( OUString::createFromAscii( _pConfigLocation ), _nAccessFlags, _nLevels ); } OConfigurationValueContainer::~OConfigurationValueContainer() @@ -242,7 +242,7 @@ namespace utl delete m_pImpl; } - void OConfigurationValueContainer::implConstruct( const ::rtl::OUString& _rConfigLocation, + void OConfigurationValueContainer::implConstruct( const OUString& _rConfigLocation, const sal_uInt16 _nAccessFlags, const sal_Int32 _nLevels ) { DBG_ASSERT( !m_pImpl->aConfigRoot.isValid(), "OConfigurationValueContainer::implConstruct: already initialized!" ); @@ -257,9 +257,9 @@ namespace utl ( _nAccessFlags & CVC_IMMEDIATE_UPDATE ) ? sal_False : sal_True ); #ifdef DBG_UTIL - rtl::OStringBuffer aBuf(256); + OStringBuffer aBuf(256); aBuf.append("Could not access the configuration node located at "); - aBuf.append( rtl::OUStringToOString( _rConfigLocation, RTL_TEXTENCODING_ASCII_US ) ); + aBuf.append( OUStringToOString( _rConfigLocation, RTL_TEXTENCODING_ASCII_US ) ); aBuf.append( " !" ); DBG_ASSERT( m_pImpl->aConfigRoot.isValid(), aBuf.getStr() ); #endif @@ -281,7 +281,7 @@ namespace utl "OConfigurationValueContainer::registerExchangeLocation: invalid type!" ); // build an accessor for this container - NodeValueAccessor aNewAccessor( ::rtl::OUString::createFromAscii( _pRelativePath ) ); + NodeValueAccessor aNewAccessor( OUString::createFromAscii( _pRelativePath ) ); aNewAccessor.bind( _pContainer, _rValueType ); // insert it into our structure diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx index f1c11964b06b..b31176cd6ed0 100644 --- a/unotools/source/config/defaultoptions.cxx +++ b/unotools/source/config/defaultoptions.cxx @@ -36,7 +36,6 @@ using namespace osl; using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; // define ---------------------------------------------------------------- @@ -95,7 +94,7 @@ public: String GetDefaultPath( sal_uInt16 nId ) const; virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); }; // global ---------------------------------------------------------------- @@ -174,7 +173,7 @@ Sequence< OUString > GetDefaultPropertyNames() return aNames; } -void SvtDefaultOptions_Impl::Notify( const Sequence< rtl::OUString >& ) +void SvtDefaultOptions_Impl::Notify( const Sequence< OUString >& ) { // no notification, will never be changed } @@ -188,7 +187,7 @@ void SvtDefaultOptions_Impl::Commit() String SvtDefaultOptions_Impl::GetDefaultPath( sal_uInt16 nId ) const { - rtl::OUString aRet; + OUString aRet; sal_uInt16 nIdx = 0; while ( PathMap_Impl[nIdx]._ePath <= SvtPathOptions::PATH_WORK ) @@ -202,7 +201,7 @@ String SvtDefaultOptions_Impl::GetDefaultPath( sal_uInt16 nId ) const nId == SvtPathOptions::PATH_MODULE || nId == SvtPathOptions::PATH_PLUGIN ) { - rtl::OUString aTmp; + OUString aTmp; ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aRet, aTmp ); aRet = aTmp; } diff --git a/unotools/source/config/docinfohelper.cxx b/unotools/source/config/docinfohelper.cxx index 91c9569c1b4c..f9d5976dece6 100644 --- a/unotools/source/config/docinfohelper.cxx +++ b/unotools/source/config/docinfohelper.cxx @@ -28,15 +28,15 @@ using namespace ::com::sun::star; namespace utl { -::rtl::OUString DocInfoHelper::GetGeneratorString() +OUString DocInfoHelper::GetGeneratorString() { - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; // First product: branded name + version // version is <product_versions>_<product_extension>$<platform> // plain product name - rtl::OUString aValue( utl::ConfigManager::getProductName() ); + OUString aValue( utl::ConfigManager::getProductName() ); if ( !aValue.isEmpty() ) { aResult.append( aValue.replace( ' ', '_' ) ); @@ -54,8 +54,8 @@ namespace utl } } - ::rtl::OUString os( "$_OS" ); - ::rtl::OUString arch( "$_ARCH" ); + OUString os( "$_OS" ); + OUString arch( "$_ARCH" ); ::rtl::Bootstrap::expandMacros(os); ::rtl::Bootstrap::expandMacros(arch); aResult.append( (sal_Unicode)'$' ); @@ -70,8 +70,8 @@ namespace utl // and ':' replaced by '-' { aResult.appendAscii( "LibreOffice_project/" ); - ::rtl::OUString aDefault; - ::rtl::OUString aBuildId( Bootstrap::getBuildIdData( aDefault ) ); + OUString aDefault; + OUString aBuildId( Bootstrap::getBuildIdData( aDefault ) ); for( sal_Int32 i=0; i < aBuildId.getLength(); i++ ) { sal_Unicode c = aBuildId[i]; diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 47896c5fe7e7..ed18ff1a2074 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -132,12 +132,12 @@ GlobalEventConfig_Impl::~GlobalEventConfig_Impl() } } -::rtl::OUString GlobalEventConfig_Impl::GetEventName( sal_Int32 nIndex ) +OUString GlobalEventConfig_Impl::GetEventName( sal_Int32 nIndex ) { if ( nIndex < (sal_Int32) m_supportedEvents.size() ) return m_supportedEvents[nIndex]; else - return rtl::OUString(); + return OUString(); } //***************************************************************************************************************** @@ -183,7 +183,7 @@ void GlobalEventConfig_Impl::Commit() if(it->second.isEmpty() ) continue; sNode = sPrefix + it->first + sPostfix; - OSL_TRACE("writing binding for: %s",::rtl::OUStringToOString(sNode , RTL_TEXTENCODING_ASCII_US ).pData->buffer); + OSL_TRACE("writing binding for: %s",OUStringToOString(sNode , RTL_TEXTENCODING_ASCII_US ).pData->buffer); seqValues[ 0 ].Name = sNode; seqValues[ 0 ].Value <<= it->second; //write the data to the registry @@ -214,7 +214,7 @@ void GlobalEventConfig_Impl::initBindingInfo() aBuffer.append( lEventNames[i] ); aBuffer.append( aCommandKey ); lMacros[0] = aBuffer.makeStringAndClear(); - OSL_TRACE("reading binding for: %s",::rtl::OUStringToOString(lMacros[0] , RTL_TEXTENCODING_ASCII_US ).pData->buffer); + OSL_TRACE("reading binding for: %s",OUStringToOString(lMacros[0] , RTL_TEXTENCODING_ASCII_US ).pData->buffer); Sequence< Any > lValues = GetProperties( lMacros ); OUString sMacroURL; if( lValues.getLength() > 0 ) @@ -280,8 +280,8 @@ Any SAL_CALL GlobalEventConfig_Impl::getByName( const OUString& aName ) throw (c Sequence< OUString > SAL_CALL GlobalEventConfig_Impl::getElementNames( ) throw (RuntimeException) { - const ::rtl::OUString* pRet = m_supportedEvents.empty() ? NULL : &m_supportedEvents[0]; - return uno::Sequence< ::rtl::OUString >(pRet, m_supportedEvents.size()); + const OUString* pRet = m_supportedEvents.empty() ? NULL : &m_supportedEvents[0]; + return uno::Sequence< OUString >(pRet, m_supportedEvents.size()); } sal_Bool SAL_CALL GlobalEventConfig_Impl::hasByName( const OUString& aName ) throw (RuntimeException) @@ -393,7 +393,7 @@ Mutex& GlobalEventConfig::GetOwnStaticMutex() return theGlobalEventConfigMutex::get(); } -::rtl::OUString GlobalEventConfig::GetEventName( sal_Int32 nIndex ) +OUString GlobalEventConfig::GetEventName( sal_Int32 nIndex ) { return GlobalEventConfig().m_pImpl->GetEventName( nIndex ); } diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index 4893baa7d82b..72e216dba7e8 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -56,10 +56,10 @@ struct OUStringHashCode } }; -class ExtensionHashMap : public ::boost::unordered_map< ::rtl::OUString, +class ExtensionHashMap : public ::boost::unordered_map< OUString, sal_Int32, OUStringHashCode, - ::std::equal_to< ::rtl::OUString > > + ::std::equal_to< OUString > > { public: inline void free() diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index 4a2369fc7da3..1f99d48fe723 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -61,7 +61,7 @@ public: bSaveVBA(sal_False) {} ~SvtAppFilterOptions_Impl(); virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); void Load(); sal_Bool IsLoad() const {return bLoadVBA;} @@ -102,7 +102,7 @@ void SvtAppFilterOptions_Impl::Commit() PutProperties(aNames, aValues); } -void SvtAppFilterOptions_Impl::Notify( const Sequence< rtl::OUString >& ) +void SvtAppFilterOptions_Impl::Notify( const Sequence< OUString >& ) { // no listeners supported yet } diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 223e42ec533a..9da6e05c0d67 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -46,7 +46,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::container; using namespace com::sun::star::configuration; -using ::rtl::OUString; /* * DefaultFontConfiguration @@ -285,7 +284,7 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const Locale& rLocale ) const sal_Unicode aSunGulim[] = { 0xC36C, 0xAD74, 0xB9BC, 0 }; const sal_Unicode aBaekmukGulim[] = { 0xBC31, 0xBC35, 0xAD74, 0xB9BC, 0 }; - rtl::OUStringBuffer aFallBackKoreanLocalized; + OUStringBuffer aFallBackKoreanLocalized; aFallBackKoreanLocalized.append(aSunGulim); aFallBackKoreanLocalized.append(';'); aFallBackKoreanLocalized.append(aBaekmukGulim); @@ -319,7 +318,7 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const Locale& rLocale ) const sal_Unicode aLXGothic[] = { 0x004C, 0x0058, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 }; const sal_Unicode aKochiGothic[] = { 0x6771, 0x98A8, 0x30B4, 0x30B7, 0x30C3, 0x30AF, 0 }; - rtl::OUStringBuffer aFallBackJapaneseLocalized; + OUStringBuffer aFallBackJapaneseLocalized; aFallBackJapaneseLocalized.append("MS UI Gothic;"); aFallBackJapaneseLocalized.append(FALLBACKFONT_UI_SANS_JAPANESE1); aFallBackJapaneseLocalized.append(aMSPGothic); @@ -337,7 +336,7 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const Locale& rLocale ) return aFallBackJapaneseLocalized.makeStringAndClear(); } - return rtl::OUString(FALLBACKFONT_UI_SANS); + return OUString(FALLBACKFONT_UI_SANS); } // ------------------------------------------------------------------------------------ @@ -910,7 +909,7 @@ static const enum_convert pWidthNames[] = }; void FontSubstConfiguration::fillSubstVector( const com::sun::star::uno::Reference< XNameAccess > xFont, - const rtl::OUString& rType, + const OUString& rType, std::vector< String >& rSubstVector ) const { try @@ -959,7 +958,7 @@ void FontSubstConfiguration::fillSubstVector( const com::sun::star::uno::Referen } FontWeight FontSubstConfiguration::getSubstWeight( const com::sun::star::uno::Reference< XNameAccess > xFont, - const rtl::OUString& rType ) const + const OUString& rType ) const { int weight = -1; try @@ -991,7 +990,7 @@ FontWeight FontSubstConfiguration::getSubstWeight( const com::sun::star::uno::Re } FontWidth FontSubstConfiguration::getSubstWidth( const com::sun::star::uno::Reference< XNameAccess > xFont, - const rtl::OUString& rType ) const + const OUString& rType ) const { int width = -1; try @@ -1023,7 +1022,7 @@ FontWidth FontSubstConfiguration::getSubstWidth( const com::sun::star::uno::Refe } unsigned long FontSubstConfiguration::getSubstType( const com::sun::star::uno::Reference< XNameAccess > xFont, - const rtl::OUString& rType ) const + const OUString& rType ) const { unsigned long type = 0; try diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 1b19d3e5eb48..f2362b36379c 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -132,14 +132,14 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl() m_xCfg = Reference< css::container::XNameAccess > ( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - rtl::OUString(s_sHistories), + OUString(s_sHistories), ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY ); m_xCommonXCU = Reference< css::container::XNameAccess > ( ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - rtl::OUString(s_sCommonHistory), + OUString(s_sCommonHistory), ::comphelper::ConfigurationHelper::E_STANDARD), css::uno::UNO_QUERY ); } @@ -177,15 +177,15 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory ) switch( eHistory ) { case ePICKLIST: - xListAccess->getPropertyValue(rtl::OUString(s_sPickListSize)) >>= nSize; + xListAccess->getPropertyValue(OUString(s_sPickListSize)) >>= nSize; break; case eHISTORY: - xListAccess->getPropertyValue(rtl::OUString(s_sURLHistorySize)) >>= nSize; + xListAccess->getPropertyValue(OUString(s_sURLHistorySize)) >>= nSize; break; case eHELPBOOKMARKS: - xListAccess->getPropertyValue(rtl::OUString(s_sHelpBookmarksSize)) >>= nSize; + xListAccess->getPropertyValue(OUString(s_sHelpBookmarksSize)) >>= nSize; break; default: @@ -213,15 +213,15 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt switch( eHistory ) { case ePICKLIST: - m_xCfg->getByName(rtl::OUString(s_sPickList)) >>= xList; + m_xCfg->getByName(OUString(s_sPickList)) >>= xList; break; case eHISTORY: - m_xCfg->getByName(rtl::OUString(s_sURLHistory)) >>= xList; + m_xCfg->getByName(OUString(s_sURLHistory)) >>= xList; break; case eHELPBOOKMARKS: - m_xCfg->getByName(rtl::OUString(s_sHelpBookmarks)) >>= xList; + m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xList; break; default: @@ -233,18 +233,18 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt if ( ! xList.is()) return; - xList->getByName(rtl::OUString(s_sOrderList)) >>= xOrderList; - xList->getByName(rtl::OUString(s_sItemList)) >>= xItemList; + xList->getByName(OUString(s_sOrderList)) >>= xOrderList; + xList->getByName(OUString(s_sItemList)) >>= xItemList; const sal_uInt32 nLength = xOrderList->getElementNames().getLength(); if (nSize < nLength) { for (sal_uInt32 i=nLength-1; i>=nSize; --i) { - ::rtl::OUString sTmp; - const ::rtl::OUString sRemove = ::rtl::OUString::valueOf((sal_Int32)i); + OUString sTmp; + const OUString sRemove = OUString::valueOf((sal_Int32)i); xOrderList->getByName(sRemove) >>= xSet; - xSet->getPropertyValue(rtl::OUString(s_sHistoryItemRef)) >>= sTmp; + xSet->getPropertyValue(OUString(s_sHistoryItemRef)) >>= sTmp; xItemList->removeByName(sTmp); xOrderList->removeByName(sRemove); } @@ -266,7 +266,7 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory ) { css::uno::Reference< css::container::XNameAccess > xListAccess; css::uno::Reference< css::container::XNameContainer > xNode; - Sequence< ::rtl::OUString > lOrders; + Sequence< OUString > lOrders; try { @@ -274,19 +274,19 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory ) { case ePICKLIST: { - m_xCfg->getByName(rtl::OUString(s_sPickList)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sPickList)) >>= xListAccess; break; } case eHISTORY: { - m_xCfg->getByName(rtl::OUString(s_sURLHistory)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sURLHistory)) >>= xListAccess; break; } case eHELPBOOKMARKS: { - m_xCfg->getByName(rtl::OUString(s_sHelpBookmarks)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess; break; } @@ -297,14 +297,14 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory ) if (xListAccess.is()) { // clear ItemList - xListAccess->getByName(rtl::OUString(s_sItemList)) >>= xNode ; + xListAccess->getByName(OUString(s_sItemList)) >>= xNode ; lOrders = xNode->getElementNames(); const sal_Int32 nLength = lOrders.getLength(); for(sal_Int32 i=0; i<nLength; ++i) xNode->removeByName(lOrders[i]); // clear OrderList - xListAccess->getByName(rtl::OUString(s_sOrderList)) >>= xNode ; + xListAccess->getByName(OUString(s_sOrderList)) >>= xNode ; lOrders = xNode->getElementNames(); for(sal_Int32 j=0; j<nLength; ++j) xNode->removeByName(lOrders[j]); @@ -328,7 +328,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT Sequence< Sequence< PropertyValue > > seqReturn; // Set default return value. Sequence< PropertyValue > seqProperties( 4 ); - Sequence< ::rtl::OUString > lOrders; + Sequence< OUString > lOrders; css::uno::Reference< css::container::XNameAccess > xListAccess; css::uno::Reference< css::container::XNameAccess > xItemList; @@ -346,19 +346,19 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT { case ePICKLIST: { - m_xCfg->getByName(rtl::OUString(s_sPickList)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sPickList)) >>= xListAccess; break; } case eHISTORY: { - m_xCfg->getByName(rtl::OUString(s_sURLHistory)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sURLHistory)) >>= xListAccess; break; } case eHELPBOOKMARKS: { - m_xCfg->getByName(rtl::OUString(s_sHelpBookmarks)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess; break; } @@ -368,8 +368,8 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT if (xListAccess.is()) { - xListAccess->getByName(rtl::OUString(s_sItemList)) >>= xItemList; - xListAccess->getByName(rtl::OUString(s_sOrderList)) >>= xOrderList; + xListAccess->getByName(OUString(s_sItemList)) >>= xItemList; + xListAccess->getByName(OUString(s_sOrderList)) >>= xOrderList; const sal_Int32 nLength = xOrderList->getElementNames().getLength(); Sequence< Sequence< PropertyValue > > aRet(nLength); @@ -379,15 +379,15 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT { try { - ::rtl::OUString sUrl; - xOrderList->getByName(::rtl::OUString::valueOf(nItem)) >>= xSet; - xSet->getPropertyValue(rtl::OUString(s_sHistoryItemRef)) >>= sUrl; + OUString sUrl; + xOrderList->getByName(OUString::valueOf(nItem)) >>= xSet; + xSet->getPropertyValue(OUString(s_sHistoryItemRef)) >>= sUrl; xItemList->getByName(sUrl) >>= xSet; seqProperties[s_nOffsetURL ].Value <<= sUrl; - xSet->getPropertyValue(rtl::OUString(s_sFilter)) >>= seqProperties[s_nOffsetFilter ].Value; - xSet->getPropertyValue(rtl::OUString(s_sTitle)) >>= seqProperties[s_nOffsetTitle ].Value; - xSet->getPropertyValue(rtl::OUString(s_sPassword)) >>= seqProperties[s_nOffsetPassword ].Value; + xSet->getPropertyValue(OUString(s_sFilter)) >>= seqProperties[s_nOffsetFilter ].Value; + xSet->getPropertyValue(OUString(s_sTitle)) >>= seqProperties[s_nOffsetTitle ].Value; + xSet->getPropertyValue(OUString(s_sPassword)) >>= seqProperties[s_nOffsetPassword ].Value; aRet[nCount++] = seqProperties; } catch(const css::uno::Exception& ex) @@ -434,19 +434,19 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory , { case ePICKLIST: { - m_xCfg->getByName(rtl::OUString(s_sPickList)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sPickList)) >>= xListAccess; nMaxSize = GetSize(ePICKLIST); } break; case eHISTORY: { - m_xCfg->getByName(rtl::OUString(s_sURLHistory)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sURLHistory)) >>= xListAccess; nMaxSize = GetSize(eHISTORY); } break; case eHELPBOOKMARKS: { - m_xCfg->getByName(rtl::OUString(s_sHelpBookmarks)) >>= xListAccess; + m_xCfg->getByName(OUString(s_sHelpBookmarks)) >>= xListAccess; nMaxSize = GetSize(eHELPBOOKMARKS); } break; @@ -463,37 +463,37 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory , try { - xListAccess->getByName(rtl::OUString(s_sItemList)) >>= xItemList; - xListAccess->getByName(rtl::OUString(s_sOrderList)) >>= xOrderList; + xListAccess->getByName(OUString(s_sItemList)) >>= xItemList; + xListAccess->getByName(OUString(s_sOrderList)) >>= xOrderList; sal_Int32 nLength = xOrderList->getElementNames().getLength(); - rtl::OUString sHistoryItemRef(s_sHistoryItemRef); + OUString sHistoryItemRef(s_sHistoryItemRef); // The item to be appended is already existing! if (xItemList->hasByName(sURL)) { for (sal_Int32 i=0; i<nLength; ++i) { - ::rtl::OUString sTmp; - xOrderList->getByName(::rtl::OUString::valueOf(i)) >>= xSet; + OUString sTmp; + xOrderList->getByName(OUString::valueOf(i)) >>= xSet; xSet->getPropertyValue(sHistoryItemRef) >>= sTmp; if(sURL == sTmp) { - ::rtl::OUString sFind; - xOrderList->getByName( ::rtl::OUString::valueOf(i) ) >>= xSet; + OUString sFind; + xOrderList->getByName( OUString::valueOf(i) ) >>= xSet; xSet->getPropertyValue(sHistoryItemRef) >>= sFind; for (sal_Int32 j=i-1; j>=0; --j) { css::uno::Reference< css::beans::XPropertySet > xPrevSet; css::uno::Reference< css::beans::XPropertySet > xNextSet; - xOrderList->getByName( ::rtl::OUString::valueOf(j+1) ) >>= xPrevSet; - xOrderList->getByName( ::rtl::OUString::valueOf(j) ) >>= xNextSet; + xOrderList->getByName( OUString::valueOf(j+1) ) >>= xPrevSet; + xOrderList->getByName( OUString::valueOf(j) ) >>= xNextSet; - ::rtl::OUString sTemp; + OUString sTemp; xNextSet->getPropertyValue(sHistoryItemRef) >>= sTemp; xPrevSet->setPropertyValue(sHistoryItemRef, css::uno::makeAny(sTemp)); } - xOrderList->getByName( ::rtl::OUString::valueOf((sal_Int32)0) ) >>= xSet; + xOrderList->getByName( OUString::valueOf((sal_Int32)0) ) >>= xSet; xSet->setPropertyValue(sHistoryItemRef, css::uno::makeAny(sFind)); ::comphelper::ConfigurationHelper::flush(m_xCfg); @@ -513,8 +513,8 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory , // Append new item to OrderList. if ( nLength == nMaxSize ) { - ::rtl::OUString sRemove; - xOrderList->getByName(::rtl::OUString::valueOf(nLength-1)) >>= xSet; + OUString sRemove; + xOrderList->getByName(OUString::valueOf(nLength-1)) >>= xSet; xSet->getPropertyValue(sHistoryItemRef) >>= sRemove; try { @@ -538,18 +538,18 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory , { xFac = css::uno::Reference< css::lang::XSingleServiceFactory >(xOrderList, css::uno::UNO_QUERY); xInst = xFac->createInstance(); - ::rtl::OUString sPush = ::rtl::OUString::valueOf(nLength++); + OUString sPush = OUString::valueOf(nLength++); xOrderList->insertByName(sPush, css::uno::makeAny(xInst)); } for (sal_Int32 j=nLength-1; j>0; --j) { - xOrderList->getByName( ::rtl::OUString::valueOf(j) ) >>= xPrevSet; - xOrderList->getByName( ::rtl::OUString::valueOf(j-1) ) >>= xNextSet; - ::rtl::OUString sTemp; + xOrderList->getByName( OUString::valueOf(j) ) >>= xPrevSet; + xOrderList->getByName( OUString::valueOf(j-1) ) >>= xNextSet; + OUString sTemp; xNextSet->getPropertyValue(sHistoryItemRef) >>= sTemp; xPrevSet->setPropertyValue(sHistoryItemRef, css::uno::makeAny(sTemp)); } - xOrderList->getByName( ::rtl::OUString::valueOf((sal_Int32)0) ) >>= xSet; + xOrderList->getByName( OUString::valueOf((sal_Int32)0) ) >>= xSet; xSet->setPropertyValue(sHistoryItemRef, css::uno::makeAny(sURL)); // Append the item to ItemList. @@ -557,9 +557,9 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory , xInst = xFac->createInstance(); xItemList->insertByName(sURL, css::uno::makeAny(xInst)); xSet = css::uno::Reference< css::beans::XPropertySet >(xInst, css::uno::UNO_QUERY); - xSet->setPropertyValue(rtl::OUString(s_sFilter), css::uno::makeAny(sFilter)); - xSet->setPropertyValue(rtl::OUString(s_sTitle), css::uno::makeAny(sTitle)); - xSet->setPropertyValue(rtl::OUString(s_sPassword), css::uno::makeAny(sPassword)); + xSet->setPropertyValue(OUString(s_sFilter), css::uno::makeAny(sFilter)); + xSet->setPropertyValue(OUString(s_sTitle), css::uno::makeAny(sTitle)); + xSet->setPropertyValue(OUString(s_sPassword), css::uno::makeAny(sPassword)); ::comphelper::ConfigurationHelper::flush(m_xCfg); } diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index 8220c48ed28e..8abbb38e84e4 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -68,8 +68,8 @@ ItemHolder1::ItemHolder1() if(bMessage) { bMessage = sal_False; - ::rtl::OString sMsg("CreateInstance with arguments exception: "); - sMsg += ::rtl::OString(rEx.Message.getStr(), + OString sMsg("CreateInstance with arguments exception: "); + sMsg += OString(rEx.Message.getStr(), rEx.Message.getLength(), RTL_TEXTENCODING_ASCII_US); OSL_FAIL(sMsg.getStr()); @@ -221,19 +221,19 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem) break; case E_VIEWOPTIONS_DIALOG : - rItem.pItem = new SvtViewOptions(E_DIALOG, ::rtl::OUString()); + rItem.pItem = new SvtViewOptions(E_DIALOG, OUString()); break; case E_VIEWOPTIONS_TABDIALOG : - rItem.pItem = new SvtViewOptions(E_TABDIALOG, ::rtl::OUString()); + rItem.pItem = new SvtViewOptions(E_TABDIALOG, OUString()); break; case E_VIEWOPTIONS_TABPAGE : - rItem.pItem = new SvtViewOptions(E_TABPAGE, ::rtl::OUString()); + rItem.pItem = new SvtViewOptions(E_TABPAGE, OUString()); break; case E_VIEWOPTIONS_WINDOW : - rItem.pItem = new SvtViewOptions(E_WINDOW, ::rtl::OUString()); + rItem.pItem = new SvtViewOptions(E_WINDOW, OUString()); break; case E_USEROPTIONS : diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 24d8b196a9f8..484869e7de36 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -42,7 +42,6 @@ using namespace com::sun::star; -using ::rtl::OUString; using ::rtl::Uri; #define EXPAND_PROTOCOL "vnd.sun.star.expand:" @@ -152,7 +151,7 @@ public: virtual ~SvtLinguConfigItem(); // utl::ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ); virtual void Commit(); // make some protected functions of utl::ConfigItem public @@ -165,24 +164,24 @@ public: com::sun::star::uno::Any - GetProperty( const rtl::OUString &rPropertyName ) const; + GetProperty( const OUString &rPropertyName ) const; com::sun::star::uno::Any GetProperty( sal_Int32 nPropertyHandle ) const; - sal_Bool SetProperty( const rtl::OUString &rPropertyName, + sal_Bool SetProperty( const OUString &rPropertyName, const com::sun::star::uno::Any &rValue ); sal_Bool SetProperty( sal_Int32 nPropertyHandle, const com::sun::star::uno::Any &rValue ); const SvtLinguOptions& GetOptions() const; - sal_Bool IsReadOnly( const rtl::OUString &rPropertyName ) const; + sal_Bool IsReadOnly( const OUString &rPropertyName ) const; sal_Bool IsReadOnly( sal_Int32 nPropertyHandle ) const; }; SvtLinguConfigItem::SvtLinguConfigItem() : - utl::ConfigItem( rtl::OUString("Office.Linguistic") ) + utl::ConfigItem( OUString("Office.Linguistic") ) { const uno::Sequence< OUString > &rPropertyNames = GetPropertyNames(); LoadOptions( rPropertyNames ); @@ -274,7 +273,7 @@ const uno::Sequence< OUString > SvtLinguConfigItem::GetPropertyNames() { const sal_Char *pFullPropName = aNamesToHdl[i].pFullPropName; if (pFullPropName) - pNames[ nIdx++ ] = ::rtl::OUString::createFromAscii( pFullPropName ); + pNames[ nIdx++ ] = OUString::createFromAscii( pFullPropName ); } aNames.realloc( nIdx ); @@ -738,7 +737,7 @@ sal_Bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProp return bRet; } -sal_Bool SvtLinguConfigItem::IsReadOnly( const rtl::OUString &rPropertyName ) const +sal_Bool SvtLinguConfigItem::IsReadOnly( const OUString &rPropertyName ) const { osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); @@ -882,14 +881,14 @@ sal_Bool SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const return sal_True; } -sal_Bool SvtLinguConfig::IsReadOnly( const rtl::OUString &rPropertyName ) const +sal_Bool SvtLinguConfig::IsReadOnly( const OUString &rPropertyName ) const { return GetConfigItem().IsReadOnly( rPropertyName ); } sal_Bool SvtLinguConfig::GetElementNamesFor( - const rtl::OUString &rNodeName, - uno::Sequence< rtl::OUString > &rElementNames ) const + const OUString &rNodeName, + uno::Sequence< OUString > &rElementNames ) const { bool bSuccess = false; try @@ -907,9 +906,9 @@ sal_Bool SvtLinguConfig::GetElementNamesFor( } sal_Bool SvtLinguConfig::GetSupportedDictionaryFormatsFor( - const rtl::OUString &rSetName, - const rtl::OUString &rSetEntry, - uno::Sequence< rtl::OUString > &rFormatList ) const + const OUString &rSetName, + const OUString &rSetEntry, + uno::Sequence< OUString > &rFormatList ) const { if (rSetName.isEmpty() || rSetEntry.isEmpty()) return sal_False; @@ -972,7 +971,7 @@ static bool lcl_GetFileUrlFromOrigin( sal_Bool SvtLinguConfig::GetDictionaryEntry( - const rtl::OUString &rNodeName, + const OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const { if (rNodeName.isEmpty()) @@ -1002,7 +1001,7 @@ sal_Bool SvtLinguConfig::GetDictionaryEntry( // get file URL's for the locations for (sal_Int32 i = 0; i < aLocations.getLength(); ++i) { - rtl::OUString &rLocation = aLocations[i]; + OUString &rLocation = aLocations[i]; if (!lcl_GetFileUrlFromOrigin( rLocation, rLocation )) bSuccess = false; } @@ -1022,9 +1021,9 @@ sal_Bool SvtLinguConfig::GetDictionaryEntry( return bSuccess; } -uno::Sequence< rtl::OUString > SvtLinguConfig::GetDisabledDictionaries() const +uno::Sequence< OUString > SvtLinguConfig::GetDisabledDictionaries() const { - uno::Sequence< rtl::OUString > aResult; + uno::Sequence< OUString > aResult; try { uno::Reference< container::XNameAccess > xNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW ); @@ -1046,10 +1045,10 @@ std::vector< SvtLinguConfigDictionaryEntry > SvtLinguConfig::GetActiveDictionari try { - uno::Sequence< rtl::OUString > aElementNames; - GetElementNamesFor( rtl::OUString(aG_Dictionaries), aElementNames ); + uno::Sequence< OUString > aElementNames; + GetElementNamesFor( OUString(aG_Dictionaries), aElementNames ); sal_Int32 nLen = aElementNames.getLength(); - const rtl::OUString *pElementNames = aElementNames.getConstArray(); + const OUString *pElementNames = aElementNames.getConstArray(); SvtLinguConfigDictionaryEntry aDicEntry; for (sal_Int32 i = 0; i < nLen; ++i) @@ -1060,7 +1059,7 @@ std::vector< SvtLinguConfigDictionaryEntry > SvtLinguConfig::GetActiveDictionari { // check if it is active or not bool bDicIsActive = true; - const uno::Sequence< rtl::OUString > aDisabledDics( GetDisabledDictionaries() ); + const uno::Sequence< OUString > aDisabledDics( GetDisabledDictionaries() ); for (sal_Int32 k = 0; bDicIsActive && k < aDisabledDics.getLength(); ++k) { if (aDisabledDics[k] == pElementNames[i]) @@ -1119,11 +1118,11 @@ uno::Reference< util::XChangesBatch > SvtLinguConfig::GetMainUpdateAccess() cons } -rtl::OUString SvtLinguConfig::GetVendorImageUrl_Impl( - const rtl::OUString &rServiceImplName, - const rtl::OUString &rImageName ) const +OUString SvtLinguConfig::GetVendorImageUrl_Impl( + const OUString &rServiceImplName, + const OUString &rImageName ) const { - rtl::OUString aRes; + OUString aRes; try { uno::Reference< container::XNameAccess > xImagesNA( GetMainUpdateAccess(), uno::UNO_QUERY_THROW ); @@ -1132,14 +1131,14 @@ rtl::OUString SvtLinguConfig::GetVendorImageUrl_Impl( uno::Reference< container::XNameAccess > xNA( xImagesNA->getByName(OUString("ServiceNameEntries")), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName( rServiceImplName ), uno::UNO_QUERY_THROW ); uno::Any aAny(xNA->getByName(OUString("VendorImagesNode"))); - rtl::OUString aVendorImagesNode; + OUString aVendorImagesNode; if (aAny >>= aVendorImagesNode) { xNA = xImagesNA; xNA.set( xNA->getByName(OUString("VendorImages")), uno::UNO_QUERY_THROW ); xNA.set( xNA->getByName( aVendorImagesNode ), uno::UNO_QUERY_THROW ); aAny = xNA->getByName( rImageName ); - rtl::OUString aTmp; + OUString aTmp; if (aAny >>= aTmp) { if (lcl_GetFileUrlFromOrigin( aTmp, aTmp )) @@ -1155,11 +1154,11 @@ rtl::OUString SvtLinguConfig::GetVendorImageUrl_Impl( } -rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage( - const rtl::OUString &rServiceImplName +OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage( + const OUString &rServiceImplName ) const { - rtl::OUString aRes; + OUString aRes; if (!rServiceImplName.isEmpty()) { OUString aImageName( "SpellAndGrammarContextMenuSuggestionImage" ); @@ -1170,11 +1169,11 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextSuggestionImage( } -rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( - const rtl::OUString &rServiceImplName +OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( + const OUString &rServiceImplName ) const { - rtl::OUString aRes; + OUString aRes; if (!rServiceImplName.isEmpty()) { OUString aImageName( "SpellAndGrammarContextMenuDictionaryImage" ); @@ -1184,11 +1183,11 @@ rtl::OUString SvtLinguConfig::GetSpellAndGrammarContextDictionaryImage( return aRes; } -::rtl::OUString SvtLinguConfig::GetSynonymsContextImage( - const ::rtl::OUString &rServiceImplName +OUString SvtLinguConfig::GetSynonymsContextImage( + const OUString &rServiceImplName ) const { - rtl::OUString aRes; + OUString aRes; if (!rServiceImplName.isEmpty()) { OUString aImageName( "SynonymsContextMenuImage" ); diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index 85711cc4ed3a..569c9f475295 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.cxx @@ -31,7 +31,6 @@ using namespace com::sun::star::uno; -using ::rtl::OUString; namespace utl { @@ -46,14 +45,14 @@ class SfxMiscCfg : public utl::ConfigItem sal_Bool bNotFound; sal_Int32 nYear2000; // two digit year representation - const com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); + const com::sun::star::uno::Sequence<OUString> GetPropertyNames(); void Load(); public: SfxMiscCfg( ); ~SfxMiscCfg( ); - virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); virtual void Commit(); sal_Bool IsNotFoundWarning() const {return bNotFound;} @@ -153,7 +152,7 @@ void SfxMiscCfg::Load() } } -void SfxMiscCfg::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) +void SfxMiscCfg::Notify( const com::sun::star::uno::Sequence<OUString>& ) { Load(); } diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index e0152939d109..b982cb0e3fbf 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -51,17 +51,17 @@ e.g.: NAMELIST[ PROPERTYHANDLE_xxx ] => VALUELIST[ PROPERTYHANDLE_xxx ] *//*-*************************************************************************************************************/ -#define ROOTNODE_FACTORIES ::rtl::OUString("Setup/Office/Factories" ) -#define PATHSEPERATOR ::rtl::OUString("/" ) +#define ROOTNODE_FACTORIES OUString("Setup/Office/Factories" ) +#define PATHSEPERATOR OUString("/" ) // Attention: The property "ooSetupFactoryEmptyDocumentURL" is read from configuration but not used! There is // special code that uses hard coded strings to return them. -#define PROPERTYNAME_SHORTNAME ::rtl::OUString("ooSetupFactoryShortName" ) -#define PROPERTYNAME_TEMPLATEFILE ::rtl::OUString("ooSetupFactoryTemplateFile" ) -#define PROPERTYNAME_WINDOWATTRIBUTES ::rtl::OUString("ooSetupFactoryWindowAttributes") -#define PROPERTYNAME_EMPTYDOCUMENTURL ::rtl::OUString("ooSetupFactoryEmptyDocumentURL") -#define PROPERTYNAME_DEFAULTFILTER ::rtl::OUString("ooSetupFactoryDefaultFilter" ) -#define PROPERTYNAME_ICON ::rtl::OUString("ooSetupFactoryIcon" ) +#define PROPERTYNAME_SHORTNAME OUString("ooSetupFactoryShortName" ) +#define PROPERTYNAME_TEMPLATEFILE OUString("ooSetupFactoryTemplateFile" ) +#define PROPERTYNAME_WINDOWATTRIBUTES OUString("ooSetupFactoryWindowAttributes") +#define PROPERTYNAME_EMPTYDOCUMENTURL OUString("ooSetupFactoryEmptyDocumentURL") +#define PROPERTYNAME_DEFAULTFILTER OUString("ooSetupFactoryDefaultFilter" ) +#define PROPERTYNAME_ICON OUString("ooSetupFactoryIcon" ) #define PROPERTYHANDLE_SHORTNAME 0 #define PROPERTYHANDLE_TEMPLATEFILE 1 @@ -72,16 +72,16 @@ #define PROPERTYCOUNT 6 -#define FACTORYNAME_WRITER ::rtl::OUString("com.sun.star.text.TextDocument" ) -#define FACTORYNAME_WRITERWEB ::rtl::OUString("com.sun.star.text.WebDocument" ) -#define FACTORYNAME_WRITERGLOBAL ::rtl::OUString("com.sun.star.text.GlobalDocument" ) -#define FACTORYNAME_CALC ::rtl::OUString("com.sun.star.sheet.SpreadsheetDocument" ) -#define FACTORYNAME_DRAW ::rtl::OUString("com.sun.star.drawing.DrawingDocument" ) -#define FACTORYNAME_IMPRESS ::rtl::OUString("com.sun.star.presentation.PresentationDocument") -#define FACTORYNAME_MATH ::rtl::OUString("com.sun.star.formula.FormulaProperties" ) -#define FACTORYNAME_CHART ::rtl::OUString("com.sun.star.chart2.ChartDocument" ) -#define FACTORYNAME_DATABASE ::rtl::OUString("com.sun.star.sdb.OfficeDatabaseDocument" ) -#define FACTORYNAME_STARTMODULE ::rtl::OUString("com.sun.star.frame.StartModule" ) +#define FACTORYNAME_WRITER OUString("com.sun.star.text.TextDocument" ) +#define FACTORYNAME_WRITERWEB OUString("com.sun.star.text.WebDocument" ) +#define FACTORYNAME_WRITERGLOBAL OUString("com.sun.star.text.GlobalDocument" ) +#define FACTORYNAME_CALC OUString("com.sun.star.sheet.SpreadsheetDocument" ) +#define FACTORYNAME_DRAW OUString("com.sun.star.drawing.DrawingDocument" ) +#define FACTORYNAME_IMPRESS OUString("com.sun.star.presentation.PresentationDocument") +#define FACTORYNAME_MATH OUString("com.sun.star.formula.FormulaProperties" ) +#define FACTORYNAME_CHART OUString("com.sun.star.chart2.ChartDocument" ) +#define FACTORYNAME_DATABASE OUString("com.sun.star.sdb.OfficeDatabaseDocument" ) +#define FACTORYNAME_STARTMODULE OUString("com.sun.star.frame.StartModule" ) #define FACTORYCOUNT 10 @@ -124,7 +124,7 @@ struct FactoryInfo // returns list of properties, which has changed only! // We use given value of sNodeBase to build full qualified paths ... // Last sign of it must be "/". because we use it directly, without any additional things! - css::uno::Sequence< css::beans::PropertyValue > getChangedProperties( const ::rtl::OUString& sNodeBase ) + css::uno::Sequence< css::beans::PropertyValue > getChangedProperties( const OUString& sNodeBase ) { // a) reserve memory for max. count of changed properties // b) add names and values of changed ones only and count it @@ -190,11 +190,11 @@ struct FactoryInfo // That's why we can't make our member public. We must use get/set/init methods // to control access on it! sal_Bool getInstalled () const { return bInstalled; }; - ::rtl::OUString getFactory () const { return sFactory; }; - ::rtl::OUString getShortName () const { return sShortName; }; - ::rtl::OUString getTemplateFile () const { return sTemplateFile; }; - ::rtl::OUString getWindowAttributes () const { return sWindowAttributes; }; - ::rtl::OUString getDefaultFilter () const { return sDefaultFilter; }; + OUString getFactory () const { return sFactory; }; + OUString getShortName () const { return sShortName; }; + OUString getTemplateFile () const { return sTemplateFile; }; + OUString getWindowAttributes () const { return sWindowAttributes; }; + OUString getDefaultFilter () const { return sDefaultFilter; }; sal_Bool isDefaultFilterReadonly() const { return bDefaultFilterReadonly; } sal_Int32 getIcon () const { return nIcon; }; @@ -202,16 +202,16 @@ struct FactoryInfo // If you call set-methods - we check for changes of valkues and mark it. // But if you whish to set it without that ... you must initialize it! void initInstalled ( sal_Bool bNewInstalled ) { bInstalled = bNewInstalled ; } - void initFactory ( const ::rtl::OUString& sNewFactory ) { sFactory = sNewFactory ; } - void initShortName ( const ::rtl::OUString& sNewShortName ) { sShortName = sNewShortName ; } - void initWindowAttributes ( const ::rtl::OUString& sNewWindowAttributes ) { sWindowAttributes = sNewWindowAttributes ; } - void initEmptyDocumentURL ( const ::rtl::OUString& sNewEmptyDocumentURL ) { sEmptyDocumentURL = sNewEmptyDocumentURL ; } - void initDefaultFilter ( const ::rtl::OUString& sNewDefaultFilter ) { sDefaultFilter = sNewDefaultFilter ; } + void initFactory ( const OUString& sNewFactory ) { sFactory = sNewFactory ; } + void initShortName ( const OUString& sNewShortName ) { sShortName = sNewShortName ; } + void initWindowAttributes ( const OUString& sNewWindowAttributes ) { sWindowAttributes = sNewWindowAttributes ; } + void initEmptyDocumentURL ( const OUString& sNewEmptyDocumentURL ) { sEmptyDocumentURL = sNewEmptyDocumentURL ; } + void initDefaultFilter ( const OUString& sNewDefaultFilter ) { sDefaultFilter = sNewDefaultFilter ; } void setDefaultFilterReadonly( const sal_Bool bVal){bDefaultFilterReadonly = bVal;} void initIcon ( sal_Int32 nNewIcon ) { nIcon = nNewIcon ; } //--------------------------------------------------------------------------------------------------------- - void initTemplateFile( const ::rtl::OUString& sNewTemplateFile ) + void initTemplateFile( const OUString& sNewTemplateFile ) { if ( !sNewTemplateFile.isEmpty() ) { @@ -226,7 +226,7 @@ struct FactoryInfo } //--------------------------------------------------------------------------------------------------------- - void setTemplateFile( const ::rtl::OUString& sNewTemplateFile ) + void setTemplateFile( const OUString& sNewTemplateFile ) { if( sTemplateFile != sNewTemplateFile ) { @@ -236,7 +236,7 @@ struct FactoryInfo }; //--------------------------------------------------------------------------------------------------------- - void setWindowAttributes( const ::rtl::OUString& sNewWindowAttributes ) + void setWindowAttributes( const OUString& sNewWindowAttributes ) { if( sWindowAttributes != sNewWindowAttributes ) { @@ -246,7 +246,7 @@ struct FactoryInfo }; //--------------------------------------------------------------------------------------------------------- - void setDefaultFilter( const ::rtl::OUString& sNewDefaultFilter ) + void setDefaultFilter( const OUString& sNewDefaultFilter ) { if( sDefaultFilter != sNewDefaultFilter ) { @@ -266,12 +266,12 @@ struct FactoryInfo } sal_Bool bInstalled ; - ::rtl::OUString sFactory ; - ::rtl::OUString sShortName ; - ::rtl::OUString sTemplateFile ; - ::rtl::OUString sWindowAttributes ; - ::rtl::OUString sEmptyDocumentURL ; - ::rtl::OUString sDefaultFilter ; + OUString sFactory ; + OUString sShortName ; + OUString sTemplateFile ; + OUString sWindowAttributes ; + OUString sEmptyDocumentURL ; + OUString sDefaultFilter ; sal_Int32 nIcon ; sal_Bool bChangedTemplateFile :1 ; @@ -313,35 +313,35 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem //--------------------------------------------------------------------------------------------------------- // overloaded methods of baseclass //--------------------------------------------------------------------------------------------------------- - virtual void Notify( const css::uno::Sequence< ::rtl::OUString >& lPropertyNames ); + virtual void Notify( const css::uno::Sequence< OUString >& lPropertyNames ); virtual void Commit( ); //--------------------------------------------------------------------------------------------------------- // public interface //--------------------------------------------------------------------------------------------------------- sal_Bool IsModuleInstalled ( SvtModuleOptions::EModule eModule ) const; - ::com::sun::star::uno::Sequence < ::rtl::OUString > GetAllServiceNames(); - ::rtl::OUString GetFactoryName ( SvtModuleOptions::EFactory eFactory ) const; - ::rtl::OUString GetFactoryShortName ( SvtModuleOptions::EFactory eFactory ) const; - ::rtl::OUString GetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ) const; - ::rtl::OUString GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory ) const; - ::rtl::OUString GetFactoryDefaultFilter ( SvtModuleOptions::EFactory eFactory ) const; + ::com::sun::star::uno::Sequence < OUString > GetAllServiceNames(); + OUString GetFactoryName ( SvtModuleOptions::EFactory eFactory ) const; + OUString GetFactoryShortName ( SvtModuleOptions::EFactory eFactory ) const; + OUString GetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ) const; + OUString GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory ) const; + OUString GetFactoryDefaultFilter ( SvtModuleOptions::EFactory eFactory ) const; sal_Bool IsDefaultFilterReadonly( SvtModuleOptions::EFactory eFactory ) const; sal_Int32 GetFactoryIcon ( SvtModuleOptions::EFactory eFactory ) const; - static sal_Bool ClassifyFactoryByName ( const ::rtl::OUString& sName , + static sal_Bool ClassifyFactoryByName ( const OUString& sName , SvtModuleOptions::EFactory& eFactory ); void SetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory , - const ::rtl::OUString& sTemplate ); + const OUString& sTemplate ); void SetFactoryDefaultFilter ( SvtModuleOptions::EFactory eFactory , - const ::rtl::OUString& sFilter ); + const OUString& sFilter ); void MakeReadonlyStatesAvailable(); //------------------------------------------------------------------------------------------------------------- // private methods //------------------------------------------------------------------------------------------------------------- private: - static css::uno::Sequence< ::rtl::OUString > impl_ExpandSetNames ( const css::uno::Sequence< ::rtl::OUString >& lSetNames ); - void impl_Read ( const css::uno::Sequence< ::rtl::OUString >& lSetNames ); + static css::uno::Sequence< OUString > impl_ExpandSetNames ( const css::uno::Sequence< OUString >& lSetNames ); + void impl_Read ( const css::uno::Sequence< OUString >& lSetNames ); //------------------------------------------------------------------------------------------------------------- // private types @@ -380,7 +380,7 @@ SvtModuleOptions_Impl::SvtModuleOptions_Impl() // Get name list of all existing set node names in configuration to read her properties in impl_Read(). // These list is a list of long names of our factories. - const css::uno::Sequence< ::rtl::OUString > lFactories = GetNodeNames( ::rtl::OUString() ); + const css::uno::Sequence< OUString > lFactories = GetNodeNames( OUString() ); impl_Read( lFactories ); // Enable notification for changes by using configuration directly. @@ -430,7 +430,7 @@ SvtModuleOptions_Impl::~SvtModuleOptions_Impl() @onerror - @threadsafe no *//*-*************************************************************************************************************/ -void SvtModuleOptions_Impl::Notify( const css::uno::Sequence< ::rtl::OUString >& ) +void SvtModuleOptions_Impl::Notify( const css::uno::Sequence< OUString >& ) { OSL_FAIL( "SvtModuleOptions_Impl::Notify()\nNot implemented yet!\n" ); } @@ -460,7 +460,7 @@ void SvtModuleOptions_Impl::Commit() css::uno::Sequence< css::beans::PropertyValue > lCommitProperties( FACTORYCOUNT*PROPERTYCOUNT ); FactoryInfo* pInfo = NULL ; sal_Int32 nRealCount = 0 ; - ::rtl::OUString sBasePath ; + OUString sBasePath ; for( sal_Int32 nFactory=0; nFactory<FACTORYCOUNT; ++nFactory ) { pInfo = &(m_lFactories[nFactory]); @@ -484,7 +484,7 @@ void SvtModuleOptions_Impl::Commit() if( nRealCount > 0 ) { lCommitProperties.realloc( nRealCount ); - SetSetProperties( ::rtl::OUString(), lCommitProperties ); + SetSetProperties( OUString(), lCommitProperties ); } } @@ -539,7 +539,7 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo return bInstalled; } -::com::sun::star::uno::Sequence < ::rtl::OUString > SvtModuleOptions_Impl::GetAllServiceNames() +::com::sun::star::uno::Sequence < OUString > SvtModuleOptions_Impl::GetAllServiceNames() { sal_uInt32 nCount=0; if( m_lFactories[SvtModuleOptions::E_WRITER].getInstalled() ) @@ -563,7 +563,7 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo if( m_lFactories[SvtModuleOptions::E_SDATABASE].getInstalled() ) nCount++; - css::uno::Sequence < ::rtl::OUString > aRet( nCount ); + css::uno::Sequence < OUString > aRet( nCount ); sal_Int32 n=0; if( m_lFactories[SvtModuleOptions::E_WRITER].getInstalled() ) aRet[n++] = m_lFactories[SvtModuleOptions::E_WRITER].getFactory(); @@ -590,9 +590,9 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions_Impl::GetFactoryName( SvtModuleOptions::EFactory eFactory ) const +OUString SvtModuleOptions_Impl::GetFactoryName( SvtModuleOptions::EFactory eFactory ) const { - ::rtl::OUString sName; + OUString sName; if( eFactory>=0 && eFactory<FACTORYCOUNT ) { @@ -603,7 +603,7 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions_Impl::GetFactoryShortName( SvtModuleOptions::EFactory eFactory ) const +OUString SvtModuleOptions_Impl::GetFactoryShortName( SvtModuleOptions::EFactory eFactory ) const { // Attention: Hard configured yet ... because it's not fine to make changes possible by xml file yet. // But it's good to plan further possibilities! @@ -642,9 +642,9 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions_Impl::GetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ) const +OUString SvtModuleOptions_Impl::GetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ) const { - ::rtl::OUString sFile; + OUString sFile; if( eFactory>=0 && eFactory<FACTORYCOUNT ) { @@ -655,7 +655,7 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions_Impl::GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory ) const +OUString SvtModuleOptions_Impl::GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory ) const { // Attention: Hard configured yet ... because it's not fine to make changes possible by xml file yet. // But it's good to plan further possibilities! @@ -693,9 +693,9 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions_Impl::GetFactoryDefaultFilter( SvtModuleOptions::EFactory eFactory ) const +OUString SvtModuleOptions_Impl::GetFactoryDefaultFilter( SvtModuleOptions::EFactory eFactory ) const { - ::rtl::OUString sDefaultFilter; + OUString sDefaultFilter; if( eFactory>=0 && eFactory<FACTORYCOUNT ) { @@ -729,7 +729,7 @@ sal_Int32 SvtModuleOptions_Impl::GetFactoryIcon( SvtModuleOptions::EFactory eFac //***************************************************************************************************************** void SvtModuleOptions_Impl::SetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory , - const ::rtl::OUString& sTemplate ) + const OUString& sTemplate ) { if( eFactory>=0 && eFactory<FACTORYCOUNT ) { @@ -740,7 +740,7 @@ void SvtModuleOptions_Impl::SetFactoryStandardTemplate( SvtModuleOptions:: //***************************************************************************************************************** void SvtModuleOptions_Impl::SetFactoryDefaultFilter( SvtModuleOptions::EFactory eFactory, - const ::rtl::OUString& sFilter ) + const OUString& sFilter ) { if( eFactory>=0 && eFactory<FACTORYCOUNT ) { @@ -763,11 +763,11 @@ void SvtModuleOptions_Impl::SetFactoryDefaultFilter( SvtModuleOptions::EFa @onerror List will be empty. @threadsafe no *//*-*************************************************************************************************************/ -css::uno::Sequence< ::rtl::OUString > SvtModuleOptions_Impl::impl_ExpandSetNames( const css::uno::Sequence< ::rtl::OUString >& lSetNames ) +css::uno::Sequence< OUString > SvtModuleOptions_Impl::impl_ExpandSetNames( const css::uno::Sequence< OUString >& lSetNames ) { sal_Int32 nCount = lSetNames.getLength() ; - css::uno::Sequence< ::rtl::OUString > lPropNames ( nCount*PROPERTYCOUNT ); - ::rtl::OUString* pPropNames = lPropNames.getArray() ; + css::uno::Sequence< OUString > lPropNames ( nCount*PROPERTYCOUNT ); + OUString* pPropNames = lPropNames.getArray() ; sal_Int32 nPropStart = 0 ; for( sal_Int32 nName=0; nName<nCount; ++nName ) @@ -803,7 +803,7 @@ css::uno::Sequence< ::rtl::OUString > SvtModuleOptions_Impl::impl_ExpandSetNames @onerror We return false. @threadsafe no *//*-*************************************************************************************************************/ -sal_Bool SvtModuleOptions_Impl::ClassifyFactoryByName( const ::rtl::OUString& sName, SvtModuleOptions::EFactory& eFactory ) +sal_Bool SvtModuleOptions_Impl::ClassifyFactoryByName( const OUString& sName, SvtModuleOptions::EFactory& eFactory ) { sal_Bool bState; @@ -882,11 +882,11 @@ sal_Bool SvtModuleOptions_Impl::ClassifyFactoryByName( const ::rtl::OUString& sN @onerror We do nothing. @threadsafe no *//*-*************************************************************************************************************/ -void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< ::rtl::OUString >& lFactories ) +void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< OUString >& lFactories ) { // Expand every set node name in lFactories to full qualified paths to his properties // and get right values from configuration. - const css::uno::Sequence< ::rtl::OUString > lProperties = impl_ExpandSetNames( lFactories ); + const css::uno::Sequence< OUString > lProperties = impl_ExpandSetNames( lFactories ); const css::uno::Sequence< css::uno::Any > lValues = GetProperties( lProperties ); // Safe impossible cases. @@ -912,10 +912,10 @@ void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< ::rtl::OUString for( sal_Int32 nSetNode=0; nSetNode<nNodeCount; ++nSetNode ) { - const ::rtl::OUString& sFactoryName = lFactories[nSetNode]; + const OUString& sFactoryName = lFactories[nSetNode]; if( ClassifyFactoryByName( sFactoryName, eFactory ) == sal_True ) { - ::rtl::OUString sTemp; + OUString sTemp; sal_Int32 nTemp = 0; pInfo = &(m_lFactories[eFactory]); @@ -947,12 +947,12 @@ void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable() if (m_bReadOnlyStatesWellKnown) return; - css::uno::Sequence< ::rtl::OUString > lFactories = GetNodeNames(::rtl::OUString()); + css::uno::Sequence< OUString > lFactories = GetNodeNames(OUString()); sal_Int32 c = lFactories.getLength(); sal_Int32 i = 0; for (i=0; i<c; ++i) { - ::rtl::OUStringBuffer sPath(256); + OUStringBuffer sPath(256); sPath.append(lFactories[i] ); sPath.append(PATHSEPERATOR ); sPath.append(PROPERTYNAME_DEFAULTFILTER); @@ -963,7 +963,7 @@ void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable() css::uno::Sequence< sal_Bool > lReadonlyStates = GetReadOnlyStates(lFactories); for (i=0; i<c; ++i) { - ::rtl::OUString& rFactoryName = lFactories[i]; + OUString& rFactoryName = lFactories[i]; SvtModuleOptions::EFactory eFactory ; if (!ClassifyFactoryByName(rFactoryName, eFactory)) @@ -1042,28 +1042,28 @@ sal_Bool SvtModuleOptions::IsModuleInstalled( EModule eModule ) const } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions::GetFactoryName( EFactory eFactory ) const +OUString SvtModuleOptions::GetFactoryName( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryName( eFactory ); } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions::GetFactoryStandardTemplate( EFactory eFactory ) const +OUString SvtModuleOptions::GetFactoryStandardTemplate( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryStandardTemplate( eFactory ); } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions::GetFactoryEmptyDocumentURL( EFactory eFactory ) const +OUString SvtModuleOptions::GetFactoryEmptyDocumentURL( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryEmptyDocumentURL( eFactory ); } //***************************************************************************************************************** -::rtl::OUString SvtModuleOptions::GetFactoryDefaultFilter( EFactory eFactory ) const +OUString SvtModuleOptions::GetFactoryDefaultFilter( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetFactoryDefaultFilter( eFactory ); @@ -1083,7 +1083,7 @@ sal_Int32 SvtModuleOptions::GetFactoryIcon( EFactory eFactory ) const } //***************************************************************************************************************** -sal_Bool SvtModuleOptions::ClassifyFactoryByName( const ::rtl::OUString& sName , +sal_Bool SvtModuleOptions::ClassifyFactoryByName( const OUString& sName , EFactory& eFactory ) { // We don't need any mutex here ... because we don't use any member here! @@ -1092,7 +1092,7 @@ sal_Bool SvtModuleOptions::ClassifyFactoryByName( const ::rtl::OUString& sName //***************************************************************************************************************** void SvtModuleOptions::SetFactoryStandardTemplate( EFactory eFactory , - const ::rtl::OUString& sTemplate ) + const OUString& sTemplate ) { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); m_pDataContainer->SetFactoryStandardTemplate( eFactory, sTemplate ); @@ -1100,7 +1100,7 @@ void SvtModuleOptions::SetFactoryStandardTemplate( EFactory eFacto //***************************************************************************************************************** void SvtModuleOptions::SetFactoryDefaultFilter( EFactory eFactory, - const ::rtl::OUString& sFilter ) + const OUString& sFilter ) { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); m_pDataContainer->SetFactoryDefaultFilter( eFactory, sFilter ); @@ -1183,29 +1183,29 @@ namespace return theModuleOptionsMutex::get(); } -::rtl::OUString SvtModuleOptions::GetModuleName( EModule eModule ) const +OUString SvtModuleOptions::GetModuleName( EModule eModule ) const { switch( eModule ) { - case SvtModuleOptions::E_SWRITER : { return ::rtl::OUString("Writer"); } - case SvtModuleOptions::E_SWEB : { return ::rtl::OUString("Web"); } - case SvtModuleOptions::E_SGLOBAL : { return ::rtl::OUString("Global"); } - case SvtModuleOptions::E_SCALC : { return ::rtl::OUString("Calc"); } - case SvtModuleOptions::E_SDRAW : { return ::rtl::OUString("Draw"); } - case SvtModuleOptions::E_SIMPRESS : { return ::rtl::OUString("Impress"); } - case SvtModuleOptions::E_SMATH : { return ::rtl::OUString("Math"); } - case SvtModuleOptions::E_SCHART : { return ::rtl::OUString("Chart"); } - case SvtModuleOptions::E_SBASIC : { return ::rtl::OUString("Basic"); } - case SvtModuleOptions::E_SDATABASE : { return ::rtl::OUString("Database"); } + case SvtModuleOptions::E_SWRITER : { return OUString("Writer"); } + case SvtModuleOptions::E_SWEB : { return OUString("Web"); } + case SvtModuleOptions::E_SGLOBAL : { return OUString("Global"); } + case SvtModuleOptions::E_SCALC : { return OUString("Calc"); } + case SvtModuleOptions::E_SDRAW : { return OUString("Draw"); } + case SvtModuleOptions::E_SIMPRESS : { return OUString("Impress"); } + case SvtModuleOptions::E_SMATH : { return OUString("Math"); } + case SvtModuleOptions::E_SCHART : { return OUString("Chart"); } + case SvtModuleOptions::E_SBASIC : { return OUString("Basic"); } + case SvtModuleOptions::E_SDATABASE : { return OUString("Database"); } default: OSL_FAIL( "unknown module" ); break; } - return ::rtl::OUString(); + return OUString(); } -SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByShortName(const ::rtl::OUString& sName) +SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByShortName(const OUString& sName) { if ( sName == "swriter" ) return E_WRITER; @@ -1231,7 +1231,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByShortName(const :: return E_UNKNOWN_FACTORY; } -SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByServiceName(const ::rtl::OUString& sName) +SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByServiceName(const OUString& sName) { if (sName.equals(FACTORYNAME_WRITERGLOBAL)) return E_WRITERGLOBAL; @@ -1255,7 +1255,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByServiceName(const return E_UNKNOWN_FACTORY; } -SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::OUString& sURL , +SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const OUString& sURL , const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor) { css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); @@ -1277,13 +1277,13 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O ::comphelper::SequenceAsHashMap stlDesc(lMediaDescriptor); // is there already a filter inside the descriptor? - ::rtl::OUString sFilterName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString("FilterName"), ::rtl::OUString()); + OUString sFilterName = stlDesc.getUnpackedValueOrDefault(OUString("FilterName"), OUString()); if (!sFilterName.isEmpty()) { try { ::comphelper::SequenceAsHashMap stlFilterProps (xFilterCfg->getByName(sFilterName)); - ::rtl::OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString("DocumentService"), ::rtl::OUString()); + OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(OUString("DocumentService"), OUString()); SvtModuleOptions::EFactory eApp = SvtModuleOptions::ClassifyFactoryByServiceName(sDocumentService); if (eApp != E_UNKNOWN_FACTORY) @@ -1296,7 +1296,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O } // is there already a type inside the descriptor? - ::rtl::OUString sTypeName = stlDesc.getUnpackedValueOrDefault(::rtl::OUString("TypeName"), ::rtl::OUString()); + OUString sTypeName = stlDesc.getUnpackedValueOrDefault(OUString("TypeName"), OUString()); if (sTypeName.isEmpty()) { // no :-( @@ -1313,9 +1313,9 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const ::rtl::O try { ::comphelper::SequenceAsHashMap stlTypeProps (xTypeCfg->getByName(sTypeName)); - ::rtl::OUString sPreferredFilter = stlTypeProps.getUnpackedValueOrDefault(::rtl::OUString("PreferredFilter"), ::rtl::OUString()); + OUString sPreferredFilter = stlTypeProps.getUnpackedValueOrDefault(OUString("PreferredFilter"), OUString()); ::comphelper::SequenceAsHashMap stlFilterProps (xFilterCfg->getByName(sPreferredFilter)); - ::rtl::OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(::rtl::OUString("DocumentService"), ::rtl::OUString()); + OUString sDocumentService = stlFilterProps.getUnpackedValueOrDefault(OUString("DocumentService"), OUString()); SvtModuleOptions::EFactory eApp = SvtModuleOptions::ClassifyFactoryByServiceName(sDocumentService); if (eApp != E_UNKNOWN_FACTORY) @@ -1336,8 +1336,8 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByModel(const css::u if (!xInfo.is()) return E_UNKNOWN_FACTORY; - const css::uno::Sequence< ::rtl::OUString > lServices = xInfo->getSupportedServiceNames(); - const ::rtl::OUString* pServices = lServices.getConstArray(); + const css::uno::Sequence< OUString > lServices = xInfo->getSupportedServiceNames(); + const OUString* pServices = lServices.getConstArray(); for (sal_Int32 i=0; i<lServices.getLength() ; ++i) { @@ -1349,15 +1349,15 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByModel(const css::u return E_UNKNOWN_FACTORY; } -::com::sun::star::uno::Sequence < ::rtl::OUString > SvtModuleOptions::GetAllServiceNames() +::com::sun::star::uno::Sequence < OUString > SvtModuleOptions::GetAllServiceNames() { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->GetAllServiceNames(); } -::rtl::OUString SvtModuleOptions::GetDefaultModuleName() +OUString SvtModuleOptions::GetDefaultModuleName() { - ::rtl::OUString aModule; + OUString aModule; if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SWRITER)) aModule = m_pDataContainer->GetFactoryShortName(SvtModuleOptions::E_WRITER); else if (m_pDataContainer->IsModuleInstalled(SvtModuleOptions::E_SCALC)) diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx index ed16db9ac9bc..f204d203fc97 100644 --- a/unotools/source/config/optionsdlg.cxx +++ b/unotools/source/config/optionsdlg.cxx @@ -33,7 +33,6 @@ using namespace utl; using namespace com::sun::star::beans ; using namespace com::sun::star::uno; -using ::rtl::OUString; #define CFG_FILENAME OUString( "Office.OptionsDialog" ) #define ROOT_NODE OUString( "OptionsDialogGroups" ) @@ -49,7 +48,7 @@ class SvtOptionsDlgOptions_Impl : public utl::ConfigItem private: struct OUStringHashCode { - size_t operator()( const ::rtl::OUString& sString ) const + size_t operator()( const OUString& sString ) const { return sString.hashCode(); } @@ -67,7 +66,7 @@ private: public: SvtOptionsDlgOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); static ::osl::Mutex & getInitMutex(); @@ -119,7 +118,7 @@ void SvtOptionsDlgOptions_Impl::Commit() // ----------------------------------------------------------------------- -void SvtOptionsDlgOptions_Impl::Notify( const Sequence< rtl::OUString >& ) +void SvtOptionsDlgOptions_Impl::Notify( const Sequence< OUString >& ) { // nothing to notify } @@ -257,18 +256,18 @@ SvtOptionsDialogOptions::~SvtOptionsDialogOptions() } } -sal_Bool SvtOptionsDialogOptions::IsGroupHidden( const rtl::OUString& _rGroup ) const +sal_Bool SvtOptionsDialogOptions::IsGroupHidden( const OUString& _rGroup ) const { return m_pImp->IsGroupHidden( _rGroup ); } -sal_Bool SvtOptionsDialogOptions::IsPageHidden( const rtl::OUString& _rPage, const rtl::OUString& _rGroup ) const +sal_Bool SvtOptionsDialogOptions::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const { return m_pImp->IsPageHidden( _rPage, _rGroup ); } sal_Bool SvtOptionsDialogOptions::IsOptionHidden( - const rtl::OUString& _rOption, const rtl::OUString& _rPage, const rtl::OUString& _rGroup ) const + const OUString& _rOption, const OUString& _rPage, const OUString& _rGroup ) const { return m_pImp->IsOptionHidden( _rOption, _rPage, _rGroup ); } diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 314c22f39f88..4ca3fa3045ab 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -53,9 +53,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::util; using namespace com::sun::star::lang; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; #define SEARCHPATH_DELIMITER ';' #define SIGN_STARTVARIABLE OUString( "$(" ) @@ -71,7 +68,7 @@ using ::rtl::OStringToOUString; struct OUStringHashCode { - size_t operator()( const ::rtl::OUString& sString ) const + size_t operator()( const OUString& sString ) const { return sString.hashCode(); } @@ -83,7 +80,7 @@ enum VarNameProperty VAR_NEEDS_FILEURL }; -class NameToHandleMap : public ::boost::unordered_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > +class NameToHandleMap : public ::boost::unordered_map< OUString, sal_Int32, OUStringHashCode, ::std::equal_to< OUString > > { public: inline void free() { NameToHandleMap().swap( *this ); } @@ -173,9 +170,9 @@ class SvtPathOptions_Impl void SetUserConfigPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_USERCONFIG, rPath ); } void SetWorkPath( const String& rPath ) { SetPath( SvtPathOptions::PATH_WORK, rPath ); } - rtl::OUString SubstVar( const rtl::OUString& rVar ) const; - rtl::OUString ExpandMacros( const rtl::OUString& rPath ) const; - rtl::OUString UsePathVariables( const rtl::OUString& rPath ) const; + OUString SubstVar( const OUString& rVar ) const; + OUString ExpandMacros( const OUString& rPath ) const; + OUString UsePathVariables( const OUString& rPath ) const; ::com::sun::star::lang::Locale GetLocale() const { return m_aLocale; } }; @@ -318,9 +315,9 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Paths ePath, const String& rN //------------------------------------------------------------------------- -OUString SvtPathOptions_Impl::ExpandMacros( const rtl::OUString& rPath ) const +OUString SvtPathOptions_Impl::ExpandMacros( const OUString& rPath ) const { - ::rtl::OUString sExpanded( rPath ); + OUString sExpanded( rPath ); const INetURLObject aParser( rPath ); if ( aParser.GetProtocol() == INET_PROT_VND_SUN_STAR_EXPAND ) @@ -403,7 +400,7 @@ OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar ) const if ( bConvertLocal ) { // Convert the URL to a system path for special path variables - rtl::OUString aReturn; + OUString aReturn; utl::LocalFileHelper::ConvertURLToPhysicalName( aWorkText, aReturn ); return aReturn; } @@ -427,7 +424,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() : // #112719#: check for existance OSL_FAIL( "SvtPathOptions_Impl::SvtPathOptions_Impl(): #112719# happened again!" ); throw RuntimeException( - ::rtl::OUString( "Service com.sun.star.util.PathSettings cannot be created" ), + OUString( "Service com.sun.star.util.PathSettings cannot be created" ), Reference< XInterface >() ); } @@ -452,7 +449,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() : for ( i = 0; i < nCount; i++ ) { NameToHandleMap::const_iterator pIter = - aTempHashMap.find( rtl::OUString::createFromAscii( aPropNames[i].pPropName )); + aTempHashMap.find( OUString::createFromAscii( aPropNames[i].pPropName )); if ( pIter != aTempHashMap.end() ) { @@ -865,7 +862,7 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Paths ePath ) return sal_False; } - rtl::OUString aIniFile = pImp->SubstVar( rIniFile ); + OUString aIniFile = pImp->SubstVar( rIniFile ); sal_Bool bRet = sal_False; switch ( ePath ) @@ -879,7 +876,7 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Paths ePath ) sal_Int32 nIniIndex = 0; do { - rtl::OUString aToken = aIniFile.getToken( 0, '/', nIniIndex ); + OUString aToken = aIniFile.getToken( 0, '/', nIniIndex ); aObj.insertName(aToken); } while ( nIniIndex >= 0 ); @@ -899,7 +896,7 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Paths ePath ) default: { - rtl::OUString aPath; + OUString aPath; switch ( ePath ) { case PATH_ADDIN: aPath = GetAddinPath(); break; @@ -933,26 +930,26 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Paths ePath ) do { sal_Bool bIsURL = sal_True; - rtl::OUString aPathToken = aPath.getToken( 0, SEARCHPATH_DELIMITER, nPathIndex ); + OUString aPathToken = aPath.getToken( 0, SEARCHPATH_DELIMITER, nPathIndex ); INetURLObject aObj( aPathToken ); if ( aObj.HasError() ) { bIsURL = sal_False; - rtl::OUString aURL; + OUString aURL; if ( LocalFileHelper::ConvertPhysicalNameToURL( aPathToken, aURL ) ) aObj.SetURL( aURL ); } if ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_EXPAND ) { Reference< XMacroExpander > xMacroExpander = theMacroExpander::get( ::comphelper::getProcessComponentContext() ); - const ::rtl::OUString sExpandedPath = xMacroExpander->expandMacros( aObj.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ) ); + const OUString sExpandedPath = xMacroExpander->expandMacros( aObj.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ) ); aObj.SetURL( sExpandedPath ); } sal_Int32 nIniIndex = 0; do { - rtl::OUString aToken = aIniFile.getToken( 0, '/', nIniIndex ); + OUString aToken = aIniFile.getToken( 0, '/', nIniIndex ); aObj.insertName(aToken); } while ( nIniIndex >= 0 ); @@ -963,7 +960,7 @@ sal_Bool SvtPathOptions::SearchFile( String& rIniFile, Paths ePath ) { if ( !bIsURL ) { - rtl::OUString sTmp(rIniFile); + OUString sTmp(rIniFile); ::utl::LocalFileHelper::ConvertURLToPhysicalName( aObj.GetMainURL( INetURLObject::NO_DECODE ), sTmp ); rIniFile = sTmp; diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index 8aebaca8bb27..04ac6e3d6f18 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -68,7 +68,7 @@ public: //--------------------------------------------------------------------------------------------------------- virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); //--------------------------------------------------------------------------------------------------------- // public interface @@ -216,7 +216,7 @@ void SvtPrintWarningOptions_Impl::Commit() PutProperties( aSeqNames, aSeqValues ); } -void SvtPrintWarningOptions_Impl::Notify( const Sequence< rtl::OUString >& ) +void SvtPrintWarningOptions_Impl::Notify( const Sequence< OUString >& ) { } diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index 513f2a334b11..9a25220f9a41 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -34,7 +34,6 @@ using namespace utl; using namespace com::sun::star::uno; -using ::rtl::OUString; class SvtSaveOptions_Impl; class SvtLoadOptions_Impl; @@ -95,7 +94,7 @@ public: SvtSaveOptions_Impl(); ~SvtSaveOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); sal_Int32 GetAutoSaveTime() const { return nAutoSaveTime; } @@ -570,23 +569,23 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() { css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - ::rtl::OUString("org.openoffice.Office.Recovery"), + OUString("org.openoffice.Office.Recovery"), ::comphelper::ConfigurationHelper::E_READONLY); ::comphelper::ConfigurationHelper::readRelativeKey( xCFG, - ::rtl::OUString("AutoSave"), - ::rtl::OUString("Enabled")) >>= bAutoSave; + OUString("AutoSave"), + OUString("Enabled")) >>= bAutoSave; ::comphelper::ConfigurationHelper::readRelativeKey( xCFG, - ::rtl::OUString("AutoSave"), - ::rtl::OUString("TimeIntervall")) >>= nAutoSaveTime; + OUString("AutoSave"), + OUString("TimeIntervall")) >>= nAutoSaveTime; ::comphelper::ConfigurationHelper::readRelativeKey( xCFG, - ::rtl::OUString("AutoSave"), - ::rtl::OUString("UserAutoSaveEnabled")) >>= bUserAutoSave; + OUString("AutoSave"), + OUString("UserAutoSaveEnabled")) >>= bUserAutoSave; } catch(const css::uno::Exception&) { OSL_FAIL("Could not find needed information for AutoSave feature."); } @@ -762,25 +761,25 @@ void SvtSaveOptions_Impl::Commit() css::uno::Reference< css::uno::XInterface > xCFG = ::comphelper::ConfigurationHelper::openConfig( ::comphelper::getProcessComponentContext(), - ::rtl::OUString("org.openoffice.Office.Recovery"), + OUString("org.openoffice.Office.Recovery"), ::comphelper::ConfigurationHelper::E_STANDARD); ::comphelper::ConfigurationHelper::writeRelativeKey( xCFG, - ::rtl::OUString("AutoSave"), - ::rtl::OUString("TimeIntervall"), + OUString("AutoSave"), + OUString("TimeIntervall"), css::uno::makeAny(nAutoSaveTime)); ::comphelper::ConfigurationHelper::writeRelativeKey( xCFG, - ::rtl::OUString("AutoSave"), - ::rtl::OUString("Enabled"), + OUString("AutoSave"), + OUString("Enabled"), css::uno::makeAny(bAutoSave)); ::comphelper::ConfigurationHelper::writeRelativeKey( xCFG, - ::rtl::OUString("AutoSave"), - ::rtl::OUString("UserAutoSaveEnabled"), + OUString("AutoSave"), + OUString("UserAutoSaveEnabled"), css::uno::makeAny(bUserAutoSave)); ::comphelper::ConfigurationHelper::flush(xCFG); @@ -788,7 +787,7 @@ void SvtSaveOptions_Impl::Commit() // ----------------------------------------------------------------------- -void SvtSaveOptions_Impl::Notify( const Sequence<rtl::OUString>& ) +void SvtSaveOptions_Impl::Notify( const Sequence<OUString>& ) { } @@ -802,7 +801,7 @@ public: SvtLoadOptions_Impl(); ~SvtLoadOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); void SetLoadUserSettings(sal_Bool b){bLoadUserDefinedSettings = b; SetModified();} @@ -838,7 +837,7 @@ void SvtLoadOptions_Impl::Commit() PutProperties( aNames, aValues ); } // ----------------------------------------------------------------------- -void SvtLoadOptions_Impl::Notify( const Sequence<rtl::OUString>& ) +void SvtLoadOptions_Impl::Notify( const Sequence<OUString>& ) { SAL_WARN( "unotools.config", "properties have been changed" ); } diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index 9044db4ba05f..fa44fbfdcdfa 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -33,7 +33,6 @@ using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star::i18n; -using ::rtl::OUString; #define MAX_FLAGS_OFFSET 25 @@ -64,7 +63,7 @@ public: // ConfigItem virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); sal_Bool GetFlag( sal_uInt16 nOffset ) const; void SetFlag( sal_uInt16 nOffset, sal_Bool bVal ); @@ -94,7 +93,7 @@ void SvtSearchOptions_Impl::Commit() Save(); } -void SvtSearchOptions_Impl::Notify( const Sequence< rtl::OUString >& ) +void SvtSearchOptions_Impl::Notify( const Sequence< OUString >& ) { } diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 94585fb23e5a..7766cde20f54 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -711,7 +711,7 @@ void SvtSecurityOptions_Impl::Commit() Sequence< Sequence< com::sun::star::beans::PropertyValue > > lPropertyValuesSeq( nCnt ); for( sal_Int32 i = 0 ; i < nCnt ; ++i ) { - rtl::OUString aPrefix = rtl::OUStringBuffer(s).append(i).append('/').makeStringAndClear(); + OUString aPrefix = OUStringBuffer(s).append(i).append('/').makeStringAndClear(); Sequence< com::sun::star::beans::PropertyValue > lPropertyValues( 3 ); lPropertyValues[ 0 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME; lPropertyValues[ 0 ].Value <<= m_seqTrustedAuthors[ i ][0]; diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index a77612016705..372387f2b1e9 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -39,7 +39,6 @@ using namespace utl; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using ::rtl::OUString; SvtSysLocaleOptions_Impl* SvtSysLocaleOptions::pOptions = NULL; sal_Int32 SvtSysLocaleOptions::nRefCount = 0; @@ -75,7 +74,7 @@ public: SvtSysLocaleOptions_Impl(); virtual ~SvtSysLocaleOptions_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); const OUString& GetLocaleString() const @@ -470,7 +469,7 @@ void SvtSysLocaleOptions_Impl::SetIgnoreLanguageChange( sal_Bool bSet) } } -void SvtSysLocaleOptions_Impl::Notify( const Sequence< rtl::OUString >& seqPropertyNames ) +void SvtSysLocaleOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) { sal_uLong nHint = 0; Sequence< Any > seqValues = GetProperties( seqPropertyNames ); @@ -669,7 +668,7 @@ sal_Bool SvtSysLocaleOptions::IsReadOnly( EOption eOption ) const // static void SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( String& rAbbrev, - LanguageType& eLang, const ::rtl::OUString& rConfigString ) + LanguageType& eLang, const OUString& rConfigString ) { sal_Int32 nDelim = rConfigString.indexOf( '-' ); if ( nDelim >= 0 ) @@ -687,13 +686,13 @@ void SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( String& rAbbrev, // static -::rtl::OUString SvtSysLocaleOptions::CreateCurrencyConfigString( +OUString SvtSysLocaleOptions::CreateCurrencyConfigString( const String& rAbbrev, LanguageType eLang ) { String aIsoStr( LanguageTag( eLang ).getBcp47() ); if ( aIsoStr.Len() ) { - ::rtl::OUStringBuffer aStr( rAbbrev.Len() + 1 + aIsoStr.Len() ); + OUStringBuffer aStr( rAbbrev.Len() + 1 + aIsoStr.Len() ); aStr.append( rAbbrev ); aStr.append( sal_Unicode('-') ); aStr.append( aIsoStr ); diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index 54365f8e9081..ac0e6067de5f 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -43,7 +43,6 @@ using namespace utl; using namespace com::sun::star; -using rtl::OUString; namespace { diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 9d77f4ec061c..1c88c9911b0b 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -44,7 +44,7 @@ #define PROPERTY_VISIBLE "Visible" #define PROPERTY_USERDATA "UserData" -#define DEFAULT_WINDOWSTATE ::rtl::OUString() +#define DEFAULT_WINDOWSTATE OUString() #define DEFAULT_USERDATA css::uno::Sequence< css::beans::NamedValue >() #define DEFAULT_PAGEID 0 #define DEFAULT_VISIBLE sal_False @@ -55,14 +55,14 @@ #define _LOG_COUNTER_( _SVIEW_, _NREAD_, _NWRITE_ ) \ { \ FILE* pFile = fopen( "viewdbg.txt", "a" ); \ - fprintf( pFile, "%s[%d, %d]\n", ::rtl::OUStringToOString(_SVIEW_, RTL_TEXTENCODING_UTF8).getStr(), _NREAD_, _NWRITE_ ); \ + fprintf( pFile, "%s[%d, %d]\n", OUStringToOString(_SVIEW_, RTL_TEXTENCODING_UTF8).getStr(), _NREAD_, _NWRITE_ ); \ fclose( pFile ); \ } #endif // DEBUG_VIEWOPTIONS #define SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION_PARAM_EXCEPTION) \ { \ - ::rtl::OUStringBuffer sMsg(256); \ + OUStringBuffer sMsg(256); \ sMsg.appendAscii("Unexpected exception catched. Original message was:\n\"" ); \ sMsg.append (SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION_PARAM_EXCEPTION.Message); \ sMsg.appendAscii("\"" ); \ @@ -116,7 +116,7 @@ class IMPL_TViewData //--------------------------------------------------------------------------------------------------------- // write access - with reseting of default state - void setWindowState( const ::rtl::OUString& sValue ) + void setWindowState( const OUString& sValue ) { m_bDefault = ( ( m_bDefault == sal_True ) && @@ -157,14 +157,14 @@ class IMPL_TViewData //--------------------------------------------------------------------------------------------------------- // read access - ::rtl::OUString getWindowState() { return m_sWindowState; } + OUString getWindowState() { return m_sWindowState; } css::uno::Sequence< css::beans::NamedValue > getUserData () { return m_lUserData ; } sal_Int32 getPageID () { return m_nPageID ; } sal_Bool getVisible () { return m_bVisible ; } //--------------------------------------------------------------------------------------------------------- // special operation for easy access on user data - void setUserItem( const ::rtl::OUString& sName , + void setUserItem( const OUString& sName , const css::uno::Any& aValue ) { // we change UserData in every case! @@ -196,7 +196,7 @@ class IMPL_TViewData } //--------------------------------------------------------------------------------------------------------- - css::uno::Any getUserItem( const ::rtl::OUString& sName ) + css::uno::Any getUserItem( const OUString& sName ) { // default value - if item not exist! css::uno::Any aValue; @@ -218,7 +218,7 @@ class IMPL_TViewData sal_Bool isDefault() { return m_bDefault; } private: - ::rtl::OUString m_sWindowState ; + OUString m_sWindowState ; css::uno::Sequence< css::beans::NamedValue > m_lUserData ; sal_Int32 m_nPageID ; sal_Bool m_bVisible ; @@ -228,16 +228,16 @@ class IMPL_TViewData struct IMPL_TStringHashCode { - size_t operator()(const ::rtl::OUString& sString) const + size_t operator()(const OUString& sString) const { return sString.hashCode(); } }; -typedef ::boost::unordered_map< ::rtl::OUString , +typedef ::boost::unordered_map< OUString , IMPL_TViewData , IMPL_TStringHashCode , - ::std::equal_to< ::rtl::OUString > > IMPL_TViewHash; + ::std::equal_to< OUString > > IMPL_TViewHash; /*-************************************************************************************************************//** @descr Implement base data container for view options elements. @@ -256,36 +256,36 @@ class SvtViewOptionsBase_Impl public: enum State { STATE_NONE, STATE_FALSE, STATE_TRUE }; - SvtViewOptionsBase_Impl ( const ::rtl::OUString& sList ); + SvtViewOptionsBase_Impl ( const OUString& sList ); virtual ~SvtViewOptionsBase_Impl ( ); - sal_Bool Exists ( const ::rtl::OUString& sName ); - sal_Bool Delete ( const ::rtl::OUString& sName ); - ::rtl::OUString GetWindowState ( const ::rtl::OUString& sName ); - void SetWindowState ( const ::rtl::OUString& sName , - const ::rtl::OUString& sState ); - css::uno::Sequence< css::beans::NamedValue > GetUserData ( const ::rtl::OUString& sName ); - void SetUserData ( const ::rtl::OUString& sName , + sal_Bool Exists ( const OUString& sName ); + sal_Bool Delete ( const OUString& sName ); + OUString GetWindowState ( const OUString& sName ); + void SetWindowState ( const OUString& sName , + const OUString& sState ); + css::uno::Sequence< css::beans::NamedValue > GetUserData ( const OUString& sName ); + void SetUserData ( const OUString& sName , const css::uno::Sequence< css::beans::NamedValue >& lData ); - sal_Int32 GetPageID ( const ::rtl::OUString& sName ); - void SetPageID ( const ::rtl::OUString& sName , + sal_Int32 GetPageID ( const OUString& sName ); + void SetPageID ( const OUString& sName , sal_Int32 nID ); - State GetVisible ( const ::rtl::OUString& sName ); - void SetVisible ( const ::rtl::OUString& sName , + State GetVisible ( const OUString& sName ); + void SetVisible ( const OUString& sName , sal_Bool bVisible ); - css::uno::Any GetUserItem ( const ::rtl::OUString& sName , - const ::rtl::OUString& sItem ); - void SetUserItem ( const ::rtl::OUString& sName , - const ::rtl::OUString& sItem , + css::uno::Any GetUserItem ( const OUString& sName , + const OUString& sItem ); + void SetUserItem ( const OUString& sName , + const OUString& sItem , const css::uno::Any& aValue ); //------------------------------------------------------------------------------------------------------------- private: - css::uno::Reference< css::uno::XInterface > impl_getSetNode( const ::rtl::OUString& sNode , + css::uno::Reference< css::uno::XInterface > impl_getSetNode( const OUString& sNode , sal_Bool bCreateIfMissing); //------------------------------------------------------------------------------------------------------------- private: - ::rtl::OUString m_sListName; + OUString m_sListName; css::uno::Reference< css::container::XNameAccess > m_xRoot; css::uno::Reference< css::container::XNameAccess > m_xSet; @@ -312,7 +312,7 @@ class SvtViewOptionsBase_Impl @param - @return - *//*-*************************************************************************************************************/ -SvtViewOptionsBase_Impl::SvtViewOptionsBase_Impl( const ::rtl::OUString& sList ) +SvtViewOptionsBase_Impl::SvtViewOptionsBase_Impl( const OUString& sList ) : m_sListName ( sList ) // we must know, which view type we must support #ifdef DEBUG_VIEWOPTIONS , m_nReadCount ( 0 ) @@ -378,7 +378,7 @@ SvtViewOptionsBase_Impl::~SvtViewOptionsBase_Impl() @return true , if item exist false, otherwise *//*-*************************************************************************************************************/ -sal_Bool SvtViewOptionsBase_Impl::Exists( const ::rtl::OUString& sName ) +sal_Bool SvtViewOptionsBase_Impl::Exists( const OUString& sName ) { sal_Bool bExists = sal_False; @@ -406,7 +406,7 @@ sal_Bool SvtViewOptionsBase_Impl::Exists( const ::rtl::OUString& sName ) @return true , if item not exist(!) or could be deleted (should be the same!) false, otherwise *//*-*************************************************************************************************************/ -sal_Bool SvtViewOptionsBase_Impl::Delete( const ::rtl::OUString& sName ) +sal_Bool SvtViewOptionsBase_Impl::Delete( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS ++m_nWriteCount; @@ -440,13 +440,13 @@ sal_Bool SvtViewOptionsBase_Impl::Delete( const ::rtl::OUString& sName ) @param - @return - *//*-*************************************************************************************************************/ -::rtl::OUString SvtViewOptionsBase_Impl::GetWindowState( const ::rtl::OUString& sName ) +OUString SvtViewOptionsBase_Impl::GetWindowState( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS ++m_nReadCount; #endif - ::rtl::OUString sWindowState; + OUString sWindowState; try { css::uno::Reference< css::beans::XPropertySet > xNode( @@ -457,7 +457,7 @@ sal_Bool SvtViewOptionsBase_Impl::Delete( const ::rtl::OUString& sName ) } catch(const css::uno::Exception& ex) { - sWindowState = ::rtl::OUString(); + sWindowState = OUString(); SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(ex) } @@ -465,8 +465,8 @@ sal_Bool SvtViewOptionsBase_Impl::Delete( const ::rtl::OUString& sName ) } //***************************************************************************************************************** -void SvtViewOptionsBase_Impl::SetWindowState( const ::rtl::OUString& sName , - const ::rtl::OUString& sState ) +void SvtViewOptionsBase_Impl::SetWindowState( const OUString& sName , + const OUString& sState ) { #ifdef DEBUG_VIEWOPTIONS ++m_nWriteCount; @@ -487,7 +487,7 @@ void SvtViewOptionsBase_Impl::SetWindowState( const ::rtl::OUString& sName , } //***************************************************************************************************************** -css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserData( const ::rtl::OUString& sName ) +css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserData( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS ++m_nReadCount; @@ -503,8 +503,8 @@ css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserDat xNode->getByName(PROPERTY_USERDATA) >>= xUserData; if (xUserData.is()) { - const css::uno::Sequence< ::rtl::OUString > lNames = xUserData->getElementNames(); - const ::rtl::OUString* pNames = lNames.getConstArray(); + const css::uno::Sequence< OUString > lNames = xUserData->getElementNames(); + const OUString* pNames = lNames.getConstArray(); sal_Int32 c = lNames.getLength(); sal_Int32 i = 0; css::uno::Sequence< css::beans::NamedValue > lUserData(c); @@ -527,7 +527,7 @@ css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserDat } //***************************************************************************************************************** -void SvtViewOptionsBase_Impl::SetUserData( const ::rtl::OUString& sName , +void SvtViewOptionsBase_Impl::SetUserData( const OUString& sName , const css::uno::Sequence< css::beans::NamedValue >& lData ) { #ifdef DEBUG_VIEWOPTIONS @@ -563,8 +563,8 @@ void SvtViewOptionsBase_Impl::SetUserData( const ::rtl::OUString& } //***************************************************************************************************************** -css::uno::Any SvtViewOptionsBase_Impl::GetUserItem( const ::rtl::OUString& sName , - const ::rtl::OUString& sItem ) +css::uno::Any SvtViewOptionsBase_Impl::GetUserItem( const OUString& sName , + const OUString& sItem ) { #ifdef DEBUG_VIEWOPTIONS ++m_nReadCount; @@ -594,8 +594,8 @@ css::uno::Any SvtViewOptionsBase_Impl::GetUserItem( const ::rtl::OUString& sName } //***************************************************************************************************************** -void SvtViewOptionsBase_Impl::SetUserItem( const ::rtl::OUString& sName , - const ::rtl::OUString& sItem , +void SvtViewOptionsBase_Impl::SetUserItem( const OUString& sName , + const OUString& sItem , const css::uno::Any& aValue ) { #ifdef DEBUG_VIEWOPTIONS @@ -625,7 +625,7 @@ void SvtViewOptionsBase_Impl::SetUserItem( const ::rtl::OUString& sName , } //***************************************************************************************************************** -sal_Int32 SvtViewOptionsBase_Impl::GetPageID( const ::rtl::OUString& sName ) +sal_Int32 SvtViewOptionsBase_Impl::GetPageID( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS ++m_nReadCount; @@ -650,7 +650,7 @@ sal_Int32 SvtViewOptionsBase_Impl::GetPageID( const ::rtl::OUString& sName ) } //***************************************************************************************************************** -void SvtViewOptionsBase_Impl::SetPageID( const ::rtl::OUString& sName , +void SvtViewOptionsBase_Impl::SetPageID( const OUString& sName , sal_Int32 nID ) { #ifdef DEBUG_VIEWOPTIONS @@ -672,7 +672,7 @@ void SvtViewOptionsBase_Impl::SetPageID( const ::rtl::OUString& sName , } //***************************************************************************************************************** -SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const ::rtl::OUString& sName ) +SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS ++m_nReadCount; @@ -702,7 +702,7 @@ SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const ::rtl: } //***************************************************************************************************************** -void SvtViewOptionsBase_Impl::SetVisible( const ::rtl::OUString& sName , +void SvtViewOptionsBase_Impl::SetVisible( const OUString& sName , sal_Bool bVisible ) { #ifdef DEBUG_VIEWOPTIONS @@ -733,7 +733,7 @@ void SvtViewOptionsBase_Impl::SetVisible( const ::rtl::OUString& sName , @param "sNode", name of new entry @return - *//*-*************************************************************************************************************/ -css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSetNode( const ::rtl::OUString& sNode , +css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSetNode( const OUString& sNode , sal_Bool bCreateIfMissing) { css::uno::Reference< css::uno::XInterface > xNode; @@ -763,7 +763,7 @@ css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSet // constructor //***************************************************************************************************************** SvtViewOptions::SvtViewOptions( EViewType eType , - const ::rtl::OUString& sViewName ) + const OUString& sViewName ) : m_eViewType ( eType ) , m_sViewName ( sViewName ) { @@ -945,12 +945,12 @@ sal_Bool SvtViewOptions::Delete() //***************************************************************************************************************** // public method //***************************************************************************************************************** -::rtl::OUString SvtViewOptions::GetWindowState() const +OUString SvtViewOptions::GetWindowState() const { // Ready for multithreading ::osl::MutexGuard aGuard( GetOwnStaticMutex() ); - ::rtl::OUString sState; + OUString sState; switch( m_eViewType ) { case E_DIALOG : { @@ -976,7 +976,7 @@ sal_Bool SvtViewOptions::Delete() //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtViewOptions::SetWindowState( const ::rtl::OUString& sState ) +void SvtViewOptions::SetWindowState( const OUString& sState ) { // Ready for multithreading ::osl::MutexGuard aGuard( GetOwnStaticMutex() ); @@ -1147,7 +1147,7 @@ void SvtViewOptions::SetUserData( const css::uno::Sequence< css::beans::NamedVal } //***************************************************************************************************************** -css::uno::Any SvtViewOptions::GetUserItem( const ::rtl::OUString& sName ) const +css::uno::Any SvtViewOptions::GetUserItem( const OUString& sName ) const { // Ready for multithreading ::osl::MutexGuard aGuard( GetOwnStaticMutex() ); @@ -1176,7 +1176,7 @@ css::uno::Any SvtViewOptions::GetUserItem( const ::rtl::OUString& sName ) const } //***************************************************************************************************************** -void SvtViewOptions::SetUserItem( const ::rtl::OUString& sName , +void SvtViewOptions::SetUserItem( const OUString& sName , const css::uno::Any& aValue ) { // Ready for multithreading diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx index 9280fade65b0..4c5fd9422098 100644 --- a/unotools/source/config/xmlaccelcfg.cxx +++ b/unotools/source/config/xmlaccelcfg.cxx @@ -27,7 +27,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::xml::sax; -using ::rtl::OUString; #define ELEMENT_ACCELERATORLIST "acceleratorlist" #define ELEMENT_ACCELERATORITEM "item" @@ -52,14 +51,14 @@ public: public: virtual sal_Int16 SAL_CALL getLength(void) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getValueByName(const OUString& aName) throw (::com::sun::star::uno::RuntimeException); public: - void addAttribute( const ::rtl::OUString &sName , const ::rtl::OUString &sType , const ::rtl::OUString &sValue ); + void addAttribute( const OUString &sName , const OUString &sType , const OUString &sValue ); private: struct AttributeListImpl_impl *m_pImpl; @@ -206,7 +205,7 @@ throw( SAXException, RuntimeException ) m_xLocator = xLocator; } -::rtl::OUString OReadAccelatorDocumentHandler::getErrorLineString() +OUString OReadAccelatorDocumentHandler::getErrorLineString() { char buffer[32]; @@ -295,7 +294,7 @@ throw( SAXException, RuntimeException ) } -void SAL_CALL OReadAccelatorDocumentHandler::characters(const rtl::OUString&) +void SAL_CALL OReadAccelatorDocumentHandler::characters(const OUString&) throw( SAXException, RuntimeException ) { } diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx index f75b157d9c64..700a8d0d8500 100644 --- a/unotools/source/i18n/calendarwrapper.cxx +++ b/unotools/source/i18n/calendarwrapper.cxx @@ -61,7 +61,7 @@ void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale& } -void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::com::sun::star::lang::Locale& rLocale ) +void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun::star::lang::Locale& rLocale ) { try { @@ -76,7 +76,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co } -::com::sun::star::uno::Sequence< ::rtl::OUString > CalendarWrapper::getAllCalendars( const ::com::sun::star::lang::Locale& rLocale ) const +::com::sun::star::uno::Sequence< OUString > CalendarWrapper::getAllCalendars( const ::com::sun::star::lang::Locale& rLocale ) const { try { @@ -88,11 +88,11 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co SAL_WARN( "unotools.i18n", "getAllCalendars: Exception caught " << e.Message ); } - return ::com::sun::star::uno::Sequence< ::rtl::OUString > (0); + return ::com::sun::star::uno::Sequence< OUString > (0); } -::rtl::OUString CalendarWrapper::getUniqueID() const +OUString CalendarWrapper::getUniqueID() const { try { @@ -103,7 +103,7 @@ void CalendarWrapper::loadCalendar( const ::rtl::OUString& rUniqueID, const ::co { SAL_WARN( "unotools.i18n", "getUniqueID: Exception caught " << e.Message ); } - return ::rtl::OUString(); + return OUString(); } diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx index bfa85dc81734..cd8d036ab601 100644 --- a/unotools/source/i18n/charclass.cxx +++ b/unotools/source/i18n/charclass.cxx @@ -270,7 +270,7 @@ sal_Bool CharClass::isLetterNumeric( const String& rStr ) const } } -rtl::OUString CharClass::titlecase(const rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount) const +OUString CharClass::titlecase(const OUString& rStr, sal_Int32 nPos, sal_Int32 nCount) const { try { @@ -286,7 +286,7 @@ rtl::OUString CharClass::titlecase(const rtl::OUString& rStr, sal_Int32 nPos, sa } } -::rtl::OUString CharClass::uppercase( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const +OUString CharClass::uppercase( const OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const { try { @@ -302,7 +302,7 @@ rtl::OUString CharClass::titlecase(const rtl::OUString& rStr, sal_Int32 nPos, sa } } -::rtl::OUString CharClass::lowercase( const ::rtl::OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const +OUString CharClass::lowercase( const OUString& rStr, sal_Int32 nPos, sal_Int32 nCount ) const { try { diff --git a/unotools/source/i18n/collatorwrapper.cxx b/unotools/source/i18n/collatorwrapper.cxx index b64268ffe2cc..3a9cf3fd278f 100644 --- a/unotools/source/i18n/collatorwrapper.cxx +++ b/unotools/source/i18n/collatorwrapper.cxx @@ -33,7 +33,7 @@ CollatorWrapper::~CollatorWrapper() } sal_Int32 -CollatorWrapper::compareString (const ::rtl::OUString& s1, const ::rtl::OUString& s2) const +CollatorWrapper::compareString (const OUString& s1, const OUString& s2) const { try { @@ -48,7 +48,7 @@ CollatorWrapper::compareString (const ::rtl::OUString& s1, const ::rtl::OUString return 0; } -uno::Sequence< ::rtl::OUString > +uno::Sequence< OUString > CollatorWrapper::listCollatorAlgorithms (const lang::Locale& rLocale) const { try @@ -61,7 +61,7 @@ CollatorWrapper::listCollatorAlgorithms (const lang::Locale& rLocale) const SAL_WARN( "unotools.i18n","CollatorWrapper: listCollatorAlgorithms failed"); } - return uno::Sequence< ::rtl::OUString > (); + return uno::Sequence< OUString > (); } sal_Int32 @@ -81,7 +81,7 @@ CollatorWrapper::loadDefaultCollator (const lang::Locale& rLocale, sal_Int32 nOp } sal_Int32 -CollatorWrapper::loadCollatorAlgorithm (const ::rtl::OUString& rAlgorithm, +CollatorWrapper::loadCollatorAlgorithm (const OUString& rAlgorithm, const lang::Locale& rLocale, sal_Int32 nOptions) { try diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 293bd27e36cd..8f849d3e2892 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -120,20 +120,20 @@ const ::com::sun::star::lang::Locale& LocaleDataWrapper::getMyLocale() const void LocaleDataWrapper::invalidateData() { - aCurrSymbol = rtl::OUString(); - aCurrBankSymbol = rtl::OUString(); + aCurrSymbol = OUString(); + aCurrBankSymbol = OUString(); nDateFormat = nLongDateFormat = nDateFormatInvalid; nCurrPositiveFormat = nCurrNegativeFormat = nCurrDigits = nCurrFormatInvalid; if ( bLocaleDataItemValid ) { for (sal_Int32 j=0; j<LocaleItem::COUNT; ++j) - aLocaleItem[j] = rtl::OUString(); + aLocaleItem[j] = OUString(); bLocaleDataItemValid = sal_False; } if ( bReservedWordValid ) { for ( sal_Int16 j=0; j<reservedWords::COUNT; ++j ) - aReservedWord[j] = rtl::OUString(); + aReservedWord[j] = OUString(); bReservedWordValid = sal_False; } xDefaultCalendar.reset(); @@ -216,7 +216,7 @@ void LocaleDataWrapper::invalidateData() } -::com::sun::star::uno::Sequence< ::rtl::OUString > LocaleDataWrapper::getReservedWord() const +::com::sun::star::uno::Sequence< OUString > LocaleDataWrapper::getReservedWord() const { try { @@ -226,7 +226,7 @@ void LocaleDataWrapper::invalidateData() { SAL_WARN( "unotools.i18n", "getReservedWord: Exception caught " << e.Message ); } - return ::com::sun::star::uno::Sequence< ::rtl::OUString >(0); + return ::com::sun::star::uno::Sequence< OUString >(0); } @@ -302,7 +302,7 @@ void LocaleDataWrapper::invalidateData() { if (areChecksEnabled()) { - rtl::OUStringBuffer aMsg("LocaleDataWrapper::getInstalledLanguageTypes: Variants not supported, locale\n"); + OUStringBuffer aMsg("LocaleDataWrapper::getInstalledLanguageTypes: Variants not supported, locale\n"); aMsg.append(aDebugLocale); outputCheckMessage(aMsg.makeStringAndClear()); } @@ -314,7 +314,7 @@ void LocaleDataWrapper::invalidateData() // In checks, exclude known problems because no MS-LCID defined. if (areChecksEnabled() && eLang == LANGUAGE_DONTKNOW) { - rtl::OUStringBuffer aMsg("ConvertIsoNamesToLanguage: unknown MS-LCID for locale\n"); + OUStringBuffer aMsg("ConvertIsoNamesToLanguage: unknown MS-LCID for locale\n"); aMsg.append(aDebugLocale); outputCheckMessage(aMsg.makeStringAndClear()); } @@ -339,7 +339,7 @@ void LocaleDataWrapper::invalidateData() // && !aDebugLocale.EqualsAscii( "es-BR" ) // ?!? Brazil/es ) { - rtl::OUStringBuffer aMsg("ConvertIsoNamesToLanguage/ConvertLanguageToIsoNames: ambiguous locale (MS-LCID?)\n"); + OUStringBuffer aMsg("ConvertIsoNamesToLanguage/ConvertLanguageToIsoNames: ambiguous locale (MS-LCID?)\n"); aMsg.append(aDebugLocale); aMsg.appendAscii(" -> 0x"); aMsg.append(static_cast<sal_Int32>(eLang), 16); @@ -360,7 +360,7 @@ void LocaleDataWrapper::invalidateData() return rInstalledLanguageTypes; } -const rtl::OUString& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) const +const OUString& LocaleDataWrapper::getOneLocaleItem( sal_Int16 nItem ) const { ::utl::ReadWriteGuard aGuard( aMutex ); if ( nItem >= LocaleItem::COUNT ) @@ -456,7 +456,7 @@ void LocaleDataWrapper::getOneReservedWordImpl( sal_Int16 nWord ) } -const rtl::OUString& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const +const OUString& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) const { ::utl::ReadWriteGuard aGuard( aMutex ); if ( nWord < 0 || nWord >= reservedWords::COUNT ) @@ -473,7 +473,7 @@ const rtl::OUString& LocaleDataWrapper::getOneReservedWord( sal_Int16 nWord ) co } -MeasurementSystem LocaleDataWrapper::mapMeasurementStringToEnum( const rtl::OUString& rMS ) const +MeasurementSystem LocaleDataWrapper::mapMeasurementStringToEnum( const OUString& rMS ) const { //! TODO: could be cached too if ( rMS.equalsIgnoreAsciiCase( "metric" ) ) @@ -533,7 +533,7 @@ const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > L // --- currencies ----------------------------------------------------- -const rtl::OUString& LocaleDataWrapper::getCurrSymbol() const +const OUString& LocaleDataWrapper::getCurrSymbol() const { ::utl::ReadWriteGuard aGuard( aMutex ); if (aCurrSymbol.isEmpty()) @@ -545,7 +545,7 @@ const rtl::OUString& LocaleDataWrapper::getCurrSymbol() const } -const rtl::OUString& LocaleDataWrapper::getCurrBankSymbol() const +const OUString& LocaleDataWrapper::getCurrBankSymbol() const { ::utl::ReadWriteGuard aGuard( aMutex ); if (aCurrBankSymbol.isEmpty()) @@ -608,15 +608,15 @@ void LocaleDataWrapper::getCurrSymbolsImpl() { if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::getCurrSymbolsImpl: no default currency" ); + OUString aMsg( "LocaleDataWrapper::getCurrSymbolsImpl: no default currency" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } nElem = 0; if ( nElem >= nCnt ) { if (areChecksEnabled()) - outputCheckMessage(rtl::OUString("LocaleDataWrapper::getCurrSymbolsImpl: no currency at all, using ShellsAndPebbles")); - aCurrSymbol = rtl::OUString("ShellsAndPebbles"); + outputCheckMessage(OUString("LocaleDataWrapper::getCurrSymbolsImpl: no currency at all, using ShellsAndPebbles")); + aCurrSymbol = OUString("ShellsAndPebbles"); aCurrBankSymbol = aCurrSymbol; nCurrPositiveFormat = nCurrNegativeFormat = nCurrFormatDefault; nCurrDigits = 2; @@ -629,7 +629,7 @@ void LocaleDataWrapper::getCurrSymbolsImpl() } -void LocaleDataWrapper::scanCurrFormatImpl( const rtl::OUString& rCode, +void LocaleDataWrapper::scanCurrFormatImpl( const OUString& rCode, sal_Int32 nStart, sal_Int32& nSign, sal_Int32& nPar, sal_Int32& nNum, sal_Int32& nBlank, sal_Int32& nSym ) { @@ -717,7 +717,7 @@ void LocaleDataWrapper::getCurrFormatsImpl() { // bad luck if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: no currency formats" ); + OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: no currency formats" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } nCurrPositiveFormat = nCurrNegativeFormat = nCurrFormatDefault; @@ -765,7 +765,7 @@ void LocaleDataWrapper::getCurrFormatsImpl() scanCurrFormatImpl( pFormatArr[nElem].Code, 0, nSign, nPar, nNum, nBlank, nSym ); if (areChecksEnabled() && (nNum == -1 || nSym == -1)) { - rtl::OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: CurrPositiveFormat?" ); + OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: CurrPositiveFormat?" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } if (nBlank == -1) @@ -788,12 +788,12 @@ void LocaleDataWrapper::getCurrFormatsImpl() nCurrNegativeFormat = nCurrFormatDefault; else { - const ::rtl::OUString& rCode = pFormatArr[nNeg].Code; + const OUString& rCode = pFormatArr[nNeg].Code; sal_Int32 nDelim = rCode.indexOf(';'); scanCurrFormatImpl( rCode, nDelim+1, nSign, nPar, nNum, nBlank, nSym ); if (areChecksEnabled() && (nNum == -1 || nSym == -1 || (nPar == -1 && nSign == -1))) { - rtl::OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: CurrNegativeFormat?" ); + OUString aMsg( "LocaleDataWrapper::getCurrFormatsImpl: CurrNegativeFormat?" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } // NOTE: one of nPar or nSign are allowed to be -1 @@ -877,7 +877,7 @@ DateFormat LocaleDataWrapper::getLongDateFormat() const } -DateFormat LocaleDataWrapper::scanDateFormatImpl( const rtl::OUString& rCode ) +DateFormat LocaleDataWrapper::scanDateFormatImpl( const OUString& rCode ) { // Only some european versions were translated, the ones with different // keyword combinations are: @@ -929,7 +929,7 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const rtl::OUString& rCode ) { if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::scanDateFormat: not all DMY present" ); + OUString aMsg( "LocaleDataWrapper::scanDateFormat: not all DMY present" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } if (nDay == -1) @@ -951,7 +951,7 @@ DateFormat LocaleDataWrapper::scanDateFormatImpl( const rtl::OUString& rCode ) { if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::scanDateFormat: no magic applyable" ); + OUString aMsg( "LocaleDataWrapper::scanDateFormat: no magic applyable" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } return DMY; @@ -969,7 +969,7 @@ void LocaleDataWrapper::getDateFormatsImpl() { // bad luck if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no date formats" ); + OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no date formats" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } nDateFormat = nLongDateFormat = DMY; @@ -1013,14 +1013,14 @@ void LocaleDataWrapper::getDateFormatsImpl() { if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no edit" ); + OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no edit" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } if ( nDef == -1 ) { if (areChecksEnabled()) { - rtl::OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no default" ); + OUString aMsg( "LocaleDataWrapper::getDateFormatsImpl: no default" ); outputCheckMessage( appendLocaleInfo( aMsg ) ); } if ( nMedium != -1 ) @@ -1188,7 +1188,7 @@ static sal_Unicode* ImplAdd2UNum( sal_Unicode* pBuf, sal_uInt16 nNumber, int bLe } -inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const rtl::OUString& rStr ) +inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const OUString& rStr ) { if ( rStr.getLength() == 1 ) *pBuf++ = rStr[0]; @@ -1280,7 +1280,7 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf, } else { - const rtl::OUString& rThoSep = getNumThousandSep(); + const OUString& rThoSep = getNumThousandSep(); // copy number to buffer (excluding decimals) sal_uInt16 nNumLen2 = nNumLen-nDecimals; @@ -1328,7 +1328,7 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf, // --- simple date and time formatting -------------------------------- -rtl::OUString LocaleDataWrapper::getDate( const Date& rDate ) const +OUString LocaleDataWrapper::getDate( const Date& rDate ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); //!TODO: leading zeros et al @@ -1371,11 +1371,11 @@ rtl::OUString LocaleDataWrapper::getDate( const Date& rDate ) const pBuf = ImplAdd2UNum( pBuf, nDay, sal_True /* IsDateDayLeadingZero() */ ); } - return rtl::OUString(aBuf, pBuf-aBuf); + return OUString(aBuf, pBuf-aBuf); } -rtl::OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_Bool b100Sec ) const +OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_Bool b100Sec ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); //!TODO: leading zeros et al @@ -1409,7 +1409,7 @@ rtl::OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_ } } - rtl::OUString aStr(aBuf, pBuf - aBuf); + OUString aStr(aBuf, pBuf - aBuf); if ( bHour12 ) { @@ -1423,7 +1423,7 @@ rtl::OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_ } -rtl::OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCal, +OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCal, sal_Int16 nDisplayDayOfWeek, sal_Bool bDayOfMonthWithLeadingZero, sal_Int16 nDisplayMonth, sal_Bool bTwoDigitYear ) const { @@ -1441,17 +1441,17 @@ rtl::OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper // day of month nVal = rCal.getValue( CalendarFieldIndex::DAY_OF_MONTH ); pBuf = ImplAdd2UNum( aBuf, nVal, bDayOfMonthWithLeadingZero ); - rtl::OUString aDay(aBuf, pBuf-aBuf); + OUString aDay(aBuf, pBuf-aBuf); // month of year nVal = rCal.getValue( CalendarFieldIndex::MONTH ); - rtl::OUString aMonth( rCal.getDisplayName( CalendarDisplayIndex::MONTH, nVal, nDisplayMonth ) ); + OUString aMonth( rCal.getDisplayName( CalendarDisplayIndex::MONTH, nVal, nDisplayMonth ) ); // year nVal = rCal.getValue( CalendarFieldIndex::YEAR ); if ( bTwoDigitYear ) pBuf = ImplAddUNum( aBuf, nVal % 100, 2 ); else pBuf = ImplAddUNum( aBuf, nVal ); - rtl::OUString aYear(aBuf, pBuf-aBuf); + OUString aYear(aBuf, pBuf-aBuf); // concatenate switch ( getLongDateFormat() ) { @@ -1480,7 +1480,7 @@ rtl::OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper } -rtl::OUString LocaleDataWrapper::getDuration( const Time& rTime, sal_Bool bSec, sal_Bool b100Sec ) const +OUString LocaleDataWrapper::getDuration( const Time& rTime, sal_Bool bSec, sal_Bool b100Sec ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); sal_Unicode aBuf[128]; @@ -1507,7 +1507,7 @@ rtl::OUString LocaleDataWrapper::getDuration( const Time& rTime, sal_Bool bSec, } } - return rtl::OUString(aBuf, pBuf-aBuf); + return OUString(aBuf, pBuf-aBuf); } @@ -1525,7 +1525,7 @@ inline size_t ImplGetNumberStringLengthGuess( const LocaleDataWrapper& rLoc, sal } -rtl::OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, +OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep, sal_Bool bTrailingZeros ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); @@ -1537,15 +1537,15 @@ rtl::OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals sal_Unicode* pBuf = ImplAddFormatNum( pBuffer, nNumber, nDecimals, bUseThousandSep, bTrailingZeros ); - rtl::OUString aStr(pBuffer, pBuf-pBuffer); + OUString aStr(pBuffer, pBuf-pBuffer); if ( pBuffer != aBuf ) delete [] pBuffer; return aStr; } -rtl::OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, - const rtl::OUString& rCurrencySymbol, sal_Bool bUseThousandSep ) const +OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, + const OUString& rCurrencySymbol, sal_Bool bUseThousandSep ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); sal_Unicode aBuf[192]; @@ -1735,7 +1735,7 @@ rtl::OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimal } } - rtl::OUString aNumber(pBuffer, pBuf-pBuffer); + OUString aNumber(pBuffer, pBuf-pBuffer); if ( pBuffer != aBuf ) delete [] pBuffer; @@ -1755,10 +1755,10 @@ LanguageTag LocaleDataWrapper::getLoadedLanguageTag() const } -rtl::OUString LocaleDataWrapper::appendLocaleInfo(const rtl::OUString& rDebugMsg) const +OUString LocaleDataWrapper::appendLocaleInfo(const OUString& rDebugMsg) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); - rtl::OUStringBuffer aDebugMsg(rDebugMsg); + OUStringBuffer aDebugMsg(rDebugMsg); aDebugMsg.append(static_cast<sal_Unicode>('\n')); aDebugMsg.append(maLanguageTag.getBcp47()); aDebugMsg.appendAscii(" requested\n"); @@ -1770,9 +1770,9 @@ rtl::OUString LocaleDataWrapper::appendLocaleInfo(const rtl::OUString& rDebugMsg // static -void LocaleDataWrapper::outputCheckMessage( const rtl::OUString& rMsg ) +void LocaleDataWrapper::outputCheckMessage( const OUString& rMsg ) { - outputCheckMessage(rtl::OUStringToOString(rMsg, RTL_TEXTENCODING_UTF8).getStr()); + outputCheckMessage(OUStringToOString(rMsg, RTL_TEXTENCODING_UTF8).getStr()); } @@ -1836,7 +1836,7 @@ void LocaleDataWrapper::evaluateLocaleDataChecking() // --- XLocaleData4 ---------------------------------------------------------- -::com::sun::star::uno::Sequence< ::rtl::OUString > LocaleDataWrapper::getDateAcceptancePatterns() const +::com::sun::star::uno::Sequence< OUString > LocaleDataWrapper::getDateAcceptancePatterns() const { ::utl::ReadWriteGuard aGuard( aMutex ); @@ -1855,13 +1855,13 @@ void LocaleDataWrapper::evaluateLocaleDataChecking() { SAL_WARN( "unotools.i18n", "getDateAcceptancePatterns: Exception caught " << e.Message ); } - return ::com::sun::star::uno::Sequence< ::rtl::OUString >(0); + return ::com::sun::star::uno::Sequence< OUString >(0); } // --- Override layer -------------------------------------------------------- void LocaleDataWrapper::setDateAcceptancePatterns( - const ::com::sun::star::uno::Sequence< ::rtl::OUString > & rPatterns ) + const ::com::sun::star::uno::Sequence< OUString > & rPatterns ) { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nWrite ); diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx index 59238084f695..2a9ba2af0556 100644 --- a/unotools/source/i18n/nativenumberwrapper.cxx +++ b/unotools/source/i18n/nativenumberwrapper.cxx @@ -37,9 +37,9 @@ NativeNumberWrapper::~NativeNumberWrapper() } -::rtl::OUString +OUString NativeNumberWrapper::getNativeNumberString( - const ::rtl::OUString& rNumberString, + const OUString& rNumberString, const ::com::sun::star::lang::Locale& rLocale, sal_Int16 nNativeNumberMode ) const { @@ -52,7 +52,7 @@ NativeNumberWrapper::getNativeNumberString( { SAL_WARN( "unotools.i18n", "getNativeNumberString: Exception caught!" ); } - return ::rtl::OUString(); + return OUString(); } diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx index 7e4a2db179ec..dfb871e70439 100644 --- a/unotools/source/i18n/textsearch.cxx +++ b/unotools/source/i18n/textsearch.cxx @@ -36,7 +36,7 @@ namespace utl { // ............................................................................ -SearchParam::SearchParam( const rtl::OUString &rText, +SearchParam::SearchParam( const OUString &rText, SearchType eType, sal_Bool bCaseSensitive, sal_Bool bWrdOnly, @@ -237,7 +237,7 @@ int TextSearch::SearchFrwrd( const String & rStr, xub_StrLen* pStart, return nRet; } -sal_Bool TextSearch::SearchForward( const ::rtl::OUString &rStr, +sal_Bool TextSearch::SearchForward( const OUString &rStr, sal_Int32* pStart, sal_Int32* pEnd, ::com::sun::star::util::SearchResult* pRes) { @@ -305,7 +305,7 @@ void TextSearch::ReplaceBackReferences( String& rReplaceStr, const String &rStr, { if( rResult.subRegExpressions > 0 ) { - rtl::OUString sTab( '\t' ); + OUString sTab( '\t' ); sal_Unicode sSrchChrs[] = {'\\', '&', '$', 0}; String sTmp; xub_StrLen nPos = 0; diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx index 23d7acbfa374..703c37e148cc 100644 --- a/unotools/source/i18n/transliterationwrapper.cxx +++ b/unotools/source/i18n/transliterationwrapper.cxx @@ -120,17 +120,17 @@ void TransliterationWrapper::loadModuleIfNeeded( sal_uInt16 nLang ) if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::SENTENCE_CASE ) { if( bLoad ) - loadModuleByImplName(rtl::OUString("SENTENCE_CASE"), nLang); + loadModuleByImplName(OUString("SENTENCE_CASE"), nLang); } else if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::TITLE_CASE ) { if( bLoad ) - loadModuleByImplName(rtl::OUString("TITLE_CASE"), nLang); + loadModuleByImplName(OUString("TITLE_CASE"), nLang); } else if( static_cast< sal_Int32 >(nType) == TransliterationModulesExtra::TOGGLE_CASE ) { if( bLoad ) - loadModuleByImplName(rtl::OUString("TOGGLE_CASE"), nLang); + loadModuleByImplName(OUString("TOGGLE_CASE"), nLang); } else { diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx index 3e30a9d3be2e..c0f8dded5d03 100644 --- a/unotools/source/misc/atom.cxx +++ b/unotools/source/misc/atom.cxx @@ -33,9 +33,9 @@ AtomProvider::~AtomProvider() { } -int AtomProvider::getAtom( const ::rtl::OUString& rString, sal_Bool bCreate ) +int AtomProvider::getAtom( const OUString& rString, sal_Bool bCreate ) { - ::boost::unordered_map< ::rtl::OUString, int, ::rtl::OUStringHash >::iterator it = m_aAtomMap.find( rString ); + ::boost::unordered_map< OUString, int, OUStringHash >::iterator it = m_aAtomMap.find( rString ); if( it != m_aAtomMap.end() ) return it->second; if( ! bCreate ) @@ -46,10 +46,10 @@ int AtomProvider::getAtom( const ::rtl::OUString& rString, sal_Bool bCreate ) return m_nAtoms-1; } -const ::rtl::OUString& AtomProvider::getString( int nAtom ) const +const OUString& AtomProvider::getString( int nAtom ) const { - static ::rtl::OUString aEmpty; - ::boost::unordered_map< int, ::rtl::OUString, ::boost::hash< int > >::const_iterator it = m_aStringMap.find( nAtom ); + static OUString aEmpty; + ::boost::unordered_map< int, OUString, ::boost::hash< int > >::const_iterator it = m_aStringMap.find( nAtom ); return it == m_aStringMap.end() ? aEmpty : it->second; } @@ -66,7 +66,7 @@ MultiAtomProvider::~MultiAtomProvider() delete it->second; } -int MultiAtomProvider::getAtom( int atomClass, const ::rtl::OUString& rString, sal_Bool bCreate ) +int MultiAtomProvider::getAtom( int atomClass, const OUString& rString, sal_Bool bCreate ) { ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it = m_aAtomLists.find( atomClass ); @@ -82,14 +82,14 @@ int MultiAtomProvider::getAtom( int atomClass, const ::rtl::OUString& rString, s return INVALID_ATOM; } -const ::rtl::OUString& MultiAtomProvider::getString( int atomClass, int atom ) const +const OUString& MultiAtomProvider::getString( int atomClass, int atom ) const { ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) return it->second->getString( atom ); - static ::rtl::OUString aEmpty; + static OUString aEmpty; return aEmpty; } diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx index 933567b67be8..8573fd611a67 100644 --- a/unotools/source/misc/componentresmodule.cxx +++ b/unotools/source/misc/componentresmodule.cxx @@ -40,10 +40,10 @@ namespace utl private: ResMgr* m_pResources; bool m_bInitialized; - ::rtl::OString m_sResFilePrefix; + OString m_sResFilePrefix; public: - OComponentResModuleImpl( const ::rtl::OString& _rResFilePrefix ) + OComponentResModuleImpl( const OString& _rResFilePrefix ) :m_pResources( NULL ) ,m_bInitialized( false ) ,m_sResFilePrefix( _rResFilePrefix ) @@ -82,11 +82,11 @@ namespace utl if ( !m_pResources && !m_bInitialized ) { // create a manager with a fixed prefix - rtl::OString aMgrName = m_sResFilePrefix; + OString aMgrName = m_sResFilePrefix; m_pResources = ResMgr::CreateResMgr( aMgrName.getStr() ); OSL_ENSURE( m_pResources, - rtl::OStringBuffer( "OModuleImpl::getResManager: could not create the resource manager (file name: " ) + OStringBuffer( "OModuleImpl::getResManager: could not create the resource manager (file name: " ) .append(aMgrName) .append(")!").getStr() ); @@ -99,7 +99,7 @@ namespace utl //= OComponentResourceModule //==================================================================== //-------------------------------------------------------------------- - OComponentResourceModule::OComponentResourceModule( const ::rtl::OString& _rResFilePrefix ) + OComponentResourceModule::OComponentResourceModule( const OString& _rResFilePrefix ) :BaseClass() ,m_pImpl( new OComponentResModuleImpl( _rResFilePrefix ) ) { diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index 99e07ee538cf..ed34a5be3aab 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -1534,7 +1534,7 @@ String GetFontToSubsFontName( FontToSubsFontConverter hConverter ) return String(); const char* pName = ((ConvertChar*)hConverter)->mpSubsFontName; - return rtl::OUString::createFromAscii( pName ); + return OUString::createFromAscii( pName ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx index ad8ab621140b..4132b5d8e779 100644 --- a/unotools/source/misc/fontdefs.cxx +++ b/unotools/source/misc/fontdefs.cxx @@ -425,7 +425,7 @@ void GetEnglishSearchFontName( OUString& rName ) // translate normalized localized name to its normalized English ASCII name if( bNeedTranslation ) { - typedef boost::unordered_map<const rtl::OUString, const char*, FontNameHash> FontNameDictionary; + typedef boost::unordered_map<const OUString, const char*, FontNameHash> FontNameDictionary; static FontNameDictionary aDictionary( SAL_N_ELEMENTS(aImplLocalizedNamesList) ); // the font name dictionary needs to be intialized once if( aDictionary.empty() ) diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx index 3729c2c827c7..da0a198565b1 100644 --- a/unotools/source/streaming/streamhelper.cxx +++ b/unotools/source/streaming/streamhelper.cxx @@ -39,10 +39,10 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >& throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException) { if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); if (nBytesToRead < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(), static_cast<staruno::XWeak*>(this)); ::osl::MutexGuard aGuard( m_aMutex ); aData.realloc(nBytesToRead); @@ -53,7 +53,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >& m_nActPos += (sal_uInt32)nRead; if (nError != ERRCODE_NONE) - throw stario::IOException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::IOException(OUString(), static_cast<staruno::XWeak*>(this)); // adjust sequence if data read is lower than the desired data if (nRead < (sal_uInt32)nBytesToRead) @@ -101,10 +101,10 @@ void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip) { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); if (nBytesToSkip < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(), static_cast<staruno::XWeak*>(this)); m_nActPos += nBytesToSkip; } @@ -115,7 +115,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::available() { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); return m_nAvailable; } @@ -126,7 +126,7 @@ void SAL_CALL OInputStreamHelper::closeInput() { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_xLockBytes.Is()) - throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); m_xLockBytes = NULL; } diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx index 0ae42190a7f6..4798af6d825f 100644 --- a/unotools/source/streaming/streamwrap.cxx +++ b/unotools/source/streaming/streamwrap.cxx @@ -66,7 +66,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& checkConnected(); if (nBytesToRead < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); ::osl::MutexGuard aGuard( m_aMutex ); @@ -88,7 +88,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int checkError(); if (nMaxBytesToRead < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); if (m_pSvStream->IsEof()) { @@ -144,7 +144,7 @@ void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedExcep void OInputStreamWrapper::checkConnected() const { if (!m_pSvStream) - throw stario::NotConnectedException(::rtl::OUString(), const_cast<staruno::XWeak*>(static_cast<const staruno::XWeak*>(this))); + throw stario::NotConnectedException(OUString(), const_cast<staruno::XWeak*>(static_cast<const staruno::XWeak*>(this))); } //------------------------------------------------------------------------------ @@ -154,7 +154,7 @@ void OInputStreamWrapper::checkError() const if (m_pSvStream->SvStream::GetError() != ERRCODE_NONE) // TODO: really evaluate the error - throw stario::NotConnectedException(::rtl::OUString(), const_cast<staruno::XWeak*>(static_cast<const staruno::XWeak*>(this))); + throw stario::NotConnectedException(OUString(), const_cast<staruno::XWeak*>(static_cast<const staruno::XWeak*>(this))); } //================================================================== @@ -229,7 +229,7 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 || (nWritten != (sal_uInt32)aData.getLength()) ) { - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); } } @@ -250,7 +250,7 @@ void OOutputStreamWrapper::checkError() const { if (rStream.GetError() != ERRCODE_NONE) // TODO: really evaluate the error - throw stario::NotConnectedException(::rtl::OUString(), const_cast<staruno::XWeak*>(static_cast<const staruno::XWeak*>(this))); + throw stario::NotConnectedException(OUString(), const_cast<staruno::XWeak*>(static_cast<const staruno::XWeak*>(this))); } //================================================================== @@ -342,7 +342,7 @@ void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aD || (nWritten != (sal_uInt32)aData.getLength()) ) { - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); } } @@ -351,7 +351,7 @@ void SAL_CALL OStreamWrapper::flush() throw(stario::NotConnectedException, stari { m_pSvStream->Flush(); if (m_pSvStream->GetError() != ERRCODE_NONE) - throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this)); } //------------------------------------------------------------------------------ diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx index 3cf3fa02ade3..0f0ea21181b1 100644 --- a/unotools/source/ucbhelper/XTempFile.hxx +++ b/unotools/source/ucbhelper/XTempFile.hxx @@ -82,9 +82,9 @@ public: throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRemoveFile( ::sal_Bool _removefile ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUri() + virtual OUString SAL_CALL getUri() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getResourceName() + virtual OUString SAL_CALL getResourceName() throw (::com::sun::star::uno::RuntimeException); // XInputStream @@ -121,16 +121,16 @@ public: virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); //::com::sun::star::uno::Reference < ::com::sun::star::uno::XInterface > SAL_CALL XTempFile_createInstance( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); - static ::rtl::OUString getImplementationName_Static (); - static ::com::sun::star::uno::Sequence < ::rtl::OUString > getSupportedServiceNames_Static(); + static OUString getImplementationName_Static (); + static ::com::sun::star::uno::Sequence < OUString > getSupportedServiceNames_Static(); static ::com::sun::star::uno::Reference < com::sun::star::lang::XSingleComponentFactory > createServiceFactory_Static(); diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx index e02da35de73d..25b2adfdbfbf 100644 --- a/unotools/source/ucbhelper/localfilehelper.cxx +++ b/unotools/source/ucbhelper/localfilehelper.cxx @@ -73,15 +73,15 @@ sal_Bool LocalFileHelper::ConvertURLToSystemPath( const OUString& rName, OUStrin return !rReturn.isEmpty(); } -bool LocalFileHelper::ConvertPhysicalNameToURL(const rtl::OUString& rName, rtl::OUString& rReturn) +bool LocalFileHelper::ConvertPhysicalNameToURL(const OUString& rName, OUString& rReturn) { - rReturn = ::rtl::OUString(); + rReturn = OUString(); Reference< XUniversalContentBroker > pBroker( UniversalContentBroker::create( comphelper::getProcessComponentContext() ) ); try { - rtl::OUString aBase( ::ucbhelper::getLocalFileURL() ); + OUString aBase( ::ucbhelper::getLocalFileURL() ); rReturn = ::ucbhelper::getFileURLFromSystemPath( pBroker, aBase, rName ); } catch (const ::com::sun::star::uno::RuntimeException&) @@ -91,7 +91,7 @@ bool LocalFileHelper::ConvertPhysicalNameToURL(const rtl::OUString& rName, rtl:: return !rReturn.isEmpty(); } -bool LocalFileHelper::ConvertURLToPhysicalName(const rtl::OUString& rName, rtl::OUString& rReturn) +bool LocalFileHelper::ConvertURLToPhysicalName(const OUString& rName, OUString& rReturn) { rReturn = ""; Reference< XUniversalContentBroker > pBroker( @@ -111,21 +111,21 @@ bool LocalFileHelper::ConvertURLToPhysicalName(const rtl::OUString& rName, rtl:: return !rReturn.isEmpty(); } -sal_Bool LocalFileHelper::IsLocalFile(const rtl::OUString& rName) +sal_Bool LocalFileHelper::IsLocalFile(const OUString& rName) { - rtl::OUString aTmp; + OUString aTmp; return ConvertURLToPhysicalName(rName, aTmp); } -sal_Bool LocalFileHelper::IsFileContent(const rtl::OUString& rName) +sal_Bool LocalFileHelper::IsFileContent(const OUString& rName) { OUString aTmp; return ConvertURLToSystemPath(rName, aTmp); } -typedef ::std::vector< ::rtl::OUString* > StringList_Impl; +typedef ::std::vector< OUString* > StringList_Impl; -::com::sun::star::uno::Sequence < ::rtl::OUString > LocalFileHelper::GetFolderContents( const ::rtl::OUString& rFolder, sal_Bool bFolder ) +::com::sun::star::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, sal_Bool bFolder ) { StringList_Impl* pFiles = NULL; try @@ -134,8 +134,8 @@ typedef ::std::vector< ::rtl::OUString* > StringList_Impl; rFolder, Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext() ); Reference< ::com::sun::star::sdbc::XResultSet > xResultSet; - ::com::sun::star::uno::Sequence< ::rtl::OUString > aProps(1); - ::rtl::OUString* pProps = aProps.getArray(); + ::com::sun::star::uno::Sequence< OUString > aProps(1); + OUString* pProps = aProps.getArray(); pProps[0] = "Url"; try @@ -158,8 +158,8 @@ typedef ::std::vector< ::rtl::OUString* > StringList_Impl; { while ( xResultSet->next() ) { - ::rtl::OUString aId = xContentAccess->queryContentIdentifierString(); - ::rtl::OUString* pFile = new ::rtl::OUString( aId ); + OUString aId = xContentAccess->queryContentIdentifierString(); + OUString* pFile = new OUString( aId ); pFiles->push_back( pFile ); } } @@ -178,11 +178,11 @@ typedef ::std::vector< ::rtl::OUString* > StringList_Impl; if ( pFiles ) { size_t nCount = pFiles->size(); - Sequence < ::rtl::OUString > aRet( nCount ); - ::rtl::OUString* pRet = aRet.getArray(); + Sequence < OUString > aRet( nCount ); + OUString* pRet = aRet.getArray(); for ( size_t i = 0; i < nCount; ++i ) { - ::rtl::OUString* pFile = (*pFiles)[ i ]; + OUString* pFile = (*pFiles)[ i ]; pRet[i] = *( pFile ); delete pFile; } @@ -190,7 +190,7 @@ typedef ::std::vector< ::rtl::OUString* > StringList_Impl; return aRet; } else - return Sequence < ::rtl::OUString > (); + return Sequence < OUString > (); } } diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx index 8480bf18692a..0d8920bf9e64 100644 --- a/unotools/source/ucbhelper/progresshandlerwrap.cxx +++ b/unotools/source/ucbhelper/progresshandlerwrap.cxx @@ -31,7 +31,7 @@ ProgressHandlerWrap::ProgressHandlerWrap( ::com::sun::star::uno::Reference< ::co { } -sal_Bool getStatusFromAny_Impl( const Any& aAny, ::rtl::OUString& aText, sal_Int32& nNum ) +sal_Bool getStatusFromAny_Impl( const Any& aAny, OUString& aText, sal_Int32& nNum ) { sal_Bool bNumIsSet = sal_False; @@ -54,7 +54,7 @@ void SAL_CALL ProgressHandlerWrap::push( const Any& Status ) if( !m_xStatusIndicator.is() ) return; - ::rtl::OUString aText; + OUString aText; sal_Int32 nRange; if( getStatusFromAny_Impl( Status, aText, nRange ) ) @@ -67,7 +67,7 @@ void SAL_CALL ProgressHandlerWrap::update( const Any& Status ) if( !m_xStatusIndicator.is() ) return; - ::rtl::OUString aText; + OUString aText; sal_Int32 nValue; if( getStatusFromAny_Impl( Status, aText, nValue ) ) diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 807c776826cb..798f61be5816 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -41,7 +41,7 @@ using namespace osl; namespace { struct TempNameBase_Impl - : public rtl::Static< ::rtl::OUString, TempNameBase_Impl > {}; + : public rtl::Static< OUString, TempNameBase_Impl > {}; } namespace utl @@ -59,23 +59,23 @@ struct TempFile_Impl {} }; -rtl::OUString getParentName( const rtl::OUString& aFileName ) +OUString getParentName( const OUString& aFileName ) { sal_Int32 lastIndex = aFileName.lastIndexOf( sal_Unicode('/') ); - rtl::OUString aParent = aFileName.copy( 0,lastIndex ); + OUString aParent = aFileName.copy( 0,lastIndex ); if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 ) - aParent += rtl::OUString("/"); + aParent += OUString("/"); if( 0 == aParent.compareToAscii( "file://" ) ) - aParent = rtl::OUString("file:///"); + aParent = OUString("file:///"); return aParent; } -sal_Bool ensuredir( const rtl::OUString& rUnqPath ) +sal_Bool ensuredir( const OUString& rUnqPath ) { - rtl::OUString aPath; + OUString aPath; if ( rUnqPath.isEmpty() ) return sal_False; @@ -106,7 +106,7 @@ umask(old_mode); if( !bSuccess ) { // perhaps parent(s) don't exist - rtl::OUString aParentDir = getParentName( aPath ); + OUString aParentDir = getParentName( aPath ); if ( aParentDir != aPath ) { bSuccess = ensuredir( getParentName( aPath ) ); @@ -135,10 +135,10 @@ String ConstructTempDir_Impl( const String* pParent ) comphelper::getProcessComponentContext() ) ); // if parent given try to use it - rtl::OUString aTmp( *pParent ); + OUString aTmp( *pParent ); // test for valid filename - rtl::OUString aRet; + OUString aRet; ::osl::FileBase::getFileURLFromSystemPath( ::ucbhelper::getSystemPathFromFileURL( pBroker, aTmp ), aRet ); @@ -156,10 +156,10 @@ String ConstructTempDir_Impl( const String* pParent ) if ( !aName.Len() ) { - ::rtl::OUString &rTempNameBase_Impl = TempNameBase_Impl::get(); + OUString &rTempNameBase_Impl = TempNameBase_Impl::get(); if (rTempNameBase_Impl.isEmpty()) { - ::rtl::OUString ustrTempDirURL; + OUString ustrTempDirURL; ::osl::FileBase::RC rc = ::osl::File::getTempDirURL( ustrTempDirURL ); if (rc == ::osl::FileBase::E_None) @@ -186,7 +186,7 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru unsigned const nRadix = 36; unsigned long const nMax = (nRadix*nRadix*nRadix*nRadix*nRadix*nRadix); String aName( rName ); - aName += rtl::OUString( "lu" ); + aName += OUString( "lu" ); rName.Erase(); static unsigned long u = Time::GetSystemTicks() % nMax; @@ -194,8 +194,8 @@ void CreateTempName_Impl( String& rName, sal_Bool bKeep, sal_Bool bDir = sal_Tru { u %= nMax; String aTmp( aName ); - aTmp += rtl::OUString::valueOf(static_cast<sal_Int64>(u), nRadix); - aTmp += rtl::OUString( ".tmp" ); + aTmp += OUString::valueOf(static_cast<sal_Int64>(u), nRadix); + aTmp += OUString( ".tmp" ); if ( bDir ) { @@ -271,7 +271,7 @@ void lcl_createName(TempFile_Impl& _rImpl,const String& rLeadingChars,sal_Bool _ if ( pExtension ) aTmp += *pExtension; else - aTmp += rtl::OUString( ".tmp" ); + aTmp += OUString( ".tmp" ); if ( bDirectory ) { FileBase::RC err = Directory::create( aTmp ); @@ -329,7 +329,7 @@ String TempFile::CreateTempName( const String* pParent ) CreateTempName_Impl( aName, sal_False ); // convert to file URL - rtl::OUString aTmp; + OUString aTmp; if ( aName.Len() ) FileBase::getSystemPathFromFileURL( aName, aTmp ); return aTmp; @@ -387,7 +387,7 @@ sal_Bool TempFile::IsValid() const String TempFile::GetFileName() const { - rtl::OUString aTmp; + OUString aTmp; FileBase::getSystemPathFromFileURL( pImp->aName, aTmp ); return aTmp; } @@ -396,7 +396,7 @@ String TempFile::GetURL() const { if ( !pImp->aURL.Len() ) { - rtl::OUString aTmp; + OUString aTmp; LocalFileHelper::ConvertPhysicalNameToURL( GetFileName(), aTmp ); pImp->aURL = aTmp; } @@ -431,7 +431,7 @@ String TempFile::SetTempNameBaseDirectory( const String &rBaseName ) if( !rBaseName.Len() ) return String(); - rtl::OUString aUnqPath( rBaseName ); + OUString aUnqPath( rBaseName ); // remove trailing slash if ( rBaseName.GetChar( rBaseName.Len() - 1 ) == sal_Unicode( '/' ) ) @@ -447,14 +447,14 @@ String TempFile::SetTempNameBaseDirectory( const String &rBaseName ) bRet = sal_True; // failure to create base directory means returning an empty string - rtl::OUString aTmp; + OUString aTmp; if ( bRet ) { // append own internal directory bRet = sal_True; - ::rtl::OUString &rTempNameBase_Impl = TempNameBase_Impl::get(); + OUString &rTempNameBase_Impl = TempNameBase_Impl::get(); rTempNameBase_Impl = rBaseName; - rTempNameBase_Impl += rtl::OUString('/'); + rTempNameBase_Impl += OUString('/'); TempFile aBase( NULL, sal_True ); if ( aBase.IsValid() ) diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index 6d00271eff1b..9dbd82a9b1cb 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.cxx @@ -60,13 +60,13 @@ namespace { -rtl::OUString canonic(rtl::OUString const & url) { +OUString canonic(OUString const & url) { INetURLObject o(url); SAL_WARN_IF(o.HasError(), "unotools.ucbhelper", "Invalid URL \"" << url << '"'); return o.GetMainURL(INetURLObject::NO_DECODE); } -ucbhelper::Content content(rtl::OUString const & url) { +ucbhelper::Content content(OUString const & url) { return ucbhelper::Content( canonic(url), css::uno::Reference<css::ucb::XCommandEnvironment>(), @@ -80,12 +80,12 @@ ucbhelper::Content content(INetURLObject const & url) { comphelper::getProcessComponentContext()); } -std::vector<rtl::OUString> getContents(rtl::OUString const & url) { +std::vector<OUString> getContents(OUString const & url) { try { - std::vector<rtl::OUString> cs; + std::vector<OUString> cs; ucbhelper::Content c(content(url)); - css::uno::Sequence<rtl::OUString> args(1); - args[0] = rtl::OUString("Title"); + css::uno::Sequence<OUString> args(1); + args[0] = OUString("Title"); css::uno::Reference<css::sdbc::XResultSet> res( c.createCursor(args, ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS), css::uno::UNO_SET_THROW); @@ -106,16 +106,16 @@ std::vector<rtl::OUString> getContents(rtl::OUString const & url) { "unotools.ucbhelper", "getContents(" << url << ") " << e.getValueType().getTypeName() << " \"" << e.get<css::uno::Exception>().Message << '"'); - return std::vector<rtl::OUString>(); + return std::vector<OUString>(); } } -rtl::OUString getCasePreservingUrl(INetURLObject url) { +OUString getCasePreservingUrl(INetURLObject url) { return content(url).executeCommand( - rtl::OUString("getCasePreservingURL"), + OUString("getCasePreservingURL"), css::uno::Any()). - get<rtl::OUString>(); + get<OUString>(); } DateTime convert(css::util::DateTime const & dt) { @@ -126,7 +126,7 @@ DateTime convert(css::util::DateTime const & dt) { } -bool utl::UCBContentHelper::IsDocument(rtl::OUString const & url) { +bool utl::UCBContentHelper::IsDocument(OUString const & url) { try { return content(url).isDocument(); } catch (css::uno::RuntimeException const &) { @@ -146,7 +146,7 @@ bool utl::UCBContentHelper::IsDocument(rtl::OUString const & url) { } css::uno::Any utl::UCBContentHelper::GetProperty( - rtl::OUString const & url, rtl::OUString const & property) + OUString const & url, OUString const & property) { try { return content(url).getPropertyValue(property); @@ -166,7 +166,7 @@ css::uno::Any utl::UCBContentHelper::GetProperty( } } -bool utl::UCBContentHelper::IsFolder(rtl::OUString const & url) { +bool utl::UCBContentHelper::IsFolder(OUString const & url) { try { return content(url).isFolder(); } catch (css::uno::RuntimeException const &) { @@ -186,11 +186,11 @@ bool utl::UCBContentHelper::IsFolder(rtl::OUString const & url) { } bool utl::UCBContentHelper::GetTitle( - rtl::OUString const & url, rtl::OUString * title) + OUString const & url, OUString * title) { assert(title != 0); try { - return content(url).getPropertyValue(rtl::OUString("Title")) >>= *title; + return content(url).getPropertyValue(OUString("Title")) >>= *title; } catch (css::uno::RuntimeException const &) { throw; } catch (css::ucb::CommandAbortedException const &) { @@ -207,10 +207,10 @@ bool utl::UCBContentHelper::GetTitle( } } -bool utl::UCBContentHelper::Kill(rtl::OUString const & url) { +bool utl::UCBContentHelper::Kill(OUString const & url) { try { content(url).executeCommand( - rtl::OUString("delete"), + OUString("delete"), css::uno::makeAny(true)); return true; } catch (css::uno::RuntimeException const &) { @@ -230,7 +230,7 @@ bool utl::UCBContentHelper::Kill(rtl::OUString const & url) { } bool utl::UCBContentHelper::MakeFolder( - ucbhelper::Content & parent, rtl::OUString const & title, + ucbhelper::Content & parent, OUString const & title, ucbhelper::Content & result, bool exclusive) { bool exists = false; @@ -248,8 +248,8 @@ bool utl::UCBContentHelper::MakeFolder( { continue; } - css::uno::Sequence<rtl::OUString> keys(1); - keys[0] = rtl::OUString("Title"); + css::uno::Sequence<OUString> keys(1); + keys[0] = OUString("Title"); css::uno::Sequence<css::uno::Any> values(1); values[0] <<= title; if (parent.insertNewContent(info[i].Type, keys, values, result)) @@ -293,10 +293,10 @@ bool utl::UCBContentHelper::MakeFolder( } } -sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) { +sal_Int64 utl::UCBContentHelper::GetSize(OUString const & url) { try { sal_Int64 n = 0; - bool ok = (content(url).getPropertyValue(rtl::OUString("Size")) >>= n); + bool ok = (content(url).getPropertyValue(OUString("Size")) >>= n); SAL_INFO_IF( !ok, "unotools.ucbhelper", "UCBContentHelper::GetSize(" << url @@ -319,17 +319,17 @@ sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) { } bool utl::UCBContentHelper::IsYounger( - rtl::OUString const & younger, rtl::OUString const & older) + OUString const & younger, OUString const & older) { try { return convert( content(younger).getPropertyValue( - rtl::OUString("DateModified")). + OUString("DateModified")). get<css::util::DateTime>()) > convert( content(older).getPropertyValue( - rtl::OUString("DateModified")). + OUString("DateModified")). get<css::util::DateTime>()); } catch (css::uno::RuntimeException const &) { throw; @@ -347,11 +347,11 @@ bool utl::UCBContentHelper::IsYounger( } } -bool utl::UCBContentHelper::Exists(rtl::OUString const & url) { - rtl::OUString pathname; +bool utl::UCBContentHelper::Exists(OUString const & url) { + OUString pathname; if (utl::LocalFileHelper::ConvertURLToPhysicalName(url, pathname)) { // Try to create a directory entry for the given URL: - rtl::OUString url2; + OUString url2; if (osl::FileBase::getFileURLFromSystemPath(pathname, url2) == osl::FileBase::E_None) { @@ -365,15 +365,15 @@ bool utl::UCBContentHelper::Exists(rtl::OUString const & url) { } else { // Divide URL into folder and name part: INetURLObject o(url); - rtl::OUString name( + OUString name( o.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET)); o.removeSegment(); o.removeFinalSlash(); - std::vector<rtl::OUString> cs( + std::vector<OUString> cs( getContents(o.GetMainURL(INetURLObject::NO_DECODE))); - for (std::vector<rtl::OUString>::iterator i(cs.begin()); i != cs.end(); + for (std::vector<OUString>::iterator i(cs.begin()); i != cs.end(); ++i) { if (INetURLObject(*i).getName( @@ -389,7 +389,7 @@ bool utl::UCBContentHelper::Exists(rtl::OUString const & url) { } bool utl::UCBContentHelper::IsSubPath( - rtl::OUString const & parent, rtl::OUString const & child) + OUString const & parent, OUString const & child) { // The comparison is done in the following way: // - First, compare case sensitively @@ -438,7 +438,7 @@ bool utl::UCBContentHelper::IsSubPath( } bool utl::UCBContentHelper::EqualURLs( - rtl::OUString const & url1, rtl::OUString const & url2) + OUString const & url1, OUString const & url2) { if (url1.isEmpty() || url2.isEmpty()) { return false; diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 086ee702582a..a5ff6fcad3f0 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -186,7 +186,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc for (i = 0; i < n; i++) { PropertyChangeEvent evt (rEvent[i]); - if (evt.PropertyName == ::rtl::OUString("DocumentHeader")) + if (evt.PropertyName == OUString("DocumentHeader")) { Sequence<DocumentHeaderField> aHead; if (evt.NewValue >>= aHead) @@ -211,12 +211,12 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc m_xLockBytes->SetStreamValid_Impl(); } - else if (evt.PropertyName == rtl::OUString("PresentationURL")) + else if (evt.PropertyName == OUString("PresentationURL")) { - ::rtl::OUString aUrl; + OUString aUrl; if (evt.NewValue >>= aUrl) { - ::rtl::OUString aBad ("private:"); + OUString aBad ("private:"); if (!aUrl.startsWith(aBad)) { // URL changed (Redirection). @@ -224,9 +224,9 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc } } } - else if (evt.PropertyName == ::rtl::OUString("MediaType")) + else if (evt.PropertyName == OUString("MediaType")) { - ::rtl::OUString aContentType; + OUString aContentType; if (evt.NewValue >>= aContentType) m_xLockBytes->SetContentType_Impl( aContentType ); } @@ -905,7 +905,7 @@ static sal_Bool UCBOpenContentSync( Reference<XContentIdentifier> xContId( xContent.is() ? xContent->getIdentifier() : 0 ); - rtl::OUString aScheme; + OUString aScheme; if(xContId.is()) aScheme = xContId->getContentProviderScheme(); @@ -927,7 +927,7 @@ static sal_Bool UCBOpenContentSync( xListener = new UcbPropertiesChangeListener_Impl(xLockBytes); xProps->addPropertiesChangeListener( - Sequence< ::rtl::OUString >(), + Sequence< OUString >(), xListener); } @@ -1012,11 +1012,11 @@ static sal_Bool UCBOpenContentSync( INetURLObject aURL( xContId.is() ? xContId->getContentIdentifier() : - rtl::OUString() ); + OUString() ); aExcep.Server = aURL.GetHost(); aExcep.Classification = InteractionClassification_ERROR; aExcep.Message = - rtl::OUString( "server not responding after five seconds"); + OUString( "server not responding after five seconds"); Any request; request <<= aExcep; ucbhelper::InteractionRequest *ir = @@ -1128,7 +1128,7 @@ static sal_Bool UCBOpenContentSync( if ( xProps.is() ) xProps->removePropertiesChangeListener( - Sequence< ::rtl::OUString >(), + Sequence< OUString >(), xListener ); return ( bAborted || bException ); @@ -1150,7 +1150,7 @@ static sal_Bool _UCBOpenContentSync( xContent, new UcbTaskEnvironment( xInteract, xProgress ), comphelper::getProcessComponentContext() ); Reference < XContentIdentifier > xIdent = xContent->getIdentifier(); - ::rtl::OUString aScheme = xIdent->getContentProviderScheme(); + OUString aScheme = xIdent->getContentProviderScheme(); // http protocol must be handled in a special way: during the opening process the input stream may change // only the last inputstream after notifying the document headers is valid @@ -1160,7 +1160,7 @@ static sal_Bool _UCBOpenContentSync( Reference< XPropertiesChangeListener > xListener = new UcbPropertiesChangeListener_Impl( xLockBytes ); Reference< XPropertiesChangeNotifier > xProps ( xContent, UNO_QUERY ); if ( xProps.is() ) - xProps->addPropertiesChangeListener( Sequence< ::rtl::OUString >(), xListener ); + xProps->addPropertiesChangeListener( Sequence< OUString >(), xListener ); Any aResult; bool bException = false; @@ -1223,7 +1223,7 @@ static sal_Bool _UCBOpenContentSync( if ( xProps.is() ) - xProps->removePropertiesChangeListener( Sequence< ::rtl::OUString >(), xListener ); + xProps->removePropertiesChangeListener( Sequence< OUString >(), xListener ); return ( bAborted || bException ); } @@ -1621,7 +1621,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo { Reference < XCommandProcessor > xProcessor( xContent, UNO_QUERY ); Command aCommand; - aCommand.Name = ::rtl::OUString("setPropertyValues"); + aCommand.Name = OUString("setPropertyValues"); aCommand.Handle = -1; /* unknown */ aCommand.Argument <<= rProps; xProcessor->execute( aCommand, 0, Reference < XCommandEnvironment >() ); @@ -1632,7 +1632,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo aArgument.Mode = OpenMode::DOCUMENT; Command aCommand; - aCommand.Name = ::rtl::OUString( "open" ); + aCommand.Name = OUString( "open" ); aCommand.Argument <<= aArgument; Reference< XProgressHandler > xProgressHdl = new ProgressHandler_Impl( LINK( &xLockBytes, UcbLockBytes, DataAvailHdl ) ); diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index bcad77d79020..1c9e39dc9658 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -60,7 +60,7 @@ static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode ::ucbhelper::Content aCnt( rFileName, Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( ::rtl::OUString("delete"), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString("delete"), makeAny( sal_Bool( sal_True ) ) ); } catch ( const CommandAbortedException& ) @@ -93,7 +93,7 @@ static SvStream* lcl_CreateStream( const String& rFileName, StreamMode eOpenMode aInsertArg.ReplaceExisting = sal_False; Any aCmdArg; aCmdArg <<= aInsertArg; - aContent.executeCommand( ::rtl::OUString("insert"), aCmdArg ); + aContent.executeCommand( OUString("insert"), aCmdArg ); } // it is NOT an error when the stream already exists and no truncation was desired diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index b88949da771e..56405bbb4c99 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -27,7 +27,7 @@ OTempFileService::OTempFileService(css::uno::Reference< css::uno::XComponentCont : ::cppu::PropertySetMixin< css::io::XTempFile >( context , static_cast< Implements >( IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET | IMPLEMENTS_PROPERTY_ACCESS ) - , com::sun::star::uno::Sequence< rtl::OUString >() ) + , com::sun::star::uno::Sequence< OUString >() ) , mpStream( NULL ) , mbRemoveFile( sal_True ) , mbInClosed( sal_False ) @@ -123,7 +123,7 @@ throw ( css::uno::RuntimeException ) mbRemoveFile = _removefile; mpTempFile->EnableKillingFile( mbRemoveFile ); }; -::rtl::OUString SAL_CALL OTempFileService::getUri() +OUString SAL_CALL OTempFileService::getUri() throw ( css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); @@ -133,10 +133,10 @@ throw ( css::uno::RuntimeException ) throw css::uno::RuntimeException(); } - return ::rtl::OUString( mpTempFile->GetURL() ); + return OUString( mpTempFile->GetURL() ); }; -::rtl::OUString SAL_CALL OTempFileService::getResourceName() +OUString SAL_CALL OTempFileService::getResourceName() throw ( css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); @@ -146,7 +146,7 @@ throw ( css::uno::RuntimeException ) throw css::uno::RuntimeException(); } - return ::rtl::OUString( mpTempFile->GetFileName() ); + return OUString( mpTempFile->GetFileName() ); }; @@ -158,11 +158,11 @@ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); if (nBytesToRead < 0) - throw css::io::BufferSizeExceededException( ::rtl::OUString(), static_cast< css::uno::XWeak * >(this)); + throw css::io::BufferSizeExceededException( OUString(), static_cast< css::uno::XWeak * >(this)); aData.realloc(nBytesToRead); @@ -191,13 +191,13 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); checkError(); if (nMaxBytesToRead < 0) - throw css::io::BufferSizeExceededException( ::rtl::OUString(), static_cast < css::uno::XWeak * >( this ) ); + throw css::io::BufferSizeExceededException( OUString(), static_cast < css::uno::XWeak * >( this ) ); if (mpStream->IsEof()) { @@ -212,7 +212,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); checkError(); @@ -224,7 +224,7 @@ throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeE { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); @@ -245,7 +245,7 @@ throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeE { ::osl::MutexGuard aGuard( maMutex ); if ( mbInClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); mbInClosed = sal_True; @@ -269,20 +269,20 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs { ::osl::MutexGuard aGuard( maMutex ); if ( mbOutClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); sal_uInt32 nWritten = mpStream->Write(aData.getConstArray(),aData.getLength()); checkError(); if ( nWritten != (sal_uInt32)aData.getLength()) - throw css::io::BufferSizeExceededException( ::rtl::OUString(),static_cast < css::uno::XWeak * > ( this ) ); + throw css::io::BufferSizeExceededException( OUString(),static_cast < css::uno::XWeak * > ( this ) ); } void SAL_CALL OTempFileService::flush( ) throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); if ( mbOutClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); checkConnected(); mpStream->Flush(); @@ -293,7 +293,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs { ::osl::MutexGuard aGuard( maMutex ); if ( mbOutClosed ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); mbOutClosed = sal_True; @@ -325,7 +325,7 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs void OTempFileService::checkError () const { if (!mpStream || mpStream->SvStream::GetError () != ERRCODE_NONE ) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); } void OTempFileService::checkConnected () { @@ -349,7 +349,7 @@ void OTempFileService::checkConnected () } if (!mpStream) - throw css::io::NotConnectedException ( ::rtl::OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); + throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); } // XSeekable @@ -423,20 +423,20 @@ throw ( css::io::IOException, css::uno::RuntimeException ) // XServiceInfo -::rtl::OUString SAL_CALL OTempFileService::getImplementationName() +OUString SAL_CALL OTempFileService::getImplementationName() throw ( css::uno::RuntimeException ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL OTempFileService::supportsService( ::rtl::OUString const & rServiceName ) +sal_Bool SAL_CALL OTempFileService::supportsService( OUString const & rServiceName ) throw ( css::uno::RuntimeException ) { - css::uno::Sequence< ::rtl::OUString > aServices(getSupportedServiceNames_Static()); + css::uno::Sequence< OUString > aServices(getSupportedServiceNames_Static()); return rServiceName == aServices[0]; } -css::uno::Sequence < ::rtl::OUString > SAL_CALL OTempFileService::getSupportedServiceNames() +css::uno::Sequence < OUString > SAL_CALL OTempFileService::getSupportedServiceNames() throw ( css::uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -444,13 +444,13 @@ throw ( css::uno::RuntimeException ) -::rtl::OUString OTempFileService::getImplementationName_Static () +OUString OTempFileService::getImplementationName_Static () { - return ::rtl::OUString ( "com.sun.star.io.comp.TempFile" ); + return OUString ( "com.sun.star.io.comp.TempFile" ); } -css::uno::Sequence < ::rtl::OUString > OTempFileService::getSupportedServiceNames_Static() +css::uno::Sequence < OUString > OTempFileService::getSupportedServiceNames_Static() { - css::uno::Sequence < ::rtl::OUString > aNames ( 1 ); + css::uno::Sequence < OUString > aNames ( 1 ); aNames[0] = "com.sun.star.io.TempFile"; return aNames; } |