[Libreoffice-commits] core.git: include/unotools unotools/source unoxml/source uui/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Mar 16 07:21:53 UTC 2020
include/unotools/configitem.hxx | 2 +-
include/unotools/intlwrapper.hxx | 2 +-
include/unotools/streamhelper.hxx | 2 +-
include/unotools/tempfile.hxx | 2 +-
include/unotools/transliterationwrapper.hxx | 2 +-
include/unotools/viewoptions.hxx | 4 ++--
unotools/source/config/configvaluecontainer.cxx | 2 +-
unotools/source/config/defaultoptions.cxx | 4 ++--
unotools/source/config/fontcfg.cxx | 8 ++++----
unotools/source/config/lingucfg.cxx | 2 +-
unotools/source/config/pathoptions.cxx | 4 ++--
unotools/source/config/viewoptions.cxx | 2 +-
unotools/source/misc/wincodepage.cxx | 12 ++++++------
unoxml/source/dom/document.cxx | 2 +-
unoxml/source/rdf/librdf_repository.cxx | 2 +-
uui/source/fltdlg.cxx | 2 +-
uui/source/logindlg.hxx | 4 ++--
uui/source/passworddlg.hxx | 2 +-
18 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 6d40302d89e1a72841c8a64733c7a26080a65cb8
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun Mar 15 18:31:45 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Mar 16 08:21:14 2020 +0100
Revert "loplugin:constfields in unotools..uui"
This reverts commit d8ac55e3e53564aca4b0bade5a5b5cb01b4519b1.
Change-Id: Ib7cf67d5d0b7780dfde9453cdddb8f11ca5d3a6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90542
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index edeaf03af55c..16153e20715f 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -74,7 +74,7 @@ namespace utl
m_xHierarchyAccess;
css::uno::Reference< css::util::XChangesListener >
xChangeLstnr;
- ConfigItemMode const m_nMode;
+ ConfigItemMode m_nMode;
bool m_bIsModified;
bool m_bEnableInternalNotification;
sal_Int16 m_nInValueChange;
diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx
index 47ded1a273a9..8a893eb78aad 100644
--- a/include/unotools/intlwrapper.hxx
+++ b/include/unotools/intlwrapper.hxx
@@ -50,7 +50,7 @@ class LocaleDataWrapper;
class UNOTOOLS_DLLPUBLIC IntlWrapper
{
private:
- LanguageTag const maLanguageTag;
+ LanguageTag maLanguageTag;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
std::unique_ptr<LocaleDataWrapper> pLocaleData;
diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx
index 5b2b7f762157..05c5a5b45e84 100644
--- a/include/unotools/streamhelper.hxx
+++ b/include/unotools/streamhelper.hxx
@@ -38,7 +38,7 @@ class UNOTOOLS_DLLPUBLIC OInputStreamHelper final : public cppu::WeakImplHelper<
::osl::Mutex m_aMutex;
SvLockBytesRef m_xLockBytes;
sal_uInt64 m_nActPos;
- sal_Int32 const m_nAvailable; // this is typically the chunk(buffer) size
+ sal_Int32 m_nAvailable; // this is typically the chunk(buffer) size
public:
OInputStreamHelper(const SvLockBytesRef& _xLockBytes,
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index b20a4f2fdf40..60ae7710c59c 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -48,7 +48,7 @@ class UNOTOOLS_DLLPUBLIC TempFile
OUString aName;
std::unique_ptr<SvStream>
pStream;
- bool const bIsDirectory;
+ bool bIsDirectory;
bool bKillingFileEnabled;
public:
diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx
index 882975bac2a5..a87cf29ca32c 100644
--- a/include/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
@@ -43,7 +43,7 @@ class UNOTOOLS_DLLPUBLIC TransliterationWrapper
{
css::uno::Reference< css::i18n::XExtendedTransliteration > xTrans;
LanguageTag aLanguageTag;
- TransliterationFlags const nType;
+ TransliterationFlags nType;
mutable bool bFirstCall;
TransliterationWrapper( const TransliterationWrapper& ) = delete;
diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index 461e5ead6e26..8eb088077b54 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.hxx
@@ -234,8 +234,8 @@ class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtViewOptions final : public utl::deta
/// 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 const m_eViewType;
- OUString const m_sViewName;
+ EViewType m_eViewType;
+ OUString m_sViewName;
/*Attention
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 9d4f711938d3..6fc60d753113 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -47,7 +47,7 @@ namespace utl
struct NodeValueAccessor
{
private:
- OUString const sRelativePath; // the relative path of the node
+ OUString sRelativePath; // the relative path of the node
LocationType eLocationType; // the type of location where the value is stored
void* pLocation; // the pointer to the location
Type aDataType; // the type object pointed to by pLocation
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index b3c9dca8e38b..80a597abcdbf 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -114,8 +114,8 @@ namespace {
struct PathToDefaultMapping_Impl
{
- SvtPathOptions::Paths const _ePath;
- PathStrPtr const _pDefaultPath;
+ SvtPathOptions::Paths _ePath;
+ PathStrPtr _pDefaultPath;
};
}
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index 1da36a7e978c..8cc694bbb59c 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -453,7 +453,7 @@ namespace {
struct ImplFontAttrWeightSearchData
{
const char* mpStr;
- FontWeight const meWeight;
+ FontWeight meWeight;
};
}
@@ -483,7 +483,7 @@ namespace {
struct ImplFontAttrWidthSearchData
{
const char* mpStr;
- FontWidth const meWidth;
+ FontWidth meWidth;
};
}
@@ -508,7 +508,7 @@ namespace {
struct ImplFontAttrTypeSearchData
{
const char* mpStr;
- ImplFontAttrs const mnType;
+ ImplFontAttrs mnType;
};
}
@@ -799,7 +799,7 @@ namespace {
struct enum_convert
{
const char* pName;
- int const nEnum;
+ int nEnum;
};
}
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 21ac370ba7ab..3bd5953889e7 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -214,7 +214,7 @@ struct NamesToHdl
{
const char *pFullPropName; // full qualified name as used in configuration
const char *pPropName; // property name only (atom) of above
- sal_Int32 const nHdl; // numeric handle representing the property
+ sal_Int32 nHdl; // numeric handle representing the property
};
}
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index f54b388d50a3..9d1927042bef 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -81,7 +81,7 @@ class SvtPathOptions_Impl
m_aMapEnumToPropHandle;
VarNameSet m_aSystemPathVarNames;
- OUString const m_aEmptyString;
+ OUString m_aEmptyString;
mutable ::osl::Mutex m_aMutex;
public:
@@ -157,7 +157,7 @@ namespace {
struct PropertyStruct
{
const char* pPropName; // The ascii name of the Office path
- SvtPathOptions::Paths const ePath; // The enum value used by SvtPathOptions
+ SvtPathOptions::Paths ePath; // The enum value used by SvtPathOptions
};
struct VarNameAttribute
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index e72450d67186..4a36ad2c26e0 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -111,7 +111,7 @@ class SvtViewOptionsBase_Impl final
bool bCreateIfMissing);
private:
- OUString const m_sListName;
+ OUString m_sListName;
css::uno::Reference< css::container::XNameAccess > m_xRoot;
css::uno::Reference< css::container::XNameAccess > m_xSet;
diff --git a/unotools/source/misc/wincodepage.cxx b/unotools/source/misc/wincodepage.cxx
index 493476a5b80b..5a5df8b3ed2e 100644
--- a/unotools/source/misc/wincodepage.cxx
+++ b/unotools/source/misc/wincodepage.cxx
@@ -20,9 +20,9 @@ rtl_TextEncoding impl_getWinTextEncodingFromLangStrANSI(const char* pLanguage)
struct LangEncodingDef
{
- const char* const mpLangStr;
- decltype(nLangLen) const mnLangStrLen;
- rtl_TextEncoding const meTextEncoding;
+ const char* mpLangStr;
+ decltype(nLangLen) mnLangStrLen;
+ rtl_TextEncoding meTextEncoding;
};
static LangEncodingDef const aLanguageTab[] =
{
@@ -82,9 +82,9 @@ rtl_TextEncoding impl_getWinTextEncodingFromLangStrOEM(const char* pLanguage)
struct LangEncodingDef
{
- const char* const mpLangStr;
- decltype(nLangLen) const mnLangStrLen;
- rtl_TextEncoding const meTextEncoding;
+ const char* mpLangStr;
+ decltype(nLangLen) mnLangStrLen;
+ rtl_TextEncoding meTextEncoding;
};
static LangEncodingDef const aLanguageTab[] =
{
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index fe6994df2191..d74a913217d0 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -328,7 +328,7 @@ namespace DOM
// IO context functions for libxml2 interaction
struct IOContext {
Reference< XOutputStream > stream;
- bool const allowClose;
+ bool allowClose;
};
}
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index dc665a9d5172..4b7fa6897468 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -412,7 +412,7 @@ private:
NamedGraphMap_t m_NamedGraphs;
/// type conversion helper - stateless
- librdf_TypeConverter const m_TypeConverter;
+ librdf_TypeConverter m_TypeConverter;
/// set of xml:ids of elements with xhtml:content
::std::set< OUString > m_RDFaXHTMLContentSet;
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 49c2f82cb618..391cf5a70b25 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -164,7 +164,7 @@ class StringCalculator : public ::cppu::WeakImplHelper< css::util::XStringWidth
}
private:
- weld::Widget* const m_pDevice;
+ weld::Widget* m_pDevice;
};
}
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index 1c1fc39cd1fe..ff799f4501ff 100644
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -51,8 +51,8 @@ class LoginDialog : public weld::GenericDialogController
std::unique_ptr<weld::CheckButton> m_xSavePasswdBtn;
std::unique_ptr<weld::CheckButton> m_xUseSysCredsCB;
std::unique_ptr<weld::Button> m_xOKBtn;
- OUString const m_server;
- OUString const m_realm;
+ OUString m_server;
+ OUString m_realm;
void HideControls_Impl( LoginFlags nFlags );
void EnableUseSysCredsControls_Impl( bool bUseSysCredsEnabled );
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index 302c6cff5388..2f9c21b71f39 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -31,7 +31,7 @@ class PasswordDialog : public weld::GenericDialogController
std::unique_ptr<weld::Entry> m_xEDConfirmPassword;
std::unique_ptr<weld::Button> m_xOKBtn;
sal_uInt16 nMinLen;
- OUString const aPasswdMismatch;
+ OUString aPasswdMismatch;
DECL_LINK(OKHdl_Impl, weld::Button&, void);
More information about the Libreoffice-commits
mailing list