1 files changed, 10 insertions, 7 deletions
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index 1ce277c321ba..bc1f5aed14f6 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -19,9 +19,11 @@
 
 #include "WrappedNumberFormatProperty.hxx"
 #include "Chart2ModelContact.hxx"
-#include <com/sun/star/chart2/XAxis.hpp>
+#include <Axis.hxx>
+#include <DataSeries.hxx>
 #include <com/sun/star/chart2/XDataSeries.hpp>
 #include <unonames.hxx>
+#include <utility>
 #include <osl/diagnose.h>
 
 using namespace ::com::sun::star;
@@ -31,9 +33,9 @@ using ::com::sun::star::uno::Any;
 namespace chart::wrapper
 {
 
-WrappedNumberFormatProperty::WrappedNumberFormatProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact)
+WrappedNumberFormatProperty::WrappedNumberFormatProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact)
         : WrappedDirectStateProperty( CHART_UNONAME_NUMFMT, CHART_UNONAME_NUMFMT )
-        , m_spChart2ModelContact(spChart2ModelContact)
+        , m_spChart2ModelContact(std::move(spChart2ModelContact))
 {
 }
 
@@ -45,7 +47,7 @@ void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, cons
 {
     sal_Int32 nFormat = 0;
     if( ! (rOuterValue >>= nFormat) )
-        throw lang::IllegalArgumentException( "Property 'NumberFormat' requires value of type sal_Int32", nullptr, 0 );
+        throw lang::IllegalArgumentException( u"Property 'NumberFormat' requires value of type sal_Int32"_ustr, nullptr, 0 );
 
     if(xInnerPropertySet.is())
         xInnerPropertySet->setPropertyValue(getInnerName(), convertOuterToInnerValue(rOuterValue));
@@ -63,11 +65,12 @@ Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XProp
     {
         sal_Int32 nKey = 0;
         Reference< chart2::XDataSeries > xSeries( xInnerPropertySet, uno::UNO_QUERY );
-        if( xSeries.is() )
-            nKey = Chart2ModelContact::getExplicitNumberFormatKeyForSeries( xSeries );
+        if( ::chart::DataSeries* pDataSeries = dynamic_cast<DataSeries*>(xSeries.get()) )
+            nKey = pDataSeries->getExplicitNumberFormatKeyForDataLabel();
         else
         {
-            Reference< chart2::XAxis > xAxis( xInnerPropertySet, uno::UNO_QUERY );
+            rtl::Reference< Axis > xAxis = dynamic_cast<Axis*>(xInnerPropertySet.get());
+            assert(xAxis || !xInnerPropertySet);
             nKey = m_spChart2ModelContact->getExplicitNumberFormatKeyForAxis( xAxis );
         }
         aRet <<= nKey;