loplugin: various warnings

Change-Id: I605bffb518d804ee69edda5e7641e13e4c14ef01

framework/source/dispatch/dispatchprovider.cxx

@@ -246,12 +246,11 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
     //  Why is "top" here handled too? Because the desktop is the topest frame. Normaly it's superflous
     //  to use this target - but we can handle it in the same manner then "_self".
     //-----------------------------------------------------------------------------------------------------
-    else
+    else if (
-    if (
+             (sTargetFrameName==SPECIALTARGET_SELF)  ||
-        (sTargetFrameName==SPECIALTARGET_SELF)  ||
+             (sTargetFrameName==SPECIALTARGET_TOP )  ||
-        (sTargetFrameName==SPECIALTARGET_TOP )  ||
+             (sTargetFrameName.isEmpty())
-        (sTargetFrameName.isEmpty())
+            )
-       )
     {
         xDispatcher = implts_searchProtocolHandler(aURL);
     }
@@ -274,10 +273,9 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
             css::uno::Reference< css::frame::XDispatchProvider > xProvider( xFoundFrame, css::uno::UNO_QUERY );
             xDispatcher = xProvider->queryDispatch(aURL,SPECIALTARGET_SELF,0);
         }
-        else
         // if it couldn't be found - but creation was allowed
         // use special dispatcher for creatio or froward it to the browser
-        if (nSearchFlags & css::frame::FrameSearchFlag::CREATE)
+        else if (nSearchFlags & css::frame::FrameSearchFlag::CREATE)
             xDispatcher = implts_getOrCreateDispatchHelper( E_CREATEDISPATCHER, xDesktop, sTargetFrameName, nSearchFlags );
     }
 
@@ -324,8 +322,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
     // I.II) "_menubar"
     //  Special mode on frame or task to receive the local menu. Not supported by findFrame()
     //-----------------------------------------------------------------------------------------------------
-    else
+    else if (sTargetName==SPECIALTARGET_MENUBAR)
-    if (sTargetName==SPECIALTARGET_MENUBAR)
     {
         xDispatcher = implts_getOrCreateDispatchHelper( E_MENUDISPATCHER, xFrame );
     }
@@ -335,8 +332,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
     //  Special sub frame of a top frame only. Search or create it. ... OK it's currently a little bit HACKI.
     //  Only the sfx (means the controller) can create it it.
     //-----------------------------------------------------------------------------------------------------
-    else
+    else if (sTargetName==SPECIALTARGET_BEAMER)
-    if (sTargetName==SPECIALTARGET_BEAMER)
     {
         css::uno::Reference< css::frame::XDispatchProvider > xBeamer( xFrame->findFrame( SPECIALTARGET_BEAMER, css::frame::FrameSearchFlag::CHILDREN | css::frame::FrameSearchFlag::SELF ), css::uno::UNO_QUERY );
         if (xBeamer.is())
@@ -357,8 +353,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
     // I.V) "_parent"
     //  Our parent frame (if it exist) should handle this URL.
     //-----------------------------------------------------------------------------------------------------
-    else
+    else if (sTargetName==SPECIALTARGET_PARENT)
-    if (sTargetName==SPECIALTARGET_PARENT)
     {
         css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY );
         if (xParent.is())
@@ -371,8 +366,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
     //  This request must be forwarded to any parent frame, till we reach a top frame.
     //  If no parent exist, we can handle itself.
     //-----------------------------------------------------------------------------------------------------
-    else
+    else if (sTargetName==SPECIALTARGET_TOP)
-    if (sTargetName==SPECIALTARGET_TOP)
     {
         if (xFrame->isTop())
         {
@@ -398,11 +392,10 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
     //  protocol handler. If this failed too - we check for a loadable content and in case of true
     //  we load it into the frame by returning specilized dispatch object.
     //-----------------------------------------------------------------------------------------------------
-    else
+    else if (
-    if (
+             (sTargetName==SPECIALTARGET_SELF)  ||
-        (sTargetName==SPECIALTARGET_SELF)  ||
+             (sTargetName.isEmpty())
-        (sTargetName.isEmpty())
+            )
-       )
     {
         // There exist a hard coded interception for special URLs.
         if ( aURL.Complete == ".uno:CloseDoc" || aURL.Complete == ".uno:CloseWin" )

sw/source/core/bastyp/swcache.cxx

@@ -37,8 +37,8 @@ void SwCache::Check()
         return;
 
     // consistency check
-    SAL_WARN_IF( pLast->GetNext(), "sw", "Last but not last." );
+    SAL_WARN_IF( pLast->GetNext(), "sw.core", "Last but not last." );
-    SAL_WARN_IF( pRealFirst->GetPrev(), "sw", "First but not first." );
+    SAL_WARN_IF( pRealFirst->GetPrev(), "sw.core", "First but not first." );
     sal_uInt16 nCnt = 0;
     bool bFirstFound = false;
     SwCacheObj *pObj = pRealFirst;
@@ -49,20 +49,20 @@ void SwCache::Check()
         SwCacheObj *pTmp = pLast;
         while ( pTmp && pTmp != pObj )
             pTmp = pTmp->GetPrev();
-        SAL_WARN_IF( !pTmp, "sw", "Objekt not found." );
+        SAL_WARN_IF( !pTmp, "sw.core", "Objekt not found." );
 
         ++nCnt;
         if ( pObj == pFirst )
             bFirstFound = true;
         if ( !pObj->GetNext() )
-            SAL_WARN_IF( pObj != pLast, "sw", "Last not Found." );
+            SAL_WARN_IF( pObj != pLast, "sw.core", "Last not Found." );
         pObj = pObj->GetNext();
-        SAL_WARN_IF( pObj == pRekursive, "sw", "Recursion in SwCache." );
+        SAL_WARN_IF( pObj == pRekursive, "sw.core", "Recursion in SwCache." );
     }
-    SAL_WARN_IF( !bFirstFound, "sw", "First not Found." );
+    SAL_WARN_IF( !bFirstFound, "sw.core", "First not Found." );
-    SAL_WARN_IF( nCnt + aFreePositions.size() != size(), "sw", "Lost Chain." );
+    SAL_WARN_IF( nCnt + aFreePositions.size() != size(), "sw.core", "Lost Chain." );
     SAL_WARN_IF(
-        size() == nCurMax && nCurMax != aFreePositions.size() + nCnt, "sw",
+        size() == nCurMax && nCurMax != aFreePositions.size() + nCnt, "sw.core",
         "Lost FreePositions." );
 }
 

sw/source/core/graphic/ndgrf.cxx

@@ -884,7 +884,7 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
         catch (const uno::Exception& e)
         {
             // #i48434#
-            SAL_WARN("sw", "<SwGrfNode::MakeCopy(..)> - unhandled exception!" << e.Message);
+            SAL_WARN("sw.core", "<SwGrfNode::MakeCopy(..)> - unhandled exception!" << e.Message);
         }
     }
     else

tools/source/inet/inetstrm.cxx

@@ -1506,7 +1506,7 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize)
                                     return status;
                             }
                             else {
-                                SAL_WARN( "tools", "Boundary not found." );
+                                SAL_WARN( "tools.stream", "Boundary not found." );
                             }
                             status = INetMessageIOStream::PutMsgLine(
                                 pOldPos, pChar - pOldPos + 1 );