diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2021-07-21 22:36:54 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-08-16 10:07:48 +0200 |
| commit | 8d85b8c9670e34c0fa3f76272594a3267ff8da77 (patch) | |
| tree | de49d5700040c8d5fe3afa4a94962c398e9b253e /sw | |
| parent | b2ccd57fd6658de21a73716a963fa73af7384868 (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>
(cherry picked from commit 717ec99667f5a9ab570f1c8581e2d7a0241c32f6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119263
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 6d799778945e5481a50ffdbb908a188f6ec77aae)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119264
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/crsr/crsrsh.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/inc/wrong.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/text/wrong.cxx | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 5b4971035c81..bb2323240c20 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -3670,6 +3670,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 ac1e2a4db165..c0e394d0c9c6 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 5a70c7be9507..ba9c2052fff6 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) { |