diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:22:21 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 13:22:21 +0000 |
| commit | 6ea28f940dca71eb4dcf81f195b6a111ecfaf134 (patch) | |
| tree | 547dfcd2a867eb5c2475de1358b09ea62b5e7a12 /ucb | |
| parent | e2441ad97ca12f95c3469bb6e2e7e9f64866cde5 (diff) | |
INTEGRATION: CWS relocinst (1.11.134); FILE MERGED
2004/04/22 11:31:18 kso 1.11.134.1: #116448# - Does no longer use ooSetupInstallPath and OfficeInstall config items.
- removed mountpoints support (not needed any longer).
CVS: ----------------------------------------------------------------------
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/file/prov.hxx | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index 48dffedbea2a..af3808c3239e 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -2,9 +2,9 @@ * * $RCSfile: prov.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: abi $ $Date: 2002-10-29 13:41:23 $ + * last change: $Author: hr $ $Date: 2004-05-10 14:22:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -165,15 +165,9 @@ namespace fileaccess { createServiceFactory( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr ); -#if SUPD > 583 static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL CreateInstance( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMultiServiceFactory ); -#else - static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > - CreateInstance( - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMultiServiceFactory ); -#endif // XTypeProvider @@ -274,28 +268,6 @@ namespace fileaccess { private: // methods - com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > - getConfiguration() const; - - com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess > - getHierAccess( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& sProvider, - const char* file ) const; - - rtl::OUString - getKey( const com::sun::star::uno::Reference< - com::sun::star::container::XHierarchicalNameAccess >& - xHierAccess, - const char* key ) const; - - void SAL_CALL initSubstVars( void ); - void SAL_CALL subst( rtl::OUString& sValue ); - - rtl::OUString m_sInstPath; - rtl::OUString m_sUserPath; - // Members com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xMultiServiceFactory; |