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

[Stephan Bergmann]

 cui/source/dialogs/iconcdlg.cxx |   28 +---------------------------
 cui/source/inc/iconcdlg.hxx     |    2 --
 2 files changed, 1 insertion(+), 29 deletions(-)

New commits:
commit 56bbd709904b3a8b8932acbf72df4192d873c18f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 24 13:21:05 2014 +0200

    -Werror,-Wunused-function -Werror,-Wunused-private-field
    
    ... -Werror,-Wunused-variable loplugin:bodynotinblock
    
    Change-Id: I64742401e22b4b83364411a7454c755daa78d00c

diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 0af84e0..5c795db 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -35,31 +35,6 @@
 
 using ::std::vector;
 
-// some stuff for easier changes for SvtViewOptions
-static const sal_Char*      pViewOptDataName = "dialog data";
-#define VIEWOPT_DATANAME    OUString::createFromAscii( pViewOptDataName )
-
-static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const OUString& rData )
-{
-    rOpt.SetUserItem( VIEWOPT_DATANAME, css::uno::makeAny( rData ) );
-}
-
-static inline OUString GetViewOptUserItem( const SvtViewOptions& rOpt )
-{
-    ::com::sun::star::uno::Any aAny( rOpt.GetUserItem( VIEWOPT_DATANAME ) );
-    OUString aUserData;
-    aAny >>= aUserData;
-
-    return aUserData;
-}
-
-
-
-
-// Class IconChoicePage
-
-
-
 /**********************************************************************
 |
 | Ctor / Dtor
@@ -209,7 +184,6 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const OString& rID,
     pOutSet         ( NULL ),
     pExampleSet     ( NULL ),
     pRanges         ( NULL ),
-    rId             ( rID ),
 
     bHideResetBtn   ( false ),
     bModal          ( false ),
@@ -754,7 +728,7 @@ void IconChoiceDialog::Start_Impl()
             nActPage = maPageList.front()->nId;
     }*/
     //else if ( USHRT_MAX != mnCurrentPageId && GetPageData ( mnCurrentPageId ) != NULL )
-        nActPage = mnCurrentPageId;
+    nActPage = mnCurrentPageId;
 
     mnCurrentPageId = nActPage;
 
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index fb8ad2f..ceb2f19 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -144,8 +144,6 @@ private :
     SfxItemSet*             pExampleSet;
     sal_uInt16*                 pRanges;
 
-    const OString&          rId;
-
     bool                    bHideResetBtn;
     bool                    bModal;
     bool                    bInOK;