[ooo-build-commit] Branch 'ooo/OOO310' - dbaccess/source

[Jan Holesovsky]

 dbaccess/source/ui/control/RelationControl.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit a9a6c27aea743f16c443cf00087dbfc7d1d31eaf
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Jul 8 13:33:39 2009 +0000

    CWS-TOOLING: integrate CWS dba311a
    2009-07-03 13:24:10 +0200 msc  r273691 : #i100000#
    2009-06-24 11:31:54 +0200 fs  r273323 : line ends
    2009-06-24 11:30:25 +0200 fs  r273322 : line ends
    2009-06-09 07:29:25 +0200 oj  r272747 : #i102557# default 2nd table
    2009-06-08 15:59:51 +0200 fs  r272737 : #i102089# PrintOrPreviewContact: do not create a Primitive2DSequence for non-printable controls
    2009-06-05 11:22:36 +0200 fs  r272673 : #i102090# do not 'paint' controls which are in alive mode, and manually switched to invisible
    2009-06-02 11:44:34 +0200 oj  r272490 : #i102409# correct deletion in array list

diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 1035203..1d8101e 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -532,7 +532,7 @@ OTableListBoxControl::OTableListBoxControl(  Window* _pParent
     // -----------------------------------------------------------------------------
     void OTableListBoxControl::fillListBoxes()
     {
-        DBG_ASSERT(m_pTableMap->size() >= 2, "OTableListBoxControl::OTableListBoxControl : brauche mindestens zwei TabWins !");
+        DBG_ASSERT( !m_pTableMap->empty(), "OTableListBoxControl::fillListBoxes: no table window!");
         OTableWindow* pInitialLeft = NULL;
         OTableWindow* pInitialRight = NULL;
 
@@ -553,6 +553,12 @@ OTableListBoxControl::OTableListBoxControl(  Window* _pParent
                 pInitialRight = aIter->second;
                 m_strCurrentRight = aIter->first;
             }
+        } // for(;aIter != m_pTableMap->end();++aIter)
+
+        if ( !pInitialRight )
+        {
+            pInitialRight = pInitialLeft;
+            m_strCurrentRight = m_strCurrentLeft;
         }
 
         // die entsprechenden Defs an mein Controls