cui/source/inc/cuitabarea.hxx | 6 ------
cui/source/inc/cuitabline.hxx | 3 ---
cui/source/tabpages/tparea.cxx | 6 ++----
cui/source/tabpages/tpbitmap.cxx | 3 +--
cui/source/tabpages/tpgradnt.cxx | 3 +--
cui/source/tabpages/tphatch.cxx | 3 +--
cui/source/tabpages/tpline.cxx | 3 +--
cui/source/tabpages/tplnedef.cxx | 3 +--
cui/source/tabpages/tplneend.cxx | 3 +--
cui/source/tabpages/tpshadow.cxx | 3 +--
10 files changed, 9 insertions(+), 27 deletions(-)
New commits:
commit ce5711267c09a8c85decbd2ad043149d584f8fe7
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Jun 26 16:01:26 2015 +0200
-fsanitize=vptr: wrong, unnecessary downcasts
(and the pXPool members are not even necessary)
Change-Id: I321f06387ca1f1e98d8f731ec2b070212c82c28a
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index a25966a..4b00e3e 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -140,7 +140,6 @@ class SvxTransparenceTabPage : public SvxTabPage
VclPtr<SvxXRectPreview> m_pCtlXRectPreview;
bool bBitmap;
- XOutdevItemPool* pXPool;
XFillAttrSetItem aXFillAttr;
SfxItemSet& rXFSet;
@@ -253,7 +252,6 @@ private:
bool* pbAreaTP;
- XOutdevItemPool* pXPool;
XFillAttrSetItem aXFillAttr;
SfxItemSet& rXFSet;
@@ -348,7 +346,6 @@ private:
bool bDisable;
- XOutdevItemPool* pXPool;
XFillAttrSetItem aXFillAttr;
SfxItemSet& rXFSet;
SfxMapUnit ePoolUnit;
@@ -420,7 +417,6 @@ private:
sal_Int32* pPos;
bool* pbAreaTP;
- XOutdevItemPool* pXPool;
XFillStyleItem aXFStyleItem;
XFillGradientItem aXGradientItem;
XFillAttrSetItem aXFillAttr;
@@ -497,7 +493,6 @@ private:
sal_Int32* pPos;
bool* pbAreaTP;
- XOutdevItemPool* pXPool;
XFillStyleItem aXFStyleItem;
XFillHatchItem aXHatchItem;
XFillAttrSetItem aXFillAttr;
@@ -584,7 +579,6 @@ private:
bool bBmpChanged;
- XOutdevItemPool* pXPool;
XFillStyleItem aXFStyleItem;
XFillBitmapItem aXBitmapItem;
XFillAttrSetItem aXFillAttr;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 678042b..d659409 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -150,7 +150,6 @@ private:
RECT_POINT eRP;
bool bObjSelected;
- XOutdevItemPool* pXPool;
XLineStyleItem aXLStyle;
XLineWidthItem aXWidth;
XLineDashItem aXDash;
@@ -267,7 +266,6 @@ private:
XDash aDash;
bool bObjSelected;
- XOutdevItemPool* pXPool;
XLineStyleItem aXLStyle;
XLineWidthItem aXWidth;
XLineDashItem aXDash;
@@ -349,7 +347,6 @@ private:
const SdrObject* pPolyObj;
bool bObjSelected;
- XOutdevItemPool* pXPool;
XLineStyleItem aXLStyle;
XLineWidthItem aXWidth;
XLineColorItem aXColor;
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index ae3f3f3..538c4612 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -258,8 +258,7 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window*
pParent, const SfxIt
nPageType (0),
nDlgType (0),
bBitmap ( false ),
- pXPool ( static_cast<XOutdevItemPool*>(rInAttrs.GetPool()) ),
- aXFillAttr ( pXPool ),
+ aXFillAttr ( rInAttrs.GetPool() ),
rXFSet ( aXFillAttr.GetItemSet() )
{
get(m_pRbtTransOff,"RBT_TRANS_OFF");
@@ -624,8 +623,7 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const
SfxItemSet& rInAttrs
// init with pointer to fixed bool
pbAreaTP(&maFixed_sal_Bool),
- pXPool ( static_cast<XOutdevItemPool*>( rInAttrs.GetPool() )
),
- aXFillAttr ( pXPool ),
+ aXFillAttr ( rInAttrs.GetPool() ),
rXFSet ( aXFillAttr.GetItemSet() ),
ePoolUnit(SFX_MAPUNIT_100TH_MM),
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 71c23e6..8c3427d 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -67,10 +67,9 @@ SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent,
const SfxItemSet& rIn
bBmpChanged ( false ),
- pXPool ( static_cast<XOutdevItemPool*>( rInAttrs.GetPool() )),
aXFStyleItem ( drawing::FillStyle_BITMAP ),
aXBitmapItem ( OUString(), Graphic() ),
- aXFillAttr ( pXPool ),
+ aXFillAttr ( rInAttrs.GetPool() ),
rXFSet ( aXFillAttr.GetItemSet() )
{
get(m_pBxPixelEditor,"maingrid");
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 380f36a..d0c1241 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -60,10 +60,9 @@ SvxGradientTabPage::SvxGradientTabPage
pPos ( 0 ),
pbAreaTP ( 0 ),
- pXPool ( static_cast<XOutdevItemPool*>( rInAttrs.GetPool() )),
aXFStyleItem ( drawing::FillStyle_GRADIENT ),
aXGradientItem ( OUString(), XGradient( COL_BLACK, COL_WHITE ) ),
- aXFillAttr ( pXPool ),
+ aXFillAttr ( rInAttrs.GetPool() ),
rXFSet ( aXFillAttr.GetItemSet() )
{
get(m_pLbGradientType, "gradienttypelb");
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 0060b36..5b28712 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -63,10 +63,9 @@ SvxHatchTabPage::SvxHatchTabPage
pPos ( 0 ),
pbAreaTP ( 0 ),
- pXPool ( static_cast<XOutdevItemPool*>(rInAttrs.GetPool()) ),
aXFStyleItem ( drawing::FillStyle_HATCH ),
aXHatchItem ( OUString(), XHatch() ),
- aXFillAttr ( pXPool ),
+ aXFillAttr ( rInAttrs.GetPool() ),
rXFSet ( aXFillAttr.GetItemSet() )
{
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index e0440c7..01940a7 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -99,12 +99,11 @@ SvxLineTabPage::SvxLineTabPage
eRP( RP_LT ),
bObjSelected( false ),
- pXPool ( static_cast<XOutdevItemPool*>(rInAttrs.GetPool()) ),
aXLStyle ( drawing::LineStyle_DASH ),
aXWidth ( 1 ),
aXDash ( OUString(), XDash( css::drawing::DashStyle_RECT, 3,
7, 2, 40, 15 ) ),
aXColor ( OUString(), COL_LIGHTRED ),
- aXLineAttr ( pXPool ),
+ aXLineAttr ( rInAttrs.GetPool() ),
rXLSet ( aXLineAttr.GetItemSet() ),
pnLineEndListState( 0 ),
pnDashListState( 0 ),
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 38a7c7f..07b904d 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -62,12 +62,11 @@ SvxLineDefTabPage::SvxLineDefTabPage
rOutAttrs ( rInAttrs ),
bObjSelected ( false ),
- pXPool ( static_cast<XOutdevItemPool*>(rInAttrs.GetPool()) ),
aXLStyle ( drawing::LineStyle_DASH ),
aXWidth ( XOUT_WIDTH ),
aXDash ( OUString(), XDash( css::drawing::DashStyle_RECT, 3,
7, 2, 40, 15 ) ),
aXColor ( OUString(), COL_BLACK ),
- aXLineAttr ( pXPool ),
+ aXLineAttr ( rInAttrs.GetPool() ),
rXLSet ( aXLineAttr.GetItemSet() ),
pnDashListState(0),
pPageType(0),
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 478ab46..dbd9063 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -62,11 +62,10 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
pPolyObj ( NULL ),
bObjSelected ( false ),
- pXPool ( static_cast<XOutdevItemPool*>(rInAttrs.GetPool()) ),
aXLStyle ( com::sun::star::drawing::LineStyle_SOLID ),
aXWidth ( XOUT_WIDTH ),
aXColor ( OUString(), COL_BLACK ),
- aXLineAttr ( pXPool ),
+ aXLineAttr ( rInAttrs.GetPool() ),
rXLSet ( aXLineAttr.GetItemSet() ),
pLineEndList ( NULL ),
pnLineEndListState ( NULL ),
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 10c0d0c..08a4d3c 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -58,8 +58,7 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent,
const SfxItemSet& rInA
nDlgType ( 0 ),
pbAreaTP ( 0 ),
bDisable ( false ),
- pXPool ( static_cast<XOutdevItemPool*>(rInAttrs.GetPool()) ),
- aXFillAttr ( pXPool ),
+ aXFillAttr ( rInAttrs.GetPool() ),
rXFSet ( aXFillAttr.GetItemSet() )
{
get(m_pTsbShowShadow,"TSB_SHOW_SHADOW");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
