diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2013-03-08 19:01:45 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2013-03-08 19:01:45 +0000 |
| commit | e835d5453f8e095714c889f749ec1c59bc494b57 (patch) | |
| tree | c3a8dfbb7b453eae4ea04c747142498cf1a163a0 /editors/libreoffice/files | |
| parent | 76db5d5e93d647fd96a6c5c5ebe39a407de68ff2 (diff) | |
Notes
Diffstat (limited to 'editors/libreoffice/files')
55 files changed, 240 insertions, 873 deletions
diff --git a/editors/libreoffice/files/disable-cppunittester b/editors/libreoffice/files/disable-cppunittester index 5af65b0f4b87..6cb4d3934ae1 100644 --- a/editors/libreoffice/files/disable-cppunittester +++ b/editors/libreoffice/files/disable-cppunittester @@ -1,6 +1,6 @@ ---- ./sal/cppunittester/cppunittester.cxx.orig 2013-02-01 15:06:04.000000000 -0500 -+++ ./sal/cppunittester/cppunittester.cxx 2013-02-01 16:35:44.000000000 -0500 -@@ -172,6 +172,7 @@ +--- ./sal/cppunittester/cppunittester.cxx.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./sal/cppunittester/cppunittester.cxx 2013-02-18 18:38:28.000000000 -0500 +@@ -167,6 +167,7 @@ } SAL_IMPLEMENT_MAIN() { diff --git a/editors/libreoffice/files/patch-RepositoryExternal.mk b/editors/libreoffice/files/patch-RepositoryExternal.mk deleted file mode 100644 index 26de1d923dc2..000000000000 --- a/editors/libreoffice/files/patch-RepositoryExternal.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ./RepositoryExternal.mk.orig 2013-02-01 13:12:08.000000000 -0500 -+++ ./RepositoryExternal.mk 2013-02-01 13:37:47.000000000 -0500 -@@ -1056,7 +1056,7 @@ - ) - - $(call gb_LinkTarget_add_libs,$(1),\ -- -l$(DB_LIB) \ -+ $(DB_LIB) \ - ) - - endef diff --git a/editors/libreoffice/files/patch-bin__distro-install-desktop-integration b/editors/libreoffice/files/patch-bin__distro-install-desktop-integration index 8c9bed5368e8..f8d0ba376383 100644 --- a/editors/libreoffice/files/patch-bin__distro-install-desktop-integration +++ b/editors/libreoffice/files/patch-bin__distro-install-desktop-integration @@ -1,6 +1,6 @@ ---- ./bin/distro-install-desktop-integration.orig 2012-03-27 18:22:01.000000000 +0200 -+++ ./bin/distro-install-desktop-integration 2012-04-23 19:17:27.574712717 +0200 -@@ -91,13 +91,13 @@ +--- ./bin/distro-install-desktop-integration.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./bin/distro-install-desktop-integration 2013-02-18 18:38:28.000000000 -0500 +@@ -94,13 +94,13 @@ } # install desktop integration from plain packages @@ -17,7 +17,7 @@ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -111,16 +111,17 @@ +@@ -114,16 +114,17 @@ export PRODUCTVERSION= export KDEMAINDIR=$PREFIXDIR export GNOMEDIR=$PREFIXDIR @@ -38,7 +38,7 @@ if test -d $DESTDIR/opt ; then rm -f $DESTDIR/opt/$INSTALLDIRNAME rmdir --ignore-fail-on-non-empty $DESTDIR/opt -@@ -129,7 +130,7 @@ +@@ -132,7 +133,7 @@ # we want non-versioned desktop files cd $DESTDIR/$INSTALLDIR/share/xdg # we want non-versioned stuff in the distro packages @@ -47,7 +47,7 @@ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -144,7 +145,7 @@ +@@ -147,7 +148,7 @@ $PREFIXDIR/share/mime/packages \ $PREFIXDIR/share/mime-info \ $PREFIXDIR/share/icons ; do diff --git a/editors/libreoffice/files/patch-bridges__Library_gcc3_linux_intel.mk b/editors/libreoffice/files/patch-bridges__Library_gcc3_linux_intel.mk new file mode 100644 index 000000000000..16ff470bc36e --- /dev/null +++ b/editors/libreoffice/files/patch-bridges__Library_gcc3_linux_intel.mk @@ -0,0 +1,11 @@ +--- ./bridges/Library_gcc3_linux_intel.mk.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./bridges/Library_gcc3_linux_intel.mk 2013-02-19 20:22:56.000000000 -0500 +@@ -39,7 +39,7 @@ + ) \ + )) + +-ifneq ($(OS),ANDROID) ++ifeq ($(filter ANDROID DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) + $(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ + )) diff --git a/editors/libreoffice/files/patch-bridges__Library_gcc3_linux_x86-64.mk b/editors/libreoffice/files/patch-bridges__Library_gcc3_linux_x86-64.mk new file mode 100644 index 000000000000..78bd6be6ad51 --- /dev/null +++ b/editors/libreoffice/files/patch-bridges__Library_gcc3_linux_x86-64.mk @@ -0,0 +1,14 @@ +--- ./bridges/Library_gcc3_linux_x86-64.mk.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./bridges/Library_gcc3_linux_x86-64.mk 2013-02-19 17:34:24.000000000 -0500 +@@ -41,9 +41,11 @@ + ) \ + )) + ++ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) + $(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ + )) ++endif + + $(eval $(call gb_Library_use_libraries,gcc3_uno,\ + cppu \ diff --git a/editors/libreoffice/files/patch-configure.ac b/editors/libreoffice/files/patch-configure.ac new file mode 100644 index 000000000000..0475e315d9af --- /dev/null +++ b/editors/libreoffice/files/patch-configure.ac @@ -0,0 +1,84 @@ +--- ./configure.ac.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./configure.ac 2013-02-18 18:14:20.000000000 -0500 +@@ -3588,7 +3588,7 @@ + PLATFORMID=freebsd_x86 + OUTPATH=unxfbsdi + ;; +- x86_64) ++ amd64|x86_64) + CPU=X + CPUNAME=X86_64 + RTL_ARCH=X86_64 +@@ -6200,21 +6200,13 @@ + JAVA_ARCH="i386" + JAVA_TOOLKIT="client" + ;; +- x86_64) +- if test "`echo $JAVA_HOME | sed -e 's,.*/,,'`" = "linux"; then +- JAVA_ARCH="i386" +- JAVA_TOOLKIT="client" +- else +- JAVA_ARCH="amd64" +- JAVA_TOOLKIT="server" +- fi ++ amd64|x86_64) ++ JAVA_ARCH="amd64" ++ JAVA_TOOLKIT="server" + ;; + esac + SOLARINC="$SOLARINC -I$JAVA_HOME/include" + SOLARINC="$SOLARINC -I$JAVA_HOME/include/freebsd" +- SOLARINC="$SOLARINC -I$JAVA_HOME/include/bsd" +- SOLARINC="$SOLARINC -I$JAVA_HOME/include/linux" +- SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include" + ;; + + k*bsd*-gnu*) +@@ -7861,9 +7853,13 @@ + AC_MSG_CHECKING([which hash container mdds shall use]) + if test "x$HAVE_CXX0X" = "xTRUE"; then + MDDS_CPPFLAGS="-std=gnu++0x" ++ else ++ MDDS_CPPFLAGS="-std=gnu++98" ++ fi ++ if test "x`basename $GXX_INCLUDE_PATH 2>/dev/null`" != "x4.2"; then + AC_MSG_RESULT([std::unordered_map]) + else +- MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST" ++ MDDS_CPPFLAGS="$MDDS_CPPFLAGS -DMDDS_HASH_CONTAINER_BOOST" + AC_MSG_RESULT([boost::unordered_map]) + fi + +@@ -8230,7 +8226,7 @@ + dnl =================================================================== + + AC_MSG_CHECKING([whether to enable graphite support]) +-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "$enable_graphite" = "" -o "$enable_graphite" != "no"; then ++if test "$_os" = "WINNT" -o "$_os" = "Linux" -o "$_os" = "FreeBSD" && test "$enable_graphite" = "" -o "$enable_graphite" != "no"; then + AC_MSG_RESULT([yes]) + ENABLE_GRAPHITE="TRUE" + AC_MSG_CHECKING([which graphite to use]) +@@ -8482,8 +8478,8 @@ + AC_MSG_RESULT([external]) + # Mac OS builds should get out without extra stuff is the Mac porters' + # wish. And pkg-config is although Xcode ships a .pc for openssl +- if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \ +- "$_os" = "DragonFly"; then ++ if test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \ ++ "$_os" = "OpenBSD" -o "$_os" = "DragonFly"; then + OPENSSL_CFLAGS= + OPENSSL_LIBS="-lssl -lcrypto" + else +@@ -10325,10 +10321,10 @@ + + dnl Check for Meta Object Compiler + +- AC_PATH_PROG( MOCQT4, moc-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] ) ++ AC_PATH_PROG( MOCQT4, moc-qt4, no, [$QT4DIR/bin:$PATH] ) + MOC4="$MOCQT4" + if test "$MOC4" = "no"; then +- AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] ) ++ AC_PATH_PROG( MOC4, moc, no, [$QT4DIR/bin:$PATH] ) + if test "$MOC4" = "no"; then + AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify + the root of your Qt installation by exporting QT4DIR before running "configure".]) diff --git a/editors/libreoffice/files/patch-configure.in b/editors/libreoffice/files/patch-configure.in deleted file mode 100644 index 3711257a4e88..000000000000 --- a/editors/libreoffice/files/patch-configure.in +++ /dev/null @@ -1,164 +0,0 @@ ---- ./configure.in.orig 2013-02-06 19:18:52.000000000 -0500 -+++ ./configure.in 2013-02-06 19:22:43.000000000 -0500 -@@ -2115,7 +2115,7 @@ - AC_SUBST(GNUTAR) - - AC_MSG_CHECKING([for tar's option to strip components]) --$GNUTAR --help 2> /dev/null | egrep "strip-components" 2>&1 >/dev/null -+$GNUTAR --help 2> /dev/null | egrep "bsdtar|strip-components" 2>&1 >/dev/null - if test $? -eq 0; then - STRIP_COMPONENTS="--strip-components" - else -@@ -3121,7 +3121,7 @@ - RTL_ARCH=x86 - OUTPATH=unxfbsdi - ;; -- x86_64) -+ amd64|x86_64) - CPU=X - CPUNAME=X86_64 - RTL_ARCH=X86_64 -@@ -5561,21 +5561,13 @@ - JAVA_ARCH="i386" - JAVA_TOOLKIT="client" - ;; -- x86_64) -- if test "`echo $JAVA_HOME | sed -e 's,.*/,,'`" = "linux"; then -- JAVA_ARCH="i386" -- JAVA_TOOLKIT="client" -- else -- JAVA_ARCH="amd64" -- JAVA_TOOLKIT="server" -- fi -+ amd64|x86_64) -+ JAVA_ARCH="amd64" -+ JAVA_TOOLKIT="server" - ;; - esac - SOLARINC="$SOLARINC -I$JAVA_HOME/include" - SOLARINC="$SOLARINC -I$JAVA_HOME/include/freebsd" -- SOLARINC="$SOLARINC -I$JAVA_HOME/include/bsd" -- SOLARINC="$SOLARINC -I$JAVA_HOME/include/linux" -- SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include" - ;; - - k*bsd*-gnu*) -@@ -6719,51 +6711,11 @@ - dnl =================================================================== - AC_MSG_CHECKING([which db to use]) - if test "$with_system_db" = "yes"; then -- SYSTEM_DB=YES - AC_MSG_RESULT([external]) -- -- db_header= -- for dbver in 5.3 5.1 5.0 5 4.8 4.7 4; do -- for dash in - ''; do -- AC_CHECK_HEADER([db$dash$dbver/db.h], -- [ db_header="db$dash$dbver/db.h"; break 2 ]) -- done -- done -- -- if test -z "$db_header"; then -- AC_CHECK_HEADER([db/db.h], [db_header='db/db.h'; dbver='']) -- fi -- -- if test -z "$db_header"; then -- AC_CHECK_HEADER(db.h, [ db_header='db.h'; dbver='' ]) -- fi -- -- if test -z "$db_header"; then -- AC_MSG_ERROR([db.h not found. Use the correct -I flag, or install the Berkeley db development package.]) -- fi -- -- AC_MSG_CHECKING([whether db is at least 4.1]) -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <$db_header>]], [[int array[(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1))-1];]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([no. you need at least db 4.1])]) -- -- SYSTEM_DB_CFLAGS="-DSYSTEM_DB_HEADER='<$db_header>'" -- -- DB_LIB= -- dnl At least on OpenBSD dbver is not appended to the library -- if test "$_os" = "OpenBSD"; then -- dbver='' -- fi -- for dash in - ''; do -- AC_CHECK_LIB(db$dash$dbver, dbopen, -- [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ]) -- AC_CHECK_LIB(db$dash$dbver, __db185_open, -- [ DB_LIB="db$dash$dbver"; DB_CPPLIB="db_cxx$dash$dbver"; break ]) -- done -- -- if test -z "$DB_LIB"; then -- AC_MSG_ERROR([db library not found. Use the correct -L flag, --or install the Berkeley db development package.]) -- fi -- -+ SYSTEM_DB=YES -+ SYSTEM_DB_CFLAGS="-DSYSTEM_DB_HEADER='<db.h>' -I$BDB_INCLUDE_DIR" -+ DB_LIB="-L$BDB_LIB_DIR -l$BDB_LIB_NAME" -+ DB_CPPLIB="-L$BDB_LIB_DIR -l$BDB_LIB_CXX_NAME" - SCPDEFS="$SCPDEFS -DSYSTEM_DB" - libo_MINGW_CHECK_DLL([DB], [libdb]) - elif test $_os != iOS -a $_os != Android; then -@@ -7347,9 +7299,13 @@ - AC_MSG_CHECKING([which hash container mdds shall use]) - if test "x$HAVE_CXX0X" = "xTRUE"; then - MDDS_CPPFLAGS="-std=gnu++0x" -+ else -+ MDDS_CPPFLAGS="-std=gnu++98" -+ fi -+ if test "x`basename $GXX_INCLUDE_PATH 2>/dev/null`" != "x4.2"; then - AC_MSG_RESULT([std::unordered_map]) - else -- MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST" -+ MDDS_CPPFLAGS="$MDDS_CPPFLAGS -DMDDS_HASH_CONTAINER_BOOST" - AC_MSG_RESULT([boost::unordered_map]) - fi - -@@ -7911,12 +7867,12 @@ - if test -z "$SYSTEM_GENCMN"; then - AC_MSG_ERROR([\'gencmn\' not found in \$PATH, install the icu development tool \'gencmn\']) - fi -- if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "4"; then -+ if test "$ICU_MAJOR" -ge "49" -o \( "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "4" \); then - ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES" - else - ICU_RECLASSIFIED_CLOSE_PARENTHESIS="NO" - fi -- if test "$ICU_MAJOR" -ge "5" -o "$ICU_MAJOR" = "4" -a "$ICU_MINOR" -ge "9"; then -+ if test "$ICU_MAJOR" -ge "49"; then - ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES" - else - ICU_RECLASSIFIED_PREPEND_SET_EMPTY="NO" -@@ -7956,7 +7912,7 @@ - dnl =================================================================== - - AC_MSG_CHECKING([whether to enable graphite support]) --if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "$enable_graphite" = "" -o "$enable_graphite" != "no"; then -+if test "$_os" = "WINNT" -o "$_os" = "Linux" -o "$_os" = "FreeBSD" && test "$enable_graphite" = "" -o "$enable_graphite" != "no"; then - AC_MSG_RESULT([yes]) - ENABLE_GRAPHITE="TRUE" - AC_MSG_CHECKING([which graphite to use]) -@@ -8186,8 +8142,8 @@ - AC_MSG_RESULT([external]) - # Mac OS builds should get out without extra stuff is the Mac porters' - # wish. And pkg-config is although Xcode ships a .pc for openssl -- if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \ -- "$_os" = "DragonFly"; then -+ if test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \ -+ "$_os" = "OpenBSD" -o "$_os" = "DragonFly"; then - OPENSSL_CFLAGS= - OPENSSL_LIBS="-lssl -lcrypto" - else -@@ -9842,10 +9798,10 @@ - - dnl Check for Meta Object Compiler - -- AC_PATH_PROG( MOCQT4, moc-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] ) -+ AC_PATH_PROG( MOCQT4, moc-qt4, no, [$QT4DIR/bin:$PATH] ) - MOC4="$MOCQT4" - if test "$MOC4" = "no"; then -- AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] ) -+ AC_PATH_PROG( MOC4, moc, no, [$QT4DIR/bin:$PATH] ) - if test "$MOC4" = "no"; then - AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify - the root of your Qt installation by exporting QT4DIR before running "configure".]) diff --git a/editors/libreoffice/files/patch-connectivity__source__commontools__FDatabaseMetaDataResultSet.cxx b/editors/libreoffice/files/patch-connectivity__source__commontools__FDatabaseMetaDataResultSet.cxx deleted file mode 100644 index 41040afc1f14..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__commontools__FDatabaseMetaDataResultSet.cxx +++ /dev/null @@ -1,17 +0,0 @@ ---- ./connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx 2012-07-18 13:26:19.000000000 -0400 -@@ -91,10 +91,10 @@ - // ------------------------------------------------------------------------- - void ODatabaseMetaDataResultSet::construct() - { -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(0))); - } - // ----------------------------------------------------------------------------- - void ODatabaseMetaDataResultSet::setType(MetaDataResultSetType _eType) diff --git a/editors/libreoffice/files/patch-connectivity__source__commontools__dbexception.cxx b/editors/libreoffice/files/patch-connectivity__source__commontools__dbexception.cxx deleted file mode 100644 index 7ce733115258..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__commontools__dbexception.cxx +++ /dev/null @@ -1,24 +0,0 @@ ---- ./connectivity/source/commontools/dbexception.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/commontools/dbexception.cxx 2012-07-18 13:24:25.000000000 -0400 -@@ -144,7 +144,7 @@ - //------------------------------------------------------------------------------ - SQLExceptionInfo::SQLExceptionInfo(const staruno::Any& _rError) - { -- const staruno::Type& aSQLExceptionType = ::getCppuType(reinterpret_cast< ::com::sun::star::sdbc::SQLException*>(NULL)); -+ const staruno::Type& aSQLExceptionType = ::getCppuType(static_cast< ::com::sun::star::sdbc::SQLException*>(0)); - sal_Bool bValid = isAssignableFrom(aSQLExceptionType, _rError.getValueType()); - if (bValid) - m_aContent = _rError; -@@ -158,9 +158,9 @@ - { - staruno::Type aContentType = m_aContent.getValueType(); - -- const Type& aSQLExceptionType = ::getCppuType( reinterpret_cast< SQLException* >( NULL ) ); -- const Type& aSQLWarningType = ::getCppuType( reinterpret_cast< SQLWarning* >( NULL ) ); -- const Type& aSQLContextType = ::getCppuType( reinterpret_cast< SQLContext* >( NULL ) ); -+ const Type& aSQLExceptionType = ::getCppuType( static_cast< SQLException* >( 0 ) ); -+ const Type& aSQLWarningType = ::getCppuType( static_cast< SQLWarning* >( 0 ) ); -+ const Type& aSQLContextType = ::getCppuType( static_cast< SQLContext* >( 0 ) ); - - if ( isAssignableFrom( aSQLContextType, m_aContent.getValueType() ) ) - m_eType = SQL_CONTEXT; diff --git a/editors/libreoffice/files/patch-connectivity__source__drivers__ado__AColumn.cxx b/editors/libreoffice/files/patch-connectivity__source__drivers__ado__AColumn.cxx deleted file mode 100644 index 53e3c74a0871..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__drivers__ado__AColumn.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./connectivity/source/drivers/ado/AColumn.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/drivers/ado/AColumn.cxx 2012-07-18 14:48:46.000000000 -0400 -@@ -117,7 +117,7 @@ - sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING, nAttrib,&m_IsAscending, ::getBooleanCppuType()); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< ::rtl::OUString*>(0))); - } - // ----------------------------------------------------------------------------- - void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) diff --git a/editors/libreoffice/files/patch-connectivity__source__drivers__ado__AUser.cxx b/editors/libreoffice/files/patch-connectivity__source__drivers__ado__AUser.cxx deleted file mode 100644 index 6385ae62e118..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__drivers__ado__AUser.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./connectivity/source/drivers/ado/AUser.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/drivers/ado/AUser.cxx 2012-07-18 14:51:51.000000000 -0400 -@@ -145,7 +145,7 @@ - void OUserExtend::construct() - { - OUser_TYPEDEF::construct(); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0))); - } - // ----------------------------------------------------------------------------- - cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const diff --git a/editors/libreoffice/files/patch-connectivity__source__drivers__file__FResultSet.cxx b/editors/libreoffice/files/patch-connectivity__source__drivers__file__FResultSet.cxx deleted file mode 100644 index f8745f21fa11..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__drivers__file__FResultSet.cxx +++ /dev/null @@ -1,17 +0,0 @@ ---- ./connectivity/source/drivers/file/FResultSet.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/drivers/file/FResultSet.cxx 2012-07-18 13:28:45.000000000 -0400 -@@ -152,10 +152,10 @@ - void OResultSet::construct() - { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::construct" ); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(0))); - } - // ------------------------------------------------------------------------- - void OResultSet::disposing(void) diff --git a/editors/libreoffice/files/patch-connectivity__source__drivers__file__FStatement.cxx b/editors/libreoffice/files/patch-connectivity__source__drivers__file__FStatement.cxx deleted file mode 100644 index ed0a69c68a03..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__drivers__file__FStatement.cxx +++ /dev/null @@ -1,27 +0,0 @@ ---- ./connectivity/source/drivers/file/FStatement.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/drivers/file/FStatement.cxx 2012-07-18 13:31:40.000000000 -0400 -@@ -93,16 +93,16 @@ - - sal_Int32 nAttrib = 0; - -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(0))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING),PROPERTY_ID_ESCAPEPROCESSING, nAttrib,&m_bEscapeProcessing,::getCppuBooleanType()); - -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, nAttrib,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, nAttrib,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(0))); - } - // ----------------------------------------------------------------------------- - OStatement_Base::~OStatement_Base() diff --git a/editors/libreoffice/files/patch-connectivity__source__drivers__hsqldb__HUser.cxx b/editors/libreoffice/files/patch-connectivity__source__drivers__hsqldb__HUser.cxx deleted file mode 100644 index e0b84c798a54..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__drivers__hsqldb__HUser.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./connectivity/source/drivers/hsqldb/HUser.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/drivers/hsqldb/HUser.cxx 2012-07-18 14:47:11.000000000 -0400 -@@ -71,7 +71,7 @@ - typedef connectivity::sdbcx::OUser OUser_TYPEDEF; - void OUserExtend::construct() - { -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0))); - } - // ----------------------------------------------------------------------------- - cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const diff --git a/editors/libreoffice/files/patch-connectivity__source__drivers__mysql__YUser.cxx b/editors/libreoffice/files/patch-connectivity__source__drivers__mysql__YUser.cxx deleted file mode 100644 index e7f7135f8804..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__drivers__mysql__YUser.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./connectivity/source/drivers/mysql/YUser.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/drivers/mysql/YUser.cxx 2012-07-18 13:34:01.000000000 -0400 -@@ -71,7 +71,7 @@ - typedef connectivity::sdbcx::OUser OUser_TYPEDEF; - void OUserExtend::construct() - { -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0))); - } - // ----------------------------------------------------------------------------- - cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const diff --git a/editors/libreoffice/files/patch-connectivity__source__inc__propertyids.hxx b/editors/libreoffice/files/patch-connectivity__source__inc__propertyids.hxx deleted file mode 100644 index 8120a247967a..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__inc__propertyids.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./connectivity/source/inc/propertyids.hxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/inc/propertyids.hxx 2012-07-18 13:36:46.000000000 -0400 -@@ -75,7 +75,7 @@ - - //------------------------------------------------------------------------------ - #define DECL_PROP1IMPL(varname, type) \ --pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)), -+pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(static_cast< type*>(0)), - //------------------------------------------------------------------------------ - #define DECL_PROP0(varname, type) \ - DECL_PROP1IMPL(varname, type) 0) diff --git a/editors/libreoffice/files/patch-connectivity__source__parse__PColumn.cxx b/editors/libreoffice/files/patch-connectivity__source__parse__PColumn.cxx deleted file mode 100644 index 3fff8bfffa57..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__parse__PColumn.cxx +++ /dev/null @@ -1,35 +0,0 @@ ---- ./connectivity/source/parse/PColumn.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/parse/PColumn.cxx 2012-07-18 17:07:31.000000000 -0400 -@@ -176,13 +176,13 @@ - // ------------------------------------------------------------------------- - void OParseColumn::construct() - { -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION), PROPERTY_ID_FUNCTION, 0, &m_bFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION), PROPERTY_ID_AGGREGATEFUNCTION, 0, &m_bAggregateFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, 0, &m_aTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME), PROPERTY_ID_REALNAME, 0, &m_aRealName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED), PROPERTY_ID_DBASEPRECISIONCHANGED, 0, &m_bDbasePrecisionChanged, ::getCppuType(reinterpret_cast<sal_Bool*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE), PROPERTY_ID_ISSEARCHABLE, 0, &m_bIsSearchable, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL), PROPERTY_ID_LABEL, 0, &m_sLabel, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION), PROPERTY_ID_FUNCTION, 0, &m_bFunction, ::getCppuType(static_cast< sal_Bool*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION), PROPERTY_ID_AGGREGATEFUNCTION, 0, &m_bAggregateFunction, ::getCppuType(static_cast< sal_Bool*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, 0, &m_aTableName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME), PROPERTY_ID_REALNAME, 0, &m_aRealName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED), PROPERTY_ID_DBASEPRECISIONCHANGED, 0, &m_bDbasePrecisionChanged, ::getCppuType(static_cast<sal_Bool*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE), PROPERTY_ID_ISSEARCHABLE, 0, &m_bIsSearchable, ::getCppuType(static_cast< sal_Bool*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL), PROPERTY_ID_LABEL, 0, &m_sLabel, ::getCppuType(static_cast< ::rtl::OUString*>(0))); - } - // ----------------------------------------------------------------------------- - ::cppu::IPropertyArrayHelper* OParseColumn::createArrayHelper() const -@@ -268,9 +268,9 @@ - void OOrderColumn::construct() - { - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING, -- PropertyAttribute::READONLY, const_cast< sal_Bool* >( &m_bAscending ), ::getCppuType( reinterpret_cast< sal_Bool* >( NULL ) ) ); -+ PropertyAttribute::READONLY, const_cast< sal_Bool* >( &m_bAscending ), ::getCppuType( static_cast< sal_Bool* >( 0 ) ) ); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, -- PropertyAttribute::READONLY, const_cast< ::rtl::OUString* >( &m_sTableName ), ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ PropertyAttribute::READONLY, const_cast< ::rtl::OUString* >( &m_sTableName ), ::getCppuType(static_cast< ::rtl::OUString*>(0))); - } - // ----------------------------------------------------------------------------- - ::cppu::IPropertyArrayHelper* OOrderColumn::createArrayHelper() const diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VCatalog.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VCatalog.cxx deleted file mode 100644 index 31fe68eb2c90..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VCatalog.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./connectivity/source/sdbcx/VCatalog.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/sdbcx/VCatalog.cxx 2012-07-18 13:18:57.000000000 -0400 -@@ -230,7 +230,7 @@ - void ODescriptor::construct() - { - sal_Int32 nAttrib = isNew() ? 0 : ::com::sun::star::beans::PropertyAttribute::READONLY; -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::getCppuType(static_cast< ::rtl::OUString*>(0))); - } - // ------------------------------------------------------------------------- - ODescriptor::~ODescriptor() diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VColumn.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VColumn.cxx deleted file mode 100644 index cfbfcd18afbc..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VColumn.cxx +++ /dev/null @@ -1,23 +0,0 @@ ---- ./connectivity/source/sdbcx/VColumn.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/sdbcx/VColumn.cxx 2012-07-18 13:07:09.000000000 -0400 -@@ -166,13 +166,13 @@ - - sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME), PROPERTY_ID_TYPENAME, nAttrib,&m_TypeName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION, nAttrib,&m_Description, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), PROPERTY_ID_DEFAULTVALUE, nAttrib,&m_DefaultValue, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION), PROPERTY_ID_PRECISION, nAttrib,&m_Precision, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE), PROPERTY_ID_SCALE, nAttrib,&m_Scale, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE), PROPERTY_ID_ISNULLABLE, nAttrib,&m_IsNullable, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME), PROPERTY_ID_TYPENAME, nAttrib,&m_TypeName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION, nAttrib,&m_Description, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), PROPERTY_ID_DEFAULTVALUE, nAttrib,&m_DefaultValue, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION), PROPERTY_ID_PRECISION, nAttrib,&m_Precision, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE), PROPERTY_ID_SCALE, nAttrib,&m_Scale, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE), PROPERTY_ID_ISNULLABLE, nAttrib,&m_IsNullable, ::getCppuType(static_cast<sal_Int32*>(0))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT), PROPERTY_ID_ISAUTOINCREMENT, nAttrib,&m_IsAutoIncrement, ::getBooleanCppuType()); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISROWVERSION), PROPERTY_ID_ISROWVERSION, nAttrib,&m_IsRowVersion, ::getBooleanCppuType()); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY), PROPERTY_ID_ISCURRENCY, nAttrib,&m_IsCurrency, ::getBooleanCppuType()); diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VIndex.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VIndex.cxx deleted file mode 100644 index 968e7f6fb7ac..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VIndex.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./connectivity/source/sdbcx/VIndex.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/sdbcx/VIndex.cxx 2012-07-18 13:17:23.000000000 -0400 -@@ -142,7 +142,7 @@ - - sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::getCppuType(static_cast< ::rtl::OUString*>(0))); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE), PROPERTY_ID_ISUNIQUE, nAttrib,&m_IsUnique, ::getBooleanCppuType()); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISPRIMARYKEYINDEX),PROPERTY_ID_ISPRIMARYKEYINDEX, nAttrib,&m_IsPrimaryKeyIndex, ::getBooleanCppuType()); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCLUSTERED), PROPERTY_ID_ISCLUSTERED, nAttrib,&m_IsClustered, ::getBooleanCppuType()); diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VKey.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VKey.cxx deleted file mode 100644 index adb61fab6b3c..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VKey.cxx +++ /dev/null @@ -1,17 +0,0 @@ ---- ./connectivity/source/sdbcx/VKey.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/sdbcx/VKey.cxx 2012-07-18 13:16:00.000000000 -0400 -@@ -139,10 +139,10 @@ - - sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(static_cast<sal_Int32*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(static_cast<sal_Int32*>(0))); - } - // ------------------------------------------------------------------------- - void SAL_CALL OKey::disposing() diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VKeyColumn.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VKeyColumn.cxx deleted file mode 100644 index 31eeffc7ff87..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VKeyColumn.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./connectivity/source/sdbcx/VKeyColumn.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/sdbcx/VKeyColumn.cxx 2012-07-18 13:11:37.000000000 -0400 -@@ -115,7 +115,7 @@ - void OKeyColumn::construct() - { - sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< ::rtl::OUString*>(0))); - } - // ----------------------------------------------------------------------------- - diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VTable.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VTable.cxx deleted file mode 100644 index 7e0faeb1c292..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VTable.cxx +++ /dev/null @@ -1,17 +0,0 @@ ---- ./connectivity/source/sdbcx/VTable.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/sdbcx/VTable.cxx 2012-07-18 13:14:27.000000000 -0400 -@@ -121,10 +121,10 @@ - - sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(static_cast< ::rtl::OUString*>(0))); - } - // ----------------------------------------------------------------------------- - void SAL_CALL OTable::acquire() throw() diff --git a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VView.cxx b/editors/libreoffice/files/patch-connectivity__source__sdbcx__VView.cxx deleted file mode 100644 index d9d9fbd6e2e0..000000000000 --- a/editors/libreoffice/files/patch-connectivity__source__sdbcx__VView.cxx +++ /dev/null @@ -1,17 +0,0 @@ ---- ./connectivity/source/sdbcx/VView.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./connectivity/source/sdbcx/VView.cxx 2012-07-18 13:21:10.000000000 -0400 -@@ -78,10 +78,10 @@ - - sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; - -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::getCppuType(static_cast< sal_Int32*>(0))); - } - // ------------------------------------------------------------------------- - void OView::disposing(void) diff --git a/editors/libreoffice/files/patch-cppunit__freebsd.patch b/editors/libreoffice/files/patch-cppunit__freebsd.patch index 251ee50d8ff8..a946f8d7ba65 100644 --- a/editors/libreoffice/files/patch-cppunit__freebsd.patch +++ b/editors/libreoffice/files/patch-cppunit__freebsd.patch @@ -1,6 +1,6 @@ ---- ./cppunit/freebsd.patch.orig 2012-07-25 15:44:00.000000000 -0400 -+++ ./cppunit/freebsd.patch 2012-07-25 15:46:01.000000000 -0400 -@@ -0,0 +1,128 @@ +--- ./cppunit/freebsd.patch.orig 2013-02-18 18:38:29.000000000 -0500 ++++ ./cppunit/freebsd.patch 2013-02-18 18:38:29.000000000 -0500 +@@ -0,0 +1,110 @@ +--- misc/build/cppunit-1.12.1/configure 2008-02-20 00:59:58.000000000 -0500 ++++ misc/build/cppunit-1.12.1/configure 2012-07-25 15:06:50.000000000 -0400 +@@ -8917,7 +8917,7 @@ @@ -111,21 +111,3 @@ + *) objformat=elf ;; + esac + fi -+@@ -21068,6 +21068,7 @@ -+ #include <typeinfo> -+ #include <cxxabi.h> -+ #include <string> -++#include <cstdlib> -+ -+ template<typename TYPE> -+ class A {}; -+--- misc/build/cppunit-1.12.1/src/cppunit/TypeInfoHelper.cpp 2004-02-18 15:45:44.000000000 -0500 -++++ misc/build/cppunit-1.12.1/src/cppunit/TypeInfoHelper.cpp 2012-07-25 15:05:11.000000000 -0400 -+@@ -6,6 +6,7 @@ -+ #include <string> -+ -+ #if CPPUNIT_HAVE_GCC_ABI_DEMANGLE -++#include <cstdlib> -+ #include <cxxabi.h> -+ #endif -+ diff --git a/editors/libreoffice/files/patch-cppunit__gcc-abi-demangle.patch b/editors/libreoffice/files/patch-cppunit__gcc-abi-demangle.patch deleted file mode 100644 index 3446cacbe86d..000000000000 --- a/editors/libreoffice/files/patch-cppunit__gcc-abi-demangle.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ./cppunit/gcc-abi-demangle.patch.orig 2012-07-25 15:22:00.000000000 -0400 -+++ ./cppunit/gcc-abi-demangle.patch 2012-08-22 14:35:55.000000000 -0400 -@@ -0,0 +1,28 @@ -+--- misc/build/cppunit-1.12.1/src/cppunit/TypeInfoHelper.cpp 2004-02-18 15:45:44.000000000 -0500 -++++ misc/build/cppunit-1.12.1/src/cppunit/TypeInfoHelper.cpp 2012-08-22 14:35:55.000000000 -0400 -+@@ -21,10 +21,21 @@ -+ int status = 0; -+ char* c_name = 0; -+ -+- c_name = abi::__cxa_demangle( info.name(), 0, 0, &status ); -+- -+- std::string name( c_name ); -+- free( c_name ); -++ const char* c_origName = info.name(); -++ if(c_origName[0] == '*') -++ ++c_origName; -++ c_name = abi::__cxa_demangle( c_origName, 0, 0, &status ); -++ -++ std::string name; -++ if(c_name) -++ { -++ name = std::string( c_name ); -++ free( c_name ); -++ } -++ else -++ { -++ name = std::string( c_origName ); -++ } -+ -+ #else // CPPUNIT_HAVE_GCC_ABI_DEMANGLE -+ diff --git a/editors/libreoffice/files/patch-cppunit__makefile.mk b/editors/libreoffice/files/patch-cppunit__makefile.mk index 7448d3031ab0..3ffb22ee3674 100644 --- a/editors/libreoffice/files/patch-cppunit__makefile.mk +++ b/editors/libreoffice/files/patch-cppunit__makefile.mk @@ -1,16 +1,7 @@ ---- ./cppunit/makefile.mk.orig 2013-01-16 04:41:51.000000000 -0500 -+++ ./cppunit/makefile.mk 2013-01-31 15:27:50.000000000 -0500 -@@ -34,7 +34,7 @@ - # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/ - # cppunit-1.12.1.tar.gz/download> - --PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch cppunit-1.12.1-unused-parameters.patch cppunit-1.12.1-warnings.patch -+PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch cppunit-1.12.1-unused-parameters.patch cppunit-1.12.1-warnings.patch gcc-abi-demangle.patch - # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail& - # aid=2912590&group_id=11795&atid=311795>; upstreamed as - # <http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id= -@@ -64,6 +64,10 @@ - PATCH_FILES += android.patch +--- ./cppunit/makefile.mk.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./cppunit/makefile.mk 2013-02-18 18:38:29.000000000 -0500 +@@ -46,6 +46,10 @@ + PATCH_FILES += disable-dynloading.patch .ENDIF +.IF "$(OS)" == "FREEBSD" diff --git a/editors/libreoffice/files/patch-dbaccess__source__core__api__RowSet.cxx b/editors/libreoffice/files/patch-dbaccess__source__core__api__RowSet.cxx deleted file mode 100644 index 560b97de3a76..000000000000 --- a/editors/libreoffice/files/patch-dbaccess__source__core__api__RowSet.cxx +++ /dev/null @@ -1,92 +0,0 @@ ---- ./dbaccess/source/core/api/RowSet.cxx.orig 2012-07-27 08:37:04.000000000 -0400 -+++ ./dbaccess/source/core/api/RowSet.cxx 2012-07-31 19:44:15.000000000 -0400 -@@ -178,45 +178,45 @@ - m_aPrematureParamValues.get().resize( 0 ); - - // sdb.RowSet Properties -- registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL))); -- registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -- registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(static_cast< Reference< XConnection >* >(0))); -+ registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(static_cast< sal_Int32*>(0))); -+ registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(static_cast< ::rtl::OUString*>(0))); - registerProperty(PROPERTY_IGNORERESULT, PROPERTY_ID_IGNORERESULT, PropertyAttribute::BOUND, &m_bIgnoreResult, ::getBooleanCppuType()); -- registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::getCppuType(static_cast< ::rtl::OUString*>(0))); - registerProperty(PROPERTY_APPLYFILTER, PROPERTY_ID_APPLYFILTER, PropertyAttribute::BOUND, &m_bApplyFilter, ::getBooleanCppuType()); -- registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -+ registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::getCppuType(static_cast< sal_Int32*>(0))); - registerProperty(PROPERTY_ISMODIFIED, PROPERTY_ID_ISMODIFIED, nBT, &m_bModified, ::getBooleanCppuType()); - registerProperty(PROPERTY_ISNEW, PROPERTY_ID_ISNEW, nRBT, &m_bNew, ::getBooleanCppuType()); -- registerProperty(PROPERTY_SINGLESELECTQUERYCOMPOSER,PROPERTY_ID_SINGLESELECTQUERYCOMPOSER, nRT, &m_xComposer, ::getCppuType(reinterpret_cast< Reference< XSingleSelectQueryComposer >* >(NULL))); -+ registerProperty(PROPERTY_SINGLESELECTQUERYCOMPOSER,PROPERTY_ID_SINGLESELECTQUERYCOMPOSER, nRT, &m_xComposer, ::getCppuType(static_cast< Reference< XSingleSelectQueryComposer >* >(0))); - - // sdbcx.ResultSet Properties - registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarkable, ::getBooleanCppuType()); - registerProperty(PROPERTY_CANUPDATEINSERTEDROWS,PROPERTY_ID_CANUPDATEINSERTEDROWS, nRT, &m_bCanUpdateInsertedRows, ::getBooleanCppuType()); - // sdbc.ResultSet Properties -- registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -- registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -- registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -- registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -+ registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::getCppuType(static_cast< sal_Int32*>(0))); -+ registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::getCppuType(static_cast< sal_Int32*>(0))); -+ registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(static_cast< sal_Int32*>(0))); -+ registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(static_cast< sal_Int32*>(0))); - - // sdbc.RowSet Properties -- registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -- registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(reinterpret_cast< Reference< XNameAccess >* >(NULL))); -+ registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(static_cast< sal_Int32*>(0))); -+ registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(static_cast< Reference< XNameAccess >* >(0))); - registerProperty(PROPERTY_ESCAPE_PROCESSING,PROPERTY_ID_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bUseEscapeProcessing,::getBooleanCppuType() ); -- registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -- registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -- registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)) ); -- registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- -- registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -- registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(static_cast< sal_Int32*>(0))); -+ registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(static_cast< sal_Int32*>(0))); -+ registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(static_cast< sal_Int32*>(0)) ); -+ registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ -+ registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); -+ registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::getCppuType(static_cast< ::rtl::OUString*>(0))); - - // ??? - registerProperty(PROPERTY_CHANGE_NOTIFICATION_ENABLED, PROPERTY_ID_PROPCHANGE_NOTIFY, PropertyAttribute::BOUND, &m_bPropChangeNotifyEnabled, ::getBooleanCppuType()); -@@ -2806,11 +2806,11 @@ - sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT; - - // sdb.RowSet Properties -- registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, &rParent.m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL))); -- registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -- registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -- registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -- registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); -+ registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, &rParent.m_aActiveConnection, ::getCppuType(static_cast< Reference< XConnection >* >(0))); -+ registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::getCppuType(static_cast< sal_Int32*>(0))); -+ registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::getCppuType(static_cast< sal_Int32*>(0))); -+ registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(static_cast< sal_Int32*>(0))); -+ registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(static_cast< sal_Int32*>(0))); - registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarkable, ::getBooleanCppuType()); - } - diff --git a/editors/libreoffice/files/patch-dbaccess__source__core__api__TableDeco.cxx b/editors/libreoffice/files/patch-dbaccess__source__core__api__TableDeco.cxx deleted file mode 100644 index 6cc63680126a..000000000000 --- a/editors/libreoffice/files/patch-dbaccess__source__core__api__TableDeco.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./dbaccess/source/core/api/TableDeco.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./dbaccess/source/core/api/TableDeco.cxx 2012-07-18 14:52:59.000000000 -0400 -@@ -172,7 +172,7 @@ - { - Any aValue; - getFastPropertyValue(aValue,nHandle); -- bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); -+ bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::getCppuType(static_cast< ::rtl::OUString*>(0))); - } - break; // we assume that it works - } diff --git a/editors/libreoffice/files/patch-dbaccess__source__ui__browser__sbagrid.cxx b/editors/libreoffice/files/patch-dbaccess__source__ui__browser__sbagrid.cxx deleted file mode 100644 index 8ad7caf014a6..000000000000 --- a/editors/libreoffice/files/patch-dbaccess__source__ui__browser__sbagrid.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./dbaccess/source/ui/browser/sbagrid.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./dbaccess/source/ui/browser/sbagrid.cxx 2012-07-18 14:58:46.000000000 -0400 -@@ -602,7 +602,7 @@ - Sequence< Type > aTypes = FmXGridPeer::getTypes(); - sal_Int32 nOldLen = aTypes.getLength(); - aTypes.realloc(nOldLen + 1); -- aTypes.getArray()[nOldLen] = ::getCppuType( reinterpret_cast< Reference< ::com::sun::star::frame::XDispatch >* >(NULL) ); -+ aTypes.getArray()[nOldLen] = ::getCppuType( static_cast< Reference< ::com::sun::star::frame::XDispatch >* >(0) ); - - return aTypes; - } diff --git a/editors/libreoffice/files/patch-editeng__Module_editeng.mk b/editors/libreoffice/files/patch-editeng__Module_editeng.mk new file mode 100644 index 000000000000..7f92f4a1fa01 --- /dev/null +++ b/editors/libreoffice/files/patch-editeng__Module_editeng.mk @@ -0,0 +1,10 @@ +--- editeng/Module_editeng.mk.orig 2013-01-31 05:54:53.000000000 -0500 ++++ editeng/Module_editeng.mk 2013-02-22 14:31:45.000000000 -0500 +@@ -28,7 +28,6 @@ + # add any runtime tests (unit tests) here + # remove if no tests + $(eval $(call gb_Module_add_check_targets,editeng,\ +- CppunitTest_editeng_core \ + CppunitTest_editeng_borderline \ + CppunitTest_editeng_lookuptree \ + )) diff --git a/editors/libreoffice/files/patch-extensions__Library_ldapbe2.mk b/editors/libreoffice/files/patch-extensions__Library_ldapbe2.mk new file mode 100644 index 000000000000..35a58003af24 --- /dev/null +++ b/editors/libreoffice/files/patch-extensions__Library_ldapbe2.mk @@ -0,0 +1,23 @@ +--- ./extensions/Library_ldapbe2.mk.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./extensions/Library_ldapbe2.mk 2013-02-19 17:56:48.000000000 -0500 +@@ -58,16 +58,10 @@ + wldap32 \ + )) + else # 0S!=WNT +-$(eval $(call gb_Library_use_externals,ldapbe2,openldap)) +- +-$(eval $(call gb_Library_add_libs,ldapbe2,\ +- -lssl3 \ +- -lsmime3 \ +- -lnss3 \ +- -lnssutil3 \ +- -lplds4 \ +- -lplc4 \ +- -lnspr4 \ ++$(eval $(call gb_Library_use_externals,ldapbe2,\ ++ nss3 \ ++ openldap \ ++ plc4 \ + )) + endif + diff --git a/editors/libreoffice/files/patch-extensions__Library_npsoplugin.mk b/editors/libreoffice/files/patch-extensions__Library_npsoplugin.mk new file mode 100644 index 000000000000..f57f3dd1f8db --- /dev/null +++ b/editors/libreoffice/files/patch-extensions__Library_npsoplugin.mk @@ -0,0 +1,14 @@ +--- ./extensions/Library_npsoplugin.mk.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./extensions/Library_npsoplugin.mk 2013-02-19 17:00:56.000000000 -0500 +@@ -44,9 +44,11 @@ + + ifeq ($(GUI),UNX) + ++ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) + $(eval $(call gb_Library_add_libs,npsoplugin,\ + -ldl \ + )) ++endif + + $(eval $(call gb_Library_use_external,npsoplugin,gtk)) + diff --git a/editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.cxx b/editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.cxx deleted file mode 100644 index 6d8ac3ce1707..000000000000 --- a/editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.cxx +++ /dev/null @@ -1,20 +0,0 @@ ---- ./extensions/source/resource/ResourceIndexAccess.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./extensions/source/resource/ResourceIndexAccess.cxx 2012-07-18 15:15:23.000000000 -0400 -@@ -94,7 +94,7 @@ - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - // XElementAccessBase - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException) -- { return ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)); }; -+ { return ::getCppuType(static_cast< ::rtl::OUString*>(0)); }; - }; - - class ResourceStringListIndexAccess : public ResourceIndexAccessBase -@@ -106,7 +106,7 @@ - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - // XElementAccessBase - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException) -- { return ::getCppuType(reinterpret_cast<Sequence<PropertyValue> * >(NULL)); }; -+ { return ::getCppuType(static_cast<Sequence<PropertyValue> * >(0)); }; - }; - } - diff --git a/editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.hxx b/editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.hxx deleted file mode 100644 index cf92d2dc371d..000000000000 --- a/editors/libreoffice/files/patch-extensions__source__resource__ResourceIndexAccess.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./extensions/source/resource/ResourceIndexAccess.hxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./extensions/source/resource/ResourceIndexAccess.hxx 2012-07-18 15:17:25.000000000 -0400 -@@ -58,7 +58,7 @@ - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); - // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException) -- { return ::getCppuType(reinterpret_cast< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*>(NULL)); }; -+ { return ::getCppuType(static_cast< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*>(0)); }; - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException) - { return static_cast<bool>(m_pResMgr.get()); }; - diff --git a/editors/libreoffice/files/patch-forms__source__component__ComboBox.cxx b/editors/libreoffice/files/patch-forms__source__component__ComboBox.cxx deleted file mode 100644 index 88e28506df14..000000000000 --- a/editors/libreoffice/files/patch-forms__source__component__ComboBox.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./forms/source/component/ComboBox.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./forms/source/component/ComboBox.cxx 2012-07-18 14:41:05.000000000 -0400 -@@ -227,7 +227,7 @@ - switch (_nHandle) - { - case PROPERTY_ID_LISTSOURCETYPE : -- DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(reinterpret_cast<ListSourceType*>(NULL))), -+ DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast<ListSourceType*>(0))), - "OComboBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" ); - _rValue >>= m_eListSourceType; - break; diff --git a/editors/libreoffice/files/patch-forms__source__component__ListBox.cxx b/editors/libreoffice/files/patch-forms__source__component__ListBox.cxx deleted file mode 100644 index 01b2ed7d087e..000000000000 --- a/editors/libreoffice/files/patch-forms__source__component__ListBox.cxx +++ /dev/null @@ -1,29 +0,0 @@ ---- ./forms/source/component/ListBox.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./forms/source/component/ListBox.cxx 2012-07-18 14:39:02.000000000 -0400 -@@ -304,7 +304,7 @@ - break; - - case PROPERTY_ID_LISTSOURCETYPE : -- DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(reinterpret_cast<ListSourceType*>(NULL))), -+ DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast<ListSourceType*>(0))), - "OComboBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" ); - _rValue >>= m_eListSourceType; - break; -@@ -343,7 +343,7 @@ - throw PropertyVetoException(); - - case PROPERTY_ID_DEFAULT_SELECT_SEQ : -- DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(reinterpret_cast< Sequence<sal_Int16>*>(NULL))), -+ DBG_ASSERT(_rValue.getValueType().equals(::getCppuType(static_cast< Sequence<sal_Int16>*>(0))), - "OListBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" ); - _rValue >>= m_aDefaultSelectSeq; - -@@ -378,7 +378,7 @@ - switch (_nHandle) - { - case PROPERTY_ID_BOUNDCOLUMN : -- bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aBoundColumn, ::getCppuType(reinterpret_cast<sal_Int16*>(NULL))); -+ bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aBoundColumn, ::getCppuType(static_cast<sal_Int16*>(0))); - break; - - case PROPERTY_ID_LISTSOURCETYPE: diff --git a/editors/libreoffice/files/patch-forms__source__inc__property.hxx b/editors/libreoffice/files/patch-forms__source__inc__property.hxx deleted file mode 100644 index 626baae6e76f..000000000000 --- a/editors/libreoffice/files/patch-forms__source__inc__property.hxx +++ /dev/null @@ -1,20 +0,0 @@ ---- ./forms/source/inc/property.hxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./forms/source/inc/property.hxx 2012-07-18 14:18:22.000000000 -0400 -@@ -111,7 +111,7 @@ - - //------------------------------------------------------------------------------ - #define DECL_PROP_IMPL(varname, type) \ -- *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type* >(NULL)), -+ *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(static_cast< type* >(0)), - - //------------------------------------------------------------------------------ - #define DECL_BOOL_PROP_IMPL(varname) \ -@@ -119,7 +119,7 @@ - - //------------------------------------------------------------------------------ - #define DECL_IFACE_PROP_IMPL(varname, type) \ -- *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< com::sun::star::uno::Reference< type >* >(NULL)), -+ *pProperties++ = com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, ::getCppuType(static_cast< com::sun::star::uno::Reference< type >* >(0)), - - //------------------------------------------------------------------------------ - #define BEGIN_DESCRIBE_PROPERTIES( count, baseclass ) \ diff --git a/editors/libreoffice/files/patch-i18npool__CustomTarget_breakiterator.mk b/editors/libreoffice/files/patch-i18npool__CustomTarget_breakiterator.mk new file mode 100644 index 000000000000..aafdc05efce4 --- /dev/null +++ b/editors/libreoffice/files/patch-i18npool__CustomTarget_breakiterator.mk @@ -0,0 +1,11 @@ +--- ./i18npool/CustomTarget_breakiterator.mk.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./i18npool/CustomTarget_breakiterator.mk 2013-02-22 15:26:45.000000000 -0500 +@@ -120,7 +120,7 @@ + # sed substitution... + $(i18npool_BIDIR)/%.txt : \ + $(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(i18npool_BIDIR)/.dir +- sed -e ': dummy' \ ++ $(SED) -e ': dummy' \ + -e "s#\[:LineBreak = Close_Punctuation:\]#\[& \[:LineBreak = Close_Parenthesis:\]\]#" \ + $(if $(filter-out YES,$(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER)),\ + -e '/\[:LineBreak = Conditional_Japanese_Starter:\]/d' \ diff --git a/editors/libreoffice/files/patch-mysqlc__source__mysqlc_propertyids.hxx b/editors/libreoffice/files/patch-mysqlc__source__mysqlc_propertyids.hxx deleted file mode 100644 index 80bc37aed19f..000000000000 --- a/editors/libreoffice/files/patch-mysqlc__source__mysqlc_propertyids.hxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./mysqlc/source/mysqlc_propertyids.hxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./mysqlc/source/mysqlc_propertyids.hxx 2012-07-18 15:00:02.000000000 -0400 -@@ -119,7 +119,7 @@ - - //------------------------------------------------------------------------------ - #define DECL_PROP1IMPL(varname, type) \ --pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)), -+pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(static_cast< type*>(0)), - //------------------------------------------------------------------------------ - #define DECL_PROP0(varname, type) \ - DECL_PROP1IMPL(varname, type) 0) diff --git a/editors/libreoffice/files/patch-odk__pack__gendocu__makefile.mk b/editors/libreoffice/files/patch-odk__pack__gendocu__makefile.mk index 6ff4536ba34a..96e61b0ee1dd 100644 --- a/editors/libreoffice/files/patch-odk__pack__gendocu__makefile.mk +++ b/editors/libreoffice/files/patch-odk__pack__gendocu__makefile.mk @@ -1,6 +1,6 @@ ---- ./odk/pack/gendocu/makefile.mk.orig 2013-02-06 20:11:03.000000000 -0500 -+++ ./odk/pack/gendocu/makefile.mk 2013-02-07 13:26:20.000000000 -0500 -@@ -106,7 +106,7 @@ +--- ./odk/pack/gendocu/makefile.mk.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./odk/pack/gendocu/makefile.mk 2013-02-18 18:38:29.000000000 -0500 +@@ -97,7 +97,7 @@ $(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/$$(@:f) -$(MKDIRHIER) $(@:d) $(MY_COPY) $< $@ diff --git a/editors/libreoffice/files/patch-odk__settings__settings.mk b/editors/libreoffice/files/patch-odk__settings__settings.mk deleted file mode 100644 index e524171ffc92..000000000000 --- a/editors/libreoffice/files/patch-odk__settings__settings.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ./odk/settings/settings.mk.orig 2013-01-16 04:41:51.000000000 -0500 -+++ ./odk/settings/settings.mk 2013-02-12 20:53:11.000000000 -0500 -@@ -566,7 +566,7 @@ - - CC_OUTPUT_SWITCH=-o - --LIBRARY_LINK_FLAGS=-shared '-Wl,-rpath,$$ORIGIN' -+LIBRARY_LINK_FLAGS=-shared '-Wl,-z,origin,-rpath,$$ORIGIN' - COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) - - EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined diff --git a/editors/libreoffice/files/patch-registry__workben__makefile.mk b/editors/libreoffice/files/patch-registry__workben__makefile.mk deleted file mode 100644 index dc2579fc7124..000000000000 --- a/editors/libreoffice/files/patch-registry__workben__makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- ./registry/workben/makefile.mk.orig 2012-07-27 08:37:04.000000000 -0400 -+++ ./registry/workben/makefile.mk 2012-08-28 19:38:00.000000000 -0400 -@@ -63,8 +63,8 @@ - APP2RPATH=NONE - .IF "$(GUI)"=="UNX" && "$(OS)"!="MACOSX" - --.IF "$(OS)"=="LINUX" --APP2LINKFLAGS=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../lib'\' -+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" -+APP2LINKFLAGS=-Wl,-z,origin,-rpath,\''$$ORIGIN:$$ORIGIN/../lib'\' - .ENDIF - - .IF "$(OS)"=="SOLARIS" diff --git a/editors/libreoffice/files/patch-reportdesign__source__ui__report__ReportController.cxx b/editors/libreoffice/files/patch-reportdesign__source__ui__report__ReportController.cxx deleted file mode 100644 index b9268de4af78..000000000000 --- a/editors/libreoffice/files/patch-reportdesign__source__ui__report__ReportController.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./reportdesign/source/ui/report/ReportController.cxx.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./reportdesign/source/ui/report/ReportController.cxx 2012-07-18 15:01:02.000000000 -0400 -@@ -325,7 +325,7 @@ - - m_sMode = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal")); - DBG_CTOR( rpt_OReportController,NULL); -- registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomValue")),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(reinterpret_cast< sal_Int16*>(NULL))); -+ registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomValue")),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0))); - - } - // ----------------------------------------------------------------------------- diff --git a/editors/libreoffice/files/patch-sal__osl__unx__interlck.c b/editors/libreoffice/files/patch-sal__osl__unx__interlck.c deleted file mode 100644 index 3febb88ae2ea..000000000000 --- a/editors/libreoffice/files/patch-sal__osl__unx__interlck.c +++ /dev/null @@ -1,20 +0,0 @@ ---- ./sal/osl/unx/interlck.c.orig 2012-07-03 07:01:28.000000000 -0400 -+++ ./sal/osl/unx/interlck.c 2012-08-17 19:37:35.000000000 -0400 -@@ -60,7 +60,7 @@ - : "memory"); - return ++nCount; - } --#if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 )) -+#if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 2 )) - else - return __sync_add_and_fetch (pCount, 1); - #else -@@ -89,7 +89,7 @@ - : "memory"); - return --nCount; - } --#if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 4 )) -+#if ( __GNUC__ > 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ >= 2 )) - else - return __sync_sub_and_fetch (pCount, 1); - #else diff --git a/editors/libreoffice/files/patch-shell__Module_shell.mk b/editors/libreoffice/files/patch-shell__Module_shell.mk new file mode 100644 index 000000000000..4b8970340fc1 --- /dev/null +++ b/editors/libreoffice/files/patch-shell__Module_shell.mk @@ -0,0 +1,11 @@ +--- ./shell/Module_shell.mk.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./shell/Module_shell.mk 2013-02-19 20:26:39.000000000 -0500 +@@ -32,7 +32,7 @@ + Library_localebe \ + )) + +-ifeq ($(OS),LINUX) ++ifeq ($(GUI),UNX) + ifeq ($(ENABLE_GIO),TRUE) + $(eval $(call gb_Module_add_targets,shell,\ + Library_losessioninstall \ diff --git a/editors/libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk b/editors/libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk index c83340a64da7..19422ce327b9 100644 --- a/editors/libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk +++ b/editors/libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk @@ -1,20 +1,11 @@ ---- ./solenv/gbuild/platform/unxgcc.mk.orig 2013-01-16 04:41:51.000000000 -0500 -+++ ./solenv/gbuild/platform/unxgcc.mk 2013-02-12 20:48:19.000000000 -0500 -@@ -297,7 +297,7 @@ - $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ - - define gb_Library__get_rpath --$(if $(1),$(strip '-Wl,-rpath,$(1)' '-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)')) -+$(if $(1),$(strip '-Wl,-z,origin,-rpath,$(1)' '-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)')) - endef - - define gb_Library_get_rpath -@@ -338,7 +338,7 @@ - - - define gb_Executable_get_rpath --'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' \ -+'-Wl,-z,origin,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call gb_Executable_get_layer,$(1)))' \ - -Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION) - endef +--- ./solenv/gbuild/platform/unxgcc.mk.orig 2013-02-19 19:39:23.000000000 -0500 ++++ ./solenv/gbuild/platform/unxgcc.mk 2013-02-19 19:35:41.000000000 -0500 +@@ -53,7 +53,7 @@ + gb_CXXFLAGS := \ + $(gb_CXXFLAGS_COMMON) \ + -fPIC \ +- -Wshadow \ ++ -Wno-unused-parameter \ + -Wsign-promo \ + -Woverloaded-virtual \ diff --git a/editors/libreoffice/files/patch-solenv__inc__libs.mk b/editors/libreoffice/files/patch-solenv__inc__libs.mk deleted file mode 100644 index ef982aaced3b..000000000000 --- a/editors/libreoffice/files/patch-solenv__inc__libs.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- ./solenv/inc/libs.mk.orig 2013-02-01 13:12:41.000000000 -0500 -+++ ./solenv/inc/libs.mk 2013-02-01 13:40:41.000000000 -0500 -@@ -213,7 +213,7 @@ - NEON3RDLIB=-lneon - .ENDIF - .IF "$(SYSTEM_DB)" == "YES" --BERKELEYLIB=-l$(DB_LIB) -+BERKELEYLIB=$(DB_LIB) - .ELIF "$(GUI)$(COM)"=="WNTGCC" - BERKELEYLIB=-ldb47 - .ELSE diff --git a/editors/libreoffice/files/patch-solenv__inc__unxgcc.mk b/editors/libreoffice/files/patch-solenv__inc__unxgcc.mk deleted file mode 100644 index 7ec2d03efa62..000000000000 --- a/editors/libreoffice/files/patch-solenv__inc__unxgcc.mk +++ /dev/null @@ -1,18 +0,0 @@ ---- ./solenv/inc/unxgcc.mk.orig 2013-01-16 04:41:51.000000000 -0500 -+++ ./solenv/inc/unxgcc.mk 2013-02-12 20:50:31.000000000 -0500 -@@ -191,11 +191,11 @@ - # entry. This will cause both, DT_RPATH and DT_RUNPATH entries, to be created - # - LINKFLAGSDEFS*=-Wl,-z,defs --LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags --LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags -+LINKFLAGSRUNPATH_URELIB=-Wl,-z,origin,-rpath,\''$$ORIGIN'\',--enable-new-dtags -+LINKFLAGSRUNPATH_UREBIN=-Wl,-z,origin,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags - #TODO: drop $ORIGIN once no URE executable is also shipped in OOo --LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags --LINKFLAGSRUNPATH_SDKBIN=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags -+LINKFLAGSRUNPATH_OOO=-Wl,-z,origin,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags -+LINKFLAGSRUNPATH_SDKBIN=-Wl,-z,origin,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags - LINKFLAGSRUNPATH_OXT= - LINKFLAGSRUNPATH_NONE= - # flag -Wl,-z,noexecstack sets the NX bit on the stack diff --git a/editors/libreoffice/files/patch-svtools__source__control__ctrlbox.cxx b/editors/libreoffice/files/patch-svtools__source__control__ctrlbox.cxx new file mode 100644 index 000000000000..cd33a8d0ee1e --- /dev/null +++ b/editors/libreoffice/files/patch-svtools__source__control__ctrlbox.cxx @@ -0,0 +1,11 @@ +--- ./svtools/source/control/ctrlbox.cxx.orig 2013-01-31 05:54:53.000000000 -0500 ++++ svtools/source/control/ctrlbox.cxx 2013-02-19 18:17:07.000000000 -0500 +@@ -829,7 +829,7 @@ + if ( nPos < pLineList->size() ) { + ImpLineList::iterator it = pLineList->begin(); + ::std::advance( it, nPos ); +- pLineList->insert( it, reinterpret_cast<ImpLineListData *>(NULL) ); ++ pLineList->insert( it, static_cast<ImpLineListData *>(NULL) ); + } else { + pLineList->push_back( NULL ); + } diff --git a/editors/libreoffice/files/patch-svx__source__items__clipfmtitem.cxx b/editors/libreoffice/files/patch-svx__source__items__clipfmtitem.cxx deleted file mode 100644 index 66580a48d826..000000000000 --- a/editors/libreoffice/files/patch-svx__source__items__clipfmtitem.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./svx/source/items/clipfmtitem.cxx.orig 2012-07-27 08:37:04.000000000 -0400 -+++ ./svx/source/items/clipfmtitem.cxx 2012-08-14 18:47:08.000000000 -0400 -@@ -133,7 +133,7 @@ - if( nPos > pImpl->aFmtNms.size() ) - nPos = pImpl->aFmtNms.size(); - -- pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, NULL); -+ pImpl->aFmtNms.insert(pImpl->aFmtNms.begin() + nPos, 0); - pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId ); - } - diff --git a/editors/libreoffice/files/patch-sw__Module_sw.mk b/editors/libreoffice/files/patch-sw__Module_sw.mk new file mode 100644 index 000000000000..c119788f71f6 --- /dev/null +++ b/editors/libreoffice/files/patch-sw__Module_sw.mk @@ -0,0 +1,13 @@ +--- ./sw/Module_sw.mk.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./sw/Module_sw.mk 2013-02-22 14:30:05.000000000 -0500 +@@ -37,10 +37,6 @@ + + endif + +-$(eval $(call gb_Module_add_check_targets,sw,\ +- CppunitTest_sw_swdoc_test \ +-)) +- + $(eval $(call gb_Module_add_slowcheck_targets,sw,\ + CppunitTest_sw_macros_test \ + CppunitTest_sw_subsequent_ooxmlexport \ diff --git a/editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh b/editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh index 699066ab780c..7abb4306d9d1 100644 --- a/editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh +++ b/editors/libreoffice/files/patch-sysui__desktop__share__create_tree.sh @@ -1,6 +1,6 @@ ---- ./sysui/desktop/share/create_tree.sh.orig 2012-03-27 18:22:01.000000000 +0200 -+++ ./sysui/desktop/share/create_tree.sh 2012-04-23 19:19:44.734593732 +0200 -@@ -42,32 +42,32 @@ +--- ./sysui/desktop/share/create_tree.sh.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./sysui/desktop/share/create_tree.sh 2013-02-18 18:46:30.000000000 -0500 +@@ -60,32 +60,32 @@ chmod 0644 "${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}".* fi diff --git a/editors/libreoffice/files/disable-uno_test b/editors/libreoffice/files/patch-testtools__Module_testtools.mk index 12bcacc6b6db..974bcdb4e942 100644 --- a/editors/libreoffice/files/disable-uno_test +++ b/editors/libreoffice/files/patch-testtools__Module_testtools.mk @@ -1,5 +1,5 @@ ---- ./testtools/Module_testtools.mk.orig 2012-07-27 08:37:04.000000000 -0400 -+++ ./testtools/Module_testtools.mk 2012-08-21 12:06:21.000000000 -0400 +--- ./testtools/Module_testtools.mk.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./testtools/Module_testtools.mk 2013-02-22 14:30:43.000000000 -0500 @@ -55,14 +55,6 @@ #)) #endif diff --git a/editors/libreoffice/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx b/editors/libreoffice/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx index cc7ee34763be..c8e35c703002 100644 --- a/editors/libreoffice/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx +++ b/editors/libreoffice/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx @@ -1,11 +1,11 @@ ---- ./vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx.orig 2012-03-27 18:22:01.000000000 +0200 -+++ ./vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 2012-04-16 14:24:48.000000000 +0200 -@@ -3688,7 +3688,7 @@ +--- ./vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx.orig 2013-01-31 05:54:53.000000000 -0500 ++++ ./vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 2013-02-18 18:47:08.000000000 -0500 +@@ -4025,7 +4025,7 @@ aStyleSet.SetPreferredSymbolsStyleName( OUString::createFromAscii( pIconThemeName ) ); g_free( pIconThemeName ); - aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE ); + aStyleSet.SetToolbarIconSize( nDispDPIY > 160 ? STYLE_TOOLBAR_ICONSIZE_LARGE : STYLE_TOOLBAR_ICONSIZE_SMALL ); - const cairo_font_options_t* pNewOptions = NULL; #if !GTK_CHECK_VERSION(2,9,0) + static cairo_font_options_t* (*gdk_screen_get_font_options)(GdkScreen*) = |