diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-08-22 14:10:55 +0200 |
---|---|---|
committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-08-23 15:38:45 +0200 |
commit | 11f81f2ba98eba4b34d9cc46a962aac2a52e0a0e (patch) | |
tree | 72d971bda7582d7c3a60f8317c8ddc7d2465bc26 /sw | |
parent | 53d0a6deffc425cdc4fc1382cb1cab2072b4f56b (diff) |
drop SwBackgroundDestinationItem wrapper
other call sites just use SfxUInt16Item and overridden Clone does
same as base class.
Change-Id: I50acb4fbb08b3c2fdc4c7605d0ccecac0e9cc209
Reviewed-on: https://gerrit.libreoffice.org/41449
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Tested-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/uibase/inc/uiitems.hxx | 10 | ||||
-rw-r--r-- | sw/source/uibase/shells/tabsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/utlui/uiitems.cxx | 10 |
3 files changed, 2 insertions, 20 deletions
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx index a5ab79c186f4..9975394a6f49 100644 --- a/sw/source/uibase/inc/uiitems.hxx +++ b/sw/source/uibase/inc/uiitems.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_UIITEMS_HXX #include <memory> -#include <svl/intitem.hxx> +#include <svl/poolitem.hxx> #include "swdllapi.h" #include "cmdid.h" #include "pagedesc.hxx" @@ -88,14 +88,6 @@ public: SwNumRule* GetNumRule() { return pRule.get(); } }; -class SwBackgroundDestinationItem : public SfxUInt16Item -{ -public: - SwBackgroundDestinationItem(sal_uInt16 nWhich, sal_uInt16 nValue); - - virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; -}; - class SW_DLLPUBLIC SwPaMItem : public SfxPoolItem { SwPaM* m_pPaM; diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 3e87a38d3035..cd6726ee2b31 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -154,7 +154,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh ) rSet.Put( aULSpace ); const sal_uInt16 nBackgroundDestination = rSh.GetViewOptions()->GetTableDest(); - rSet.Put(SwBackgroundDestinationItem(SID_BACKGRND_DESTINATION, nBackgroundDestination )); + rSet.Put(SfxUInt16Item(SID_BACKGRND_DESTINATION, nBackgroundDestination )); SvxBrushItem aBrush( RES_BACKGROUND ); if(rSh.GetRowBackground(aBrush)) { diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx index 64681613bb91..4b57004cec13 100644 --- a/sw/source/uibase/utlui/uiitems.cxx +++ b/sw/source/uibase/utlui/uiitems.cxx @@ -268,16 +268,6 @@ bool SwUINumRuleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) return true; } -SwBackgroundDestinationItem::SwBackgroundDestinationItem(sal_uInt16 _nWhich, sal_uInt16 nValue) : - SfxUInt16Item(_nWhich, nValue) -{ -} - -SfxPoolItem* SwBackgroundDestinationItem::Clone( SfxItemPool * /*pPool*/ ) const -{ - return new SwBackgroundDestinationItem(Which(), GetValue()); -} - SwPaMItem::SwPaMItem( const sal_uInt16 nId, SwPaM* pPaM ) : SfxPoolItem( nId ), m_pPaM(pPaM) |