diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 15:23:42 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 15:23:42 +0000 |
| commit | 4dbbf211d02b2e65f8373524107786dd992c0248 (patch) | |
| tree | ad346c3065d3a3bd152f9a045a62c0a6e85fb5af /sw/source/ui/shells/basesh.cxx | |
| parent | 390633b53684fc83f675c91abe21018170192c77 (diff) | |
INTEGRATION: CWS os38 (1.58.6); FILE MERGED
2004/10/08 13:48:11 os 1.58.6.2: RESYNC: (1.58-1.59); FILE MERGED
2004/09/22 11:43:13 os 1.58.6.1: #i28977# #i32007# use additional status slot to switch the border controller modes
Diffstat (limited to 'sw/source/ui/shells/basesh.cxx')
| -rw-r--r-- | sw/source/ui/shells/basesh.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 0d29383bab84..a95ea054c89b 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: basesh.cxx,v $ * - * $Revision: 1.59 $ + * $Revision: 1.60 $ * - * last change: $Author: kz $ $Date: 2004-10-04 19:29:20 $ + * last change: $Author: hr $ $Date: 2004-11-09 16:23:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2295,7 +2295,8 @@ void SwBaseShell::GetBorderState(SfxItemSet &rSet) SwWrtShell &rSh = GetShell(); // Tabellenzelle(n) selektiert? BOOL bPrepare = TRUE; - if ( rSh.IsTableMode() ) + BOOL bTableMode = rSh.IsTableMode(); + if ( bTableMode ) { SfxItemSet aCoreSet( GetPool(), RES_BOX, RES_BOX, @@ -2314,9 +2315,10 @@ void SwBaseShell::GetBorderState(SfxItemSet &rSet) else // Umrandungsattribute ganz normal ueber Shell holen rSh.GetAttr( rSet ); - if ( bPrepare ) ::PrepareBoxInfo( rSet, rSh ); + // switch the border toolbox controller mode + rSet.Put( SfxBoolItem( SID_BORDER_REDUCED_MODE, !bTableMode )); } /*-------------------------------------------------------------------- |