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/inc/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/inc/unotools')
24 files changed, 254 insertions, 261 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; }; |