summaryrefslogtreecommitdiff
path: root/writerfilter/source
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-02-01 16:26:09 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-02-02 09:04:02 +0100
commita6f2199e9888cb75960f1d35034bd44fb45e5565 (patch)
tree9664d85097c3ad83331f3298840ed60432735bd2 /writerfilter/source
parent0499fc5619bf540afd1caea8ebf40cecff0b0014 (diff)
DOCX import: don't try to set grab-gag props as UNO props
This fixes loads of warnings like this one: warn:legacy.osl:22335:22335:writerfilter/source/dmapper/StyleSheetTable.cxx:1611: Exception in StyleSheetTable::getOrCreateCharStyle - Style::setPropertyValue during import. They are harmless as we catch the exception, but they are just noise. It seems the code that transforms grab-bag pseudo-props into real props was added in commit 4c3ba3a413be7339115ea5e6edc825a8434cd345 (fdo#75757: Remove inheritance from std::map., 2014-07-26), which is supposed to be a pure refactoring, so just remove this problematic transformation. Change-Id: Ibf45bfedc661f9e065405c47623516c4026148a4 Reviewed-on: https://gerrit.libreoffice.org/49105 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'writerfilter/source')
-rw-r--r--writerfilter/source/dmapper/NumberingManager.cxx9
1 files changed, 0 insertions, 9 deletions
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 72308e05c117..2e5794c31495 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -217,15 +217,6 @@ uno::Sequence< beans::PropertyValue > ListLevel::GetCharStyleProperties( )
{
if (IgnoreForCharStyle(aValIter->Name))
continue;
- else if(aValIter->Name=="CharInteropGrabBag" || aValIter->Name=="ParaInteropGrabBag") {
- uno::Sequence<beans::PropertyValue> vGrabVals;
- aValIter->Value >>= vGrabVals;
- beans::PropertyValue* aGrabIter = vGrabVals.begin();
- for(; aGrabIter!=vGrabVals.end(); ++aGrabIter) {
- if(!IgnoreForCharStyle(aGrabIter->Name))
- rProperties.emplace_back(aGrabIter->Name, 0, aGrabIter->Value, beans::PropertyState_DIRECT_VALUE);
- }
- }
else
rProperties.emplace_back(aValIter->Name, 0, aValIter->Value, beans::PropertyState_DIRECT_VALUE);
}