diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-09-10 09:26:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-10 12:46:49 +0100 |
commit | abbeed756019e099d16acb4155c7c459fef2d1b4 (patch) | |
tree | 221c20f0f2ee09e61bb68a8d5d352990feb79d07 /sc | |
parent | 3e0f9a148bf2c0a5916e850528a9b0472830bb9e (diff) |
callcatcher: update unused code
Change-Id: Ie31c16318b09699e080484292d489a378e3a6dce
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/document.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/documen5.cxx | 35 | ||||
-rw-r--r-- | sc/source/ui/inc/gridwin.hxx | 7 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 30 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin5.cxx | 18 |
5 files changed, 0 insertions, 92 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 88e062397117..e314145fd5f2 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -567,8 +567,6 @@ public: bool HasChartAtPoint( SCTAB nTab, const Point& rPos, OUString& rName ); ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > GetChartByName( const OUString& rChartName ); - std::vector<std::pair<css::uno::Reference< - css::chart2::XChartDocument>, Rectangle> > GetAllCharts(); SC_DLLPUBLIC void GetChartRanges( const OUString& rChartName, ::std::vector< ScRangeList >& rRanges, ScDocument* pSheetNameDoc ); void SetChartRanges( const OUString& rChartName, const ::std::vector< ScRangeList >& rRanges ); diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index b90297909a72..b3a9813945dd 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -661,41 +661,6 @@ uno::Reference< embed::XEmbeddedObject > return uno::Reference< embed::XEmbeddedObject >(); } -std::vector<std::pair<uno::Reference<chart2::XChartDocument>, Rectangle> > ScDocument::GetAllCharts() -{ - std::vector<std::pair<uno::Reference<chart2::XChartDocument>, Rectangle> > aRet; - if (!pDrawLayer) - return aRet; - - for (SCTAB nTab=0; nTab< static_cast<SCTAB>(maTabs.size()); nTab++) - { - if (!maTabs[nTab]) - continue; - - SdrPage* pPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(nTab)); - OSL_ENSURE(pPage,"Page ?"); - - if (!pPage) - continue; - - SdrObjListIter aIter( *pPage, IM_DEEPNOGROUPS ); - - for (SdrObject* pObject = aIter.Next(); pObject; pObject = aIter.Next()) - { - if ( pObject->GetObjIdentifier() != OBJ_OLE2 ) - continue; - - uno::Reference< chart2::XChartDocument > xChartDoc( ScChartHelper::GetChartFromSdrObject( pObject ) ); - if(!xChartDoc.is()) - continue; - - Rectangle aRect = pObject->GetLastBoundRect(); - aRet.push_back(std::pair<uno::Reference<chart2::XChartDocument>, Rectangle>(xChartDoc, aRect)); - } - } - return aRet; -} - void ScDocument::UpdateChartListenerCollection() { OSL_ASSERT(pChartListenerCollection); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index ed066b22becc..808633561987 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -130,7 +130,6 @@ class ScGridWindow : public Window, public DropTargetHelper, public DragSourceHe VisibleRange maVisibleRange; boost::scoped_ptr<sc::SpellCheckContext> mpSpellCheckCxt; - boost::ptr_vector<Window> maChildWindows; ScViewData* pViewData; ScSplitPos eWhich; @@ -416,12 +415,6 @@ public: void UpdateShrinkOverlay(); void UpdateAllOverlays(); - /** - * Takes ownership of the window - */ - void AddChildWindow(Window* pChildWindow); - void DeleteChildWindow(Window* pChildWindow); - protected: // #114409# void ImpCreateOverlayObjects(); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 071558c4e3fc..74219599323e 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -1634,36 +1634,6 @@ bool ScGridWindow::TestMouse( const MouseEvent& rMEvt, bool bAction ) void ScGridWindow::MouseButtonDown( const MouseEvent& rMEvt ) { - if(!maChildWindows.empty()) - { - const Point& rPos = rMEvt.GetPosPixel(); - for(boost::ptr_vector<Window>::iterator itr = maChildWindows.begin(), - itrEnd = maChildWindows.end(); itr != itrEnd; ++itr) - { - if(!itr->IsVisible()) - continue; - - Point aPoint = itr->GetPosPixel(); - Size aSize = itr->GetSizePixel(); - - if(rPos.X() >= aPoint.X() && rPos.X() <= (aPoint.X() + aSize.Width()) - && rPos.Y() >= aPoint.Y() && rPos.Y() <= (aPoint.Y() + aSize.Height())) - { - // we found a mouse event for the child window - // we need to recalculate the position based on the child window - - Point aNewPos = rPos - aPoint; - sal_uInt16 nClicks = rMEvt.GetClicks(); - sal_uInt16 nMode = rMEvt.GetMode(); - sal_uInt16 nButtons = rMEvt.GetButtons(); - sal_uInt16 nModifier = rMEvt.GetModifier(); - - MouseEvent aEvent(aNewPos, nClicks, nMode, nButtons, nModifier); - itr->MouseButtonDown(aEvent); - return; - } - } - } nNestedButtonState = SC_NESTEDBUTTON_DOWN; MouseEventState aState; diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index bed697b2db5b..9adb789f9ed7 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -472,22 +472,4 @@ void ScGridWindow::SwitchView() } } -void ScGridWindow::AddChildWindow(Window* pWindow) -{ - maChildWindows.push_back(pWindow); -} - -void ScGridWindow::DeleteChildWindow(Window* pWindow) -{ - for(boost::ptr_vector<Window>::iterator itr = maChildWindows.begin(), - itrEnd = maChildWindows.end(); itr != itrEnd; ++itr) - { - if(&(*itr) == pWindow) - { - maChildWindows.erase(itr); - return; - } - } -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |