Pass context and resource string down to boost::locale separately

because this is often on a hot path, and we can avoid the splitting and
joining of strings like this.

Change-Id: Ia36047209368ca53431178c2e8723a18cfe8260a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119220
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

19 files changed, 21 insertions, 19 deletions

diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
index 675cc422e1e6..35c53e72778f 100644
--- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
+++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx
@@ -54,7 +54,7 @@ public:
     virtual void Close() override;
 
 protected:
-    virtual const char* GetUndoNameId() override;
+    virtual TranslateId GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/ChiSquareTestDialog.hxx b/sc/source/ui/inc/ChiSquareTestDialog.hxx
index 584035c8e83c..20e7d696c95f 100644
--- a/sc/source/ui/inc/ChiSquareTestDialog.hxx
+++ b/sc/source/ui/inc/ChiSquareTestDialog.hxx
@@ -24,7 +24,7 @@ public:
     virtual void Close() override;
 
 protected:
-    virtual const char* GetUndoNameId() override;
+    virtual TranslateId GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/CovarianceDialog.hxx b/sc/source/ui/inc/CovarianceDialog.hxx
index ae30b34e086b..181bebeac154 100644
--- a/sc/source/ui/inc/CovarianceDialog.hxx
+++ b/sc/source/ui/inc/CovarianceDialog.hxx
@@ -24,7 +24,7 @@ public:
 protected:
     virtual OUString getLabel() override;
     virtual OUString getTemplate() override;
-    virtual const char* GetUndoNameId() override;
+    virtual TranslateId GetUndoNameId() override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx
index 9edd1329021e..dd2488450beb 100644
--- a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx
+++ b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx
@@ -24,7 +24,7 @@ public:
     virtual void Close() override;
 
 protected:
-    virtual const char* GetUndoNameId() override;
+    virtual TranslateId GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx
index 0d425fdbc0a2..54b877167805 100644
--- a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx
+++ b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx
@@ -30,7 +30,7 @@ public:
     virtual void Close() override;
 
 protected:
-    virtual const char* GetUndoNameId() override;
+    virtual TranslateId GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/FTestDialog.hxx b/sc/source/ui/inc/FTestDialog.hxx
index f1a0467b24d0..efd477ce08bb 100644
--- a/sc/source/ui/inc/FTestDialog.hxx
+++ b/sc/source/ui/inc/FTestDialog.hxx
@@ -24,7 +24,7 @@ public:
     virtual void Close() override;
 
 protected:
-    virtual const char* GetUndoNameId() override;
+    virtual TranslateId GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/FourierAnalysisDialog.hxx b/sc/source/ui/inc/FourierAnalysisDialog.hxx
index ab9507e31c49..f839b274e4d8 100644
--- a/sc/source/ui/inc/FourierAnalysisDialog.hxx
+++ b/sc/source/ui/inc/FourierAnalysisDialog.hxx
@@ -41,7 +41,7 @@ public:
     virtual void Close() override;
 
 protected:
-    virtual const char* GetUndoNameId() override;
+    virtual TranslateId GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
     virtual bool InputRangesValid() override;
 
diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx
index e68d60772035..058b9611a758 100644
--- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx
+++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx
@@ -26,7 +26,7 @@ public:
     virtual ~ScMatrixComparisonGenerator() override;
 
 protected:
-    virtual const char* GetUndoNameId() override;
+    virtual TranslateId GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 
     virtual OUString getLabel() = 0;
diff --git a/sc/source/ui/inc/MovingAverageDialog.hxx b/sc/source/ui/inc/MovingAverageDialog.hxx
index fe03e2631d08..216b67c8b400 100644
--- a/sc/source/ui/inc/MovingAverageDialog.hxx
+++ b/sc/source/ui/inc/MovingAverageDialog.hxx
@@ -31,7 +31,7 @@ public:
     virtual void Close() override;
 
 protected:
-    virtual const char* GetUndoNameId() override;
+    virtual TranslateId GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
index 40a457732909..0f890fc79936 100644
--- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
+++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
@@ -62,7 +62,7 @@ private:
 
     template<class RNG>
 
-    void GenerateNumbers(RNG& randomGenerator, const char* pDistributionStringId, const std::optional<sal_Int8> aDecimalPlaces);
+    void GenerateNumbers(RNG& randomGenerator, TranslateId pDistributionStringId, const std::optional<sal_Int8> aDecimalPlaces);
 
     void SelectGeneratorAndGenerateNumbers();
 
