diff options
| -rw-r--r-- | basic/inc/basic/sbxcore.hxx | 9 | ||||
| -rw-r--r-- | desktop/source/app/appinit.cxx | 2 | ||||
| -rwxr-xr-x | desktop/unx/source/pagein.c | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx index 085fe10d52bb..9f73f264318e 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 be1d1502f683..13624379bf5d 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 947b4b7375d5..90392b790881 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, '/'))) |