From aa0b9d13b5f8c150a3b3035aa7a1d54f70720cdd Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 21 Feb 2013 09:45:33 +0000
Subject: change lib:widget delimiter from : to -

because glade catalogs don't allow : in widgetnames
which blocks making a catalog for our custom widgets

Change-Id: I3d590ce7451264b49fa5a82a752dac44e47bbd81
---
 basctl/uiconfig/basicide/ui/basicmacrodialog.ui    |  4 +-
 bin/verify-custom-widgets-libs                     |  6 +-
 cui/uiconfig/ui/backgroundpage.ui                  | 12 +--
 cui/uiconfig/ui/borderpage.ui                      | 12 +--
 cui/uiconfig/ui/charnamepage.ui                    | 34 ++++----
 cui/uiconfig/ui/colorconfigwin.ui                  | 92 +++++++++++-----------
 cui/uiconfig/ui/colorpage.ui                       |  8 +-
 cui/uiconfig/ui/effectspage.ui                     |  8 +-
 cui/uiconfig/ui/gradientpage.ui                    |  8 +-
 cui/uiconfig/ui/hyphenate.ui                       |  2 +-
 cui/uiconfig/ui/macroselectordialog.ui             |  4 +-
 cui/uiconfig/ui/numberingformatpage.ui             |  6 +-
 cui/uiconfig/ui/numberingoptionspage.ui            |  4 +-
 cui/uiconfig/ui/numberingpositionpage.ui           |  2 +-
 cui/uiconfig/ui/optadvancedpage.ui                 |  2 +-
 cui/uiconfig/ui/optappearancepage.ui               |  2 +-
 cui/uiconfig/ui/optfontspage.ui                    |  6 +-
 cui/uiconfig/ui/optionsdialog.ui                   |  2 +-
 cui/uiconfig/ui/optpathspage.ui                    |  2 +-
 cui/uiconfig/ui/pickbulletpage.ui                  |  2 +-
 cui/uiconfig/ui/pickgraphicpage.ui                 |  2 +-
 cui/uiconfig/ui/picknumberingpage.ui               |  2 +-
 cui/uiconfig/ui/pickoutlinepage.ui                 |  2 +-
 cui/uiconfig/ui/positionpage.ui                    |  2 +-
 cui/uiconfig/ui/scriptorganizer.ui                 |  2 +-
 cui/uiconfig/ui/specialcharacters.ui               |  6 +-
 cui/uiconfig/ui/spellingdialog.ui                  |  4 +-
 cui/uiconfig/ui/storedwebconnectiondialog.ui       |  2 +-
 cui/uiconfig/ui/thesaurus.ui                       |  6 +-
 cui/uiconfig/ui/twolinespage.ui                    |  2 +-
 filter/uiconfig/ui/xmlfiltersettings.ui            |  2 +-
 sc/uiconfig/scalc/ui/sortoptionspage.ui            |  2 +-
 sc/uiconfig/scalc/ui/textimportoptions.ui          |  2 +-
 sfx2/uiconfig/ui/custominfopage.ui                 |  2 +-
 svx/uiconfig/ui/asianphoneticguidedialog.ui        | 18 ++---
 sw/uiconfig/swriter/ui/autoformattable.ui          |  2 +-
 sw/uiconfig/swriter/ui/autotext.ui                 |  4 +-
 sw/uiconfig/swriter/ui/columnpage.ui               | 10 +--
 sw/uiconfig/swriter/ui/editcategories.ui           |  4 +-
 sw/uiconfig/swriter/ui/endnotepage.ui              |  2 +-
 sw/uiconfig/swriter/ui/exchangedatabases.ui        |  4 +-
 sw/uiconfig/swriter/ui/footnotepage.ui             |  2 +-
 sw/uiconfig/swriter/ui/formattablepage.ui          |  2 +-
 sw/uiconfig/swriter/ui/insertbookmark.ui           |  2 +-
 sw/uiconfig/swriter/ui/insertcaption.ui            |  4 +-
 sw/uiconfig/swriter/ui/inserttable.ui              |  2 +-
 sw/uiconfig/swriter/ui/linenumbering.ui            |  2 +-
 sw/uiconfig/swriter/ui/outlinenumberingpage.ui     |  4 +-
 sw/uiconfig/swriter/ui/outlinepositionpage.ui      |  2 +-
 sw/uiconfig/swriter/ui/sortdialog.ui               |  2 +-
 vcl/source/window/builder.cxx                      |  2 +-
 vcl/uiconfig/ui/printdialog.ui                     |  4 +-
 xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui |  2 +-
 xmlsecurity/uiconfig/ui/securitytrustpage.ui       |  2 +-
 xmlsecurity/uiconfig/ui/selectcertificatedialog.ui |  2 +-
 55 files changed, 167 insertions(+), 167 deletions(-)

diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
index 4acfa633de3d..8cd1be71ea85 100644
--- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
+++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
@@ -189,7 +189,7 @@
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="svtlo:SvTreeListBox" id="macros">
+                      <object class="svtlo-SvTreeListBox" id="macros">
                         <property name="use_action_appearance">False</property>
                         <property name="width_request">280</property>
                         <property name="height_request">300</property>
@@ -259,7 +259,7 @@
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="basctllo:TreeListBox" id="libraries">
+                      <object class="basctllo-TreeListBox" id="libraries">
                         <property name="use_action_appearance">False</property>
                         <property name="width_request">280</property>
                         <property name="height_request">300</property>
diff --git a/bin/verify-custom-widgets-libs b/bin/verify-custom-widgets-libs
index 6a04702fa4cc..8ca278456c5d 100755
--- a/bin/verify-custom-widgets-libs
+++ b/bin/verify-custom-widgets-libs
@@ -15,10 +15,10 @@
 # its easy to put the wrong lib name in if developing
 # under Linux
 
-FOO=`grep -h -r lo: */uiconfig | sed -e "s/<object class=\"//g" | sed -e "s/\".*$//"| sed 's/^[ \t]*//;s/[ \t]*$//'|sort|uniq`
+FOO=`grep -h -r lo- */uiconfig | sed -e "s/<object class=\"//g" | sed -e "s/\".*$//"| sed 's/^[ \t]*//;s/[ \t]*$//'|sort|uniq`
 for foo in $FOO; do
-    lib=$(echo $foo | cut -f1 -d:)
-    symbol=$(echo $foo | cut -f2 -d:)
+    lib=$(echo $foo | cut -f1 -d-)
+    symbol=$(echo $foo | cut -f2 -d-)
     echo testing if lib$lib.so contains make$symbol
     nm -D solver/unxlng*/lib/lib$lib.so | grep make$symbol > /dev/null
     if [ $? != 0 ]; then
diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui
index eaff48f7024c..3cf82c1f976f 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
@@ -143,7 +143,7 @@
                 <property name="row_spacing">4</property>
                 <property name="column_spacing">42</property>
                 <child>
-                  <object class="svtlo:ValueSet" id="backgroundcolorset">
+                  <object class="svtlo-ValueSet" id="backgroundcolorset">
                     <property name="width_request">150</property>
                     <property name="height_request">250</property>
                     <property name="visible">True</property>
@@ -199,7 +199,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="cuilo:BackgroundPreview" id="preview1">
+                  <object class="cuilo-BackgroundPreview" id="preview1">
                     <property name="width_request">150</property>
                     <property name="height_request">10</property>
                     <property name="visible">True</property>
@@ -407,7 +407,7 @@
                         <property name="row_spacing">12</property>
                         <property name="column_spacing">12</property>
                         <child>
-                          <object class="svxlo:SvxRectCtl" id="windowpos">
+                          <object class="svxlo-SvxRectCtl" id="windowpos">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="hexpand">True</property>
@@ -573,7 +573,7 @@
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <child>
-              <object class="cuilo:BackgroundPreview" id="preview2">
+              <object class="cuilo-BackgroundPreview" id="preview2">
                 <property name="no_show_all">True</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
@@ -639,7 +639,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="svxlo:GradientLB" id="gradientslb">
+                      <object class="svxlo-GradientLB" id="gradientslb">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
@@ -651,7 +651,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo:SvxXRectPreview" id="previewctl">
+                      <object class="svxlo-SvxXRectPreview" id="previewctl">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui
index 833797abb94e..524e9e5ae2a3 100644
--- a/cui/uiconfig/ui/borderpage.ui
+++ b/cui/uiconfig/ui/borderpage.ui
@@ -52,7 +52,7 @@
                     <property name="hexpand">True</property>
                     <property name="row_spacing">6</property>
                     <child>
-                      <object class="svxlo:SvxFrameSelector" id="framesel">
+                      <object class="svxlo-SvxFrameSelector" id="framesel">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="hexpand">center</property>
@@ -98,7 +98,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svtlo:ValueSet" id="presets">
+                      <object class="svtlo-ValueSet" id="presets">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="halign">start</property>
@@ -198,7 +198,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svtlo:LineListBox" id="linestylelb">
+                      <object class="svtlo-LineListBox" id="linestylelb">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
@@ -226,7 +226,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svtlo:ColorListBox" id="linecolorlb">
+                      <object class="svtlo-ColorListBox" id="linecolorlb">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
@@ -536,7 +536,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:ColorListBox" id="shadowcolorlb">
+                  <object class="svtlo-ColorListBox" id="shadowcolorlb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                   </object>
@@ -548,7 +548,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:ValueSet" id="shadows">
+                  <object class="svtlo-ValueSet" id="shadows">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="halign">start</property>
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 47f5ae8804dd..89bc97407dd1 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -97,7 +97,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxcorelo:SvxLanguageBox" id="westlanglb-nocjk">
+                  <object class="svxcorelo-SvxLanguageBox" id="westlanglb-nocjk">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -111,7 +111,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:FontNameBox" id="westfontnamelb-nocjk">
+                  <object class="svtlo-FontNameBox" id="westfontnamelb-nocjk">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="dropdown">False</property>
@@ -124,7 +124,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:FontStyleBox" id="weststylelb-nocjk">
+                  <object class="svtlo-FontStyleBox" id="weststylelb-nocjk">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="dropdown">False</property>
@@ -137,7 +137,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:FontSizeBox" id="westsizelb-nocjk">
+                  <object class="svtlo-FontSizeBox" id="westsizelb-nocjk">
                     <property name="height_request">150</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -299,7 +299,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:FontNameBox" id="westfontnamelb-cjk">
+                  <object class="svtlo-FontNameBox" id="westfontnamelb-cjk">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -312,7 +312,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:FontStyleBox" id="weststylelb-cjk">
+                  <object class="svtlo-FontStyleBox" id="weststylelb-cjk">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -325,7 +325,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:FontSizeBox" id="westsizelb-cjk">
+                  <object class="svtlo-FontSizeBox" id="westsizelb-cjk">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -338,7 +338,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxcorelo:SvxLanguageBox" id="westlanglb-cjk">
+                  <object class="svxcorelo-SvxLanguageBox" id="westlanglb-cjk">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -486,7 +486,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:FontNameBox" id="eastfontnamelb">
+                  <object class="svtlo-FontNameBox" id="eastfontnamelb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -499,7 +499,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:FontStyleBox" id="eaststylelb">
+                  <object class="svtlo-FontStyleBox" id="eaststylelb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -512,7 +512,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:FontSizeBox" id="eastsizelb">
+                  <object class="svtlo-FontSizeBox" id="eastsizelb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -525,7 +525,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxcorelo:SvxLanguageBox" id="eastlanglb">
+                  <object class="svxcorelo-SvxLanguageBox" id="eastlanglb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -673,7 +673,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:FontNameBox" id="ctlfontnamelb">
+                  <object class="svtlo-FontNameBox" id="ctlfontnamelb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -686,7 +686,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:FontStyleBox" id="ctlstylelb">
+                  <object class="svtlo-FontStyleBox" id="ctlstylelb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -699,7 +699,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:FontSizeBox" id="ctlsizelb">
+                  <object class="svtlo-FontSizeBox" id="ctlsizelb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -712,7 +712,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxcorelo:SvxLanguageBox" id="ctllanglb">
+                  <object class="svxcorelo-SvxLanguageBox" id="ctllanglb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -784,7 +784,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
-              <object class="svxlo:SvxFontPrevWindow" id="preview">
+              <object class="svxlo-SvxFontPrevWindow" id="preview">
                 <property name="height_request">100</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/colorconfigwin.ui b/cui/uiconfig/ui/colorconfigwin.ui
index 53fa33b9f405..d4af11f4daf8 100644
--- a/cui/uiconfig/ui/colorconfigwin.ui
+++ b/cui/uiconfig/ui/colorconfigwin.ui
@@ -40,7 +40,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="doccolor_lb">
+      <object class="svtlo-ColorListBox" id="doccolor_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -81,7 +81,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="docboundaries_lb">
+      <object class="svtlo-ColorListBox" id="docboundaries_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -110,7 +110,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="appback_lb">
+      <object class="svtlo-ColorListBox" id="appback_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -168,7 +168,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="objboundaries_lb">
+      <object class="svtlo-ColorListBox" id="objboundaries_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -211,7 +211,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="tblboundaries_lb">
+      <object class="svtlo-ColorListBox" id="tblboundaries_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -252,7 +252,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="font_lb">
+      <object class="svtlo-ColorListBox" id="font_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -295,7 +295,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="unvisitedlinks_lb">
+      <object class="svtlo-ColorListBox" id="unvisitedlinks_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -338,7 +338,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="visitedlinks_lb">
+      <object class="svtlo-ColorListBox" id="visitedlinks_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -451,7 +451,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="autospellcheck_lb">
+      <object class="svtlo-ColorListBox" id="autospellcheck_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -463,7 +463,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="shadows_lb">
+      <object class="svtlo-ColorListBox" id="shadows_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -475,7 +475,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="smarttags_lb">
+      <object class="svtlo-ColorListBox" id="smarttags_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -504,7 +504,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="writergrid_lb">
+      <object class="svtlo-ColorListBox" id="writergrid_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -545,7 +545,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="field_lb">
+      <object class="svtlo-ColorListBox" id="field_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -571,7 +571,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="index_lb">
+      <object class="svtlo-ColorListBox" id="index_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -597,7 +597,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="script_lb">
+      <object class="svtlo-ColorListBox" id="script_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -689,7 +689,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="section_lb">
+      <object class="svtlo-ColorListBox" id="section_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -715,7 +715,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="hdft_lb">
+      <object class="svtlo-ColorListBox" id="hdft_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -756,7 +756,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="pagebreak_lb">
+      <object class="svtlo-ColorListBox" id="pagebreak_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -797,7 +797,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="direct_lb">
+      <object class="svtlo-ColorListBox" id="direct_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -855,7 +855,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="sgml_lb">
+      <object class="svtlo-ColorListBox" id="sgml_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -896,7 +896,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="htmlcomment_lb">
+      <object class="svtlo-ColorListBox" id="htmlcomment_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -937,7 +937,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="htmlkeyword_lb">
+      <object class="svtlo-ColorListBox" id="htmlkeyword_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -978,7 +978,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="unknown_lb">
+      <object class="svtlo-ColorListBox" id="unknown_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1036,7 +1036,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="calcgrid_lb">
+      <object class="svtlo-ColorListBox" id="calcgrid_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1077,7 +1077,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="brk_lb">
+      <object class="svtlo-ColorListBox" id="brk_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1118,7 +1118,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="brkmanual_lb">
+      <object class="svtlo-ColorListBox" id="brkmanual_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1159,7 +1159,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="brkauto_lb">
+      <object class="svtlo-ColorListBox" id="brkauto_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1200,7 +1200,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="det_lb">
+      <object class="svtlo-ColorListBox" id="det_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1241,7 +1241,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="deterror_lb">
+      <object class="svtlo-ColorListBox" id="deterror_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1282,7 +1282,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="ref_lb">
+      <object class="svtlo-ColorListBox" id="ref_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1323,7 +1323,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="notes_lb">
+      <object class="svtlo-ColorListBox" id="notes_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1381,7 +1381,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="drawgrid_lb">
+      <object class="svtlo-ColorListBox" id="drawgrid_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1439,7 +1439,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="basicid_lb">
+      <object class="svtlo-ColorListBox" id="basicid_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1480,7 +1480,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="basiccomment_lb">
+      <object class="svtlo-ColorListBox" id="basiccomment_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1521,7 +1521,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="basicnumber_lb">
+      <object class="svtlo-ColorListBox" id="basicnumber_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1562,7 +1562,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="basicstring_lb">
+      <object class="svtlo-ColorListBox" id="basicstring_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1603,7 +1603,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="basicop_lb">
+      <object class="svtlo-ColorListBox" id="basicop_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1644,7 +1644,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="basickeyword_lb">
+      <object class="svtlo-ColorListBox" id="basickeyword_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1685,7 +1685,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="error_lb">
+      <object class="svtlo-ColorListBox" id="error_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1743,7 +1743,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="sqlid_lb">
+      <object class="svtlo-ColorListBox" id="sqlid_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1784,7 +1784,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="sqlnumber_lb">
+      <object class="svtlo-ColorListBox" id="sqlnumber_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1825,7 +1825,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="sqlstring_lb">
+      <object class="svtlo-ColorListBox" id="sqlstring_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1866,7 +1866,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="sqlop_lb">
+      <object class="svtlo-ColorListBox" id="sqlop_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1907,7 +1907,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="sqlkeyword_lb">
+      <object class="svtlo-ColorListBox" id="sqlkeyword_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1948,7 +1948,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="sqlparam_lb">
+      <object class="svtlo-ColorListBox" id="sqlparam_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
@@ -1989,7 +1989,7 @@
       </packing>
     </child>
     <child>
-      <object class="svtlo:ColorListBox" id="sqlcomment_lb">
+      <object class="svtlo-ColorListBox" id="sqlcomment_lb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
       </object>
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 72f8b9c3fe27..48da1f31b5f6 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -95,7 +95,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo:ColorLB" id="colorlb">
+                      <object class="svxlo-ColorLB" id="colorlb">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="halign">start</property>
@@ -129,7 +129,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svtlo:ValueSet" id="colorset">
+                          <object class="svtlo-ValueSet" id="colorset">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
@@ -170,7 +170,7 @@
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">6</property>
                     <child>
-                      <object class="svxlo:SvxXRectPreview" id="oldpreview">
+                      <object class="svxlo-SvxXRectPreview" id="oldpreview">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -184,7 +184,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo:SvxXRectPreview" id="newpreview">
+                      <object class="svxlo-SvxXRectPreview" id="newpreview">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 2219cb40b910..7de277b20f50 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -336,7 +336,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:ColorListBox" id="fontcolorlb">
+                  <object class="svtlo-ColorListBox" id="fontcolorlb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                   </object>
@@ -413,7 +413,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:ColorListBox" id="underlinecolorlb">
+                  <object class="svtlo-ColorListBox" id="underlinecolorlb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                   </object>
@@ -425,7 +425,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:ColorListBox" id="overlinecolorlb">
+                  <object class="svtlo-ColorListBox" id="overlinecolorlb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                   </object>
@@ -623,7 +623,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
-              <object class="svxlo:SvxFontPrevWindow" id="preview">
+              <object class="svxlo-SvxFontPrevWindow" id="preview">
                 <property name="height_request">100</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui
index 15df94529baa..d0eafe67c1c1 100644
--- a/cui/uiconfig/ui/gradientpage.ui
+++ b/cui/uiconfig/ui/gradientpage.ui
@@ -212,7 +212,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo:ColorLB" id="colorfromlb">
+                      <object class="svxlo-ColorLB" id="colorfromlb">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="entry_text_column">0</property>
@@ -255,7 +255,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo:ColorLB" id="colortolb">
+                      <object class="svxlo-ColorLB" id="colortolb">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="entry_text_column">0</property>
@@ -341,7 +341,7 @@
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">6</property>
                     <child>
-                      <object class="svxlo:GradientLB" id="gradientslb">
+                      <object class="svxlo-GradientLB" id="gradientslb">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="entry_text_column">0</property>
@@ -355,7 +355,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo:SvxXRectPreview" id="previewctl">
+                      <object class="svxlo-SvxXRectPreview" id="previewctl">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/hyphenate.ui b/cui/uiconfig/ui/hyphenate.ui
index 15e0f867dfb8..da1702ae6286 100644
--- a/cui/uiconfig/ui/hyphenate.ui
+++ b/cui/uiconfig/ui/hyphenate.ui
@@ -87,7 +87,7 @@
               </packing>
             </child>
             <child>
-              <object class="cuilo:HyphenEdit" id="worded">
+              <object class="cuilo-HyphenEdit" id="worded">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/macroselectordialog.ui b/cui/uiconfig/ui/macroselectordialog.ui
index d681f295d0f9..39776c42a548 100644
--- a/cui/uiconfig/ui/macroselectordialog.ui
+++ b/cui/uiconfig/ui/macroselectordialog.ui
@@ -160,7 +160,7 @@
                         <property name="top_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <object class="cuilo:SvxConfigGroupListBox" id="categories">
+                          <object class="cuilo-SvxConfigGroupListBox" id="categories">
                             <property name="height_request">300</property>
                             <property name="width_request">280</property>
                             <property name="visible">True</property>
@@ -225,7 +225,7 @@
                         <property name="top_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <object class="cuilo:SvxConfigFunctionListBox" id="commands">
+                          <object class="cuilo-SvxConfigFunctionListBox" id="commands">
                             <property name="height_request">300</property>
                             <property name="width_request">280</property>
                             <property name="visible">True</property>
diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui
index cc26b9845fb0..45008824c7f2 100644
--- a/cui/uiconfig/ui/numberingformatpage.ui
+++ b/cui/uiconfig/ui/numberingformatpage.ui
@@ -366,7 +366,7 @@
                     <property name="vexpand">True</property>
                     <property name="row_spacing">6</property>
                     <child>
-                      <object class="svxlo:SvxFontListBox" id="formatlb">
+                      <object class="svxlo-SvxFontListBox" id="formatlb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="hexpand">True</property>
@@ -437,7 +437,7 @@
                     <property name="vexpand">True</property>
                     <property name="row_spacing">6</property>
                     <child>
-                      <object class="svxcorelo:SvxLanguageBox" id="languagelb">
+                      <object class="svxcorelo-SvxLanguageBox" id="languagelb">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="valign">start</property>
@@ -450,7 +450,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="cuilo:SvxNumberPreview" id="preview">
+                      <object class="cuilo-SvxNumberPreview" id="preview">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui
index 3dd0c913df30..11338c006ded 100644
--- a/cui/uiconfig/ui/numberingoptionspage.ui
+++ b/cui/uiconfig/ui/numberingoptionspage.ui
@@ -410,7 +410,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svtlo:ColorListBox" id="color">
+                          <object class="svtlo-ColorListBox" id="color">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                           </object>
@@ -613,7 +613,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="cuilo:SvxNumberingPreview" id="preview">
+                      <object class="cuilo-SvxNumberingPreview" id="preview">
                         <property name="width_request">150</property>
                         <property name="height_request">300</property>
                         <property name="visible">True</property>
diff --git a/cui/uiconfig/ui/numberingpositionpage.ui b/cui/uiconfig/ui/numberingpositionpage.ui
index b77dd82eedb7..e7511bb32ecd 100644
--- a/cui/uiconfig/ui/numberingpositionpage.ui
+++ b/cui/uiconfig/ui/numberingpositionpage.ui
@@ -273,7 +273,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="cuilo:SvxNumberingPreview" id="preview">
+                  <object class="cuilo-SvxNumberingPreview" id="preview">
                     <property name="width_request">300</property>
                     <property name="height_request">150</property>
                     <property name="visible">True</property>
