[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - xmloff/source
matteocam
matteo.campanelli at gmail.com
Wed Jul 29 08:07:48 PDT 2015
xmloff/source/draw/ximpshap.cxx | 26 +++++++++++++++++++++++++-
xmloff/source/draw/ximpshap.hxx | 1 +
2 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 6338b3465f993231dcf7a6a769e3f6b5d8d729e0
Author: matteocam <matteo.campanelli at gmail.com>
Date: Wed Jul 29 17:06:22 2015 +0200
Set Uno property for chain-next-name from SdXMLTextBoxShapeContext
Change-Id: Ie9dab5768ff555ab2b4c90fffb0311865154f29c
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index c9ad9f5..6ca2075 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1600,7 +1600,8 @@ SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext(
uno::Reference< drawing::XShapes >& rShapes,
bool bTemporaryShape)
: SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, bTemporaryShape ),
- mnRadius(0)
+ mnRadius(0),
+ maChainNextName("")
{
}
@@ -1619,6 +1620,12 @@ void SdXMLTextBoxShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr
mnRadius, rValue);
return;
}
+
+ if( IsXMLToken( rLocalName, XML_CHAIN_NEXT_NAME ) )
+ {
+ maChainNextName = rValue;
+ return;
+ }
}
SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
@@ -1752,6 +1759,23 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
}
}
+ if(maChainNextName != "")
+ {
+ uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY);
+ if(xPropSet.is())
+ {
+ try
+ {
+ xPropSet->setPropertyValue("TextChainNextName",
+ uno::makeAny( maChainNextName ) );
+ }
+ catch(const uno::Exception&)
+ {
+ OSL_FAIL( "exception during setting of name of next chain link!");
+ }
+ }
+ }
+
SdXMLShapeContext::StartElement(mxAttrList);
}
}
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index ac95e7d..50ddb25 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -245,6 +245,7 @@ public:
class SdXMLTextBoxShapeContext : public SdXMLShapeContext
{
sal_Int32 mnRadius;
+ OUString maChainNextName;
public:
TYPEINFO_OVERRIDE();
More information about the Libreoffice-commits
mailing list