From d256dbede60533369d1aac64cca34721183f6a8a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 17 May 2013 16:15:09 +0200 Subject: fdo#46808, Convert chart2::Title service to new style API CHANGE: The chart2::XTitled interface now takes and returns a XTitle2 instead of an XTitle. Change-Id: I96c35909d3a13f1abb544296a782a0b6a7a58ec6 --- offapi/UnoApi_offapi.mk | 3 +- offapi/com/sun/star/chart2/Title.idl | 63 ++----------------------- offapi/com/sun/star/chart2/XTitle2.idl | 86 ++++++++++++++++++++++++++++++++++ offapi/com/sun/star/chart2/XTitled.idl | 6 +-- 4 files changed, 95 insertions(+), 63 deletions(-) create mode 100644 offapi/com/sun/star/chart2/XTitle2.idl (limited to 'offapi') diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 46055c9fdf81..682ef3950dff 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -89,6 +89,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2,\ PowerScaling \ RegressionEquation \ Scaling \ + Title \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/chart2/data,\ DatabaseDataProvider \ @@ -634,7 +635,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2, RegressionCurve \ RegressionCurveEquation \ StandardDiagramCreationParameters \ - Title \ )) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/chart2/data,\ DataFilter \ @@ -2027,6 +2027,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/chart2,\ XScaling \ XTarget \ XTitle \ + XTitle2 \ XTitled \ XTransformation \ )) diff --git a/offapi/com/sun/star/chart2/Title.idl b/offapi/com/sun/star/chart2/Title.idl index 24bcfd5dce98..936c8e110ff8 100644 --- a/offapi/com/sun/star/chart2/Title.idl +++ b/offapi/com/sun/star/chart2/Title.idl @@ -19,68 +19,13 @@ #ifndef com_sun_star_chart2_Title_idl #define com_sun_star_chart2_Title_idl -#include -#include -#include -#include -#include -#include -//FIXME does not exist +#include -module com -{ -module sun -{ -module star -{ -module chart2 -{ +module com { module sun { module star { module chart2 { -service Title -{ - /** only mandatory properties - */ - service ::com::sun::star::style::ParagraphProperties; - service ::com::sun::star::drawing::FillProperties; - service ::com::sun::star::drawing::LineProperties; - service ::com::sun::star::beans::PropertySet; -//FIXME [optional] service ::com::sun::star::layout::LayoutElement; +service Title : XTitle2; - /** - */ - interface XTitle; - - /** the rotation of the title's text in degrees in the range - [0,360). - */ - [property] double TextRotation; - - /** writes the characters of the title on top of each other if set - to . - */ - [property] boolean StackCharacters; - - /** The position is a relative position on the page. - -

If a relative position is given the title is not automatically placed, - but instead is placed relative on the page.

- */ - [property, maybevoid] ::com::sun::star::chart2::RelativePosition RelativePosition; - - - /** contains the size of the page at the time when properties were - set (e.g. the CharHeight). - -

This way it is possible to resize objects (like text) in - the view without modifying the model.

- */ - [property, maybevoid] com::sun::star::awt::Size ReferencePageSize; -}; - -} ; // chart2 -} ; // com -} ; // sun -} ; // star +}; }; }; }; #endif diff --git a/offapi/com/sun/star/chart2/XTitle2.idl b/offapi/com/sun/star/chart2/XTitle2.idl new file mode 100644 index 000000000000..d993f75f2f83 --- /dev/null +++ b/offapi/com/sun/star/chart2/XTitle2.idl @@ -0,0 +1,86 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef com_sun_star_chart2_XTitle2_idl +#define com_sun_star_chart2_XTitle2_idl + +#include +#include +#include +#include +#include +#include +//FIXME does not exist + +module com { module sun { module star { module chart2 { + +/** + The unified interface for the Title service. + + This service actually implements a few other services + (style::ParagraphProperties, drawing::FillProperties, drawing::LineProperties). + This set here is only the set that we use internally. + + @since LibreOffice 4.1 +*/ +interface XTitle2 +{ + /** only mandatory properties + */ +// service ::com::sun::star::style::ParagraphProperties; +// service ::com::sun::star::drawing::FillProperties; +// service ::com::sun::star::drawing::LineProperties; + interface ::com::sun::star::beans::XPropertySet; +//FIXME [optional] service ::com::sun::star::layout::LayoutElement; + + /** + */ + interface XTitle; + + /** the rotation of the title's text in degrees in the range + [0,360). + */ + [attribute] double TextRotation; + + /** writes the characters of the title on top of each other if set + to . + */ + [attribute] boolean StackCharacters; + + /** The position is a relative position on the page. + +

If a relative position is given the title is not automatically placed, + but instead is placed relative on the page.

+ */ + [attribute] ::com::sun::star::chart2::RelativePosition RelativePosition; + + + /** contains the size of the page at the time when properties were + set (e.g. the CharHeight). + +

This way it is possible to resize objects (like text) in + the view without modifying the model.

+ */ + [attribute] com::sun::star::awt::Size ReferencePageSize; +}; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/chart2/XTitled.idl b/offapi/com/sun/star/chart2/XTitled.idl index 3a5ec1883c26..84d326ba34fd 100644 --- a/offapi/com/sun/star/chart2/XTitled.idl +++ b/offapi/com/sun/star/chart2/XTitled.idl @@ -20,7 +20,7 @@ #define com_sun_star_chart2_XTitled_idl #include -#include +#include module com { @@ -38,11 +38,11 @@ interface XTitled : ::com::sun::star::uno::XInterface { /** get the object holding the title's content and formatting */ - XTitle getTitleObject(); + XTitle2 getTitleObject(); /** set a new title object replacing the former one */ - void setTitleObject( [in] XTitle Title ); + void setTitleObject( [in] XTitle2 Title ); }; } ; // chart2 -- cgit v1.2.3