summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/colfrm.cxx
diff options
context:
space:
mode:
authorAndreas Martens <ama@openoffice.org>2001-09-13 07:24:07 +0000
committerAndreas Martens <ama@openoffice.org>2001-09-13 07:24:07 +0000
commit7f54c53df79e5de74355901a8f5f21ea85b20370 (patch)
tree528e62a1aeda380270cdd4bb4c1aa8ba2ec503b6 /sw/source/core/layout/colfrm.cxx
parentb58160be39fa2b3f49e48da82b0d90c8408960c1 (diff)
New vertical layout: Notifying and recalculation after changing the direction
Diffstat (limited to 'sw/source/core/layout/colfrm.cxx')
-rw-r--r--sw/source/core/layout/colfrm.cxx32
1 files changed, 2 insertions, 30 deletions
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx
index 935cc63261e9..f97f416d5a35 100644
--- a/sw/source/core/layout/colfrm.cxx
+++ b/sw/source/core/layout/colfrm.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: colfrm.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: ama $ $Date: 2001-08-30 08:49:33 $
+ * last change: $Author: ama $ $Date: 2001-09-13 08:24:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -441,34 +441,6 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, BOOL bAdjustAttributes )
SvxLRSpaceItem aLR( pSet->GetLRSpace() );
SvxULSpaceItem aUL( pSet->GetULSpace() );
-#ifdef VERTICAL_LAYOUT
- if( IsVertical() )
- {
- if ( bLine )
- {
- if ( i == 0 )
- { aUL.SetUpper( pC->GetLeft() );
- aUL.SetLower( Max(pC->GetRight(), nMin) );
- }
- else if ( i == (pAttr->GetNumCols() - 1) )
- { aUL.SetUpper( Max(pC->GetLeft(), nMin) );
- aUL.SetLower( pC->GetRight() );
- }
- else
- { aUL.SetUpper( Max(pC->GetLeft(), nMin) );
- aUL.SetLower( Max(pC->GetRight(), nMin) );
- }
- }
- else
- {
- aUL.SetUpper( pC->GetLeft() );
- aUL.SetLower( pC->GetRight());
- }
- aLR.SetLeft ( pC->GetUpper() );
- aLR.SetRight( pC->GetLower() );
- }
- else
-#endif
{
//Damit die Trennlinien Platz finden, muessen sie hier
//Beruecksichtigung finden. Ueberall wo zwei Spalten aufeinanderstossen