loplugin:constantfunction: unotools

Change-Id: Icf543973dc9edde270016c8af7e4c08c57eff650

8 files changed, 12 insertions, 17 deletions

diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 3bde7a4b32fe..2e41965b81c9 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -243,7 +243,7 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument,
     SbMethod* pMethod = NULL;
 
     boost::scoped_ptr< MacroChooser > pChooser( new MacroChooser( NULL, true ) );
-    if ( bChooseOnly || !SvtModuleOptions().IsBasicIDE() )
+    if ( bChooseOnly || !SvtModuleOptions::IsBasicIDE() )
         pChooser->SetMode(MacroChooser::ChooseOnly);
 
     if ( !bChooseOnly && rxLimitToDocument.is() )
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 60ada3d5af34..25a876878aed 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -380,7 +380,7 @@ long HandleBasicError( StarBASIC* pBasic )
 
     long nRet = 0;
     Shell* pShell = 0;
-    if ( SvtModuleOptions().IsBasicIDE() )
+    if ( SvtModuleOptions::IsBasicIDE() )
     {
         BasicManager* pBasMgr = FindBasicManager( pBasic );
         if ( pBasMgr )
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index 7c5d6278af71..d6448599e596 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -296,12 +296,12 @@ public:
     // dummy returns, to be implemented
     inline  sal_Unicode         getCurrZeroChar() const
                                     { return cCurrZeroChar; }
-    inline  bool                isNumLeadingZero() const
+    static inline  bool         isNumLeadingZero()
                                     { return true; }
                                 /// standard decimal places
-    inline  sal_uInt16              getNumDigits() const
+    static inline sal_uInt16    getNumDigits()
                                     { return 2; }
-    inline  bool                isNumTrailingZeros() const
+    static inline  bool         isNumTrailingZeros()
                                     { return true; }
 
     // reserved words
diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx
index d1e2499062ea..29dff59d2d75 100644
--- a/include/unotools/moduleoptions.hxx
+++ b/include/unotools/moduleoptions.hxx
@@ -161,7 +161,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail::
         bool   IsDraw     () const;
         bool   IsWriter   () const;
         bool   IsImpress  () const;
-        bool   IsBasicIDE () const;
+        static bool   IsBasicIDE () { return true; }
         bool   IsDataBase () const;
 
         ::com::sun::star::uno::Sequence < OUString > GetAllServiceNames();
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index f7c67d36d284..281ccf7857c8 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -870,7 +870,7 @@ bool SdrAngleItem::GetPresentation(
             pIntlWrapper = pMyIntlWrapper = new IntlWrapper(
                 Application::GetSettings().GetLanguageTag() );
 
-        if(pIntlWrapper->getLocaleData()->isNumLeadingZero())
+        if(LocaleDataWrapper::isNumLeadingZero())
             nCount++;
 
         while(aText.getLength() < nCount)
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 9e59338bdbd3..69aadc58c094 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1224,7 +1224,7 @@ void SdrModel::TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars, sal_I
 
     if( -1 == nNumDigits )
     {
-        nNumDigits = rLoc.getNumDigits();
+        nNumDigits = LocaleDataWrapper::getNumDigits();
     }
 
     sal_Int32 nKomma(nUIUnitKomma);
@@ -1267,7 +1267,7 @@ void SdrModel::TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars, sal_I
         // if necessary, add zeros before the decimal point
         sal_Int32 nAnz = nKomma - aBuf.getLength();
 
-        if(nAnz >= 0 && rLoc.isNumLeadingZero())
+        if(nAnz >= 0 && LocaleDataWrapper::isNumLeadingZero())
             nAnz++;
 
         for(sal_Int32 i=0; i<nAnz; i++)
@@ -1282,7 +1282,7 @@ void SdrModel::TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars, sal_I
     if(nKomma > 0)
         aBuf.insert(nVorKomma, cDec);
 
-    if(!rLoc.isNumTrailingZeros())
+    if(!LocaleDataWrapper::isNumTrailingZeros())
     {
         // Remove all trailing zeros.
         while (!aBuf.isEmpty() && aBuf[aBuf.getLength()-1] == '0')
@@ -1338,7 +1338,7 @@ void SdrModel::TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar) const
     const LocaleDataWrapper& rLoc = aSysLoc.GetLocaleData();
     sal_Int32 nAnz = 2;
 
-    if(rLoc.isNumLeadingZero())
+    if(LocaleDataWrapper::isNumLeadingZero())
         nAnz++;
 
     while(aBuf.getLength() < nAnz)
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index e4c0b85ffff5..1cb007867eee 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -867,7 +867,7 @@ void SdrFormatter::TakeStr(long nVal, OUString& rStr) const
             aStr.insert(0, aNullCode);
 
         // remove superfluous decimal points
-        sal_Int32 nNumDigits(rLoc.getNumDigits());
+        sal_Int32 nNumDigits(LocaleDataWrapper::getNumDigits());
         sal_Int32 nWeg(nC - nNumDigits);
 
         if(nWeg > 0)
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index f5ad76ce0ba5..64ccf8a17e93 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -1044,11 +1044,6 @@ bool SvtModuleOptions::IsImpress() const
     return m_pDataContainer->IsModuleInstalled( E_SIMPRESS );
 }
 
-bool SvtModuleOptions::IsBasicIDE() const
-{
-    return true;
-}
-
 bool SvtModuleOptions::IsDataBase() const
 {
     ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );