diff options
Diffstat (limited to 'chart2/source/controller')
6 files changed, 14 insertions, 14 deletions
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index ad07eb12c70a..89f6f9e9de6b 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::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY); + Reference< chart2::XTitle2 > 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::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY); + Reference< chart2::XTitle2 > 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::XTitle > xTitle( this->getTitleObject() ); + Reference< chart2::XTitle2 > 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::XTitle > xTitle( this->getTitleObject() ); + Reference< chart2::XTitle2 > xTitle( this->getTitleObject() ); if( xTitle.is()) { Sequence< Reference< chart2::XFormattedString > > aStrings( xTitle->getText()); @@ -494,7 +494,7 @@ awt::Size TitleWrapper::getCurrentSizeForReference() // ================================================================================ -Reference< chart2::XTitle > TitleWrapper::getTitleObject() +Reference< chart2::XTitle2 > 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 5a437115de86..85f765753be1 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -30,7 +30,7 @@ #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/chart2/XTitle.hpp> +#include <com/sun/star/chart2/XTitle2.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <boost/shared_ptr.hpp> @@ -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::XTitle > getTitleObject(); + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle2 > 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 d21f485166fe..342411941236 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::XTitle > xTitle( TitleHelper::getTitle( m_eTitleType, m_spChart2ModelContact->getChartModel() ) ); + Reference< chart2::XTitle2 > 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 29a3f38be4be..2f81a5c25226 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< XTitle > xTitle( + Reference< XTitle2 > 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 91d44353934e..b1560dba7579 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< XTitle > xTitle = TitleHelper::getTitle( + uno::Reference< XTitle2 > 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< XTitle > xTitle( - TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( nN ), xChartModel ) ); + uno::Reference< XTitle2 > 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 8fd50b0a64d7..6f7b4ebc2817 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::XTitle >::query( xPropSet ), m_xCC ); + ::com::sun::star::chart2::XTitle2 >::query( xPropSet ), m_xCC ); OSL_ENSURE( m_pTextActionUndoGuard.get(), "ChartController::EndTextEdit: no TextUndoGuard!" ); if ( m_pTextActionUndoGuard.get() ) |