diff options
| author | Armin Le Grand <alg@apache.org> | 2013-04-22 15:38:05 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:18 +0100 |
| commit | 60285fdc868635f99644ef1d8a195a2be87074c7 (patch) | |
| tree | dbd69b9d424b527357c2ba33c2256e99edca3d91 /include/svtools/valueset.hxx | |
| parent | Resolves: #i122095# React asynchronously to context changes (diff) | |
| download | core-60285fdc868635f99644ef1d8a195a2be87074c7.tar.gz core-60285fdc868635f99644ef1d8a195a2be87074c7.zip | |
Related: #i122041# More unifications for FillStyles
better defaults and better preview visualizations
(cherry picked from commit 35c9acfc98fc98399005815e0464b1944f327d4e)
Conflicts:
officecfg/registry/schema/org/openoffice/Office/Common.xcs
svtools/inc/svtools/accessibilityoptions.hxx
svtools/inc/svtools/valueset.hxx
svtools/source/config/accessibilityoptions.cxx
svtools/source/control/ctrlbox.cxx
svtools/source/control/valueset.cxx
svtools/source/inc/configitems/accessibilityoptions_const.hxx
svx/inc/svx/dlgctrl.hxx
svx/inc/svx/xtable.hxx
svx/source/dialog/dlgctrl.cxx
svx/source/tbxctrls/SvxColorValueSet.cxx
svx/source/xoutdev/xtabdash.cxx
svx/source/xoutdev/xtable.cxx
vcl/inc/ilstbox.hxx
vcl/inc/vcl/combobox.hxx
vcl/inc/vcl/lstbox.hxx
vcl/inc/vcl/settings.hxx
vcl/source/app/settings.cxx
vcl/source/control/combobox.cxx
vcl/source/control/ilstbox.cxx
vcl/source/control/lstbox.cxx
Change-Id: I905b6814cb796a35aa23fedb9ce716f77e2bfda0
Diffstat (limited to 'include/svtools/valueset.hxx')
| -rw-r--r-- | include/svtools/valueset.hxx | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 70fcd008c363..d26705a3324d 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -214,15 +214,21 @@ private: long mnLines; long mnUserItemWidth; long mnUserItemHeight; - sal_uInt16 mnSelItemId; - sal_uInt16 mnHighItemId; - sal_uInt16 mnCols; - sal_uInt16 mnCurCol; - sal_uInt16 mnUserCols; - sal_uInt16 mnUserVisLines; - sal_uInt16 mnFirstLine; - sal_uInt16 mnSpacing; - sal_uInt16 mnFrameStyle; + sal_uInt16 mnSelItemId; + sal_uInt16 mnHighItemId; + sal_uInt16 mnCols; + sal_uInt16 mnCurCol; + sal_uInt16 mnUserCols; + sal_uInt16 mnUserVisLines; + sal_uInt16 mnFirstLine; + sal_uInt16 mnSpacing; + sal_uInt16 mnFrameStyle; + Color maColor; + Link maDoubleClickHdl; + Link maSelectHdl; + Link maHighlightHdl; + + // bitfield bool mbFormat : 1; bool mbHighlight : 1; bool mbSelection : 1; @@ -232,12 +238,9 @@ private: bool mbDoubleSel : 1; bool mbScroll : 1; bool mbFullMode : 1; + bool mbEdgeBlending : 1; bool mbIsTransientChildrenDisabled : 1; bool mbHasVisibleItems : 1; - Color maColor; - Link maDoubleClickHdl; - Link maSelectHdl; - Link maHighlightHdl; friend class ValueSetAcc; friend class ValueItemAcc; @@ -380,6 +383,9 @@ public: const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } void SetHighlightHdl( const Link& rLink ); + + bool GetEdgeBlending() const { return mbEdgeBlending; } + void SetEdgeBlending(bool bNew); }; #endif // _VALUESET_HXX |