[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Tor Lillqvist]

 patches/dev300/pdf-link-export-fix.diff |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 31269e9cd4a492f8a41477f7d39a0d7a511bc233
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Apr 7 14:00:07 2011 +0300

    Make pdf-link-export-fix.diff apply again

diff --git a/patches/dev300/pdf-link-export-fix.diff b/patches/dev300/pdf-link-export-fix.diff
index 1bd93b0..2c33812 100644
--- a/patches/dev300/pdf-link-export-fix.diff
+++ b/patches/dev300/pdf-link-export-fix.diff
@@ -4,7 +4,7 @@ index d7e36f9..ec181ed 100644
 +++ sd/source/ui/unoidl/unomodel.cxx
 @@ -1947,7 +1947,9 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
                                      // if necessary, the master page interactions will be exported first
-                                     sal_Bool bIsBackgroundObjectsVisible = sal_False;	// SJ: #i39428# IsBackgroundObjectsVisible not available for Draw
+                                     sal_Bool bIsBackgroundObjectsVisible = sal_False;	// #i39428# IsBackgroundObjectsVisible not available for Draw
                                      const rtl::OUString sIsBackgroundObjectsVisible( RTL_CONSTASCII_USTRINGPARAM( "IsBackgroundObjectsVisible" ) );
 -                                    if ( mbImpressDoc && ( xPagePropSet->getPropertyValue( sIsBackgroundObjectsVisible ) >>= bIsBackgroundObjectsVisible ) && bIsBackgroundObjectsVisible )
 +                                    if ( xPagePropSet->getPropertySetInfo( )->hasPropertyByName( sIsBackgroundObjectsVisible ) )
@@ -175,7 +175,7 @@ index d7e36f9..ec181ed 100644
                              }
 @@ -2108,7 +2121,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
                              }
-                             //<--- i56629, i40318
+                             //<--- #i56629, #i40318
                          }
 -                        catch( uno::Exception& )
 +                        catch( uno::Exception& e )