inline some use-once fields in cui

Change-Id: Ib2abea6b1f68cf193325d312e67578b2d346e39a

9 files changed, 9 insertions, 27 deletions

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 0faca3c5cd64..12b48faa7566 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -378,7 +378,6 @@ private:
     ChangeType*         m_pnGradientListState;
     ChangeType*         m_pnColorListState;
 
-    XFillStyleItem      m_aXFStyleItem;
     XFillGradientItem   m_aXGradientItem;
     XFillAttrSetItem    m_aXFillAttr;
     SfxItemSet&         m_rXFSet;
@@ -448,7 +447,6 @@ private:
     ChangeType*         m_pnHatchingListState;
     ChangeType*         m_pnColorListState;
 
-    XFillStyleItem      m_aXFStyleItem;
     XFillHatchItem      m_aXHatchItem;
     XFillAttrSetItem    m_aXFillAttr;
     SfxItemSet&         m_rXFSet;
@@ -527,7 +525,6 @@ private:
 
     XBitmapListRef             m_pBitmapList;
     ChangeType*                m_pnBitmapListState;
-    XFillStyleItem             m_aXFStyleItem;
     XFillBitmapItem            m_aXBitmapItem;
 
     double                     m_fObjectWidth;
@@ -603,7 +600,6 @@ private:
     ChangeType*         m_pnPatternListState;
     ChangeType*         m_pnColorListState;
 
-    XFillStyleItem      m_aXFStyleItem;
     XFillBitmapItem     m_aXPatternItem;
     XFillAttrSetItem    m_aXFillAttr;
     SfxItemSet&         m_rXFSet;
@@ -699,7 +695,6 @@ private:
 
     ChangeType*         pnColorListState;
 
-    XFillStyleItem      aXFStyleItem;
     XFillColorItem      aXFillColorItem;
     XFillAttrSetItem    aXFillAttr;
     SfxItemSet&         rXFSet;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 670297f860f4..95fbe6ed9f0c 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -263,8 +263,6 @@ private:
     const SfxItemSet&   rOutAttrs;
     XDash               aDash;
 
-    XLineStyleItem      aXLStyle;
-    XLineWidthItem      aXWidth;
     XLineDashItem       aXDash;
     XLineColorItem      aXColor;
     XLineAttrSetItem    aXLineAttr;
@@ -344,8 +342,6 @@ private:
     const SfxItemSet&   rOutAttrs;
     const SdrObject*    pPolyObj;
 
-    XLineStyleItem      aXLStyle;
-    XLineWidthItem      aXWidth;
     XLineColorItem      aXColor;
     XLineAttrSetItem    aXLineAttr;
     SfxItemSet&         rXLSet;
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index ddf6e0b69c4b..fa2e431f3cf3 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -80,7 +80,6 @@ SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInA
     m_pBitmapList( nullptr ),
 
     m_pnBitmapListState( nullptr ),
-    m_aXFStyleItem( drawing::FillStyle_BITMAP ),
     m_aXBitmapItem( OUString(), Graphic() ),
     m_fObjectWidth(0.0),
     m_fObjectHeight(0.0),
@@ -111,7 +110,7 @@ SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInA
     get(m_pBtnImport, "BTN_IMPORT");
 
     // setting the output device
-    m_rXFSet.Put( m_aXFStyleItem );
+    m_rXFSet.Put( XFillStyleItem(drawing::FillStyle_BITMAP) );
     m_rXFSet.Put( m_aXBitmapItem );
     m_pCtlBitmapPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
 
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 62cf5e8293d3..fdbd86392a1e 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -60,7 +60,6 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
     , rOutAttrs           ( rInAttrs )
     // All the horrific pointers we store and should not
     , pnColorListState( nullptr )
-    , aXFStyleItem( drawing::FillStyle_SOLID )
     , aXFillColorItem( OUString(), Color( COL_BLACK ) )
     , aXFillAttr( rInAttrs.GetPool() )
     , rXFSet( aXFillAttr.GetItemSet() )
@@ -110,7 +109,7 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
     SetExchangeSupport();
 
     // setting the output device
-    rXFSet.Put( aXFStyleItem );
+    rXFSet.Put( XFillStyleItem(drawing::FillStyle_SOLID) );
     rXFSet.Put( aXFillColorItem );
     m_pCtlPreviewOld->SetAttributes( aXFillAttr.GetItemSet() );
     m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index ba3a550cb2af..6d060e4b16ab 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -61,7 +61,6 @@ SvxGradientTabPage::SvxGradientTabPage
     m_pnGradientListState ( nullptr ),
     m_pnColorListState    ( nullptr ),
 
-    m_aXFStyleItem        ( drawing::FillStyle_GRADIENT ),
     m_aXGradientItem      ( OUString(), XGradient( COL_BLACK, COL_WHITE ) ),
     m_aXFillAttr          ( rInAttrs.GetPool() ),
     m_rXFSet              ( m_aXFillAttr.GetItemSet() )
@@ -101,7 +100,7 @@ SvxGradientTabPage::SvxGradientTabPage
     m_pSliderBorder->SetRange(Range(0,100));
 
     // setting the output device
