[Libreoffice-commits] core.git: chart2/source vcl/inc vcl/source

[Noel Grandin]

 chart2/source/model/template/DataInterpreter.hxx |    3 ---
 vcl/inc/listbox.hxx                              |    3 ---
 vcl/source/control/imp_listbox.cxx               |    3 +--
 3 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit fde0892f2d77c19b2c281aece7d20244640aa147
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Nov 18 09:35:22 2016 +0200

    loplugin:unusedmethods
    
    Change-Id: I567c672a0606ac11c0f269fcf5cc3906684e23f9
    Reviewed-on: https://gerrit.libreoffice.org/30950
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx
index 008144b..0a1900a 100644
--- a/chart2/source/model/template/DataInterpreter.hxx
+++ b/chart2/source/model/template/DataInterpreter.hxx
@@ -35,9 +35,6 @@ public:
     explicit DataInterpreter( const css::uno::Reference< css::uno::XComponentContext > & xContext );
     virtual ~DataInterpreter() override;
 
-    const css::uno::Reference< css::uno::XComponentContext >&
-        GetComponentContext() const { return m_xContext;}
-
     /// XServiceInfo declarations
     virtual OUString SAL_CALL getImplementationName()
             throw( css::uno::RuntimeException, std::exception ) override;
diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx
index 5802613..a589c72 100644
--- a/vcl/inc/listbox.hxx
+++ b/vcl/inc/listbox.hxx
@@ -513,7 +513,6 @@ private:
     Image           maImage;
 
     Rectangle       maFocusRect;
-    Size            maUserItemSize;
 
     Link<void*,void> maMBDownHdl;
     Link<UserDrawEvent*, void> maUserDrawHdl;
@@ -546,8 +545,6 @@ public:
     void            SetMBDownHdl( const Link<void*,void>& rLink ) { maMBDownHdl = rLink; }
     void            SetUserDrawHdl( const Link<UserDrawEvent*, void>& rLink ) { maUserDrawHdl = rLink; }
 
-    void            SetUserItemSize( const Size& rSz )  { maUserItemSize = rSz; }
-
     void            EnableUserDraw( bool bUserDraw )    { mbUserDrawEnabled = bUserDraw; }
     bool            IsUserDrawEnabled() const           { return mbUserDrawEnabled; }
 
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 70deaae..f957c45 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2805,8 +2805,7 @@ void ImplWin::DrawEntry(vcl::RenderContext& rRenderContext, bool bDrawImage, boo
 
         if ( !bDrawTextAtImagePos && ( bImage || IsUserDrawEnabled() ) )
         {
-            long nMaxWidth = std::max( maImage.GetSizePixel().Width(), maUserItemSize.Width() );
-            aTextRect.Left() += nMaxWidth + IMG_TXT_DISTANCE;
+            aTextRect.Left() += maImage.GetSizePixel().Width() + IMG_TXT_DISTANCE;
         }
 
         MetricVector* pVector = bLayout ? &mpControlData->mpLayoutData->m_aUnicodeBoundRects : nullptr;