mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: fdo#71309 Export SWF with Multiple files crashes

Browse Source 
In case of unamed file, creation of sPresentationName crash.
This patch forces creation of empty name

Change-Id: I1b5319eb945f1959f2ad3c703365539508521861
Reviewed-on: https://gerrit.libreoffice.org/6598
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Laurent Balland-Poirier
2013-11-06 17:57:09 +01:00
committed by Caolán McNamara
parent a71afa2ffc
commit 2cf96ae334
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
filter/source/flash/swffilter.cxx
View File

@@ -285,16 +285,20 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue
// AS: sPath is the parent directory, where everything else exists (like the sxi,
// the -swf-files folder, the -audio files, etc.
int lastslash = sOriginalPath.lastIndexOf('/');
sal_Int32 lastslash = sOriginalPath.lastIndexOf('/');
OUString sPath( sOriginalPath.copy(0, lastslash) );
OUString sPresentation(xStorable->getLocation());
lastslash = sPresentation.lastIndexOf('/') + 1;
int lastdot = sPresentation.lastIndexOf('.');
sal_Int32 lastdot = sPresentation.lastIndexOf('.');
// AS: The name of the presentation, without 3 character extension.
OUString sPresentationName = sPresentation.copy(lastslash, lastdot - lastslash);
OUString sPresentationName;
if (lastdot < 0) // fdo#71309 in case file has no name
sPresentationName = sPresentation.copy(lastslash);
else
sPresentationName = sPresentation.copy(lastslash, lastdot - lastslash);
OUString fullpath, swfdirpath, backgroundfilename, objectsfilename;