[Libreoffice-commits] core.git: extensions/source
Tor Lillqvist
tml at collabora.com
Mon Feb 12 20:12:20 UTC 2018
extensions/source/ole/oleobjw.cxx | 5 -----
extensions/source/ole/servprov.cxx | 33 ---------------------------------
extensions/source/ole/servprov.hxx | 26 ++++++--------------------
extensions/source/ole/unoobjw.hxx | 10 ++--------
4 files changed, 8 insertions(+), 66 deletions(-)
New commits:
commit 4c925efc4373a5a09941b56d2edd30500987dd25
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 12 15:24:12 2018 +0200
Reduce ASCII graphics and pointless comments a bit
Change-Id: Ia5cf6b923a6c6057463171d219af250ddb069bad
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 6d4cfd365ecb..3e90adb54385 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -79,11 +79,6 @@ std::unordered_map<sal_uIntPtr, sal_uIntPtr> AdapterToWrapperMap;
std::unordered_map<sal_uIntPtr,sal_uIntPtr> WrapperToAdapterMap;
std::unordered_map<sal_uIntPtr, WeakReference<XInterface> > ComPtrToWrapperMap;
-/*****************************************************************************
-
- class implementation IUnknownWrapper_Impl
-
-*****************************************************************************/
IUnknownWrapper_Impl::IUnknownWrapper_Impl( Reference<XMultiServiceFactory> const & xFactory,
sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass):
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 3bdd595f8197..9f217b2a8770 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -47,12 +47,6 @@ namespace ole_adapter
// {82154420-0FBF-11d4-8313-005004526AB4}
DEFINE_GUID(OID_ServiceManager, 0x82154420, 0xfbf, 0x11d4, 0x83, 0x13, 0x0, 0x50, 0x4, 0x52, 0x6a, 0xb4);
-/*****************************************************************************
-
- class implementation ProviderOleWrapper_Impl
-
-*****************************************************************************/
-
ProviderOleWrapper_Impl::ProviderOleWrapper_Impl(const Reference<XMultiServiceFactory>& smgr,
const Reference<XSingleServiceFactory>& xSFact, GUID const * pGuid)
: m_xSingleServiceFactory(xSFact),
@@ -180,12 +174,6 @@ STDMETHODIMP ProviderOleWrapper_Impl::LockServer(int /*fLock*/)
return NOERROR;
}
-/*****************************************************************************
-
- class implementation OneInstanceOleWrapper_Impl
-
-*****************************************************************************/
-
OneInstanceOleWrapper_Impl::OneInstanceOleWrapper_Impl( const Reference<XMultiServiceFactory>& smgr,
const Reference<XInterface>& xInst,
GUID const * pGuid )
@@ -305,13 +293,6 @@ STDMETHODIMP OneInstanceOleWrapper_Impl::LockServer(int /*fLock*/)
return NOERROR;
}
-
-/*****************************************************************************
-
- class implementation OleConverter_Impl2
-
-*****************************************************************************/
-
OleConverter_Impl2::OleConverter_Impl2( const Reference<XMultiServiceFactory> &smgr):
UnoConversionUtilities<OleConverter_Impl2>( smgr)
@@ -479,13 +460,6 @@ Reference< XInterface > OleConverter_Impl2::createComWrapperInstance()
return Reference<XInterface>( xWeak, UNO_QUERY);
}
-
-/*****************************************************************************
-
- class implementation OleClient_Impl
-
-*****************************************************************************/
-
OleClient_Impl::OleClient_Impl( const Reference<XMultiServiceFactory>& smgr):
UnoConversionUtilities<OleClient_Impl>( smgr)
{
@@ -604,13 +578,6 @@ Reference< XInterface > OleClient_Impl::createComWrapperInstance( )
return Reference<XInterface>( xWeak, UNO_QUERY);
}
-
-/*****************************************************************************
-
- class implementation OleServer_Impl
-
-*****************************************************************************/
-
OleServer_Impl::OleServer_Impl( const Reference<XMultiServiceFactory>& smgr):
m_smgr( smgr)
{
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index 2c31d2e11419..9173aa9de665 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -43,7 +43,7 @@ Reference<XInterface> OleClient_CreateInstance( const Reference<XMultiServiceFac
Reference<XInterface> OleServer_CreateInstance( const Reference<XMultiServiceFactory> & xSMgr);
/*****************************************************************************
- class declaration IClassFactoryWrapper
+ IClassFactoryWrapper
Specify abstract helper methods on class factories, which provide
UNO objects. These methods are used by objects of class OleServer_Impl,
@@ -64,7 +64,7 @@ protected:
/*****************************************************************************
- class declaration ProviderOleWrapper_Impl
+ ProviderOleWrapper_Impl
Provides an UNO service provider as OLE class factory. Handle the
OLE registration by overriding the abstract methods from
@@ -108,7 +108,7 @@ protected:
/*****************************************************************************
- class declaration OneInstanceOleWrapper_Impl
+ OneInstanceOleWrapper_Impl
Provides an single UNO object as OLE object. Handle the
OLE registration by overriding the abstract methods from
@@ -148,13 +148,7 @@ protected:
Reference<XMultiServiceFactory> m_smgr;
};
-/*****************************************************************************
-
- class declaration OleConverter_Impl2
-
- Implementation of the UNO service com.sun.star.bridge.OleBridgeSupplier2.
-
-*****************************************************************************/
+// Implementation of the UNO service com.sun.star.bridge.OleBridgeSupplier2.
// This class realizes the service com.sun.star.bridge.OleBridgeSupplier2 and
// com.sun.star.bridge.OleBridgeSupplierVar1. The class implements XBridgeSupplier2
@@ -197,15 +191,7 @@ protected:
};
-
-/*****************************************************************************
-
- class declaration OleClient_Impl
-
- Implementation of the UNO service com.sun.star.bridge.OleObjectFactory.
-
-*****************************************************************************/
-
+// Implementation of the UNO service com.sun.star.bridge.OleObjectFactory.
class OleClient_Impl : public WeakImplHelper<XMultiServiceFactory, css::lang::XServiceInfo>,
public UnoConversionUtilities<OleClient_Impl>
@@ -235,7 +221,7 @@ protected:
/*****************************************************************************
- class declaration OleServer_Impl
+ OleServer_Impl
Implementation of the UNO service com.sun.star.bridge.OleApplicationRegistration.
Register the calling application as OLE automation server for
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index 22036dbe4762..36af08e4d46f 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -93,12 +93,6 @@ typedef std::unordered_map
MemberInfo
> IdToMemberInfoMap;
-/*****************************************************************************
-
- class declaration: InterfaceOleWrapper_Impl
-
-*****************************************************************************/
-
class InterfaceOleWrapper_Impl : public WeakImplHelper<XBridgeSupplier2, XInitialization>,
public IDispatchEx,
public UnoConversionUtilities<InterfaceOleWrapper_Impl>,
@@ -221,8 +215,8 @@ protected:
/*****************************************************************************
- class declaration: UnoObjectWrapperRemoteOpt
- ( Uno Object Wrapper Remote Optimized)
+ UnoObjectWrapperRemoteOpt = Uno Object Wrapper Remote Optimized
+
This is the UNO wrapper used in the service com.sun.star.bridge.OleBridgeSupplierVar1.
Key features:
DISPIDs are passed out blindly. That is in GetIDsOfNames is no name checking carried out.
More information about the Libreoffice-commits
mailing list