[Libreoffice-commits] core.git: shell/source

[Mike Kaganski (via logerrit)]

 shell/source/win32/spsupp/COMOpenDocuments.cxx |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 31cc28ca7c02f28b64e9d757c9fc17e2a81ba352
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Tue May 14 19:15:59 2019 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed May 15 05:32:15 2019 +0200

    Use proper VARIANT_BOOL values: VARIANT_TRUE is actually -1
    
    Who was that idiot who initially used wrong values??? Hmm... oh damn,
    that was me :-(
    
    Change-Id: I3bfde7511bcf8adfa38ae68372f21511f21efca1
    Reviewed-on: https://gerrit.libreoffice.org/72308
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/shell/source/win32/spsupp/COMOpenDocuments.cxx b/shell/source/win32/spsupp/COMOpenDocuments.cxx
index 319cd8c1751a..4d00b8de6c46 100644
--- a/shell/source/win32/spsupp/COMOpenDocuments.cxx
+++ b/shell/source/win32/spsupp/COMOpenDocuments.cxx
@@ -16,8 +16,11 @@
 #include <spsuppServ.hpp>
 #include <stdio.h>
 
+namespace
+{
+
 // Display confirmation dialog, return false on negative answer
-static bool SecurityWarning(const wchar_t* sProgram, const wchar_t* sDocument)
+bool SecurityWarning(const wchar_t* sProgram, const wchar_t* sDocument)
 {
     // TODO: change wording (currently taken from MS Office), use LO localization
     wchar_t sBuf[65536];
@@ -30,7 +33,7 @@ static bool SecurityWarning(const wchar_t* sProgram, const wchar_t* sDocument)
 }
 
 // Returns S_OK if successful
-static HRESULT LOStart(const wchar_t* sModeArg, const wchar_t* sFilePath, bool bDoSecurityWarning)
+HRESULT LOStart(const wchar_t* sModeArg, const wchar_t* sFilePath, bool bDoSecurityWarning)
 {
     const wchar_t* sProgram = GetLOPath();
     if (bDoSecurityWarning && !SecurityWarning(sProgram, sFilePath))
@@ -76,6 +79,10 @@ static HRESULT LOStart(const wchar_t* sModeArg, const wchar_t* sFilePath, bool b
     return S_OK;
 }
 
+VARIANT_BOOL toVBool(bool b) { return b ? VARIANT_TRUE : VARIANT_FALSE; }
+
+} // namespace
+
 // IObjectSafety methods
 
 void COMOpenDocuments::COMObjectSafety::SetMaskedOptions(DWORD iMask, DWORD iOptions)
@@ -309,7 +316,7 @@ STDMETHODIMP COMOpenDocuments::CreateNewDocument2(
 {
     // TODO: resolve the program from varProgID (nullptr -> default?)
     HRESULT hr = LOStart(L"-n", bstrTemplateLocation, m_aObjectSafety.GetSafe_forUntrustedCaller() || m_aObjectSafety.GetSafe_forUntrustedData());
-    *pbResult = VARIANT_BOOL(SUCCEEDED(hr));
+    *pbResult = toVBool(SUCCEEDED(hr));
     return hr;
 }
 
@@ -360,7 +367,7 @@ STDMETHODIMP COMOpenDocuments::ViewDocument3(
 {
     // TODO: resolve the program from varProgID (nullptr -> default?)
     HRESULT hr = LOStart(L"--view", bstrDocumentLocation, m_aObjectSafety.GetSafe_forUntrustedCaller() || m_aObjectSafety.GetSafe_forUntrustedData());
-    *pbResult = VARIANT_BOOL(SUCCEEDED(hr));
+    *pbResult = toVBool(SUCCEEDED(hr));
     return hr;
 }
 
@@ -422,7 +429,7 @@ STDMETHODIMP COMOpenDocuments::EditDocument3(
 {
     // TODO: resolve the program from varProgID (nullptr -> default?)
     HRESULT hr = LOStart(L"-o", bstrDocumentLocation, m_aObjectSafety.GetSafe_forUntrustedCaller() || m_aObjectSafety.GetSafe_forUntrustedData());
-    *pbResult = VARIANT_BOOL(SUCCEEDED(hr));
+    *pbResult = toVBool(SUCCEEDED(hr));
     return hr;
 }