diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-02-09 11:29:37 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-02-09 11:29:37 +0100 |
commit | c12ab867f282e783507fcf74ab5c90e784681f65 (patch) | |
tree | 6435dd10b5d05d86b9ea4549bceb2696d028b641 /sd | |
parent | d84e78aa31252f6e514ad8a8ef38c4a4ec93cb37 (diff) |
Remove unused methods
GetOptimalSizePixel and GetHCtrlWidth are never called
Change-Id: Ib2ce1445447e85de66683f8b0fdf4fc8aa464084
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/inc/DrawViewShell.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/OutlineViewShell.hxx | 3 | ||||
-rw-r--r-- | sd/source/ui/inc/ViewShell.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drviews1.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/view/drviews5.cxx | 36 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 32 | ||||
-rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 5 |
7 files changed, 0 insertions, 94 deletions
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 1705abc97d5b..64de25ea84e3 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -389,9 +389,7 @@ protected: virtual SvxRuler* CreateVRuler(::sd::Window* pWin); virtual void UpdateHRuler(); virtual void UpdateVRuler(); - virtual long GetHCtrlWidth(); virtual void SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY); - virtual Size GetOptimalSizePixel() const; void SetupPage( Size &rSize, long nLeft, long nRight, long nUpper, long nLower, sal_Bool bSize, sal_Bool bMargin, sal_Bool bScaleAll ); diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index eb8dc5da26fa..616ed4269305 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -150,9 +150,6 @@ public: bool UpdateTitleObject( SdPage* pPage, Paragraph* pPara ); bool UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ); -protected: - virtual Size GetOptimalSizePixel() const; - private: OutlineView* pOlView; SdPage* pLastPage; // Zur performanten Aufbereitung der Preview diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index f1411652c8b7..7d7c58e9b396 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -537,10 +537,6 @@ protected: virtual void UpdateHRuler(); virtual void UpdateVRuler(); - // Zeiger auf ein zusaetzliches Control im horizontalen ScrollBar - // abgeleiteter Klassen (z.B. ein TabBar) zurueckgeben - virtual long GetHCtrlWidth(); - virtual void Activate(sal_Bool IsMDIActivate); virtual void Deactivate(sal_Bool IsMDIActivate); diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 92370bfd2030..2a2bfbafddeb 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -476,18 +476,6 @@ bool DrawViewShell::IsLayerModeActive (void) const } - -/** - * Return size of TabControls and ModeButtons - */ - -long DrawViewShell::GetHCtrlWidth() -{ - // return maTabControl.GetSizePixel().Width(); - return 0; -} - - /** * Generate horizontal ruler */ diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 2df7ffc396bc..152dc114fd10 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -478,42 +478,6 @@ void DrawViewShell::SetZoomFactor(const Fraction& rZoomX, const Fraction& rZoomY /************************************************************************* |* -|* Optimale Groesse zurueckgeben -|* -\************************************************************************/ - -Size DrawViewShell::GetOptimalSizePixel() const -{ - Size aSize; - - SdrPageView* pPV = mpDrawView->GetSdrPageView(); - if (pPV) - { - SdPage* pPage = (SdPage*) pPV->GetPage(); - - if (pPage) - { - if (!mbZoomOnPage) - { - // Gegenwaertigen MapMode beruecksichtigen - aSize = GetActiveWindow()->LogicToPixel( pPage->GetSize() ); - } - else - { - // 1:1 Darstellung - MapMode aMapMode(MAP_100TH_MM); - aSize = GetActiveWindow()->LogicToPixel( pPage->GetSize(), aMapMode ); - const_cast< DrawViewShell* >(this)->mbZoomOnPage = sal_True; - } - } - } - - return(aSize); -} - - -/************************************************************************* -|* |* Seite wird gehided |* \************************************************************************/ diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 6469ef017270..2703bf14e184 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1536,38 +1536,6 @@ sal_Bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) /************************************************************************* |* -|* Return optimal Size -|* -\************************************************************************/ - -Size OutlineViewShell::GetOptimalSizePixel() const -{ - Size aResult(200, 200); - if (pOlView) - { - ::Outliner* pOutliner = pOlView->GetOutliner(); - if (pOutliner) - { - Size aTemp = pOutliner->CalcTextSize(); - aTemp = GetActiveWindow()->LogicToPixel(aTemp); - aResult.Width() = Max(aResult.Width(), aTemp.Width()); - aResult.Height() = Max(aResult.Height(), aTemp.Height()); - if (4 * aResult.Height() > 3 * aResult.Width()) - { - aResult.Height() = 3 * aResult.Width() / 4; - } - } - } - - // now add the default stuff - aResult.Width() += mpVerticalScrollBar->GetSizePixel().Width(); - aResult.Height() += mpHorizontalScrollBar->GetSizePixel().Height(); - return aResult; -} - - -/************************************************************************* -|* |* Return text of the selection |* \************************************************************************/ diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index e4b65e04a906..c666875643ec 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -284,11 +284,6 @@ void ViewShell::UpdateVRuler() { } -long ViewShell::GetHCtrlWidth() -{ - return 0; -} - /************************************************************************* |* |* Eine bestimmte Anzahl von Zeilen scrollen (wird beim automatischen |