CWS-TOOLING: integrate CWS dba31d

2008-12-08 16:22:07 +0100 rt  r265005 : Remove DOS lineends
2008-12-05 13:56:24 +0100 fs  r264906 : #i10000# removed unreachable statement
2008-11-20 11:41:26 +0100 fs  r264037 : merged in the fix for #i95865# (it was wrongly committed to CWS dba32a, should have been here)
2008-11-20 11:34:24 +0100 fs  r264036 : line ends
2008-11-14 08:44:50 +0100 lla  r263665 : #i10000# comparsion between int and uint fixed
2008-11-13 13:31:12 +0100 lla  r263641 : #i10000# build problem fixed
2008-11-13 11:20:01 +0100 lla  r263625 : #i96130# hard code name of extension
2008-11-12 11:13:41 +0100 fs  r263582 : #i96096# when opening a SRB-report fails due to the missing SRB extension, log this as warning only, and proceed with the migration
2008-11-12 11:11:35 +0100 fs  r263581 : #i96096# ContentType handling. Now all contents deliver proper results in XContent::getContentType
2008-11-12 11:10:11 +0100 fs  r263580 : #i96096# new ctors taking UNO_QUERY_THROW
2008-11-11 10:10:13 +0100 lla  r263546 : CWS-TOOLING: rebase CWS dba31d to trunk@263288 (milestone: DEV300:m35)
2008-11-06 15:55:39 +0100 oj  r263393 : #i93452# get field from model fallbackis the name
2008-11-06 15:31:47 +0100 oj  r263392 : #i93465# remeber location of floating windows
2008-11-06 13:36:24 +0100 oj  r263381 : #i93450# check typemap for null
2008-11-06 13:28:49 +0100 oj  r263379 : #i93020# empty column list boxes when new relation should be created
2008-11-06 12:33:53 +0100 oj  r263377 : #i93012# set border to default : flat
2008-11-06 12:26:54 +0100 oj  r263375 : #i74927# do some less calls for odbc
2008-11-06 09:34:01 +0100 oj  r263362 : #i93383# grabFocus in suspend to get allmodified cells
2008-11-03 21:01:39 +0100 oj  r263308 : #i86739# check if slash can be valid for tables
2008-11-03 14:40:21 +0100 oj  r263287 : #i86739# check if slash can be valid for tables
2008-11-03 14:32:17 +0100 oj  r263286 : #i95227# column width
2008-11-03 14:27:26 +0100 oj  r263285 : link fwe
2008-11-03 14:24:54 +0100 oj  r263284 : #i95235# changed to hold no ref only weak
2008-10-31 11:21:48 +0100 oj  r262859 : #i93459# set images add menu entry
2008-10-31 09:06:37 +0100 oj  r262851 : #i88629# correct fileopen filter for database odb files
2008-10-30 15:01:04 +0100 oj  r262828 : #i95229# set filter at the composer
2008-10-29 15:57:41 +0100 oj  r262817 : #i95235# changed to hold no ref only weak
2008-10-29 15:57:19 +0100 oj  r262816 : #i95235# changed to hold no ref only weak
2008-10-29 15:57:03 +0100 oj  r262815 : #i95235# changed to hold no ref only weak
2008-10-29 15:56:15 +0100 oj  r262814 : #i95235# filtermanger changed to hold no ref only weak
2008-10-29 10:32:39 +0100 oj  r262773 : #i93474# use correct table name
2008-10-28 13:49:33 +0100 lla  r262744 : #i95524# make an Invalidate and refresh on Tables
2008-10-28 10:45:02 +0100 fs  r262707 : line ends
2008-10-28 10:34:42 +0100 fs  r262706 : #i95522# don't expect the component to live in a TopWindow
2008-10-28 08:30:40 +0100 lla  r262696 : #i93176# set preview mode on view
2008-10-28 07:56:57 +0100 oj  r262694 : merge cvs svn
2008-10-27 14:13:51 +0100 oj  r262673 : #i94129# use dummy data
2008-10-27 12:38:45 +0100 fs  r262669 : #i94125# rework ScrollColumns
2008-10-23 15:53:57 +0200 oj  r262624 : #i94568# do not load the embeddedobj just copy the storage
2008-10-23 14:39:14 +0200 oj  r262622 : #i94129# handle chart correctly
2008-10-22 10:51:19 +0200 lla  r262582 : #i94115# problem with left walk chart shape fixed
2008-10-22 07:47:48 +0200 oj  r262576 : #i94455# rename now do not use remove insert
2008-10-22 07:47:27 +0200 oj  r262575 : #i94455# rename now do not use remove insert
2008-10-21 12:46:26 +0200 lla  r262567 : #i93845# extra check if default schema doesn't exists, fix assertion

1 files changed, 29 insertions, 14 deletions

diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index e6a6044fa01f..d45a7ac849a3 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -91,14 +91,14 @@ namespace dbtools
     //--------------------------------------------------------------------
     void ParameterManager::initialize( const Reference< XPropertySet >& _rxComponent, const Reference< XAggregation >& _rxComponentAggregate )
     {
-        OSL_ENSURE( !m_xComponent.is(), "ParameterManager::initialize: already initialized!" );
+        OSL_ENSURE( !m_xComponent.get().is(), "ParameterManager::initialize: already initialized!" );
 
         m_xComponent        = _rxComponent;
         m_xAggregatedRowSet = _rxComponentAggregate;
         if ( m_xAggregatedRowSet.is() )
             m_xAggregatedRowSet->queryAggregation( ::getCppuType( &m_xInnerParamUpdate ) ) >>= m_xInnerParamUpdate;
-        OSL_ENSURE( m_xComponent.is() && m_xInnerParamUpdate.is(), "ParameterManager::initialize: invalid arguments!" );
-        if ( !m_xComponent.is() || !m_xInnerParamUpdate.is() )
+        OSL_ENSURE( m_xComponent.get().is() && m_xInnerParamUpdate.is(), "ParameterManager::initialize: invalid arguments!" );
+        if ( !m_xComponent.get().is() || !m_xInnerParamUpdate.is() )
             return;
     }
 
@@ -109,7 +109,7 @@ namespace dbtools
 
         m_xComposer.clear();
         m_xParentComposer.clear();
-        m_xComponent.clear();
+        //m_xComponent.clear();
         m_xInnerParamUpdate.clear();
         m_xAggregatedRowSet.clear();
     }
@@ -359,8 +359,13 @@ namespace dbtools
         try
         {
             // the links as determined by the  properties
-            m_xComponent->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MASTERFIELDS) ) >>= m_aMasterFields;
-            m_xComponent->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DETAILFIELDS) ) >>= m_aDetailFields;
+            Reference< XPropertySet > xProp = m_xComponent;
+            OSL_ENSURE(xProp.is(),"Some already released my component!");
+            if ( xProp.is() )
+            {
+                xProp->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MASTERFIELDS) ) >>= m_aMasterFields;
+                xProp->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DETAILFIELDS) ) >>= m_aDetailFields;
+            }
 
             {
                 // normalize to equal length
@@ -500,10 +505,15 @@ namespace dbtools
         cacheConnectionInfo();
 
         // check whether the  is based on a statement/query which requires parameters
-        if ( !initializeComposerByComponent( m_xComponent ) )
-        {   // okay, nothing to do
-            m_bUpToDate = true;
-            return;
+        Reference< XPropertySet > xProp = m_xComponent;
+        OSL_ENSURE(xProp.is(),"Some already released my component!");
+        if ( xProp.is() )
+        {
+            if ( !initializeComposerByComponent( xProp ) )
+            {   // okay, nothing to do
+                m_bUpToDate = true;
+                return;
+            } // if ( !initializeComposerByComponent( m_xComponent ) )
         }
         OSL_POSTCOND( m_xInnerParamColumns.is(), "ParameterManager::updateParameterInfo: initializeComposerByComponent did nonsense (1)!" );
 
@@ -699,7 +709,9 @@ namespace dbtools
         if ( nParamsLeft )
         {
             ::cppu::OInterfaceIteratorHelper aIter( m_aParameterListeners );
-            DatabaseParameterEvent aEvent( m_xComponent.get(), m_pOuterParameters.get() );
+            Reference< XPropertySet > xProp = m_xComponent;
+            OSL_ENSURE(xProp.is(),"Some already released my component!");
+            DatabaseParameterEvent aEvent( xProp.get(), m_pOuterParameters.get() );
 
             _rClearForNotifies.clear();
             while ( aIter.hasMoreElements() && !bCanceled )
@@ -746,7 +758,10 @@ namespace dbtools
         _rxConnection.clear();
         try
         {
-            m_xComponent->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ACTIVE_CONNECTION) ) >>= _rxConnection;
+            Reference< XPropertySet > xProp = m_xComponent;
+            OSL_ENSURE(xProp.is(),"Some already released my component!");
+            if ( xProp.is() )
+                xProp->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ACTIVE_CONNECTION) ) >>= _rxConnection;
         }
         catch( const Exception& )
         {
@@ -786,7 +801,7 @@ namespace dbtools
         if ( _bFromComposer )
             xColumnSupp = xColumnSupp.query( m_xComposer );
         else
-            xColumnSupp = xColumnSupp.query( m_xComponent );
+            xColumnSupp.set( m_xComponent.get(),UNO_QUERY);
         if ( xColumnSupp.is() )
             _rxColumns = xColumnSupp->getColumns();
         OSL_ENSURE( _rxColumns.is(), "ParameterManager::getColumns: could not retrieve the columns for the detail !" );
@@ -803,7 +818,7 @@ namespace dbtools
         try
         {
             // get the parent of the component we're working for
-            Reference< XChild > xAsChild( m_xComponent, UNO_QUERY_THROW );
+            Reference< XChild > xAsChild( m_xComponent.get(), UNO_QUERY_THROW );
             Reference< XPropertySet > xParent( xAsChild->getParent(), UNO_QUERY );
             if ( !xParent.is() )
                 return false;