diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-07-22 13:08:24 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-07-22 13:08:24 +0200 |
| commit | 69b48fb7fa47b4fa60b7c21f610f4eeace90fb78 (patch) | |
| tree | 58ff7e23f34a12963620e4884dbae70cfa3ae54b /dbaccess/source/ui/browser | |
| parent | 6c16430117277b381160ba4de249a71f49a9ed07 (diff) | |
| parent | 3df7d157d6f3210b7547aaf26e26dd0416fe3462 (diff) | |
CWS-TOOLING: integrate CWS dba33g
Notes
Notes:
split repo tag: base_ooo/OOO330_m2
split repo tag: base_ooo/OOO330_m3
split repo tag: base_ooo/OOO330_m4
split repo tag: base_ooo/OOO330_m5
split repo tag: base_ooo/OOO330_m6
Diffstat (limited to 'dbaccess/source/ui/browser')
| -rw-r--r-- | dbaccess/source/ui/browser/brwctrlr.cxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/unodatbr.cxx | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index c14e5a514298..6a2161b1c291 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2751,6 +2751,7 @@ void SbaXDataBrowserController::unloading(const EventObject& /*aEvent*/) throw( void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/) throw( RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::unloaded" ); + m_xParser.clear(); InvalidateAll(); // do this asynchron, there are other listeners reacting on this message ... // (it's a little hack : the grid columns are listening to this event, too, and their bound field may diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 46d0c847b503..c65055c582fc 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1106,9 +1106,7 @@ SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::rtl::OUString& _rDataS // expand if required so if (_bExpandAncestors) { - m_sToBeLoaded = _rCommand; m_pTreeView->getListBox().Expand(pCommandType); - m_sToBeLoaded = ::rtl::OUString(); } // look for the object @@ -2054,7 +2052,7 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce const ::rtl::OUString* pEnd = pIter + aNames.getLength(); for (; pIter != pEnd; ++pIter) { - if( (!m_sToBeLoaded.getLength() || m_sToBeLoaded == *pIter) && !m_pTreeView->getListBox().GetEntryPosByName(*pIter,_pParent)) + if( !m_pTreeView->getListBox().GetEntryPosByName(*pIter,_pParent)) { Reference<XNameAccess> xChild(_xNameAccess->getByName(*pIter),UNO_QUERY); DBTreeListUserData* pEntryData = new DBTreeListUserData; |