diff --git a/cui/uiconfig/ui/optadvancedpage.ui b/cui/uiconfig/ui/optadvancedpage.ui
index ca4681f6ca6b..ddfce7e19a73 100644
--- a/cui/uiconfig/ui/optadvancedpage.ui
+++ b/cui/uiconfig/ui/optadvancedpage.ui
@@ -232,7 +232,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="svxcorelo:SvxSimpleTableContainer" id="javas">
+                                  <object class="svxcorelo-SvxSimpleTableContainer" id="javas">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/optappearancepage.ui b/cui/uiconfig/ui/optappearancepage.ui
index 2357088ecdd6..51d94c7c17d4 100644
--- a/cui/uiconfig/ui/optappearancepage.ui
+++ b/cui/uiconfig/ui/optappearancepage.ui
@@ -198,7 +198,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="cuilo:ColorConfigCtrl" id="colorconfig">
+                  <object class="cuilo-ColorConfigCtrl" id="colorconfig">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/optfontspage.ui b/cui/uiconfig/ui/optfontspage.ui
index 20da64e60206..a5666cda8bc5 100644
--- a/cui/uiconfig/ui/optfontspage.ui
+++ b/cui/uiconfig/ui/optfontspage.ui
@@ -82,7 +82,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svtlo:FontNameBox" id="font1">
+                      <object class="svtlo-FontNameBox" id="font1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -96,7 +96,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svtlo:FontNameBox" id="font2">
+                      <object class="svtlo-FontNameBox" id="font2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -162,7 +162,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxcorelo:SvxSimpleTableContainer" id="checklb">
+                      <object class="svxcorelo-SvxSimpleTableContainer" id="checklb">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="vexpand">True</property>
diff --git a/cui/uiconfig/ui/optionsdialog.ui b/cui/uiconfig/ui/optionsdialog.ui
index 625e9f2b1a6a..4f13ef3fac83 100644
--- a/cui/uiconfig/ui/optionsdialog.ui
+++ b/cui/uiconfig/ui/optionsdialog.ui
@@ -100,7 +100,7 @@
               </packing>
             </child>
             <child>
-              <object class="svtlo:SvTreeListBox" id="pages">
+              <object class="svtlo-SvTreeListBox" id="pages">
                 <property name="visible">True</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
diff --git a/cui/uiconfig/ui/optpathspage.ui b/cui/uiconfig/ui/optpathspage.ui
index d4c6957a037d..64f0b8054e8b 100644
--- a/cui/uiconfig/ui/optpathspage.ui
+++ b/cui/uiconfig/ui/optpathspage.ui
@@ -93,7 +93,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxcorelo:SvxSimpleTableContainer" id="paths">
+                  <object class="svxcorelo-SvxSimpleTableContainer" id="paths">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/pickbulletpage.ui b/cui/uiconfig/ui/pickbulletpage.ui
index 7d4129986426..faa76e284648 100644
--- a/cui/uiconfig/ui/pickbulletpage.ui
+++ b/cui/uiconfig/ui/pickbulletpage.ui
@@ -18,7 +18,7 @@
         <property name="top_padding">6</property>
         <property name="left_padding">12</property>
         <child>
-          <object class="svxlo:SvxNumValueSet" id="valueset">
+          <object class="svxlo-SvxNumValueSet" id="valueset">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/pickgraphicpage.ui b/cui/uiconfig/ui/pickgraphicpage.ui
index f42857aef6f9..34de40582d20 100644
--- a/cui/uiconfig/ui/pickgraphicpage.ui
+++ b/cui/uiconfig/ui/pickgraphicpage.ui
@@ -42,7 +42,7 @@
               </packing>
             </child>
             <child>
-              <object class="svxlo:SvxBmpNumValueSet" id="valueset">
+              <object class="svxlo-SvxBmpNumValueSet" id="valueset">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/picknumberingpage.ui b/cui/uiconfig/ui/picknumberingpage.ui
index 567ac882300e..868e8f625d31 100644
--- a/cui/uiconfig/ui/picknumberingpage.ui
+++ b/cui/uiconfig/ui/picknumberingpage.ui
@@ -18,7 +18,7 @@
         <property name="top_padding">6</property>
         <property name="left_padding">12</property>
         <child>
-          <object class="svxlo:SvxNumValueSet" id="valueset">
+          <object class="svxlo-SvxNumValueSet" id="valueset">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/pickoutlinepage.ui b/cui/uiconfig/ui/pickoutlinepage.ui
index a73710c046b5..8e1f4a332483 100644
--- a/cui/uiconfig/ui/pickoutlinepage.ui
+++ b/cui/uiconfig/ui/pickoutlinepage.ui
@@ -18,7 +18,7 @@
         <property name="top_padding">6</property>
         <property name="left_padding">12</property>
         <child>
-          <object class="svxlo:SvxNumValueSet" id="valueset">
+          <object class="svxlo-SvxNumValueSet" id="valueset">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui
index 638f8b163f30..7416e3d92e46 100644
--- a/cui/uiconfig/ui/positionpage.ui
+++ b/cui/uiconfig/ui/positionpage.ui
@@ -519,7 +519,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
-              <object class="svxlo:SvxFontPrevWindow" id="preview">
+              <object class="svxlo-SvxFontPrevWindow" id="preview">
                 <property name="height_request">100</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/cui/uiconfig/ui/scriptorganizer.ui b/cui/uiconfig/ui/scriptorganizer.ui
index c5100fecbf4e..328f81369406 100644
--- a/cui/uiconfig/ui/scriptorganizer.ui
+++ b/cui/uiconfig/ui/scriptorganizer.ui
@@ -156,7 +156,7 @@
                 <property name="top_padding">6</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="cuilo:SFTreeListBox" id="scripts">
+                  <object class="cuilo-SFTreeListBox" id="scripts">
                     <property name="height_request">300</property>
                     <property name="width_request">280</property>
                     <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui
index 03e3eaed620e..1fe38029f367 100644
--- a/cui/uiconfig/ui/specialcharacters.ui
+++ b/cui/uiconfig/ui/specialcharacters.ui
@@ -182,7 +182,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="cuilo:SvxShowText" id="showchar">
+                      <object class="cuilo-SvxShowText" id="showchar">
                         <property name="width_request">100</property>
                         <property name="height_request">150</property>
                         <property name="visible">True</property>
@@ -206,7 +206,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxlo:SvxShowCharSet" id="showcharset">
+                  <object class="svxlo-SvxShowCharSet" id="showcharset">
                     <property name="width_request">400</property>
                     <property name="height_request">250</property>
                     <property name="visible">True</property>
