diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 11:15:14 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-23 11:15:14 +0000 |
commit | 812e990c13912281e3a0ad436a9e4dde4842a1d5 (patch) | |
tree | ff9d5d677989800678a46e1f567b65f377b4b9a6 /dbaccess/source/ui/app/AppControllerGen.cxx | |
parent | 3343c256c54e1fc665990bd639d1d589a0b5a0b1 (diff) |
INTEGRATION: CWS dba201b (1.12.38); FILE MERGED
2005/09/21 07:47:00 oj 1.12.38.4: RESYNC: (1.12-1.13); FILE MERGED
2005/07/21 14:35:55 fs 1.12.38.3: slight syntax changes to the recently introduced SharedUNOComponent for better readability of client code
2005/07/20 10:13:48 fs 1.12.38.2: #i51255# XConnection (partly) replaced with SharedConnection
2005/07/11 13:37:10 fs 1.12.38.1: merging CWS dba201 into CWS dba201b
Diffstat (limited to 'dbaccess/source/ui/app/AppControllerGen.cxx')
-rw-r--r-- | dbaccess/source/ui/app/AppControllerGen.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index d2f99fdeb15c..2bc7f34aee5f 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -4,9 +4,9 @@ * * $RCSfile: AppControllerGen.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: rt $ $Date: 2005-09-08 14:19:40 $ + * last change: $Author: hr $ $Date: 2005-09-23 12:15:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -216,7 +216,11 @@ void OApplicationController::pasteFormat(sal_uInt32 _nFormatId) { Reference<XConnection> xDestConnection; ensureConnection(xDestConnection); - m_aTableCopyHelper.pasteTable(_nFormatId, rClipboard,getDatabaseName() , xDestConnection); + + SharedConnection xConnection( xDestConnection, SharedConnection::NoTakeOwnership ); + // TODO: migrate ensureConnection to the SharedConnection-API + + m_aTableCopyHelper.pasteTable( _nFormatId, rClipboard, getDatabaseName(), xConnection); } else paste( eType,ODataAccessObjectTransferable::extractObjectDescriptor(rClipboard) ); @@ -429,6 +433,7 @@ void OApplicationController::askToReconnect() { ElementType eType = getContainer()->getElementType(); clearConnections(); + getContainer()->getDetailView()->clearPages(sal_False); getContainer()->changeContainer(E_NONE); // invalidate the old selection getContainer()->changeContainer(eType); // reselect the current one again } |