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

the scope of path properties can be reduced

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

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

@ -2453,8 +2453,6 @@ void RTFDocumentImpl::resolveShapeProperties(std::vector< std::pair<rtl::OUStrin
createShape(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")), xShape, xPropertySet); createShape(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")), xShape, xPropertySet);
uno::Any aAny; uno::Any aAny;
beans::PropertyValue aPropertyValue; beans::PropertyValue aPropertyValue;
uno::Sequence<drawing::EnhancedCustomShapeParameterPair> aCoordinates;
uno::Sequence<drawing::EnhancedCustomShapeSegment> aSegments;
awt::Rectangle aViewBox; awt::Rectangle aViewBox;
std::vector<beans::PropertyValue> aPathPropVec; std::vector<beans::PropertyValue> aPathPropVec;
@ -2526,6 +2524,7 @@ void RTFDocumentImpl::resolveShapeProperties(std::vector< std::pair<rtl::OUStrin
} }
else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("pVerticies"))) else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("pVerticies")))
{ {
uno::Sequence<drawing::EnhancedCustomShapeParameterPair> aCoordinates;
sal_Int32 nSize = 0; // Size of a token (it's value is hardwired in the exporter) sal_Int32 nSize = 0; // Size of a token (it's value is hardwired in the exporter)
sal_Int32 nCount = 0; // Number of tokens sal_Int32 nCount = 0; // Number of tokens
sal_Int32 nCharIndex = 0; // Character index sal_Int32 nCharIndex = 0; // Character index
@ -2568,6 +2567,7 @@ void RTFDocumentImpl::resolveShapeProperties(std::vector< std::pair<rtl::OUStrin
} }
else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("pSegmentInfo"))) else if (i->first.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("pSegmentInfo")))
{ {
uno::Sequence<drawing::EnhancedCustomShapeSegment> aSegments;
sal_Int32 nSize = 0; sal_Int32 nSize = 0;
sal_Int32 nCount = 0; sal_Int32 nCount = 0;
sal_Int32 nCharIndex = 0; sal_Int32 nCharIndex = 0;