[Libreoffice-commits] .: 2 commits - offapi/com offapi/type_reference offapi/UnoApi_offapi.mk uui/source uui/util

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Nov 29 13:54:28 PST 2012


 offapi/UnoApi_offapi.mk                               |    3 
 offapi/com/sun/star/style/XStyleCondition.idl         |   54 -----------------
 offapi/com/sun/star/task/InteractionHandler.idl       |    1 
 offapi/com/sun/star/ucb/CHAOSProgressStart.idl        |   55 ------------------
 offapi/com/sun/star/ucb/InteractiveCHAOSException.idl |   55 ------------------
 offapi/type_reference/types.rdb                       |binary
 uui/source/iahndl.cxx                                 |   23 -------
 uui/util/uui.xml                                      |    1 
 8 files changed, 192 deletions(-)

New commits:
commit 487ec7193b7b470bbbade008c1a3e81fd74a127c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 29 22:49:26 2012 +0100

    API CHANGE: remove com.sun.star.style.XStyleCondition
    
    This was apparently never used or implemented.
    
    EXISTENCE: published key "/UCR/com/sun/star/style/XStyleCondition"
    exists only in registry 1
    
    Change-Id: I814b56dc5830862817303fe385c35142382cbe65

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 4373cdc..1bbff25 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3465,7 +3465,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/style,\
 	XAutoStylesSupplier \
 	XDefaultsSupplier \
 	XStyle \
-	XStyleCondition \
 	XStyleFamiliesSupplier \
 	XStyleLoader \
 	XStyleSupplier \
