diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-23 08:48:06 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-09-27 11:48:46 +0200 |
commit | 1534025a0386584a7b8f3f929b10ce5eb33257cf (patch) | |
tree | 7f12dd6763148089cd4fb5495c8fffe84f415e12 /svx | |
parent | 0f2e01677cd0e8857faec99c61d71e88eee78b27 (diff) |
loplugin:methodcycles more graph theory for the win
implemeent a reduction approach, which is good at finding virtual
methods that only themselves or their virtual partners.
The accessibility GetVisArea stuff is dead since
commit 891e41fac81fbd8d5cdb277b26639abfd25a7143
Date: Wed Apr 4 11:23:22 2018 +0200
dead code in AccessibleTextHelper_Impl::UpdateVisibleChildren
Change-Id: I78d9d8bca585ecec8394f2c3fe2baa93db0e58f5
Reviewed-on: https://gerrit.libreoffice.org/60912
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/inc/sdr/contact/objectcontactofpageview.hxx | 12 | ||||
-rw-r--r-- | svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 3 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleEmptyEditSource.cxx | 1 | ||||
-rw-r--r-- | svx/source/sdr/contact/objectcontact.cxx | 25 | ||||
-rw-r--r-- | svx/source/sdr/contact/objectcontactofobjlistpainter.cxx | 6 | ||||
-rw-r--r-- | svx/source/sdr/contact/objectcontactofpageview.cxx | 46 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofpageobj.cxx | 6 | ||||
-rw-r--r-- | svx/source/sdr/overlay/overlaymanager.cxx | 5 | ||||
-rw-r--r-- | svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 10 | ||||
-rw-r--r-- | svx/source/svdraw/svdmrkv1.cxx | 17 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 16 | ||||
-rw-r--r-- | svx/source/svdraw/svdogrp.cxx | 5 | ||||
-rw-r--r-- | svx/source/svdraw/svdotext.cxx | 15 | ||||
-rw-r--r-- | svx/source/svdraw/svdovirt.cxx | 11 | ||||
-rw-r--r-- | svx/source/svdraw/svdpage.cxx | 33 | ||||
-rw-r--r-- | svx/source/svdraw/svdundo.cxx | 10 | ||||
-rw-r--r-- | svx/source/table/svdotable.cxx | 12 | ||||
-rw-r--r-- | svx/source/unodraw/unoshtxt.cxx | 35 |
18 files changed, 1 insertions, 267 deletions
diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx index 5a73731e12be..4fb0bef53898 100644 --- a/svx/inc/sdr/contact/objectcontactofpageview.hxx +++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx @@ -76,9 +76,6 @@ namespace sdr // this ObjectContact. virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const override; - // Get info if given Rectangle is visible in this view - virtual bool IsAreaVisible(const basegfx::B2DRange& rRange) const override; - // Get info about the need to visualize GluePoints. The default // is that it is not necessary. virtual bool AreGluePointsVisible() const override; @@ -92,12 +89,6 @@ namespace sdr // print? Default is false virtual bool isOutputToPrinter() const override; - // window? Default is true - virtual bool isOutputToWindow() const override; - - // VirtualDevice? Default is false - virtual bool isOutputToVirtualDevice() const override; - // recording MetaFile? Default is false virtual bool isOutputToRecordingMetaFile() const override; @@ -107,9 +98,6 @@ namespace sdr // gray display mode virtual bool isDrawModeGray() const override; - // gray display mode - virtual bool isDrawModeBlackWhite() const override; - // high contrast display mode virtual bool isDrawModeHighContrast() const override; diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx index 0e7d6b489564..1970131c75ee 100644 --- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx @@ -67,9 +67,6 @@ namespace sdr // flush. Do buffered updates. virtual void flush() override; - // restore part of background. Implemented form buffered versions only. - virtual void restoreBackground(const vcl::Region& rRegion) const override; - // invalidate the given range at local OutputDevice virtual void invalidateRange(const basegfx::B2DRange& rRange) override; }; diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 0b87947ce329..804b208b59aa 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -158,7 +158,6 @@ namespace accessibility sal_Int16 GetDepth( sal_Int32 ) const override { return -1; } bool SetDepth( sal_Int32, sal_Int16 ) override { return true; } - tools::Rectangle GetVisArea() const override { return tools::Rectangle(); } Point LogicToPixel( const Point& rPoint, const MapMode& /*rMapMode*/ ) const override { return rPoint; } Point PixelToLogic( const Point& rPoint, const MapMode& /*rMapMode*/ ) const override { return rPoint; } diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx index 9bcd586acf7f..a4d52073dfa1 100644 --- a/svx/source/sdr/contact/objectcontact.cxx +++ b/svx/source/sdr/contact/objectcontact.cxx @@ -121,13 +121,6 @@ void ObjectContact::InvalidatePartOfView(const basegfx::B2DRange& /*rRange*/) co // nothing to do here in the default version } -// Get info if given Rectangle is visible in this view -bool ObjectContact::IsAreaVisible(const basegfx::B2DRange& /*rRange*/) const -{ - // always visible in default version - return true; -} - // Get info about the need to visualize GluePoints bool ObjectContact::AreGluePointsVisible() const { @@ -160,18 +153,6 @@ bool ObjectContact::isOutputToPrinter() const return false; } -// window? Default is true -bool ObjectContact::isOutputToWindow() const -{ - return true; -} - -// VirtualDevice? Default is false -bool ObjectContact::isOutputToVirtualDevice() const -{ - return false; -} - // recording MetaFile? Default is false bool ObjectContact::isOutputToRecordingMetaFile() const { @@ -190,12 +171,6 @@ bool ObjectContact::isDrawModeGray() const return false; } -// gray display mode -bool ObjectContact::isDrawModeBlackWhite() const -{ - return false; -} - // high contrast display mode bool ObjectContact::isDrawModeHighContrast() const { diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index 71ab1bb83a10..2e89227ff93d 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -128,12 +128,6 @@ void ObjectContactOfObjListPainter::ProcessDisplay(DisplayInfo& rDisplayInfo) } } -// VirtualDevice? -bool ObjectContactOfObjListPainter::isOutputToVirtualDevice() const -{ - return (OUTDEV_VIRDEV == mrTargetOutputDevice.GetOutDevType()); -} - // recording MetaFile? bool ObjectContactOfObjListPainter::isOutputToRecordingMetaFile() const { diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 19b28b9488d0..e4b4b6ca1de9 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -354,33 +354,6 @@ namespace sdr GetPageWindow().InvalidatePageWindow(rRange); } - // Get info if given Rectangle is visible in this view - bool ObjectContactOfPageView::IsAreaVisible(const basegfx::B2DRange& rRange) const - { - // compare with the visible rectangle - if(rRange.isEmpty()) - { - // no range -> not visible - return false; - } - else - { - const OutputDevice& rTargetOutDev = GetPageWindow().GetPaintWindow().GetTargetOutputDevice(); - const Size aOutputSizePixel(rTargetOutDev.GetOutputSizePixel()); - basegfx::B2DRange aLogicViewRange(0.0, 0.0, aOutputSizePixel.getWidth(), aOutputSizePixel.getHeight()); - - aLogicViewRange.transform(rTargetOutDev.GetInverseViewTransformation()); - - if(!aLogicViewRange.isEmpty() && !aLogicViewRange.overlaps(rRange)) - { - return false; - } - } - - // call parent - return ObjectContact::IsAreaVisible(rRange); - } - // Get info about the need to visualize GluePoints bool ObjectContactOfPageView::AreGluePointsVisible() const { @@ -413,18 +386,6 @@ namespace sdr return (OUTDEV_PRINTER == mrPageWindow.GetPaintWindow().GetOutputDevice().GetOutDevType()); } - // window? - bool ObjectContactOfPageView::isOutputToWindow() const - { - return (OUTDEV_WINDOW == mrPageWindow.GetPaintWindow().GetOutputDevice().GetOutDevType()); - } - - // VirtualDevice? - bool ObjectContactOfPageView::isOutputToVirtualDevice() const - { - return (OUTDEV_VIRDEV == mrPageWindow.GetPaintWindow().GetOutputDevice().GetOutDevType()); - } - // recording MetaFile? bool ObjectContactOfPageView::isOutputToRecordingMetaFile() const { @@ -445,13 +406,6 @@ namespace sdr return (nDrawMode == (DrawModeFlags::GrayLine|DrawModeFlags::GrayFill|DrawModeFlags::BlackText|DrawModeFlags::GrayBitmap|DrawModeFlags::GrayGradient)); } - // gray display mode - bool ObjectContactOfPageView::isDrawModeBlackWhite() const - { - const DrawModeFlags nDrawMode(mrPageWindow.GetPaintWindow().GetOutputDevice().GetDrawMode()); - return (nDrawMode == (DrawModeFlags::BlackLine|DrawModeFlags::BlackText|DrawModeFlags::WhiteFill|DrawModeFlags::GrayBitmap|DrawModeFlags::WhiteGradient)); - } - // high contrast display mode bool ObjectContactOfPageView::isDrawModeHighContrast() const { diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index e22cbc184891..3a01278f2e1b 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -64,12 +64,9 @@ public: // forward access to SdrPageView of ViewObjectContactOfPageObj virtual bool isOutputToPrinter() const override; - virtual bool isOutputToWindow() const override; - virtual bool isOutputToVirtualDevice() const override; virtual bool isOutputToRecordingMetaFile() const override; virtual bool isOutputToPDFFile() const override; virtual bool isDrawModeGray() const override; - virtual bool isDrawModeBlackWhite() const override; virtual bool isDrawModeHighContrast() const override; virtual SdrPageView* TryToGetSdrPageView() const override; virtual OutputDevice* TryToGetOutputDevice() const override; @@ -177,12 +174,9 @@ void PagePrimitiveExtractor::InvalidatePartOfView(const basegfx::B2DRange& rRang // forward access to SdrPageView to VOCOfPageObj bool PagePrimitiveExtractor::isOutputToPrinter() const { return mrViewObjectContactOfPageObj.GetObjectContact().isOutputToPrinter(); } -bool PagePrimitiveExtractor::isOutputToWindow() const { return mrViewObjectContactOfPageObj.GetObjectContact().isOutputToWindow(); } -bool PagePrimitiveExtractor::isOutputToVirtualDevice() const { return mrViewObjectContactOfPageObj.GetObjectContact().isOutputToVirtualDevice(); } bool PagePrimitiveExtractor::isOutputToRecordingMetaFile() const { return mrViewObjectContactOfPageObj.GetObjectContact().isOutputToRecordingMetaFile(); } bool PagePrimitiveExtractor::isOutputToPDFFile() const { return mrViewObjectContactOfPageObj.GetObjectContact().isOutputToPDFFile(); } bool PagePrimitiveExtractor::isDrawModeGray() const { return mrViewObjectContactOfPageObj.GetObjectContact().isDrawModeGray(); } -bool PagePrimitiveExtractor::isDrawModeBlackWhite() const { return mrViewObjectContactOfPageObj.GetObjectContact().isDrawModeBlackWhite(); } bool PagePrimitiveExtractor::isDrawModeHighContrast() const { return mrViewObjectContactOfPageObj.GetObjectContact().isDrawModeHighContrast(); } SdrPageView* PagePrimitiveExtractor::TryToGetSdrPageView() const { return mrViewObjectContactOfPageObj.GetObjectContact().TryToGetSdrPageView(); } OutputDevice* PagePrimitiveExtractor::TryToGetOutputDevice() const { return mrViewObjectContactOfPageObj.GetObjectContact().TryToGetOutputDevice(); } diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 621521ebf9cb..c3fa222b83ed 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -261,11 +261,6 @@ namespace sdr // default has nothing to do } - void OverlayManager::restoreBackground(const vcl::Region& /*rRegion*/) const - { - // unbuffered versions do nothing here - } - void OverlayManager::add(OverlayObject& rOverlayObject) { OSL_ENSURE(nullptr == rOverlayObject.mpOverlayManager, "OverlayObject is added twice to an OverlayManager (!)"); diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index 9ee032c1ee3b..2d4514c90046 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -413,16 +413,6 @@ namespace sdr ImpBufferTimerHandler(nullptr); } - void OverlayManagerBuffered::restoreBackground(const vcl::Region& rRegion) const - { - // restore - const vcl::Region aRegionPixel(getOutputDevice().LogicToPixel(rRegion)); - ImpRestoreBackground(aRegionPixel); - - // call parent - OverlayManager::restoreBackground(rRegion); - } - void OverlayManagerBuffered::invalidateRange(const basegfx::B2DRange& rRange) { if(!rRange.isEmpty()) diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 6b4e4c67c09f..d9a6fc66796a 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -82,23 +82,6 @@ bool SdrMarkView::HasMarkedPoints() const return bRet; } -sal_Int32 SdrMarkView::GetMarkedPointCount() const -{ - ForceUndirtyMrkPnt(); - sal_Int32 nCount=0; - if (!ImpIsFrameHandles()) { - size_t nMarkCount=GetMarkedObjectCount(); - if (nMarkCount<=static_cast<size_t>(mnFrameHandlesLimit)) { - for (size_t nMarkNum=0; nMarkNum<nMarkCount; ++nMarkNum) { - const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); - const SdrUShortCont& rPts = pM->GetMarkedPoints(); - nCount += rPts.size(); - } - } - } - return nCount; -} - bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const { return !ImpIsFrameHandles() && !rHdl.IsPlusHdl() && rHdl.GetKind()!=SdrHdlKind::Glue && rHdl.GetKind()!=SdrHdlKind::SmartTag && rHdl.GetObj()!=nullptr && rHdl.GetObj()->IsPolyObj(); diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 83b35d8d4c1c..b9ba5a92dda9 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1754,17 +1754,6 @@ void SdrObject::NbcReformatText() { } -void SdrObject::ReformatText() -{ - tools::Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); - NbcReformatText(); - SetChanged(); - BroadcastObjectChange(); - if (GetCurrentBoundRect()!=aBoundRect0) { - SendUserCall(SdrUserCallType::Resize,aBoundRect0); - } -} - void SdrObject::BurnInStyleSheetAttributes() { GetProperties().ForceStyleToHardAttributes(); @@ -1813,11 +1802,6 @@ bool SdrObject::DoMacro(const SdrObjMacroHitRec&) return false; } -OUString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec&) const -{ - return OUString(); -} - bool SdrObject::IsMacroHit(const SdrObjMacroHitRec& rRec) const { return CheckMacroHit(rRec) != nullptr; diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index fc2a42d71735..7168b6206e61 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -766,11 +766,6 @@ void SdrObjGroup::NbcReformatText() NbcReformatAllTextObjects(); } -void SdrObjGroup::ReformatText() -{ - ReformatAllTextObjects(); -} - SdrObject* SdrObjGroup::DoConvertToPolyObj(bool bBezier, bool bAddText) const { SdrObject* pGroup = new SdrObjGroup(getSdrModelFromSdrObject()); diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 2a520936da66..da6a4280a1eb 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1430,21 +1430,6 @@ void SdrTextObj::NbcReformatText() } } -void SdrTextObj::ReformatText() -{ - if(GetOutlinerParaObject()) - { - tools::Rectangle aBoundRect0; - if (pUserCall!=nullptr) - aBoundRect0=GetLastBoundRect(); - - NbcReformatText(); - SetChanged(); - BroadcastObjectChange(); - SendUserCall(SdrUserCallType::Resize,aBoundRect0); - } -} - SdrObjGeoData* SdrTextObj::NewGeoData() const { return new SdrTextObjGeoData; diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index bfdd163c2391..e0fa4bf168e2 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -520,12 +520,6 @@ void SdrVirtObj::NbcReformatText() rRefObj.NbcReformatText(); } -void SdrVirtObj::ReformatText() -{ - rRefObj.ReformatText(); -} - - bool SdrVirtObj::HasMacro() const { return rRefObj.HasMacro(); @@ -551,11 +545,6 @@ bool SdrVirtObj::DoMacro(const SdrObjMacroHitRec& rRec) return rRefObj.DoMacro(rRec); // TODO: positioning offset } -OUString SdrVirtObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const -{ - return rRefObj.GetMacroPopupComment(rRec); // TODO: positioning offset -} - const Point SdrVirtObj::GetOffset() const { // #i73248# default offset of SdrVirtObj is aAnchor diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 7ce2e18cb546..fe440edf4649 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -450,39 +450,6 @@ SdrObject* SdrObjList::RemoveObject(size_t nObjNum) return pObj; } -SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum) -{ - if (nObjNum >= maList.size() || pNewObj == nullptr) - { - OSL_ASSERT(nObjNum<maList.size()); - OSL_ASSERT(pNewObj!=nullptr); - return nullptr; - } - - SdrObject* pObj=maList[nObjNum]; - DBG_ASSERT(pObj!=nullptr,"SdrObjList::ReplaceObject: Could not find object to remove."); - if (pObj!=nullptr) { - DBG_ASSERT(pObj->IsInserted(),"SdrObjList::ReplaceObject: the object does not have status Inserted."); - pObj->InsertedStateChange(); - SetParentAtSdrObjectFromSdrObjList(*pObj, nullptr); - ReplaceObjectInContainer(*pNewObj,nObjNum); - - // flushViewObjectContacts() clears the VOC's and those invalidate - pObj->GetViewContact().flushViewObjectContacts(); - - pNewObj->SetOrdNum(nObjNum); - SetParentAtSdrObjectFromSdrObjList(*pNewObj, this); - - // Inform the parent about change to allow invalidations at - // evtl. existing parent visualisations - impChildInserted(*pNewObj); - - pNewObj->InsertedStateChange(); - SetSdrObjListRectsDirty(); - } - return pObj; -} - SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, size_t nObjNum) { if (nObjNum >= maList.size()) diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index b9cd69098072..09bf65d05f68 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1718,11 +1718,8 @@ OUString SdrUndoPageChangeMasterPage::GetComment() const SdrUndoFactory::~SdrUndoFactory(){} + // shapes -SdrUndoAction* SdrUndoFactory::CreateUndoMoveObject( SdrObject& rObject ) -{ - return new SdrUndoMoveObj( rObject ); -} SdrUndoAction* SdrUndoFactory::CreateUndoMoveObject( SdrObject& rObject, const Size& rDist ) { @@ -1804,11 +1801,6 @@ SdrUndoAction* SdrUndoFactory::CreateUndoDeleteLayer(sal_uInt16 nLayerNum, SdrLa return new SdrUndoDelLayer( nLayerNum, rNewLayerAdmin, rNewModel ); } -SdrUndoAction* SdrUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNewPos1) -{ - return new SdrUndoMoveLayer( nLayerNum, rNewLayerAdmin, rNewModel, nNewPos1 ); -} - // page SdrUndoAction* SdrUndoFactory::CreateUndoDeletePage(SdrPage& rPage) { diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 8a9dbac463da..88c58cff636b 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -2006,18 +2006,6 @@ void SdrTableObj::NbcReformatText() } -void SdrTableObj::ReformatText() -{ - tools::Rectangle aBoundRect0; - if (pUserCall!=nullptr) - aBoundRect0=GetLastBoundRect(); - NbcReformatText(); - SetChanged(); - BroadcastObjectChange(); - SendUserCall(SdrUserCallType::Resize,aBoundRect0); -} - - bool SdrTableObj::IsVerticalWriting() const { const SvxWritingModeItem* pModeItem = &GetObjectItem( SDRATTR_TEXTDIRECTION ); diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index f7c26ff87270..790ce87893ab 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -139,7 +139,6 @@ public: bool IsValid() const; - tools::Rectangle GetVisArea(); Point LogicToPixel( const Point&, const MapMode& rMapMode ); Point PixelToLogic( const Point&, const MapMode& rMapMode ); @@ -822,35 +821,6 @@ bool SvxTextEditSourceImpl::IsValid() const return mpView && mpWindow; } -tools::Rectangle SvxTextEditSourceImpl::GetVisArea() -{ - if( IsValid() ) - { - SdrPaintWindow* pPaintWindow = mpView->FindPaintWindow(*mpWindow); - tools::Rectangle aVisArea; - - if(pPaintWindow) - { - aVisArea = pPaintWindow->GetVisibleArea(); - } - - // offset vis area by edit engine left-top position - SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>( mpObject ); - if( pTextObj ) - { - tools::Rectangle aAnchorRect; - pTextObj->TakeTextAnchorRect( aAnchorRect ); - aVisArea.Move( -aAnchorRect.Left(), -aAnchorRect.Top() ); - - MapMode aMapMode(mpWindow->GetMapMode()); - aMapMode.SetOrigin(Point()); - return mpWindow->LogicToPixel( aVisArea, aMapMode ); - } - } - - return tools::Rectangle(); -} - Point SvxTextEditSourceImpl::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) { // The responsibilities of ViewForwarder happen to be @@ -999,11 +969,6 @@ bool SvxTextEditSource::IsValid() const return mpImpl->IsValid(); } -tools::Rectangle SvxTextEditSource::GetVisArea() const -{ - return mpImpl->GetVisArea(); -} - Point SvxTextEditSource::LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const { return mpImpl->LogicToPixel( rPoint, rMapMode ); |