From a27bad586b418e566ba88cd7f99ccb45dbc1282f Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Fri, 27 Apr 2012 00:52:19 +0900 Subject: removed dead code --- svx/source/customshapes/EnhancedCustomShape2d.cxx | 14 --------- .../customshapes/EnhancedCustomShapeEngine.cxx | 15 --------- .../customshapes/EnhancedCustomShapeGeometry.cxx | 36 ---------------------- svx/source/unodraw/unoshtxt.cxx | 7 ----- svx/source/xoutdev/xattr.cxx | 16 ---------- 5 files changed, 88 deletions(-) diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 39a7709e7827..08762bb1418f 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -508,20 +508,6 @@ sal_Bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle( if ( rPropVal.Value >>= rDestinationHandle.aPolar ) rDestinationHandle.nFlags |= HANDLE_FLAGS_POLAR; } -/* seems not to be used. - else if ( rPropVal.Name.equals( sMap ) ) - { - com::sun::star::drawing::EnhancedCustomShapeParameterPair aMap; - if ( rPropVal.Value >>= aMap ) - { - if ( GetValueForEnhancedCustomShapeHandleParameter( nXMap, aMap.First ) ) - rDestinationHandle.Flags |= 0x800; - if ( GetValueForEnhancedCustomShapeHandleParameter( nYMap, aMap.Second ) ) - rDestinationHandle.Flags |= 0x1000; - rDestinationHandle.Flags |= 0x10; - } - } -*/ else if ( rPropVal.Name.equals( sRefX ) ) { if ( rPropVal.Value >>= rDestinationHandle.nRefX ) diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index cfb8c41678e8..5be4546d4fea 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -240,21 +240,6 @@ void SetTemporary( ::com::sun::star::uno::Reference< ::com::sun::star::drawing:: SvxShape* pShape = SvxShape::getImplementation( xShape ); if ( pShape ) pShape->TakeSdrObjectOwnership(); -/* - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes > xShapes( xShape, ::com::sun::star::uno::UNO_QUERY ); - if ( xShapes.is() ) - { - sal_Int32 i; - for ( i = 0; i < xShapes->getCount(); i++ ) - { - ::com::sun::star::uno::Any aAny( xShapes->getByIndex( i ) ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape; - if ( aAny >>= xShape ) - SetTemporary( xShape ); - } - } -*/ } } diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index b0ede74ef749..4bc2cd389b53 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -33,42 +33,6 @@ static const sal_Int32 MIN_INT32 = std::numeric_limits::min(); -/* -static const SvxMSDffVertPair Vert[] = -{ - { 0, 0, } -}; -static const sal_uInt16 Segm[] = -{ - 0x4000, - 0x8000 -}; -static const SvxMSDffCalculationData Calc[] = -{ - { 0x0000, 0, 0, 0 } -}; -static const sal_Int32 Default[] = -{ - 0 -}; -static const SvxMSDffTextRect TextRect[] = -{ - { { 0, 0 }, { 0, 0 } } -}; -static const mso_CustomShape mso = -{ - (SvxMSDffVertPair*)mso_sptVert, SAL_N_ELEMENTS( mso_sptVert ), - (sal_uInt16*)mso_sptSegm, sizeof( mso_sptSegm ) >> 1, - (SvxMSDffCalculationData*)mso_sptCalc, SAL_N_ELEMENTS( mso_sptCalc ), - (sal_Int32*)mso_sptDefault, - (SvxMSDffTextRectangles*)mso_sptTextRect, SAL_N_ELEMENTS( mso_sptTextRect ), - 21600, 21600, - MIN_INT32, MIN_INT32, - (SvxMSDffVertPair*)mso_sptVert, SAL_N_ELEMENTS( mso_sptVert ), - (SvxMSDffHandles*)mso_sptHandles, SAL_N_ELEMENTS( mso_sptHandles ) -}; -*/ - static const sal_Int32 mso_sptDefault0[] = { 1, 0 diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 17cc1e6f3ea3..6779a018ce6a 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -576,11 +576,6 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() } mpOutliner->SetTextObjNoInit( pTextObj ); -/* - mpOutliner = SdrMakeOutliner( nOutlMode, pModel ); - Outliner& aDrawOutliner = pModel->GetDrawOutliner(); - mpOutliner->SetCalcFieldValueHdl( aDrawOutliner.GetCalcFieldValueHdl() ); -*/ if( mbIsLocked ) { ((EditEngine*)&(mpOutliner->GetEditEngine()))->SetUpdateMode( sal_False ); @@ -588,7 +583,6 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() ((EditEngine*)&(mpOutliner->GetEditEngine()))->EnableUndo( sal_False ); } -// - if ( !m_xLinguServiceManager.is() ) { css::uno::Reference< css::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); @@ -602,7 +596,6 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() if( xHyphenator.is() ) mpOutliner->SetHyphenator( xHyphenator ); } -// - } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 18745ef829f3..813f1b0e3f66 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -3669,22 +3669,6 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const //------------------------------------------------------------------------ -//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, sal_uInt16 nVer ) const -//{ -// return( ( 0 == nVer ) ? Clone( NULL ) : new XFillFloatTransparenceItem( rIn, nVer ) ); -//} - -//------------------------------------------------------------------------ - -//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const -//{ -// XFillGradientItem::Store( rOut, nItemVersion ); -// rOut << bEnabled; -// return rOut; -//} - -//------------------------------------------------------------------------ - sal_uInt16 XFillFloatTransparenceItem::GetVersion( sal_uInt16 nFileFormatVersion ) const { // !!! if version number of this object must be increased, please !!! -- cgit