sw/source/core/edit/edfcol.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bcccdc71cb363760c6b0899fd13dee4203ec8711
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Oct 16 15:55:44 2017 +0200
Fix merge conflict
between 0716aca251bbb64fab6c8697ee0a2215461f1019 "tscp: move getting the
current
policy type to class. helper" on the one hand and
217dd15374a7020aa498817bcf4ea28157e7080f "TSCP: edit paragraph
classification"
and c140d8d97344299be70e32ac4ebc324ba4dc5dba "TSCP: paragraph classification
support" on the other.
Change-Id: I9c399b0224c485d71e39ad547be2f9b51fbbecc9
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 37b774264aec..74a3c6365288 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -778,7 +778,7 @@ void
SwEditShell::ApplyParagraphClassification(std::vector<svx::ClassificationRe
uno::Reference<frame::XModel> xModel = pDocShell->GetBaseModel();
uno::Reference<lang::XMultiServiceFactory> xMultiServiceFactory(xModel,
uno::UNO_QUERY);
- const OUString sPolicy =
SfxClassificationHelper::policyTypeToString(getPolicyType());
+ const OUString sPolicy =
SfxClassificationHelper::policyTypeToString(SfxClassificationHelper::getPolicyType());
// Prevent recursive validation since this is triggered on node updates,
which we do below.
const bool bOldValidationFlag = SetParagraphSignatureValidation(false);
@@ -863,7 +863,7 @@ std::vector<svx::ClassificationResult>
SwEditShell::CollectParagraphClassificati
uno::Reference<container::XEnumeration> xTextPortions =
xTextPortionEnumerationAccess->createEnumeration();
- const OUString sPolicy =
SfxClassificationHelper::policyTypeToString(getPolicyType());
+ const OUString sPolicy =
SfxClassificationHelper::policyTypeToString(SfxClassificationHelper::getPolicyType());
const sal_Int32 nParagraph = 1;
while (xTextPortions->hasMoreElements())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
