CWS-TOOLING: integrate CWS dba31e

2008-11-19 12:36:23 +0100 msc  r263980 : i96104
2008-11-19 12:31:19 +0100 msc  r263979 : i96104
2008-11-19 12:21:55 +0100 msc  r263977 : i96104
2008-11-19 12:18:53 +0100 msc  r263976 : i96104
2008-11-18 09:09:45 +0100 oj  r263746 : disable color entry when area is set
2008-11-18 08:37:52 +0100 oj  r263741 : #remove sub report entry
2008-11-17 11:20:25 +0100 fs  r263708 : #i10000#
2008-11-17 11:06:52 +0100 fs  r263706 : minimal version now is 3.1
2008-11-12 22:25:59 +0100 fs  r263621 : #i96150#
2008-11-12 22:20:02 +0100 fs  r263620 : rebased to m34
2008-11-12 21:39:41 +0100 fs  r263618 : MANUAL REBASE: rebase CWS dba31d to DEV300_m34
2008-11-12 13:54:58 +0100 fs  r263597 : #i96134# MediaDescriptor.URL is to be preferred over MediaDescriptor.FileName. Nonetheless, ensure both are handled
2008-11-12 13:53:40 +0100 fs  r263596 : #i96134# re-enabled the code for #i41897#, a better fix is to come
2008-11-12 12:48:21 +0100 fs  r263585 : #i96134# disable saving URLs of file-base databases relatively
2008-11-11 16:11:11 +0100 msc  r263566 : #i96104#
2008-11-05 09:09:47 +0100 oj  r263342 : #i88727# color noe added
2008-11-05 08:41:43 +0100 oj  r263341 : #i77916# zoom added
2008-11-04 21:24:15 +0100 fs  r263339 : disposing: call disposeAndClear without own mutex locked - some of our listeners insist on locking the SolarMutex, which sometimes led to deadlocks on the complex test cases
2008-11-04 21:23:15 +0100 fs  r263338 : remove SolarMutex locking - this happned in CWS dba31c (in the CVS version), which this CWS was created from, but seems to got lost during resync
2008-11-04 20:49:50 +0100 fs  r263335 : docu formatting
2008-11-04 20:06:39 +0100 fs  r263334 : #i95826# use m_aMutex, not a DocumentGuard (wrongly resolved merge conflicts)
2008-11-04 17:36:29 +0100 fs  r263332 : #i92688# properly revoke as XEventListener from m_xActiveController when disposing
2008-11-04 14:49:34 +0100 fs  r263324 : #i92322# enable Input Required if EmptyIsNULL does not exist at the control
2008-10-31 11:10:04 +0100 oj  r262857 : merge from cvs to svn
2008-10-31 09:46:45 +0100 oj  r262853 : merge from cvs to svn
2008-10-31 08:46:37 +0100 oj  r262849 : merge from cvs to svn
2008-10-31 08:44:24 +0100 oj  r262848 : merge from cvs to svn
2008-10-31 08:43:33 +0100 oj  r262847 : merge from cvs to svn
2008-10-31 08:42:28 +0100 oj  r262846 : merge from cvs to svn
2008-10-31 08:41:58 +0100 oj  r262845 : merge from cvs to svn
2008-10-31 08:41:32 +0100 oj  r262844 : merge from cvs to svn
2008-10-28 12:19:50 +0100 oj  r262733 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:42 +0100 oj  r262732 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:36 +0100 oj  r262731 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:31 +0100 oj  r262730 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:22 +0100 oj  r262729 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:18 +0100 oj  r262728 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:10 +0100 oj  r262727 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:06 +0100 oj  r262726 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:05 +0100 oj  r262725 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:01 +0100 oj  r262724 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:50 +0100 oj  r262723 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:41 +0100 oj  r262722 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:40 +0100 oj  r262721 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:27 +0100 oj  r262720 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:10 +0100 oj  r262719 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:01 +0100 oj  r262718 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:17:39 +0100 oj  r262717 : #iXXXXX#: migrate CWS dba31e to SVN

1 files changed, 60 insertions, 121 deletions

diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 59c5bcf8334b..2570822ca6e2 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -40,6 +40,7 @@
 #include "defaultobjectnamecheck.hxx"
 #include "dlgsave.hxx"
 #include "UITools.hxx"
+#include "subcomponentmanager.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/container/XChild.hpp>
@@ -216,7 +217,7 @@ void OApplicationController::openDialog( const ::rtl::OUString& _sServiceName )
     try
     {
         ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-        ::osl::MutexGuard aGuard(m_aMutex);
+        ::osl::MutexGuard aGuard( getMutex() );
         WaitObject aWO(getView());
 
         Sequence< Any > aArgs(3);
@@ -306,7 +307,7 @@ void OApplicationController::openDirectSQLDialog()
 void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException)
 {
     ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-    ::osl::MutexGuard aGuard(m_aMutex);
+    ::osl::MutexGuard aGuard( getMutex() );
     if ( evt.PropertyName == PROPERTY_USER )
     {
         m_bNeedToReconnect = sal_True;
@@ -347,7 +348,7 @@ void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent&
 // -----------------------------------------------------------------------------
 Reference< XDataSource > SAL_CALL OApplicationController::getDataSource() throw (RuntimeException)
 {
-    ::osl::MutexGuard aGuard(m_aMutex);
+    ::osl::MutexGuard aGuard( getMutex() );
     Reference< XDataSource > xDataSource( m_xDataSource, UNO_QUERY );
     return xDataSource;
 }
@@ -355,7 +356,7 @@ Reference< XDataSource > SAL_CALL OApplicationController::getDataSource() throw
 // -----------------------------------------------------------------------------
 Reference< XWindow > SAL_CALL OApplicationController::getApplicationMainWindow() throw (RuntimeException)
 {
-    ::osl::MutexGuard aGuard(m_aMutex);
+    ::osl::MutexGuard aGuard( getMutex() );
     Reference< XFrame > xFrame( getFrame(), UNO_QUERY_THROW );
     Reference< XWindow > xWindow( xFrame->getContainerWindow(), UNO_QUERY_THROW );
     return xWindow;
@@ -364,134 +365,47 @@ Reference< XWindow > SAL_CALL OApplicationController::getApplicationMainWindow()
 // -----------------------------------------------------------------------------
 Sequence< Reference< XComponent > > SAL_CALL OApplicationController::getSubComponents() throw (RuntimeException)
 {
-    ::osl::MutexGuard aGuard(m_aMutex);
-    Sequence< Reference< XComponent > > aComponents( m_aDocuments.size() );
-    ::std::transform( m_aDocuments.begin(), m_aDocuments.end(), aComponents.getArray(), ::std::select1st< TDocuments::value_type >() );
-    return aComponents;
+    return m_pSubComponentManager->getSubComponents();
 }
 
 // -----------------------------------------------------------------------------
 Reference< XConnection > SAL_CALL OApplicationController::getActiveConnection() throw (RuntimeException)
 {
-    ::osl::MutexGuard aGuard(m_aMutex);
+    ::osl::MutexGuard aGuard( getMutex() );
     return m_xDataSourceConnection.getTyped();
 }
 
 // -----------------------------------------------------------------------------
 ::sal_Bool SAL_CALL OApplicationController::isConnected(  ) throw (RuntimeException)
 {
-    ::osl::MutexGuard aGuard(m_aMutex);
+    ::osl::MutexGuard aGuard( getMutex() );
     return m_xDataSourceConnection.is();
 }
 
 // -----------------------------------------------------------------------------
-::sal_Bool SAL_CALL OApplicationController::connect(  ) throw (RuntimeException)
+void SAL_CALL OApplicationController::connect(  ) throw (SQLException, RuntimeException)
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-    ::osl::MutexGuard aGuard(m_aMutex);
-
-    ensureConnection();
-    return isConnected();
-}
-
-// -----------------------------------------------------------------------------
-namespace
-{
-    static Reference< XController > lcl_getController( const OApplicationController::TDocuments::iterator& _docPos )
+    SQLExceptionInfo aError;
+    SharedConnection xConnection = ensureConnection( &aError );
+    if ( !xConnection.is() )
     {
-        Reference< XController > xController;
+        if ( aError.isValid() )
+            aError.doThrow();
 
-        Reference< XComponent > xComponent( _docPos->first );
-        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();
-            }
-        }
-        return xController;
+        // no particular error, but nonetheless could not connect -> throw a generic exception
+        String sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) );
+        sConnectingContext.SearchAndReplaceAscii( "$name$", getStrippedDatabaseName() );
+        ::dbtools::throwGenericSQLException( sConnectingContext, *this );
     }
 }
 
 // -----------------------------------------------------------------------------
 ::sal_Bool SAL_CALL OApplicationController::closeSubComponents(  ) throw (RuntimeException)
 {
-    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-    ::osl::MutexGuard aGuard( m_aMutex );
-
-    try
-    {
-        typedef ::std::vector< Reference< XComponent > > ComponentArray;
-        ComponentArray aClosedComponents;
-
-        TDocuments aDocuments( m_aDocuments );
-        for (   TDocuments::iterator doc = aDocuments.begin();
-                doc != aDocuments.end();
-                ++doc
-            )
-        {
-            Reference< XController > xController( lcl_getController( doc ) );
-            OSL_ENSURE( xController.is(), "OApplicationController::closeSubComponents: did not find the sub controller!" );
-
-            // suspend the controller in the document
-            if  (   !xController.is()
-                ||  !xController->suspend( sal_True )
-                )
-                // break complete operation, no sense in continueing
-                break;
-
-            // revoke event listener
-            Reference< XComponent > xDocument = doc->first;
-            if ( xDocument.is() )
-                xDocument->removeEventListener( static_cast< XFrameActionListener* >( this ) );
-
-            bool bClosedSubDoc = false;
-            try
-            {
-                Reference< XCloseable > xCloseable( xController->getFrame(), UNO_QUERY_THROW );
-                xCloseable->close( sal_True );
-                bClosedSubDoc = true;
-            }
-            catch( const Exception& )
-            {
-                DBG_UNHANDLED_EXCEPTION();
-            }
-
-            if ( !bClosedSubDoc )
-                // no sense in continueing with the other docs
-                break;
-
-            aClosedComponents.push_back( doc->first );
-        }
-
-        // now remove all the components which we could successfully close
-        // (this might be none, or all, or something inbetween) from m_aDocuments
-        for (   ComponentArray::const_iterator comp = aClosedComponents.begin();
-                comp != aClosedComponents.end();
-                ++comp
-            )
-        {
-            TDocuments::iterator pos = m_aDocuments.find( *comp );
-            OSL_ENSURE( pos != m_aDocuments.end(),
-                "OApplicationController::closeSubComponents: closed a component which doesn't exist anymore!" );
-            if ( pos !=m_aDocuments.end() )
-                m_aDocuments.erase( pos );
-        }
-    }
-    catch ( const Exception& )
-    {
-        DBG_UNHANDLED_EXCEPTION();
-    }
-
-    return m_aDocuments.empty();
+    return m_pSubComponentManager->closeSubComponents();
 }
 
