[Libreoffice-commits] .: 2 commits - cppunit/android.patch cppunit/disable-dynloading.patch cppunit/ios.patch cppunit/makefile.mk cppunit/unix.patch cppunit/windows.patch ooo.lst.in sc/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Sep 25 12:54:44 PDT 2012
cppunit/android.patch | 12 ++++++------
cppunit/disable-dynloading.patch | 4 ++--
cppunit/ios.patch | 4 ++--
cppunit/makefile.mk | 4 ++--
cppunit/unix.patch | 4 ++--
cppunit/windows.patch | 8 ++++----
ooo.lst.in | 2 +-
sc/source/core/tool/rangelst.cxx | 14 ++++++++++++++
8 files changed, 33 insertions(+), 19 deletions(-)
New commits:
commit 51734600c5c9826d6c9a0d5f4cb983d08f2ab698
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Tue Sep 25 21:48:54 2012 +0200
workaround broken uno implementation with ScRangeList in ScCellRangeObj
ScCellRangesBase uses a ScRangeList to keep track of the range but the
ScCellRangeObj class which inherits from it can not deal with more than
one range. This is a temporary workaround for this problem. We need to
think about a better solution for ScCellRangeObj to prevent such
problems in the future.
Change-Id: I4403e55f605267ef99eb6a73302366cf024b3866
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 8aae801..c9c4c3e 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -434,6 +434,9 @@ bool ScRangeList::UpdateReference(
}
}
+ if(maRanges.empty())
+ return true;
+
iterator itr = maRanges.begin(), itrEnd = maRanges.end();
for (; itr != itrEnd; ++itr)
{
@@ -456,6 +459,17 @@ bool ScRangeList::UpdateReference(
pR->aEnd.Set( theCol2, theRow2, theTab2 );
}
}
+
+ if(eUpdateRefMode == URM_INSDEL)
+ {
+ if( nDx < 0 || nDy < 0 )
+ {
+ size_t n = maRanges.size();
+ for(size_t i = n-1; i > 0; --i)
+ Join(*maRanges[i], true);
+ }
+ }
+
return bChanged;
}
commit 342211da33d7b604791fa8ebe2a6cb10445d8392
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Tue Sep 25 19:59:50 2012 +0200
update cppunit to 1.13.1
Change-Id: I13a74ca921bb4b0766fab2123f46a97c90372a44
diff --git a/cppunit/android.patch b/cppunit/android.patch
index e5671a0..deabf3b 100644
--- a/cppunit/android.patch
+++ b/cppunit/android.patch
@@ -1,5 +1,5 @@
---- misc/cppunit-1.13.0/config/config.sub
-+++ misc/build/cppunit-1.13.0/config/config.sub
+--- misc/cppunit-1.13.1/config/config.sub
++++ misc/build/cppunit-1.13.1/config/config.sub
@@ -120,7 +120,7 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
@@ -18,8 +18,8 @@
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
---- misc/cppunit-1.13.0/config/ltmain.sh
-+++ misc/build/cppunit-1.13.0/config/ltmain.sh
+--- misc/cppunit-1.13.1/config/ltmain.sh
++++ misc/build/cppunit-1.13.1/config/ltmain.sh
@@ -3228,6 +3228,12 @@
fi
else
@@ -33,8 +33,8 @@
# Parse the version information argument.
save_ifs="$IFS"; IFS=':'
set dummy $vinfo 0 0 0
---- misc/cppunit-1.13.0/src/cppunit/UnixDynamicLibraryManager.cpp
-+++ misc/build/cppunit-1.13.0/src/cppunit/UnixDynamicLibraryManager.cpp
+--- misc/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp
++++ misc/build/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp
@@ -13,7 +13,15 @@
DynamicLibraryManager::LibraryHandle
DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
diff --git a/cppunit/disable-dynloading.patch b/cppunit/disable-dynloading.patch
index ffe01d3..14b6d29 100644
--- a/cppunit/disable-dynloading.patch
+++ b/cppunit/disable-dynloading.patch
@@ -1,5 +1,5 @@
---- misc/build/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h
-+++ misc/build/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h
+--- misc/build/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h
++++ misc/build/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h
@@ -106,7 +106,9 @@
* CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void);
* \endcode
diff --git a/cppunit/ios.patch b/cppunit/ios.patch
index 55ee65c..998bbe5 100644
--- a/cppunit/ios.patch
+++ b/cppunit/ios.patch
@@ -1,5 +1,5 @@
---- misc/build/cppunit-1.13.0/configure
-+++ misc/build/cppunit-1.13.0/configure
+--- misc/build/cppunit-1.13.1/configure
++++ misc/build/cppunit-1.13.1/configure
@@ -23273,7 +23273,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
$as_echo "creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6; }
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 9dab3ca..adeb909 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -29,8 +29,8 @@ TARGET = cppunit
.INCLUDE: settings.mk
-TARFILE_NAME=cppunit-1.13.0
-TARFILE_MD5=0c65c839854edd43d9294d1431a2b292
+TARFILE_NAME=cppunit-1.13.1
+TARFILE_MD5=fa9aa839145cdf860bf596532bb8af97
PATCH_FILES = windows.patch unix.patch
diff --git a/cppunit/unix.patch b/cppunit/unix.patch
index 2c55463..0a153ad 100644
--- a/cppunit/unix.patch
+++ b/cppunit/unix.patch
@@ -1,5 +1,5 @@
---- misc/cppunit-1.13.0/src/cppunit/UnixDynamicLibraryManager.cpp
-+++ misc/build/cppunit-1.13.0/src/cppunit/UnixDynamicLibraryManager.cpp
+--- misc/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp
++++ misc/build/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp
@@ -34,7 +34,11 @@
std::string
DynamicLibraryManager::getLastErrorDetail() const
diff --git a/cppunit/windows.patch b/cppunit/windows.patch
index c23477d..c8ea6d7 100644
--- a/cppunit/windows.patch
+++ b/cppunit/windows.patch
@@ -1,5 +1,5 @@
---- misc/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:25.084658287 +0100
-+++ misc/build/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:18.660706180 +0100
+--- misc/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:25.084658287 +0100
++++ misc/build/cppunit-1.13.1/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:18.660706180 +0100
@@ -133,9 +133,8 @@
/*! \def CPPUNIT_PLUGIN_IMPLEMENT_MAIN()
* \brief Implements the 'main' function for the plug-in.
@@ -34,8 +34,8 @@
typedef char __CppUnitPlugInImplementMainDummyTypeDef
// Unix
---- misc/cppunit-1.13.0/include/cppunit/TestAssert.h
-+++ misc/build/cppunit-1.13.0/include/cppunit/TestAssert.h
+--- misc/cppunit-1.13.1/include/cppunit/TestAssert.h
++++ misc/build/cppunit-1.13.1/include/cppunit/TestAssert.h
@@ -76,7 +76,7 @@
const int precision = 15;
#endif // #ifdef DBL_DIG
diff --git a/ooo.lst.in b/ooo.lst.in
index dfed3ab..1118d0f 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -33,7 +33,7 @@ f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz
8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
-0c65c839854edd43d9294d1431a2b292-cppunit-1.13.0.tar.gz
+fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz
a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz
a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
More information about the Libreoffice-commits
mailing list