diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-26 14:05:30 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-26 14:05:30 +0000 |
| commit | aa8e7c645494a2785ee217e7fe652738c2444be4 (patch) | |
| tree | 01456d78f468291f558eb0d1d8d77b841019f62a | |
| parent | 8851281de9e67c716e52c97e67ea4d6407c79b14 (diff) | |
INTEGRATION: CWS custommeta (1.124.66); FILE MERGED
2008/02/01 10:38:55 mst 1.124.66.4: RESYNC: (1.126-1.127); FILE MERGED
2007/12/10 10:32:20 mst 1.124.66.3: RESYNC: (1.124-1.126); FILE MERGED
2007/11/01 14:45:15 mst 1.124.66.2: - source/doc/SfxDocumentMetaData.cxx:
remove dead code; improve exception handling
2007/10/31 12:50:45 mst 1.124.66.1: - inc/SfxDocumentMetaData.hxx, source/doc/SfxDocumentMetaData.cxx:
added implementation of service css.document.DocumentProperties
- source/doc/REMOVEME.cxx: temporary stuff from CWS xmlfilter02
- source/appl/appuno.cxx, source/doc/makefile.mk:
build/register new service
| -rw-r--r-- | sfx2/source/appl/appuno.cxx | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 1bbd30565957..fd0a56fe4f02 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -4,9 +4,9 @@ * * $RCSfile: appuno.cxx,v $ * - * $Revision: 1.127 $ + * $Revision: 1.128 $ * - * last change: $Author: ihi $ $Date: 2008-01-14 17:27:51 $ + * last change: $Author: obo $ $Date: 2008-02-26 15:05:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -225,6 +225,7 @@ using namespace ::com::sun::star::io; #include "plugin.hxx" #include "iframe.hxx" #include <ownsubfilterservice.hxx> +#include "SfxDocumentMetaData.hxx" #define FRAMELOADER_SERVICENAME "com.sun.star.frame.FrameLoader" @@ -2199,7 +2200,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( { ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pRegistryKey ) ) ; - // Eigentliche Implementierung und ihre Services registrieren + // register actual implementations and their services ::rtl::OUString aImpl; ::rtl::OUString aTempStr; ::rtl::OUString aKeyStr; @@ -2339,6 +2340,14 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo( for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ ) xNewKey->createKey( rServices.getConstArray()[ind] ); + // document meta data + aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + aImpl += comp_SfxDocumentMetaData::_getImplementationName(); + + aTempStr = aImpl; + aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); + xNewKey = xKey->createKey( aTempStr ); + xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.document.DocumentProperties") ); return sal_True; } @@ -2389,6 +2398,14 @@ SFX2_DLLPUBLIC void* SAL_CALL component_getFactory( IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::PluginObject ) IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::IFrameObject ) IF_NAME_CREATECOMPONENTFACTORY( ::sfx2::OwnSubFilterService ) + if ( ::comp_SfxDocumentMetaData::_getImplementationName().equals( + ::rtl::OUString::createFromAscii( pImplementationName ) ) ) + { + xFactory = ::cppu::createSingleComponentFactory( + ::comp_SfxDocumentMetaData::_create, + ::comp_SfxDocumentMetaData::_getImplementationName(), + ::comp_SfxDocumentMetaData::_getSupportedServiceNames()); + } // Factory is valid - service was found. if ( xFactory.is() ) |