From 66604baf08c47cc0c77ab3b9ee7e77f987c64722 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 23 Aug 2017 18:11:38 +0200 Subject: Consistently use OUString in test::Directories Change-Id: Ia5fd8af34ee9d2f37e4450ab241f6bb9a06445b2 Reviewed-on: https://gerrit.libreoffice.org/41466 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- chart2/qa/extras/charttest.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chart2') diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx index b75dac6d25b5..438565222db4 100644 --- a/chart2/qa/extras/charttest.hxx +++ b/chart2/qa/extras/charttest.hxx @@ -76,10 +76,10 @@ public: void load( const OUString& rDir, const OUString& rFileName ); std::shared_ptr save( const OUString& rFileName ); std::shared_ptr reload( const OUString& rFileName ); - uno::Sequence < OUString > getImpressChartColumnDescriptions( const char* pDir, const char* pName ); + uno::Sequence < OUString > getImpressChartColumnDescriptions( const OUString& pDir, const char* pName ); OUString getFileExtension( const OUString& rFileName ); - uno::Reference< chart::XChartDocument > getChartDocFromImpress( const char* pDir, const char* pName ); + uno::Reference< chart::XChartDocument > getChartDocFromImpress( const OUString& pDir, const char* pName ); uno::Reference getChartDocFromDrawImpress( sal_Int32 nPage, sal_Int32 nShape ); @@ -497,7 +497,7 @@ std::vector > getDataSeriesLabelsFromChartType( const Re return aRet; } -uno::Reference< chart::XChartDocument > ChartTest::getChartDocFromImpress( const char* pDir, const char* pName ) +uno::Reference< chart::XChartDocument > ChartTest::getChartDocFromImpress( const OUString& pDir, const char* pName ) { mxComponent = loadFromDesktop(m_directories.getURLFromSrc(pDir) + OUString::createFromAscii(pName), "com.sun.star.comp.Draw.PresentationDocument"); uno::Reference< drawing::XDrawPagesSupplier > xDoc(mxComponent, uno::UNO_QUERY_THROW ); @@ -562,7 +562,7 @@ uno::Reference ChartTest::getChartDocFromWriter( sal_Int3 return xChartDoc; } -uno::Sequence < OUString > ChartTest::getImpressChartColumnDescriptions( const char* pDir, const char* pName ) +uno::Sequence < OUString > ChartTest::getImpressChartColumnDescriptions( const OUString& pDir, const char* pName ) { uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromImpress( pDir, pName ); uno::Reference< chart::XChartDataArray > xChartData ( xChartDoc->getData(), uno::UNO_QUERY_THROW); -- cgit