diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-23 12:06:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-24 14:43:34 +0200 |
| commit | 6f50961e69406a17d6ec998956a6b33208b1001b (patch) | |
| tree | 413c83df969e73c5cba1e11ef3740afc748ee1f5 /include | |
| parent | 4e729de73f2947155248f8df5897380611b87917 (diff) | |
remove more rtl::OUString and OString prefixes
which seem to have snuck back in since the great rounds of removals.
Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
43 files changed, 334 insertions, 334 deletions
diff --git a/include/comphelper/DisableInteractionHelper.hxx b/include/comphelper/DisableInteractionHelper.hxx index 7d99112edeaa..da513b9b23eb 100644 --- a/include/comphelper/DisableInteractionHelper.hxx +++ b/include/comphelper/DisableInteractionHelper.hxx @@ -29,7 +29,7 @@ public: private: virtual ~NoEnableJavaInteractionContext() override {} - virtual css::uno::Any SAL_CALL getValueByName(rtl::OUString const& Name) override + virtual css::uno::Any SAL_CALL getValueByName(OUString const& Name) override { if (Name == "DontEnableJava") return css::uno::Any(true); diff --git a/include/comphelper/backupfilehelper.hxx b/include/comphelper/backupfilehelper.hxx index 33042e917ec3..70dd77667826 100644 --- a/include/comphelper/backupfilehelper.hxx +++ b/include/comphelper/backupfilehelper.hxx @@ -184,7 +184,7 @@ namespace comphelper private: // internal helper methods - static const rtl::OUString getPackURL(); + static const OUString getPackURL(); static const std::vector< OUString >& getCustomizationDirNames(); static const std::vector< OUString >& getCustomizationFileNames(); diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx index 240545848b30..b45d584c9c7a 100644 --- a/include/comphelper/docpasswordhelper.hxx +++ b/include/comphelper/docpasswordhelper.hxx @@ -219,11 +219,11 @@ public: @return the raw hash value as sal_Int8 sequence. */ static css::uno::Sequence<sal_Int8> GetOoxHashAsSequence( - const rtl::OUString& rPassword, - const rtl::OUString& rSaltValue, + const OUString& rPassword, + const OUString& rSaltValue, sal_uInt32 nSpinCount, comphelper::Hash::IterCount eIterCount, - const rtl::OUString& rAlgorithmName); + const OUString& rAlgorithmName); /** Convenience function to calculate a salted hash with iterations as @@ -264,12 +264,12 @@ public: @return the base64 encoded string of the hash value, that can be compared against a stored base64 encoded hash value. */ - static rtl::OUString GetOoxHashAsBase64( - const rtl::OUString& rPassword, - const rtl::OUString& rSaltValue, + static OUString GetOoxHashAsBase64( + const OUString& rPassword, + const OUString& rSaltValue, sal_uInt32 nSpinCount, comphelper::Hash::IterCount eIterCount, - const rtl::OUString& rAlgorithmName); + const OUString& rAlgorithmName); /** Convenience function to calculate a salted hash with iterations as @@ -309,11 +309,11 @@ public: @return the raw the hash value. */ static std::vector<unsigned char> GetOoxHashAsVector( - const rtl::OUString& rPassword, + const OUString& rPassword, const std::vector<unsigned char>& rSaltValue, sal_uInt32 nSpinCount, comphelper::Hash::IterCount eIterCount, - const rtl::OUString& rAlgorithmName); + const OUString& rAlgorithmName); /** This helper function generates a random sequence of bytes of diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx index 6a44d737c5dd..e95c00410249 100644 --- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx +++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx @@ -82,19 +82,19 @@ namespace drawinglayer double getStrikeoutOffset() const; double getTextWidth( - const rtl::OUString& rText, + const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength) const; void getTextOutlines( basegfx::B2DPolyPolygonVector&, - const rtl::OUString& rText, + const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength, const ::std::vector< double >& rDXArray) const; basegfx::B2DRange getTextBoundRect( - const rtl::OUString& rText, + const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength) const; @@ -103,12 +103,12 @@ namespace drawinglayer void addTextRectActions( const tools::Rectangle& rRectangle, - const rtl::OUString& rText, + const OUString& rText, DrawTextFlags nStyle, GDIMetaFile& rGDIMetaFile) const; ::std::vector< double > getTextArray( - const rtl::OUString& rText, + const OUString& rText, sal_uInt32 nIndex, sal_uInt32 nLength) const; }; diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx index 1f3f8923e062..91f8dc109276 100644 --- a/include/framework/addonmenu.hxx +++ b/include/framework/addonmenu.hxx @@ -63,7 +63,7 @@ class FWE_DLLPUBLIC AddonMenuManager sal_uInt16& nUniqueMenuId, const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& aAddonMenuDefinition, const css::uno::Reference< css::frame::XFrame >& rFrame, - const ::rtl::OUString& rModuleIdentifier ); + const OUString& rModuleIdentifier ); // Retrieve the menu entry property values from a sequence static void GetMenuEntry( const css::uno::Sequence< css::beans::PropertyValue >& rAddonMenuEntry, diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 001d248f7dc5..2da3a8c4f4a3 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -71,10 +71,10 @@ typedef ::std::vector< MergeToolbarInstruction > MergeToolbarInstructionContaine struct FWE_DLLPUBLIC MergeStatusbarInstruction { - ::rtl::OUString aMergePoint; - ::rtl::OUString aMergeCommand; - ::rtl::OUString aMergeCommandParameter; - ::rtl::OUString aMergeContext; + OUString aMergePoint; + OUString aMergeCommand; + OUString aMergeCommandParameter; + OUString aMergeContext; css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > aMergeStatusbarItems; }; diff --git a/include/o3tl/string_view.hxx b/include/o3tl/string_view.hxx index 303e4800af79..bdc81e8d7261 100644 --- a/include/o3tl/string_view.hxx +++ b/include/o3tl/string_view.hxx @@ -28,7 +28,7 @@ #include <sal/types.h> // An approximation of C++17 <string_view>, including implicit conversion -// from rtl::OString and rtl::OUString. +// from OString and OUString. namespace o3tl { @@ -547,7 +547,7 @@ public: data_(s.data()), size_(s.size()) {} // For std::string_view, this will be provided by a (LIBO_INTERNAL_ONLY) - // non-explicit conversion operator from rtl::OString: + // non-explicit conversion operator from OString: template<typename T = charT> basic_string_view( OString const & s, typename std::enable_if< @@ -556,7 +556,7 @@ public: data_(s.getStr()), size_(s.getLength()) {} // For std::u16string_view, this will be provided by a (LIBO_INTERNAL_ONLY) - // non-explicit conversion operator from rtl::OUString: + // non-explicit conversion operator from OUString: template<typename T = charT> basic_string_view( OUString const & s, typename std::enable_if< @@ -566,10 +566,10 @@ public: // For std::u16string_view, this would either be provided by a // (LIBO_INTERNAL_ONLY) non-explicit conversion operator from - // rtl::OUStringLiteral, or rtl::OUStringLiteral would be given up in favor + // OUStringLiteral, or OUStringLiteral would be given up in favor // of std::u16string_view anyway (but this constructor also serves to reject // as ambiguous construction of a o3tl::u16string_view from a narrow string - // literal, which would otherwise go via the above rtl::OUString + // literal, which would otherwise go via the above OUString // constructor): template<typename T = charT> constexpr basic_string_view( OUStringLiteral literal, @@ -858,7 +858,7 @@ namespace o3tl { // LO-specific convenience functions: // For std::u16string_view, this will be provided by a (LIBO_INTERNAL_ONLY) -// rtl::OUString constructor: +// OUString constructor: inline OUString toOUString(u16string_view s) { return OUString(s.data(), s.size()); } diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx index b37b6659a443..8b99b8523d77 100644 --- a/include/oox/drawingml/clrscheme.hxx +++ b/include/oox/drawingml/clrscheme.hxx @@ -49,7 +49,7 @@ enum PredefinedClrSchemeId { Count }; -static std::map<PredefinedClrSchemeId, rtl::OUString> PredefinedClrNames = +static std::map<PredefinedClrSchemeId, OUString> PredefinedClrNames = { //{ dk1, "dk1" }, //{ lt1, "lt1" }, diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 3d67e49b23c3..b53988e2f908 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -598,8 +598,8 @@ public: sal_uInt32 mnTabStyle; sal_uInt32 mnTabData; sal_uInt32 mnVariousPropertyBits; - std::vector< ::rtl::OUString > maItems; // captions for each tab - std::vector< ::rtl::OUString > maTabNames; // names for each tab + std::vector< OUString > maItems; // captions for each tab + std::vector< OUString > maTabNames; // names for each tab }; diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index f8fde406d06a..58199fc463f6 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -198,7 +198,7 @@ private: OUString maPrjName; ///< Name of the VBA project. css::uno::Reference< css::container::XNameContainer > mxOleOverridesSink; - typedef RefMap< rtl::OUString, VbaModule > VbaModuleMap; + typedef RefMap< OUString, VbaModule > VbaModuleMap; VbaModuleMap maModules; VbaModuleMap maModulesByStrm; }; diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index 55e7afedcb50..2bab907e884f 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -101,8 +101,8 @@ struct OOX_DLLPUBLIC ShapeTypeModel OptValue< OUString > moGraphicTitle; ///< Title of the graphic. OptValue< OUString > moWrapAnchorX; ///< The base object from which our horizontal positioning should be calculated. OptValue< OUString > moWrapAnchorY; ///< The base object from which our vertical positioning should be calculated. - OptValue< ::rtl::OUString > moWrapType; ///< How to wrap the text around the object - OptValue< ::rtl::OUString > moWrapSide; ///< On which side to wrap the text around the object + OptValue< OUString > moWrapType; ///< How to wrap the text around the object + OptValue< OUString > moWrapSide; ///< On which side to wrap the text around the object OUString maVTextAnchor; ///< How the text inside the shape is anchored vertically. OUString maWrapDistanceLeft; ///< Distance from the left side of the shape to the text that wraps around it. OUString maWrapDistanceRight; ///< Distance from the right side of the shape to the text that wraps around it. diff --git a/include/registry/reader.hxx b/include/registry/reader.hxx index d25e719119ed..a41327f5e928 100644 --- a/include/registry/reader.hxx +++ b/include/registry/reader.hxx @@ -124,13 +124,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getDocumentation() const { + OUString getDocumentation() const { rtl_uString * s = nullptr; typereg_reader_getDocumentation(m_handle, &s); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -142,13 +142,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs @deprecated */ - rtl::OUString getFileName() const { + OUString getFileName() const { rtl_uString * s = nullptr; typereg_reader_getFileName(m_handle, &s); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -183,13 +183,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getTypeName() const { + OUString getTypeName() const { rtl_uString * s = nullptr; typereg_reader_getTypeName(m_handle, &s); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -212,13 +212,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getSuperTypeName(sal_uInt16 index) const { + OUString getSuperTypeName(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getSuperTypeName(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -240,13 +240,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getFieldDocumentation(sal_uInt16 index) const { + OUString getFieldDocumentation(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getFieldDocumentation(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -259,13 +259,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs @deprecated */ - rtl::OUString getFieldFileName(sal_uInt16 index) const { + OUString getFieldFileName(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getFieldFileName(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -288,13 +288,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getFieldName(sal_uInt16 index) const { + OUString getFieldName(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getFieldName(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -306,13 +306,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getFieldTypeName(sal_uInt16 index) const { + OUString getFieldTypeName(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getFieldTypeName(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -353,13 +353,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getMethodDocumentation(sal_uInt16 index) const { + OUString getMethodDocumentation(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getMethodDocumentation(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -382,13 +382,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getMethodName(sal_uInt16 index) const { + OUString getMethodName(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getMethodName(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -400,13 +400,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getMethodReturnTypeName(sal_uInt16 index) const { + OUString getMethodReturnTypeName(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getMethodReturnTypeName(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -451,7 +451,7 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getMethodParameterName( + OUString getMethodParameterName( sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const { rtl_uString * s = nullptr; @@ -460,7 +460,7 @@ public: if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -476,7 +476,7 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getMethodParameterTypeName( + OUString getMethodParameterTypeName( sal_uInt16 methodIndex, sal_uInt16 parameterIndex) const { rtl_uString * s = nullptr; @@ -485,7 +485,7 @@ public: if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -512,7 +512,7 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getMethodExceptionTypeName( + OUString getMethodExceptionTypeName( sal_uInt16 methodIndex, sal_uInt16 exceptionIndex) const { rtl_uString * s = nullptr; @@ -521,7 +521,7 @@ public: if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -544,13 +544,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getReferenceDocumentation(sal_uInt16 index) const { + OUString getReferenceDocumentation(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getReferenceDocumentation(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } /** @@ -587,13 +587,13 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - rtl::OUString getReferenceTypeName(sal_uInt16 index) const { + OUString getReferenceTypeName(sal_uInt16 index) const { rtl_uString * s = nullptr; typereg_reader_getReferenceTypeName(m_handle, &s, index); if (s == nullptr) { throw std::bad_alloc(); } - return rtl::OUString(s, SAL_NO_ACQUIRE); + return OUString(s, SAL_NO_ACQUIRE); } private: diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx index 41e86c07c08d..0cd7d576f644 100644 --- a/include/registry/registry.hxx +++ b/include/registry/registry.hxx @@ -125,14 +125,14 @@ public: inline RegError openRootKey(RegistryKey& rRootKey); /// returns the name of the current registry data file. - inline rtl::OUString getName(); + inline OUString getName(); /** creates a new registry with the specified name and creates a root key. @param registryName specifies the name of the new registry. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError create(const rtl::OUString& registryName); + inline RegError create(const OUString& registryName); /** opens a registry with the specified name. @@ -141,7 +141,7 @@ public: @param accessMode specifies the access mode for the registry, RegAccessMode::READONLY or RegAccessMode::READWRITE. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError open(const rtl::OUString& registryName, + inline RegError open(const OUString& registryName, RegAccessMode accessMode); /// closes explicitly the current registry data file. @@ -153,7 +153,7 @@ public: itself will be destroyed. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError destroy(const rtl::OUString& registryName); + inline RegError destroy(const OUString& registryName); /** merges the registry information of the specified key with the registry information of the specified file. @@ -170,8 +170,8 @@ public: restore the state before merging. */ inline RegError mergeKey(RegistryKey& rKey, - const rtl::OUString& keyName, - const rtl::OUString& regFileName, + const OUString& keyName, + const OUString& regFileName, bool bReport); friend class RegistryKey; @@ -241,7 +241,7 @@ public: inline ~RegistryKeyNames(); /// returns the name of the key specified by index. - inline rtl::OUString getElement(sal_uInt32 index); + inline OUString getElement(sal_uInt32 index); /// returns the length of the array. inline sal_uInt32 getLength() const; @@ -368,7 +368,7 @@ public: inline bool isReadOnly() const; /// returns the full qualified name of the key beginning with the rootkey. - inline rtl::OUString getName(); + inline OUString getName(); /** creates a new key or opens a key if the specified key already exists. @@ -377,7 +377,7 @@ public: @param rNewKey references a RegistryKey which will be filled with the new or open key. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError createKey(const rtl::OUString& keyName, + inline RegError createKey(const OUString& keyName, RegistryKey& rNewKey); /** opens the specified key. @@ -387,7 +387,7 @@ public: @param rOpenKey references a RegistryKey which will be filled with the open key. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError openKey(const rtl::OUString& keyName, + inline RegError openKey(const OUString& keyName, RegistryKey& rOpenKey); /** opens all subkeys of the specified key. @@ -397,7 +397,7 @@ public: @param rSubKeys reference a RegistryKeyArray which will be filled with the open subkeys. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError openSubKeys(const rtl::OUString& keyName, + inline RegError openSubKeys(const OUString& keyName, RegistryKeyArray& rSubKeys); /** returns an array with the names of all subkeys of the specified key. @@ -407,7 +407,7 @@ public: @param rSubKeyNames reference a RegistryKeyNames array which will be filled with the subkey names. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError getKeyNames(const rtl::OUString& keyName, + inline RegError getKeyNames(const OUString& keyName, RegistryKeyNames& rSubKeyNames); /** deletes the specified key. @@ -415,7 +415,7 @@ public: @param keyName specifies the name of the key which will be deleted. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError deleteKey(const rtl::OUString& keyName); + inline RegError deleteKey(const OUString& keyName); /// closes explicitly the current key inline RegError closeKey(); @@ -433,7 +433,7 @@ public: @param valueSize specifies the size of pData in bytes @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError setValue(const rtl::OUString& keyName, + inline RegError setValue(const OUString& keyName, RegValueType valueType, RegValue pValue, sal_uInt32 valueSize); @@ -447,7 +447,7 @@ public: @param len specifies the length of the list (the array referenced by pValueList). @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError setLongListValue(const rtl::OUString& keyName, + inline RegError setLongListValue(const OUString& keyName, sal_Int32 const * pValueList, sal_uInt32 len); @@ -460,7 +460,7 @@ public: @param len specifies the length of the list (the array referenced by pValueList). @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError setStringListValue(const rtl::OUString& keyName, + inline RegError setStringListValue(const OUString& keyName, sal_Char** pValueList, sal_uInt32 len); @@ -473,7 +473,7 @@ public: @param len specifies the length of the list (the array referenced by pValueList). @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError setUnicodeListValue(const rtl::OUString& keyName, + inline RegError setUnicodeListValue(const OUString& keyName, sal_Unicode** pValueList, sal_uInt32 len); @@ -486,7 +486,7 @@ public: @param pValueSize returns the size of the value in bytes or the length of a list value. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError getValueInfo(const rtl::OUString& keyName, + inline RegError getValueInfo(const OUString& keyName, RegValueType* pValueType, sal_uInt32* pValueSize); @@ -498,7 +498,7 @@ public: @param pValue points to an allocated memory block receiving the data of the value. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError getValue(const rtl::OUString& keyName, + inline RegError getValue(const OUString& keyName, RegValue pValue); /** gets a long list value of a key. @@ -509,7 +509,7 @@ public: @param rValueList references a RegistryValueList which will be filled with the long values. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError getLongListValue(const rtl::OUString& keyName, + inline RegError getLongListValue(const OUString& keyName, RegistryValueList<sal_Int32>& rValueList); /** gets an ascii list value of a key. @@ -520,7 +520,7 @@ public: @param rValueList references a RegistryValueList which will be filled with the ascii values. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError getStringListValue(const rtl::OUString& keyName, + inline RegError getStringListValue(const OUString& keyName, RegistryValueList<sal_Char*>& rValueList); /** gets a unicode value of a key. @@ -531,7 +531,7 @@ public: @param rValueList reference a RegistryValueList which will be filled with the unicode values. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError getUnicodeListValue(const rtl::OUString& keyName, + inline RegError getUnicodeListValue(const OUString& keyName, RegistryValueList<sal_Unicode*>& rValueList); /** resolves a keyname. @@ -541,11 +541,11 @@ public: @param[out] rResolvedName the resolved name. @return RegError::NO_ERROR if succeeds else an error code. */ - inline RegError getResolvedKeyName(const rtl::OUString& keyName, - rtl::OUString& rResolvedName) const; + inline RegError getResolvedKeyName(const OUString& keyName, + OUString& rResolvedName) const; /// returns the name of the registry in which the key is defined. - inline rtl::OUString getRegistryName(); + inline OUString getRegistryName(); friend class Registry; public: @@ -618,13 +618,13 @@ inline RegistryKeyNames::~RegistryKeyNames() m_registry.m_pApi->freeKeyNames(m_pKeyNames, m_length); } -inline rtl::OUString RegistryKeyNames::getElement(sal_uInt32 index) +inline OUString RegistryKeyNames::getElement(sal_uInt32 index) { if (m_pKeyNames && index < m_length) return m_pKeyNames[index]; else - return rtl::OUString(); + return OUString(); } inline sal_uInt32 RegistryKeyNames::getLength() const @@ -700,15 +700,15 @@ inline bool RegistryKey::isReadOnly() const return false; } -inline rtl::OUString RegistryKey::getName() +inline OUString RegistryKey::getName() { - rtl::OUString sRet; + OUString sRet; if (m_registry.isValid()) m_registry.m_pApi->getKeyName(m_hImpl, &sRet.pData); return sRet; } -inline RegError RegistryKey::createKey(const rtl::OUString& keyName, +inline RegError RegistryKey::createKey(const OUString& keyName, RegistryKey& rNewKey) { if (rNewKey.isValid()) rNewKey.closeKey(); @@ -721,7 +721,7 @@ inline RegError RegistryKey::createKey(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::openKey(const rtl::OUString& keyName, +inline RegError RegistryKey::openKey(const OUString& keyName, RegistryKey& rOpenKey) { if (rOpenKey.isValid()) rOpenKey.closeKey(); @@ -735,7 +735,7 @@ inline RegError RegistryKey::openKey(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::openSubKeys(const rtl::OUString& keyName, +inline RegError RegistryKey::openSubKeys(const OUString& keyName, RegistryKeyArray& rSubKeys) { if (m_registry.isValid()) @@ -757,7 +757,7 @@ inline RegError RegistryKey::openSubKeys(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::getKeyNames(const rtl::OUString& keyName, +inline RegError RegistryKey::getKeyNames(const OUString& keyName, RegistryKeyNames& rSubKeyNames) { if (m_registry.isValid()) @@ -779,7 +779,7 @@ inline RegError RegistryKey::getKeyNames(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::deleteKey(const rtl::OUString& keyName) +inline RegError RegistryKey::deleteKey(const OUString& keyName) { if (m_registry.isValid()) return m_registry.m_pApi->deleteKey(m_hImpl, keyName.pData); @@ -811,7 +811,7 @@ inline void RegistryKey::releaseKey() } } -inline RegError RegistryKey::setValue(const rtl::OUString& keyName, +inline RegError RegistryKey::setValue(const OUString& keyName, RegValueType valueType, RegValue pValue, sal_uInt32 valueSize) @@ -823,7 +823,7 @@ inline RegError RegistryKey::setValue(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::setLongListValue(const rtl::OUString& keyName, +inline RegError RegistryKey::setLongListValue(const OUString& keyName, sal_Int32 const * pValueList, sal_uInt32 len) { @@ -834,7 +834,7 @@ inline RegError RegistryKey::setLongListValue(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::setStringListValue(const rtl::OUString& keyName, +inline RegError RegistryKey::setStringListValue(const OUString& keyName, sal_Char** pValueList, sal_uInt32 len) { @@ -845,7 +845,7 @@ inline RegError RegistryKey::setStringListValue(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::setUnicodeListValue(const rtl::OUString& keyName, +inline RegError RegistryKey::setUnicodeListValue(const OUString& keyName, sal_Unicode** pValueList, sal_uInt32 len) { @@ -856,7 +856,7 @@ inline RegError RegistryKey::setUnicodeListValue(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::getValueInfo(const rtl::OUString& keyName, +inline RegError RegistryKey::getValueInfo(const OUString& keyName, RegValueType* pValueType, sal_uInt32* pValueSize) { @@ -866,7 +866,7 @@ inline RegError RegistryKey::getValueInfo(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::getValue(const rtl::OUString& keyName, +inline RegError RegistryKey::getValue(const OUString& keyName, RegValue pValue) { if (m_registry.isValid()) @@ -875,7 +875,7 @@ inline RegError RegistryKey::getValue(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::getLongListValue(const rtl::OUString& keyName, +inline RegError RegistryKey::getLongListValue(const OUString& keyName, RegistryValueList<sal_Int32>& rValueList) { if (m_registry.isValid()) @@ -898,7 +898,7 @@ inline RegError RegistryKey::getLongListValue(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::getStringListValue(const rtl::OUString& keyName, +inline RegError RegistryKey::getStringListValue(const OUString& keyName, RegistryValueList<sal_Char*>& rValueList) { if (m_registry.isValid()) @@ -921,7 +921,7 @@ inline RegError RegistryKey::getStringListValue(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::getUnicodeListValue(const rtl::OUString& keyName, +inline RegError RegistryKey::getUnicodeListValue(const OUString& keyName, RegistryValueList<sal_Unicode*>& rValueList) { if (m_registry.isValid()) @@ -944,8 +944,8 @@ inline RegError RegistryKey::getUnicodeListValue(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline RegError RegistryKey::getResolvedKeyName(const rtl::OUString& keyName, - rtl::OUString& rResolvedName) const +inline RegError RegistryKey::getResolvedKeyName(const OUString& keyName, + OUString& rResolvedName) const { if (m_registry.isValid()) return m_registry.m_pApi->getResolvedKeyName(m_hImpl, @@ -956,13 +956,13 @@ inline RegError RegistryKey::getResolvedKeyName(const rtl::OUString& keyName, return RegError::INVALID_KEY; } -inline rtl::OUString RegistryKey::getRegistryName() +inline OUString RegistryKey::getRegistryName() { if (m_registry.isValid()) { return m_registry.getName(); } else - return rtl::OUString(); + return OUString(); } @@ -1011,21 +1011,21 @@ inline RegError Registry::openRootKey(RegistryKey& rRootKey) return m_pApi->openRootKey(m_hImpl, &rRootKey.m_hImpl); } -inline rtl::OUString Registry::getName() +inline OUString Registry::getName() { - rtl::OUString sRet; + OUString sRet; m_pApi->getName(m_hImpl, &sRet.pData); return sRet; } -inline RegError Registry::create(const rtl::OUString& registryName) +inline RegError Registry::create(const OUString& registryName) { if (m_hImpl) m_pApi->release(m_hImpl); return m_pApi->createRegistry(registryName.pData, &m_hImpl); } -inline RegError Registry::open(const rtl::OUString& registryName, +inline RegError Registry::open(const OUString& registryName, RegAccessMode accessMode) { if (m_hImpl) @@ -1041,7 +1041,7 @@ inline RegError Registry::close() return ret; } -inline RegError Registry::destroy(const rtl::OUString& registryName) +inline RegError Registry::destroy(const OUString& registryName) { RegError ret = m_pApi->destroyRegistry(m_hImpl, registryName.pData); if ( ret == RegError::NO_ERROR && registryName.isEmpty() ) @@ -1050,8 +1050,8 @@ inline RegError Registry::destroy(const rtl::OUString& registryName) } inline RegError Registry::mergeKey(RegistryKey& rKey, - const rtl::OUString& keyName, - const rtl::OUString& regFileName, + const OUString& keyName, + const OUString& regFileName, bool bReport) { return m_pApi->mergeKey(m_hImpl, rKey.m_hImpl, keyName.pData, regFileName.pData, false/*bWarnings*/, bReport); } diff --git a/include/registry/writer.hxx b/include/registry/writer.hxx index 7e3bfbd7e9bc..17d6838bd831 100644 --- a/include/registry/writer.hxx +++ b/include/registry/writer.hxx @@ -70,9 +70,9 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ Writer( - typereg_Version version, rtl::OUString const & documentation, - rtl::OUString const & fileName, RTTypeClass typeClass, bool published, - rtl::OUString const & typeName, sal_uInt16 superTypeCount, + typereg_Version version, OUString const & documentation, + OUString const & fileName, RTTypeClass typeClass, bool published, + OUString const & typeName, sal_uInt16 superTypeCount, sal_uInt16 fieldCount, sal_uInt16 methodCount, sal_uInt16 referenceCount): m_handle( @@ -103,7 +103,7 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ - void setSuperTypeName(sal_uInt16 index, rtl::OUString const & typeName) { + void setSuperTypeName(sal_uInt16 index, OUString const & typeName) { if (!typereg_writer_setSuperTypeName(m_handle, index, typeName.pData)) { throw std::bad_alloc(); } @@ -129,9 +129,9 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ void setFieldData( - sal_uInt16 index, rtl::OUString const & documentation, - rtl::OUString const & fileName, RTFieldAccess flags, rtl::OUString const & name, - rtl::OUString const & typeName, RTConstValue const & value) + sal_uInt16 index, OUString const & documentation, + OUString const & fileName, RTFieldAccess flags, OUString const & name, + OUString const & typeName, RTConstValue const & value) { if (!typereg_writer_setFieldData( m_handle, index, documentation.pData, fileName.pData, flags, @@ -161,9 +161,9 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ void setMethodData( - sal_uInt16 index, rtl::OUString const & documentation, - RTMethodMode flags, rtl::OUString const & name, - rtl::OUString const & returnTypeName, sal_uInt16 parameterCount, + sal_uInt16 index, OUString const & documentation, + RTMethodMode flags, OUString const & name, + OUString const & returnTypeName, sal_uInt16 parameterCount, sal_uInt16 exceptionCount) { if (!typereg_writer_setMethodData( @@ -193,8 +193,8 @@ public: */ void setMethodParameterData( sal_uInt16 methodIndex, sal_uInt16 parameterIndex, - RTParamMode flags, rtl::OUString const & name, - rtl::OUString const & typeName) const + RTParamMode flags, OUString const & name, + OUString const & typeName) const { if (!typereg_writer_setMethodParameterData( m_handle, methodIndex, parameterIndex, flags, name.pData, @@ -219,7 +219,7 @@ public: */ void setMethodExceptionTypeName( sal_uInt16 methodIndex, sal_uInt16 exceptionIndex, - rtl::OUString const & typeName) + OUString const & typeName) { if (!typereg_writer_setMethodExceptionTypeName( m_handle, methodIndex, exceptionIndex, typeName.pData)) @@ -245,9 +245,9 @@ public: @exception std::bad_alloc is raised if an out-of-memory condition occurs */ void setReferenceData( - sal_uInt16 index, rtl::OUString const & documentation, + sal_uInt16 index, OUString const & documentation, RTReferenceType sort, RTFieldAccess flags, - rtl::OUString const & typeName) + OUString const & typeName) { if (!typereg_writer_setReferenceData( m_handle, index, documentation.pData, sort, flags, diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx index 7d592f1fe03f..b0323cb11696 100644 --- a/include/sfx2/linksrc.hxx +++ b/include/sfx2/linksrc.hxx @@ -68,14 +68,14 @@ public: void SetUpdateTimeout( sal_uInt64 nTimeMs ); // notify the sink, the mime type is not // a selection criterion - void DataChanged( const rtl::OUString & rMimeType, + void DataChanged( const OUString & rMimeType, const css::uno::Any & rVal ); void SendDataChanged(); void NotifyDataChanged(); virtual bool Connect( SvBaseLink* ); virtual bool GetData( css::uno::Any & rData /*out param*/, - const rtl::OUString & rMimeType, + const OUString & rMimeType, bool bSynchron = false ); // sal_True => waitinmg for data @@ -86,7 +86,7 @@ public: virtual void Edit(weld::Window *, SvBaseLink *, const Link<const OUString&, void>& rEndEditHdl); - void AddDataAdvise( SvBaseLink *, const rtl::OUString & rMimeType, + void AddDataAdvise( SvBaseLink *, const OUString & rMimeType, sal_uInt16 nAdviceMode ); void RemoveAllDataAdvise( SvBaseLink const * ); diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx index dbe529cdab29..0734998c7357 100644 --- a/include/sfx2/progress.hxx +++ b/include/sfx2/progress.hxx @@ -42,12 +42,12 @@ class SFX2_DLLPUBLIC SfxProgress public: SfxProgress( SfxObjectShell* pObjSh, - const rtl::OUString& rText, + const OUString& rText, sal_uInt32 nRange, bool bWait = true); virtual ~SfxProgress(); - void SetStateText( sal_uInt32 nVal, const rtl::OUString &rVal ); + void SetStateText( sal_uInt32 nVal, const OUString &rVal ); void SetState( sal_uInt32 nVal, sal_uInt32 nNewRange = 0 ); sal_uInt32 GetState() const { return nVal; } diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index fa7ad8aeadbe..c6c7b243f62c 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -99,8 +99,8 @@ class SfxAbstractPasteDialog : virtual public VclAbstractDialog protected: virtual ~SfxAbstractPasteDialog() override = default; public: - virtual void Insert( SotClipboardFormatId nFormat, const rtl::OUString & rFormatName ) = 0; - virtual void SetObjName( const SvGlobalName & rClass, const rtl::OUString & rObjName ) = 0; + virtual void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName ) = 0; + virtual void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ) = 0; virtual SotClipboardFormatId GetFormat( const TransferableDataHelper& aHelper ) = 0; }; @@ -115,7 +115,7 @@ class AbstractScriptSelectorDialog : virtual public VclAbstractDialog protected: virtual ~AbstractScriptSelectorDialog() override = default; public: - virtual rtl::OUString GetScriptURL() const = 0; + virtual OUString GetScriptURL() const = 0; virtual void SetRunLabel() = 0; }; @@ -126,7 +126,7 @@ class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialog public: virtual ~SfxAbstractDialogFactory() override; // needed for export of vtable static SfxAbstractDialogFactory* Create(); - virtual VclPtr<VclAbstractDialog> CreateFrameDialog(vcl::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0; + virtual VclPtr<VclAbstractDialog> CreateFrameDialog(vcl::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rFrame, sal_uInt32 nResId, const OUString& rParameter ) = 0; virtual VclPtr<SfxAbstractTabDialog> CreateAutoCorrTabDialog(vcl::Window* pParent, const SfxItemSet* pAttrSet) = 0; virtual VclPtr<SfxAbstractTabDialog> CreateCustomizeTabDialog( const SfxItemSet* pAttrSet, @@ -140,7 +140,7 @@ public: const css::uno::Reference < css::embed::XEmbeddedObject >& xObj )=0; virtual VclPtr<SfxAbstractPasteDialog> CreatePasteDialog(weld::Window* pParent) = 0; virtual VclPtr<SfxAbstractLinksDialog> CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=nullptr )=0; - virtual VclPtr<VclAbstractDialog> CreateSvxScriptOrgDialog( vcl::Window* pParent, const rtl::OUString& rLanguage ) = 0; + virtual VclPtr<VclAbstractDialog> CreateSvxScriptOrgDialog( vcl::Window* pParent, const OUString& rLanguage ) = 0; virtual VclPtr<AbstractScriptSelectorDialog> CreateScriptSelectorDialog( diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 0887c4f3dfe9..f137729540b1 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -458,7 +458,7 @@ public: /** Set the name of the sidebar context that is broadcast on calls to Activation(). */ - void SetContextName (const ::rtl::OUString& rsContextName); + void SetContextName (const OUString& rsContextName); /** Broadcast a sidebar context change. This method is typically called from Activate() or diff --git a/include/sfx2/sidebar/Context.hxx b/include/sfx2/sidebar/Context.hxx index d41b71d88403..aa6b2716cdd3 100644 --- a/include/sfx2/sidebar/Context.hxx +++ b/include/sfx2/sidebar/Context.hxx @@ -28,13 +28,13 @@ namespace sfx2 { namespace sidebar { class Context { public: - ::rtl::OUString msApplication; - ::rtl::OUString msContext; + OUString msApplication; + OUString msContext; Context(); Context ( - const ::rtl::OUString& rsApplication, - const ::rtl::OUString& rsContext); + const OUString& rsApplication, + const OUString& rsContext); /** When two contexts are matched against each other, then application or context name may have the wildcard value 'any'. diff --git a/include/sfx2/sidebar/ContextList.hxx b/include/sfx2/sidebar/ContextList.hxx index 7db19ffeb590..08ee70cb617a 100644 --- a/include/sfx2/sidebar/ContextList.hxx +++ b/include/sfx2/sidebar/ContextList.hxx @@ -39,7 +39,7 @@ public: public: Context maContext; bool mbIsInitiallyVisible; - ::rtl::OUString msMenuCommand; + OUString msMenuCommand; }; /** Return <TRUE/> when the given context matches any of the stored contexts. @@ -52,7 +52,7 @@ public: void AddContextDescription ( const Context& rContext, const bool bIsInitiallyVisible, - const ::rtl::OUString& rsMenuCommand); + const OUString& rsMenuCommand); void ToggleVisibilityForContext( const Context& rContext,const bool bIsInitiallyVisible ); const ::std::vector<Entry>& GetEntries() const {return maEntries;}; diff --git a/include/sfx2/sidebar/ControllerFactory.hxx b/include/sfx2/sidebar/ControllerFactory.hxx index feb40343afcb..83d631a1bed8 100644 --- a/include/sfx2/sidebar/ControllerFactory.hxx +++ b/include/sfx2/sidebar/ControllerFactory.hxx @@ -37,7 +37,7 @@ public: static css::uno::Reference<css::frame::XToolbarController> CreateToolBoxController( ToolBox* pToolBox, const sal_uInt16 nItemId, - const ::rtl::OUString& rsCommandName, + const OUString& rsCommandName, const css::uno::Reference<css::frame::XFrame>& rxFrame, const css::uno::Reference<css::frame::XController>& rxController, const css::uno::Reference<css::awt::XWindow>& rxParentWindow, @@ -46,7 +46,7 @@ public: private: static css::uno::Reference<css::frame::XToolbarController> CreateToolBarController( ToolBox* pToolBox, - const ::rtl::OUString& rsCommandName, + const OUString& rsCommandName, const css::uno::Reference<css::frame::XFrame>& rxFrame, const css::uno::Reference<css::frame::XController>& rxController, const sal_Int32 nWidth); diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx index c0d9ed9ba2d9..677391938a7b 100644 --- a/include/sfx2/sidebar/ResourceManager.hxx +++ b/include/sfx2/sidebar/ResourceManager.hxx @@ -102,7 +102,7 @@ private: typedef std::vector<std::shared_ptr<PanelDescriptor>> PanelContainer; PanelContainer maPanels; - mutable std::set<rtl::OUString> maProcessedApplications; + mutable std::set<OUString> maProcessedApplications; std::map<OUString, OUString> maLastActiveDecks; SvtMiscOptions const maMiscOptions; diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index 5064742c2a8b..be3a7a2db1a7 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -155,27 +155,27 @@ public: // beans::XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue ( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Any& rValue) override; virtual css::uno::Any SAL_CALL getPropertyValue ( - const ::rtl::OUString& rsPropertyName) override; + const OUString& rsPropertyName) override; virtual void SAL_CALL addPropertyChangeListener( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) override; virtual void SAL_CALL removePropertyChangeListener( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener) override; virtual void SAL_CALL addVetoableChangeListener( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) override; virtual void SAL_CALL removeVetoableChangeListener( - const ::rtl::OUString& rsPropertyName, + const OUString& rsPropertyName, const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener) override; // beans::XPropertySetInfo virtual css::uno::Sequence<css::beans::Property> SAL_CALL getProperties() override; - virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName) override; - virtual sal_Bool SAL_CALL hasPropertyByName (const ::rtl::OUString& rsName) override; + virtual css::beans::Property SAL_CALL getPropertyByName (const OUString& rsName) override; + virtual sal_Bool SAL_CALL hasPropertyByName (const OUString& rsName) override; private: static Theme& GetCurrentTheme(); @@ -189,9 +189,9 @@ private: bool mbIsHighContrastMode; bool mbIsHighContrastModeSetManually; - typedef std::unordered_map<rtl::OUString,ThemeItem> PropertyNameToIdMap; + typedef std::unordered_map<OUString,ThemeItem> PropertyNameToIdMap; PropertyNameToIdMap maPropertyNameToIdMap; - typedef std::vector<rtl::OUString> PropertyIdToNameMap; + typedef std::vector<OUString> PropertyIdToNameMap; PropertyIdToNameMap maPropertyIdToNameMap; typedef ::std::vector<css::uno::Any> RawValueContainer; RawValueContainer maRawValues; diff --git a/include/sfx2/sidebar/Tools.hxx b/include/sfx2/sidebar/Tools.hxx index c6b790975ad8..854de39e62da 100644 --- a/include/sfx2/sidebar/Tools.hxx +++ b/include/sfx2/sidebar/Tools.hxx @@ -37,23 +37,23 @@ class SFX2_DLLPUBLIC Tools { public: static Image GetImage ( - const ::rtl::OUString& rsImageURL, - const ::rtl::OUString& rsHighContrastImageURL, + const OUString& rsImageURL, + const OUString& rsHighContrastImageURL, const css::uno::Reference<css::frame::XFrame>& rxFrame); static Image GetImage ( - const ::rtl::OUString& rsURL, + const OUString& rsURL, const css::uno::Reference<css::frame::XFrame>& rxFrame); static css::awt::Gradient VclToAwtGradient (const Gradient& rGradient); static Gradient AwtToVclGradient (const css::awt::Gradient& rGradient); - static css::util::URL GetURL (const ::rtl::OUString& rsCommand); + static css::util::URL GetURL (const OUString& rsCommand); static css::uno::Reference<css::frame::XDispatch> GetDispatch ( const css::uno::Reference<css::frame::XFrame>& rxFrame, const css::util::URL& rURL); - static ::rtl::OUString GetModuleName ( + static OUString GetModuleName ( const css::uno::Reference<css::frame::XController>& rxFrame); }; diff --git a/include/store/store.hxx b/include/store/store.hxx index eee47c206577..fb4b430c5f2e 100644 --- a/include/store/store.hxx +++ b/include/store/store.hxx @@ -71,8 +71,8 @@ public: */ storeError create ( storeFileHandle hFile, - rtl::OUString const & rPath, - rtl::OUString const & rName, + OUString const & rPath, + OUString const & rName, storeAccessMode eMode) { if (m_hImpl) @@ -181,8 +181,8 @@ public: */ storeError create ( storeFileHandle hFile, - rtl::OUString const & rPath, - rtl::OUString const & rName, + OUString const & rPath, + OUString const & rName, storeAccessMode eMode) { if (m_hImpl) @@ -284,7 +284,7 @@ public: @see store_openFile() */ storeError create( - rtl::OUString const & rFilename, + OUString const & rFilename, storeAccessMode eAccessMode ) { if (m_hImpl) @@ -335,7 +335,7 @@ public: @see store_remove() */ storeError remove ( - rtl::OUString const & rPath, rtl::OUString const & rName) + OUString const & rPath, OUString const & rName) { if (!m_hImpl) return store_E_InvalidHandle; diff --git a/include/svl/IndexedStyleSheets.hxx b/include/svl/IndexedStyleSheets.hxx index eba5cded45bb..8196767f9a62 100644 --- a/include/svl/IndexedStyleSheets.hxx +++ b/include/svl/IndexedStyleSheets.hxx @@ -122,7 +122,7 @@ public: /** Obtain the positions of all styles which have a given name */ std::vector<unsigned> - FindPositionsByName(const rtl::OUString& name) const; + FindPositionsByName(const OUString& name) const; enum class SearchBehavior { ReturnAll, ReturnFirst }; /** Obtain the positions of all styles which have a certain name and fulfill a certain condition. @@ -130,7 +130,7 @@ public: * This method is fast because it can use the name-based index */ std::vector<unsigned> - FindPositionsByNameAndPredicate(const rtl::OUString& name, StyleSheetPredicate& predicate, + FindPositionsByNameAndPredicate(const OUString& name, StyleSheetPredicate& predicate, SearchBehavior behavior = SearchBehavior::ReturnAll) const; /** Obtain the positions of all styles which fulfill a certain condition. @@ -178,7 +178,7 @@ private: * * @internal * Must be an unordered map. A regular map is too slow for some files. */ - typedef std::unordered_multimap<rtl::OUString, unsigned> MapType; + typedef std::unordered_multimap<OUString, unsigned> MapType; /** A map which stores the positions of style sheets by their name */ MapType mPositionsByName; diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index d150192c1731..009d152d2dc0 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -63,7 +63,7 @@ class SvtRulerAccessible final : public ::cppu::BaseMutex, public SvtRulerAccess public: //===== internal ======================================================== SvtRulerAccessible( - const css::uno::Reference< css::accessibility::XAccessible>& rxParent, Ruler& rRepresentation, const ::rtl::OUString& rName ); + const css::uno::Reference< css::accessibility::XAccessible>& rxParent, Ruler& rRepresentation, const OUString& rName ); /// @throws css::uno::RuntimeException bool @@ -119,10 +119,10 @@ public: virtual sal_Int16 SAL_CALL getAccessibleRole() override; - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleDescription() override; - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getAccessibleName() override; virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL @@ -143,13 +143,13 @@ public: //===== XServiceInfo ==================================================== - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& sServiceName ) override; + supportsService( const OUString& sServiceName ) override; - virtual css::uno::Sequence< ::rtl::OUString> SAL_CALL + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override; //===== XTypeProvider =================================================== @@ -180,7 +180,7 @@ private: tools::Rectangle GetBoundingBox(); /// Name of this object. - ::rtl::OUString const msName; + OUString const msName; /// Reference to the parent object. css::uno::Reference< css::accessibility::XAccessible > diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx index 34d3bbb5dd3b..feaa9d537e60 100644 --- a/include/svtools/imagemgr.hxx +++ b/include/svtools/imagemgr.hxx @@ -116,7 +116,7 @@ struct VolumeInfo class SvFileInformationManager { private: - static rtl::OUString GetDescription_Impl( const INetURLObject& rObject, bool bDetectFolder ); + static OUString GetDescription_Impl( const INetURLObject& rObject, bool bDetectFolder ); public: SVT_DLLPUBLIC static OUString GetImageId( const INetURLObject& rURL ); @@ -126,9 +126,9 @@ public: SVT_DLLPUBLIC static Image GetImageNoDefault( const INetURLObject& rURL, bool bBig = false ); SVT_DLLPUBLIC static Image GetFolderImage( const svtools::VolumeInfo& rInfo ); - SVT_DLLPUBLIC static rtl::OUString GetDescription( const INetURLObject& rObject ); - SVT_DLLPUBLIC static rtl::OUString GetFileDescription( const INetURLObject& rObject ); - SVT_DLLPUBLIC static rtl::OUString GetFolderDescription( const svtools::VolumeInfo& rInfo ); + SVT_DLLPUBLIC static OUString GetDescription( const INetURLObject& rObject ); + SVT_DLLPUBLIC static OUString GetFileDescription( const INetURLObject& rObject ); + SVT_DLLPUBLIC static OUString GetFolderDescription( const svtools::VolumeInfo& rInfo ); }; #endif diff --git a/include/svtools/rtfout.hxx b/include/svtools/rtfout.hxx index d163abf33f87..2f8751faf29f 100644 --- a/include/svtools/rtfout.hxx +++ b/include/svtools/rtfout.hxx @@ -33,7 +33,7 @@ class SvStream; namespace RTFOutFuncs { SVT_DLLPUBLIC SvStream& Out_String( - SvStream&, const rtl::OUString&, + SvStream&, const OUString&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); } diff --git a/include/svtools/rtftoken.h b/include/svtools/rtftoken.h index 550a36f84321..15061a81c45c 100644 --- a/include/svtools/rtftoken.h +++ b/include/svtools/rtftoken.h @@ -25,7 +25,7 @@ namespace rtl { }; // search the TokenID for the token -int GetRTFToken( const rtl::OUString& rSearch ); +int GetRTFToken( const OUString& rSearch ); enum RTF_TOKEN_RANGES { RTF_NOGROUP = 0x0100, diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index e3d9cc80c9c2..1a9ac4f617c3 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -39,8 +39,8 @@ class SVX_DLLPUBLIC SvxGalleryItem : public SfxPoolItem { sal_Int8 m_nType; - rtl::OUString m_aURL; - rtl::OUString m_aFilterName; + OUString m_aURL; + OUString m_aFilterName; css::uno::Reference< css::lang::XComponent > m_xDrawing; css::uno::Reference< css::graphic::XGraphic > m_xGraphic; @@ -52,7 +52,7 @@ public: virtual ~SvxGalleryItem() override; sal_Int8 GetType() const { return m_nType; } - const rtl::OUString& GetURL() const { return m_aURL; } + const OUString& GetURL() const { return m_aURL; } const css::uno::Reference< css::graphic::XGraphic >& GetGraphic() const { return m_xGraphic; } // pure virtual methods from SfxPoolItem diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index 030b692ec8c3..9379d1da9282 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -50,10 +50,10 @@ class SVX_DLLPUBLIC NumSettings_Impl SvxAdjust eNumAlign; long nNumAlignAt; long nNumIndentAt; - rtl::OUString sPrefix; - rtl::OUString sSuffix; - rtl::OUString sBulletChar; - rtl::OUString sBulletFont; + OUString sPrefix; + OUString sSuffix; + OUString sBulletChar; + OUString sBulletFont; SvxBrushItem *pBrushItem; Size aSize; @@ -103,7 +103,7 @@ class SVX_DLLPUBLIC OutlineSettings_Impl { public: bool bIsCustomized; - rtl::OUString sDescription; + OUString sDescription; NumSettingsArr_Impl *pNumSettingsArr; public: OutlineSettings_Impl() : diff --git a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx index 9b94e9067faa..5b315aa3a928 100644 --- a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx +++ b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx @@ -56,7 +56,7 @@ public: const vcl::EnumContext::Context eContext); private: - static ::rtl::OUString GetModuleName ( + static OUString GetModuleName ( const css::uno::Reference<css::frame::XFrame>& rxFrame); }; diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx index deaa2581a9a2..45dce18525b9 100644 --- a/include/svx/sidebar/SelectionChangeHandler.hxx +++ b/include/svx/sidebar/SelectionChangeHandler.hxx @@ -45,7 +45,7 @@ class SVX_DLLPUBLIC SelectionChangeHandler { public: SelectionChangeHandler ( - const std::function<rtl::OUString ()>& rSelectionChangeCallback, + const std::function<OUString ()>& rSelectionChangeCallback, const css::uno::Reference<css::frame::XController>& rxController, const vcl::EnumContext::Context eDefaultContext); virtual ~SelectionChangeHandler() override; @@ -63,7 +63,7 @@ private: SelectionChangeHandler(const SelectionChangeHandler&) = delete; SelectionChangeHandler& operator=(const SelectionChangeHandler&) = delete; - const std::function<rtl::OUString ()> maSelectionChangeCallback; + const std::function<OUString ()> maSelectionChangeCallback; css::uno::Reference<css::frame::XController> mxController; const vcl::EnumContext::Context meDefaultContext; bool mbIsConnected; diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx index 8c0c6a3b59e6..f270754c2df5 100644 --- a/include/svx/textchain.hxx +++ b/include/svx/textchain.hxx @@ -78,7 +78,7 @@ namespace rtl { class OUString; } -typedef rtl::OUString ChainLinkId; +typedef OUString ChainLinkId; enum class CursorChainingEvent { diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx index 5783c894be1f..082e08205f3e 100644 --- a/include/toolkit/controls/dialogcontrol.hxx +++ b/include/toolkit/controls/dialogcontrol.hxx @@ -139,13 +139,13 @@ public: { UnoDialogControl_Base::ControlContainerBase::addPaintListener(p1); } virtual void SAL_CALL removePaintListener(const css::uno::Reference<css::awt::XPaintListener>& p1) override { UnoDialogControl_Base::ControlContainerBase::removePaintListener(p1); } - virtual void SAL_CALL setStatusText(const rtl::OUString& p1) override + virtual void SAL_CALL setStatusText(const OUString& p1) override { UnoDialogControl_Base::ControlContainerBase::setStatusText(p1); } virtual css::uno::Sequence<css::uno::Reference<css::awt::XControl> > SAL_CALL getControls() override { return UnoDialogControl_Base::ControlContainerBase::getControls(); } - virtual css::uno::Reference<css::awt::XControl> SAL_CALL getControl(const rtl::OUString& p1) override + virtual css::uno::Reference<css::awt::XControl> SAL_CALL getControl(const OUString& p1) override { return UnoDialogControl_Base::ControlContainerBase::getControl(p1); } - virtual void SAL_CALL addControl(const rtl::OUString& p1, const css::uno::Reference<css::awt::XControl>& p2) override + virtual void SAL_CALL addControl(const OUString& p1, const css::uno::Reference<css::awt::XControl>& p2) override { UnoDialogControl_Base::ControlContainerBase::addControl(p1, p2); } virtual void SAL_CALL removeControl(const css::uno::Reference<css::awt::XControl>& p1) override { UnoDialogControl_Base::ControlContainerBase::removeControl(p1); } diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx index 98674f6789e6..24fa7b27ef07 100644 --- a/include/unoidl/unoidl.hxx +++ b/include/unoidl/unoidl.hxx @@ -27,25 +27,25 @@ namespace unoidl { class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL NoSuchFileException final { public: - SAL_DLLPRIVATE NoSuchFileException(rtl::OUString const & uri): uri_(uri) {} + SAL_DLLPRIVATE NoSuchFileException(OUString const & uri): uri_(uri) {} SAL_DLLPRIVATE NoSuchFileException(NoSuchFileException const & other): uri_(other.uri_) {} SAL_DLLPRIVATE ~NoSuchFileException() throw (); - const rtl::OUString& getUri() const { return uri_; } + const OUString& getUri() const { return uri_; } private: void operator =(NoSuchFileException) = delete; - rtl::OUString const uri_; + OUString const uri_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL FileFormatException final { public: SAL_DLLPRIVATE FileFormatException( - rtl::OUString const & uri, rtl::OUString const & detail): + OUString const & uri, OUString const & detail): uri_(uri), detail_(detail) {} @@ -55,27 +55,27 @@ public: SAL_DLLPRIVATE ~FileFormatException() throw (); - const rtl::OUString& getUri() const { return uri_; } + const OUString& getUri() const { return uri_; } - const rtl::OUString& getDetail() const { return detail_; } + const OUString& getDetail() const { return detail_; } private: void operator =(FileFormatException) = delete; - rtl::OUString const uri_; - rtl::OUString const detail_; + OUString const uri_; + OUString const detail_; }; struct AnnotatedReference { AnnotatedReference( - rtl::OUString const & theName, - std::vector< rtl::OUString > const & theAnnotations): + OUString const & theName, + std::vector< OUString > const & theAnnotations): name(theName), annotations(theAnnotations) {} - rtl::OUString name; + OUString name; - std::vector< rtl::OUString > const annotations; + std::vector< OUString > const annotations; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL Entity: public salhelper::SimpleReferenceObject { @@ -102,7 +102,7 @@ private: class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL MapCursor: public salhelper::SimpleReferenceObject { public: // throws FileFormatException: - virtual rtl::Reference< Entity > getNext(rtl::OUString * name) = 0; + virtual rtl::Reference< Entity > getNext(OUString * name) = 0; protected: SAL_DLLPRIVATE MapCursor() {} @@ -113,7 +113,7 @@ protected: class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ModuleEntity: public Entity { public: // throws FileFormatException: - virtual std::vector< rtl::OUString > getMemberNames() const = 0; + virtual std::vector< OUString > getMemberNames() const = 0; // throws FileFormatException: virtual rtl::Reference< MapCursor > createCursor() const = 0; @@ -128,13 +128,13 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PublishableEntity: public Entity { public: bool isPublished() const { return published_; } - std::vector< rtl::OUString > const & getAnnotations() const + std::vector< OUString > const & getAnnotations() const { return annotations_; } protected: SAL_DLLPRIVATE PublishableEntity( Sort sort, bool published, - std::vector< rtl::OUString > const & annotations): + std::vector< OUString > const & annotations): Entity(sort), published_(published), annotations_(annotations) {} @@ -143,28 +143,28 @@ protected: private: bool const published_; - std::vector< rtl::OUString > const annotations_; + std::vector< OUString > const annotations_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL EnumTypeEntity: public PublishableEntity { public: struct Member { Member( - rtl::OUString const & theName, sal_Int32 theValue, - std::vector< rtl::OUString > const & theAnnotations): + OUString const & theName, sal_Int32 theValue, + std::vector< OUString > const & theAnnotations): name(theName), value(theValue), annotations(theAnnotations) {} - rtl::OUString name; + OUString name; sal_Int32 value; - std::vector< rtl::OUString > const annotations; + std::vector< OUString > const annotations; }; SAL_DLLPRIVATE EnumTypeEntity( bool published, std::vector< Member > const & members, - std::vector< rtl::OUString > const & annotations): + std::vector< OUString > const & annotations): PublishableEntity(SORT_ENUM_TYPE, published, annotations), members_(members) { assert(!members.empty()); } @@ -180,27 +180,27 @@ private: class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PlainStructTypeEntity: public PublishableEntity { public: struct Member { - Member(rtl::OUString const & theName, rtl::OUString const & theType, - std::vector< rtl::OUString > const & theAnnotations): + Member(OUString const & theName, OUString const & theType, + std::vector< OUString > const & theAnnotations): name(theName), type(theType), annotations(theAnnotations) {} - rtl::OUString name; + OUString name; - rtl::OUString type; + OUString type; - std::vector< rtl::OUString > const annotations; + std::vector< OUString > const annotations; }; SAL_DLLPRIVATE PlainStructTypeEntity( - bool published, rtl::OUString const & directBase, + bool published, OUString const & directBase, std::vector< Member > const & directMembers, - std::vector< rtl::OUString > const & annotations): + std::vector< OUString > const & annotations): PublishableEntity(SORT_PLAIN_STRUCT_TYPE, published, annotations), directBase_(directBase), directMembers_(directMembers) {} - const rtl::OUString& getDirectBase() const { return directBase_; } + const OUString& getDirectBase() const { return directBase_; } std::vector< Member > const & getDirectMembers() const { return directMembers_; } @@ -208,7 +208,7 @@ public: private: virtual SAL_DLLPRIVATE ~PlainStructTypeEntity() throw () override; - rtl::OUString const directBase_; + OUString const directBase_; std::vector< Member > const directMembers_; }; @@ -218,32 +218,32 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL PolymorphicStructTypeTemplateEntity: public: struct Member { Member( - rtl::OUString const & theName, rtl::OUString const & theType, + OUString const & theName, OUString const & theType, bool theParameterized, - std::vector< rtl::OUString > const & theAnnotations): + std::vector< OUString > const & theAnnotations): name(theName), type(theType), parameterized(theParameterized), annotations(theAnnotations) {} - rtl::OUString name; + OUString name; - rtl::OUString type; + OUString type; bool parameterized; - std::vector< rtl::OUString > const annotations; + std::vector< OUString > const annotations; }; SAL_DLLPRIVATE PolymorphicStructTypeTemplateEntity( - bool published, std::vector< rtl::OUString > const & typeParameters, + bool published, std::vector< OUString > const & typeParameters, std::vector< Member > const & members, - std::vector< rtl::OUString > const & annotations): + std::vector< OUString > const & annotations): PublishableEntity( SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE, published, annotations), typeParameters_(typeParameters), members_(members) {} - std::vector< rtl::OUString > const & getTypeParameters() const + std::vector< OUString > const & getTypeParameters() const { return typeParameters_; } std::vector< Member > const & getMembers() const { return members_; } @@ -251,7 +251,7 @@ public: private: virtual SAL_DLLPRIVATE ~PolymorphicStructTypeTemplateEntity() throw () override; - std::vector< rtl::OUString > const typeParameters_; + std::vector< OUString > const typeParameters_; std::vector< Member > const members_; }; @@ -259,27 +259,27 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ExceptionTypeEntity: public Publishabl public: struct Member { Member( - rtl::OUString const & theName, rtl::OUString const & theType, - std::vector< rtl::OUString > const & theAnnotations): + OUString const & theName, OUString const & theType, + std::vector< OUString > const & theAnnotations): name(theName), type(theType), annotations(theAnnotations) {} - rtl::OUString name; + OUString name; - rtl::OUString type; + OUString type; - std::vector< rtl::OUString > const annotations; + std::vector< OUString > const annotations; }; SAL_DLLPRIVATE ExceptionTypeEntity( - bool published, rtl::OUString const & directBase, + bool published, OUString const & directBase, std::vector< Member > const & directMembers, - std::vector< rtl::OUString > const & annotations): + std::vector< OUString > const & annotations): PublishableEntity(SORT_EXCEPTION_TYPE, published, annotations), directBase_(directBase), directMembers_(directMembers) {} - const rtl::OUString& getDirectBase() const { return directBase_; } + const OUString& getDirectBase() const { return directBase_; } std::vector< Member > const & getDirectMembers() const { return directMembers_; } @@ -287,7 +287,7 @@ public: private: virtual SAL_DLLPRIVATE ~ExceptionTypeEntity() throw () override; - rtl::OUString const directBase_; + OUString const directBase_; std::vector< Member > const directMembers_; }; @@ -295,29 +295,29 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL InterfaceTypeEntity: public Publishabl public: struct Attribute { Attribute( - rtl::OUString const & theName, rtl::OUString const & theType, + OUString const & theName, OUString const & theType, bool theBound, bool theReadOnly, - std::vector< rtl::OUString > const & theGetExceptions, - std::vector< rtl::OUString > const & theSetExceptions, - std::vector< rtl::OUString > const & theAnnotations): + std::vector< OUString > const & theGetExceptions, + std::vector< OUString > const & theSetExceptions, + std::vector< OUString > const & theAnnotations): name(theName), type(theType), bound(theBound), readOnly(theReadOnly), getExceptions(theGetExceptions), setExceptions(theSetExceptions), annotations(theAnnotations) { assert(!theReadOnly || theSetExceptions.empty()); } - rtl::OUString name; + OUString name; - rtl::OUString type; + OUString type; bool bound; bool readOnly; - std::vector< rtl::OUString > getExceptions; + std::vector< OUString > getExceptions; - std::vector< rtl::OUString > setExceptions; + std::vector< OUString > setExceptions; - std::vector< rtl::OUString > const annotations; + std::vector< OUString > const annotations; }; struct Method { @@ -325,36 +325,36 @@ public: enum Direction { DIRECTION_IN, DIRECTION_OUT, DIRECTION_IN_OUT }; Parameter( - rtl::OUString const & theName, rtl::OUString const & theType, + OUString const & theName, OUString const & theType, Direction theDirection): name(theName), type(theType), direction(theDirection) {} - rtl::OUString name; + OUString name; - rtl::OUString type; + OUString type; Direction direction; }; Method( - rtl::OUString const & theName, rtl::OUString const & theReturnType, + OUString const & theName, OUString const & theReturnType, std::vector< Parameter > const & theParameters, - std::vector< rtl::OUString > const & theExceptions, - std::vector< rtl::OUString > const & theAnnotations): + std::vector< OUString > const & theExceptions, + std::vector< OUString > const & theAnnotations): name(theName), returnType(theReturnType), parameters(theParameters), exceptions(theExceptions), annotations(theAnnotations) {} - rtl::OUString name; + OUString name; - rtl::OUString returnType; + OUString returnType; std::vector< Parameter > parameters; - std::vector< rtl::OUString > exceptions; + std::vector< OUString > exceptions; - std::vector< rtl::OUString > const annotations; + std::vector< OUString > const annotations; }; SAL_DLLPRIVATE InterfaceTypeEntity( @@ -363,7 +363,7 @@ public: std::vector< AnnotatedReference > const & directOptionalBases, std::vector< Attribute > const & directAttributes, std::vector< Method > const & directMethods, - std::vector< rtl::OUString > const & annotations): + std::vector< OUString > const & annotations): PublishableEntity(SORT_INTERFACE_TYPE, published, annotations), directMandatoryBases_(directMandatoryBases), directOptionalBases_(directOptionalBases), @@ -394,17 +394,17 @@ private: class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL TypedefEntity: public PublishableEntity { public: SAL_DLLPRIVATE TypedefEntity( - bool published, rtl::OUString const & type, - std::vector< rtl::OUString > const & annotations): + bool published, OUString const & type, + std::vector< OUString > const & annotations): PublishableEntity(SORT_TYPEDEF, published, annotations), type_(type) {} - const rtl::OUString& getType() const { return type_; } + const OUString& getType() const { return type_; } private: virtual SAL_DLLPRIVATE ~TypedefEntity() throw () override; - rtl::OUString const type_; + OUString const type_; }; struct SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ConstantValue { @@ -459,21 +459,21 @@ class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ConstantGroupEntity: public Publishabl public: struct Member { Member( - rtl::OUString const & theName, ConstantValue const & theValue, - std::vector< rtl::OUString > const & theAnnotations): + OUString const & theName, ConstantValue const & theValue, + std::vector< OUString > const & theAnnotations): name(theName), value(theValue), annotations(theAnnotations) {} - rtl::OUString name; + OUString name; ConstantValue value; - std::vector< rtl::OUString > const annotations; + std::vector< OUString > const annotations; }; SAL_DLLPRIVATE ConstantGroupEntity( bool published, std::vector< Member > const & members, - std::vector< rtl::OUString > const & annotations): + std::vector< OUString > const & annotations): PublishableEntity(SORT_CONSTANT_GROUP, published, annotations), members_(members) {} @@ -493,14 +493,14 @@ public: struct Constructor { struct Parameter { Parameter( - rtl::OUString const & theName, rtl::OUString const & theType, + OUString const & theName, OUString const & theType, bool theRest): name(theName), type(theType), rest(theRest) {} - rtl::OUString name; + OUString name; - rtl::OUString const type; + OUString const type; bool const rest; }; @@ -512,35 +512,35 @@ public: defaultConstructor(true) {} Constructor( - rtl::OUString const & theName, + OUString const & theName, std::vector< Parameter > const & theParameters, - std::vector< rtl::OUString > const & theExceptions, - std::vector< rtl::OUString > const & theAnnotations): + std::vector< OUString > const & theExceptions, + std::vector< OUString > const & theAnnotations): name(theName), parameters(theParameters), exceptions(theExceptions), annotations(theAnnotations), defaultConstructor(false) {} - rtl::OUString name; + OUString name; std::vector< Parameter > parameters; - std::vector< rtl::OUString > exceptions; + std::vector< OUString > exceptions; - std::vector< rtl::OUString > const annotations; + std::vector< OUString > const annotations; bool defaultConstructor; }; SAL_DLLPRIVATE SingleInterfaceBasedServiceEntity( - bool published, rtl::OUString const & base, + bool published, OUString const & base, std::vector< Constructor > const & constructors, - std::vector< rtl::OUString > const & annotations): + std::vector< OUString > const & annotations): PublishableEntity( SORT_SINGLE_INTERFACE_BASED_SERVICE, published, annotations), base_(base), constructors_(constructors) {} - const rtl::OUString& getBase() const { return base_; } + const OUString& getBase() const { return base_; } std::vector< Constructor > const & getConstructors() const { return constructors_; } @@ -548,7 +548,7 @@ public: private: virtual SAL_DLLPRIVATE ~SingleInterfaceBasedServiceEntity() throw () override; - rtl::OUString const base_; + OUString const base_; std::vector< Constructor > const constructors_; }; @@ -570,20 +570,20 @@ public: }; Property( - rtl::OUString const & theName, rtl::OUString const & theType, + OUString const & theName, OUString const & theType, Attributes theAttributes, - std::vector< rtl::OUString > const & theAnnotations): + std::vector< OUString > const & theAnnotations): name(theName), type(theType), attributes(theAttributes), annotations(theAnnotations) {} - rtl::OUString name; + OUString name; - rtl::OUString type; + OUString type; Attributes const attributes; - std::vector< rtl::OUString > const annotations; + std::vector< OUString > const annotations; }; SAL_DLLPRIVATE AccumulationBasedServiceEntity( @@ -593,7 +593,7 @@ public: std::vector< AnnotatedReference > const & directMandatoryBaseInterfaces, std::vector< AnnotatedReference > const & directOptionalBaseInterfaces, std::vector< Property > const & directProperties, - std::vector< rtl::OUString > const & annotations): + std::vector< OUString > const & annotations): PublishableEntity( SORT_ACCUMULATION_BASED_SERVICE, published, annotations), directMandatoryBaseServices_(directMandatoryBaseServices), @@ -637,37 +637,37 @@ class LO_DLLPUBLIC_UNOIDL InterfaceBasedSingletonEntity: { public: SAL_DLLPRIVATE InterfaceBasedSingletonEntity( - bool published, rtl::OUString const & base, - std::vector< rtl::OUString > const & annotations): + bool published, OUString const & base, + std::vector< OUString > const & annotations): PublishableEntity( SORT_INTERFACE_BASED_SINGLETON, published, annotations), base_(base) {} - const rtl::OUString& getBase() const { return base_; } + const OUString& getBase() const { return base_; } private: virtual SAL_DLLPRIVATE ~InterfaceBasedSingletonEntity() throw () override; - rtl::OUString const base_; + OUString const base_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL ServiceBasedSingletonEntity: public PublishableEntity { public: SAL_DLLPRIVATE ServiceBasedSingletonEntity( - bool published, rtl::OUString const & base, - std::vector< rtl::OUString > const & annotations): + bool published, OUString const & base, + std::vector< OUString > const & annotations): PublishableEntity(SORT_SERVICE_BASED_SINGLETON, published, annotations), base_(base) {} - const rtl::OUString& getBase() const { return base_; } + const OUString& getBase() const { return base_; } private: virtual SAL_DLLPRIVATE ~ServiceBasedSingletonEntity() throw () override; - rtl::OUString const base_; + OUString const base_; }; class SAL_WARN_UNUSED LO_DLLPUBLIC_UNOIDL Provider: public salhelper::SimpleReferenceObject { @@ -676,7 +676,7 @@ public: virtual rtl::Reference< MapCursor > createRootCursor() const = 0; // throws FileFormatException: - virtual rtl::Reference< Entity > findEntity(rtl::OUString const & name) + virtual rtl::Reference< Entity > findEntity(OUString const & name) const = 0; protected: @@ -690,19 +690,19 @@ public: Manager() {} // throws FileFormatException, NoSuchFileException: - rtl::Reference< Provider > addProvider(rtl::OUString const & uri); + rtl::Reference< Provider > addProvider(OUString const & uri); // throws FileFormatException: - rtl::Reference< Entity > findEntity(rtl::OUString const & name) const; + rtl::Reference< Entity > findEntity(OUString const & name) const; // throws FileFormatException: - rtl::Reference< MapCursor > createCursor(rtl::OUString const & name) const; + rtl::Reference< MapCursor > createCursor(OUString const & name) const; private: virtual SAL_DLLPRIVATE ~Manager() throw () override; SAL_DLLPRIVATE rtl::Reference< Provider > loadProvider( - rtl::OUString const & uri); + OUString const & uri); mutable osl::Mutex mutex_; std::vector< rtl::Reference< Provider > > providers_; diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx index fd35a31d231f..088ae6baf40c 100644 --- a/include/unotools/datetime.hxx +++ b/include/unotools/datetime.hxx @@ -42,10 +42,10 @@ namespace utl UNOTOOLS_DLLPUBLIC void extractDate(const css::util::DateTime& _rDateTime, css::util::Date& _rOut); - UNOTOOLS_DLLPUBLIC ::rtl::OUString toISO8601(const css::util::DateTime& _rDateTime); - UNOTOOLS_DLLPUBLIC bool ISO8601parseDateTime(const ::rtl::OUString &i_rIn, css::util::DateTime& o_rDateTime); - UNOTOOLS_DLLPUBLIC bool ISO8601parseDate(const ::rtl::OUString &i_rIn, css::util::Date& o_rDate); - UNOTOOLS_DLLPUBLIC bool ISO8601parseTime(const ::rtl::OUString &i_rIn, css::util::Time& o_Time); + UNOTOOLS_DLLPUBLIC OUString toISO8601(const css::util::DateTime& _rDateTime); + UNOTOOLS_DLLPUBLIC bool ISO8601parseDateTime(const OUString &i_rIn, css::util::DateTime& o_rDateTime); + UNOTOOLS_DLLPUBLIC bool ISO8601parseDate(const OUString &i_rIn, css::util::Date& o_rDate); + UNOTOOLS_DLLPUBLIC bool ISO8601parseTime(const OUString &i_rIn, css::util::Time& o_Time); } // namespace utl diff --git a/include/vcl/EnumContext.hxx b/include/vcl/EnumContext.hxx index df23520337cb..5a63d00c22e6 100644 --- a/include/vcl/EnumContext.hxx +++ b/include/vcl/EnumContext.hxx @@ -118,8 +118,8 @@ public: const Application eApplication, const Context eContext); EnumContext ( - const ::rtl::OUString& rsApplicationName, - const ::rtl::OUString& rsContextName); + const OUString& rsApplicationName, + const OUString& rsContextName); /** This variant of the GetCombinedContext() method treats some application names as identical to each other. Replacements @@ -143,11 +143,11 @@ public: const static sal_Int32 NoMatch; const static sal_Int32 OptimalMatch; - static Application GetApplicationEnum (const ::rtl::OUString& rsApplicationName); - static const ::rtl::OUString& GetApplicationName (const Application eApplication); + static Application GetApplicationEnum (const OUString& rsApplicationName); + static const OUString& GetApplicationName (const Application eApplication); - static Context GetContextEnum (const ::rtl::OUString& rsContextName); - static const ::rtl::OUString& GetContextName (const Context eContext); + static Context GetContextEnum (const OUString& rsContextName); + static const OUString& GetContextName (const Context eContext); private: Application meApplication; @@ -155,8 +155,8 @@ private: static void ProvideApplicationContainers(); static void ProvideContextContainers(); - static void AddEntry (const ::rtl::OUString& rsName, const Application eApplication); - static void AddEntry (const ::rtl::OUString& rsName, const Context eContext); + static void AddEntry (const OUString& rsName, const Application eApplication); + static void AddEntry (const OUString& rsName, const Context eContext); }; diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 1253a4f02091..a7b227a687e8 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -180,13 +180,13 @@ protected: private: struct ProgramHash { - size_t operator()( const rtl::OString& aDigest ) const + size_t operator()( const OString& aDigest ) const { return static_cast<size_t>( rtl_crc32( 0, aDigest.getStr(), aDigest.getLength() ) ); } }; - typedef std::unordered_map< rtl::OString, std::shared_ptr<OpenGLProgram>, ProgramHash > ProgramCollection; + typedef std::unordered_map< OString, std::shared_ptr<OpenGLProgram>, ProgramHash > ProgramCollection; ProgramCollection maPrograms; OpenGLProgram* mpCurrentProgram; diff --git a/include/vcl/vclstatuslistener.hxx b/include/vcl/vclstatuslistener.hxx index 42894dd5e98b..f733eaad5067 100644 --- a/include/vcl/vclstatuslistener.hxx +++ b/include/vcl/vclstatuslistener.hxx @@ -24,7 +24,7 @@ template <class T> class VclStatusListener : public cppu::WeakImplHelper < css::frame::XStatusListener> { public: - VclStatusListener<T>(T* widget, const rtl::OUString& aCommand); + VclStatusListener<T>(T* widget, const OUString& aCommand); private: VclPtr<T> mWidget; /** The widget on which actions are performed */ @@ -47,7 +47,7 @@ public: }; template<class T> -VclStatusListener<T>::VclStatusListener(T* widget, const rtl::OUString& aCommand) { +VclStatusListener<T>::VclStatusListener(T* widget, const OUString& aCommand) { mWidget = widget; css::uno::Reference<css::uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext(); diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index bee1124e63ec..32163f5385dd 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -52,7 +52,7 @@ protected: // Helper to check if the local maProperties contains the given // FillStyle tag and if the FillStyle there is different from FillStyle_NONE bool doNewDrawingLayerFillStyleDefinitionsExist( - const ::rtl::OUString& rFillStyleTag) const; + const OUString& rFillStyleTag) const; // Helper which will deactivate all old fill definitions (identified by // the given OldFillStyleDefinitionSet) in the local maProperties. Deactivation diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx index 8a715a398dd8..6489feedd717 100644 --- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx +++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx @@ -55,7 +55,7 @@ public: In contrast to registerReference(), this here overwrites any earlier registration of the same identifier */ - void registerReferenceAlways( const rtl::OUString& rIdentifier, const css::uno::Reference< css::uno::XInterface >& rInterface ); + void registerReferenceAlways( const OUString& rIdentifier, const css::uno::Reference< css::uno::XInterface >& rInterface ); /** @returns the identifier for the given uno object. If this uno object is not already |