[Libreoffice-commits] core.git: include/xmloff xmloff/inc xmloff/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Mar 16 09:56:09 UTC 2020
include/xmloff/ProgressBarHelper.hxx | 2
include/xmloff/SinglePropertySetInfoCache.hxx | 2
include/xmloff/XMLCharContext.hxx | 2
include/xmloff/XMLFontAutoStylePool.hxx | 2
include/xmloff/XMLFontStylesContext.hxx | 2
include/xmloff/controlpropertyhdl.hxx | 2
include/xmloff/i18nmap.hxx | 4 -
include/xmloff/numehelp.hxx | 2
include/xmloff/prstylei.hxx | 2
include/xmloff/shapeimport.hxx | 2
include/xmloff/xmlement.hxx | 8 +--
include/xmloff/xmlevent.hxx | 2
include/xmloff/xmlexp.hxx | 6 +-
include/xmloff/xmlimp.hxx | 2
include/xmloff/xmlimppr.hxx | 2
include/xmloff/xmlnumfe.hxx | 2
include/xmloff/xmlnumfi.hxx | 4 -
include/xmloff/xmlnumi.hxx | 2
include/xmloff/xmlprcon.hxx | 6 +-
include/xmloff/xmlstyle.hxx | 2
include/xmloff/xmltkmap.hxx | 6 +-
include/xmloff/xmluconv.hxx | 2
xmloff/inc/MultiPropertySetHelper.hxx | 2
xmloff/inc/WordWrapPropertyHdl.hxx | 2
xmloff/inc/XMLBackgroundImageContext.hxx | 2
xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx | 6 +-
xmloff/inc/XMLClipPropertyHandler.hxx | 2
xmloff/inc/XMLRectangleMembersHandler.hxx | 2
xmloff/inc/XMLTextHeaderFooterContext.hxx | 4 -
xmloff/inc/animations.hxx | 2
xmloff/inc/propimp0.hxx | 2
xmloff/inc/txtfldi.hxx | 14 ++---
xmloff/inc/txtvfldi.hxx | 16 +++---
xmloff/source/chart/ColorPropertySet.hxx | 2
xmloff/source/chart/SchXMLAxisContext.hxx | 6 +-
xmloff/source/chart/SchXMLChartContext.cxx | 2
xmloff/source/chart/SchXMLChartContext.hxx | 12 ++--
xmloff/source/chart/SchXMLExport.cxx | 4 -
xmloff/source/chart/SchXMLImport.cxx | 2
xmloff/source/chart/SchXMLPlotAreaContext.hxx | 12 ++--
xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx | 4 -
xmloff/source/chart/SchXMLSeries2Context.cxx | 2
xmloff/source/chart/SchXMLSeries2Context.hxx | 6 +-
xmloff/source/chart/SchXMLTableContext.cxx | 2
xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx | 2
xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx | 2
xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx | 4 -
xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx | 2
xmloff/source/chart/transporttypes.hxx | 2
xmloff/source/core/DocumentSettingsContext.cxx | 2
xmloff/source/core/RDFaImportHelper.cxx | 8 +--
xmloff/source/core/xmlerror.cxx | 14 ++---
xmloff/source/core/xmlexp.cxx | 6 +-
xmloff/source/core/xmlimp.cxx | 2
xmloff/source/core/xmltoken.cxx | 4 -
xmloff/source/draw/EnhancedCustomShapeToken.cxx | 2
xmloff/source/draw/XMLNumberStyles.cxx | 14 ++---
xmloff/source/draw/animexp.cxx | 8 +--
xmloff/source/draw/sdpropls.hxx | 4 -
xmloff/source/draw/sdxmlexp.cxx | 8 +--
xmloff/source/draw/sdxmlexp_impl.hxx | 2
xmloff/source/draw/xexptran.cxx | 28 +++++------
xmloff/source/draw/ximpshap.hxx | 2
xmloff/source/draw/ximpstyl.hxx | 2
xmloff/source/forms/elementexport.hxx | 6 +-
xmloff/source/forms/gridcolumnproptranslator.cxx | 4 -
xmloff/source/forms/propertyimport.hxx | 2
xmloff/source/script/xmlscripti.cxx | 2
xmloff/source/style/PageHeaderFooterContext.hxx | 4 -
xmloff/source/style/PageMasterPropHdl.hxx | 2
xmloff/source/style/XMLFontAutoStylePool.cxx | 12 ++--
xmloff/source/style/XMLFontStylesContext_impl.hxx | 2
xmloff/source/style/XMLFootnoteSeparatorImport.hxx | 2
xmloff/source/style/impastpl.hxx | 14 ++---
xmloff/source/style/prstylecond.cxx | 4 -
xmloff/source/style/weighhdl.cxx | 4 -
xmloff/source/style/xmlbahdl.hxx | 18 +++----
xmloff/source/style/xmlexppr.cxx | 4 -
xmloff/source/style/xmlnumfe.cxx | 6 +-
xmloff/source/style/xmlnumfi.cxx | 24 ++++-----
xmloff/source/style/xmlprmap.cxx | 2
xmloff/source/style/xmlstyle.cxx | 2
xmloff/source/table/XMLTableImport.cxx | 8 +--
xmloff/source/table/table.hxx | 2
xmloff/source/text/XMLChangeElementImportContext.hxx | 2
xmloff/source/text/XMLChangeImportContext.hxx | 4 -
xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx | 2
xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx | 2
xmloff/source/text/XMLIndexSourceBaseContext.hxx | 2
xmloff/source/text/XMLIndexTemplateContext.hxx | 4 -
xmloff/source/text/XMLPropertyBackpatcher.hxx | 2
xmloff/source/text/XMLTextFrameContext.cxx | 10 +--
xmloff/source/text/XMLTextFrameHyperlinkContext.hxx | 2
xmloff/source/text/XMLTextListAutoStylePool.cxx | 2
xmloff/source/text/txtimp.cxx | 10 +--
xmloff/source/text/txtparai.hxx | 2
xmloff/source/text/txtparaimphint.hxx | 10 +--
xmloff/source/text/txtprhdl.cxx | 2
xmloff/source/transform/NotesTContext.hxx | 2
xmloff/source/xforms/xformsexport.cxx | 2
100 files changed, 238 insertions(+), 238 deletions(-)
New commits:
commit 729927f7609b5753757d8c53f954958f067431aa
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Mar 16 09:50:25 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Mar 16 10:55:27 2020 +0100
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 at collabora.co.uk>
diff --git a/include/xmloff/ProgressBarHelper.hxx b/include/xmloff/ProgressBarHelper.hxx
index 272ea33e9b30..aa1b3585a3b0 100644
--- a/include/xmloff/ProgressBarHelper.hxx
+++ b/include/xmloff/ProgressBarHelper.hxx
@@ -36,7 +36,7 @@ class XMLOFF_DLLPUBLIC ProgressBarHelper
sal_Int32 nReference;
sal_Int32 nValue;
double fOldPercent;
- bool const bStrict;
+ bool bStrict;
// #96469#; if the value goes over the Range the progressbar starts again
bool bRepeat;
diff --git a/include/xmloff/SinglePropertySetInfoCache.hxx b/include/xmloff/SinglePropertySetInfoCache.hxx
index 75ec174f5b92..052aeef6ee93 100644
--- a/include/xmloff/SinglePropertySetInfoCache.hxx
+++ b/include/xmloff/SinglePropertySetInfoCache.hxx
@@ -34,7 +34,7 @@ class SinglePropertySetInfoCache
typedef std::map<css::uno::Reference<css::beans::XPropertySetInfo>, bool>
Map;
- OUString const sName;
+ OUString sName;
Map map_;
public:
diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx
index 9cdfa63402be..364878e38dfe 100644
--- a/include/xmloff/XMLCharContext.hxx
+++ b/include/xmloff/XMLCharContext.hxx
@@ -28,7 +28,7 @@ class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext
{
XMLCharContext(const XMLCharContext&) = delete;
void operator =(const XMLCharContext&) = delete;
- sal_Int16 const m_nControl;
+ sal_Int16 m_nControl;
protected:
sal_uInt16 m_nCount;
sal_Unicode m_c;
diff --git a/include/xmloff/XMLFontAutoStylePool.hxx b/include/xmloff/XMLFontAutoStylePool.hxx
index 59ca1414078b..2354bcf8ce7d 100644
--- a/include/xmloff/XMLFontAutoStylePool.hxx
+++ b/include/xmloff/XMLFontAutoStylePool.hxx
@@ -40,7 +40,7 @@ private:
std::unique_ptr<XMLFontAutoStylePool_Impl> m_pFontAutoStylePool;
std::set<OUString> m_aNames;
- bool const m_bTryToEmbedFonts;
+ bool m_bTryToEmbedFonts;
std::unordered_map<OString, OUString> m_aEmbeddedFontFiles;
OUString embedFontFile(OUString const & rFileUrl, OUString const & rFamilyName);
diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx
index 5f97f9b772aa..b10bf2797b14 100644
--- a/include/xmloff/XMLFontStylesContext.hxx
+++ b/include/xmloff/XMLFontStylesContext.hxx
@@ -43,7 +43,7 @@ class XMLOFF_DLLPUBLIC XMLFontStylesContext final : public SvXMLStylesContext
std::unique_ptr<SvXMLTokenMap> pFontStyleAttrTokenMap;
- rtl_TextEncoding const eDfltEncoding;
+ rtl_TextEncoding eDfltEncoding;
virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
diff --git a/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx
index 1a767ff50781..6ec2cb2dab1e 100644
--- a/include/xmloff/controlpropertyhdl.hxx
+++ b/include/xmloff/controlpropertyhdl.hxx
@@ -75,7 +75,7 @@ namespace xmloff
virtual bool exportXML( OUString& _rStrExpValue, const css::uno::Any& _rValue, const SvXMLUnitConverter& _rUnitConverter ) const override;
private:
- BorderFacet const m_eFacet;
+ BorderFacet m_eFacet;
};
diff --git a/include/xmloff/i18nmap.hxx b/include/xmloff/i18nmap.hxx
index 20953d147f2e..c3921281f70f 100644
--- a/include/xmloff/i18nmap.hxx
+++ b/include/xmloff/i18nmap.hxx
@@ -27,8 +27,8 @@
class SvI18NMapEntry_Key
{
- sal_uInt16 const nKind;
- OUString const aName;
+ sal_uInt16 nKind;
+ OUString aName;
public:
SvI18NMapEntry_Key( sal_uInt16 nKnd, const OUString& rName ) :
nKind( nKnd ),
diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx
index 9e0292e6380e..0c32b595f3f7 100644
--- a/include/xmloff/numehelp.hxx
+++ b/include/xmloff/numehelp.hxx
@@ -36,7 +36,7 @@ class SvXMLExport;
struct XMLNumberFormat
{
OUString sCurrency;
- sal_Int32 const nNumberFormat;
+ sal_Int32 nNumberFormat;
sal_Int16 nType;
bool bIsStandard : 1;
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index dced149b4289..d34fd4527644 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -42,7 +42,7 @@ class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext
private:
::std::vector< XMLPropertyState > maProperties;
css::uno::Reference < css::style::XStyle > mxStyle;
- SvXMLImportContextRef const mxStyles;
+ SvXMLImportContextRef mxStyles;
XMLPropStyleContext(XMLPropStyleContext const &) = delete;
XMLPropStyleContext& operator =(XMLPropStyleContext const &) = delete;
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 12fe2aea6b08..4ccd94d9e432 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -199,7 +199,7 @@ class SvXMLShapeContext : public SvXMLImportContext
{
protected:
css::uno::Reference< css::drawing::XShape > mxShape;
- bool const mbTemporaryShape;
+ bool mbTemporaryShape;
OUString msHyperlink;
public:
diff --git a/include/xmloff/xmlement.hxx b/include/xmloff/xmlement.hxx
index 92173b31b2b0..bedef86e654c 100644
--- a/include/xmloff/xmlement.hxx
+++ b/include/xmloff/xmlement.hxx
@@ -33,8 +33,8 @@ template<typename EnumT>
struct SvXMLEnumMapEntry
{
private:
- ::xmloff::token::XMLTokenEnum const eToken;
- sal_uInt16 const nValue;
+ ::xmloff::token::XMLTokenEnum eToken;
+ sal_uInt16 nValue;
public:
SvXMLEnumMapEntry(::xmloff::token::XMLTokenEnum eToken_, EnumT nValue_)
: eToken(eToken_), nValue(static_cast<sal_uInt16>(nValue_)) {}
@@ -71,8 +71,8 @@ struct SvXMLEnumStringMapEntry
{
private:
const char * pName;
- sal_Int32 const nNameLength;
- sal_uInt16 const nValue;
+ sal_Int32 nNameLength;
+ sal_uInt16 nValue;
public:
SvXMLEnumStringMapEntry(const char * pName_, sal_Int32 nNameLength_, EnumT nValue_)
: pName(pName_), nNameLength(nNameLength_), nValue(nValue_) {}
diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx
index ebbd400755fc..f365a2ce4417 100644
--- a/include/xmloff/xmlevent.hxx
+++ b/include/xmloff/xmlevent.hxx
@@ -75,7 +75,7 @@ struct XMLEventName
struct XMLEventNameTranslation
{
const char* sAPIName;
- sal_uInt16 const nPrefix; // namespace prefix
+ sal_uInt16 nPrefix; // namespace prefix
const char* sXMLName;
};
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 0ff26a843d45..e1c9b2eb6129 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -118,7 +118,7 @@ class XMLOFF_DLLPUBLIC SvXMLExport : public cppu::WeakImplHelper<
std::unique_ptr<SvXMLExport_Impl> mpImpl; // dummy
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- OUString const m_implementationName;
+ OUString m_implementationName;
css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::xml::sax::XDocumentHandler > mxHandler; // the handlers
@@ -228,8 +228,8 @@ protected:
struct SettingsGroup
{
- ::xmloff::token::XMLTokenEnum const eGroupName;
- css::uno::Sequence< css::beans::PropertyValue > const aSettings;
+ ::xmloff::token::XMLTokenEnum eGroupName;
+ css::uno::Sequence< css::beans::PropertyValue > aSettings;
SettingsGroup(
const ::xmloff::token::XMLTokenEnum _eGroupName,
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 5bcd2531c845..19bb0b7b5358 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -214,7 +214,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public cppu::WeakImplHelper<
SAL_DLLPRIVATE void InitCtor_();
- SvXMLImportFlags const mnImportFlags;
+ SvXMLImportFlags mnImportFlags;
std::set< OUString > embeddedFontUrlsKnown;
bool isFastContext;
css::uno::Reference< css::xml::sax::XFastParser > mxParser;
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index d77d434b3ab5..de10dd3b7b10 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -53,7 +53,7 @@ class SvXMLImport;
*/
struct ContextID_Index_Pair
{
- sal_Int16 const nContextID;
+ sal_Int16 nContextID;
sal_Int32 nIndex;
};
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 71e25bd2b907..3798c7bd6977 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -48,7 +48,7 @@ class XMLOFF_DLLPUBLIC SvXMLNumFmtExport final
{
private:
SvXMLExport& rExport;
- OUString const sPrefix;
+ OUString sPrefix;
SvNumberFormatter* pFormatter;
OUStringBuffer sTextContent;
std::unique_ptr<SvXMLNumUsedList_Impl> pUsedList;
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index 4a1eaca5b256..a37335ef67bc 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -117,9 +117,9 @@ struct MyCondition
class XMLOFF_DLLPUBLIC SvXMLNumFormatContext : public SvXMLStyleContext
{
SvXMLNumImpData* pData;
- SvXMLStylesContext* const pStyles;
+ SvXMLStylesContext* pStyles;
std::vector <MyCondition> aMyConditions;
- sal_uInt16 const nType;
+ sal_uInt16 nType;
sal_Int32 nKey;
// OUString sFormatName;
OUString sFormatTitle;
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index 654583a37563..ca82d8f55295 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -41,7 +41,7 @@ class XMLOFF_DLLPUBLIC SvxXMLListStyleContext final
std::unique_ptr<SvxXMLListStyle_Impl> pLevelStyles;
bool bConsecutive : 1;
- bool const bOutline : 1;
+ bool bOutline : 1;
SAL_DLLPRIVATE virtual void SetAttribute( sal_uInt16 nPrefixKey,
const OUString& rLocalName,
diff --git a/include/xmloff/xmlprcon.hxx b/include/xmloff/xmlprcon.hxx
index dc528233e187..a0219b3742d9 100644
--- a/include/xmloff/xmlprcon.hxx
+++ b/include/xmloff/xmlprcon.hxx
@@ -30,9 +30,9 @@ struct XMLPropertyState;
class XMLOFF_DLLPUBLIC SvXMLPropertySetContext : public SvXMLImportContext
{
protected:
- sal_Int32 const mnStartIdx;
- sal_Int32 const mnEndIdx;
- sal_uInt32 const mnFamily;
+ sal_Int32 mnStartIdx;
+ sal_Int32 mnEndIdx;
+ sal_uInt32 mnFamily;
::std::vector< XMLPropertyState > &mrProperties;
rtl::Reference < SvXMLImportPropertyMapper > mxMapper;
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index c728f0e5b501..7b81350e2c31 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -72,7 +72,7 @@ class XMLOFF_DLLPUBLIC SvXMLStyleContext : public SvXMLImportContext
// by Finish() or si somehow invalid.
bool mbNew : 1; // Set this to false in CreateAnsInsert
// if the style is already existing.
- bool const mbDefaultStyle : 1;
+ bool mbDefaultStyle : 1;
protected:
diff --git a/include/xmloff/xmltkmap.hxx b/include/xmloff/xmltkmap.hxx
index df4de8e4848f..0449a27d184e 100644
--- a/include/xmloff/xmltkmap.hxx
+++ b/include/xmloff/xmltkmap.hxx
@@ -34,10 +34,10 @@ class SvXMLTokenMap_Impl;
struct SvXMLTokenMapEntry
{
- enum xmloff::token::XMLTokenEnum const eLocalName;
+ enum xmloff::token::XMLTokenEnum eLocalName;
sal_Int32 nFastToken;
- sal_uInt16 const nPrefixKey;
- sal_uInt16 const nToken;
+ sal_uInt16 nPrefixKey;
+ sal_uInt16 nToken;
SvXMLTokenMapEntry( sal_uInt16 nPrefix, xmloff::token::XMLTokenEnum eName,
sal_uInt16 nTok, sal_Int32 nFastTok = 0 ) :
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index a17c7d0deea6..cbeb41907b16 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -56,7 +56,7 @@ class XMLOFF_DLLPUBLIC SvXMLTokenEnumerator
private:
const OUString& maTokenString;
sal_Int32 mnNextTokenPos;
- sal_Unicode const mcSeparator;
+ sal_Unicode mcSeparator;
public:
SvXMLTokenEnumerator( const OUString& rString, sal_Unicode cSeparator = u' ' );
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx
index 4e1c18958fbd..7744c907c72c 100644
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
@@ -75,7 +75,7 @@ class MultiPropertySetHelper
const css::uno::Any* pValues;
/// an empty Any
- css::uno::Any const aEmptyAny;
+ css::uno::Any aEmptyAny;
public:
diff --git a/xmloff/inc/WordWrapPropertyHdl.hxx b/xmloff/inc/WordWrapPropertyHdl.hxx
index 12fca72171e3..22aea9aff4cd 100644
--- a/xmloff/inc/WordWrapPropertyHdl.hxx
+++ b/xmloff/inc/WordWrapPropertyHdl.hxx
@@ -29,7 +29,7 @@ class SvXMLImport;
class XMLWordWrapPropertyHdl final : public XMLPropertyHandler
{
private:
- SvXMLImport* const mpImport;
+ SvXMLImport* mpImport;
public:
XMLWordWrapPropertyHdl( SvXMLImport* pImport );
diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx
index 39c9949f6159..402e28291da6 100644
--- a/xmloff/inc/XMLBackgroundImageContext.hxx
+++ b/xmloff/inc/XMLBackgroundImageContext.hxx
@@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star {
class XMLBackgroundImageContext final : public XMLElementPropertyContext
{
XMLPropertyState aPosProp;
- sal_Int32 const m_nBitmapModeIdx;
+ sal_Int32 m_nBitmapModeIdx;
XMLPropertyState aFilterProp;
XMLPropertyState aTransparencyProp;
diff --git a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
index a62b39741c85..64cfe9876e41 100644
--- a/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
+++ b/xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx
@@ -29,9 +29,9 @@ template<typename EnumT> struct SvXMLEnumMapEntry;
*/
class XMLBitmapRepeatOffsetPropertyHandler final : public XMLPropertyHandler
{
- bool const mbX;
- OUString const msVertical;
- OUString const msHorizontal;
+ bool mbX;
+ OUString msVertical;
+ OUString msHorizontal;
public:
XMLBitmapRepeatOffsetPropertyHandler( bool bX );
diff --git a/xmloff/inc/XMLClipPropertyHandler.hxx b/xmloff/inc/XMLClipPropertyHandler.hxx
index 50a59481ae4b..b11eb2c76327 100644
--- a/xmloff/inc/XMLClipPropertyHandler.hxx
+++ b/xmloff/inc/XMLClipPropertyHandler.hxx
@@ -27,7 +27,7 @@
*/
class XMLClipPropertyHandler final : public XMLPropertyHandler
{
- bool const m_bODF11;
+ bool m_bODF11;
public:
XMLClipPropertyHandler( bool bODF11 );
virtual ~XMLClipPropertyHandler() override;
diff --git a/xmloff/inc/XMLRectangleMembersHandler.hxx b/xmloff/inc/XMLRectangleMembersHandler.hxx
index 7ebf55300a4f..e0d61a01f383 100644
--- a/xmloff/inc/XMLRectangleMembersHandler.hxx
+++ b/xmloff/inc/XMLRectangleMembersHandler.hxx
@@ -31,7 +31,7 @@ template<typename EnumT> struct SvXMLEnumMapEntry;
class XMLRectangleMembersHdl final : public XMLPropertyHandler
{
private:
- sal_Int32 const mnType;
+ sal_Int32 mnType;
public:
XMLRectangleMembersHdl( sal_Int32 nType );
diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index fee5211ddbd1..8cdd2c739d53 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -39,8 +39,8 @@ class XMLTextHeaderFooterContext final : public SvXMLImportContext
const OUString sTextLeft;
bool bInsertContent : 1;
- bool const bLeft : 1;
- bool const bFirst : 1;
+ bool bLeft : 1;
+ bool bFirst : 1;
public:
diff --git a/xmloff/inc/animations.hxx b/xmloff/inc/animations.hxx
index a84907845236..668d1839aa80 100644
--- a/xmloff/inc/animations.hxx
+++ b/xmloff/inc/animations.hxx
@@ -45,7 +45,7 @@ extern const SvXMLEnumMapEntry<sal_Int16> aAnimations_EnumMap_Command[];
struct ImplAttributeNameConversion
{
- token::XMLTokenEnum const meXMLToken;
+ token::XMLTokenEnum meXMLToken;
const char* mpAPIName;
};
diff --git a/xmloff/inc/propimp0.hxx b/xmloff/inc/propimp0.hxx
index ec7e7ddadc97..1e8615f380f8 100644
--- a/xmloff/inc/propimp0.hxx
+++ b/xmloff/inc/propimp0.hxx
@@ -36,7 +36,7 @@ class SvXMLImport;
class XMLOpacityPropertyHdl final : public XMLPropertyHandler
{
private:
- SvXMLImport* const mpImport;
+ SvXMLImport* mpImport;
public:
explicit XMLOpacityPropertyHdl( SvXMLImport* pImport );
virtual ~XMLOpacityPropertyHdl() override;
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 0ca05a051c4e..94d0c6ce5cbf 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -187,7 +187,7 @@ class XMLSenderFieldImportContext : public XMLTextFieldImportContext
protected:
// variables for access in subclass
bool bFixed;
- sal_uInt16 const nElementToken; /// token for this element field
+ sal_uInt16 nElementToken; /// token for this element field
public:
@@ -394,7 +394,7 @@ class XMLDatabaseFieldImportContext : public XMLTextFieldImportContext
bool bDisplay;
bool bDisplayOK;
- bool const bUseDisplay;
+ bool bUseDisplay;
protected:
bool bDatabaseOK;
@@ -534,8 +534,8 @@ class XMLSimpleDocInfoImportContext : public XMLTextFieldImportContext
protected:
bool bFixed;
- bool const bHasAuthor;
- bool const bHasContent;
+ bool bHasAuthor;
+ bool bHasContent;
public:
@@ -913,7 +913,7 @@ class XMLReferenceFieldImportContext final : public XMLTextFieldImportContext
{
OUString sName;
OUString sLanguage;
- sal_uInt16 const nElementToken;
+ sal_uInt16 nElementToken;
sal_Int16 nSource;
sal_Int16 nType;
@@ -978,7 +978,7 @@ public:
class XMLDdeFieldImportContext final : public XMLTextFieldImportContext
{
OUString sName;
- OUString const sPropertyContent;
+ OUString sPropertyContent;
public:
@@ -1107,7 +1107,7 @@ class XMLAnnotationImportContext final : public XMLTextFieldImportContext
css::uno::Reference < css::text::XTextCursor > mxCursor;
css::uno::Reference < css::text::XTextCursor > mxOldCursor;
- sal_uInt16 const m_nToken;
+ sal_uInt16 m_nToken;
public:
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index cce0447fe3e5..d399ff2beea9 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -121,14 +121,14 @@ private:
bool bHintOK; /// sHint was set
bool bDisplayOK; /// sDisplayFormula/-None were set
- bool const bSetFormula; /// set Formula property
- bool const bSetFormulaDefault; /// use content as default for formula
- bool const bSetDescription; /// set sDescription with Hint-property
- bool const bSetHelp;
- bool const bSetHint;
- bool const bSetVisible; /// set IsVisible
+ bool bSetFormula; /// set Formula property
+ bool bSetFormulaDefault; /// use content as default for formula
+ bool bSetDescription; /// set sDescription with Hint-property
+ bool bSetHelp;
+ bool bSetHint;
+ bool bSetVisible; /// set IsVisible
bool bSetDisplayFormula; /// set DisplayFormula (sub type???)
- bool const bSetPresentation; /// set presentation frm elem. content?
+ bool bSetPresentation; /// set presentation frm elem. content?
public:
@@ -377,7 +377,7 @@ private:
*/
class XMLVariableDeclsImportContext final : public SvXMLImportContext
{
- enum VarType const eVarDeclsContextType;
+ enum VarType eVarDeclsContextType;
XMLTextImportHelper& rImportHelper;
public:
diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx
index 739ed50315bf..f10d9e10ef45 100644
--- a/xmloff/source/chart/ColorPropertySet.hxx
+++ b/xmloff/source/chart/ColorPropertySet.hxx
@@ -73,7 +73,7 @@ private:
css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo;
static constexpr OUStringLiteral g_aColorPropName = "FillColor";
Color m_nColor;
- Color const m_nDefaultColor;
+ Color m_nDefaultColor;
};
} // namespace chart
diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx
index f5e16577f61e..622c6282aeb0 100644
--- a/xmloff/source/chart/SchXMLAxisContext.hxx
+++ b/xmloff/source/chart/SchXMLAxisContext.hxx
@@ -64,9 +64,9 @@ private:
sal_Int32 m_nAxisType;//css::chart::ChartAxisType
bool m_bAxisTypeImported;
bool m_bDateScaleImported;
- bool const m_bAddMissingXAxisForNetCharts; //to correct errors from older versions
- bool const m_bAdaptWrongPercentScaleValues; //to correct errors from older versions
- bool const m_bAdaptXAxisOrientationForOld2DBarCharts; //to correct different behaviour from older versions
+ bool m_bAddMissingXAxisForNetCharts; //to correct errors from older versions
+ bool m_bAdaptWrongPercentScaleValues; //to correct errors from older versions
+ bool m_bAdaptXAxisOrientationForOld2DBarCharts; //to correct different behaviour from older versions
bool& m_rbAxisPositionAttributeImported;
css::uno::Reference< css::drawing::XShape > getTitleShape() const;
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index f3bc2fa9e840..706998f68387 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -441,7 +441,7 @@ namespace
struct NewDonutSeries
{
css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
- OUString const msStyleName;
+ OUString msStyleName;
sal_Int32 mnAttachedAxis;
::std::vector< OUString > m_aSeriesStyles;
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index c0dca6e654fc..26f38d0bf9ec 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -49,12 +49,12 @@ struct SeriesDefaultsAndStyles
css::uno::Any maSymbolTypeDefault;
css::uno::Any maDataCaptionDefault;
- css::uno::Any const maErrorIndicatorDefault;
- css::uno::Any const maErrorCategoryDefault;
- css::uno::Any const maConstantErrorLowDefault;
- css::uno::Any const maConstantErrorHighDefault;
- css::uno::Any const maPercentageErrorDefault;
- css::uno::Any const maErrorMarginDefault;
+ css::uno::Any maErrorIndicatorDefault;
+ css::uno::Any maErrorCategoryDefault;
+ css::uno::Any maConstantErrorLowDefault;
+ css::uno::Any maConstantErrorHighDefault;
+ css::uno::Any maPercentageErrorDefault;
+ css::uno::Any maErrorMarginDefault;
css::uno::Any maMeanValueDefault;
css::uno::Any maRegressionCurvesDefault;
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index dd56e8fc658e..a2716cfd6c1f 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -265,7 +265,7 @@ public:
OUString msChartAddress;
css::uno::Sequence< sal_Int32 > maSequenceMapping;
- OUString const msCLSID;
+ OUString msCLSID;
OUString maSrcShellID;
OUString maDestShellID;
@@ -343,7 +343,7 @@ public:
}
private:
- OUString const m_aRole;
+ OUString m_aRole;
};
template< typename T >
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 2675e3678fba..e03a2d3c203c 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -68,7 +68,7 @@ public:
}
private:
- OUString const m_aChartTypeName;
+ OUString m_aChartTypeName;
};
} // anonymous namespace
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index d43179db2981..d55fb5dd04a9 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -129,12 +129,12 @@ private:
bool & mrColHasLabels;
bool & mrRowHasLabels;
css::chart::ChartDataRowSource & mrDataRowSource;
- OUString const maChartTypeServiceName;
+ OUString maChartTypeServiceName;
tSchXMLLSequencesPerIndex & mrLSequencesPerIndex;
bool mbGlobalChartTypeUsedBySeries;
- css::awt::Size const maChartSize;
+ css::awt::Size maChartSize;
};
class SchXMLDataLabelSpanContext: public SvXMLImportContext
@@ -226,7 +226,7 @@ public:
private:
SchXMLImportHelper& mrImportHelper;
css::uno::Reference< css::chart::X3DDisplay > mxWallFloorSupplier;
- ContextType const meContextType;
+ ContextType meContextType;
public:
SchXMLWallFloorContext( SchXMLImportHelper& rImportHelper,
@@ -252,7 +252,7 @@ public:
private:
SchXMLImportHelper& mrImportHelper;
css::uno::Reference< css::chart::XStatisticDisplay > mxStockPropProvider;
- ContextType const meContextType;
+ ContextType meContextType;
public:
SchXMLStockContext( SchXMLImportHelper& rImportHelper,
@@ -293,8 +293,8 @@ private:
SchXMLImportHelper & mrImportHelper;
::std::vector< DataRowPointStyle > & mrStyleVector;
css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
- ContextType const meContextType;
- OUString const maSeriesStyleName;
+ ContextType meContextType;
+ OUString maSeriesStyleName;
tSchXMLLSequencesPerIndex& mrLSequencesPerIndex;
};
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
index 72cf7cdb0116..c9f13f4e53d6 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
@@ -49,7 +49,7 @@ private:
SchXMLImportHelper& mrImportHelper;
css::uno::Reference<css::chart2::XDataSeries > mxSeries;
- css::awt::Size const maChartSize;
+ css::awt::Size maChartSize;
std::vector< RegressionStyle >& mrRegressionStyleVector;
};
@@ -71,7 +71,7 @@ public:
private:
SchXMLImportHelper& mrImportHelper;
RegressionStyle& mrRegressionStyle;
- css::awt::Size const maChartSize;
+ css::awt::Size maChartSize;
};
#endif // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLREGRESSIONCURVEOBJECTCONTEXT_HXX
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 38ec7c084d2b..31e638971368 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -510,7 +510,7 @@ struct DomainInfo
: aRole(rRole), aRange(rRange), nIndexForLocalData(nIndex)
{}
- OUString const aRole;
+ OUString aRole;
OUString aRange;
sal_Int32 nIndexForLocalData;
};
diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx
index cbf0b2a52cdd..5deb9db8764a 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.hxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.hxx
@@ -48,9 +48,9 @@ private:
::std::vector< RegressionStyle >& mrRegressionStyleVector;
css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
- sal_Int32 const mnSeriesIndex;
+ sal_Int32 mnSeriesIndex;
sal_Int32 mnDataPointIndex;
- bool const m_bStockHasVolume;
+ bool m_bStockHasVolume;
GlobalSeriesImportInfo& m_rGlobalSeriesImportInfo;
@@ -66,7 +66,7 @@ private:
tSchXMLLSequencesPerIndex maPostponedSequences;
bool& mrGlobalChartTypeUsedBySeries;
bool mbSymbolSizeIsMissingInFile;
- css::awt::Size const maChartSize;
+ css::awt::Size maChartSize;
public:
SchXMLSeries2Context( SchXMLImportHelper& rImpHelper,
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index 44d878759fb6..b561dcfb058e 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -90,7 +90,7 @@ struct lcl_ApplyCellToData
private:
Sequence< double > & m_rData;
sal_Int32 m_nIndex;
- sal_Int32 const m_nSize;
+ sal_Int32 m_nSize;
double m_fNaN;
};
diff --git a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
index 4610c3a0fc55..485b7a89c379 100644
--- a/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
+++ b/xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx
@@ -31,7 +31,7 @@ public:
virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
private:
- bool const m_bCrossingValue;
+ bool m_bCrossingValue;
};
#endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLAXISPOSITIONPROPERTYHDL_HXX
diff --git a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
index d44dc928bd1b..6e4de8706283 100644
--- a/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
+++ b/xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx
@@ -24,7 +24,7 @@
class XMLErrorIndicatorPropertyHdl : public XMLPropertyHandler
{
private:
- bool const mbUpperIndicator;
+ bool mbUpperIndicator;
public:
explicit XMLErrorIndicatorPropertyHdl( bool bUpper ) : mbUpperIndicator( bUpper )
diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
index fa51286635b8..1eb374a41f1a 100644
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx
@@ -27,8 +27,8 @@ namespace
{
struct SvXMLSignedEnumMapEntry
{
- ::xmloff::token::XMLTokenEnum const eToken;
- sal_Int32 const nValue;
+ ::xmloff::token::XMLTokenEnum eToken;
+ sal_Int32 nValue;
};
const SvXMLSignedEnumMapEntry aXMLChartSymbolTypeEnumMap[] =
diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
index fde168ce58a3..475463a5943b 100644
--- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
+++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx
@@ -31,7 +31,7 @@ public:
virtual bool exportXML( OUString& rStrExpValue, const css::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const override;
private:
- bool const m_bIsNamedSymbol;
+ bool m_bIsNamedSymbol;
};
#endif // INCLUDED_XMLOFF_SOURCE_CHART_XMLSYMBOLTYPEPROPERTYHDL_HXX
diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx
index cc7dce95ef06..673729f43033 100644
--- a/xmloff/source/chart/transporttypes.hxx
+++ b/xmloff/source/chart/transporttypes.hxx
@@ -135,7 +135,7 @@ struct RegressionStyle
css::uno::Reference<
css::beans::XPropertySet > m_xEquationProperties;
- OUString const msStyleName;
+ OUString msStyleName;
RegressionStyle(const css::uno::Reference<
css::chart2::XDataSeries >& xSeries,
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index f7e4ea468ee3..8167ac678217 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -193,7 +193,7 @@ public:
class XMLConfigItemMapIndexedContext : public XMLConfigBaseContext
{
private:
- OUString const maConfigItemName;
+ OUString maConfigItemName;
public:
XMLConfigItemMapIndexedContext(SvXMLImport& rImport,
diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx
index 81af8cb9d976..8d724735ff54 100644
--- a/xmloff/source/core/RDFaImportHelper.cxx
+++ b/xmloff/source/core/RDFaImportHelper.cxx
@@ -109,10 +109,10 @@ public:
/** store parsed RDFa attributes */
struct ParsedRDFaAttributes
{
- OUString const m_About;
- ::std::vector< OUString > const m_Properties;
- OUString const m_Content;
- OUString const m_Datatype;
+ OUString m_About;
+ ::std::vector< OUString > m_Properties;
+ OUString m_Content;
+ OUString m_Datatype;
ParsedRDFaAttributes(
OUString const & i_rAbout,
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 115c2b12de3a..8b070c7f53c8 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -50,18 +50,18 @@ public:
const OUString& rPublicId,
const OUString& rSystemId);
- sal_Int32 const nId; /// error ID
+ sal_Int32 nId; /// error ID
- OUString const sExceptionMessage;/// message of original exception (if available)
+ OUString sExceptionMessage;/// message of original exception (if available)
// XLocator information:
- sal_Int32 const nRow; /// row number where error occurred (or -1 for unknown)
- sal_Int32 const nColumn; /// column number where error occurred (or -1)
- OUString const sPublicId; /// public identifier
- OUString const sSystemId; /// public identifier
+ sal_Int32 nRow; /// row number where error occurred (or -1 for unknown)
+ sal_Int32 nColumn; /// column number where error occurred (or -1)
+ OUString sPublicId; /// public identifier
+ OUString sSystemId; /// public identifier
/// message Parameters
- Sequence<OUString> const aParams;
+ Sequence<OUString> aParams;
};
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 0a1f53107d13..5bb3db71c7d4 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -125,9 +125,9 @@ namespace {
struct XMLServiceMapEntry_Impl
{
const char *sModelService;
- sal_Int32 const nModelServiceLen;
+ sal_Int32 nModelServiceLen;
const char *sFilterService;
- sal_Int32 const nFilterServiceLen;
+ sal_Int32 nFilterServiceLen;
};
}
@@ -261,7 +261,7 @@ public:
uno::Reference< embed::XStorage > mxTargetStorage;
- SvtSaveOptions const maSaveOptions;
+ SvtSaveOptions maSaveOptions;
/// name of stream in package, e.g., "content.xml"
OUString mStreamName;
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 628054dc1fcd..2470d054e355 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -283,7 +283,7 @@ public:
bool mbTextDocInOOoFileFormat;
const uno::Reference< uno::XComponentContext > mxComponentContext;
- OUString const implementationName;
+ OUString implementationName;
uno::Reference< embed::XStorage > mxSourceStorage;
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index b55c4c9c7a7b..48fc80a37b0b 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -33,11 +33,11 @@ namespace xmloff::token {
{
struct XMLTokenEntry
{
- sal_Int32 const nLength;
+ sal_Int32 nLength;
const char* pChar;
std::optional<OUString> xOUString;
#if OSL_DEBUG_LEVEL > 0
- XMLTokenEnum const eToken;
+ XMLTokenEnum eToken;
#endif
};
}
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index 22e88df0ced6..ffbb5813ccdb 100644
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
@@ -37,7 +37,7 @@ namespace {
struct TokenTable
{
const char* pS;
- EnhancedCustomShapeTokenEnum const pE;
+ EnhancedCustomShapeTokenEnum pE;
};
}
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx
index 98bdeb17ef9e..99cdb55b11d6 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -35,10 +35,10 @@ namespace {
struct SdXMLDataStyleNumber
{
- enum XMLTokenEnum const meNumberStyle;
- bool const mbLong;
- bool const mbTextual;
- bool const mbDecimal02;
+ enum XMLTokenEnum meNumberStyle;
+ bool mbLong;
+ bool mbTextual;
+ bool mbDecimal02;
const char* mpText;
};
@@ -93,8 +93,8 @@ SdXMLDataStyleNumber const aSdXMLDataStyleNumbers[] =
struct SdXMLFixedDataStyle
{
const char* mpName;
- bool const mbAutomatic;
- bool const mbDateStyle;
+ bool mbAutomatic;
+ bool mbDateStyle;
sal_uInt8 mpFormat[8];
};
@@ -484,7 +484,7 @@ class SdXMLNumberFormatMemberImportContext : public SvXMLImportContext
private:
SdXMLNumberFormatImportContext* mpParent;
- OUString const maNumberStyle;
+ OUString maNumberStyle;
bool mbLong;
bool mbTextual;
bool mbDecimal02;
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index fbed96791f34..3dfbe0175450 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -51,10 +51,10 @@ namespace {
struct Effect
{
- XMLEffect const meKind;
- XMLEffectDirection const meDirection;
- sal_Int16 const mnStartScale;
- bool const mbIn;
+ XMLEffect meKind;
+ XMLEffectDirection meDirection;
+ sal_Int16 mnStartScale;
+ bool mbIn;
};
}
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index 4e2bedb5a79d..893ab3d5df8e 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -56,8 +56,8 @@ class XMLSdPropHdlFactory : public XMLPropertyHandlerFactory
{
private:
css::uno::Reference< css::frame::XModel > mxModel;
- SvXMLExport* const mpExport;
- SvXMLImport* const mpImport;
+ SvXMLExport* mpExport;
+ SvXMLImport* mpImport;
public:
XMLSdPropHdlFactory( css::uno::Reference< css::frame::XModel > const & xModel, SvXMLExport& rExport );
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 48a8837fbfb0..03c769cce1a4 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -187,11 +187,11 @@ void ImpXMLEXPPageMasterInfo::SetName(const OUString& rStr)
class ImpXMLAutoLayoutInfo
{
- sal_uInt16 const mnType;
- ImpXMLEXPPageMasterInfo* const mpPageMasterInfo;
+ sal_uInt16 mnType;
+ ImpXMLEXPPageMasterInfo* mpPageMasterInfo;
OUString msLayoutName;
- tools::Rectangle maTitleRect;
- tools::Rectangle maPresRect;
+ tools::Rectangle maTitleRect;
+ tools::Rectangle maPresRect;
sal_Int32 mnGapX;
sal_Int32 mnGapY;
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index 1ececf77ff0d..aacacba93b07 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -108,7 +108,7 @@ class SdXMLExport : public SvXMLExport
SdXMLFormatMap maUsedDateStyles; // this is a vector with the used formattings for date fields
SdXMLFormatMap maUsedTimeStyles; // this is a vector with the used formattings for time fields
- bool const mbIsDraw;
+ bool mbIsDraw;
virtual void ExportStyles_(bool bUsed) override;
virtual void ExportAutoStyles_() override;
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 0137166871bc..ca9a7a2c55fd 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -162,7 +162,7 @@ static void Imp_PutDoubleChar(OUStringBuffer& rStr, const SvXMLUnitConverter& rC
struct ImpSdXMLExpTransObj2DBase
{
- sal_uInt16 const mnType;
+ sal_uInt16 mnType;
explicit ImpSdXMLExpTransObj2DBase(sal_uInt16 nType)
: mnType(nType) {}
};
@@ -182,37 +182,37 @@ namespace {
struct ImpSdXMLExpTransObj2DRotate : public ImpSdXMLExpTransObj2DBase
{
- double const mfRotate;
+ double mfRotate;
explicit ImpSdXMLExpTransObj2DRotate(double fVal)
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_ROTATE), mfRotate(fVal) {}
};
struct ImpSdXMLExpTransObj2DScale : public ImpSdXMLExpTransObj2DBase
{
- ::basegfx::B2DTuple const maScale;
+ ::basegfx::B2DTuple maScale;
explicit ImpSdXMLExpTransObj2DScale(const ::basegfx::B2DTuple& rNew)
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_SCALE), maScale(rNew) {}
};
struct ImpSdXMLExpTransObj2DTranslate : public ImpSdXMLExpTransObj2DBase
{
- ::basegfx::B2DTuple const maTranslate;
+ ::basegfx::B2DTuple maTranslate;
explicit ImpSdXMLExpTransObj2DTranslate(const ::basegfx::B2DTuple& rNew)
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE), maTranslate(rNew) {}
};
struct ImpSdXMLExpTransObj2DSkewX : public ImpSdXMLExpTransObj2DBase
{
- double const mfSkewX;
+ double mfSkewX;
explicit ImpSdXMLExpTransObj2DSkewX(double fVal)
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_SKEWX), mfSkewX(fVal) {}
};
struct ImpSdXMLExpTransObj2DSkewY : public ImpSdXMLExpTransObj2DBase
{
- double const mfSkewY;
+ double mfSkewY;
explicit ImpSdXMLExpTransObj2DSkewY(double fVal)
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_SKEWY), mfSkewY(fVal) {}
};
struct ImpSdXMLExpTransObj2DMatrix : public ImpSdXMLExpTransObj2DBase
{
- ::basegfx::B2DHomMatrix const maMatrix;
+ ::basegfx::B2DHomMatrix maMatrix;
explicit ImpSdXMLExpTransObj2DMatrix(const ::basegfx::B2DHomMatrix& rNew)
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_MATRIX), maMatrix(rNew) {}
};
@@ -542,7 +542,7 @@ void SdXMLImExTransform2D::GetFullTransform(::basegfx::B2DHomMatrix& rFullTrans)
struct ImpSdXMLExpTransObj3DBase
{
- sal_uInt16 const mnType;
+ sal_uInt16 mnType;
explicit ImpSdXMLExpTransObj3DBase(sal_uInt16 nType)
: mnType(nType) {}
};
@@ -562,37 +562,37 @@ namespace {
struct ImpSdXMLExpTransObj3DRotateX : public ImpSdXMLExpTransObj3DBase
{
- double const mfRotateX;
+ double mfRotateX;
explicit ImpSdXMLExpTransObj3DRotateX(double fVal)
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X), mfRotateX(fVal) {}
};
struct ImpSdXMLExpTransObj3DRotateY : public ImpSdXMLExpTransObj3DBase
{
- double const mfRotateY;
+ double mfRotateY;
explicit ImpSdXMLExpTransObj3DRotateY(double fVal)
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y), mfRotateY(fVal) {}
};
struct ImpSdXMLExpTransObj3DRotateZ : public ImpSdXMLExpTransObj3DBase
{
- double const mfRotateZ;
+ double mfRotateZ;
explicit ImpSdXMLExpTransObj3DRotateZ(double fVal)
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z), mfRotateZ(fVal) {}
};
struct ImpSdXMLExpTransObj3DScale : public ImpSdXMLExpTransObj3DBase
{
- ::basegfx::B3DTuple const maScale;
+ ::basegfx::B3DTuple maScale;
explicit ImpSdXMLExpTransObj3DScale(const ::basegfx::B3DTuple& rNew)
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_SCALE), maScale(rNew) {}
};
struct ImpSdXMLExpTransObj3DTranslate : public ImpSdXMLExpTransObj3DBase
{
- ::basegfx::B3DTuple const maTranslate;
+ ::basegfx::B3DTuple maTranslate;
explicit ImpSdXMLExpTransObj3DTranslate(const ::basegfx::B3DTuple& rNew)
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE), maTranslate(rNew) {}
};
struct ImpSdXMLExpTransObj3DMatrix : public ImpSdXMLExpTransObj3DBase
{
- ::basegfx::B3DHomMatrix const maMatrix;
+ ::basegfx::B3DHomMatrix maMatrix;
explicit ImpSdXMLExpTransObj3DMatrix(const ::basegfx::B3DHomMatrix& rNew)
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_MATRIX), maMatrix(rNew) {}
};
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index 5231163429c9..35566e597a2c 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -192,7 +192,7 @@ class SdXMLPolygonShapeContext : public SdXMLShapeContext
{
OUString maPoints;
OUString maViewBox;
- bool const mbClosed;
+ bool mbClosed;
public:
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index e39ac0a162ec..9c1f21e28c23 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -174,7 +174,7 @@ public:
class SdXMLStylesContext : public SvXMLStylesContext
{
rtl::Reference< SvXMLImportPropertyMapper > xPresImpPropMapper;
- bool const mbIsAutoStyle;
+ bool mbIsAutoStyle;
std::unique_ptr<SvXMLNumFmtHelper> mpNumFmtHelper;
std::unique_ptr<SvNumberFormatter> mpNumFormatter;
diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx
index 9095aa9a69b3..13e1b52d2260 100644
--- a/xmloff/source/forms/elementexport.hxx
+++ b/xmloff/source/forms/elementexport.hxx
@@ -41,7 +41,7 @@ namespace xmloff
class OElementExport : public OPropertyExport
{
protected:
- css::uno::Sequence< css::script::ScriptEventDescriptor > const
+ css::uno::Sequence< css::script::ScriptEventDescriptor >
m_aEvents;
std::unique_ptr<SvXMLElementExport> m_pXMLElement; // XML element doing the concrete startElement etc.
@@ -91,8 +91,8 @@ namespace xmloff
typedef std::set<sal_Int16> Int16Set;
// used below
- OUString const m_sControlId; // the control id to use when exporting
- OUString const m_sReferringControls; // list of referring controls (i.e. their id's)
+ OUString m_sControlId; // the control id to use when exporting
+ OUString m_sReferringControls; // list of referring controls (i.e. their id's)
sal_Int16 m_nClassId; // class id of the control we're representing
ElementType m_eType; // (XML) type of the control we're representing
CCAFlags m_nIncludeCommon; // common control attributes to include
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index f1f8abad8948..267f6e46c101 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
@@ -59,8 +59,8 @@ namespace xmloff
static struct AlignmentTranslationEntry
{
- ParagraphAdjust const nParagraphValue;
- sal_Int16 const nControlValue;
+ ParagraphAdjust nParagraphValue;
+ sal_Int16 nControlValue;
}
const AlignmentTranslations[] =
{
diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx
index a08727902dbb..2f8718c6e6e3 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -156,7 +156,7 @@ namespace xmloff
*/
class OPropertyElementsContext : public SvXMLImportContext
{
- OPropertyImportRef const m_xPropertyImporter; // to add the properties
+ OPropertyImportRef m_xPropertyImporter; // to add the properties
public:
OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName,
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index ea502ec94aba..a8bf2ab36047 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -45,7 +45,7 @@ class XMLScriptChildContext : public SvXMLImportContext
private:
css::uno::Reference< css::frame::XModel > m_xModel;
css::uno::Reference< css::document::XEmbeddedScripts > m_xDocumentScripts;
- OUString const m_aLanguage;
+ OUString m_aLanguage;
public:
XMLScriptChildContext( SvXMLImport& rImport,
diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx
index 27812771d8c2..596c596d97b4 100644
--- a/xmloff/source/style/PageHeaderFooterContext.hxx
+++ b/xmloff/source/style/PageHeaderFooterContext.hxx
@@ -25,8 +25,8 @@
class PageHeaderFooterContext : public SvXMLImportContext
{
::std::vector< XMLPropertyState > & rProperties;
- sal_Int32 const nStartIndex;
- sal_Int32 const nEndIndex;
+ sal_Int32 nStartIndex;
+ sal_Int32 nEndIndex;
bool bHeader;
const rtl::Reference < SvXMLImportPropertyMapper > rMap;
diff --git a/xmloff/source/style/PageMasterPropHdl.hxx b/xmloff/source/style/PageMasterPropHdl.hxx
index 912b19536aa7..603154d4e9c9 100644
--- a/xmloff/source/style/PageMasterPropHdl.hxx
+++ b/xmloff/source/style/PageMasterPropHdl.hxx
@@ -104,7 +104,7 @@ public:
class XMLPMPropHdl_Print : public XMLPropertyHandler
{
- OUString const sAttrValue;
+ OUString sAttrValue;
public:
explicit XMLPMPropHdl_Print( enum ::xmloff::token::XMLTokenEnum eValue );
diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx
index d6abd7cff68d..76a6a4d2bf33 100644
--- a/xmloff/source/style/XMLFontAutoStylePool.cxx
+++ b/xmloff/source/style/XMLFontAutoStylePool.cxx
@@ -51,12 +51,12 @@ namespace {
class XMLFontAutoStylePoolEntry_Impl
{
- OUString const sName;
- OUString const sFamilyName;
- OUString const sStyleName;
- FontFamily const nFamily;
- FontPitch const nPitch;
- rtl_TextEncoding const eEnc;
+ OUString sName;
+ OUString sFamilyName;
+ OUString sStyleName;
+ FontFamily nFamily;
+ FontPitch nPitch;
+ rtl_TextEncoding eEnc;
public:
diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx b/xmloff/source/style/XMLFontStylesContext_impl.hxx
index 97c4d397b98e..e1baa2dd1ed0 100644
--- a/xmloff/source/style/XMLFontStylesContext_impl.hxx
+++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx
@@ -35,7 +35,7 @@ class XMLFontStyleContextFontFace : public SvXMLStyleContext
css::uno::Any aPitch;
css::uno::Any aEnc;
- SvXMLImportContextRef const xStyles;
+ SvXMLImportContextRef xStyles;
XMLFontStylesContext *GetStyles()
{
diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
index de916f5bc972..375b90826c27 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx
@@ -41,7 +41,7 @@ class XMLFootnoteSeparatorImport : public SvXMLImportContext
{
::std::vector<XMLPropertyState> & rProperties;
rtl::Reference<XMLPropertySetMapper> rMapper;
- sal_Int32 const nPropIndex;
+ sal_Int32 nPropIndex;
public:
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index f936b82f7dda..ee28c11a75a3 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -45,8 +45,8 @@ enum class XmlStyleFamily;
class XMLAutoStylePoolProperties
{
OUString msName;
- ::std::vector< XMLPropertyState > const maProperties;
- sal_uInt32 const mnPos;
+ ::std::vector< XMLPropertyState > maProperties;
+ sal_uInt32 mnPos;
public:
@@ -66,7 +66,7 @@ public:
typedef std::vector<std::unique_ptr<XMLAutoStylePoolProperties>> PropertiesListType;
private:
- OUString const msParent;
+ OUString msParent;
PropertiesListType m_PropertiesList;
public:
@@ -101,8 +101,8 @@ struct XMLAutoStyleFamily
typedef std::set<std::unique_ptr<XMLAutoStylePoolParent>,
comphelper::UniquePtrValueLess<XMLAutoStylePoolParent>> ParentSetType;
- XmlStyleFamily const mnFamily;
- OUString const maStrFamilyName;
+ XmlStyleFamily mnFamily;
+ OUString maStrFamilyName;
rtl::Reference<SvXMLExportPropertyMapper> mxMapper;
ParentSetType m_ParentSet;
@@ -110,8 +110,8 @@ struct XMLAutoStyleFamily
std::set<OUString> maReservedNameSet;
sal_uInt32 mnCount;
sal_uInt32 mnName;
- OUString const maStrPrefix;
- bool const mbAsFamily;
+ OUString maStrPrefix;
+ bool mbAsFamily;
XMLAutoStyleFamily( XmlStyleFamily nFamily, const OUString& rStrName,
const rtl::Reference<SvXMLExportPropertyMapper>& rMapper,
diff --git a/xmloff/source/style/prstylecond.cxx b/xmloff/source/style/prstylecond.cxx
index e384a645dffe..f644f5029be2 100644
--- a/xmloff/source/style/prstylecond.cxx
+++ b/xmloff/source/style/prstylecond.cxx
@@ -30,8 +30,8 @@ namespace {
struct ConditionMap
{
char const* aInternal;
- XMLTokenEnum const nExternal;
- int const aValue;
+ XMLTokenEnum nExternal;
+ int aValue;
};
}
diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx
index 31ca901d8379..a069dbd30fd0 100644
--- a/xmloff/source/style/weighhdl.cxx
+++ b/xmloff/source/style/weighhdl.cxx
@@ -35,8 +35,8 @@ namespace {
struct FontWeightMapper
{
- float const fWeight;
- sal_uInt16 const nValue;
+ float fWeight;
+ sal_uInt16 nValue;
};
}
diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx
index 4e6ce48b6c6d..c88488f4848b 100644
--- a/xmloff/source/style/xmlbahdl.hxx
+++ b/xmloff/source/style/xmlbahdl.hxx
@@ -29,7 +29,7 @@
*/
class XMLNumberPropHdl : public XMLPropertyHandler
{
- sal_Int8 const nBytes;
+ sal_Int8 nBytes;
public:
explicit XMLNumberPropHdl( sal_Int8 nB ) : nBytes( nB ) {}
@@ -44,8 +44,8 @@ public:
*/
class XMLNumberNonePropHdl : public XMLPropertyHandler
{
- OUString const sZeroStr;
- sal_Int8 const nBytes;
+ OUString sZeroStr;
+ sal_Int8 nBytes;
public:
explicit XMLNumberNonePropHdl( sal_Int8 nB = 4 );
XMLNumberNonePropHdl( enum ::xmloff::token::XMLTokenEnum eZeroString, sal_Int8 nB );
@@ -60,7 +60,7 @@ public:
*/
class XMLMeasurePropHdl : public XMLPropertyHandler
{
- sal_Int8 const nBytes;
+ sal_Int8 nBytes;
public:
explicit XMLMeasurePropHdl( sal_Int8 nB ) : nBytes( nB ) {}
virtual ~XMLMeasurePropHdl() override;
@@ -74,7 +74,7 @@ public:
*/
class XMLPercentPropHdl : public XMLPropertyHandler
{
- sal_Int8 const nBytes;
+ sal_Int8 nBytes;
public:
explicit XMLPercentPropHdl( sal_Int8 nB ) : nBytes( nB ) {}
virtual ~XMLPercentPropHdl() override;
@@ -98,7 +98,7 @@ class XMLDoublePercentPropHdl : public XMLPropertyHandler
*/
class XMLNegPercentPropHdl : public XMLPropertyHandler
{
- sal_Int8 const nBytes;
+ sal_Int8 nBytes;
public:
explicit XMLNegPercentPropHdl( sal_Int8 nB ) : nBytes( nB ) {}
virtual ~XMLNegPercentPropHdl() override;
@@ -112,7 +112,7 @@ public:
*/
class XMLMeasurePxPropHdl : public XMLPropertyHandler
{
- sal_Int8 const nBytes;
+ sal_Int8 nBytes;
public:
explicit XMLMeasurePxPropHdl( sal_Int8 nB ) : nBytes( nB ) {}
virtual ~XMLMeasurePxPropHdl() override;
@@ -236,7 +236,7 @@ public:
class XMLIsTransparentPropHdl : public XMLPropertyHandler
{
const OUString sTransparent;
- bool const bTransPropValue;
+ bool bTransPropValue;
public:
XMLIsTransparentPropHdl( enum ::xmloff::token::XMLTokenEnum eTransparent = xmloff::token::XML_TOKEN_INVALID,
@@ -294,7 +294,7 @@ public:
*/
class XMLNumberWithoutZeroPropHdl : public XMLPropertyHandler
{
- sal_Int8 const nBytes;
+ sal_Int8 nBytes;
public:
explicit XMLNumberWithoutZeroPropHdl( sal_Int8 nB );
virtual ~XMLNumberWithoutZeroPropHdl() override;
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 76fd72c71deb..188f510c0fe8 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -58,8 +58,8 @@ namespace {
struct XMLPropTokens_Impl
{
- sal_uInt16 const nType;
- XMLTokenEnum const eToken;
+ sal_uInt16 nType;
+ XMLTokenEnum eToken;
};
const sal_uInt16 MAX_PROP_TYPES =
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 569cc072231c..de626f0e1661 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -59,9 +59,9 @@ namespace {
struct SvXMLEmbeddedTextEntry
{
- sal_uInt16 const nSourcePos; // position in NumberFormat (to skip later)
- sal_Int32 const nFormatPos; // resulting position in embedded-text element
- OUString const aText;
+ sal_uInt16 nSourcePos; // position in NumberFormat (to skip later)
+ sal_Int32 nFormatPos; // resulting position in embedded-text element
+ OUString aText;
SvXMLEmbeddedTextEntry( sal_uInt16 nSP, sal_Int32 nFP, const OUString& rT ) :
nSourcePos(nSP), nFormatPos(nFP), aText(rT) {}
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 5edbb3055201..bfdf1671a127 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -51,8 +51,8 @@ namespace {
struct SvXMLNumFmtEntry
{
- OUString const aName;
- sal_uInt32 const nKey;
+ OUString aName;
+ sal_uInt32 nKey;
bool bRemoveAfterUse;
SvXMLNumFmtEntry( const OUString& rN, sal_uInt32 nK, bool bR ) :
@@ -118,7 +118,7 @@ namespace {
class SvXMLNumFmtElementContext : public SvXMLImportContext
{
SvXMLNumFormatContext& rParent;
- sal_uInt16 const nType;
+ sal_uInt16 nType;
OUStringBuffer aContent;
SvXMLNumberInfo aNumInfo;
LanguageType nElementLang;
@@ -309,15 +309,15 @@ namespace {
struct SvXMLDefaultDateFormat
{
- NfIndexTableOffset const eFormat;
- SvXMLDateElementAttributes const eDOW;
- SvXMLDateElementAttributes const eDay;
- SvXMLDateElementAttributes const eMonth;
- SvXMLDateElementAttributes const eYear;
- SvXMLDateElementAttributes const eHours;
- SvXMLDateElementAttributes const eMins;
- SvXMLDateElementAttributes const eSecs;
- bool const bSystem;
+ NfIndexTableOffset eFormat;
+ SvXMLDateElementAttributes eDOW;
+ SvXMLDateElementAttributes eDay;
+ SvXMLDateElementAttributes eMonth;
+ SvXMLDateElementAttributes eYear;
+ SvXMLDateElementAttributes eHours;
+ SvXMLDateElementAttributes eMins;
+ SvXMLDateElementAttributes eSecs;
+ bool bSystem;
};
}
diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx
index ae84852baa12..9d20baa86f08 100644
--- a/xmloff/source/style/xmlprmap.cxx
+++ b/xmloff/source/style/xmlprmap.cxx
@@ -91,7 +91,7 @@ struct XMLPropertySetMapper::Impl
std::vector<XMLPropertySetMapperEntry_Impl> maMapEntries;
std::vector<rtl::Reference <XMLPropertyHandlerFactory> > maHdlFactories;
- bool const mbOnlyExportMappings;
+ bool mbOnlyExportMappings;
explicit Impl( bool bForExport ) : mbOnlyExportMappings(bForExport) {}
};
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index d0ae0db93ece..cba7ac8a37d4 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -246,7 +246,7 @@ class SvXMLStylesContext_Impl
std::vector<rtl::Reference<SvXMLStyleContext>> aStyles;
mutable std::unique_ptr<IndicesType> pIndices;
- bool const bAutomaticStyle;
+ bool bAutomaticStyle;
#if OSL_DEBUG_LEVEL > 0
mutable sal_uInt32 m_nIndexCreated;
diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx
index e02170676935..14d6e94bfa9f 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -78,10 +78,10 @@ private:
struct MergeInfo
{
- sal_Int32 const mnStartColumn;
- sal_Int32 const mnStartRow;
- sal_Int32 const mnEndColumn;
- sal_Int32 const mnEndRow;
+ sal_Int32 mnStartColumn;
+ sal_Int32 mnStartRow;
+ sal_Int32 mnEndColumn;
+ sal_Int32 mnEndRow;
MergeInfo( sal_Int32 nStartColumn, sal_Int32 nStartRow, sal_Int32 nColumnSpan, sal_Int32 nRowSpan )
: mnStartColumn( nStartColumn ), mnStartRow( nStartRow ), mnEndColumn( nStartColumn + nColumnSpan - 1 ), mnEndRow( nStartRow + nRowSpan - 1 ) {};
diff --git a/xmloff/source/table/table.hxx b/xmloff/source/table/table.hxx
index cdf5dba92311..d711b17647e9 100644
--- a/xmloff/source/table/table.hxx
+++ b/xmloff/source/table/table.hxx
@@ -26,7 +26,7 @@ struct XMLPropertyMapEntry;
struct TableStyleElement
{
- ::xmloff::token::XMLTokenEnum const meElement;
+ ::xmloff::token::XMLTokenEnum meElement;
OUString msStyleName;
};
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 ) :
diff --git a/xmloff/source/transform/NotesTContext.hxx b/xmloff/source/transform/NotesTContext.hxx
index de115a5c7555..dcc88b468802 100644
--- a/xmloff/source/transform/NotesTContext.hxx
+++ b/xmloff/source/transform/NotesTContext.hxx
@@ -26,7 +26,7 @@ class XMLNotesTransformerContext : public XMLPersElemContentTContext
{
bool m_bEndNote;
bool const m_bPersistent;
- ::xmloff::token::XMLTokenEnum const m_eTypeToken;
+ ::xmloff::token::XMLTokenEnum m_eTypeToken;
public:
XMLNotesTransformerContext( XMLTransformerBase& rTransformer,
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index 264eb299d9d3..fad78c46a438 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -110,7 +110,7 @@ struct ExportTable
{
const char* pPropertyName;
sal_uInt16 const nNamespace;
- sal_uInt16 const nToken;
+ sal_uInt16 nToken;
convert_t const aConverter;
};
More information about the Libreoffice-commits
mailing list