diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-02-03 08:35:59 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-09 09:28:06 +0000 |
| commit | e0759e728436052e560285849b30a9ec8a13bef5 (patch) | |
| tree | 9a757ff4a17be2ed081f350af5c40e3b83e3407d /include | |
| parent | 059f6f1916c17ee3d78b2b815d01b59d7abf3924 (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/33872
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/core/xmlfilterbase.hxx | 6 | ||||
| -rw-r--r-- | include/svx/dialogs.hrc | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index 1a9be6a15ff9..83d8ff1585e4 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -233,6 +233,10 @@ public: bool isMSO2007Document() const; + /// Signal that an MSO 2007-created SmartArt was found, need to warn the + /// user about it. + void setMissingExtDrawing(); + void checkDocumentProperties( const css::uno::Reference<css::document::XDocumentProperties>& xDocProps); @@ -256,6 +260,8 @@ private: sal_Int32 mnRelId; sal_Int32 mnMaxDocId; bool mbMSO2007; +protected: + bool mbMissingExtDrawing; }; } // namespace core diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 589b6a8a7413..1c320896368d 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -981,9 +981,10 @@ #define RID_SVXSTR_ERR_REPEAT_PASSWD (SVX_OOO_BUILD_START + 8) // 1238 #define RID_SVXBMP_ZOOM_PAGE (SVX_OOO_BUILD_START + 9) // 1239 #define RID_SVXSTR_FIT_SLIDE (SVX_OOO_BUILD_START + 10) // 1240 +#define RID_SVXSTR_WARN_MISSING_SMARTART (SVX_OOO_BUILD_START + 11) // 1241 // sidebar-related resources -#define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1241) +#define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1242) #define IMG_SPACE3 (RID_SVX_SIDEBAR_BEGIN + 0) #define IMG_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN + 1) #define IMG_NONE_ICON (RID_SVX_SIDEBAR_BEGIN + 21) |