From 3340ce30562832b584dd0576d9e0733aa03d867f Mon Sep 17 00:00:00 2001 From: Szymon Kłos Date: Sat, 1 Jul 2017 20:30:43 +0200 Subject: tdf#108545 show an icon (DOCX inside DOCX) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If DrawAspect is equal "Icon", show an icon not document preview Document is opened in the separate window, not in-place. Change-Id: I3a8d81e7340b29d247f8ac440c06b0420bb65644 Reviewed-on: https://gerrit.libreoffice.org/39440 Tested-by: Jenkins Reviewed-by: Szymon Kłos --- sw/inc/cmdid.h | 1 + sw/inc/unoframe.hxx | 2 ++ sw/inc/unoprnms.hxx | 1 + 3 files changed, 4 insertions(+) (limited to 'sw/inc') diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 0c5726536511..91078196f67b 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -585,6 +585,7 @@ #define FN_MATH_BASELINE_ALIGNMENT (FN_EXTRA2 + 115) #define FN_EMBEDDED_OBJECT (FN_EXTRA2 + 116) +#define FN_UNO_DRAW_ASPECT (FN_EXTRA2 + 117) #define FN_UNO_HEADER_FIRST (FN_EXTRA2 + 118) #define FN_UNO_FOOTER_FIRST (FN_EXTRA2 + 119) #define FN_UNO_TABLE_BORDER2 (FN_EXTRA2 + 120) diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 4bf9e3aa0647..44e27f6434b6 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -71,6 +71,8 @@ private: SwPaM* m_pCopySource; + sal_Int64 m_nDrawAspect; + protected: css::uno::Reference< css::beans::XPropertySet > mxStyleData; css::uno::Reference< css::container::XNameAccess > mxStyleFamily; diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 24cc71cb8740..c78f08bf5577 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -813,6 +813,7 @@ #define UNO_NAME_EMBEDDED_OBJECT "EmbeddedObject" #define UNO_NAME_RSID "Rsid" #define UNO_NAME_PARRSID "ParRsid" +#define UNO_NAME_DRAW_ASPECT "DrawAspect" #define UNO_NAME_LINE_STYLE "LineStyle" #define UNO_NAME_LINE_WIDTH "LineWidth" -- cgit