diff options
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/test/tests.cxx | 12 | ||||
| -rw-r--r-- | sdext/source/presenter/PresenterScreen.cxx | 4 | ||||
| -rw-r--r-- | sdext/source/presenter/PresenterScreen.hxx | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx index 58f3d332b4e0..dd118cc3aea9 100644 --- a/sdext/source/pdfimport/test/tests.cxx +++ b/sdext/source/pdfimport/test/tests.cxx @@ -454,7 +454,7 @@ namespace auto pSink = std::make_shared<TestSink>(); CPPUNIT_ASSERT( pdfi::xpdf_ImportFromFile( - m_directories.getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"), + m_directories.getURLFromSrc(u"/sdext/source/pdfimport/test/testinput.pdf"), pSink, uno::Reference< task::XInteractionHandler >(), OUString(), @@ -473,7 +473,7 @@ namespace CPPUNIT_ASSERT_EQUAL( osl::File::E_None, osl::File::createTempFile( nullptr, nullptr, &tempFileURL ) ); osl::File::remove( tempFileURL ); // FIXME the below apparently fails silently if the file already exists CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", - xAdaptor->odfConvert( m_directories.getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"), + xAdaptor->odfConvert( m_directories.getURLFromSrc(u"/sdext/source/pdfimport/test/testinput.pdf"), new OutputWrap(tempFileURL), nullptr )); osl::File::remove( tempFileURL ); @@ -490,7 +490,7 @@ namespace CPPUNIT_ASSERT_EQUAL( osl::File::E_None, osl::File::createTempFile( nullptr, nullptr, &tempFileURL ) ); osl::File::remove( tempFileURL ); // FIXME the below apparently fails silently if the file already exists CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", - xAdaptor->odfConvert( m_directories.getURLFromSrc("/sdext/source/pdfimport/test/testinput.pdf"), + xAdaptor->odfConvert( m_directories.getURLFromSrc(u"/sdext/source/pdfimport/test/testinput.pdf"), new OutputWrap(tempFileURL), nullptr )); osl::File::remove( tempFileURL ); @@ -505,7 +505,7 @@ namespace OString aOutput; CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", - xAdaptor->odfConvert(m_directories.getURLFromSrc("/sdext/source/pdfimport/test/testTdf96993.pdf"), + xAdaptor->odfConvert(m_directories.getURLFromSrc(u"/sdext/source/pdfimport/test/testTdf96993.pdf"), new OutputWrapString(aOutput), nullptr)); // This ensures that the imported image arrives properly flipped @@ -521,7 +521,7 @@ namespace OString aOutput; CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", - xAdaptor->odfConvert(m_directories.getURLFromSrc("/sdext/source/pdfimport/test/testTdf96993.pdf"), + xAdaptor->odfConvert(m_directories.getURLFromSrc(u"/sdext/source/pdfimport/test/testTdf96993.pdf"), new OutputWrapString(aOutput), nullptr)); // This ensures that the imported image arrives properly flipped @@ -538,7 +538,7 @@ namespace OString aOutput; CPPUNIT_ASSERT_MESSAGE("Exporting to ODF", - xAdaptor->odfConvert(m_directories.getURLFromSrc("/sdext/source/pdfimport/test/testTdf105536.pdf"), + xAdaptor->odfConvert(m_directories.getURLFromSrc(u"/sdext/source/pdfimport/test/testTdf105536.pdf"), new OutputWrapString(aOutput), nullptr)); // This ensures that the imported image arrives properly flipped diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index a06bf17c5a00..30f1864e8aed 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -633,7 +633,7 @@ void PresenterScreen::SetupConfiguration ( void PresenterScreen::ProcessLayout ( PresenterConfigurationAccess& rConfiguration, - const OUString& rsLayoutName, + std::u16string_view rsLayoutName, const Reference<XComponentContext>& rxContext, const Reference<XResourceId>& rxAnchorId) { @@ -641,7 +641,7 @@ void PresenterScreen::ProcessLayout ( { Reference<container::XHierarchicalNameAccess> xLayoutNode ( rConfiguration.GetConfigurationNode( - "Presenter/Layouts/"+rsLayoutName), + OUString::Concat("Presenter/Layouts/")+rsLayoutName), UNO_QUERY_THROW); // Read the parent layout first, if one is referenced. diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index ca4ca7fe57e7..e696c0dc646e 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -33,6 +33,7 @@ #include <rtl/ref.hxx> #include <map> +#include <string_view> namespace sdext::presenter { @@ -172,7 +173,7 @@ private: */ void ProcessLayout ( PresenterConfigurationAccess& rConfiguration, - const OUString& rsLayoutName, + std::u16string_view rsLayoutName, const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxAnchorId); |