diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-31 09:11:09 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-01 12:34:37 +0100 |
commit | ae5f89fdcccb2cf74256b04771249fc8afca8794 (patch) | |
tree | 7b9235188fbfc8fb74edf7be3e4c2c351638c8a3 /sd | |
parent | e02efb621fe672aa52e56caa916cf5c3fd0a9cb8 (diff) |
split out SFX_METRIC_ITEM into separate field
instead of overloading the nMemberId field
and thus fix various places that were effectively setting the METRIC
flag and causing a warning in SvxUnoConvertToMM
And fix bug in
sw/source/core/unocore/unomap.cxx
where the PropertyAttribute::READONLY was in the wrong place,
ever since
commit 84a3db80b4fd66c6854b3135b5f69b61fd828e62
Date: Mon Sep 18 23:08:29 2000 +0000
initial import
Change-Id: Ifc2bf56709f19aea75300b2fda62ce551efc26af
Reviewed-on: https://gerrit.libreoffice.org/48950
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 0c6d1fd7b877..9eff10023c07 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -179,20 +179,20 @@ void SdUnoForbiddenCharsTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) t } } -const sal_Int32 WID_MODEL_LANGUAGE = 1; -const sal_Int32 WID_MODEL_TABSTOP = 2; -const sal_Int32 WID_MODEL_VISAREA = 3; -const sal_Int32 WID_MODEL_MAPUNIT = 4; -const sal_Int32 WID_MODEL_FORBCHARS = 5; -const sal_Int32 WID_MODEL_CONTFOCUS = 6; -const sal_Int32 WID_MODEL_DSGNMODE = 7; -const sal_Int32 WID_MODEL_BASICLIBS = 8; -const sal_Int32 WID_MODEL_RUNTIMEUID = 9; -const sal_Int32 WID_MODEL_BUILDID = 10; -const sal_Int32 WID_MODEL_HASVALIDSIGNATURES = 11; -const sal_Int32 WID_MODEL_DIALOGLIBS = 12; -const sal_Int32 WID_MODEL_FONTS = 13; -const sal_Int32 WID_MODEL_INTEROPGRABBAG = 14; +const sal_uInt16 WID_MODEL_LANGUAGE = 1; +const sal_uInt16 WID_MODEL_TABSTOP = 2; +const sal_uInt16 WID_MODEL_VISAREA = 3; +const sal_uInt16 WID_MODEL_MAPUNIT = 4; +const sal_uInt16 WID_MODEL_FORBCHARS = 5; +const sal_uInt16 WID_MODEL_CONTFOCUS = 6; +const sal_uInt16 WID_MODEL_DSGNMODE = 7; +const sal_uInt16 WID_MODEL_BASICLIBS = 8; +const sal_uInt16 WID_MODEL_RUNTIMEUID = 9; +const sal_uInt16 WID_MODEL_BUILDID = 10; +const sal_uInt16 WID_MODEL_HASVALIDSIGNATURES = 11; +const sal_uInt16 WID_MODEL_DIALOGLIBS = 12; +const sal_uInt16 WID_MODEL_FONTS = 13; +const sal_uInt16 WID_MODEL_INTEROPGRABBAG = 14; const SvxItemPropertySet* ImplGetDrawModelPropertySet() { |