diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 14:14:09 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-06-05 14:14:09 +0000 |
| commit | 147fc587311f6c5fc2298e01db3b0e9bc65a100e (patch) | |
| tree | a451b4448e725c38c43a8815748a403a462b8c10 /sd/source/ui/unoidl/unopool.cxx | |
| parent | c18f7d3ede4955798d2a5d1af111b1c2d2bb3d28 (diff) | |
INTEGRATION: CWS bgdlremove (1.5.168); FILE MERGED
2007/05/28 17:40:54 kso 1.5.168.1: #i76911# - ucbhelper no longer uses VOS (vos::ORef -> rtl::Reference, ...)
Diffstat (limited to 'sd/source/ui/unoidl/unopool.cxx')
| -rw-r--r-- | sd/source/ui/unoidl/unopool.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sd/source/ui/unoidl/unopool.cxx b/sd/source/ui/unoidl/unopool.cxx index 473fc536b786..e14da425adfd 100644 --- a/sd/source/ui/unoidl/unopool.cxx +++ b/sd/source/ui/unoidl/unopool.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unopool.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:28:04 $ + * last change: $Author: ihi $ $Date: 2007-06-05 15:14:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,9 +55,6 @@ #include "drawdoc.hxx" using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::beans; using namespace ::rtl; using namespace ::cppu; using namespace ::comphelper; @@ -82,7 +79,7 @@ public: virtual ~SdUnoDrawPool() throw(); protected: - virtual void putAny( SfxItemPool* pPool, const PropertyMapEntry* pEntry, const Any& rValue ) throw( UnknownPropertyException, IllegalArgumentException); + virtual void putAny( SfxItemPool* pPool, const PropertyMapEntry* pEntry, const uno::Any& rValue ) throw( beans::UnknownPropertyException, lang::IllegalArgumentException); private: SdDrawDocument* mpDrawModel; @@ -97,8 +94,8 @@ SdUnoDrawPool::~SdUnoDrawPool() throw() { } -void SdUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const Any& rValue ) - throw(UnknownPropertyException, IllegalArgumentException) +void SdUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const uno::Any& rValue ) + throw(beans::UnknownPropertyException, lang::IllegalArgumentException) { switch( pEntry->mnHandle ) { @@ -116,7 +113,7 @@ void SdUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEnt SvxUnoDrawPool::putAny( pPool, pEntry, rValue ); } -Reference< XInterface > SdUnoCreatePool( SdDrawDocument* pDrawModel ) +uno::Reference< uno::XInterface > SdUnoCreatePool( SdDrawDocument* pDrawModel ) { return (uno::XAggregation*)new SdUnoDrawPool( pDrawModel ); } |