fdo#46808, Convert chart2::Title service to new style

API CHANGE: The chart2::XTitled interface now takes and returns
   a XTitle2 instead of an XTitle.

Change-Id: I96c35909d3a13f1abb544296a782a0b6a7a58ec6

7 files changed, 95 insertions, 21 deletions

diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 35fcabb89571..bac6aea6a194 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -341,7 +341,7 @@ Axis::Axis( const Axis & rOther ) :
         lcl_CloneSubGrids( rOther.m_aSubGridProperties, m_aSubGridProperties );
     ModifyListenerHelper::addListenerToAllSequenceElements( m_aSubGridProperties, m_xModifyEventForwarder );
 
-    m_xTitle.set( CloneHelper::CreateRefClone< Reference< chart2::XTitle > >()( rOther.m_xTitle ));
+    m_xTitle.set( CloneHelper::CreateRefClone< Reference< chart2::XTitle2 > >()( rOther.m_xTitle ));
     if( m_xTitle.is())
         ModifyListenerHelper::addListener( m_xTitle, m_xModifyEventForwarder );
 }
@@ -480,18 +480,18 @@ Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties
 
 
 // ____ XTitled ____
-Reference< chart2::XTitle > SAL_CALL Axis::getTitleObject()
+Reference< chart2::XTitle2 > SAL_CALL Axis::getTitleObject()
     throw (uno::RuntimeException)
 {
     MutexGuard aGuard( GetMutex() );
     return m_xTitle;
 }
 
-void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle )
+void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle2 >& xNewTitle )
     throw (uno::RuntimeException)
 {
     Reference< util::XModifyListener > xModifyEventForwarder;
-    Reference< chart2::XTitle > xOldTitle;
+    Reference< chart2::XTitle2 > xOldTitle;
     {
         MutexGuard aGuard( GetMutex() );
         xOldTitle = m_xTitle;
diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx
index 46301fee3605..c5c2c1768e23 100644
--- a/chart2/source/model/main/Axis.hxx
+++ b/chart2/source/model/main/Axis.hxx
@@ -106,11 +106,11 @@ protected:
 
     // ____ XTitled ____
     virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject()
+                ::com::sun::star::chart2::XTitle2 > SAL_CALL getTitleObject()
         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setTitleObject(
         const ::com::sun::star::uno::Reference<
-            ::com::sun::star::chart2::XTitle >& Title )
+            ::com::sun::star::chart2::XTitle2 >& Title )
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XCloneable ____
@@ -160,7 +160,7 @@ private: //member
             ::com::sun::star::beans::XPropertySet > >     m_aSubGridProperties;
 
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XTitle >          m_xTitle;
+        ::com::sun::star::chart2::XTitle2 >         m_xTitle;
 };
 
 } //  namespace chart
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index e2157c4f2daa..da5224319b36 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -156,7 +156,7 @@ ChartModel::ChartModel( const ChartModel & rOther )
         m_xOldModelAgg->setDelegator( *this );
 
         Reference< util::XModifyListener > xListener;
-        Reference< chart2::XTitle > xNewTitle = CreateRefClone< Reference< chart2::XTitle > >()( rOther.m_xTitle );
+        Reference< chart2::XTitle2 > xNewTitle = CreateRefClone< Reference< chart2::XTitle2 > >()( rOther.m_xTitle );
         Reference< chart2::XDiagram > xNewDiagram = CreateRefClone< Reference< chart2::XDiagram > >()( rOther.m_xDiagram );
         Reference< beans::XPropertySet > xNewPageBackground = CreateRefClone< Reference< beans::XPropertySet > >()( rOther.m_xPageBackground );
         Reference< chart2::XChartTypeManager > xChartTypeManager = CreateRefClone< Reference< chart2::XChartTypeManager > >()( rOther.m_xChartTypeManager );
@@ -967,14 +967,14 @@ uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getPageBackground()
 }
 
 // ____ XTitled ____
-uno::Reference< chart2::XTitle > SAL_CALL ChartModel::getTitleObject()
+uno::Reference< chart2::XTitle2 > SAL_CALL ChartModel::getTitleObject()
     throw (uno::RuntimeException)
 {
     MutexGuard aGuard( m_aModelMutex );
     return m_xTitle;
 }
 
-void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle >& xTitle )
+void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle2 >& xTitle )
     throw (uno::RuntimeException)
 {
     {
diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx
index f7d81b8dff92..b27e8340a3fe 100644
--- a/chart2/source/model/main/ChartModel.hxx
+++ b/chart2/source/model/main/ChartModel.hxx
@@ -160,7 +160,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >
         m_xDiagram;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >
+    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle2 >
                                           m_xTitle;
 
     bool                                  m_bIsDisposed;
@@ -480,10 +480,10 @@ public:
 
     // ____ XTitled ____
     virtual ::com::sun::star::uno::Reference<
-        ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject()
+        ::com::sun::star::chart2::XTitle2 > SAL_CALL getTitleObject()
         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference<
-                                          ::com::sun::star::chart2::XTitle >& Title )
+                                          ::com::sun::star::chart2::XTitle2 >& Title )
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XInterface (for old API wrapper) ____
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index ec1637ba1f51..eb7fac357755 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -307,7 +307,7 @@ Diagram::Diagram( const Diagram & rOther ) :
 
     m_xWall.set( CloneHelper::CreateRefClone< Reference< beans::XPropertySet > >()( rOther.m_xWall ));
     m_xFloor.set( CloneHelper::CreateRefClone< Reference< beans::XPropertySet > >()( rOther.m_xFloor ));
-    m_xTitle.set( CloneHelper::CreateRefClone< Reference< chart2::XTitle > >()( rOther.m_xTitle ));
+    m_xTitle.set( CloneHelper::CreateRefClone< Reference< chart2::XTitle2 > >()( rOther.m_xTitle ));
     m_xLegend.set( CloneHelper::CreateRefClone< Reference< chart2::XLegend > >()( rOther.m_xLegend ));
 
     ModifyListenerHelper::addListener( m_xWall, m_xModifyEventForwarder );
@@ -442,17 +442,17 @@ void SAL_CALL Diagram::setDiagramData(
 }
 
 // ____ XTitled ____
-uno::Reference< chart2::XTitle > SAL_CALL Diagram::getTitleObject()
+uno::Reference< chart2::XTitle2 > SAL_CALL Diagram::getTitleObject()
     throw (uno::RuntimeException)
 {
     MutexGuard aGuard( GetMutex() );
     return m_xTitle;
 }
 
-void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle >& xNewTitle )
+void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle2 >& xNewTitle )
     throw (uno::RuntimeException)
 {
-    Reference< chart2::XTitle > xOldTitle;
+    Reference< chart2::XTitle2 > xOldTitle;
     {
         MutexGuard aGuard( GetMutex() );
         if( m_xTitle == xNewTitle )
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 346a967058af..5eb9686106c5 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -370,6 +370,40 @@ void Title::fireModifyEvent()
     m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
 }
 
+sal_Bool Title::getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException)
+{
+   uno::Any any = getPropertyValue(aPropertyName);
+   sal_Bool b = sal_False;
+   any >>= b;
+   return b;
+}
+
+double Title::getPropertyDouble(const OUString& aPropertyName) throw (css::uno::RuntimeException)
+{
+   uno::Any any = getPropertyValue(aPropertyName);
+   double b = sal_False;
+   any >>= b;
+   return b;
+}
+
+awt::Size Title::getReferencePageSize() throw(css::uno::RuntimeException)
+{
+   uno::Any any = getPropertyValue("ReferencePageSize");
+   awt::Size b;
+   any >>= b;
+   return b;
+}
+
+chart2::RelativePosition Title::getRelativePosition() throw(css::uno::RuntimeException)
+{
+   uno::Any any = getPropertyValue("RelativePosition");
+   chart2::RelativePosition b;
+   any >>= b;
+   return b;
+}
+
+
+
 
 // ================================================================================
 
diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx
index c177d6e9ebc4..32c7c1726576 100644
--- a/chart2/source/model/main/Title.hxx
+++ b/chart2/source/model/main/Title.hxx
@@ -25,7 +25,7 @@
 #include "MutexContainer.hxx"
 #include <cppuhelper/implbase5.hxx>
 #include <comphelper/uno3.hxx>
