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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/dialog/ClassificationDialog.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx index 57c29847d3b1..7eed3b94e424 100644 --- a/svx/source/dialog/ClassificationDialog.cxx +++ b/svx/source/dialog/ClassificationDialog.cxx @@ -371,36 +371,36 @@ void ClassificationDialog::readIn(std::vector<ClassificationResult> const & rInp sal_Int32 nParagraph = -1; for (ClassificationResult const & rClassificationResult : rInput) { - OUString msAbbreviatedString = rClassificationResult.msAbbreviatedString; - if (msAbbreviatedString.isEmpty()) - msAbbreviatedString = maHelper.GetAbbreviatedBACName(rClassificationResult.msString); + OUString msAbbreviatedName = rClassificationResult.msAbbreviatedName; + if (msAbbreviatedName.isEmpty()) + msAbbreviatedName = maHelper.GetAbbreviatedBACName(rClassificationResult.msName); switch (rClassificationResult.meType) { case svx::ClassificationType::TEXT: { - m_pEditWindow->pEdView->InsertText(rClassificationResult.msString); + m_pEditWindow->pEdView->InsertText(rClassificationResult.msName); } break; case svx::ClassificationType::CATEGORY: { - m_pClassificationListBox->SelectEntry(rClassificationResult.msString); + m_pClassificationListBox->SelectEntry(rClassificationResult.msName); m_pInternationalClassificationListBox->SelectEntryPos(m_pClassificationListBox->GetSelectedEntryPos()); - insertField(rClassificationResult.meType, msAbbreviatedString, rClassificationResult.msString, rClassificationResult.msIdentifier); + insertField(rClassificationResult.meType, msAbbreviatedName, rClassificationResult.msName, rClassificationResult.msIdentifier); } break; case svx::ClassificationType::MARKING: { - m_pMarkingListBox->SelectEntry(rClassificationResult.msString); - insertField(rClassificationResult.meType, msAbbreviatedString, rClassificationResult.msString, rClassificationResult.msIdentifier); + m_pMarkingListBox->SelectEntry(rClassificationResult.msName); + insertField(rClassificationResult.meType, msAbbreviatedName, rClassificationResult.msName, rClassificationResult.msIdentifier); } break; case svx::ClassificationType::INTELLECTUAL_PROPERTY_PART: { - insertField(rClassificationResult.meType, msAbbreviatedString, rClassificationResult.msString, rClassificationResult.msIdentifier); + insertField(rClassificationResult.meType, msAbbreviatedName, rClassificationResult.msName, rClassificationResult.msIdentifier); } break; @@ -412,7 +412,7 @@ void ClassificationDialog::readIn(std::vector<ClassificationResult> const & rInp m_pEditWindow->pEdView->InsertParaBreak(); // Set paragraph font weight - FontWeight eWeight = (rClassificationResult.msString == "BOLD") ? WEIGHT_BOLD : WEIGHT_NORMAL; + FontWeight eWeight = (rClassificationResult.msName == "BOLD") ? WEIGHT_BOLD : WEIGHT_NORMAL; std::unique_ptr<SfxItemSet> pSet(new SfxItemSet(m_pEditWindow->pEdEngine->GetParaAttribs(nParagraph))); pSet->Put(SvxWeightItem(eWeight, EE_CHAR_WEIGHT)); m_pEditWindow->pEdEngine->SetParaAttribs(nParagraph, *pSet); |