[Libreoffice-commits] .: offapi/com offapi/type_reference offapi/UnoApi_offapi.mk qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Nov 30 10:44:38 PST 2012
offapi/UnoApi_offapi.mk | 1
offapi/com/sun/star/text/GenericTextDocument.idl | 3
offapi/com/sun/star/text/XLineNumberingSupplier.idl | 62 ----------
offapi/type_reference/types.rdb |binary
qadevOOo/Jar_OOoRunner.mk | 1
qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXTextDocument.csv | 2
qadevOOo/tests/java/ifc/text/_XLineNumberingSupplier.java | 55 --------
7 files changed, 124 deletions(-)
New commits:
commit 8674c120cf4eb0f180ec40044a060ef1b345e40c
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 30 19:40:31 2012 +0100
API CHANGE: remove com.sun.star.text.XLineNumberingSupplier
This interface has been deprecated since OpenOffice.org initial CVS
import.
EXISTENCE: published key "/UCR/com/sun/star/text/XLineNumberingSupplier"
exists only in registry 1
SERVICE: /UCR/com/sun/star/text/GenericTextDocument
service1 contains 1 more references as service2
incompatible change: Reference 10 ('XLineNumberingSupplier') in
'r1' is not longer a reference of this service in 'r2'
Change-Id: I24ff18d0fe22d3caa893a7d5c766d352b7ca99c3
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 67a29e2..b9fd090 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3628,7 +3628,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\
XHeaderFooter \
XHeaderFooterPageStyle \
XLineNumberingProperties \
- XLineNumberingSupplier \
XMailMergeBroadcaster \
XMailMergeListener \
XMultiTextMarkup \
diff --git a/offapi/com/sun/star/text/GenericTextDocument.idl b/offapi/com/sun/star/text/GenericTextDocument.idl
index 09e1886..9956b80 100644
--- a/offapi/com/sun/star/text/GenericTextDocument.idl
+++ b/offapi/com/sun/star/text/GenericTextDocument.idl
@@ -28,7 +28,6 @@
#include <com/sun/star/util/XReplaceable.idl>
#include <com/sun/star/text/XPagePrintable.idl>
#include <com/sun/star/text/XReferenceMarksSupplier.idl>
-#include <com/sun/star/text/XLineNumberingSupplier.idl>
#include <com/sun/star/text/XChapterNumberingSupplier.idl>
#include <com/sun/star/text/XTextGraphicObjectsSupplier.idl>
#include <com/sun/star/text/XTextEmbeddedObjectsSupplier.idl>
@@ -87,8 +86,6 @@ published service GenericTextDocument
[optional] interface com::sun::star::text::XReferenceMarksSupplier;
- [optional] interface com::sun::star::text::XLineNumberingSupplier;
-
[optional] interface com::sun::star::text::XChapterNumberingSupplier;
[optional] interface com::sun::star::beans::XPropertySet;
diff --git a/offapi/com/sun/star/text/XLineNumberingSupplier.idl b/offapi/com/sun/star/text/XLineNumberingSupplier.idl
deleted file mode 100644
index ae08741..0000000
--- a/offapi/com/sun/star/text/XLineNumberingSupplier.idl
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- 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_XLineNumberingSupplier_idl__
-#define __com_sun_star_text_XLineNumberingSupplier_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-
-#include <com/sun/star/beans/PropertyValue.idl>
-
-
- module com { module sun { module star { module text {
-
-
-// DocMerge from xml: interface com::sun::star::text::XLineNumberingSupplier
-/** contains the settings of the line numbering in a text document.
-
- @deprecated
- */
-published interface XLineNumberingSupplier: com::sun::star::uno::XInterface
-{
-
- // DocMerge from idl: method com::sun::star::text::XLineNumberingSupplier::getLineNumberingRules
- /** @return the <type>LineNumberingSettings</type> of the object.
- */
- sequence< sequence<com::sun::star::beans::PropertyValue> > getLineNumberingRules();
-
-
- // DocMerge from xml: method com::sun::star::text::XLineNumberingSupplier::setLineNumberingRules
- /** sets a sequence of numbering rules.
-
-
-
- <p>The elements of the sequence are representing the chapter levels,
- index 0 for the major chapter level.</p>
- */
- void setLineNumberingRules( [in] sequence< sequence<com::sun::star::beans::PropertyValue> > aRules );
-
-};
-
-
-}; }; }; };
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 0cc9a60..dc13d62 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index c0481c1..9da1f31 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -852,7 +852,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/ifc/text/_XFootnotesSettingsSupplier \
qadevOOo/tests/java/ifc/text/_XFootnotesSupplier \
qadevOOo/tests/java/ifc/text/_XLineNumberingProperties \
- qadevOOo/tests/java/ifc/text/_XLineNumberingSupplier \
qadevOOo/tests/java/ifc/text/_XMailMergeBroadcaster \
qadevOOo/tests/java/ifc/text/_XPageCursor \
qadevOOo/tests/java/ifc/text/_XPagePrintable \
diff --git a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXTextDocument.csv b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXTextDocument.csv
index dd21e26..e7e989d 100644
--- a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXTextDocument.csv
+++ b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXTextDocument.csv
@@ -36,8 +36,6 @@
"SwXTextDocument";"com::sun::star::frame::XStorable";"store()"
"SwXTextDocument";"com::sun::star::frame::XStorable";"storeAsURL()"
"SwXTextDocument";"com::sun::star::frame::XStorable";"storeToURL()"
-"SwXTextDocument";"com::sun::star::text::XLineNumberingSupplier#optional";"getLineNumberingRules()"
-"SwXTextDocument";"com::sun::star::text::XLineNumberingSupplier#optional";"setLineNumberingRules()"
"SwXTextDocument";"com::sun::star::document::XEventsSupplier#optional";"getEvents()"
"SwXTextDocument";"com::sun::star::text::XPagePrintable#optional";"getPagePrintSettings()"
"SwXTextDocument";"com::sun::star::text::XPagePrintable#optional";"setPagePrintSettings()"
diff --git a/qadevOOo/tests/java/ifc/text/_XLineNumberingSupplier.java b/qadevOOo/tests/java/ifc/text/_XLineNumberingSupplier.java
deleted file mode 100644
index 309354e..0000000
--- a/qadevOOo/tests/java/ifc/text/_XLineNumberingSupplier.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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 .
- */
-
-package ifc.text;
-
-import lib.MultiMethodTest;
-
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.text.XLineNumberingSupplier;
-
-/**
- * Testing <code>com.sun.star.text.XLineNumberingSupplier</code>
- * interface methods :
- * <ul>
- * <li><code> getLineNumberingRules()</code></li>
- * <li><code> setLineNumberingRules()</code></li>
- * </ul> <p>
- * Test is <b> NOT </b> multithread compilant. <p>
- * @see com.sun.star.text.XLineNumberingSupplier
- */
-public class _XLineNumberingSupplier extends MultiMethodTest {
-
- public static XLineNumberingSupplier oObj = null;
-
- public PropertyValue[][] lineNumberingSettings = null;
-
- /**
- * Test calls the method. <p>
- * Has <b> OK </b> status if the method returns not
- * <code>null</code> value.
- */
- public void _getLineNumberingRules() {
- boolean res = false;
- lineNumberingSettings = oObj.getLineNumberingRules();
- res = lineNumberingSettings != null ;
- tRes.tested("getLineNumberingRules()",res);
- }
-
-} // finish class _XLineNumberingSupplier
-
More information about the Libreoffice-commits
mailing list