diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:36:43 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:36:43 +0000 |
commit | e63e64c3367b2e27e556ffb1d9727129f0f3075e (patch) | |
tree | b8af27108eb9b337f2f2adc4e5ee8e946d74918d /dbaccess/source/ui/control/marktree.cxx | |
parent | 2b081672f5b36de41b1e13b22e6f33a84cddf5e4 (diff) |
INTEGRATION: CWS insight01 (1.11.16); FILE MERGED
2004/07/09 14:05:15 oj 1.11.16.3: resource changes
2003/08/20 08:19:40 oj 1.11.16.2: #98349# don't display dialog if conenction could not be established
2003/08/15 08:51:04 oj 1.11.16.1: #111075# ongoing new dbaapp work
Diffstat (limited to 'dbaccess/source/ui/control/marktree.cxx')
-rw-r--r-- | dbaccess/source/ui/control/marktree.cxx | 43 |
1 files changed, 14 insertions, 29 deletions
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 679251becdd1..f5ef25c593cb 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -2,9 +2,9 @@ * * $RCSfile: marktree.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2003-06-06 10:48:15 $ + * last change: $Author: hr $ $Date: 2004-08-02 15:36:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,18 +75,22 @@ //......................................................................... namespace dbaui { + using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::lang; //......................................................................... #define SPACEBETWEENENTRIES 4 //======================================================================== //= OMarkableTreeListBox //======================================================================== //------------------------------------------------------------------------ -OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, WinBits nWinStyle ) : SvTreeListBox(pParent,nWinStyle) +OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nWinStyle ) + : DBTreeListBox(pParent,_rxORB,nWinStyle) { InitButtonData(); } //------------------------------------------------------------------------ -OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const ResId& rResId) : SvTreeListBox(pParent,rResId) +OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, const ResId& rResId) + : DBTreeListBox(pParent,_rxORB,rResId) { InitButtonData(); } @@ -95,11 +99,6 @@ OMarkableTreeListBox::~OMarkableTreeListBox() { delete m_pCheckButton; } -// ----------------------------------------------------------------------------- -void OMarkableTreeListBox::notifyHiContrastChanged() -{ - // old actions now done in SvTreeListBox::DataChanged() / InitSettings() -} //------------------------------------------------------------------------ void OMarkableTreeListBox::Paint(const Rectangle& _rRect) { @@ -112,21 +111,16 @@ void OMarkableTreeListBox::Paint(const Rectangle& _rRect) aNewFont.SetColor(aSystemStyle.GetDisableColor()); SetFont(aNewFont); - SvTreeListBox::Paint(_rRect); + DBTreeListBox::Paint(_rRect); SetFont(aOldFont); } else - SvTreeListBox::Paint(_rRect); + DBTreeListBox::Paint(_rRect); } //------------------------------------------------------------------------ void OMarkableTreeListBox::InitButtonData() { - USHORT nSize = SPACEBETWEENENTRIES; - SetSpaceBetweenEntries(nSize); - SetNodeDefaultImages( ); - m_pCheckButton = new SvLBoxButtonData( this ); - OMarkableTreeListBox::notifyHiContrastChanged(); EnableCheckButton( m_pCheckButton ); } //------------------------------------------------------------------------ @@ -147,10 +141,10 @@ void OMarkableTreeListBox::KeyInput( const KeyEvent& rKEvt ) CheckButtonHdl(); } else - SvTreeListBox::KeyInput(rKEvt); + DBTreeListBox::KeyInput(rKEvt); } else - SvTreeListBox::KeyInput(rKEvt); + DBTreeListBox::KeyInput(rKEvt); } //------------------------------------------------------------------------ @@ -161,7 +155,7 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry) // nothing to do in this bottom-up routine if there are no children ... return eState; #ifdef DBG_UTIL - String sEntryText = GetEntryText(_pEntry); + String sEntryText =GetEntryText(_pEntry); #endif // loop through the children and check their states @@ -172,7 +166,7 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry) while (pChildLoop) { #ifdef DBG_UTIL - String sChildText = GetEntryText(pChildLoop); + String sChildText =GetEntryText(pChildLoop); #endif SvButtonState eChildState = implDetermineState(pChildLoop); if (SV_BUTTON_TRISTATE == eChildState) @@ -344,15 +338,6 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) } //------------------------------------------------------------------------ -SvLBoxEntry* OMarkableTreeListBox::GetEntryPosByName(const String& aName,SvLBoxEntry* pStart) const -{ - SvLBoxEntry* pEntry = pStart ? GetModel()->FirstChild(pStart) : GetModel()->First(); - while(pEntry && !GetEntryText(pEntry).Equals(aName)) - pEntry = GetModel()->Next(pEntry); - - return pEntry; -} - //......................................................................... } // namespace dbaui //......................................................................... |