@@ -250,7 +250,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="cuilo:SvxShowText" id="showtext">
+                  <object class="cuilo-SvxShowText" id="showtext">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="valign">center</property>
diff --git a/cui/uiconfig/ui/spellingdialog.ui b/cui/uiconfig/ui/spellingdialog.ui
index 084a41f787e4..c97a1b5519ed 100644
--- a/cui/uiconfig/ui/spellingdialog.ui
+++ b/cui/uiconfig/ui/spellingdialog.ui
@@ -91,7 +91,7 @@
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
-              <object class="svxcorelo:SvxLanguageBox" id="languagelb">
+              <object class="svxcorelo-SvxLanguageBox" id="languagelb">
                 <property name="visible">True</property>
                 <property name="halign">end</property>
               </object>
@@ -134,7 +134,7 @@
               </packing>
             </child>
             <child>
-              <object class="cuilo:SentenceEditWindow" id="sentence">
+              <object class="cuilo-SentenceEditWindow" id="sentence">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/storedwebconnectiondialog.ui b/cui/uiconfig/ui/storedwebconnectiondialog.ui
index f4a1a359d7ce..a9a4cf6222d7 100644
--- a/cui/uiconfig/ui/storedwebconnectiondialog.ui
+++ b/cui/uiconfig/ui/storedwebconnectiondialog.ui
@@ -114,7 +114,7 @@
               </packing>
             </child>
             <child>
-              <object class="svxcorelo:SvxSimpleTableContainer" id="logins">
+              <object class="svxcorelo-SvxSimpleTableContainer" id="logins">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/thesaurus.ui b/cui/uiconfig/ui/thesaurus.ui
index b294ab1a5289..e70c07cba35a 100644
--- a/cui/uiconfig/ui/thesaurus.ui
+++ b/cui/uiconfig/ui/thesaurus.ui
@@ -120,7 +120,7 @@
               </packing>
             </child>
             <child>
-              <object class="cuilo:ReplaceEdit" id="replaceed">
+              <object class="cuilo-ReplaceEdit" id="replaceed">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="invisible_char">●</property>
@@ -133,7 +133,7 @@
               </packing>
             </child>
             <child>
-              <object class="cuilo:LookUpComboBox" id="wordcb">
+              <object class="cuilo-LookUpComboBox" id="wordcb">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
@@ -180,7 +180,7 @@
               </packing>
             </child>
             <child>
-              <object class="cuilo:ThesaurusAlternativesCtrl" id="alternatives">
+              <object class="cuilo-ThesaurusAlternativesCtrl" id="alternatives">
                 <property name="width_request">500</property>
                 <property name="height_request">300</property>
                 <property name="visible">True</property>
diff --git a/cui/uiconfig/ui/twolinespage.ui b/cui/uiconfig/ui/twolinespage.ui
index b0551b1bb61a..4a4637928c5b 100644
--- a/cui/uiconfig/ui/twolinespage.ui
+++ b/cui/uiconfig/ui/twolinespage.ui
@@ -160,7 +160,7 @@
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
-              <object class="svxlo:SvxFontPrevWindow" id="preview">
+              <object class="svxlo-SvxFontPrevWindow" id="preview">
                 <property name="height_request">100</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
diff --git a/filter/uiconfig/ui/xmlfiltersettings.ui b/filter/uiconfig/ui/xmlfiltersettings.ui
index c4499b3a5e28..e4f51f488d12 100644
--- a/filter/uiconfig/ui/xmlfiltersettings.ui
+++ b/filter/uiconfig/ui/xmlfiltersettings.ui
@@ -155,7 +155,7 @@
           </packing>
         </child>
         <child>
-          <object class="xsltdlglo:SvxPathControl" id="filterlist">
+          <object class="xsltdlglo-SvxPathControl" id="filterlist">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="height_request">100</property>
diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index 7815ab9071dc..805e0cc9db9f 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -212,7 +212,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxcorelo:SvxLanguageBox" id="language">
+                  <object class="svxcorelo-SvxLanguageBox" id="language">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
               </object>
diff --git a/sc/uiconfig/scalc/ui/textimportoptions.ui b/sc/uiconfig/scalc/ui/textimportoptions.ui
index 3ef3c5241842..18f928cba8fb 100644
--- a/sc/uiconfig/scalc/ui/textimportoptions.ui
+++ b/sc/uiconfig/scalc/ui/textimportoptions.ui
@@ -126,7 +126,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxcorelo:SvxLanguageBox" id="lang">
+                          <object class="svxcorelo-SvxLanguageBox" id="lang">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                           </object>
diff --git a/sfx2/uiconfig/ui/custominfopage.ui b/sfx2/uiconfig/ui/custominfopage.ui
index 15a7c96f1141..d00ff1d29bdc 100644
--- a/sfx2/uiconfig/ui/custominfopage.ui
+++ b/sfx2/uiconfig/ui/custominfopage.ui
@@ -40,7 +40,7 @@
       </packing>
     </child>
     <child>
-      <object class="sfxlo:CustomPropertiesControl" id="properties">
+      <object class="sfxlo-CustomPropertiesControl" id="properties">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
diff --git a/svx/uiconfig/ui/asianphoneticguidedialog.ui b/svx/uiconfig/ui/asianphoneticguidedialog.ui
index 3a4702649318..9c045ca88b46 100644
--- a/svx/uiconfig/ui/asianphoneticguidedialog.ui
+++ b/svx/uiconfig/ui/asianphoneticguidedialog.ui
@@ -130,7 +130,7 @@
                     <property name="vexpand">True</property>
                     <property name="column_spacing">3</property>
                     <child>
