diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2024-05-09 18:46:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-09 21:01:29 +0200 |
| commit | 03f13aa770c71795a1e69cf7f77c51aa6bf9ac0a (patch) | |
| tree | 2413d765f1301949fb54e98b15a29f442c29de32 | |
| parent | document why GatherFields messes up sorted order (diff) | |
| download | core-03f13aa770c71795a1e69cf7f77c51aa6bf9ac0a.tar.gz core-03f13aa770c71795a1e69cf7f77c51aa6bf9ac0a.zip | |
workaround segfault in compiler on macos-clang-intel
Change-Id: I4327849c2c58c1656b82ea43fdc218dd7b9578c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167392
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
| -rw-r--r-- | chart2/source/controller/main/CommandDispatchContainer.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index e84d4877b5e9..95ba86433f47 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -71,10 +71,10 @@ void CommandDispatchContainer::setChartDispatch( Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL( const util::URL & rURL ) { - static const o3tl::sorted_vector< OUString > s_aContainerDocumentCommands { - u"AddDirect"_ustr, u"NewDoc"_ustr, u"Open"_ustr, - u"Save"_ustr, u"SaveAs"_ustr, u"SendMail"_ustr, - u"EditDoc"_ustr, u"ExportDirectToPDF"_ustr, u"PrintDefault"_ustr}; + static const o3tl::sorted_vector< std::u16string_view > s_aContainerDocumentCommands { + u"AddDirect", u"NewDoc", u"Open", + u"Save", u"SaveAs", u"SendMail", + u"EditDoc", u"ExportDirectToPDF", u"PrintDefault"}; Reference< frame::XDispatch > xResult; tDispatchMap::const_iterator aIt( m_aCachedDispatches.find( rURL.Complete )); @@ -109,7 +109,7 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL( m_aToBeDisposedDispatches.push_back( xResult ); } else if( xModel.is() && - (s_aContainerDocumentCommands.find( rURL.Path ) != s_aContainerDocumentCommands.end()) ) + (s_aContainerDocumentCommands.find( std::u16string_view(rURL.Path) ) != s_aContainerDocumentCommands.end()) ) { xResult.set( getContainerDispatchForURL( xModel->getCurrentController(), rURL )); // ToDo: can those dispatches be cached? |