[Libreoffice-commits] core.git: sd/source

[Stephan Bergmann]

 sd/source/ui/sidebar/SlideBackground.cxx |   22 ----------------------
 sd/source/ui/sidebar/SlideBackground.hxx |    1 -
 2 files changed, 23 deletions(-)

New commits:
commit f28473dd0aaab4aee3fbe60c915a554550c4d8b2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Sep 30 22:46:30 2017 +0200

    -Werror,-Wunused-private-field
    
    Change-Id: I6dc2aaffc2fb018ed389312cbc0d37222a6df89a
    Reviewed-on: https://gerrit.libreoffice.org/42979
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 08e7cab09e6d..fcd11edcb44e 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -73,27 +73,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 
-namespace
-{
-    FieldUnit lcl_GetFieldUnit()
-    {
-        FieldUnit eUnit = FUNIT_CM;
-        const SfxPoolItem* pItem = nullptr;
-        SfxViewFrame* pCurrent = SfxViewFrame::Current();
-        SfxItemState eState = pCurrent ? pCurrent->GetBindings().GetDispatcher()->QueryState(SID_ATTR_METRIC, pItem) : SfxItemState::UNKNOWN;
-        if (pItem && eState >= SfxItemState::DEFAULT)
-        {
-            eUnit = (FieldUnit)static_cast<const SfxUInt16Item*>( pItem )->GetValue();
-        }
-        else
-        {
-            return SfxModule::GetCurrentFieldUnit();
-        }
-
-        return eUnit;
-    }
-}
-
 namespace sd { namespace sidebar {
 
 enum eFillStyle
@@ -144,7 +123,6 @@ SlideBackground::SlideBackground(
     mbTitle(false),
     mpPageLRMarginItem( new SvxLongLRSpaceItem( 0, 0, SID_ATTR_PAGE_LRSPACE ) ),
     mpPageULMarginItem( new SvxLongULSpaceItem( 0, 0, SID_ATTR_PAGE_ULSPACE ) ),
-    meFieldUnit(lcl_GetFieldUnit()),
     m_nPageLeftMargin(0),
     m_nPageRightMargin(0),
     m_nPageTopMargin(0),
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index 804b6571b20d..ce00b6716b01 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -131,7 +131,6 @@ private:
     bool         mbTitle;
     std::unique_ptr<SvxLongLRSpaceItem> mpPageLRMarginItem;
     std::unique_ptr<SvxLongULSpaceItem> mpPageULMarginItem;
-    FieldUnit meFieldUnit;
     long m_nPageLeftMargin;
     long m_nPageRightMargin;
     long m_nPageTopMargin;