summaryrefslogtreecommitdiff
path: root/xmloff/source/text
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-03-16 09:50:25 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-03-16 10:55:27 +0100
commit729927f7609b5753757d8c53f954958f067431aa (patch)
tree8b7bfe88baf64db2f6ef93cd78fecc88ebf87727 /xmloff/source/text
parent073817736f359821b668921cfad20c96943486bd (diff)
Revert "loplugin:constfields in xmloff"
This reverts commit 0302c9b192c3b7ba10daabed61d6864c24c14070. Change-Id: Ib919429e22ad039d6a82fe081f4e5421fe08905d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90549 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff/source/text')
-rw-r--r--xmloff/source/text/XMLChangeElementImportContext.hxx2
-rw-r--r--xmloff/source/text/XMLChangeImportContext.hxx4
-rw-r--r--xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx2
-rw-r--r--xmloff/source/text/XMLIndexSourceBaseContext.hxx2
-rw-r--r--xmloff/source/text/XMLIndexTemplateContext.hxx4
-rw-r--r--xmloff/source/text/XMLPropertyBackpatcher.hxx2
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx10
-rw-r--r--xmloff/source/text/XMLTextFrameHyperlinkContext.hxx2
-rw-r--r--xmloff/source/text/XMLTextListAutoStylePool.cxx2
-rw-r--r--xmloff/source/text/txtimp.cxx10
-rw-r--r--xmloff/source/text/txtparai.hxx2
-rw-r--r--xmloff/source/text/txtparaimphint.hxx10
-rw-r--r--xmloff/source/text/txtprhdl.cxx2
14 files changed, 28 insertions, 28 deletions
diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx
index 395ea94dc2c2..f1fe47ef2e99 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.hxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.hxx
@@ -51,7 +51,7 @@ class XMLChangeElementImportContext : public SvXMLImportContext
*
* So if bAcceptContent is true, we are importing a <text:deletion> element
*/
- bool const bAcceptContent;
+ bool bAcceptContent;
/// context of enclosing <text:changed-region> element
XMLChangedRegionImportContext& rChangedRegion;
diff --git a/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx
index 7dddeacc36fa..a2e88e809ae7 100644
--- a/xmloff/source/text/XMLChangeImportContext.hxx
+++ b/xmloff/source/text/XMLChangeImportContext.hxx
@@ -62,8 +62,8 @@ public:
const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override;
private:
- Element const m_Element;
- bool const m_bIsOutsideOfParagraph;
+ Element m_Element;
+ bool m_bIsOutsideOfParagraph;
};
#endif
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index 3346fafb70d6..9bbe6c4d0039 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -58,7 +58,7 @@ class XMLFootnoteConfigHelper : public SvXMLImportContext
{
OUStringBuffer sBuffer;
XMLFootnoteConfigurationImportContext& rConfig;
- bool const bIsBegin;
+ bool bIsBegin;
public:
diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
index a1771c77d837..3d05aa2dc568 100644
--- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
+++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx
@@ -39,7 +39,7 @@ class XMLIndexChapterInfoEntryContext : public XMLIndexSimpleEntryContext
// chapter format
sal_Int16 nChapterInfo;
bool bChapterInfoOK;
- bool const bTOC;
+ bool bTOC;
sal_Int16 nOutlineLevel;
bool bOutlineLevelOK;
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
index 8d9f4894611a..09973439c805 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx
@@ -75,7 +75,7 @@ enum IndexSourceParamEnum
*/
class XMLIndexSourceBaseContext : public SvXMLImportContext
{
- bool const bUseLevelFormats;
+ bool bUseLevelFormats;
bool bChapterIndex; /// chapter-wise or document index?
bool bRelativeTabs; /// tab stops relative to margin or indent?
diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx
index 5af747e0fad5..177e7db5896d 100644
--- a/xmloff/source/text/XMLIndexTemplateContext.hxx
+++ b/xmloff/source/text/XMLIndexTemplateContext.hxx
@@ -70,14 +70,14 @@ class XMLIndexTemplateContext : public SvXMLImportContext
OUString sStyleName;
const SvXMLEnumMapEntry<sal_uInt16>* pOutlineLevelNameMap;
- enum ::xmloff::token::XMLTokenEnum const eOutlineLevelAttrName;
+ enum ::xmloff::token::XMLTokenEnum eOutlineLevelAttrName;
const char** pOutlineLevelStylePropMap;
const bool* pAllowedTokenTypesMap;
sal_Int32 nOutlineLevel;
bool bStyleNameOK;
bool bOutlineLevelOK;
- bool const bTOC;
+ bool bTOC;
// PropertySet of current index
css::uno::Reference<css::beans::XPropertySet> & rPropertySet;
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx
index b829f008e787..d3fa054b9050 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.hxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx
@@ -62,7 +62,7 @@ class XMLPropertyBackpatcher
{
/// name of property that gets set or backpatched
- OUString const sPropertyName;
+ OUString sPropertyName;
/// backpatch list type
typedef ::std::vector<
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 7eb3b2b14109..d8580c3ddb26 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -85,10 +85,10 @@ typedef ::std::map < const OUString, OUString > ParamMap;
class XMLTextFrameContextHyperlink_Impl
{
- OUString const sHRef;
- OUString const sName;
- OUString const sTargetFrameName;
- bool const bMap;
+ OUString sHRef;
+ OUString sName;
+ OUString sTargetFrameName;
+ bool bMap;
public:
@@ -374,7 +374,7 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext
sal_Int16 nRelWidth;
sal_Int16 nRelHeight;
- sal_uInt16 const nType;
+ sal_uInt16 nType;
css::text::TextContentAnchorType eAnchorType;
bool bMayScript : 1;
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
index 132db87150f2..eb3906e18c25 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
@@ -35,7 +35,7 @@ class XMLTextFrameHyperlinkContext : public SvXMLImportContext
OUString sHRef;
OUString sName;
OUString sTargetFrameName;
- css::text::TextContentAnchorType const eDefaultAnchorType;
+ css::text::TextContentAnchorType eDefaultAnchorType;
SvXMLImportContextRef xFrameContext;
bool bMap;
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index dd788e215d8c..5f4e7320c323 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -43,7 +43,7 @@ class XMLTextListAutoStylePoolEntry_Impl
OUString sName;
OUString sInternalName;
Reference < XIndexReplace > xNumRules;
- sal_uInt32 const nPos;
+ sal_uInt32 nPos;
bool bIsNamed;
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 5dcae9a2d2bf..ebdb30ef7f7a 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -572,11 +572,11 @@ struct XMLTextImportHelper::Impl
SvXMLImport & m_rSvXMLImport;
- bool const m_bInsertMode : 1;
- bool const m_bStylesOnlyMode : 1;
- bool const m_bBlockMode : 1;
- bool const m_bProgress : 1;
- bool const m_bOrganizerMode : 1;
+ bool m_bInsertMode : 1;
+ bool m_bStylesOnlyMode : 1;
+ bool m_bBlockMode : 1;
+ bool m_bProgress : 1;
+ bool m_bOrganizerMode : 1;
bool m_bBodyContentStarted : 1;
/// Are we inside a <text:deletion> element (deleted redline section)
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 0624864e84a9..7dcba0007e40 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -49,7 +49,7 @@ class XMLParaContext : public SvXMLImportContext
// Lost outline numbering in master document (#i73509#)
bool mbOutlineLevelAttrFound;
bool bIgnoreLeadingSpace;
- bool const bHeading;
+ bool bHeading;
bool bIsListHeader;
bool bIsRestart;
sal_Int16 nStartValue;
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index fb532af457bb..175f3d65e658 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -37,7 +37,7 @@ class XMLHint_Impl
css::uno::Reference < css::text::XTextRange > xStart;
css::uno::Reference < css::text::XTextRange > xEnd;
- sal_uInt8 const nType;
+ sal_uInt8 nType;
public:
@@ -64,7 +64,7 @@ public:
class XMLStyleHint_Impl : public XMLHint_Impl
{
- OUString const sStyleName;
+ OUString sStyleName;
public:
@@ -80,7 +80,7 @@ public:
class XMLReferenceHint_Impl : public XMLHint_Impl
{
- OUString const sRefName;
+ OUString sRefName;
public:
@@ -163,7 +163,7 @@ public:
class XMLTextFrameHint_Impl : public XMLHint_Impl
{
// OD 2004-04-20 #i26791#
- SvXMLImportContextRef const xContext;
+ SvXMLImportContextRef xContext;
public:
@@ -216,7 +216,7 @@ public:
// Core impl. of the unification of drawing objects and Writer fly frames (#i26791#)
class XMLDrawHint_Impl : public XMLHint_Impl
{
- SvXMLImportContextRef const xContext;
+ SvXMLImportContextRef xContext;
public:
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 2a6e3a32c0d5..1e7547d1c8b8 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -734,7 +734,7 @@ namespace {
class XMLGrfMirrorPropHdl_Impl : public XMLPropertyHandler
{
const OUString sVal;
- bool const bHori;
+ bool bHori;
public:
XMLGrfMirrorPropHdl_Impl( enum XMLTokenEnum eVal, bool bH ) :