summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2017-09-26 13:43:04 +0200
committerTamás Zolnai <tamas.zolnai@collabora.com>2017-09-26 19:05:29 +0200
commit5e54cd8702e15fe3869375893fa423def12b1edb (patch)
treefc5779b259f3a88bb90e9bd6e01c75fda0f559bd
parentd81e6184f691cf49abdbf3b3714c507dcca3a50c (diff)
Special character dialog small fixes
Use stock button for OK and identation fixes. Followup changes to: 4020945651b4f3c636980e2103db440b5c55459c Change-Id: I3fe2f2f9a4528d38086db453d7ea71f7ac8b7a9a Reviewed-on: https://gerrit.libreoffice.org/42800 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
-rw-r--r--cui/source/dialogs/cuicharmap.cxx14
-rw-r--r--cui/uiconfig/ui/specialcharacters.ui5
2 files changed, 10 insertions, 9 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 5234d75ef287..6ff10a51a510 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -624,15 +624,15 @@ void SvxCharacterMap::insertCharToDoc(const OUString& sGlyph)
return;
if (m_bHasInsert) {
- uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() );
+ uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() );
- uno::Sequence<beans::PropertyValue> aArgs(2);
- aArgs[0].Name = "Symbols";
- aArgs[0].Value <<= sGlyph;
+ uno::Sequence<beans::PropertyValue> aArgs(2);
+ aArgs[0].Name = "Symbols";
+ aArgs[0].Value <<= sGlyph;
- aArgs[1].Name = "FontName";
- aArgs[1].Value <<= aFont.GetFamilyName();
- comphelper::dispatchCommand(".uno:InsertSymbol", aArgs);
+ aArgs[1].Name = "FontName";
+ aArgs[1].Value <<= aFont.GetFamilyName();
+ comphelper::dispatchCommand(".uno:InsertSymbol", aArgs);
}
updateRecentCharacterList(sGlyph, aFont.GetFamilyName());
diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui
index cd1c0402ddb0..2e4f881ce18e 100644
--- a/cui/uiconfig/ui/specialcharacters.ui
+++ b/cui/uiconfig/ui/specialcharacters.ui
@@ -18,7 +18,7 @@
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
- <!-- Ok and Insert buttons are the same button. The correct one is set to visible incode. -->
+ <!-- OK and Insert buttons are the same button. The correct one is set to visible incode. -->
<child>
<object class="GtkButton" id="insert">
<property name="label" translatable="yes" context="specialcharacters|insert">_Insert</property>
@@ -36,12 +36,13 @@
</child>
<child>
<object class="GtkButton" id="ok">
- <property name="label" translatable="yes" context="specialcharacters|ok">Ok</property>
+ <property name="label">gtk-ok</property>
<property name="visible">False</property>
<property name="can_focus">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
+ <property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>