clang-cl loplugin: embedserv

Change-Id: I9901dac882a74453015881ded2355ff0a51b50d5
Reviewed-on: https://gerrit.libreoffice.org/29868
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

1 files changed, 39 insertions, 39 deletions

diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index 2f412d338db2..3bde41481447 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -83,20 +83,20 @@ void SAL_CALL Interceptor::dispose()
     if(m_pStatCL)
         m_pStatCL->disposeAndClear( aEvt );
 
-    m_xSlaveDispatchProvider = 0;
-    m_xMasterDispatchProvider = 0;
+    m_xSlaveDispatchProvider = nullptr;
+    m_xMasterDispatchProvider = nullptr;
 }
 
 
 Interceptor::Interceptor(
     const ::rtl::Reference< EmbeddedDocumentInstanceAccess_Impl >& xOleAccess,
     DocumentHolder* pDocH,
-    sal_Bool bLink )
+    bool bLink )
     : m_xOleAccess( xOleAccess ),
       m_xDocHLocker( static_cast< ::cppu::OWeakObject* >( pDocH ) ),
       m_pDocH(pDocH),
-      m_pDisposeEventListeners(0),
-      m_pStatCL(0),
+      m_pDisposeEventListeners(nullptr),
+      m_pStatCL(nullptr),
       m_bLink( bLink )
 {
     m_aInterceptedURL[0] = ".uno:Save";
@@ -113,7 +113,7 @@ Interceptor::~Interceptor()
     delete m_pDisposeEventListeners;
     delete m_pStatCL;
 
-    DocumentHolder* pTmpDocH = NULL;
+    DocumentHolder* pTmpDocH = nullptr;
     uno::Reference< uno::XInterface > xLock;
     {
         osl::MutexGuard aGuard(m_aMutex);
@@ -130,8 +130,8 @@ void Interceptor::DisconnectDocHolder()
 {
     osl::MutexGuard aGuard(m_aMutex);
     m_xDocHLocker.clear();
-    m_pDocH = NULL;
-    m_xOleAccess = NULL;
+    m_pDocH = nullptr;
+    m_xOleAccess = nullptr;
 }
 
 //XDispatch
@@ -169,7 +169,7 @@ Interceptor::dispatch(
                 {
                     if ( aNewArgs[nInd].Name == "SaveTo" )
                     {
-                        aNewArgs[nInd].Value <<= sal_True;
+                        aNewArgs[nInd].Value <<= true;
                         break;
                     }
                     nInd++;
@@ -179,11 +179,11 @@ Interceptor::dispatch(
                 {
                     aNewArgs.realloc( nInd + 1 );
                     aNewArgs[nInd].Name = "SaveTo";
-                    aNewArgs[nInd].Value <<= sal_True;
+                    aNewArgs[nInd].Value <<= true;
                 }
 
                 uno::Reference< frame::XDispatch > xDispatch = m_xSlaveDispatchProvider->queryDispatch(
-                    URL, OUString( "_self" ), 0 );
+                    URL, "_self", 0 );
                 if ( xDispatch.is() )
                     xDispatch->dispatch( URL, aNewArgs );
             }
@@ -196,7 +196,7 @@ void Interceptor::generateFeatureStateEvent()
 {
     if( m_pStatCL )
     {
-        DocumentHolder* pTmpDocH = NULL;
+        DocumentHolder* pTmpDocH = nullptr;
         uno::Reference< uno::XInterface > xLock;
         {
             osl::MutexGuard aGuard(m_aMutex);
@@ -223,14 +223,14 @@ void Interceptor::generateFeatureStateEvent()
                 continue;
 
             frame::FeatureStateEvent aStateEvent;
-            aStateEvent.IsEnabled = sal_True;
-            aStateEvent.Requery = sal_False;
+            aStateEvent.IsEnabled = true;
+            aStateEvent.Requery = false;
             if(i == 0)
             {
 
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
                 aStateEvent.FeatureDescriptor = "Update";
-                aStateEvent.State <<= (OUString("($1) ") + aTitle);
+                aStateEvent.State <<= ("($1) " + aTitle);
 
             }
             else if ( i == 5 )
@@ -243,7 +243,7 @@ void Interceptor::generateFeatureStateEvent()
             {
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
                 aStateEvent.FeatureDescriptor = "Close and Return";
-                aStateEvent.State <<= (OUString("($2) ") + aTitle);
+                aStateEvent.State <<= ("($2) " + aTitle);
 
             }
 
@@ -274,7 +274,7 @@ Interceptor::addStatusListener(
 
     if( !m_bLink && URL.Complete == m_aInterceptedURL[0] )
     {   // Save
-        DocumentHolder* pTmpDocH = NULL;
+        DocumentHolder* pTmpDocH = nullptr;
         uno::Reference< uno::XInterface > xLock;
         {
             osl::MutexGuard aGuard(m_aMutex);
@@ -290,9 +290,9 @@ Interceptor::addStatusListener(
         frame::FeatureStateEvent aStateEvent;
         aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
         aStateEvent.FeatureDescriptor = "Update";
-        aStateEvent.IsEnabled = sal_True;
-        aStateEvent.Requery = sal_False;
-        aStateEvent.State <<= (OUString("($1) ") + aTitle );
+        aStateEvent.IsEnabled = true;
+        aStateEvent.Requery = false;
+        aStateEvent.State <<= ("($1) " + aTitle );
         Control->statusChanged(aStateEvent);
 
         {
@@ -312,7 +312,7 @@ Interceptor::addStatusListener(
            URL.Complete == m_aInterceptedURL[++i] ||
            URL.Complete == m_aInterceptedURL[++i] ) )
     {   // Close and return
-        DocumentHolder* pTmpDocH = NULL;
+        DocumentHolder* pTmpDocH = nullptr;
         uno::Reference< uno::XInterface > xLock;
         {
             osl::MutexGuard aGuard(m_aMutex);
@@ -328,9 +328,9 @@ Interceptor::addStatusListener(
         frame::FeatureStateEvent aStateEvent;
         aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
         aStateEvent.FeatureDescriptor = "Close and Return";
-        aStateEvent.IsEnabled = sal_True;
-        aStateEvent.Requery = sal_False;
-        aStateEvent.State <<= (OUString("($2) ") + aTitle );
+        aStateEvent.IsEnabled = true;
+        aStateEvent.Requery = false;
+        aStateEvent.State <<= ("($2) " + aTitle );
         Control->statusChanged(aStateEvent);
 
 
@@ -350,8 +350,8 @@ Interceptor::addStatusListener(
         frame::FeatureStateEvent aStateEvent;
         aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
         aStateEvent.FeatureDescriptor = "SaveCopyTo";
-        aStateEvent.IsEnabled = sal_True;
-        aStateEvent.Requery = sal_False;
+        aStateEvent.IsEnabled = true;
+        aStateEvent.Requery = false;
         aStateEvent.State <<= (OUString("($3)"));
         Control->statusChanged(aStateEvent);
 
@@ -422,23 +422,23 @@ Interceptor::queryDispatch(
 {
     osl::MutexGuard aGuard(m_aMutex);
     if( !m_bLink && URL.Complete == m_aInterceptedURL[0] )
-        return (frame::XDispatch*)this;
+        return static_cast<frame::XDispatch*>(this);
     else if(URL.Complete == m_aInterceptedURL[1])
-        return (frame::XDispatch*)0   ;
+        return nullptr;
     else if( !m_bLink && URL.Complete == m_aInterceptedURL[2] )
-        return (frame::XDispatch*)this;
+        return static_cast<frame::XDispatch*>(this);
     else if( !m_bLink && URL.Complete == m_aInterceptedURL[3] )
-        return (frame::XDispatch*)this;
+        return static_cast<frame::XDispatch*>(this);
     else if( !m_bLink && URL.Complete == m_aInterceptedURL[4] )
-        return (frame::XDispatch*)this;
+        return static_cast<frame::XDispatch*>(this);
     else if(URL.Complete == m_aInterceptedURL[5])
-        return (frame::XDispatch*)this;
+        return static_cast<frame::XDispatch*>(this);
     else {
         if(m_xSlaveDispatchProvider.is())
             return m_xSlaveDispatchProvider->queryDispatch(
                 URL,TargetFrameName,SearchFlags);
         else
-            return uno::Reference<frame::XDispatch>(0);
+            return uno::Reference<frame::XDispatch>(nullptr);
     }
 }
 
@@ -458,17 +458,17 @@ Interceptor::queryDispatches(
 
     for(sal_Int32 i = 0; i < Requests.getLength(); ++i)
         if ( !m_bLink && m_aInterceptedURL[0] == Requests[i].FeatureURL.Complete )
-            aRet[i] = (frame::XDispatch*) this;
+            aRet[i] = static_cast<frame::XDispatch*>(this);
         else if(m_aInterceptedURL[1] == Requests[i].FeatureURL.Complete)
-            aRet[i] = (frame::XDispatch*) 0;
+            aRet[i] = nullptr;
         else if( !m_bLink && m_aInterceptedURL[2] == Requests[i].FeatureURL.Complete )
-            aRet[i] = (frame::XDispatch*) this;
+            aRet[i] = static_cast<frame::XDispatch*>(this);
         else if( !m_bLink && m_aInterceptedURL[3] == Requests[i].FeatureURL.Complete )
-            aRet[i] = (frame::XDispatch*) this;
+            aRet[i] = static_cast<frame::XDispatch*>(this);
         else if( !m_bLink && m_aInterceptedURL[4] == Requests[i].FeatureURL.Complete )
-            aRet[i] = (frame::XDispatch*) this;
+            aRet[i] = static_cast<frame::XDispatch*>(this);
         else if(m_aInterceptedURL[5] == Requests[i].FeatureURL.Complete)
-            aRet[i] = (frame::XDispatch*) this;
+            aRet[i] = static_cast<frame::XDispatch*>(this);
 
     return aRet;
 }