-                      <object class="svxlo:RubyEdit" id="Left2ED">
+                      <object class="svxlo-RubyEdit" id="Left2ED">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -143,7 +143,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo:RubyEdit" id="Left1ED">
+                      <object class="svxlo-RubyEdit" id="Left1ED">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
@@ -155,7 +155,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo:RubyEdit" id="Right1ED">
+                      <object class="svxlo-RubyEdit" id="Right1ED">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
@@ -168,7 +168,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo:RubyEdit" id="Right2ED">
+                      <object class="svxlo-RubyEdit" id="Right2ED">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
@@ -180,7 +180,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo:RubyEdit" id="Left3ED">
+                      <object class="svxlo-RubyEdit" id="Left3ED">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
@@ -192,7 +192,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo:RubyEdit" id="Right3ED">
+                      <object class="svxlo-RubyEdit" id="Right3ED">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
@@ -204,7 +204,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo:RubyEdit" id="Right4ED">
+                      <object class="svxlo-RubyEdit" id="Right4ED">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
@@ -216,7 +216,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo:RubyEdit" id="Left4ED">
+                      <object class="svxlo-RubyEdit" id="Left4ED">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                       </object>
@@ -385,7 +385,7 @@
               </packing>
             </child>
             <child>
-              <object class="svxlo:RubyPreview" id="preview">
+              <object class="svxlo-RubyPreview" id="preview">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
               </object>
diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui b/sw/uiconfig/swriter/ui/autoformattable.ui
index bf3d8cc64287..8e9c1e35138f 100644
--- a/sw/uiconfig/swriter/ui/autoformattable.ui
+++ b/sw/uiconfig/swriter/ui/autoformattable.ui
@@ -161,7 +161,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="swuilo:AutoFmtPreview" id="preview">
+                          <object class="swuilo-AutoFmtPreview" id="preview">
                             <property name="width_request">200</property>
                             <property name="height_request">200</property>
                             <property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui
index 85c820fbb352..1af3c64c8448 100644
--- a/sw/uiconfig/swriter/ui/autotext.ui
+++ b/sw/uiconfig/swriter/ui/autotext.ui
@@ -293,7 +293,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="swlo:NoSpaceEdit" id="shortname">
+                          <object class="swlo-NoSpaceEdit" id="shortname">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="halign">end</property>
@@ -316,7 +316,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="swuilo:SwGlTreeListBox" id="category">
+                      <object class="swuilo-SwGlTreeListBox" id="category">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui
index b9fc2ecadd3c..ca7a0d51b0b0 100644
--- a/sw/uiconfig/swriter/ui/columnpage.ui
+++ b/sw/uiconfig/swriter/ui/columnpage.ui
@@ -202,7 +202,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="swuilo:ColumnValueSet" id="valueset">
+                      <object class="swuilo-ColumnValueSet" id="valueset">
                         <property name="visible">True</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
@@ -241,7 +241,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
-              <object class="swlo:SwColExample" id="pageexample">
+              <object class="swlo-SwColExample" id="pageexample">
                 <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
@@ -254,7 +254,7 @@
               </packing>
             </child>
             <child>
-              <object class="swlo:SwColumnOnlyExample" id="frameexample">
+              <object class="swlo-SwColumnOnlyExample" id="frameexample">
                 <property name="visible">True</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
@@ -719,7 +719,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:LineListBox" id="linestylelb">
+                  <object class="svtlo-LineListBox" id="linestylelb">
                     <property name="visible">True</property>
                     <property name="dropdown">True</property>
                   </object>
@@ -781,7 +781,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svtlo:ColorListBox" id="colorlb">
+                  <object class="svtlo-ColorListBox" id="colorlb">
                     <property name="visible">True</property>
                     <property name="dropdown">True</property>
                   </object>
diff --git a/sw/uiconfig/swriter/ui/editcategories.ui b/sw/uiconfig/swriter/ui/editcategories.ui
index 4ae12a6fcfd8..4e4555b64e8d 100644
--- a/sw/uiconfig/swriter/ui/editcategories.ui
+++ b/sw/uiconfig/swriter/ui/editcategories.ui
@@ -135,7 +135,7 @@
               </packing>
             </child>
             <child>
-              <object class="swuilo:SwGlossaryGroupTLB" id="group">
+              <object class="swuilo-SwGlossaryGroupTLB" id="group">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
@@ -197,7 +197,7 @@
               </packing>
             </child>
             <child>
-              <object class="swuilo:FEdit" id="name">
+              <object class="swuilo-FEdit" id="name">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">256</property>
diff --git a/sw/uiconfig/swriter/ui/endnotepage.ui b/sw/uiconfig/swriter/ui/endnotepage.ui
index 5d5ddf93fda0..1afc564d2b1d 100644
--- a/sw/uiconfig/swriter/ui/endnotepage.ui
+++ b/sw/uiconfig/swriter/ui/endnotepage.ui
@@ -133,7 +133,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="swlo:SwNumberingTypeListBox" id="numberinglb">
+                  <object class="swlo-SwNumberingTypeListBox" id="numberinglb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui b/sw/uiconfig/swriter/ui/exchangedatabases.ui
index 08d75ffe2db0..2cba93f2e6bb 100644
--- a/sw/uiconfig/swriter/ui/exchangedatabases.ui
+++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui
@@ -165,7 +165,7 @@ Use the browse button to select a database file.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="svtlo:SvTreeListBox" id="inuselb">
+                          <object class="svtlo-SvTreeListBox" id="inuselb">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
@@ -179,7 +179,7 @@ Use the browse button to select a database file.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="swlo:SwDBTreeList" id="availablelb">
+                          <object class="swlo-SwDBTreeList" id="availablelb">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
diff --git a/sw/uiconfig/swriter/ui/footnotepage.ui b/sw/uiconfig/swriter/ui/footnotepage.ui
index 6ffe813a3006..9972ad93cab0 100644
--- a/sw/uiconfig/swriter/ui/footnotepage.ui
+++ b/sw/uiconfig/swriter/ui/footnotepage.ui
@@ -208,7 +208,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="swlo:SwNumberingTypeListBox" id="numberinglb">
+                  <object class="swlo-SwNumberingTypeListBox" id="numberinglb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
diff --git a/sw/uiconfig/swriter/ui/formattablepage.ui b/sw/uiconfig/swriter/ui/formattablepage.ui
index 3e341b3e280c..150b18d34289 100644
--- a/sw/uiconfig/swriter/ui/formattablepage.ui
+++ b/sw/uiconfig/swriter/ui/formattablepage.ui
@@ -84,7 +84,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="swlo:TableNameEdit" id="name">
+                          <object class="swlo-TableNameEdit" id="name">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="hexpand">True</property>
diff --git a/sw/uiconfig/swriter/ui/insertbookmark.ui b/sw/uiconfig/swriter/ui/insertbookmark.ui
index 66639ab9dc90..6bfbfc7eccfe 100644
--- a/sw/uiconfig/swriter/ui/insertbookmark.ui
+++ b/sw/uiconfig/swriter/ui/insertbookmark.ui
@@ -67,7 +67,7 @@
           </packing>
         </child>
         <child>
-          <object class="swuilo:BookmarkCombo" id="bookmarks">
+          <object class="swuilo-BookmarkCombo" id="bookmarks">
               <property name="width_request">150</property>
               <property name="height_request">200</property>
               <property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui b/sw/uiconfig/swriter/ui/insertcaption.ui
index b88a3cfba3c7..b71a2f72169e 100644
--- a/sw/uiconfig/swriter/ui/insertcaption.ui
+++ b/sw/uiconfig/swriter/ui/insertcaption.ui
@@ -210,7 +210,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="swuilo:CategoryBox" id="category">
+                          <object class="swuilo-CategoryBox" id="category">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="entry_text_column">0</property>
@@ -259,7 +259,7 @@
                     <property name="bottom_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="swuilo:SwCaptionPreview" id="preview">
+                      <object class="swuilo-SwCaptionPreview" id="preview">
                         <property name="width_request">200</property>
                         <property name="height_request">50</property>
                         <property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/inserttable.ui b/sw/uiconfig/swriter/ui/inserttable.ui
index 0a635857cbba..15b553759c7b 100644
--- a/sw/uiconfig/swriter/ui/inserttable.ui
+++ b/sw/uiconfig/swriter/ui/inserttable.ui
@@ -104,7 +104,7 @@
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">12</property>
                         <child>
-                          <object class="swlo:TableNameEdit" id="nameedit">
+                          <object class="swlo-TableNameEdit" id="nameedit">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="invisible_char">•</property>
diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui b/sw/uiconfig/swriter/ui/linenumbering.ui
index 865943a4180a..dbb2ea356ea4 100644
--- a/sw/uiconfig/swriter/ui/linenumbering.ui
+++ b/sw/uiconfig/swriter/ui/linenumbering.ui
@@ -211,7 +211,7 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="swlo:SwNumberingTypeListBox" id="formatdropdown">
+                              <object class="swlo-SwNumberingTypeListBox" id="formatdropdown">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="hexpand">True</property>
diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
index 90c8ad9f4cdc..550aa2694184 100644
--- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui
@@ -165,7 +165,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="swlo:SwNumberingTypeListBox" id="numbering">
+                      <object class="swlo-SwNumberingTypeListBox" id="numbering">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="type">17</property>
@@ -312,7 +312,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="swuilo:NumberingPreview" id="preview">
+                  <object class="swuilo-NumberingPreview" id="preview">
                     <property name="width_request">150</property>
                     <property name="height_request">300</property>
                     <property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
index 1b5964efc486..08e19f1a5164 100644
--- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
@@ -227,7 +227,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="swuilo:NumberingPreview" id="preview">
+                  <object class="swuilo-NumberingPreview" id="preview">
                         <property name="width_request">300</property>
                         <property name="height_request">150</property>
                         <property name="visible">True</property>
diff --git a/sw/uiconfig/swriter/ui/sortdialog.ui b/sw/uiconfig/swriter/ui/sortdialog.ui
index 247344bb54de..3c0306ced266 100644
--- a/sw/uiconfig/swriter/ui/sortdialog.ui
+++ b/sw/uiconfig/swriter/ui/sortdialog.ui
@@ -707,7 +707,7 @@
                         <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <object class="svxcorelo:SvxLanguageBox" id="langlb">
+                          <object class="svxcorelo-SvxLanguageBox" id="langlb">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                           </object>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 1f7d3a853b6a..dc25339b42e1 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1160,7 +1160,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
     }
     else
     {
-        sal_Int32 nDelim = name.indexOf(':');
+        sal_Int32 nDelim = name.indexOf('-');
         if (nDelim != -1)
         {
 #ifndef DISABLE_DYNLOADING
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 8f76126ece5d..a0d9453dd232 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -97,7 +97,7 @@
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
-                  <object class="vcllo:PrintPreviewWindow" id="preview">
+                  <object class="vcllo-PrintPreviewWindow" id="preview">
                     <property name="width_request">235</property>
                     <property name="height_request">331</property>
                     <property name="visible">True</property>
@@ -1125,7 +1125,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="vcllo:ShowNupOrderWindow" id="orderpreview">
+                                  <object class="vcllo-ShowNupOrderWindow" id="orderpreview">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="hexpand">False</property>
diff --git a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
index 3085c25667ea..414f80de4550 100644
--- a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
+++ b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui
@@ -76,7 +76,7 @@
               </packing>
             </child>
             <child>
-              <object class="svxcorelo:SvxSimpleTableContainer" id="signatures">
+              <object class="svxcorelo-SvxSimpleTableContainer" id="signatures">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
diff --git a/xmlsecurity/uiconfig/ui/securitytrustpage.ui b/xmlsecurity/uiconfig/ui/securitytrustpage.ui
index a75014153abf..4ffa7d3ae13c 100644
--- a/xmlsecurity/uiconfig/ui/securitytrustpage.ui
+++ b/xmlsecurity/uiconfig/ui/securitytrustpage.ui
@@ -129,7 +129,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxcorelo:SvxSimpleTableContainer" id="certificates">
+                  <object class="svxcorelo-SvxSimpleTableContainer" id="certificates">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
index 621bc4f00c2a..16dd3fa94708 100644
--- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
+++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
@@ -144,7 +144,7 @@
               </packing>
             </child>
             <child>
-              <object class="svxcorelo:SvxSimpleTableContainer" id="signatures">
+              <object class="svxcorelo-SvxSimpleTableContainer" id="signatures">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
-- 
cgit