diff --git a/sc/source/ui/inc/RegressionDialog.hxx b/sc/source/ui/inc/RegressionDialog.hxx
index cab704d96384..59accf265c3b 100644
--- a/sc/source/ui/inc/RegressionDialog.hxx
+++ b/sc/source/ui/inc/RegressionDialog.hxx
@@ -40,7 +40,7 @@ public:
     virtual void Close() override;
 
 protected:
-    virtual const char* GetUndoNameId() override;
+    virtual TranslateId GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
     virtual bool InputRangesValid() override;
 
diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
index 6f35e75472ea..2de05951b3ab 100644
--- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
+++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
@@ -37,7 +37,7 @@ protected:
     void CalculateInputAndWriteToOutput();
 
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) = 0;
-    virtual const char* GetUndoNameId() = 0;
+    virtual TranslateId GetUndoNameId() = 0;
     virtual bool InputRangesValid();
     void ValidateDialogInput();
 
diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
index 8ac10b3c42df..3b1d5e46781f 100644
--- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
+++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
@@ -36,7 +36,7 @@ protected:
     void CalculateInputAndWriteToOutput();
 
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) = 0;
-    virtual const char* GetUndoNameId() = 0;
+    virtual TranslateId GetUndoNameId() = 0;
     virtual bool InputRangesValid();
     void ValidateDialogInput();
 
diff --git a/sc/source/ui/inc/TTestDialog.hxx b/sc/source/ui/inc/TTestDialog.hxx
index 1cfa7475c2d1..0ed370dce2d4 100644
--- a/sc/source/ui/inc/TTestDialog.hxx
+++ b/sc/source/ui/inc/TTestDialog.hxx
@@ -24,7 +24,7 @@ public:
     virtual void Close() override;
 
 protected:
-    virtual const char* GetUndoNameId() override;
+    virtual TranslateId GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/ZTestDialog.hxx b/sc/source/ui/inc/ZTestDialog.hxx
index c9b62603ca48..2476c38f32a7 100644
--- a/sc/source/ui/inc/ZTestDialog.hxx
+++ b/sc/source/ui/inc/ZTestDialog.hxx
@@ -24,7 +24,7 @@ public:
     virtual void Close() override;
 
 protected:
-    virtual const char* GetUndoNameId() override;
+    virtual TranslateId GetUndoNameId() override;
     virtual ScRange ApplyOutput(ScDocShell* pDocShell) override;
 };
 
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 43839eb94d21..4a8cad6dc9d6 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -23,6 +23,7 @@
 #include <global.hxx>
 #include <formula/grammar.hxx>
 #include <tabbgcolor.hxx>
+#include <unotools/resmgr.hxx>
 
 #include <memory>
 #include <vector>
@@ -73,7 +74,7 @@ public:
     void            NotifyDrawUndo(std::unique_ptr<SdrUndoAction>);
 
     // for grouping multiple operations into one with a new name
-    void            EnterListAction(const char* pNameResId);
+    void            EnterListAction(TranslateId pNameResId);
     void            EndListAction();
 
     bool            DetectiveAddPred(const ScAddress& rPos);
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 57f172ef2b5e..83cd3a20857e 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -259,7 +259,7 @@ public:
     void            DoAutoStyle( const ScRange& rRange, const OUString& rStyle );
 
     static weld::Window*  GetActiveDialogParent();
-    void            ErrorMessage(const char* pGlobStrId);
+    void            ErrorMessage(TranslateId pGlobStrId);
     bool            IsEditable() const;
 
     bool            AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab );
diff --git a/sc/source/ui/inc/editable.hxx b/sc/source/ui/inc/editable.hxx
index e03a1235743a..1c229a1b11ef 100644
--- a/sc/source/ui/inc/editable.hxx
+++ b/sc/source/ui/inc/editable.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <address.hxx>
+#include <unotools/resmgr.hxx>
 
 class ScDocument;
 class ScViewFunc;
@@ -82,7 +83,7 @@ public:
 
     bool IsEditable() const { return mbIsEditable; }
     bool IsFormatEditable() const { return mbIsEditable || mbOnlyMatrix; }
-    const char* GetMessageId() const;
+    TranslateId GetMessageId() const;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 93cedfee36ec..0bdc143d3e62 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -576,7 +576,7 @@ public:
     void            SplitAtPixel( const Point& rPixel );
     void            InvalidateSplit();
 
-    void            ErrorMessage(const char* pGlobStrId);
+    void            ErrorMessage(TranslateId pGlobStrId);
 
     void            EnableRefInput(bool bFlag);