summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-12-11 20:57:45 +0000
committerCaolán McNamara <caolanm@redhat.com>2019-12-12 21:12:10 +0100
commit2431477337f4ac4384ba615f76bfb5904f1a3b47 (patch)
tree6f676441983e9b3c8440600d09a49478353e1faf /sd/source
parent23cfd3d1004f5ddda8cd79878c00b6c64f20068c (diff)
use covariant return type for SfxPoolItem::Clone
and can then remove some casting Change-Id: Id821c32ca2cbcdb7f57ef7a5fa1960042e630ffc Reviewed-on: https://gerrit.libreoffice.org/85022 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/ui/app/optsitem.cxx8
-rw-r--r--sd/source/ui/docshell/docshel3.cxx4
-rw-r--r--sd/source/ui/inc/optsitem.hxx8
-rw-r--r--sd/source/ui/sidebar/SlideBackground.cxx2
-rw-r--r--sd/source/ui/table/TableDesignPane.cxx2
-rw-r--r--sd/source/ui/view/drtxtob1.cxx6
6 files changed, 15 insertions, 15 deletions
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index d75f0c2cd56f..b247a7e02a72 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -309,7 +309,7 @@ SdOptionsLayoutItem::SdOptionsLayoutItem( SdOptions const * pOpts, ::sd::FrameVi
}
}
-SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const
+SdOptionsLayoutItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const
{
return new SdOptionsLayoutItem( *this );
}
@@ -680,7 +680,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( SdOptions const * pOpts, ::sd::FrameView c
}
}
-SfxPoolItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const
+SdOptionsMiscItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const
{
return new SdOptionsMiscItem( *this );
}
@@ -865,7 +865,7 @@ SdOptionsSnapItem::SdOptionsSnapItem( SdOptions const * pOpts, ::sd::FrameView c
}
}
-SfxPoolItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const
+SdOptionsSnapItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const
{
return new SdOptionsSnapItem( *this );
}
@@ -1318,7 +1318,7 @@ SdOptionsPrintItem::SdOptionsPrintItem( SdOptions const * pOpts )
maOptionsPrint.SetOutputQuality( pOpts->GetOutputQuality() );
}
-SfxPoolItem* SdOptionsPrintItem::Clone( SfxItemPool* ) const
+SdOptionsPrintItem* SdOptionsPrintItem::Clone( SfxItemPool* ) const
{
return new SdOptionsPrintItem( *this );
}
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx
index 54791875a733..e9d67b7a6976 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -148,7 +148,7 @@ void DrawDocShell::Execute( SfxRequest& rReq )
{
const SvxSearchItem & rSearchItem = pReqArgs->Get(SID_SEARCH_ITEM);
- SD_MOD()->SetSearchItem(std::unique_ptr<SvxSearchItem>(static_cast<SvxSearchItem*>(rSearchItem.Clone())));
+ SD_MOD()->SetSearchItem(std::unique_ptr<SvxSearchItem>(rSearchItem.Clone()));
}
rReq.Done();
@@ -211,7 +211,7 @@ void DrawDocShell::Execute( SfxRequest& rReq )
{
const SvxSearchItem& rSearchItem = pReqArgs->Get(SID_SEARCH_ITEM);
- SD_MOD()->SetSearchItem(std::unique_ptr<SvxSearchItem>(static_cast<SvxSearchItem*>( rSearchItem.Clone() )));
+ SD_MOD()->SetSearchItem(std::unique_ptr<SvxSearchItem>(rSearchItem.Clone()));
xFuSearch->SearchAndReplace(&rSearchItem);
}
}
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index c532c39571c2..db73144bad1d 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -152,7 +152,7 @@ public:
explicit SdOptionsLayoutItem();
SdOptionsLayoutItem( SdOptions const * pOpts, ::sd::FrameView const * pView );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
+ virtual SdOptionsLayoutItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
void SetOptions( SdOptions* pOpts ) const;
@@ -317,7 +317,7 @@ public:
explicit SdOptionsMiscItem();
SdOptionsMiscItem( SdOptions const * pOpts, ::sd::FrameView const * pView );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
+ virtual SdOptionsMiscItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
void SetOptions( SdOptions* pOpts ) const;
@@ -385,7 +385,7 @@ public:
explicit SdOptionsSnapItem();
SdOptionsSnapItem( SdOptions const * pOpts, ::sd::FrameView const * pView );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
+ virtual SdOptionsSnapItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
void SetOptions( SdOptions* pOpts ) const;
@@ -553,7 +553,7 @@ public:
explicit SdOptionsPrintItem();
explicit SdOptionsPrintItem( SdOptions const * pOpts );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
+ virtual SdOptionsPrintItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
void SetOptions( SdOptions* pOpts ) const;
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 7a43a4c63161..67f43fb7157f 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -911,7 +911,7 @@ void SlideBackground::NotifyItemUpdate(
pPageItem = dynamic_cast<const SvxPageItem*>(pState);
if (pPageItem)
{
- mpPageItem.reset(static_cast<SvxPageItem*>(pPageItem->Clone()));
+ mpPageItem.reset(pPageItem->Clone());
bool bIsLandscape = mpPageItem->IsLandscape();
mpPaperOrientation->SelectEntryPos( bIsLandscape ? 0 : 1 );
}
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index bea6a35797f3..0c482885de2d 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -455,7 +455,7 @@ CellInfo::CellInfo( const Reference< XStyle >& xStyle )
// get border
const SvxBoxItem* pBoxItem = rSet.GetItem( SDRATTR_TABLE_BORDER );
if( pBoxItem )
- maBorder.reset(static_cast<SvxBoxItem*>(pBoxItem->Clone()));
+ maBorder.reset(pBoxItem->Clone());
}
typedef std::vector< std::shared_ptr< CellInfo > > CellInfoVector;
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 0b06a88c267b..65a357e33563 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -186,7 +186,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( nPara ) );
aAttr.Put( aTmpSet, false );
const SvxLRSpaceItem& rItem = aAttr.Get( EE_PARA_LRSPACE );
- std::unique_ptr<SvxLRSpaceItem> pNewItem(static_cast<SvxLRSpaceItem*>(rItem.Clone()));
+ std::unique_ptr<SvxLRSpaceItem> pNewItem(rItem.Clone());
long nLeft = pNewItem->GetLeft();
if( nSlot == SID_INC_INDENT )
@@ -239,7 +239,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
SfxItemSet aTmpSet( pOLV->GetOutliner()->GetParaAttribs( nPara ) );
aAttr.Put( aTmpSet, false ); // sal_False= InvalidItems is not default, handle it as "holes"
const SvxULSpaceItem& rItem = aAttr.Get( EE_PARA_ULSPACE );
- std::unique_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>(rItem.Clone()));
+ std::unique_ptr<SvxULSpaceItem> pNewItem(rItem.Clone());
long nUpper = pNewItem->GetUpper();
if( nSlot == SID_PARASPACE_INCREASE )
@@ -280,7 +280,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
SfxItemSet aNewAttrs(*(aEditAttr.GetPool()), aEditAttr.GetRanges());
const SvxULSpaceItem& rItem = aEditAttr.Get( EE_PARA_ULSPACE );
- std::unique_ptr<SvxULSpaceItem> pNewItem(static_cast<SvxULSpaceItem*>( rItem.Clone() ));
+ std::unique_ptr<SvxULSpaceItem> pNewItem(rItem.Clone());
long nUpper = pNewItem->GetUpper();
if( nSlot == SID_PARASPACE_INCREASE )