From d0b3815392d1fb253ed05218422a7f9b37c9df24 Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Thu, 12 Nov 2020 12:56:36 +0100 Subject: tdf#123936 Formatting files in module extensions with clang-format Change-Id: I6e86641bc93bf4b3941b01fbef69c1e7984aad3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105667 Reviewed-by: Christian Lohmaier Tested-by: Jenkins --- .../test/ole/AxTestComponents/AxTestComponents.cpp | 23 +++---------- extensions/test/ole/AxTestComponents/Foo.cpp | 16 ++------- .../EventListener/EventListener.cpp | 23 +++---------- extensions/test/ole/MfcControl/MfcControl.cpp | 13 ++------ extensions/test/ole/MfcControl/MfcControl.h | 5 ++- extensions/test/ole/OleClient/axhost.cxx | 13 +++----- extensions/test/ole/cpptest/cpptest.cxx | 39 ++++++++++------------ .../XCallback_Impl/XCallback_Impl.cpp | 24 +++---------- 8 files changed, 41 insertions(+), 115 deletions(-) (limited to 'extensions/test') diff --git a/extensions/test/ole/AxTestComponents/AxTestComponents.cpp b/extensions/test/ole/AxTestComponents/AxTestComponents.cpp index a981e7b43eeb..ca7d37457f7d 100644 --- a/extensions/test/ole/AxTestComponents/AxTestComponents.cpp +++ b/extensions/test/ole/AxTestComponents/AxTestComponents.cpp @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // Note: Proxy/Stub Information // To build a separate proxy/stub DLL, // run nmake -f AxTestComponentsps.mk in the project directory. @@ -29,7 +28,6 @@ #include "Basic.h" #include "Foo.h" - CComModule _Module; BEGIN_OBJECT_MAP(ObjectMap) @@ -37,11 +35,9 @@ OBJECT_ENTRY(CLSID_Basic, CBasic) OBJECT_ENTRY(CLSID_Foo, CFoo) END_OBJECT_MAP() - // DLL Entry Point -extern "C" -BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) +extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) { if (dwReason == DLL_PROCESS_ATTACH) { @@ -50,17 +46,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) } else if (dwReason == DLL_PROCESS_DETACH) _Module.Term(); - return TRUE; // ok + return TRUE; // ok } - // Used to determine whether the DLL can be unloaded by OLE -STDAPI DllCanUnloadNow(void) -{ - return (_Module.GetLockCount()==0) ? S_OK : S_FALSE; -} - +STDAPI DllCanUnloadNow(void) { return (_Module.GetLockCount() == 0) ? S_OK : S_FALSE; } // Returns a class factory to create an object of the requested type @@ -69,7 +60,6 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) return _Module.GetClassObject(rclsid, riid, ppv); } - // DllRegisterServer - Adds entries to the system registry STDAPI DllRegisterServer(void) @@ -78,14 +68,9 @@ STDAPI DllRegisterServer(void) return _Module.RegisterServer(TRUE); } - // DllUnregisterServer - Removes entries from the system registry -STDAPI DllUnregisterServer(void) -{ - return _Module.UnregisterServer(TRUE); -} - +STDAPI DllUnregisterServer(void) { return _Module.UnregisterServer(TRUE); } //VT_I4 size_t V_ERROR VARIANT VARIANT_FALSE CComVariant FADF_EMBEDDED diff --git a/extensions/test/ole/AxTestComponents/Foo.cpp b/extensions/test/ole/AxTestComponents/Foo.cpp index a5064278b8ff..9faefd393ec8 100644 --- a/extensions/test/ole/AxTestComponents/Foo.cpp +++ b/extensions/test/ole/AxTestComponents/Foo.cpp @@ -20,21 +20,11 @@ #include "stdafx.h" #include "Foo.h" - - // CBasic -CFoo::CFoo() -{ -} - -CFoo::~CFoo() -{ +CFoo::CFoo() {} -} +CFoo::~CFoo() {} -STDMETHODIMP CFoo::Foo(IUnknown *pVal) -{ - return S_OK; -} +STDMETHODIMP CFoo::Foo(IUnknown* pVal) { return S_OK; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp b/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp index 5509cd99aa67..ad42dda6255b 100644 --- a/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp +++ b/extensions/test/ole/EventListenerSample/EventListener/EventListener.cpp @@ -18,7 +18,6 @@ */ // EventListener.cpp : Implementation of DLL Exports. - // Note: Proxy/Stub Information // To build a separate proxy/stub DLL, // run nmake -f EventListenerps.mk in the project directory. @@ -31,18 +30,15 @@ #include "EventListener_i.c" #include "EvtListener.h" - CComModule _Module; BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_EvtListener, CEvtListener) END_OBJECT_MAP() - // DLL Entry Point -extern "C" -BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) +extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) { if (dwReason == DLL_PROCESS_ATTACH) { @@ -51,17 +47,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) } else if (dwReason == DLL_PROCESS_DETACH) _Module.Term(); - return TRUE; // ok + return TRUE; // ok } - // Used to determine whether the DLL can be unloaded by OLE -STDAPI DllCanUnloadNow(void) -{ - return (_Module.GetLockCount()==0) ? S_OK : S_FALSE; -} - +STDAPI DllCanUnloadNow(void) { return (_Module.GetLockCount() == 0) ? S_OK : S_FALSE; } // Returns a class factory to create an object of the requested type @@ -70,7 +61,6 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) return _Module.GetClassObject(rclsid, riid, ppv); } - // DllRegisterServer - Adds entries to the system registry STDAPI DllRegisterServer(void) @@ -79,13 +69,8 @@ STDAPI DllRegisterServer(void) return _Module.RegisterServer(TRUE); } - // DllUnregisterServer - Removes entries from the system registry -STDAPI DllUnregisterServer(void) -{ - return _Module.UnregisterServer(TRUE); -} - +STDAPI DllUnregisterServer(void) { return _Module.UnregisterServer(TRUE); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/MfcControl/MfcControl.cpp b/extensions/test/ole/MfcControl/MfcControl.cpp index 74f10830e927..cb7f723e399b 100644 --- a/extensions/test/ole/MfcControl/MfcControl.cpp +++ b/extensions/test/ole/MfcControl/MfcControl.cpp @@ -27,16 +27,13 @@ static char THIS_FILE[] = __FILE__; #endif - CMfcControlApp NEAR theApp; -const GUID CDECL BASED_CODE _tlid = - { 0xac221fb3, 0xa0d8, 0x11d4, { 0x83, 0x3b, 0, 0x50, 0x4, 0x52, 0x6a, 0xb4 } }; +const GUID CDECL BASED_CODE _tlid + = { 0xac221fb3, 0xa0d8, 0x11d4, { 0x83, 0x3b, 0, 0x50, 0x4, 0x52, 0x6a, 0xb4 } }; const WORD _wVerMajor = 1; const WORD _wVerMinor = 0; - - // CMfcControlApp::InitInstance - DLL initialization BOOL CMfcControlApp::InitInstance() @@ -51,8 +48,6 @@ BOOL CMfcControlApp::InitInstance() return bInit; } - - // CMfcControlApp::ExitInstance - DLL termination int CMfcControlApp::ExitInstance() @@ -62,8 +57,6 @@ int CMfcControlApp::ExitInstance() return COleControlModule::ExitInstance(); } - - // DllRegisterServer - Adds entries to the system registry STDAPI DllRegisterServer(void) @@ -79,8 +72,6 @@ STDAPI DllRegisterServer(void) return NOERROR; } - - // DllUnregisterServer - Removes entries from the system registry STDAPI DllUnregisterServer(void) diff --git a/extensions/test/ole/MfcControl/MfcControl.h b/extensions/test/ole/MfcControl/MfcControl.h index 64edc9ae7063..49ef5e72fe6d 100644 --- a/extensions/test/ole/MfcControl/MfcControl.h +++ b/extensions/test/ole/MfcControl/MfcControl.h @@ -25,13 +25,12 @@ // MfcControl.h : main header file for MFCCONTROL.DLL -#if !defined( __AFXCTL_H__ ) - #error include 'afxctl.h' before including this file +#if !defined(__AFXCTL_H__) +#error include 'afxctl.h' before including this file #endif #include "resource.h" - // CMfcControlApp : See MfcControl.cpp for implementation. class CMfcControlApp : public COleControlModule diff --git a/extensions/test/ole/OleClient/axhost.cxx b/extensions/test/ole/OleClient/axhost.cxx index a163a6a7de4a..47709f383483 100644 --- a/extensions/test/ole/OleClient/axhost.cxx +++ b/extensions/test/ole/OleClient/axhost.cxx @@ -21,24 +21,19 @@ HostWin::HostWin(LPWSTR progid) { - controlName= progid; - RECT rcPos={0,0,200,200}; + controlName = progid; + RECT rcPos = { 0, 0, 200, 200 }; Create(0, rcPos, _T("HostWin")); } -HostWin::~HostWin() -{ - DestroyWindow(); -} - +HostWin::~HostWin() { DestroyWindow(); } LRESULT HostWin::OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { CAxWindow wnd(m_hWnd); - HRESULT hr= wnd.CreateControlEx( controlName, NULL, NULL,&spControl.p); + HRESULT hr = wnd.CreateControlEx(controlName, NULL, NULL, &spControl.p); return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/cpptest/cpptest.cxx b/extensions/test/ole/cpptest/cpptest.cxx index f87a0663d192..ff083a05220c 100644 --- a/extensions/test/ole/cpptest/cpptest.cxx +++ b/extensions/test/ole/cpptest/cpptest.cxx @@ -19,11 +19,10 @@ // cpptest.cpp : Defines the entry point for the console application. - #ifdef _MSC_VER #pragma once #endif -#pragma warning(disable: 4917) +#pragma warning(disable : 4917) #include #include #include @@ -33,17 +32,17 @@ HRESULT doTest(); int main(int /*argc*/, char** /*argv*/) { HRESULT hr; - if( FAILED( hr=CoInitializeEx(NULL, COINIT_APARTMENTTHREADED))) + if (FAILED(hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED))) { printf("CoInitializeEx failed \n"); return -1; } - if( FAILED(hr=doTest())) + if (FAILED(hr = doTest())) { - _com_error err( hr); - const CHAR * errMsg= err.ErrorMessage(); - MessageBoxA( NULL, errMsg, "Test failed", MB_ICONERROR); + _com_error err(hr); + const CHAR* errMsg = err.ErrorMessage(); + MessageBoxA(NULL, errMsg, "Test failed", MB_ICONERROR); } CoUninitialize(); @@ -55,13 +54,12 @@ HRESULT doTest() HRESULT hr; CComPtr spUnkMgr; - - if( FAILED(hr= spUnkMgr.CoCreateInstance(L"com.sun.star.ServiceManager"))) + if (FAILED(hr = spUnkMgr.CoCreateInstance(L"com.sun.star.ServiceManager"))) return hr; IDispatchPtr starManager; // var starManager=new ActiveXObject("com.sun.star.ServiceManager"); - if (FAILED(hr= starManager.CreateInstance(_T("com.sun.star.ServiceManager")))) + if (FAILED(hr = starManager.CreateInstance(_T("com.sun.star.ServiceManager")))) { fprintf(stderr, "creating ServiceManager failed\n"); return hr; @@ -70,9 +68,9 @@ HRESULT doTest() _variant_t varP1(L"com.sun.star.frame.Desktop"); _variant_t varRet; CComDispatchDriver dispMgr(starManager); - if (FAILED(hr= dispMgr.Invoke1(L"createInstance", &varP1, &varRet))) + if (FAILED(hr = dispMgr.Invoke1(L"createInstance", &varP1, &varRet))) { - fprintf(stderr,"createInstance of Desktop failed\n"); + fprintf(stderr, "createInstance of Desktop failed\n"); return hr; } CComDispatchDriver dispDesk(varRet.pdispVal); @@ -83,22 +81,21 @@ HRESULT doTest() // var noArgs=new Array(); // var oDoc=starDesktop.loadComponentFromURL("private:factory/swriter", "Test", 40, noArgs); IDispatchPtr oDoc; - SAFEARRAY* ar= SafeArrayCreateVector(VT_DISPATCH, 0, 0); + SAFEARRAY* ar = SafeArrayCreateVector(VT_DISPATCH, 0, 0); _variant_t args[4]; - args[3]= _variant_t(L"private:factory/swriter"); - args[2]= _variant_t(L"Test"); - args[1]= _variant_t((long) 40); - args[0].vt= VT_ARRAY | VT_DISPATCH; - args[0].parray= ar; - if (FAILED(hr= dispDesk.InvokeN(L"loadComponentFromURL", args, 4, &varRet))) + args[3] = _variant_t(L"private:factory/swriter"); + args[2] = _variant_t(L"Test"); + args[1] = _variant_t((long)40); + args[0].vt = VT_ARRAY | VT_DISPATCH; + args[0].parray = ar; + if (FAILED(hr = dispDesk.InvokeN(L"loadComponentFromURL", args, 4, &varRet))) { - fprintf(stderr,"loadComponentFromURL failed\n"); + fprintf(stderr, "loadComponentFromURL failed\n"); return hr; } CComDispatchDriver dispDoc(varRet.pdispVal); varRet.Clear(); return S_OK; - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp index 2d44a5937e3d..73969591439f 100644 --- a/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp +++ b/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.cpp @@ -18,7 +18,6 @@ */ // XCallback_Impl.cpp : Implementation of DLL Exports. - // Note: Proxy/Stub Information // To build a separate proxy/stub DLL, // run nmake -f XCallback_Implps.mk in the project directory. @@ -32,7 +31,6 @@ #include "Callback.h" #include "Simple.h" - CComModule _Module; BEGIN_OBJECT_MAP(ObjectMap) @@ -40,11 +38,9 @@ OBJECT_ENTRY(CLSID_Callback, CCallback) OBJECT_ENTRY(CLSID_Simple, CSimple) END_OBJECT_MAP() - // DLL Entry Point -extern "C" -BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) +extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) { if (dwReason == DLL_PROCESS_ATTACH) { @@ -53,17 +49,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/) } else if (dwReason == DLL_PROCESS_DETACH) _Module.Term(); - return TRUE; // ok + return TRUE; // ok } - // Used to determine whether the DLL can be unloaded by OLE -STDAPI DllCanUnloadNow(void) -{ - return (_Module.GetLockCount()==0) ? S_OK : S_FALSE; -} - +STDAPI DllCanUnloadNow(void) { return (_Module.GetLockCount() == 0) ? S_OK : S_FALSE; } // Returns a class factory to create an object of the requested type @@ -72,7 +63,6 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) return _Module.GetClassObject(rclsid, riid, ppv); } - // DllRegisterServer - Adds entries to the system registry STDAPI DllRegisterServer(void) @@ -81,14 +71,8 @@ STDAPI DllRegisterServer(void) return _Module.RegisterServer(TRUE); } - // DllUnregisterServer - Removes entries from the system registry -STDAPI DllUnregisterServer(void) -{ - return _Module.UnregisterServer(TRUE); -} - - +STDAPI DllUnregisterServer(void) { return _Module.UnregisterServer(TRUE); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit