diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-15 01:10:49 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-15 13:27:11 +0100 |
commit | 6853fc74833147dc03a7acb4bcf4801178f83acf (patch) | |
tree | b77e40f2267cd5a7fc45a0b6057d9317292d6247 /svx | |
parent | b92ba0dcad32e5246af6770a1a304df4af6f7d77 (diff) |
Remove SDR_ISPOOLABLE
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/svx/sdangitm.hxx | 4 | ||||
-rw-r--r-- | svx/inc/svx/sdasaitm.hxx | 5 | ||||
-rw-r--r-- | svx/inc/svx/sdasitm.hxx | 3 | ||||
-rw-r--r-- | svx/inc/svx/sdmetitm.hxx | 4 | ||||
-rw-r--r-- | svx/inc/svx/sdooitm.hxx | 4 | ||||
-rw-r--r-- | svx/inc/svx/sdprcitm.hxx | 8 | ||||
-rw-r--r-- | svx/inc/svx/sdtfchim.hxx | 4 | ||||
-rw-r--r-- | svx/inc/svx/sdynitm.hxx | 3 | ||||
-rw-r--r-- | svx/inc/svx/sxfiitm.hxx | 3 | ||||
-rw-r--r-- | svx/source/items/customshapeitem.cxx | 7 | ||||
-rw-r--r-- | svx/source/svdraw/svdattr.cxx | 72 |
11 files changed, 0 insertions, 117 deletions
diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx index 30be2dbb3081..f29d0d48b412 100644 --- a/svx/inc/svx/sdangitm.hxx +++ b/svx/inc/svx/sdangitm.hxx @@ -50,10 +50,6 @@ public: String& rText, const IntlWrapper * pIntlWrapper = 0) const; - -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx index 4bf1108246b3..49efb7da83c2 100644 --- a/svx/inc/svx/sdasaitm.hxx +++ b/svx/inc/svx/sdasaitm.hxx @@ -68,11 +68,6 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif - sal_uInt32 GetCount() const { return aAdjustmentValueList.Count(); }; SVX_DLLPUBLIC const SdrCustomShapeAdjustmentValue& GetValue( sal_uInt32 nIndex ) const; SVX_DLLPUBLIC void SetValue( sal_uInt32 nIndex, diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx index 038935f790cc..9564f51b9aae 100644 --- a/svx/inc/svx/sdasitm.hxx +++ b/svx/inc/svx/sdasitm.hxx @@ -105,9 +105,6 @@ private: const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const; -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif com::sun::star::uno::Any* GetPropertyValueByName( const rtl::OUString& rPropName ); com::sun::star::uno::Any* GetPropertyValueByName( const rtl::OUString& rPropName, const rtl::OUString& rPropName2 ); diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx index 16ca590add89..e98aba94976d 100644 --- a/svx/inc/svx/sdmetitm.hxx +++ b/svx/inc/svx/sdmetitm.hxx @@ -52,10 +52,6 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; - -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx index fa4447bbbd6c..0e795cdf6032 100644 --- a/svx/inc/svx/sdooitm.hxx +++ b/svx/inc/svx/sdooitm.hxx @@ -49,10 +49,6 @@ public: virtual String GetValueTextByVal(BOOL bVal) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; - -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx index b63b34dcf473..9089c69f547d 100644 --- a/svx/inc/svx/sdprcitm.hxx +++ b/svx/inc/svx/sdprcitm.hxx @@ -48,10 +48,6 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; - -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; //------------------------------------------------------------ @@ -70,10 +66,6 @@ public: virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0 ) const; - -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx index 219c5f57b086..a29c2bfa37fc 100644 --- a/svx/inc/svx/sdtfchim.hxx +++ b/svx/inc/svx/sdtfchim.hxx @@ -49,10 +49,6 @@ public: SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - -#ifdef SDR_ISPOOLABLE - SVX_DLLPRIVATE virtual int IsPoolable() const; -#endif }; #endif diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx index f55d0e7cee64..c83c4dca5f88 100644 --- a/svx/inc/svx/sdynitm.hxx +++ b/svx/inc/svx/sdynitm.hxx @@ -47,9 +47,6 @@ public: virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; virtual String GetValueTextByVal(BOOL bVal) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx index c4c6f5d5b832..25191754f275 100644 --- a/svx/inc/svx/sxfiitm.hxx +++ b/svx/inc/svx/sxfiitm.hxx @@ -49,9 +49,6 @@ public: virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const; const Fraction& GetValue() const { return nValue; } void SetValue(const Fraction& rVal) { nValue = rVal; } -#ifdef SDR_ISPOOLABLE - virtual int IsPoolable() const; -#endif }; diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 3c9b427384fc..af426ec21937 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -345,13 +345,6 @@ SfxPoolItem* SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/ ) const return pItem; } -#ifdef SDR_ISPOOLABLE -int SdrCustomShapeGeometryItem::IsPoolable() const -{ - USHORT nId=Which(); - return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST; -} -#endif sal_uInt16 SdrCustomShapeGeometryItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const { return 1; diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 57381d64ea59..618cde189d5f 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -698,14 +698,6 @@ SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const return new SdrFractionItem(Which(),GetValue()); } -#ifdef SDR_ISPOOLABLE -int SdrFractionItem::IsPoolable() const -{ - USHORT nId=Which(); - return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST; -} -#endif - //////////////////////////////////////////////////////////////////////////////// // ScaleItem //////////////////////////////////////////////////////////////////////////////// @@ -788,14 +780,6 @@ SfxItemPresentation SdrOnOffItem::GetPresentation(SfxItemPresentation ePres, return ePres; } -#ifdef SDR_ISPOOLABLE -int SdrOnOffItem::IsPoolable() const -{ - USHORT nId=Which(); - return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST; -} -#endif - TYPEINIT1_AUTOFACTORY(SdrYesNoItem,SfxBoolItem); SfxPoolItem* SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const @@ -828,14 +812,6 @@ SfxItemPresentation SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, return ePres; } -#ifdef SDR_ISPOOLABLE -int SdrYesNoItem::IsPoolable() const -{ - USHORT nId=Which(); - return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST; -} -#endif - //------------------------------------------------------------ // class SdrPercentItem //------------------------------------------------------------ @@ -871,14 +847,6 @@ SfxItemPresentation SdrPercentItem::GetPresentation( return ePres; } -#ifdef SDR_ISPOOLABLE -int SdrPercentItem::IsPoolable() const -{ - USHORT nId=Which(); - return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST; -} -#endif - //------------------------------------------------------------ // class SdrAngleItem //------------------------------------------------------------ @@ -968,14 +936,6 @@ SfxItemPresentation SdrAngleItem::GetPresentation( return ePres; } -#ifdef SDR_ISPOOLABLE -int SdrAngleItem::IsPoolable() const -{ - USHORT nId=Which(); - return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST; -} -#endif - //------------------------------------------------------------ // class SdrMetricItem //------------------------------------------------------------ @@ -1028,14 +988,6 @@ SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres, return ePres; } -#ifdef SDR_ISPOOLABLE -int SdrMetricItem::IsPoolable() const -{ - USHORT nId=Which(); - return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST; -} -#endif - //////////////////////////////////////////////////////////////////////////////// // Items des Legendenobjekts //////////////////////////////////////////////////////////////////////////////// @@ -1505,13 +1457,6 @@ bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMemberI SetValue( bValue ); return true; } -#ifdef SDR_ISPOOLABLE -int SdrTextFixedCellHeightItem::IsPoolable() const -{ - USHORT nId=Which(); - return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST; -} -#endif TYPEINIT1_AUTOFACTORY( SdrCustomShapeAdjustmentItem, SfxPoolItem ); @@ -1615,14 +1560,6 @@ SfxPoolItem* SdrCustomShapeAdjustmentItem::Clone( SfxItemPool * /*pPool*/) const return pItem; } -#ifdef SDR_ISPOOLABLE -int SdrCustomShapeAdjustmentItem::IsPoolable() const -{ - USHORT nId=Which(); - return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST; -} -#endif - const SdrCustomShapeAdjustmentValue& SdrCustomShapeAdjustmentItem::GetValue( sal_uInt32 nIndex ) const { #ifdef DBG_UTIL @@ -2171,15 +2108,6 @@ SfxItemPresentation SdrSignedPercentItem::GetPresentation( return ePres; } -#ifdef SDR_ISPOOLABLE - -int SdrSignedPercentItem::IsPoolable() const -{ - USHORT nId=Which(); - return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST; -} -#endif - //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ // SdrGrafRedItem //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |