From 31bf558349d9ab2634e9a866edf79bc115d649ce Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 11 Mar 2020 13:43:39 +0200 Subject: Revert "loplugin:constfields in oox" This reverts commit a84e3df74eecc8778e3d5be5dd80ad4ddb511edf. Now that we know that making fields has negative side effects like disabling assignment operator generation. Change-Id: I7b45b7ead281cf3a9202ca6aabc55ee5033e5331 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90332 Tested-by: Noel Grandin Reviewed-by: Noel Grandin --- include/oox/core/contexthandler2.hxx | 2 +- include/oox/core/filterdetect.hxx | 2 +- include/oox/core/fragmenthandler.hxx | 2 +- include/oox/core/relations.hxx | 2 +- include/oox/crypto/AgileEngine.hxx | 18 +++++++++--------- include/oox/crypto/CryptTools.hxx | 2 +- include/oox/crypto/DocumentEncryption.hxx | 2 +- include/oox/drawingml/graphicshapecontext.hxx | 4 ++-- include/oox/drawingml/shape.hxx | 2 +- include/oox/drawingml/shapepropertymap.hxx | 12 ++++++------ include/oox/dump/dumperbase.hxx | 8 ++++---- include/oox/dump/oledumper.hxx | 22 +++++++++++----------- include/oox/export/chartexport.hxx | 8 ++++---- include/oox/export/drawingml.hxx | 2 +- include/oox/helper/binaryinputstream.hxx | 2 +- include/oox/helper/modelobjecthelper.hxx | 2 +- include/oox/helper/storagebase.hxx | 8 ++++---- include/oox/ole/axbinaryreader.hxx | 6 +++--- include/oox/ole/axbinarywriter.hxx | 8 ++++---- include/oox/ole/axcontrol.hxx | 14 ++++++++------ include/oox/ole/olehelper.hxx | 4 ++-- include/oox/ole/vbacontrol.hxx | 2 +- include/oox/ole/vbaexport.hxx | 4 ++-- include/oox/ole/vbamodule.hxx | 4 ++-- include/oox/ole/vbaproject.hxx | 2 +- include/oox/ppt/pptfilterhelpers.hxx | 10 +++++----- include/oox/ppt/pptshapegroupcontext.hxx | 4 ++-- include/oox/ppt/slidefragmenthandler.hxx | 2 +- include/oox/ppt/slidemastertextstylescontext.hxx | 2 +- include/oox/ppt/slidepersist.hxx | 16 ++++++++-------- include/oox/ppt/timenodelistcontext.hxx | 2 +- include/oox/vml/vmltextbox.hxx | 4 ++-- include/oox/vml/vmltextboxcontext.hxx | 4 ++-- 33 files changed, 95 insertions(+), 93 deletions(-) (limited to 'include') diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index 678aed1380c2..06761ff0797c 100644 --- a/include/oox/core/contexthandler2.hxx +++ b/include/oox/core/contexthandler2.hxx @@ -214,7 +214,7 @@ private: typedef std::shared_ptr< ContextStack > ContextStackRef; ContextStackRef mxContextStack; ///< Stack of all processed elements. - size_t const mnRootStackSize; ///< Stack size on construction time. + size_t mnRootStackSize; ///< Stack size on construction time. protected: bool mbEnableTrimSpace; ///< True = trim whitespace in characters(). diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index ac3194e81acd..47de23055c60 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -87,7 +87,7 @@ private: typedef ::std::vector< sal_Int32 > ContextVector; OUString& mrFilterName; - OUString const maFileName; + OUString maFileName; ContextVector maContextStack; OUString maTargetPath; css::uno::Reference< css::uno::XComponentContext > mxContext; diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx index 30f182a71fa3..2563a7ac9bf8 100644 --- a/include/oox/core/fragmenthandler.hxx +++ b/include/oox/core/fragmenthandler.hxx @@ -55,7 +55,7 @@ struct FragmentBaseData const OUString maFragmentPath; css::uno::Reference< css::xml::sax::XLocator > mxLocator; - RelationsRef const mxRelations; + RelationsRef mxRelations; explicit FragmentBaseData( XmlFilterBase& rFilter, diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx index 514ef9ac3cf9..d556d9c8cf93 100644 --- a/include/oox/core/relations.hxx +++ b/include/oox/core/relations.hxx @@ -109,7 +109,7 @@ public: private: ::std::map< OUString, Relation > maMap; - OUString const maFragmentPath; + OUString maFragmentPath; }; diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx index 796f030b3bce..b4aeec6de5be 100644 --- a/include/oox/crypto/AgileEngine.hxx +++ b/include/oox/crypto/AgileEngine.hxx @@ -57,15 +57,15 @@ struct OOX_DLLPUBLIC AgileEncryptionInfo struct OOX_DLLPUBLIC AgileEncryptionParameters { - sal_Int32 const spinCount; - sal_Int32 const saltSize; - sal_Int32 const keyBits; - sal_Int32 const hashSize; - sal_Int32 const blockSize; - - OUString const cipherAlgorithm; - OUString const cipherChaining; - OUString const hashAlgorithm; + sal_Int32 spinCount; + sal_Int32 saltSize; + sal_Int32 keyBits; + sal_Int32 hashSize; + sal_Int32 blockSize; + + OUString cipherAlgorithm; + OUString cipherChaining; + OUString hashAlgorithm; }; enum class AgileEncryptionPreset diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index 8de3e7db933d..4e8d8e586922 100644 --- a/include/oox/crypto/CryptTools.hxx +++ b/include/oox/crypto/CryptTools.hxx @@ -106,7 +106,7 @@ public: class OOX_DLLPUBLIC CryptoHash final : public Crypto { - sal_Int32 const mnHashSize; + sal_Int32 mnHashSize; public: CryptoHash(std::vector& rKey, CryptoHashType eType); bool update(std::vector& rInput, sal_uInt32 nInputLength = 0); diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx index 36455c1b7af5..03ad719d7c99 100644 --- a/include/oox/crypto/DocumentEncryption.hxx +++ b/include/oox/crypto/DocumentEncryption.hxx @@ -31,7 +31,7 @@ class DocumentEncryption private: css::uno::Reference< css::io::XStream > mxDocumentStream; oox::ole::OleStorage& mrOleStorage; - OUString const maPassword; + OUString maPassword; Standard2007Engine mEngine; diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx index 14b49f23615c..655e15a31ea3 100644 --- a/include/oox/drawingml/graphicshapecontext.hxx +++ b/include/oox/drawingml/graphicshapecontext.hxx @@ -51,8 +51,8 @@ public: virtual void onEndElement() override; private: - bool const mbEmbedShapesInChart; - ::oox::core::ContextHandler2Helper* const mpParent; + bool mbEmbedShapesInChart; + ::oox::core::ContextHandler2Helper* mpParent; }; diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index f2f95224cf61..53290f0cbbdb 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -84,7 +84,7 @@ typedef std::shared_ptr DiagramDataPtr; struct ChartShapeInfo { OUString maFragmentPath; ///< Path to related XML stream, e.g. for charts. - bool const mbEmbedShapes; ///< True = load chart shapes into chart, false = load into parent drawpage. + bool mbEmbedShapes; ///< True = load chart shapes into chart, false = load into parent drawpage. explicit ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes( bEmbedShapes ) {} }; diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx index cc55b24e8ceb..143807175512 100644 --- a/include/oox/drawingml/shapepropertymap.hxx +++ b/include/oox/drawingml/shapepropertymap.hxx @@ -81,11 +81,11 @@ typedef o3tl::enumarray ShapePropertyIds; struct OOX_DLLPUBLIC ShapePropertyInfo { const ShapePropertyIds& mrPropertyIds; - bool const mbNamedLineMarker; /// True = use named line marker instead of explicit line marker. - bool const mbNamedLineDash; /// True = use named line dash instead of explicit line dash. - bool const mbNamedFillGradient; /// True = use named fill gradient instead of explicit fill gradient. - bool const mbNamedFillBitmap; /// True = use named fill bitmap instead of explicit fill bitmap. - bool const mbNamedFillHatch; /// True = use named fill hatch instead of explicit fill hatch. + bool mbNamedLineMarker; /// True = use named line marker instead of explicit line marker. + bool mbNamedLineDash; /// True = use named line dash instead of explicit line dash. + bool mbNamedFillGradient; /// True = use named fill gradient instead of explicit fill gradient. + bool mbNamedFillBitmap; /// True = use named fill bitmap instead of explicit fill bitmap. + bool mbNamedFillHatch; /// True = use named fill hatch instead of explicit fill hatch. static ShapePropertyInfo DEFAULT; /// Default property info (used as default parameter of other methods). @@ -155,7 +155,7 @@ private: private: ModelObjectHelper& mrModelObjHelper; - ShapePropertyInfo const maShapePropInfo; + ShapePropertyInfo maShapePropInfo; }; diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 5fe8cc2b0b90..43a893105380 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -798,8 +798,8 @@ private: typedef ::std::map< OUString, NameListRef > NameListMap; css::uno::Reference< css::uno::XComponentContext > mxContext; - StorageRef const mxRootStrg; - OUString const maSysFileName; + StorageRef mxRootStrg; + OUString maSysFileName; ConfigFileSet maConfigFiles; ConfigDataMap maConfigData; NameListMap maNameLists; @@ -1182,8 +1182,8 @@ private: private: struct PreferredItem { - OUString const maName; - bool const mbStorage; + OUString maName; + bool mbStorage; explicit PreferredItem( const OUString& rName, bool bStorage ) : maName( rName ), mbStorage( bStorage ) {} diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index c1c4e78d357f..7dfe26dc24c9 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -174,11 +174,11 @@ private: bool dumpComCtlComplex(); protected: - sal_uInt32 const mnDataId5; - sal_uInt32 const mnDataId6; - sal_uInt16 const mnVersion; - bool const mbCommonPart; - bool const mbComplexPart; + sal_uInt32 mnDataId5; + sal_uInt32 mnDataId6; + sal_uInt16 mnVersion; + bool mbCommonPart; + bool mbComplexPart; }; @@ -350,9 +350,9 @@ private: { enum LargePropertyType { PROPTYPE_POS, PROPTYPE_SIZE, PROPTYPE_GUID, PROPTYPE_STRING, PROPTYPE_STRINGARRAY }; - LargePropertyType const mePropType; - OUString const maItemName; - sal_uInt32 const mnDataSize; + LargePropertyType mePropType; + OUString maItemName; + sal_uInt32 mnDataSize; OUString* mpItemValue; explicit LargeProperty( LargePropertyType ePropType, const String& rItemName, sal_uInt32 nDataSize, OUString* pItemValue = nullptr ) : mePropType( ePropType ), maItemName( rItemName ), mnDataSize( nDataSize ), mpItemValue( pItemValue ) {} @@ -361,8 +361,8 @@ private: struct StreamProperty { - OUString const maItemName; - sal_uInt16 const mnData; + OUString maItemName; + sal_uInt16 mnData; explicit StreamProperty( const String& rItemName, sal_uInt16 nData ) : maItemName( rItemName ), mnData( nData ) {} }; @@ -761,7 +761,7 @@ protected: private: VbaSharedData& mrVbaData; - sal_Int32 const mnStrmOffset; + sal_Int32 mnStrmOffset; }; diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx index 951819703a76..c3ce9fd99a9d 100644 --- a/include/oox/export/chartexport.hxx +++ b/include/oox/export/chartexport.hxx @@ -79,9 +79,9 @@ enum AxesType }; struct AxisIdPair{ - AxesType const nAxisType; - sal_Int32 const nAxisId; - sal_Int32 const nCrossAx; + AxesType nAxisType; + sal_Int32 nAxisId; + sal_Int32 nCrossAx; AxisIdPair(AxesType nType, sal_Int32 nId, sal_Int32 nAx) : nAxisType(nType) @@ -97,7 +97,7 @@ public: typedef ::std::vector< AxisIdPair > AxisVector; private: - sal_Int32 const mnXmlNamespace; + sal_Int32 mnXmlNamespace; sal_Int32 mnSeriesCount; css::uno::Reference< css::frame::XModel > mxChartModel; css::uno::Reference< css::chart::XDiagram > mxDiagram; diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index ce5c6e9668e2..7d71f6f3e02c 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -139,7 +139,7 @@ private: static std::map maWdpCache; /// To specify where write eg. the images to (like 'ppt', or 'word' - according to the OPC). - DocumentType const meDocumentType; + DocumentType meDocumentType; /// Parent exporter, used for text callback. DMLTextExport* mpTextExport; diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index c73a5978db0a..af6a6240fffc 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -372,7 +372,7 @@ private: private: BinaryInputStream* mpInStrm; - sal_Int64 const mnStartPos; + sal_Int64 mnStartPos; sal_Int64 mnRelPos; sal_Int64 mnSize; }; diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx index a946a5c6aa78..2b9e1d2cfd51 100644 --- a/include/oox/helper/modelobjecthelper.hxx +++ b/include/oox/helper/modelobjecthelper.hxx @@ -69,7 +69,7 @@ private: mxModelFactory; ///< Factory to create the container. mutable css::uno::Reference< css::container::XNameContainer > mxContainer; ///< Container for the objects. - OUString const maServiceName; ///< Service name to create the container. + OUString maServiceName; ///< Service name to create the container. sal_Int32 mnIndex; ///< Index to create unique identifiers. }; diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx index 71ee2ddf3de7..537517fbff73 100644 --- a/include/oox/helper/storagebase.hxx +++ b/include/oox/helper/storagebase.hxx @@ -178,10 +178,10 @@ private: mxInStream; ///< Cached base input stream (to keep it alive). css::uno::Reference< css::io::XStream > mxOutStream; ///< Cached base output stream (to keep it alive). - OUString const maParentPath; ///< Full path of parent storage. - OUString const maStorageName; ///< Name of this storage, if it is a substorage. - bool const mbBaseStreamAccess; ///< True = access base streams with empty stream name. - bool const mbReadOnly; ///< True = storage opened read-only (based on input stream). + OUString maParentPath; ///< Full path of parent storage. + OUString maStorageName; ///< Name of this storage, if it is a substorage. + bool mbBaseStreamAccess; ///< True = access base streams with empty stream name. + bool mbReadOnly; ///< True = storage opened read-only (based on input stream). }; diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx index 4ab1c504ab85..427f47cc85f6 100644 --- a/include/oox/ole/axbinaryreader.hxx +++ b/include/oox/ole/axbinaryreader.hxx @@ -85,7 +85,7 @@ public: private: BinaryInputStream* mpInStrm; ///< The wrapped input stream. sal_Int64 mnStrmPos; ///< Tracks relative position in the stream. - sal_Int64 const mnStrmSize; ///< Size of the wrapped stream data. + sal_Int64 mnStrmSize; ///< Size of the wrapped stream data. }; @@ -182,7 +182,7 @@ private: struct StringProperty : public ComplexProperty { OUString& mrValue; - sal_uInt32 const mnSize; + sal_uInt32 mnSize; explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) : mrValue( rValue ), mnSize( nSize ) {} @@ -193,7 +193,7 @@ private: struct ArrayStringProperty : public ComplexProperty { AxArrayString& mrArray; - sal_uInt32 const mnSize; + sal_uInt32 mnSize; explicit ArrayStringProperty( AxArrayString& rArray, sal_uInt32 nSize ) : mrArray( rArray ), mnSize( nSize ) {} virtual bool readProperty( AxAlignedInputStream& rInStrm ) override; diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx index 55cb652a6c7c..dfde745dd647 100644 --- a/include/oox/ole/axbinarywriter.hxx +++ b/include/oox/ole/axbinarywriter.hxx @@ -68,8 +68,8 @@ public: private: BinaryOutputStream* mpOutStrm; ///< The wrapped input stream. sal_Int64 mnStrmPos; ///< Tracks relative position in the stream. - sal_Int64 const mnStrmSize; ///< Size of the wrapped stream data. - sal_Int64 const mnWrappedBeginPos; ///< starting pos or wrapped stream + sal_Int64 mnStrmSize; ///< Size of the wrapped stream data. + sal_Int64 mnWrappedBeginPos; ///< starting pos or wrapped stream }; /** A pair of integer values as a property. */ @@ -130,7 +130,7 @@ private: struct StringProperty : public ComplexProperty { OUString& mrValue; - sal_uInt32 const mnSize; + sal_uInt32 mnSize; explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) : mrValue( rValue ), mnSize( nSize ) {} @@ -154,7 +154,7 @@ private: sal_Int64 mnPropFlags; ///< Flags specifying existing properties. sal_Int64 mnNextProp; ///< Next property to read. bool mbValid; ///< True = stream still valid. - bool const mb64BitPropFlags; + bool mb64BitPropFlags; }; diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index ec2555a4dfed..7e4e4fda5347 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -339,7 +339,7 @@ private: const GraphicHelper& mrGraphicHelper; mutable PropertySet maAddressConverter; mutable PropertySet maRangeConverter; - bool const mbDefaultColorBgr; + bool mbDefaultColorBgr; }; @@ -422,8 +422,10 @@ protected: const sal_uInt16 mnVersion; ///< Current version of the ComCtl control model. private: - sal_uInt32 const mnDataPartId5; ///< Identifier for version 5.0 control data. - sal_uInt32 const mnDataPartId6; ///< Identifier for version 6.0 control data. + sal_uInt32 mnDataPartId5; ///< Identifier for version 5.0 control data. + sal_uInt32 mnDataPartId6; ///< Identifier for version 6.0 control data. + bool mbCommonPart; ///< True = the COMCTL_COMMONDATA part exists. + bool mbComplexPart; ///< True = the COMCTL_COMPLEXDATA part exists. }; @@ -496,7 +498,7 @@ public: // direct access needed for legacy VML drawing controls AxFontData maFontData; ///< The font settings. private: - bool const mbSupportsAlign; ///< True = UNO model supports Align property. + bool mbSupportsAlign; ///< True = UNO model supports Align property. }; @@ -826,7 +828,7 @@ public: // direct access needed for legacy VML drawing controls sal_Int32 mnPicAlign; ///< Anchor position of the picture. sal_Int32 mnPicSizeMode; ///< Clip, stretch, zoom. bool mbPicTiling; ///< True = picture is repeated. - bool const mbFontSupport; ///< True = control supports the font property. + bool mbFontSupport; ///< True = control supports the font property. }; @@ -978,7 +980,7 @@ private: createXForm(); private: - ControlConverter const maControlConv; + ControlConverter maControlConv; css::uno::Reference< css::lang::XMultiServiceFactory > mxModelFactory; css::uno::Reference< css::form::XFormsSupplier > mxFormsSupp; css::uno::Reference< css::container::XIndexContainer > mxFormIC; diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx index 389b2a874fbf..5717b87045af 100644 --- a/include/oox/ole/olehelper.hxx +++ b/include/oox/ole/olehelper.hxx @@ -137,7 +137,7 @@ class OOX_DLLPUBLIC OleFormCtrlExportHelper final { std::unique_ptr<::oox::ole::EmbeddedControl> mpControl; ::oox::ole::ControlModelBase* mpModel; - ::oox::GraphicHelper const maGrfHelper; + ::oox::GraphicHelper maGrfHelper; css::uno::Reference< css::frame::XModel > mxDocModel; css::uno::Reference< css::awt::XControlModel > mxControlModel; @@ -174,7 +174,7 @@ class OOX_DLLPUBLIC MSConvertOCXControls : public SvxMSConvertOCXControls { protected: css::uno::Reference< css::uno::XComponentContext > mxCtx; - ::oox::GraphicHelper const maGrfHelper; + ::oox::GraphicHelper maGrfHelper; bool importControlFromStream( ::oox::BinaryInputStream& rInStrm, css::uno::Reference< css::form::XFormComponent > & rxFormComp, diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx index 80244bc025f4..05f1321400bc 100644 --- a/include/oox/ole/vbacontrol.hxx +++ b/include/oox/ole/vbacontrol.hxx @@ -204,7 +204,7 @@ public: private: css::uno::Reference< css::uno::XComponentContext > mxContext; css::uno::Reference< css::frame::XModel > mxDocModel; - ControlConverter const maConverter; + ControlConverter maConverter; }; diff --git a/include/oox/ole/vbaexport.hxx b/include/oox/ole/vbaexport.hxx index 6194d7108126..e30189dc5d12 100644 --- a/include/oox/ole/vbaexport.hxx +++ b/include/oox/ole/vbaexport.hxx @@ -63,7 +63,7 @@ private: sal_uInt8* mpCompressedChunkStream; // same as DecompressedChunkEnd in the spec - std::size_t const mnChunkSize; + std::size_t mnChunkSize; // CompressedCurrent according to the spec sal_uInt64 mnCompressedCurrent; @@ -133,7 +133,7 @@ private: sal_uInt8 mnUnencryptedByte1; // the last unencrypted byte read or written sal_uInt8 mnEncryptedByte1; // the last encrypted byte read or written sal_uInt8 mnEncryptedByte2; // the next-to-last encrypted byte read or written - sal_Unicode const mnProjKey; // a project-specific encryption key + sal_Unicode mnProjKey; // a project-specific encryption key sal_uInt8 mnIgnoredLength; // the length in bytes of IgnoredEnc sal_uInt8 mnSeed; // the seed value diff --git a/include/oox/ole/vbamodule.hxx b/include/oox/ole/vbamodule.hxx index dbea6bf5eb50..cb3682839c90 100644 --- a/include/oox/ole/vbamodule.hxx +++ b/include/oox/ole/vbamodule.hxx @@ -92,12 +92,12 @@ private: OUString maName; OUString maStreamName; OUString maDocString; - rtl_TextEncoding const meTextEnc; + rtl_TextEncoding meTextEnc; sal_Int32 mnType; sal_uInt32 mnOffset; bool mbReadOnly; bool mbPrivate; - bool const mbExecutable; + bool mbExecutable; }; diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index e72c356f1864..e0266cb1f217 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -105,7 +105,7 @@ private: virtual void attachMacro( const OUString& rScriptUrl ) = 0; private: - OUString const maMacroName; + OUString maMacroName; }; typedef std::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef; diff --git a/include/oox/ppt/pptfilterhelpers.hxx b/include/oox/ppt/pptfilterhelpers.hxx index 2c2bab5f71bd..aceb34552b7b 100644 --- a/include/oox/ppt/pptfilterhelpers.hxx +++ b/include/oox/ppt/pptfilterhelpers.hxx @@ -43,7 +43,7 @@ namespace oox { namespace ppt { struct ImplAttributeNameConversion { - AnimationAttributeEnum const meAttribute; + AnimationAttributeEnum meAttribute; const char* mpMSName; const char* mpAPIName; }; @@ -53,9 +53,9 @@ namespace oox { namespace ppt { struct OOX_DLLPUBLIC transition { const char* mpName; - sal_Int16 const mnType; - sal_Int16 const mnSubType; - bool const mbDirection; // true: default geometric direction + sal_Int16 mnType; + sal_Int16 mnSubType; + bool mbDirection; // true: default geometric direction static const transition* getList(); static const transition* find( const OUString& rName ); @@ -63,7 +63,7 @@ namespace oox { namespace ppt { struct OOX_DLLPUBLIC convert_subtype { - sal_Int32 const mnID; + sal_Int32 mnID; const char* mpStrSubType; static const convert_subtype* getList(); diff --git a/include/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx index 15667109d409..73f0cb226cd2 100644 --- a/include/oox/ppt/pptshapegroupcontext.hxx +++ b/include/oox/ppt/pptshapegroupcontext.hxx @@ -36,8 +36,8 @@ namespace oox { namespace ppt { class PPTShapeGroupContext final : public ::oox::drawingml::ShapeGroupContext { - SlidePersistPtr const mpSlidePersistPtr; - ShapeLocation const meShapeLocation; + SlidePersistPtr mpSlidePersistPtr; + ShapeLocation meShapeLocation; oox::drawingml::ShapePtr pGraphicShape; void applyFontRefColor(const oox::drawingml::ShapePtr& pShape, const oox::drawingml::Color& rFontRefColor); diff --git a/include/oox/ppt/slidefragmenthandler.hxx b/include/oox/ppt/slidefragmenthandler.hxx index c6a193ffdbff..2308816a418c 100644 --- a/include/oox/ppt/slidefragmenthandler.hxx +++ b/include/oox/ppt/slidefragmenthandler.hxx @@ -48,7 +48,7 @@ public: protected: SlidePersistPtr mpSlidePersistPtr; - ShapeLocation const meShapeLocation; + ShapeLocation meShapeLocation; private: OUString maSlideName; diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx index 9f4c3cac39d9..7acab9888158 100644 --- a/include/oox/ppt/slidemastertextstylescontext.hxx +++ b/include/oox/ppt/slidemastertextstylescontext.hxx @@ -37,7 +37,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: - SlidePersistPtr const mpSlidePersistPtr; + SlidePersistPtr mpSlidePersistPtr; }; } } diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx index 8ef8515757bf..383bc501abc5 100644 --- a/include/oox/ppt/slidepersist.hxx +++ b/include/oox/ppt/slidepersist.hxx @@ -140,14 +140,14 @@ private: oox::ppt::HeaderFooter maHeaderFooter; sal_Int32 mnLayoutValueToken; - bool const mbMaster; - bool const mbNotes; - - oox::drawingml::TextListStylePtr const maDefaultTextStylePtr; - oox::drawingml::TextListStylePtr const maTitleTextStylePtr; - oox::drawingml::TextListStylePtr const maBodyTextStylePtr; - oox::drawingml::TextListStylePtr const maNotesTextStylePtr; - oox::drawingml::TextListStylePtr const maOtherTextStylePtr; + bool mbMaster; + bool mbNotes; + + oox::drawingml::TextListStylePtr maDefaultTextStylePtr; + oox::drawingml::TextListStylePtr maTitleTextStylePtr; + oox::drawingml::TextListStylePtr maBodyTextStylePtr; + oox::drawingml::TextListStylePtr maNotesTextStylePtr; + oox::drawingml::TextListStylePtr maOtherTextStylePtr; std::map< OUString, css::uno::Reference< css::animations::XAnimationNode > > maAnimNodesMap; std::map< OUString, ::oox::drawingml::ShapePtr > maShapeMap; diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx index b4f5e3ca5539..2ecd1ec6d7a9 100644 --- a/include/oox/ppt/timenodelistcontext.hxx +++ b/include/oox/ppt/timenodelistcontext.hxx @@ -45,7 +45,7 @@ namespace oox { namespace ppt { protected: TimeNodeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const TimeNodePtr & pNode ) throw(); - sal_Int32 const mnElement; + sal_Int32 mnElement; TimeNodePtr mpNode; }; diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx index 7a37577c71ad..8c3fad709ac0 100644 --- a/include/oox/vml/vmltextbox.hxx +++ b/include/oox/vml/vmltextbox.hxx @@ -68,9 +68,9 @@ struct OOX_DLLPUBLIC TextFontModel /** A text portion in a textbox with the same formatting for all characters. */ struct TextPortionModel { - TextParagraphModel const maParagraph; + TextParagraphModel maParagraph; TextFontModel maFont; - OUString const maText; + OUString maText; explicit TextPortionModel( const TextParagraphModel& rParagraph, const TextFontModel& rFont, const OUString& rText ); }; diff --git a/include/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx index b9d29ed7b35f..d5c3dde86cea 100644 --- a/include/oox/vml/vmltextboxcontext.hxx +++ b/include/oox/vml/vmltextboxcontext.hxx @@ -54,9 +54,9 @@ public: private: TextBox& mrTextBox; - TextParagraphModel const maParagraph; + TextParagraphModel maParagraph; TextFontModel maFont; - size_t const mnInitialPortions; + size_t mnInitialPortions; }; -- cgit v1.2.3