diff options
Diffstat (limited to 'ucbhelper/inc')
| -rw-r--r-- | ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx | 100 | ||||
| -rw-r--r-- | ucbhelper/inc/ucbhelper/content.hxx | 203 | ||||
| -rw-r--r-- | ucbhelper/inc/ucbhelper/contentbroker.hxx | 17 | ||||
| -rw-r--r-- | ucbhelper/inc/ucbhelper/contenthelper.hxx | 14 | ||||
| -rw-r--r-- | ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx | 217 | ||||
| -rw-r--r-- | ucbhelper/inc/ucbhelper/propertyvalueset.hxx | 152 | ||||
| -rw-r--r-- | ucbhelper/inc/ucbhelper/resultsethelper.hxx | 9 | ||||
| -rw-r--r-- | ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx | 57 |
8 files changed, 0 insertions, 769 deletions
diff --git a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx deleted file mode 100644 index 90c05d17d19e..000000000000 --- a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx +++ /dev/null @@ -1,100 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _UCBHELPER_COMMANDENVIRONMENTPROXY_HXX -#define _UCBHELPER_COMMANDENVIRONMENTPROXY_HXX - -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/ucb/XCommandEnvironment.hpp> -#include <cppuhelper/weak.hxx> -#include <ucbhelper/macros.hxx> - -namespace ucbhelper -{ - -struct CommandEnvironmentProxy_Impl; - -//========================================================================= - -/** - * This class implements the interface - * com::sun::star::ucb::XCommandEnvironement. - * - * Instances of this class can be used to create a (local) proxy for (remote) - * command environment implementations. This implementation caches the - * (remote) interfaces supplied by the given environment in order to avoid the - * overhead produced by multiple (remote) calls to methods of the given - * (remote) command environment. - */ -class CommandEnvironmentProxy : public cppu::OWeakObject, - public com::sun::star::lang::XTypeProvider, - public com::sun::star::ucb::XCommandEnvironment -{ - CommandEnvironmentProxy_Impl* m_pImpl; - -private: - CommandEnvironmentProxy( const CommandEnvironmentProxy& ); // n.i. - CommandEnvironmentProxy& operator=( const CommandEnvironmentProxy& ); // n.i. - -public: - /** - * Constructor. - * - * @param rxEnv is the implementation of a (remote) command environment. - */ - CommandEnvironmentProxy( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv ); - /** - * Destructor. - */ - virtual ~CommandEnvironmentProxy(); - - // XInterface - XINTERFACE_DECL() - - // XTypeProvider - XTYPEPROVIDER_DECL() - - // XCommandEnvironemnt - virtual com::sun::star::uno::Reference< - com::sun::star::task::XInteractionHandler > SAL_CALL - getInteractionHandler() - throw ( com::sun::star::uno::RuntimeException ); - - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XProgressHandler > SAL_CALL - getProgressHandler() - throw ( com::sun::star::uno::RuntimeException ); -}; - -} /* namespace ucbhelper */ - -#endif /* !_UCBHELPER_COMMANDENVIRONMENTPROXY_HXX */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/inc/ucbhelper/content.hxx b/ucbhelper/inc/ucbhelper/content.hxx index f290134dfae1..54318c49ec51 100644 --- a/ucbhelper/inc/ucbhelper/content.hxx +++ b/ucbhelper/inc/ucbhelper/content.hxx @@ -140,21 +140,6 @@ public: /** * Constructor. * - * @param rId is the content identifier of the content to create. - * @param rEnv is the environment to use for commands executed by the - * content. The command environment is used by the content - * implementation to interact with the client and to propagate - * errors. - */ - Content( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& rId, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& rEnv ) - throw ( ::com::sun::star::ucb::ContentCreationException, - ::com::sun::star::uno::RuntimeException ); - /** - * Constructor. - * * @param rContent is the content object of the content to create. * @param rEnv is the environment to use for commands executed by the * content. The command environment is used by the content @@ -205,46 +190,6 @@ public: ::com::sun::star::ucb::XCommandEnvironment >& rEnv, Content& rContent ); - /** - * Constructor. This method should be used, if the exception thrown - * by the direct ctors of this class are to 'expensive' for your - * application - * - * @param rId is the content identifier of the content to create. - * @param rEnv is the environment to use for commands executed by the - * content. The command environment is used by the content - * implementation to interact with the client and to propagate - * errors. - * @param rContent will be filled by this method with the content created. - * @return true, if the operation was successful - false, otherwise. - */ - static sal_Bool - create( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& rId, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& rEnv, - Content& rContent ); - - /** - * Constructor. This method should be used, if the exception thrown - * by the direct ctors of this class are to 'expensive' for your - * application - * - * @param xContent is the content object of the content to create. - * @param rEnv is the environment to use for commands executed by the - * content. The command environment is used by the content - * implementation to interact with the client and to propagate - * errors. - * @param rContent will be filled by this method with the content created. - * @return true, if the operation was successful - false, otherwise. - */ - static sal_Bool - create( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContent >& xContent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& rEnv, - Content& rContent ); - ////////////////////////////////////////////////////////////////////// // Direct access to UCB content. ////////////////////////////////////////////////////////////////////// @@ -341,18 +286,6 @@ public: ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); /** - * This method can be used to read a single property value. - * - * @param nPropertyHande is the handle of the property for that the - * value shall be obtained. - * @return the property value. - */ - ::com::sun::star::uno::Any - getPropertyValue( sal_Int32 nPropertyHandle ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); - /** * This method can be used to set a single property value. * * @param rPropertyName is the name of the property for that the @@ -383,36 +316,6 @@ public: ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); /** - * This method can be used to set a single property value. - * - * @param nPropertyHande is the handle of the property for that the - * value shall be set. - * @return an any containing: - * - No value indicates, that the property value was set - * successfully. - * - com::sun::star::beans::UnknownPropertyException indicates, - * that the property is not known to the content implementation. - * - com::sun::star::beans::IllegalTypeException indicates, that - * the data type of the property value is not acceptable. - * - com::sun::star::lang::IllegalAccessException indicates, that - * the property is constant. - * - com::sun::star::lang::IllegalArgumentException indicates, - * that the property value is not acceptable. For instance, - * setting an empty title may be illegal. - * - Any other execption derived from - * com::sun::star::uno::Exception indicates, that the value was - * not set successfully. For example, this can be a - * com::sun:star::ucb::InteractiveAugmentedIOException - * transporting the error code - * com::sun::star::ucb::IOErrorCode::ACCESS_DENIED. - */ - ::com::sun::star::uno::Any - setPropertyValue( const sal_Int32 nPropertyHandle, - const ::com::sun::star::uno::Any& rValue ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); - /** * This method can be used to read multiple property values. * * @param rPropertyNames is a sequence of names of properties for @@ -563,30 +466,6 @@ public: throw( ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); - ::com::sun::star::uno::Any - /** - * This method can be used to execute any command supported by the - * content. - * - * @param rCommandHandle is the handle of the command to execute. - * @param rCommandArgument is the argument for the command. Type and - * values of this parameter must correspond to the command - * specification. - * @return the result of the command according to its specification. - */ - executeCommand( sal_Int32 nCommandHandle, - const ::com::sun::star::uno::Any& rCommandArgument ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); - /** - * This method can be used to abort the command currently executed by - * a content. Note that a content can only process one command per - * thread at a time. The implementation of the content is responsible - * for determining the command to abort when this method is called. - */ - void - abortCommand(); ////////////////////////////////////////////////////////////////////// // Special commands. @@ -620,28 +499,6 @@ public: * preselected property values of the children. * Internally it executes the command "open" at the content. * - * @param nPropertyHandles is a sequence of handles of properties for - * that the values should be accessible via the resultset - * returned by this method. - * @param eMode is a very simple filter for the children contained - * in the resultset. - * @return an implementation of the service - * com.cun.star.ucb.ContentResultSet, which can be used to - * get access to the children of a content. - */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > - createCursor( const ::com::sun::star::uno::Sequence< - sal_Int32 >& rPropertyHandles, - ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); - /** - * This methods gives access to the children of a folder content. - * Additionally, the result set returned provides efficient access to - * preselected property values of the children. - * Internally it executes the command "open" at the content. - * * @param rPropertyNames is a sequence of names of properties for * that the values should be accessible via the resultset * returned by this method. @@ -683,24 +540,6 @@ public: ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet > - createSortedDynamicCursor( const ::com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames, - const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo, - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompareFactory > rAnyCompareFactory, - ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); - - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet > - createSortedDynamicCursor( const ::com::sun::star::uno::Sequence< sal_Int32 >& rPropertyHandles, - const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo, - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompareFactory > rAnyCompareFactory, - ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > createSortedCursor( const ::com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo, @@ -710,15 +549,6 @@ public: ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > - createSortedCursor( const ::com::sun::star::uno::Sequence< sal_Int32 >& rPropertyHandles, - const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo, - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompareFactory > rAnyCompareFactory, - ResultSetInclude eMode = INCLUDE_FOLDERS_AND_DOCUMENTS ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); - /** * This methods gives read access to the content stream of a content (i.e * the content of a file located at the local file system). @@ -868,39 +698,6 @@ public: ::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception ); /** - * This method creates, initializes and inserts ( commits ) a new content - * (i.e. it could be used to create a new file system folder). - * Internally this method does a - * XCommandProcessor::execute( "createNewContent", ... ); - * XCommandProcessor::execute( "setPropertyValues", ... ); - * XCommandProcessor::execute( "insert", ... ); calling sequence. - * - * @param rContentType is the type for the new UCB content. Each content - * provider implementation may introduce own types for its content - * objects (See queryCreatableContentsInfo()). - * @param nPropertyHandes is a sequence of handles of properties for that - * values are to set at the new content before it will be inserted - * ( commited ). - * The order of the handles must correspond to the order of the - * property values. - * @param rPropertyValues is a sequence of property values that are to - * set at the new content before it will be inserted ( commited ). - * The order of the values must correspond to the order of the - * property handles. - * @param rNewContent will be filled by the implementation of this method - * with the new content. - */ - sal_Bool - insertNewContent( const ::rtl::OUString& rContentType, - const ::com::sun::star::uno::Sequence< - sal_Int32 >& nPropertyHandles, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Any >& rPropertyValues, - Content& rNewContent ) - throw( ::com::sun::star::ucb::CommandAbortedException, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::uno::Exception ); - /** * This method creates, initializes and inserts (commits) a new content * inside this (the target folder) content. For example, it can be used to * create a new file system file. diff --git a/ucbhelper/inc/ucbhelper/contentbroker.hxx b/ucbhelper/inc/ucbhelper/contentbroker.hxx index f21597cccc84..fe883efe1354 100644 --- a/ucbhelper/inc/ucbhelper/contentbroker.hxx +++ b/ucbhelper/inc/ucbhelper/contentbroker.hxx @@ -122,23 +122,6 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArguments ); - /** Initialize "the one and only" Broker. This method must be called - * exactly once, before the Broker is used in any way. - * - * @param rSMgr is a factory to create services needed in the Broker's - * implementation. - * - * @param rData are the data for the for the content providers for - * the UCB to initialize. - * - * @return True if creation and possible configuration of the Broker - * was successful. - */ - static sal_Bool - initialize( const::com::sun::star::uno::Reference< - ::com::sun::star::lang::XMultiServiceFactory >& rSMgr, - const ContentProviderDataList & rData ); - /** Deinitialize "the one and only" Broker. Once this method has been * called, the Broker must not be used any longer. */ diff --git a/ucbhelper/inc/ucbhelper/contenthelper.hxx b/ucbhelper/inc/ucbhelper/contenthelper.hxx index fdeb3a307979..bdfb425931f5 100644 --- a/ucbhelper/inc/ucbhelper/contenthelper.hxx +++ b/ucbhelper/inc/ucbhelper/contenthelper.hxx @@ -216,20 +216,6 @@ protected: const com::sun::star::beans::PropertySetInfoChangeEvent& evt ) const; /** - * This method can be used to propagate changes of the command info of - * your content. This can happen at any time if there shall be a new - * command available at a content or a currently present command shall no - * longer be present. (i.e. only if the content count of a trash can - * object is greater then zero, there will be available a command - * "emptyTrash". If there are no objects in the trash can, this command - * won't be available. - * - * @param evt is a sequence of command info change events. - */ - void notifyCommandInfoChange( - const com::sun::star::ucb::CommandInfoChangeEvent& evt ) const; - - /** * This method can be used to propagate content events. * * @param evt is a sequence of content events. diff --git a/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx b/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx deleted file mode 100644 index ab0d445e76a9..000000000000 --- a/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx +++ /dev/null @@ -1,217 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef INCLUDED_UCBHELPER_HANDLEINTERACTIONREQUEST_HXX -#define INCLUDED_UCBHELPER_HANDLEINTERACTIONREQUEST_HXX - -#include "com/sun/star/uno/Exception.hpp" -#include "com/sun/star/uno/Reference.hxx" -#include "rtl/ref.hxx" -#include "sal/types.h" - -#ifndef INCLUDED_UTILITY -#include <utility> -#define INCLUDED_UTILITY -#endif - -namespace com { namespace sun { namespace star { namespace ucb { - class XCommandEnvironment; -} } } } -namespace ucbhelper { - class InteractionSupplyAuthentication; - class SimpleAuthenticationRequest; - class SimpleInteractionRequest; - class SimpleCertificateValidationRequest; -} - -/** Pass a <type scope="ucbhelper">SimpleInteractionRequest</type> to an - <type scope="com::sun::star::task">XInteractionHandler</type>, and handle - (by throwing the request as an exception) those cases where an interaction - handler is either not available or does not handle the request. - - @param rRequest - a <type scope="ucbhelper">SimpleInteractionRequest</type>. Must not be - <NULL/>. - - @param rEnvironment - At the moment, only the - <type scope="com::sun::star::task">XInteractionHandler</type> part is - used. May be <NULL/>. - - @param bThrowOnAbort - determines what is done if the interaction handler selects a - <const scope="ucbhelper">CONTINUATION_ABORT</const> continuation: If - <TRUE/>, an appropriate - <type scope="com::sun::star::ucb">CommandFailedException</type> is thrown. - If <FALSE/>, <const scope="ucbhelper">CONTINUATION_ABORT</const> is passed - to the caller of this function. - - @returns - the constant (defined in ucbhelper/simpelinteractionrequest.hxx) that - corresponds to the continuation selected by the interaction handler. - The constant <const scope="ucbhelper">CONTINUATION_UNKNOWN</const> will - never be returned. - - @throws - <ul> - <li>the exception specified by the request, if an interaction handler is - either not available or does not handle the request;</li> - <li>a <type scope="com::sun::star::ucb">CommandFailedException</type> if - the interaction handler selects a - <const scope="ucbhelper">CONTINUATION_ABORT</const> continuation and - <code>bThrowOnAbort</code> is <TRUE/>;</li> - <li>a <type scope="com::sun::star::uno">RuntimeException</type> if such an - exception is thrown by code called from within this function.</li> - </ul> - */ -namespace ucbhelper { - -sal_Int32 -handleInteractionRequest( - rtl::Reference< ucbhelper::SimpleInteractionRequest > const & rRequest, - com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > const & - rEnvironment, - bool bThrowOnAbort = true) - SAL_THROW((com::sun::star::uno::Exception)); - -} - -/** Pass a <type scope="ucbhelper">SimpleAuthenticationRequest</type> to an - <type scope="com::sun::star::task">XInteractionHandler</type>, and handle - (by throwing the request as an exception) those cases where an interaction - handler is either not available or does not handle the request. - - @param rRequest - a <type scope="ucbhelper">SimpleAuthenticationRequest</type>. Must not be - <NULL/>. - - @param rEnvironment - At the moment, only the - <type scope="com::sun::star::task">XInteractionHandler</type> part is - used. May be <NULL/>. - - @param bThrowOnAbort - determines what is done if the interaction handler selects a - <const scope="ucbhelper">CONTINUATION_ABORT</const> continuation: If - <TRUE/>, an appropriate - <type scope="com::sun::star::ucb">CommandFailedException</type> is thrown. - If <FALSE/>, <const scope="ucbhelper">CONTINUATION_ABORT</const> is passed - to the caller of this function. - - @returns - either a pair consisting of one of the constants - <const scope="ucbhelper">CONTINUATION_ABORT</const> or - <const scope="ucbhelper">CONTINUATION_RETRY</const> (defined in - ucbhelper/simpelinteractionrequest.hxx) and an empty reference, or a pair - consisting of the constant - <const scope="ucbhelper">CONTINUATION_UNKNOWN</const> and a reference to - an <type scope="ucbhelper">InteractionSupplyAuthentication</type> that - contains the supplied data. - - @throws - <ul> - <li>the exception specified by the request, if an interaction handler is - either not available or does not handle the request;</li> - <li>a <type scope="com::sun::star::ucb">CommandFailedException</type> if - the interaction handler selects a - <const scope="ucbhelper">CONTINUATION_ABORT</const> continuation and - <code>bThrowOnAbort</code> is <TRUE/>;</li> - <li>a <type scope="com::sun::star::uno">RuntimeException</type> if such an - exception is thrown by code called from within this function.</li> - </ul> - */ -namespace ucbhelper { - -std::pair< sal_Int32, - rtl::Reference< ucbhelper::InteractionSupplyAuthentication > > -handleInteractionRequest( - rtl::Reference< ucbhelper::SimpleAuthenticationRequest > const & rRequest, - com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > const & - rEnvironment, - bool bThrowOnAbort = true) - SAL_THROW((com::sun::star::uno::Exception)); - -} - -/** Pass a <type scope="ucbhelper">SimpleCertificateValidationRequest</type> to an - <type scope="com::sun::star::task">XInteractionHandler</type>, and handle - (by throwing the request as an exception) those cases where an interaction - handler is either not available or does not handle the request. - - @param rRequest - a <type scope="ucbhelper">SimpleCertificateValidationRequest</type>. Must not be - <NULL/>. - - @param rEnvironment - At the moment, only the - <type scope="com::sun::star::task">XInteractionHandler</type> part is - used. May be <NULL/>. - - @param bThrowOnAbort - determines what is done if the interaction handler selects a - <const scope="ucbhelper">CONTINUATION_ABORT</const> continuation: If - <TRUE/>, an appropriate - <type scope="com::sun::star::ucb">CommandFailedException</type> is thrown. - If <FALSE/>, <const scope="ucbhelper">CONTINUATION_ABORT</const> is passed - to the caller of this function. - - @returns - the constant (defined in ucbhelper/simpelinteractionrequest.hxx) that - corresponds to the continuation selected by the interaction handler. - The constant <const scope="ucbhelper">CONTINUATION_UNKNOWN</const> will - never be returned. - - @throws - <ul> - <li>the exception specified by the request, if an interaction handler is - either not available or does not handle the request;</li> - <li>a <type scope="com::sun::star::ucb">CommandFailedException</type> if - the interaction handler selects a - <const scope="ucbhelper">CONTINUATION_ABORT</const> continuation and - <code>bThrowOnAbort</code> is <TRUE/>;</li> - <li>a <type scope="com::sun::star::uno">RuntimeException</type> if such an - exception is thrown by code called from within this function.</li> - </ul> - */ -namespace ucbhelper { - -sal_Int32 -handleInteractionRequest( - rtl::Reference< ucbhelper::SimpleCertificateValidationRequest > const & rRequest, - com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > const & - rEnvironment, - bool bThrowOnAbort = true) - SAL_THROW((com::sun::star::uno::Exception)); - -} -#endif // INCLUDED_UCBHELPER_HANDLEINTERACTIONREQUEST_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx index 50aa9b91c77e..b9965b48dbb0 100644 --- a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx +++ b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx @@ -86,11 +86,6 @@ public: PropertyValueSet( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSMgr ); - PropertyValueSet( - const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rxSMgr, - const com::sun::star::uno::Sequence< - com::sun::star::beans::PropertyValue >& rValues ); virtual ~PropertyValueSet(); // XInterface @@ -199,13 +194,6 @@ public: // Non-interface methods ////////////////////////////////////////////////////////////////////// - /** - * This method returns the number of elements of the value set. - * - * @return the number of elements of the value set. - */ - sal_Int32 getLength() const; - void appendString( const ::rtl::OUString& rPropName, const ::rtl::OUString& rValue ); void appendString( const sal_Char* pAsciiPropName, const ::rtl::OUString& rValue ) { @@ -226,36 +214,6 @@ public: appendBoolean( rProp.Name, bValue ); } - void appendByte( const ::rtl::OUString& rPropName, sal_Int8 nValue ); - void appendByte( const sal_Char* pAsciiPropName, sal_Int8 nValue ) - { - appendByte( ::rtl::OUString::createFromAscii( pAsciiPropName ), nValue ); - } - void appendByte( const ::com::sun::star::beans::Property& rProp, sal_Int8 nValue ) - { - appendByte( rProp.Name, nValue ); - } - - void appendShort( const ::rtl::OUString& rPropName, sal_Int16 nValue ); - void appendShort( const sal_Char* pAsciiPropName, sal_Int16 nValue ) - { - appendShort( ::rtl::OUString::createFromAscii( pAsciiPropName ), nValue ); - } - void appendShort( const ::com::sun::star::beans::Property& rProp, sal_Int16 nValue ) - { - appendShort( rProp.Name, nValue ); - } - - void appendInt( const ::rtl::OUString& rPropName, sal_Int32 nValue ); - void appendInt( const sal_Char* pAsciiPropName, sal_Int32 nValue ) - { - appendInt( ::rtl::OUString::createFromAscii( pAsciiPropName ), nValue ); - } - void appendInt( const ::com::sun::star::beans::Property& rProp, sal_Int32 nValue ) - { - appendInt( rProp.Name, nValue ); - } - void appendLong( const ::rtl::OUString& rPropName, sal_Int64 nValue ); void appendLong( const sal_Char* pAsciiPropName, sal_Int64 nValue ) { @@ -266,56 +224,6 @@ public: appendLong( rProp.Name, nValue ); } - void appendFloat( const ::rtl::OUString& rPropName, float nValue ); - void appendFloat( const sal_Char* pAsciiPropName, float nValue ) - { - appendFloat( ::rtl::OUString::createFromAscii( pAsciiPropName ), nValue ); - } - void appendFloat( const ::com::sun::star::beans::Property& rProp, float nValue ) - { - appendFloat( rProp.Name, nValue ); - } - - void appendDouble( const ::rtl::OUString& rPropName, double nValue ); - void appendDouble( const sal_Char* pAsciiPropName, double nValue ) - { - appendDouble( ::rtl::OUString::createFromAscii( pAsciiPropName ), nValue ); - } - void appendDouble( const ::com::sun::star::beans::Property& rProp, double nValue ) - { - appendDouble( rProp.Name, nValue ); - } - - void appendBytes( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Sequence< sal_Int8 >& rValue ); - void appendBytes( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Sequence< sal_Int8 >& rValue ) - { - appendBytes( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue ); - } - void appendBytes( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Sequence< sal_Int8 >& rValue ) - { - appendBytes( rProp.Name, rValue ); - } - - void appendDate( const ::rtl::OUString& rPropName, const ::com::sun::star::util::Date& rValue ); - void appendDate( const sal_Char* pAsciiPropName, const ::com::sun::star::util::Date& rValue ) - { - appendDate( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue ); - } - void appendDate( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::util::Date& rValue ) - { - appendDate( rProp.Name, rValue ); - } - - void appendTime( const ::rtl::OUString& rPropName, const ::com::sun::star::util::Time& rValue ); - void appendTime( const sal_Char* pAsciiPropName, const ::com::sun::star::util::Time& rValue ) - { - appendTime( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue ); - } - void appendTime( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::util::Time& rValue ) - { - appendTime( rProp.Name, rValue ); - } - void appendTimestamp( const ::rtl::OUString& rPropName, const ::com::sun::star::util::DateTime& rValue ); void appendTimestamp( const sal_Char* pAsciiPropName, const ::com::sun::star::util::DateTime& rValue ) { @@ -326,26 +234,6 @@ public: appendTimestamp( rProp.Name, rValue ); } - void appendBinaryStream( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rValue ); - void appendBinaryStream( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rValue ) - { - appendBinaryStream( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue ); - } - void appendBinaryStream( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rValue ) - { - appendBinaryStream( rProp.Name, rValue ); - } - - void appendCharacterStream( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rValue ); - void appendCharacterStream( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rValue ) - { - appendCharacterStream( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue ); - } - void appendCharacterStream( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rValue ) - { - appendCharacterStream( rProp.Name, rValue ); - } - void appendObject( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rValue ); void appendObject( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Any& rValue ) { @@ -356,46 +244,6 @@ public: appendObject( rProp.Name, rValue ); } - void appendRef( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& rValue ); - void appendRef( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& rValue ) - { - appendRef( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue ); - } - void appendRef( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& rValue ) - { - appendRef( rProp.Name, rValue ); - } - - void appendBlob( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& rValue ); - void appendBlob( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& rValue ) - { - appendBlob( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue ); - } - void appendBlob( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& rValue ) - { - appendBlob( rProp.Name, rValue ); - } - - void appendClob( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& rValue ); - void appendClob( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& rValue ) - { - appendClob( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue ); - } - void appendClob( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& rValue ) - { - appendClob( rProp.Name, rValue ); - } - - void appendArray( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& rValue ); - void appendArray( const sal_Char* pAsciiPropName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& rValue ) - { - appendArray( ::rtl::OUString::createFromAscii( pAsciiPropName ), rValue ); - } - void appendArray( const ::com::sun::star::beans::Property& rProp, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& rValue ) - { - appendArray( rProp.Name, rValue ); - } - void appendVoid( const ::rtl::OUString& rPropName ); void appendVoid( const sal_Char* pAsciiPropName) { diff --git a/ucbhelper/inc/ucbhelper/resultsethelper.hxx b/ucbhelper/inc/ucbhelper/resultsethelper.hxx index e670a76b34b5..89dffe94a32b 100644 --- a/ucbhelper/inc/ucbhelper/resultsethelper.hxx +++ b/ucbhelper/inc/ucbhelper/resultsethelper.hxx @@ -131,15 +131,6 @@ public: * Construtor. * * @param rxSMgr is a Service Manager. - */ - ResultSetImplHelper( - const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rxSMgr ); - - /** - * Construtor. - * - * @param rxSMgr is a Service Manager. * @param rCommand is the paramter for the open command that produces * this resultset. */ diff --git a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx index 026cd7f7e991..5303cb4b43ef 100644 --- a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx +++ b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx @@ -94,26 +94,6 @@ public: * @param rPassword contains a password, if available (for instance from * a previous try). * @param rAccount contains an account, if applicable. - */ - SimpleAuthenticationRequest( const rtl::OUString & rURL, - const rtl::OUString & rServerName, - const rtl::OUString & rRealm, - const rtl::OUString & rUserName, - const rtl::OUString & rPassword, - const rtl::OUString & rAccount - = rtl::OUString() ); - - /** - * Constructor. - * - * @param rURL contains a URL for which authentication is requested. - * @param rServerName contains a server name. - * @param rRealm contains a realm, if applicable. - * @param rUserName contains a username, if available (for instance from - * a previous try). - * @param rPassword contains a password, if available (for instance from - * a previous try). - * @param rAccount contains an account, if applicable. * @param bAllowPersistentStoring specifies if the credentials should * be stored in the passowrd container persistently * @param bAllowUseSystemCredntials specifies if requesting client is @@ -160,43 +140,6 @@ public: const rtl::OUString & rAccount = rtl::OUString() ); - /** - * Constructor. - * - * @param rURL contains a URL for which authentication is requested. - * @param rServerName contains a server name. - * @param eRealmType specifies whether a realm is applicable and - modifiable. - * @param rRealm contains a realm, if applicable. - * @param eUserNameType specifies whether a username is applicable and - modifiable. - * @param rUserName contains a username, if available (for instance from - * a previous try). - * @param ePasswordType specifies whether a password is applicable and - modifiable. - * @param rPassword contains a password, if available (for instance from - * a previous try). - * @param eAccountType specifies whether an account is applicable and - modifiable. - * @param rAccount contains an account, if applicable. - * @param bAllowPersistentStoring specifies if the credentials should - * be stored in the passowrd container persistently - * @param bAllowUseSystemCredntials specifies if requesting client is - * able to obtain and use system credentials for authentication - */ - SimpleAuthenticationRequest( const rtl::OUString & rURL, - const rtl::OUString & rServerName, - EntityType eRealmType, - const rtl::OUString & rRealm, - EntityType eUserNameType, - const rtl::OUString & rUserName, - EntityType ePasswordType, - const rtl::OUString & rPassword, - EntityType eAccountType, - const rtl::OUString & rAccount, - sal_Bool bAllowPersistentStoring, - sal_Bool bAllowUseSystemCredentials ); - /** * This method returns the supplier for the missing authentication data, * that, for instance can be used to query the password supplied by the |