summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-01 13:20:55 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-01 13:20:55 +0000
commit6173f8b29e2979da7e579e361e748a06262df87c (patch)
tree54bfacb302a4b703998038824991f68d7cc8e72a /sfx2
parent532d47b610e1a73297c01ac0dc5d90b10065838d (diff)
CWS-TOOLING: integrate CWS cmcfixes56
2009-03-26 14:46:13 +0100 cmc r270080 : #i100517# merge changes of locales32 to match 2009-03-26 14:31:32 +0100 cmc r270079 : #i100517# add some brackets and remove stray ; 2009-03-25 13:30:36 +0100 cmc r270021 : #i100503# make tralay work again 2009-03-25 10:13:35 +0100 cmc r269999 : #i100536# remove last unused method 2009-03-24 15:13:50 +0100 cmc r269955 : #i100517# fix straight-forward warnings 2009-03-24 14:36:37 +0100 cmc r269947 : #i100469# keep ia64 and arm alignments after fork-exec to signal change, but hackaround for arm to keep userlevel qemu-arm working 2009-03-24 14:02:27 +0100 cmc r269943 : #i100223# make stl headers warning free for extra gcc 4.3 warnings 2009-03-24 13:58:15 +0100 cmc r269942 : #i100504# drawinglayer is warning free on ix86 linux 2009-03-24 13:56:15 +0100 cmc r269940 : #i100469# keep ia64 and arm alignments after fork-exec to signal change
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/appl/workwin.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index d6bfb67c4b..03f39c8a8c 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1595,7 +1595,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
if ( pCW->pCli )
{
// Fenster ist direktes Child
- if ( bAllChildsVisible && ( IsDockingAllowed() && bInternalDockingAllowed || pCW->pCli->eAlign == SFX_ALIGN_NOALIGNMENT ) )
+ if ( bAllChildsVisible && ( (IsDockingAllowed() && bInternalDockingAllowed) || pCW->pCli->eAlign == SFX_ALIGN_NOALIGNMENT ) )
pCW->pCli->nVisible |= CHILD_NOT_HIDDEN;
}
else if ( pCW->bCreate && IsDockingAllowed() && bInternalDockingAllowed )