diff options
| author | Tsutomu Uchino <hanya@apache.org> | 2015-01-26 09:06:52 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-27 10:46:43 +0000 |
| commit | 41146013ad088e6539335454edffc0a394a1d24f (patch) | |
| tree | 4a199009b5b977dcd43b253664be8e75cb1995e1 /toolkit | |
| parent | dbf15c904425a4358b3c930ddff4c01982138ef6 (diff) | |
Resolves: #i98734# save/load ScaleMode property of image control on dialogs
Suggested by: Frank Schönheit <frank.schoenheit@gmx.de>
(cherry picked from commit 350c4f9a01b88d4fd1006465151348ac5d459f1a)
Conflicts:
xmlscript/source/xmldlg_imexp/exp_share.hxx
xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
Change-Id: I2a11809112c0b1b53349f5b74dca20897d4a6acd
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/helper/property.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx index 49df534f6faa..4b63b5cb8327 100644 --- a/toolkit/source/helper/property.cxx +++ b/toolkit/source/helper/property.cxx @@ -203,7 +203,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount ) DECL_PROP_2 ( "AutoRepeat", AUTO_REPEAT, sal_Bool, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "RepeatDelay", REPEAT_DELAY, sal_Int32, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "ScaleImage", SCALEIMAGE, bool, BOUND, MAYBEDEFAULT ), - DECL_PROP_2 ( "ScaleMode", IMAGE_SCALE_MODE, sal_Int16, BOUND, MAYBEDEFAULT ), + DECL_DEP_PROP_2 ( "ScaleMode", IMAGE_SCALE_MODE, sal_Int16, BOUND, MAYBEDEFAULT ), DECL_DEP_PROP_3 ( "ScrollValue", SCROLLVALUE, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID ), DECL_PROP_2 ( "ScrollValueMax", SCROLLVALUE_MAX, sal_Int32, BOUND, MAYBEDEFAULT ), DECL_PROP_2 ( "ScrollValueMin", SCROLLVALUE_MIN, sal_Int32, BOUND, MAYBEDEFAULT ), |