summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2018-01-10 13:25:33 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-01-11 16:06:14 +0100
commit10eb616c3106b538857542f1c4b1df375a6cf1b6 (patch)
treed012f43c34fecd302d009cc74652739fd987b450 /vcl/source
parent47c9a10c462d27aa6fdb3a8e453dff1cebf233fd (diff)
tdf#113874 Guard against invalid states
Change-Id: I013dd4eb81f0fbef25d9f58e27fe72d800d910ba Reviewed-on: https://gerrit.libreoffice.org/47702 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit d2763bde00f0f840585e1ec4c8f94c0ef804a580) Reviewed-on: https://gerrit.libreoffice.org/47744 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/window/accessibility.cxx4
-rw-r--r--vcl/source/window/window.cxx3
2 files changed, 5 insertions, 2 deletions
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index 3d81a1e82edc..4ee4b07ea89d 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -139,7 +139,9 @@ css::uno::Reference< css::accessibility::XAccessible > Window::CreateAccessible(
void Window::SetAccessible( const css::uno::Reference< css::accessibility::XAccessible >& x )
{
- assert(mpWindowImpl);
+ if (!mpWindowImpl)
+ return;
+
mpWindowImpl->mxAccessible = x;
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 84dabd027689..a3310a5b4976 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3136,7 +3136,8 @@ const OUString& Window::GetHelpText() const
void Window::SetWindowPeer( Reference< css::awt::XWindowPeer > const & xPeer, VCLXWindow* pVCLXWindow )
{
- assert(mpWindowImpl);
+ if (!mpWindowImpl)
+ return;
// be safe against re-entrance: first clear the old ref, then assign the new one
mpWindowImpl->mxWindowPeer.clear();