[Libreoffice-commits] core.git: include/oox oox/inc oox/qa oox/source opencl/inc
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Mar 12 06:31:44 UTC 2020
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 -
oox/inc/drawingml/chart/axismodel.hxx | 2
oox/inc/drawingml/chart/chartdrawingfragment.hxx | 4 -
oox/inc/drawingml/chart/titlemodel.hxx | 2
oox/inc/drawingml/chart/typegroupmodel.hxx | 2
oox/inc/drawingml/clrschemecontext.hxx | 2
oox/inc/drawingml/transform2dcontext.hxx | 2
oox/qa/token/tokenmap-test.cxx | 2
oox/qa/unit/vba_compression.cxx | 2
oox/source/core/fastparser.cxx | 2
oox/source/core/recordparser.cxx | 2
oox/source/drawingml/chart/converterbase.cxx | 2
oox/source/drawingml/chart/objectformatter.cxx | 42 ++++++++--------
oox/source/drawingml/clrscheme.cxx | 2
oox/source/drawingml/customshapegeometry.cxx | 2
oox/source/drawingml/diagram/diagramfragmenthandler.hxx | 4 -
oox/source/drawingml/diagram/diagramlayoutatoms.hxx | 4 -
oox/source/dump/dffdumper.cxx | 8 +--
oox/source/export/ColorPropertySet.cxx | 2
oox/source/export/ColorPropertySet.hxx | 6 +-
oox/source/export/chartexport.cxx | 2
oox/source/helper/progressbar.cxx | 4 -
oox/source/ole/axcontrol.cxx | 15 +++--
oox/source/ole/olehelper.cxx | 2
oox/source/ole/olestorage.cxx | 2
oox/source/ppt/animvariantcontext.hxx | 2
oox/source/ppt/extdrawingfragmenthandler.hxx | 2
oox/source/ppt/timenodelistcontext.cxx | 4 -
oox/source/shape/ShapeDrawingFragmentHandler.hxx | 2
opencl/inc/opencl_device_selection.h | 2
62 files changed, 163 insertions(+), 156 deletions(-)
New commits:
commit 31bf558349d9ab2634e9a866edf79bc115d649ce
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Mar 11 13:43:39 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Mar 12 07:31:08 2020 +0100
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 <noel.grandin at collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
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<sal_uInt8>& rKey, CryptoHashType eType);
bool update(std::vector<sal_uInt8>& 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<DiagramData> 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<ShapeProperty, sal_Int32> 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<OUString, OUString> 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;
};
diff --git a/oox/inc/drawingml/chart/axismodel.hxx b/oox/inc/drawingml/chart/axismodel.hxx
index 8f1f9046aed8..afa097d72e11 100644
--- a/oox/inc/drawingml/chart/axismodel.hxx
+++ b/oox/inc/drawingml/chart/axismodel.hxx
@@ -81,7 +81,7 @@ struct AxisModel
sal_Int32 mnTickLabelPos; /// Position of tick mark labels relative to the axis.
sal_Int32 mnTickLabelSkip; /// Number of tick mark labels to skip.
sal_Int32 mnTickMarkSkip; /// Number of tick marks to skip.
- sal_Int32 const mnTypeId; /// Type identifier of this axis.
+ sal_Int32 mnTypeId; /// Type identifier of this axis.
bool mbAuto; /// True = automatic selection of text/date axis type.
bool mbDeleted; /// True = axis has been deleted manually.
bool mbNoMultiLevel; /// True = no multi-level categories supported.
diff --git a/oox/inc/drawingml/chart/chartdrawingfragment.hxx b/oox/inc/drawingml/chart/chartdrawingfragment.hxx
index bc030a78d574..8392999fa798 100644
--- a/oox/inc/drawingml/chart/chartdrawingfragment.hxx
+++ b/oox/inc/drawingml/chart/chartdrawingfragment.hxx
@@ -67,7 +67,7 @@ private:
AnchorPosModel maFrom; /// Top-left position relative to chart object.
AnchorPosModel maTo; /// Bottom-right position relative to chart object.
AnchorSizeModel maSize; /// Shape size, if anchor has absolute size.
- bool const mbRelSize; /// True = relative size, false = absolute size.
+ bool mbRelSize; /// True = relative size, false = absolute size.
};
/** Handler for a chart drawing fragment (c:userShapes root element).
@@ -94,7 +94,7 @@ private:
::oox::drawingml::ShapePtr mxShape; /// Current top-level shape.
std::shared_ptr< ShapeAnchor > mxAnchor; /// Current anchor of top-level shape.
EmuRectangle maChartRectEmu; /// Position and size of the chart object for embedded shapes (in EMUs).
- bool const mbOleSupport; /// True = allow to insert OLE objects into the drawing page.
+ bool mbOleSupport; /// True = allow to insert OLE objects into the drawing page.
};
diff --git a/oox/inc/drawingml/chart/titlemodel.hxx b/oox/inc/drawingml/chart/titlemodel.hxx
index f069c7697a60..c31b8d34ba73 100644
--- a/oox/inc/drawingml/chart/titlemodel.hxx
+++ b/oox/inc/drawingml/chart/titlemodel.hxx
@@ -51,7 +51,7 @@ struct TitleModel
LayoutRef mxLayout; /// Layout/position of the frame.
TextRef mxText; /// Text source of the title.
bool mbOverlay; /// True = title may overlay other objects.
- sal_Int32 const mnDefaultRotation;
+ sal_Int32 mnDefaultRotation;
explicit TitleModel(sal_Int32 nDefaultRotation = 0);
~TitleModel();
diff --git a/oox/inc/drawingml/chart/typegroupmodel.hxx b/oox/inc/drawingml/chart/typegroupmodel.hxx
index 0803bf4e7a82..7da97c39e578 100644
--- a/oox/inc/drawingml/chart/typegroupmodel.hxx
+++ b/oox/inc/drawingml/chart/typegroupmodel.hxx
@@ -69,7 +69,7 @@ struct TypeGroupModel
sal_Int32 mnShape; /// 3D bar shape type.
sal_Int32 mnSizeRepresents; /// Bubble size represents area or width.
sal_Int32 mnSplitType; /// Split type in pie-to charts.
- sal_Int32 const mnTypeId; /// Chart type identifier.
+ sal_Int32 mnTypeId; /// Chart type identifier.
bool mbBubble3d; /// True = show bubbles with 3D shade.
bool mbShowMarker; /// True = show point markers in line charts.
bool mbShowNegBubbles; /// True = show absolute value of negative bubbles.
diff --git a/oox/inc/drawingml/clrschemecontext.hxx b/oox/inc/drawingml/clrschemecontext.hxx
index 0525dc45b71f..d6cc3f350536 100644
--- a/oox/inc/drawingml/clrschemecontext.hxx
+++ b/oox/inc/drawingml/clrschemecontext.hxx
@@ -42,7 +42,7 @@ public:
private:
ClrScheme& mrClrScheme;
- sal_Int32 const mnColorToken;
+ sal_Int32 mnColorToken;
};
class clrSchemeContext final : public oox::core::ContextHandler2
diff --git a/oox/inc/drawingml/transform2dcontext.hxx b/oox/inc/drawingml/transform2dcontext.hxx
index a4b3ac9d32b3..eb772ee7419e 100644
--- a/oox/inc/drawingml/transform2dcontext.hxx
+++ b/oox/inc/drawingml/transform2dcontext.hxx
@@ -37,7 +37,7 @@ public:
private:
Shape& mrShape;
- bool const mbtxXfrm;
+ bool mbtxXfrm;
};
} // namespace drawingml
diff --git a/oox/qa/token/tokenmap-test.cxx b/oox/qa/token/tokenmap-test.cxx
index ce25d3f7a874..4f617189bbf4 100644
--- a/oox/qa/token/tokenmap-test.cxx
+++ b/oox/qa/token/tokenmap-test.cxx
@@ -31,7 +31,7 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
- TokenMap const tokenMap;
+ TokenMap tokenMap;
};
void TokenmapTest::test_roundTrip()
diff --git a/oox/qa/unit/vba_compression.cxx b/oox/qa/unit/vba_compression.cxx
index 0ade756e363f..bfe241c5995c 100644
--- a/oox/qa/unit/vba_compression.cxx
+++ b/oox/qa/unit/vba_compression.cxx
@@ -67,7 +67,7 @@ private:
return url.url;
}
- test::Directories const m_directories;
+ test::Directories m_directories;
};
namespace {
diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx
index 8268b9bb6277..34246a16548a 100644
--- a/oox/source/core/fastparser.cxx
+++ b/oox/source/core/fastparser.cxx
@@ -47,7 +47,7 @@ public:
~InputStreamCloseGuard();
private:
Reference< XInputStream > mxInStream;
- bool const mbCloseStream;
+ bool mbCloseStream;
};
InputStreamCloseGuard::InputStreamCloseGuard( const Reference< XInputStream >& rxInStream, bool bCloseStream ) :
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index d5a9a9866f13..6d9d7b4e6004 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -108,7 +108,7 @@ private:
typedef ::std::pair< RecordInfo, ContextHandlerRef > ContextInfo;
typedef ::std::vector< ContextInfo > ContextInfoVec;
- FragmentHandlerRef const mxHandler;
+ FragmentHandlerRef mxHandler;
ContextInfoVec maStack;
};
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index 8162e860f0dc..31b31083ab25 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -145,7 +145,7 @@ struct ConverterData
XmlFilterBase& mrFilter;
ChartConverter& mrConverter;
Reference< XChartDocument > mxDoc;
- awt::Size const maSize;
+ awt::Size maSize;
explicit ConverterData(
XmlFilterBase& rFilter,
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index a72652fdaf2b..1a43409dbea0 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -52,9 +52,9 @@ namespace {
struct AutoFormatPatternEntry
{
- sal_Int32 const mnColorToken; /// Theme color token.
- sal_Int32 const mnModToken; /// Color modification token.
- sal_Int32 const mnModValue; /// Color modification value.
+ sal_Int32 mnColorToken; /// Theme color token.
+ sal_Int32 mnModToken; /// Color modification token.
+ sal_Int32 mnModValue; /// Color modification value.
};
#define AUTOFORMAT_PATTERN_COLOR( color_token ) \
@@ -116,15 +116,15 @@ static const AutoFormatPatternEntry spAutoFormatPattern4[] =
struct AutoFormatEntry
{
- sal_Int32 const mnFirstStyleIdx; /// First chart style index.
- sal_Int32 const mnLastStyleIdx; /// Last chart style index.
- sal_Int32 const mnThemedIdx; /// Themed style index.
- sal_Int32 const mnColorToken; /// Theme color token.
- sal_Int32 const mnModToken; /// Color modification token.
- sal_Int32 const mnModValue; /// Color modification value.
- sal_Int32 const mnRelLineWidth; /// Relative line width (percent).
+ sal_Int32 mnFirstStyleIdx; /// First chart style index.
+ sal_Int32 mnLastStyleIdx; /// Last chart style index.
+ sal_Int32 mnThemedIdx; /// Themed style index.
+ sal_Int32 mnColorToken; /// Theme color token.
+ sal_Int32 mnModToken; /// Color modification token.
+ sal_Int32 mnModValue; /// Color modification value.
+ sal_Int32 mnRelLineWidth; /// Relative line width (percent).
const AutoFormatPatternEntry* mpPattern;/// Color cycling pattern for data series.
- bool const mbFadedColor; /// True = Faded color for data series.
+ bool mbFadedColor; /// True = Faded color for data series.
};
#define AUTOFORMAT_COLOR( first, last, themed_style, color_token ) \
@@ -393,13 +393,13 @@ const AutoFormatEntry* lclGetAutoFormatEntry( const AutoFormatEntry* pEntries, s
struct AutoTextEntry
{
- sal_Int32 const mnFirstStyleIdx; /// First chart style index.
- sal_Int32 const mnLastStyleIdx; /// Last chart style index.
- sal_Int32 const mnThemedFont; /// Themed font (minor/major).
- sal_Int32 const mnColorToken; /// Theme color token.
- sal_Int32 const mnDefFontSize; /// Default font size (1/100 points).
- sal_Int32 const mnRelFontSize; /// Font size relative to chart global font (percent).
- bool const mbBold; /// True = bold font.
+ sal_Int32 mnFirstStyleIdx; /// First chart style index.
+ sal_Int32 mnLastStyleIdx; /// Last chart style index.
+ sal_Int32 mnThemedFont; /// Themed font (minor/major).
+ sal_Int32 mnColorToken; /// Theme color token.
+ sal_Int32 mnDefFontSize; /// Default font size (1/100 points).
+ sal_Int32 mnRelFontSize; /// Font size relative to chart global font (percent).
+ bool mbBold; /// True = bold font.
};
#define AUTOTEXT_COLOR( first, last, themed_font, color_token, def_font_size, rel_font_size, bold ) \
@@ -508,7 +508,7 @@ struct ObjectTypeFormatEntry
const AutoFormatEntry* mpAutoLines; /// Automatic line formatting for all chart styles.
const AutoFormatEntry* mpAutoFills; /// Automatic fill formatting for all chart styles.
const AutoTextEntry* mpAutoTexts; /// Automatic text attributes for all chart styles.
- bool const mbIsFrame; /// True = object is a frame, false = object is a line.
+ bool mbIsFrame; /// True = object is a frame, false = object is a line.
ObjectTypeFormatEntry(ObjectType eObjType, const ShapePropertyInfo& rPropInfo,
const AutoFormatEntry* pAutoLines,
const AutoFormatEntry* pAutoFills,
@@ -712,8 +712,8 @@ struct ObjectFormatterData
ModelObjectHelper maModelObjHelper; /// Helper for named drawing formatting (dashes, gradients, bitmaps).
Reference< XNumberFormats > mxNumFmts; /// Number formats collection of container document.
Reference< XNumberFormatTypes > mxNumTypes; /// Number format types collection of container document.
- Locale const maEnUsLocale; /// Locale struct containing en-US.
- Locale const maFromLocale; /// Empty locale struct.
+ Locale maEnUsLocale; /// Locale struct containing en-US.
+ Locale maFromLocale; /// Empty locale struct.
sal_Int32 mnMaxSeriesIdx; /// Maximum series index used for color cycling/fading.
explicit ObjectFormatterData(
diff --git a/oox/source/drawingml/clrscheme.cxx b/oox/source/drawingml/clrscheme.cxx
index 202b30a619b2..6b391d7877a8 100644
--- a/oox/source/drawingml/clrscheme.cxx
+++ b/oox/source/drawingml/clrscheme.cxx
@@ -60,7 +60,7 @@ struct find_by_token
}
private:
- sal_Int32 const m_token;
+ sal_Int32 m_token;
};
}
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index a0112ebc3da8..d77ae8a618d6 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -66,7 +66,7 @@ enum FormularCommand
struct FormularCommandNameTable
{
const char* pS;
- FormularCommand const pE;
+ FormularCommand pE;
};
}
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index 73a72f4aef9a..3b5a5cc86ff1 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -37,7 +37,7 @@ public:
private:
- DiagramDataPtr const mpDataPtr;
+ DiagramDataPtr mpDataPtr;
};
class DiagramLayoutFragmentHandler : public ::oox::core::FragmentHandler2
@@ -51,7 +51,7 @@ public:
private:
- DiagramLayoutPtr const mpDataPtr;
+ DiagramLayoutPtr mpDataPtr;
};
class DiagramQStylesFragmentHandler : public ::oox::core::FragmentHandler2
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 859b3bc2884b..35080ea19332 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -213,7 +213,7 @@ private:
static bool compareResult(sal_Int32 nOperator, sal_Int32 nFirst, sal_Int32 nSecond);
sal_Int32 getNodeCount(const dgm::Point* pPresPoint) const;
- bool const mIsElse;
+ bool mIsElse;
IteratorAttr maIter;
ConditionAttr maCond;
};
@@ -285,7 +285,7 @@ public:
{ return mpShapeTemplate; }
private:
- ShapePtr const mpShapeTemplate;
+ ShapePtr mpShapeTemplate;
};
typedef std::shared_ptr< ShapeAtom > ShapeAtomPtr;
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index 0eeebfce394f..9c8acd82846c 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -157,10 +157,10 @@ enum class PropType { Binary };
struct PropInfo
{
- OUString const maName;
- PropType const meType;
- sal_uInt16 const mnId;
- sal_uInt32 const mnSize;
+ OUString maName;
+ PropType meType;
+ sal_uInt16 mnId;
+ sal_uInt32 mnSize;
explicit PropInfo( const OUString& rName, PropType eType, sal_uInt16 nId, sal_uInt32 nSize ) :
maName( rName ), meType( eType ), mnId( nId ), mnSize( nSize ) {}
};
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index 5b3d71a6d422..84f7da6a72f8 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -47,7 +47,7 @@ protected:
virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override;
private:
- OUString const m_aColorPropName;
+ OUString m_aColorPropName;
Property m_aColorProp;
};
diff --git a/oox/source/export/ColorPropertySet.hxx b/oox/source/export/ColorPropertySet.hxx
index 1ac05f5cf823..e1734422ac8c 100644
--- a/oox/source/export/ColorPropertySet.hxx
+++ b/oox/source/export/ColorPropertySet.hxx
@@ -75,10 +75,10 @@ protected:
private:
css::uno::Reference< css::beans::XPropertySetInfo > m_xInfo;
- OUString const m_aColorPropName;
+ OUString m_aColorPropName;
::Color m_nColor;
- bool const m_bIsFillColor;
- ::Color const m_nDefaultColor;
+ bool m_bIsFillColor;
+ ::Color m_nDefaultColor;
};
} // namespace chart
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index aecfe3948d33..1d0aed9ef442 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -157,7 +157,7 @@ public:
}
private:
- OUString const m_aRole;
+ OUString m_aRole;
};
}
diff --git a/oox/source/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx
index 07e5b437a68f..86170b47e66a 100644
--- a/oox/source/helper/progressbar.cxx
+++ b/oox/source/helper/progressbar.cxx
@@ -87,8 +87,8 @@ public:
private:
IProgressBar& mrParentProgress;
- double const mfStartPos;
- double const mfLength;
+ double mfStartPos;
+ double mfLength;
double mfPosition;
double mfFreeStart;
};
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 8ce93ea1ffa5..ebdf845310e5 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -661,7 +661,9 @@ ComCtlModelBase::ComCtlModelBase( sal_uInt32 nDataPartId5, sal_uInt32 nDataPartI
mnFlags( 0 ),
mnVersion( nVersion ),
mnDataPartId5( nDataPartId5 ),
- mnDataPartId6( nDataPartId6 )
+ mnDataPartId6( nDataPartId6 ),
+ mbCommonPart( true ),
+ mbComplexPart( true )
{
}
@@ -671,13 +673,15 @@ bool ComCtlModelBase::importBinaryModel( BinaryInputStream& rInStrm )
if( importSizePart( rInStrm ) && readPartHeader( rInStrm, getDataPartId(), mnVersion ) )
{
// if flags part exists, the first int32 of the data part contains its size
- sal_uInt32 nCommonPartSize = rInStrm.readuInt32();
+ sal_uInt32 nCommonPartSize = 0;
+ if (mbCommonPart)
+ nCommonPartSize = rInStrm.readuInt32();
// implementations must read the exact amount of data, stream must point to its end afterwards
importControlData( rInStrm );
// read following parts
if( !rInStrm.isEof() &&
- importCommonPart( rInStrm, nCommonPartSize ) &&
- importComplexPart( rInStrm ) )
+ (!mbCommonPart || importCommonPart( rInStrm, nCommonPartSize )) &&
+ (!mbComplexPart || importComplexPart( rInStrm )) )
{
return !rInStrm.isEof();
}
@@ -687,7 +691,8 @@ bool ComCtlModelBase::importBinaryModel( BinaryInputStream& rInStrm )
void ComCtlModelBase::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const
{
- rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, COMCTL_COMMON_ENABLED ) );
+ if( mbCommonPart )
+ rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, COMCTL_COMMON_ENABLED ) );
ControlModelBase::convertProperties( rPropMap, rConv );
}
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 93de727d5097..ec7dad6c181f 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -96,7 +96,7 @@ struct GUIDCNamePair
struct IdCntrlData
{
sal_Int16 nId;
- GUIDCNamePair const aData;
+ GUIDCNamePair aData;
};
const sal_Int16 TOGGLEBUTTON = -1;
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index f9fd84a8c44e..0eec7ad679bf 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -79,7 +79,7 @@ private:
Reference< XStream > mxTempFile;
Reference< XOutputStream > mxOutStrm;
Reference< XSeekable > mxSeekable;
- OUString const maElementName;
+ OUString maElementName;
};
OleOutputStream::OleOutputStream( const Reference< XComponentContext >& rxContext,
diff --git a/oox/source/ppt/animvariantcontext.hxx b/oox/source/ppt/animvariantcontext.hxx
index 9f02e709665a..03eac37b92ba 100644
--- a/oox/source/ppt/animvariantcontext.hxx
+++ b/oox/source/ppt/animvariantcontext.hxx
@@ -38,7 +38,7 @@ namespace oox { namespace ppt {
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
private:
- ::sal_Int32 const mnElement;
+ ::sal_Int32 mnElement;
css::uno::Any& maValue;
::oox::drawingml::Color maColor;
};
diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx
index 2ea704f5f1e5..61c00b92862e 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -30,7 +30,7 @@ public:
private:
const oox::ppt::SlidePersistPtr mpSlidePersistPtr;
const oox::ppt::ShapeLocation meShapeLocation;
- oox::drawingml::ShapePtr const mpGroupShapePtr;
+ oox::drawingml::ShapePtr mpGroupShapePtr;
oox::drawingml::ShapePtr mpShapePtr;
};
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 52e23b27aee9..361a6a68e72f 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -510,8 +510,8 @@ namespace oox::ppt {
}
private:
- sal_Int32 const mnColorSpace;
- sal_Int32 const mnDir;
+ sal_Int32 mnColorSpace;
+ sal_Int32 mnDir;
bool mbHasByColor;
AnimColor m_byColor;
oox::drawingml::Color maToClr;
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
index abf4800172b6..7675a3be67a8 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
@@ -25,7 +25,7 @@ public:
virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) override;
private:
- oox::drawingml::ShapePtr const mpGroupShapePtr;
+ oox::drawingml::ShapePtr mpGroupShapePtr;
};
} }
diff --git a/opencl/inc/opencl_device_selection.h b/opencl/inc/opencl_device_selection.h
index 4fa8cf4a55de..af0ecd37be5c 100644
--- a/opencl/inc/opencl_device_selection.h
+++ b/opencl/inc/opencl_device_selection.h
@@ -86,7 +86,7 @@ struct ds_device
struct ds_profile
{
std::vector<ds_device> devices;
- OString const version;
+ OString version;
ds_profile(OString const & inVersion)
: version(inVersion)
More information about the Libreoffice-commits
mailing list