From f30399c540f01f16f097b86ff518251324d558d7 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 23 May 2013 10:11:49 +0200 Subject: Revert "fdo#46808, Convert chart2::Title service to new style" This reverts commit d256dbede60533369d1aac64cca34721183f6a8a: For one, the new css.chart2.XTitle2 looked unfinished, in that it transfered the direct properties of the old-style css.chart2.Title service into attributes, but left out all the properties inherited by the old-style service from css.style.ParagraphProperties, css.drawing.FillProperties, css.drawing.LineProperties (and that missing FIXME css.layout.LayoutElement, whatever that is supposed to be). This needs more thought, to either make available all propertiers as attributes, or none. For another, this broke JunitTest_chart2_unoapi (sch.ChXChartDocument, sch.ChartTitle), for hard-to-debug reasons. Conflicts: chart2/source/model/main/Title.cxx chart2/source/model/main/Title.hxx offapi/com/sun/star/chart2/XTitle2.idl sc/source/filter/inc/xlchart.hxx Change-Id: I4747208a13984904d0e409ea49a73b0f667c86c7 --- .../controller/chartapiwrapper/TitleWrapper.cxx | 10 +- .../controller/chartapiwrapper/TitleWrapper.hxx | 4 +- .../WrappedAxisAndGridExistenceProperties.cxx | 2 +- .../controller/dialogs/ObjectNameProvider.cxx | 2 +- .../source/controller/dialogs/TitleDialogData.cxx | 8 +- .../controller/main/ChartController_TextEdit.cxx | 2 +- chart2/source/inc/TitleHelper.hxx | 10 +- chart2/source/model/inc/Diagram.hxx | 6 +- chart2/source/model/main/Axis.cxx | 8 +- chart2/source/model/main/Axis.hxx | 6 +- chart2/source/model/main/ChartModel.cxx | 6 +- chart2/source/model/main/ChartModel.hxx | 6 +- chart2/source/model/main/Diagram.cxx | 8 +- chart2/source/model/main/Title.cxx | 34 ------ chart2/source/model/main/Title.hxx | 48 +------- chart2/source/tools/ObjectIdentifier.cxx | 2 +- chart2/source/tools/TitleHelper.cxx | 125 +++++++++++---------- chart2/source/view/main/ChartView.cxx | 2 +- 18 files changed, 113 insertions(+), 176 deletions(-) (limited to 'chart2/source') diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 89f6f9e9de6b..ad07eb12c70a 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -77,7 +77,7 @@ WrappedTitleStringProperty::~WrappedTitleStringProperty() void WrappedTitleStringProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - Reference< chart2::XTitle2 > xTitle(xInnerPropertySet,uno::UNO_QUERY); + Reference< chart2::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY); if(xTitle.is()) { OUString aString; @@ -89,7 +89,7 @@ Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPrope throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); - Reference< chart2::XTitle2 > xTitle(xInnerPropertySet,uno::UNO_QUERY); + Reference< chart2::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY); if(xTitle.is()) { Sequence< Reference< chart2::XFormattedString > > aStrings( xTitle->getText()); @@ -294,7 +294,7 @@ Reference< beans::XPropertySet > TitleWrapper::getFirstCharacterPropertySet() { Reference< beans::XPropertySet > xProp; - Reference< chart2::XTitle2 > xTitle = this->getTitleObject(); + Reference< chart2::XTitle > xTitle( this->getTitleObject() ); if( xTitle.is()) { Sequence< Reference< chart2::XFormattedString > > aStrings( xTitle->getText()); @@ -333,7 +333,7 @@ void TitleWrapper::setFastCharacterPropertyValue( OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle && nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP ); - Reference< chart2::XTitle2 > xTitle( this->getTitleObject() ); + Reference< chart2::XTitle > xTitle( this->getTitleObject() ); if( xTitle.is()) { Sequence< Reference< chart2::XFormattedString > > aStrings( xTitle->getText()); @@ -494,7 +494,7 @@ awt::Size TitleWrapper::getCurrentSizeForReference() // ================================================================================ -Reference< chart2::XTitle2 > TitleWrapper::getTitleObject() +Reference< chart2::XTitle > TitleWrapper::getTitleObject() { return TitleHelper::getTitle( m_eTitleType, m_spChart2ModelContact->getChartModel() ); } diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index 85f765753be1..5a437115de86 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include @@ -112,7 +112,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getFirstCharacterPropertySet(); private: - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle2 > getTitleObject(); + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > getTitleObject(); private: ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 342411941236..d21f485166fe 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -300,7 +300,7 @@ Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans: { sal_Bool bHasTitle = sal_False; - Reference< chart2::XTitle2 > xTitle( TitleHelper::getTitle( m_eTitleType, m_spChart2ModelContact->getChartModel() ) ); + Reference< chart2::XTitle > xTitle( TitleHelper::getTitle( m_eTitleType, m_spChart2ModelContact->getChartModel() ) ); if( xTitle.is() && !TitleHelper::getCompleteString( xTitle ).isEmpty() ) bHasTitle = sal_True; diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 2f81a5c25226..29a3f38be4be 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -393,7 +393,7 @@ OUString ObjectNameProvider::getTitleName( const OUString& rObjectCID { OUString aRet; - Reference< XTitle2 > xTitle( + Reference< XTitle > xTitle( ObjectIdentifier::getObjectPropertySet( rObjectCID , xChartModel ), uno::UNO_QUERY ); if( xTitle.is() ) { diff --git a/chart2/source/controller/dialogs/TitleDialogData.cxx b/chart2/source/controller/dialogs/TitleDialogData.cxx index b1560dba7579..91d44353934e 100644 --- a/chart2/source/controller/dialogs/TitleDialogData.cxx +++ b/chart2/source/controller/dialogs/TitleDialogData.cxx @@ -62,10 +62,10 @@ void TitleDialogData::readFromModel( const uno::Reference< frame::XModel>& xChar nTitleIndex < static_cast< sal_Int32 >( TitleHelper::NORMAL_TITLE_END ); nTitleIndex++) { - uno::Reference< XTitle2 > xTitle = TitleHelper::getTitle( + uno::Reference< XTitle > xTitle = TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( nTitleIndex ), xChartModel ); this->aExistenceList[nTitleIndex] = xTitle.is(); - this->aTextList[nTitleIndex] = TitleHelper::getCompleteString( xTitle ); + this->aTextList[nTitleIndex]=TitleHelper::getCompleteString( xTitle ); } } @@ -97,8 +97,8 @@ bool TitleDialogData::writeDifferenceToModel( else if( !pOldState || ( pOldState->aTextList[nN] != this->aTextList[nN] ) ) { //change content - uno::Reference< XTitle2 > xTitle = - TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( nN ), xChartModel ); + uno::Reference< XTitle > xTitle( + TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( nN ), xChartModel ) ); if(xTitle.is()) { TitleHelper::setCompleteString( this->aTextList[nN], xTitle, xContext ); diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 6f7b4ebc2817..8fd50b0a64d7 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -145,7 +145,7 @@ bool ChartController::EndTextEdit() ControllerLockGuard aCLGuard( getModel() ); TitleHelper::setCompleteString( aString, uno::Reference< - ::com::sun::star::chart2::XTitle2 >::query( xPropSet ), m_xCC ); + ::com::sun::star::chart2::XTitle >::query( xPropSet ), m_xCC ); OSL_ENSURE( m_pTextActionUndoGuard.get(), "ChartController::EndTextEdit: no TextUndoGuard!" ); if ( m_pTextActionUndoGuard.get() ) diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index 3fec3e3033d5..ec9db23e2401 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -52,13 +52,13 @@ public: }; static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle2 > + ::com::sun::star::chart2::XTitle > getTitle( eTitleType nTitleIndex , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); static ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle2 > + ::com::sun::star::chart2::XTitle > createTitle( eTitleType nTitleIndex , const OUString& rTitleText , const ::com::sun::star::uno::Reference< @@ -72,17 +72,17 @@ public: ::com::sun::star::frame::XModel >& xModel ); static OUString getCompleteString( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle2 >& xTitle ); + ::com::sun::star::chart2::XTitle >& xTitle ); static void setCompleteString( const OUString& rNewText , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle2 >& xTitle + ::com::sun::star::chart2::XTitle >& xTitle , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext , float * pDefaultCharHeight = 0 ); static bool getTitleType( eTitleType& rType , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle2 >& xTitle + ::com::sun::star::chart2::XTitle >& xTitle , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); }; diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index c9223636a26d..f31c3c509a12 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -150,10 +150,10 @@ protected: // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle2 > SAL_CALL getTitleObject() + ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle2 >& Title ) + ::com::sun::star::chart2::XTitle >& Title ) throw (::com::sun::star::uno::RuntimeException); // ____ X3DDefaultSetter ____ @@ -209,7 +209,7 @@ private: m_xFloor; ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle2 > + ::com::sun::star::chart2::XTitle > m_xTitle; ::com::sun::star::uno::Reference< diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index bac6aea6a194..35fcabb89571 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::XTitle2 > >()( rOther.m_xTitle )); + m_xTitle.set( CloneHelper::CreateRefClone< Reference< chart2::XTitle > >()( 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::XTitle2 > SAL_CALL Axis::getTitleObject() +Reference< chart2::XTitle > SAL_CALL Axis::getTitleObject() throw (uno::RuntimeException) { MutexGuard aGuard( GetMutex() ); return m_xTitle; } -void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle2 >& xNewTitle ) +void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle ) throw (uno::RuntimeException) { Reference< util::XModifyListener > xModifyEventForwarder; - Reference< chart2::XTitle2 > xOldTitle; + Reference< chart2::XTitle > xOldTitle; { MutexGuard aGuard( GetMutex() ); xOldTitle = m_xTitle; diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index c5c2c1768e23..46301fee3605 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::XTitle2 > SAL_CALL getTitleObject() + ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle2 >& Title ) + ::com::sun::star::chart2::XTitle >& 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::XTitle2 > m_xTitle; + ::com::sun::star::chart2::XTitle > m_xTitle; }; } // namespace chart diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index da5224319b36..e2157c4f2daa 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::XTitle2 > xNewTitle = CreateRefClone< Reference< chart2::XTitle2 > >()( rOther.m_xTitle ); + Reference< chart2::XTitle > xNewTitle = CreateRefClone< Reference< chart2::XTitle > >()( 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::XTitle2 > SAL_CALL ChartModel::getTitleObject() +uno::Reference< chart2::XTitle > SAL_CALL ChartModel::getTitleObject() throw (uno::RuntimeException) { MutexGuard aGuard( m_aModelMutex ); return m_xTitle; } -void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle2 >& xTitle ) +void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle >& xTitle ) throw (uno::RuntimeException) { { diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx index b27e8340a3fe..f7d81b8dff92 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::XTitle2 > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > m_xTitle; bool m_bIsDisposed; @@ -480,10 +480,10 @@ public: // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle2 > SAL_CALL getTitleObject() + ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle2 >& Title ) + ::com::sun::star::chart2::XTitle >& 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 eb7fac357755..ec1637ba1f51 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::XTitle2 > >()( rOther.m_xTitle )); + m_xTitle.set( CloneHelper::CreateRefClone< Reference< chart2::XTitle > >()( 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::XTitle2 > SAL_CALL Diagram::getTitleObject() +uno::Reference< chart2::XTitle > SAL_CALL Diagram::getTitleObject() throw (uno::RuntimeException) { MutexGuard aGuard( GetMutex() ); return m_xTitle; } -void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle2 >& xNewTitle ) +void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle >& xNewTitle ) throw (uno::RuntimeException) { - Reference< chart2::XTitle2 > xOldTitle; + Reference< chart2::XTitle > 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 70db368d5abe..346a967058af 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -370,40 +370,6 @@ 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; -} - -beans::Optional Title::getReferencePageSize() throw(css::uno::RuntimeException) -{ - uno::Any any = getPropertyValue("ReferencePageSize"); - beans::Optional b; - any >>= b; - return b; -} - -beans::Optional Title::getRelativePosition() throw(css::uno::RuntimeException) -{ - uno::Any any = getPropertyValue("RelativePosition"); - beans::Optional b; - any >>= b; - return b; -} - - - // ================================================================================ diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index 62a2e0cd3e52..c177d6e9ebc4 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -25,7 +25,7 @@ #include "MutexContainer.hxx" #include #include -#include +#include #include #include #include @@ -36,7 +36,7 @@ namespace chart namespace impl { typedef ::cppu::WeakImplHelper5< - ::com::sun::star::chart2::XTitle2, + ::com::sun::star::chart2::XTitle, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::util::XCloneable, ::com::sun::star::util::XModifyBroadcaster, @@ -61,41 +61,9 @@ public: APPHELPER_XSERVICEINFO_DECL() /// merge XInterface implementations - DECLARE_XINTERFACE() + DECLARE_XINTERFACE() /// merge XTypeProvider implementations - 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& 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& 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& 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& 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 css::beans::Optional SAL_CALL getRelativePosition() throw(css::uno::RuntimeException); - virtual void SAL_CALL setRelativePosition(const css::beans::Optional& p1) throw(css::uno::RuntimeException) - { setPropertyValue("RelativePosition", css::uno::Any(p1)); } - virtual css::beans::Optional SAL_CALL getReferencePageSize() throw(css::uno::RuntimeException); - virtual void SAL_CALL setReferencePageSize(const css::beans::Optional& p1) throw(css::uno::RuntimeException) - { setPropertyValue("ReferencePageSize", css::uno::Any(p1)); } - + DECLARE_XTYPEPROVIDER() protected: explicit Title( const Title & rOther ); @@ -151,14 +119,6 @@ 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; diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index 135227774289..9dc31b17363a 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -344,7 +344,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject( try { //title - Reference< XTitle2 > xTitle( xObject, uno::UNO_QUERY ); + Reference< XTitle > xTitle( xObject, uno::UNO_QUERY ); if( xTitle.is() ) { TitleHelper::eTitleType aTitleType; diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index dda05135c7f2..a8a0b0074990 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -23,7 +23,6 @@ #include "AxisHelper.hxx" #include "DiagramHelper.hxx" #include -#include #include #include @@ -123,23 +122,23 @@ uno::Reference< XTitled > lcl_getTitleParent( TitleHelper::eTitleType nTitleInde return xResult; } -uno::Reference< XTitle2 > TitleHelper::getTitle( TitleHelper::eTitleType nTitleIndex +uno::Reference< XTitle > TitleHelper::getTitle( TitleHelper::eTitleType nTitleIndex , const uno::Reference< frame::XModel >& xModel ) { uno::Reference< XTitled > xTitled( lcl_getTitleParent( nTitleIndex, xModel ) ); if( xTitled.is()) - xTitled->getTitleObject(); + return xTitled->getTitleObject(); return NULL; } -uno::Reference< XTitle2 > TitleHelper::createTitle( +uno::Reference< XTitle > TitleHelper::createTitle( TitleHelper::eTitleType eTitleType , const OUString& rTitleText , const uno::Reference< frame::XModel >& xModel , const uno::Reference< uno::XComponentContext > & xContext , ReferenceSizeProvider * pRefSizeProvider ) { - uno::Reference< XTitle2 > xTitle; + uno::Reference< XTitle > xTitle; uno::Reference< XTitled > xTitled( lcl_getTitleParent( eTitleType, xModel ) ); if( !xTitled.is() ) @@ -169,62 +168,71 @@ uno::Reference< XTitle2 > TitleHelper::createTitle( { uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xModel ) ); - xTitle = chart2::Title::create( xContext ); + xTitle.set( xContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.chart2.Title", + xContext ), uno::UNO_QUERY ); - // default char height (main: 13.0 == default) - float fDefaultCharHeightSub = 11.0; - float fDefaultCharHeightAxis = 9.0; - switch( eTitleType ) + if(xTitle.is()) { - case TitleHelper::SUB_TITLE: - TitleHelper::setCompleteString( - rTitleText, xTitle, xContext, & fDefaultCharHeightSub ); - break; - case TitleHelper::X_AXIS_TITLE: - case TitleHelper::Y_AXIS_TITLE: - case TitleHelper::Z_AXIS_TITLE: - case TitleHelper::TITLE_AT_STANDARD_X_AXIS_POSITION: - case TitleHelper::TITLE_AT_STANDARD_Y_AXIS_POSITION: - case TitleHelper::SECONDARY_X_AXIS_TITLE: - case TitleHelper::SECONDARY_Y_AXIS_TITLE: - TitleHelper::setCompleteString( - rTitleText, xTitle, xContext, & fDefaultCharHeightAxis ); - break; - default: - TitleHelper::setCompleteString( rTitleText, xTitle, xContext ); - break; - } + // default char height (main: 13.0 == default) + float fDefaultCharHeightSub = 11.0; + float fDefaultCharHeightAxis = 9.0; + switch( eTitleType ) + { + case TitleHelper::SUB_TITLE: + TitleHelper::setCompleteString( + rTitleText, xTitle, xContext, & fDefaultCharHeightSub ); + break; + case TitleHelper::X_AXIS_TITLE: + case TitleHelper::Y_AXIS_TITLE: + case TitleHelper::Z_AXIS_TITLE: + case TitleHelper::TITLE_AT_STANDARD_X_AXIS_POSITION: + case TitleHelper::TITLE_AT_STANDARD_Y_AXIS_POSITION: + case TitleHelper::SECONDARY_X_AXIS_TITLE: + case TitleHelper::SECONDARY_Y_AXIS_TITLE: + TitleHelper::setCompleteString( + rTitleText, xTitle, xContext, & fDefaultCharHeightAxis ); + break; + default: + TitleHelper::setCompleteString( rTitleText, xTitle, xContext ); + break; + } - // set/clear autoscale - if( pRefSizeProvider ) - pRefSizeProvider->setValuesAtTitle( xTitle ); + // set/clear autoscale + if( pRefSizeProvider ) + pRefSizeProvider->setValuesAtTitle( xTitle ); - xTitled->setTitleObject( xTitle ); + xTitled->setTitleObject( xTitle ); - //default rotation 90 degree for y axis title in normal coordinatesystems or for x axis title for swapped coordinatesystems - if( eTitleType == TitleHelper::X_AXIS_TITLE || - eTitleType == TitleHelper::Y_AXIS_TITLE || - eTitleType == TitleHelper::SECONDARY_X_AXIS_TITLE || - eTitleType == TitleHelper::SECONDARY_Y_AXIS_TITLE ) + //default rotation 90 degree for y axis title in normal coordinatesystems or for x axis title for swapped coordinatesystems + if( eTitleType == TitleHelper::X_AXIS_TITLE || + eTitleType == TitleHelper::Y_AXIS_TITLE || + eTitleType == TitleHelper::SECONDARY_X_AXIS_TITLE || + eTitleType == TitleHelper::SECONDARY_Y_AXIS_TITLE ) - { - try { - bool bDummy = false; - bool bIsVertical = DiagramHelper::getVertical( xDiagram, bDummy, bDummy ); - - if( (!bIsVertical && eTitleType == TitleHelper::Y_AXIS_TITLE) - || (bIsVertical && eTitleType == TitleHelper::X_AXIS_TITLE) - || (!bIsVertical && eTitleType == TitleHelper::SECONDARY_Y_AXIS_TITLE) - || (bIsVertical && eTitleType == TitleHelper::SECONDARY_X_AXIS_TITLE) ) + try { - double fNewAngleDegree = 90.0; - xTitle->setTextRotation( fNewAngleDegree ); + bool bDummy = false; + bool bIsVertical = DiagramHelper::getVertical( xDiagram, bDummy, bDummy ); + + Reference< beans::XPropertySet > xTitleProps( xTitle, uno::UNO_QUERY ); + if( xTitleProps.is() ) + { + if( (!bIsVertical && eTitleType == TitleHelper::Y_AXIS_TITLE) + || (bIsVertical && eTitleType == TitleHelper::X_AXIS_TITLE) + || (!bIsVertical && eTitleType == TitleHelper::SECONDARY_Y_AXIS_TITLE) + || (bIsVertical && eTitleType == TitleHelper::SECONDARY_X_AXIS_TITLE) ) + { + double fNewAngleDegree = 90.0; + xTitleProps->setPropertyValue( "TextRotation", uno::makeAny( fNewAngleDegree )); + } + } + } + catch( const uno::Exception & ex ) + { + ASSERT_EXCEPTION( ex ); } - } - catch( const uno::Exception & ex ) - { - ASSERT_EXCEPTION( ex ); } } } @@ -232,7 +240,7 @@ uno::Reference< XTitle2 > TitleHelper::createTitle( } -OUString TitleHelper::getCompleteString( const uno::Reference< XTitle2 >& xTitle ) +OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xTitle ) { OUString aRet; if(!xTitle.is()) @@ -244,7 +252,7 @@ OUString TitleHelper::getCompleteString( const uno::Reference< XTitle2 >& xTitle } void TitleHelper::setCompleteString( const OUString& rNewText - , const uno::Reference< XTitle2 >& xTitle + , const uno::Reference< XTitle >& xTitle , const uno::Reference< uno::XComponentContext > & xContext , float * pDefaultCharHeight /* = 0 */ ) { @@ -254,7 +262,10 @@ void TitleHelper::setCompleteString( const OUString& rNewText OUString aNewText = rNewText; - bool bStacked = xTitle->getStackCharacters(); + bool bStacked = false; + uno::Reference< beans::XPropertySet > xTitleProperties( xTitle, uno::UNO_QUERY ); + if( xTitleProperties.is() ) + xTitleProperties->getPropertyValue( "StackCharacters" ) >>= bStacked; if( bStacked ) { @@ -326,14 +337,14 @@ void TitleHelper::removeTitle( TitleHelper::eTitleType nTitleIndex bool TitleHelper::getTitleType( eTitleType& rType , const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XTitle2 >& xTitle + ::com::sun::star::chart2::XTitle >& xTitle , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ) { if( !xTitle.is() || !xModel.is() ) return false; - Reference< chart2::XTitle2 > xCurrentTitle; + Reference< chart2::XTitle > xCurrentTitle; for( sal_Int32 nTitleType = TITLE_BEGIN; nTitleType < NORMAL_TITLE_END; nTitleType++ ) { xCurrentTitle = TitleHelper::getTitle( static_cast(nTitleType), xModel ); diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 5698e3e2a43a..e5ae969c483d 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2167,7 +2167,7 @@ boost::shared_ptr lcl_createTitle( TitleHelper::eTitleType eType nXDistance = nXOffset; } - uno::Reference< XTitle2 > xTitle( TitleHelper::getTitle( eType, xChartModel ) ); + uno::Reference< XTitle > xTitle( TitleHelper::getTitle( eType, xChartModel ) ); OUString aCompleteString( TitleHelper::getCompleteString( xTitle ) ); if( !aCompleteString.isEmpty() ) { -- cgit v1.2.3