diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-07-31 12:33:41 +0200 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2012-08-01 10:24:40 +0100 |
| commit | 76c05c56d19f0643fb99375ef8315e931f87de59 (patch) | |
| tree | 190068a6261ec1e02c6102d60bd47b4315e80736 | |
| parent | 1db74f95ca260b65e04f7ed3e11f2bb36d3d8414 (diff) | |
fdo#45724 improve WW8 textbox export
If there is no default value, but there is a current one, export that
instead.
Change-Id: I01af5cfa641b061b0aeb959e579bca66340781e9
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index ff86c8dc5385..7756ebf890e2 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -1717,6 +1717,9 @@ void AxTextBoxModel::convertFromProperties( PropertySet& rPropSet, const Control if ( rPropSet.getProperty( bRes, PROP_HideInactiveSelection ) ) setFlag( mnFlags, AX_FLAGS_HIDESELECTION, bRes ); rPropSet.getProperty( maValue, ( mbAwtModel ? PROP_Text : PROP_DefaultText ) ); + if (maValue.isEmpty() && !mbAwtModel) + // No default value? Then try exporting the current one. + rPropSet.getProperty( maValue, PROP_Text); sal_Int16 nTmp(0); if ( rPropSet.getProperty( nTmp, PROP_MaxTextLen ) ) mnMaxLength = nTmp; |