[Libreoffice-commits] .: embedserv/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Dec 21 15:16:20 PST 2012


 embedserv/source/embed/ed_ioleobject.cxx |    2 --
 embedserv/source/inprocserv/dllentry.cxx |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 3567a7e324a47dbafc91b7d39031dd58677eaa6c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Dec 22 00:14:46 2012 +0100

    Some cppcheck cleaning in embedserv
    
    Change-Id: I49d81f482c6b97627e6e7cc3741246b70383eb5a

diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx
index f51ebda..e8651b3 100644
--- a/embedserv/source/embed/ed_ioleobject.cxx
+++ b/embedserv/source/embed/ed_ioleobject.cxx
@@ -176,12 +176,10 @@ STDMETHODIMP EmbedDocument_Impl::DoVerb(
                 OSL_ENSURE(m_pDocHolder,"no document for inplace activation");
 
                 return m_pDocHolder->InPlaceActivate(pActiveSite,FALSE);
-                break;
             case OLEIVERB_UIACTIVATE:
                 OSL_ENSURE(m_pDocHolder,"no document for     inplace activation");
 
                 return m_pDocHolder->InPlaceActivate(pActiveSite,TRUE);
-                break;
             case OLEIVERB_PRIMARY:
             case OLEIVERB_SHOW:
                 OSL_ENSURE(m_pDocHolder,"no document for inplace activation");
diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx
index 3fc6997..3622c96 100644
--- a/embedserv/source/inprocserv/dllentry.cxx
+++ b/embedserv/source/inprocserv/dllentry.cxx
@@ -207,10 +207,10 @@ extern "C" STDAPI INPROC_DLLPUBLIC DllCanUnloadNow()
 // -------------------------------------------------------------------------------
 STDAPI INPROC_DLLPUBLIC DllRegisterServer( void )
 {
-    char aLibPath[1024];
     HMODULE aCurModule = GetModuleHandleA( "inprocserv.dll" );
     if( aCurModule )
     {
+        char aLibPath[1024];
         DWORD nLen = GetModuleFileNameA( aCurModule, aLibPath, 1019 );
         if ( nLen && nLen < 1019 )
         {


More information about the Libreoffice-commits mailing list