diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-02-15 12:17:05 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-15 12:23:13 +0000 |
commit | 158aee9ad3e8d7dbb58381fc260ebdb53466ce22 (patch) | |
tree | a0af424fcae3a44fa73716503f3961f753be7a1a | |
parent | eaf189abf2a3aa9d64a77ec866204203b51f52a8 (diff) |
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
-rwxr-xr-x | bin/verify-custom-widgets-libs | 29 | ||||
-rw-r--r-- | cui/uiconfig/ui/pickbulletpage.ui | 2 | ||||
-rw-r--r-- | cui/uiconfig/ui/pickgraphicpage.ui | 2 | ||||
-rw-r--r-- | cui/uiconfig/ui/picknumberingpage.ui | 2 | ||||
-rw-r--r-- | cui/uiconfig/ui/pickoutlinepage.ui | 2 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/autotext.ui | 2 | ||||
-rw-r--r-- | sw/uiconfig/swriter/ui/exchangedatabases.ui | 2 |
7 files changed, 35 insertions, 6 deletions
diff --git a/bin/verify-custom-widgets-libs b/bin/verify-custom-widgets-libs new file mode 100755 index 000000000000..6a04702fa4cc --- /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 8f7bdce1144f..6bad6e35b4b9 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 0fe5b6eb7085..2464194907b5 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 081da688acc3..a03fc951ba24 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 708fd55b8850..6ade493bc928 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 e6fddb1a3d9a..6689142c7429 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 d3af20b7e36f..b76a9203ed50 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> |