-#include <com/sun/star/chart2/XTitle.hpp>
+#include <com/sun/star/chart2/XTitle2.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
@@ -36,7 +36,7 @@ namespace chart
 namespace impl
 {
 typedef ::cppu::WeakImplHelper5<
-    ::com::sun::star::chart2::XTitle,
+    ::com::sun::star::chart2::XTitle2,
     ::com::sun::star::lang::XServiceInfo,
     ::com::sun::star::util::XCloneable,
     ::com::sun::star::util::XModifyBroadcaster,
@@ -61,9 +61,41 @@ public:
     APPHELPER_XSERVICEINFO_DECL()
 
     /// merge XInterface implementations
-     DECLARE_XINTERFACE()
+    DECLARE_XINTERFACE()
     /// merge XTypeProvider implementations
-     DECLARE_XTYPEPROVIDER()
+    DECLARE_XTYPEPROVIDER()
+
+
+    // ambiguous overloads
+    virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) throw(css::uno::RuntimeException)
+        { ::property::OPropertySet::setPropertyValue(p1, p2); }
+    virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw(css::uno::RuntimeException)
+        { return ::property::OPropertySet::getPropertyValue(p1); }
+    virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw(css::uno::RuntimeException)
+        { ::property::OPropertySet::addPropertyChangeListener(p1, p2); }
+    virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw(css::uno::RuntimeException)
+        { ::property::OPropertySet::removePropertyChangeListener(p1, p2); }
+    virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw(css::uno::RuntimeException)
+        { ::property::OPropertySet::addVetoableChangeListener(p1, p2); }
+    virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw(css::uno::RuntimeException)
+        { ::property::OPropertySet::removeVetoableChangeListener(p1, p2); }
+
+    // Attributes
+    virtual double SAL_CALL getTextRotation() throw(css::uno::RuntimeException)
+        { return getPropertyDouble("TextRotation"); }
+    virtual void SAL_CALL setTextRotation(double p1) throw(css::uno::RuntimeException)
+        { setPropertyDouble("TextRotation", p1); }
+    virtual sal_Bool SAL_CALL getStackCharacters() throw(css::uno::RuntimeException)
+        { return getPropertyBool("StackCharacters"); }
+    virtual void SAL_CALL setStackCharacters(sal_Bool p1) throw(css::uno::RuntimeException)
+        { setPropertyBool("StackCharacters", p1); }
+    virtual com::sun::star::chart2::RelativePosition SAL_CALL getRelativePosition() throw(css::uno::RuntimeException);
+    virtual void SAL_CALL setRelativePosition(const com::sun::star::chart2::RelativePosition& p1) throw(css::uno::RuntimeException)
+        { setPropertyValue("RelativePosition", css::uno::Any(p1)); }
+    virtual com::sun::star::awt::Size SAL_CALL getReferencePageSize() throw(css::uno::RuntimeException);
+    virtual void SAL_CALL setReferencePageSize(const com::sun::star::awt::Size& p1) throw(css::uno::RuntimeException)
+        { setPropertyValue("ReferencePageSize", css::uno::Any(p1)); }
+
 
 protected:
     explicit Title( const Title & rOther );
@@ -119,6 +151,14 @@ protected:
     void fireModifyEvent();
 
 private:
+
+    sal_Bool getPropertyBool(const OUString& p1) throw(::com::sun::star::uno::RuntimeException);
+    double getPropertyDouble(const OUString& p1) throw(::com::sun::star::uno::RuntimeException);
+    void setPropertyBool(const OUString& p1, sal_Bool p2) throw(::com::sun::star::uno::RuntimeException)
+        { setPropertyValue( p1, css::uno::Any(p2) ); }
+    void setPropertyDouble(const OUString& p1, double p2) throw(::com::sun::star::uno::RuntimeException)
+        { setPropertyValue( p1, css::uno::Any(p2) ); }
+
     ::com::sun::star::uno::Sequence<
         ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XFormattedString > > m_aStrings;