sd/source/core/drawdoc4.cxx | 10 ++++++++--
sd/source/ui/func/undoheaderfooter.cxx | 6 ++++--
sd/source/ui/view/Outliner.cxx | 10 ++++++----
sd/source/ui/view/ViewShellImplementation.cxx | 14 +++++++++-----
vcl/win/window/salframe.cxx | 2 +-
5 files changed, 28 insertions(+), 14 deletions(-)
New commits:
commit 1f59a2abcd68aab710e9502b1e00f172f569cb67
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 15 19:38:44 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Dec 16 08:51:09 2022 +0000
BP_CHECKBOX should be teamed with some CBS_* part
noticed by Julien at https://gerrit.libreoffice.org/c/core/+/143999
Change-Id: Ic17834d503f174f91200614cd48e6771835cc08d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144252
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 290c3588de11..1f8c02f66927 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -2664,7 +2664,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
hTheme = OpenThemeData(mhWnd, L"Button");
GetThemeColor(hTheme, BP_PUSHBUTTON, PBS_NORMAL, TMT_TEXTCOLOR,
&color);
aControlTextColor = ImplWinColorToSal(color);
- GetThemeColor(hTheme, BP_CHECKBOX, PBS_NORMAL, TMT_TEXTCOLOR, &color);
+ GetThemeColor(hTheme, BP_CHECKBOX, CBS_CHECKEDNORMAL, TMT_TEXTCOLOR,
&color);
aStyleSettings.SetRadioCheckTextColor( ImplWinColorToSal( color ) );
CloseThemeData(hTheme);
commit e717f3a49f700e2e8fdc3c2ba239619e2e1ba2bc
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Dec 15 20:25:18 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Dec 16 08:50:55 2022 +0000
sd: check SfxViewFrame::Current()
these ones look potentially worth backporting
Change-Id: I6153b0f9ead7caef9f228a5724f51823bcf87c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144280
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 907b4163e500..c487c041c75a 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -948,9 +948,15 @@ void
SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo const * pInfo, Sdr
StartOnlineSpelling();
}
else if (nCommand == SpellCallbackCommand::STARTSPELLDLG)
- SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SPELL_DIALOG,
SfxCallMode::ASYNCHRON );
+ {
+ if (SfxViewFrame* pViewFrame = SfxViewFrame::Current())
+ pViewFrame->GetDispatcher()->Execute( SID_SPELL_DIALOG,
SfxCallMode::ASYNCHRON );
+ }
else if (nCommand == SpellCallbackCommand::AUTOCORRECT_OPTIONS)
- SfxViewFrame::Current()->GetDispatcher()->Execute(
SID_AUTO_CORRECT_DLG, SfxCallMode::ASYNCHRON );
+ {
+ if (SfxViewFrame* pViewFrame = SfxViewFrame::Current())
+ pViewFrame->GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG,
SfxCallMode::ASYNCHRON );
+ }
}
// Return formatted page number (1, I, i, a, etc.)
diff --git a/sd/source/ui/func/undoheaderfooter.cxx
b/sd/source/ui/func/undoheaderfooter.cxx
index 18a89d4ca8f5..6f386a42fd11 100644
--- a/sd/source/ui/func/undoheaderfooter.cxx
+++ b/sd/source/ui/func/undoheaderfooter.cxx
@@ -40,13 +40,15 @@ SdHeaderFooterUndoAction::~SdHeaderFooterUndoAction()
void SdHeaderFooterUndoAction::Undo()
{
mpPage->setHeaderFooterSettings( maOldSettings );
- SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SWITCHPAGE,
SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
+ if (SfxViewFrame* pViewFrm = SfxViewFrame::Current())
+ pViewFrm->GetDispatcher()->Execute( SID_SWITCHPAGE,
SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
}
void SdHeaderFooterUndoAction::Redo()
{
mpPage->setHeaderFooterSettings( maNewSettings );
- SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SWITCHPAGE,
SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
+ if (SfxViewFrame* pViewFrm = SfxViewFrame::Current())
+ pViewFrm->GetDispatcher()->Execute( SID_SWITCHPAGE,
SfxCallMode::ASYNCHRON | SfxCallMode::RECORD );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 4773b3badf4f..6384f1ee58d7 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1925,13 +1925,15 @@ weld::Window* SdOutliner::GetMessageBoxParent()
switch (meMode)
{
case SEARCH:
- pChildWindow = SfxViewFrame::Current()->GetChildWindow(
- SvxSearchDialogWrapper::GetChildWindowId());
+ if (SfxViewFrame* pViewFrm = SfxViewFrame::Current())
+ pChildWindow = pViewFrm->GetChildWindow(
+ SvxSearchDialogWrapper::GetChildWindowId());
break;
case SPELL:
- pChildWindow = SfxViewFrame::Current()->GetChildWindow(
- sd::SpellDialogChildWindow::GetChildWindowId());
+ if (SfxViewFrame* pViewFrm = SfxViewFrame::Current())
+ pChildWindow = pViewFrm->GetChildWindow(
+ sd::SpellDialogChildWindow::GetChildWindowId());
break;
case TEXT_CONVERSION:
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx
b/sd/source/ui/view/ViewShellImplementation.cxx
index 2f81d5be9b3e..fb4598e048c0 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -305,12 +305,16 @@ SfxInterfaceId ViewShell::Implementation::GetViewId()
const
SvxIMapDlg* ViewShell::Implementation::GetImageMapDialog()
{
- SvxIMapDlg* pDialog = nullptr;
- SfxChildWindow* pChildWindow = SfxViewFrame::Current()->GetChildWindow(
+ SfxViewFrame* pViewFrm = SfxViewFrame::Current();
+ if (!pViewFrm)
+ return nullptr;
+
+ SfxChildWindow* pChildWindow = pViewFrm->GetChildWindow(
SvxIMapDlgChildWindow::GetChildWindowId());
- if (pChildWindow != nullptr)
- pDialog =
dynamic_cast<SvxIMapDlg*>(pChildWindow->GetController().get());
- return pDialog;
+ if (pChildWindow == nullptr)
+ return nullptr;
+
+ return dynamic_cast<SvxIMapDlg*>(pChildWindow->GetController().get());
}
//===== ToolBarManagerLock ====================================================
