Non-split currency button

Change-Id: I002af2140dd372302509509baf8d5f400ed4341a

9 files changed, 37 insertions, 2 deletions

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index b97f2e223f44..67acc1c1a190 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -649,6 +649,8 @@ cmd/lc_currencyfield.png cmd/lc_formattedfield.png
 cmd/sc_currencyfield.png cmd/sc_formattedfield.png
 cmd/lc_numberformatcurrency.png cmd/lc_formattedfield.png
 cmd/sc_numberformatcurrency.png cmd/sc_formattedfield.png
+cmd/lc_numberformatcurrencysimple.png cmd/lc_formattedfield.png
+cmd/sc_numberformatcurrencysimple.png cmd/sc_formattedfield.png
 
 # Fontwork
 cmd/lc_fontworkshapetype.png cmd/lc_fontwork.png
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 0c66dda38504..3742652181fa 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -2,6 +2,8 @@ cmd/lc_savesimple.png cmd/lc_save.png
 cmd/sc_savesimple.png cmd/sc_save.png
 cmd/lc_underlinesimple.png cmd/lc_underline.png
 cmd/sc_underlinesimple.png cmd/sc_underline.png
+cmd/lc_numberformatcurrencysimple.png cmd/lc_numberformatcurrency.png
+cmd/sc_numberformatcurrencysimple.png cmd/sc_numberformatcurrency.png
 cmd/lc_datastreamsplay.png avmedia/res/avl02049.png
 cmd/sc_datastreamsplay.png avmedia/res/av02049.png
 cmd/lc_datastreamsstop.png avmedia/res/avl02051.png
diff --git a/icon-themes/hicontrast/links.txt b/icon-themes/hicontrast/links.txt
index df0ec87ceb50..f5dd5531dd4a 100644
--- a/icon-themes/hicontrast/links.txt
+++ b/icon-themes/hicontrast/links.txt
@@ -2,6 +2,8 @@ cmd/lc_savesimple.png cmd/lc_save.png
 cmd/sc_savesimple.png cmd/sc_save.png
 cmd/lc_underlinesimple.png cmd/lc_underline.png
 cmd/sc_underlinesimple.png cmd/sc_underline.png
+cmd/lc_numberformatcurrencysimple.png cmd/lc_numberformatcurrency.png
+cmd/sc_numberformatcurrencysimple.png cmd/sc_numberformatcurrency.png
 cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png
 cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png
 
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 2424d04052f9..80f8e01252cb 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -96,6 +96,8 @@ cmd/sc_spellingandgrammardialog.png cmd/sc_spelling.png
 # Calc
 cmd/lc_numberformatcurrency.png cmd/lc_insertcurrencyfield.png
 cmd/sc_numberformatcurrency.png cmd/sc_insertcurrencyfield.png
+cmd/lc_numberformatcurrencysimple.png cmd/lc_insertcurrencyfield.png
+cmd/sc_numberformatcurrencysimple.png cmd/sc_insertcurrencyfield.png
 cmd/lc_linestyle.png cmd/lc_borderdialog.png
 cmd/sc_linestyle.png cmd/sc_borderdialog.png
 
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 5e7ed99de6dc..8003f058c992 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -178,9 +178,11 @@ cmd/lc_numberformatdate.png cmd/lc_datefield.png
 cmd/sc_datefield.png cmd/sc_numberformatdate.png
 cmd/lc_insertcurrencyfield.png cmd/lc_currencyfield.png
 cmd/lc_numberformatcurrency.png cmd/lc_currencyfield.png
+cmd/lc_numberformatcurrencysimple.png cmd/lc_currencyfield.png
 cmd/sc_inserttimefield.png cmd/sc_timefield.png
 cmd/sc_insertcurrencyfield.png cmd/sc_currencyfield.png
 cmd/sc_numberformatcurrency.png cmd/sc_currencyfield.png
+cmd/sc_numberformatcurrencysimple.png cmd/sc_currencyfield.png
 sfx2/res/favourite_big.png cmd/lc_insertbookmark.png
 sfx2/res/favorite.png cmd/sc_insertbookmark.png
 cmd/lc_hyperlinkdialog.png cmd/lc_inserthyperlink.png
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 662a9fb58c7b..5e96b22fc040 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -304,6 +304,10 @@ public:
     virtual ~SvxCurrencyToolBoxControl();
     virtual void Select( sal_uInt16 nSelectModifier ) override;
     virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
+
+    // XInitialization
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rArguments )
+        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
 };
 
 
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index da6d836b6fe6..11998fd9a795 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1792,6 +1792,20 @@
           <value>1</value>
         </prop>
       </node>
+      <node oor:name=".uno:NumberFormatCurrencySimple" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Format as Currency</value>
+        </prop>
+        <prop oor:name="TooltipLabel" oor:type="xs:string">
+          <value xml:lang="en-US">Currency</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:NumberFormatCurrency</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:NumberFormatPercent" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Format as Percent</value>
diff --git a/sc/uiconfig/scalc/toolbar/singlemode.xml b/sc/uiconfig/scalc/toolbar/singlemode.xml
index df58727575c4..afee24d0f806 100644
--- a/sc/uiconfig/scalc/toolbar/singlemode.xml
+++ b/sc/uiconfig/scalc/toolbar/singlemode.xml
@@ -33,7 +33,7 @@
  <toolbar:toolbaritem xlink:href=".uno:SpellDialog" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:NumberFormatStandard" toolbar:visible="false"/>
- <toolbar:toolbaritem xlink:href=".uno:NumberFormatCurrency"/>
+ <toolbar:toolbaritem xlink:href=".uno:NumberFormatCurrencySimple"/>
  <toolbar:toolbaritem xlink:href=".uno:NumberFormatPercent"/>
  <toolbar:toolbaritem xlink:href=".uno:NumberFormatDecimal"/>
  <toolbar:toolbarseparator/>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2670db97e772..9434567a09a4 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2998,11 +2998,18 @@ SvxCurrencyToolBoxControl::SvxCurrencyToolBoxControl( sal_uInt16 nSlotId, sal_uI
     m_eLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ),
     m_nFormatKey( NUMBERFORMAT_ENTRY_NOT_FOUND )
 {
-    rBox.SetItemBits( nId, rBox.GetItemBits( nId ) | ToolBoxItemBits::DROPDOWN );
 }
 
 SvxCurrencyToolBoxControl::~SvxCurrencyToolBoxControl() {}
 
+void SvxCurrencyToolBoxControl::initialize( const css::uno::Sequence< css::uno::Any >& rArguments )
+    throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
+{
+    SfxToolBoxControl::initialize(rArguments);
+    if (GetToolBox().GetItemCommand(GetId()) == m_aCommandURL)
+        GetToolBox().SetItemBits(GetId(), ToolBoxItemBits::DROPDOWN | GetToolBox().GetItemBits(GetId()));
+}
+
 VclPtr<SfxPopupWindow> SvxCurrencyToolBoxControl::CreatePopupWindow()
 {
     VclPtr<SvxCurrencyList_Impl> xCurrencyWin =