diff options
| author | László Németh <nemeth@numbertext.org> | 2018-12-18 14:13:09 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2018-12-19 07:57:46 +0100 |
| commit | 69ce3374f90847f357249a41118314508da6bb98 (patch) | |
| tree | 9448aba709a8bbc9d68482bdaad02f185b38c5fb /sw/inc | |
| parent | 05cbfa4cca3dc77dcdcdd5d87de7baf37485d852 (diff) | |
tdf#99631 DOCX import: keep zoom of embedded XLSX
OLE objects by importing their VisibleArea settings
This also reverts commit 5c1a6c9adb5ccfbb869a0a7ac730d8860a1bf405
"tdf#99631 DOCX import: set 1:1 scale in embedded XLSX".
Change-Id: I73dc945c86d0200e72767810b2ff39f233729080
Reviewed-on: https://gerrit.libreoffice.org/65343
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/cmdid.h | 2 | ||||
| -rw-r--r-- | sw/inc/unoframe.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/unoprnms.hxx | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index d829c3d45fe2..28a13ea71abd 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -599,6 +599,8 @@ #define FN_UNO_HIDDEN (FN_EXTRA2 + 122) #define FN_UNO_STYLE_INTEROP_GRAB_BAG (FN_EXTRA2 + 123) #define FN_UNO_TABLE_TEMPLATE_NAME (FN_EXTRA2 + 124) +#define FN_UNO_VISIBLE_AREA_WIDTH (FN_EXTRA2 + 125) +#define FN_UNO_VISIBLE_AREA_HEIGHT (FN_EXTRA2 + 126) // Area: Help // Region: Traveling & Selection diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 41dc3292c53c..43876e94a580 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -72,6 +72,8 @@ private: std::unique_ptr<SwPaM> m_pCopySource; sal_Int64 m_nDrawAspect; + sal_Int64 m_nVisibleAreaWidth; + sal_Int64 m_nVisibleAreaHeight; protected: css::uno::Reference< css::beans::XPropertySet > mxStyleData; diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 3e0383961b7a..b2de700dd23f 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -822,6 +822,8 @@ #define UNO_NAME_RSID "Rsid" #define UNO_NAME_PARRSID "ParRsid" #define UNO_NAME_DRAW_ASPECT "DrawAspect" +#define UNO_NAME_VISIBLE_AREA_WIDTH "VisibleAreaWidth" +#define UNO_NAME_VISIBLE_AREA_HEIGHT "VisibleAreaHeight" #define UNO_NAME_LINE_STYLE "LineStyle" #define UNO_NAME_LINE_WIDTH "LineWidth" |