[ooo-build-commit] .: 3 commits - patches/dev300 src/openintro_nld.bmp

[Tor Lillqvist]

 patches/dev300/apply                        |    9 ++++++++-
 patches/dev300/skip-empty-links-in-pdf.diff |   11 +++++++++++
 src/openintro_nld.bmp                       |binary
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 306939db66ccb9fd921eea8059eb9d22d48ecf6b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri May 7 15:02:56 2010 +0300

    Don't put bogus file links in exported presentation PDF
    
    In some cases when exporting a PDF from a presentation, we are asked
    to export an empty "link annotation", which gets turned into a rather
    bogus file: link to the directory the presentadion document is in.
    Just don't bother handling such empty "link annotations". Should fix
    bnc#598816.
    
    * patches/dev300/skip-empty-links-in-pdf.diff: New simple patch to
      vcl/source/gdi/pdfwriter_impl.cxx
    * patches/dev300/apply: Add it to Fixes.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index fd7886f..e8e5104 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3859,6 +3859,12 @@ vcl-limit-iterator-advance.diff, i#110806, dtardon
 moblin-netbook-theme.diff, i#103999, bnc#527356, tml
 metric-field-limits.diff, cbosdo
 
+# In some cases when exporting a PDF from a presentation, we are asked
+# to export an empty "link annotation", which gets turned into a
+# rather bogus file: link to the directory the presentadion document
+# is in.  Just don't bother handling such empty "link annotations".
+skip-empty-links-in-pdf.diff, bnc#598816, tml
+
 [ Features ]
 # embed generic media files inside odf docs, 2nd part
 # FIXME: this depends on sd-sound.diff
diff --git a/patches/dev300/skip-empty-links-in-pdf.diff b/patches/dev300/skip-empty-links-in-pdf.diff
new file mode 100644
index 0000000..70c873a
--- /dev/null
+++ b/patches/dev300/skip-empty-links-in-pdf.diff
@@ -0,0 +1,11 @@
+--- vcl/source/gdi/pdfwriter_impl.cxx
++++ vcl/source/gdi/pdfwriter_impl.cxx
+@@ -4144,6 +4144,8 @@ bool PDFWriterImpl::emitLinkAnnotations()
+     for( int i = 0; i < nAnnots; i++ )
+     {
+         const PDFLink& rLink			= m_aLinks[i];
++        if( rLink.m_aURL.getLength() == 0 )
++            continue;
+         if( ! updateObject( rLink.m_nObject ) )
+             continue;
+ 
commit a1646c50bad25768d400b14b15f68bb91154a53a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue May 4 14:33:04 2010 +0300

    Make space for progress bar in openintro_nld.bmp
    
    Make it wider and move the red "Novell" text down to make space for
    the progress bar's new size and location.

diff --git a/src/openintro_nld.bmp b/src/openintro_nld.bmp
index 2d2b48e..358379d 100644
Binary files a/src/openintro_nld.bmp and b/src/openintro_nld.bmp differ
commit 7daaad0388963409115ebe86dd5952fb8cef24da
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon May 3 16:44:34 2010 +0300

    Don't bother with fix-arm-eabi-bridge.diff on Windows
    
    It creats armhelper.S and deletes armhelper.s which gets interesting
    on a case-insensitive file system.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 48a7480..fd7886f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1227,7 +1227,8 @@ transex3-localize-gsicheck-path.diff, i#109378, pmladek
 
 [ Fixes < dev300-m66 ]
 armeabi-softfp-buildfix.diff, i#105302, doko
-[ Fixes ]
+
+[ Fixes and not Win32Only ]
 # fix ARM bridges
 fix-arm-eabi-bridge.diff, i#105359, cmc