[Libreoffice-commits] .: 2 commits - codemaker/inc codemaker/source hyphen/hyphen-fdo43931.patch hyphen/makefile.mk unusedcode.easy

[Caolán McNamara]

 codemaker/inc/codemaker/commoncpp.hxx    |    2 --
 codemaker/source/commoncpp/commoncpp.cxx |   25 -------------------------
 hyphen/hyphen-fdo43931.patch             |   11 +++++++++++
 hyphen/makefile.mk                       |    3 ++-
 unusedcode.easy                          |    1 -
 5 files changed, 13 insertions(+), 29 deletions(-)

New commits:
commit 84897d4b3b2a0e4719b00fb06abb8c04e3c20c24
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 22 23:41:29 2011 +0000

    Recover fix for fdo#43931

diff --git a/hyphen/hyphen-fdo43931.patch b/hyphen/hyphen-fdo43931.patch
new file mode 100644
index 0000000..5299066
--- /dev/null
+++ b/hyphen/hyphen-fdo43931.patch
@@ -0,0 +1,11 @@
+--- misc/hyphen-2.8.3/hyphen.c	2011-12-22 23:37:55.929693094 +0000
++++ misc/build/hyphen-2.8.3/hyphen.c	2011-12-22 23:38:32.294088592 +0000
+@@ -437,7 +437,7 @@
+     /* default first level: hyphen and ASCII apostrophe */
+     if (!dict[0]->utf8) hnj_hyphen_load_line("NOHYPHEN '\n", dict[k], hashtab);
+     else hnj_hyphen_load_line("NOHYPHEN ',\xe2\x80\x93,\xe2\x80\x99\n", dict[k], hashtab);
+-    strcpy(buf, "1-1/=,1,1\n"); // buf rewritten by hnj_hyphen_load here
++    strcpy(buf, "1-1\n"); // buf rewritten by hnj_hyphen_load here
+     hnj_hyphen_load_line(buf, dict[k], hashtab); /* remove hyphen */
+     hnj_hyphen_load_line("1'1\n", dict[k], hashtab); /* ASCII apostrophe */
+     if (dict[0]->utf8) {
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index feb0ea7..f44953f 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -43,7 +43,8 @@ ADDITIONAL_FILES += makefile.mk
 
 PATCH_FILES= \
     hyphen-build.patch \
-    hyphen-android.patch
+    hyphen-android.patch \
+    hyphen-fdo43931.patch
 
 .IF "$(GUI)"=="UNX"
 CONFIGURE_DIR=$(BUILD_DIR)
commit 279b71044d1a8b60452425b5b192d3dfb21a62fe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 22 23:18:21 2011 +0000

    callcatcher: remove unused typeToPrefix

diff --git a/codemaker/inc/codemaker/commoncpp.hxx b/codemaker/inc/codemaker/commoncpp.hxx
index 5ccb5e3..812dd04 100644
--- a/codemaker/inc/codemaker/commoncpp.hxx
+++ b/codemaker/inc/codemaker/commoncpp.hxx
@@ -33,8 +33,6 @@
 
 namespace codemaker { namespace cpp {
 
-rtl::OString typeToPrefix(TypeManager const & manager, rtl::OString const & type);
-
 rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace=false,
                            bool shortname=false);
 
diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx
index a6926e6..ddd9dad 100644
--- a/codemaker/source/commoncpp/commoncpp.cxx
+++ b/codemaker/source/commoncpp/commoncpp.cxx
@@ -46,31 +46,6 @@
 
 namespace codemaker { namespace cpp {
 
-rtl::OString typeToPrefix(TypeManager const & manager, rtl::OString const & type)
-{
-    RTTypeClass typeclass = manager.getTypeClass(type);
-    if (typeclass == RT_TYPE_INVALID ||
-        typeclass == RT_TYPE_PUBLISHED)
-        return rtl::OString("_");
-
-    static char const * const typeclassPrefix[RT_TYPE_UNION + 1] = {
-        "invalid",    /* RT_TYPE_INVALID, is here only as placeholder */
-        "interface",  /* RT_TYPE_INTERFACE */
-        "module",     /* RT_TYPE_MODULE */
-        "struct",     /* RT_TYPE_STRUCT */
-        "enum",       /* RT_TYPE_ENUM */
-        "exception",  /* RT_TYPE_EXCEPTION */
-        "typedef",    /* RT_TYPE_TYPEDEF */
-        "service",    /* RT_TYPE_SERVICE */
-        "singleton",  /* RT_TYPE_SINGLETON */
-        "object",     /* RT_TYPE_OBJECT */
-        "constants",  /* RT_TYPE_CONSTANTS */
-        "union"       /* RT_TYPE_UNION */
-    };
-
-    return rtl::OString(typeclassPrefix[typeclass]);
-}
-
 rtl::OString scopedCppName(rtl::OString const & type, bool bNoNameSpace,
                            bool shortname)
 {
diff --git a/unusedcode.easy b/unusedcode.easy
index 40865c7..fa8ca4a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1608,7 +1608,6 @@ chart::EquidistantTickIter::getMaxIndex() const
 chart::EquidistantTickIter::gotoIndex(int)
 cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&)
 cmis::Content::queryChildren(std::__debug::list<rtl::Reference<cmis::Content>, std::allocator<rtl::Reference<cmis::Content> > >&)
-codemaker::cpp::typeToPrefix(TypeManager const&, rtl::OString const&)
 comphelper::AccessibleEventNotifier::getEventListeners(unsigned int)
 comphelper::AttributeList::AppendAttributeList(com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&)
 comphelper::AttributeList::Clear()