diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-08-17 05:43:57 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-17 16:33:48 +0200 |
commit | 5a64d8b20ed74559617d2f97c3f941842b6a9ea1 (patch) | |
tree | b1a199d190faa447544979896a34caf7f8b3e3ff /svx | |
parent | 9f56a577771b0a842c8be3ad1341cabdb47ac1fc (diff) |
drop unused SdrCustomShapeAdjustmentItem
unused since commit 935baf97a926baa50d985808736e0adb8837c716
Date: Tue May 19 09:32:45 2009 +0000
CWS-TOOLING: integrate CWS impress169
Change-Id: I1e8b0285ae1f6e8d92efd3f5a2463ff3126f1a0d
Reviewed-on: https://gerrit.libreoffice.org/41248
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 1 | ||||
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 1 | ||||
-rw-r--r-- | svx/source/svdraw/svdattr.cxx | 113 | ||||
-rw-r--r-- | svx/source/unodraw/unoprov.cxx | 7 |
4 files changed, 0 insertions, 122 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 630a2a4cf39d..cf33390dea26 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -28,7 +28,6 @@ #include <svx/svdocapt.hxx> #include <svx/svdpage.hxx> #include <svx/xflclit.hxx> -#include <svx/sdasaitm.hxx> #include <svx/svdmodel.hxx> #include <rtl/crc.h> #include <rtl/math.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 18b4965e87f4..f83cdc4fb66d 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -25,7 +25,6 @@ #include <vcl/metric.hxx> #include <svx/svdpage.hxx> #include <svx/sdasitm.hxx> -#include <svx/sdasaitm.hxx> #include <svx/sdtfsitm.hxx> #include <vcl/virdev.hxx> #include <svx/svditer.hxx> diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index cc94cf7efc3e..e4fb92b3e0ee 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -161,7 +161,6 @@ SdrItemPool::SdrItemPool( rPoolDefaults[SDRATTR_TEXT_ANIDELAY -SDRATTR_START]=new SdrTextAniDelayItem; rPoolDefaults[SDRATTR_TEXT_ANIAMOUNT -SDRATTR_START]=new SdrTextAniAmountItem; rPoolDefaults[SDRATTR_TEXT_CONTOURFRAME -SDRATTR_START]=new SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME, false); - rPoolDefaults[SDRATTR_CUSTOMSHAPE_ADJUSTMENT -SDRATTR_START]=new SdrCustomShapeAdjustmentItem; rPoolDefaults[SDRATTR_XMLATTRIBUTES -SDRATTR_START]=new SvXMLAttrContainerItem( SDRATTR_XMLATTRIBUTES ); rPoolDefaults[SDRATTR_TEXT_CHAINNEXTNAME -SDRATTR_START]=new SfxStringItem(SDRATTR_TEXT_CHAINNEXTNAME, ""); rPoolDefaults[SDRATTR_TEXT_USEFIXEDCELLHEIGHT -SDRATTR_START]=new SdrTextFixedCellHeightItem; @@ -479,7 +478,6 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName) case SDRATTR_TEXT_ANIDELAY : pResId = SIP_SA_TEXT_ANIDELAY;break; case SDRATTR_TEXT_ANIAMOUNT : pResId = SIP_SA_TEXT_ANIAMOUNT;break; case SDRATTR_TEXT_CONTOURFRAME : pResId = SIP_SA_TEXT_CONTOURFRAME;break; - case SDRATTR_CUSTOMSHAPE_ADJUSTMENT : pResId = SIP_SA_CUSTOMSHAPE_ADJUSTMENT;break; case SDRATTR_XMLATTRIBUTES : pResId = SIP_SA_XMLATTRIBUTES;break; case SDRATTR_TEXT_USEFIXEDCELLHEIGHT: pResId = SIP_SA_TEXT_USEFIXEDCELLHEIGHT;break; case SDRATTR_TEXT_WORDWRAP : pResId = SIP_SA_WORDWRAP;break; @@ -1301,117 +1299,6 @@ bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMe return true; } - -SdrCustomShapeAdjustmentItem::SdrCustomShapeAdjustmentItem() : SfxPoolItem( SDRATTR_CUSTOMSHAPE_ADJUSTMENT ) -{ -} - -SdrCustomShapeAdjustmentItem::~SdrCustomShapeAdjustmentItem() -{ -} - -bool SdrCustomShapeAdjustmentItem::operator==( const SfxPoolItem& rCmp ) const -{ - bool bRet = SfxPoolItem::operator==( rCmp ); - if ( bRet ) - { - bRet = GetCount() == static_cast<const SdrCustomShapeAdjustmentItem&>(rCmp).GetCount(); - - if (bRet) - { - for (sal_uInt32 i = 0; i < GetCount(); ++i) - if (aAdjustmentValueList[i].nValue != static_cast<const SdrCustomShapeAdjustmentItem&>(rCmp).aAdjustmentValueList[i].nValue) - return false; - } - } - return bRet; -} - -bool SdrCustomShapeAdjustmentItem::GetPresentation( - SfxItemPresentation ePresentation, MapUnit /*eCoreMetric*/, - MapUnit /*ePresentationMetric*/, OUString &rText, const IntlWrapper&) const -{ - sal_uInt32 i, nCount = GetCount(); - rText += OUString::number( nCount ); - for ( i = 0; i < nCount; i++ ) - { - rText = rText + " " + OUString::number( GetValue( i ).nValue ); - } - if ( ePresentation == SfxItemPresentation::Complete ) - { - OUString aStr; - - SdrItemPool::TakeItemName( Which(), aStr ); - rText = aStr + " " + rText; - } - return true; -} - -SfxPoolItem* SdrCustomShapeAdjustmentItem::Clone( SfxItemPool * /*pPool*/) const -{ - SdrCustomShapeAdjustmentItem* pItem = new SdrCustomShapeAdjustmentItem; - pItem->aAdjustmentValueList = aAdjustmentValueList; - return pItem; -} - -const SdrCustomShapeAdjustmentValue& SdrCustomShapeAdjustmentItem::GetValue( sal_uInt32 nIndex ) const -{ -#ifdef DBG_UTIL - if ( aAdjustmentValueList.size() <= nIndex ) - OSL_FAIL( "SdrCustomShapeAdjustemntItem::GetValue - nIndex out of range (SJ)" ); -#endif - return aAdjustmentValueList[nIndex]; -} - -void SdrCustomShapeAdjustmentItem::SetValue( sal_uInt32 nIndex, const SdrCustomShapeAdjustmentValue& rVal ) -{ - for (sal_uInt32 i = aAdjustmentValueList.size(); i <= nIndex; i++ ) - aAdjustmentValueList.push_back(SdrCustomShapeAdjustmentValue()); - - aAdjustmentValueList[nIndex] = rVal; -} - -sal_uInt16 SdrCustomShapeAdjustmentItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const -{ - return 1; -} - -bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const -{ - sal_uInt32 i, nCount = GetCount(); - uno::Sequence< sal_Int32 > aSequence( nCount ); - if ( nCount ) - { - sal_Int32* pPtr = aSequence.getArray(); - for ( i = 0; i < nCount; i++ ) - *pPtr++ = GetValue( i ).nValue; - } - rVal <<= aSequence; - return true; -} - -bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) -{ - uno::Sequence< sal_Int32 > aSequence; - if( !( rVal >>= aSequence ) ) - return false; - - aAdjustmentValueList.clear(); - - sal_uInt32 i, nCount = aSequence.getLength(); - if ( nCount ) - { - SdrCustomShapeAdjustmentValue val; - const sal_Int32* pPtr2 = aSequence.getConstArray(); - for ( i = 0; i < nCount; i++ ) - { - val.nValue = *pPtr2++; - aAdjustmentValueList.push_back(val); - } - } - return true; -} - // EdgeKind SfxPoolItem* SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeKindItem(*this); } diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 92d9f1b7ff4c..48caa04e1683 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -64,7 +64,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - CUSTOMSHAPE_PROPERTIES { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -88,7 +87,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - CUSTOMSHAPE_PROPERTIES { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -161,7 +159,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - CUSTOMSHAPE_PROPERTIES { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -187,7 +184,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - CUSTOMSHAPE_PROPERTIES { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -213,7 +209,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonBezierPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - CUSTOMSHAPE_PROPERTIES { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -419,7 +414,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap() SPECIAL_3DBACKSCALE_PROPERTIES SPECIAL_3DPOLYGONOBJECT_PROPERTIES - CUSTOMSHAPE_PROPERTIES { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType<css::container::XNameContainer>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } @@ -694,7 +688,6 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() { OUString("CustomShapeGeometry"), SDRATTR_CUSTOMSHAPE_GEOMETRY, cppu::UnoType<css::uno::Sequence< css::beans::PropertyValue >>::get(), 0, 0 }, { OUString("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, cppu::UnoType<OUString>::get(), 0, 0}, - CUSTOMSHAPE_PROPERTIES FILL_PROPERTIES LINE_PROPERTIES LINE_PROPERTIES_START_END |