[Libreoffice-commits] core.git: bin/verify-custom-widgets-libs cui/uiconfig sw/uiconfig

[Caolán McNamara]

 bin/verify-custom-widgets-libs              |   29 ++++++++++++++++++++++++++++
 cui/uiconfig/ui/pickbulletpage.ui           |    2 -
 cui/uiconfig/ui/pickgraphicpage.ui          |    2 -
 cui/uiconfig/ui/picknumberingpage.ui        |    2 -
 cui/uiconfig/ui/pickoutlinepage.ui          |    2 -
 sw/uiconfig/swriter/ui/autotext.ui          |    2 -
 sw/uiconfig/swriter/ui/exchangedatabases.ui |    2 -
 7 files changed, 35 insertions(+), 6 deletions(-)

New commits:
commit 158aee9ad3e8d7dbb58381fc260ebdb53466ce22
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 15 12:17:05 2013 +0000

    Resolves: fdo#60627 wrong lib names for some custom widgets
    
    Under Linux dlsym will search other locations and find them if they exist
    elsewhere, but not under windows, so its easy to put the wrong lib name in if
    developing under Linux because it'll generally work anyway.
    
    So add a script: bin/verify-custom-widgets-libs which can be used under Linux
    to verify that the required factory methods exist in the right lib.
    
    Change-Id: Ic30f8da5acc4712684a7a25fbfb003e8b21cb867

diff --git a/bin/verify-custom-widgets-libs b/bin/verify-custom-widgets-libs
new file mode 100755
index 0000000..6a04702
--- /dev/null
+++ b/bin/verify-custom-widgets-libs
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Run this from the source root dir of a completed build to
+# verify that all customwidgets used in our .ui files have
+# their factory method in the library they claim to be in
+#
+# Under Linux dlsym will search other locations and find
+# them if they exist elsewhere, but not under windows, so
+# 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`
+for foo in $FOO; do
+    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
+        echo "MISSING. Windows will crash"
+    else
+        echo "OK";
+    fi
+done
diff --git a/cui/uiconfig/ui/pickbulletpage.ui b/cui/uiconfig/ui/pickbulletpage.ui
index 8f7bdce..6bad6e3 100644
--- a/cui/uiconfig/ui/pickbulletpage.ui
+++ b/cui/uiconfig/ui/pickbulletpage.ui
@@ -17,7 +17,7 @@
         <property name="top_padding">6</property>
         <property name="left_padding">12</property>
         <child>
-          <object class="cuilo: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 0fe5b6e..2464194 100644
--- a/cui/uiconfig/ui/pickgraphicpage.ui
+++ b/cui/uiconfig/ui/pickgraphicpage.ui
@@ -40,7 +40,7 @@
               </packing>
             </child>
             <child>
-              <object class="cuilo: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 081da68..a03fc95 100644
--- a/cui/uiconfig/ui/picknumberingpage.ui
+++ b/cui/uiconfig/ui/picknumberingpage.ui
@@ -17,7 +17,7 @@
         <property name="top_padding">6</property>
         <property name="left_padding">12</property>
         <child>
-          <object class="cuilo: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 708fd55..6ade493 100644
--- a/cui/uiconfig/ui/pickoutlinepage.ui
+++ b/cui/uiconfig/ui/pickoutlinepage.ui
@@ -17,7 +17,7 @@
         <property name="top_padding">6</property>
         <property name="left_padding">12</property>
         <child>
-          <object class="cuilo: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/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui
index e6fddb1..6689142 100644
--- a/sw/uiconfig/swriter/ui/autotext.ui
+++ b/sw/uiconfig/swriter/ui/autotext.ui
@@ -293,7 +293,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="swuilo: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>
diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui b/sw/uiconfig/swriter/ui/exchangedatabases.ui
index d3af20b..b76a920 100644
--- a/sw/uiconfig/swriter/ui/exchangedatabases.ui
+++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui
@@ -179,7 +179,7 @@ Use the browse button to select a database file.</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="swuilo: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>