Tag: cws_src680_dba24 User: oj Date: 05/02/21 05:10:41 Modified: /dba/dbaccess/source/ui/app/ AppController.cxx
Log: RESYNC: (1.12-1.14); FILE MERGED 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.4.3&r2=1.12.4.4 Delta lines: +38 -24 --------------------- --- AppController.cxx 18 Feb 2005 12:27:20 -0000 1.12.4.3 +++ AppController.cxx 21 Feb 2005 13:10:38 -0000 1.12.4.4 @@ -528,6 +528,7 @@ if ( aIter->second.is() && aIter->second == xCon ) { getContainer()->clearPages(); + m_aDataSourceConnections.erase(aIter); break; } } @@ -563,11 +564,13 @@ { ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); ::osl::MutexGuard aGuard(m_aMutex); + sal_Bool bCheck = sal_True; + if ( m_bSuspended != bSuspend ) + { m_bSuspended = bSuspend; if ( bSuspend && !suspendDocuments( bSuspend )) return sal_False; - sal_Bool bCheck = sal_True; Reference<XModifiable> xModi(m_xModel,UNO_QUERY); if ( m_bCurrentlyModified || (xModi.is() && xModi->isModified()) ) { @@ -583,6 +586,7 @@ break; } } + } return bCheck; } @@ -1049,9 +1053,14 @@ case ID_BROWSER_SAVEASDOC: { WinBits nBits(WB_STDMODAL|WB_SAVEAS); + ::rtl::OUString sUrl; + if ( m_xModel.is() ) + sUrl = m_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 +1082,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]
