diff options
| author | Noel Power <noel.power@novell.com> | 2012-05-22 10:08:26 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2012-05-22 10:20:44 +0100 |
| commit | e623ee66dfde0d5a2705e222aaa7ce580e409506 (patch) | |
| tree | 02647e6e70927e450ea5aef665ded863983df004 /xmloff/inc | |
| parent | 1543df470360d2e64428536a26a5996becc412d2 (diff) | |
make row heights ( incl default row height ) from excel are saved absolute
Currently default row heights imported from Excel are not adjusted Optimally ( AdjustRowHeight() is no longer called ) However to ensure correct round tripping the CR_MANUALSIZE flag *is* still set, this results in the style:use-optimal-row-height="true" being set for default row height(s) when saving as odf. So, for example absolute positions which are calculated on importing the Excel document ( where the row height is *not* optimally adjusted ) are still saved with the 'style:use-optimal-row-height' set. When the row heights are read back into calc the row sizes are changed any absolutely positioned objects are now out of place. This patch ensures *all* row heights are from an imported excel document are saved with style:use-optimal-row-height="false"
Change-Id: If898b97ddb0c8b59a401d7b3c133b0eec09cd1db
Diffstat (limited to 'xmloff/inc')
| -rw-r--r-- | xmloff/inc/xmloff/xmlaustp.hxx | 2 | ||||
| -rw-r--r-- | xmloff/inc/xmloff/xmltypes.hxx | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/xmloff/inc/xmloff/xmlaustp.hxx b/xmloff/inc/xmloff/xmlaustp.hxx index ba7783476d94..828ff54d7d3a 100644 --- a/xmloff/inc/xmloff/xmlaustp.hxx +++ b/xmloff/inc/xmloff/xmlaustp.hxx @@ -89,6 +89,8 @@ public: void AddFamily( sal_Int32 nFamily, const ::rtl::OUString& rStrName, const UniReference< SvXMLExportPropertyMapper >& rMapper, const ::rtl::OUString& rStrPrefix, sal_Bool bAsFamily = sal_True ); + void SetFamilyPropSetMapper( sal_Int32 nFamily, const ::rtl::OUString& rStrName, + const UniReference< SvXMLExportPropertyMapper >& rMapper ); /// Register a name that must not be used as a generated name. void RegisterName( sal_Int32 nFamily, const ::rtl::OUString& rName ); diff --git a/xmloff/inc/xmloff/xmltypes.hxx b/xmloff/inc/xmloff/xmltypes.hxx index 9aee08b6fc59..dc790e4ca51a 100644 --- a/xmloff/inc/xmloff/xmltypes.hxx +++ b/xmloff/inc/xmloff/xmltypes.hxx @@ -280,6 +280,7 @@ #define XML_TYPE_TEXT_OVERLINE_WIDTH (XML_TEXT_TYPES_START + 111) #define XML_TYPE_TEXT_OVERLINE_COLOR (XML_TEXT_TYPES_START + 112) #define XML_TYPE_TEXT_OVERLINE_HASCOLOR (XML_TEXT_TYPES_START + 113) +#define XML_TYPE_BOOL_FALSE (XML_TEXT_TYPES_START + 114) #define XML_SCH_TYPES_START (0x4 << XML_TYPE_APP_SHIFT) #define XML_PM_TYPES_START (0x5 << XML_TYPE_APP_SHIFT) // page master |