[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/galaxy icon-themes/hicontrast icon-themes/sifr icon-themes/tango include/svx officecfg/registry sc/uiconfig svx/source sw/uiconfig
Maxim Monastirsky
momonasmon at gmail.com
Fri Aug 26 12:05:06 UTC 2016
icon-themes/breeze/links.txt | 2 +
icon-themes/galaxy/links.txt | 2 +
icon-themes/hicontrast/links.txt | 2 +
icon-themes/sifr/links.txt | 3 ++
icon-themes/tango/links.txt | 2 +
include/svx/TextUnderlinePopup.hxx | 4 +++
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 11 ++++++++++
sc/uiconfig/scalc/toolbar/singlemode.xml | 2 -
svx/source/sidebar/text/TextUnderlinePopup.cxx | 9 +++++++-
sw/uiconfig/swriter/toolbar/singlemode.xml | 2 -
10 files changed, 36 insertions(+), 3 deletions(-)
New commits:
commit c73592e38a075242bc90c5cb2119f163defdad25
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Wed Aug 24 14:18:11 2016 +0300
tdf#101672 non-split underline button
Change-Id: Ib20dc0d0036f594adb83a50c2e3da66f565b2db8
Reviewed-on: https://gerrit.libreoffice.org/28356
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index e91a80e..b97f2e2 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -828,6 +828,8 @@ cmd/sc_dsbrowserexplorer.png cmd/sc_showfmexplorer.png
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
# Slide command aliases
cmd/lc_insertslide.png cmd/lc_insertpage.png
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 3cb75cc..0c66dda 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -1,5 +1,7 @@
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_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 fc96ed6..df0ec87 100644
--- a/icon-themes/hicontrast/links.txt
+++ b/icon-themes/hicontrast/links.txt
@@ -1,5 +1,7 @@
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_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 bdf0d87..2424d04 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -162,6 +162,9 @@ cmd/sc_insertcolumnsafter.png cmd/sc_insertcolumns.png
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
+
# anchor menu
cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png
cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 3ecaa71..5e7ed99 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -1,5 +1,7 @@
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/sc_showsinglepage.png cmd/sc_adddirect.png
res/sx03129.png dbaccess/res/db.png
cmd/sc_refresh.png cmd/sc_reload.png
diff --git a/include/svx/TextUnderlinePopup.hxx b/include/svx/TextUnderlinePopup.hxx
index 99d0eba..c627391 100644
--- a/include/svx/TextUnderlinePopup.hxx
+++ b/include/svx/TextUnderlinePopup.hxx
@@ -36,6 +36,10 @@ public:
TextUnderlinePopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
virtual ~TextUnderlinePopup();
+ // XInitialization
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override;
+
virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
};
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 9f476a5..bcee0d6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1523,6 +1523,17 @@
<value>9</value>
</prop>
</node>
+ <node oor:name=".uno:UnderlineSimple" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Underline</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>9</value>
+ </prop>
+ <prop oor:name="TargetURL" oor:type="xs:string">
+ <value>.uno:Underline</value>
+ </prop>
+ </node>
<node oor:name=".uno:Overline" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Overline</value>
diff --git a/sc/uiconfig/scalc/toolbar/singlemode.xml b/sc/uiconfig/scalc/toolbar/singlemode.xml
index 672ecac..df58727 100644
--- a/sc/uiconfig/scalc/toolbar/singlemode.xml
+++ b/sc/uiconfig/scalc/toolbar/singlemode.xml
@@ -50,7 +50,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Bold"/>
<toolbar:toolbaritem xlink:href=".uno:Italic"/>
- <toolbar:toolbaritem xlink:href=".uno:Underline"/>
+ <toolbar:toolbaritem xlink:href=".uno:UnderlineSimple"/>
<toolbar:toolbaritem xlink:href=".uno:Color"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:BackgroundColor"/>
diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx
index 9e4b638..975861cf 100644
--- a/svx/source/sidebar/text/TextUnderlinePopup.cxx
+++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx
@@ -28,13 +28,20 @@ SFX_IMPL_TOOLBOX_CONTROL(TextUnderlinePopup, SvxTextLineItem);
TextUnderlinePopup::TextUnderlinePopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx)
: SfxToolBoxControl(nSlotId, nId, rTbx)
{
- rTbx.SetItemBits(nId, ToolBoxItemBits::DROPDOWN | rTbx.GetItemBits(nId));
}
TextUnderlinePopup::~TextUnderlinePopup()
{
}
+void TextUnderlinePopup::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
+{
+ SfxToolBoxControl::initialize(aArguments);
+ if (GetToolBox().GetItemCommand(GetId()) == m_aCommandURL)
+ GetToolBox().SetItemBits(GetId(), ToolBoxItemBits::DROPDOWN | GetToolBox().GetItemBits(GetId()));
+}
+
VclPtr<SfxPopupWindow> TextUnderlinePopup::CreatePopupWindow()
{
VclPtr<TextUnderlineControl> pControl = VclPtr<TextUnderlineControl>::Create(GetSlotId());
diff --git a/sw/uiconfig/swriter/toolbar/singlemode.xml b/sw/uiconfig/swriter/toolbar/singlemode.xml
index 1fb5891..67c012b 100644
--- a/sw/uiconfig/swriter/toolbar/singlemode.xml
+++ b/sw/uiconfig/swriter/toolbar/singlemode.xml
@@ -35,7 +35,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:Bold"/>
<toolbar:toolbaritem xlink:href=".uno:Italic"/>
- <toolbar:toolbaritem xlink:href=".uno:Underline"/>
+ <toolbar:toolbaritem xlink:href=".uno:UnderlineSimple"/>
<toolbar:toolbaritem xlink:href=".uno:Strikeout" toolbar:visible="false"/>
<toolbar:toolbaritem xlink:href=".uno:FontColor"/>
<toolbar:toolbaritem xlink:href=".uno:BackColor" toolbar:visible="false"/>
More information about the Libreoffice-commits
mailing list