mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

writerfilter: these are expected to be UTF-8

Browse Source 
Change-Id: I8cd2ce341996a219ee885969de3482be422730b3
This commit is contained in:
Miklos Vajna
2014-11-16 12:11:58 +01:00
parent 7cf996cf6e
commit 6a499c904f
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
writerfilter/source/dmapper/BorderHandler.cxx
View File

@@ -67,7 +67,7 @@ void BorderHandler::lcl_attribute(Id rName, Value & rVal)
break; break;
case NS_ooxml::LN_CT_Border_color: case NS_ooxml::LN_CT_Border_color:
m_nLineColor = nIntValue; m_nLineColor = nIntValue;
appendGrabBag("color", OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8)); appendGrabBag("color", OUString::fromUtf8(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true)));
break; break;
case NS_ooxml::LN_CT_Border_space: // border distance in points case NS_ooxml::LN_CT_Border_space: // border distance in points
m_nLineDistance = ConversionHelper::convertTwipToMM100( nIntValue * 20 ); m_nLineDistance = ConversionHelper::convertTwipToMM100( nIntValue * 20 );

4
writerfilter/source/dmapper/CellColorHandler.cxx
View File

@@ -106,13 +106,13 @@ void CellColorHandler::lcl_attribute(Id rName, Value & rVal)
} }
break; break;
case NS_ooxml::LN_CT_Shd_fill: case NS_ooxml::LN_CT_Shd_fill:
createGrabBag("fill", uno::makeAny(OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8))); createGrabBag("fill", uno::makeAny(OUString::fromUtf8(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true))));
if( nIntValue == OOXML_COLOR_AUTO ) if( nIntValue == OOXML_COLOR_AUTO )
nIntValue = 0xffffff; //fill color auto means white nIntValue = 0xffffff; //fill color auto means white
m_nFillColor = nIntValue; m_nFillColor = nIntValue;
break; break;
case NS_ooxml::LN_CT_Shd_color: case NS_ooxml::LN_CT_Shd_color:
createGrabBag("color", uno::makeAny(OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8))); createGrabBag("color", uno::makeAny(OUString::fromUtf8(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true))));
if( nIntValue == OOXML_COLOR_AUTO ) if( nIntValue == OOXML_COLOR_AUTO )
nIntValue = 0; //shading color auto means black nIntValue = 0; //shading color auto means black
//color of the shading //color of the shading

2
writerfilter/source/dmapper/DomainMapper.cxx
View File

@@ -277,7 +277,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
case NS_ooxml::LN_CT_Color_val: case NS_ooxml::LN_CT_Color_val:
if (m_pImpl->GetTopContext()) if (m_pImpl->GetTopContext())
m_pImpl->GetTopContext()->Insert(PROP_CHAR_COLOR, uno::makeAny( nIntValue ) ); m_pImpl->GetTopContext()->Insert(PROP_CHAR_COLOR, uno::makeAny( nIntValue ) );
m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "val", OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8)); m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "val", OUString::fromUtf8(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true)));
break; break;
case NS_ooxml::LN_CT_Underline_color: case NS_ooxml::LN_CT_Underline_color:
if (m_pImpl->GetTopContext()) if (m_pImpl->GetTopContext())

2
writerfilter/source/dmapper/TDefTableHandler.cxx
View File

@@ -292,7 +292,7 @@ void TDefTableHandler::lcl_attribute(Id rName, Value & rVal)
appendGrabBag("val", TDefTableHandler::getBorderTypeString(nIntValue)); appendGrabBag("val", TDefTableHandler::getBorderTypeString(nIntValue));
break; break;
case NS_ooxml::LN_CT_Border_color: case NS_ooxml::LN_CT_Border_color:
appendGrabBag("color", OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8)); appendGrabBag("color", OUString::fromUtf8(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true)));
m_nLineColor = nIntValue; m_nLineColor = nIntValue;
break; break;
case NS_ooxml::LN_CT_Border_space: case NS_ooxml::LN_CT_Border_space:

6
writerfilter/source/rtftok/rtfsdrimport.cxx
View File

@@ -357,11 +357,11 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
xPropertySet->setPropertyValue("FillColor", aAny); xPropertySet->setPropertyValue("FillColor", aAny);
// fillType will decide, possible it'll be the start color of a gradient. // fillType will decide, possible it'll be the start color of a gradient.
aFillModel.moColor.set(OUString("#") + OStringToOUString(msfilter::util::ConvertColor(aAny.get<sal_Int32>()), RTL_TEXTENCODING_UTF8)); aFillModel.moColor.set(OUString("#") + OUString::fromUtf8(msfilter::util::ConvertColor(aAny.get<sal_Int32>())));
} }
else if (i->first == "fillBackColor") else if (i->first == "fillBackColor")
// fillType will decide, possible it'll be the end color of a gradient. // fillType will decide, possible it'll be the end color of a gradient.
aFillModel.moColor2.set(OUString("#") + OStringToOUString(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32())), RTL_TEXTENCODING_UTF8)); aFillModel.moColor2.set(OUString("#") + OUString::fromUtf8(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32()))));
else if (i->first == "lineColor") else if (i->first == "lineColor")
aLineColor <<= msfilter::util::BGRToRGB(i->second.toInt32()); aLineColor <<= msfilter::util::BGRToRGB(i->second.toInt32());
else if (i->first == "lineBackColor") else if (i->first == "lineBackColor")
@@ -564,7 +564,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
aShadowModel.mbHasShadow = true; aShadowModel.mbHasShadow = true;
} }
else if (i->first == "shadowColor") else if (i->first == "shadowColor")
aShadowModel.moColor.set(OUString("#") + OStringToOUString(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32())), RTL_TEXTENCODING_UTF8)); aShadowModel.moColor.set(OUString("#") + OUString::fromUtf8(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32()))));
else if (i->first == "shadowOffsetX") else if (i->first == "shadowOffsetX")
// EMUs to points // EMUs to points
aShadowModel.moOffset.set(OUString::number(i->second.toDouble() / 12700) + "pt"); aShadowModel.moOffset.set(OUString::number(i->second.toDouble() / 12700) + "pt");