From 70e0c09fcffa5520d3cfdc4708c81248b135c796 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 1 Dec 2014 12:56:22 +0000 Subject: - more warning fixes; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@11191 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/mTextControl/src/richeditutils.cpp | 42 ++++++++++++++---------------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'plugins/mTextControl/src/richeditutils.cpp') diff --git a/plugins/mTextControl/src/richeditutils.cpp b/plugins/mTextControl/src/richeditutils.cpp index 043ab81675..7ffa31c1bd 100644 --- a/plugins/mTextControl/src/richeditutils.cpp +++ b/plugins/mTextControl/src/richeditutils.cpp @@ -1,6 +1,6 @@ #include "headers.h" -class CREOleCallback: public IRichEditOleCallback +class CREOleCallback : public IRichEditOleCallback { private: unsigned refCount; @@ -16,8 +16,7 @@ public: HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, LPVOID * ppvObj) { - if (IsEqualIID(riid, IID_IRichEditOleCallback)) - { + if (IsEqualIID(riid, IID_IRichEditOleCallback)) { *ppvObj = this; this->AddRef(); return S_OK; @@ -30,49 +29,49 @@ public: { if (this->refCount == 0) { if (S_OK != StgCreateDocfile(NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &this->pictStg)) - this->pictStg = NULL; + this->pictStg = NULL; this->nextStgId = 0; - } - return ++this->refCount; + } + return ++this->refCount; } ULONG STDMETHODCALLTYPE Release() { - if (--this->refCount == 0) { - if (this->pictStg) + if (--this->refCount == 0) { + if (this->pictStg) this->pictStg->Release(); - } - return this->refCount; + } + return this->refCount; } HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode) { - return S_OK; + return S_OK; } HRESULT STDMETHODCALLTYPE DeleteObject(LPOLEOBJECT lpoleobj) { - return S_OK; + return S_OK; } HRESULT STDMETHODCALLTYPE GetClipboardData(CHARRANGE * lpchrg, DWORD reco, LPDATAOBJECT * lplpdataobj) { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE GetContextMenu(WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE * lpchrg, HMENU * lphmenu) { - return E_INVALIDARG; + return E_INVALIDARG; } HRESULT STDMETHODCALLTYPE GetDragDropEffect(BOOL fDrag, DWORD grfKeyState, LPDWORD pdwEffect) { - return S_OK; + return S_OK; } HRESULT STDMETHODCALLTYPE GetInPlaceContext(LPOLEINPLACEFRAME * lplpFrame, LPOLEINPLACEUIWINDOW * lplpDoc, LPOLEINPLACEFRAMEINFO lpFrameInfo) { - return E_INVALIDARG; + return E_INVALIDARG; } HRESULT STDMETHODCALLTYPE GetNewStorage(LPSTORAGE * lplpstg) @@ -82,7 +81,7 @@ public: if (this->pictStg == NULL) return STG_E_MEDIUMFULL; - return this->pictStg->CreateStorage(sztName, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, lplpstg); + return this->pictStg->CreateStorage(sztName, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, lplpstg); } @@ -93,12 +92,12 @@ public: HRESULT STDMETHODCALLTYPE QueryInsertObject(LPCLSID lpclsid, LPSTORAGE lpstg, LONG cp) { - return S_OK; + return S_OK; } HRESULT STDMETHODCALLTYPE ShowContainerUI(BOOL fShow) { - return S_OK; + return S_OK; } }; @@ -113,8 +112,7 @@ void InitRichEdit(ITextServices *ts) LRESULT CALLBACK RichEditProxyWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { ITextServices *ts = (ITextServices *)GetWindowLongPtr(hwnd, GWLP_USERDATA); - if (ts && (msg != WM_DESTROY)) - { + if (ts && (msg != WM_DESTROY)) { LRESULT lResult; ts->TxSendMessage(msg, wParam, lParam, &lResult); return lResult; @@ -139,7 +137,7 @@ void LoadRichEdit() wcl.hbrBackground = (HBRUSH)GetStockObject(LTGRAY_BRUSH); wcl.lpszMenuName = NULL; wcl.lpszClassName = _T("NBRichEditProxyWndClass"); - wcl.hIconSm = 0; + wcl.hIconSm = 0; RegisterClassEx(&wcl); } -- cgit v1.2.3