diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-05-06 06:08:47 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-05-08 14:56:41 +0200 |
commit | 07e3155a666e85b8213608423ae84dbd2b30c3dc (patch) | |
tree | 560bf3f1389f16721f71de406827c5ff975cb32d /oox/inc/drawingml | |
parent | 8a051cb9543b49cc70f5e6728df3387b128d3daf (diff) |
inherit default title rotation from parent, tdf#75316
Change-Id: I2cf609a3f2c5eb1f9d7716b3ee89d4131d942ffb
Diffstat (limited to 'oox/inc/drawingml')
-rw-r--r-- | oox/inc/drawingml/chart/objectformatter.hxx | 8 | ||||
-rw-r--r-- | oox/inc/drawingml/chart/titlemodel.hxx | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/oox/inc/drawingml/chart/objectformatter.hxx b/oox/inc/drawingml/chart/objectformatter.hxx index 1e8d7807095c..c84afc66b5f1 100644 --- a/oox/inc/drawingml/chart/objectformatter.hxx +++ b/oox/inc/drawingml/chart/objectformatter.hxx @@ -34,8 +34,6 @@ namespace oox { namespace drawingml { namespace chart { - - /** Enumerates different object types for specific automatic formatting behaviour. */ enum ObjectType { @@ -67,8 +65,6 @@ enum ObjectType OBJECTTYPE_DATATABLE /// Data table. }; - - struct ChartSpaceModel; struct ObjectFormatterData; struct PictureOptionsModel; @@ -125,7 +121,7 @@ public: static void convertTextRotation( PropertySet& rPropSet, const ModelRef< TextBody >& rxTextProp, - bool bSupportsStacked ); + bool bSupportsStacked, sal_Int32 nDefaultRotation = 0); /** Sets number format properties to the passed property set. */ void convertNumberFormat( @@ -147,8 +143,6 @@ private: std::shared_ptr< ObjectFormatterData > mxData; }; - - } // namespace chart } // namespace drawingml } // namespace oox diff --git a/oox/inc/drawingml/chart/titlemodel.hxx b/oox/inc/drawingml/chart/titlemodel.hxx index dad4914e8af7..9e09c44a9090 100644 --- a/oox/inc/drawingml/chart/titlemodel.hxx +++ b/oox/inc/drawingml/chart/titlemodel.hxx @@ -51,8 +51,9 @@ struct TitleModel LayoutRef mxLayout; /// Layout/position of the frame. TextRef mxText; /// Text source of the title. bool mbOverlay; /// True = title may overlay other objects. + sal_Int32 mnDefaultRotation; - explicit TitleModel(); + explicit TitleModel(sal_Int32 nDefaultRotation = 0); ~TitleModel(); }; |