summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-07 12:04:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-07 12:07:43 +0200
commite1b1778b00227e11bd180db254ce6f2a20739394 (patch)
tree74c43914676869334125236a9f51f6aeb822e540
parentcff185e438f2db564d0309f1c790cd79be908351 (diff)
loplugin:staticmethods: sc
Change-Id: I7fb92d55a48e1a79568a25002bf17155b8f387b4
-rw-r--r--sc/source/ui/inc/docsh.hxx2
-rw-r--r--sc/source/ui/inc/tabview.hxx2
-rw-r--r--sc/source/ui/vba/vbawindow.cxx2
-rw-r--r--sc/source/ui/view/tabview.cxx2
-rw-r--r--sc/source/ui/view/viewdata.cxx2
5 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 31adcf66ea43..d5b2c9287ede 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -134,7 +134,7 @@ class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell, public SfxListener
SAL_DLLPRIVATE bool SaveXML( SfxMedium* pMedium, const css::uno::Reference< css::embed::XStorage >& );
SAL_DLLPRIVATE SCTAB GetSaveTab();
- SAL_DLLPRIVATE bool SaveCurrentChart( SfxMedium& rMedium );
+ SAL_DLLPRIVATE static bool SaveCurrentChart( SfxMedium& rMedium );
SAL_DLLPRIVATE sal_uLong DBaseImport( const OUString& rFullFileName, rtl_TextEncoding eCharSet,
ScColWidthParam aColWidthParam[MAXCOLCOUNT], ScFlatBoolRowSegments& rRowHeightsRecalc );
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 58cebc8763ba..ceb1531e979a 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -252,7 +252,7 @@ public:
/** Returns the current tab bar width in pixels. */
long GetTabBarWidth() const;
/** Returns the current tab bar width relative to the frame window width (0.0 ... 1.0). */
- SC_DLLPUBLIC double GetRelTabBarWidth() const;
+ SC_DLLPUBLIC static double GetRelTabBarWidth();
/** Returns the pending tab bar width relative to the frame window width (0.0 ... 1.0). */
double GetPendingRelTabBarWidth() const { return mfPendingTabBarWidth;}
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 42c62bbeb4d9..29f9206ac586 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -862,7 +862,7 @@ double SAL_CALL ScVbaWindow::getTabRatio() throw (css::uno::RuntimeException, st
ScTabViewShell* pViewShell = excel::getBestViewShell( m_xModel );
if ( pViewShell && pViewShell->GetViewData().GetView() )
{
- double fRatio = pViewShell->GetViewData().GetView()->GetRelTabBarWidth();
+ double fRatio = ScTabView::GetRelTabBarWidth();
if ( fRatio >= 0.0 && fRatio <= 1.0 )
return fRatio;
}
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index c83ddd442d30..e2fa248ee17f 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -891,7 +891,7 @@ long ScTabView::GetTabBarWidth() const
return pTabControl->GetSizePixel().Width();
}
-double ScTabView::GetRelTabBarWidth() const
+double ScTabView::GetRelTabBarWidth()
{
return 0.5;
}
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 90d5cd6e10bc..614bd5f2f4be 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2454,7 +2454,7 @@ void ScViewData::WriteExtOptions( ScExtDocOptions& rDocOpt ) const
// width of the tabbar, relative to frame window width
rDocSett.mfTabBarWidth = pView->GetPendingRelTabBarWidth();
if( rDocSett.mfTabBarWidth < 0.0 )
- rDocSett.mfTabBarWidth = pView->GetRelTabBarWidth();
+ rDocSett.mfTabBarWidth = ScTabView::GetRelTabBarWidth();
// sheet settings
for( SCTAB nTab = 0; nTab < static_cast<SCTAB>(maTabData.size()); ++nTab )