[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                         |    2 ++
 patches/dev300/sw-doc-image-export-size.diff |   11 +++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 99727389003d03f7c7ae579adbaf44aa7394eadd
Author: Miguel Freitas <mfreitas at gmail.com>
Date:   Thu Nov 12 15:01:16 2009 +0200

    Correct short/ushort confusion in image export to .doc
    
    bnc#554549, i#59648.
    
    Signed-off-by: Tor Lillqvist <tlillqvist at novell.com>

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 40f9bfc..f05f5c7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3400,6 +3400,8 @@ sw-ww8-textframe-background-fix.diff, Fong, n#547308
 sw-ww8-import-list-fix.diff, Fong, n#547308
 # show insertion change first
 sw-changes-format-fix.diff, Fong, n#545815
+# short/ushort mixup
+sw-doc-image-export-size.diff, bnc#554549, i#59648, tml
 
 [ NLPSolverBits ]
 # build NLPSolver extension when enabled (fate#304653)
diff --git a/patches/dev300/sw-doc-image-export-size.diff b/patches/dev300/sw-doc-image-export-size.diff
new file mode 100644
index 0000000..d878750
--- /dev/null
+++ b/patches/dev300/sw-doc-image-export-size.diff
@@ -0,0 +1,11 @@
+--- sw/source/filter/ww8/wrtww8gr.cxx
++++ sw/source/filter/ww8/wrtww8gr.cxx
+@@ -608,7 +608,7 @@
+     substitute the final size and loose on retaining the scaling factor but
+     still keep the correct display size anyway.
+     */
+-    if ( (aGrTwipSz.Width() > USHRT_MAX) || (aGrTwipSz.Height() > USHRT_MAX)
++    if ( (aGrTwipSz.Width() > SHRT_MAX) || (aGrTwipSz.Height() > SHRT_MAX)
+         || (aGrTwipSz.Width() < 0 ) || (aGrTwipSz.Height() < 0) )
+     {
+         aGrTwipSz.Width() = nWidth;