diff options
| author | Andreas Schlüns <as@openoffice.org> | 2000-11-28 13:45:33 +0000 |
|---|---|---|
| committer | Andreas Schlüns <as@openoffice.org> | 2000-11-28 13:45:33 +0000 |
| commit | 131c5ab3a1816a3d0ccef09661e4e360575473f5 (patch) | |
| tree | 6947a81fed9f8aad15960a6c0c4340098712d58b /framework/source | |
| parent | 171fac5f9fb4c46c5f4d897d054c526e8427288d (diff) | |
#79040# new version of new type detection
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/register/registerservices.cxx | 8 | ||||
| -rw-r--r-- | framework/source/services/mediatypedetectionhelper.cxx | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index 2f731c6b5177..30776b384773 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registerservices.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: as $ $Date: 2000-11-23 14:52:09 $ + * last change: $Author: as $ $Date: 2000-11-28 14:45:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,7 +119,7 @@ #include <services/frameloaderfactory.hxx> #endif -#if TF_FILTER//MUSTFILTER +#ifdef TF_FILTER//MUSTFILTER #ifndef __FRAMEWORK_SERVICES_FILTERFACTORY_HXX_ #include <services/filterfactory.hxx> #endif @@ -131,7 +131,7 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT -#if TF_FILTER//MUSTFILTER +#ifdef TF_FILTER//MUSTFILTER COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer ) COMPONENTINFO( ::framework::PlugInFrame ) COMPONENTINFO( ::framework::Desktop ) diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index 94b2a8867466..2b05b9898ca8 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mediatypedetectionhelper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: as $ $Date: 2000-11-23 14:52:10 $ + * last change: $Author: as $ $Date: 2000-11-28 14:45:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,7 +82,7 @@ //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ -#if !TF_FILTER//MUSTFILTER +#ifndef TF_FILTER//MUSTFILTER #ifndef _COM_SUN_STAR_FRAME_XFRAMELOADERQUERY_HPP_ #include <com/sun/star/frame/XFrameLoaderQuery.hpp> #endif @@ -94,7 +94,7 @@ namespace framework { -#if !TF_FILTER//MUSTFILTER +#ifndef TF_FILTER//MUSTFILTER using namespace ::com::sun::star::frame ; #endif//MUSTFILTER using namespace ::com::sun::star ; @@ -159,7 +159,7 @@ sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings( return sal_False; } -#if !TF_FILTER//MUSTFILTER +#ifndef TF_FILTER//MUSTFILTER uno::Reference< frame::XFrameLoaderQuery > xQ( m_xFactory->createInstance( SERVICENAME_FRAMELOADERFACTORY ),uno::UNO_QUERY ); //IMPLEMENTATIONNAME_FRAMELOADERFACTORY @@ -210,6 +210,9 @@ sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings( /*------------------------------------------------------------------------- $Log: not supported by cvs2svn $ + Revision 1.1 2000/11/23 14:52:10 as + #79040# implement new filter detection - use TF_FILTER to enable + Revision 1.1.1.1 2000/09/18 16:29:23 hr initial import |