[Libreoffice-commits] core.git: 2 commits - external/libmwaw tools/source

[Norbert Thiebaud]

 external/libmwaw/Library_mwaw.mk  |    6 ++++++
 tools/source/generic/rational.cxx |    7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 4b71bb35a7c04fef4ed86591d8892a29c4150c0b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 18 20:54:45 2014 -0500

    work around windows whining
    
    Change-Id: If2922bca25c93edc25e1171001def8ce3011cf4c

diff --git a/tools/source/generic/rational.cxx b/tools/source/generic/rational.cxx
index 1f2fc14..f99bdfa 100644
--- a/tools/source/generic/rational.cxx
+++ b/tools/source/generic/rational.cxx
@@ -128,10 +128,11 @@ void rational_ReduceInaccurate(boost::rational<sal_Int64>& rRational, unsigned n
     DBG_ASSERT(nSignificantBits<65, "More than 64 bit of significance is overkill!");
 
     // How much bits can we lose?
-    const int nMulBitsToLose = std::max( ( impl_NumberOfBits( nMul ) - int( nSignificantBits ) ), 0 );
-    const int nDivBitsToLose = std::max( ( impl_NumberOfBits( nDiv ) - int( nSignificantBits ) ), 0 );
+    const int nMulBitsToLose = impl_NumberOfBits( nMul ) - int( nSignificantBits );
+    const int nDivBitsToLose = impl_NumberOfBits( nDiv ) - int( nSignificantBits );
 
-    const int nToLose = std::min( nMulBitsToLose, nDivBitsToLose );
+    int nToLose = nMulBitsToLose < nDivBitsToLose ? nMulBitsToLose : nDivBitsToLose;
+    nToLose = nToLose < 0 ? 0 : nToLose;
 
     // Remove the bits
     nMul >>= nToLose;
commit b564162dbdc2c17673e08b4f799e09add190e9ed
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 18 20:53:01 2014 -0500

    fix libmwaw build on Windows
    
    Change-Id: I103ba777cc7f38f5df17995d9ef9bfb6d6cf133b

diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 92ab48a..ade8367 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
 	UnpackedTarball/libmwaw/src/lib/ClarisWksDbaseContent \
 	UnpackedTarball/libmwaw/src/lib/ClarisWksDocument \
 	UnpackedTarball/libmwaw/src/lib/ClarisWksGraph \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksPRPArser \
 	UnpackedTarball/libmwaw/src/lib/ClarisWksParser \
 	UnpackedTarball/libmwaw/src/lib/ClarisWksPresentation \
 	UnpackedTarball/libmwaw/src/lib/ClarisWksSSParser \
@@ -99,6 +100,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
 	UnpackedTarball/libmwaw/src/lib/MWAWPictBitmap \
 	UnpackedTarball/libmwaw/src/lib/MWAWPictData \
 	UnpackedTarball/libmwaw/src/lib/MWAWPictMac \
+	UnpackedTarball/libmwaw/src/lib/MWAWPresentationListener \
 	UnpackedTarball/libmwaw/src/lib/MWAWPrinter \
 	UnpackedTarball/libmwaw/src/lib/MWAWPropertyHandler \
 	UnpackedTarball/libmwaw/src/lib/MWAWRSRCParser \
@@ -111,6 +113,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
 	UnpackedTarball/libmwaw/src/lib/MWAWTable \
 	UnpackedTarball/libmwaw/src/lib/MWAWTextListener \
 	UnpackedTarball/libmwaw/src/lib/MacDocParser \
+	UnpackedTarball/libmwaw/src/lib/MacDrawParser \
+	UnpackedTarball/libmwaw/src/lib/MacDrawProParser \
+	UnpackedTarball/libmwaw/src/lib/MacDrawProStyleManager \
 	UnpackedTarball/libmwaw/src/lib/MacPaintParser \
 	UnpackedTarball/libmwaw/src/lib/MacWrtParser \
 	UnpackedTarball/libmwaw/src/lib/MacWrtProParser \
@@ -142,6 +147,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
 	UnpackedTarball/libmwaw/src/lib/NisusWrtText \
 	UnpackedTarball/libmwaw/src/lib/RagTimeParser \
 	UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \
+	UnpackedTarball/libmwaw/src/lib/RagTimeStruct \
 	UnpackedTarball/libmwaw/src/lib/RagTimeText \
 	UnpackedTarball/libmwaw/src/lib/SuperPaintParser \
 	UnpackedTarball/libmwaw/src/lib/TeachTxtParser \