Skip to content

C
core
Kaydet (Commit) e8abc2e2 authored tarafından Takeshi Abe's avatar Takeshi Abe
Dosyalara gözat
Seçenekler

nuke dead code 

Change-Id: I1884cfcbe7276d902ba3f8525ffe39c7f33b729e
üst c559bda8
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 190 deletions
svx/source/table/cell.cxx
Dosyayı görüntüle @ e8abc2e2
......@@ -1062,12 +1062,6 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(Unknow
{
switch( pMap->nWID )
{
/*
case OWN_ATTR_HASLEVELS:
{
return Any( hasLevels() );
}
*/
case OWN_ATTR_STYLE:
{
return Any( Reference< XStyle >( dynamic_cast< SfxUnoStyleSheet* >( GetStyleSheet() ) ) );
......@@ -1280,12 +1274,6 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
eState = PropertyState_DEFAULT_VALUE;
}
}
/*
case OWN_ATTR_HASLEVELS:
{
return PropertyState_DIRECT_VALUE;
}
*/
case OWN_ATTR_STYLE:
{
return PropertyState_DIRECT_VALUE;
......@@ -1311,9 +1299,6 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
case SFX_ITEM_DEFAULT:
eState = PropertyState_DEFAULT_VALUE;
break;
// case SFX_ITEM_UNKNOWN:
// case SFX_ITEM_DONTCARE:
// case SFX_ITEM_DISABLED:
default:
eState = PropertyState_AMBIGUOUS_VALUE;
break;
......@@ -1412,7 +1397,6 @@ void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(U
mpProperties->ClearObjectItem( XATTR_FILLBMP_TILE );
break;
}
// case OWN_ATTR_HASLEVELS:
case OWN_ATTR_STYLE:
break;
......@@ -1452,10 +1436,6 @@ Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(Unk
case OWN_ATTR_FILLBMP_MODE:
return Any( BitmapMode_NO_REPEAT );
/*
case OWN_ATTR_HASLEVELS:
return Any( sal_False );
*/
case OWN_ATTR_STYLE:
{
Reference< XStyle > xStyle;
......
svx/source/table/svdotable.cxx
Dosyayı görüntüle @ e8abc2e2
......@@ -223,7 +223,6 @@ public:
TableStyleSettings maTableStyle;
Reference< XIndexAccess > mxTableStyle;
bool mbModifyPending;
// sal_Int32 mnSavedEditRowHeight;
void SetModel(SdrModel* pOldModel, SdrModel* pNewModel);
......@@ -244,8 +243,6 @@ public:
void DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset );
// void GetBorderLines( const CellPos& rPos, const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop, const SvxBorderLine** ppRight, const SvxBorderLine** ppBottom ) const;
void operator=( const SdrTableObjImpl& rSource );
// XModifyListener
......@@ -1308,7 +1305,6 @@ void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
{
Rectangle aRect0( aRect );
aRect = maLogicRect;
// mpImpl->mpLayouter->setRowHeight( mpImpl->maEditPos.mnRow, mpImpl->mnSavedEditRowHeight );
mpImpl->LayoutTable( aRect, false, false );
SetRectsDirty();
ActionChanged();
......@@ -1404,7 +1400,6 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
TakeTextAnchorRect( rPos, aAnkRect );
SdrTextVertAdjust eVAdj=xCell->GetTextVerticalAdjust();
// SdrTextHorzAdjust eHAdj=xCell->GetTextHorizontalAdjust();
sal_uIntPtr nStat0=rOutliner.GetControlWord();
Size aNullSize;
......@@ -1459,16 +1454,6 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
Point aTextPos(aAnkRect.TopLeft());
Size aTextSiz(rOutliner.GetPaperSize());
/*
if (eHAdj==SDRTEXTHORZADJUST_CENTER || eHAdj==SDRTEXTHORZADJUST_RIGHT)
{
long nFreeWdt=aAnkRect.GetWidth()-aTextSiz.Width();
if (eHAdj==SDRTEXTHORZADJUST_CENTER)
aTextPos.X()+=nFreeWdt/2;
if (eHAdj==SDRTEXTHORZADJUST_RIGHT)
aTextPos.X()+=nFreeWdt;
}
*/
if (eVAdj==SDRTEXTVERTADJUST_CENTER || eVAdj==SDRTEXTVERTADJUST_BOTTOM)
{
long nFreeHgt=aAnkRect.GetHeight()-aTextSiz.Height();
......@@ -1602,33 +1587,14 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size*
CellRef xCell( mpImpl->getCell( rPos ) );
SdrTextVertAdjust eVAdj = xCell.is() ? xCell->GetTextVerticalAdjust() : SDRTEXTVERTADJUST_TOP;
// SdrTextHorzAdjust eHAdj = xCell.is() ? xCell->GetTextHorizontalAdjust() : SDRTEXTHORZADJUST_LEFT;
aPaperMax=aMaxSiz;
// if((SDRTEXTHORZADJUST_BLOCK == eHAdj && !IsVerticalWriting()) || (SDRTEXTVERTADJUST_BLOCK == eVAdj && IsVerticalWriting()))
aPaperMin.Width() = aAnkSiz.Width();
if (pViewMin!=NULL)
{
*pViewMin=aViewInit;
/*
long nXFree=aAnkSiz.Width()-aPaperMin.Width();
if (eHAdj==SDRTEXTHORZADJUST_LEFT)
{
pViewMin->Right()-=nXFree;
}
else if (eHAdj==SDRTEXTHORZADJUST_RIGHT)
{
pViewMin->Left()+=nXFree;
}
else
{
pViewMin->Left()+=nXFree/2;
pViewMin->Right()=pViewMin->Left()+aPaperMin.Width();
}
*/
long nYFree=aAnkSiz.Height()-aPaperMin.Height();
if (eVAdj==SDRTEXTVERTADJUST_TOP)
......@@ -1666,9 +1632,7 @@ sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const
if( xCell.is() )
{
SdrTextVertAdjust eV=xCell->GetTextVerticalAdjust();
// SdrTextHorzAdjust eH=xCell->GetTextHorizontalAdjust();
// if (eH==SDRTEXTHORZADJUST_LEFT)
{
if (eV==SDRTEXTVERTADJUST_TOP)
{
......@@ -1683,38 +1647,6 @@ sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const
eRet=ANCHOR_VCENTER_LEFT;
}
}
/*
else if (eH==SDRTEXTHORZADJUST_RIGHT)
{
if (eV==SDRTEXTVERTADJUST_TOP)
{
eRet=ANCHOR_TOP_RIGHT;
}
else if (eV==SDRTEXTVERTADJUST_BOTTOM)
{
eRet=ANCHOR_BOTTOM_RIGHT;
}
else
{
eRet=ANCHOR_VCENTER_RIGHT;
}
}
else
{
if (eV==SDRTEXTVERTADJUST_TOP)
{
eRet=ANCHOR_TOP_HCENTER;
}
else if (eV==SDRTEXTVERTADJUST_BOTTOM)
{
eRet=ANCHOR_BOTTOM_HCENTER;
}
else
{
eRet=ANCHOR_VCENTER_HCENTER;
}
}
*/
}
return (sal_uInt16)eRet;
}
......@@ -1867,14 +1799,11 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
pEdtOutl=&rOutl;
// ForceOutlinerParaObject();
mbInEditMode = sal_True;
rOutl.Init( OUTLINERMODE_TEXTOBJECT );
rOutl.SetRefDevice( pModel->GetRefDevice() );
// --
bool bUpdMerk=rOutl.GetUpdateMode();
if (bUpdMerk) rOutl.SetUpdateMode(sal_False);
Size aPaperMin;
......@@ -1887,10 +1816,8 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
rOutl.SetPaperSize(aPaperMax);
if (bUpdMerk) rOutl.SetUpdateMode(sal_True);
//---
sal_uIntPtr nStat=rOutl.GetControlWord();
// nStat &= ~EE_CNTRL_AUTOPAGESIZE;
nStat |= EE_CNTRL_AUTOPAGESIZE;
nStat &=~EE_CNTRL_STRETCHING;
rOutl.SetControlWord(nStat);
......@@ -1902,8 +1829,6 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
rOutl.UpdateFields();
rOutl.ClearModifyFlag();
// mpImpl->mnSavedEditRowHeight = mpImpl->mpLayouter->getRowHeight( mpImpl->maEditPos.mnRow );
return sal_True;
}
......@@ -1985,8 +1910,6 @@ void SdrTableObj::NbcSetOutlinerParaObject( OutlinerParaObject* pTextObject)
SetTextSizeDirty();
NbcAdjustTextFrameWidthAndHeight();
// ImpSetTextStyleSheetListeners();
// ImpCheckMasterCachable();
}
}
......
svx/source/tbxctrls/fontworkgallery.cxx
Dosyayı görüntüle @ e8abc2e2
......@@ -133,21 +133,6 @@ void FontWorkGalleryDialog::initfavorites(sal_uInt16 nThemeId, std::vector< Bitm
if( GalleryExplorer::GetSdrObj( nThemeId, nModelPos, pModel, pThumb ) )
{
/*
VirtualDevice aVDev;
Size aRenderSize( aThumbSize.Width() * 4, aThumbSize.Height() * 4 );
aVDev.SetOutputSizePixel( aRenderSize );
if( GalleryExplorer::DrawCentered( &aVDev, *pModel ) )
{
aThumb = aVDev.GetBitmap( Point(), aVDev.GetOutputSizePixel() );
Size aMS( 4, 4 );
BmpFilterParam aParam( aMS );
aThumb.Filter( BMP_FILTER_MOSAIC, &aParam );
aThumb.Scale( aThumbSize );
}
*/
}
rFavorites.push_back( pThumb );
......@@ -218,15 +203,6 @@ void FontWorkGalleryDialog::insertSelectedFontwork()
{
Rectangle aObjRect( pNewObject->GetLogicRect() );
Rectangle aVisArea = pOutDev->PixelToLogic(Rectangle(Point(0,0), pOutDev->GetOutputSizePixel()));
/*
sal_Int32 nObjHeight = aObjRect.GetHeight();
VirtualDevice aVirDev( 1 ); // calculating the optimal textwidth
Font aFont;
aFont.SetHeight( nObjHeight );
aVirDev.SetMapMode( MAP_100TH_MM );
aVirDev.SetFont( aFont );
aObjRect.SetSize( Size( aVirDev.GetTextWidth( maStrClickToAddText ), nObjHeight ) );
*/
Point aPagePos = aVisArea.Center();
aPagePos.X() -= aObjRect.GetWidth() / 2;
aPagePos.Y() -= aObjRect.GetHeight() / 2;
......
svx/source/toolbars/fontworkbar.cxx
Dosyayı görüntüle @ e8abc2e2
......@@ -583,12 +583,6 @@ void FontworkBar::getState( SdrView* pSdrView, SfxItemSet& rSet )
{
sal_uInt32 nCheckStatus = 0;
/*
if ( rSet.GetItemState( SID_FONTWORK_SHAPE ) != SFX_ITEM_UNKNOWN )
{
sal_Bool bBreak = sal_True;
}
*/
if ( rSet.GetItemState( SID_FONTWORK_ALIGNMENT_FLOATER ) != SFX_ITEM_UNKNOWN )
{
if ( !checkForSelectedFontWork( pSdrView, nCheckStatus ) )
......
svx/source/unodraw/unoctabl.cxx
Dosyayı görüntüle @ e8abc2e2
......@@ -241,15 +241,6 @@ uno::Reference< uno::XInterface > SAL_CALL create_EnhancedCustomShapeEngine( con
#include "uno/lbnames.h"
#include <svx/sdr/primitive2d/primitiveFactory2d.hxx>
/*
namespace svx
{
extern OUString SAL_CALL ExtrusionDepthController_getImplementationName();
extern uno::Reference< uno::XInterface > SAL_CALL ExtrusionDepthController_createInstance(const uno::Reference< lang::XMultiServiceFactory > &) throw( uno::RuntimeException );
extern uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( uno::RuntimeException );
}
*/
extern "C"
{
......@@ -362,16 +353,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL svx_component_getFactory (
::svx::SvXMLGraphicExportHelper_createInstance,
::svx::SvXMLGraphicExportHelper_getSupportedServiceNames() );
}
/*
else if( ::svx::ExtrusionDepthController_getImplementationName().equalsAscii( pImplName ) )
{
xFactory = ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
::svx::ExtrusionDepthController_getImplementationName(),
::svx::ExtrusionDepthController_createInstance,
::svx::ExtrusionDepthController_getSupportedServiceNames() );
}
*/
if( xFactory.is())
{
xFactory->acquire();
......
svx/source/unodraw/unoshap4.cxx
Dosyayı görüntüle @ e8abc2e2
......@@ -101,50 +101,6 @@ bool SvxOle2Shape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
{
switch( pProperty->nWID )
{
/*
case OWN_ATTR_CLSID:
{
OUString aCLSID;
if( rValue >>= aCLSID )
{
// init an ole object with a global name
SdrOle2Obj* pOle2 = dynamic_cast< SdrOle2Obj* >( mpObj.get() );
if( pOle2 )
{
uno::Reference < embed::XEmbeddedObject > xObj = pOle2->GetObjRef();
if ( !xObj.is() )
{
SvGlobalName aClassName;
if( aClassName.MakeId( aCLSID ) )
{
SfxObjectShell* pPersist = mpModel->GetPersist();
::rtl::OUString aPersistName;
Any aAny( getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )) ) );
aAny >>= aPersistName;
//TODO/LATER: how to cope with creation failure?!
xObj = pPersist->GetEmbeddedObjectContainer().CreateEmbeddedObject( aClassName.GetByteSequence(), aPersistName );
if( xObj.is() )
{
aAny <<= aPersistName;
setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_OLE2_PERSISTNAME )), aAny );
pOle2->SetObjRef( xObj );
Rectangle aRect = pOle2->GetLogicRect();
awt::Size aSz;
Size aSize( pOle2->GetLogicRect().GetSize() );
aSz.Width = aSize.Width();
aSz.Height = aSize.Height();
xObj->setVisualAreaSize( pOle2->GetAspect(), aSz );
}
}
}
}
return true;
}
break;
}
*/
case OWN_ATTR_OLE_VISAREA:
{
// TODO/LATER: seems to make no sence for iconified object
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment