summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2005-03-23 13:04:41 +0000
committerVladimir Glazounov <vg@openoffice.org>2005-03-23 13:04:41 +0000
commit5f6fc0c1b7cb5dd4fd91d8fdc61a69523960a19d (patch)
treea4ee343a0eaefffcd3e21a8adb599815274804ce /setup_native
parent8cf961bfb44e5c480550b59e6ced7404c14dd3e6 (diff)
INTEGRATION: CWS fwkfinal1 (1.1.50); FILE MERGED
2005/03/10 09:36:51 mav 1.1.50.1: #i43100# do not register ActiveX control for MS document types
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/win32/customactions/reg4msdoc/register.hxx11
1 files changed, 2 insertions, 9 deletions
diff --git a/setup_native/source/win32/customactions/reg4msdoc/register.hxx b/setup_native/source/win32/customactions/reg4msdoc/register.hxx
index f8aec9bcd5f3..bf78fbd766ef 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/register.hxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/register.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: register.hxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: tra $ $Date: 2004-05-26 17:05:35 $
+ * last change: $Author: vg $ $Date: 2005-03-23 14:04:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -109,11 +109,4 @@ bool query_preselect_registration_for_ms_application(
// location
int FixReturnRegistrationState(MSIHANDLE handle);
-// ActiveX control registration
-void RegisterActiveX4MsDoc(MSIHANDLE handle, int nPref);
-void UnregisterActiveX4MsDoc(MSIHANDLE handle, int nPref);
-
-inline void UnregisterActiveX4MsDocAll(MSIHANDLE handle)
-{ UnregisterActiveX4MsDoc(handle, 0x07); }
-
#endif