cui/source/tabpages/transfrm.cxx | 2
vcl/source/window/dialog.cxx | 111 +++++++++++++++++++++------------------
2 files changed, 60 insertions(+), 53 deletions(-)
New commits:
commit c1816feaa9c6ab30f01e14f621402307543c82ac
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon May 20 16:13:40 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue May 21 09:54:15 2019 +0200
Resolves: tdf#125394 consider unwelded dialogs
Change-Id: Ic66a622bb8b5481656ffe8e29a345a435042402e
Reviewed-on: https://gerrit.libreoffice.org/72625
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 5348e206f2c0..03512eb76178 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1445,25 +1445,28 @@ vcl::Window* Dialog::get_widget_for_response(int
response)
//copy explicit responses
std::map<VclPtr<vcl::Window>, short> aResponses(mpDialogImpl->maResponses);
- //add implicit responses
- for (vcl::Window* pChild =
mpActionArea->GetWindow(GetWindowType::FirstChild); pChild;
- pChild = pChild->GetWindow(GetWindowType::Next))
+ if (mpActionArea)
{
- if (aResponses.find(pChild) != aResponses.end())
- continue;
- switch (pChild->GetType())
+ //add implicit responses
+ for (vcl::Window* pChild =
mpActionArea->GetWindow(GetWindowType::FirstChild); pChild;
+ pChild = pChild->GetWindow(GetWindowType::Next))
{
- case WindowType::OKBUTTON:
- aResponses[pChild] = RET_OK;
- break;
- case WindowType::CANCELBUTTON:
- aResponses[pChild] = RET_CANCEL;
- break;
- case WindowType::HELPBUTTON:
- aResponses[pChild] = RET_HELP;
- break;
- default:
- break;
+ if (aResponses.find(pChild) != aResponses.end())
+ continue;
+ switch (pChild->GetType())
+ {
+ case WindowType::OKBUTTON:
+ aResponses[pChild] = RET_OK;
+ break;
+ case WindowType::CANCELBUTTON:
+ aResponses[pChild] = RET_CANCEL;
+ break;
+ case WindowType::HELPBUTTON:
+ aResponses[pChild] = RET_HELP;
+ break;
+ default:
+ break;
+ }
}
}
@@ -1481,25 +1484,28 @@ int Dialog::get_default_response()
//copy explicit responses
std::map<VclPtr<vcl::Window>, short> aResponses(mpDialogImpl->maResponses);
- //add implicit responses
- for (vcl::Window* pChild =
mpActionArea->GetWindow(GetWindowType::FirstChild); pChild;
- pChild = pChild->GetWindow(GetWindowType::Next))
+ if (mpActionArea)
{
- if (aResponses.find(pChild) != aResponses.end())
- continue;
- switch (pChild->GetType())
+ //add implicit responses
+ for (vcl::Window* pChild =
mpActionArea->GetWindow(GetWindowType::FirstChild); pChild;
+ pChild = pChild->GetWindow(GetWindowType::Next))
{
- case WindowType::OKBUTTON:
- aResponses[pChild] = RET_OK;
- break;
- case WindowType::CANCELBUTTON:
- aResponses[pChild] = RET_CANCEL;
- break;
- case WindowType::HELPBUTTON:
- aResponses[pChild] = RET_HELP;
- break;
- default:
- break;
+ if (aResponses.find(pChild) != aResponses.end())
+ continue;
+ switch (pChild->GetType())
+ {
+ case WindowType::OKBUTTON:
+ aResponses[pChild] = RET_OK;
+ break;
+ case WindowType::CANCELBUTTON:
+ aResponses[pChild] = RET_CANCEL;
+ break;
+ case WindowType::HELPBUTTON:
+ aResponses[pChild] = RET_HELP;
+ break;
+ default:
+ break;
+ }
}
}
@@ -1518,25 +1524,28 @@ void Dialog::set_default_response(int response)
//copy explicit responses
std::map<VclPtr<vcl::Window>, short> aResponses(mpDialogImpl->maResponses);
- //add implicit responses
- for (vcl::Window* pChild =
mpActionArea->GetWindow(GetWindowType::FirstChild); pChild;
- pChild = pChild->GetWindow(GetWindowType::Next))
+ if (mpActionArea)
{
- if (aResponses.find(pChild) != aResponses.end())
- continue;
- switch (pChild->GetType())
+ //add implicit responses
+ for (vcl::Window* pChild =
mpActionArea->GetWindow(GetWindowType::FirstChild); pChild;
+ pChild = pChild->GetWindow(GetWindowType::Next))
{
- case WindowType::OKBUTTON:
- aResponses[pChild] = RET_OK;
- break;
- case WindowType::CANCELBUTTON:
- aResponses[pChild] = RET_CANCEL;
- break;
- case WindowType::HELPBUTTON:
- aResponses[pChild] = RET_HELP;
- break;
- default:
- break;
+ if (aResponses.find(pChild) != aResponses.end())
+ continue;
+ switch (pChild->GetType())
+ {
+ case WindowType::OKBUTTON:
+ aResponses[pChild] = RET_OK;
+ break;
+ case WindowType::CANCELBUTTON:
+ aResponses[pChild] = RET_CANCEL;
+ break;
+ case WindowType::HELPBUTTON:
+ aResponses[pChild] = RET_HELP;
+ break;
+ default:
+ break;
+ }
}
}
commit c278c1cf3e9ad4c810534558b7f9ea1a41c5e1cc
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon May 20 15:57:16 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue May 21 09:53:43 2019 +0200
Resolves: tdf#125387 gtk3 fit-to-text stuck as disabled
should only disable/enable its parent container
Change-Id: I002a525b7ac4c178c3db7efc06848315afb785e0
Reviewed-on: https://gerrit.libreoffice.org/72624
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 397803c96e5c..160a636233df 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -793,8 +793,6 @@
SvxPositionSizeTabPage::SvxPositionSizeTabPage(TabPageParent pParent, const SfxI
m_xMtrHeight->connect_value_changed( LINK( this, SvxPositionSizeTabPage,
ChangeHeightHdl ) );
m_xCbxScale->connect_toggled( LINK( this, SvxPositionSizeTabPage,
ClickAutoHdl ) );
- m_xTsbAutoGrowWidth->set_sensitive(false);
- m_xTsbAutoGrowHeight->set_sensitive(false);
m_xFlAdjust->set_sensitive(false);
// #i2379# disable controls when protected
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
