diff options
author | Noel Grandin <noel@peralex.com> | 2013-03-19 15:36:11 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-03-20 07:32:48 +0200 |
commit | 70e7bd63adda4c17a47fd7caeacdf5b91ace6157 (patch) | |
tree | 22e2ba35c38d477efa0809cfc2db659b633c66f8 /offapi | |
parent | fix the object name so it matches the cppunit make file name (diff) | |
download | core-70e7bd63adda4c17a47fd7caeacdf5b91ace6157.tar.gz core-70e7bd63adda4c17a47fd7caeacdf5b91ace6157.zip |
fdo#46808, Convert text::AutoTextContainer to new style
Change-Id: Ia33419c4d8cf633b572627edf57c926099d698e5
Diffstat (limited to 'offapi')
-rw-r--r-- | offapi/UnoApi_offapi.mk | 3 | ||||
-rw-r--r-- | offapi/com/sun/star/text/AutoTextContainer.idl | 13 | ||||
-rw-r--r-- | offapi/com/sun/star/text/XAutoTextContainer2.idl | 45 | ||||
-rw-r--r-- | offapi/type_reference/types.rdb | bin | 7439872 -> 7439872 bytes |
4 files changed, 50 insertions, 11 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index e6b2b75636b4..7197b34ff476 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -334,6 +334,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\ StatusIndicatorFactory \ )) $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/text,\ + AutoTextContainer \ DefaultNumberingProvider \ )) $(eval $(call gb_ZipUnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\ @@ -1265,7 +1266,6 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/text AccessibleTextEmbeddedObject \ AccessibleTextFrameView \ AccessibleTextGraphicObject \ - AutoTextContainer \ AutoTextEntry \ AutoTextGroup \ BaseFrame \ @@ -3647,6 +3647,7 @@ $(eval $(call gb_ZipUnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\ WritingMode \ WritingMode2 \ XAutoTextContainer \ + XAutoTextContainer2 \ XAutoTextEntry \ XAutoTextGroup \ XBookmarkInsertTool \ diff --git a/offapi/com/sun/star/text/AutoTextContainer.idl b/offapi/com/sun/star/text/AutoTextContainer.idl index 66e427164573..36644d094afa 100644 --- a/offapi/com/sun/star/text/AutoTextContainer.idl +++ b/offapi/com/sun/star/text/AutoTextContainer.idl @@ -19,22 +19,15 @@ #ifndef __com_sun_star_text_AutoTextContainer_idl__ #define __com_sun_star_text_AutoTextContainer_idl__ -#include <com/sun/star/text/XAutoTextContainer.idl> -#include <com/sun/star/container/XIndexAccess.idl> +#include <com/sun/star/text/XAutoTextContainer2.idl> +module com { module sun { module star { module text { - module com { module sun { module star { module text { /** provides access to groups of text blocks. */ -published service AutoTextContainer -{ - interface com::sun::star::text::XAutoTextContainer; - - [optional] interface com::sun::star::container::XIndexAccess; - -}; +published service AutoTextContainer : XAutoTextContainer2; }; }; }; }; diff --git a/offapi/com/sun/star/text/XAutoTextContainer2.idl b/offapi/com/sun/star/text/XAutoTextContainer2.idl new file mode 100644 index 000000000000..8d018f1a26eb --- /dev/null +++ b/offapi/com/sun/star/text/XAutoTextContainer2.idl @@ -0,0 +1,45 @@ +/* -*- 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_text_XAutoTextContainer2_idl__ +#define __com_sun_star_text_XAutoTextContainer2_idl__ + +#include <com/sun/star/text/XAutoTextContainer.idl> +#include <com/sun/star/container/XIndexAccess.idl> + + +module com { module sun { module star { module text { + + +/** + @since LibreOffice 4.1 + */ +published interface XAutoTextContainer2 +{ + interface com::sun::star::text::XAutoTextContainer; + + interface com::sun::star::container::XIndexAccess; + +}; + + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb Binary files differindex b5a34d5589e9..d98aaadb41d3 100644 --- a/offapi/type_reference/types.rdb +++ b/offapi/type_reference/types.rdb |