cui/uiconfig/ui/specialcharacters.ui | 64 ++++++++++++-------------
extras/source/glade/libreoffice-catalog.xml.in | 2
sfx2/uiconfig/ui/charmapcontrol.ui | 64 ++++++++++++-------------
3 files changed, 65 insertions(+), 65 deletions(-)
New commits:
commit 545c6fdd8267354d74d3d3a6fc6641fd7c25a0dc
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jul 31 08:58:50 2017 +0100
Resolves: tdf#109007 SvxCharView is in sfx2 not cui
Change-Id: I54f19f61161f3473cbdf2b1bfdc04e9354cc39a8
diff --git a/cui/uiconfig/ui/specialcharacters.ui
b/cui/uiconfig/ui/specialcharacters.ui
index 15104d2f27b0..b321dfc21185 100644
--- a/cui/uiconfig/ui/specialcharacters.ui
+++ b/cui/uiconfig/ui/specialcharacters.ui
@@ -325,7 +325,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="cuilo-SvxCharView" id="viewchar1">
+ <object class="sfxlo-SvxCharView" id="viewchar1">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -337,7 +337,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar2">
+ <object class="sfxlo-SvxCharView" id="viewchar2">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -349,7 +349,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar3">
+ <object class="sfxlo-SvxCharView" id="viewchar3">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -361,7 +361,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar4">
+ <object class="sfxlo-SvxCharView" id="viewchar4">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -373,7 +373,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar5">
+ <object class="sfxlo-SvxCharView" id="viewchar5">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -385,7 +385,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar6">
+ <object class="sfxlo-SvxCharView" id="viewchar6">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -397,7 +397,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar7">
+ <object class="sfxlo-SvxCharView" id="viewchar7">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -409,7 +409,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar8">
+ <object class="sfxlo-SvxCharView" id="viewchar8">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -421,7 +421,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar9">
+ <object class="sfxlo-SvxCharView" id="viewchar9">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -433,7 +433,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar10">
+ <object class="sfxlo-SvxCharView" id="viewchar10">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -445,7 +445,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar11">
+ <object class="sfxlo-SvxCharView" id="viewchar11">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -457,7 +457,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar12">
+ <object class="sfxlo-SvxCharView" id="viewchar12">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -469,7 +469,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar13">
+ <object class="sfxlo-SvxCharView" id="viewchar13">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -481,7 +481,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar14">
+ <object class="sfxlo-SvxCharView" id="viewchar14">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -493,7 +493,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar15">
+ <object class="sfxlo-SvxCharView" id="viewchar15">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -505,7 +505,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar16">
+ <object class="sfxlo-SvxCharView" id="viewchar16">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -556,7 +556,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="cuilo-SvxCharView" id="favchar1">
+ <object class="sfxlo-SvxCharView" id="favchar1">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -567,7 +567,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar2">
+ <object class="sfxlo-SvxCharView" id="favchar2">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -578,7 +578,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar4">
+ <object class="sfxlo-SvxCharView" id="favchar4">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -589,7 +589,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar3">
+ <object class="sfxlo-SvxCharView" id="favchar3">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -600,7 +600,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar5">
+ <object class="sfxlo-SvxCharView" id="favchar5">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -611,7 +611,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar6">
+ <object class="sfxlo-SvxCharView" id="favchar6">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -622,7 +622,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar7">
+ <object class="sfxlo-SvxCharView" id="favchar7">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -633,7 +633,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar8">
+ <object class="sfxlo-SvxCharView" id="favchar8">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -644,7 +644,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar16">
+ <object class="sfxlo-SvxCharView" id="favchar16">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -655,7 +655,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar15">
+ <object class="sfxlo-SvxCharView" id="favchar15">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -666,7 +666,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar14">
+ <object class="sfxlo-SvxCharView" id="favchar14">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -677,7 +677,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar13">
+ <object class="sfxlo-SvxCharView" id="favchar13">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -688,7 +688,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar12">
+ <object class="sfxlo-SvxCharView" id="favchar12">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -699,7 +699,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar11">
+ <object class="sfxlo-SvxCharView" id="favchar11">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -710,7 +710,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar10">
+ <object class="sfxlo-SvxCharView" id="favchar10">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -721,7 +721,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar9">
+ <object class="sfxlo-SvxCharView" id="favchar9">
<property name="width_request">40</property>
<property name="height_request">35</property>
<property name="visible">True</property>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 1ea0c987f45f..93b8d81ad22a 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -815,7 +815,7 @@
<glade-widget-class title="Show Text" name="cuilo-SvxShowText"
generic-name="ShowText" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
- <glade-widget-class title="Char Win" name="cuilo-SvxCharView"
+ <glade-widget-class title="Char Win" name="sfxlo-SvxCharView"
generic-name="ShowText" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="Notebook switching tabs depending on context"
name="sfxlo-NotebookbarTabControl"
diff --git a/sfx2/uiconfig/ui/charmapcontrol.ui
b/sfx2/uiconfig/ui/charmapcontrol.ui
index 7a4d722a2b80..111288ab81b0 100644
--- a/sfx2/uiconfig/ui/charmapcontrol.ui
+++ b/sfx2/uiconfig/ui/charmapcontrol.ui
@@ -35,7 +35,7 @@
<property name="row_homogeneous">True</property>
<property name="column_homogeneous">True</property>
<child>
- <object class="cuilo-SvxCharView" id="viewchar1">
+ <object class="sfxlo-SvxCharView" id="viewchar1">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -46,7 +46,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar2">
+ <object class="sfxlo-SvxCharView" id="viewchar2">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -57,7 +57,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar4">
+ <object class="sfxlo-SvxCharView" id="viewchar4">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -68,7 +68,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar3">
+ <object class="sfxlo-SvxCharView" id="viewchar3">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -79,7 +79,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar12">
+ <object class="sfxlo-SvxCharView" id="viewchar12">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -90,7 +90,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar11">
+ <object class="sfxlo-SvxCharView" id="viewchar11">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -101,7 +101,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar10">
+ <object class="sfxlo-SvxCharView" id="viewchar10">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -112,7 +112,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar9">
+ <object class="sfxlo-SvxCharView" id="viewchar9">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -123,7 +123,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar5">
+ <object class="sfxlo-SvxCharView" id="viewchar5">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -134,7 +134,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar6">
+ <object class="sfxlo-SvxCharView" id="viewchar6">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -145,7 +145,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar7">
+ <object class="sfxlo-SvxCharView" id="viewchar7">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -156,7 +156,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar8">
+ <object class="sfxlo-SvxCharView" id="viewchar8">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -167,7 +167,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar13">
+ <object class="sfxlo-SvxCharView" id="viewchar13">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -178,7 +178,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar14">
+ <object class="sfxlo-SvxCharView" id="viewchar14">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -189,7 +189,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar15">
+ <object class="sfxlo-SvxCharView" id="viewchar15">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -200,7 +200,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="viewchar16">
+ <object class="sfxlo-SvxCharView" id="viewchar16">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -234,7 +234,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="cuilo-SvxCharView" id="favchar1">
+ <object class="sfxlo-SvxCharView" id="favchar1">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -245,7 +245,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar2">
+ <object class="sfxlo-SvxCharView" id="favchar2">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -256,7 +256,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar4">
+ <object class="sfxlo-SvxCharView" id="favchar4">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -267,7 +267,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar3">
+ <object class="sfxlo-SvxCharView" id="favchar3">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -278,7 +278,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar12">
+ <object class="sfxlo-SvxCharView" id="favchar12">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -289,7 +289,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar11">
+ <object class="sfxlo-SvxCharView" id="favchar11">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -300,7 +300,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar10">
+ <object class="sfxlo-SvxCharView" id="favchar10">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -311,7 +311,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar9">
+ <object class="sfxlo-SvxCharView" id="favchar9">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -322,7 +322,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar5">
+ <object class="sfxlo-SvxCharView" id="favchar5">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -333,7 +333,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar6">
+ <object class="sfxlo-SvxCharView" id="favchar6">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -344,7 +344,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar7">
+ <object class="sfxlo-SvxCharView" id="favchar7">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -355,7 +355,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar8">
+ <object class="sfxlo-SvxCharView" id="favchar8">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -366,7 +366,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar13">
+ <object class="sfxlo-SvxCharView" id="favchar13">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -377,7 +377,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar14">
+ <object class="sfxlo-SvxCharView" id="favchar14">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -388,7 +388,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar15">
+ <object class="sfxlo-SvxCharView" id="favchar15">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
@@ -399,7 +399,7 @@
</packing>
</child>
<child>
- <object class="cuilo-SvxCharView" id="favchar16">
+ <object class="sfxlo-SvxCharView" id="favchar16">
<property name="width_request">35</property>
<property name="height_request">35</property>
<property name="visible">True</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
