core.git: Branch 'libreoffice-24-8' - svx/source

[Xisco Fauli (via logerrit)]

 svx/source/tbxctrls/tbcontrl.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dfb685f877019866e6268ac2d68df19fb9ae83d2
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Oct 15 16:06:41 2024 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Oct 16 11:08:13 2024 +0200

    svx: check SfxObjectShell::Current()
    
    Change-Id: Ie8e504491d350d582620a5c421d6243239d437d0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174947
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Tested-by: Jenkins

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 718759e4168f..dcc6f76620e5 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3923,9 +3923,9 @@ namespace
 
             std::vector<sfx::CurrencyID> aCurrencyIDs;
 
-            SfxObjectShell* pDocShell = SfxObjectShell::Current();
-            if (auto pModelAccessor = pDocShell->GetDocumentModelAccessor())
-                aCurrencyIDs = pModelAccessor->getDocumentCurrencies();
+            if (SfxObjectShell* pDocShell = SfxObjectShell::Current())
+                if (auto pModelAccessor = 
pDocShell->GetDocumentModelAccessor())
+                    aCurrencyIDs = pModelAccessor->getDocumentCurrencies();
 
             SvxCurrencyToolBoxControl::GetCurrencySymbols(aList, true, 
aCurrencyList, aCurrencyIDs);