[Libreoffice-commits] .: ucbhelper/inc ucbhelper/Library_ucbhelper.mk ucbhelper/Package_inc.mk ucbhelper/source unusedcode.easy
Matus Kukan
mkukan at kemper.freedesktop.org
Thu Aug 25 16:30:45 PDT 2011
ucbhelper/Library_ucbhelper.mk | 2
ucbhelper/Package_inc.mk | 2
ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx | 100 -----
ucbhelper/inc/ucbhelper/content.hxx | 203 ----------
ucbhelper/inc/ucbhelper/contentbroker.hxx | 17
ucbhelper/inc/ucbhelper/contenthelper.hxx | 14
ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx | 217 ----------
ucbhelper/inc/ucbhelper/propertyvalueset.hxx | 152 -------
ucbhelper/inc/ucbhelper/resultsethelper.hxx | 9
ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx | 57 --
ucbhelper/source/client/content.cxx | 278 --------------
ucbhelper/source/client/contentbroker.cxx | 28 -
ucbhelper/source/provider/commandenvironmentproxy.cxx | 168 --------
ucbhelper/source/provider/contenthelper.cxx | 20 -
ucbhelper/source/provider/handleinteractionrequest.cxx | 164 --------
ucbhelper/source/provider/propertyvalueset.cxx | 130 ------
ucbhelper/source/provider/resultsethelper.cxx | 10
ucbhelper/source/provider/simpleauthenticationrequest.cxx | 81 ----
unusedcode.easy | 37 -
19 files changed, 1689 deletions(-)
New commits:
commit 8c4e7806b2e8486108a817ded456433fc77f60a5
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Aug 25 22:00:10 2011 +0200
unusedcode: ucbhelper:: cleaning
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
index c048c46..ce1798d 100644
--- a/ucbhelper/Library_ucbhelper.mk
+++ b/ucbhelper/Library_ucbhelper.mk
@@ -68,11 +68,9 @@ $(eval $(call gb_Library_add_exception_objects,ucbhelper,\
ucbhelper/source/provider/resultsethelper \
ucbhelper/source/provider/simplenameclashresolverequest \
ucbhelper/source/provider/simpleinteractionrequest \
- ucbhelper/source/provider/handleinteractionrequest \
ucbhelper/source/provider/registerucb \
ucbhelper/source/provider/contentinfo \
ucbhelper/source/provider/interactionrequest \
- ucbhelper/source/provider/commandenvironmentproxy \
ucbhelper/source/provider/providerhelper \
ucbhelper/source/client/proxydecider \
ucbhelper/source/client/content \
diff --git a/ucbhelper/Package_inc.mk b/ucbhelper/Package_inc.mk
index 0ef822e..501cc29 100644
--- a/ucbhelper/Package_inc.mk
+++ b/ucbhelper/Package_inc.mk
@@ -47,12 +47,10 @@ $(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simplecertificatev
$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/proxydecider.hxx,ucbhelper/proxydecider.hxx))
$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/fileidentifierconverter.hxx,ucbhelper/fileidentifierconverter.hxx))
$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/cancelcommandexecution.hxx,ucbhelper/cancelcommandexecution.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/commandenvironmentproxy.hxx,ucbhelper/commandenvironmentproxy.hxx))
$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/registerucb.hxx,ucbhelper/registerucb.hxx))
$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultsethelper.hxx,ucbhelper/resultsethelper.hxx))
$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/configurationkeys.hxx,ucbhelper/configurationkeys.hxx))
$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentidentifier.hxx,ucbhelper/contentidentifier.hxx))
-$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/handleinteractionrequest.hxx,ucbhelper/handleinteractionrequest.hxx))
$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/providerhelper.hxx,ucbhelper/providerhelper.hxx))
$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simplenameclashresolverequest.hxx,ucbhelper/simplenameclashresolverequest.hxx))
$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/macros.hxx,ucbhelper/macros.hxx))
diff --git a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx
deleted file mode 100644
index 90c05d1..0000000
--- 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 f290134..54318c4 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 f21597c..fe883ef 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 fdeb3a3..bdfb425 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 ab0d445..0000000
--- 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 50aa9b9..b9965b4 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 e670a76..89dffe9 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 026cd7f..5303cb4 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
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index ff2a8ef..19fd94e 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -205,7 +205,6 @@ public:
Reference< XMultiServiceFactory > getServiceManager() { return m_xSMgr; }
Any executeCommand( const Command& rCommand );
- void abortCommand();
inline const Reference< XCommandEnvironment >& getEnvironment() const;
inline void setEnvironment(
@@ -405,18 +404,6 @@ Content::Content( const rtl::OUString& rURL,
}
//=========================================================================
-Content::Content( const Reference< XContentIdentifier >& rId,
- const Reference< XCommandEnvironment >& rEnv )
- throw ( ContentCreationException, RuntimeException )
-{
- ContentBroker* pBroker = getContentBroker( true );
-
- Reference< XContent > xContent = getContent( *pBroker, rId, true );
-
- m_xImpl = new Content_Impl( pBroker->getServiceManager(), xContent, rEnv );
-}
-
-//=========================================================================
Content::Content( const Reference< XContent >& rContent,
const Reference< XCommandEnvironment >& rEnv )
throw ( ContentCreationException, RuntimeException )
@@ -458,42 +445,6 @@ sal_Bool Content::create( const rtl::OUString& rURL,
}
//=========================================================================
-// static
-sal_Bool Content::create( const Reference< XContentIdentifier >& rId,
- const Reference< XCommandEnvironment >& rEnv,
- Content& rContent )
-{
- ContentBroker* pBroker = getContentBroker( false );
- if ( !pBroker )
- return sal_False;
-
- Reference< XContent > xContent = getContent( *pBroker, rId, false );
- if ( !xContent.is() )
- return sal_False;
-
- rContent.m_xImpl
- = new Content_Impl( pBroker->getServiceManager(), xContent, rEnv );
-
- return sal_True;
-}
-
-//=========================================================================
-// static
-sal_Bool Content::create( const Reference< XContent >& xContent,
- const Reference< XCommandEnvironment >& rEnv,
- Content& rContent )
-{
- ContentBroker* pBroker = getContentBroker( false );
- if ( !pBroker )
- return sal_False;
-
- rContent.m_xImpl
- = new Content_Impl( pBroker->getServiceManager(), xContent, rEnv );
-
- return sal_True;
-}
-
-//=========================================================================
Content::~Content()
{
}
@@ -574,17 +525,6 @@ Any Content::getPropertyValue( const rtl::OUString& rPropertyName )
}
//=========================================================================
-Any Content::getPropertyValue( sal_Int32 nPropertyHandle )
- throw( CommandAbortedException, RuntimeException, Exception )
-{
- Sequence< sal_Int32 > aHandles( 1 );
- aHandles.getArray()[ 0 ] = nPropertyHandle;
-
- Sequence< Any > aRet = getPropertyValues( aHandles );
- return aRet.getConstArray()[ 0 ];
-}
-
-//=========================================================================
Any Content::setPropertyValue( const rtl::OUString& rName,
const Any& rValue )
throw( CommandAbortedException, RuntimeException, Exception )
@@ -600,21 +540,6 @@ Any Content::setPropertyValue( const rtl::OUString& rName,
}
//=========================================================================
-Any Content::setPropertyValue( const sal_Int32 nPropertyHandle,
- const Any& rValue )
- throw( CommandAbortedException, RuntimeException, Exception )
-{
- Sequence< sal_Int32 > aHandles( 1 );
- aHandles.getArray()[ 0 ] = nPropertyHandle;
-
- Sequence< Any > aValues( 1 );
- aValues.getArray()[ 0 ] = rValue;
-
- Sequence< Any > aErrors = setPropertyValues( aHandles, aValues );
- return aErrors.getConstArray()[ 0 ];
-}
-
-//=========================================================================
Sequence< Any > Content::getPropertyValues(
const Sequence< rtl::OUString >& rPropertyNames )
throw( CommandAbortedException, RuntimeException, Exception )
@@ -832,25 +757,6 @@ Any Content::executeCommand( const rtl::OUString& rCommandName,
}
//=========================================================================
-Any Content::executeCommand( sal_Int32 nCommandHandle,
- const Any& rCommandArgument )
- throw( CommandAbortedException, RuntimeException, Exception )
-{
- Command aCommand;
- aCommand.Name = rtl::OUString(); // n/a
- aCommand.Handle = nCommandHandle;
- aCommand.Argument = rCommandArgument;
-
- return m_xImpl->executeCommand( aCommand );
-}
-
-//=========================================================================
-void Content::abortCommand()
-{
- m_xImpl->abortCommand();
-}
-
-//=========================================================================
Any Content::createCursorAny( const Sequence< rtl::OUString >& rPropertyNames,
ResultSetInclude eMode )
throw( CommandAbortedException, RuntimeException, Exception )
@@ -947,36 +853,6 @@ Reference< XResultSet > Content::createCursor(
}
//=========================================================================
-Reference< XResultSet > Content::createCursor(
- const Sequence< sal_Int32 >& rPropertyHandles,
- ResultSetInclude eMode )
- throw( CommandAbortedException, RuntimeException, Exception )
-{
- Any aCursorAny = createCursorAny( rPropertyHandles, eMode );
-
- Reference< XDynamicResultSet > xDynSet;
- Reference< XResultSet > aResult;
-
- aCursorAny >>= xDynSet;
- if ( xDynSet.is() )
- aResult = xDynSet->getStaticResultSet();
-
- OSL_ENSURE( aResult.is(), "Content::createCursor - no cursor!" );
-
- if ( !aResult.is() )
- {
- // Former, the open command directly returned a XResultSet.
- aCursorAny >>= aResult;
-
- OSL_ENSURE( !aResult.is(),
- "Content::createCursor - open-Command must "
- "return a Reference< XDynnamicResultSet >!" );
- }
-
- return aResult;
-}
-
-//=========================================================================
Reference< XDynamicResultSet > Content::createDynamicCursor(
const Sequence< rtl::OUString >& rPropertyNames,
ResultSetInclude eMode )
@@ -1005,76 +881,6 @@ Reference< XDynamicResultSet > Content::createDynamicCursor(
}
//=========================================================================
-Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
- const Sequence< rtl::OUString >& rPropertyNames,
- const Sequence< NumberedSortingInfo >& rSortInfo,
- Reference< XAnyCompareFactory > rAnyCompareFactory,
- ResultSetInclude eMode )
- throw( CommandAbortedException, RuntimeException, Exception )
-{
- Reference< XDynamicResultSet > aResult;
- Reference< XDynamicResultSet > aOrigCursor = createDynamicCursor( rPropertyNames, eMode );
-
- if( aOrigCursor.is() )
- {
- Reference< XMultiServiceFactory > aServiceManager = m_xImpl->getServiceManager();
-
- if( aServiceManager.is() )
- {
- Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))),
- UNO_QUERY );
-
- aResult = aSortFactory->createSortedDynamicResultSet( aOrigCursor,
- rSortInfo,
- rAnyCompareFactory );
- }
-
- OSL_ENSURE( aResult.is(), "Content::createSortedDynamicCursor - no sorted cursor!\n" );
-
- if( !aResult.is() )
- aResult = aOrigCursor;
- }
-
- return aResult;
-}
-
-//=========================================================================
-Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
- const Sequence< sal_Int32 >& rPropertyHandles,
- const Sequence< NumberedSortingInfo >& rSortInfo,
- Reference< XAnyCompareFactory > rAnyCompareFactory,
- ResultSetInclude eMode )
- throw( CommandAbortedException, RuntimeException, Exception )
-{
- Reference< XDynamicResultSet > aResult;
- Reference< XDynamicResultSet > aOrigCursor = createDynamicCursor( rPropertyHandles, eMode );
-
- if( aOrigCursor.is() )
- {
- Reference< XMultiServiceFactory > aServiceManager = m_xImpl->getServiceManager();
-
- if( aServiceManager.is() )
- {
- Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))),
- UNO_QUERY );
-
- aResult = aSortFactory->createSortedDynamicResultSet( aOrigCursor,
- rSortInfo,
- rAnyCompareFactory );
- }
-
- OSL_ENSURE( aResult.is(), "Content::createSortedDynamicCursor - no sorted cursor!\n" );
-
- if( !aResult.is() )
- aResult = aOrigCursor;
- }
-
- return aResult;
-}
-
-//=========================================================================
Reference< XResultSet > Content::createSortedCursor(
const Sequence< rtl::OUString >& rPropertyNames,
const Sequence< NumberedSortingInfo >& rSortInfo,
@@ -1129,60 +935,6 @@ Reference< XResultSet > Content::createSortedCursor(
}
//=========================================================================
-Reference< XResultSet > Content::createSortedCursor(
- const Sequence< sal_Int32 >& rPropertyHandles,
- const Sequence< NumberedSortingInfo >& rSortInfo,
- Reference< XAnyCompareFactory > rAnyCompareFactory,
- ResultSetInclude eMode )
- throw( CommandAbortedException, RuntimeException, Exception )
-{
- Reference< XResultSet > aResult;
- Reference< XDynamicResultSet > aDynSet;
-
- Any aCursorAny = createCursorAny( rPropertyHandles, eMode );
-
- aCursorAny >>= aDynSet;
-
- if( aDynSet.is() )
- {
- Reference< XDynamicResultSet > aDynResult;
- Reference< XMultiServiceFactory > aServiceManager = m_xImpl->getServiceManager();
-
- if( aServiceManager.is() )
- {
- Reference< XSortedDynamicResultSetFactory > aSortFactory( aServiceManager->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory"))),
- UNO_QUERY );
-
- aDynResult = aSortFactory->createSortedDynamicResultSet( aDynSet,
- rSortInfo,
- rAnyCompareFactory );
- }
-
- OSL_ENSURE( aDynResult.is(), "Content::createSortedCursor - no sorted cursor!\n" );
-
- if( aDynResult.is() )
- aResult = aDynResult->getStaticResultSet();
- else
- aResult = aDynSet->getStaticResultSet();
- }
-
- OSL_ENSURE( aResult.is(), "Content::createSortedCursor - no cursor!" );
-
- if ( !aResult.is() )
- {
- // Former, the open command directly returned a XResultSet.
- aCursorAny >>= aResult;
-
- OSL_ENSURE( !aResult.is(),
- "Content::createCursor - open-Command must "
- "return a Reference< XDynnamicResultSet >!" );
- }
-
- return aResult;
-}
-
-//=========================================================================
Reference< XInputStream > Content::openStream()
throw( CommandAbortedException, RuntimeException, Exception )
{
@@ -1384,21 +1136,6 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
//=========================================================================
sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
- const Sequence< sal_Int32 >&
- nPropertyHandles,
- const Sequence< Any >& rPropertyValues,
- Content& rNewContent )
- throw( CommandAbortedException, RuntimeException, Exception )
-{
- return insertNewContent( rContentType,
- nPropertyHandles,
- rPropertyValues,
- new EmptyInputStream,
- rNewContent );
-}
-
-//=========================================================================
-sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
const Sequence< rtl::OUString >&
rPropertyNames,
const Sequence< Any >& rPropertyValues,
@@ -1871,21 +1608,6 @@ Any Content_Impl::executeCommand( const Command& rCommand )
}
//=========================================================================
-void Content_Impl::abortCommand()
-{
- sal_Int32 nCommandId;
- Reference< XCommandProcessor > xCommandProcessor;
- {
- osl::MutexGuard aGuard( m_aMutex );
- nCommandId = m_nCommandId;
- xCommandProcessor = m_xCommandProcessor;
- }
-
- if ( ( nCommandId != 0 ) && xCommandProcessor.is() )
- xCommandProcessor->abort( nCommandId );
-}
-
-//=========================================================================
inline const Reference< XCommandEnvironment >&
Content_Impl::getEnvironment() const
{
diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx
index 8eb455c..36669b0 100644
--- a/ucbhelper/source/client/contentbroker.cxx
+++ b/ucbhelper/source/client/contentbroker.cxx
@@ -206,34 +206,6 @@ sal_Bool ContentBroker::initialize(
//=========================================================================
// static
-sal_Bool ContentBroker::initialize(
- const Reference< XMultiServiceFactory >& rSMgr,
- const ContentProviderDataList & rData )
-{
- OSL_ENSURE( !m_pTheBroker,
- "ContentBroker::initialize - already initialized!" );
-
- if ( !m_pTheBroker )
- {
- osl::Guard< osl::Mutex > aGuard( getGlobalContentBrokerMutex() );
-
- if ( !m_pTheBroker )
- {
- ContentBroker * pBroker = new ContentBroker( rSMgr, rData );
-
- // Force init to be able to detect UCB init trouble immediately.
- if ( pBroker->m_pImpl->initialize() )
- m_pTheBroker = pBroker;
- else
- delete pBroker;
- }
- }
-
- return m_pTheBroker != 0;
-}
-
-//=========================================================================
-// static
void ContentBroker::deinitialize()
{
osl::MutexGuard aGuard( getGlobalContentBrokerMutex() );
diff --git a/ucbhelper/source/provider/commandenvironmentproxy.cxx b/ucbhelper/source/provider/commandenvironmentproxy.cxx
deleted file mode 100644
index 7e3f100..0000000
--- a/ucbhelper/source/provider/commandenvironmentproxy.cxx
+++ /dev/null
@@ -1,168 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_ucbhelper.hxx"
-
-/**************************************************************************
- TODO
- **************************************************************************
-
- *************************************************************************/
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
-#include <com/sun/star/ucb/XContentProvider.hpp>
-#include <com/sun/star/ucb/XContentProviderManager.hpp>
-#include <osl/mutex.hxx>
-#include <ucbhelper/commandenvironmentproxy.hxx>
-
-using namespace com::sun::star::lang;
-using namespace com::sun::star::task;
-using namespace com::sun::star::ucb;
-using namespace com::sun::star::uno;
-
-namespace ucbhelper
-{
-
-//=========================================================================
-//=========================================================================
-//
-// struct CommandEnvironmentProxy_Impl.
-//
-//=========================================================================
-//=========================================================================
-
-struct CommandEnvironmentProxy_Impl
-{
- osl::Mutex m_aMutex;
- Reference< XCommandEnvironment > m_xEnv;
- Reference< XInteractionHandler > m_xInteractionHandler;
- Reference< XProgressHandler > m_xProgressHandler;
- sal_Bool m_bGotInteractionHandler;
- sal_Bool m_bGotProgressHandler;
-
- CommandEnvironmentProxy_Impl(
- const Reference< XCommandEnvironment >& rxEnv )
- : m_xEnv( rxEnv ), m_bGotInteractionHandler( sal_False ),
- m_bGotProgressHandler( sal_False ) {}
-};
-
-//=========================================================================
-//=========================================================================
-//
-// CommandEnvironmentProxy Implementation.
-//
-//=========================================================================
-//=========================================================================
-
-CommandEnvironmentProxy::CommandEnvironmentProxy(
- const Reference< XCommandEnvironment >& rxEnv )
-{
- m_pImpl = new CommandEnvironmentProxy_Impl( rxEnv );
-}
-
-//=========================================================================
-// virtual
-CommandEnvironmentProxy::~CommandEnvironmentProxy()
-{
- delete m_pImpl;
-}
-
-//=========================================================================
-//
-// XInterface methods
-//
-//=========================================================================
-
-XINTERFACE_IMPL_2( CommandEnvironmentProxy,
- XTypeProvider,
- XCommandEnvironment );
-
-//=========================================================================
-//
-// XTypeProvider methods
-//
-//=========================================================================
-
-XTYPEPROVIDER_IMPL_2( CommandEnvironmentProxy,
- XTypeProvider,
- XCommandEnvironment );
-
-//=========================================================================
-//
-// XCommandEnvironemnt methods.
-//
-//=========================================================================
-
-// virtual
-Reference< XInteractionHandler > SAL_CALL
-CommandEnvironmentProxy::getInteractionHandler()
- throw ( RuntimeException )
-{
- if ( m_pImpl->m_xEnv.is() )
- {
- if ( !m_pImpl->m_bGotInteractionHandler )
- {
- osl::MutexGuard aGuard( m_pImpl->m_aMutex );
- if ( !m_pImpl->m_bGotInteractionHandler )
- {
- m_pImpl->m_xInteractionHandler
- = m_pImpl->m_xEnv->getInteractionHandler();
- m_pImpl->m_bGotInteractionHandler = sal_True;
- }
- }
- }
- return m_pImpl->m_xInteractionHandler;
-}
-
-//=========================================================================
-// virtual
-Reference< XProgressHandler > SAL_CALL
-CommandEnvironmentProxy::getProgressHandler()
- throw ( RuntimeException )
-{
- if ( m_pImpl->m_xEnv.is() )
- {
- if ( !m_pImpl->m_bGotProgressHandler )
- {
- osl::MutexGuard aGuard( m_pImpl->m_aMutex );
- if ( !m_pImpl->m_bGotProgressHandler )
- {
- m_pImpl->m_xProgressHandler
- = m_pImpl->m_xEnv->getProgressHandler();
- m_pImpl->m_bGotProgressHandler = sal_True;
- }
- }
- }
- return m_pImpl->m_xProgressHandler;
-}
-
-} /* namespace ucbhelper */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index 6a50737..ecc7ad2 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -954,26 +954,6 @@ void ContentImplHelper::notifyPropertySetInfoChange(
}
//=========================================================================
-void ContentImplHelper::notifyCommandInfoChange(
- const com::sun::star::ucb::CommandInfoChangeEvent& evt ) const
-{
- if ( !m_pImpl->m_pCommandChangeListeners )
- return;
-
- // Notify event listeners.
- cppu::OInterfaceIteratorHelper aIter(
- *m_pImpl->m_pCommandChangeListeners );
- while ( aIter.hasMoreElements() )
- {
- // Propagate event.
- uno::Reference< com::sun::star::ucb::XCommandInfoChangeListener >
- xListener( aIter.next(), uno::UNO_QUERY );
- if ( xListener.is() )
- xListener->commandInfoChange( evt );
- }
-}
-
-//=========================================================================
void ContentImplHelper::notifyContentEvent(
const com::sun::star::ucb::ContentEvent& evt ) const
{
diff --git a/ucbhelper/source/provider/handleinteractionrequest.cxx b/ucbhelper/source/provider/handleinteractionrequest.cxx
deleted file mode 100644
index 84a010f..0000000
--- a/ucbhelper/source/provider/handleinteractionrequest.cxx
+++ /dev/null
@@ -1,164 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_ucbhelper.hxx"
-#include "ucbhelper/handleinteractionrequest.hxx"
-#include "com/sun/star/task/XInteractionAbort.hpp"
-#include "com/sun/star/task/XInteractionHandler.hpp"
-#include "com/sun/star/task/XInteractionRetry.hpp"
-#include "com/sun/star/ucb/CommandFailedException.hpp"
-#include "com/sun/star/ucb/XCommandEnvironment.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "cppuhelper/exc_hlp.hxx"
-#include "osl/diagnose.h"
-#include "rtl/ustring.hxx"
-#include "ucbhelper/interactionrequest.hxx"
-#include "ucbhelper/simpleauthenticationrequest.hxx"
-#include "ucbhelper/simpleinteractionrequest.hxx"
-#include "ucbhelper/simplecertificatevalidationrequest.hxx"
-#ifndef INCLUDED_UTILITY
-#include <utility>
-#define INCLUDED_UTILITY
-#endif
-
-using namespace com::sun::star;
-
-namespace {
-
-void
-handle(uno::Reference< task::XInteractionRequest > const & rRequest,
- uno::Reference< ucb::XCommandEnvironment > const & rEnvironment)
- SAL_THROW((uno::Exception))
-{
- OSL_ENSURE(rRequest.is(), "specification violation");
- uno::Reference< task::XInteractionHandler > xHandler;
- if (rEnvironment.is())
- xHandler = rEnvironment->getInteractionHandler();
- if (!xHandler.is())
- cppu::throwException(rRequest->getRequest());
- xHandler->handle(rRequest.get());
-}
-
-}
-
-namespace ucbhelper {
-
-sal_Int32
-handleInteractionRequest(
- rtl::Reference< ucbhelper::SimpleInteractionRequest > const & rRequest,
- uno::Reference< ucb::XCommandEnvironment > const & rEnvironment,
- bool bThrowOnAbort)
- SAL_THROW((uno::Exception))
-{
- handle(rRequest.get(), rEnvironment);
- sal_Int32 nResponse = rRequest->getResponse();
- switch (nResponse)
- {
- case ucbhelper::CONTINUATION_UNKNOWN:
- cppu::throwException(rRequest->getRequest());
- break;
-
- case ucbhelper::CONTINUATION_ABORT:
- if (bThrowOnAbort)
- throw ucb::CommandFailedException(
- rtl::OUString(), 0, rRequest->getRequest());
- break;
- }
- return nResponse;
-}
-
-std::pair< sal_Int32,
- rtl::Reference< ucbhelper::InteractionSupplyAuthentication > >
-handleInteractionRequest(
- rtl::Reference< ucbhelper::SimpleAuthenticationRequest > const & rRequest,
- uno::Reference< ucb::XCommandEnvironment > const & rEnvironment,
- bool bThrowOnAbort)
- SAL_THROW((uno::Exception))
-{
- handle(rRequest.get(), rEnvironment);
- rtl::Reference< ucbhelper::InteractionContinuation >
- xContinuation(rRequest->getSelection());
- if (uno::Reference< task::XInteractionAbort >(
- xContinuation.get(), uno::UNO_QUERY).
- is())
- if (bThrowOnAbort)
- throw ucb::CommandFailedException(
- rtl::OUString(), 0, rRequest->getRequest());
- else
- return std::make_pair(
- ucbhelper::CONTINUATION_ABORT,
- rtl::Reference<
- ucbhelper::InteractionSupplyAuthentication >());
- else if (uno::Reference< task::XInteractionRetry >(
- xContinuation.get(), uno::UNO_QUERY).
- is())
- return std::make_pair(
- ucbhelper::CONTINUATION_ABORT,
- rtl::Reference<
- ucbhelper::InteractionSupplyAuthentication >());
- else
- return std::make_pair(
- ucbhelper::CONTINUATION_UNKNOWN,
- rtl::Reference<
- ucbhelper::InteractionSupplyAuthentication >(
- rRequest->getAuthenticationSupplier()));
-}
-
-}
-
-namespace ucbhelper {
-
-sal_Int32
-handleInteractionRequest(
- rtl::Reference< ucbhelper::SimpleCertificateValidationRequest > const & rRequest,
- uno::Reference< ucb::XCommandEnvironment > const & rEnvironment,
- bool bThrowOnAbort)
- SAL_THROW((uno::Exception))
-{
- handle(rRequest.get(), rEnvironment);
- sal_Int32 nResponse = rRequest->getResponse();
- switch (nResponse)
- {
- case ucbhelper::CONTINUATION_UNKNOWN:
- cppu::throwException(rRequest->getRequest());
- break;
-
- case ucbhelper::CONTINUATION_ABORT:
- if (bThrowOnAbort)
- throw ucb::CommandFailedException(
- rtl::OUString(), 0, rRequest->getRequest());
- break;
- }
- return nResponse;
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 361a8fd..799a757 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -278,30 +278,6 @@ PropertyValueSet::PropertyValueSet(
}
//=========================================================================
-PropertyValueSet::PropertyValueSet(
- const Reference< XMultiServiceFactory >& rxSMgr,
- const Sequence< com::sun::star::beans::PropertyValue >& rValues )
-: PROPERTYVALUESET_INIT()
-{
- sal_Int32 nCount = rValues.getLength();
- if ( nCount )
- {
- const com::sun::star::beans::PropertyValue* pValues
- = rValues.getConstArray();
-
- for ( sal_Int32 n = 0; n < nCount; ++n )
- {
- const com::sun::star::beans::PropertyValue& rValue = pValues[ n ];
- appendObject( Property( rValue.Name,
- rValue.Handle,
- rValue.Value.getValueType(),
- 0 ),
- rValue.Value );
- }
- }
-}
-
-//=========================================================================
// virtual
PropertyValueSet::~PropertyValueSet()
{
@@ -677,12 +653,6 @@ const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter()
}
//=========================================================================
-sal_Int32 PropertyValueSet::getLength() const
-{
- return m_pValues->size();
-}
-
-//=========================================================================
void PropertyValueSet::appendString( const ::rtl::OUString& rPropName,
const OUString& rValue )
{
@@ -697,27 +667,6 @@ void PropertyValueSet::appendBoolean( const ::rtl::OUString& rPropName,
}
//=========================================================================
-void PropertyValueSet::appendByte( const ::rtl::OUString& rPropName,
- sal_Int8 nValue )
-{
- SETVALUE_IMPL( rPropName, BYTE_VALUE_SET, nByte, nValue );
-}
-
-//=========================================================================
-void PropertyValueSet::appendShort( const ::rtl::OUString& rPropName,
- sal_Int16 nValue )
-{
- SETVALUE_IMPL( rPropName, SHORT_VALUE_SET, nShort, nValue );
-}
-
-//=========================================================================
-void PropertyValueSet::appendInt( const ::rtl::OUString& rPropName,
- sal_Int32 nValue )
-{
- SETVALUE_IMPL( rPropName, INT_VALUE_SET, nInt, nValue );
-}
-
-//=========================================================================
void PropertyValueSet::appendLong( const ::rtl::OUString& rPropName,
sal_Int64 nValue )
{
@@ -725,41 +674,6 @@ void PropertyValueSet::appendLong( const ::rtl::OUString& rPropName,
}
//=========================================================================
-void PropertyValueSet::appendFloat( const ::rtl::OUString& rPropName,
- float nValue )
-{
- SETVALUE_IMPL( rPropName, FLOAT_VALUE_SET, nFloat, nValue );
-}
-
-//=========================================================================
-void PropertyValueSet::appendDouble( const ::rtl::OUString& rPropName,
- double nValue )
-{
- SETVALUE_IMPL( rPropName, DOUBLE_VALUE_SET, nDouble, nValue );
-}
-
-//=========================================================================
-void PropertyValueSet::appendBytes( const ::rtl::OUString& rPropName,
- const Sequence< sal_Int8 >& rValue )
-{
- SETVALUE_IMPL( rPropName, BYTES_VALUE_SET, aBytes, rValue );
-}
-
-//=========================================================================
-void PropertyValueSet::appendDate( const ::rtl::OUString& rPropName,
- const Date& rValue )
-{
- SETVALUE_IMPL( rPropName, DATE_VALUE_SET, aDate, rValue );
-}
-
-//=========================================================================
-void PropertyValueSet::appendTime( const ::rtl::OUString& rPropName,
- const Time& rValue )
-{
- SETVALUE_IMPL( rPropName, TIME_VALUE_SET, aTime, rValue );
-}
-
-//=========================================================================
void PropertyValueSet::appendTimestamp( const ::rtl::OUString& rPropName,
const DateTime& rValue )
{
@@ -767,22 +681,6 @@ void PropertyValueSet::appendTimestamp( const ::rtl::OUString& rPropName,
}
//=========================================================================
-void PropertyValueSet::appendBinaryStream(
- const ::rtl::OUString& rPropName,
- const Reference< XInputStream >& rValue )
-{
- SETVALUE_IMPL( rPropName, BINARYSTREAM_VALUE_SET, xBinaryStream, rValue );
-}
-
-//=========================================================================
-void PropertyValueSet::appendCharacterStream(
- const ::rtl::OUString& rPropName,
- const Reference< XInputStream >& rValue )
-{
- SETVALUE_IMPL( rPropName, CHARACTERSTREAM_VALUE_SET, xCharacterStream, rValue );
-}
-
-//=========================================================================
void PropertyValueSet::appendObject( const ::rtl::OUString& rPropName,
const Any& rValue )
{
@@ -790,34 +688,6 @@ void PropertyValueSet::appendObject( const ::rtl::OUString& rPropName,
}
//=========================================================================
-void PropertyValueSet::appendRef( const ::rtl::OUString& rPropName,
- const Reference< XRef >& rValue )
-{
- SETVALUE_IMPL( rPropName, REF_VALUE_SET, xRef, rValue );
-}
-
-//=========================================================================
-void PropertyValueSet::appendBlob( const ::rtl::OUString& rPropName,
- const Reference< XBlob >& rValue )
-{
- SETVALUE_IMPL( rPropName, BLOB_VALUE_SET, xBlob, rValue );
-}
-
-//=========================================================================
-void PropertyValueSet::appendClob( const ::rtl::OUString& rPropName,
- const Reference< XClob >& rValue )
-{
- SETVALUE_IMPL( rPropName, CLOB_VALUE_SET, xClob, rValue );
-}
-
-//=========================================================================
-void PropertyValueSet::appendArray( const ::rtl::OUString& rPropName,
- const Reference< XArray >& rValue )
-{
- SETVALUE_IMPL( rPropName, ARRAY_VALUE_SET, xArray, rValue );
-}
-
-//=========================================================================
void PropertyValueSet::appendVoid( const ::rtl::OUString& rPropName )
{
SETVALUE_IMPL( rPropName, NO_VALUE_SET, aObject, Any() );
diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index ac6798e..e600977 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -60,16 +60,6 @@ namespace ucbhelper {
//=========================================================================
ResultSetImplHelper::ResultSetImplHelper(
- const uno::Reference< lang::XMultiServiceFactory >& rxSMgr )
-: m_pDisposeEventListeners( 0 ),
- m_bStatic( sal_False ),
- m_bInitDone( sal_False ),
- m_xSMgr( rxSMgr )
-{
-}
-
-//=========================================================================
-ResultSetImplHelper::ResultSetImplHelper(
const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
const com::sun::star::ucb::OpenCommandArgument2& rCommand )
: m_pDisposeEventListeners( 0 ),
diff --git a/ucbhelper/source/provider/simpleauthenticationrequest.cxx b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
index c4ac91c..86f1a53 100644
--- a/ucbhelper/source/provider/simpleauthenticationrequest.cxx
+++ b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
@@ -42,42 +42,6 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
const rtl::OUString & rRealm,
const rtl::OUString & rUserName,
const rtl::OUString & rPassword,
- const rtl::OUString & rAccount )
-{
- // Fill request...
- ucb::URLAuthenticationRequest aRequest;
-// aRequest.Message = // OUString
-// aRequest.Context = // XInterface
- aRequest.Classification = task::InteractionClassification_ERROR;
- aRequest.ServerName = rServerName;
-// aRequest.Diagnostic = // OUString
- aRequest.HasRealm = ( rRealm.getLength() > 0 );
- if ( aRequest.HasRealm )
- aRequest.Realm = rRealm;
- aRequest.HasUserName = sal_True;
- aRequest.UserName = rUserName;
- aRequest.HasPassword = sal_True;
- aRequest.Password = rPassword;
- aRequest.HasAccount = ( rAccount.getLength() > 0 );
- if ( aRequest.HasAccount )
- aRequest.Account = rAccount;
- aRequest.URL = rURL;
-
- initialize(aRequest,
- sal_False,
- sal_True,
- sal_True,
- aRequest.HasAccount,
- sal_True,
- sal_False );
-}
-//=========================================================================
-SimpleAuthenticationRequest::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,
sal_Bool bAllowPersistentStoring,
sal_Bool bAllowUseSystemCredentials )
@@ -155,51 +119,6 @@ SimpleAuthenticationRequest::SimpleAuthenticationRequest(
}
//=========================================================================
-SimpleAuthenticationRequest::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 )
-{
- // Fill request...
- ucb::URLAuthenticationRequest aRequest;
-// aRequest.Message = // OUString
-// aRequest.Context = // XInterface
- aRequest.Classification = task::InteractionClassification_ERROR;
- aRequest.ServerName = rServerName;
-// aRequest.Diagnostic = // OUString
- aRequest.HasRealm = eRealmType != ENTITY_NA;
- if ( aRequest.HasRealm )
- aRequest.Realm = rRealm;
- aRequest.HasUserName = eUserNameType != ENTITY_NA;
- if ( aRequest.HasUserName )
- aRequest.UserName = rUserName;
- aRequest.HasPassword = ePasswordType != ENTITY_NA;
- if ( aRequest.HasPassword )
- aRequest.Password = rPassword;
- aRequest.HasAccount = eAccountType != ENTITY_NA;
- if ( aRequest.HasAccount )
- aRequest.Account = rAccount;
- aRequest.URL = rURL;
-
- initialize(aRequest,
- eRealmType == ENTITY_MODIFY,
- eUserNameType == ENTITY_MODIFY,
- ePasswordType == ENTITY_MODIFY,
- eAccountType == ENTITY_MODIFY,
- bAllowPersistentStoring,
- bAllowUseSystemCredentials );
-}
-
-//=========================================================================
void SimpleAuthenticationRequest::initialize(
const ucb::URLAuthenticationRequest & rRequest,
sal_Bool bCanSetRealm,
diff --git a/unusedcode.easy b/unusedcode.easy
index 1f12ff3..1bfe896 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -3312,43 +3312,6 @@ test::OfficeConnection::~OfficeConnection()
test::getTestArgument(rtl::OUString const&, rtl::OUString*)
toolkit::registerServices(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, char const*, char const*, char const*)
tools::SolarMutex::GetSolarMutex()
-ucbhelper::CommandEnvironmentProxy::CommandEnvironmentProxy(com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&)
-ucbhelper::Content::Content(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&)
-ucbhelper::Content::abortCommand()
-ucbhelper::Content::create(com::sun::star::uno::Reference<com::sun::star::ucb::XContent> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, ucbhelper::Content&)
-ucbhelper::Content::create(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, ucbhelper::Content&)
-ucbhelper::Content::createCursor(com::sun::star::uno::Sequence<int> const&, ucbhelper::ResultSetInclude)
-ucbhelper::Content::createSortedCursor(com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::ucb::NumberedSortingInfo> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XAnyCompareFactory>, ucbhelper::ResultSetInclude)
-ucbhelper::Content::createSortedDynamicCursor(com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::ucb::NumberedSortingInfo> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XAnyCompareFactory>, ucbhelper::ResultSetInclude)
-ucbhelper::Content::createSortedDynamicCursor(com::sun::star::uno::Sequence<rtl::OUString> const&, com::sun::star::uno::Sequence<com::sun::star::ucb::NumberedSortingInfo> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XAnyCompareFactory>, ucbhelper::ResultSetInclude)
-ucbhelper::Content::executeCommand(int, com::sun::star::uno::Any const&)
-ucbhelper::Content::getPropertyValue(int)
-ucbhelper::Content::insertNewContent(rtl::OUString const&, com::sun::star::uno::Sequence<int> const&, com::sun::star::uno::Sequence<com::sun::star::uno::Any> const&, ucbhelper::Content&)
-ucbhelper::Content::setPropertyValue(int, com::sun::star::uno::Any const&)
-ucbhelper::ContentBroker::initialize(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, std::vector<ucbhelper::ContentProviderData, std::allocator<ucbhelper::ContentProviderData> > const&)
-ucbhelper::ContentImplHelper::notifyCommandInfoChange(com::sun::star::ucb::CommandInfoChangeEvent const&) const
-ucbhelper::PropertyValueSet::PropertyValueSet(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
-ucbhelper::PropertyValueSet::appendArray(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::sdbc::XArray> const&)
-ucbhelper::PropertyValueSet::appendBinaryStream(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&)
-ucbhelper::PropertyValueSet::appendBlob(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::sdbc::XBlob> const&)
-ucbhelper::PropertyValueSet::appendByte(rtl::OUString const&, signed char)
-ucbhelper::PropertyValueSet::appendBytes(rtl::OUString const&, com::sun::star::uno::Sequence<signed char> const&)
-ucbhelper::PropertyValueSet::appendCharacterStream(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&)
-ucbhelper::PropertyValueSet::appendClob(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::sdbc::XClob> const&)
-ucbhelper::PropertyValueSet::appendDate(rtl::OUString const&, com::sun::star::util::Date const&)
-ucbhelper::PropertyValueSet::appendDouble(rtl::OUString const&, double)
-ucbhelper::PropertyValueSet::appendFloat(rtl::OUString const&, float)
-ucbhelper::PropertyValueSet::appendInt(rtl::OUString const&, int)
-ucbhelper::PropertyValueSet::appendRef(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::sdbc::XRef> const&)
-ucbhelper::PropertyValueSet::appendShort(rtl::OUString const&, short)
-ucbhelper::PropertyValueSet::appendTime(rtl::OUString const&, com::sun::star::util::Time const&)
-ucbhelper::PropertyValueSet::getLength() const
-ucbhelper::ResultSetImplHelper::ResultSetImplHelper(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
-ucbhelper::SimpleAuthenticationRequest::SimpleAuthenticationRequest(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
-ucbhelper::SimpleAuthenticationRequest::SimpleAuthenticationRequest(rtl::OUString const&, rtl::OUString const&, ucbhelper::SimpleAuthenticationRequest::EntityType, rtl::OUString const&, ucbhelper::SimpleAuthenticationRequest::EntityType, rtl::OUString const&, ucbhelper::SimpleAuthenticationRequest::EntityType, rtl::OUString const&, ucbhelper::SimpleAuthenticationRequest::EntityType, rtl::OUString const&, unsigned char, unsigned char)
-ucbhelper::handleInteractionRequest(rtl::Reference<ucbhelper::SimpleAuthenticationRequest> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, bool)
-ucbhelper::handleInteractionRequest(rtl::Reference<ucbhelper::SimpleCertificateValidationRequest> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, bool)
-ucbhelper::handleInteractionRequest(rtl::Reference<ucbhelper::SimpleInteractionRequest> const&, com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment> const&, bool)
unicode::getCharType(unsigned short)
unicode::isBase(unsigned short)
unicode::isPunctuation(unsigned short)
More information about the Libreoffice-commits
mailing list