diff options
| author | brian houston morrow <bhm@brianmorrow.net> | 2018-01-24 00:24:17 -0600 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2018-01-31 15:10:18 +0100 |
| commit | 7d11a1e1f0a282c73204af47e8dfcb767295d597 (patch) | |
| tree | 1e5ccc1c719dc4e6e5b05973cec219cd9d5773a4 /oox | |
| parent | c3e5fba9da796c8af47141cc98ef127cac0bbe7e (diff) | |
tdf#111417 Import read only property on ActiveX text box
Change-Id: I45d933ef308fbad31695cfc9f668eced4cd8e1f1
Reviewed-on: https://gerrit.libreoffice.org/48872
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 3 | ||||
| -rw-r--r-- | oox/source/token/properties.txt | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index db456b58f01d..9d5f4c5d27f2 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -1770,6 +1770,7 @@ void AxTextBoxModel::convertProperties( PropertyMap& rPropMap, const ControlConv { rPropMap.setProperty( PROP_MultiLine, getFlag( mnFlags, AX_FLAGS_MULTILINE ) ); rPropMap.setProperty( PROP_HideInactiveSelection, getFlag( mnFlags, AX_FLAGS_HIDESELECTION ) ); + rPropMap.setProperty( PROP_ReadOnly, getFlag( mnFlags, AX_FLAGS_LOCKED ) ); rPropMap.setProperty( mbAwtModel ? PROP_Text : PROP_DefaultText, maValue ); rPropMap.setProperty( PROP_MaxTextLen, getLimitedValue< sal_Int16, sal_Int32 >( mnMaxLength, 0, SAL_MAX_INT16 ) ); if( (0 < mnPasswordChar) && (mnPasswordChar <= SAL_MAX_INT16) ) @@ -1788,6 +1789,8 @@ void AxTextBoxModel::convertFromProperties( PropertySet& rPropSet, const Control setFlag( mnFlags, AX_FLAGS_WORDWRAP, bRes ); if ( rPropSet.getProperty( bRes, PROP_HideInactiveSelection ) ) setFlag( mnFlags, AX_FLAGS_HIDESELECTION, bRes ); + if ( rPropSet.getProperty( bRes, PROP_ReadOnly ) ) + setFlag( mnFlags, AX_FLAGS_LOCKED, bRes ); rPropSet.getProperty( maValue, ( mbAwtModel ? PROP_Text : PROP_DefaultText ) ); if (maValue.isEmpty() && !mbAwtModel) // No default value? Then try exporting the current one. diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index 5c79a83ed756..fabb7383a891 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -389,6 +389,7 @@ RangeXMaximum RangeXMinimum RangeYMaximum RangeYMinimum +ReadOnly RefAngle RefR RefX |