ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

use covariant return type for SfxPoolItem::Clone

Browse Source 
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>
This commit is contained in:
Caolán McNamara
2019-12-12 21:12:10 +01:00
parent 23cfd3d100
commit 2431477337
437 changed files with 988 additions and 1188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
avmedia/source/framework/mediaitem.cxx
+1 -1
View File
@@ -113,7 +113,7 @@ bool MediaItem::operator==( const SfxPoolItem& rItem ) const
&& m_pImpl->m_eZoom == rOther.m_pImpl->m_eZoom;
}
SfxPoolItem* MediaItem::Clone( SfxItemPool* ) const
MediaItem* MediaItem::Clone( SfxItemPool* ) const
{
return new MediaItem( *this );
}
basctl/source/basicide/basides1.cxx
+2 -2
View File
@@ -83,7 +83,7 @@ void Shell::ExecuteSearch( SfxRequest& rReq )
case SID_SEARCH_OPTIONS:
break;
case SID_SEARCH_ITEM:
mpSearchItem.reset( static_cast<SvxSearchItem*>( pArgs->Get(SID_SEARCH_ITEM).Clone() ));
mpSearchItem.reset(pArgs->Get(SID_SEARCH_ITEM).Clone());
break;
case FID_SEARCH_ON:
mbJustOpened = true;
@@ -106,7 +106,7 @@ void Shell::ExecuteSearch( SfxRequest& rReq )
// Get SearchItem from request if it is the first searching
if ( pArgs )
{
mpSearchItem.reset( static_cast<SvxSearchItem*>( pArgs->Get( SID_SEARCH_ITEM ).Clone() ));
mpSearchItem.reset(pArgs->Get(SID_SEARCH_ITEM).Clone());
}
}
basctl/source/basicide/sbxitem.cxx
+1 -1
View File
@@ -53,7 +53,7 @@ SbxItem::SbxItem (
m_eType(eType)
{ }
SfxPoolItem *SbxItem::Clone(SfxItemPool*) const
SbxItem* SbxItem::Clone(SfxItemPool*) const
{
return new SbxItem(*this);
}
basctl/source/inc/sbxitem.hxx
+1 -1
View File
@@ -48,7 +48,7 @@ public:
SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, ItemType);
SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, const OUString& aMethodName, ItemType eType);
virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override;
virtual SbxItem* Clone(SfxItemPool *pPool = nullptr) const override;
virtual bool operator==(const SfxPoolItem&) const override;
ScriptDocument const& GetDocument () const { return m_aDocument; }
cui/source/options/cfgchart.cxx
+1 -1
View File
@@ -264,7 +264,7 @@ SvxChartColorTableItem::SvxChartColorTableItem( sal_uInt16 nWhich_, const SvxCha
{
}
SfxPoolItem* SvxChartColorTableItem::Clone( SfxItemPool * ) const
SvxChartColorTableItem* SvxChartColorTableItem::Clone( SfxItemPool * ) const
{
return new SvxChartColorTableItem( *this );
}
cui/source/options/cfgchart.hxx
+1 -1
View File
@@ -89,7 +89,7 @@ class SvxChartColorTableItem : public SfxPoolItem
public:
SvxChartColorTableItem( sal_uInt16 nWhich, const SvxChartColorTable& );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxChartColorTableItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
const SvxChartColorTable & GetColorList() const { return m_aColorTable;}
cui/source/options/connpoolsettings.cxx
+1 -2
View File
@@ -70,8 +70,7 @@ namespace offapp
return true;
}
SfxPoolItem* DriverPoolingSettingsItem::Clone( SfxItemPool * ) const
DriverPoolingSettingsItem* DriverPoolingSettingsItem::Clone( SfxItemPool * ) const
{
return new DriverPoolingSettingsItem(*this);
}
cui/source/options/connpoolsettings.hxx
+1 -1
View File
@@ -76,7 +76,7 @@ namespace offapp
DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings );
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual DriverPoolingSettingsItem* Clone( SfxItemPool *pPool = nullptr ) const override;
const DriverPoolingSettings& getSettings() const { return m_aSettings; }
};
cui/source/options/dbregistersettings.cxx
+1 -6
View File
@@ -25,14 +25,12 @@
namespace svx
{
DatabaseMapItem::DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations )
:SfxPoolItem( _nId )
,m_aRegistrations( _rRegistrations )
{
}
bool DatabaseMapItem::operator==( const SfxPoolItem& _rCompare ) const
{
if (!SfxPoolItem::operator==(_rCompare))
@@ -47,14 +45,11 @@ namespace svx
return m_aRegistrations == pItem->m_aRegistrations;
}
SfxPoolItem* DatabaseMapItem::Clone( SfxItemPool* ) const
DatabaseMapItem* DatabaseMapItem::Clone( SfxItemPool* ) const
{
return new DatabaseMapItem( *this );
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/options/dbregistersettings.hxx
+1 -1
View File
@@ -68,7 +68,7 @@ namespace svx
DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations );
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual DatabaseMapItem* Clone( SfxItemPool *pPool = nullptr ) const override;
const DatabaseRegistrations&
getRegistrations() const { return m_aRegistrations; }
cui/source/tabpages/align.cxx
+6 -6
View File
@@ -216,7 +216,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
const SfxUInt16Item* pIndentItem = static_cast<const SfxUInt16Item*>(GetOldItem(
*rSet, SID_ATTR_ALIGN_INDENT));
assert(pIndentItem);
std::unique_ptr<SfxUInt16Item> pNewIndentItem(static_cast<SfxUInt16Item*>(pIndentItem->Clone()));
std::unique_ptr<SfxUInt16Item> pNewIndentItem(pIndentItem->Clone());
pNewIndentItem->SetValue(m_xEdIndent->get_value(FieldUnit::TWIP));
rSet->Put(*pNewIndentItem);
bChanged = true;
@@ -259,7 +259,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
const SdrAngleItem* pAngleItem = static_cast<const SdrAngleItem*>(GetOldItem(
*rSet, SID_ATTR_ALIGN_DEGREES));
assert(pAngleItem);
std::unique_ptr<SdrAngleItem> pNewAngleItem(static_cast<SdrAngleItem*>(pAngleItem->Clone()));
std::unique_ptr<SdrAngleItem> pNewAngleItem(pAngleItem->Clone());
pNewAngleItem->SetValue(m_aCtrlDial.GetRotation());
rSet->Put(*pNewAngleItem);
bChanged = true;
@@ -296,7 +296,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
const SfxBoolItem* pStackItem = static_cast<const SfxBoolItem*>(GetOldItem(
*rSet, SID_ATTR_ALIGN_STACKED));
assert(pStackItem);
std::unique_ptr<SfxBoolItem> pNewStackItem(static_cast<SfxBoolItem*>(pStackItem->Clone()));
std::unique_ptr<SfxBoolItem> pNewStackItem(pStackItem->Clone());
pNewStackItem->SetValue(m_xCbStacked->get_active());
rSet->Put(*pNewStackItem);
bChanged = true;
@@ -319,7 +319,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
const SfxBoolItem* pWrapItem = static_cast<const SfxBoolItem*>(GetOldItem(
*rSet, SID_ATTR_ALIGN_LINEBREAK));
assert(pWrapItem);
std::unique_ptr<SfxBoolItem> pNewWrapItem(static_cast<SfxBoolItem*>(pWrapItem->Clone()));
std::unique_ptr<SfxBoolItem> pNewWrapItem(pWrapItem->Clone());
pNewWrapItem->SetValue(m_xBtnWrap->get_active());
rSet->Put(*pNewWrapItem);
bChanged = true;
@@ -333,7 +333,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
const SfxBoolItem* pHyphItem = static_cast<const SfxBoolItem*>(GetOldItem(
*rSet, SID_ATTR_ALIGN_HYPHENATION));
assert(pHyphItem);
std::unique_ptr<SfxBoolItem> pNewHyphItem(static_cast<SfxBoolItem*>(pHyphItem->Clone()));
std::unique_ptr<SfxBoolItem> pNewHyphItem(pHyphItem->Clone());
pNewHyphItem->SetValue(m_xBtnHyphen->get_active());
rSet->Put(*pNewHyphItem);
bChanged = true;
@@ -347,7 +347,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
const SfxBoolItem* pShrinkItem = static_cast<const SfxBoolItem*>(GetOldItem(
*rSet, SID_ATTR_ALIGN_SHRINKTOFIT));
assert(pShrinkItem);
std::unique_ptr<SfxBoolItem> pNewShrinkItem(static_cast<SfxBoolItem*>(pShrinkItem->Clone()));
std::unique_ptr<SfxBoolItem> pNewShrinkItem(pShrinkItem->Clone());
pNewShrinkItem->SetValue(m_xBtnShrink->get_active());
rSet->Put(*pNewShrinkItem);
bChanged = true;
cui/source/tabpages/numfmt.cxx
+1 -1
View File
@@ -1728,7 +1728,7 @@ void SvxNumberFormatTabPage::PageCreated(const SfxAllItemSet& aSet)
{
const SvxNumberInfoItem* pNumberInfoItem = aSet.GetItem<SvxNumberInfoItem>(SID_ATTR_NUMBERFORMAT_INFO, false);
if (pNumberInfoItem && !pNumItem)
pNumItem.reset( static_cast<SvxNumberInfoItem*>(pNumberInfoItem->Clone()) );
pNumItem.reset(pNumberInfoItem->Clone());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/tabpages/page.cxx
+1 -1
View File
@@ -752,7 +752,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet )
(m_xRegisterCB->get_active() || m_xRegisterCB->get_state_changed_from_saved()))
{
const SfxBoolItem& rRegItem = static_cast<const SfxBoolItem&>(rOldSet.Get(SID_SWREGISTER_MODE));
std::unique_ptr<SfxBoolItem> pRegItem(static_cast<SfxBoolItem*>(rRegItem.Clone()));
std::unique_ptr<SfxBoolItem> pRegItem(rRegItem.Clone());
bool bCheck = m_xRegisterCB->get_active();
pRegItem->SetValue(bCheck);
rSet->Put(std::move(pRegItem));
cui/source/tabpages/paragrph.cxx
+1 -1
View File
@@ -400,7 +400,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
*rOutSet, SID_ATTR_PARA_REGISTER));
if (!pBoolItem)
return bModified;
std::unique_ptr<SfxBoolItem> pRegItem(static_cast<SfxBoolItem*>(pBoolItem->Clone()));
std::unique_ptr<SfxBoolItem> pRegItem(pBoolItem->Clone());
sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_REGISTER );
bool bSet = pRegItem->GetValue();
cui/source/tabpages/tabstpge.cxx
+1 -1
View File
@@ -183,7 +183,7 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet)
aNewTabs->Insert(aNull);
}
std::unique_ptr<SvxTabStopItem> aTmp(static_cast<SvxTabStopItem*>(aNewTabs->Clone()));
std::unique_ptr<SvxTabStopItem> aTmp(aNewTabs->Clone());
aTmp->Remove(0, aTmp->Count());
for (sal_uInt16 i = 0; i < aNewTabs->Count(); ++i)
dbaccess/source/ui/dlg/DbAdminImpl.cxx
+1 -1
View File
@@ -1071,7 +1071,7 @@ bool DbuTypeCollectionItem::operator==(const SfxPoolItem& _rItem) const
static_cast<const DbuTypeCollectionItem&>( _rItem ).getCollection() == getCollection();
}
SfxPoolItem* DbuTypeCollectionItem::Clone(SfxItemPool* /*_pPool*/) const
DbuTypeCollectionItem* DbuTypeCollectionItem::Clone(SfxItemPool* /*_pPool*/) const
{
return new DbuTypeCollectionItem(*this);
}
dbaccess/source/ui/dlg/dsnItem.hxx
+1 -1
View File
@@ -40,7 +40,7 @@ namespace dbaui
DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource);
virtual bool operator==(const SfxPoolItem& _rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* _pPool = nullptr) const override;
virtual DbuTypeCollectionItem* Clone(SfxItemPool* _pPool = nullptr) const override;
::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; }
};
dbaccess/source/ui/dlg/optionalboolitem.cxx
+1 -1
View File
@@ -35,7 +35,7 @@ namespace dbaui
static_cast<const OptionalBoolItem&>( _rItem ).m_aValue == m_aValue;
}
SfxPoolItem* OptionalBoolItem::Clone( SfxItemPool* /*_pPool*/ ) const
OptionalBoolItem* OptionalBoolItem::Clone( SfxItemPool* /*_pPool*/ ) const
{
return new OptionalBoolItem( *this );
}
dbaccess/source/ui/dlg/optionalboolitem.hxx
+1 -1
View File
@@ -36,7 +36,7 @@ namespace dbaui
explicit OptionalBoolItem( sal_uInt16 nWhich );
virtual bool operator==( const SfxPoolItem& _rItem ) const override;
virtual SfxPoolItem* Clone( SfxItemPool* _pPool = nullptr ) const override;
virtual OptionalBoolItem* Clone( SfxItemPool* _pPool = nullptr ) const override;
bool HasValue() const { return !!m_aValue; }
void ClearValue() { m_aValue.reset(); }
dbaccess/source/ui/inc/stringlistitem.hxx
+1 -1
View File
@@ -40,7 +40,7 @@ public:
OStringListItem(const OStringListItem& _rSource);
virtual bool operator==(const SfxPoolItem& _rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* _pPool = nullptr) const override;
virtual OStringListItem* Clone(SfxItemPool* _pPool = nullptr) const override;
const css::uno::Sequence< OUString >& getList() const { return m_aList; }
};
dbaccess/source/ui/misc/stringlistitem.cxx
+1 -1
View File
@@ -53,7 +53,7 @@ bool OStringListItem::operator==(const SfxPoolItem& _rItem) const
return true;
}
SfxPoolItem* OStringListItem::Clone(SfxItemPool* /* _pPool */) const
OStringListItem* OStringListItem::Clone(SfxItemPool* /* _pPool */) const
{
return new OStringListItem(*this);
}
editeng/source/items/bulitem.cxx
+1 -3
View File
@@ -59,13 +59,11 @@ SvxBulletItem::~SvxBulletItem()
{
}
SfxPoolItem* SvxBulletItem::Clone( SfxItemPool * /*pPool*/ ) const
SvxBulletItem* SvxBulletItem::Clone( SfxItemPool * /*pPool*/ ) const
{
return new SvxBulletItem( *this );
}
void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom )
{
vcl::Font _aFont = GetFont();
editeng/source/items/charhiddenitem.cxx
+1 -1
View File
@@ -27,7 +27,7 @@ SvxCharHiddenItem::SvxCharHiddenItem( const bool bHidden, const sal_uInt16 nId )
{
}
SfxPoolItem* SvxCharHiddenItem::Clone( SfxItemPool * ) const
SvxCharHiddenItem* SvxCharHiddenItem::Clone( SfxItemPool * ) const
{
return new SvxCharHiddenItem( *this );
}
editeng/source/items/flditem.cxx
+1 -4
View File
@@ -293,18 +293,15 @@ SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) :
{
}
SvxFieldItem::~SvxFieldItem()
{
}
SfxPoolItem* SvxFieldItem::Clone( SfxItemPool* ) const
SvxFieldItem* SvxFieldItem::Clone( SfxItemPool* ) const
{
return new SvxFieldItem(*this);
}
bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
editeng/source/items/frmitems.cxx
+15 -45
View File
@@ -111,13 +111,11 @@ SfxPoolItem* SvxFormatBreakItem::CreateDefault() { return new SvxFormatBreakIte
SfxPoolItem* SvxFormatKeepItem::CreateDefault() { return new SvxFormatKeepItem(false, 0);}
SfxPoolItem* SvxLineItem::CreateDefault() { return new SvxLineItem(0);}
SfxPoolItem* SvxPaperBinItem::Clone( SfxItemPool* ) const
SvxPaperBinItem* SvxPaperBinItem::Clone( SfxItemPool* ) const
{
return new SvxPaperBinItem( *this );
}
bool SvxPaperBinItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -249,13 +247,11 @@ bool SvxSizeItem::operator==( const SfxPoolItem& rAttr ) const
return ( m_aSize == static_cast<const SvxSizeItem&>( rAttr ).GetSize() );
}
SfxPoolItem* SvxSizeItem::Clone( SfxItemPool* ) const
SvxSizeItem* SvxSizeItem::Clone( SfxItemPool* ) const
{
return new SvxSizeItem( *this );
}
bool SvxSizeItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -503,13 +499,11 @@ bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const
bExplicitZeroMarginValLeft == rOther.IsExplicitZeroMarginValLeft() );
}
SfxPoolItem* SvxLRSpaceItem::Clone( SfxItemPool* ) const
SvxLRSpaceItem* SvxLRSpaceItem::Clone( SfxItemPool* ) const
{
return new SvxLRSpaceItem( *this );
}
bool SvxLRSpaceItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -779,13 +773,11 @@ bool SvxULSpaceItem::operator==( const SfxPoolItem& rAttr ) const
nPropLower == rSpaceItem.nPropLower );
}
SfxPoolItem* SvxULSpaceItem::Clone( SfxItemPool* ) const
SvxULSpaceItem* SvxULSpaceItem::Clone( SfxItemPool* ) const
{
return new SvxULSpaceItem( *this );
}
bool SvxULSpaceItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -896,13 +888,11 @@ boost::property_tree::ptree SvxULSpaceItem::dumpAsJSON() const
return aTree;
}
SfxPoolItem* SvxPrintItem::Clone( SfxItemPool* ) const
SvxPrintItem* SvxPrintItem::Clone( SfxItemPool* ) const
{
return new SvxPrintItem( *this );
}
bool SvxPrintItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -919,13 +909,11 @@ bool SvxPrintItem::GetPresentation
return true;
}
SfxPoolItem* SvxOpaqueItem::Clone( SfxItemPool* ) const
SvxOpaqueItem* SvxOpaqueItem::Clone( SfxItemPool* ) const
{
return new SvxOpaqueItem( *this );
}
bool SvxOpaqueItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -989,13 +977,11 @@ bool SvxProtectItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return true;
}
SfxPoolItem* SvxProtectItem::Clone( SfxItemPool* ) const
SvxProtectItem* SvxProtectItem::Clone( SfxItemPool* ) const
{
return new SvxProtectItem( *this );
}
bool SvxProtectItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -1155,13 +1141,11 @@ bool SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const
( eLocation == rItem.GetLocation() ) );
}
SfxPoolItem* SvxShadowItem::Clone( SfxItemPool* ) const
SvxShadowItem* SvxShadowItem::Clone( SfxItemPool* ) const
{
return new SvxShadowItem( *this );
}
sal_uInt16 SvxShadowItem::CalcShadowSpace( SvxShadowItemSide nShadow ) const
{
sal_uInt16 nSpace = 0;
@@ -1737,13 +1721,11 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return true;
}
SfxPoolItem* SvxBoxItem::Clone( SfxItemPool* ) const
SvxBoxItem* SvxBoxItem::Clone( SfxItemPool* ) const
{
return new SvxBoxItem( *this );
}
bool SvxBoxItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -2143,13 +2125,11 @@ void SvxBoxInfoItem::SetLine( const SvxBorderLine* pNew, SvxBoxInfoItemLine nLin
}
}
SfxPoolItem* SvxBoxInfoItem::Clone( SfxItemPool* ) const
SvxBoxInfoItem* SvxBoxInfoItem::Clone( SfxItemPool* ) const
{
return new SvxBoxInfoItem( *this );
}
bool SvxBoxInfoItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -2617,25 +2597,21 @@ bool SvxFormatBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/
return true;
}
SfxPoolItem* SvxFormatBreakItem::Clone( SfxItemPool* ) const
SvxFormatBreakItem* SvxFormatBreakItem::Clone( SfxItemPool* ) const
{
return new SvxFormatBreakItem( *this );
}
sal_uInt16 SvxFormatBreakItem::GetValueCount() const
{
return sal_uInt16(SvxBreak::End); // SvxBreak::PageBoth + 1
}
SfxPoolItem* SvxFormatKeepItem::Clone( SfxItemPool* ) const
SvxFormatKeepItem* SvxFormatKeepItem::Clone( SfxItemPool* ) const
{
return new SvxFormatKeepItem( *this );
}
bool SvxFormatKeepItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -2678,13 +2654,11 @@ bool SvxLineItem::operator==( const SfxPoolItem& rAttr ) const
return CmpBrdLn( pLine, static_cast<const SvxLineItem&>(rAttr).GetLine() );
}
SfxPoolItem* SvxLineItem::Clone( SfxItemPool* ) const
SvxLineItem* SvxLineItem::Clone( SfxItemPool* ) const
{
return new SvxLineItem( *this );
}
bool SvxLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemId ) const
{
bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
@@ -3153,13 +3127,11 @@ bool SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const
return bEqual;
}
SfxPoolItem* SvxBrushItem::Clone( SfxItemPool* ) const
SvxBrushItem* SvxBrushItem::Clone( SfxItemPool* ) const
{
return new SvxBrushItem( *this );
}
const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) const
{
if (bLoadAgain && !maStrLink.isEmpty() && !xGraphicObject)
@@ -3351,13 +3323,11 @@ SvxFrameDirectionItem::~SvxFrameDirectionItem()
{
}
SfxPoolItem* SvxFrameDirectionItem::Clone( SfxItemPool * ) const
SvxFrameDirectionItem* SvxFrameDirectionItem::Clone( SfxItemPool * ) const
{
return new SvxFrameDirectionItem( *this );
}
const char* getFrmDirResId(size_t nIndex)
{
const char* const RID_SVXITEMS_FRMDIR[] =
editeng/source/items/justifyitem.cxx
+3 -3
View File
@@ -165,7 +165,7 @@ OUString SvxHorJustifyItem::GetValueText(SvxCellHorJustify nVal)
return EditResId(RID_SVXITEMS_HORJUST[static_cast<size_t>(nVal)]);
}
SfxPoolItem* SvxHorJustifyItem::Clone( SfxItemPool* ) const
SvxHorJustifyItem* SvxHorJustifyItem::Clone( SfxItemPool* ) const
{
return new SvxHorJustifyItem( *this );
}
@@ -290,7 +290,7 @@ OUString SvxVerJustifyItem::GetValueText( SvxCellVerJustify nVal )
return EditResId(RID_SVXITEMS_VERJUST[static_cast<size_t>(nVal)]);
}
SfxPoolItem* SvxVerJustifyItem::Clone( SfxItemPool* ) const
SvxVerJustifyItem* SvxVerJustifyItem::Clone( SfxItemPool* ) const
{
return new SvxVerJustifyItem( *this );
}
@@ -359,7 +359,7 @@ OUString SvxJustifyMethodItem::GetValueText( SvxCellJustifyMethod nVal )
return EditResId(RID_SVXITEMS_JUSTMETHOD[static_cast<size_t>(nVal)]);
}
SfxPoolItem* SvxJustifyMethodItem::Clone( SfxItemPool* ) const
SvxJustifyMethodItem* SvxJustifyMethodItem::Clone( SfxItemPool* ) const
{
return new SvxJustifyMethodItem( *this );
}
editeng/source/items/numitem.cxx
+3 -7
View File
@@ -410,14 +410,10 @@ bool SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
void SvxNumberFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem,
const Size* pSize, const sal_Int16* pOrient)
{
if(!pBrushItem)
{
if (!pBrushItem)
pGraphicBrush.reset();
}
else if ( !pGraphicBrush || (*pBrushItem != *pGraphicBrush) )
{
pGraphicBrush.reset( static_cast<SvxBrushItem*>(pBrushItem->Clone()) );
}
pGraphicBrush.reset(pBrushItem->Clone());
if(pOrient)
eVertOrient = *pOrient;
@@ -942,7 +938,7 @@ bool SvxNumBulletItem::operator==( const SfxPoolItem& rCopy) const
*pNumRule == *static_cast<const SvxNumBulletItem&>(rCopy).pNumRule;
}
SfxPoolItem* SvxNumBulletItem::Clone( SfxItemPool * ) const
SvxNumBulletItem* SvxNumBulletItem::Clone( SfxItemPool * ) const
{
return new SvxNumBulletItem(*this);
}
editeng/source/items/optitems.cxx
+1 -4
View File
@@ -31,7 +31,6 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const sal_uInt16 nId ) :
nMinLead = nMinTrail = 0;
}
bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
@@ -40,13 +39,11 @@ bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const
( static_cast<const SfxHyphenRegionItem&>( rAttr ).nMinTrail == nMinTrail ) );
}
SfxPoolItem* SfxHyphenRegionItem::Clone( SfxItemPool* ) const
SfxHyphenRegionItem* SfxHyphenRegionItem::Clone( SfxItemPool* ) const
{
return new SfxHyphenRegionItem( *this );
}
bool SfxHyphenRegionItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
editeng/source/items/paraitem.cxx
+13 -29
View File
@@ -222,8 +222,7 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return bRet;
}
SfxPoolItem* SvxLineSpacingItem::Clone( SfxItemPool * ) const
SvxLineSpacingItem* SvxLineSpacingItem::Clone( SfxItemPool * ) const
{
return new SvxLineSpacingItem( *this );
}
@@ -408,13 +407,11 @@ bool SvxAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return true;
}
SfxPoolItem* SvxAdjustItem::Clone( SfxItemPool * ) const
SvxAdjustItem* SvxAdjustItem::Clone( SfxItemPool * ) const
{
return new SvxAdjustItem( *this );
}
bool SvxAdjustItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -474,13 +471,11 @@ SvxWidowsItem::SvxWidowsItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
{
}
SfxPoolItem* SvxWidowsItem::Clone( SfxItemPool * ) const
SvxWidowsItem* SvxWidowsItem::Clone( SfxItemPool * ) const
{
return new SvxWidowsItem( *this );
}
bool SvxWidowsItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -520,13 +515,11 @@ SvxOrphansItem::SvxOrphansItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
{
}
SfxPoolItem* SvxOrphansItem::Clone( SfxItemPool * ) const
SvxOrphansItem* SvxOrphansItem::Clone( SfxItemPool * ) const
{
return new SvxOrphansItem( *this );
}
bool SvxOrphansItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -641,13 +634,11 @@ bool SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const
&& rItem.nMaxHyphens == nMaxHyphens );
}
SfxPoolItem* SvxHyphenZoneItem::Clone( SfxItemPool * ) const
SvxHyphenZoneItem* SvxHyphenZoneItem::Clone( SfxItemPool * ) const
{
return new SvxHyphenZoneItem( *this );
}
bool SvxHyphenZoneItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -936,13 +927,11 @@ bool SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const
return true;
}
SfxPoolItem* SvxTabStopItem::Clone( SfxItemPool * ) const
SvxTabStopItem* SvxTabStopItem::Clone( SfxItemPool * ) const
{
return new SvxTabStopItem( *this );
}
bool SvxTabStopItem::GetPresentation
(
SfxItemPresentation ePres,
@@ -1010,12 +999,11 @@ SvxFormatSplitItem::~SvxFormatSplitItem()
{
}
SfxPoolItem* SvxFormatSplitItem::Clone( SfxItemPool * ) const
SvxFormatSplitItem* SvxFormatSplitItem::Clone( SfxItemPool * ) const
{
return new SvxFormatSplitItem( *this );
}
bool SvxFormatSplitItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -1032,13 +1020,11 @@ bool SvxFormatSplitItem::GetPresentation
return true;
}
SfxPoolItem* SvxPageModelItem::Clone( SfxItemPool* ) const
SvxPageModelItem* SvxPageModelItem::Clone( SfxItemPool* ) const
{
return new SvxPageModelItem( *this );
}
bool SvxPageModelItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
@@ -1109,7 +1095,7 @@ SvxScriptSpaceItem::SvxScriptSpaceItem( bool bOn, const sal_uInt16 nId )
{
}
SfxPoolItem* SvxScriptSpaceItem::Clone( SfxItemPool * ) const
SvxScriptSpaceItem* SvxScriptSpaceItem::Clone( SfxItemPool * ) const
{
return new SvxScriptSpaceItem( *this );
}
@@ -1132,7 +1118,7 @@ SvxHangingPunctuationItem::SvxHangingPunctuationItem(
{
}
SfxPoolItem* SvxHangingPunctuationItem::Clone( SfxItemPool * ) const
SvxHangingPunctuationItem* SvxHangingPunctuationItem::Clone( SfxItemPool * ) const
{
return new SvxHangingPunctuationItem( *this );
}
@@ -1155,7 +1141,7 @@ SvxForbiddenRuleItem::SvxForbiddenRuleItem(
{
}
SfxPoolItem* SvxForbiddenRuleItem::Clone( SfxItemPool * ) const
SvxForbiddenRuleItem* SvxForbiddenRuleItem::Clone( SfxItemPool * ) const
{
return new SvxForbiddenRuleItem( *this );
}
@@ -1181,7 +1167,7 @@ SvxParaVertAlignItem::SvxParaVertAlignItem( Align nValue,
{
}
SfxPoolItem* SvxParaVertAlignItem::Clone( SfxItemPool* ) const
SvxParaVertAlignItem* SvxParaVertAlignItem::Clone( SfxItemPool* ) const
{
return new SvxParaVertAlignItem( *this );
}
@@ -1224,14 +1210,12 @@ bool SvxParaVertAlignItem::PutValue( const css::uno::Any& rVal,
return false;
}
SvxParaGridItem::SvxParaGridItem( bool bOn, const sal_uInt16 nId )
: SfxBoolItem( nId, bOn )
{
}
SfxPoolItem* SvxParaGridItem::Clone( SfxItemPool * ) const
SvxParaGridItem* SvxParaGridItem::Clone( SfxItemPool * ) const
{
return new SvxParaGridItem( *this );
}
editeng/source/items/textitem.cxx
+29 -71
View File
@@ -138,13 +138,11 @@ SvxFontListItem::SvxFontListItem( const FontList* pFontLst,
}
}
SfxPoolItem* SvxFontListItem::Clone( SfxItemPool* ) const
SvxFontListItem* SvxFontListItem::Clone( SfxItemPool* ) const
{
return new SvxFontListItem( *this );
}
bool SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
@@ -310,13 +308,11 @@ bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const
return bRet;
}
SfxPoolItem* SvxFontItem::Clone( SfxItemPool * ) const
SvxFontItem* SvxFontItem::Clone( SfxItemPool * ) const
{
return new SvxFontItem( *this );
}
bool SvxFontItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -349,13 +345,11 @@ SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const sal_uInt16 nId
{
}
SfxPoolItem* SvxPostureItem::Clone( SfxItemPool * ) const
SvxPostureItem* SvxPostureItem::Clone( SfxItemPool * ) const
{
return new SvxPostureItem( *this );
}
sal_uInt16 SvxPostureItem::GetValueCount() const
{
return ITALIC_NORMAL + 1; // ITALIC_NONE also belongs here
@@ -488,13 +482,11 @@ sal_uInt16 SvxWeightItem::GetValueCount() const
return WEIGHT_BLACK; // WEIGHT_DONTKNOW does not belong
}
SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const
SvxWeightItem* SvxWeightItem::Clone( SfxItemPool * ) const
{
return new SvxWeightItem( *this );
}
bool SvxWeightItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -590,13 +582,11 @@ SvxFontHeightItem::SvxFontHeightItem( const sal_uLong nSz,
SetHeight( nSz,nPrp ); // calculate in percentage
}
SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const
SvxFontHeightItem* SvxFontHeightItem::Clone( SfxItemPool * ) const
{
return new SvxFontHeightItem( *this );
}
bool SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const
{
assert(SfxPoolItem::operator==(rItem));
@@ -942,13 +932,11 @@ void SvxTextLineItem::SetBoolValue( bool bVal )
SetValue( bVal ? LINESTYLE_SINGLE : LINESTYLE_NONE );
}
SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const
SvxTextLineItem* SvxTextLineItem::Clone( SfxItemPool * ) const
{
return new SvxTextLineItem( *this );
}
sal_uInt16 SvxTextLineItem::GetValueCount() const
{
return LINESTYLE_DOTTED + 1; // LINESTYLE_NONE also belongs here
@@ -1052,13 +1040,11 @@ SvxUnderlineItem::SvxUnderlineItem( const FontLineStyle eSt, const sal_uInt16 nI
{
}
SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const
SvxUnderlineItem* SvxUnderlineItem::Clone( SfxItemPool * ) const
{
return new SvxUnderlineItem( *this );
}
OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
static const char* RID_SVXITEMS_UL[] =
@@ -1095,13 +1081,11 @@ SvxOverlineItem::SvxOverlineItem( const FontLineStyle eSt, const sal_uInt16 nId
{
}
SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const
SvxOverlineItem* SvxOverlineItem::Clone( SfxItemPool * ) const
{
return new SvxOverlineItem( *this );
}
OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
static const char* RID_SVXITEMS_OL[] =
@@ -1162,13 +1146,11 @@ sal_uInt16 SvxCrossedOutItem::GetValueCount() const
return STRIKEOUT_DOUBLE + 1; // STRIKEOUT_NONE belongs also here
}
SfxPoolItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const
SvxCrossedOutItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const
{
return new SvxCrossedOutItem( *this );
}
bool SvxCrossedOutItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -1239,13 +1221,11 @@ SvxShadowedItem::SvxShadowedItem( const bool bShadowed, const sal_uInt16 nId ) :
{
}
SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const
SvxShadowedItem* SvxShadowedItem::Clone( SfxItemPool * ) const
{
return new SvxShadowedItem( *this );
}
bool SvxShadowedItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -1269,13 +1249,11 @@ SvxAutoKernItem::SvxAutoKernItem( const bool bAutoKern, const sal_uInt16 nId ) :
{
}
SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const
SvxAutoKernItem* SvxAutoKernItem::Clone( SfxItemPool * ) const
{
return new SvxAutoKernItem( *this );
}
bool SvxAutoKernItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -1300,13 +1278,11 @@ SvxWordLineModeItem::SvxWordLineModeItem( const bool bWordLineMode,
{
}
SfxPoolItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const
SvxWordLineModeItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const
{
return new SvxWordLineModeItem( *this );
}
bool SvxWordLineModeItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -1330,13 +1306,11 @@ SvxContourItem::SvxContourItem( const bool bContoured, const sal_uInt16 nId ) :
{
}
SfxPoolItem* SvxContourItem::Clone( SfxItemPool * ) const
SvxContourItem* SvxContourItem::Clone( SfxItemPool * ) const
{
return new SvxContourItem( *this );
}
bool SvxContourItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -1367,7 +1341,7 @@ SvxBackgroundColorItem::SvxBackgroundColorItem( const Color& rCol,
{
}
SfxPoolItem* SvxBackgroundColorItem::Clone( SfxItemPool * ) const
SvxBackgroundColorItem* SvxBackgroundColorItem::Clone( SfxItemPool * ) const
{
return new SvxBackgroundColorItem(*this);
}
@@ -1485,7 +1459,7 @@ bool SvxColorItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
}
SfxPoolItem* SvxColorItem::Clone( SfxItemPool * ) const
SvxColorItem* SvxColorItem::Clone( SfxItemPool * ) const
{
return new SvxColorItem( *this );
}
@@ -1532,13 +1506,11 @@ SvxKerningItem::SvxKerningItem( const short nKern, const sal_uInt16 nId ) :
{
}
SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const
SvxKerningItem* SvxKerningItem::Clone( SfxItemPool * ) const
{
return new SvxKerningItem( *this );
}
void SvxKerningItem::ScaleMetrics( long nMult, long nDiv )
{
SetValue( static_cast<sal_Int16>(Scale( GetValue(), nMult, nDiv )) );
@@ -1613,19 +1585,16 @@ SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) :
{
}
sal_uInt16 SvxCaseMapItem::GetValueCount() const
{
return sal_uInt16(SvxCaseMap::End); // SvxCaseMap::SmallCaps + 1
}
SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const
SvxCaseMapItem* SvxCaseMapItem::Clone( SfxItemPool * ) const
{
return new SvxCaseMapItem( *this );
}
bool SvxCaseMapItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -1729,13 +1698,11 @@ bool SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const
nProp == static_cast<const SvxEscapementItem&>(rAttr).nProp );
}
SfxPoolItem* SvxEscapementItem::Clone( SfxItemPool * ) const
SvxEscapementItem* SvxEscapementItem::Clone( SfxItemPool * ) const
{
return new SvxEscapementItem( *this );
}
sal_uInt16 SvxEscapementItem::GetValueCount() const
{
return sal_uInt16(SvxEscapement::End); // SvxEscapement::Subscript + 1
@@ -1870,13 +1837,11 @@ sal_uInt16 SvxLanguageItem::GetValueCount() const
return 0;
}
SfxPoolItem* SvxLanguageItem::Clone( SfxItemPool * ) const
SvxLanguageItem* SvxLanguageItem::Clone( SfxItemPool * ) const
{
return new SvxLanguageItem( *this );
}
bool SvxLanguageItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -1939,13 +1904,11 @@ SvxNoHyphenItem::SvxNoHyphenItem( const sal_uInt16 nId ) :
{
}
SfxPoolItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const
SvxNoHyphenItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const
{
return new SvxNoHyphenItem( *this );
}
bool SvxNoHyphenItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -1972,13 +1935,11 @@ SvxBlinkItem::SvxBlinkItem( const bool bBlink, const sal_uInt16 nId ) :
{
}
SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const
SvxBlinkItem* SvxBlinkItem::Clone( SfxItemPool * ) const
{
return new SvxBlinkItem( *this );
}
bool SvxBlinkItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -2003,13 +1964,11 @@ SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue,
{
}
SfxPoolItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const
SvxEmphasisMarkItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const
{
return new SvxEmphasisMarkItem( *this );
}
bool SvxEmphasisMarkItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -2121,7 +2080,7 @@ bool SvxTwoLinesItem::operator==( const SfxPoolItem& rAttr ) const
cEndBracket == static_cast<const SvxTwoLinesItem&>(rAttr).cEndBracket;
}
SfxPoolItem* SvxTwoLinesItem::Clone( SfxItemPool* ) const
SvxTwoLinesItem* SvxTwoLinesItem::Clone( SfxItemPool* ) const
{
return new SvxTwoLinesItem( *this );
}
@@ -2216,7 +2175,7 @@ SvxTextRotateItem::SvxTextRotateItem(sal_uInt16 nValue, const sal_uInt16 nW)
{
}
SfxPoolItem* SvxTextRotateItem::Clone(SfxItemPool*) const
SvxTextRotateItem* SvxTextRotateItem::Clone(SfxItemPool*) const
{
return new SvxTextRotateItem(*this);
}
@@ -2295,7 +2254,7 @@ SvxCharRotateItem::SvxCharRotateItem( sal_uInt16 nValue,
{
}
SfxPoolItem* SvxCharRotateItem::Clone( SfxItemPool* ) const
SvxCharRotateItem* SvxCharRotateItem::Clone( SfxItemPool* ) const
{
return new SvxCharRotateItem( *this );
}
@@ -2384,12 +2343,11 @@ SvxCharScaleWidthItem::SvxCharScaleWidthItem( sal_uInt16 nValue,
{
}
SfxPoolItem* SvxCharScaleWidthItem::Clone( SfxItemPool* ) const
SvxCharScaleWidthItem* SvxCharScaleWidthItem::Clone( SfxItemPool* ) const
{
return new SvxCharScaleWidthItem( *this );
}
bool SvxCharScaleWidthItem::GetPresentation(
SfxItemPresentation /*ePres*/,
MapUnit /*eCoreMetric*/, MapUnit /*ePresMetric*/,
@@ -2439,7 +2397,7 @@ SvxCharReliefItem::SvxCharReliefItem( FontRelief eValue,
{
}
SfxPoolItem* SvxCharReliefItem::Clone( SfxItemPool * ) const
SvxCharReliefItem* SvxCharReliefItem::Clone( SfxItemPool * ) const
{
return new SvxCharReliefItem( *this );
}
@@ -2530,7 +2488,7 @@ SvxScriptSetItem::SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool )
GetItemSet().MergeRange( nComplex, nComplex );
}
SfxPoolItem* SvxScriptSetItem::Clone( SfxItemPool * ) const
SvxScriptSetItem* SvxScriptSetItem::Clone( SfxItemPool * ) const
{
SvxScriptSetItem* p = new SvxScriptSetItem( Which(), *GetItemSet().GetPool() );
p->GetItemSet().Put( GetItemSet(), false );
@@ -2731,7 +2689,7 @@ bool SvxRsidItem::PutValue( const uno::Any& rVal, sal_uInt8 )
return true;
}
SfxPoolItem* SvxRsidItem::Clone( SfxItemPool * ) const
SvxRsidItem* SvxRsidItem::Clone( SfxItemPool * ) const
{
return new SvxRsidItem( *this );
}
editeng/source/items/writingmodeitem.cxx
+1 -1
View File
@@ -38,7 +38,7 @@ SvxWritingModeItem::~SvxWritingModeItem()
{
}
SfxPoolItem* SvxWritingModeItem::Clone( SfxItemPool * ) const
SvxWritingModeItem* SvxWritingModeItem::Clone( SfxItemPool * ) const
{
return new SvxWritingModeItem( *this );
}
include/avmedia/mediaitem.hxx
+1 -1
View File
@@ -72,7 +72,7 @@ public:
virtual ~MediaItem() override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual MediaItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreUnit,
MapUnit ePresUnit,
include/editeng/adjustitem.hxx
+1 -1
View File
@@ -64,7 +64,7 @@ public:
static OUString GetValueTextByPos( sal_uInt16 nPos );
virtual sal_uInt16 GetEnumValue() const override;
virtual void SetEnumValue( sal_uInt16 nNewVal ) override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxAdjustItem* Clone( SfxItemPool *pPool = nullptr ) const override;
void SetOneWord( const SvxAdjust eType )
{
include/editeng/autokernitem.hxx
+1 -1
View File
@@ -38,7 +38,7 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxAutoKernItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/blinkitem.hxx
+1 -1
View File
@@ -38,7 +38,7 @@ public:
SvxBlinkItem( const bool bBlink /*= false*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxBlinkItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
include/editeng/boxitem.hxx
+2 -2
View File
@@ -82,7 +82,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxBoxItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual void ScaleMetrics( long nMult, long nDiv ) override;
virtual bool HasMetrics() const override;
@@ -195,7 +195,7 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxBoxInfoItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual void ScaleMetrics( long nMult, long nDiv ) override;
virtual bool HasMetrics() const override;
include/editeng/brushitem.hxx
+1 -1
View File
@@ -86,7 +86,7 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxBrushItem* Clone( SfxItemPool *pPool = nullptr ) const override;
const Color& GetColor() const { return aColor; }
Color& GetColor() { return aColor; }
include/editeng/bulletitem.hxx
+1 -1
View File
@@ -61,7 +61,7 @@ public:
SvxBulletItem( const SvxBulletItem& );
virtual ~SvxBulletItem() override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxBulletItem* Clone( SfxItemPool *pPool = nullptr ) const override;
OUString GetFullText() const;
include/editeng/charhiddenitem.hxx
+1 -1
View File
@@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxCharHiddenItem final : public SfxBoolItem
public:
SvxCharHiddenItem( const bool bHidden /*= false*/, const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxCharHiddenItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
include/editeng/charreliefitem.hxx
+1 -1
View File
@@ -39,7 +39,7 @@ public:
SvxCharReliefItem( FontRelief eValue /*= FontRelief::NONE*/,
const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxCharReliefItem* Clone( SfxItemPool *pPool = nullptr ) const override;
static OUString GetValueTextByPos( sal_uInt16 nPos );
virtual sal_uInt16 GetValueCount() const override;
include/editeng/charrotateitem.hxx
+2 -2
View File
@@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxTextRotateItem : public SfxUInt16Item
public:
SvxTextRotateItem(sal_uInt16 nValue, const sal_uInt16 nId);
virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override;
virtual SvxTextRotateItem* Clone(SfxItemPool *pPool = nullptr) const override;
virtual bool GetPresentation(SfxItemPresentation ePres,
MapUnit eCoreMetric,
@@ -79,7 +79,7 @@ public:
bool bFitIntoLine /*= false*/,
const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxCharRotateItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/charscaleitem.hxx
+1 -1
View File
@@ -40,7 +40,7 @@ public:
SvxCharScaleWidthItem( sal_uInt16 nValue /*= 100*/,
const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxCharScaleWidthItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/cmapitem.hxx
+1 -1
View File
@@ -44,7 +44,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxCaseMapItem* Clone( SfxItemPool *pPool = nullptr ) const override;
static OUString GetValueTextByPos( sal_uInt16 nPos );
virtual sal_uInt16 GetValueCount() const override;
include/editeng/colritem.hxx
+8 -8
View File
@@ -48,7 +48,7 @@ public:
MapUnit eCoreMetric, MapUnit ePresMetric,
OUString &rText, const IntlWrapper& rIntlWrapper) const override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual SvxColorItem* Clone(SfxItemPool* pPool = nullptr) const override;
SvxColorItem(SvxColorItem const &) = default; // SfxPoolItem copy function dichotomy
const Color& GetValue() const
@@ -63,15 +63,15 @@ public:
// XXX: to be moved in a separate header.
class EDITENG_DLLPUBLIC SvxBackgroundColorItem final : public SvxColorItem
{
public:
static SfxPoolItem* CreateDefault();
public:
static SfxPoolItem* CreateDefault();
SvxBackgroundColorItem(const sal_uInt16 nId);
SvxBackgroundColorItem(const Color& rCol, const sal_uInt16 nId);
SvxBackgroundColorItem(const sal_uInt16 nId);
SvxBackgroundColorItem(const Color& rCol, const sal_uInt16 nId);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override;
virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override;
virtual SvxBackgroundColorItem* Clone(SfxItemPool* pPool = nullptr) const override;
virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override;
virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override;
};
#endif
include/editeng/contouritem.hxx
+1 -1
View File
@@ -37,7 +37,7 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxContourItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/crossedoutitem.hxx
+1 -1
View File
@@ -43,7 +43,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxCrossedOutItem* Clone( SfxItemPool *pPool = nullptr ) const override;
static OUString GetValueTextByPos( sal_uInt16 nPos );
virtual sal_uInt16 GetValueCount() const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
include/editeng/emphasismarkitem.hxx
+1 -1
View File
@@ -45,7 +45,7 @@ public:
OUString &rText,
const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxEmphasisMarkItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
include/editeng/escapementitem.hxx
+1 -1
View File
@@ -60,7 +60,7 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxEscapementItem* Clone( SfxItemPool *pPool = nullptr ) const override;
void SetEscapement( const SvxEscapement eNew )
{
include/editeng/fhgtitem.hxx
+1 -1
View File
@@ -62,7 +62,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxFontHeightItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual void ScaleMetrics( long nMult, long nDiv ) override;
virtual bool HasMetrics() const override;
include/editeng/flditem.hxx
+1 -1
View File
@@ -79,7 +79,7 @@ public:
virtual ~SvxFieldItem() override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxFieldItem* Clone( SfxItemPool *pPool = nullptr ) const override;
const SvxFieldData* GetField() const { return mpField.get(); }
};
include/editeng/flstitem.hxx
+1 -1
View File
@@ -46,7 +46,7 @@ public:
const sal_uInt16 nId );
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxFontListItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
include/editeng/fontitem.hxx
+1 -1
View File
@@ -46,7 +46,7 @@ public:
// "pure virtual Methods" from SfxPoolItem
virtual bool operator==(const SfxPoolItem& rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool *pPool = nullptr) const override;
virtual SvxFontItem* Clone(SfxItemPool *pPool = nullptr) const override;
virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) const override;
virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) override;
include/editeng/forbiddenruleitem.hxx
+1 -1
View File
@@ -35,7 +35,7 @@ public:
SvxForbiddenRuleItem( bool bOn /*= false*/,
const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxForbiddenRuleItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/formatbreakitem.hxx
+1 -1
View File
@@ -53,7 +53,7 @@ public:
OUString &rText, const IntlWrapper& ) const override;
static OUString GetValueTextByPos( sal_uInt16 nPos );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxFormatBreakItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual sal_uInt16 GetValueCount() const override;
SvxBreak GetBreak() const { return GetValue(); }
include/editeng/frmdiritem.hxx
+1 -1
View File
@@ -39,7 +39,7 @@ public:
SvxFrameDirectionItem & operator =(SvxFrameDirectionItem const &) = delete;
SvxFrameDirectionItem & operator =(SvxFrameDirectionItem &&) = delete;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxFrameDirectionItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/hngpnctitem.hxx
+1 -1
View File
@@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxHangingPunctuationItem final : public SfxBoolItem
public:
SvxHangingPunctuationItem( bool bOn /*= false*/, const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxHangingPunctuationItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/hyphenzoneitem.hxx
+1 -1
View File
@@ -55,7 +55,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxHyphenZoneItem* Clone( SfxItemPool *pPool = nullptr ) const override;
void SetHyphen( const bool bNew ) { bHyphen = bNew; }
bool IsHyphen() const { return bHyphen; }
include/editeng/justifyitem.hxx
+3 -3
View File
@@ -46,7 +46,7 @@ public:
virtual sal_uInt16 GetValueCount() const override;
static OUString GetValueText( SvxCellHorJustify nVal );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxHorJustifyItem* Clone( SfxItemPool *pPool = nullptr ) const override;
SvxHorJustifyItem(SvxHorJustifyItem const &) = default; // SfxPoolItem copy function dichotomy
};
@@ -73,7 +73,7 @@ public:
virtual sal_uInt16 GetValueCount() const override;
static OUString GetValueText( SvxCellVerJustify nVal );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxVerJustifyItem* Clone( SfxItemPool *pPool = nullptr ) const override;
SvxVerJustifyItem(SvxVerJustifyItem const &) = default; // SfxPoolItem copy function dichotomy
};
@@ -96,7 +96,7 @@ public:
virtual sal_uInt16 GetValueCount() const override;
static OUString GetValueText( SvxCellJustifyMethod nVal );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxJustifyMethodItem* Clone( SfxItemPool *pPool = nullptr ) const override;
};
#endif
include/editeng/keepitem.hxx
+1 -1
View File
@@ -40,7 +40,7 @@ public:
SvxFormatKeepItem(SvxFormatKeepItem const &) = default; // SfxPoolItem copy function dichotomy
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxFormatKeepItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/kernitem.hxx
+1 -1
View File
@@ -40,7 +40,7 @@ public:
SvxKerningItem( const short nKern /*= 0*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxKerningItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual void ScaleMetrics( long nMult, long nDiv ) override;
virtual bool HasMetrics() const override;
include/editeng/langitem.hxx
+1 -1
View File
@@ -52,7 +52,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper&) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxLanguageItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual sal_uInt16 GetValueCount() const override;
SvxLanguageItem(SvxLanguageItem const &) = default; // SfxPoolItem copy function dichotomy
include/editeng/lineitem.hxx
+1 -1
View File
@@ -53,7 +53,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxLineItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual void ScaleMetrics( long nMult, long nDiv ) override;
virtual bool HasMetrics() const override;
include/editeng/lrspitem.hxx
+1 -1
View File
@@ -81,7 +81,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxLRSpaceItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual void ScaleMetrics( long nMult, long nDiv ) override;
virtual bool HasMetrics() const override;
include/editeng/lspcitem.hxx
+1 -1
View File
@@ -59,7 +59,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxLineSpacingItem* Clone( SfxItemPool *pPool = nullptr ) const override;
// Methods to query and edit. InterlineSpace is added to the height.
short GetInterLineSpace() const { return nInterLineSpace; }
include/editeng/nhypitem.hxx
+1 -1
View File
@@ -29,7 +29,7 @@ public:
SvxNoHyphenItem( const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxNoHyphenItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/numitem.hxx
+1 -1
View File
@@ -300,7 +300,7 @@ public:
SvxNumBulletItem(const SvxNumBulletItem& rCopy);
virtual ~SvxNumBulletItem() override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxNumBulletItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
SvxNumRule* GetNumRule() const {return pNumRule.get();}
include/editeng/opaqitem.hxx
+1 -1
View File
@@ -36,7 +36,7 @@ public:
explicit SvxOpaqueItem( const sal_uInt16 nId , const bool bOpa = true );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxOpaqueItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/optitems.hxx
+1 -1
View File
@@ -40,7 +40,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxHyphenRegionItem* Clone( SfxItemPool *pPool = nullptr ) const override;
sal_uInt8 &GetMinLead() { return nMinLead; }
sal_uInt8 GetMinLead() const { return nMinLead; }
include/editeng/orphitem.hxx
+1 -1
View File
@@ -37,7 +37,7 @@ public:
SvxOrphansItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxOrphansItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/paravertalignitem.hxx
+1 -1
View File
@@ -40,7 +40,7 @@ public:
SvxParaVertAlignItem( Align nValue /*= 0*/,
const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxParaVertAlignItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/pbinitem.hxx
+1 -1
View File
@@ -42,7 +42,7 @@ public:
const sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxPaperBinItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
include/editeng/pgrditem.hxx
+1 -1
View File
@@ -37,7 +37,7 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxParaGridItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/pmdlitem.hxx
+1 -1
View File
@@ -41,7 +41,7 @@ public:
inline SvxPageModelItem( const OUString& rModel, bool bA /*= false*/,
sal_uInt16 nWh );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxPageModelItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/postitem.hxx
+1 -1
View File
@@ -44,7 +44,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxPostureItem* Clone( SfxItemPool *pPool = nullptr ) const override;
static OUString GetValueTextByPos( sal_uInt16 nPos );
virtual sal_uInt16 GetValueCount() const override;
include/editeng/prntitem.hxx
+1 -1
View File
@@ -38,7 +38,7 @@ public:
explicit SvxPrintItem( const sal_uInt16 nId , const bool bPrt = true );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxPrintItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/protitem.hxx
+1 -1
View File
@@ -51,7 +51,7 @@ public:
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxProtectItem* Clone( SfxItemPool *pPool = nullptr ) const override;
bool IsContentProtected() const { return bCntnt; }
bool IsSizeProtected() const { return bSize; }
include/editeng/rsiditem.hxx
+1 -1
View File
@@ -26,7 +26,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual SvxRsidItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
include/editeng/scriptspaceitem.hxx
+1 -1
View File
@@ -36,7 +36,7 @@ public:
SvxScriptSpaceItem( bool bOn /*= false*/,
const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxScriptSpaceItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/scripttypeitem.hxx
+1 -1
View File
@@ -28,7 +28,7 @@ class EDITENG_DLLPUBLIC SvxScriptSetItem final : public SfxSetItem
public:
SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxScriptSetItem* Clone( SfxItemPool *pPool = nullptr ) const override;
static const SfxPoolItem* GetItemOfScriptSet( const SfxItemSet& rSet,
sal_uInt16 nWhich );
include/editeng/shaditem.hxx
+1 -1
View File
@@ -57,7 +57,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxShadowItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual void ScaleMetrics( long nMult, long nDiv ) override;
virtual bool HasMetrics() const override;
include/editeng/shdditem.hxx
+1 -1
View File
@@ -38,7 +38,7 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxShadowedItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/sizeitem.hxx
+1 -1
View File
@@ -51,7 +51,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxSizeItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual void ScaleMetrics( long nMult, long nDiv ) override;
virtual bool HasMetrics() const override;
include/editeng/spltitem.hxx
+1 -1
View File
@@ -44,7 +44,7 @@ public:
SvxFormatSplitItem & operator =(SvxFormatSplitItem &&) = delete; // due to SfxBoolItem
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxFormatSplitItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/tstpitem.hxx
+1 -1
View File
@@ -139,7 +139,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxTabStopItem* Clone( SfxItemPool *pPool = nullptr ) const override;
void dumpAsXml(xmlTextWriterPtr pWriter) const override;
};
include/editeng/twolinesitem.hxx
+1 -1
View File
@@ -41,7 +41,7 @@ public:
// "pure virtual Methods" from SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual SvxTwoLinesItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
MapUnit ePresMetric,
include/editeng/udlnitem.hxx
+3 -3
View File
@@ -41,7 +41,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxTextLineItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const;
virtual sal_uInt16 GetValueCount() const override;
@@ -77,7 +77,7 @@ public:
SvxUnderlineItem( const FontLineStyle eSt,
const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxUnderlineItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
};
@@ -93,7 +93,7 @@ public:
SvxOverlineItem( const FontLineStyle eSt,
const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxOverlineItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override;
};
include/editeng/ulspitem.hxx
+1 -1
View File
@@ -56,7 +56,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxULSpaceItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual void ScaleMetrics( long nMult, long nDiv ) override;
virtual bool HasMetrics() const override;
include/editeng/wghtitem.hxx
+1 -1
View File
@@ -44,7 +44,7 @@ public:
MapUnit ePresMetric,
OUString &rText, const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxWeightItem* Clone( SfxItemPool *pPool = nullptr ) const override;
static OUString GetValueTextByPos( sal_uInt16 nPos );
virtual sal_uInt16 GetValueCount() const override;
include/editeng/widwitem.hxx
+1 -1
View File
@@ -37,7 +37,7 @@ public:
SvxWidowsItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxWidowsItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/writingmodeitem.hxx
+1 -1
View File
@@ -37,7 +37,7 @@ public:
SvxWritingModeItem & operator =(SvxWritingModeItem const &) = delete; // due to SfxUInt16Item
SvxWritingModeItem & operator =(SvxWritingModeItem &&) = delete; // due to SfxUInt16Item
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxWritingModeItem* Clone( SfxItemPool *pPool = nullptr ) const override;
css::text::WritingMode GetValue() const { return static_cast<css::text::WritingMode>(SfxUInt16Item::GetValue()); }
virtual bool GetPresentation( SfxItemPresentation ePres,
include/editeng/wrlmitem.hxx
+1 -1
View File
@@ -39,7 +39,7 @@ public:
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SvxWordLineModeItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
MapUnit eCoreMetric,
include/editeng/xmlcnitm.hxx
+1 -1
View File
@@ -48,7 +48,7 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual SfxPoolItem *Clone( SfxItemPool * = nullptr) const override
virtual SvXMLAttrContainerItem* Clone( SfxItemPool * = nullptr) const override
{ return new SvXMLAttrContainerItem( *this ); }
bool AddAttr( const OUString& rLName,
include/sfx2/app.hxx
+1 -1
View File
@@ -87,7 +87,7 @@ public:
SfxLinkItem( sal_uInt16 nWhichId, const Link<SfxPoolItem const *, void>& rValue ) : SfxPoolItem( nWhichId )
{ aLink = rValue; }
virtual SfxPoolItem* Clone( SfxItemPool* = nullptr ) const override
virtual SfxLinkItem* Clone( SfxItemPool* = nullptr ) const override
{ return new SfxLinkItem( *this ); }
virtual bool operator==( const SfxPoolItem& rL) const override
{ return static_cast<const SfxLinkItem&>(rL).aLink == aLink; }
include/sfx2/dinfdlg.hxx
+1 -1
View File
@@ -153,7 +153,7 @@ public:
GetCmisProperties() const { return m_aCmisProperties;}
void SetCmisProperties(const css::uno::Sequence< css::document::CmisProperty >& cmisProps );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual SfxDocumentInfoItem* Clone( SfxItemPool* pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
include/sfx2/evntconf.hxx
+1 -1
View File
@@ -77,7 +77,7 @@ public:
MapUnit ePresMetric,
OUString &rText,
const IntlWrapper& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxEventNamesItem* Clone( SfxItemPool *pPool = nullptr ) const override;
const SfxEventNamesList& GetEvents() const { return aEventsList;}
void AddEvent( const OUString&, const OUString&, SvMacroItemId );
include/sfx2/frame.hxx
+3 -3
View File
@@ -168,7 +168,7 @@ public:
SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p );
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxFrameItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
@@ -186,7 +186,7 @@ public:
const css::uno::Any& GetValue() const
{ return aValue; }
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxUnoAnyItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};
@@ -204,7 +204,7 @@ public:
GetFrame() const
{ return m_xFrame; }
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxUnoFrameItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};
include/sfx2/minfitem.hxx
+1 -1
View File
@@ -43,7 +43,7 @@ public:
const OUString &rMethodName,
const OUString &rComment);
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxMacroInfoItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
const OUString& GetMethod() const
{ return aMethodName; }
include/sfx2/objitem.hxx
+1 -1
View File
@@ -34,7 +34,7 @@ public:
SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=nullptr );
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxObjectItem* Clone( SfxItemPool *pPool = nullptr ) const override;
SfxShell* GetShell() const
{ return _pSh; }
include/sfx2/objsh.hxx
+1 -1
View File
@@ -870,7 +870,7 @@ public:
{}
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxObjectShellItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};
include/sfx2/tabdlg.hxx
+1 -1
View File
@@ -46,7 +46,7 @@ class SFX2_DLLPUBLIC SfxTabDialogItem final : public SfxSetItem
public:
SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet );
SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool);
virtual SfxPoolItem* Clone(SfxItemPool* pToPool = nullptr) const override;
virtual SfxTabDialogItem* Clone(SfxItemPool* pToPool = nullptr) const override;
};
class SFX2_DLLPUBLIC SfxTabDialogController : public SfxOkDialogController

Some files were not shown because too many files have changed in this diff Show More