diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-05 11:22:58 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-05 11:22:58 +0000 |
| commit | 0636e34fcf7f68051fa89dd9ded80456030b3fea (patch) | |
| tree | 4ce4fc1ec6920d7700d910bc91e4b560ccb02089 | |
| parent | bf4812821bb7d02d1273b69ae12b1037afd81453 (diff) | |
INTEGRATION: CWS dba20 (1.2.278); FILE MERGED
2004/11/29 11:19:58 oj 1.2.278.2: RESYNC: (1.2-1.3); FILE MERGED
2004/11/19 15:11:52 fs 1.2.278.1: #i37434# canColorBorder: also take into account the type of the control
| -rw-r--r-- | svx/source/inc/fmcontrolbordermanager.hxx | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index 256ebcbe0578..a1b684fbdab9 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmcontrolbordermanager.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: obo $ $Date: 2004-11-16 11:29:29 $ + * last change: $Author: obo $ $Date: 2005-01-05 12:22:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,6 +76,9 @@ #include <com/sun/star/awt/XVclWindowPeer.hpp> #endif /** === end UNO includes === **/ +#ifndef _COMPHELPER_STLTYPES_HXX_ +#include <comphelper/stl_types.hxx> +#endif #ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> @@ -112,6 +115,11 @@ namespace svxform ,nBorderColor( 0x00000000 ) { } + inline void clear() + { + nBorderType = ::com::sun::star::awt::VisualEffect::FLAT; + nBorderColor = 0x00000000; + } }; //==================================================================== @@ -133,6 +141,12 @@ namespace svxform ,nUnderlineColor( _nUnderlineColor ) { } + + inline void clear() + { + nUnderlineType = ::com::sun::star::awt::FontUnderline::NONE; + nUnderlineColor = 0x00000000; + } }; //==================================================================== @@ -148,6 +162,13 @@ namespace svxform :xControl( _rxControl ) { } + void clear() + { + BorderDescriptor::clear(); + UnderlineDescriptor::clear(); + xControl.clear(); + sOriginalHelpText = ::rtl::OUString(); + } }; //==================================================================== @@ -172,13 +193,19 @@ namespace svxform }; typedef ::std::set< ControlData, ControlDataCompare > ControlBag; + typedef ::com::sun::star::awt::XVclWindowPeer WindowPeer; + typedef ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > WindowPeerRef; + typedef ::std::set< WindowPeerRef, ::comphelper::OInterfaceCompare< WindowPeer > > PeerBag; + + PeerBag m_aColorableControls; + PeerBag m_aNonColorableControls; - // ---------------- - // attributes ControlData m_aFocusControl; ControlData m_aMouseHoverControl; ControlBag m_aInvalidControls; + // ---------------- + // attributes sal_Int32 m_nFocusColor; sal_Int32 m_nMouseHoveColor; sal_Int32 m_nInvalidColor; |