[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sfx2/source

[Caolán McNamara]

 sfx2/source/appl/linkmgr2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2d8798e42cc11c0ed414014a8453e89bb6ab410
Author: Caolán McNamara <caol...@redhat.com>
Date:   Tue Jun 16 16:43:15 2015 +0100

    crash on use of 'echo hello' as dde command in insert section
    
    Change-Id: Ic46be8ac6da04663096e682d17faa214b324e8bf
    (cherry picked from commit ff2dd7942e42476432c2db08da71d85be7a14075)
    (cherry picked from commit b5fa5c0324298e70fcbfbde482fea6d554fc8760)
    Reviewed-on: https://gerrit.libreoffice.org/16313
    Reviewed-by: Michael Stahl <mst...@redhat.com>
    Tested-by: Michael Stahl <mst...@redhat.com>

diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 314cd81..ebcb1d5 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -272,7 +272,7 @@ bool LinkManager::GetDisplayNames( const SvBaseLink * pLink,
                     if( pFile )
                         *pFile = sTopic;
                     if( pLinkStr )
-                        *pLinkStr = sCmd.copy( nTmp );
+                        *pLinkStr = nTmp != -1 ? sCmd.copy(nTmp) : OUString();
                     bRet = true;
                 }
                 break;

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits