Kaydet (Commit) f2586285 authored tarafından Michael Stahl's avatar Michael Stahl

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
üst 924f0936
...@@ -3690,7 +3690,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\ ...@@ -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,\ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
AlreadyInitializedException \ AlreadyInitializedException \
AuthenticationRequest \ AuthenticationRequest \
CHAOSProgressStart \
CheckinArgument \ CheckinArgument \
CertificateValidationRequest \ CertificateValidationRequest \
Command \ Command \
...@@ -3734,7 +3733,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\ ...@@ -3734,7 +3733,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ucb,\
InteractiveAppException \ InteractiveAppException \
InteractiveAugmentedIOException \ InteractiveAugmentedIOException \
InteractiveBadTransferURLException \ InteractiveBadTransferURLException \
InteractiveCHAOSException \
InteractiveFileIOException \ InteractiveFileIOException \
InteractiveIOException \ InteractiveIOException \
InteractiveLockingException \ InteractiveLockingException \
......
...@@ -41,7 +41,6 @@ module com { module sun { module star { module task { ...@@ -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">CertificateValidationRequest</type></LI>
<LI><type scope="com::sun::star::ucb">HandleCookiesRequest</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">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">InteractiveFileIOException</type>*</LI>
<LI><type scope="com::sun::star::ucb">InteractiveIOException</type>*</LI> <LI><type scope="com::sun::star::ucb">InteractiveIOException</type>*</LI>
<LI><type scope="com::sun::star::ucb">InteractiveNetworkConnectException</type>*</LI> <LI><type scope="com::sun::star::ucb">InteractiveNetworkConnectException</type>*</LI>
......
/* -*- 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: */
/* -*- 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: */
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include "com/sun/star/task/XInteractionRequest.hpp" #include "com/sun/star/task/XInteractionRequest.hpp"
#include "com/sun/star/task/XInteractionRetry.hpp" #include "com/sun/star/task/XInteractionRetry.hpp"
#include "com/sun/star/ucb/InteractiveAppException.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/InteractiveLockingLockedException.hpp"
#include "com/sun/star/ucb/InteractiveLockingNotLockedException.hpp" #include "com/sun/star/ucb/InteractiveLockingNotLockedException.hpp"
#include "com/sun/star/ucb/InteractiveLockingLockExpiredException.hpp" #include "com/sun/star/ucb/InteractiveLockingLockExpiredException.hpp"
...@@ -600,28 +599,6 @@ UUIInteractionHelper::handleRequest_impl( ...@@ -600,28 +599,6 @@ UUIInteractionHelper::handleRequest_impl(
return true; 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; ucb::InteractiveWrongMediumException aWrongMediumException;
if (aAnyRequest >>= aWrongMediumException) if (aAnyRequest >>= aWrongMediumException)
{ {
......
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
<type>com.sun.star.task.XPasswordContainer</type> <type>com.sun.star.task.XPasswordContainer</type>
<type>com.sun.star.ucb.AuthenticationRequest</type> <type>com.sun.star.ucb.AuthenticationRequest</type>
<type>com.sun.star.ucb.InteractiveAugmentedIOException</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.InteractiveNetworkConnectException</type>
<type>com.sun.star.ucb.InteractiveNetworkException</type> <type>com.sun.star.ucb.InteractiveNetworkException</type>
<type>com.sun.star.ucb.InteractiveNetworkGeneralException</type> <type>com.sun.star.ucb.InteractiveNetworkGeneralException</type>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment