[Libreoffice-commits] core.git: filter/source include/filter include/oox include/svx include/tools include/vcl include/xmloff lotuswordpro/source oox/inc oox/source reportdesign/source sc/source sd/inc sd/source svx/inc svx/source sw/source vcl/source xmloff/source
Noel Grandin
noel at peralex.com
Mon Feb 22 07:19:48 UTC 2016
filter/source/msfilter/msdffimp.cxx | 3 --
include/filter/msfilter/msdffimp.hxx | 1
include/oox/drawingml/shape.hxx | 1
include/svx/float3d.hxx | 1
include/svx/galmisc.hxx | 4 +-
include/svx/sdr/overlay/overlaymanager.hxx | 5 +--
include/svx/svdobj.hxx | 3 --
include/svx/svdotext.hxx | 4 --
include/svx/svdtrans.hxx | 5 +--
include/svx/viewpt3d.hxx | 2 -
include/tools/b3dtrans.hxx | 10 -------
include/vcl/image.hxx | 4 --
include/vcl/print.hxx | 1
include/xmloff/SchXMLImportHelper.hxx | 1
include/xmloff/shapeimport.hxx | 3 --
include/xmloff/txtparae.hxx | 1
lotuswordpro/source/filter/lwpobjfactory.cxx | 3 --
lotuswordpro/source/filter/lwpobjfactory.hxx | 1
lotuswordpro/source/filter/xfilter/xfstyle.cxx | 1
lotuswordpro/source/filter/xfilter/xfstyle.hxx | 1
oox/inc/drawingml/chart/typegroupconverter.hxx | 3 --
oox/inc/drawingml/textparagraphproperties.hxx | 1
oox/source/drawingml/chart/typegroupconverter.cxx | 30 +++++++++++-----------
oox/source/drawingml/shape.cxx | 4 --
reportdesign/source/filter/xml/xmlExport.cxx | 4 --
reportdesign/source/filter/xml/xmlExport.hxx | 14 ++--------
sc/source/core/data/userdat.cxx | 8 ++---
sd/inc/imapinfo.hxx | 6 ++--
sd/source/core/anminfo.cxx | 2 -
svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 2 -
svx/source/dialog/frmsel.cxx | 2 -
svx/source/dialog/imapwnd.hxx | 6 ++--
svx/source/engine3d/float3d.cxx | 2 -
svx/source/engine3d/viewpt3d2.cxx | 2 -
svx/source/sdr/overlay/overlaymanager.cxx | 7 ++---
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 5 ---
svx/source/svdraw/sdrpaintwindow.cxx | 4 +-
svx/source/svdraw/svdobj.cxx | 8 ++---
svx/source/svdraw/svdotext.cxx | 6 ----
svx/source/svdraw/svdotxln.cxx | 2 -
sw/source/filter/ww8/ww8par.cxx | 3 --
sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 2 -
vcl/source/image/ImageList.cxx | 18 +++----------
vcl/source/window/msgbox.cxx | 2 -
vcl/source/window/splitwin.cxx | 4 +-
xmloff/source/chart/SchXMLImport.cxx | 2 -
xmloff/source/draw/shapeimport.cxx | 6 ----
xmloff/source/text/txtparae.cxx | 2 -
48 files changed, 61 insertions(+), 151 deletions(-)
New commits:
commit f17f977d0ad5b4c51a8f58b43901f72de001a56d
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 19 13:06:07 2016 +0200
loplugin:write only fields
Change-Id: I45895e9845a9037da207f001fece427452ed499f
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 3600381..b80374e 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5543,7 +5543,6 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
SvStream* pStData2_,
bool bSkipImages )
:DffPropertyReader( *this ),
- pFormModel( nullptr ),
m_pBLIPInfos( new SvxMSDffBLIPInfos ),
m_xShapeInfosByTxBxComp( new SvxMSDffShapeInfos_ByTxBxComp ),
m_pShapeOrders( new SvxMSDffShapeOrders ),
@@ -5591,7 +5590,6 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const OUString& rBaseURL )
:DffPropertyReader( *this ),
- pFormModel( nullptr ),
m_pBLIPInfos( new SvxMSDffBLIPInfos ),
m_xShapeInfosByTxBxComp( new SvxMSDffShapeInfos_ByTxBxComp ),
m_pShapeOrders( new SvxMSDffShapeOrders ),
@@ -5619,7 +5617,6 @@ SvxMSDffManager::~SvxMSDffManager()
delete pSecPropSet;
delete m_pBLIPInfos;
delete m_pShapeOrders;
- delete pFormModel;
}
void SvxMSDffManager::InitSvxMSDffManager( sal_uInt32 nOffsDgg_, SvStream* pStData_, sal_uInt32 nOleConvFlags )
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index 92b277a..fed255e 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -386,7 +386,6 @@ public:
*/
class MSFILTER_DLLPUBLIC SvxMSDffManager : public DffPropertyReader
{
- FmFormModel* pFormModel;
SvxMSDffBLIPInfos* m_pBLIPInfos;
std::unique_ptr<SvxMSDffShapeInfos_ByTxBxComp> m_xShapeInfosByTxBxComp;
std::unique_ptr<SvxMSDffShapeInfos_ById> m_xShapeInfosById;
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 0c1150a..c0c2510 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -238,7 +238,6 @@ protected:
std::vector< ShapePtr > maChildren; // only used for group shapes
css::awt::Size maChSize; // only used for group shapes
css::awt::Point maChPosition; // only used for group shapes
- bool mbIsChild;
TextBodyPtr mpTextBody;
LinePropertiesPtr mpLinePropertiesPtr;
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index 6c44b44..6f22ef7 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -172,7 +172,6 @@ private:
// Model, Page, View etc. for favourites
FmFormModel* pModel;
VclPtr<VirtualDevice> pVDev;
- E3dView* p3DView;
SfxBindings* pBindings;
Svx3DCtrlItem* pControllerItem;
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 5d7ddbe..ec3c901 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -106,10 +106,10 @@ class SgaIMapInfo : public SdrObjUserData, public SfxListener
ImageMap aImageMap;
public:
- SgaIMapInfo() : SdrObjUserData( IV_IMAPINFO, ID_IMAPINFO, 0 ) {};
+ SgaIMapInfo() : SdrObjUserData( IV_IMAPINFO, ID_IMAPINFO ) {};
SgaIMapInfo( const ImageMap& rImageMap) :
- SdrObjUserData( IV_IMAPINFO, ID_IMAPINFO, 0 ),
+ SdrObjUserData( IV_IMAPINFO, ID_IMAPINFO ),
aImageMap( rImageMap ) {};
virtual ~SgaIMapInfo() {};
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index 08a0f30..f91571e 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -59,7 +59,6 @@ namespace sdr
protected:
// the OutputDevice to work on, set on construction and not to be changed
OutputDevice& mrOutputDevice;
- const SdrModel* mpModel;
// the vector of registered OverlayObjects
OverlayObjectVector maOverlayObjects;
@@ -89,11 +88,11 @@ namespace sdr
// ViewTransformation and evtl. correct mfDiscreteOne
double getDiscreteOne() const;
- OverlayManager(OutputDevice& rOutputDevice, const SdrModel* pModel);
+ OverlayManager(OutputDevice& rOutputDevice);
virtual ~OverlayManager();
public:
- static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice, const SdrModel* pModel);
+ static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice);
// access to current ViewInformation2D; this call checks and evtl. updates ViewInformation2D
const drawinglayer::geometry::ViewInformation2D getCurrentViewInformation2D() const;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index b75a37c..742a7b4 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -187,7 +187,6 @@ class SVX_DLLPUBLIC SdrObjUserData
protected:
sal_uInt32 nInventor;
sal_uInt16 nIdentifier;
- sal_uInt16 nVersion;
private:
void operator=(const SdrObjUserData& rData) = delete;
@@ -195,7 +194,7 @@ private:
bool operator!=(const SdrObjUserData& rData) const = delete;
public:
- SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer);
+ SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId);
SdrObjUserData(const SdrObjUserData& rData);
virtual ~SdrObjUserData();
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 1b5d081..a60629e 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -199,10 +199,6 @@ protected:
// werden kann
SdrOutliner* pEdtOutl;
- // Bei Fontwork muss soviel auf's BoundRect draufgerechnet werden
- // damit es ausreichend gross ist.
- Rectangle* pFormTextBoundRect;
-
// Moegliche Werte fuer eTextKind sind:
// OBJ_TEXT normaler Textrahmen
// OBJ_TEXTEXT Textfortsetzungsrahmen
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index 074def1..f9931b0 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -232,9 +232,8 @@ public:
double nTan; // tan(nShearAngle)
double nSin; // sin(nRotationAngle)
double nCos; // cos(nRotationAngle)
- bool bMirrored; // Horizontally mirrored? (ni)
-public:
- GeoStat(): nRotationAngle(0),nShearAngle(0),nTan(0.0),nSin(0.0),nCos(1.0),bMirrored(false) {}
+
+ GeoStat(): nRotationAngle(0),nShearAngle(0),nTan(0.0),nSin(0.0),nCos(1.0) {}
void RecalcSinCos();
void RecalcTan();
};
diff --git a/include/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx
index 8ad713a..e50f34e 100644
--- a/include/svx/viewpt3d.hxx
+++ b/include/svx/viewpt3d.hxx
@@ -55,8 +55,6 @@ class SVX_DLLPUBLIC Viewport3D
basegfx::B3DPoint aPRP; // Projection Reference Point(View-coordinates)
// up to now only the z-coordinate is considered
double fVPD; // View Plane Distance
- double fNearClipDist; // distance of the near Clipping level
- double fFarClipDist; // distance of the far Clipping level
ProjectionType eProjection; // kind of the projection
AspectMapType eAspectMapping; // flag for the acclimatization of the aspect ratio
diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index 1abea82..2ec9071 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -63,16 +63,6 @@ private:
// Texture Matrices
basegfx::B2DHomMatrix maTexture;
- // Special transformation set for converting Object -> Device
- basegfx::B3DHomMatrix maObjectToDevice;
-
- // Transposed and inversed matrix for vector transformations
- basegfx::B3DHomMatrix maInvTransObjectToEye;
-
- // Transformation for World->View
- basegfx::B3DHomMatrix maMatFromWorldToView;
- basegfx::B3DHomMatrix maInvMatFromWorldToView;
-
// Parameters for ViewportTransformation
basegfx::B3DVector maScale;
basegfx::B3DVector maTranslate;
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index e5c045f..9e180f8 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -85,7 +85,7 @@ private:
class VCL_DLLPUBLIC ImageList
{
public:
- explicit ImageList( sal_uInt16 nInit = 8, sal_uInt16 nGrow = 4 );
+ explicit ImageList();
explicit ImageList( const ResId& rResId );
ImageList( const std::vector<OUString>& rNameVector,
const OUString& rPrefix);
@@ -129,8 +129,6 @@ public:
private:
ImplImageList* mpImplData;
- sal_uInt16 mnInitSize;
- sal_uInt16 mnGrowSize;
SAL_DLLPRIVATE void ImplInit( sal_uInt16 nItems, const Size &rSize );
SAL_DLLPRIVATE sal_uInt16 ImplGetImageId( const OUString& rImageName ) const;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 84fef6f..423b4e0 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -65,7 +65,6 @@ class VCL_DLLPUBLIC PrinterPage
public:
- PrinterPage() : mpMtf( new GDIMetaFile() ) {}
PrinterPage( GDIMetaFile* pMtf ) : mpMtf( pMtf ) {}
~PrinterPage() { delete mpMtf; }
};
diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx
index 068cc35..415a9a0 100644
--- a/include/xmloff/SchXMLImportHelper.hxx
+++ b/include/xmloff/SchXMLImportHelper.hxx
@@ -74,7 +74,6 @@ private:
SvXMLTokenMap* mpChartAttrTokenMap;
SvXMLTokenMap* mpPlotAreaAttrTokenMap;
- SvXMLTokenMap* mpAutoStyleAttrTokenMap;
SvXMLTokenMap* mpCellAttrTokenMap;
SvXMLTokenMap* mpSeriesAttrTokenMap;
SvXMLTokenMap* mpPropMappingAttrTokenMap;
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 85465db..8d59a36 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -286,10 +286,7 @@ class XMLOFF_DLLPUBLIC XMLShapeImportHelper : public salhelper::SimpleReferenceO
SvXMLTokenMap* mp3DPolygonBasedAttrTokenMap;
SvXMLTokenMap* mp3DCubeObjectAttrTokenMap;
SvXMLTokenMap* mp3DSphereObjectAttrTokenMap;
- SvXMLTokenMap* mp3DSceneShapeAttrTokenMap;
SvXMLTokenMap* mp3DLightAttrTokenMap;
- SvXMLTokenMap* mpPathShapeAttrTokenMap;
- SvXMLTokenMap* mpPolygonShapeAttrTokenMap;
const OUString msStartShape;
const OUString msEndShape;
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 3e42ee9..257f650 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -93,7 +93,6 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public XMLStyleExport
/// may be NULL (if no redlines should be exported; e.g. in block mode)
XMLRedlineExport *pRedlineExport;
- std::vector<OUString> *pHeadingStyles;
bool bProgress;
diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx
index b1f94a1..d2bbaa3 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.cxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.cxx
@@ -98,7 +98,7 @@
//LwpObjectFactory* LwpObjectFactory::m_pMgr = NULL;
LwpObjectFactory::LwpObjectFactory(LwpSvStream* pSvStream)
- : m_nNumObjs(0), m_pSvStream(pSvStream)
+ : m_pSvStream(pSvStream)
{
m_IdToObjList.clear();
}
@@ -130,7 +130,6 @@ void LwpObjectFactory::ReadIndex(LwpSvStream* pStrm)
rtl::Reference<LwpObject> LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObjectHeader &objHdr)
{
rtl::Reference<LwpObject> newObj;
- m_nNumObjs++;
SAL_WARN_IF(type>=300, "lwp", "invalid type: " << type);
switch(type)
{
diff --git a/lotuswordpro/source/filter/lwpobjfactory.hxx b/lotuswordpro/source/filter/lwpobjfactory.hxx
index 6d84f5c..ca7258c 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.hxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.hxx
@@ -86,7 +86,6 @@ public:
//For object Factory and object manager
private:
- sal_uInt32 m_nNumObjs;
LwpSvStream* m_pSvStream;
std::vector<LwpObjectID> m_aObjsIDInCreation;
struct hashFunc
diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.cxx b/lotuswordpro/source/filter/xfilter/xfstyle.cxx
index 7619ad8..eb25502 100644
--- a/lotuswordpro/source/filter/xfilter/xfstyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstyle.cxx
@@ -60,7 +60,6 @@
#include "xfstyle.hxx"
XFStyle::XFStyle()
- : m_enumFamily(enumXFStyleUnknown)
{
}
diff --git a/lotuswordpro/source/filter/xfilter/xfstyle.hxx b/lotuswordpro/source/filter/xfilter/xfstyle.hxx
index d84001d..8c3f843 100644
--- a/lotuswordpro/source/filter/xfilter/xfstyle.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfstyle.hxx
@@ -107,7 +107,6 @@ public:
protected:
OUString m_strStyleName;
OUString m_strParentStyleName;
- enumXFStyle m_enumFamily;
};
#endif
diff --git a/oox/inc/drawingml/chart/typegroupconverter.hxx b/oox/inc/drawingml/chart/typegroupconverter.hxx
index 0e71740..694d97f 100644
--- a/oox/inc/drawingml/chart/typegroupconverter.hxx
+++ b/oox/inc/drawingml/chart/typegroupconverter.hxx
@@ -80,8 +80,6 @@ struct TypeGroupInfo
const sal_Char* mpcServiceName; /// Service name of the type.
VarPointMode meVarPointMode; /// Mode for varying point colors.
sal_Int32 mnDefLabelPos; /// Default data label position (API constant).
- bool mbCombinable2d; /// True = types can be combined in one axes set.
- bool mbSupports3d; /// True = 3D type allowed, false = only 2D type.
bool mbPolarCoordSystem; /// True = polar, false = cartesian.
bool mbSeriesIsFrame2d; /// True = 2D type series with area formatting.
bool mbSingleSeriesVis; /// True = only first series visible (e.g. pie charts).
@@ -89,7 +87,6 @@ struct TypeGroupInfo
bool mbSwappedAxesSet; /// True = X axis and Y axis are swapped.
bool mbSupportsStacking; /// True = data points can be stacked on each other.
bool mbReverseSeries; /// True = insert unstacked series in reverse order.
- bool mbTicksBetweenCateg; /// True = X axis ticks between categories.
bool mbPictureOptions; /// True = bitmaps support options from c:pictureOptions.
};
diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx
index 6975c4c..fb9f3cc 100644
--- a/oox/inc/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/drawingml/textparagraphproperties.hxx
@@ -72,7 +72,6 @@ public:
css::uno::Any mnFontSize;
css::uno::Any maStyleName;
css::uno::Any maGraphic;
- boost::optional< float > maFollowFontSize;
};
class TextParagraphProperties
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
index 860364a..a4ddb2c 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -66,24 +66,24 @@ namespace csscd = ::com::sun::star::chart::DataLabelPlacement;
static const TypeGroupInfo spTypeInfos[] =
{
- // type-id type-category service varied-point-color default label pos comb2d supp3d polar area2d 1stvis xcateg swap stack revers betw picopt
- { TYPEID_BAR, TYPECATEGORY_BAR, SERVICE_CHART2_COLUMN, VARPOINTMODE_SINGLE, csscd::OUTSIDE, true, true, false, true, false, true, false, true, false, true, true },
- { TYPEID_HORBAR, TYPECATEGORY_BAR, SERVICE_CHART2_COLUMN, VARPOINTMODE_SINGLE, csscd::OUTSIDE, false, true, false, true, false, true, true, true, false, true, true },
- { TYPEID_LINE, TYPECATEGORY_LINE, SERVICE_CHART2_LINE, VARPOINTMODE_SINGLE, csscd::RIGHT, true, true, false, false, false, true, false, true, false, true, false },
- { TYPEID_AREA, TYPECATEGORY_LINE, SERVICE_CHART2_AREA, VARPOINTMODE_NONE, csscd::CENTER, true, true, false, true, false, true, false, true, true, false, false },
- { TYPEID_STOCK, TYPECATEGORY_LINE, SERVICE_CHART2_CANDLE, VARPOINTMODE_NONE, csscd::RIGHT, true, false, false, false, false, true, false, true, false, true, false },
- { TYPEID_RADARLINE, TYPECATEGORY_RADAR, SERVICE_CHART2_NET, VARPOINTMODE_SINGLE, csscd::TOP, false, false, true, false, false, true, false, false, false, false, false },
- { TYPEID_RADARAREA, TYPECATEGORY_RADAR, SERVICE_CHART2_FILLEDNET, VARPOINTMODE_NONE, csscd::TOP, false, false, true, true, false, true, false, false, true, false, false },
- { TYPEID_PIE, TYPECATEGORY_PIE, SERVICE_CHART2_PIE, VARPOINTMODE_MULTI, csscd::AVOID_OVERLAP, false, true, true, true, true, true, false, false, false, false, false },
- { TYPEID_DOUGHNUT, TYPECATEGORY_PIE, SERVICE_CHART2_PIE, VARPOINTMODE_MULTI, csscd::AVOID_OVERLAP, false, true, true, true, false, true, false, false, false, false, false },
- { TYPEID_OFPIE, TYPECATEGORY_PIE, SERVICE_CHART2_PIE, VARPOINTMODE_MULTI, csscd::AVOID_OVERLAP, false, true, true, true, true, true, false, false, false, false, false },
- { TYPEID_SCATTER, TYPECATEGORY_SCATTER, SERVICE_CHART2_SCATTER, VARPOINTMODE_SINGLE, csscd::RIGHT, true, true, false, false, false, false, false, false, false, false, false },
- { TYPEID_BUBBLE, TYPECATEGORY_SCATTER, SERVICE_CHART2_BUBBLE, VARPOINTMODE_SINGLE, csscd::RIGHT, false, false, false, true, false, false, false, false, false, false, false },
- { TYPEID_SURFACE, TYPECATEGORY_SURFACE, SERVICE_CHART2_SURFACE, VARPOINTMODE_NONE, csscd::RIGHT, false, true, false, true, false, true, false, false, false, false, false }
+ // type-id type-category service varied-point-color default label pos polar area2d 1stvis xcateg swap stack revers picopt
+ { TYPEID_BAR, TYPECATEGORY_BAR, SERVICE_CHART2_COLUMN, VARPOINTMODE_SINGLE, csscd::OUTSIDE, false, true, false, true, false, true, false, true },
+ { TYPEID_HORBAR, TYPECATEGORY_BAR, SERVICE_CHART2_COLUMN, VARPOINTMODE_SINGLE, csscd::OUTSIDE, false, true, false, true, true, true, false, true },
+ { TYPEID_LINE, TYPECATEGORY_LINE, SERVICE_CHART2_LINE, VARPOINTMODE_SINGLE, csscd::RIGHT, false, false, false, true, false, true, false, false },
+ { TYPEID_AREA, TYPECATEGORY_LINE, SERVICE_CHART2_AREA, VARPOINTMODE_NONE, csscd::CENTER, false, true, false, true, false, true, true, false },
+ { TYPEID_STOCK, TYPECATEGORY_LINE, SERVICE_CHART2_CANDLE, VARPOINTMODE_NONE, csscd::RIGHT, false, false, false, true, false, true, false, false },
+ { TYPEID_RADARLINE, TYPECATEGORY_RADAR, SERVICE_CHART2_NET, VARPOINTMODE_SINGLE, csscd::TOP, true, false, false, true, false, false, false, false },
+ { TYPEID_RADARAREA, TYPECATEGORY_RADAR, SERVICE_CHART2_FILLEDNET, VARPOINTMODE_NONE, csscd::TOP, true, true, false, true, false, false, true, false },
+ { TYPEID_PIE, TYPECATEGORY_PIE, SERVICE_CHART2_PIE, VARPOINTMODE_MULTI, csscd::AVOID_OVERLAP, true, true, true, true, false, false, false, false },
+ { TYPEID_DOUGHNUT, TYPECATEGORY_PIE, SERVICE_CHART2_PIE, VARPOINTMODE_MULTI, csscd::AVOID_OVERLAP, true, true, false, true, false, false, false, false },
+ { TYPEID_OFPIE, TYPECATEGORY_PIE, SERVICE_CHART2_PIE, VARPOINTMODE_MULTI, csscd::AVOID_OVERLAP, true, true, true, true, false, false, false, false },
+ { TYPEID_SCATTER, TYPECATEGORY_SCATTER, SERVICE_CHART2_SCATTER, VARPOINTMODE_SINGLE, csscd::RIGHT, false, false, false, false, false, false, false, false },
+ { TYPEID_BUBBLE, TYPECATEGORY_SCATTER, SERVICE_CHART2_BUBBLE, VARPOINTMODE_SINGLE, csscd::RIGHT, false, true, false, false, false, false, false, false },
+ { TYPEID_SURFACE, TYPECATEGORY_SURFACE, SERVICE_CHART2_SURFACE, VARPOINTMODE_NONE, csscd::RIGHT, false, true, false, true, false, false, false, false }
};
static const TypeGroupInfo saUnknownTypeInfo =
- { TYPEID_UNKNOWN, TYPECATEGORY_BAR, SERVICE_CHART2_COLUMN, VARPOINTMODE_SINGLE, csscd::OUTSIDE, true, true, false, true, false, true, false, true, false, true, true };
+ { TYPEID_UNKNOWN, TYPECATEGORY_BAR, SERVICE_CHART2_COLUMN, VARPOINTMODE_SINGLE, csscd::OUTSIDE, false, true, false, true, false, true, false, true };
const TypeGroupInfo& lclGetTypeInfoFromTypeId( TypeId eTypeId )
{
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 128b2a2..71b2f46 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -99,8 +99,7 @@ namespace oox { namespace drawingml {
aProperties[nPos].Value = Any( aPropValue );
Shape::Shape( const sal_Char* pServiceName, bool bDefaultHeight )
-: mbIsChild( false )
-, mpLinePropertiesPtr( new LineProperties )
+: mpLinePropertiesPtr( new LineProperties )
, mpShapeRefLinePropPtr( new LineProperties )
, mpFillPropertiesPtr( new FillProperties )
, mpShapeRefFillPropPtr( new FillProperties )
@@ -130,7 +129,6 @@ Shape::Shape( const sal_Char* pServiceName, bool bDefaultHeight )
Shape::Shape( const ShapePtr& pSourceShape )
: maChildren()
-, mbIsChild( pSourceShape->mbIsChild )
, mpTextBody(pSourceShape->mpTextBody)
, mpLinePropertiesPtr( pSourceShape->mpLinePropertiesPtr )
, mpShapeRefLinePropPtr( pSourceShape->mpShapeRefLinePropPtr )
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 30f9105..6b99aaf 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -490,7 +490,7 @@ void lcl_calculate(const ::std::vector<sal_Int32>& _aPosX,const ::std::vector<sa
if ( nHeight )
for (sal_Int32 i = 0; i < nCountX ; ++i)
{
- _rColumns[j].second[i] = ORptExport::TCell(_aPosX[i+1] - _aPosX[i],nHeight,1,1);
+ _rColumns[j].second[i] = ORptExport::TCell(1,1);
_rColumns[j].second[i].bSet = true;
}
}
@@ -649,8 +649,6 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp)
sal_Int32 nRowSpan = y2 - y1;
aInsert->second[y1].second[x1] =
TCell(
- aElementSize.Width , // -1 why?
- aElementSize.Height, // -1 why?
nColSpan,
nRowSpan,
xReportElement
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 5b24685..9f13b1e 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -64,29 +64,21 @@ class ORptExport : public SvXMLExport
public:
struct TCell
{
- sal_Int32 nWidth;
- sal_Int32 nHeight;
sal_Int32 nColSpan;
sal_Int32 nRowSpan;
Reference<XReportComponent> xElement;
bool bSet;
- TCell( sal_Int32 _nWidth,
- sal_Int32 _nHeight,
- sal_Int32 _nColSpan,
+ TCell( sal_Int32 _nColSpan,
sal_Int32 _nRowSpan,
Reference<XReportComponent> _xElement = Reference<XReportComponent>()) :
- nWidth(_nWidth)
- ,nHeight(_nHeight)
- ,nColSpan(_nColSpan)
+ nColSpan(_nColSpan)
,nRowSpan(_nRowSpan)
,xElement(_xElement)
,bSet(xElement.is())
{}
TCell( ) :
- nWidth(0)
- ,nHeight(0)
- ,nColSpan(1)
+ nColSpan(1)
,nRowSpan(1)
,bSet(true)
{}
diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx
index d856e55..f06d220 100644
--- a/sc/source/core/data/userdat.cxx
+++ b/sc/source/core/data/userdat.cxx
@@ -50,7 +50,7 @@ IMPL_STATIC_LINK_TYPED(
}
ScDrawObjData::ScDrawObjData() :
- SdrObjUserData( SC_DRAWLAYER, SC_UD_OBJDATA, 0 ),
+ SdrObjUserData( SC_DRAWLAYER, SC_UD_OBJDATA ),
maStart( ScAddress::INITIALIZE_INVALID ),
maEnd( ScAddress::INITIALIZE_INVALID ),
meType( DrawingObject )
@@ -63,12 +63,12 @@ ScDrawObjData* ScDrawObjData::Clone( SdrObject* ) const
}
ScIMapInfo::ScIMapInfo() :
- SdrObjUserData( SC_DRAWLAYER, SC_UD_IMAPDATA, 0 )
+ SdrObjUserData( SC_DRAWLAYER, SC_UD_IMAPDATA )
{
}
ScIMapInfo::ScIMapInfo( const ImageMap& rImageMap ) :
- SdrObjUserData( SC_DRAWLAYER, SC_UD_IMAPDATA, 0 ),
+ SdrObjUserData( SC_DRAWLAYER, SC_UD_IMAPDATA ),
aImageMap( rImageMap )
{
}
@@ -89,7 +89,7 @@ SdrObjUserData* ScIMapInfo::Clone( SdrObject* ) const
}
ScMacroInfo::ScMacroInfo() :
- SdrObjUserData( SC_DRAWLAYER, SC_UD_MACRODATA, 0 )
+ SdrObjUserData( SC_DRAWLAYER, SC_UD_MACRODATA )
{
}
diff --git a/sd/inc/imapinfo.hxx b/sd/inc/imapinfo.hxx
index 37319b8..47db00b 100644
--- a/sd/inc/imapinfo.hxx
+++ b/sd/inc/imapinfo.hxx
@@ -32,14 +32,14 @@ class SdIMapInfo : public SdrObjUserData, public SfxListener
public:
SdIMapInfo() :
- SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID, 0 ) {};
+ SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID ) {};
SdIMapInfo( const ImageMap& rImageMap ) :
- SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID, 0 ),
+ SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID ),
aImageMap( rImageMap ) {};
SdIMapInfo( const SdIMapInfo& rIMapInfo ) :
- SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID, 0 ),
+ SdrObjUserData( SdUDInventor, SD_IMAPINFO_ID ),
SfxListener(),
aImageMap( rIMapInfo.aImageMap ) {};
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index c0794a1..b62b0ee 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -34,7 +34,7 @@
using namespace ::com::sun::star;
SdAnimationInfo::SdAnimationInfo(SdrObject& rObject)
- : SdrObjUserData(SdUDInventor, SD_ANIMATIONINFO_ID, 0),
+ : SdrObjUserData(SdUDInventor, SD_ANIMATIONINFO_ID),
mePresObjKind (PRESOBJ_NONE),
meEffect (presentation::AnimationEffect_NONE),
meTextEffect (presentation::AnimationEffect_NONE),
diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
index dcebfce..8257419 100644
--- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx
@@ -63,13 +63,11 @@ namespace sdr
OverlayManagerBuffered(
OutputDevice& rOutputDevice,
- const SdrModel* pModel,
bool bRefreshWithPreRendering = false);
virtual ~OverlayManagerBuffered();
public:
static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice,
- const SdrModel* pModel,
bool bRefreshWithPreRendering = false);
// complete redraw
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 7a67870..3268bb5 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -208,7 +208,7 @@ FrameSelectorImpl::FrameSelectorImpl( FrameSelector& rFrameSel ) :
Resource( SVX_RES( RID_SVXSTR_BORDER_CONTROL ) ),
mrFrameSel( rFrameSel ),
mpVirDev( VclPtr<VirtualDevice>::Create() ),
- maILArrows( 16 ),
+ maILArrows(),
maLeft( FRAMEBORDER_LEFT ),
maRight( FRAMEBORDER_RIGHT ),
maTop( FRAMEBORDER_TOP ),
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 727eda8..9ab5114 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -61,15 +61,15 @@ class IMapUserData : public SdrObjUserData
public:
IMapUserData() :
- SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA, 0 ),
+ SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA ),
mpObj ( ) {}
explicit IMapUserData( const IMapObjectPtr& rIMapObj ) :
- SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA, 0 ),
+ SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA ),
mpObj ( rIMapObj ) {}
IMapUserData( const IMapUserData& rIMapUserData ) :
- SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA, 0 ),
+ SdrObjUserData ( IMapInventor, SVD_IMAP_USERDATA ),
mpObj ( rIMapUserData.mpObj ) {}
virtual ~IMapUserData() { }
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index edaec94..b461bb7 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -92,7 +92,6 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
, eViewType(VIEWTYPE_GEO)
, pModel(nullptr)
, pVDev(nullptr)
- , p3DView(nullptr)
, pBindings(pInBindings)
, pControllerItem(nullptr)
, pConvertTo3DItem(nullptr)
@@ -328,7 +327,6 @@ Svx3DWin::~Svx3DWin()
void Svx3DWin::dispose()
{
- delete p3DView;
pVDev.disposeAndClear();
delete pModel;
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index 743b60d..1096124 100644
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -27,8 +27,6 @@ Viewport3D::Viewport3D() :
aVUV(0, 1, 1),
aPRP(0, 0, 2),
fVPD(-3),
- fNearClipDist (0.0),
- fFarClipDist (0.0),
eProjection(PR_PERSPECTIVE),
eAspectMapping(AS_NO_MAPPING),
aDeviceRect(Point(0,0), Size(-1,-1)),
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index f162c2b..479310f 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -114,10 +114,9 @@ namespace sdr
return mfDiscreteOne;
}
- OverlayManager::OverlayManager(OutputDevice& rOutputDevice, const SdrModel* pModel)
+ OverlayManager::OverlayManager(OutputDevice& rOutputDevice)
: Scheduler(),
mrOutputDevice(rOutputDevice),
- mpModel(pModel),
maOverlayObjects(),
maStripeColorA(Color(COL_BLACK)),
maStripeColorB(Color(COL_WHITE)),
@@ -140,9 +139,9 @@ namespace sdr
}
}
- rtl::Reference<OverlayManager> OverlayManager::create(OutputDevice& rOutputDevice, const SdrModel* pModel)
+ rtl::Reference<OverlayManager> OverlayManager::create(OutputDevice& rOutputDevice)
{
- return rtl::Reference<OverlayManager>(new OverlayManager(rOutputDevice, pModel));
+ return rtl::Reference<OverlayManager>(new OverlayManager(rOutputDevice));
}
const drawinglayer::geometry::ViewInformation2D OverlayManager::getCurrentViewInformation2D() const
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 6b3def9..6fe69de 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -375,9 +375,8 @@ namespace sdr
OverlayManagerBuffered::OverlayManagerBuffered(
OutputDevice& rOutputDevice,
- const SdrModel* pModel,
bool bRefreshWithPreRendering)
- : OverlayManager(rOutputDevice, pModel),
+ : OverlayManager(rOutputDevice),
mpBufferDevice(VclPtr<VirtualDevice>::Create()),
mpOutputBufferDevice(VclPtr<VirtualDevice>::Create()),
mbRefreshWithPreRendering(bRefreshWithPreRendering)
@@ -389,11 +388,9 @@ namespace sdr
rtl::Reference<OverlayManager> OverlayManagerBuffered::create(
OutputDevice& rOutputDevice,
- const SdrModel* pModel,
bool bRefreshWithPreRendering)
{
return rtl::Reference<OverlayManager>(new OverlayManagerBuffered(rOutputDevice,
- pModel,
bRefreshWithPreRendering));
}
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index c18bfa5..21c771e 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -203,7 +203,7 @@ void SdrPaintWindow::impCreateOverlayManager()
// whether that refresh itself will use a 2nd vdev to avoid flickering.
// Also hand over the old OverlayManager if existent; this means to take over
// the registered OverlayObjects from it
- mxOverlayManager = sdr::overlay::OverlayManagerBuffered::create(GetOutputDevice(), GetPaintView().GetModel(), true);
+ mxOverlayManager = sdr::overlay::OverlayManagerBuffered::create(GetOutputDevice(), true);
}
else
{
@@ -211,7 +211,7 @@ void SdrPaintWindow::impCreateOverlayManager()
// take place
// Also hand over the old OverlayManager if existent; this means to take over
// the registered OverlayObjects from it
- mxOverlayManager = sdr::overlay::OverlayManager::create(GetOutputDevice(), GetPaintView().GetModel());
+ mxOverlayManager = sdr::overlay::OverlayManager::create(GetOutputDevice());
}
OSL_ENSURE(mxOverlayManager.is(), "SdrPaintWindow::SdrPaintWindow: Could not allocate an overlayManager (!)");
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 5d2c35b..7e2c4d9 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -157,15 +157,13 @@ SdrObjMacroHitRec::SdrObjMacroHitRec() :
bDown(false) {}
-SdrObjUserData::SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer) :
+SdrObjUserData::SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId) :
nInventor(nInv),
- nIdentifier(nId),
- nVersion(nVer) {}
+ nIdentifier(nId) {}
SdrObjUserData::SdrObjUserData(const SdrObjUserData& rData) :
nInventor(rData.nInventor),
- nIdentifier(rData.nIdentifier),
- nVersion(rData.nVersion) {}
+ nIdentifier(rData.nIdentifier) {}
SdrObjUserData::~SdrObjUserData() {}
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 2c69439..11a535d 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -85,7 +85,6 @@ SdrTextObj::SdrTextObj()
: SdrAttrObj(),
mpText(nullptr),
pEdtOutl(nullptr),
- pFormTextBoundRect(nullptr),
eTextKind(OBJ_TEXT)
{
bTextSizeDirty=false;
@@ -114,7 +113,6 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect)
maRect(rNewRect),
mpText(nullptr),
pEdtOutl(nullptr),
- pFormTextBoundRect(nullptr),
eTextKind(OBJ_TEXT)
{
bTextSizeDirty=false;
@@ -143,7 +141,6 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind)
: SdrAttrObj(),
mpText(nullptr),
pEdtOutl(nullptr),
- pFormTextBoundRect(nullptr),
eTextKind(eNewTextKind)
{
bTextSizeDirty=false;
@@ -172,7 +169,6 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
maRect(rNewRect),
mpText(nullptr),
pEdtOutl(nullptr),
- pFormTextBoundRect(nullptr),
eTextKind(eNewTextKind)
{
bTextSizeDirty=false;
@@ -208,8 +204,6 @@ SdrTextObj::~SdrTextObj()
delete mpText;
- delete pFormTextBoundRect;
-
ImpLinkAbmeldung();
}
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 7374491..6ced8dc 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -101,7 +101,7 @@ void ImpSdrObjTextLink::Closed()
ImpSdrObjTextLinkUserData::ImpSdrObjTextLinkUserData():
- SdrObjUserData(SdrInventor,SDRUSERDATA_OBJTEXTLINK,0),
+ SdrObjUserData(SdrInventor,SDRUSERDATA_OBJTEXTLINK),
aFileDate0( DateTime::EMPTY ),
pLink(nullptr),
eCharSet(RTL_TEXTENCODING_DONTKNOW)
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 2dff4a4..f5872ba 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6428,9 +6428,8 @@ namespace sw
}
SwMacroInfo::SwMacroInfo()
- : SdrObjUserData( SW_DRAWLAYER, SW_UD_IMAPDATA, 0 )
+ : SdrObjUserData( SW_DRAWLAYER, SW_UD_IMAPDATA )
, mnShapeId(-1)
-
{
}
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index 4185326..bb11118 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -77,7 +77,7 @@ WrapPropertyPanel::WrapPropertyPanel(
, nRight(0)
// resources
, aCustomEntry()
- , aWrapIL(6,2)
+ , aWrapIL()
// controller items
, maSwNoWrapControl(FN_FRAME_NOWRAP, *pBindings, *this)
, maSwWrapLeftControl(FN_FRAME_WRAP, *pBindings, *this)
diff --git a/vcl/source/image/ImageList.cxx b/vcl/source/image/ImageList.cxx
index 4c88c99..2263529 100644
--- a/vcl/source/image/ImageList.cxx
+++ b/vcl/source/image/ImageList.cxx
@@ -37,17 +37,13 @@
#include <rtl/strbuf.hxx>
#endif
-ImageList::ImageList( sal_uInt16 nInit, sal_uInt16 nGrow ) :
- mpImplData( nullptr ),
- mnInitSize( nInit ),
- mnGrowSize( nGrow )
+ImageList::ImageList() :
+ mpImplData( nullptr )
{
}
ImageList::ImageList( const ResId& rResId ) :
- mpImplData( nullptr ),
- mnInitSize( 1 ),
- mnGrowSize( 4 )
+ mpImplData( nullptr )
{
SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList( const ResId& rResId )" );
@@ -92,9 +88,7 @@ ImageList::ImageList( const ResId& rResId ) :
ImageList::ImageList( const std::vector< OUString >& rNameVector,
const OUString& rPrefix) :
- mpImplData( nullptr ),
- mnInitSize( 1 ),
- mnGrowSize( 4 )
+ mpImplData( nullptr )
{
SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList(const vector< OUString >& ..." );
@@ -108,9 +102,7 @@ ImageList::ImageList( const std::vector< OUString >& rNameVector,
}
ImageList::ImageList( const ImageList& rImageList ) :
- mpImplData( rImageList.mpImplData ),
- mnInitSize( rImageList.mnInitSize ),
- mnGrowSize( rImageList.mnGrowSize )
+ mpImplData( rImageList.mpImplData )
{
if( mpImplData )
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 600a1a8..7fb7f28 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -41,7 +41,7 @@ static void ImplInitMsgBoxImageList()
if ( !pSVData->maWinData.mpMsgBoxImgList )
{
ResMgr* pResMgr = ImplGetResMgr();
- pSVData->maWinData.mpMsgBoxImgList = new ImageList(4);
+ pSVData->maWinData.mpMsgBoxImgList = new ImageList();
if( pResMgr )
{
Color aNonAlphaMask( 0xC0, 0xC0, 0xC0 );
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 36639b1..5b64482 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -1822,7 +1822,7 @@ void SplitWindow::ImplDrawAutoHide(vcl::RenderContext& rRenderContext, bool bInP
if (pResMgr)
{
Color aNonAlphaMask( 0x00, 0x00, 0xFF );
- pSVData->maCtrlData.mpSplitHPinImgList = new ImageList(4);
+ pSVData->maCtrlData.mpSplitHPinImgList = new ImageList;
pSVData->maCtrlData.mpSplitHPinImgList->InsertFromHorizontalBitmap
( ResId( SV_RESID_BITMAP_SPLITHPIN, *pResMgr ), 4, &aNonAlphaMask );
}
@@ -1834,7 +1834,7 @@ void SplitWindow::ImplDrawAutoHide(vcl::RenderContext& rRenderContext, bool bInP
if (!pSVData->maCtrlData.mpSplitVPinImgList)
{
ResMgr* pResMgr = ImplGetResMgr();
- pSVData->maCtrlData.mpSplitVPinImgList = new ImageList(4);
+ pSVData->maCtrlData.mpSplitVPinImgList = new ImageList;
if (pResMgr)
{
Color aNonAlphaMask( 0x00, 0x00, 0xFF );
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 1190674..443425d 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -94,7 +94,6 @@ SchXMLImportHelper::SchXMLImportHelper() :
mpChartAttrTokenMap( nullptr ),
mpPlotAreaAttrTokenMap( nullptr ),
- mpAutoStyleAttrTokenMap( nullptr ),
mpCellAttrTokenMap( nullptr ),
mpSeriesAttrTokenMap( nullptr ),
mpPropMappingAttrTokenMap( nullptr ),
@@ -113,7 +112,6 @@ SchXMLImportHelper::~SchXMLImportHelper()
delete mpChartAttrTokenMap;
delete mpPlotAreaAttrTokenMap;
- delete mpAutoStyleAttrTokenMap;
delete mpCellAttrTokenMap;
delete mpSeriesAttrTokenMap;
delete mpPropMappingAttrTokenMap;
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 18b7dd9..80d269e 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -122,10 +122,7 @@ XMLShapeImportHelper::XMLShapeImportHelper(
mp3DPolygonBasedAttrTokenMap(nullptr),
mp3DCubeObjectAttrTokenMap(nullptr),
mp3DSphereObjectAttrTokenMap(nullptr),
- mp3DSceneShapeAttrTokenMap(nullptr),
mp3DLightAttrTokenMap(nullptr),
- mpPathShapeAttrTokenMap(nullptr),
- mpPolygonShapeAttrTokenMap(nullptr),
msStartShape("StartShape"),
msEndShape("EndShape"),
msStartGluePointIndex("StartGluePointIndex"),
@@ -198,14 +195,11 @@ XMLShapeImportHelper::~XMLShapeImportHelper()
delete mpGroupShapeElemTokenMap;
delete mpFrameShapeElemTokenMap;
- delete mpPolygonShapeAttrTokenMap;
- delete mpPathShapeAttrTokenMap;
delete mp3DSceneShapeElemTokenMap;
delete mp3DObjectAttrTokenMap;
delete mp3DPolygonBasedAttrTokenMap;
delete mp3DCubeObjectAttrTokenMap;
delete mp3DSphereObjectAttrTokenMap;
- delete mp3DSceneShapeAttrTokenMap;
delete mp3DLightAttrTokenMap;
// Styles or AutoStyles context?
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index a7ece9e..89ca196 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -1170,7 +1170,6 @@ XMLTextParagraphExport::XMLTextParagraphExport(
pSectionExport( nullptr ),
pIndexMarkExport( nullptr ),
pRedlineExport( nullptr ),
- pHeadingStyles( nullptr ),
bProgress( false ),
bBlock( false ),
bOpenRuby( false ),
@@ -1320,7 +1319,6 @@ XMLTextParagraphExport::XMLTextParagraphExport(
XMLTextParagraphExport::~XMLTextParagraphExport()
{
- delete pHeadingStyles;
delete pRedlineExport;
delete pIndexMarkExport;
delete pSectionExport;
More information about the Libreoffice-commits
mailing list