summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2021-07-21 22:36:54 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-07-22 13:01:43 +0200
commit717ec99667f5a9ab570f1c8581e2d7a0241c32f6 (patch)
tree389a46b66d926419b04ac0f80c880d87372b3a25
parent1400274aa4157fd92e708324a46d1633723f00fe (diff)
tdf#143464: fix SmartTag management
by putting back missing information in lcl_FillRecognizerData Regression from e98711c14db9348f4d3f7d0f5bbde9276a3e73bc loplugin:unusedfields in sw (2018-12-12) Change-Id: I2e99df1a712915851c30c018a1f7279756da72de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119346 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--sw/source/core/crsr/crsrsh.cxx1
-rw-r--r--sw/source/core/inc/wrong.hxx1
-rw-r--r--sw/source/core/text/wrong.cxx4
3 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index e68c91710f43..ccabd89f38ba 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -3710,6 +3710,7 @@ static void lcl_FillRecognizerData( std::vector< OUString >& rSmartTagTypes,
if ( pArea )
{
rSmartTagTypes.push_back( pArea->maType );
+ aStringKeyMaps.push_back( pArea->mxPropertyBag );
}
}
}
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 0a2f010b4f38..163c19adb3ef 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -67,6 +67,7 @@ class SwWrongArea
{
public:
OUString maType;
+ css::uno::Reference< css::container::XStringKeyMap > mxPropertyBag;
sal_Int32 mnPos;
sal_Int32 mnLen;
SwWrongList* mpSubList;
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 347f4feae7d9..6240716c2968 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -29,7 +29,7 @@ SwWrongArea::SwWrongArea( const OUString& rType, WrongListType listType,
css::uno::Reference< css::container::XStringKeyMap > const & xPropertyBag,
sal_Int32 nPos,
sal_Int32 nLen)
-: maType(rType), mnPos(nPos), mnLen(nLen), mpSubList(nullptr)
+: maType(rType), mxPropertyBag(xPropertyBag), mnPos(nPos), mnLen(nLen), mpSubList(nullptr)
{
mColor = getWrongAreaColor(listType, xPropertyBag);
mLineType = getWrongAreaLineType(listType, xPropertyBag);
@@ -40,7 +40,7 @@ SwWrongArea::SwWrongArea( const OUString& rType,
sal_Int32 nPos,
sal_Int32 nLen,
SwWrongList* pSubList)
-: maType(rType), mnPos(nPos), mnLen(nLen), mpSubList(pSubList), mLineType(WRONGAREA_NONE)
+: maType(rType), mxPropertyBag(xPropertyBag), mnPos(nPos), mnLen(nLen), mpSubList(pSubList), mLineType(WRONGAREA_NONE)
{
if (pSubList != nullptr)
{