diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2012-06-12 14:16:45 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2012-06-12 14:16:45 +0900 |
commit | 16738213c400f9192abc2ff6c08d7f711dee8d34 (patch) | |
tree | 3e17fbd6d8ab5a823ea4333a2325ee233ca8e4a7 /sw | |
parent | a3451df90e0db9d37a7c6950c2eea53a96616e12 (diff) |
nuke dead code
Change-Id: If8b6b4a3d9222726ae562e5b685710d86b5fe332
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/layout/calcmove.cxx | 15 | ||||
-rw-r--r-- | sw/source/core/layout/flyincnt.cxx | 11 | ||||
-rw-r--r-- | sw/source/ui/shells/tabsh.cxx | 10 |
3 files changed, 0 insertions, 36 deletions
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index b0499133228c..70aafc0caf4b 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -731,10 +731,6 @@ void SwPageFrm::MakeAll() if ( nWidth < pSh->GetBrowseWidth() ) nWidth = pSh->GetBrowseWidth(); nWidth += + 2 * aBorder.Width(); -/* - long nWidth = GetUpper() ? ((SwRootFrm*)GetUpper())->GetBrowseWidth() + 2 * aBorder.Width() : 0; - if ( nWidth < pSh->VisArea().Width() ) - nWidth = pSh->VisArea().Width(); */ nWidth = Max( nWidth, 2L * aBorder.Width() + 4L*MM50 ); Frm().Width( nWidth ); @@ -1066,17 +1062,6 @@ sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs ) nUpper=0; nLower=0; } -// // in balanced columned section frames we do not want the -// // common border -// sal_Bool bCommonBorder = sal_True; -// if ( IsInSct() && GetUpper()->IsColBodyFrm() ) -// { -// const SwSectionFrm* pSct = FindSctFrm(); -// bCommonBorder = pSct->GetFmt()->GetBalancedColumns().GetValue(); -// } -// SwTwips nLower = bCommonBorder ? -// rAttrs.GetBottomLine( this ) : -// rAttrs.CalcBottomLine(); (Prt().*fnRect->fnSetPosY)( (!bVert || bReverse) ? nUpper : nLower); nUpper += nLower; diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index 676191befdbb..5caf39b35e72 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -282,17 +282,6 @@ void SwFlyInCntFrm::MakeAll() if ( !bValidSize ) { bValidPrtArea = sal_False; -/* - // This is also done in the Format function, so I think - // this code is not necessary anymore: - long nOldWidth = aFrm.Width(); - const Size aRelSize( CalcRel( rFrmSz ) ); - aFrm.Width( aRelSize.Width() ); - - if ( aFrm.Width() > nOldWidth ) - //Damit sich der Inhalt anpasst - aFrm.Height( aRelSize.Height() ); -*/ } if ( !bValidPrtArea ) diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 32eb4e01c2a1..947f9ea03cbf 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -82,16 +82,6 @@ #include <tblsel.hxx> #include <dialog.hrc> - -//!!! new: insert table -/* -#include <svx/htmlmode.hxx> -#include <modcfg.hxx> -#include <tblafmt.hxx> -#include <instable.hxx> -*/ -//!!! - #include <popup.hrc> #include <shells.hrc> #include <cmdid.h> |