sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx | 25 --------------------- sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 1 sc/uiconfig/scalc/ui/sidebarnumberformat.ui | 3 -- 3 files changed, 29 deletions(-)
New commits: commit 882604ad9546c7d267b1c0beed29448e072cf0a3 Author: Maxim Monastirsky <[email protected]> Date: Tue Aug 25 13:20:11 2015 +0300 Some cleanup Change-Id: Ia22866225b2a726ed69c9f18d02d1ebffdafde8f diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 0350373..e78bf7f 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -38,10 +38,6 @@ using namespace css; using namespace css::uno; using ::sfx2::sidebar::Theme; -const char UNO_NUMERICFIELD[] = ".uno:NumberFormatDecimal"; -const char UNO_NUMBERFORMATPERCENT[] = ".uno:NumberFormatPercent"; -const char UNO_NUMBERFORMATCURRENCY[] = ".uno:NumberFormatCurrency"; - namespace sc { namespace sidebar { NumberFormatPropertyPanel::NumberFormatPropertyPanel( @@ -97,8 +93,6 @@ void NumberFormatPropertyPanel::Initialize() mpLbCategory->SetAccessibleName(OUString( "Category")); mpLbCategory->SetDropDownLineCount(mpLbCategory->GetEntryCount()); - mpTBCategory->SetSelectHdl ( LINK(this, NumberFormatPropertyPanel, NumFormatHdl) ); - aLink = LINK(this, NumberFormatPropertyPanel, NumFormatValueHdl); mpEdDecimals->SetModifyHdl( aLink ); @@ -112,25 +106,6 @@ void NumberFormatPropertyPanel::Initialize() mpTBCategory->SetAccessibleRelationLabeledBy(mpTBCategory); } -IMPL_LINK_TYPED( NumberFormatPropertyPanel, NumFormatHdl, ToolBox*, pBox, void ) -{ - const OUString aCommand(pBox->GetItemCommand(pBox->GetCurItemId())); - sal_uInt16 nId = 0; - - if(aCommand == UNO_NUMERICFIELD) - nId = 1; - else if(aCommand == UNO_NUMBERFORMATPERCENT) - nId = 2; - else if(aCommand == UNO_NUMBERFORMATCURRENCY) - nId = 3; - - if( nId != mnCategorySelected ) - { - SfxUInt16Item aItem( SID_NUMBER_TYPE_FORMAT, nId ); - GetBindings()->GetDispatcher()->Execute(SID_NUMBER_TYPE_FORMAT, SfxCallMode::RECORD, &aItem, 0L); - } -} - IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox*, pBox ) { sal_uInt16 nVal = pBox->GetSelectEntryPos(); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 5c61709..c401b8a 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -84,7 +84,6 @@ private: ::sfx2::sidebar::EnumContext maContext; SfxBindings* mpBindings; - DECL_LINK_TYPED(NumFormatHdl, ToolBox*, void); DECL_LINK(NumFormatSelectHdl, ListBox*); DECL_LINK(NumFormatValueHdl, void*); diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui index 16641e1..1251181 100644 --- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui +++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui @@ -56,7 +56,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NumberFormatCurrency</property> - <property name="label">toolbutton1</property> <property name="use_underline">True</property> </object> <packing> @@ -70,7 +69,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NumberFormatPercent</property> - <property name="label">toolbutton2</property> <property name="use_underline">True</property> </object> <packing> @@ -84,7 +82,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:NumberFormatDecimal</property> - <property name="label">toolbutton3</property> <property name="use_underline">True</property> </object> <packing> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
