diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-02-03 08:35:59 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-10 12:52:52 +0100 |
| commit | 5c330fdaeb86b298c9c404ee74996865f2854e71 (patch) | |
| tree | 668dc570695fda727ea955991ded4059fe3fcbaa /svx | |
| parent | 4db6de9b83d3aaaf33fc7ecc936e0a6324ca92a3 (diff) | |
tdf#105707 PPTX import: warn when SmartArt is missing DrawingML fallback
By the time DiagramGraphicDataContext::onCreateContext() completes, we
know if there will be a DrawingML fallback for the SmartArt (called
ExtDrawing in the code) or not.
Warn about this case once at the end of the import when in interactive
mode. Headless mode silently ignores the warning as expected.
(cherry picked from commit ae828495be9c2ac5fdb4c1747ed7bdd51e5d87a7)
Conflicts:
include/svx/dialogs.hrc
oox/source/core/xmlfilterbase.cxx
Change-Id: I2bfeeedcaa244f08d8a0c208167e79d7bb697e6d
Reviewed-on: https://gerrit.libreoffice.org/33873
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 3687612a93813449cfc68ce5ece3b785560b2e58)
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/stbctrls/stbctrls.src | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src index 0337f7788075..2be3e63af37b 100644 --- a/svx/source/stbctrls/stbctrls.src +++ b/svx/source/stbctrls/stbctrls.src @@ -119,6 +119,12 @@ String RID_SVXSTR_DOC_LOAD String RID_SVXSTR_FIT_SLIDE { Text [ en-US ] = "Fit slide to current window."; +} +; + +String RID_SVXSTR_WARN_MISSING_SMARTART +{ + Text [ en-US ] = "Could not load all SmartArts. Saving in Microsoft Office 2010 or later would avoid this issue."; }; String RID_SVXSTR_ZOOMTOOL_HINT |