merge with db33a

3 files changed, 6 insertions, 24 deletions

diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 96ca58d6f428..a8c5d5a97054 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -295,15 +295,6 @@ namespace dbaui
         /// returns <TRUE/> if the clipboard supports a table format, otherwise <FALSE/>.
         sal_Bool isTableFormat() const;
 
-        /** copies a table which was constructed by tags like HTML or RTF
-            @param  _rDesc
-                The Drop descriptor
-            @param  _bCheck
-                If set to <TRUE/> than the controller checks only if a copy is possible.
-        */
-        sal_Bool copyTagTable(  OTableCopyHelper::DropDescriptor& _rDesc
-                                , sal_Bool _bCheck);
-
         /** fills the vector with all supported formats
             @param  _eType
                 The type for which we need the formats
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index d83b6278f15b..ed8c5a15dd89 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -902,18 +902,6 @@ sal_Bool OApplicationController::isTableFormat()  const
     return m_aTableCopyHelper.isTableFormat(getViewClipboard());
 }
 // -----------------------------------------------------------------------------
-sal_Bool OApplicationController::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc, sal_Bool _bCheck)
-{
-    // first get the dest connection
-    ::osl::MutexGuard aGuard( getMutex() );
-
-    SharedConnection xConnection( ensureConnection() );
-    if ( !xConnection.is() )
-        return sal_False;
-
-    return m_aTableCopyHelper.copyTagTable( _rDesc, _bCheck, xConnection );
-}
-// -----------------------------------------------------------------------------
 IMPL_LINK( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ )
 {
     m_nAsyncDrop = 0;
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index 8ef4f77f20c7..a24fe29b5974 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -125,8 +125,9 @@ namespace dbaui
                 xModel.set( _rxComponent, UNO_QUERY );
                 if ( xModel.is() )
                 {
-                    xController.set( xModel->getCurrentController(), UNO_SET_THROW );
-                    xFrame.set( xController->getFrame(), UNO_SET_THROW );
+                    xController.set( xModel->getCurrentController() );
+                    if ( xController.is() )
+                        xFrame.set( xController->getFrame(), UNO_SET_THROW );
                 }
                 else
                 {
@@ -468,13 +469,15 @@ namespace dbaui
         // put into map
         SubComponentAccessor aKey( _rName, _nComponentType, _eOpenMode );
         SubComponentDescriptor aElement( _rxComponent );
+        ENSURE_OR_THROW( aElement.xModel.is() || aElement.xController.is(), "illegal component" );
 
         m_pData->m_aComponents.insert( SubComponentMap::value_type(
             aKey, aElement
         ) ) ;
 
         // add as listener
-        aElement.xController->addEventListener( this );
+        if ( aElement.xController.is() )
+            aElement.xController->addEventListener( this );
         if ( aElement.xModel.is() )
             aElement.xModel->addEventListener( this );