implement vertical text

This commit is contained in:
Miklos Vajna 2011-07-06 11:34:07 +02:00
parent 635b75c9a3
commit c064ec80a0

View file

@ -2440,9 +2440,9 @@ void RTFDocumentImpl::resolveShapeProperties(std::vector< std::pair<rtl::OUStrin
uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY);
// Defaults // Defaults
uno::Any aColor; uno::Any aAny;
aColor <<= (sal_uInt32)0xffffff; // White in Word, kind of blue in Writer. aAny <<= (sal_uInt32)0xffffff; // White in Word, kind of blue in Writer.
xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")), aColor); xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")), aAny);
for (std::vector< std::pair<rtl::OUString, rtl::OUString> >::iterator i = rShapeProperties.begin(); i != rShapeProperties.end(); ++i) for (std::vector< std::pair<rtl::OUString, rtl::OUString> >::iterator i = rShapeProperties.begin(); i != rShapeProperties.end(); ++i)
{ {
@ -2468,13 +2468,21 @@ void RTFDocumentImpl::resolveShapeProperties(std::vector< std::pair<rtl::OUStrin
} }
else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("fillColor"))) else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("fillColor")))
{ {
aColor <<= lcl_BGRToRGB(i->second.toInt32()); aAny <<= lcl_BGRToRGB(i->second.toInt32());
xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")), aColor); xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("FillColor")), aAny);
} }
else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("lineColor"))) else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("lineColor")))
{ {
aColor <<= lcl_BGRToRGB(i->second.toInt32()); aAny <<= lcl_BGRToRGB(i->second.toInt32());
xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")), aColor); xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")), aAny);
}
else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("txflTextFlow")))
{
if (i->second.toInt32() == 1)
{
aAny <<= (long)27000;
xPropertySet->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("RotateAngle")), aAny);
}
} }
else else
OSL_TRACE("%s: TODO handle shape property '%s':'%s'", OSL_THIS_FUNC, OSL_TRACE("%s: TODO handle shape property '%s':'%s'", OSL_THIS_FUNC,