summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2013-09-12 21:37:42 +0100
committerLionel Elie Mamane <lionel@mamane.lu>2013-09-15 17:02:33 +0200
commit2a151b7e3258f24299f885d020b07ab50582e7df (patch)
tree78583e050b5dc4fb7f422b45b5744373b8c6c40c
parentc0cf51a499ec52b23443393b67425ab557328a9a (diff)
fix for fdo#69173 crasher
the layout changes for the basic IDE ( for the object browser and object catalog ) seem flacky, I have seen since those changes have been introduced some strange ( but random ) behaviour ( like the odd unrepeatable core ( maybe related to this ) and also sometimes Modules appearing in the tree under the wrong nodes etc. I'm no expert in the basic IDE code but this patch seems to fix the problem. However there is one drawback, in the core inducing scenario the tree view ( object catalog ) dissappears, this is because the patch suppresses the problematic layout in this case ( as the layout seem not to be currently able to deal with 'no-existent' (recently) deleted current window ) Probably in this scenario a fallback currentwin (instead of nil) could be set this would behave better but ideally. Ultimately the layout class should probably be modified ( possibly redesigned ) Change-Id: I9d1e23bd6fc4aae32aa78da8278c318f7051136a
-rw-r--r--basctl/source/basicide/basides1.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 85da8aef485b..a7babde9f8f5 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -1010,7 +1010,10 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRemembe
}
}
else
+ {
+ SetWindow(pLayout);
pLayout = 0;
+ }
if ( bUpdateTabBar )
{
sal_uLong nKey = GetWindowId( pCurWin );