Tag: cws_src680_dba28 User: fs Date: 05/03/30 02:19:20 Modified: /dba/dbaccess/source/ui/app/ AppController.cxx
Log: checked the previous fix onto the wrong branch File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.18.2.1&r2=1.18.2.2 Delta lines: +11 -12 --------------------- --- AppController.cxx 30 Mar 2005 10:17:15 -0000 1.18.2.1 +++ AppController.cxx 30 Mar 2005 10:19:14 -0000 1.18.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.18.2.1 $ + * $Revision: 1.18.2.2 $ * - * last change: $Author: fs $ $Date: 2005/03/30 10:17:15 $ + * last change: $Author: fs $ $Date: 2005/03/30 10:19:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1935,19 +1935,18 @@ } } break; - case E_TABLE: - if ( !ensureConnection( xConnection, sal_True ) ) - break; - // NO break case E_QUERY: if ( xContainer->hasByName(*aList.begin()) ) { xRename.set(xContainer->getByName(*aList.begin()),UNO_QUERY); - sal_Int32 nCommandType = eType == E_QUERY ? CommandType::QUERY : CommandType::TABLE; - aDlg.reset( new OSaveAsDlg( - getView(), nCommandType, xContainer, - xConnection.is() ? xConnection->getMetaData() : Reference< XDatabaseMetaData >(), - xConnection, *aList.begin(), SAD_TITLE_RENAME) ); + aDlg.reset( new OSaveAsDlg(getView(),CommandType::QUERY,xContainer,xConnection->getMetaData(),xConnection,*aList.begin(),SAD_TITLE_RENAME) ); + } + break; + case E_TABLE: + if ( xContainer->hasByName(*aList.begin()) ) + { + xRename.set(xContainer->getByName(*aList.begin()),UNO_QUERY); + aDlg.reset( new OSaveAsDlg(getView(),CommandType::TABLE,xContainer,xConnection->getMetaData(),xConnection,*aList.begin(),SAD_TITLE_RENAME) ); } break; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
