diff options
author | Kurt Zenker <kz@openoffice.org> | 2004-03-25 13:59:57 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2004-03-25 13:59:57 +0000 |
commit | cfb3be676037896a89c65ca1687539997623d1b1 (patch) | |
tree | 793757f5919b5cdaf1b7abeec374f8fe65a0e7e3 /filter/source/svg/svgfilter.hxx | |
parent | 55da2052a533b05972cfabfcbf12a876aecca173 (diff) |
INTEGRATION: CWS jl3 (1.4.126); FILE MERGED
2004/02/09 14:21:57 jl 1.4.126.3: RESYNC: (1.4-1.6); FILE MERGED
2003/11/21 11:31:02 jl 1.4.126.2: #111907# #include sj2/jnihelp.hxx removed
2003/11/21 08:56:18 jl 1.4.126.1: #111907# replace TKTThreadAttach by jvmaccess::VirtualMachine
Diffstat (limited to 'filter/source/svg/svgfilter.hxx')
-rw-r--r-- | filter/source/svg/svgfilter.hxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx index 710da2dec032..b7191046fd4b 100644 --- a/filter/source/svg/svgfilter.hxx +++ b/filter/source/svg/svgfilter.hxx @@ -2,9 +2,9 @@ * * $RCSfile: svgfilter.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: vg $ $Date: 2003-12-17 15:25:52 $ + * last change: $Author: kz $ $Date: 2004-03-25 14:59:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -160,13 +160,10 @@ #include <svx/svdxcgv.hxx> #include <svx/svdobj.hxx> #include <xmloff/xmlexp.hxx> -#ifdef SOLAR_JAVA -#include <sj2/jnihelp.hxx> -#endif + #include "svgfilter.hxx" #include "svgscript.hxx" -using namespace ::rtl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -313,8 +310,8 @@ private: sal_Bool implCreateObjectsFromShapes( const Reference< XShapes >& rxShapes ); sal_Bool implCreateObjectsFromShape( const Reference< XShape >& rxShape ); sal_Bool implCreateObjectsFromBackground( const Reference< XDrawPage >& rxMasterPage ); - OUString implGetDescriptionFromShape( const Reference< XShape >& rxShape ); - OUString implGetValidIDFromInterface( const Reference< XInterface >& rxIf ); + ::rtl::OUString implGetDescriptionFromShape( const Reference< XShape >& rxShape ); + ::rtl::OUString implGetValidIDFromInterface( const Reference< XInterface >& rxIf ); protected: @@ -334,9 +331,9 @@ protected: virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(RuntimeException); + virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); public: |