summaryrefslogtreecommitdiff
path: root/cui/source/tabpages
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-06-26 16:01:26 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-06-26 16:03:05 +0200
commitce5711267c09a8c85decbd2ad043149d584f8fe7 (patch)
treedd3ecb89d183729e227616840bfdfbff8f7cc499 /cui/source/tabpages
parent14d988583a2f2d2b300e4804faa426f8a694b2e2 (diff)
-fsanitize=vptr: wrong, unnecessary downcasts
(and the pXPool members are not even necessary) Change-Id: I321f06387ca1f1e98d8f731ec2b070212c82c28a
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r--cui/source/tabpages/tparea.cxx6
-rw-r--r--cui/source/tabpages/tpbitmap.cxx3
-rw-r--r--cui/source/tabpages/tpgradnt.cxx3
-rw-r--r--cui/source/tabpages/tphatch.cxx3
-rw-r--r--cui/source/tabpages/tpline.cxx3
-rw-r--r--cui/source/tabpages/tplnedef.cxx3
-rw-r--r--cui/source/tabpages/tplneend.cxx3
-rw-r--r--cui/source/tabpages/tpshadow.cxx3
8 files changed, 9 insertions, 18 deletions
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index ae3f3f34cd32..538c4612b0c0 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 71c23e614918..8c3427d8d335 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 380f36a625ea..d0c1241272ba 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 0060b36d848e..5b2871221f2a 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 e0440c7caf45..01940a7b591a 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 38a7c7f246be..07b904d9f34c 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 478ab46c529b..dbd90637fe64 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 10c0d0cf8aba..08a4d3cd8bf0 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");