diff options
author | Felix Zhang <fezhang@suse.com> | 2011-11-18 18:23:52 +0800 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-11-18 23:35:52 +0100 |
commit | ddb1d5ebf0a81888001ffa1dbab883df70cdc279 (patch) | |
tree | 955d4a1dd2233669eb3256f93a43ff9b8da4fb31 /svx/source | |
parent | 898c527481059017c8f75ba51bfc80b297f0480d (diff) |
remove unused Sdr methods
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/items/customshapeitem.cxx | 40 | ||||
-rw-r--r-- | svx/source/svdraw/sdrpaintwindow.cxx | 11 | ||||
-rw-r--r-- | svx/source/svdraw/svdedtv.cxx | 14 | ||||
-rw-r--r-- | svx/source/svdraw/svdetc.cxx | 15 | ||||
-rw-r--r-- | svx/source/svdraw/svdglue.cxx | 45 | ||||
-rw-r--r-- | svx/source/svdraw/svdhdl.cxx | 5 | ||||
-rw-r--r-- | svx/source/svdraw/svdlayer.cxx | 10 | ||||
-rw-r--r-- | svx/source/svdraw/svdmark.cxx | 10 | ||||
-rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 110 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 28 | ||||
-rw-r--r-- | svx/source/svdraw/svdograf.cxx | 36 | ||||
-rw-r--r-- | svx/source/svdraw/svdomedia.cxx | 17 | ||||
-rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 42 | ||||
-rw-r--r-- | svx/source/svdraw/svdotext.cxx | 69 | ||||
-rw-r--r-- | svx/source/svdraw/svdotxat.cxx | 55 | ||||
-rw-r--r-- | svx/source/svdraw/svdpage.cxx | 41 | ||||
-rw-r--r-- | svx/source/svdraw/svdpagv.cxx | 70 | ||||
-rw-r--r-- | svx/source/svdraw/svdpntv.cxx | 47 | ||||
-rw-r--r-- | svx/source/svdraw/svdpoev.cxx | 5 | ||||
-rw-r--r-- | svx/source/svdraw/svdsnpv.cxx | 20 | ||||
-rw-r--r-- | svx/source/svdraw/svdundo.cxx | 20 | ||||
-rw-r--r-- | svx/source/svdraw/svdview.cxx | 28 |
22 files changed, 0 insertions, 738 deletions
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 3119696b14ca..38787788701a 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -37,16 +37,10 @@ using namespace com::sun::star; SdrCustomShapeEngineItem::SdrCustomShapeEngineItem() : SfxStringItem( SDRATTR_CUSTOMSHAPE_ENGINE, String() ) {} -SdrCustomShapeEngineItem::SdrCustomShapeEngineItem( const String& rVal ) -: SfxStringItem( SDRATTR_CUSTOMSHAPE_ENGINE, rVal ) -{} SdrCustomShapeDataItem::SdrCustomShapeDataItem() : SfxStringItem( SDRATTR_CUSTOMSHAPE_DATA, String() ) {} -SdrCustomShapeDataItem::SdrCustomShapeDataItem( const String& rVal ) -: SfxStringItem( SDRATTR_CUSTOMSHAPE_DATA, rVal ) -{} bool SdrCustomShapeGeometryItem::PropertyEq::operator()( const rtl::OUString& r1, const rtl::OUString& r2 ) const { @@ -248,37 +242,6 @@ void SdrCustomShapeGeometryItem::ClearPropertyValue( const rtl::OUString& rPropN } } -void SdrCustomShapeGeometryItem::ClearPropertyValue( const rtl::OUString& rSequenceName, const rtl::OUString& rPropName ) -{ - com::sun::star::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); - if ( pSeqAny ) - { - if ( pSeqAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Sequence < beans::PropertyValue >*)0) ) - { - PropertyPairHashMap::iterator aHashIter( aPropPairHashMap.find( PropertyPair( rSequenceName, rPropName ) ) ); - if ( aHashIter != aPropPairHashMap.end() ) - { - ::com::sun::star::uno::Sequence < beans::PropertyValue >& rSecSequence = - *((::com::sun::star::uno::Sequence < beans::PropertyValue >*)pSeqAny->getValue()); - - sal_Int32 nLength = rSecSequence.getLength(); - if ( nLength ) - { - sal_Int32 nIndex = (*aHashIter).second; - if ( nIndex != ( nLength - 1 ) ) // resizing sequence - { - PropertyPairHashMap::iterator aHashIter2( aPropPairHashMap.find( PropertyPair( rSequenceName, rSecSequence[ nLength - 1 ].Name ) ) ); - (*aHashIter2).second = nIndex; - rSecSequence[ nIndex ] = rSecSequence[ nLength - 1 ]; - } - rSecSequence.realloc( aPropSeq.getLength() - 1 ); - } - aPropPairHashMap.erase( aHashIter ); - } - } - } -} - SdrCustomShapeGeometryItem::~SdrCustomShapeGeometryItem() { } @@ -355,8 +318,5 @@ const uno::Sequence< beans::PropertyValue >& SdrCustomShapeGeometryItem::GetGeom SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem() : SfxStringItem( SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, String() ) {} -SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem( const String& rVal ) -: SfxStringItem( SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, rVal ) -{} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 98e28a0c3eaa..280cb2ab245d 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -288,17 +288,6 @@ void SdrPaintWindow::DrawOverlay(const Region& rRegion, bool bUseBuffer) } } -void SdrPaintWindow::HideOverlay(const Region& rRegion) -{ - if(mpOverlayManager && !OutputToPrinter()) - { - if(!mpPreRenderDevice) - { - mpOverlayManager->restoreBackground(rRegion); - } - } -} - const Region& SdrPaintWindow::GetRedrawRegion() const { return maRedrawRegion; diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 8874f112223f..7ed203930f07 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -308,20 +308,6 @@ void SdrEditView::DeleteLayer(const XubString& rName) } } -void SdrEditView::MoveLayer(const XubString& rName, sal_uInt16 nNewPos) -{ - SdrLayerAdmin& rLA=pMod->GetLayerAdmin(); - SdrLayer* pLayer=rLA.GetLayer(rName,sal_True); - sal_uInt16 nLayerNum=rLA.GetLayerPos(pLayer); - if (nLayerNum!=SDRLAYER_NOTFOUND) - { - if( IsUndoEnabled() ) - AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoMoveLayer(nLayerNum,rLA,*pMod,nNewPos)); - rLA.MoveLayer(nLayerNum,nNewPos); - pMod->SetChanged(); - } -} - //////////////////////////////////////////////////////////////////////////////////////////////////// void SdrEditView::EndUndo() diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index d1fc85affb5a..88a2471368f1 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -89,33 +89,18 @@ SdrGlobalData::SdrGlobalData() : nExchangeFormat(0) { //pSysLocale = new SvtSysLocale; - //pCharClass = pSysLocale->GetCharClassPtr(); //pLocaleData = pSysLocale->GetLocaleDataPtr(); svx::ExtrusionBar::RegisterInterface(); svx::FontworkBar::RegisterInterface(); } -SdrGlobalData::~SdrGlobalData() -{ - delete pOutliner; - delete pDefaults; - delete pResMgr; - //! do NOT delete pCharClass and pLocaleData - delete pSysLocale; -} const SvtSysLocale* SdrGlobalData::GetSysLocale() { if ( !pSysLocale ) pSysLocale = new SvtSysLocale; return pSysLocale; } -const CharClass* SdrGlobalData::GetCharClass() -{ - if ( !pCharClass ) - pCharClass = GetSysLocale()->GetCharClassPtr(); - return pCharClass; -} const LocaleDataWrapper* SdrGlobalData::GetLocaleData() { if ( !pLocaleData ) diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 737542d43fe0..a42947ef1398 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -201,13 +201,6 @@ void SdrGluePoint::Rotate(const Point& rRef, long nWink, double sn, double cs, c if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt); } -void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj) -{ - Point aPt(rRef2); aPt-=rRef1; - long nWink=GetAngle(aPt); - Mirror(rRef1,rRef2,nWink,pObj); -} - void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj) { Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); @@ -253,44 +246,6 @@ void SdrGluePoint::Shear(const Point& rRef, long /*nWink*/, double tn, bool bVSh if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt); } -void SdrGluePoint::Draw(OutputDevice& rOut, const SdrObject* pObj) const -{ - Color aBackPenColor(COL_WHITE); - Color aForePenColor(COL_LIGHTBLUE); - - bool bMapMerk=rOut.IsMapModeEnabled(); - Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); - aPt=rOut.LogicToPixel(aPt); - rOut.EnableMapMode(sal_False); - long x=aPt.X(),y=aPt.Y(); // Groesse erstmal fest auf 7 Pixel - - rOut.SetLineColor( aBackPenColor ); - rOut.DrawLine(Point(x-2,y-3),Point(x+3,y+2)); - rOut.DrawLine(Point(x-3,y-2),Point(x+2,y+3)); - rOut.DrawLine(Point(x-3,y+2),Point(x+2,y-3)); - rOut.DrawLine(Point(x-2,y+3),Point(x+3,y-2)); - - if (bNoPercent) - { - switch (GetHorzAlign()) - { - case SDRHORZALIGN_LEFT : rOut.DrawLine(Point(x-3,y-1),Point(x-3,y+1)); break; - case SDRHORZALIGN_RIGHT : rOut.DrawLine(Point(x+3,y-1),Point(x+3,y+1)); break; - } - - switch (GetVertAlign()) - { - case SDRVERTALIGN_TOP : rOut.DrawLine(Point(x-1,y-3),Point(x+1,y-3)); break; - case SDRVERTALIGN_BOTTOM: rOut.DrawLine(Point(x-1,y+3),Point(x+1,y+3)); break; - } - } - - rOut.SetLineColor( aForePenColor ); - rOut.DrawLine(Point(x-2,y-2),Point(x+2,y+2)); - rOut.DrawLine(Point(x-2,y+2),Point(x+2,y-2)); - rOut.EnableMapMode(bMapMerk); -} - void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const { bool bMapMerk=rWin.IsMapModeEnabled(); diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 2cfb2cccd403..dff3afa5161b 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -903,11 +903,6 @@ void SdrHdl::onMouseLeave() { } -bool SdrHdl::isMouseOver() const -{ - return mbMouseOver; -} - //////////////////////////////////////////////////////////////////////////////////////////////////// // class SdrHdlColor diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 232c63ab450b..e8cc9bff9223 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -360,16 +360,6 @@ SdrLayer* SdrLayerAdmin::MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos) return pLayer; } -void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos) -{ - sal_uIntPtr nPos=aLayer.GetPos(pLayer); - if (nPos!=CONTAINER_ENTRY_NOTFOUND) { - aLayer.Remove(nPos); - aLayer.Insert(pLayer,nNewPos); - Broadcast(); - } -} - sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const { sal_uIntPtr nRet=SDRLAYER_NOTFOUND; diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 1aa2a742b0ca..daf03026b662 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -313,16 +313,6 @@ sal_Bool SdrMark::operator==(const SdrMark& rMark) const return bRet; } -SdrPage* SdrMark::GetPage() const -{ - return (mpSelectedSdrObject ? mpSelectedSdrObject->GetPage() : 0); -} - -SdrObjList* SdrMark::GetObjList() const -{ - return (mpSelectedSdrObject ? mpSelectedSdrObject->GetObjList() : 0); -} - //////////////////////////////////////////////////////////////////////////////////////////////////// class ImpSdrMarkListSorter: public ContainerSorter diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 07331e5f945b..fdc87e5554c9 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -366,18 +366,6 @@ bool SdrModel::IsInDestruction() const return mbInDestruction; } -const SvNumberFormatter& SdrModel::GetNumberFormatter() const -{ - if(!mpNumberFormatter) - { - // use cast here since from outside view this IS a const method - ((SdrModel*)this)->mpNumberFormatter = new SvNumberFormatter( - ::comphelper::getProcessServiceFactory(), LANGUAGE_SYSTEM); - } - - return *mpNumberFormatter; -} - // noch nicht implementiert: void SdrModel::operator=(const SdrModel& /*rSrcModel*/) { @@ -600,32 +588,6 @@ void SdrModel::BegUndo(const XubString& rComment, const XubString& rObjDescr, Sd } } -void SdrModel::BegUndo(SdrUndoGroup* pUndoGrp) -{ - if( mpImpl->mpUndoManager ) - { - OSL_FAIL("svx::SdrModel::BegUndo(), method not supported with application undo manager!" ); - nUndoLevel++; - } - else if( IsUndoEnabled() ) - { - if (pAktUndoGroup==NULL) - { - pAktUndoGroup=pUndoGrp; - nUndoLevel=1; - } - else - { - delete pUndoGrp; - nUndoLevel++; - } - } - else - { - delete pUndoGrp; - } -} - void SdrModel::EndUndo() { DBG_ASSERT(nUndoLevel!=0,"SdrModel::EndUndo(): UndoLevel is already 0!"); @@ -1547,17 +1509,6 @@ void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) //////////////////////////////////////////////////////////////////////////////////////////////////// -bool SdrModel::CheckConsistence() const -{ - bool bRet = true; -#ifdef DBG_UTIL - DBG_CHKTHIS(SdrModel,NULL); -#endif - return bRet; -} - -//////////////////////////////////////////////////////////////////////////////////////////////////// - // #48289# void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, @@ -1967,25 +1918,6 @@ void SdrModel::ReformatAllTextObjects() ImpReformatAllTextObjects(); } -bool SdrModel::HasTransparentObjects( bool bCheckForAlphaChannel ) const -{ - bool bRet = false; - sal_uInt16 n, nCount; - - for( n = 0, nCount = GetMasterPageCount(); ( n < nCount ) && !bRet; n++ ) - if( GetMasterPage( n )->HasTransparentObjects( bCheckForAlphaChannel ) ) - bRet = true; - - if( !bRet ) - { - for( n = 0, nCount = GetPageCount(); ( n < nCount ) && !bRet; n++ ) - if( GetPage( n )->HasTransparentObjects( bCheckForAlphaChannel ) ) - bRet = true; - } - - return bRet; -} - SdrOutliner* SdrModel::createOutliner( sal_uInt16 nOutlinerMode ) { if( NULL == mpOutlinerCache ) @@ -2081,11 +2013,6 @@ void SdrModel::SetSdrUndoFactory( SdrUndoFactory* pUndoFactory ) /** cl: added this for OJ to complete his reporting engine, does not work correctly so only enable it for his model */ -bool SdrModel::IsAllowShapePropertyChangeListener() const -{ - return mpImpl && mpImpl->mbAllowShapePropertyChangeListener; -} - void SdrModel::SetAllowShapePropertyChangeListener( bool bAllow ) { if( mpImpl ) @@ -2108,14 +2035,6 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImpleme TYPEINIT1(SdrHint,SfxHint); -SdrHint::SdrHint() -: mpPage(0L), - mpObj(0L), - mpObjList(0L), - meHint(HINT_UNKNOWN) -{ -} - SdrHint::SdrHint(SdrHintKind eNewHint) : mpPage(0L), mpObj(0L), @@ -2133,25 +2052,11 @@ SdrHint::SdrHint(const SdrObject& rNewObj) maRectangle = rNewObj.GetLastBoundRect(); } -SdrHint::SdrHint(const SdrObject& rNewObj, const Rectangle& rRect) -: mpPage(rNewObj.GetPage()), - mpObj(&rNewObj), - mpObjList(rNewObj.GetObjList()), - meHint(HINT_OBJCHG) -{ - maRectangle = rRect; -} - void SdrHint::SetPage(const SdrPage* pNewPage) { mpPage = pNewPage; } -void SdrHint::SetObjList(const SdrObjList* pNewOL) -{ - mpObjList = pNewOL; -} - void SdrHint::SetObject(const SdrObject* pNewObj) { mpObj = pNewObj; @@ -2162,21 +2067,11 @@ void SdrHint::SetKind(SdrHintKind eNewKind) meHint = eNewKind; } -void SdrHint::SetRect(const Rectangle& rNewRect) -{ - maRectangle = rNewRect; -} - const SdrPage* SdrHint::GetPage() const { return mpPage; } -const SdrObjList* SdrHint::GetObjList() const -{ - return mpObjList; -} - const SdrObject* SdrHint::GetObject() const { return mpObj; @@ -2187,11 +2082,6 @@ SdrHintKind SdrHint::GetKind() const return meHint; } -const Rectangle& SdrHint::GetRect() const -{ - return maRectangle; -} - // eof /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index e91ec3ef9145..132690dc6972 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1900,11 +1900,6 @@ void SdrObject::SetMergedItem(const SfxPoolItem& rItem) GetProperties().SetMergedItem(rItem); } -void SdrObject::ClearObjectItem(const sal_uInt16 nWhich) -{ - GetProperties().ClearObjectItem(nWhich); -} - void SdrObject::ClearMergedItem(const sal_uInt16 nWhich) { GetProperties().ClearMergedItem(nWhich); @@ -3124,29 +3119,6 @@ SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, S return pObj; } -SdrObjUserData* SdrObjFactory::MakeNewObjUserData(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1) -{ - SdrObjUserData* pData=NULL; - if (nInvent==SdrInventor) { - switch (nIdent) - { - case sal_uInt16(SDRUSERDATA_OBJTEXTLINK) : pData=new ImpSdrObjTextLinkUserData((SdrTextObj*)pObj1); break; - } - } - if (pData==NULL) { - SdrObjFactory aFact(nInvent,nIdent,pObj1); - SdrLinkList& rLL=ImpGetUserMakeObjUserDataHdl(); - unsigned nAnz=rLL.GetLinkCount(); - unsigned i=0; - while (i<nAnz && pData==NULL) { - rLL.GetLink(i).Call((void*)&aFact); - pData=aFact.pNewData; - i++; - } - } - return pData; -} - void SdrObjFactory::InsertMakeObjectHdl(const Link& rLink) { SdrLinkList& rLL=ImpGetUserMakeObjHdl(); diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index d1eadd0481b0..ae74a9608ea7 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -556,22 +556,6 @@ String SdrGrafObj::GetGrafStreamURL() const // ----------------------------------------------------------------------------- -void SdrGrafObj::SetFileName(const String& rFileName) -{ - aFileName = rFileName; - SetChanged(); -} - -// ----------------------------------------------------------------------------- - -void SdrGrafObj::SetFilterName(const String& rFilterName) -{ - aFilterName = rFilterName; - SetChanged(); -} - -// ----------------------------------------------------------------------------- - void SdrGrafObj::ForceSwapIn() const { if( mbIsPreview ) @@ -1027,13 +1011,6 @@ void SdrGrafObj::StartAnimation( OutputDevice* /*pOutDev*/, const Point& /*rPoin // ----------------------------------------------------------------------------- -void SdrGrafObj::StopAnimation(OutputDevice* /*pOutDev*/, long /*nExtraData*/) -{ - SetGrafAnimationAllowed(sal_False); -} - -// ----------------------------------------------------------------------------- - bool SdrGrafObj::HasGDIMetaFile() const { return( pGraphic->GetType() == GRAPHIC_GDIMETAFILE ); @@ -1041,14 +1018,6 @@ bool SdrGrafObj::HasGDIMetaFile() const // ----------------------------------------------------------------------------- -const GDIMetaFile* SdrGrafObj::GetGDIMetaFile() const -{ - OSL_FAIL( "Invalid return value! Don't use it! (KA)" ); - return &GetGraphic().GetGDIMetaFile(); -} - -// ----------------------------------------------------------------------------- - SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier) const { SdrObject* pRetval = NULL; @@ -1334,11 +1303,6 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) // ----------------------------------------------------------------------------- -sal_Bool SdrGrafObj::IsGrafAnimationAllowed() const -{ - return mbGrafAnimationAllowed; -} - void SdrGrafObj::SetGrafAnimationAllowed(sal_Bool bNew) { if(mbGrafAnimationAllowed != bNew) diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 0001cd518534..d1d4bbabb4c6 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -232,13 +232,6 @@ const ::avmedia::MediaItem& SdrMediaObj::getMediaProperties() const // ------------------------------------------------------------------------------ -bool SdrMediaObj::hasPreferredSize() const -{ - return static_cast< ::sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).hasPreferredSize(); -} - -// ------------------------------------------------------------------------------ - Size SdrMediaObj::getPreferredSize() const { return static_cast< ::sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).getPreferredSize(); @@ -246,16 +239,6 @@ Size SdrMediaObj::getPreferredSize() const // ------------------------------------------------------------------------------ -const Graphic& SdrMediaObj::getGraphic() const -{ - if( !mapGraphic.get() ) - const_cast< SdrMediaObj* >( this )->mapGraphic.reset( new Graphic( ::avmedia::MediaWindow::grabFrame( getURL(), true ) ) ); - - return *mapGraphic; -} - -// ------------------------------------------------------------------------------ - void SdrMediaObj::setGraphic( const Graphic* pGraphic ) { mapGraphic.reset( pGraphic ? new Graphic( *pGraphic ) : NULL ); diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index b6c5f476a407..a3c26a48fbdf 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -755,48 +755,6 @@ SdrOle2Obj::SdrOle2Obj(bool bFrame_) : m_bTypeAsked(false) } // ----------------------------------------------------------------------------- -SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, bool bFrame_) - : xObjRef( rNewObjRef ) - , m_bTypeAsked(false) - , m_bChart(false) -{ - DBG_CTOR( SdrOle2Obj,NULL); - bInDestruction = false; - Init(); - - bFrame=bFrame_; - - if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) - SetResizeProtect(sal_True); - - // For math objects, set closed state to transparent - if( ImplIsMathObj( xObjRef.GetObject() ) ) - SetClosedObj( false ); -} - -// ----------------------------------------------------------------------------- - -SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, bool bFrame_) - : xObjRef( rNewObjRef ) - , m_bTypeAsked(false) - , m_bChart(false) -{ - DBG_CTOR( SdrOle2Obj,NULL); - bInDestruction = false; - Init(); - - mpImpl->aPersistName = rNewObjName; - bFrame=bFrame_; - - if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) - SetResizeProtect(sal_True); - - // For math objects, set closed state to transparent - if( ImplIsMathObj( xObjRef.GetObject() ) ) - SetClosedObj( false ); -} - -// ----------------------------------------------------------------------------- SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, bool bFrame_) : SdrRectObj(rNewRect) diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 1f77182bbb77..fb0acd41f1e4 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -561,16 +561,6 @@ bool SdrTextObj::NbcSetEckenradius(long nRad) return true; } -bool SdrTextObj::NbcSetAutoGrowHeight(bool bAuto) -{ - if(bTextFrame) - { - SetObjectItem(SdrTextAutoGrowHeightItem(bAuto)); - return true; - } - return false; -} - bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt) { if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // #i44922# @@ -590,26 +580,6 @@ bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt) return false; } -bool SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt) -{ - if(bTextFrame) - { - SetObjectItem(SdrTextMaxFrameHeightItem(nHgt)); - return true; - } - return false; -} - -bool SdrTextObj::NbcSetAutoGrowWidth(bool bAuto) -{ - if(bTextFrame) - { - SetObjectItem(SdrTextAutoGrowWidthItem(bAuto)); - return true; - } - return false; -} - bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt) { if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // #i44922# @@ -629,26 +599,6 @@ bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt) return false; } -bool SdrTextObj::NbcSetMaxTextFrameWidth(long nWdt) -{ - if(bTextFrame) - { - SetObjectItem(SdrTextMaxFrameWidthItem(nWdt)); - return true; - } - return false; -} - -bool SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit) -{ - if(bTextFrame) - { - SetObjectItem(SdrTextFitToSizeTypeItem(eFit)); - return true; - } - return false; -} - void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const { basegfx::B2DPolyPolygon aXorPolyPolygon(TakeXorPoly()); @@ -1869,20 +1819,6 @@ SdrTextAniDirection SdrTextObj::GetTextAniDirection() const return ((SdrTextAniDirectionItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_ANIDIRECTION))).GetValue(); } -// Access to thext hidden flag -sal_Bool SdrTextObj::GetTextHidden() const -{ - return mbTextHidden; -} - -void SdrTextObj::NbcSetTextHidden(sal_Bool bNew) -{ - if(bNew != mbTextHidden) - { - mbTextHidden = bNew; - } -} - // Get necessary data for text scroll animation. ATM base it on a Text-Metafile and a // painting rectangle. Rotation is excluded from the returned values. GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle( @@ -1939,11 +1875,6 @@ GDIMetaFile* SdrTextObj::GetTextScrollMetaFileAndRectangle( } // Access to TextAnimationAllowed flag -bool SdrTextObj::IsTextAnimationAllowed() const -{ - return mbTextAnimationAllowed; -} - bool SdrTextObj::IsAutoFit() const { return GetFitToSize()==SDRTEXTFIT_AUTOFIT; diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 94b6727eedbf..92c07b0ec3bb 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -327,61 +327,6 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() } } -void SdrTextObj::NbcResizeTextAttributes(const Fraction& xFact, const Fraction& yFact) -{ - OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); - if (pOutlinerParaObject!=NULL && xFact.IsValid() && yFact.IsValid()) - { - Fraction n100(100,1); - long nX=long(xFact*n100); - long nY=long(yFact*n100); - if (nX<0) nX=-nX; - if (nX<1) nX=1; - if (nX>0xFFFF) nX=0xFFFF; - if (nY<0) nY=-nY; - if (nY<1) nY=1; - if (nY>0xFFFF) nY=0xFFFF; - if (nX!=100 || nY!=100) - { - // Rahmenattribute - const SfxItemSet& rSet = GetObjectItemSet(); - const SvxCharScaleWidthItem& rOldWdt=(SvxCharScaleWidthItem&)rSet.Get(EE_CHAR_FONTWIDTH); - const SvxFontHeightItem& rOldHgt=(SvxFontHeightItem&)rSet.Get(EE_CHAR_FONTHEIGHT); - - // erstmal die alten Werte holen - long nRelWdt=rOldWdt.GetValue(); - long nAbsHgt=rOldHgt.GetHeight(); - long nRelHgt=rOldHgt.GetProp(); - - // Relative Breite aendern - nRelWdt*=nX; - nRelWdt/=nY; - if (nRelWdt<0) nRelWdt=-nRelWdt; // nicht negativ - if (nRelWdt<=0) nRelWdt=1; // und mind. 1% - if (nRelWdt>0xFFFF) nRelWdt=0xFFFF; - - // Absolute Hoehe aendern - nAbsHgt*=nY; - nAbsHgt/=100; - if (nAbsHgt<0) nAbsHgt=-nAbsHgt; // nicht negativ - if (nAbsHgt<=0) nAbsHgt=1; // und mind. 1 - if (nAbsHgt>0xFFFF) nAbsHgt=0xFFFF; - - // und nun attributieren - SetObjectItem(SvxCharScaleWidthItem( (sal_uInt16) nRelWdt, EE_CHAR_FONTWIDTH)); - SetObjectItem(SvxFontHeightItem(nAbsHgt,(sal_uInt16)nRelHgt, EE_CHAR_FONTHEIGHT)); - // Zeichen- und Absatzattribute innerhalb des OutlinerParaObjects - Outliner& rOutliner=ImpGetDrawOutliner(); - rOutliner.SetPaperSize(Size(LONG_MAX,LONG_MAX)); - rOutliner.SetText(*pOutlinerParaObject); - rOutliner.DoStretchChars((sal_uInt16)nX,(sal_uInt16)nY); - OutlinerParaObject* pNewPara=rOutliner.CreateParaObject(); - NbcSetOutlinerParaObject(pNewPara); - rOutliner.Clear(); - } - } -} - /** iterates over the paragraphs of a given SdrObject and removes all hard set character attributes with the which ids contained in the given vector diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 63fe525c2085..de1086050a41 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1891,50 +1891,9 @@ void SdrPage::ActionChanged() const } } -// Dummy implementations for declarations in svdpage.hxx -Bitmap SdrPage::GetBitmap(const SetOfByte& /*rVisibleLayers*/, bool /*bTrimBorders*/) const -{ - DBG_ASSERT(0, "SdrPage::GetBitmap(): not yet implemented."); - return Bitmap(); -} -GDIMetaFile SdrPage::GetMetaFile(const SetOfByte& /*rVisibleLayers*/, bool /*bTrimBorders*/) -{ - DBG_ASSERT(0, "SdrPage::GetMetaFile(): not yet implemented."); - return GDIMetaFile(); -} - -bool SdrPage::isHandoutMasterPage() const -{ - return mbMaster && GetModel() && GetModel()->GetMasterPageCount() - && GetModel()->GetMasterPage(0) == this; -} - ////////////////////////////////////////////////////////////////////////////// // sdr::Comment interface -const sdr::Comment& SdrPage::GetCommentByIndex(sal_uInt32 nIndex) -{ - DBG_ASSERT(nIndex < maComments.size(), "SdrPage::GetCommentByIndex: Access out of range (!)"); - return maComments[nIndex]; -} - -void SdrPage::AddComment(const sdr::Comment& rNew) -{ - maComments.push_back(rNew); - ::std::sort(maComments.begin(), maComments.end()); -} - -void SdrPage::ReplaceCommentByIndex(sal_uInt32 nIndex, const sdr::Comment& rNew) -{ - DBG_ASSERT(nIndex < maComments.size(), "SdrPage::GetCommentByIndex: Access out of range (!)"); - - if(maComments[nIndex] != rNew) - { - maComments[nIndex] = rNew; - ::std::sort(maComments.begin(), maComments.end()); - } -} - const SdrPageProperties* SdrPage::getCorrectSdrPageProperties() const { if(mpMasterPageDescriptor) diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 1392ab9ffe9a..f689bc0a27ab 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -143,20 +143,6 @@ void SdrPageView::AppendPageWindow(SdrPageWindow& rNew) maPageWindows.push_back(&rNew); } -SdrPageWindow* SdrPageView::RemovePageWindow(sal_uInt32 nPos) -{ - if(nPos < maPageWindows.size()) - { - SdrPageWindowVector::iterator aAccess = maPageWindows.begin() + nPos; - // remember return value - SdrPageWindow* pErasedSdrPageWindow = *aAccess; - maPageWindows.erase(aAccess); - return pErasedSdrPageWindow; - } - - return 0L; -} - SdrPageWindow* SdrPageView::RemovePageWindow(SdrPageWindow& rOld) { const SdrPageWindowVector::iterator aFindResult = ::std::find(maPageWindows.begin(), maPageWindows.end(), &rOld); @@ -311,14 +297,6 @@ void SdrPageView::InvalidateAllWin() } } -void SdrPageView::InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix) -{ - if(IsVisible()) - { - GetView().InvalidateAllWin(rRect, bPlus1Pix); - } -} - void SdrPageView::PaintOutlinerView(OutputDevice* pOut, const Rectangle& rRect) const { if (GetView().pTextEditOutliner==NULL) return; @@ -1015,54 +993,6 @@ sal_uInt16 SdrPageView::GetEnteredLevel() const return nAnz; } -XubString SdrPageView::GetActualGroupName() const -{ - if(GetAktGroup()) - { - XubString aStr(GetAktGroup()->GetName()); - - if(!aStr.Len()) - aStr += sal_Unicode('?'); - - return aStr; - } - else - return String(); -} - -XubString SdrPageView::GetActualPathName(sal_Unicode cSep) const -{ - XubString aStr; - sal_Bool bNamFnd(sal_False); - SdrObject* pGrp = GetAktGroup(); - - while(pGrp) - { - XubString aStr1(pGrp->GetName()); - - if(!aStr1.Len()) - aStr1 += sal_Unicode('?'); - else - bNamFnd = sal_True; - - aStr += aStr1; - pGrp = pGrp->GetUpGroup(); - - if(pGrp) - aStr += cSep; - } - - if(!bNamFnd && GetAktGroup()) - { - aStr = String(); - aStr += sal_Unicode('('); - aStr += String::CreateFromInt32( GetEnteredLevel() ); - aStr += sal_Unicode(')'); - } - - return aStr; -} - void SdrPageView::CheckAktGroup() { SdrObject* pGrp=GetAktGroup(); diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 92ffdccef40e..dd6f70096967 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -504,19 +504,6 @@ void SdrPaintView::SetActualWin(const OutputDevice* pWin) //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrPaintView::BegEncirclement(const Point& rPnt) -{ - BrkAction(); - - DBG_ASSERT(0L == mpEncirclementOverlay, "SdrSnapView::BegSetPageOrg: There exists a ImplPageOriginOverlay (!)"); - basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y()); - mpEncirclementOverlay = new ImplEncirclementOverlay(*this, aStartPos); - - aDragStat.Reset(rPnt); - aDragStat.SetMinMove(ImpGetMinMovLogic(-2,0L)); - aDragStat.NextPoint(); -} - void SdrPaintView::MovEncirclement(const Point& rPnt) { if(IsEncirclement() && aDragStat.CheckMinMoved(rPnt)) @@ -662,16 +649,6 @@ bool SdrPaintView::IsLayerVisible(const XubString& rName) const return false; } -void SdrPaintView::SetAllLayersVisible(sal_Bool bShow) -{ - if(mpPageView) - { - mpPageView->SetAllLayersVisible(bShow); - } - - InvalidateAllWin(); -} - void SdrPaintView::SetLayerLocked(const XubString& rName, sal_Bool bLock) { if(mpPageView) @@ -690,14 +667,6 @@ bool SdrPaintView::IsLayerLocked(const XubString& rName) const return false; } -void SdrPaintView::SetAllLayersLocked(sal_Bool bLock) -{ - if(mpPageView) - { - mpPageView->SetAllLayersLocked(bLock); - } -} - void SdrPaintView::SetLayerPrintable(const XubString& rName, sal_Bool bPrn) { if(mpPageView) @@ -716,14 +685,6 @@ bool SdrPaintView::IsLayerPrintable(const XubString& rName) const return false; } -void SdrPaintView::SetAllLayersPrintable(sal_Bool bPrn) -{ - if(mpPageView) - { - mpPageView->SetAllLayersPrintable(bPrn); - } -} - void SdrPaintView::PrePaint() { if(mpPageView) @@ -732,14 +693,6 @@ void SdrPaintView::PrePaint() } } -void SdrPaintView::PostPaint() -{ - if(mpPageView) - { - mpPageView->PostPaint(); - } -} - //////////////////////////////////////////////////////////////////////////////////////////////////// // #define SVX_REPAINT_TIMER_TEST diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index a5cdd406a46d..a988291a3321 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -549,11 +549,6 @@ SdrObjClosedKind SdrPolyEditView::GetMarkedObjectsClosedState() const } } -void SdrPolyEditView::ShutMarkedObjects() -{ - CloseMarkedObjects(); -} - void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen) // , long nOpenDistance) { if (AreObjectsMarked()) diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 40f7c6a9be8a..24efd7c511db 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -471,26 +471,6 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes } } -sal_uInt16 SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const -{ - long nBestXSnap=0; - long nBestYSnap=0; - bool bXSnapped=sal_False; - bool bYSnapped=sal_False; - CheckSnap(rRect.TopLeft() ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped); - if (!bMoveSnapOnlyTopLeft) { - CheckSnap(rRect.TopRight() ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped); - CheckSnap(rRect.BottomLeft() ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped); - CheckSnap(rRect.BottomRight(),pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped); - } - rDX=nBestXSnap; - rDY=nBestYSnap; - sal_uInt16 nRet=0; - if (bXSnapped) nRet+=SDRSNAP_XSNAPPED; - if (bYSnapped) nRet+=SDRSNAP_YSNAPPED; - return nRet; -} - //////////////////////////////////////////////////////////////////////////////////////////////////// sal_Bool SdrSnapView::BegSetPageOrg(const Point& rPnt) diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index b746813faff5..154713da5873 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -109,13 +109,6 @@ SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod) eFunction(SDRREPFUNC_OBJ_NONE) {} -SdrUndoGroup::SdrUndoGroup(SdrModel& rNewMod,const String& rStr) -: SdrUndoAction(rNewMod), - aBuf(1024,32,32), - aComment(rStr), - eFunction(SDRREPFUNC_OBJ_NONE) -{} - SdrUndoGroup::~SdrUndoGroup() { Clear(); @@ -135,11 +128,6 @@ void SdrUndoGroup::AddAction(SdrUndoAction* pAct) aBuf.Insert(pAct,CONTAINER_APPEND); } -void SdrUndoGroup::push_front( SdrUndoAction* pAct ) -{ - aBuf.Insert(pAct, (sal_uIntPtr)0 ); -} - void SdrUndoGroup::Undo() { for (sal_uIntPtr nu=GetActionCount(); nu>0;) { @@ -354,14 +342,6 @@ SdrUndoAttrObj::~SdrUndoAttrObj() delete pTextRedo; } -void SdrUndoAttrObj::SetRepeatAttr(const SfxItemSet& rSet) -{ - if(pRepeatSet) - delete pRepeatSet; - - pRepeatSet = new SfxItemSet(rSet); -} - void SdrUndoAttrObj::Undo() { E3DModifySceneSnapRectUpdater aUpdater(pObj); diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 84cfe9d77ea6..a915777a2195 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1382,34 +1382,6 @@ void SdrView::UnmarkAll() else UnmarkAllObj(); } -sal_Bool SdrView::MarkNext(sal_Bool bPrev) -{ - if (IsTextEdit()) { - return sal_False; - } - if (IsGluePointEditMode() && HasMarkedGluePoints()) { - return MarkNextGluePoint(bPrev); - } - if (HasMarkedPoints()) { - return MarkNextPoint(bPrev); - } - return MarkNextObj(bPrev); -} - -sal_Bool SdrView::MarkNext(const Point& rPnt, sal_Bool bPrev) -{ - if (IsTextEdit()) { - return sal_False; - } - if (IsGluePointEditMode() && HasMarkedGluePoints()) { - //return MarkNextGluePoint(rPnt,bPrev); fehlende Implementation !!! - } - if (HasMarkedPoints()) { - //return MarkNextPoint(rPnt,bPrev); fehlende Implementation !!! - } - return MarkNextObj(rPnt,-2,bPrev); -} - const Rectangle& SdrView::GetMarkedRect() const { if (IsGluePointEditMode() && HasMarkedGluePoints()) { |