fix getNonLayout[Real]Parent helpers

Change-Id: Idae11802aaeb3d9192cdf7fe8fae61788bbb9b5b

fix getNonLayout[Real]Parent helpers
Change-Id: Idae11802aaeb3d9192cdf7fe8fae61788bbb9b5b
595feb2f · Caolán McNamara · dc5d6deb · 595feb2f
Kaydet (Commit) 595feb2f authored Eyl 25, 2012 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

layout.cxx vcl/source/window/layout.cxx +10 -2

No files found.
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1074,15 +1074,23 @@ Size getLegacyBestSizeForChildren(const Window &rWindow)

 Window* getNonLayoutParent(Window *pWindow)
 {
-    while (pWindow && pWindow->GetType() == WINDOW_CONTAINER)
+    while (pWindow)
+    {
        pWindow = pWindow->GetParent();
+        if (!pWindow || pWindow->GetType() != WINDOW_CONTAINER)
+            break;
+    }
    return pWindow;
 }

 Window* getNonLayoutRealParent(Window *pWindow)
 {
-    while (pWindow && pWindow->GetType() == WINDOW_CONTAINER)
+    while (pWindow)
+    {
        pWindow = pWindow->ImplGetParent();
+        if (!pWindow || pWindow->GetType() != WINDOW_CONTAINER)
+            break;
+    }
    return pWindow;
 }