rebase to DEV300_m84

1 files changed, 40 insertions, 10 deletions

diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 14a20e133ff1f..edf8ad2b62095 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -160,7 +160,9 @@ enum
     PROP_DOCUMENT_BASEDIAGRAM,
     PROP_DOCUMENT_ADDITIONAL_SHAPES,
     PROP_DOCUMENT_UPDATE_ADDIN,
-    PROP_DOCUMENT_NULL_DATE
+    PROP_DOCUMENT_NULL_DATE,
+    PROP_DOCUMENT_DISABLE_COMPLEX_CHARTTYPES,
+    PROP_DOCUMENT_DISABLE_DATATABLE_DIALOG
 };
 
 void lcl_AddPropertiesToVector(
@@ -170,20 +172,20 @@ void lcl_AddPropertiesToVector(
         Property( C2U( "HasMainTitle" ),
                   PROP_DOCUMENT_HAS_MAIN_TITLE,
                   ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT ));
+                  //#i111967# no PropertyChangeEvent is fired on change so far
+                  beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
         Property( C2U( "HasSubTitle" ),
                   PROP_DOCUMENT_HAS_SUB_TITLE,
                   ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT ));
+                  //#i111967# no PropertyChangeEvent is fired on change so far
+                  beans::PropertyAttribute::MAYBEDEFAULT ));
     rOutProperties.push_back(
         Property( C2U( "HasLegend" ),
                   PROP_DOCUMENT_HAS_LEGEND,
                   ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT ));
+                  //#i111967# no PropertyChangeEvent is fired on change so far
+                  beans::PropertyAttribute::MAYBEDEFAULT ));
 
     // really needed?
     rOutProperties.push_back(
@@ -196,8 +198,8 @@ void lcl_AddPropertiesToVector(
         Property( C2U( "DataSourceLabelsInFirstColumn" ),
                   PROP_DOCUMENT_LABELS_IN_FIRST_COLUMN,
                   ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND
-                  | beans::PropertyAttribute::MAYBEDEFAULT ));
+                  //#i111967# no PropertyChangeEvent is fired on change so far
+                  beans::PropertyAttribute::MAYBEDEFAULT ));
 
     //add-in
     rOutProperties.push_back(
@@ -223,7 +225,8 @@ void lcl_AddPropertiesToVector(
         Property( C2U( "RefreshAddInAllowed" ),
                   PROP_DOCUMENT_UPDATE_ADDIN,
                   ::getBooleanCppuType(),
-                  beans::PropertyAttribute::BOUND ));
+                  //#i111967# no PropertyChangeEvent is fired on change so far
+                  beans::PropertyAttribute::TRANSIENT ));
 
     // table:null-date // i99104
     rOutProperties.push_back(
@@ -231,6 +234,19 @@ void lcl_AddPropertiesToVector(
                   PROP_DOCUMENT_NULL_DATE,
                   ::getCppuType( static_cast< const ::com::sun::star::util::DateTime * >(0)),
                   beans::PropertyAttribute::MAYBEVOID ));
+
+    rOutProperties.push_back(
+        Property( C2U( "DisableComplexChartTypes" ),
+                  PROP_DOCUMENT_DISABLE_COMPLEX_CHARTTYPES,
+                  ::getBooleanCppuType(),
+                  beans::PropertyAttribute::BOUND
+                  | beans::PropertyAttribute::MAYBEDEFAULT ) );
+    rOutProperties.push_back(
+        Property( C2U( "DisableDataTableDialog" ),
+                  PROP_DOCUMENT_DISABLE_DATATABLE_DIALOG,
+                  ::getBooleanCppuType(),
+                  beans::PropertyAttribute::BOUND
+                  | beans::PropertyAttribute::MAYBEDEFAULT ) );
 }
 
 const uno::Sequence< Property > & lcl_GetPropertySequence()
@@ -742,6 +758,7 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle()
 {
     if( !m_xTitle.is()  )
     {
+        ControllerLockGuard aCtrlLockGuard( Reference< frame::XModel >( m_spChart2ModelContact->getChart2Document(), uno::UNO_QUERY ));
         m_xTitle = new TitleWrapper( TitleHelper::MAIN_TITLE, m_spChart2ModelContact );
     }
     return m_xTitle;
@@ -752,6 +769,7 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle()
 {
     if( !m_xSubTitle.is() )
     {
+        ControllerLockGuard aCtrlLockGuard( Reference< frame::XModel >( m_spChart2ModelContact->getChart2Document(), uno::UNO_QUERY ));
         m_xSubTitle = new TitleWrapper( TitleHelper::SUB_TITLE, m_spChart2ModelContact );
     }
     return m_xSubTitle;
@@ -1499,6 +1517,16 @@ void SAL_CALL ChartDocumentWrapper::setDelegator(
     const uno::Reference< uno::XInterface >& rDelegator )
     throw (uno::RuntimeException)
 {
+    if( m_bIsDisposed )
+    {
+        if( rDelegator.is() )
+            throw lang::DisposedException(
+                C2U("ChartDocumentWrapper is disposed" ),
+                static_cast< ::cppu::OWeakObject* >( this ));
+        else
+            return;
+    }
+
     if( rDelegator.is())
     {
         m_xDelegator = rDelegator;
@@ -1570,6 +1598,8 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert
     aWrappedProperties.push_back( new WrappedAdditionalShapesProperty( *this ) );
     aWrappedProperties.push_back( new WrappedRefreshAddInAllowedProperty( *this ) );
     aWrappedProperties.push_back( new WrappedIgnoreProperty( C2U("NullDate"),Any() ) ); // i99104
+    aWrappedProperties.push_back( new WrappedIgnoreProperty( C2U( "DisableComplexChartTypes" ), uno::makeAny( sal_False ) ) );
+    aWrappedProperties.push_back( new WrappedIgnoreProperty( C2U( "DisableDataTableDialog" ), uno::makeAny( sal_False ) ) );
 
     return aWrappedProperties;
 }