diff --git a/offapi/com/sun/star/style/XStyleCondition.idl b/offapi/com/sun/star/style/XStyleCondition.idl
deleted file mode 100644
index 59058b4..0000000
--- a/offapi/com/sun/star/style/XStyleCondition.idl
+++ /dev/null
@@ -1,54 +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_style_XStyleCondition_idl__
-#define __com_sun_star_style_XStyleCondition_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-
-
-
- module com {  module sun {  module star {  module style {
-
-
-/** This interface makes it possible to access conditional styles of the object.
-
-    @deprecated This interface was never implemented or referenced.
- */
-published interface XStyleCondition: com::sun::star::uno::XInterface
-{
-
-    /** @returns
-                    the style condition for the specified type.
-     */
-    string getStyleConditionByType( [in] short TextType );
-
-
-    /** sets the style condition for the specified type.
-     */
-    [oneway] void setStyleConditionByType( [in] string StyleName,
-             [in] short TextType );
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 237b6c5..7fc0995 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
commit f2586285f24977827a1dae06b8b4abd034cb7508
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 29 22:37:17 2012 +0100

    API CHANGE: remove com.sun.star.ucb.InteractiveCHAOSException
    
    ... and com.sun.star.ucb.CHAOSProgressStart.
    
    These are apparently remnants of a predecessor of UCB called CHAOS that
    has been removed long ago.
    
    EXISTENCE: published key
    "/UCR/com/sun/star/ucb/InteractiveCHAOSException" exists only in
    registry 1
    EXISTENCE: published key "/UCR/com/sun/star/ucb/CHAOSProgressStart"
    exists only in registry 1
    
    Change-Id: I6502874d6026665c0696a4226396714fc44819ee

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 16f2617..4373cdc 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3690,7 +3690,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
 	AlreadyInitializedException \
 	AuthenticationRequest \
-	CHAOSProgressStart \
 	CheckinArgument \
 	CertificateValidationRequest \
 	Command \
@@ -3734,7 +3733,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
 	InteractiveAppException \
 	InteractiveAugmentedIOException \
 	InteractiveBadTransferURLException \
-	InteractiveCHAOSException \
 	InteractiveFileIOException \
 	InteractiveIOException \
 	InteractiveLockingException \
diff --git a/offapi/com/sun/star/task/InteractionHandler.idl b/offapi/com/sun/star/task/InteractionHandler.idl
index c105a90..25f6edb 100644
--- a/offapi/com/sun/star/task/InteractionHandler.idl
+++ b/offapi/com/sun/star/task/InteractionHandler.idl
@@ -41,7 +41,6 @@ module com { module sun { module star { module task {
         <LI><type scope="com::sun::star::ucb">CertificateValidationRequest</type></LI>
         <LI><type scope="com::sun::star::ucb">HandleCookiesRequest</type></LI>
         <LI><type scope="com::sun::star::ucb">InteractiveAugmentedIOException</type>*</LI>
-        <LI><type scope="com::sun::star::ucb">InteractiveCHAOSException</type>*</LI>
         <LI><type scope="com::sun::star::ucb">InteractiveFileIOException</type>*</LI>
         <LI><type scope="com::sun::star::ucb">InteractiveIOException</type>*</LI>
         <LI><type scope="com::sun::star::ucb">InteractiveNetworkConnectException</type>*</LI>
diff --git a/offapi/com/sun/star/ucb/CHAOSProgressStart.idl b/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
deleted file mode 100644
index e90f981..0000000
--- a/offapi/com/sun/star/ucb/CHAOSProgressStart.idl
+++ /dev/null
@@ -1,55 +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_ucb_CHAOSProgressStart_idl__
-#define __com_sun_star_ucb_CHAOSProgressStart_idl__
-
-#include <com/sun/star/uno/XInterface.idl>
-
-
-
-module com { module sun { module star { module ucb {
-
-/** An object representing the start of a task's activity that will progress
-    from some minimal to some maximal value.
-
-    @deprecated
-
-    @see XProgressHandler
-*/
-published struct CHAOSProgressStart
-{
-    /** An optional text describing the activity.
-    */
-    string Text;
-
-    /** The minimal value of the progress.
-    */
-    long Minimum;
-
-    /** The maximal value of the progress.
-    */
-    long Maximum;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl b/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
deleted file mode 100644
index 979fb92..0000000
--- a/offapi/com/sun/star/ucb/InteractiveCHAOSException.idl
+++ /dev/null
@@ -1,55 +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_ucb_InteractiveCHAOSException_idl__
-#define __com_sun_star_ucb_InteractiveCHAOSException_idl__
-
-#include <com/sun/star/task/ClassifiedInteractionRequest.idl>
-
-
-
-module com { module sun { module star { module ucb {
-
-/** An error capsuling error information as used by CHAOS.
-
-    @deprecated
-*/
-published exception InteractiveCHAOSException: com::sun::star::task::ClassifiedInteractionRequest
-{
-    /** The error ID.
-
-        <p>For a "dynamic" error (with extra textual arguments), this ID
-        does not contain the "dynamic bits".
-    */
-    long ID;
-
-    /** Any textual arguments of a "dynamic" error (which will get merged into
-        the error message).
-
-        <p>This sequence should contain at most two elements.
-    */
-    sequence<string> Arguments;
-
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 23164cd..237b6c5 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 1967c3a..92db839 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -43,7 +43,6 @@
 #include "com/sun/star/task/XInteractionRequest.hpp"
 #include "com/sun/star/task/XInteractionRetry.hpp"
 #include "com/sun/star/ucb/InteractiveAppException.hpp"
-#include "com/sun/star/ucb/InteractiveCHAOSException.hpp"
 #include "com/sun/star/ucb/InteractiveLockingLockedException.hpp"
 #include "com/sun/star/ucb/InteractiveLockingNotLockedException.hpp"
 #include "com/sun/star/ucb/InteractiveLockingLockExpiredException.hpp"
@@ -600,28 +599,6 @@ UUIInteractionHelper::handleRequest_impl(
             return true;
         }
 
-        ucb::InteractiveCHAOSException aChaosException;
-        if (aAnyRequest >>= aChaosException)
-        {
-            std::vector< rtl::OUString > aArguments;
-            sal_Int32 nCount
-                = std::min< sal_Int32 >(aChaosException.Arguments.getLength(),
-                                        2);
-            aArguments.
-                reserve(static_cast< std::vector< rtl::OUString >::size_type >(
-                    nCount));
-            for (sal_Int32 i = 0; i < nCount; ++i)
-                aArguments.push_back(aChaosException.Arguments[i]);
-            handleErrorHandlerRequest(aChaosException.Classification,
-                                      aChaosException.ID,
-                                      aArguments,
-                                      rRequest->getContinuations(),
-                                      bObtainErrorStringOnly,
-                                      bHasErrorString,
-                                      rErrorString);
-            return true;
-        }
-
         ucb::InteractiveWrongMediumException aWrongMediumException;
         if (aAnyRequest >>= aWrongMediumException)
         {
diff --git a/uui/util/uui.xml b/uui/util/uui.xml
index 7c12cfc..e6a16af 100644
--- a/uui/util/uui.xml
+++ b/uui/util/uui.xml
@@ -70,7 +70,6 @@
     <type>com.sun.star.task.XPasswordContainer</type>
     <type>com.sun.star.ucb.AuthenticationRequest</type>
     <type>com.sun.star.ucb.InteractiveAugmentedIOException</type>
-    <type>com.sun.star.ucb.InteractiveCHAOSException</type>
     <type>com.sun.star.ucb.InteractiveNetworkConnectException</type>
     <type>com.sun.star.ucb.InteractiveNetworkException</type>
     <type>com.sun.star.ucb.InteractiveNetworkGeneralException</type>


More information about the Libreoffice-commits mailing list