[Libreoffice-commits] .: configure.in
configure.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 62a318eea86feb9340970c71eac835d09b78 Author: Tomas Chvatal tchva...@suse.cz Date: Mon Apr 23 13:23:57 2012 +0200 Add all the available themes to the list. diff --git a/configure.in b/configure.in index 15d8ce6..e6d8844 100644 --- a/configure.in +++ b/configure.in @@ -9472,13 +9472,13 @@ dnl === AC_MSG_CHECKING([which themes to include]) # if none given, use all available themes if test x$with_theme = x -o x$with_theme = xyes; then -with_theme=default crystal hicontrast oxygen tango +with_theme=crystal hicontrast human oxygen tango fi WITH_THEMES= for theme in $with_theme; do case $theme in -default|crystal|hicontrast|oxygen|tango|human) : ;; +classic|crystal|galaxy|hicontrast|human|industrial|oxygen|tango) : ;; *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; esac WITH_THEMES=$WITH_THEMES $theme ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/parameter.pm |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 071d6daf5c798e89887a84a17fb3b64824fdbc6f
Author: Tomas Chvatal tchva...@suse.cz
Date: Mon Apr 23 14:39:39 2012 +0200
Fix undefined destdir if the directory was not existing prior the run.
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index 6d99aaa..198a381 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -152,7 +152,10 @@ sub getparameter
elsif ($param eq -destdir)# new parameter for simple installer
{
$installer::globals::rootpath ne die must set destdir
before -i or -simple;
-$installer::globals::destdir = Cwd::realpath( shift @ARGV );
+
+ my $path = shift(@ARGV);
+ mkdir $path;
+$installer::globals::destdir = Cwd::realpath($path);
}
elsif ($param eq -simple) # new parameter for simple installer
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/parameter.pm |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f3480645bd444649491942c501ec679a46eb8d09
Author: Tomas Chvatal tchva...@suse.cz
Date: Mon Apr 23 14:42:26 2012 +0200
Whitespace torture
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index 198a381..e84dbdc 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -153,8 +153,8 @@ sub getparameter
{
$installer::globals::rootpath ne die must set destdir
before -i or -simple;
- my $path = shift(@ARGV);
- mkdir $path;
+my $path = shift(@ARGV);
+mkdir $path;
$installer::globals::destdir = Cwd::realpath($path);
}
elsif ($param eq -simple) # new parameter for simple installer
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in
configure.in |7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) New commits: commit f9f8d9ac12979e7ec2f269e7f42f1408da9b6795 Author: Tomas Chvatal tchva...@suse.cz Date: Tue Apr 17 09:57:19 2012 +0200 --enable-ext-languagetool requires --with-java now bit more sanely. diff --git a/configure.in b/configure.in index d1dff86..13cc862 100644 --- a/configure.in +++ b/configure.in @@ -9655,7 +9655,7 @@ dnl === dnl Test whether to include LanguageTool extension dnl === AC_MSG_CHECKING([for LanguageTool extension integration]) -if test x$enable_ext_languagetool = xyes -a x$enable_extension_integration != xno; then +if test x$enable_ext_languagetool = xyes -a x$enable_extension_integration != xno -a x$with_java != xno; then BUILD_TYPE=$BUILD_TYPE LANGUAGETOOL SCPDEFS=$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL AC_MSG_RESULT([yes]) commit a774c6e38503975fdeea165db914176ef1c9a3be Author: Tomas Chvatal tchva...@suse.cz Date: Tue Apr 17 09:55:28 2012 +0200 Revert --enable-ext-languagetool requires --with-java This reverts commit 844b4520a9f0879d7b756654cef8fdbaa03a9000. diff --git a/configure.in b/configure.in index eb4e746..d1dff86 100644 --- a/configure.in +++ b/configure.in @@ -435,7 +435,7 @@ AC_ARG_ENABLE(ext-hunart, AC_ARG_ENABLE(ext-languagetool, AS_HELP_STRING([--enable-ext-languagetool], -[Enable the LanguageTool extension. Does not work --without-java.]) +[Enable the LanguageTool extension.]) ) AC_ARG_ENABLE(ext-mysql-connector, @@ -9656,9 +9656,6 @@ dnl Test whether to include LanguageTool extension dnl === AC_MSG_CHECKING([for LanguageTool extension integration]) if test x$enable_ext_languagetool = xyes -a x$enable_extension_integration != xno; then -if test -z $SOLAR_JAVA; then -AC_MSG_ERROR([--enable_ext_languagetool requires --with-java]) -fi BUILD_TYPE=$BUILD_TYPE LANGUAGETOOL SCPDEFS=$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL AC_MSG_RESULT([yes]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b3fa15b05f5fab3d62f10a5419ea56cd8d87e629 Author: Tomas Chvatal tchva...@suse.cz Date: Tue Apr 17 10:01:13 2012 +0200 Fix help string in --with-flat-logo. diff --git a/configure.in b/configure.in index 13cc862..e71aaa9 100644 --- a/configure.in +++ b/configure.in @@ -1766,7 +1766,7 @@ AC_ARG_WITH(intro-progressbar-frame-color, AC_ARG_WITH(flat-logo-svg, [ --with-flat-logo-svgAllows specification of the flat Logo SVG. - Usage: --with-about-background-svg=/path/my_flat_logo.svg + Usage: --with-flat-logo-svg=/path/my_flat_logo.svg ],,) AC_ARG_WITH(about-background-svg, ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 81c20913cdeb0c819b3b74115902da1c51d280fa Author: Tomas Chvatal tchva...@suse.cz Date: Tue Apr 17 10:05:50 2012 +0200 Add the system-clucene under the with-system-libs As the distros already had enough time to pick up the required patch and most did. diff --git a/configure.in b/configure.in index e71aaa9..b108b79 100644 --- a/configure.in +++ b/configure.in @@ -1140,7 +1140,8 @@ AC_ARG_WITH(system-jpeg, AC_ARG_WITH(system-clucene, AS_HELP_STRING([--with-system-clucene], -[Use clucene already on system.]),,) +[Use clucene already on system.]),, +[with_system_clucene=$with_system_libs]) AC_ARG_WITH(system-expat, AS_HELP_STRING([--with-system-expat], ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc
solenv/inc/libs.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cf1e3b9132a804bd5d7eb0294c1d7e4f0254f52b Author: Tomas Chvatal tchva...@suse.cz Date: Tue Apr 17 16:38:39 2012 +0200 Use proper variable when using system clucene. Thanks to Caolan for the fix. diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 3adeb01..a936193 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -182,7 +182,7 @@ HM2LIBST=-lhmwrap LINGULIB=$(HM2LIBST) LNGLIB=-llng$(DLLPOSTFIX) .IF $(SYSTEM_CLUCENE)==YES -CLUCENELIB=$(LIBCLUCENE_LIBS) +CLUCENELIB=$(CLUCENE_LIBS) .ELSE CLUCENELIB=-lclucene .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/CppunitTest.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 141fdfa04807f49b1c4e89a90b477cc1714fc726 Author: Tomáš Chvátal tchva...@suse.cz Date: Tue Apr 3 14:21:23 2012 +0200 always pass --headless to cppunits They should not need any actual UI anyway, and most of them already pass the option manually. http://lists.freedesktop.org/archives/libreoffice/2012-March/029109.html This is partial code grab as cherry-pick had the test-mk files collisions all over the place. I pick only the additional define which results in some tests adding --headless twice, which does no harm. Author: LuboÅ¡ LuÅák l.lu...@suse.cz Signed-off-by: Tomáš Chvátal tchva...@suse.cz diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 0d8959e..826d3f5 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -61,6 +61,7 @@ gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS_FOR_BUILD)),/)$(1) gb_CppunitTest__get_uno_type_target = $(OUTDIR)/bin/$(1).rdb define gb_CppunitTest__make_args $(ARGS) \ +--headless \ $(if $(strip $(UNO_TYPES)),\ -env:UNO_TYPES=$(foreach rdb,udkapi $(UNO_TYPES),\ $(call gb_CppunitTarget__make_url,$(call gb_CppunitTest__get_uno_type_target,$(rdb) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - sal/qa
sal/qa/osl/security/osl_Security.cxx | 93 +--
sal/qa/osl/security/osl_Security_Const.h | 19 +-
2 files changed, 54 insertions(+), 58 deletions(-)
New commits:
commit 0c1b92a79929fe2b25dc3a95cf94413a713d99db
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Apr 3 14:01:30 2012 +0200
don't skip first cmdline argument
It looks like this one is also meant to be called manually or something,
and the original version didn't skip the first argument either.
Signed-off-by: Tomas Chvatal tchva...@suse.cz
diff --git a/sal/qa/osl/security/osl_Security.cxx
b/sal/qa/osl/security/osl_Security.cxx
index 637c378..4deb7af 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -637,8 +637,7 @@ void MyTestPlugInImpl::initialize(
CPPUNIT_NS::TestFactoryRegistry *,
rtl::OUString args[ 3 ];
int argsCount = 0;
sal_uInt32 n = rtl_getAppCommandArgCount();
-// skip first, that's the module name
-for (sal_uInt32 i = 1; i n; ++i)
+for (sal_uInt32 i = 0; i n; ++i)
{
rtl::OUString arg;
rtl_getAppCommandArg(i, arg.pData);
commit 23be7b5d793a44ab53a996a1eba6b571bd311339
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Mon Apr 2 18:59:53 2012 +0200
fix crude command line arguments handling
Signed-off-by: Tomas Chvatal tchva...@suse.cz
diff --git a/sal/qa/osl/security/osl_Security.cxx
b/sal/qa/osl/security/osl_Security.cxx
index 751f09b..637c378 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -38,6 +38,7 @@
#endif
#include osl_Security_Const.h
#include osl/thread.h
+#include rtl/process.h
#include rtl/strbuf.hxx
using namespace osl;
@@ -353,7 +354,7 @@ class MyTestPlugInImpl: public
CPPUNIT_NS::TestPlugInDefaultImpl
void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
- const CPPUNIT_NS::PlugInParameters parameters)
+ const CPPUNIT_NS::PlugInParameters )
{
/// start message
t_print(#Initializing ...\n );
@@ -633,44 +634,53 @@ void MyTestPlugInImpl::initialize(
CPPUNIT_NS::TestFactoryRegistry *,
t_print(Administrator.\n );
/// get and display forwarded text if available.
-aStringForward = ::rtl::OUString::createFromAscii(
parameters.getCommandLine().c_str() );
-if ( !aStringForward.isEmpty() aStringForward.indexOf( (sal_Unicode)' '
) != -1 )
+rtl::OUString args[ 3 ];
+int argsCount = 0;
+sal_uInt32 n = rtl_getAppCommandArgCount();
+// skip first, that's the module name
+for (sal_uInt32 i = 1; i n; ++i)
{
-sal_Int32 nFirstSpacePoint = aStringForward.indexOf( (sal_Unicode)' '
);;
-sal_Int32 nLastSpacePoint = aStringForward.lastIndexOf( (sal_Unicode)'
' );;
-if ( nFirstSpacePoint == nLastSpacePoint )
-/// only forwarded two parameters, username and password.
+rtl::OUString arg;
+rtl_getAppCommandArg(i, arg.pData);
+if( !arg.isEmpty() arg[ 0 ] == '-' )
+continue;
+if( argsCount = 3 )
{
-aLogonUser = aStringForward.copy( 0, nFirstSpacePoint );
-t_print(\n#Forwarded username: );
-printUString( aLogonUser);
-
-aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1,
aStringForward.getLength( ) - 1 );
-t_print(#Forwarded password: );
-for (int i = nFirstSpacePoint+1; i =
aStringForward.getLength()-1; ++i)
-t_print(*);
-t_print(\n );
-}
-else
-/// forwarded three parameters, username, password and fileserver.
-{
-aLogonUser = aStringForward.copy( 0, nFirstSpacePoint );
-t_print(#Forwarded username: );
-printUString( aLogonUser);
-
-aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1,
nLastSpacePoint );
-t_print(#Forwarded password: );
-for (int i = nFirstSpacePoint+1; i = nLastSpacePoint; ++i)
-t_print(*);
-t_print(\n );
-
-aFileServer = aStringForward.copy( nLastSpacePoint +1,
aStringForward.getLength( ) - 1 );
-t_print(#Forwarded FileServer: );
-printUString( aFileServer );
-
+SAL_WARN( sal, Too many test arguments );
+continue;
}
+args[ argsCount++ ] = arg;
+}
+/// only forwarded two parameters, username and password.
+if( argsCount == 2 )
+{
+aLogonUser = args[ 0 ];
+t_print(\n#Forwarded username: );
+printUString( aLogonUser);
+
+aLogonPasswd = args[ 1 ];
+t_print(#Forwarded password: );
+for (int i = 0; i aLogonPasswd.getLength(); ++i)
+t_print(*);
+t_print(\n );
+}
+else if( argsCount == 3 )
+/// forwarded three parameters, username, password and fileserver.
+{
+aLogonUser = args[ 0
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - fpicker/source
fpicker/source/unx/kde4/KDE4FilePicker.cxx |4 1 file changed, 4 insertions(+) New commits: commit 14dfa9de27ddab9bb0bbe64e6c0a4b5e4caab742 Author: David Tardon dtar...@redhat.com Date: Thu Mar 8 14:15:09 2012 +0100 yet another clash with macro name Signed-off-by: Tomas Chvatal tchva...@suse.cz diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx index 69be3b1..9c3ded3 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx @@ -60,6 +60,8 @@ #undef SETTINGS_MOUSE #define LO_SETTINGS_LOCALE SETTINGS_LOCALE #undef SETTINGS_LOCALE +#define LO_SETTINGS_STYLE SETTINGS_STYLE +#undef SETTINGS_STYLE #include kfiledialog.h #include kwindowsystem.h @@ -77,6 +79,8 @@ #undef LO_SETTINGS_MOUSE #define SETTINGS_LOCALE LO_SETTINGS_LOCALE #undef LO_SETTINGS_LOCALE +#define SETTINGS_STYLE LO_SETTINGS_STYLE +#undef LO_SETTINGS_STYLE using namespace ::com::sun::star; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/plugadapt/salplug.cxx | 16 +---
1 file changed, 5 insertions(+), 11 deletions(-)
New commits:
commit 966981dd77b5e6c091b9e2615a8191353897a9b2
Author: Tomas Chvatal tchva...@suse.cz
Date: Tue Feb 28 21:19:45 2012 +0100
Actually there is no need to have if and elseif with same action.
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index eb9e90c..6bc7d89 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -90,19 +90,13 @@ static SalInstance* tryInstance( const OUString
rModuleBase, bool bForce = fals
* not access the 'gnome_accessibility_module_shutdown'
anymore.
* So make sure libgtk+ co are still mapped into memory when
* atk-bridge's atexit handler gets called.
+ * #i109007# KDE3 seems to have the same problem.
+* And same applies for KDE4.
*/
if(
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(gtk)) ||
-
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(gtk3)) )
-{
-pCloseModule = NULL;
-}
-/*
- * #i109007# KDE3 seems to have the same problem; an atexit
cleanup
- * handler, which cannot be resolved anymore if the plugin is
already unloaded.
-* Same applies for kde4.
- */
-else if(
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(kde)) ||
-
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(kde4)) )
+
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(gtk3)) ||
+ rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(kde))
||
+
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(kde4)) )
{
pCloseModule = NULL;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |4 1 file changed, 4 insertions(+) New commits: commit a43caa76d9da112f40a973911e779fc42c5af3c3 Author: Tomas Chvatal tchva...@suse.cz Date: Tue Nov 29 11:04:16 2011 +0100 Add checking msg for tarball fetching so we know if it is on/off diff --git a/configure.in b/configure.in index 4bb2f1f..d925ba4 100644 --- a/configure.in +++ b/configure.in @@ -2547,8 +2547,12 @@ if test -z $TARFILE_LOCATION; then fi AC_SUBST(TARFILE_LOCATION) +AC_MSG_CHECKING([whether we want to fetch tarballs]) if test z$enable_fetch_external != zno ; then +AC_MSG_RESULT([yes]) DO_FETCH_TARBALLS=YES +else +AC_MSG_RESULT([no]) fi AC_SUBST(DO_FETCH_TARBALLS) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in set_soenv.in
configure.in |1 + set_soenv.in |1 + 2 files changed, 2 insertions(+) New commits: commit b8a2970f24872ee1620f3cc2381055b14484dd63 Author: Tomas Chvatal tchva...@suse.cz Date: Tue Nov 29 13:09:06 2011 +0100 Export DO_FETCH_TARBALLS in set_soenv. diff --git a/configure.in b/configure.in index d925ba4..3e3671f 100644 --- a/configure.in +++ b/configure.in @@ -2553,6 +2553,7 @@ if test z$enable_fetch_external != zno ; then DO_FETCH_TARBALLS=YES else AC_MSG_RESULT([no]) +DO_FETCH_TARBALLS=NO fi AC_SUBST(DO_FETCH_TARBALLS) diff --git a/set_soenv.in b/set_soenv.in index b723e14..10a0937 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1484,6 +1484,7 @@ ToFile( LIBDIR,@LIBDIR@, e ); ToFile( DATADIR, @DATADIR@,e ); ToFile( MANDIR,@MANDIR@, e ); ToFile( DOCDIR,@DOCDIR@, e ); +ToFile( DO_FETCH_TARBALLS, @DO_FETCH_TARBALLS, e ); ToFile( BUILD_MOZAB, @BUILD_MOZAB@,e ); ToFile( PREBUILD_MOZAB,$PREBUILD_MOZAB,e ); ToFile( MOZILLA_VERSION, $MOZILLA_VERSION, e ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: icc/prj icc/source
icc/prj/build.lst |4 ++-- icc/source/create_sRGB_profile/makefile.mk |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit ce2a78b4efe5c62d4aa13109401dc820e3891e71 Author: Tomas Chvatal tchva...@suse.cz Date: Wed Nov 23 17:05:19 2011 +0100 Whitespace and expand comment, drop useless rm. diff --git a/icc/prj/build.lst b/icc/prj/build.lst index 45fbe5a..ac7cf32 100644 --- a/icc/prj/build.lst +++ b/icc/prj/build.lst @@ -1,4 +1,4 @@ -ip icc : solenv external sal NULL +ip icc : solenv external sal NULL ip icc usr1- all ip_mkout NULL ip icc nmake - all ip_icc NULL -ip icc/source/create_sRGB_profile nmake - all ip_profile ip_icc NULL +ip icc/source/create_sRGB_profile nmake - all ip_profile ip_icc NULL diff --git a/icc/source/create_sRGB_profile/makefile.mk b/icc/source/create_sRGB_profile/makefile.mk index d3dc3f9..56a9a67 100644 --- a/icc/source/create_sRGB_profile/makefile.mk +++ b/icc/source/create_sRGB_profile/makefile.mk @@ -68,6 +68,7 @@ APP1STDLIBS=\ -lICC_utils # this library is not in pkgconfig but in the same dir # so no need to cry for it and just hardcode it here +# bug also opened upstream about this .ELSE APP1LIBS=\ $(SLB)$/proflib.lib \ @@ -81,5 +82,4 @@ APP1OBJS= $(OBJFILES) ALLTAR: $(TARGET)$(EXECPOST) $(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST) -rm -rf $@ cd $(BIN)$/ $(BIN)$/$(TARGET)$(EXECPOST) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |5 - 1 file changed, 5 deletions(-) New commits: commit a738b25f7caff2a5ed789668e1ab0bf29bf5082f Author: Tomas Chvatal tchva...@suse.cz Date: Sat Nov 19 00:00:47 2011 +0100 Remove layout from configure opts (does nothing now). diff --git a/configure.in b/configure.in index b50da2e..0043bdb 100644 --- a/configure.in +++ b/configure.in @@ -633,11 +633,6 @@ AC_ARG_ENABLE(static-gtk, instead of the dynamic ones. (Enables -Bstatic linker flag for GTK+ libraries.)]), ,) -AC_ARG_ENABLE(layout, -AS_HELP_STRING([--enable-layout], -[Enable the compilation and use of layout dialogs.]), -,) - AC_ARG_ENABLE(build-mozilla, AS_HELP_STRING([--disable-build-mozilla], [Use this option if you do not want to build the Mozilla components from ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in desktop/unx
configure.in |2 +-
desktop/unx/source/start.c |5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 2264f482e57e989e649934d3980368f2b135d496
Author: Tomas Chvatal tchva...@suse.cz
Date: Tue Nov 15 12:34:12 2011 +0100
Use proper switch for on/of qstart-libpng.
diff --git a/configure.in b/configure.in
index 34400e7..6ae1fbb 100644
--- a/configure.in
+++ b/configure.in
@@ -7013,7 +7013,7 @@ AC_SUBST(LIBPNG_LIBS)
AC_SUBST(LIBPNG_CFLAGS)
AC_MSG_CHECKING([whether to enable libpng linking in quickstarter])
-if test x$enable_unix_libpng = xyes; then
+if test x$unix_qstart_libpng != xno; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
commit 4fe54ea11ed82dd662d0132585c199ec9f3a6c95
Author: Tomas Chvatal tchva...@suse.cz
Date: Tue Nov 15 12:33:49 2011 +0100
Instead of returning out of function just skip its calling.
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 940a997..6152e4c 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -697,9 +697,6 @@ static void extend_library_path (const char *new_element)
static void
exec_javaldx (Args *args)
{
-#ifndef SOLAR_JAVA
-return;
-#endif
char newpath[4096];
sal_uInt32 nArgs;
rtl_uString *pApp;
@@ -858,8 +855,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
exec_pagein (args);
/* javaldx */
+#ifdef SOLAR_JAVA
if (!args-bInhibitJavaLdx)
exec_javaldx (args);
+#endif
do
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bin/distro-install-clean-up bin/distro-install-desktop-integration bin/distro-install-file-lists bin/distro-install-sdk
bin/distro-install-clean-up|2
bin/distro-install-desktop-integration |8 +-
bin/distro-install-file-lists | 130 -
bin/distro-install-sdk | 72 +-
4 files changed, 106 insertions(+), 106 deletions(-)
New commits:
commit 8326efcbb46d423958f5b4bf86941ce30c3639be
Author: Tomas Chvatal tchva...@suse.cz
Date: Mon Nov 14 15:07:15 2011 +0100
Remove basisVERSION from distro scripts as it is not used anymore.
diff --git a/bin/distro-install-clean-up b/bin/distro-install-clean-up
index c18a2c4..98fb546 100755
--- a/bin/distro-install-clean-up
+++ b/bin/distro-install-clean-up
@@ -59,7 +59,7 @@ if test -f $DESTDIR$INSTALLDIR/help/en/sbasic.cfg -a \
fi
echo Fixing permissions...
-for dir in $DESTDIR$DOCDIR
$DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk/examples ; do
+for dir in $DESTDIR$DOCDIR $DESTDIR$INSTALLDIR/sdk/examples ; do
if test -d $dir -a -w $dir ; then
find $dir -type f \( -name *.txt -o -name *.java -o -name *.xml
-o \
-name *.xcu -o -name *.xcs -o -name
*.html -o \
diff --git a/bin/distro-install-desktop-integration
b/bin/distro-install-desktop-integration
index 466a9ad..f988e12 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -182,9 +182,9 @@ if test $WITH_COMPAT_OOWRAPPERS = YES ; then
fi
echo Install $OOINSTDIR/basis$VERSION/program/java-set-classpath;
-mkdir -p $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program
-sed -e s|@INSTALLDIR@|$INSTALLDIR|g bin/java-set-classpath.in |
$DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath || exit 1;
-chmod 755 $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath
-test -f $DESTDIR/gid_Module_Root_Brand echo
$INSTALLDIR/basis$PRODUCTVERSION/program/java-set-classpath
$DESTDIR/gid_Module_Root_Brand
+mkdir -p $DESTDIR$INSTALLDIR/program
+sed -e s|@INSTALLDIR@|$INSTALLDIR|g bin/java-set-classpath.in |
$DESTDIR$INSTALLDIR/program/java-set-classpath || exit 1;
+chmod 755 $DESTDIR$INSTALLDIR/program/java-set-classpath
+test -f $DESTDIR/gid_Module_Root_Brand echo
$INSTALLDIR/program/java-set-classpath $DESTDIR/gid_Module_Root_Brand
exit 0
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index eaabf9c..d00d9ea 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -186,7 +186,7 @@ if test z$OOO_VENDOR != zDebian ; then
if test $OOO_VENDOR = Mandriva -o \( $OOO_VENDOR = Novell,
Inc. -a $SPLIT_APP_MODULES = YES \) ; then
for lang in `echo $WITH_LANG_LIST | sed -e s/-/_/g`; do
test -f $FILELISTSDIR/help_${lang}_list.txt || continue;
-mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt
$FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/basis$PRODUCTVERSION/help/.*
+mv_file_between_flists $FILELISTSDIR/help_${lang}_list.txt
$FILELISTSDIR/lang_${lang}_list.txt $INSTALLDIR/help/.*
add_used_directories $FILELISTSDIR/help_${lang}_list.txt
$FILELISTSDIR/lang_${lang}_list.txt
done
fi
@@ -206,28 +206,28 @@ if test z$OOO_VENDOR != zDebian ; then
# kde subpackage
test -f $DESTDIR/gid_Module_Optional_Kde cp
$DESTDIR/gid_Module_Optional_Kde kde_list.txt || :
mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/program/kdefilepicker
-mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/basis$PRODUCTVERSION/program/fps_kde.uno.so
-mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/basis$PRODUCTVERSION/program/libvclplug_kdel..so
-mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/basis$PRODUCTVERSION/program/libkabdrv1.so
+mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/program/fps_kde.uno.so
+mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/program/libvclplug_kdel..so
+mv_file_between_flists kde_list.txt common_list.txt
$INSTALLDIR/program/libkabdrv1.so
add_used_directories kde_list.txt common_list.txt
# create kde4 subpackage
-mv_file_between_flists kde4_list.txt kde_list.txt
$INSTALLDIR/basis$PRODUCTVERSION/program/kde4be1.uno.so
-mv_file_between_flists kde4_list.txt common_list.txt
$INSTALLDIR/basis$PRODUCTVERSION/program/libvclplug_kde4l..so
-mv_file_between_flists kde4_list.txt common_list.txt
$INSTALLDIR/basis$PRODUCTVERSION/program/fps_kde4.uno.so
+mv_file_between_flists kde4_list.txt kde_list.txt
$INSTALLDIR/program/kde4be1.uno.so
+mv_file_between_flists kde4_list.txt common_list.txt
$INSTALLDIR/program/libvclplug_kde4l..so
+mv_file_between_flists kde4_list.txt common_list.txt
$INSTALLDIR/program/fps_kde4.uno.so
add_used_directories kde4_list.txt common_list.txt
# gnome subpackage
test -f $DESTDIR/gid_Module_Optional_Gnome cp
$DESTDIR/gid_Module_Optional_Gnome
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eb7bd97af519d10fcd1ddd7503d9504ebbbe627f Author: Tomas Chvatal tchva...@suse.cz Date: Fri Nov 11 21:30:39 2011 +0100 convert tab to space diff --git a/configure.in b/configure.in index 3d1830d..9292e14 100644 --- a/configure.in +++ b/configure.in @@ -6165,7 +6165,7 @@ ENABLE_NSPLUGIN=NO if test $enable_nsplugin != no; then if test $enable_gtk != no; then AC_MSG_RESULT([yes]) - ENABLE_NSPLUGIN=YES +ENABLE_NSPLUGIN=YES else AC_MSG_RESULT([no, disabled gtk2]) fi ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ooo.lst.in translate_toolkit/makefile.mk translate_toolkit/prj translate_toolkit/translate-toolkit-1.8.1-skipsource.patch
ooo.lst.in |1 translate_toolkit/makefile.mk | 80 -- translate_toolkit/prj/build.lst|3 translate_toolkit/prj/d.lst| 35 translate_toolkit/translate-toolkit-1.8.1-skipsource.patch | 99 - 5 files changed, 218 deletions(-) New commits: commit 3433ac9b0f350d5cfa86d92239cd41e6c75dbeb1 Author: Tomas Chvatal tchva...@suse.cz Date: Thu Nov 3 16:32:53 2011 +0100 Drop translate_toolkit folder and its internal download. Signed-off-by: Tomas Chvatal tchva...@suse.cz diff --git a/ooo.lst.in b/ooo.lst.in index 223ec9b..5a45936 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -94,7 +94,6 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 @GOOGLE_DOCS_EXTENSION_PACK@ http://dev-www.libreoffice.org/extern 185d60944ea767075d27247c3162b3bc-unowinreg.dll -b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://ooo.itc.hu/oxygenoffice/download/libreoffice/ @OOOP_GALLERY_PACK@ @OOOP_TEMPLATES_PACK@ diff --git a/translate_toolkit/makefile.mk b/translate_toolkit/makefile.mk deleted file mode 100644 index b311001..000 --- a/translate_toolkit/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#* -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the License); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an AS IS basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Petr Mladek pmla...@suse.cz -# Portions created by the Initial Developer are Copyright (C) 2010 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# Ted t...@bear.com -# Portions created by the Ted are Copyright (C) 2010 Ted. All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the GPLv3+), or -# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. -# -#* - -PRJ=. - -PRJNAME=trt -TARGET=trt - -# --- Settings - - -.INCLUDE : settings.mk - -.IF $(SYSTEM_TRANSLATE_TOOLKIT) == YES -@all: - @echo Using system translate toolkit... -.ENDIF - -# --- Python paths -- - -.IF $(SYSTEM_PYTHON) == YES -PY_CMD=$(PYTHON) -.ELSE # $(SYSTEM_PYTHON) == YES -.IF $(OS)==MACOSX -# the framework only gets delivered as zip, so call it from python's output-dir -PY_CMD=$(SRC_ROOT)/python/$(INPATH)/misc/build/python-inst/OOoPython.framework/Versions/2.6/Resources/Python.app/Contents/MacOS/OOoPython -.ELSE -PY_CMD=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/python -# watch for the path delimiter -.IF $(GUI)==WNT -PYTHONPATH:=$(SOLARLIBDIR);$(SOLARLIBDIR)/python;$(SOLARLIBDIR)/python/lib-dynload -.ELSE # $(GUI)==WNT -PYTHONPATH:=$(SOLARLIBDIR):$(SOLARLIBDIR)/python:$(SOLARLIBDIR)/python/lib-dynload -.ENDIF # $(GUI)==WNT -.EXPORT: PYTHONPATH -.ENDIF # $(OS)==MACOSX -.ENDIF # $(SYSTEM_PYTHON) == YES - -# --- Files - -TARFILE_NAME=translate-toolkit-1.8.1 -TARFILE_MD5=b4cae0700aa1c2aef7eb7f345365e6f1 -PATCH_FILES=translate-toolkit-1.8.1-skipsource.patch -BUILD_ACTION=$(PY_CMD) setup.py build -BUILD_DIR= - -# --- Targets -- - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk diff --git a/translate_toolkit/prj/build.lst b/translate_toolkit/prj/build.lst deleted file mode 100644 index f87945c..000 --- a/translate_toolkit/prj/build.lst +++ /dev/null @@ -1,3 +0,0 @@ -trt translate_toolkit : solenv PYTHON:python NULL -trt translate_toolkit usr1- all trt_mkout NULL -trt translate_toolkit nmake - all translate_toolkit NULL diff --git a/translate_toolkit/prj/d.lst b/translate_toolkit/prj/d.lst deleted file mode 100644 index 31d61b0..000 --- a/translate_toolkit/prj/d.lst +++ /dev/null @@ -1,35 +0,0 @@ -mkdir: %_DEST%\bin\translate -mkdir: %_DEST%\bin\translate\convert -mkdir: %_DEST%\bin\translate\filters -mkdir:
[Libreoffice-commits] .: RepositoryExternal.mk
RepositoryExternal.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 75f77e63189607142d0a90047ac04cd415072174 Author: Tomas Chvatal tchva...@suse.cz Date: Wed Nov 2 21:16:53 2011 +0100 One more SYSTEM_MOZILLA to SYSTEM_NSS diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8891d6b..d7ff86f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -828,16 +828,16 @@ $(call gb_LinkTarget_add_libs,$(1), \ endef -ifeq ($(SYSTEM_MOZILLA),YES) +ifeq ($(SYSTEM_NSS),YES) define gb_LinkTarget__use_plc4 $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -$(MOZ_NSS_CFLAGS) \ +$(NSS_CFLAGS) \ ) $(call gb_LinkTarget_add_libs,$(1),\ -$(MOZ_NSS_LIBS) \ +$(NSS_LIBS) \ ) endef ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - vcl/unx
vcl/unx/kde4/main.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit 4c2b93d96689f62c24ebdb2d4e87ac08d51ed53a
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Thu Oct 20 14:41:50 2011 +
let Qt call XInitThreads(), so that it knows it's been called (fdo#40298)
Otherwise QPixmap complains when used outside of the main Qt thread
and resets itself to null pixmap, eventually leading to crashes.
Signed-off-by: Tomáš Chvátal tchva...@suse.cz
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 32561d9..4365ad6 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -54,7 +54,18 @@ extern C {
established, so protect X against itself
*/
if( ! ( pNoXInitThreads *pNoXInitThreads ) )
+{
+#if QT_VERSION = 0x040800
+// let Qt call XInitThreads(), so that also Qt knows it's been used
+// (otherwise QPixmap may warn about threads not being initialized)
+QApplication::setAttribute( Qt::AA_X11InitThreads );
+#else
XInitThreads();
+// just in case somebody builds with old version and then upgrades
Qt,
+// otherwise this is a no-op
+QApplication::setAttribute( static_cast Qt::ApplicationAttribute
( 10 ));
+#endif
+}
#if QT_VERSION 0x05
// Qt 4.x support needs = 4.1.0
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in sal/qa
configure.in | 116 ---
sal/qa/osl/module/osl_Module.cxx | 45 ---
2 files changed, 50 insertions(+), 111 deletions(-)
New commits:
commit 0ca1973c7c97e62c727484ea66adef26fa2f8162
Author: Tomas Chvatal tchva...@suse.cz
Date: Wed Oct 5 13:11:49 2011 +0200
Drop test that require tmp with exec rights.
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index c8fed7d..0a0a37e 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -291,54 +291,9 @@ namespace osl_Module
CPPUNIT_ASSERT_MESSAGE( #test comment#: load function should do
the same thing as constructor with library name.,
sal_True == bRes );
}
-// load lib which is under a CJK directory
-void load_002( )
-{
-#if defined( UNX ) !defined( MACOSX ) !defined( FREEBSD )
-// TODO: Find out why this fails on Mac OS X
-//Can not get a CJK directory already exist, so here create one.
Perhaps reason is encoding problem.
-::rtl::OUString aPidDirURL =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///tmp/)) +
::rtl::OUString::valueOf( ( long )getpid( ) );
-::rtl::OUString aMyDirURL = aPidDirURL + aKname;
-createTestDirectory( aPidDirURL );
-createTestDirectory( aMyDirURL );
-
-::rtl::OUString aDLLURL = aMyDirURL +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/libModule_DLL.so));
-//check if the lib exist.
-//FIXME: if assert condition is false, the case will return, so
the directory will not be clean-up
-CPPUNIT_ASSERT_MESSAGE( #Source file is not exist. please
manually clean-up directory and file under /tmp, ifFileExist( getDllURL( ) )
== sal_True );
-::osl::FileBase::RC nError = ::osl::File::copy( getDllURL( ),
aDLLURL );
-CPPUNIT_ASSERT_MESSAGE( #copy failed. please manually clean-up
directory and file under /tmp, nError == ::osl::FileBase::E_None );
-//ifFileExist returned false but the file exist
-CPPUNIT_ASSERT_MESSAGE( #This file is not exist, copy failed.
please manually clean-up directory and file under /tmp, ifFileExist( aDLLURL )
== sal_True );
-
-//test if can create a normal file
-::rtl::OUString aFileURL = aMyDirURL +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/test_file));
-::osl::File testFile( aFileURL );
-nError = testFile.open( osl_File_OpenFlag_Create );
-CPPUNIT_ASSERT_MESSAGE( #create failed. please manually clean-up
directory and file under /tmp, nError == ::osl::FileBase::E_None );
-CPPUNIT_ASSERT_MESSAGE( #This file is not exist, create failed.
please manually clean-up directory and file under /tmp, ifFileExist( aFileURL
) == sal_True );
-
-//load the copied dll
-::osl::Module aMod( aDLLURL );
-::osl::Module aMod1;
-
-sal_Bool bOK = aMod1.load( aDLLURL );
-bRes = oslModule(aMod) == oslModule(aMod1);
-aMod.unload( );
-aMod1.unload( );
-deleteTestFile( aFileURL );
-deleteTestFile( aDLLURL );
-deleteTestDirectory( aMyDirURL );
-deleteTestDirectory( aPidDirURL );
-
-CPPUNIT_ASSERT_MESSAGE( #test comment#: load lib which is under a
CJK directory.,
-sal_True == bRes bOK == sal_True );
-#endif
-}
SAL_CPPUNIT_TEST_SUITE( load );
CPPUNIT_TEST( load_001 );
-CPPUNIT_TEST( load_002 );
SAL_CPPUNIT_TEST_SUITE_END( );
}; // class load
commit e9cc0d9cabb6df2ec956be026970042cc3dbd70a
Author: Tomas Chvatal tchva...@suse.cz
Date: Tue Oct 4 11:02:22 2011 +0200
Use simpler detection for system/internal libs.
diff --git a/configure.in b/configure.in
index 9ba7653..21a1a5e 100644
--- a/configure.in
+++ b/configure.in
@@ -685,8 +685,8 @@ AC_ARG_WITH(external-thes-dir,
AC_ARG_WITH(system-libs,
AS_HELP_STRING([--with-system-libs],
-[Use libraries already on system -- enables all --with-system-* flags
except
- mozilla, libvisio, libexttextcat and translate-toolkit.]),
+[Use C/C++ libraries already on system -- enables all --with-system-*.
+ Except mozilla libs.]),
,)
AC_ARG_WITH(system-headers,
@@ -698,9 +698,7 @@ AC_ARG_WITH(system-headers,
AC_ARG_WITH(system-jars,
AS_HELP_STRING([--without-system-jars],
-[When building with --with-system-libs, also the needed jars are
expected
- on the system. Use this to disable that (except for the db case where
- --with-system-db *has to* imply using the db.jar from there, too).]),
+[Use Java packages already on system]),
,)
AC_ARG_WITH(system-zlib,
@@ -2280,7 +2278,7 @@ fi
dnl Set the ENABLE_WERROR variable. (Activate
[Libreoffice-commits] .: configure.in
configure.in |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 25c27aae73f09759f7d6d874c54c6071e21d0c42 Author: Tomas Chvatal tchva...@suse.cz Date: Wed Oct 5 15:27:58 2011 +0200 Add libexttextcat and libvisio under system-libs switch diff --git a/configure.in b/configure.in index 9ba7653..84ae9d6 100644 --- a/configure.in +++ b/configure.in @@ -4610,7 +4610,8 @@ dnl === dnl Check for system libvisio dnl === AC_MSG_CHECKING([which libvisio to use]) -if test -n $with_system_libvisio -a $with_system_libvisio = yes; then +if test -n $with_system_libvisio -o -n $with_system_libs \ +test $with_system_libvisio != no; then AC_MSG_RESULT([external]) SYSTEM_LIBVISIO=YES PKG_CHECK_MODULES( VISIO, libvisio-0.0 ) @@ -6494,7 +6495,8 @@ dnl === dnl Checking for libexttextcat dnl === AC_MSG_CHECKING([which libexttextcat to use]) -if test x$with_system_libexttextcat = xyes; then +if test -n $with_system_libexttextcat -o -n $with_system_libs \ +test $with_system_libexttextcat != no; then AC_MSG_RESULT([external]) SYSTEM_LIBEXTTEXTCAT=YES PKG_CHECK_MODULES([LIBEXTTEXTCAT], [libexttextcat]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in .gitignore
.gitignore |3 +++ configure.in |5 + 2 files changed, 8 insertions(+) New commits: commit 721bc1b42dc88b8bd5ddbfe0b9fdac8dbcb5fd95 Author: Tomas Chvatal tchva...@suse.cz Date: Mon Oct 3 12:16:21 2011 +0200 Add the libcmis switch to known flags. diff --git a/configure.in b/configure.in index 87c8627..49b7185 100644 --- a/configure.in +++ b/configure.in @@ -718,6 +718,11 @@ AC_ARG_WITH(system-expat, [Use expat already on system.]), ,) +AC_ARG_WITH(system-libcmis, +AS_HELP_STRING([--with-system-libcmis], +[Use libcmis already on system.]), +,) + AC_ARG_WITH(system-libvisio, AS_HELP_STRING([--with-system-libvisio], [Use libvisio already on system.]), commit b6d2ac014889f628942f1ffd32bb093421326298 Author: Tomas Chvatal tchva...@suse.cz Date: Mon Oct 3 12:15:18 2011 +0200 Add pspfontcache to gitignore. diff --git a/.gitignore b/.gitignore index f42c00a..8c0f62a 100644 --- a/.gitignore +++ b/.gitignore @@ -96,5 +96,8 @@ /solenv/gdb/libreoffice/*.py[co] /solenv/gdb/libreoffice/util/*.py[co] +# test output files +test/user-template/user/psprint/pspfontcache + # MSVC debug information /*/vc90.pdb ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - configure.in
configure.in | 10 ++ 1 file changed, 10 insertions(+) New commits: commit 72a5f87cb3f0a367f1cd6a5cc15101acc83396fe Author: Rene Engelhard r...@debian.org Date: Wed Sep 28 20:40:07 2011 + make configure check for cpp/poppler-version.h diff --git a/configure.in b/configure.in index c5ea30e..3402424 100755 --- a/configure.in +++ b/configure.in @@ -6371,6 +6371,16 @@ AS_IF([test x$enable_ext_pdfimport = xyes], [ AC_MSG_RESULT([external]) SYSTEM_POPPLER=YES PKG_CHECK_MODULES( POPPLER, poppler = 0.8.0 ) + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + save_CPPFLAGS=$CPPFLAGS + CXXFLAGS=$CXXFLAGS $POPPLER_CFLAGS + CPPFLAGS=$CPPFLAGS $POPPLER_CFLAGS + AC_CHECK_HEADER([cpp/poppler-version.h], [], + [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], []) + CXXFLAGS=$save_CXXFLAGS + CPPFLAGS=$save_CPPFLAGS + AC_LANG_POP([C++]) else AC_MSG_RESULT([internal]) SYSTEM_POPPLER=NO ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 3 commits - sdext/source
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |8
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 13 -
2 files changed, 20 insertions(+), 1 deletion(-)
New commits:
commit a9cc06fa45d4cd9547f40a9869c64c912b821b42
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Sep 21 15:13:25 2011 +
build without glib poppler bindings
- there's not configure check for it, only for poppler itself
- and it's not actually used anyway
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 8a1708c..2f8d717 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -68,7 +68,11 @@ class PDFDoc;
#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
typedef GString GooString;
#else
-#include glib/poppler-features.h
+#include cpp/poppler-version.h
+#define POPPLER_CHECK_VERSION(major,minor,micro) \
+ (POPPLER_VERSION_MAJOR (major) || \
+ (POPPLER_VERSION_MAJOR == (major) POPPLER_VERSION_MINOR (minor)) || \
+ (POPPLER_VERSION_MAJOR == (major) POPPLER_VERSION_MINOR == (minor)
POPPLER_VERSION_MICRO = (micro)))
#endif
namespace pdfi
commit 9540db43f3f1b11d3407a45aefda235d7e78f76b
Author: Caolán McNamara caol...@redhat.com
Date: Fri Sep 2 12:15:49 2011 +
Resolves: rhbz#735182 libreoffice doesn't build with poppler-0.17.3
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 5022dd5..bd6d721 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -150,7 +150,11 @@ void writeBinaryBuffer( const OutputBuffer rBuffer )
void writeJpeg_( OutputBuffer o_rOutputBuf, Stream* str, bool bWithLinefeed )
{
// dump JPEG file as-is
+#if POPPLER_CHECK_VERSION(0, 17, 3)
+str = str-getBaseStream();
+#else
str = ((DCTStream *)str)-getRawStream();
+#endif
str-reset();
int c;
@@ -490,7 +494,7 @@ void PDFOutDev::endPage()
}
#if POPPLER_CHECK_VERSION(0, 17, 0)
-void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
+void PDFOutDev::processLink(AnnotLink *link, Catalog *)
#else
void PDFOutDev::processLink(Link* link, Catalog*)
#endif
commit 53e66aea4c1b3617363fd138a7903190d964da6b
Author: Tomáš Chvátal tchva...@suse.cz
Date: Fri Sep 30 11:51:04 2011 +0200
This is merge of f6f8f67460bba296c49f794d14621b7313df4f7d.
It is not posible to git-am due to merge to core/ repository.
It had one minor collision on pdfioutdev_gpl.hxx.
Orginal header:
From f6f8f67460bba296c49f794d14621b7313df4f7d Mon Sep 17 00:00:00 2001
From: Caolán McNamara caol...@redhat.com
Date: Tue, 19 Jul 2011 07:54:07 +
Subject: poppler 0.17.0 changed its api for no some reason or other
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index f7741b4..5022dd5 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -489,7 +489,11 @@ void PDFOutDev::endPage()
printf(endPage\n);
}
+#if POPPLER_CHECK_VERSION(0, 17, 0)
+void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
+#else
void PDFOutDev::processLink(Link* link, Catalog*)
+#endif
{
assert(link);
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 3ac0f49..8a1708c 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -65,7 +65,10 @@ class GfxPath;
class GfxFont;
class PDFDoc;
#ifndef SYSTEM_POPPLER
+#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
typedef GString GooString;
+#else
+#include glib/poppler-features.h
#endif
namespace pdfi
@@ -193,9 +196,13 @@ namespace pdfi
// Convert between device and user coordinates.
// virtual void cvtDevToUser(double dx, double dy, double *ux, double
*uy);
// virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
-
+
+#if POPPLER_CHECK_VERSION(0, 17, 0)
+virtual void processLink(AnnotLink *link, Catalog *catalog);
+#else
//- link borders
virtual void processLink(Link *link, Catalog *catalog);
+#endif
//- save/restore graphics state
virtual void saveState(GfxState *state);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/doc/docsort.cxx |5 +++--
sw/source/ui/app/docshini.cxx |4 ++--
sw/source/ui/dbui/dbinsdlg.cxx |6 +++---
sw/source/ui/index/cnttab.cxx |2 +-
sw/source/ui/misc/srtdlg.cxx |3 ++-
5 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit db3a8faba14e89be39df5fb98f5535c1ca295f62
Author: Tomas Chvatal tchva...@suse.cz
Date: Thu Sep 29 15:14:34 2011 +0200
Solve more ambiguous issues with Locale from sun::star.. and icu::.
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index d76dcec..518860f 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -59,12 +59,13 @@
#include unochart.hxx
using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star;
SwSortOptions* SwSortElement::pOptions = 0;
SwDoc* SwSortElement::pDoc = 0;
const FlatFndBox* SwSortElement::pBox = 0;
CollatorWrapper*SwSortElement::pSortCollator = 0;
-com::sun::star::lang::Locale* SwSortElement::pLocale = 0;
+lang::Locale* SwSortElement::pLocale = 0;
String* SwSortElement::pLastAlgorithm = 0;
LocaleDataWrapper* SwSortElement::pLclData = 0;
@@ -89,7 +90,7 @@ void SwSortElement::Init( SwDoc* pD, const SwSortOptions
rOpt,
nLang = (LanguageType)GetAppLanguage();
break;
}
-pLocale = new Locale( SvxCreateLocale( nLang ) );
+pLocale = new lang::Locale( SvxCreateLocale( nLang ) );
pSortCollator = new CollatorWrapper(
::comphelper::getProcessServiceFactory() );
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 5c43206..350cf74 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -135,10 +135,10 @@ sal_Bool SwDocShell::InitNew( const uno::Reference
embed::XStorage xStor )
// set forbidden characters if necessary
SvxAsianConfig aAsian;
-SequenceLocale aLocales = aAsian.GetStartEndCharLocales();
+Sequencelang::Locale aLocales = aAsian.GetStartEndCharLocales();
if(aLocales.getLength())
{
-const com::sun::star::lang::Locale* pLocales =
aLocales.getConstArray();
+const lang::Locale* pLocales = aLocales.getConstArray();
for(sal_Int32 i = 0; i aLocales.getLength(); i++)
{
ForbiddenCharacters aForbidden;
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 33a053b..e059ab1 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -275,7 +275,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView
rView,
if(xColSupp.is())
{
SwWrtShell rSh = pView-GetWrtShell();
-Locale aDocLocale( SvxCreateLocale( rSh.GetCurLang() ));
+lang::Locale aDocLocale( SvxCreateLocale( rSh.GetCurLang() ));
SvNumberFormatter* pNumFmtr = rSh.GetNumberFormatter();
SvNumberFormatsSupplierObj* pNumFmt = new SvNumberFormatsSupplierObj(
pNumFmtr );
Reference util::XNumberFormatsSupplier xDocNumFmtsSupplier =
pNumFmt;
@@ -1705,7 +1705,7 @@ void SwInsertDBColAutoPilot::Commit()
if( eLang != ePrevLang )
{
-Locale aLocale;
+lang::Locale aLocale;
aLocale = SvxLanguageToLocale( aLocale, eLang );
(( sPrevLang = aLocale.Country ) += rtl::OUString( '-' )) +=
aLocale.Language;
ePrevLang = eLang;
@@ -1790,7 +1790,7 @@ void SwInsertDBColAutoPilot::Load()
rtl::OUString sNumberFormatLocale;
pSubProps[5] = sNumberFormatLocale;
-Locale aLocale;
+lang::Locale aLocale;
aLocale.Language = sNumberFormatLocale.copy(0, 2);
aLocale.Country = sNumberFormatLocale.copy(3, 2);
pInsDBColumn-eUsrNumFmtLng = SvxLocaleToLanguage( aLocale );
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index d5c2838..9f0f60f 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1516,7 +1516,7 @@ IMPL_LINK(SwTOXSelectTabPage, RadioButtonHdl,
RadioButton*, EMPTYARG )
IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox)
{
-Locale aLcl( SvxCreateLocale( aLanguageLB.GetSelectLanguage() ) );
+lang::Locale aLcl( SvxCreateLocale( aLanguageLB.GetSelectLanguage() ) );
Sequence OUString aSeq = pIndexEntryWrapper-GetAlgorithmList( aLcl );
if( !pIndexRes )
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 8027638..06c15a5 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -83,6 +83,7 @@ static sal_UnicodecDeli = '\t';
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star;
using ::rtl::OUString;
void lcl_ClearLstBoxAndDelUserData( ListBox rLstBox )
@@ -462,7
[Libreoffice-commits] .: configure.in
configure.in | 24 +--- 1 file changed, 13 insertions(+), 11 deletions(-) New commits: commit 8148ad076ca750da8066051a105ab391b9ba8957 Author: Tomas Chvatal tchva...@suse.cz Date: Sun Sep 25 15:03:44 2011 +0200 Update some java checks to check all vars properly. diff --git a/configure.in b/configure.in index 11f4681..8f7ce2f 100755 --- a/configure.in +++ b/configure.in @@ -4410,13 +4410,15 @@ dnl === dnl Check for building stax dnl === AC_MSG_CHECKING([whether to build the stax]) -if test -f ./stax/download/jsr173_1.0_api.jar; then -BUILD_STAX=NO -AC_MSG_RESULT([no, will use the prebuilt stax/download/jsr173_1.0_api.jar]) -else -BUILD_STAX=YES -AC_MSG_RESULT([yes]) -fi +AS_IF([test $with_system_saxon = no -a $with_system_jars = no -a $SOLAR_JAVA != ], [ +if test -f ./stax/download/jsr173_1.0_api.jar; then +BUILD_STAX=NO +AC_MSG_RESULT([no, will use the prebuilt stax/download/jsr173_1.0_api.jar]) +else +BUILD_STAX=YES +AC_MSG_RESULT([yes]) +fi +]) AC_SUBST(BUILD_STAX) dnl === @@ -6374,16 +6376,16 @@ dnl === dnl Checking for libexttextcat dnl === AC_MSG_CHECKING([which libexttextcat to use]) -if test -n $with_system_libexttextcat test $with_system_libexttextcat != no; then +AS_IF([test $with_system_libexttextcat = yes], [ # -o -n $with_system_libs], [ AC_MSG_RESULT([external]) SYSTEM_LIBEXTTEXTCAT=YES PKG_CHECK_MODULES([LIBEXTTEXTCAT], [libexttextcat]) SYSTEM_LIBEXTTEXTCAT_DATA=file://`$PKG_CONFIG --variable=pkgdatadir libexttextcat` -else +], [ AC_MSG_RESULT([internal]) SYSTEM_LIBEXTTEXTCAT=NO BUILD_TYPE=$BUILD_TYPE LIBEXTTEXTCAT -fi +]) AC_SUBST(SYSTEM_LIBEXTTEXTCAT) AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) AC_SUBST(LIBEXTTEXTCAT_CFLAGS) @@ -7086,7 +7088,7 @@ AS_IF([test $enable_ext_report_builder != no -a x$enable_extension_integrat ENABLE_REPORTBUILDER=YES AC_MSG_CHECKING([for reportbuilder module]) AC_MSG_CHECKING([which jfreereport libs to use]) -if test $with_system_jfreereport = yes; then +if test $with_system_jfreereport = yes -o x$with_system_jars = xyes; then SYSTEM_JFREEREPORT=YES AC_MSG_RESULT([external]) if test -z $SAC_JAR; then ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6104b24ff4f9d1921190bb10cd759df7be40597d Author: Tomas Chvatal tchva...@suse.cz Date: Sun Sep 25 17:34:27 2011 +0200 Remove the comment as it confuses the macro expansion. diff --git a/configure.in b/configure.in index 8f7ce2f..ad9c042 100755 --- a/configure.in +++ b/configure.in @@ -6376,7 +6376,7 @@ dnl === dnl Checking for libexttextcat dnl === AC_MSG_CHECKING([which libexttextcat to use]) -AS_IF([test $with_system_libexttextcat = yes], [ # -o -n $with_system_libs], [ +AS_IF([test x$with_system_libexttextcat = xyes], [ AC_MSG_RESULT([external]) SYSTEM_LIBEXTTEXTCAT=YES PKG_CHECK_MODULES([LIBEXTTEXTCAT], [libexttextcat]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in sw/source
configure.in |2 +-
sw/source/core/doc/docsort.cxx |2 +-
sw/source/ui/app/appopt.cxx|2 +-
sw/source/ui/app/docshini.cxx |2 +-
sw/source/ui/dbui/dbmgr.cxx|2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit cddea419b645c11819b9314acb95d8ea8df4fc98
Author: Tomas Chvatal tchva...@suse.cz
Date: Sat Sep 24 18:08:24 2011 +0200
Avoid ambiguous Locale type by specifying full path to sun::star... ; the
other definition is from ICU.
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 6a65b32..d76dcec 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -64,7 +64,7 @@ SwSortOptions* SwSortElement::pOptions = 0;
SwDoc* SwSortElement::pDoc = 0;
const FlatFndBox* SwSortElement::pBox = 0;
CollatorWrapper*SwSortElement::pSortCollator = 0;
-Locale* SwSortElement::pLocale = 0;
+com::sun::star::lang::Locale* SwSortElement::pLocale = 0;
String* SwSortElement::pLastAlgorithm = 0;
LocaleDataWrapper* SwSortElement::pLclData = 0;
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 6ab953e..689e875 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -161,7 +161,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
else
{
SvtLinguConfig aLinguCfg;
-Locale aLocale;
+com::sun::star::lang::Locale aLocale;
LanguageType nLang;
using namespace ::com::sun::star::i18n::ScriptType;
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index f2663d3..5c43206 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -138,7 +138,7 @@ sal_Bool SwDocShell::InitNew( const uno::Reference
embed::XStorage xStor )
SequenceLocale aLocales = aAsian.GetStartEndCharLocales();
if(aLocales.getLength())
{
-const Locale* pLocales = aLocales.getConstArray();
+const com::sun::star::lang::Locale* pLocales =
aLocales.getConstArray();
for(sal_Int32 i = 0; i aLocales.getLength(); i++)
{
ForbiddenCharacters aForbidden;
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 5ee9fca..2bdd83c 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1474,7 +1474,7 @@ sal_uLong SwNewDBMgr::GetColumnFmt( uno::Reference
XDataSource xSource,
uno::Reference XNumberFormats xDocNumberFormats =
xDocNumFmtsSupplier-getNumberFormats();
uno::Reference XNumberFormatTypes
xDocNumberFormatTypes(xDocNumberFormats, UNO_QUERY);
-Locale aLocale( MsLangId::convertLanguageToLocale(
(LanguageType)nLanguage ));
+com::sun::star::lang::Locale aLocale(
MsLangId::convertLanguageToLocale( (LanguageType)nLanguage ));
//get the number formatter of the data source
uno::ReferenceXPropertySet xSourceProps(xSource, UNO_QUERY);
commit 3a8c8537d1c8e03f3587a6823b2f6749b3115c46
Author: Tomas Chvatal tchva...@suse.cz
Date: Thu Sep 22 12:52:40 2011 +0200
For wiki-ext check also java and ext support.
diff --git a/configure.in b/configure.in
index 2359334..11f4681 100755
--- a/configure.in
+++ b/configure.in
@@ -7046,7 +7046,7 @@ if test $ENABLE_PRESENTER_SCREEN = YES -o
$ENABLE_MINIMIZER = YES -o $E
fi
AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
-AS_IF([test x$enable_ext_wiki_publisher = xyes], [
+AS_IF([test x$enable_ext_wiki_publisher = xyes -a -o
x$enable_extension_integration != xno -a $with_java != no], [
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([for swext module])
ENABLE_MEDIAWIKI=YES
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f19e3f1d8b052474a4de87e3518b1b1dac3b400a Author: Tomas Chvatal tchva...@suse.cz Date: Thu Sep 22 12:39:27 2011 +0200 Override internal apache-commons with system-jars. diff --git a/configure.in b/configure.in index 0be1d0e..06d3124 100755 --- a/configure.in +++ b/configure.in @@ -7294,7 +7294,7 @@ AC_SUBST(LIBSERIALIZER_JAR) # commons-logging if test $ENABLE_MEDIAWIKI = YES -o $ENABLE_REPORTBUILDER = YES; then AC_MSG_CHECKING([which Apache commons-* libs to use]) -if test $with_system_apache_commons = yes; then +if test x$with_system_apache_commons = xyes -o x$with_system_jars = xyes; then SYSTEM_APACHE_COMMONS=YES AC_MSG_RESULT([external]) if test $ENABLE_MEDIAWIKI = YES; then ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sdext/source
sdext/source/presenter/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c0022716105b9935ae16d3817191c546d3f8e0da Author: Tomas Chvatal tchva...@suse.cz Date: Sat Sep 17 05:44:43 2011 +0200 Fix install for presenter extension. diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 1a3c052..6427c25 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -288,7 +288,7 @@ $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $ $@ -$(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp +$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp @echo creating $@ @-$(MKDIRHIER) $(@:d) $(TYPE) $ | sed s/PLATFORMID/$(PLATFORMID)/ | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' $@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
