Kaydet (Commit) 31cc28ca authored tarafından Mike Kaganski's avatar Mike Kaganski

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/72308Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
Tested-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst d2fa9c0d
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment