diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-02-24 03:33:36 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-02-24 05:33:53 +0100 |
commit | a3fccd27deeee38af5bb08c31e6317002a0e3e9e (patch) | |
tree | 6dbb5d57c846f83e86fb5a09a62dbc0643e012bb /filter | |
parent | 695dca68537e56e66657a43667793af5eb4b6695 (diff) |
unusedcode.easy: remove unused code
Diffstat (limited to 'filter')
-rw-r--r-- | filter/inc/filter/msfilter/msdffimp.hxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 81 |
2 files changed, 0 insertions, 83 deletions
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx index e2d6ced95ed9..1616adbaa162 100644 --- a/filter/inc/filter/msfilter/msdffimp.hxx +++ b/filter/inc/filter/msfilter/msdffimp.hxx @@ -519,7 +519,6 @@ protected : const unsigned long nDrawingContainerId ); bool ReadGraphic( SvStream& rSt, sal_uLong nIndex, Graphic& rGraphic ) const; - SdrObject* ImportFontWork( SvStream&, SfxItemSet&, Rectangle& rBoundRect ) const; SdrObject* ImportGraphic( SvStream&, SfxItemSet&, const DffObjData& ); // #i32596# - pass <nCalledByGroup> to method // Needed in the Writer Microsoft Word import to avoid import of OLE objects @@ -530,7 +529,6 @@ protected : const Rectangle& rVisArea, const int _nCalledByGroup, sal_Int64 nAspect ) const; - SdrObject* GetAutoForm( MSO_SPT eTyp ) const; static com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > CheckForConvertToSOObj( sal_uInt32 nConvertFlags, SotStorage& rSrcStg, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg, diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index da90330a47e3..a39a556f9546 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4014,73 +4014,6 @@ rtl::OUString SvxMSDffManager::MSDFFReadZString(SvStream& rIn, return sBuf.EraseTrailingChars( 0 ); } -SdrObject* SvxMSDffManager::ImportFontWork( SvStream& rStCt, SfxItemSet& rSet, Rectangle& rBoundRect ) const -{ - SdrObject* pRet = NULL; - String aObjectText; - String aFontName; - sal_Bool bTextRotate = sal_False; - - ((SvxMSDffManager*)this)->mnFix16Angle = 0; // we don't want to use this property in future - if ( SeekToContent( DFF_Prop_gtextUNICODE, rStCt ) ) - aObjectText = MSDFFReadZString( rStCt, GetPropertyValue( DFF_Prop_gtextUNICODE ), sal_True ); - if ( SeekToContent( DFF_Prop_gtextFont, rStCt ) ) - aFontName = MSDFFReadZString( rStCt, GetPropertyValue( DFF_Prop_gtextFont ), sal_True ); - if ( GetPropertyValue( DFF_Prop_gtextFStrikethrough, 0 ) & 0x2000 ) - { - // Text ist senkrecht formatiert, Box Kippen - sal_Int32 nHalfWidth = ( rBoundRect.GetWidth() + 1) >> 1; - sal_Int32 nHalfHeight = ( rBoundRect.GetHeight() + 1) >> 1; - Point aTopLeft( rBoundRect.Left() + nHalfWidth - nHalfHeight, - rBoundRect.Top() + nHalfHeight - nHalfWidth); - Size aNewSize( rBoundRect.GetHeight(), rBoundRect.GetWidth() ); - Rectangle aNewRect( aTopLeft, aNewSize ); - rBoundRect = aNewRect; - - String aSrcText( aObjectText ); - aObjectText.Erase(); - for( sal_uInt16 a = 0; a < aSrcText.Len(); a++ ) - { - aObjectText += aSrcText.GetChar( a ); - aObjectText += '\n'; - } - rSet.Put( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_CENTER ) ); - bTextRotate = sal_True; - } - if ( aObjectText.Len() ) - { // FontWork-Objekt Mit dem Text in aObjectText erzeugen - SdrObject* pNewObj = new SdrRectObj( OBJ_TEXT, rBoundRect ); - if( pNewObj ) - { - pNewObj->SetModel( pSdrModel ); - ((SdrRectObj*)pNewObj)->SetText( aObjectText ); - SdrFitToSizeType eFTS = SDRTEXTFIT_PROPORTIONAL; - rSet.Put( SdrTextFitToSizeTypeItem( eFTS ) ); - rSet.Put( SdrTextAutoGrowHeightItem( sal_False ) ); - rSet.Put( SdrTextAutoGrowWidthItem( sal_False ) ); - rSet.Put( SvxFontItem( FAMILY_DONTKNOW, aFontName, String(), - PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO )); - - pNewObj->SetMergedItemSet(rSet); - - pRet = pNewObj->ConvertToPolyObj( sal_False, sal_False ); - if( !pRet ) - pRet = pNewObj; - else - { - pRet->NbcSetSnapRect( rBoundRect ); - SdrObject::Free( pNewObj ); - } - if( bTextRotate ) - { - double a = 9000 * nPi180; - pRet->NbcRotate( rBoundRect.Center(), 9000, sin( a ), cos( a ) ); - } - } - } - return pRet; -} - static Size lcl_GetPrefSize(const Graphic& rGraf, MapMode aWanted) { MapMode aPrefMapMode(rGraf.GetPrefMapMode()); @@ -7581,20 +7514,6 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( return pRet; } -SdrObject* SvxMSDffManager::GetAutoForm( MSO_SPT eTyp ) const -{ - SdrObject* pRet = NULL; - - if(120 >= sal_uInt16(eTyp)) - { - pRet = new SdrRectObj(); - } - - DBG_ASSERT(pRet, "SvxMSDffManager::GetAutoForm -> UNKNOWN AUTOFORM"); - - return pRet; -} - sal_Bool SvxMSDffManager::SetPropValue( const uno::Any& rAny, const uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const String& rPropName, sal_Bool bTestPropertyAvailability ) { |