strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS dba24 (1.9.4); FILE MERGED

Browse source 
2005/03/08 10:16:41 oj 1.9.4.3: RESYNC: (1.9-1.10); FILE MERGED
2005/02/18 12:27:21 oj 1.9.4.2: #i42460# changes for the separation of datasource and database document(model)
2005/02/03 13:53:47 oj 1.9.4.1: #i41913# set suspended back to before if failed
This commit is contained in:
Vladimir Glazounov 2005-03-10 15:44:07 +00:00
parent f1c092cba6
commit 1cae1ac6e1
1 changed files with 45 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
dbaccess/source/ui/app/AppControllerGen.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: AppControllerGen.cxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: kz $ $Date: 2005-03-01 19:14:59 $
* last change: $Author: vg $ $Date: 2005-03-10 16:44:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -176,6 +176,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::ucb;
//........................................................................
// -----------------------------------------------------------------------------
void OApplicationController::convertToView(const ::rtl::OUString& _sName)
{
try
@ -364,7 +365,7 @@ void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent&
}
EventObject aEvt;
aEvt.Source = m_xDataSource;
aEvt.Source = m_xModel;
modified(aEvt);
}
// -----------------------------------------------------------------------------
@ -455,37 +456,42 @@ void OApplicationController::askToReconnect()
}
}
// -----------------------------------------------------------------------------
sal_Bool OApplicationController::suspendDocument(const TDocuments::key_type& _xComponent,sal_Bool _bSuspend)
{
sal_Bool bSuspended = sal_True;
Reference<XController> xController;
Reference<XModel> xModel(_xComponent,UNO_QUERY);
if ( xModel.is() )
xController = xModel->getCurrentController();
else
{
xController.set(_xComponent,UNO_QUERY);
if ( !xController.is() )
{
Reference<XFrame> xFrame(_xComponent,UNO_QUERY);
if ( xFrame.is() )
xController = xFrame->getController();
}
}
if ( xController.is() && xController != *this )
bSuspended = xController->suspend(_bSuspend);
return bSuspended;
}
// -----------------------------------------------------------------------------
sal_Bool OApplicationController::suspendDocuments(sal_Bool bSuspend)
{
sal_Bool bSubSuspended = sal_True;
Reference<XModel> xModel;
TDocuments::iterator aIter = m_aDocuments.begin();
TDocuments::iterator aEnd = m_aDocuments.end();
sal_Int32 nSuspendPos = 1;
try
{
for (; aIter != aEnd && bSubSuspended; ++aIter)
{
Reference<XController> xController;
xModel.set(aIter->first,UNO_QUERY);
if ( xModel.is() )
xController = xModel->getCurrentController();
else
{
xController.set(aIter->first,UNO_QUERY);
if ( !xController.is() )
{
Reference<XFrame> xFrame(aIter->first,UNO_QUERY);
if ( xFrame.is() )
xController = xFrame->getController();
}
}
if ( xController.is() && xController != *this )
{
bSubSuspended = xController->suspend(bSuspend);
}
}
for (; aIter != aEnd && bSubSuspended; ++aIter,++nSuspendPos)
bSubSuspended = suspendDocument(aIter->first,bSuspend);
}
catch(Exception)
{
@ -543,6 +549,19 @@ sal_Bool OApplicationController::suspendDocuments(sal_Bool bSuspend)
}
m_aDocuments.clear();
}
else // resuspend the documents again
{
aIter = m_aDocuments.begin();
aEnd = m_aDocuments.end();
try
{
for (; aIter != aEnd && nSuspendPos ; ++aIter,--nSuspendPos)
suspendDocument(aIter->first,!bSuspend);
}
catch(Exception)
{
}
}
return bSubSuspended;
}