diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:36:08 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-22 09:36:08 +0000 |
| commit | 27634249c1d1f73fb5ec7c695282137f0842632d (patch) | |
| tree | 0e6ea7a869898058b4e703b1a65bbbc31728dabb /extensions/inc | |
| parent | 29b28a3aa0f1e5ac9018c1b0cd6fae78b8d2991d (diff) | |
INTEGRATION: CWS hr33 (1.2.132); FILE MERGED
2006/05/03 15:20:44 hr 1.2.132.1: #i55967#: remove not needed STL includes; cleanup
Diffstat (limited to 'extensions/inc')
| -rw-r--r-- | extensions/inc/ucbhelper/ext_content.hxx | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/extensions/inc/ucbhelper/ext_content.hxx b/extensions/inc/ucbhelper/ext_content.hxx index 8b072071772c..e7df0d68a507 100644 --- a/extensions/inc/ucbhelper/ext_content.hxx +++ b/extensions/inc/ucbhelper/ext_content.hxx @@ -4,9 +4,9 @@ * * $RCSfile: ext_content.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:01:24 $ + * last change: $Author: vg $ $Date: 2006-11-22 10:36:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,11 +67,8 @@ #endif #include <list> -#include <hash_map> -#if defined(TF_TYPE) || (SUPD >= 564) using namespace cppu; -#endif using namespace com::sun::star::ucb; using namespace com::sun::star::uno; using namespace com::sun::star::beans; @@ -95,11 +92,7 @@ public: OSimpleContentIdentifier( const OUString& rIdentifier, const OUString& rProviderScheme ); // XInterface -#if defined(TF_TYPE) || (SUPD >= 564) virtual Any SAL_CALL queryInterface( const Type &type ) throw( RuntimeException ); -#else - virtual sal_Bool SAL_CALL queryInterface( const Uik& type, Any& ifc ) throw( RuntimeException ); -#endif virtual void SAL_CALL acquire() throw(RuntimeException); virtual void SAL_CALL release() throw(RuntimeException); @@ -169,11 +162,7 @@ public: virtual Any doCommand( const Command & crCommand ) = 0; // XInterface -#if defined(TF_TYPE) || (SUPD >= 564) virtual Any SAL_CALL queryInterface( const Type &type ) throw( RuntimeException ); -#else - virtual sal_Bool SAL_CALL queryInterface( const Uik& type, Any& ifc ) throw( RuntimeException ); -#endif virtual void SAL_CALL acquire() throw(RuntimeException); virtual void SAL_CALL release() throw(RuntimeException); @@ -268,11 +257,7 @@ public: virtual ~OContentTask(); // XInterface -#if defined(TF_TYPE) || (SUPD >= 564) virtual Any SAL_CALL queryInterface( const Type &type ) throw( RuntimeException ); -#else - virtual sal_Bool SAL_CALL queryInterface( const Uik& type, Any& ifc ) throw( RuntimeException ); -#endif virtual void SAL_CALL acquire() throw(RuntimeException); virtual void SAL_CALL release() throw(RuntimeException); @@ -306,11 +291,7 @@ public: virtual void doExecute(); // XInterface -#if defined(TF_TYPE) || (SUPD >= 564) virtual Any SAL_CALL queryInterface( const Type &type ) throw( RuntimeException ); -#else - virtual sal_Bool SAL_CALL queryInterface( const Uik& type, Any& ifc ) throw( RuntimeException ); -#endif virtual void SAL_CALL acquire() throw(RuntimeException); virtual void SAL_CALL release() throw(RuntimeException); @@ -350,11 +331,7 @@ public: virtual void getPropertyValue( PropertyValueInfo & rProperty ) = 0; // XInterface -#if defined(TF_TYPE) || (SUPD >= 564) virtual Any SAL_CALL queryInterface( const Type &type ) throw( RuntimeException ); -#else - virtual sal_Bool SAL_CALL queryInterface( const Uik& type, Any& ifc ) throw( RuntimeException ); -#endif virtual void SAL_CALL acquire() throw(RuntimeException); virtual void SAL_CALL release() throw(RuntimeException); |