[Libreoffice-commits] core.git: embedserv/source svl/source winaccessibility/source

Stephan Bergmann sbergman at redhat.com
Wed Jan 24 18:18:33 UTC 2018


 embedserv/source/inprocserv/dllentry.cxx                              |    3 ---
 embedserv/source/inprocserv/inprocembobj.cxx                          |    4 ----
 svl/source/svdde/ddecli.cxx                                           |    5 -----
 winaccessibility/source/service/AccContainerEventListener.cxx         |    4 ----
 winaccessibility/source/service/AccDescendantManagerEventListener.cxx |    4 ----
 winaccessibility/source/service/AccDialogEventListener.cxx            |    4 ----
 winaccessibility/source/service/AccFrameEventListener.cxx             |    4 ----
 winaccessibility/source/service/AccMenuEventListener.cxx              |    4 ----
 winaccessibility/source/service/AccWindowEventListener.cxx            |    4 ----
 9 files changed, 36 deletions(-)

New commits:
commit 902698412183e93a1bd018200c63054a422f2636
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 24 08:34:52 2018 +0100

    loplugin:emptyif (clang-cl)
    
    Change-Id: I8ddf764f9e155c037e25855b7d6efc49eb494179
    Reviewed-on: https://gerrit.libreoffice.org/48483
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx
index 581435cba1c3..65d8bc550a4b 100644
--- a/embedserv/source/inprocserv/dllentry.cxx
+++ b/embedserv/source/inprocserv/dllentry.cxx
@@ -163,9 +163,6 @@ extern "C" BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lp
     {
         g_hInstance = hInstance;
     }
-    else if (dwReason == DLL_PROCESS_DETACH)
-    {
-    }
 
     return TRUE;    // ok
 }
diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx
index cb43f94fe5ba..cffa2cf03c58 100644
--- a/embedserv/source/inprocserv/inprocembobj.cxx
+++ b/embedserv/source/inprocserv/inprocembobj.cxx
@@ -848,10 +848,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::DoVerb(
         if ( SUCCEEDED( hr ) && pOleObject )
         {
             hr = pOleObject->DoVerb( iVerb, pMsg, pActiveSite, nLong, hWin, pRect );
-            if ( SUCCEEDED( hr ) )
-            {
-            }
-
             return hr;
         }
 
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index 3faef58aca80..f5f30412c747 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -125,11 +125,6 @@ HDDEDATA CALLBACK DdeInternal::CliCallback( UINT nCode, UINT nCbType,
                 SAL_FALLTHROUGH;
 
             case XTYP_REQUEST:
-                if( !hData && XTYP_REQUEST == nCode )
-                {
-
-                }
-
                 DdeData d;
                 d.xImp->hData = hData;
                 d.xImp->nFmt  = DdeData::GetInternalFormat( nCbType );
diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx
index dc66b4b3df06..fefdd50827a6 100644
--- a/winaccessibility/source/service/AccContainerEventListener.cxx
+++ b/winaccessibility/source/service/AccContainerEventListener.cxx
@@ -137,8 +137,6 @@ void AccContainerEventListener::HandleChildChangedEvent(Any oldValue, Any newVal
                 pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
             }
         }
-        else
-        {}
     }
     else if (oldValue >>= xChild)
     {
@@ -153,8 +151,6 @@ void AccContainerEventListener::HandleChildChangedEvent(Any oldValue, Any newVal
             pAgent->DeleteAccObj( pAcc );
 
         }
-        else
-        {}
     }
 
 }
diff --git a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
index 71b77ff131c1..3f865cd2e27d 100644
--- a/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
+++ b/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
@@ -96,8 +96,6 @@ void AccDescendantManagerEventListener::HandleChildChangedEvent(Any oldValue, An
             pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
 
         }
-        else
-        {}
     }
 
     if (oldValue >>= xChild)
@@ -110,8 +108,6 @@ void AccDescendantManagerEventListener::HandleChildChangedEvent(Any oldValue, An
             pAgent->DeleteChildrenAccObj( pAcc );
             pAgent->DeleteAccObj( pAcc );
         }
-        else
-        {}
     }
 
 }
diff --git a/winaccessibility/source/service/AccDialogEventListener.cxx b/winaccessibility/source/service/AccDialogEventListener.cxx
index e75341c04127..c67b7ed6bf74 100644
--- a/winaccessibility/source/service/AccDialogEventListener.cxx
+++ b/winaccessibility/source/service/AccDialogEventListener.cxx
@@ -84,8 +84,6 @@ void AccDialogEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
             pAgent->InsertChildrenAccObj(pAcc);
             pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
         }
-        else
-        {}
     }
     else if (oldValue >>= xChild)
     {
@@ -99,8 +97,6 @@ void AccDialogEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
             //delete this child
             pAgent->DeleteAccObj( pAcc );
         }
-        else
-        {}
     }
 
 }
diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx
index 51f8bb579b59..8f7a6bc32753 100644
--- a/winaccessibility/source/service/AccFrameEventListener.cxx
+++ b/winaccessibility/source/service/AccFrameEventListener.cxx
@@ -97,8 +97,6 @@ void AccFrameEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
             pAgent->InsertChildrenAccObj(pAcc);
             pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
         }
-        else
-        {}
     }
     else if (oldValue >>= xChild)
     {
@@ -112,8 +110,6 @@ void AccFrameEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
             //delete this child
             pAgent->DeleteAccObj( pAcc );
         }
-        else
-        {}
     }
 
 }
diff --git a/winaccessibility/source/service/AccMenuEventListener.cxx b/winaccessibility/source/service/AccMenuEventListener.cxx
index 6713afc76952..623997177e9f 100644
--- a/winaccessibility/source/service/AccMenuEventListener.cxx
+++ b/winaccessibility/source/service/AccMenuEventListener.cxx
@@ -83,8 +83,6 @@ void AccMenuEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
             pAgent->InsertChildrenAccObj(pAcc);
             pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
         }
-        else
-        {}
     }
     else if (oldValue >>= xChild)
     {
@@ -98,8 +96,6 @@ void AccMenuEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
             //delete this child
             pAgent->DeleteAccObj( pAcc );
         }
-        else
-        {}
     }
 
 }
diff --git a/winaccessibility/source/service/AccWindowEventListener.cxx b/winaccessibility/source/service/AccWindowEventListener.cxx
index d49df491c7f4..ff68da52fda8 100644
--- a/winaccessibility/source/service/AccWindowEventListener.cxx
+++ b/winaccessibility/source/service/AccWindowEventListener.cxx
@@ -84,8 +84,6 @@ void AccWindowEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
             pAgent->InsertChildrenAccObj(pAcc);
             pAgent->NotifyAccEvent(UM_EVENT_CHILD_ADDED, pAcc);
         }
-        else
-        {}
     }
     else if (oldValue >>= xChild)
     {
@@ -98,8 +96,6 @@ void AccWindowEventListener::HandleChildChangedEvent(Any oldValue, Any newValue)
             //delete this child
             pAgent->DeleteAccObj( pAcc );
         }
-        else
-        {}
     }
 }
 


More information about the Libreoffice-commits mailing list