diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 17:11:26 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 17:11:26 +0000 |
commit | aae2ed3532ec6ce888b34486330e6ead043ab148 (patch) | |
tree | f860cd1bc0c115a0de97aefce59712ae3bfd64dc /ucb/source/ucp/odma/odma_contentcaps.cxx | |
parent | f35310caee44fbb4b0297066c908f16e57a69f4a (diff) |
INTEGRATION: CWS bgdlremove (1.5.40); FILE MERGED
2007/05/18 14:06:50 kso 1.5.40.2: #i77419# - cleanup of ucbhelper namespaces.
2007/05/11 12:59:02 kso 1.5.40.1: #i76911# - ucbhelper no longer uses VOS
Diffstat (limited to 'ucb/source/ucp/odma/odma_contentcaps.cxx')
-rw-r--r-- | ucb/source/ucp/odma/odma_contentcaps.cxx | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/ucb/source/ucp/odma/odma_contentcaps.cxx b/ucb/source/ucp/odma/odma_contentcaps.cxx index 93df633fe2..c69662db42 100644 --- a/ucb/source/ucp/odma/odma_contentcaps.cxx +++ b/ucb/source/ucp/odma/odma_contentcaps.cxx @@ -4,9 +4,9 @@ * * $RCSfile: odma_contentcaps.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 13:57:29 $ + * last change: $Author: ihi $ $Date: 2007-06-05 18:09:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,7 +73,6 @@ #include "odma_content.hxx" #endif -using namespace com::sun; using namespace com::sun::star; using namespace odma; @@ -92,7 +91,7 @@ using namespace odma; // virtual uno::Sequence< beans::Property > Content::getProperties( - const uno::Reference< star::ucb::XCommandEnvironment > & xEnv ) + const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ ) { // @@@ Add additional properties... @@ -149,13 +148,13 @@ uno::Sequence< beans::Property > Content::getProperties( beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateCreated" ) ), -1, - getCppuType(static_cast< const com::sun::star::util::DateTime * >( 0 ) ), + getCppuType(static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ), -1, - getCppuType(static_cast< const com::sun::star::util::DateTime * >( 0 ) ), + getCppuType(static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), beans::Property( @@ -192,8 +191,8 @@ uno::Sequence< beans::Property > Content::getProperties( //========================================================================= // virtual -uno::Sequence< star::ucb::CommandInfo > Content::getCommands( - const uno::Reference< star::ucb::XCommandEnvironment > & xEnv ) +uno::Sequence< ucb::CommandInfo > Content::getCommands( + const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ ) { // @@@ Add additional commands... @@ -207,28 +206,28 @@ uno::Sequence< star::ucb::CommandInfo > Content::getCommands( #define COMMAND_COUNT 8 - static star::ucb::CommandInfo aCommandInfoTable[] = + static ucb::CommandInfo aCommandInfoTable[] = { /////////////////////////////////////////////////////////////// // Required commands /////////////////////////////////////////////////////////////// - star::ucb::CommandInfo( + ucb::CommandInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getCommandInfo" ) ), -1, getCppuVoidType() ), - star::ucb::CommandInfo( + ucb::CommandInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getPropertySetInfo" ) ), -1, getCppuVoidType() ), - star::ucb::CommandInfo( + ucb::CommandInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" ) ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ), - star::ucb::CommandInfo( + ucb::CommandInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "setPropertyValues" ) ), -1, getCppuType( @@ -238,32 +237,32 @@ uno::Sequence< star::ucb::CommandInfo > Content::getCommands( // Optional standard commands /////////////////////////////////////////////////////////////// /* - star::ucb::CommandInfo( + ucb::CommandInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "delete" ) ), -1, getCppuBooleanType() ), */ - star::ucb::CommandInfo( + ucb::CommandInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ) ), -1, getCppuType( - static_cast< star::ucb::InsertCommandArgument * >( 0 ) ) + static_cast< ucb::InsertCommandArgument * >( 0 ) ) ), - star::ucb::CommandInfo( + ucb::CommandInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ) ), -1, - getCppuType( static_cast< star::ucb::OpenCommandArgument2 * >( 0 ) ) + getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ), - star::ucb::CommandInfo( + ucb::CommandInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "close" ) ), -1, getCppuVoidType( ) ), - star::ucb::CommandInfo( + ucb::CommandInfo( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "transfer" ) ), -1, - getCppuType( static_cast< star::ucb::TransferInfo * >( 0 ) ) + getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ) /////////////////////////////////////////////////////////////// @@ -272,6 +271,6 @@ uno::Sequence< star::ucb::CommandInfo > Content::getCommands( }; return uno::Sequence< - star::ucb::CommandInfo >( aCommandInfoTable, COMMAND_COUNT ); + ucb::CommandInfo >( aCommandInfoTable, COMMAND_COUNT ); } |