summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-13 15:30:58 +0200
committerNoel Grandin <noel@peralex.com>2015-08-14 09:16:06 +0200
commit0db25f68ab897953d9ca76ae094cc80e0ad11d34 (patch)
tree49113132a27fe96ebdcab497c9a2c8de796e54c4 /sw
parente50b5526e24ff552def8f08d393037d2c020dc29 (diff)
remove default value from SfxPoolItem::PutValue
more useful to make it explicit. Specifically, otherwise my defaultvalue clang plugin would want to remove lots of places that contains #define constants which, while technically the same as the default value, convey semantic information which is quite useful. Change-Id: I918ad5b0e73ba279fa1b1489b62d900339ff71eb
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/fchrfmt.hxx2
-rw-r--r--sw/inc/fmtanchr.hxx2
-rw-r--r--sw/inc/fmtautofmt.hxx2
-rw-r--r--sw/inc/fmtclds.hxx2
-rw-r--r--sw/inc/fmtfsize.hxx2
-rw-r--r--sw/inc/fmtftntx.hxx2
-rw-r--r--sw/inc/fmtinfmt.hxx2
-rw-r--r--sw/inc/fmtline.hxx2
-rw-r--r--sw/inc/fmtornt.hxx4
-rw-r--r--sw/inc/fmtpdsc.hxx2
-rw-r--r--sw/inc/fmtruby.hxx2
-rw-r--r--sw/inc/fmtsrnd.hxx2
-rw-r--r--sw/inc/fmturl.hxx2
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx2
-rw-r--r--sw/inc/grfatr.hxx10
-rw-r--r--sw/inc/paratr.hxx2
-rw-r--r--sw/inc/tgrditem.hxx2
-rw-r--r--sw/source/core/attr/format.cxx2
-rw-r--r--sw/source/core/doc/number.cxx2
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx4
-rw-r--r--sw/source/core/unocore/unoframe.cxx30
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx2
-rw-r--r--sw/source/uibase/inc/envimg.hxx2
-rw-r--r--sw/source/uibase/inc/uiitems.hxx4
24 files changed, 45 insertions, 45 deletions
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index 0e044b0b9dbb..7e1f9ab54db8 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -61,7 +61,7 @@ public:
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index 36851ce59788..1dc702ba6bb9 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -60,7 +60,7 @@ public:
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
RndStdIds GetAnchorId() const { return nAnchorId; }
sal_uInt16 GetPageNum() const { return nPageNum; }
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index 048307c15c2b..14a103c4b3f3 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -52,7 +52,7 @@ public:
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
void SetStyleHandle( std::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; }
const std::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; }
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index c5020eed04f4..7bf1a4bd24ea 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -109,7 +109,7 @@ public:
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
const SwColumns &GetColumns() const { return m_aColumns; }
SwColumns &GetColumns() { return m_aColumns; }
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index 2a5cf5558c29..52804be75d99 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -73,7 +73,7 @@ public:
OUString &rText,
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
SwFrmSize GetHeightSizeType() const { return m_eFrmHeightType; }
void SetHeightSizeType( SwFrmSize eSize ) { m_eFrmHeightType = eSize; }
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index cfb7c7346d46..f8bc16050776 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -57,7 +57,7 @@ public:
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index 35d7a7dc88ec..cfe3c79d30f6 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -62,7 +62,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) SAL_OVERRIDE;
const SwTextINetFormat* GetTextINetFormat() const
{
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index e6373b137502..090565a60a84 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -46,7 +46,7 @@ public:
OUString &rText,
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
sal_uLong GetStartValue() const { return nStartValue; }
bool IsCount() const { return bCountLines; }
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 87b9f8f4977c..88b6d580bca8 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -50,7 +50,7 @@ public:
OUString &rText,
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
SvStream& Store(SvStream &rStream, sal_uInt16 itemVersion) const SAL_OVERRIDE;
SfxPoolItem* Create(SvStream &rStream, sal_uInt16 itemVersion) const SAL_OVERRIDE;
@@ -87,7 +87,7 @@ public:
OUString &rText,
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
sal_Int16 GetHoriOrient() const { return m_eOrient; }
sal_Int16 GetRelationOrient() const { return m_eRelation; }
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index e9d5cee94afa..c1861f57c9a2 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -67,7 +67,7 @@ public:
OUString &rText,
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
SwPageDesc *GetPageDesc() { return static_cast<SwPageDesc*>(GetRegisteredIn()); }
const SwPageDesc *GetPageDesc() const { return static_cast<const SwPageDesc*>(GetRegisteredIn()); }
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index 219f3ddab687..6e4b6e7551ff 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -54,7 +54,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) SAL_OVERRIDE;
const SwTextRuby* GetTextRuby() const { return pTextAttr; }
SwTextRuby* GetTextRuby() { return pTextAttr; }
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index 5b933e99b287..837af21aef49 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -48,7 +48,7 @@ public:
OUString &rText,
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
SwSurround GetSurround()const { return SwSurround( GetValue() ); }
bool IsAnchorOnly() const { return bAnchorOnly; }
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index bdcf92f8283e..c1534fc9dd6a 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -57,7 +57,7 @@ public:
OUString &rText,
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
void SetTargetFrameName( const OUString& rStr ) { sTargetFrameName = rStr; }
void SetURL(const OUString &rURL, bool bServerMap);
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index 88e86a2c46d4..d83ecbb76db8 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -48,7 +48,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
/// direct accessors to data
void SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition );
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index a2c27637c9b0..27f5803052c4 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -66,7 +66,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) SAL_OVERRIDE;
inline SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf )
{
@@ -113,7 +113,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) SAL_OVERRIDE;
const Size& GetUnrotatedSize() const { return aUnrotatedSize; }
};
@@ -221,7 +221,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) SAL_OVERRIDE;
const double& GetValue() const { return nValue; }
void SetValue( const double& rVal ) { nValue = rVal; }
@@ -260,7 +260,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) SAL_OVERRIDE;
};
class SW_DLLPUBLIC SwDrawModeGrf : public SfxEnumItem
@@ -284,7 +284,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
- sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ sal_uInt8 nMemberId ) SAL_OVERRIDE;
};
// Implementation of graphics attributes methods of SwAttr
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 235bc3577587..6744274e7795 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -84,7 +84,7 @@ public:
OUString &rText,
const IntlWrapper* pIntl = 0) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
inline sal_uInt8 GetLines() const { return nLines; }
inline sal_uInt8 &GetLines() { return nLines; }
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index 1d147818d496..807350aa7630 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -59,7 +59,7 @@ public:
OUString &rText,
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
SwTextGridItem& operator=( const SwTextGridItem& );
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index ab6a5a5d5103..20fdef1cd7a8 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -805,7 +805,7 @@ void SwFormat::SetGrabBagItem(const uno::Any& rVal)
if (!m_pGrabBagItem.get())
m_pGrabBagItem.reset(new SfxGrabBagItem);
- m_pGrabBagItem->PutValue(rVal);
+ m_pGrabBagItem->PutValue(rVal, 0);
}
//UUUU
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 3292de9634ce..be310a1f54d5 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1054,7 +1054,7 @@ void SwNumRule::SetGrabBagItem(const uno::Any& rVal)
if (!mpGrabBagItem.get())
mpGrabBagItem.reset(new SfxGrabBagItem);
- mpGrabBagItem->PutValue(rVal);
+ mpGrabBagItem->PutValue(rVal, 0);
}
namespace numfunc
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index dcd698e306c9..9bdc06a39d56 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -320,7 +320,7 @@ bool SwFormatINetFormat::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
}
return true;
}
-bool SwFormatINetFormat::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatINetFormat::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
bool bRet = true;
nMemberId &= ~CONVERT_TWIPS;
@@ -470,7 +470,7 @@ bool SwFormatRuby::QueryValue( uno::Any& rVal,
return bRet;
}
bool SwFormatRuby::PutValue( const uno::Any& rVal,
- sal_uInt8 nMemberId )
+ sal_uInt8 nMemberId )
{
bool bRet = true;
nMemberId &= ~CONVERT_TWIPS;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 19c702f95ae7..eb204b90888b 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -348,7 +348,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
if(pXFillStyleItem)
{
- aXFillStyleItem.PutValue(*pXFillStyleItem);
+ aXFillStyleItem.PutValue(*pXFillStyleItem, 0);
rToSet.Put(aXFillStyleItem);
}
@@ -357,7 +357,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
const Color aNullCol(COL_DEFAULT_SHAPE_FILLING);
XFillColorItem aXFillColorItem(OUString(), aNullCol);
- aXFillColorItem.PutValue(*pXFillColorItem);
+ aXFillColorItem.PutValue(*pXFillColorItem, 0);
rToSet.Put(aXFillColorItem);
//set old-school brush color if we later encounter the
//MID_BACK_COLOR_TRANSPARENCY case below
@@ -469,7 +469,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
if (pXFillTransparenceItem)
{
XFillTransparenceItem aXFillTransparenceItem;
- aXFillTransparenceItem.PutValue(*pXFillTransparenceItem);
+ aXFillTransparenceItem.PutValue(*pXFillTransparenceItem, 0);
rToSet.Put(aXFillTransparenceItem);
}
else if (pColTrans &&
@@ -497,7 +497,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
{
XGradientStepCountItem aXGradientStepCountItem;
- aXGradientStepCountItem.PutValue(*pXGradientStepCountItem);
+ aXGradientStepCountItem.PutValue(*pXGradientStepCountItem, 0);
rToSet.Put(aXGradientStepCountItem);
}
@@ -505,7 +505,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
{
XFillBmpPosItem aXFillBmpPosItem;
- aXFillBmpPosItem.PutValue(*pXFillBmpPosItem);
+ aXFillBmpPosItem.PutValue(*pXFillBmpPosItem, 0);
rToSet.Put(aXFillBmpPosItem);
}
@@ -513,7 +513,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
{
XFillBmpSizeXItem aXFillBmpSizeXItem;
- aXFillBmpSizeXItem.PutValue(*pXFillBmpSizeXItem);
+ aXFillBmpSizeXItem.PutValue(*pXFillBmpSizeXItem, 0);
rToSet.Put(aXFillBmpSizeXItem);
}
@@ -521,7 +521,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
{
XFillBmpSizeYItem aXFillBmpSizeYItem;
- aXFillBmpSizeYItem.PutValue(*pXFillBmpSizeYItem);
+ aXFillBmpSizeYItem.PutValue(*pXFillBmpSizeYItem, 0);
rToSet.Put(aXFillBmpSizeYItem);
}
@@ -554,7 +554,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
const Color aNullCol(COL_DEFAULT_SHAPE_FILLING);
XSecondaryFillColorItem aXSecondaryFillColorItem(OUString(), aNullCol);
- aXSecondaryFillColorItem.PutValue(*pXSecondaryFillColorItem);
+ aXSecondaryFillColorItem.PutValue(*pXSecondaryFillColorItem, 0);
rToSet.Put(aXSecondaryFillColorItem);
}
@@ -562,7 +562,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
{
XFillBmpSizeLogItem aXFillBmpSizeLogItem;
- aXFillBmpSizeLogItem.PutValue(*pXFillBmpSizeLogItem);
+ aXFillBmpSizeLogItem.PutValue(*pXFillBmpSizeLogItem, 0);
rToSet.Put(aXFillBmpSizeLogItem);
}
@@ -570,7 +570,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
{
XFillBmpTileOffsetXItem aXFillBmpTileOffsetXItem;
- aXFillBmpTileOffsetXItem.PutValue(*pXFillBmpTileOffsetXItem);
+ aXFillBmpTileOffsetXItem.PutValue(*pXFillBmpTileOffsetXItem, 0);
rToSet.Put(aXFillBmpTileOffsetXItem);
}
@@ -578,7 +578,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
{
XFillBmpTileOffsetYItem aXFillBmpTileOffsetYItem;
- aXFillBmpTileOffsetYItem.PutValue(*pXFillBmpTileOffsetYItem);
+ aXFillBmpTileOffsetYItem.PutValue(*pXFillBmpTileOffsetYItem, 0);
rToSet.Put(aXFillBmpTileOffsetYItem);
}
@@ -586,7 +586,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
{
XFillBmpPosOffsetXItem aXFillBmpPosOffsetXItem;
- aXFillBmpPosOffsetXItem.PutValue(*pXFillBmpPosOffsetXItem);
+ aXFillBmpPosOffsetXItem.PutValue(*pXFillBmpPosOffsetXItem, 0);
rToSet.Put(aXFillBmpPosOffsetXItem);
}
@@ -594,7 +594,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
{
XFillBmpPosOffsetYItem aXFillBmpPosOffsetYItem;
- aXFillBmpPosOffsetYItem.PutValue(*pXFillBmpPosOffsetYItem);
+ aXFillBmpPosOffsetYItem.PutValue(*pXFillBmpPosOffsetYItem, 0);
rToSet.Put(aXFillBmpPosOffsetYItem);
}
@@ -602,7 +602,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
{
XFillBackgroundItem aXFillBackgroundItem;
- aXFillBackgroundItem.PutValue(*pXFillBackgroundItem);
+ aXFillBackgroundItem.PutValue(*pXFillBackgroundItem, 0);
rToSet.Put(aXFillBackgroundItem);
}
@@ -941,7 +941,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
if ( pTextVertAdjust )
{
SdrTextVertAdjustItem aTextVertAdjust(static_cast <const :: SdrTextVertAdjustItem & > ( rFromSet.Get ( RES_TEXT_VERT_ADJUST ) ));
- bRet &= ((SfxPoolItem&)aTextVertAdjust).PutValue(*pTextVertAdjust);
+ bRet &= ((SfxPoolItem&)aTextVertAdjust).PutValue(*pTextVertAdjust, 0);
rToSet.Put(aTextVertAdjust);
}
}
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index abf17cf56265..5fd5ac89aa15 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -950,7 +950,7 @@ bool SvXMLImportItemMapper::PutXMLValue(
bOk = pWritingModeHandler->importXML( rValue, aAny,
rUnitConverter );
if( bOk )
- bOk = rItem.PutValue( aAny );
+ bOk = rItem.PutValue( aAny, 0 );
delete pWritingModeHandler;
}
diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx
index fc836b635871..49faf2339110 100644
--- a/sw/source/uibase/inc/envimg.hxx
+++ b/sw/source/uibase/inc/envimg.hxx
@@ -64,7 +64,7 @@ public:
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
};
class SwEnvCfgItem : public utl::ConfigItem
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index 6e5ae4299e51..54427c49bec7 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -48,7 +48,7 @@ public:
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
SwPageFootnoteInfo& GetPageFootnoteInfo() { return aFootnoteInfo; }
const SwPageFootnoteInfo& GetPageFootnoteInfo() const { return aFootnoteInfo; }
@@ -81,7 +81,7 @@ public:
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
const SwNumRule* GetNumRule() const { return pRule; }
SwNumRule* GetNumRule() { return pRule; }