[Libreoffice-commits] .: 5 commits - offapi/type_reference solenv/gbuild udkapi/com udkapi/UnoApi_udkapi.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Nov 28 05:34:37 PST 2012
offapi/type_reference/types.rdb |binary
solenv/gbuild/UnoApiTarget.mk | 2
udkapi/UnoApi_udkapi.mk | 39 -
udkapi/com/sun/star/beans/XIntroTest.idl | 161 -------
udkapi/com/sun/star/corba/corba.idl | 102 ----
udkapi/com/sun/star/corba/giop/giop.idl | 248 -----------
udkapi/com/sun/star/corba/iiop/iiop.idl | 84 ----
udkapi/com/sun/star/corba/iop/iop.idl | 120 -----
udkapi/com/sun/star/test/TestEvent.idl | 49 --
udkapi/com/sun/star/test/TestFactory.idl | 59 --
udkapi/com/sun/star/test/XSimpleTest.idl | 101 ----
udkapi/com/sun/star/test/XTest.idl | 133 ------
udkapi/com/sun/star/test/XTestListener.idl | 68 ---
udkapi/com/sun/star/test/bridge/XBridgeTest.idl | 294 --------------
udkapi/com/sun/star/test/performance/XPerformanceTest.idl | 130 ------
udkapi/com/sun/star/util/logging/LogLevel.idl | 50 --
udkapi/com/sun/star/util/logging/Logger.idl | 47 --
udkapi/com/sun/star/util/logging/LoggerRemote.idl | 47 --
udkapi/com/sun/star/util/logging/XLogger.idl | 60 --
udkapi/com/sun/star/util/logging/XLoggerRemote.idl | 63 ---
20 files changed, 2 insertions(+), 1855 deletions(-)
New commits:
commit 3e6b35fc96de29ba077f8f266ccfd73cb93561b3
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 28 13:57:01 2012 +0100
API CHANGE: remove com.sun.star.util.logging module
This module was deprecated and replaced with com.sun.star.logging in
OpenOffice.org 2.3 (i#76119); there is no implementation of the
interfaces. Removed types:
com.sun.star.util.logging.LogLevel
com.sun.star.util.logging.Logger
com.sun.star.util.logging.LoggerRemote
com.sun.star.util.logging.XLogger
com.sun.star.util.logging.XLoggerRemote
WARNING: could not open key "/UCR/com/sun/star/util/logging/XLogger" in
registry "/master/offapi/type_reference/types.rdb"
EXISTENCE: module "/UCR/com/sun/star/util/logging" with published
children exists only in registry 1
Change-Id: Ief1beadf0e32dee03f555599909ac5f31a5034dd
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 04870ab..0f959fa 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index a1dfacb..e043fc9 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -101,11 +101,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\
MacroExpander \
theMacroExpander \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util/logging,\
- Logger \
- LoggerRemote \
-))
-
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,udkapi,udkapi/com/sun/star/beans,\
Introspection \
@@ -534,11 +529,5 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util,\
XMacroExpander \
XVeto \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/util/logging,\
- LogLevel \
- XLogger \
- XLoggerRemote \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/udkapi/com/sun/star/util/logging/LogLevel.idl b/udkapi/com/sun/star/util/logging/LogLevel.idl
deleted file mode 100644
index 82afec7..0000000
--- a/udkapi/com/sun/star/util/logging/LogLevel.idl
+++ /dev/null
@@ -1,50 +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_util_logging_Level_idl__
-#define __com_sun_star_util_logging_Level_idl__
-
-
-module com { module sun { module star { module util { module logging {
-
-
-/** deprecated API - use <type scope="com::sun::star::logging">LogLevel</type> instead
-
- @deprecated
- @since OOo 1.1.2
-*/
-published constants LogLevel
-{
- const long OFF = 0x7fffffff;
- const long SEVERE = 1000;
- const long WARNING = 900;
- const long INFO = 800;
- const long CONFIG = 700;
- const long FINE = 500;
- const long FINER = 400;
- const long FINEST = 300;
- const long ALL = -0x80000000;
-};
-
-
-}; }; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/util/logging/Logger.idl b/udkapi/com/sun/star/util/logging/Logger.idl
deleted file mode 100644
index 5b535b7..0000000
--- a/udkapi/com/sun/star/util/logging/Logger.idl
+++ /dev/null
@@ -1,47 +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_webtop_Logger_idl__
-#define __com_sun_star_webtop_Logger_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/util/logging/XLogger.idl>
-#include <com/sun/star/util/logging/XLoggerRemote.idl>
-
-
-module com { module sun { module star { module util { module logging {
-
-
-/** deprecated API - use <type scope="com::sun::star::logging">LoggerPool</type> instead
-
- @deprecated
- @since OOo 1.1.2
-*/
-published service Logger
-{
- /// @deprecated
- interface com::sun::star::util::logging::XLogger;
-};
-
-
-}; }; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/util/logging/LoggerRemote.idl b/udkapi/com/sun/star/util/logging/LoggerRemote.idl
deleted file mode 100644
index c42d320..0000000
--- a/udkapi/com/sun/star/util/logging/LoggerRemote.idl
+++ /dev/null
@@ -1,47 +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_webtop_Logger_idl__
-#define __com_sun_star_webtop_Logger_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/util/logging/XLogger.idl>
-#include <com/sun/star/util/logging/XLoggerRemote.idl>
-
-
-module com { module sun { module star { module util { module logging {
-
-
- /** deprecated API - use <type scope="com::sun::star::logging">LoggerPool</type> instead
-
- @deprecated
- @since OOo 1.1.2
-*/
-published service LoggerRemote
-{
- /// @deprecated
- interface com::sun::star::util::logging::XLoggerRemote;
-};
-
-
-}; }; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/util/logging/XLogger.idl b/udkapi/com/sun/star/util/logging/XLogger.idl
deleted file mode 100644
index 2eace8c..0000000
--- a/udkapi/com/sun/star/util/logging/XLogger.idl
+++ /dev/null
@@ -1,60 +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_util_logging_XLogger_idl__
-#define __com_sun_star_util_logging_XLogger_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-
-
-module com { module sun { module star { module util { module logging {
-
-
-/** deprecated API - use <type scope="com::sun::star::logging">XLogger</type> instead
-
- @deprecated
- @since OOo 1.1.2
-*/
-published interface XLogger: com::sun::star::uno::XInterface
-{
- /// @deprecated
- XLogger getLogger( [in] string name );
-
- /// @deprecated
- long getLevel();
-
- /// @deprecated
- string getName();
-
- /// @deprecated
- boolean isLoggable( [in] long level );
-
- /// @deprecated
- [oneway] void logp( [in] long level,
- [in] string sourceClass,
- [in] string sourceMethod,
- [in] string msg );
-};
-
-
-}; }; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/util/logging/XLoggerRemote.idl b/udkapi/com/sun/star/util/logging/XLoggerRemote.idl
deleted file mode 100644
index c891280..0000000
--- a/udkapi/com/sun/star/util/logging/XLoggerRemote.idl
+++ /dev/null
@@ -1,63 +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_util_logging_XLoggerRemote_idl__
-#define __com_sun_star_util_logging_XLoggerRemote_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/beans/XPropertiesChangeListener.idl>
-
-
-module com { module sun { module star { module util { module logging {
-
-
-/** deprecated API - use <type scope="com::sun::star::logging">XLogger</type> instead
-
- @deprecated
- @since OOo 1.1.2
-*/
-published interface XLoggerRemote: com::sun::star::uno::XInterface
-{
- /// @deprecated
- long getLevel();
-
- /// @deprecated
- string getName();
-
- /// @deprecated
- boolean isLoggable( [in] long level );
-
- /// @deprecated
- [oneway] void logp( [in] long level,
- [in] string sourceClass,
- [in] string sourceMethod,
- [in] string msg,
- [in] string thread );
-
- /// @deprecated
- [oneway] void addPropertiesChangeListener(
- [in] com::sun::star::beans::XPropertiesChangeListener listener);
-};
-
-
-}; }; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 61d16504fc1aac2545589a85660c1c89aedbc372
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 28 13:38:18 2012 +0100
API CHANGE: remove com.sun.star.beans.XIntroTest
This is evidently only intended for testing and not implemented
anywhere.
EXISTENCE: published key "/UCR/com/sun/star/beans/XIntroTest" exists
only in registry 1
Change-Id: Ib12117c7761a7cb95d71705127753579004d5e79
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 0be7f29..04870ab 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 101e430..a1dfacb 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -188,7 +188,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/beans,\
XFastPropertySet \
XHierarchicalPropertySet \
XHierarchicalPropertySetInfo \
- XIntroTest \
XIntrospection \
XIntrospectionAccess \
XMaterialHolder \
diff --git a/udkapi/com/sun/star/beans/XIntroTest.idl b/udkapi/com/sun/star/beans/XIntroTest.idl
deleted file mode 100644
index f5b62a4..0000000
--- a/udkapi/com/sun/star/beans/XIntroTest.idl
+++ /dev/null
@@ -1,161 +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_beans_XIntroTest_idl__
-#define __com_sun_star_beans_XIntroTest_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/beans/Property.idl>
-#include <com/sun/star/beans/PropertyValue.idl>
-#include <com/sun/star/uno/TypeClass.idl>
-
-
-module com { module sun { module star { module beans {
-
- published interface XPropertyChangeListener;
- published interface XPropertiesChangeListener;
-
-/** This is a test interface for introspection.
-
- @deprecated
-*/
-published interface XIntroTest: com::sun::star::uno::XInterface
-{
- /** contains the ID-String of the implementation.
- */
- [attribute] string ObjectName;
-
- /** contains the first name of a person.
- */
- [readonly, attribute] string FirstName;
-
- /** contains the last name of a person.
- */
- [readonly, attribute] string LastName;
-
- /** contains the age of a person.
- */
- [readonly, attribute] short Age;
-
- /** contains the number of children person has.
- */
- [attribute] short ChildrenCount;
-
- /** contains a struct of type <type>Property</type>.
- */
- [attribute] com::sun::star::beans::Property FirstStruct;
-
- /** contains a struct of type <type>PropertyValue</type>.
- */
- [attribute] com::sun::star::beans::PropertyValue SecondStruct;
-
- /** output method.
- */
- void writeln( [in] string Text );
-
- /** ...
- */
- long getDroenk();
-
- /** gets another object with this interface.
- */
- com::sun::star::beans::XIntroTest getIntroTest();
-
- /** !!! No property, because parameter exists
- */
- long getUps( [in] long l );
-
- /** ...
- */
- void setDroenk( [in] long l );
-
- /** ...
- */
- short getBla();
-
- /** !!! Not the set method for property Bla, because param type != return type.
- */
- void setBla( [in] long n );
-
- /** ...
- */
- short getBlub();
-
- /** ...
- */
- void setBlub( [in] short n );
-
- /** ...
- */
- short getGulp();
-
- /** !!! Not the set method for property Gulp, because return type != void.
- */
- short setGulp( [in] short n );
-
- /** ...
- */
- com::sun::star::uno::TypeClass getTypeClass( [in] short n );
-
- /** ...
- */
- void setTypeClass( [in] com::sun::star::uno::TypeClass t,
- [in] double d1,
- [in] double d2 );
-
- sequence<string> getStrings();
-
- /** ...
- */
- void setStrings( [in] sequence<string> Strings );
-
- /** ...
- */
- void setStringsPerMethod( [in] sequence<string> Strings,
- [in] short n );
-
- sequence< sequence< sequence< short > > > getMultiSequence();
-
- /** ...
- */
- void setMultiSequence( [in] sequence< sequence< sequence< short > > > Seq );
-
- /** adds a listener which is called, when one of the specified properties
- changes its value.
-
- <p>It is suggested to allow multiple registration of the same listener,
- thus for each time a listener is added, it has to be removed.
- */
- [oneway] void addPropertiesChangeListener( [in] sequence< string > PropertyNames,
- [in] XPropertiesChangeListener Listener );
-
- /** removes a listener.
-
- <p>It is suggested to allow multiple registration of the same listener,
- thus for each time a listener is added, it has to be removed.
- */
- [oneway] void removePropertiesChangeListener( [in] XPropertiesChangeListener Listener );
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 771914ab1482af600b11dfe789182604802d1046
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 28 12:47:43 2012 +0100
API CHANGE: remove com.sun.star.test module
The com.sun.star.test module is intended only for internal testing of
the UNO implementation and should not be part of the public API.
EXISTENCE: published key "/UCR/com/sun/star/test/TestEvent" exists only
in registry 1
EXISTENCE: published key "/UCR/com/sun/star/test/TestFactory" exists
only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/test/XSimpleTest" exists
only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/test/XTestListener" exists
only in registry 1
EXISTENCE: module "/UCR/com/sun/star/test/performance" with published
children exists only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/test/XTest" exists only in
registry 1
EXISTENCE: module "/UCR/com/sun/star/test/bridge" with published
children exists only in registry 1
Change-Id: If9e607ef944b5b1b0a1af60cc9210fa4d8993bb4
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index e7e9c0e..0be7f29 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index c322585..101e430 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -96,9 +96,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/script,
InvocationAdapterFactory \
JavaScript \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/test,\
- TestFactory \
-))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/util,\
BootstrapMacroExpander \
MacroExpander \
@@ -505,18 +502,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/task,\
XInteractionRequest \
XInteractionRetry \
))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/test,\
- TestEvent \
- XSimpleTest \
- XTest \
- XTestListener \
-))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/test/bridge,\
- XBridgeTest \
-))
-$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/test/performance,\
- XPerformanceTest \
-))
$(eval $(call gb_UnoApi_add_idlfiles,udkapi,udkapi/com/sun/star/uno,\
DeploymentException \
Exception \
diff --git a/udkapi/com/sun/star/test/TestEvent.idl b/udkapi/com/sun/star/test/TestEvent.idl
deleted file mode 100644
index 35bd760..0000000
--- a/udkapi/com/sun/star/test/TestEvent.idl
+++ /dev/null
@@ -1,49 +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_test_TestEvent_idl__
-#define __com_sun_star_test_TestEvent_idl__
-
-#include <com/sun/star/lang/EventObject.idl>
-
-
-
-module com { module sun { module star { module test {
-
-/** This event gets delivered whenever a test event (an error, an exception,
- a warning) takes place.
- @deprecated
-*/
-published struct TestEvent: com::sun::star::lang::EventObject
-{
- /** contains the error/warning message
- */
- string Message;
-
- /** contains the exception notified by the <type>XTestListener</type>
- method notifyException. This value is not valid for other events.
- */
- any Exception;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/test/TestFactory.idl b/udkapi/com/sun/star/test/TestFactory.idl
deleted file mode 100644
index 73f9f56..0000000
--- a/udkapi/com/sun/star/test/TestFactory.idl
+++ /dev/null
@@ -1,59 +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_test_TestFactory_idl__
-#define __com_sun_star_test_TestFactory_idl__
-
-#include <com/sun/star/lang/MultiServiceFactory.idl>
-
-
-
-module com { module sun { module star { module test {
-
-/** describes a factory of services with interfaces for testing purposes.
-
- <p>It create instances that support the interface
- <type scope="com::sun::star::test">XSimpleTest</type>.
-
- <p>The services are accessed through interface, service or object
- names. The name test service must begin with "test." followed by the
- interface, service or object name ("test.com.sun.star.beans.XPropertySet").
-
- @example:Java
-
- <listing>
- xTestService = TestFactory.createInstance( "com.sun.star.beans.XPropertySet" );
- xTestService.test( "com.sun.star.beans.XPropertySet", myTestObject );
- </listing>
-
- @author Markus Meyer
- @version 0.1
- @deprecated
-*/
-published service TestFactory
-{
- service com::sun::star::lang::MultiServiceFactory;
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/test/XSimpleTest.idl b/udkapi/com/sun/star/test/XSimpleTest.idl
deleted file mode 100644
index 47aa47a..0000000
--- a/udkapi/com/sun/star/test/XSimpleTest.idl
+++ /dev/null
@@ -1,101 +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_test_XSimpleTest_idl__
-#define __com_sun_star_test_XSimpleTest_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-
-
-
-module com { module sun { module star { module test {
-
-/**
- A simple interface to test a service or interface implementation.
-*/
-published interface XSimpleTest: com::sun::star::uno::XInterface
-{
- /**
- Test the object TestObject against the test specified with TestName. This test
- does not change the semantic state of the object, so it can be called on a existing
- component that will used further on.
- Note : This can be a strong test limitation. There are some components, that cannot
- perform their full test scenario.
- @param TestName the name of the test. Must be an interface, service or implementation name.
- Note : The name is only used by the test component to distinguish
- between test scenarios.
- @param TestObject The instance to be tested.
-
- @throws IllegalArgumentException
- if the test does not support TestName or TestObject is null.
- */
- void testInvariant( [in] string TestName,
- [in] com::sun::star::uno::XInterface TestObject )
- raises( com::sun::star::lang::IllegalArgumentException );
-
- /**
- Test the object TestObject against the test specified with TestName. This test
- changes the state of the object. The object may be useless afterwards.
- (e.g. a closed XOutputStream). The method in general may be called multipe times with a new
- test object instance.
- Note : These tests should include the testInvariant test.
- Note : Each test scenario should be independent of each other, so even if a scenario
- didn't pass the test, the other test can still be performed. The error messages
- are cumulative.
-
- @param TestName The name of the test. Must be an interface, service or implementation name.
- Note : The name is only used by the test component to distinguish
- between test scenarios.
- @param TestObject The instance to be tested.
- @param hTestHandle Internal test handle. Handle for first test is always 0.
- Handle of next test is returned by the method.
- @return Handle of the next test. -1 if this was the last test.
-
- @throws IllegalArgumentException
- if the test does not support TestName or
- TestObject is null.
- */
- long test( [in] string TestName,
- [in] com::sun::star::uno::XInterface TestObject,
- [in] long hTestHandle )
- raises( com::sun::star::lang::IllegalArgumentException );
-
- /**States if one of the last test has failed. This is cumulative.
- @return true if all test have been passed successfully. false if an error has occurred.
-
- */
- boolean testPassed();
-
- // DOCUMENTATION MISSING FOR XSimpleTest::getErrors
- sequence<string> getErrors();
-
- // DOCUMENTATION MISSING FOR XSimpleTest::getErrorExceptions
- sequence<any> getErrorExceptions();
-
- // DOCUMENTATION MISSING FOR XSimpleTest::getWarnings
- sequence<string> getWarnings();
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/test/XTest.idl b/udkapi/com/sun/star/test/XTest.idl
deleted file mode 100644
index 68d0ae0..0000000
--- a/udkapi/com/sun/star/test/XTest.idl
+++ /dev/null
@@ -1,133 +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_test_XTest_idl__
-#define __com_sun_star_test_XTest_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-#include <com/sun/star/test/XTestListener.idl>
-
-
-
-module com { module sun { module star { module test {
-
-/**
- A simple interface to test a service or interface implementation.
-*/
-published interface XTest: com::sun::star::uno::XInterface
-{
- /**
- Test the object TestObject against the test specified with TestName. This test
- does not change the semantic state of the object, so it can be called on a existing
- component that will used further on. Note: This can be a strong test limitation.
- There are some components, that cannot perform their full test scenario.
- @param TestName
- the name of the test. Must be an interface, service, or implementation name.
- Note: The name is only used by the test component to distinguish between test
- scenarios.
- @param TestObject
- The instance to be tested.
- @throws IllegalArgumentException
- if the test does not support TestName or TestObject is null.
- */
- void testInvariant( [in] string TestName,
- [in] com::sun::star::uno::XInterface TestObject )
- raises( com::sun::star::lang::IllegalArgumentException );
-
- /**
- Test the object TestObject against the test specified with TestName.
- This test changes the state of the object. The object may be useless
- afterwards (e.g., a closed XOutputStream). The method in general may
- be called multiple times with a new test object instance. Note: Each test
- scenario should be independent of each other, so even if a scenario
- didn't pass the test, the other test can still be performed.
- The error messages are cumulative.
-
- @param TestName
- The name of the test. Must be an interface, service, or
- implementation name. Note: The name is only used by the test component
- to distinguish between test scenarios.
- @param TestObject
- The instance to be tested.
- @param hTestHandle
- Internal test handle. Handle for first test is always 0.
- Handle of next test is returned by the method.
- @return Handle of the next test. -1 if this was the last test.
-
- @throws IllegalArgumentException
- if the test does not support TestName or TestObject is null.
- */
- long test( [in] string TestName,
- [in] com::sun::star::uno::XInterface TestObject,
- [in] long hTestHandle )
- raises( com::sun::star::lang::IllegalArgumentException );
-
- /**
- Test the object TestObject against the test specified with TestName using
- several threads. That does NOT mean that testMultiThread should implement
- a test using several threads but that this test method should be designed
- to be called by several threads. So for example, it has to take into consideration
- that a test object state that is changed by the method can be
- changed again by another thread. So it's not necessarily a mistake if an
- expected state can't be confirmed after setting it. Besides that, everything
- is the same as described for the test method.
-
- If this way of testing with multiple threads is not appropriate for the
- component to be tested this method should not be implemented (it should
- only return -1) and a special multithread test adapted to the special
- needs of testing this component should be integrated in the test method.
-
- @param TestName
- The name of the test. Must be an interface, service or
- implementation name. Note: The name is only used by the test component
- to distinguish between test scenarios.
- @param TestObject
- The instance to be tested.
- @param hTestHandle
- Internal test handle. Handle for first test is always 0.
- Handle of next test is returned by the method.
- @return Handle of the next test. -1 if this was the last test.
-
- @throws IllegalArgumentException
- if the test does not support TestName or TestObject is null.
- */
- long testMultiThread( [in] string TestName,
- [in] com::sun::star::uno::XInterface TestObject,
- [in] long hTestHandle )
- raises( com::sun::star::lang::IllegalArgumentException );
-
- /** registers an event listener, which will be called for reporting
- errors/exceptions and warnings and for protocol purpuses.
- */
- void addTestListener( [in] XTestListener xListener );
-
- /** unregisters an event listener which was registered with
- <member>XTest::addTestListener()</member>.
-
- */
- void removeTestListener( [in] XTestListener xListener );
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/test/XTestListener.idl b/udkapi/com/sun/star/test/XTestListener.idl
deleted file mode 100644
index 77d1575..0000000
--- a/udkapi/com/sun/star/test/XTestListener.idl
+++ /dev/null
@@ -1,68 +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_test_XTestListener_idl__
-#define __com_sun_star_test_XTestListener_idl__
-
-#include <com/sun/star/lang/XEventListener.idl>
-#include <com/sun/star/test/TestEvent.idl>
-
-
-
-module com { module sun { module star { module test {
-
-/** is used to handle errors/exceptions and warnings during tests.
-*/
-published interface XTestListener: com::sun::star::lang::XEventListener
-{
- /** gets called when an error occurs while performing an test.
- If the error results from an exception, the exception
- can be found in the Exception member of the TestEvent
-
- @param evt
- This property contains the <type>TestEvent</type> object that
- describes the event source and error description.
- */
- void notifyError( [in] com::sun::star::test::TestEvent evt );
-
- /** gets called when an warning occurs while performing an test.
-
- @param evt
- This property contains the <type>TestEvent</type> object that
- describes the event source and warning description.
- */
- void notifyWarning( [in] com::sun::star::test::TestEvent evt );
-
- /** can be called by the broadcaster to inform the listener about
- the progress of the test. The listener can use this information
- for example to write it into a test protocol file.
-
- @param evt
- This property contains the <type>TestEvent</type> object that
- describes the protocol message.
- */
- void protocol( [in] com::sun::star::test::TestEvent evt );
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/test/bridge/XBridgeTest.idl b/udkapi/com/sun/star/test/bridge/XBridgeTest.idl
deleted file mode 100644
index 99110f9..0000000
--- a/udkapi/com/sun/star/test/bridge/XBridgeTest.idl
+++ /dev/null
@@ -1,294 +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_test_bridge_XBridge_idl__
-#define __com_sun_star_test_bridge_XBridge_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/lang/IllegalArgumentException.idl>
-
-module com
-{
-module sun
-{
-module star
-{
-module test
-{
-module bridge
-{
-
-published enum TestEnum
-{
- TEST,
- ONE,
- TWO,
- CHECK,
- LOLA,
- PALOO,
- ZA
-};
-
-/**
- * simple types
- */
-published struct TestSimple
-{
- boolean Bool;
- char Char;
- byte Byte;
- short Short;
- unsigned short UShort;
- long Long;
- unsigned long ULong;
- hyper Hyper;
- unsigned hyper UHyper;
- float Float;
- double Double;
- TestEnum Enum;
-};
-/**
- * complex types adding string, inteface, any
- */
-published struct TestElement : TestSimple
-{
- string String;
- com::sun::star::uno::XInterface Interface;
- any Any;
-};
-/**
- * adding even more complexity, sequence< TestElement >
- */
-published struct TestDataElements : TestElement
-{
- sequence< TestElement > Sequence;
-};
-
-/**
- * typedef used in interface
- */
-published typedef TestDataElements TestData;
-
-published interface XRecursiveCall : com::sun::star::uno::XInterface
-{
- /***
- * @param nToCall If nToCall is 0, the method returns immeadiatly.
- * Otherwise, call the given interface with nToCall -1
- *
- ***/
- void callRecursivly( [in] XRecursiveCall xCall , [in] long nToCall );
-};
-
-/**
- * Monster test interface to test bridge calls.
- * An implementation of this object has to store given values and return whenever there
- * is an out param or return value.
- */
-published interface XBridgeTestBase : com::sun::star::uno::XInterface
-{
- /**
- * in parameter test, tests by calls reference also (complex types)
- */
- [oneway] void setValues( [in] boolean bBool, [in] char cChar, [in] byte nByte,
- [in] short nShort, [in] unsigned short nUShort,
- [in] long nLong, [in] unsigned long nULong,
- [in] hyper nHyper, [in] unsigned hyper nUHyper,
- [in] float fFloat, [in] double fDouble,
- [in] TestEnum eEnum, [in] string aString,
- [in] com::sun::star::uno::XInterface xInterface, [in] any aAny,
- [in] sequence< TestElement > aSequence,
- [in] TestData aStruct );
- /**
- * inout parameter test
- *
- * @return aStruct. The out parameter contain the values, that were previously set
- * by setValues or (if not called before) default constructed values.
- *
- */
- TestData setValues2( [inout] boolean bBool, [inout] char cChar, [inout] byte nByte,
- [inout] short nShort, [inout] unsigned short nUShort,
- [inout] long nLong, [inout] unsigned long nULong,
- [inout] hyper nHyper, [inout] unsigned hyper nUHyper,
- [inout] float fFloat, [inout] double fDouble,
- [inout] TestEnum eEnum, [inout] string aString,
- [inout] com::sun::star::uno::XInterface xInterface, [inout] any aAny,
- [inout] sequence< TestElement > aSequence,
- [inout] TestData aStruct );
-
- /**
- * out parameter test
- */
- TestData getValues( [out] boolean bBool, [out] char cChar, [out] byte nByte,
- [out] short nShort, [out] unsigned short nUShort,
- [out] long nLong, [out] unsigned long nULong,
- [out] hyper nHyper, [out] unsigned hyper nUHyper,
- [out] float fFloat, [out] double fDouble,
- [out] TestEnum eEnum, [out] string aString,
- [out] com::sun::star::uno::XInterface xInterface, [out] any aAny,
- [out] sequence< TestElement > aSequence,
- [out] TestData aStruct );
-
- [attribute] boolean Bool;
- [attribute] byte Byte;
- [attribute] char Char;
- [attribute] short Short;
- [attribute] unsigned short UShort;
- [attribute] long Long;
- [attribute] unsigned long ULong;
- [attribute] hyper Hyper;
- [attribute] unsigned hyper UHyper;
- [attribute] float Float;
- [attribute] double Double;
- [attribute] TestEnum Enum;
- [attribute] string String;
- [attribute] com::sun::star::uno::XInterface Interface;
- [attribute] any Any;
- [attribute] sequence< TestElement > Sequence;
- [attribute] TestData Struct;
-
-
- /***
- * This method returns the parameter value.
- * Method to extensivly test anys.
- ****/
- any transportAny( [in] any value );
-
- /***
- * methods to check sequence of calls. Call call() and callOneway
- * in an arbitrary sequence. Increase the callId for every call.
- * The testobject sets an error flag.
-
- @see testSequencePassed
- ***/
- void call( [in] long nCallId, [in] long nWaitMUSEC );
- [oneway] void callOneway( [in] long nCallId, [in] long nWaitMUSEC );
- boolean sequenceOfCallTestPassed();
-
- /****
- * methods to check, if threads thread identity is holded.
- *
- ***/
- void startRecursiveCall( [in] XRecursiveCall xCall , [in] long nToCall );
-};
-
-
-/**
- * Inherting from monster; adds raiseException(), attribute raising RuntimeException.
- */
-published interface XBridgeTest : XBridgeTestBase
-{
- /**
- * the exception struct returned has to be filled with given arguments.
- * return value is for dummy.
- */
- TestData raiseException( [in] short ArgumentPosition,
- [in] string Message,
- [in] com::sun::star::uno::XInterface Context )
- raises( com::sun::star::lang::IllegalArgumentException );
-
-
- /**
- * Throws runtime exception.
- * check remote bridges handle exceptions during oneway calls properly.
- * Note that on client side the execption may fly or not. When it flies, it should
- * have the proper message and context.
- ***/
- [oneway] void raiseRuntimeExceptionOneway( [in] string Message,
- [in] com::sun::star::uno::XInterface Context );
-
- /**
- * raises runtime exception;
- * the exception struct returned has to be filled with formerly set test data.
- */
- [attribute] long RuntimeException;
-};
-
-/** Extended tests with sequences.
- */
-published interface XBridgeTest2 : XBridgeTest
-{
- sequence< boolean > setSequenceBool( [in] sequence< boolean > aSeq);
- sequence< char > setSequenceChar( [in] sequence< char > aSeq);
- sequence< byte> setSequenceByte( [in] sequence< byte > aSeq);
- sequence< short> setSequenceShort( [in] sequence< short > aSeq);
- sequence< unsigned short > setSequenceUShort( [in] sequence< unsigned short > aSeq);
- sequence< long > setSequenceLong( [in] sequence< long > aSeq);
- sequence< unsigned long > setSequenceULong( [in] sequence< unsigned long > aSeq);
- sequence< hyper > setSequenceHyper( [in] sequence< hyper > aSeq);
- sequence< unsigned hyper > setSequenceUHyper( [in] sequence< unsigned hyper > aSeq);
- sequence< float > setSequenceFloat( [in] sequence< float > aSeq);
- sequence< double > setSequenceDouble( [in] sequence< double > aSeq);
- sequence< TestEnum > setSequenceEnum( [in] sequence< TestEnum > aSeq);
- sequence< string > setSequenceString( [in] sequence< string > aString);
- sequence< com::sun::star::uno::XInterface > setSequenceXInterface(
- [in] sequence< com::sun::star::uno::XInterface > aSeq);
- sequence< any > setSequenceAny( [in] sequence< any > aSeq);
- sequence< TestElement > setSequenceStruct( [in] sequence< TestElement > aSeq);
-
- sequence< sequence< long > > setDim2( [in] sequence< sequence< long > > aSeq);
- sequence< sequence < sequence < long > > > setDim3(
- [in] sequence< sequence < sequence < long > > > aSeq);
-
- void setSequencesInOut( [inout] sequence< boolean > aSeqBoolean,
- [inout] sequence< char > aSeqChar,
- [inout] sequence< byte > aSeqByte,
- [inout] sequence< short > aSeqShort,
- [inout] sequence< unsigned short> aSeqUShort,
- [inout] sequence< long > aSeqLong,
- [inout] sequence< unsigned long > aSeqULong,
- [inout] sequence< hyper > aSeqHyper,
- [inout] sequence< unsigned hyper > aSeqUHyper,
- [inout] sequence< float > aSeqFloat,
- [inout] sequence< double > aSeqDouble,
- [inout] sequence< TestEnum > aSeqEnum,
- [inout] sequence< string > aSeqString,
- [inout] sequence< com::sun::star::uno::XInterface > aSeqXInterface,
- [inout] sequence< any > aSeqAny,
- [inout] sequence< sequence< long > > aSeqDim2,
- [inout] sequence< sequence < sequence < long > > > aSeqDim3);
-
- void setSequencesOut( [out] sequence< boolean > aSeqBoolean,
- [out] sequence< char > aSeqChar,
- [out] sequence< byte > aSeqByte,
- [out] sequence< short > aSeqShort,
- [out] sequence< unsigned short> aSeqUShort,
- [out] sequence< long > aSeqLong,
- [out] sequence< unsigned long > aSeqULong,
- [out] sequence< hyper > aSeqHyper,
- [out] sequence< unsigned hyper > aSeqUHyper,
- [out] sequence< float > aSeqFloat,
- [out] sequence< double > aSeqDouble,
- [out] sequence< TestEnum > aSeqEnum,
- [out] sequence< string > aSeqString,
- [out] sequence< com::sun::star::uno::XInterface > aSeqXInterface,
- [out] sequence< any > aSeqAny,
- [out] sequence< sequence< long > > aSeqDim2,
- [out] sequence< sequence < sequence < long > > > aSeqDim3);
-
-
-};
-
-};
-};
-};
-};
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/test/performance/XPerformanceTest.idl b/udkapi/com/sun/star/test/performance/XPerformanceTest.idl
deleted file mode 100644
index a5ea704..0000000
--- a/udkapi/com/sun/star/test/performance/XPerformanceTest.idl
+++ /dev/null
@@ -1,130 +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_test_performance_XPerformanceTest_idl__
-#define __com_sun_star_test_performance_XPerformanceTest_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-
-module com
-{
-module sun
-{
-module star
-{
-module test
-{
-module performance
-{
-
-/** struct of simple types to be carried
-*/
-published struct SimpleTypes
-{
- boolean Bool;
- char Char;
- byte Byte;
- short Short;
- unsigned short UShort;
- long Long;
- unsigned long ULong;
- hyper Hyper;
- unsigned hyper UHyper;
- float Float;
- double Double;
-};
-/** struct ComplexTypes adding Sequence, String, Interface, Any to SimpleTypes
-*/
-published struct ComplexTypes : SimpleTypes
-{
- sequence< long > Sequence;
- string String;
- com::sun::star::uno::XInterface Interface;
- any Any;
-};
-
-/** A performance test object has to be implemented in a special way, that:
- <ul>
- <li>queryInterface() execution times remain (nearly) static</li>
- <li>functions kept simple, thus there is (nearly) no execution time of the function itself</li>
- <li>no dynamic data is ever returned except of createObject(), so return 0, empty strings etc.</li>
- </ul>
- The interface is divided into three sections:
- <ul>
- <li>measuring asynchron/ synchron calls</li>
- <li>complex data calls with/out return value; in/out parameters</li>
- <li>single data types like long, float, string etc.</li>
- <li>method calls versa attribute calls</li>
- <li>raising RuntimeException</li>
- </ul>
-*/
-published interface XPerformanceTest : com::sun::star::uno::XInterface
-{
- [oneway] void async();
- void sync();
-
- ComplexTypes complex_in( [in] ComplexTypes aVal );
- ComplexTypes complex_inout( [inout] ComplexTypes aVal );
-
- [oneway] void complex_oneway( [in] ComplexTypes aVal );
- void complex_noreturn( [in] ComplexTypes aVal );
-
- XPerformanceTest createObject();
-
- [attribute] long Long_attr;
- [attribute] hyper Hyper_attr;
- [attribute] float Float_attr;
- [attribute] double Double_attr;
- [attribute] string String_attr;
- [attribute] com::sun::star::uno::XInterface Interface_attr;
- [attribute] any Any_attr;
- [attribute] sequence< com::sun::star::uno::XInterface > Sequence_attr;
- [attribute] ComplexTypes Struct_attr;
-
- long getLong();
- void setLong( [in] long n );
- hyper getHyper();
- void setHyper( [in] hyper n );
- float getFloat();
- void setFloat( [in] float f );
- double getDouble();
- void setDouble( [in] double f );
- string getString();
- void setString( [in] string s );
- com::sun::star::uno::XInterface getInterface();
- void setInterface( [in] com::sun::star::uno::XInterface x );
- any getAny();
- void setAny( [in] any a );
- sequence< com::sun::star::uno::XInterface > getSequence();
- void setSequence( [in] sequence< com::sun::star::uno::XInterface > seq );
- ComplexTypes getStruct();
- void setStruct( [in] ComplexTypes c );
-
- void raiseRuntimeException();
-};
-
-
-};
-};
-};
-};
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6eb7ee11c6a8286de7141e3938e10c96e4f3d81d
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 28 12:13:00 2012 +0100
API CHANGE: remove com.sun.star.corba module
The com.sun.star.corba module is entirely deprecated and unused.
EXISTENCE: published key "/UCR/com/sun/star/corba/ObjectSystemID" exists
only in registry 1
EXISTENCE: module "/UCR/com/sun/star/corba/iiop" with published children
exists only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/corba/OpaqueData" exists
only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/corba/ObjectKey" exists only
in registry 1
EXISTENCE: module "/UCR/com/sun/star/corba/iop" with published children
exists only in registry 1
EXISTENCE: module "/UCR/com/sun/star/corba/giop" with published children
exists only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/corba/CorbaString8" exists
only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/corba/OneThreadID" exists
only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/corba/CorbaUnion" exists
only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/corba/LogicalThreadID"
exists only in registry 1
EXISTENCE: published key "/UCR/com/sun/star/corba/TCKind" exists only in
registry 1
EXISTENCE: published key "/UCR/com/sun/star/corba/ThreadIDs" exists only
in registry 1
Change-Id: I0331d0462f2187ba8d8eacf2a5b3f6af20963304
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index dc8fc10..e7e9c0e 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 3826f3c..c322585 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -57,18 +57,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/
BridgeSupplier \
Factory \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba,\
- corba \
-))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/giop,\
- giop \
-))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iiop,\
- iiop \
-))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iop,\
- iop \
-))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\
DataInputStream \
DataOutputStream \
diff --git a/udkapi/com/sun/star/corba/corba.idl b/udkapi/com/sun/star/corba/corba.idl
deleted file mode 100644
index 191ea08..0000000
--- a/udkapi/com/sun/star/corba/corba.idl
+++ /dev/null
@@ -1,102 +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_corba_corba_idl__
-#define __com_sun_star_corba_corba_idl__
-
-module com { module sun { module star { module corba
-{
- /**
- @deprecated
- */
- published typedef unsigned long ObjectSystemID;
- /**
- @deprecated
- */
- published typedef sequence< byte > OpaqueData;
-
- /**
- @deprecated
- */
- published struct OneThreadID
- {
- ObjectSystemID objSysID;
- OpaqueData threadID;
- };
-
- /**
- @deprecated
- */
- published typedef sequence<OneThreadID> ThreadIDs;
-
- /**
- @deprecated
- */
- published struct LogicalThreadID // Service context
- {
- ThreadIDs IDs;
- };
-
- /**
- @deprecated
- */
- published struct CorbaString8
- {
- string theString;
- };
-
- /**
- @deprecated
- */
- published struct CorbaUnion
- {
- long dummy;
- };
-
- /**
- @deprecated
- */
- published struct ObjectKey
- {
- CorbaString8 sOid;
- CorbaString8 sType;
- };
-
- /**
- @deprecated
- */
- published enum TCKind
- {
- tk_null, tk_void,
- tk_short, tk_long, tk_ushort, tk_ulong,
- tk_float, tk_double, tk_boolean, tk_char,
- tk_octet, tk_any, tk_TypeCode, tk_Principal, tk_objref,
- tk_struct, tk_union, tk_enum, tk_string,
- tk_sequence, tk_array, tk_alias, tk_except,
- tk_longlong, tk_ulonglong, tk_longdouble,
- tk_wchar, tk_wstring, tk_fixed,
- tk_value, tk_value_box,
- tk_native,
- tk_abstract_interface
- };
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/corba/giop/giop.idl b/udkapi/com/sun/star/corba/giop/giop.idl
deleted file mode 100644
index 5e47576..0000000
--- a/udkapi/com/sun/star/corba/giop/giop.idl
+++ /dev/null
@@ -1,248 +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_corba_giop_giop_idl__
-#define __com_sun_star_corba_giop_giop_idl__
-
-#include <com/sun/star/corba/iop/iop.idl>
-module com { module sun { module star { module corba { module giop
-{
- /**
- @deprecated
- */
-published struct Version
- {
- byte major;
- byte minor;
- };
-
- /**
- @deprecated
- */
-published enum MsgType_1_1
- {
- Request, Reply, CancelRequest,
- LocateRequest, LocateReply,
- CloseConnection, MessageError,
- Fragment // GIOP 1.1 addition
- };
-
-
- /**
- @deprecated
- */
-published struct MessageHeader_1_0
- {// Renamed from MessageHeader
- byte magic_1;
- byte magic_2;
- byte magic_3;
- byte magic_4;
- Version GIOP_version;
- boolean byte_order;
- byte message_type;
- unsigned long message_size;
- };
-
- /**
- @deprecated
- */
-published struct MessageHeader_1_1
- {
- byte magic_1;
- byte magic_2;
- byte magic_3;
- byte magic_4;
- Version GIOP_version;
- byte flags; // GIOP 1.1 change
- byte message_type;
- unsigned long message_size;
- };
-
- /**
- @deprecated
- */
-published typedef MessageHeader_1_1 MessageHeader_1_2;
-
- /**
- @deprecated
- */
-published struct RequestHeader_1_0
- {
- com::sun::star::corba::iop::ServiceContextList service_context;
- unsigned long request_id;
- boolean response_expected;
- sequence < byte > object_key;
- com::sun::star::corba::CorbaString8 operation;
- sequence < byte > requesting_principal;
- };
-
- /**
- @deprecated
- */
-published struct RequestHeader_1_1
- {
- com::sun::star::corba::iop::ServiceContextList service_context;
- unsigned long request_id;
- boolean response_expected;
- byte reserved_1;
- byte reserved_2;
- byte reserved_3; // Added in GIOP 1.1
- sequence <byte> object_key;
- com::sun::star::corba::CorbaString8 operation;
- sequence <byte> requesting_principal; // binary compatible
- };
-
- /**
- @deprecated
- */
-published struct IORAddressingInfo
- {
- unsigned long selected_profile_index;
- com::sun::star::corba::iop::IOR ior;
- };
-
- /**
- @deprecated
- */
-published constants TargetAddressGroup
- {
- const short KeyAddr = 0;
- const short ProfileAddr = 1;
- const short ReferenceAddr = 2;
- };
-
- /**
- @deprecated
- */
-published struct TargetAddress : com::sun::star::corba::CorbaUnion
- {
- short nDiscriminator;
- sequence < byte > object_key; // KeyAddr
- com::sun::star::corba::iop::TaggedProfile profile; // ProfileAddr
- IORAddressingInfo ior; // ReferenceAddr
- };
-
-
- /**
- @deprecated
- */
-published struct RequestHeader_1_2
- {
- unsigned long request_id;
- byte response_flags;
- byte reserved_1;
- byte reserved_2;
- byte reserved_3;
- TargetAddress target;
- com::sun::star::corba::CorbaString8 operation;
-// Principal not in GIOP 1.2
- com::sun::star::corba::iop::ServiceContextList service_context; // 1.2 change
- };
-
-
- /**
- @deprecated
- */
-published enum ReplyStatusType_1_2
- {
- NO_EXCEPTION,
- USER_EXCEPTION,
- SYSTEM_EXCEPTION,
- LOCATION_FORWARD,
- LOCATION_FORWARD_PERM, // new value for 1.2
- NEEDS_ADDRESSING_MODE // new value for 1.2
- };
-
-
- /**
- @deprecated
- */
-published struct ReplyHeader_1_2
- {
- unsigned long request_id;
- ReplyStatusType_1_2 reply_status;
- com::sun::star::corba::iop::ServiceContextList service_context; // 1.2 change
- };
-
- /**
- @deprecated
- */
-published struct SystemExceptionReplyBody
- {
- com::sun::star::corba::CorbaString8 exception_id;
- unsigned long minor_code_value;
- unsigned long completion_status;
- };
-
- /**
- @deprecated
- */
-published struct CancelRequestHeader
- {
- unsigned long request_id;
- };
-
- /**
- @deprecated
- */
-published struct LocateRequestHeader_1_0
- {
-// Renamed LocationRequestHeader
- unsigned long request_id;
- sequence <byte> object_key;
- };
-
- /**
- @deprecated
- */
-published typedef LocateRequestHeader_1_0 LocateRequestHeader_1_1;
-
- /**
- @deprecated
- */
-published enum LocateStatusType_1_2 {
- UNKNOWN_OBJECT,
- OBJECT_HERE,
- OBJECT_FORWARD,
- OBJECT_FORWARD_PERM, // new value for GIOP 1.2
- LOC_SYSTEM_EXCEPTION, // new value for GIOP 1.2
- LOC_NEEDS_ADDRESSING_MODE // new value for GIOP 1.2
- };
-
- /**
- @deprecated
- */
-published struct LocateReplyHeader_1_2
- {
- unsigned long request_id;
- LocateStatusType_1_2 locate_status;
- };
-
- /**
- @deprecated
- */
-published struct FragmentHeader_1_2
- {
- unsigned long request_id;
- };
-
-
-}; }; }; }; };
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/corba/iiop/iiop.idl b/udkapi/com/sun/star/corba/iiop/iiop.idl
deleted file mode 100644
index 0dc76e4..0000000
--- a/udkapi/com/sun/star/corba/iiop/iiop.idl
+++ /dev/null
@@ -1,84 +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_corba_iiop_iiop_idl__
-#define __com_sun_star_corba_iiop_iiop_idl__
-
-#include <com/sun/star/corba/giop/giop.idl>
-module com { module sun { module star { module corba { module iiop
-{
- /**
- @deprecated
- */
-published struct Version
- {
- byte major;
- byte minor;
- };
-
-
- /**
- @deprecated
- */
-published struct ProfileBody_1_0
- {// renamed from ProfileBody
- Version iiop_version;
- com::sun::star::corba::CorbaString8 host;
- unsigned short port;
- sequence <byte> object_key;
- };
-
- /**
- @deprecated
- */
-published struct ProfileBody_1_1
- {// also used for 1.2
- Version iiop_version;
- com::sun::star::corba::CorbaString8 host;
- unsigned short port;
- sequence < byte > object_key;
-// Added in 1.1 unchanged for 1.2
- sequence <com::sun::star::corba::iop::TaggedComponent> components;
- };
-
- /**
- @deprecated
- */
-published struct ListenPoint
- {
- com::sun::star::corba::CorbaString8 host;
- unsigned short port;
- };
-
- /**
- @deprecated
- */
-published typedef sequence<ListenPoint> ListenPointList;
-
- /**
- @deprecated
- */
-published struct BiDirIIOPServiceContext
- {// BI_DIR_IIOP Service Context
- ListenPointList listen_points;
- };
-
-}; }; }; }; };
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/corba/iop/iop.idl b/udkapi/com/sun/star/corba/iop/iop.idl
deleted file mode 100644
index 3c52d8b..0000000
--- a/udkapi/com/sun/star/corba/iop/iop.idl
+++ /dev/null
@@ -1,120 +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_corba_iop_iop_idl__
-#define __com_sun_star_corba_iop_iop_idl__
-
-#include <com/sun/star/corba/corba.idl>
-module com { module sun { module star { module corba { module iop
-{ // IDL
-
- /**
- @deprecated
- */
- published typedef unsigned long ProfileId;
-
- /**
- @deprecated
- */
- published constants ProfileIdGroup
- {
- const ProfileId TAG_INTERNET_IOP = 0;
- const ProfileId TAG_MULTIPLE_COMPONENTS = 1;
- };
-
- /**
- @deprecated
- */
- published struct TaggedProfile
- {
- ProfileId tag;
- sequence <byte> profile_data;
- };
- // an Interoperable Object Reference is a sequence of
- // object-specific protocol profiles, plus a type ID.
-
- /**
- @deprecated
- */
- published struct IOR
- {
- com::sun::star::corba::CorbaString8 type_id;
- sequence <TaggedProfile> profiles;
- };
-
- // Standard way of representing multicomponent profiles.
- // This would be encapsulated in a TaggedProfile.
- /**
- @deprecated
- */
- published typedef unsigned long ComponentId;
-
- /**
- @deprecated
- */
- published struct TaggedComponent
- {
- ComponentId tag;
- sequence <byte> component_data;
- };
-
- /**
- @deprecated
- */
- published typedef sequence <TaggedComponent> MultipleComponentProfile;
-
- /**
- @deprecated
- */
- published typedef unsigned long ServiceId;
-
- /**
- @deprecated
- */
- published struct ServiceContext
- {
- ServiceId context_id;
- sequence < byte > context_data;
- };
-
- /**
- @deprecated
- */
- published typedef sequence <ServiceContext> ServiceContextList;
-
- /**
- @deprecated
- */
- published constants ServiceIdGroup
- {
- const ServiceId TransactionService = 0;
- const ServiceId CodeSets = 1;
- const ServiceId ChainBypassCheck = 2;
- const ServiceId ChainBypassInfo = 3;
- const ServiceId LogicalThreadId = 4;
- const ServiceId BI_DIR_IIOP = 5;
- const ServiceId SendingContextRunTime = 6;
- const ServiceId INVOCATION_POLICIES = 7;
- const ServiceId FORWARDED_IDENTITY = 8;
- const ServiceId UnknownExceptionInfo = 9;
- };
-
-}; }; }; }; };
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit b4a004e65655446c0bec8a134444b43f375b7471
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Nov 28 12:16:39 2012 +0100
gbuild: UnoApiTarget: delete RDB file before rebuilding it
regmerge does not by itself remove those parts of the RDB that
have their IDL files removed.
Change-Id: Ie3972779deb7de4250e1a5f0f66c2e964fc60043
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 1b854b6..9246938 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -98,9 +98,11 @@ $(gb_UnoApiTarget_REGMERGECOMMAND) @$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE}
endef
+# first delete target rdb file to detect problems when removing IDL files
define gb_UnoApiTarget__command
$(call gb_Output_announce,$(2),$(true),UNO,4)
mkdir -p $(dir $(1)) && \
+rm -f $(1) && \
$(call gb_UnoApiTarget__command_impl,$(1),$(UNOAPI_ROOT),$(if $(UNOAPI_FILES),$(UNOAPI_FILES),$(UNOAPI_MERGE))) \
$(if $(UNOAPI_REFERENCE), \
$(call gb_Output_announce,$(2),$(true),DBc,3) \
More information about the Libreoffice-commits
mailing list