[Libreoffice-commits] core.git: 2 commits - extensions/Library_oleautobridge2.mk extensions/Module_extensions.mk extensions/source Repository.mk
Michael Stahl
mstahl at redhat.com
Thu Feb 28 14:03:51 PST 2013
Repository.mk | 1
extensions/Library_oleautobridge2.mk | 94 -----------------------------------
extensions/Module_extensions.mk | 1
extensions/source/ole/servprov.cxx | 27 +---------
extensions/source/ole/servprov.hxx | 5 -
5 files changed, 7 insertions(+), 121 deletions(-)
New commits:
commit ffa37355709b95c5b8951f3a46e2b7952eee84d2
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Feb 28 23:00:34 2013 +0100
extensions: remove code specific to oleautobridge2
Change-Id: I88ecfceba0d08ef7136d6db49da1e62c61518d2b
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index d85afa8..e844287 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -50,15 +50,9 @@ namespace ole_adapter
#include <initguid.h>
-#ifndef OWNGUID
// GUID used since 5.2 ( src569 m)
// {82154420-0FBF-11d4-8313-005004526AB4}
DEFINE_GUID(OID_ServiceManager, 0x82154420, 0xfbf, 0x11d4, 0x83, 0x13, 0x0, 0x50, 0x4, 0x52, 0x6a, 0xb4);
-#else
-// Alternative GUID
-// {D9BB9D1D-BFA9-4357-9F11-9A2E9061F06E}
-DEFINE_GUID(OID_ServiceManager, 0xd9bb9d1d, 0xbfa9, 0x4357, 0x9f, 0x11, 0x9a, 0x2e, 0x90, 0x61, 0xf0, 0x6e);
-#endif
extern rtl_StandardModuleCount globalModuleCount;
@@ -205,12 +199,10 @@ STDMETHODIMP ProviderOleWrapper_Impl::LockServer(int /*fLock*/)
OneInstanceOleWrapper_Impl::OneInstanceOleWrapper_Impl( const Reference<XMultiServiceFactory>& smgr,
const Reference<XInterface>& xInst,
- GUID* pGuid,
- sal_Bool bAsApplication )
+ GUID* pGuid )
: m_xInst(xInst), m_refCount(0),
m_smgr( smgr),
m_factoryHandle( 0 ),
- m_bAsApplication( bAsApplication ),
m_nApplRegHandle( 0 )
{
m_guid = *pGuid;
@@ -242,17 +234,12 @@ sal_Bool OneInstanceOleWrapper_Impl::registerClass()
REGCLS_MULTIPLEUSE,
&m_factoryHandle);
- if ( hresult == NOERROR && m_bAsApplication )
- hresult = RegisterActiveObject( this, m_guid, ACTIVEOBJECT_WEAK, &m_nApplRegHandle );
-
return (hresult == NOERROR);
}
sal_Bool OneInstanceOleWrapper_Impl::deregisterClass()
{
HRESULT hresult1 = NOERROR;
- if ( m_bAsApplication )
- hresult1 = RevokeActiveObject( m_nApplRegHandle, NULL );
HRESULT hresult2 = CoRevokeClassObject(m_factoryHandle);
@@ -635,12 +622,7 @@ OleServer_Impl::OleServer_Impl( const Reference<XMultiServiceFactory>& smgr):
a >>= m_bridgeSupplier;
}
-#ifndef OWNGUID
- sal_Bool bOLERegister = sal_False;
-#else
- sal_Bool bOLERegister = sal_True;
-#endif
- sal_Bool ret = provideInstance( m_smgr, (GUID*)&OID_ServiceManager, bOLERegister );
+ sal_Bool ret = provideInstance( m_smgr, (GUID*)&OID_ServiceManager );
(void)ret;
}
@@ -718,9 +700,10 @@ sal_Bool OleServer_Impl::provideService(const Reference<XSingleServiceFactory>&
return pFac->registerClass();
}
-sal_Bool OleServer_Impl::provideInstance(const Reference<XInterface>& xInst, GUID* guid, sal_Bool bAsApplication )
+sal_Bool OleServer_Impl::provideInstance(const Reference<XInterface>& xInst, GUID* guid)
{
- IClassFactoryWrapper* pFac = new OneInstanceOleWrapper_Impl( m_smgr, xInst, guid, bAsApplication );
+ IClassFactoryWrapper* pFac =
+ new OneInstanceOleWrapper_Impl( m_smgr, xInst, guid );
pFac->AddRef();
m_wrapperList.push_back(pFac);
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index 1a57b7c..4b04388 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -121,7 +121,7 @@ class OneInstanceOleWrapper_Impl : public IClassFactoryWrapper
{
public:
- OneInstanceOleWrapper_Impl( const Reference<XMultiServiceFactory>& smgr, const Reference<XInterface>& xInst, GUID* pGuid, sal_Bool bAsApplication );
+ OneInstanceOleWrapper_Impl( const Reference<XMultiServiceFactory>& smgr, const Reference<XInterface>& xInst, GUID* pGuid );
virtual ~OneInstanceOleWrapper_Impl();
sal_Bool registerClass();
@@ -145,7 +145,6 @@ protected:
Reference<XBridgeSupplier2> m_bridgeSupplier;
Reference<XMultiServiceFactory> m_smgr;
unsigned long m_nApplRegHandle;
- sal_Bool m_bAsApplication;
};
/*****************************************************************************
@@ -253,7 +252,7 @@ public:
protected:
sal_Bool provideService(const Reference<XSingleServiceFactory>& xMulFact, GUID* guid);
- sal_Bool provideInstance(const Reference<XInterface>& xInst, GUID* guid, sal_Bool bAsApplication );
+ sal_Bool provideInstance(const Reference<XInterface>& xInst, GUID* guid);
list< IClassFactoryWrapper* > m_wrapperList;
Reference< XBridgeSupplier2 > m_bridgeSupplier;
commit 5a68f57606d097dac10ea501658c3b668f5029cc
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Feb 28 22:48:28 2013 +0100
extensions: remove obsolete oleautobridge2 library
This library was never shipped with LibreOffice; presumably it is some
backward compat kludge for StarOffice versions older than 5.2 that only
shipped with StarOffice.
Change-Id: I5e07e14fde0f62814f4648b362f9e9333fd6c84f
diff --git a/Repository.mk b/Repository.mk
index 5899fad..dbc844f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -633,7 +633,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
oleautobridge \
- oleautobridge2 \
smplmail \
wininetbe1 \
))
diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk
deleted file mode 100644
index 53eac9f..0000000
--- a/extensions/Library_oleautobridge2.mk
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl at redhat.com> (initial developer) ]
-# [ Copyright (C) 2011 Peter Foley <pefoley2 at verizon.net> ]
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-# TODO: do we really need 2 of these?
-$(eval $(call gb_Library_Library,oleautobridge2))
-
-$(eval $(call gb_Library_add_defs,oleautobridge2,\
- -DOWNGUID \
-))
-
-$(eval $(call gb_Library_use_sdk_api,oleautobridge2))
-
-$(eval $(call gb_Library_set_include,oleautobridge2,\
- -I$(SRCDIR)/extensions/source/ole \
- $(foreach inc,$(ATL_INCLUDE),-I$(inc)) \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_add_ldflags,oleautobridge2,\
- -LIBPATH:$(ATL_LIB) \
-))
-
-$(eval $(call gb_Library_use_external,oleautobridge2,boost_headers))
-
-$(eval $(call gb_Library_use_libraries,oleautobridge2,\
- comphelper \
- cppuhelper \
- cppu \
- sal \
-))
-
-$(eval $(call gb_Library_use_system_win32_libs,oleautobridge2,\
- advapi32 \
- ole32 \
- oleaut32 \
- uuid \
-))
-
-ifeq ($(COM),MSC)
-ifneq ($(USE_DEBUG_RUNTIME),)
-$(eval $(call gb_Library_add_libs,oleautobridge2,\
- $(ATL_LIB)/atlsd.lib \
-))
-else
-$(eval $(call gb_Library_add_libs,oleautobridge2,\
- $(ATL_LIB)/atls.lib \
-))
-endif
-endif
-
-$(WORKDIR)/CustomTarget/extensions/source/ole/%.cxx: $(SRCDIR)/extensions/source/ole/%.cxx
- mkdir -p $(dir $@)
- cp $< $@
-
-$(eval $(call gb_Library_add_generated_exception_objects,oleautobridge2,\
- CustomTarget/extensions/source/ole/jscriptclasses \
- CustomTarget/extensions/source/ole/ole2uno \
- CustomTarget/extensions/source/ole/oledll \
- CustomTarget/extensions/source/ole/oleobjw \
- CustomTarget/extensions/source/ole/olethread \
- CustomTarget/extensions/source/ole/servprov \
- CustomTarget/extensions/source/ole/servreg \
- CustomTarget/extensions/source/ole/unoobjw \
- CustomTarget/extensions/source/ole/unotypewrapper \
- CustomTarget/extensions/source/ole/windata \
-))
-
-# vim:set noet sw=4 ts=4:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 4c83159..0e12f94 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -97,7 +97,6 @@ endif # COM=MSC
ifeq ($(DISABLE_ATL),)
$(eval $(call gb_Module_add_targets,extensions,\
Library_oleautobridge \
- Library_oleautobridge2 \
))
endif # DISABLE_ATL
More information about the Libreoffice-commits
mailing list