diff options
| author | Mikhail Voitenko <mav@openoffice.org> | 2003-08-20 13:43:27 +0000 |
|---|---|---|
| committer | Mikhail Voitenko <mav@openoffice.org> | 2003-08-20 13:43:27 +0000 |
| commit | 5ec0cc74195a96fb43590ab6efae7b33b76f70fd (patch) | |
| tree | b625daa9c08c8b4faf8e69114fc6e57be4941c5a /extensions/source/activex/main | |
| parent | 0055de5a2c126047251b597996d71286618f79fc (diff) | |
previous version must be removed
Diffstat (limited to 'extensions/source/activex/main')
| -rw-r--r-- | extensions/source/activex/main/example.html | 3 | ||||
| -rw-r--r-- | extensions/source/activex/main/makefile.mk | 24 | ||||
| -rw-r--r-- | extensions/source/activex/main/resource.h | 12 |
3 files changed, 17 insertions, 22 deletions
diff --git a/extensions/source/activex/main/example.html b/extensions/source/activex/main/example.html index d3ab534b6..3efee1f75 100644 --- a/extensions/source/activex/main/example.html +++ b/extensions/source/activex/main/example.html @@ -10,7 +10,8 @@ First you should edit the example.html file!!! <center> <!-- Please edit CODEBASE parameter --> <!-- In case ActiveX control is already registered the parameter can be removed --> -<OBJECT CLASSID="clsid:957A0A0D-4B7F-4513-9533-16B25CE740D5" width="500" height="500" "> +<OBJECT CLASSID="clsid:67F2A879-82D5-4A6D-8CC5-FFB3C114B69D" width="500" height="500" + CODEBASE="..\..\..\WINexample.out\bin\so_activex.dll"> <!-- Full URL to a document <PARAM NAME="src" VALUE="file:///d:/example.sxw"> --> diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk index ffef482f8..b7d851b23 100644 --- a/extensions/source/activex/main/makefile.mk +++ b/extensions/source/activex/main/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: mav $ $Date: 2003-08-05 07:51:41 $ +# last change: $Author: mav $ $Date: 2003-08-20 14:43:27 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -62,7 +62,7 @@ PRJ=..$/..$/.. PRJNAME=extensions -TARGET=uno_activex +TARGET=so_activex use_shl_versions= @@ -91,24 +91,14 @@ RCFILES=\ RCDEPN=$(MISC)$/envsettings.h SLOFILES=\ - $(SLO)$/uno_activex.obj \ - $(SLO)$/UNOActiveX.obj \ - $(SLO)$/officeconnection.obj \ - $(SLO)$/initwindowpeer.obj \ - $(SLO)$/intercept.obj \ - $(SLO)$/outputistream.obj \ + $(SLO)$/so_activex.obj \ + $(SLO)$/SOActiveX.obj \ + $(SLO)$/SOComWindowPeer.obj \ + $(SLO)$/SODispatchInterceptor.obj \ $(SLO)$/StdAfx2.obj -EXCEPTIONSFILES=\ - $(SLO)$/UNOActiveX.obj \ - $(SLO)$/officeconnection.obj \ - $(SLO)$/outputistream.obj - SHL1TARGET=$(TARGET) SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ uuid.lib \ advapi32.lib \ ole32.lib \ diff --git a/extensions/source/activex/main/resource.h b/extensions/source/activex/main/resource.h index a048e3a79..73ff1d923 100644 --- a/extensions/source/activex/main/resource.h +++ b/extensions/source/activex/main/resource.h @@ -1,10 +1,14 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. -// Used by uno_activex.rc +// Used by so_activex.rc // #define IDS_PROJNAME 100 -#define IDB_UNOACTIVEX 101 -#define IDR_UNOACTIVEX 102 +#define IDB_SOACTIVEX 101 +#define IDR_SOACTIVEX 102 +#define IDB_SOCOMWINDOWPEER 103 +#define IDR_SOCOMWINDOWPEER 104 +#define IDB_SODISPATCHINTERCEPTOR 105 +#define IDR_SODISPATCHINTERCEPTOR 106 // Next default values for new objects @@ -14,7 +18,7 @@ #define _APS_NEXT_RESOURCE_VALUE 201 #define _APS_NEXT_COMMAND_VALUE 32768 #define _APS_NEXT_CONTROL_VALUE 201 -#define _APS_NEXT_SYMED_VALUE 103 +#define _APS_NEXT_SYMED_VALUE 107 #endif #endif |