RepositoryExternal.mk | 4 -
filter/source/config/cache/constant.hxx | 47 ++++++---------
filter/source/config/cache/registration.cxx | 47 ---------------
libexttextcat/android.patch | 4 -
libexttextcat/libexttextcat-3.2.0-visibility.patch | 10 ---
libexttextcat/libexttextcat-visibility.patch | 10 +++
libexttextcat/makefile.mk | 10 +--
libexttextcat/prj/d.lst | 2
lingucomponent/source/languageguessing/simpleguesser.cxx | 3
ooo.lst.in | 2
starmath/inc/node.hxx | 3
sw/source/filter/ww8/WW8Sttbf.cxx | 2
12 files changed, 43 insertions(+), 101 deletions(-)
New commits:
commit 578b7df37638cf9afad327900d2140aabd0c3556
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri May 25 15:42:11 2012 +0100
bump libexttextcat
Change-Id: I381a975bebfc805ef04dbf8c5b7df66314da8acb
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8e620bf..af1ee00 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -270,7 +270,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
))
else
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
- exttextcat \
+ exttextcat-1.0 \
))
endif
@@ -281,7 +281,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
)
else
$(call gb_LinkTarget_use_static_libraries,$(1),\
- exttextcat \
+ exttextcat-1.0 \
)
endif
diff --git a/libexttextcat/android.patch b/libexttextcat/android.patch
index e82851d..bca8fe1 100644
--- a/libexttextcat/android.patch
+++ b/libexttextcat/android.patch
@@ -1,5 +1,5 @@
---- misc/libexttextcat-3.2.0/config.sub
-+++ misc/build/libexttextcat-3.2.0/config.sub
+--- misc/libexttextcat-3.3.0/config.sub
++++ misc/build/libexttextcat-3.3.0/config.sub
@@ -120,7 +120,7 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
diff --git a/libexttextcat/libexttextcat-3.2.0-visibility.patch
b/libexttextcat/libexttextcat-3.2.0-visibility.patch
deleted file mode 100644
index a4104b7..0000000
--- a/libexttextcat/libexttextcat-3.2.0-visibility.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc/libexttextcat-3.2.0/src/makefile.mk 2011-10-07 00:09:38.000000000
+0200
-+++ misc/build/libexttextcat-3.2.0/src/makefile.mk 2011-11-15
13:57:19.742958488 +0100
-@@ -33,6 +33,7 @@
-
- USE_DEFFILE=TRUE
- EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+VISIBILITY_HIDDEN=TRUE
- UWINAPILIB=
-
- .INCLUDE : settings.mk
diff --git a/libexttextcat/libexttextcat-visibility.patch
b/libexttextcat/libexttextcat-visibility.patch
new file mode 100644
index 0000000..86c0efb
--- /dev/null
+++ b/libexttextcat/libexttextcat-visibility.patch
@@ -0,0 +1,10 @@
+--- misc/libexttextcat-3.3.0/src/makefile.mk 2011-10-07 00:09:38.000000000
+0200
++++ misc/build/libexttextcat-3.3.0/src/makefile.mk 2011-11-15
13:57:19.742958488 +0100
+@@ -33,6 +33,7 @@
+
+ USE_DEFFILE=TRUE
+ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++VISIBILITY_HIDDEN=TRUE
+ UWINAPILIB=
+
+ .INCLUDE : settings.mk
diff --git a/libexttextcat/makefile.mk b/libexttextcat/makefile.mk
index 0f4c0b0..5e18911 100644
--- a/libexttextcat/makefile.mk
+++ b/libexttextcat/makefile.mk
@@ -44,10 +44,10 @@ all:
# See http://cgit.freedesktop.org/libreoffice/libexttextcat/ for upstream
# sources, far better to commit your changes in there
-TARFILE_NAME=libexttextcat-3.2.0
-TARFILE_MD5=e1c178b18f130b40494561f02bc1a948
-TARFILE_ROOTDIR=libexttextcat-3.2.0
-PATCH_FILES=libexttextcat-3.2.0-visibility.patch android.patch
+TARFILE_NAME=libexttextcat-3.3.0
+TARFILE_MD5=dc8fc13710a987edd59f0bcae004fec2
+TARFILE_ROOTDIR=libexttextcat-3.3.0
+PATCH_FILES=libexttextcat-visibility.patch android.patch
.IF "$(GUI)"=="UNX"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -68,7 +68,7 @@ CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)
BUILD_ACTION=make $(eq,$(VERBOSE),TRUE V=1)
-OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libexttextcat.a
+OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libexttextcat-1.0.a
.ENDIF # "$(GUI)"=="UNX"
diff --git a/libexttextcat/prj/d.lst b/libexttextcat/prj/d.lst
index daabc3c..5bc6031 100644
--- a/libexttextcat/prj/d.lst
+++ b/libexttextcat/prj/d.lst
@@ -4,7 +4,7 @@
..\%__SRC%\bin\l*.dll %_DEST%\bin\*.dll
mkdir: %_DEST%\inc\external\libexttextcat
-..\%__SRC%\misc\build\libexttextcat-3.2.0\src\*.h
%_DEST%\inc\external\libexttextcat\*.h
+..\%__SRC%\misc\build\libexttextcat-3.3.0\src\*.h
%_DEST%\inc\external\libexttextcat\*.h
# data for language guessing
..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\pck\*.zip
diff --git a/ooo.lst.in b/ooo.lst.in
index e31a791..507d2d8 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -3,7 +3,7 @@ http://dev-www.libreoffice.org/src
51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
-e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
+dc8fc13710a987edd59f0bcae004fec2-libexttextcat-3.3.0.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
commit ccf238b307d144623c1075902d256aad78fc69f0
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon May 28 12:21:19 2012 +0100
OSL_LITTLEENDIAN->OSL_LITENDIAN
thanks Norbert :-)
Change-Id: I03942dd80bff39f4cc9a19117a4c5c5e4dfcd325
diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx
b/sw/source/filter/ww8/WW8Sttbf.cxx
index fecb58b..4280a0a 100644
--- a/sw/source/filter/ww8/WW8Sttbf.cxx
+++ b/sw/source/filter/ww8/WW8Sttbf.cxx
@@ -87,7 +87,7 @@ namespace ww8
sal_uInt32 nAvailable = (mn_size - nStartOff)/sizeof(sal_Unicode);
if (nCount > nAvailable)
nCount = nAvailable;
-#if defined OSL_LITTLEENDIAN
+#if defined OSL_LITENDIAN
aResult = rtl::OUString(reinterpret_cast<const sal_Unicode *>(
mp_data.get() + nStartOff), nCount);
#else
commit 25a605f36544582bd454d4bc0e71e684749a0b80
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri May 25 15:51:04 2012 +0100
this is supposed to just be the number of bytes
Change-Id: Iecd376aba13f94c5c62fab2f3278c5f3efda20b4
diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx
b/lingucomponent/source/languageguessing/simpleguesser.cxx
index 383ab3e..3346ef2 100644
--- a/lingucomponent/source/languageguessing/simpleguesser.cxx
+++ b/lingucomponent/source/languageguessing/simpleguesser.cxx
@@ -117,8 +117,7 @@ vector<Guess> SimpleGuesser::GuessLanguage(const char* text)
if (!h)
return guesses;
- //calculate le number of unicode charcters (symbols)
- int len = utfstrlen(text);
+ int len = strlen(text);
if (len > MAX_STRING_LENGTH_TO_ANALYSE)
len = MAX_STRING_LENGTH_TO_ANALYSE;
commit 6e12f367d5d0cee5b023bf93fe6faaebd92d5abd
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri May 25 15:41:59 2012 +0100
reduce static_initialization_and_destruction chain
Change-Id: Ic709bb128a82016b1bbc2c43cf4fe7ad091e7b1a
diff --git a/filter/source/config/cache/constant.hxx
b/filter/source/config/cache/constant.hxx
index 9161803..a6e28b5 100644
--- a/filter/source/config/cache/constant.hxx
+++ b/filter/source/config/cache/constant.hxx
@@ -30,15 +30,6 @@
#include "macros.hxx"
-namespace filter { namespace config {
-extern rtl::OUString pFilterStrings[];
-} }
-#ifndef PROPNAME_IMPL_DECL
-# define PROPNAME_DECL(index, str) (pFilterStrings[(index)])
-#else
-# define PROPNAME_DECL(index, str) pFilterStrings[(index)] =
_FILTER_CONFIG_FROM_ASCII_(str)
-#endif
-
/* disable impl_loadOnDemand function of BaseContainer for certain
functions, where it the feature "impl_loadItemOnDemand() of class
FilterCache
can be used instead of loadAll()!*/
@@ -50,40 +41,40 @@ extern rtl::OUString pFilterStrings[];
configuration API and can be used at all name containers
(based on this filtercache) too.
*/
-#define PROPNAME_NAME PROPNAME_DECL(0, "Name")
+#define PROPNAME_NAME "Name"
/** @short used to identify a type item property against the
configuration API and can be used at all name containers
(based on this filtercache) too.
*/
-#define PROPNAME_UINAME PROPNAME_DECL(1, "UIName" )
-#define PROPNAME_UINAMES PROPNAME_DECL(2, "UINames" )
-#define PROPNAME_PREFERRED PROPNAME_DECL(3, "Preferred" )
-#define PROPNAME_PREFERREDFILTER PROPNAME_DECL(4, "PreferredFilter" )
-#define PROPNAME_DETECTSERVICE PROPNAME_DECL(5, "DetectService" )
-#define PROPNAME_MEDIATYPE PROPNAME_DECL(6, "MediaType" )
-#define PROPNAME_CLIPBOARDFORMAT PROPNAME_DECL(7, "ClipboardFormat" )
-#define PROPNAME_URLPATTERN PROPNAME_DECL(8, "URLPattern" )
-#define PROPNAME_EXTENSIONS PROPNAME_DECL(9, "Extensions" )
+#define PROPNAME_UINAME "UIName"
+#define PROPNAME_UINAMES "UINames"
+#define PROPNAME_PREFERRED "Preferred"
+#define PROPNAME_PREFERREDFILTER "PreferredFilter"
+#define PROPNAME_DETECTSERVICE "DetectService"
+#define PROPNAME_MEDIATYPE "MediaType"
+#define PROPNAME_CLIPBOARDFORMAT "ClipboardFormat"
+#define PROPNAME_URLPATTERN "URLPattern"
+#define PROPNAME_EXTENSIONS "Extensions"
/** @short used to identify a filter item property against the
configuration API and can be used at all name containers
(based on this filtercache) too.
*/
-#define PROPNAME_TYPE PROPNAME_DECL(10, "Type" )
-#define PROPNAME_DOCUMENTSERVICE PROPNAME_DECL(11, "DocumentService" )
-#define PROPNAME_FILTERSERVICE PROPNAME_DECL(12, "FilterService" )
-#define PROPNAME_UICOMPONENT PROPNAME_DECL(13, "UIComponent" )
-#define PROPNAME_FLAGS PROPNAME_DECL(14, "Flags" )
-#define PROPNAME_USERDATA PROPNAME_DECL(15, "UserData" )
-#define PROPNAME_TEMPLATENAME PROPNAME_DECL(16, "TemplateName" )
-#define PROPNAME_FILEFORMATVERSION PROPNAME_DECL(17, "FileFormatVersion")
+#define PROPNAME_TYPE "Type"
+#define PROPNAME_DOCUMENTSERVICE "DocumentService"
+#define PROPNAME_FILTERSERVICE "FilterService"
+#define PROPNAME_UICOMPONENT "UIComponent"
+#define PROPNAME_FLAGS "Flags"
+#define PROPNAME_USERDATA "UserData"
+#define PROPNAME_TEMPLATENAME "TemplateName"
+#define PROPNAME_FILEFORMATVERSION "FileFormatVersion"
/** @short used to identify a frame loader or detect service item
property against the configuration API and can be used
at all name containers (based on this filtercache) too.
*/
-#define PROPNAME_TYPES PROPNAME_DECL(18, "Types")
+#define PROPNAME_TYPES "Types"
/** @short used to identify the list of sorted filters for a specific
office module
diff --git a/filter/source/config/cache/registration.cxx
b/filter/source/config/cache/registration.cxx
index 3895f57..846068c 100644
--- a/filter/source/config/cache/registration.cxx
+++ b/filter/source/config/cache/registration.cxx
@@ -30,12 +30,6 @@
#include <cppuhelper/factory.hxx>
#include <rtl/instance.hxx>
-#ifdef _FILTER_CONFIG_CONSTANT_HXX_
-# error "Already included constant.hxx"
-#else
-# define PROPNAME_IMPL_DECL
-# include "constant.hxx"
-#endif
#include "typedetection.hxx"
#include "filterfactory.hxx"
#include "contenthandlerfactory.hxx"
@@ -53,45 +47,6 @@ namespace css = ::com::sun::star;
//_______________________________________________
// definitions
-rtl::OUString pFilterStrings[19];
-
-namespace
-{
- class doInitConstants
- {
- public:
- doInitConstants()
- {
- PROPNAME_NAME;
- PROPNAME_UINAME;
- PROPNAME_UINAMES;
- PROPNAME_PREFERRED;
- PROPNAME_PREFERREDFILTER;
- PROPNAME_DETECTSERVICE;
- PROPNAME_MEDIATYPE;
- PROPNAME_CLIPBOARDFORMAT;
- PROPNAME_URLPATTERN;
- PROPNAME_EXTENSIONS;
- PROPNAME_TYPE;
- PROPNAME_DOCUMENTSERVICE;
- PROPNAME_FILTERSERVICE;
- PROPNAME_UICOMPONENT;
- PROPNAME_FLAGS;
- PROPNAME_USERDATA;
- PROPNAME_TEMPLATENAME;
- PROPNAME_FILEFORMATVERSION;
- PROPNAME_TYPES;
- }
- };
-
- struct theConstantsInitializer : public rtl::Static< doInitConstants,
theConstantsInitializer > {};
-}
-
-static void InitConstants()
-{
- theConstantsInitializer::get();
-}
-
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL
filterconfig1_component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
@@ -100,8 +55,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL
if ((!pImplementationName) || (!pServiceManager ))
return NULL;
- InitConstants();
-
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory
>
xSMGR = reinterpret_cast< com::sun::star::lang::XMultiServiceFactory*
>(pServiceManager);
com::sun::star::uno::Reference<
com::sun::star::lang::XSingleServiceFactory > xFactory;
commit 2899b1ade437812cfb138fe48a5b9517727facc9
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri May 25 14:26:26 2012 +0100
only need to include ostream here, iostream sucks in global ctors
Change-Id: I829a223f66199214c6dc4a08c6f2f53d7166a586
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 385aa8e..e1df8f2 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -30,8 +30,7 @@
#define NODE_HXX
#include <vector>
-#include <fstream>
-#include <iostream>
+#include <ostream>
#include <stdio.h>
#include "parse.hxx"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
