summaryrefslogtreecommitdiff
path: root/odk/examples/OLE
diff options
context:
space:
mode:
Diffstat (limited to 'odk/examples/OLE')
-rw-r--r--odk/examples/OLE/activex/Makefile1
-rw-r--r--odk/examples/OLE/activex/example.html4
-rw-r--r--odk/examples/OLE/activex/so_activex.def12
3 files changed, 7 insertions, 10 deletions
diff --git a/odk/examples/OLE/activex/Makefile b/odk/examples/OLE/activex/Makefile
index 8887ab2f1b50..5cb0813d38e8 100644
--- a/odk/examples/OLE/activex/Makefile
+++ b/odk/examples/OLE/activex/Makefile
@@ -104,6 +104,7 @@ $(SHAREDLIB_OUT)/$(SHAREDLIB_PRE)%.$(SHAREDLIB_EXT) : $(SLOFILES) $(OUT_COMP_GEN
/DEF:so_activex.def /IMPLIB:$(OUT_LIB)/iso_activex.lib $(SLOFILES) \
msvcrt.lib kernel32.lib user32.lib uuid.lib advapi32.lib ole32.lib oleaut32.lib gdi32.lib \
urlmon.lib Shlwapi.lib oldnames.lib $(CL_NEW_LIB) $(OUT_COMP_GEN)/so_activex.res
+ $(LINK_MANIFEST)
ifeq "$(OS)" "WIN"
OleActvieXComponentExample : $(COMPONENT_IMPL)
diff --git a/odk/examples/OLE/activex/example.html b/odk/examples/OLE/activex/example.html
index 3efee1f75a03..fd5876a6f212 100644
--- a/odk/examples/OLE/activex/example.html
+++ b/odk/examples/OLE/activex/example.html
@@ -11,9 +11,9 @@ First you should edit the example.html file!!!
<!-- Please edit CODEBASE parameter -->
<!-- In case ActiveX control is already registered the parameter can be removed -->
<OBJECT CLASSID="clsid:67F2A879-82D5-4A6D-8CC5-FFB3C114B69D" width="500" height="500"
- CODEBASE="..\..\..\WINexample.out\bin\so_activex.dll">
+ CODEBASE="<path_to_the_sdk_sample_output_dir>\bin\so_activex.dll">
<!-- Full URL to a document
- <PARAM NAME="src" VALUE="file:///d:/example.sxw">
+ <PARAM NAME="src" VALUE="file:///d:/tmp/test.odt">
-->
<!-- Just view the document, do not edit
<PARAM NAME="readonly" VALUE="true">
diff --git a/odk/examples/OLE/activex/so_activex.def b/odk/examples/OLE/activex/so_activex.def
index 88ba88d1ba51..68939efa1fe2 100644
--- a/odk/examples/OLE/activex/so_activex.def
+++ b/odk/examples/OLE/activex/so_activex.def
@@ -1,9 +1,5 @@
-; iervp.def : Declares the module parameters.
-
-LIBRARY "so_activex.dll"
-
EXPORTS
- DllCanUnloadNow @1 PRIVATE
- DllGetClassObject @2 PRIVATE
- DllRegisterServer @3 PRIVATE
- DllUnregisterServer @4 PRIVATE
+ DllCanUnloadNow PRIVATE
+ DllGetClassObject PRIVATE
+ DllRegisterServer PRIVATE
+ DllUnregisterServer PRIVATE