+
 // -----------------------------------------------------------------------------
 namespace
 {
@@ -569,7 +483,7 @@ Reference< XComponent > SAL_CALL OApplicationController::loadComponentWithArgume
     const ::rtl::OUString& _ObjectName, ::sal_Bool _ForEditing, const Sequence< PropertyValue >& _Arguments ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException)
 {
     ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-    ::osl::MutexGuard aGuard( m_aMutex );
+    ::osl::MutexGuard aGuard( getMutex() );
 
     impl_validateObjectTypeAndName_throw( _ObjectType, _ObjectName );
 
@@ -601,7 +515,7 @@ void SAL_CALL OApplicationController::releaseContextMenuInterceptor( const Refer
 void OApplicationController::previewChanged( sal_Int32 _nMode )
 {
     ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
-    ::osl::MutexGuard aGuard(m_aMutex);
+    ::osl::MutexGuard aGuard( getMutex() );
 
     if ( m_xDataSource.is() && !isDataSourceReadOnly() )
     {
@@ -645,7 +559,7 @@ void OApplicationController::askToReconnect()
     {
         m_bNeedToReconnect = sal_False;
         sal_Bool bClear = sal_True;
-        if ( !m_aDocuments.empty() )
+        if ( !m_pSubComponentManager->empty() )
         {
             QueryBox aQry(getView(), ModuleRes(APP_CLOSEDOCUMENTS));
             switch (aQry.Execute())
@@ -671,28 +585,53 @@ void OApplicationController::askToReconnect()
 }
 
 // -----------------------------------------------------------------------------
+::rtl::OUString OApplicationController::getDatabaseName() const
+{
+    ::rtl::OUString sDatabaseName;
+    try
+    {
+        if ( m_xDataSource.is() )
+        {
+            OSL_VERIFY( m_xDataSource->getPropertyValue( PROPERTY_NAME ) >>= sDatabaseName );
+        }
+    }
+    catch ( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
+    return sDatabaseName;
+}
+
+// -----------------------------------------------------------------------------
 ::rtl::OUString OApplicationController::getStrippedDatabaseName() const
 {
-    return ::dbaui::getStrippedDatabaseName(m_xDataSource,m_sDatabaseName);
+    ::rtl::OUString sDatabaseName;
+    return ::dbaui::getStrippedDatabaseName( m_xDataSource, sDatabaseName );
 }
 
 // -----------------------------------------------------------------------------
-void OApplicationController::addDocumentListener(const Reference< XComponent >& _xDocument,const Reference< XComponent >& _xDefintion)
+void OApplicationController::onDocumentOpened( const ::rtl::OUString& _rName, const sal_Int32 _nType,
+        const ElementOpenMode _eMode, const Reference< XComponent >& _xDocument, const Reference< XComponent >& _rxDefinition )
 {
-    if ( _xDocument.is() )
+    OSL_PRECOND( _xDocument.is(), "OApplicationController::onDocumentOpened: illegal document!" );
+    if ( !_xDocument.is() )
+        return;
+
+    try
     {
-        try
-        {
-            m_aDocuments[_xDocument] = _xDefintion;
-            _xDocument->addEventListener(static_cast<XFrameActionListener*>(this));
-            Reference<XPropertySet> xProp(_xDefintion,UNO_QUERY_THROW);
-            if ( xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_NAME) )
-                xProp->addPropertyChangeListener(PROPERTY_NAME,static_cast<XPropertyChangeListener*>(this));
-        }
-        catch(Exception&)
+        m_pSubComponentManager->onSubComponentOpened( _rName, _nType, _eMode, _xDocument );
+
+        if ( _rxDefinition.is() )
         {
+            Reference< XPropertySet > xProp( _rxDefinition, UNO_QUERY_THROW );
+            Reference< XPropertySetInfo > xPSI( xProp->getPropertySetInfo(), UNO_SET_THROW );
+            xProp->addPropertyChangeListener( PROPERTY_NAME, static_cast< XPropertyChangeListener* >( this ) );
         }
     }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
 }
 // -----------------------------------------------------------------------------
 sal_Bool OApplicationController::insertHierachyElement(ElementType _eType,const String& _sParentFolder,sal_Bool _bCollection,const Reference<XContent>& _xContent,sal_Bool _bMove)