summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/inc/InternalDataProvider.hxx6
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx16
2 files changed, 12 insertions, 10 deletions
diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx
index 21cd31e3d6a2..0fa2bdf8b855 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -29,6 +29,7 @@
#include <com/sun/star/util/XCloneable.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
+#include <rtl/ref.hxx>
#include <map>
@@ -36,6 +37,7 @@ namespace com::sun::star::chart2 { class XChartDocument; }
namespace chart
{
+class UncachedDataSequence;
namespace impl
{
@@ -180,10 +182,10 @@ private:
css::uno::Reference< css::chart2::data::XDataSequence >
createDataSequenceAndAddToMap( const OUString & rRangeRepresentation,
const OUString & rRole );
- css::uno::Reference< css::chart2::data::XDataSequence >
+ rtl::Reference< UncachedDataSequence >
createDataSequenceAndAddToMap( const OUString & rRangeRepresentation );
- css::uno::Reference<css::chart2::data::XDataSequence>
+ rtl::Reference<UncachedDataSequence>
createDataSequenceFromArray( const OUString& rArrayStr, std::u16string_view rRole,
std::u16string_view rRoleQualifier);
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 4af0a42a684e..dd70b4617547 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -483,29 +483,29 @@ void InternalDataProvider::decreaseMapReferences(
}
}
-Reference< chart2::data::XDataSequence > InternalDataProvider::createDataSequenceAndAddToMap(
+rtl::Reference< UncachedDataSequence > InternalDataProvider::createDataSequenceAndAddToMap(
const OUString & rRangeRepresentation )
{
- Reference<chart2::data::XDataSequence> xSeq = createDataSequenceFromArray(rRangeRepresentation, u"", u"");
+ rtl::Reference<UncachedDataSequence> xSeq = createDataSequenceFromArray(rRangeRepresentation, u"", u"");
if (xSeq.is())
- return xSeq;
+ return nullptr;
xSeq.set(new UncachedDataSequence(this, rRangeRepresentation));
addDataSequenceToMap(rRangeRepresentation, xSeq);
return xSeq;
}
-uno::Reference<chart2::data::XDataSequence>
+rtl::Reference<UncachedDataSequence>
InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, std::u16string_view rRole, std::u16string_view rRoleQualifier )
{
if (rArrayStr.indexOf('{') != 0 || rArrayStr[rArrayStr.getLength()-1] != '}')
{
// Not an array string.
- return uno::Reference<chart2::data::XDataSequence>();
+ return nullptr;
}
bool bAllNumeric = true;
- uno::Reference<chart2::data::XDataSequence> xSeq;
+ rtl::Reference<UncachedDataSequence> xSeq;
const sal_Unicode* p = rArrayStr.getStr();
const sal_Unicode* pEnd = p + rArrayStr.getLength();
@@ -665,8 +665,8 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::createDataSequenc
const OUString & rRangeRepresentation,
const OUString & rRole )
{
- Reference< chart2::data::XDataSequence > xSeq(
- new UncachedDataSequence( this, rRangeRepresentation, rRole ));
+ rtl::Reference< UncachedDataSequence > xSeq =
+ new UncachedDataSequence( this, rRangeRepresentation, rRole );
addDataSequenceToMap( rRangeRepresentation, xSeq );
return xSeq;
}