[Libreoffice-commits] .: 2 commits - desktop/win32 svx/inc svx/source unusedcode.easy

[Caolán McNamara]

 desktop/win32/source/setup/setup.cpp |    1 -
 svx/inc/svx/modctrl.hxx              |    2 --
 svx/source/stbctrls/modctrl.cxx      |    4 ----
 unusedcode.easy                      |    1 -
 4 files changed, 8 deletions(-)

New commits:
commit e9d33950625ea51bbfc887b3b3eb3150a145ce23
Author: Dmitry Ashkadov <dmitry.ashkadov at gmail.com>
Date:   Wed Sep 21 14:54:29 2011 +0100

    Removed unused some code related to fdo#39430

diff --git a/svx/inc/svx/modctrl.hxx b/svx/inc/svx/modctrl.hxx
index ef2859e..34abea0 100644
--- a/svx/inc/svx/modctrl.hxx
+++ b/svx/inc/svx/modctrl.hxx
@@ -49,8 +49,6 @@ public:
 
     SvxModifyControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
 
-    static  sal_uIntPtr GetDefItemWidth(const StatusBar& rStb);
-
 private:
     struct ImplData;
     ::boost::shared_ptr<ImplData> mpImpl;
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 8239aa8..1e94cd9 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -146,10 +146,6 @@ void SvxModifyControl::DoubleClick()
     execute(OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")), aArgs);
 }
 
-sal_uIntPtr SvxModifyControl::GetDefItemWidth(const StatusBar& rStb)
-{
-    return rStb.GetTextWidth(String::CreateFromAscii("XX"));
-}
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 1ca9d33..9c43bd3 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1134,7 +1134,6 @@ SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeOrder* const*, unsigned short)
 SvxMSDffShapeTxBxSort::Insert(SvxMSDffShapeTxBxSort const*, unsigned short, unsigned short)
 SvxMSDffShapeTxBxSort::Remove(SvxMSDffShapeOrder* const&, unsigned short)
 SvxMSDffShapeTxBxSort::Remove(unsigned short, unsigned short)
-SvxModifyControl::GetDefItemWidth(StatusBar const&)
 SvxNumRule::SetLevel(unsigned short, SvxNumberFormat const*)
 SvxNumberFormatShell::GetCurCurrencyEntry()
 SvxNumberFormatShell::GetCurrencyFormats(SvStrings&)
commit 36bc016123b11a3e4ab3fb8d4a9fe2b441c54417
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 21 13:45:26 2011 +0100

    WaE: fall through to final return

diff --git a/desktop/win32/source/setup/setup.cpp b/desktop/win32/source/setup/setup.cpp
index 990d34c..a85a74b 100644
--- a/desktop/win32/source/setup/setup.cpp
+++ b/desktop/win32/source/setup/setup.cpp
@@ -1913,7 +1913,6 @@ boolean SetupAppX::IsPatchInstalled( TCHAR* pBaseDir, TCHAR* pFileName )
         return false;
     else if ( nRet == ERROR_UNKNOWN_PROPERTY )
         return false;
-    else return false;
 
     return false;
 }