diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-08 13:48:09 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-08 18:23:53 +0100 |
commit | c774ad610eb828742a3eea050e5a7571ba3b00be (patch) | |
tree | 5563215fe7b481f99efc96017d61ecd5c7a59072 /include | |
parent | 24d0704fa468b300558a3f904ae853fcb7fca312 (diff) |
loplugin:constantparam in svtools..unotools
Change-Id: I6e72fbe44dcb65ee5162448e9a72e6437d56b044
Reviewed-on: https://gerrit.libreoffice.org/50948
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/svtools/imap.hxx | 4 | ||||
-rw-r--r-- | include/svtools/langtab.hxx | 6 | ||||
-rw-r--r-- | include/svx/fmview.hxx | 1 | ||||
-rw-r--r-- | include/svx/gallery.hxx | 3 | ||||
-rw-r--r-- | include/svx/galmisc.hxx | 4 | ||||
-rw-r--r-- | include/tools/urlobj.hxx | 8 | ||||
-rw-r--r-- | include/unotools/fontcvt.hxx | 3 |
7 files changed, 11 insertions, 18 deletions
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx index e60efb9990ed..232248d20039 100644 --- a/include/svtools/imap.hxx +++ b/include/svtools/imap.hxx @@ -52,10 +52,10 @@ private: void ImpReadCERNLine( const OString& rLine ); static Point ImpReadCERNCoords( const char** ppStr ); static long ImpReadCERNRadius( const char** ppStr ); - static OUString ImpReadCERNURL( const char** ppStr, const OUString& rBaseURL ); + static OUString ImpReadCERNURL( const char** ppStr ); void ImpReadNCSALine( const OString& rLine ); - static OUString ImpReadNCSAURL( const char** ppStr, const OUString& rBaseURL ); + static OUString ImpReadNCSAURL( const char** ppStr ); static Point ImpReadNCSACoords( const char** ppStr ); static sal_uLong ImpDetectFormat( SvStream& rIStm ); diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx index 8c78002fe9bd..a53e928c9998 100644 --- a/include/svtools/langtab.hxx +++ b/include/svtools/langtab.hxx @@ -36,12 +36,8 @@ public: static LanguageType GetLanguageTypeAtIndex( sal_uInt32 nIndex ); /** Add a language tag to the table. - - @param rString - UI visible description string. If empty, the rLanguageTag Bcp47 - string placed in curly brackets is used instead, e.g. "{en-DK}" */ - static sal_uInt32 AddLanguageTag( const LanguageTag& rLanguageTag, const OUString& rString ); + static sal_uInt32 AddLanguageTag( const LanguageTag& rLanguageTag ); }; // Add LRE or RLE embedding characters to the string based on the diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 92ca8585e2ef..a4245150337a 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -92,7 +92,6 @@ public: const css::uno::Reference< css::beans::XPropertySet >& _rxField, const css::uno::Reference< css::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, - const OUString& _rFieldPostfix, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx index 19a2c9e226c7..a02c1f3fc9d4 100644 --- a/include/svx/gallery.hxx +++ b/include/svx/gallery.hxx @@ -118,8 +118,7 @@ public: static bool InsertURL( sal_uInt32 nThemeId, const OUString& rURL ); static bool GetGraphicObj( const OUString& rThemeName, sal_uInt32 nPos, - Graphic* pGraphic, BitmapEx* pThumb, - bool bProgress = false ); + Graphic* pGraphic ); static bool GetGraphicObj( sal_uInt32 nThemeId, sal_uInt32 nPos, Graphic* pGraphic ); diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 62ad8c65b1f6..dd2aea3c5a16 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -187,8 +187,8 @@ public: GalleryHint( GalleryHintType nType, const OUString& rThemeName, void* nData1 = nullptr ) : mnType( nType ), maThemeName( rThemeName ), mnData1( nData1 ) {} - GalleryHint( GalleryHintType nType, const OUString& rThemeName, const OUString& rStringData, void* nData1 = nullptr ) : - mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ) {} + GalleryHint( GalleryHintType nType, const OUString& rThemeName, const OUString& rStringData ) : + mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nullptr ) {} GalleryHintType GetType() const { return mnType; } const OUString& GetThemeName() const { return maThemeName; } diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx index 99780fa0e79d..819cc3136596 100644 --- a/include/tools/urlobj.hxx +++ b/include/tools/urlobj.hxx @@ -1131,7 +1131,7 @@ private: bool bKeepVisibleEscapes); static inline OUString encodeText( - OUString const & rTheText, bool bOctets, Part ePart, + OUString const & rTheText, Part ePart, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, bool bKeepVisibleEscapes); @@ -1151,13 +1151,13 @@ private: // static inline OUString INetURLObject::encodeText(OUString const & rTheText, - bool bOctets, Part ePart, + Part ePart, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, bool bKeepVisibleEscapes) { return encodeText(rTheText.getStr(), - rTheText.getStr() + rTheText.getLength(), bOctets, ePart, + rTheText.getStr() + rTheText.getLength(), /*bOctets*/false, ePart, eMechanism, eCharset, bKeepVisibleEscapes); } @@ -1324,7 +1324,7 @@ inline OUString INetURLObject::encode(OUString const & rText, Part ePart, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { - return encodeText(rText, false, ePart, eMechanism, eCharset, false); + return encodeText(rText, ePart, eMechanism, eCharset, false); } // static diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx index bd640bd3593b..4b7ef6e35b95 100644 --- a/include/unotools/fontcvt.hxx +++ b/include/unotools/fontcvt.hxx @@ -30,11 +30,10 @@ enum class FontToSubsFontFlags { IMPORT = 0x01, EXPORT = 0x02, - ONLYOLDSOSYMBOLFONTS = 0x04, }; namespace o3tl { - template<> struct typed_flags<FontToSubsFontFlags> : is_typed_flags<FontToSubsFontFlags, 0x07> {}; + template<> struct typed_flags<FontToSubsFontFlags> : is_typed_flags<FontToSubsFontFlags, 0x03> {}; } typedef void* FontToSubsFontConverter; |