diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-22 12:55:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-29 10:41:37 +0200 |
| commit | b49e10f9dbe0d02b012ceff378e8e4e64a3016a0 (patch) | |
| tree | e5ebe76aa2e4db91d8bfe991aa8f5208dc38cff3 | |
| parent | aaa1861c49bf2549e1bddc461961871ac102a83d (diff) | |
remove unused code
Change-Id: I1393240d8ba74388484839fb94bb82fd9d78da32
| -rw-r--r-- | include/svx/EnhancedCustomShape2d.hxx | 5 | ||||
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 11 |
2 files changed, 0 insertions, 16 deletions
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 74f06e06f8e4..547fe6f98142 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -38,10 +38,6 @@ #include <memory> #include <vector> -#define DFF_CUSTOMSHAPE_FLIP_V 1 -#define DFF_CUSTOMSHAPE_FLIP_H 2 -#define DFF_CUSTOMSHAPE_EXCH 4 - class SdrModel; class SdrObject; class SfxItemSet; @@ -92,7 +88,6 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet sal_Int32 nXRef; sal_Int32 nYRef; - sal_uInt32 nFlags; sal_uInt32 nColorData; /* diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 368e87682d35..8bf41478447d 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -698,7 +698,6 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) : bOOXMLShape ( false ), nXRef ( 0x80000000 ), nYRef ( 0x80000000 ), - nFlags ( 0 ), nColorData ( 0 ), bTextFlow ( false ), bFilled ( static_cast<const XFillStyleItem&>(pAObj->GetMergedItem( XATTR_FILLSTYLE )).GetValue() != drawing::FillStyle_NONE ), @@ -939,15 +938,11 @@ Point EnhancedCustomShape2d::GetPoint( const com::sun::star::drawing::EnhancedCu const bool bScale, const bool bReplaceGeoSize ) const { Point aRetValue; - bool bExchange = ( nFlags & DFF_CUSTOMSHAPE_EXCH ) != 0; // x <-> y sal_uInt32 nPass = 0; do { sal_uInt32 nIndex = nPass; - if ( bExchange ) - nIndex ^= 1; - double fVal; const EnhancedCustomShapeParameter& rParameter = nIndex ? rPair.Second : rPair.First; if ( nPass ) // height @@ -957,9 +952,6 @@ Point EnhancedCustomShape2d::GetPoint( const com::sun::star::drawing::EnhancedCu if ( bScale ) { fVal *= fYScale; - - if ( nFlags & DFF_CUSTOMSHAPE_FLIP_V ) - fVal = aLogicRect.GetHeight() - fVal; } aRetValue.Y() = (sal_Int32)fVal; } @@ -970,9 +962,6 @@ Point EnhancedCustomShape2d::GetPoint( const com::sun::star::drawing::EnhancedCu if ( bScale ) { fVal *= fXScale; - - if ( nFlags & DFF_CUSTOMSHAPE_FLIP_H ) - fVal = aLogicRect.GetWidth() - fVal; } aRetValue.X() = static_cast<long>(fVal); } |