[Libreoffice-commits] .: vcl/inc vcl/unx

Caolán McNamara caolan at kemper.freedesktop.org
Mon Sep 5 09:05:10 PDT 2011


 vcl/inc/unx/i18n_status.hxx         |    5 -----
 vcl/unx/generic/app/i18n_status.cxx |   36 ------------------------------------
 2 files changed, 41 deletions(-)

New commits:
commit 8da489aa9da47634c51010e49bb0844147169cfa
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 5 17:05:03 2011 +0100

    now we can ditch these unused methods

diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index 0b88d77..a35e1d6 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -91,16 +91,11 @@ public:
     SalFrame* getStatusFrame() const;
 
     void setStatusText( const String& rText );
-    String getStatusText() const;
 
     enum ShowReason { focus, presentation, contextmap };
     void show( bool bShow, ShowReason eReason );
 
     const ::std::vector< ChoiceData >& getChoices() const { return m_aChoices; }
-    void clearChoices();
-    void addChoice( const String&, void* pData );
-
-    void toTop() const;
 
     // for SwitchIMCallback
     void changeIM( const String& );
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index 8cae9d1..f818f04 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -638,42 +638,6 @@ void I18NStatus::changeIM( const String& rIM )
 
 // --------------------------------------------------------------------------
 
-String I18NStatus::getStatusText() const
-{
-    return m_pStatusWindow ? m_pStatusWindow->getText() :  String();
-}
-
-// --------------------------------------------------------------------------
-
-void I18NStatus::clearChoices()
-{
-    m_aChoices.clear();
-}
-
-// --------------------------------------------------------------------------
-
-void I18NStatus::addChoice( const String& rChoice, void* pData )
-{
-    ChoiceData aData;
-    aData.pData     = pData;
-    aData.aString   = rChoice;
-    m_aChoices.push_back( aData );
-}
-
-// --------------------------------------------------------------------------
-
-void I18NStatus::toTop() const
-{
-    if( m_pStatusWindow )
-    {
-        const SystemEnvData* pData = m_pStatusWindow->GetSystemData();
-        XRaiseWindow( (Display*)pData->pDisplay,
-                      (XLIB_Window)pData->aShellWindow );
-    }
-}
-
-// --------------------------------------------------------------------------
-
 SalFrame* I18NStatus::getStatusFrame() const
 {
     SalFrame* pRet = NULL;


More information about the Libreoffice-commits mailing list