sc/inc/addincol.hxx | 4 +++-
sc/source/core/tool/addincol.cxx | 8 +++++---
sc/source/core/tool/interpr4.cxx | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 2919441c102122455b7b9967885a0a8a342eff56
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Wed Sep 14 00:19:04 2022 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Sep 15 07:04:31 2022 +0200
Resolves: tdf#150926 Add-In result svl::SharedString needs to be interned
Change-Id: If582e7e1bf818dcf9eaddd5313aa21f5768a578f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139886
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 4a702b978384bf733363a64cd9ec64014675d515)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139841
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index bb89f8d3c87a..a319b31b0132 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -43,6 +43,7 @@ class SfxObjectShell;
class ScUnoAddInFuncData;
class ScFuncDesc;
class LanguageTag;
+class ScDocument;
typedef std::unordered_map< OUString, const ScUnoAddInFuncData* >
ScAddInHashMap;
@@ -197,6 +198,7 @@ private:
css::uno::Sequence<css::uno::Any> aArgs;
css::uno::Sequence<css::uno::Any> aVarArg;
css::uno::Reference<css::uno::XInterface> xCaller;
+ ScDocument& mrDoc;
bool bValidCount;
// result:
FormulaError nErrCode;
@@ -210,7 +212,7 @@ private:
public:
// exact name
- ScUnoAddInCall( ScUnoAddInCollection& rColl, const
OUString& rName,
+ ScUnoAddInCall( ScDocument& rDoc, ScUnoAddInCollection&
rColl, const OUString& rName,
tools::Long nParamCount );
~ScUnoAddInCall();
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 9027f0456ff4..3100a09833e6 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -60,6 +60,7 @@
#include <svl/sharedstring.hxx>
#include <formulaopt.hxx>
#include <compiler.hxx>
+#include <document.hxx>
#include <memory>
using namespace com::sun::star;
@@ -1282,8 +1283,9 @@ bool ScUnoAddInCollection::FillFunctionDescFromData(
const ScUnoAddInFuncData& r
return true;
}
-ScUnoAddInCall::ScUnoAddInCall( ScUnoAddInCollection& rColl, const OUString&
rName,
+ScUnoAddInCall::ScUnoAddInCall( ScDocument& rDoc, ScUnoAddInCollection& rColl,
const OUString& rName,
tools::Long nParamCount ) :
+ mrDoc( rDoc ),
bValidCount( false ),
nErrCode( FormulaError::NoCode ), // before function was called
bHasString( true ),
@@ -1636,13 +1638,13 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes
)
for (sal_Int32 nCol=0; nCol<nColCount; nCol++)
{
xMatrix->PutString(
- svl::SharedString(pColArr[nCol]),
+
mrDoc.GetSharedStringPool().intern(pColArr[nCol]),
static_cast<SCSIZE>(nCol),
static_cast<SCSIZE>(nRow));
}
for (sal_Int32 nCol=nColCount; nCol<nMaxColCount;
nCol++)
{
xMatrix->PutString(
- svl::SharedString(OUString()),
+ svl::SharedString::getEmptyString(),
static_cast<SCSIZE>(nCol),
static_cast<SCSIZE>(nRow));
}
}
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c123374c745d..0895c75b5cc9 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -2734,7 +2734,7 @@ void ScInterpreter::ScExternal()
// bLocalFirst=false in FindFunction, cFunc should be the stored
// internal name
- ScUnoAddInCall aCall( *ScGlobal::GetAddInCollection(), aUnoName,
nParamCount );
+ ScUnoAddInCall aCall( mrDoc, *ScGlobal::GetAddInCollection(),
aUnoName, nParamCount );
if ( !aCall.ValidParamCount() )
SetError( FormulaError::IllegalParameter );
