[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-7' - sd/source

[Caolán McNamara]

 sd/source/filter/eppt/epptso.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2b5973f46a43781ece56ddaedc0c098760f33658
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 14 20:59:50 2015 +0100

    fix assert on re-export of ooo48994-1.ppt to ppt
    
    (cherry picked from commit eece059c1f728059b536763bffd2d4fc3537833e)
    Reviewed-on: https://gerrit.libreoffice.org/15314
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit d946f85440f4f225ecda88b121bad601b5573549)
    
    Change-Id: Ic8274e7d060f315d7891f8f5cf576f834ca89117
    Reviewed-on: https://gerrit.libreoffice.org/15429
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index bf8bd4f..2b13085 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1138,7 +1138,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
                                 aFile = aFile.replaceAll( "/", "\\" );
                                 aTarget = aFile;
                             }
-                            else if ( pFieldEntry->aFieldUrl[0] == '#' )
+                            else if ( pFieldEntry->aFieldUrl.startsWith("#") )
                             {
                                 OUString aPage( INetURLObject::decode( pFieldEntry->aFieldUrl, '%', INetURLObject::DECODE_WITH_CHARSET ) );
                                 aPage = aPage.copy( 1 );