diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-12-03 11:31:00 +0100 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-12-03 11:31:00 +0100 |
| commit | ad336d156b4b27471896e31fb911808790007531 (patch) | |
| tree | 41592722d28ca3cf8ff8052c92b68e027b15d8a2 /sw/source/ui/shells/frmsh.cxx | |
| parent | 6bcbe6006dcf6853cd315c3167b2e5b6efa5b6f9 (diff) | |
| parent | 6ad930a9e6a25ec36f4672bf833cffa7371d6f9a (diff) | |
CWS-TOOLING: integrate CWS os144
Diffstat (limited to 'sw/source/ui/shells/frmsh.cxx')
| -rw-r--r-- | sw/source/ui/shells/frmsh.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index d8f6afd98347..1bb2ae01ba6e 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -717,7 +717,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) case FN_FRAME_ALIGN_HORZ_LEFT: if ( (eFrmType & FRMTYPE_FLY_INCNT) || bProtect || - (nWhich == FN_FRAME_ALIGN_HORZ_CENTER || nWhich == SID_OBJECT_ALIGN_CENTER)&& bHtmlMode ) + ((nWhich == FN_FRAME_ALIGN_HORZ_CENTER || nWhich == SID_OBJECT_ALIGN_CENTER)&& bHtmlMode) ) rSet.DisableItem( nWhich ); break; case FN_FRAME_ALIGN_VERT_ROW_TOP: @@ -727,7 +727,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) case FN_FRAME_ALIGN_VERT_CHAR_CENTER: case FN_FRAME_ALIGN_VERT_CHAR_BOTTOM: if ( !(eFrmType & FRMTYPE_FLY_INCNT) || bProtect - || bHtmlMode && FN_FRAME_ALIGN_VERT_CHAR_BOTTOM == nWhich ) + || (bHtmlMode && FN_FRAME_ALIGN_VERT_CHAR_BOTTOM == nWhich) ) rSet.DisableItem( nWhich ); break; @@ -738,7 +738,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) case FN_FRAME_ALIGN_VERT_TOP: case FN_FRAME_ALIGN_VERT_CENTER: case FN_FRAME_ALIGN_VERT_BOTTOM: - if ( bProtect || bHtmlMode && eFrmType & FRMTYPE_FLY_ATCNT) + if ( bProtect || (bHtmlMode && eFrmType & FRMTYPE_FLY_ATCNT) ) rSet.DisableItem( nWhich ); else { |