diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-13 11:19:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-13 11:19:56 +0000 |
| commit | 19203faa44439b953d670ca169d1f1900e937463 (patch) | |
| tree | 654eb3a05babce29b8a4b060e270d7f865da40c9 /sw/source/ui/utlui/navipi.cxx | |
| parent | 1524aa18b9ddf7a4181e3f278155c48655084452 (diff) | |
CWS-TOOLING: integrate CWS sw31bf02
2009-01-26 08:39:59 +0100 fme r266900 : #i93190# placeholder field should be checked in IsEqualsFlags as well
2009-01-21 17:32:32 +0100 ama r266695 : CWS-TOOLING: rebase CWS sw31bf02 to trunk@266428 (milestone: DEV300:m39)
2009-01-19 09:26:02 +0100 ama r266475 : Fix #i96109#: Bracket mismatch
2009-01-19 09:08:47 +0100 ama r266473 : Fix #i96391#: Wrong default parameter
2009-01-19 09:07:13 +0100 ama r266472 : Fix #i96112#: Bracket mismatch
2009-01-19 08:51:42 +0100 ama r266471 : Fix #i96113#: Bracket mismatch
2009-01-16 15:07:01 +0100 ama r266421 : Fix #i93105#: export 0x14
2009-01-16 09:07:02 +0100 ama r266400 : Fix #i96111#: Wrong condition
2009-01-16 08:49:47 +0100 ama r266399 : Fix #i99110#: Wrong condition
2009-01-12 15:54:46 +0100 ama r266164 : Fix #i17949#: Ctrl+A if document starts with a section
2009-01-09 15:39:44 +0100 ama r266091 : Fix #i93144#: Crash during update of TOC
2009-01-09 14:40:20 +0100 ama r266086 : Fix #i90072#: Shorten undo strings
2008-12-10 16:34:57 +0100 fme r265203 : #i73332# Crash with section endnotes
2008-12-10 15:04:29 +0100 fme r265194 : #i93190# Omit painting of placeholder fields during pdf export
2008-12-09 16:46:54 +0100 fme r265115 : #i96167# haggi - reset view options before disposing view
2008-12-09 16:17:13 +0100 fme r265114 : #i96167# Added missing word coun invalidation on splitting node in second half
2008-12-09 15:49:19 +0100 fme r265108 : #i91740# Write actual text only for hyphen portions
2008-12-09 14:52:13 +0100 fme r265090 : #91483# Disable some Insert menu entries in case cursor is located in hidden text
Diffstat (limited to 'sw/source/ui/utlui/navipi.cxx')
| -rw-r--r-- | sw/source/ui/utlui/navipi.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 9758f47728a9..79555502034b 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -879,10 +879,15 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, ((SfxDockingWindow*)pParent)->SetMinOutputSizePixel(aMinSize); SetOutputSizePixel( Size( nWishWidth, nZoomOutInit)); Size aTmpParentSize(((SfxDockingWindow*)pParent)->GetSizePixel()); - if(aTmpParentSize.Width() < aMinSize.Width() || - aTmpParentSize.Height() < aMinSize.Height() && - ((SfxDockingWindow*)pParent)->GetFloatingWindow() && - !((SfxDockingWindow*)pParent)->GetFloatingWindow()->IsRollUp()) + if( + ( + aTmpParentSize.Width() < aMinSize.Width() || + aTmpParentSize.Height() < aMinSize.Height() + ) + && + ((SfxDockingWindow*)pParent)->GetFloatingWindow() && + !((SfxDockingWindow*)pParent)->GetFloatingWindow()->IsRollUp() + ) ((SfxDockingWindow*)pParent)->SetOutputSizePixel(aMinSize); aContentTree.SetPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y ); |