User: vg Date: 05/02/16 08:00:52 Modified: /dba/dbaccess/source/ui/app/ AppController.cxx
Log: INTEGRATION: CWS hsqldb2 (1.12.2); FILE MERGED 2005/01/28 12:19:41 oj 1.12.2.1: #i39922# fix for storeAsURL and merges from dba23 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.12&r2=1.13 Delta lines: +14 -2 -------------------- --- AppController.cxx 21 Jan 2005 17:05:05 -0000 1.12 +++ AppController.cxx 16 Feb 2005 16:00:49 -0000 1.13 @@ -519,7 +519,7 @@ Reference<XConnection> xCon(_rSource.Source, UNO_QUERY); if ( xCon.is() ) { - if ( getContainer()&& getContainer()->getElementType() == E_TABLE ) + if ( getContainer() && getContainer()->getElementType() == E_TABLE ) { TDataSourceConnections::iterator aIter = m_aDataSourceConnections.begin(); TDataSourceConnections::iterator aEnd = m_aDataSourceConnections.end(); @@ -528,6 +528,7 @@ if ( aIter->second.is() && aIter->second == xCon ) { getContainer()->clearPages(); + m_aDataSourceConnections.erase(aIter); break; } } @@ -1049,9 +1050,15 @@ case ID_BROWSER_SAVEASDOC: { WinBits nBits(WB_STDMODAL|WB_SAVEAS); + Reference<XModel> xModel(m_xDataSource,UNO_QUERY); + ::rtl::OUString sUrl; + if ( xModel.is() ) + sUrl = xModel->getURL(); + if ( !sUrl.getLength() ) + sUrl = SvtPathOptions().GetWorkPath(); ::sfx2::FileDialogHelper aFileDlg( ::sfx2::FILESAVE_AUTOEXTENSION,static_cast<sal_uInt32>(nBits) ,getView()); - aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() ); + aFileDlg.SetDisplayDirectory( sUrl ); const SfxFilter* pFilter = getStandardDatabaseFilter(); if ( pFilter ) @@ -1073,6 +1080,11 @@ updateTitle(); m_bCurrentlyModified = sal_False; InvalidateFeature(ID_BROWSER_SAVEDOC); + if ( getContainer()->getElementType() == E_NONE ) + { + getContainer()->changeContainer(E_NONE); + getContainer()->changeContainer(E_TABLE); + } } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
