strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

the path property is now created independent from the type

Browse source
This commit is contained in:
Miklos Vajna 2011-07-08 15:06:12 +02:00
parent 0a5f10879f
commit 6e7f7864de
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
writerfilter/source/rtftok/rtfdocumentimpl.cxx
View file

@ -2456,6 +2456,8 @@ void RTFDocumentImpl::resolveShapeProperties(std::vector< std::pair<rtl::OUStrin
uno::Sequence<drawing::EnhancedCustomShapeParameterPair> aCoordinates;
uno::Sequence<drawing::EnhancedCustomShapeSegment> aSegments;
awt::Rectangle aViewBox;
std::vector<beans::PropertyValue> aPathPropVec;
for (std::vector< std::pair<rtl::OUString, rtl::OUString> >::iterator i = rShapeProperties.begin(); i != rShapeProperties.end(); ++i)
{
@ -2560,6 +2562,9 @@ void RTFDocumentImpl::resolveShapeProperties(std::vector< std::pair<rtl::OUStrin
}
}
while (nCharIndex >= 0);
aPropertyValue.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Coordinates"));
aPropertyValue.Value <<= aCoordinates;
aPathPropVec.push_back(aPropertyValue);
}
else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("pSegmentInfo")))
{
@ -2612,7 +2617,11 @@ void RTFDocumentImpl::resolveShapeProperties(std::vector< std::pair<rtl::OUStrin
}
nIndex++;
}
} while (nCharIndex >= 0);
}
while (nCharIndex >= 0);
aPropertyValue.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Segments"));
aPropertyValue.Value <<= aSegments;
aPathPropVec.push_back(aPropertyValue);
}
else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("geoLeft")))
aViewBox.X = i->second.toInt32();
@ -2642,23 +2651,14 @@ void RTFDocumentImpl::resolveShapeProperties(std::vector< std::pair<rtl::OUStrin
xDefaulter->createCustomShapeDefaults(OUString::valueOf(sal_Int32(nType)));
}
// pushing the whole Path element
uno::Sequence<beans::PropertyValue> aPathPropSeq(aPathPropVec.size());
beans::PropertyValue* pPathValues = aPathPropSeq.getArray();
for (std::vector<beans::PropertyValue>::iterator i = aPathPropVec.begin(); i != aPathPropVec.end(); ++i)
*pPathValues++ = *i;
if (nType == 0)
{
std::vector<beans::PropertyValue> aPathPropVec;
aPropertyValue.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Coordinates"));
aPropertyValue.Value <<= aCoordinates;
aPathPropVec.push_back(aPropertyValue);
aPropertyValue.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Segments"));
aPropertyValue.Value <<= aSegments;
aPathPropVec.push_back(aPropertyValue);
uno::Sequence<beans::PropertyValue> aPathPropSeq(aPathPropVec.size());
beans::PropertyValue* pPathValues = aPathPropSeq.getArray();
for (std::vector<beans::PropertyValue>::iterator i = aPathPropVec.begin(); i != aPathPropVec.end(); ++i)
*pPathValues++ = *i;
uno::Sequence<beans::PropertyValue> aGeoPropSeq(2);
aGeoPropSeq[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("ViewBox"));
aGeoPropSeq[0].Value <<= uno::Any(aViewBox);