Tag: cws_src680_dba205a User: oj Date: 2006/08/22 00:09:55 Modified: dba/dbaccess/source/ui/app/AppController.cxx dba/dbaccess/source/ui/dlg/dlgsave.cxx dba/dbaccess/source/ui/inc/dlgsave.hxx
Log: #i67014# correct table name 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.31.10.1&r2=1.31.10.2 Delta lines: +3 -3 ------------------- --- AppController.cxx 28 Jul 2006 13:03:08 -0000 1.31.10.1 +++ AppController.cxx 22 Aug 2006 07:09:51 -0000 1.31.10.2 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.31.10.1 $ + * $Revision: 1.31.10.2 $ * - * last change: $Author: oj $ $Date: 2006/07/28 13:03:08 $ + * last change: $Author: oj $ $Date: 2006/08/22 07:09:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1912,7 +1912,7 @@ ::rtl::OUString sCatalog = aDialog->getCatalog(); ::rtl::OUString sSchema = aDialog->getSchema(); - sNewName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sName, sal_False, ::dbtools::eInTableDefinitions ); + sNewName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sName, sal_False, ::dbtools::eInDataManipulation ); } else sNewName = aDialog->getName(); Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dlgsave.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dlgsave.cxx?r1=1.29&r2=1.29.6.1 Delta lines: +9 -9 ------------------- --- dlgsave.cxx 26 Jul 2006 07:48:02 -0000 1.29 +++ dlgsave.cxx 22 Aug 2006 07:09:52 -0000 1.29.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: dlgsave.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.29.6.1 $ * - * last change: $Author: rt $ $Date: 2006/07/26 07:48:02 $ + * last change: $Author: oj $ $Date: 2006/08/22 07:09:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -200,21 +200,21 @@ &XDatabaseMetaData::getSchemas, m_xMetaData->getUserName() ); } - ::rtl::OUString sCatalog,sSchema,sTable; + ::rtl::OUString sTable; ::dbtools::qualifiedNameComponents( m_xMetaData, m_aName, - sCatalog, - sSchema, + m_sCatalog, + m_sSchema, sTable, ::dbtools::eInDataManipulation); - USHORT nPos = m_aCatalog.GetEntryPos( String( sCatalog ) ); + USHORT nPos = m_aCatalog.GetEntryPos( String( m_sCatalog ) ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) m_aCatalog.SelectEntryPos( nPos ); - if ( sSchema.getLength() ) + if ( m_sSchema.getLength() ) { - nPos = m_aSchema.GetEntryPos( String( sSchema ) ); + nPos = m_aSchema.GetEntryPos( String( m_sSchema ) ); if ( nPos != COMBOBOX_ENTRY_NOTFOUND ) m_aSchema.SelectEntryPos( nPos ); } Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: dlgsave.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dlgsave.hxx?r1=1.10&r2=1.10.10.1 Delta lines: +8 -5 ------------------- --- dlgsave.hxx 10 Jul 2006 15:32:07 -0000 1.10 +++ dlgsave.hxx 22 Aug 2006 07:09:52 -0000 1.10.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: dlgsave.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.10.10.1 $ * - * last change: $Author: obo $ $Date: 2006/07/10 15:32:07 $ + * last change: $Author: oj $ $Date: 2006/08/22 07:09:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -85,7 +85,10 @@ HelpButton m_aPB_HELP; String m_aQryLabel; String m_sTblLabel; + rtl::OUString m_sCatalog; + rtl::OUString m_sSchema; String m_aName; + const IObjectNameCheck& m_rObjectNameCheck; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; @@ -110,8 +113,8 @@ sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS); String getName() const { return m_aName; } - String getCatalog() const { return m_aCatalog.IsVisible() ? m_aCatalog.GetText() : String(); } - String getSchema() const { return m_aSchema.IsVisible() ? m_aSchema.GetText() : String(); } + String getCatalog() const { return m_aCatalog.IsVisible() ? m_aCatalog.GetText() : m_sCatalog; } + String getSchema() const { return m_aSchema.IsVisible() ? m_aSchema.GetText() : m_sSchema; } private: DECL_LINK(ButtonClickHdl, Button *); DECL_LINK(EditModifyHdl, Edit * ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
