Use sal::systools::CoInitializeGuard and sal::systools::ThrowIfFailed

Change-Id: Ifb40e7672671df03b5ffc89905ad1e7b68451b68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127232
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

1 files changed, 5 insertions, 16 deletions

diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
index a412769ee639..ce4d147220c2 100644
--- a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
+++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
@@ -90,33 +90,22 @@ public:
     {
         try
         {
-            struct CoInitializeGuard
-            {
-                CoInitializeGuard()
-                {
-                    if (HRESULT hr = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); FAILED(hr))
-                        throw sal::systools::ComError("CoInitializeEx failed", hr);
-                }
-                ~CoInitializeGuard() { CoUninitialize(); }
-            } aCoInitializeGuard;
+            sal::systools::CoInitializeGuard aCoInitializeGuard(COINIT_APARTMENTTHREADED);
 
             auto pADsys = sal::systools::COMReference<IADsADSystemInfo>().CoCreateInstance(
                 CLSID_ADSystemInfo, nullptr, CLSCTX_INPROC_SERVER);
 
             smartBSTR sUserDN;
-            HRESULT hr = pADsys->get_UserName(&sUserDN.ptr);
-            if (FAILED(hr))
-                throw sal::systools::ComError("get_UserName failed", hr);
+            sal::systools::ThrowIfFailed(pADsys->get_UserName(&sUserDN.ptr), "get_UserName failed");
             // If this user is an AD user, then without an active connection to the domain, all the
             // above will succeed, and m_sUserDN will be correctly initialized, but the following
             // call to ADsGetObject will fail, and we will attempt reading cached values.
             m_sUserDN = o3tl::toU(sUserDN.ptr);
             OUString sLdapUserDN = "LDAP://" + m_sUserDN;
             sal::systools::COMReference<IADsUser> pUser;
-            hr = ADsGetObject(o3tl::toW(sLdapUserDN.getStr()), IID_IADsUser,
-                              reinterpret_cast<void**>(&pUser));
-            if (FAILED(hr))
-                throw sal::systools::ComError("ADsGetObject failed", hr);
+            sal::systools::ThrowIfFailed(ADsGetObject(o3tl::toW(sLdapUserDN.getStr()), IID_IADsUser,
+                                                      reinterpret_cast<void**>(&pUser)),
+                                         "ADsGetObject failed");
             // Fetch all the required information right now, when we know to have access to AD
             // (later the connection may already be lost)
             m_aMap[givenname] = Str(pUser, &IADsUser::get_FirstName);