[Libreoffice-commits] core.git: xmlhelp/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Sep 13 12:37:50 UTC 2018
xmlhelp/source/cxxhelp/inc/tvread.hxx | 2 +-
xmlhelp/source/cxxhelp/provider/content.cxx | 10 +++++-----
xmlhelp/source/cxxhelp/provider/databases.hxx | 12 ++++++------
xmlhelp/source/cxxhelp/provider/db.hxx | 2 +-
xmlhelp/source/cxxhelp/provider/provider.cxx | 3 +--
xmlhelp/source/cxxhelp/provider/provider.hxx | 1 -
xmlhelp/source/cxxhelp/provider/resultsetbase.hxx | 2 +-
xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx | 2 +-
xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 2 +-
9 files changed, 17 insertions(+), 19 deletions(-)
New commits:
commit 04e9a4c012f12dc26fda10aabb8d229555c711ab
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Sep 13 10:40:54 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Sep 13 14:37:36 2018 +0200
loplugin:constfields in xmlhelp
Change-Id: Ia8eda3075b0387ec3a5ed6267f1dfcfb3a8cf782
Reviewed-on: https://gerrit.libreoffice.org/60426
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index bee206db49c6..05c6991ab28c 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -269,7 +269,7 @@ namespace treeview {
css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xSFA;
IteratorState m_eState;
- OUString m_aLanguage;
+ OUString const m_aLanguage;
css::uno::Sequence< css::uno::Reference
< css::deployment::XPackage > > m_aUserPackagesSeq;
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 2551c82baa61..8a2696557dea 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -137,9 +137,9 @@ private:
uno::Reference< uno::XComponentContext > m_xContext;
uno::Reference< ucb::XContentProvider > m_xProvider;
- uno::Sequence< beans::Property > m_seq;
- URLParameter m_aURLParameter;
- Databases* m_pDatabases;
+ uno::Sequence< beans::Property > const m_seq;
+ URLParameter const m_aURLParameter;
+ Databases* const m_pDatabases;
public:
@@ -174,9 +174,9 @@ private:
uno::Reference< uno::XComponentContext > m_xContext;
uno::Reference< ucb::XContentProvider > m_xProvider;
- uno::Sequence< beans::Property > m_seq;
+ uno::Sequence< beans::Property > const m_seq;
URLParameter m_aURLParameter;
- Databases* m_pDatabases;
+ Databases* const m_pDatabases;
public:
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index e5beff449e8e..ae3e5049af5c 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -57,10 +57,10 @@ namespace chelp {
{
private:
- OUString m_aStartId;
- OUString m_aProgramSwitch;
- OUString m_aTitle;
- int m_nOrder;
+ OUString const m_aStartId;
+ OUString const m_aProgramSwitch;
+ OUString const m_aTitle;
+ int const m_nOrder;
public:
@@ -233,7 +233,7 @@ namespace chelp {
css::uno::Reference< css::lang::XMultiComponentFactory > m_xSMgr;
css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xSFA;
- bool m_bShowBasic;
+ bool const m_bShowBasic;
std::vector<char> m_vCustomCSSDoc;
OUString m_aCSS;
@@ -387,7 +387,7 @@ namespace chelp {
const css::uno::Reference< css::deployment::XPackage >& xPackage,
OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath );
- bool m_bHelpText;
+ bool const m_bHelpText;
}; // end class DataBaseIterator
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx b/xmlhelp/source/cxxhelp/provider/db.hxx
index 607b987ff838..ce7dbc29d15d 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -51,7 +51,7 @@ namespace helpdatafileproxy {
class Hdf
{
- OUString m_aFileURL;
+ OUString const m_aFileURL;
std::unique_ptr<StringToDataMap> m_pStringToDataMap;
std::unique_ptr<StringToValPosMap> m_pStringToValPosMap;
css::uno::Reference< css::ucb::XSimpleFileAccess3 >
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 960650048718..2ce009cc8d7d 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -48,7 +48,6 @@ using namespace chelp;
ContentProvider::ContentProvider( const uno::Reference< uno::XComponentContext >& rxContext )
: ::ucbhelper::ContentProviderImplHelper( rxContext )
, isInitialized( false )
- , m_aScheme(MYUCP_URL_SCHEME)
{
}
@@ -169,7 +168,7 @@ ContentProvider::queryContent(
const uno::Reference< ucb::XContentIdentifier >& xCanonicId )
{
if ( !xCanonicId->getContentProviderScheme()
- .equalsIgnoreAsciiCase( m_aScheme ) )
+ .equalsIgnoreAsciiCase( MYUCP_URL_SCHEME ) )
{ // Wrong URL-scheme
throw ucb::IllegalIdentifierException();
}
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index c90950306062..c12d0cb7b995 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -119,7 +119,6 @@ namespace chelp {
private:
bool isInitialized;
- OUString m_aScheme;
std::unique_ptr<Databases> m_pDatabases;
css::uno::Reference<css::container::XContainer> m_xContainer;
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index 127b4ec0bdfd..8c6e0cfcd713 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -387,7 +387,7 @@ namespace chelp {
ItemSet m_aItems;
std::vector<OUString> m_aPath;
- css::uno::Sequence< css::beans::Property > m_sProperty;
+ css::uno::Sequence< css::beans::Property > const m_sProperty;
osl::Mutex m_aMutex;
std::unique_ptr<comphelper::OInterfaceContainerHelper2> m_pDisposeEventListeners;
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
index 41952ec9d30f..249ece256574 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetforquery.hxx
@@ -45,7 +45,7 @@ namespace chelp {
private:
- URLParameter m_aURLParameter;
+ URLParameter const m_aURLParameter;
};
}
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index 5b30916c278a..ff917d6def08 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -169,7 +169,7 @@ namespace chelp {
bool m_bHelpDataFileRead;
bool m_bUseDB;
- OUString m_aURL;
+ OUString const m_aURL;
OUString m_aTag;
OUString m_aId;
More information about the Libreoffice-commits
mailing list