diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-07 09:59:00 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-04-07 09:59:00 +0000 |
| commit | 7535c6b66a2605bb5a76945a2f52bb842e870b15 (patch) | |
| tree | 8949a1fce13e958758dfb6fd05899ebe9e8ead53 /shell/source/win32/shlxthandler/classfactory.cxx | |
| parent | INTEGRATION: CWS desktintgr01 (1.1.2); FILE ADDED (diff) | |
| download | core-7535c6b66a2605bb5a76945a2f52bb842e870b15.tar.gz core-7535c6b66a2605bb5a76945a2f52bb842e870b15.zip | |
INTEGRATION: CWS desktintgr01 (1.1.114); FILE MERGED
2004/02/26 14:33:20 deuce 1.1.114.1: Issue number: 97686, 115531, 108219 restructure shxthdl module
Submitted by: Gorden Lin/gorden.lin@sun.com
Reviewed by: Tino Rachui/tino.rachui@sun.com
Diffstat (limited to 'shell/source/win32/shlxthandler/classfactory.cxx')
| -rw-r--r-- | shell/source/win32/shlxthandler/classfactory.cxx | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx index 545a2da07bcd..8fe0c3baba1b 100644 --- a/shell/source/win32/shlxthandler/classfactory.cxx +++ b/shell/source/win32/shlxthandler/classfactory.cxx @@ -2,9 +2,9 @@ * * $RCSfile: classfactory.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: tra $ $Date: 2002-08-26 10:53:56 $ + * last change: $Author: hr $ $Date: 2004-04-07 10:59:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -59,28 +59,28 @@ * ************************************************************************/ -#ifndef _GLOBAL_HXX_ -#include "global.hxx" +#ifndef GLOBAL_HXX_INCLUDED +#include "internal/global.hxx" #endif -#ifndef _CLASSFACTORY_HXX_ +#ifndef CLASSFACTORY_HXX_INCLUDED #include "classfactory.hxx" #endif -#ifndef _INFOTIP_HXX_ -#include "infotip.hxx" +#ifndef INFOTIPS_HXX_INCLUDED +#include "internal/infotips.hxx" #endif -#ifndef _PROPSHTHDL_HXX_ -#include "propshthdl.hxx" +#ifndef PROPSHEETS_HXX_INCLUDED +#include "internal/propsheets.hxx" #endif -#ifndef _COLUMNPROVIDER_HXX_ -#include "columnprovider.hxx" +#ifndef COLUMNINFO_HXX_INCLUDED +#include "internal/columninfo.hxx" #endif -#ifndef _SHLXTHDL_HXX_ -#include "shlxthdl.hxx" +#ifndef SHLXTHDL_HXX_INCLUDED +#include "internal/shlxthdl.hxx" #endif //----------------------------- @@ -166,21 +166,13 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance( IUnknown* pUnk = 0; if (CLSID_PROPERTYSHEET_HANDLER == m_Clsid) - pUnk = static_cast<IShellExtInit*>(new CPropertySheetHandler()); - -#ifdef BUILD_SOSL + pUnk = static_cast<IShellExtInit*>(new CPropertySheet()); else if (CLSID_INFOTIP_HANDLER == m_Clsid) pUnk = static_cast<IQueryInfo*>(new CInfoTip()); -#endif - -#if defined(_WINXPSDK) && (BUILD_SOSL) - else if (CLSID_COLUMN_HANDLER == m_Clsid) - pUnk = static_cast<IColumnProvider*>(new CColumnProvider()); - -#endif + pUnk = static_cast<IColumnProvider*>(new CColumnInfo()); POST_CONDITION(pUnk != 0, "Could not create COM object"); |