[Libreoffice-commits] .: basic/inc desktop/source desktop/unx

Julien Nabet serval2412 at kemper.freedesktop.org
Sun Jul 31 08:36:59 PDT 2011


 basic/inc/basic/sbxcore.hxx    |    9 ++++++---
 desktop/source/app/appinit.cxx |    2 +-
 desktop/unx/source/pagein.c    |    1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 771c8d34780b48497e2ca3408c6b509b5137d251
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Jul 31 17:37:07 2011 +0200

    Some cppcheck cleaning

diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 3aec642..8cbaf43 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -145,16 +145,19 @@ SV_DECL_REF(SbxBase)
 #endif
 
 inline void SbxBase::SetFlags( sal_uInt16 n )
-{ DBG_CHKTHIS( SbxBase, 0 ); nFlags = n; }
+{ //DBG_CHKTHIS( SbxBase, 0 );
+ nFlags = n; }
 
 inline sal_uInt16 SbxBase::GetFlags() const
 { DBG_CHKTHIS( SbxBase, 0 ); return nFlags; }
 
 inline void SbxBase::SetFlag( sal_uInt16 n )
-{ DBG_CHKTHIS( SbxBase, 0 ); nFlags |= n; }
+{ //DBG_CHKTHIS( SbxBase, 0 );
+ nFlags |= n; }
 
 inline void SbxBase::ResetFlag( sal_uInt16 n )
-{ DBG_CHKTHIS( SbxBase, 0 ); nFlags &= ~n; }
+{ //DBG_CHKTHIS( SbxBase, 0 );
+ nFlags &= ~n; }
 
 inline sal_Bool SbxBase::IsSet( sal_uInt16 n ) const
 { DBG_CHKTHIS( SbxBase, 0 ); return sal_Bool( ( nFlags & n ) != 0 ); }
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 45e9528..dd7bc2f 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -402,7 +402,7 @@ void Desktop::CreateTemporaryDirectory()
         else
             aMsg = OUString( RTL_CONSTASCII_USTRINGPARAM( "The path manager is not available.\n" ));
         e.Message = aMsg + e.Message;
-        throw e;
+        throw;
     }
 
     // remove possible old directory and base directory
diff --git a/desktop/unx/source/pagein.c b/desktop/unx/source/pagein.c
index 947b4b7..90392b7 100755
--- a/desktop/unx/source/pagein.c
+++ b/desktop/unx/source/pagein.c
@@ -108,6 +108,7 @@ int pagein_execute (int argc, char **argv)
         if ((argv[i][0] == '@') && ((fp = fopen (argv[i], "r")) == 0))
         {
             char fullpath[4096];
+            memset(fullpath, 0, sizeof(fullpath));
             char *path;
             strncpy (fullpath, argv[i] + 1, 3000);
             if (!(path = strrchr (fullpath, '/')))


More information about the Libreoffice-commits mailing list