summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-05-23 10:11:49 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-05-23 10:41:41 +0200
commitd28f2cfcce9d551c88b2a45df840788797163db6 (patch)
tree556f8ea4157102e8c04412213f8f045f41b0231d /include
parent3fb3e22f9f0d4626671c477763c998973f1e0b6a (diff)
Revert "fdo#46808, Convert chart2::Title service to new style"
This reverts commit d256dbede60533369d1aac64cca34721183f6a8a: For one, the new css.chart2.XTitle2 looked unfinished, in that it transfered the direct properties of the old-style css.chart2.Title service into attributes, but left out all the properties inherited by the old-style service from css.style.ParagraphProperties, css.drawing.FillProperties, css.drawing.LineProperties (and that missing FIXME css.layout.LayoutElement, whatever that is supposed to be). This needs more thought, to either make available all propertiers as attributes, or none. For another, this broke JunitTest_chart2_unoapi (sch.ChXChartDocument, sch.ChartTitle), for hard-to-debug reasons. Conflicts: chart2/source/model/main/Title.cxx chart2/source/model/main/Title.hxx offapi/com/sun/star/chart2/XTitle2.idl sc/source/filter/inc/xlchart.hxx (cherry picked from commit f30399c540f01f16f097b86ff518251324d558d7) Conflicts: sc/source/filter/inc/xlchart.hxx Change-Id: I4747208a13984904d0e409ea49a73b0f667c86c7
Diffstat (limited to 'include')
-rw-r--r--include/oox/drawingml/chart/converterbase.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/oox/drawingml/chart/converterbase.hxx b/include/oox/drawingml/chart/converterbase.hxx
index 3408e85b1d14..21a03441e803 100644
--- a/include/oox/drawingml/chart/converterbase.hxx
+++ b/include/oox/drawingml/chart/converterbase.hxx
@@ -27,7 +27,7 @@ namespace com { namespace sun { namespace star {
namespace awt { struct Rectangle; }
namespace awt { struct Size; }
namespace chart2 { class XChartDocument; }
- namespace chart2 { class XTitle2; }
+ namespace chart2 { class XTitle; }
namespace drawing { class XShape; }
} } }
@@ -87,7 +87,7 @@ protected:
/** Registers a title object and its layout data, needed for conversion of
the title position using the old Chart1 API. */
void registerTitleLayout(
- const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle2 >& rxTitle,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& rxTitle,
const ModelRef< LayoutModel >& rxLayout, ObjectType eObjType,
sal_Int32 nMainIdx = -1, sal_Int32 nSubIdx = -1 );
/** Converts the positions of the main title and all axis titles. */