npower14miscfixes: merge with DEV300_m75

4 files changed, 18 insertions, 15 deletions

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 03a31ac63db9..53cf115382e5 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -548,8 +548,10 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
 
         case SID_CRASH :
         {
-            GetpApp()->Exception( EXC_SYSTEM );
-            abort();
+            // Provoke a crash:
+            char * crash = 0;
+            *crash = 0;
+            break;
         }
 
         case SID_SHOW_IME_STATUS_WINDOW:
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 26fb46ec8b17..9ef635ae4786 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -122,7 +122,8 @@ rtl::OUString HelpLocaleString()
         Any aLocale =
             ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty(
                ::utl::ConfigManager::LOCALE );
-        bool bOk = (aLocale >>= aLocaleStr);
+        aLocale >>= aLocaleStr;
+        bool bOk = aLocaleStr.getLength() != 0;
         if ( bOk )
         {
             rtl::OUString aBaseInstallPath;
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index b128e305d655..091651fedbc2 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -549,9 +549,17 @@ uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL )
             }
         }
     }
-    catch( uno::Exception& )
-    {
-        DBG_ERRORFILE( "GetResultSet: Any other exception" );
+    catch( uno::Exception& e )
+    {
+        (void) e;
+        DBG_ERRORFILE(
+            rtl::OUStringToOString(
+                (rtl::OUString(
+                    RTL_CONSTASCII_USTRINGPARAM(
+                        "GetResultSet: Any other exception: ")) +
+                 e.Message),
+                RTL_TEXTENCODING_UTF8).
+            getStr());
     }
 
     if ( pList )
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index b0711f919a7b..a3c20411d1fc 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1259,21 +1259,13 @@ sal_uInt16 SfxObjectShell::ImplCheckSignaturesInformation( const uno::Sequence<
     bool bCompleteSignature = true;
     if( nInfos )
     {
-        //These errors of certificates are allowed
-        sal_Int32 nNonErrors = security::CertificateValidity::VALID |
-                               security::CertificateValidity::UNKNOWN_REVOKATION;
-        //Build a  mask to filter out the allowed errors
-        sal_Int32 nMask = ~nNonErrors;
-
         nResult = SIGNATURESTATE_SIGNATURES_OK;
         for ( int n = 0; n < nInfos; n++ )
         {
             if ( bCertValid )
             {
                 sal_Int32 nCertStat = aInfos[n].CertificateStatus;
-                // "subtract" the allowed error flags from the result
-                sal_Int32 nErrors = ( nCertStat & nMask );
-                bCertValid = nErrors > 0 ? sal_False : sal_True;
+                bCertValid = nCertStat == security::CertificateValidity::VALID ? sal_True : sal_False;
             }
 
             if ( !aInfos[n].SignatureIsValid )