diff options
| author | Muthu Subramanian <sumuthu@suse.com> | 2012-09-06 12:34:14 +0530 |
|---|---|---|
| committer | Muthu Subramanian <sumuthu@suse.com> | 2012-09-06 12:42:06 +0530 |
| commit | 5ca197ce7a2a845933e17fc90195c929cbc7e062 (patch) | |
| tree | bac9d22e237acb5315ecd77da7e19d0e5cefb30c /oox/inc | |
| parent | c75af8578d921040e1baf8414edd7239969bcd45 (diff) | |
n#771549: Import text offsets in shapes.
* Also fixed a bug where the (offset) increment was conditional.
* Reusing Transform2D for <txXfrm> as well.
* This is a kind of hack where the margins are adjusted
for the give offset values.
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/oox/drawingml/textbodyproperties.hxx | 2 | ||||
| -rw-r--r-- | oox/inc/oox/drawingml/transform2dcontext.hxx | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/oox/inc/oox/drawingml/textbodyproperties.hxx b/oox/inc/oox/drawingml/textbodyproperties.hxx index 25007be53f35..f8800be29659 100644 --- a/oox/inc/oox/drawingml/textbodyproperties.hxx +++ b/oox/inc/oox/drawingml/textbodyproperties.hxx @@ -36,6 +36,8 @@ struct TextBodyProperties OptValue< sal_Int32 > moRotation; OptValue< sal_Int32 > moVert; boost::optional< sal_Int32 > moInsets[4]; + boost::optional< sal_Int32 > moTextOffX; + boost::optional< sal_Int32 > moTextOffY; ::com::sun::star::drawing::TextVerticalAdjust meVA; explicit TextBodyProperties(); diff --git a/oox/inc/oox/drawingml/transform2dcontext.hxx b/oox/inc/oox/drawingml/transform2dcontext.hxx index 8a8b18c32bfc..6bbbe191e77c 100644 --- a/oox/inc/oox/drawingml/transform2dcontext.hxx +++ b/oox/inc/oox/drawingml/transform2dcontext.hxx @@ -34,11 +34,12 @@ class Transform2DContext : public ::oox::core::ContextHandler { public: Transform2DContext( ::oox::core::ContextHandler& rParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, Shape& rShape ) throw(); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes, Shape& rShape, bool btxXfrm = false ) throw(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); protected: Shape& mrShape; + bool mbtxXfrm; }; // ============================================================================ |