Kaydet (Commit) a84e3df7 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:constfields in oox

Change-Id: I1e110d193ebfa30ab1ab0d85bfb6dc409e341439
Reviewed-on: https://gerrit.libreoffice.org/61728
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst fb1d3b58
......@@ -93,6 +93,8 @@ bool StaticConstField::TraverseConstructorInitializer(CXXCtorInitializer* init)
// unusual case where a user constructor sets a field to one value, and a copy constructor sets it to a different value
if (fn == SRCDIR "/sw/source/core/attr/hints.cxx")
return true;
if (fn == SRCDIR "/oox/source/core/contexthandler2.cxx")
return true;
report(DiagnosticsEngine::Warning, "field can be static const", init->getSourceLocation())
<< init->getSourceRange();
......
......@@ -217,7 +217,7 @@ private:
typedef std::shared_ptr< ContextStack > ContextStackRef;
ContextStackRef mxContextStack; ///< Stack of all processed elements.
size_t mnRootStackSize; ///< Stack size on construction time.
size_t const mnRootStackSize; ///< Stack size on construction time.
protected:
bool mbEnableTrimSpace; ///< True = trim whitespace in characters().
......
......@@ -90,7 +90,7 @@ private:
typedef ::std::vector< sal_Int32 > ContextVector;
OUString& mrFilterName;
OUString maFileName;
OUString const maFileName;
ContextVector maContextStack;
OUString maTargetPath;
css::uno::Reference< css::uno::XComponentContext > mxContext;
......
......@@ -59,7 +59,7 @@ struct FragmentBaseData
const OUString maFragmentPath;
css::uno::Reference< css::xml::sax::XLocator >
mxLocator;
RelationsRef mxRelations;
RelationsRef const mxRelations;
explicit FragmentBaseData(
XmlFilterBase& rFilter,
......
......@@ -109,7 +109,7 @@ public:
private:
::std::map< OUString, Relation > maMap;
OUString maFragmentPath;
OUString const maFragmentPath;
};
......
......@@ -57,15 +57,15 @@ struct OOX_DLLPUBLIC AgileEncryptionInfo
struct OOX_DLLPUBLIC AgileEncryptionParameters
{
sal_Int32 spinCount;
sal_Int32 saltSize;
sal_Int32 keyBits;
sal_Int32 hashSize;
sal_Int32 blockSize;
OUString cipherAlgorithm;
OUString cipherChaining;
OUString hashAlgorithm;
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;
};
enum class AgileEncryptionPreset
......
......@@ -107,7 +107,7 @@ public:
class OOX_DLLPUBLIC CryptoHash : public Crypto
{
sal_Int32 mnHashSize;
sal_Int32 const mnHashSize;
public:
CryptoHash(std::vector<sal_uInt8>& rKey, CryptoHashType eType);
bool update(std::vector<sal_uInt8>& rInput, sal_uInt32 nInputLength = 0);
......
......@@ -32,7 +32,7 @@ class OOX_DLLPUBLIC DocumentEncryption
private:
css::uno::Reference< css::io::XStream > mxDocumentStream;
oox::ole::OleStorage& mrOleStorage;
OUString maPassword;
OUString const maPassword;
Standard2007Engine mEngine;
......
......@@ -51,8 +51,8 @@ public:
virtual void onEndElement() override;
private:
bool mbEmbedShapesInChart;
::oox::core::ContextHandler2Helper* mpParent;
bool const mbEmbedShapesInChart;
::oox::core::ContextHandler2Helper* const mpParent;
};
......
......@@ -81,7 +81,7 @@ typedef ::std::map< sal_Int32, ShapeStyleRef > ShapeStyleRefMap;
struct ChartShapeInfo
{
OUString maFragmentPath; ///< Path to related XML stream, e.g. for charts.
bool mbEmbedShapes; ///< True = load chart shapes into chart, false = load into parent drawpage.
bool const mbEmbedShapes; ///< True = load chart shapes into chart, false = load into parent drawpage.
explicit ChartShapeInfo( bool bEmbedShapes ) : mbEmbedShapes( bEmbedShapes ) {}
};
......
......@@ -83,10 +83,10 @@ typedef o3tl::enumarray<ShapeProperty, sal_Int32> ShapePropertyIds;
struct OOX_DLLPUBLIC ShapePropertyInfo
{
const ShapePropertyIds& mrPropertyIds;
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 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.
static ShapePropertyInfo DEFAULT; /// Default property info (used as default parameter of other methods).
......@@ -154,7 +154,7 @@ private:
private:
ModelObjectHelper& mrModelObjHelper;
ShapePropertyInfo maShapePropInfo;
ShapePropertyInfo const maShapePropInfo;
};
......
......@@ -800,8 +800,8 @@ private:
typedef ::std::map< OUString, NameListRef > NameListMap;
css::uno::Reference< css::uno::XComponentContext > mxContext;
StorageRef mxRootStrg;
OUString maSysFileName;
StorageRef const mxRootStrg;
OUString const maSysFileName;
ConfigFileSet maConfigFiles;
ConfigDataMap maConfigData;
NameListMap maNameLists;
......@@ -1184,8 +1184,8 @@ private:
private:
struct PreferredItem
{
OUString maName;
bool mbStorage;
OUString const maName;
bool const mbStorage;
explicit PreferredItem( const OUString& rName, bool bStorage ) :
maName( rName ), mbStorage( bStorage ) {}
......
......@@ -174,11 +174,11 @@ private:
bool dumpComCtlComplex();
protected:
sal_uInt32 mnDataId5;
sal_uInt32 mnDataId6;
sal_uInt16 mnVersion;
bool mbCommonPart;
bool mbComplexPart;
sal_uInt32 const mnDataId5;
sal_uInt32 const mnDataId6;
sal_uInt16 const mnVersion;
bool const mbCommonPart;
bool const mbComplexPart;
};
......@@ -350,9 +350,9 @@ private:
{
enum LargePropertyType { PROPTYPE_POS, PROPTYPE_SIZE, PROPTYPE_GUID, PROPTYPE_STRING, PROPTYPE_STRINGARRAY };
LargePropertyType mePropType;
OUString maItemName;
sal_uInt32 mnDataSize;
LargePropertyType const mePropType;
OUString const maItemName;
sal_uInt32 const 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 maItemName;
sal_uInt16 mnData;
OUString const maItemName;
sal_uInt16 const mnData;
explicit StreamProperty( const String& rItemName, sal_uInt16 nData ) :
maItemName( rItemName ), mnData( nData ) {}
};
......@@ -761,7 +761,7 @@ protected:
private:
VbaSharedData& mrVbaData;
sal_Int32 mnStrmOffset;
sal_Int32 const mnStrmOffset;
};
......
......@@ -78,9 +78,9 @@ enum AxesType
};
struct AxisIdPair{
AxesType nAxisType;
sal_Int32 nAxisId;
sal_Int32 nCrossAx;
AxesType const nAxisType;
sal_Int32 const nAxisId;
sal_Int32 const nCrossAx;
AxisIdPair(AxesType nType, sal_Int32 nId, sal_Int32 nAx)
: nAxisType(nType)
......@@ -96,7 +96,7 @@ public:
typedef ::std::vector< AxisIdPair > AxisVector;
private:
sal_Int32 mnXmlNamespace;
sal_Int32 const mnXmlNamespace;
sal_Int32 mnSeriesCount;
css::uno::Reference< css::frame::XModel > mxChartModel;
css::uno::Reference< css::chart::XDiagram > mxDiagram;
......
......@@ -126,7 +126,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 meDocumentType;
DocumentType const meDocumentType;
/// Parent exporter, used for text callback.
DMLTextExport* mpTextExport;
......
......@@ -372,7 +372,7 @@ private:
private:
BinaryInputStream* mpInStrm;
sal_Int64 mnStartPos;
sal_Int64 const mnStartPos;
sal_Int64 mnRelPos;
sal_Int64 mnSize;
};
......
......@@ -68,7 +68,7 @@ private:
mxModelFactory; ///< Factory to create the container.
mutable css::uno::Reference< css::container::XNameContainer >
mxContainer; ///< Container for the objects.
OUString maServiceName; ///< Service name to create the container.
OUString const maServiceName; ///< Service name to create the container.
sal_Int32 mnIndex; ///< Index to create unique identifiers.
};
......
......@@ -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 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).
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).
};
......
......@@ -85,7 +85,7 @@ public:
private:
BinaryInputStream* mpInStrm; ///< The wrapped input stream.
sal_Int64 mnStrmPos; ///< Tracks relative position in the stream.
sal_Int64 mnStrmSize; ///< Size of the wrapped stream data.
sal_Int64 const mnStrmSize; ///< Size of the wrapped stream data.
};
......@@ -182,7 +182,7 @@ private:
struct StringProperty : public ComplexProperty
{
OUString& mrValue;
sal_uInt32 mnSize;
sal_uInt32 const 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 mnSize;
sal_uInt32 const mnSize;
explicit ArrayStringProperty( AxArrayString& rArray, sal_uInt32 nSize ) :
mrArray( rArray ), mnSize( nSize ) {}
virtual bool readProperty( AxAlignedInputStream& rInStrm ) override;
......
......@@ -68,8 +68,8 @@ public:
private:
BinaryOutputStream* mpOutStrm; ///< The wrapped input stream.
sal_Int64 mnStrmPos; ///< Tracks relative position in the stream.
sal_Int64 mnStrmSize; ///< Size of the wrapped stream data.
sal_Int64 mnWrappedBeginPos; ///< starting pos or wrapped stream
sal_Int64 const mnStrmSize; ///< Size of the wrapped stream data.
sal_Int64 const 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 mnSize;
sal_uInt32 const 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 mb64BitPropFlags;
bool const mb64BitPropFlags;
};
......
......@@ -339,7 +339,7 @@ private:
const GraphicHelper& mrGraphicHelper;
mutable PropertySet maAddressConverter;
mutable PropertySet maRangeConverter;
bool mbDefaultColorBgr;
bool const mbDefaultColorBgr;
};
......@@ -422,10 +422,8 @@ protected:
const sal_uInt16 mnVersion; ///< Current version of the ComCtl control model.
private:
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.
sal_uInt32 const mnDataPartId5; ///< Identifier for version 5.0 control data.
sal_uInt32 const mnDataPartId6; ///< Identifier for version 6.0 control data.
};
......@@ -500,7 +498,7 @@ public: // direct access needed for legacy VML drawing controls
AxFontData maFontData; ///< The font settings.
private:
bool mbSupportsAlign; ///< True = UNO model supports Align property.
bool const mbSupportsAlign; ///< True = UNO model supports Align property.
};
......@@ -830,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 mbFontSupport; ///< True = control supports the font property.
bool const mbFontSupport; ///< True = control supports the font property.
};
......@@ -982,7 +980,7 @@ private:
createXForm();
private:
ControlConverter maControlConv;
ControlConverter const maControlConv;
css::uno::Reference< css::lang::XMultiServiceFactory > mxModelFactory;
css::uno::Reference< css::form::XFormsSupplier > mxFormsSupp;
css::uno::Reference< css::container::XIndexContainer > mxFormIC;
......
......@@ -138,7 +138,7 @@ class OOX_DLLPUBLIC OleFormCtrlExportHelper final
{
std::unique_ptr<::oox::ole::EmbeddedControl> mpControl;
::oox::ole::ControlModelBase* mpModel;
::oox::GraphicHelper maGrfHelper;
::oox::GraphicHelper const maGrfHelper;
css::uno::Reference< css::frame::XModel > mxDocModel;
css::uno::Reference< css::awt::XControlModel > mxControlModel;
......@@ -175,7 +175,7 @@ class OOX_DLLPUBLIC MSConvertOCXControls : public SvxMSConvertOCXControls
{
protected:
css::uno::Reference< css::uno::XComponentContext > mxCtx;
::oox::GraphicHelper maGrfHelper;
::oox::GraphicHelper const maGrfHelper;
bool importControlFromStream( ::oox::BinaryInputStream& rInStrm,
css::uno::Reference< css::form::XFormComponent > & rxFormComp,
......
......@@ -204,7 +204,7 @@ public:
private:
css::uno::Reference< css::uno::XComponentContext > mxContext;
css::uno::Reference< css::frame::XModel > mxDocModel;
ControlConverter maConverter;
ControlConverter const maConverter;
};
......
......@@ -63,7 +63,7 @@ private:
sal_uInt8* mpCompressedChunkStream;
// same as DecompressedChunkEnd in the spec
std::size_t mnChunkSize;
std::size_t const 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 mnProjKey; // a project-specific encryption key
sal_Unicode const mnProjKey; // a project-specific encryption key
sal_uInt8 mnIgnoredLength; // the length in bytes of IgnoredEnc
sal_uInt8 mnSeed; // the seed value
......
......@@ -92,12 +92,12 @@ private:
OUString maName;
OUString maStreamName;
OUString maDocString;
rtl_TextEncoding meTextEnc;
rtl_TextEncoding const meTextEnc;
sal_Int32 mnType;
sal_uInt32 mnOffset;
bool mbReadOnly;
bool mbPrivate;
bool mbExecutable;
bool const mbExecutable;
};
......
......@@ -105,7 +105,7 @@ private:
virtual void attachMacro( const OUString& rScriptUrl ) = 0;
private:
OUString maMacroName;
OUString const maMacroName;
};
typedef std::shared_ptr< VbaMacroAttacherBase > VbaMacroAttacherRef;
......
......@@ -43,7 +43,7 @@ namespace oox { namespace ppt {
struct ImplAttributeNameConversion
{
AnimationAttributeEnum meAttribute;
AnimationAttributeEnum const meAttribute;
const char* mpMSName;
const char* mpAPIName;
};
......@@ -53,9 +53,9 @@ namespace oox { namespace ppt {
struct OOX_DLLPUBLIC transition
{
const sal_Char* mpName;
sal_Int16 mnType;
sal_Int16 mnSubType;
bool mbDirection; // true: default geometric direction
sal_Int16 const mnType;
sal_Int16 const mnSubType;
bool const 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 mnID;
sal_Int32 const mnID;
const sal_Char* mpStrSubType;
static const convert_subtype* getList();
......
......@@ -36,8 +36,8 @@ namespace oox { namespace ppt {
class PPTShapeGroupContext : public ::oox::drawingml::ShapeGroupContext
{
SlidePersistPtr mpSlidePersistPtr;
ShapeLocation meShapeLocation;
SlidePersistPtr const mpSlidePersistPtr;
ShapeLocation const meShapeLocation;
oox::drawingml::ShapePtr pGraphicShape;
void applyFontRefColor(const oox::drawingml::ShapePtr& pShape, const oox::drawingml::Color& rFontRefColor);
......
......@@ -48,7 +48,7 @@ public:
protected:
SlidePersistPtr mpSlidePersistPtr;
ShapeLocation meShapeLocation;
ShapeLocation const meShapeLocation;
private:
OUString maSlideName;
......
......@@ -37,7 +37,7 @@ public:
virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
private:
SlidePersistPtr mpSlidePersistPtr;
SlidePersistPtr const mpSlidePersistPtr;
};
} }
......
......@@ -139,14 +139,14 @@ private:
oox::ppt::HeaderFooter maHeaderFooter;
sal_Int32 mnLayoutValueToken;
bool mbMaster;
bool mbNotes;
oox::drawingml::TextListStylePtr maDefaultTextStylePtr;
oox::drawingml::TextListStylePtr maTitleTextStylePtr;
oox::drawingml::TextListStylePtr maBodyTextStylePtr;
oox::drawingml::TextListStylePtr maNotesTextStylePtr;
oox::drawingml::TextListStylePtr maOtherTextStylePtr;
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;
std::map< OUString, css::uno::Reference< css::animations::XAnimationNode > > maAnimNodesMap;
std::map< OUString, ::oox::drawingml::ShapePtr > maShapeMap;
......
......@@ -45,7 +45,7 @@ namespace oox { namespace ppt {
protected:
TimeNodeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const TimeNodePtr & pNode ) throw();
sal_Int32 mnElement;
sal_Int32 const mnElement;
TimeNodePtr mpNode;
};
......
......@@ -67,9 +67,9 @@ struct OOX_DLLPUBLIC TextFontModel
/** A text portion in a textbox with the same formatting for all characters. */
struct TextPortionModel
{
TextParagraphModel maParagraph;
TextParagraphModel const maParagraph;
TextFontModel maFont;
OUString maText;
OUString const maText;
explicit TextPortionModel( const TextParagraphModel& rParagraph, const TextFontModel& rFont, const OUString& rText );
};
......
......@@ -54,9 +54,9 @@ public:
private:
TextBox& mrTextBox;
TextParagraphModel maParagraph;
TextParagraphModel const maParagraph;
TextFontModel maFont;
size_t mnInitialPortions;
size_t const mnInitialPortions;
};
......
......@@ -82,7 +82,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 mnTypeId; /// Type identifier of this axis.
sal_Int32 const 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.
......
......@@ -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 mbRelSize; /// True = relative size, false = absolute size.
bool const 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 mbOleSupport; /// True = allow to insert OLE objects into the drawing page.
bool const mbOleSupport; /// True = allow to insert OLE objects into the drawing page.
};
......
......@@ -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 mnDefaultRotation;
sal_Int32 const mnDefaultRotation;
explicit TitleModel(sal_Int32 nDefaultRotation = 0);
~TitleModel();
......
......@@ -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 mnTypeId; /// Chart type identifier.
sal_Int32 const 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.
......
......@@ -42,7 +42,7 @@ public:
private:
ClrScheme& mrClrScheme;
sal_Int32 mnColorToken;
sal_Int32 const mnColorToken;
};
class clrSchemeContext : public oox::core::ContextHandler2
......
......@@ -37,7 +37,7 @@ public:
private:
Shape& mrShape;
bool mbtxXfrm;
bool const mbtxXfrm;
};
} // namespace drawingml
......
......@@ -31,7 +31,7 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
TokenMap tokenMap;
TokenMap const tokenMap;
};
void TokenmapTest::test_roundTrip()
......
......@@ -68,7 +68,7 @@ private:
return url.url;
}
test::Directories m_directories;
test::Directories const m_directories;
};
namespace {
......
......@@ -47,7 +47,7 @@ public:
~InputStreamCloseGuard();
private:
Reference< XInputStream > mxInStream;
bool mbCloseStream;
bool const mbCloseStream;
};
InputStreamCloseGuard::InputStreamCloseGuard( const Reference< XInputStream >& rxInStream, bool bCloseStream ) :
......
......@@ -107,7 +107,7 @@ private:
typedef ::std::pair< RecordInfo, ContextHandlerRef > ContextInfo;
typedef ::std::vector< ContextInfo > ContextInfoVec;
FragmentHandlerRef mxHandler;
FragmentHandlerRef const mxHandler;
ContextInfoVec maStack;
};
......
......@@ -146,7 +146,7 @@ struct ConverterData
XmlFilterBase& mrFilter;
ChartConverter& mrConverter;
Reference< XChartDocument > mxDoc;
awt::Size maSize;
awt::Size const maSize;
explicit ConverterData(
XmlFilterBase& rFilter,
......