From 0b7bba10208d198471cbdb56c2007e5cdb00a6ac Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 2 Feb 2012 12:07:59 +0100 Subject: 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. --- xmloff/inc/xmloff/txtparae.hxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xmloff/inc') 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< -- cgit