-    m_rXFSet.Put( m_aXFStyleItem );
+    m_rXFSet.Put( XFillStyleItem(drawing::FillStyle_GRADIENT) );
     m_rXFSet.Put( m_aXGradientItem );
     m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
 
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index d9978103e212..33422103baaa 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -61,7 +61,6 @@ SvxHatchTabPage::SvxHatchTabPage
     m_pnHatchingListState ( nullptr ),
     m_pnColorListState    ( nullptr ),
 
-    m_aXFStyleItem        ( drawing::FillStyle_HATCH ),
     m_aXHatchItem         ( OUString(), XHatch() ),
     m_aXFillAttr          ( rInAttrs.GetPool() ),
     m_rXFSet              ( m_aXFillAttr.GetItemSet() )
@@ -106,7 +105,7 @@ SvxHatchTabPage::SvxHatchTabPage
     m_ePoolUnit = pPool->GetMetric( SID_ATTR_FILL_HATCH );
 
     // setting the output device
-    m_rXFSet.Put( m_aXFStyleItem );
+    m_rXFSet.Put( XFillStyleItem(drawing::FillStyle_HATCH) );
     m_rXFSet.Put( m_aXHatchItem );
     m_pCtlPreview->SetAttributes( m_aXFillAttr.GetItemSet() );
     m_pHatchLB->SetSelectHdl( LINK( this, SvxHatchTabPage, ChangeHatchHdl ) );
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 49e2bb8a028e..01bd02642051 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -63,8 +63,6 @@ SvxLineDefTabPage::SvxLineDefTabPage
               , &rInAttrs ),
     rOutAttrs       ( rInAttrs ),
 
-    aXLStyle            ( drawing::LineStyle_DASH ),
-    aXWidth             ( XOUT_WIDTH ),
     aXDash              ( OUString(), XDash( css::drawing::DashStyle_RECT, 3, 7, 2, 40, 15 ) ),
     aXColor             ( OUString(), COL_BLACK ),
     aXLineAttr          ( rInAttrs.GetPool() ),
@@ -117,8 +115,8 @@ SvxLineDefTabPage::SvxLineDefTabPage
     DBG_ASSERT( pPool, "Where is the pool?" );
     ePoolUnit = pPool->GetMetric( SID_ATTR_LINE_WIDTH );
 
-    rXLSet.Put( aXLStyle );
-    rXLSet.Put( aXWidth );
+    rXLSet.Put( XLineStyleItem(drawing::LineStyle_DASH) );
+    rXLSet.Put( XLineWidthItem(XOUT_WIDTH) );
     rXLSet.Put( aXDash );
     rXLSet.Put( aXColor );
 
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 4ac321a6e65c..e3ada8dc504b 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -64,8 +64,6 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
     rOutAttrs           ( rInAttrs ),
     pPolyObj            ( nullptr ),
 
-    aXLStyle            ( css::drawing::LineStyle_SOLID ),
-    aXWidth             ( XOUT_WIDTH ),
     aXColor             ( OUString(), COL_BLACK ),
     aXLineAttr          ( rInAttrs.GetPool() ),
     rXLSet              ( aXLineAttr.GetItemSet() ),
@@ -87,8 +85,8 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
     // this page needs ExchangeSupport
     SetExchangeSupport();
 
-    rXLSet.Put( aXLStyle );
-    rXLSet.Put( aXWidth );
+    rXLSet.Put( XLineStyleItem(css::drawing::LineStyle_SOLID) );
+    rXLSet.Put( XLineWidthItem(XOUT_WIDTH) );
     rXLSet.Put( aXColor );
     rXLSet.Put( XLineStartWidthItem( m_pCtlPreview->GetOutputSize().Height()  / 2 ) );
     rXLSet.Put( XLineEndWidthItem( m_pCtlPreview->GetOutputSize().Height() / 2 ) );
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 95746d9ca8d1..d0f3bd8cdf41 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -93,7 +93,6 @@ SvxPatternTabPage::SvxPatternTabPage(  vcl::Window* pParent, const SfxItemSet& r
 
     m_pnPatternListState  ( nullptr ),
     m_pnColorListState    ( nullptr ),
-    m_aXFStyleItem        ( drawing::FillStyle_BITMAP ),
     m_aXPatternItem       ( OUString(), Graphic() ),
     m_aXFillAttr          ( rInAttrs.GetPool() ),
     m_rXFSet              ( m_aXFillAttr.GetItemSet() )
@@ -119,7 +118,7 @@ SvxPatternTabPage::SvxPatternTabPage(  vcl::Window* pParent, const SfxItemSet& r
     SetExchangeSupport();
 
     // setting the output device
-    m_rXFSet.Put( m_aXFStyleItem );
+    m_rXFSet.Put( XFillStyleItem(drawing::FillStyle_BITMAP) );
     m_rXFSet.Put( m_aXPatternItem );
 
     m_pBtnAdd->SetClickHdl( LINK( this, SvxPatternTabPage, ClickAddHdl_Impl ) );