[Libreoffice-commits] .: 6 commits - dbaccess/source

[Jan Holesovsky]

 dbaccess/source/ui/app/AppController.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ddf76ab15f4291c4c69026b820e812f4b2f3dfe1
Merge: 17ad15b... 0f9cfad...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Jul 28 10:14:00 2011 +0200

    Merge commit 'libreoffice-3.4.2.3'

commit 0f9cfad26dd3086f7ac11347e6b62f4e07678534
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jul 25 20:28:40 2011 +0200

    Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)
commit 9e7402f1e6909316f18b2ba4e70e6a360d1563a4
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 19 17:07:56 2011 +0200

    Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)
commit 62ee682a6d742a7d42be01acb9496817d1b9cfa4
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 16:41:07 2011 +0200

    Branch libreoffice-3-4-2
    
    This is 'libreoffice-3-4-2' - the stable branch for the 3.4.2 release.
    Only very safe changes, reviewed by three people are allowed.
    
    If you want to commit more complicated fix for the next 3.4.x release,
    please use the 'libreoffice-3-4' branch.
    
    If you want to build something cool, unstable, and risky, use master.
commit 959aacc59eb2fe1ff5e8eb6e6b0df6faf7e64e35
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 15:49:38 2011 +0200

    Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)
commit 6bfa004c52451b618691b56938611ffd368549e2
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Jul 1 11:06:15 2011 +0200

    Don't crash when selecting target to db document, fdo#36545.
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>

diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 7545e73..ba65284 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1936,7 +1936,8 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const
 IMPL_LINK( OApplicationController, OnSelectContainer, void*, _pType )
 {
     ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType );
-    getContainer()->selectContainer(eType);
+    if (getContainer())
+        getContainer()->selectContainer(eType);
     return 0L;
 }
 // -----------------------------------------------------------------------------