[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Libreoffice Gerrit user]

 sw/source/core/text/portxt.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit df15a240c409ddfd71bb969f2427c7ad846321e6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 13 16:35:06 2012 +0000

    Resolves: fdo#32181 #i68503# don't emit pesky space unless in tagged pdf mode
    
    which means that they are not there to be underlined
    
    Change-Id: Ic02372c5284384e18198ebea44c36e83ccb6bf2a
    (cherry picked from commit d3a9e97164c0071d8b18f8dcf4197ec7c5c5c2f9)
    Reviewed-on: https://gerrit.libreoffice.org/1328
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 3932f37..5b1f9f4 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -32,6 +32,7 @@
 
 #include <com/sun/star/i18n/ScriptType.hdl>
 #include <hintids.hxx>     // CH_TXTATR
+#include <EnhancedPDFExportHelper.hxx>
 #include <SwPortionHandler.hxx>
 #include <porlay.hxx>
 #include <inftxt.hxx>
@@ -727,7 +728,8 @@ SwLinePortion *SwHolePortion::Compress() { return this; }
 void SwHolePortion::Paint( const SwTxtPaintInfo &rInf ) const
 {
     // #i16816# tagged pdf support
-    if( rInf.GetVsh() && rInf.GetVsh()->GetViewOptions()->IsPDFExport() )
+    if( rInf.GetVsh() && rInf.GetVsh()->GetViewOptions()->IsPDFExport() &&
+        SwTaggedPDFHelper::IsExportTaggedPDF( *rInf.GetOut()) )
     {
         const XubString aTxt( ' ' );
         rInf.DrawText( aTxt, *this, 0, 1, false );