chart2/source/controller/inc/ChartController.hxx | 2
chart2/source/controller/inc/CommandDispatchContainer.hxx | 4
chart2/source/controller/main/ChartController.cxx | 112 ++++++-------
chart2/source/controller/main/CommandDispatchContainer.cxx | 14 -
4 files changed, 66 insertions(+), 66 deletions(-)
New commits:
commit 27e398b88066a4d1e236ce8b298f466754c41de0
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu May 9 18:51:31 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu May 9 21:01:39 2024 +0200
workaround segfault in compiler on macos-clang-intel
Change-Id: Ic4ee6c80eb340c1a6db50b9176fcbffcb6419483
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167393
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/controller/inc/ChartController.hxx
b/chart2/source/controller/inc/ChartController.hxx
index 737d0cf3768f..c882c185b3f8 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -541,7 +541,7 @@ private:
const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX,
double fAmountLogicY );
bool impl_DragDataPoint( std::u16string_view rCID, double fOffset );
- static const o3tl::sorted_vector< OUString >& impl_getAvailableCommands();
+ static const o3tl::sorted_vector< std::u16string_view >&
impl_getAvailableCommands();
void impl_PasteGraphic( css::uno::Reference< css::graphic::XGraphic >
const & xGraphic,
const ::Point & aPosition );
diff --git a/chart2/source/controller/inc/CommandDispatchContainer.hxx
b/chart2/source/controller/inc/CommandDispatchContainer.hxx
index ae95313c0f20..34c80e7bf319 100644
--- a/chart2/source/controller/inc/CommandDispatchContainer.hxx
+++ b/chart2/source/controller/inc/CommandDispatchContainer.hxx
@@ -80,7 +80,7 @@ public:
*/
void setChartDispatch(
const css::uno::Reference< css::frame::XDispatch >& rChartDispatch,
- o3tl::sorted_vector< OUString > && rChartCommands );
+ const o3tl::sorted_vector< std::u16string_view > & rChartCommands );
/** Returns the dispatch that is able to do the command given in rURL, if
implemented here. If the URL is not implemented here, it should be
@@ -125,7 +125,7 @@ private:
unotools::WeakReference< ::chart::ChartModel > m_xModel;
css::uno::Reference< css::frame::XDispatch > m_xChartDispatcher;
- o3tl::sorted_vector< OUString > m_aChartCommands;
+ o3tl::sorted_vector< std::u16string_view > m_aChartCommands;
DrawCommandDispatch* m_pDrawCommandDispatch;
ShapeController* m_pShapeController;
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index 6504c3efd981..f21bfad50549 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -541,7 +541,7 @@ sal_Bool SAL_CALL ChartController::attachModel( const
uno::Reference< frame::XMo
// the dispatch container will return "this" for all commands returned by
// impl_getAvailableCommands(). That means, for those commands dispatch()
// is called here at the ChartController.
- m_aDispatchContainer.setChartDispatch( pDispatch,
o3tl::sorted_vector(impl_getAvailableCommands()) );
+ m_aDispatchContainer.setChartDispatch( pDispatch,
impl_getAvailableCommands() );
rtl::Reference<DrawCommandDispatch> pDrawDispatch = new
DrawCommandDispatch( m_xCC, this );
pDrawDispatch->initialize();
@@ -1576,73 +1576,73 @@ void ChartController::impl_initializeAccessible(
AccessibleChartView& rAccChartV
void ChartController::impl_initializeAccessible( AccessibleChartView& /*
rAccChartView */) {}
#endif
-const o3tl::sorted_vector< OUString >&
ChartController::impl_getAvailableCommands()
+const o3tl::sorted_vector< std::u16string_view >&
ChartController::impl_getAvailableCommands()
{
- static const o3tl::sorted_vector< OUString > s_AvailableCommands {
+ static const o3tl::sorted_vector< std::u16string_view >
s_AvailableCommands {
// commands for container forward
- 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,
+ u"AddDirect", u"NewDoc", u"Open",
+ u"Save", u"SaveAs", u"SendMail",
+ u"EditDoc", u"ExportDirectToPDF", u"PrintDefault",
// own commands
- u"Cut"_ustr, u"Copy"_ustr,
u"Paste"_ustr,
- u"DataRanges"_ustr, u"DiagramData"_ustr,
+ u"Cut", u"Copy", u"Paste",
+ u"DataRanges", u"DiagramData",
// insert objects
- u"InsertMenuTitles"_ustr, u"InsertTitles"_ustr,
- u"InsertMenuLegend"_ustr, u"InsertLegend"_ustr,
u"DeleteLegend"_ustr,
- u"InsertMenuDataLabels"_ustr,
- u"InsertMenuAxes"_ustr, u"InsertRemoveAxes"_ustr,
u"InsertMenuGrids"_ustr,
- u"InsertSymbol"_ustr,
- u"InsertTrendlineEquation"_ustr, u"InsertTrendlineEquationAndR2"_ustr,
- u"InsertR2Value"_ustr, u"DeleteR2Value"_ustr,
- u"InsertMenuTrendlines"_ustr, u"InsertTrendline"_ustr,
- u"InsertMenuMeanValues"_ustr, u"InsertMeanValue"_ustr,
- u"InsertMenuXErrorBars"_ustr, u"InsertXErrorBars"_ustr,
- u"InsertMenuYErrorBars"_ustr, u"InsertYErrorBars"_ustr,
- u"InsertDataLabels"_ustr, u"InsertDataLabel"_ustr,
- u"DeleteTrendline"_ustr, u"DeleteMeanValue"_ustr,
u"DeleteTrendlineEquation"_ustr,
- u"DeleteXErrorBars"_ustr, u"DeleteYErrorBars"_ustr,
- u"DeleteDataLabels"_ustr, u"DeleteDataLabel"_ustr,
- u"InsertMenuDataTable"_ustr,
- u"InsertDataTable"_ustr, u"DeleteDataTable"_ustr,
+ u"InsertMenuTitles", u"InsertTitles",
+ u"InsertMenuLegend", u"InsertLegend", u"DeleteLegend",
+ u"InsertMenuDataLabels",
+ u"InsertMenuAxes", u"InsertRemoveAxes", u"InsertMenuGrids",
+ u"InsertSymbol",
+ u"InsertTrendlineEquation", u"InsertTrendlineEquationAndR2",
+ u"InsertR2Value", u"DeleteR2Value",
+ u"InsertMenuTrendlines", u"InsertTrendline",
+ u"InsertMenuMeanValues", u"InsertMeanValue",
+ u"InsertMenuXErrorBars", u"InsertXErrorBars",
+ u"InsertMenuYErrorBars", u"InsertYErrorBars",
+ u"InsertDataLabels", u"InsertDataLabel",
+ u"DeleteTrendline", u"DeleteMeanValue",
u"DeleteTrendlineEquation",
+ u"DeleteXErrorBars", u"DeleteYErrorBars",
+ u"DeleteDataLabels", u"DeleteDataLabel",
+ u"InsertMenuDataTable",
+ u"InsertDataTable", u"DeleteDataTable",
//format objects
- u"FormatSelection"_ustr, u"FontDialog"_ustr,
u"TransformDialog"_ustr,
- u"DiagramType"_ustr, u"View3D"_ustr,
- u"Forward"_ustr, u"Backward"_ustr,
- u"MainTitle"_ustr, u"SubTitle"_ustr,
- u"XTitle"_ustr, u"YTitle"_ustr,
u"ZTitle"_ustr,
- u"SecondaryXTitle"_ustr, u"SecondaryYTitle"_ustr,
- u"AllTitles"_ustr, u"Legend"_ustr,
- u"DiagramAxisX"_ustr, u"DiagramAxisY"_ustr,
u"DiagramAxisZ"_ustr,
- u"DiagramAxisA"_ustr, u"DiagramAxisB"_ustr,
u"DiagramAxisAll"_ustr,
- u"DiagramGridXMain"_ustr, u"DiagramGridYMain"_ustr,
u"DiagramGridZMain"_ustr,
- u"DiagramGridXHelp"_ustr, u"DiagramGridYHelp"_ustr,
u"DiagramGridZHelp"_ustr,
- u"DiagramGridAll"_ustr,
- u"DiagramWall"_ustr, u"DiagramFloor"_ustr,
u"DiagramArea"_ustr,
+ u"FormatSelection", u"FontDialog", u"TransformDialog",
+ u"DiagramType", u"View3D",
+ u"Forward", u"Backward",
+ u"MainTitle", u"SubTitle",
+ u"XTitle", u"YTitle", u"ZTitle",
+ u"SecondaryXTitle", u"SecondaryYTitle",
+ u"AllTitles", u"Legend",
+ u"DiagramAxisX", u"DiagramAxisY", u"DiagramAxisZ",
+ u"DiagramAxisA", u"DiagramAxisB", u"DiagramAxisAll",
+ u"DiagramGridXMain", u"DiagramGridYMain", u"DiagramGridZMain",
+ u"DiagramGridXHelp", u"DiagramGridYHelp", u"DiagramGridZHelp",
+ u"DiagramGridAll",
+ u"DiagramWall", u"DiagramFloor", u"DiagramArea",
//context menu - format objects entries
- u"FormatWall"_ustr, u"FormatFloor"_ustr,
u"FormatChartArea"_ustr,
- u"FormatLegend"_ustr,
+ u"FormatWall", u"FormatFloor", u"FormatChartArea",
+ u"FormatLegend",
- u"FormatAxis"_ustr, u"FormatTitle"_ustr,
- u"FormatDataSeries"_ustr, u"FormatDataPoint"_ustr,
- u"ResetAllDataPoints"_ustr, u"ResetDataPoint"_ustr,
- u"FormatDataLabels"_ustr, u"FormatDataLabel"_ustr,
- u"FormatMeanValue"_ustr, u"FormatTrendline"_ustr,
u"FormatTrendlineEquation"_ustr,
- u"FormatXErrorBars"_ustr, u"FormatYErrorBars"_ustr,
- u"FormatStockLoss"_ustr, u"FormatStockGain"_ustr,
+ u"FormatAxis", u"FormatTitle",
+ u"FormatDataSeries", u"FormatDataPoint",
+ u"ResetAllDataPoints", u"ResetDataPoint",
+ u"FormatDataLabels", u"FormatDataLabel",
+ u"FormatMeanValue", u"FormatTrendline",
u"FormatTrendlineEquation",
+ u"FormatXErrorBars", u"FormatYErrorBars",
+ u"FormatStockLoss", u"FormatStockGain",
- u"FormatMajorGrid"_ustr, u"InsertMajorGrid"_ustr,
u"DeleteMajorGrid"_ustr,
- u"FormatMinorGrid"_ustr, u"InsertMinorGrid"_ustr,
u"DeleteMinorGrid"_ustr,
- u"InsertAxis"_ustr, u"DeleteAxis"_ustr,
u"InsertAxisTitle"_ustr,
+ u"FormatMajorGrid", u"InsertMajorGrid", u"DeleteMajorGrid",
+ u"FormatMinorGrid", u"InsertMinorGrid", u"DeleteMinorGrid",
+ u"InsertAxis", u"DeleteAxis", u"InsertAxisTitle",
// toolbar commands
- u"ToggleGridHorizontal"_ustr, u"ToggleGridVertical"_ustr,
u"ToggleLegend"_ustr, u"ScaleText"_ustr,
- u"NewArrangement"_ustr, u"Update"_ustr,
- u"DefaultColors"_ustr, u"BarWidth"_ustr,
u"NumberOfLines"_ustr,
- u"ArrangeRow"_ustr,
- u"StatusBarVisible"_ustr,
- u"ChartElementSelector"_ustr};
+ u"ToggleGridHorizontal", u"ToggleGridVertical", u"ToggleLegend",
u"ScaleText",
+ u"NewArrangement", u"Update",
+ u"DefaultColors", u"BarWidth", u"NumberOfLines",
+ u"ArrangeRow",
+ u"StatusBarVisible",
+ u"ChartElementSelector"};
return s_AvailableCommands;
}
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx
b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 95ba86433f47..31b49c76889c 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -60,11 +60,11 @@ void CommandDispatchContainer::setModel(
void CommandDispatchContainer::setChartDispatch(
const Reference< frame::XDispatch >& rChartDispatch,
- o3tl::sorted_vector< OUString > && rChartCommands )
+ const o3tl::sorted_vector< std::u16string_view > & rChartCommands )
{
OSL_ENSURE(rChartDispatch.is(),"Invalid fall back dispatcher!");
m_xChartDispatcher.set( rChartDispatch );
- m_aChartCommands = std::move(rChartCommands);
+ m_aChartCommands = rChartCommands;
m_aToBeDisposedDispatches.push_back( m_xChartDispatcher );
}
commit 03f13aa770c71795a1e69cf7f77c51aa6bf9ac0a
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu May 9 18:46:12 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu May 9 21:01:29 2024 +0200
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.gran...@collabora.co.uk>
Tested-by: Jenkins
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?
