diff options
| author | Ashod Nakashian <ashodnakashian@yahoo.com> | 2017-10-30 14:25:23 -0400 |
|---|---|---|
| committer | Ashod Nakashian <ashnakash@gmail.com> | 2017-11-03 11:16:25 +0100 |
| commit | 25a26b66b398d127842369e06c3ef95fe901e305 (patch) | |
| tree | 4ed12732e4d478d68f8591212893e341a87aa6c4 /sw | |
| parent | 2ecd194d091fd33c2554bfff960985b2bd5e654e (diff) | |
TSCP: flesh out ClassificationResult
Change-Id: Ie6ee33cc21f6f27ae1d58a0e47f367b0539e4378
Reviewed-on: https://gerrit.libreoffice.org/44117
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/edit/edfcol.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index 0120eee919c1..2e0fa19c32e7 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -677,7 +677,7 @@ void SwEditShell::ApplyAdvancedClassification(std::vector<svx::ClassificationRes { if (rResult.meType == svx::ClassificationType::CATEGORY) { - aHelper.SetBACName(rResult.msString, SfxClassificationHelper::getPolicyType()); + aHelper.SetBACName(rResult.msName, SfxClassificationHelper::getPolicyType()); } } @@ -716,7 +716,7 @@ void SwEditShell::ApplyAdvancedClassification(std::vector<svx::ClassificationRes { OUString sKey = aCreator.makeNumberedMarkingTextKey(); - addOrInsertDocumentProperty(xPropertyContainer, sKey, rResult.msString); + addOrInsertDocumentProperty(xPropertyContainer, sKey, rResult.msName); insertFieldToDocument(xMultiServiceFactory, xHeaderText, xHeaderParagraphCursor, sKey); insertFieldToDocument(xMultiServiceFactory, xFooterText, xFooterParagraphCursor, sKey); } @@ -733,7 +733,7 @@ void SwEditShell::ApplyAdvancedClassification(std::vector<svx::ClassificationRes case svx::ClassificationType::MARKING: { OUString sKey = aCreator.makeMarkingKey(); - addOrInsertDocumentProperty(xPropertyContainer, sKey, rResult.msString); + addOrInsertDocumentProperty(xPropertyContainer, sKey, rResult.msName); insertFieldToDocument(xMultiServiceFactory, xHeaderText, xHeaderParagraphCursor, sKey); insertFieldToDocument(xMultiServiceFactory, xFooterText, xFooterParagraphCursor, sKey); } @@ -742,7 +742,7 @@ void SwEditShell::ApplyAdvancedClassification(std::vector<svx::ClassificationRes case svx::ClassificationType::INTELLECTUAL_PROPERTY_PART: { OUString sKey = aCreator.makeIntellectualPropertyPartKey(); - addOrInsertDocumentProperty(xPropertyContainer, sKey, rResult.msString); + addOrInsertDocumentProperty(xPropertyContainer, sKey, rResult.msName); insertFieldToDocument(xMultiServiceFactory, xHeaderText, xHeaderParagraphCursor, sKey); insertFieldToDocument(xMultiServiceFactory, xFooterText, xFooterParagraphCursor, sKey); } @@ -763,7 +763,7 @@ void SwEditShell::ApplyAdvancedClassification(std::vector<svx::ClassificationRes uno::Reference<beans::XPropertySet> xHeaderPropertySet(xHeaderParagraphCursor, uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xFooterPropertySet(xFooterParagraphCursor, uno::UNO_QUERY_THROW); - if (rResult.msString == "BOLD") + if (rResult.msName == "BOLD") { xHeaderPropertySet->setPropertyValue("CharWeight", uno::makeAny(awt::FontWeight::BOLD)); xFooterPropertySet->setPropertyValue("CharWeight", uno::makeAny(awt::FontWeight::BOLD)); @@ -1042,10 +1042,10 @@ void SwEditShell::ApplyParagraphClassification(std::vector<svx::ClassificationRe break; } - OUString sDisplayText = (isFirst ? ("(" + rResult.msAbbreviatedString) : rResult.msAbbreviatedString); + OUString sDisplayText = (isFirst ? ("(" + rResult.msAbbreviatedName) : rResult.msAbbreviatedName); if (isLast) sDisplayText += ")"; - lcl_UpdateParagraphClassificationField(GetDoc(), xModel, xParent, sKey, rResult.msString, sDisplayText); + lcl_UpdateParagraphClassificationField(GetDoc(), xModel, xParent, sKey, rResult.msName, sDisplayText); } } @@ -1750,7 +1750,7 @@ void SwEditShell::ClassifyDocPerHighestParagraphClass() { case svx::ClassificationType::CATEGORY: { - const OUString sHighestClass = aHelper.GetHigherClass(sHighestParaClass, rResult.msString); + const OUString sHighestClass = aHelper.GetHigherClass(sHighestParaClass, rResult.msName); const auto eType = SfxClassificationHelper::stringToPolicyType(sHighestClass); SetClassification(sHighestClass, eType); } |