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

Caolán McNamara caolanm at redhat.com
Tue Sep 12 14:51:57 UTC 2017


 cui/source/options/optgdlg.cxx |   24 ------------------------
 cui/source/options/optgdlg.hxx |    2 --
 2 files changed, 26 deletions(-)

New commits:
commit 98034b25ee3a2d4b1a98a48c22b21ef2f7ec8b23
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 12 15:50:47 2017 +0100

    down/up/focus/first/last handler not needed now
    
    Change-Id: Ie8cb8e1bfb32669c2b4487f02d107b08c60b2399

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 9592e852b633..bba98cf6540c 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -288,12 +288,6 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     m_aStrDateInfo = m_pToYearFT->GetText();
     m_pYearValueField->SetUseThousandSep(false);
     m_pYearValueField->SetModifyHdl( LINK( this, OfaMiscTabPage, TwoFigureHdl ) );
-    Link<SpinField&,void> aLink = LINK( this, OfaMiscTabPage, TwoFigureConfigHdl );
-    m_pYearValueField->SetDownHdl( aLink );
-    m_pYearValueField->SetUpHdl( aLink );
-    m_pYearValueField->SetLoseFocusHdl( LINK( this, OfaMiscTabPage, TwoFigureConfigFocusHdl ) );
-    m_pYearValueField->SetFirstHdl( aLink );
-    TwoFigureConfigHdl(*m_pYearValueField);
 
     SetExchangeSupport();
 }
@@ -389,14 +383,9 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
 
     const SfxPoolItem* pItem = nullptr;
     if ( SfxItemState::SET == rSet->GetItemState( SID_ATTR_YEAR2000, false, &pItem ) )
-    {
         m_pYearValueField->SetValue( static_cast<const SfxUInt16Item*>(pItem)->GetValue() );
-        TwoFigureConfigHdl(*m_pYearValueField);
-    }
     else
-    {
         m_pYearFrame->Enable(false);
-    }
 
     m_pCollectUsageInfo->Check(officecfg::Office::Common::Misc::CollectUsageInformation::get());
     m_pCollectUsageInfo->Enable(!officecfg::Office::Common::Misc::CollectUsageInformation::isReadOnly());
@@ -418,19 +407,6 @@ IMPL_LINK_NOARG( OfaMiscTabPage, TwoFigureHdl, Edit&, void )
     m_pToYearFT->SetText( aOutput );
 }
 
-IMPL_LINK( OfaMiscTabPage, TwoFigureConfigFocusHdl, Control&, rControl, void )
-{
-    TwoFigureConfigHdl(static_cast<SpinField&>(rControl));
-}
-IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, SpinField&, rEd, void )
-{
-    sal_Int64 nNum = m_pYearValueField->GetValue();
-    OUString aOutput(OUString::number(nNum));
-    m_pYearValueField->SetText(aOutput);
-    m_pYearValueField->SetSelection( Selection( 0, aOutput.getLength() ) );
-    TwoFigureHdl( static_cast<Edit&>(rEd) );
-}
-
 class CanvasSettings
 {
 public:
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 7a7dd59accf9..d0255c31793c 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -59,8 +59,6 @@ private:
     VclPtr<CheckBox>     m_pCollectUsageInfo;
 
     DECL_LINK( TwoFigureHdl, Edit&, void );
-    DECL_LINK( TwoFigureConfigHdl, SpinField&, void );
-    DECL_LINK( TwoFigureConfigFocusHdl, Control&, void );
 protected:
     virtual DeactivateRC   DeactivatePage( SfxItemSet* pSet ) override;
 


More information about the Libreoffice-commits mailing list