summaryrefslogtreecommitdiff
path: root/xmloff/inc
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-02-02 12:07:59 +0100
committerMichael Stahl <mstahl@redhat.com>2012-02-02 14:36:17 +0100
commit0b7bba10208d198471cbdb56c2007e5cdb00a6ac (patch)
tree77a456c2bf28d4dd30bd5dc8175cee8ca194f811 /xmloff/inc
parent790365e79d28e2c2a41140707ac126dbf6966e38 (diff)
fdo#45449: ODF export: frames: invalid "min-width"
XMLTextParagraphExport::addTextFrameAttributes: delay writing of the fo:min-width and fo:min-height attributes so that they end up at the draw:text-box element, and not at draw:frame where they are invalid. Testing reveals that the ODF import can already handle reading the attributes from the draw:text-box elements, so there doesn't seem to be a backward compatibility problem.
Diffstat (limited to 'xmloff/inc')
-rw-r--r--xmloff/inc/xmloff/txtparae.hxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx
index 02eb4b66d51a..11e014085855 100644
--- a/xmloff/inc/xmloff/txtparae.hxx
+++ b/xmloff/inc/xmloff/txtparae.hxx
@@ -263,7 +263,8 @@ protected:
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& rPropSet,
sal_Bool bShape,
- ::rtl::OUString *pMinHeightValue = 0 );
+ ::rtl::OUString *pMinHeightValue = 0,
+ ::rtl::OUString *pMinWidthValue = 0 );
virtual void exportStyleAttributes(
const ::com::sun::star::uno::Reference<