[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-2-26-gd990712
The following commit has been merged in the debian-experimental-3.5 branch:
commit 29cd123c814e66ccb9b2755fe65181e39c89d89a
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 15 10:45:35 2012 +0100
remove some patches applied in 3.5.1
diff --git a/patches/SwTblBoxFormula-destructor.diff b/patches/SwTblBoxFormula-destructor.diff
deleted file mode 100644
index c3b9b69..0000000
--- a/patches/SwTblBoxFormula-destructor.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/sw/inc/cellatr.hxx-old 2012-01-30 13:30:56.000000000 +0100
-+++ b/sw/inc/cellatr.hxx 2012-01-30 13:31:52.000000000 +0100
-@@ -64,6 +64,7 @@
-
- public:
- SwTblBoxFormula( const String& rFormula );
-+ ~SwTblBoxFormula() {};
-
- // "pure virtual methods" of SfxPoolItem
- virtual int operator==( const SfxPoolItem& ) const;
diff --git a/patches/getMIMEDescription-mismatch.diff b/patches/getMIMEDescription-mismatch.diff
deleted file mode 100644
index 2984fc0..0000000
--- a/patches/getMIMEDescription-mismatch.diff
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 4667f0b..28c8790 100644
---- a/configure.in
-+++ b/configure.in
-@@ -6089,6 +6089,7 @@ AC_SUBST(NSS_LIBS)
- dnl ===================================================================
- dnl Check for system mozilla headers
- dnl ===================================================================
-+HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=
- AC_MSG_CHECKING([which mozilla headers to use])
- if test "$with_system_mozilla_headers" = "yes"; then
- AC_MSG_RESULT([external])
-@@ -6103,12 +6104,31 @@ if test "$with_system_mozilla_headers" = "yes"; then
- if test "x$LOCATED" != "xyes"; then
- AC_MSG_ERROR([npapi.h header file not found])
- fi
-+
-+ AC_LANG_PUSH([C])
-+ save_CFLAGS=$CFLAGS
-+ CFLAGS="$CFLAGS $MOZILLA_HEADERS_CFLAGS"
-+ AC_MSG_CHECKING([for NPP_GetMIMEDescription return type])
-+ AC_COMPILE_IFELSE(
-+ [AC_LANG_SOURCE([[
-+ #define XP_UNIX
-+ #include <npapi.h>
-+ const char* NPP_GetMIMEDescription(void) { return "foo"; }
-+ ]])],
-+ [AC_MSG_RESULT([const char*])],
-+ [
-+ AC_MSG_RESULT([char*])
-+ HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=TRUE
-+ ])
-+ CFLAGS=$save_CFLAGS
-+ AC_LANG_POP([C])
- else
- AC_MSG_RESULT([internal])
- SYSTEM_MOZILLA_HEADERS=NO
- fi
- AC_SUBST(MOZILLA_HEADERS_CFLAGS)
- AC_SUBST(SYSTEM_MOZILLA_HEADERS)
-+AC_SUBST(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION)
-
- dnl ===================================================================
- dnl Check for system sane
-diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
-index 5b74764..d3c6fb1 100644
---- a/extensions/source/nsplugin/source/makefile.mk
-+++ b/extensions/source/nsplugin/source/makefile.mk
-@@ -42,6 +42,10 @@ INCPRE+=$(MOZILLA_HEADERS_CFLAGS)
- INCPRE=$(SOLARINCDIR)$/npsdk
- .ENDIF
-
-+.IF "$(HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION)" == "TRUE"
-+CFLAGS += -DHAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=1
-+.ENDIF
-+
- .IF "$(GUI)"=="UNX"
-
- # not sure about -DMOZ_X11 but otheriwse some struct member don't exist...
-diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
-index e25326f..be8ea84 100644
---- a/extensions/source/nsplugin/source/npshell.cxx
-+++ b/extensions/source/nsplugin/source/npshell.cxx
-@@ -361,7 +361,10 @@ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ":odp:OpenDocument Presentation;"
- MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ":otp:OpenDocument Presentation Template;"
- MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ":odf:OpenDocument Formula;" );
-
--char*
-+#ifndef HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION
-+const
-+#endif
-+char*
- NPP_GetMIMEDescription(void)
- {
- debug_fprintf(NSP_LOG_APPEND, "print by Netscape Plugin, NPP_GetMIMEDescription:%s.\n", pMimeTypes);
-diff --git a/set_soenv.in b/set_soenv.in
-index 817693e..3dc9cfa 100755
---- a/set_soenv.in
-+++ b/set_soenv.in
-@@ -1777,6 +1777,7 @@ ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
- ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
- "@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
- ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
-+ToFile( "HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION","@HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION@","e" );
- ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
- ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
- "@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
---- a/np_sdk/inc/npapi.h-old 2012-02-22 07:32:09.000000000 +0000
-+++ a/np_sdk/inc/npapi.h 2012-02-22 07:32:26.000000000 +0000
-@@ -784,7 +784,7 @@
-
- /* NPP_* functions are provided by the plugin and called by the navigator. */
-
--char* NPP_GetMIMEDescription(void);
-+const char* NPP_GetMIMEDescription(void);
- NPError NP_LOADDS NPP_New(NPMIMEType pluginType, NPP instance,
- uint16_t mode, int16_t argc, char* argn[],
- char* argv[], NPSavedData* saved);
diff --git a/patches/ia64-oox-size.diff b/patches/ia64-oox-size.diff
deleted file mode 100644
index 981a2f8..0000000
--- a/patches/ia64-oox-size.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/oox/Library_oox.mk-old 2012-01-31 19:35:02.000000000 +0000
-+++ b/oox/Library_oox.mk 2012-01-27 12:01:14.000000000 +0000
-@@ -40,6 +40,12 @@
- -I$(realpath $(SRCDIR)/oox/inc) \
- ))
-
-+ifeq ($(CPUNAME),IA64)
-+$(eval $(call gb_Library_add_cxxflags,oox,\
-+ -Os \
-+))
-+endif
-+
- $(eval $(call gb_Library_add_defs,oox,\
- -DOOX_DLLIMPLEMENTATION \
- ))
diff --git a/patches/icu-arm.diff b/patches/icu-arm.diff
deleted file mode 100644
index a582083..0000000
--- a/patches/icu-arm.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-From 1e4b46f5f638b0b2cbb40fd048f44e2d16cf7f02 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Fri, 17 Feb 2012 15:37:20 +0100
-Subject: [PATCH 1/3] fix icu build on arm
-
-(from http://patch-tracker.debian.org/patch/series/view/icu/4.4.1-7/arm-assembler.patch)
----
- icu/arm-assembler.patch | 24 ++++++++++++++++++++++++
- icu/makefile.mk | 3 ++-
- 2 files changed, 26 insertions(+), 1 deletions(-)
- create mode 100644 icu/arm-assembler.patch
-
-diff --git a/icu/arm-assembler.patch b/icu/arm-assembler.patch
-new file mode 100644
-index 0000000..752f9ad
---- /dev/null
-+++ b/icu/arm-assembler.patch
-@@ -0,0 +1,24 @@
-+Index: icu-4.4.1/source/tools/toolutil/pkg_genc.c
-+===================================================================
-+--- misc/icu/source/tools/toolutil/pkg_genc.c 2010-04-28 11:27:46.000000000 -0400
-++++ misc/build/icu/source/tools/toolutil/pkg_genc.c 2010-07-17 07:31:54.408752610 -0400
-+@@ -1,5 +1,5 @@
-+ /******************************************************************************
-+- * Copyright (C) 2009, International Business Machines
-++ * Copyright (C) 2009-2010, International Business Machines
-+ * Corporation and others. All Rights Reserved.
-+ *******************************************************************************
-+ */
-+@@ -118,10 +118,10 @@
-+ } assemblyHeader[] = {
-+ {"gcc",
-+ ".globl %s\n"
-+- "\t.section .note.GNU-stack,\"\",@progbits\n"
-++ "\t.section .note.GNU-stack,\"\",%%progbits\n"
-+ "\t.section .rodata\n"
-+ "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
-+- "\t.type %s,@object\n"
-++ "\t.type %s,%%object\n"
-+ "%s:\n\n",
-+
-+ ".long ","",HEX_0X
-diff --git a/icu/makefile.mk b/icu/makefile.mk
-index 02f94a45..872544c 100644
---- a/icu/makefile.mk
-+++ b/icu/makefile.mk
-@@ -53,7 +53,8 @@ PATCH_FILES=\
- icu4c-warnings.patch \
- icu4c-escapespace.patch \
- icu4c-strict-c.patch \
-- CVE-2011-4599.patch
-+ CVE-2011-4599.patch \
-+ arm-assembler.patch
-
- .IF "$(OS)"=="ANDROID"
- PATCH_FILES+=\
---
-1.7.2.5
-
diff --git a/patches/make-gengal-work-again.diff b/patches/make-gengal-work-again.diff
deleted file mode 100644
index 5d57e9a..0000000
--- a/patches/make-gengal-work-again.diff
+++ /dev/null
@@ -1,323 +0,0 @@
-diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
-index 34ed8a9..c872244 100644
---- a/scp2/source/ooo/file_ooo.scp
-+++ b/scp2/source/ooo/file_ooo.scp
-@@ -124,6 +124,28 @@ End
- End
- #endif
-
-+File gid_File_Bin_Gengal
-+ BIN_FILE_BODY;
-+ Dir = gid_Brand_Dir_Program;
-+ Styles = (PACKED);
-+ #ifdef UNX
-+ Name = "gengal.bin";
-+ #else
-+ Name = "gengal.exe";
-+ #endif
-+End
-+
-+#ifdef UNX
-+
-+File gid_File_Script_Gengal
-+ BIN_FILE_BODY;
-+ Dir = gid_Brand_Dir_Program;
-+ Styles = (PACKED);
-+ Name = "gengal";
-+End
-+
-+#endif
-+
- #if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
-
- File gid_File_Bin_Pluginapp
-diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
-new file mode 100644
-index 0000000..36f7752
---- /dev/null
-+++ b/svx/Executable_gengal.bin.mk
-@@ -0,0 +1,80 @@
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+$(eval $(call gb_Executable_Executable,gengal.bin))
-+
-+$(eval $(call gb_Executable_set_include,gengal.bin,\
-+ $$(INCLUDE) \
-+ -I$(SRCDIR)/svx/inc/ \
-+ -I$(SRCDIR)/svx/inc/pch \
-+ -I$(OUTDIR)/inc/offuh \
-+ -I$(OUTDIR)/inc/udkapi \
-+ -I$(OUTDIR)/inc/offapi \
-+))
-+
-+$(eval $(call gb_Executable_add_cxxflags,gengal.bin,\
-+ $$(CXXFLAGS) \
-+))
-+
-+$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
-+ sal \
-+ tl \
-+ svl \
-+ comphelper \
-+ cppu \
-+ cppuhelper \
-+ vcl \
-+ ucbhelper \
-+ svxcore \
-+))
-+
-+$(eval $(call gb_Executable_add_exception_objects,gengal.bin,\
-+ svx/source/gengal/gengal \
-+))
-+
-+$(eval $(call gb_Executable_add_linked_static_libs,gengal.bin,\
-+ vclmain \
-+))
-+
-+ifeq ($(OS),WNT)
-+$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
-+ kernel32 \
-+ msvcrt \
-+ oldnames \
-+ user32 \
-+ uwinapi \
-+))
-+endif
-+
-+ifeq ($(OS),LINUX)
-+$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
-+ dl \
-+ pthread \
-+))
-+endif
-+
-+# vim: set noet sw=4 ts=4:
-diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
-index 9a3091f..43ffc52 100644
---- a/svx/Module_svx.mk
-+++ b/svx/Module_svx.mk
-@@ -38,6 +38,8 @@ $(eval $(call gb_Module_add_targets,svx,\
- AllLangResTarget_textconversiondlgs \
- Package_inc \
- Package_sdi \
-+ Package_gengal \
-+ Executable_gengal.bin \
- ))
-
- $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
-diff --git a/svx/Package_gengal.mk b/svx/Package_gengal.mk
-new file mode 100644
-index 0000000..d5afd59
---- /dev/null
-+++ b/svx/Package_gengal.mk
-@@ -0,0 +1,31 @@
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2011 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+$(eval $(call gb_Package_Package,svx_gengal,$(SRCDIR)/svx/source/gengal))
-+$(eval $(call gb_Package_add_file,svx_gengal,bin/gengal,gengal.sh))
-+
-+# vim: set noet ts=4 sw=4:
-diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
-index 21f687a..fb6e59e8 100644
---- a/svx/source/gengal/gengal.cxx
-+++ b/svx/source/gengal/gengal.cxx
-@@ -67,7 +67,7 @@
- #include <osl/process.h>
- #include <rtl/bootstrap.hxx>
-
--#include <galtheme.hxx>
-+#include <svx/galtheme.hxx>
- #include <svx/gallery1.hxx>
-
- using namespace ::com::sun::star::uno;
-@@ -100,7 +100,7 @@ void disposeGallery( Gallery* pGallery )
- static void createTheme( rtl::OUString aThemeName,
- rtl::OUString aGalleryURL,
- rtl::OUString aDestDir,
-- UINT32 nNumFrom,
-+ sal_uInt32 nNumFrom,
- FileNameList &rFiles )
- {
- Gallery * pGallery( createGallery( aGalleryURL ) );
-@@ -278,10 +278,10 @@ int GalApp::Main()
- bool bHelp = false;
- rtl::OUString aPath, aDestDir;
- rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("Default name"));
-- UINT32 nNumFrom = 0;
-+ sal_uInt32 nNumFrom = 0;
- FileNameList aFiles;
-
-- for( USHORT i = 0; i < GetCommandLineParamCount(); i++ )
-+ for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ )
- {
- rtl::OUString aParam = GetCommandLineParam( i );
-
-diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh
-new file mode 100644
-index 0000000..5173fb4
---- /dev/null
-+++ b/svx/source/gengal/gengal.sh
-@@ -0,0 +1,103 @@
-+#!/bin/sh
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+# enable file locking
-+SAL_ENABLE_FILE_LOCKING=1
-+export SAL_ENABLE_FILE_LOCKING
-+
-+# resolve installation directory
-+sd_cwd="`pwd`"
-+if [ -h "$0" ] ; then
-+ sd_basename=`basename "$0"`
-+ sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
-+ cd "`dirname "$0"`"
-+ cd "`dirname "$sd_script"`"
-+else
-+ cd "`dirname "$0"`"
-+fi
-+
-+sd_prog="`pwd`"
-+
-+cd ..
-+sd_binary=`basename "$0"`".bin"
-+sd_inst="`pwd`"
-+
-+# change back directory
-+cd "$sd_cwd"
-+
-+# check if all required patches are installed
-+if [ -x "$sd_prog/sopatchlevel.sh" ]; then
-+ "$sd_prog/sopatchlevel.sh"
-+ if [ $? -eq 1 ]; then
-+ exit 0
-+ fi
-+fi
-+
-+# set search path for shared libraries
-+sd_platform=`uname -s`
-+sd_prog1="$sd_prog/../basis-link/program"
-+sd_prog2="$sd_prog/../basis-link/ure-link/lib"
-+case $sd_platform in
-+ AIX)
-+ LIBPATH=${sd_prog1}:${sd_prog2}${LIBPATH+:${LIBPATH}}
-+ export LIBPATH
-+ ;;
-+
-+ Darwin)
-+ DYLD_LIBRARY_PATH=${sd_prog1}:${sd_prog2}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
-+ export DYLD_LIBRARY_PATH
-+ ;;
-+
-+ HP-UX)
-+ SHLIB_PATH=${sd_prog1}:${sd_prog2}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}}
-+ export SHLIB_PATH
-+ ;;
-+
-+ *)
-+ LD_LIBRARY_PATH=${sd_prog1}:${sd_prog2}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-+ export LD_LIBRARY_PATH
-+ ;;
-+esac
-+
-+# misc. environment variables
-+unset XENVIRONMENT
-+
-+# set path so that other apps can be started just by name
-+PATH="$sd_prog":$PATH
-+export PATH
-+
-+OOO_INSTALL_PREFIX=${OOO_INSTALL_PREFIX-$sd_prog/../..}
-+if ! test -e $OOO_INSTALL_PREFIX/basis-link; then
-+ # Hack for vanilla OOo binaries' split install layout
-+ OOO_INSTALL_PREFIX=$OOO_INSTALL_PREFIX/../openoffice.org3
-+fi
-+
-+export OOO_INSTALL_PREFIX
-+
-+# execute binary
-+exec "$sd_prog/$sd_binary" "$@"
---- a/Repository.mk-old 2012-02-13 22:35:59.000000000 +0100
-+++ b/Repository.mk 2012-02-13 22:36:16.000000000 +0100
-@@ -74,6 +74,7 @@
- $(eval $(call gb_Helper_register_executables,OOO,\
- soffice.bin \
- unopkg.bin \
-+ gengal.bin \
- ))
-
- ifeq ($(OS),MACOSX)
diff --git a/patches/odk-fix-rdb-paths.diff b/patches/odk-fix-rdb-paths.diff
deleted file mode 100644
index 2453547..0000000
--- a/patches/odk-fix-rdb-paths.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From bcdadc2e9f3f6a400438cbbefffc60bf02baa0f1 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Tue, 14 Feb 2012 09:32:59 +0000
-Subject: Resolves rhbz#789622: Adapt SDK to changed paths in LO installation
-
----
-diff --git a/odk/settings/std.mk b/odk/settings/std.mk
-index 0726631..705b528 100644
---- a/odk/settings/std.mk
-+++ b/odk/settings/std.mk
-@@ -27,8 +27,8 @@ SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag
- URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)"
- URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb)
-
--OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)offapi.rdb)"
--OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)
-+OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types$(PS)offapi.rdb)"
-+OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb)
-
- OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
-
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/passwordTest-test-old-password-algorith-too.diff b/patches/passwordTest-test-old-password-algorith-too.diff
deleted file mode 100644
index da040cf..0000000
--- a/patches/passwordTest-test-old-password-algorith-too.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-From 8f82bccf26d14d3ad4a64739edd9ba23c124b8ad Mon Sep 17 00:00:00 2001
-From: Markus Mohrhard <markus.mohrhard@googlemail.com>
-Date: Tue, 21 Feb 2012 08:30:26 +0000
-Subject: add test case for old password algorithm, related fdo#45171
-
----
-diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
-index 9916584..3b46a91 100644
---- a/sc/qa/unit/subsequent_filters-test.cxx
-+++ b/sc/qa/unit/subsequent_filters-test.cxx
-@@ -171,7 +171,9 @@ public:
- void testBugFixesXLSX();
-
- //misc tests unrelated to the import filters
-- void testPassword();
-+ void testPasswordNew();
-+ void testPasswordOld();
-+
-
- CPPUNIT_TEST_SUITE(ScFiltersTest);
- CPPUNIT_TEST(testRangeName);
-@@ -185,7 +187,8 @@ public:
- //disable testPassword on MacOSX due to problems with libsqlite3
- //also crashes on DragonFly due to problems with nss/nspr headers
- #if !defined(MACOSX) && !defined(DRAGONFLY)
-- CPPUNIT_TEST(testPassword);
-+ CPPUNIT_TEST(testPasswordOld);
-+ CPPUNIT_TEST(testPasswordNew);
- #endif
-
- #if TEST_BUG_FILES
-@@ -196,6 +199,7 @@ public:
- CPPUNIT_TEST_SUITE_END();
-
- private:
-+ void testPassword_Impl(const rtl::OUString& rFileNameBase);
- uno::Reference<uno::XInterface> m_xCalcComponent;
- ::rtl::OUString m_aBaseString;
- };
-@@ -544,15 +548,13 @@ void ScFiltersTest::testBugFixesXLSX()
- xDocSh->DoClose();
- }
-
--void ScFiltersTest::testPassword()
-+void ScFiltersTest::testPassword_Impl(const rtl::OUString& aFileNameBase)
- {
-- const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("password."));
- rtl::OUString aFileExtension(aFileFormats[0].pName, strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 );
- rtl::OUString aFilterName(aFileFormats[0].pFilterName, strlen(aFileFormats[0].pFilterName), RTL_TEXTENCODING_UTF8) ;
- rtl::OUString aFileName;
- createFileURL(aFileNameBase, aFileExtension, aFileName);
- rtl::OUString aFilterType(aFileFormats[0].pTypeName, strlen(aFileFormats[0].pTypeName), RTL_TEXTENCODING_UTF8);
-- std::cout << aFileFormats[0].pName << " Test" << std::endl;
-
- sal_uInt32 nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS;
- SfxFilter* aFilter = new SfxFilter(
-@@ -577,6 +579,21 @@ void ScFiltersTest::testPassword()
- ScDocument* pDoc = xDocSh->GetDocument();
- CPPUNIT_ASSERT_MESSAGE("No Document", pDoc); //remove with first test
- xDocSh->DoClose();
-+
-+}
-+
-+void ScFiltersTest::testPasswordNew()
-+{
-+ //tests opening a file with new password algorithm
-+ const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("password."));
-+ testPassword_Impl(aFileNameBase);
-+}
-+
-+void ScFiltersTest::testPasswordOld()
-+{
-+ //tests opening a file with old password algorithm
-+ const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("passwordOld."));
-+ testPassword_Impl(aFileNameBase);
- }
-
- ScFiltersTest::ScFiltersTest()
diff --git a/patches/series b/patches/series
index 94b7b60..1c194b2 100644
--- a/patches/series
+++ b/patches/series
@@ -6,11 +6,9 @@ split-binfilters-and-evo.diff
debian-debug.diff
rhino-build-optional.diff
disable-dynamic-list-cpp.diff
-make-gengal-work-again.diff
fix-system-lpsolve-build.diff
install-fixes.diff
smoketest-only-en-US.diff
-getMIMEDescription-mismatch.diff
mention-java-common-package.diff
help-msg-add-package-info.diff
sensible-lomua.diff
@@ -25,15 +23,10 @@ fix-ARM-detection-in-set-soenv.diff
add-debian-multiarch-support.diff
propagate-gb_FULLDEPS.diff
disable-sc-sw-unoapi-subsequentcheck-for-now.diff
-SwTblBoxFormula-destructor.diff
-ia64-oox-size.diff
mediwiki-oor-replace.diff
no-rcX-in-final.diff
-odk-fix-rdb-paths.diff
armhf-bridges.diff
armhf-bridges-fix-armv4t-armel.diff
-icu-arm.diff
move-binfilter-mimetypes-in-extra-desktop-file.diff
-passwordTest-test-old-password-algorith-too.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
armhf-bridges-doubles.diff
--
LibreOffice packaging repository
Reply to: