1 files changed, 71 insertions, 11 deletions

diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 2791021a6159..435c6ff25fef 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -87,6 +87,7 @@ namespace dbaui
 using namespace ::dbtools;
 using namespace ::connectivity;
 using namespace ::svx;
+using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::util;
@@ -104,6 +105,7 @@ using namespace ::com::sun::star::ucb;
 using ::com::sun::star::util::XCloseable;
 using ::com::sun::star::ui::XContextMenuInterceptor;
 /** === end UNO using === **/
+
 namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
 namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
 
@@ -325,15 +327,22 @@ void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent&
             ::rtl::OUString sOldName,sNewName;
             evt.OldValue >>= sOldName;
             evt.NewValue >>= sNewName;
-            Reference<XChild> xChild(evt.Source,UNO_QUERY);
-            if ( xChild.is() )
+
+            // if the old name is empty, then this is a newly inserted content. We're notified of it via the
+            // elementInserted method, so there's no need to handle it here.
+
+            if ( sOldName.getLength() )
             {
-                Reference<XContent> xContent(xChild->getParent(),UNO_QUERY);
-                if ( xContent.is() )
-                    sOldName = xContent->getIdentifier()->getContentIdentifier() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sOldName;
-            }
+                Reference<XChild> xChild(evt.Source,UNO_QUERY);
+                if ( xChild.is() )
+                {
+                    Reference<XContent> xContent(xChild->getParent(),UNO_QUERY);
+                    if ( xContent.is() )
+                        sOldName = xContent->getIdentifier()->getContentIdentifier() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sOldName;
+                }
 
-            getContainer()->elementReplaced( eType , sOldName, sNewName );
+                getContainer()->elementReplaced( eType , sOldName, sNewName );
+            }
         }
     }
 
@@ -362,6 +371,7 @@ Reference< XWindow > SAL_CALL OApplicationController::getApplicationMainWindow()
 // -----------------------------------------------------------------------------
 Sequence< Reference< XComponent > > SAL_CALL OApplicationController::getSubComponents() throw (RuntimeException)
 {
+    ::osl::MutexGuard aGuard( getMutex() );
     return m_pSubComponentManager->getSubComponents();
 }
 
@@ -382,6 +392,9 @@ Reference< XConnection > SAL_CALL OApplicationController::getActiveConnection()
 // -----------------------------------------------------------------------------
 void SAL_CALL OApplicationController::connect(  ) throw (SQLException, RuntimeException)
 {
+    ::vos::OGuard aSolarGuard(Application::GetSolarMutex());
+    ::osl::MutexGuard aGuard( getMutex() );
+
     SQLExceptionInfo aError;
     SharedConnection xConnection = ensureConnection( &aError );
     if ( !xConnection.is() )
@@ -397,8 +410,29 @@ void SAL_CALL OApplicationController::connect(  ) throw (SQLException, RuntimeEx
 }
 
 // -----------------------------------------------------------------------------
+beans::Pair< ::sal_Int32, ::rtl::OUString > SAL_CALL OApplicationController::identifySubComponent( const Reference< XComponent >& i_rSubComponent ) throw (IllegalArgumentException, RuntimeException)
+{
+    ::osl::MutexGuard aGuard( getMutex() );
+
+    sal_Int32 nType = -1;
+    ::rtl::OUString sName;
+
+    if ( !m_pSubComponentManager->lookupSubComponent( i_rSubComponent, sName, nType ) )
+        throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+
+    if ( nType == SID_DB_APP_DSRELDESIGN )
+        // this is somewhat hacky ... we're expected to return a DatabaseObject value. However, there is no such
+        // value for the relation design. /me thinks we should change the API definition here ...
+        nType = -1;
+
+    return beans::Pair< ::sal_Int32, ::rtl::OUString >( nType, sName );
+}
+
+// -----------------------------------------------------------------------------
 ::sal_Bool SAL_CALL OApplicationController::closeSubComponents(  ) throw (RuntimeException)
 {
+    ::vos::OGuard aSolarGuard(Application::GetSolarMutex());
+    ::osl::MutexGuard aGuard( getMutex() );
     return m_pSubComponentManager->closeSubComponents();
 }
 
@@ -424,7 +458,7 @@ namespace
 }
 
 // -----------------------------------------------------------------------------
-void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int32 _nObjectType, const ::rtl::OUString& _rObjectName )
+void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int32 _nObjectType, const ::boost::optional< ::rtl::OUString >& i_rObjectName )
 {
     // ensure we're connected
     if ( !isConnected() )
@@ -441,6 +475,9 @@ void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int
         )
         throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
 
+    if ( !i_rObjectName )
+        return;
+
     // ensure an existing object
     Reference< XNameAccess > xContainer( getElements( lcl_objectType2ElementType( _nObjectType ) ) );
     if ( !xContainer.is() )
@@ -453,19 +490,19 @@ void OApplicationController::impl_validateObjectTypeAndName_throw( const sal_Int
     {
     case DatabaseObject::TABLE:
     case DatabaseObject::QUERY:
-        bExistentObject = xContainer->hasByName( _rObjectName );
+        bExistentObject = xContainer->hasByName( *i_rObjectName );
         break;
     case DatabaseObject::FORM:
     case DatabaseObject::REPORT:
     {
         Reference< XHierarchicalNameAccess > xHierarchy( xContainer, UNO_QUERY_THROW );
-        bExistentObject = xHierarchy->hasByHierarchicalName( _rObjectName );
+        bExistentObject = xHierarchy->hasByHierarchicalName( *i_rObjectName );
     }
     break;
     }
 
     if ( !bExistentObject )
-        throw NoSuchElementException( _rObjectName, *this );
+        throw NoSuchElementException( *i_rObjectName, *this );
 }
 
 // -----------------------------------------------------------------------------
@@ -496,6 +533,29 @@ Reference< XComponent > SAL_CALL OApplicationController::loadComponentWithArgume
 }
 
 // -----------------------------------------------------------------------------
+Reference< XComponent > SAL_CALL OApplicationController::createComponent( ::sal_Int32 i_nObjectType, Reference< XComponent >& o_DocumentDefinition  ) throw (IllegalArgumentException, SQLException, RuntimeException)
+{
+    return createComponentWithArguments( i_nObjectType, Sequence< PropertyValue >(), o_DocumentDefinition );
+}
+
+// -----------------------------------------------------------------------------
+Reference< XComponent > SAL_CALL OApplicationController::createComponentWithArguments( ::sal_Int32 i_nObjectType, const Sequence< PropertyValue >& i_rArguments, Reference< XComponent >& o_DocumentDefinition ) throw (IllegalArgumentException, SQLException, RuntimeException)
+{
+    ::vos::OGuard aSolarGuard( Application::GetSolarMutex() );
+    ::osl::MutexGuard aGuard( getMutex() );
+
+    impl_validateObjectTypeAndName_throw( i_nObjectType, ::boost::optional< ::rtl::OUString >() );
+
+    Reference< XComponent > xComponent( newElement(
+        lcl_objectType2ElementType( i_nObjectType ),
+        ::comphelper::NamedValueCollection( i_rArguments ),
+        o_DocumentDefinition
+    ) );
+
+    return xComponent;
+}
+
+// -----------------------------------------------------------------------------
 void SAL_CALL OApplicationController::registerContextMenuInterceptor( const Reference< XContextMenuInterceptor >& _Interceptor ) throw (RuntimeException)
 {
     if ( _Interceptor.is() )