sw: outline SwFrm::Calc()

Change-Id: I9c59116828585c9645bc415ef5fffe65a24d09ee (cherry picked from commit 533e9794)

sw: outline SwFrm::Calc()
Change-Id: I9c59116828585c9645bc415ef5fffe65a24d09ee (cherry picked from commit 533e9794)
20e28ffd · Miklos Vajna · Andras Timar · e9efb1e8 · 20e28ffd · 20e28ffd
Kaydet (Commit) 20e28ffd authored Haz 29, 2015 tarafından Miklos Vajna Kaydeden (comit) Andras Timar Agu 06, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

frame.hxx sw/source/core/inc/frame.hxx +0 -5

trvlfrm.cxx sw/source/core/layout/trvlfrm.cxx +6 -0

No files found.
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -998,11 +998,6 @@ inline void SwFrm::InvalidateNextPos( bool bNoFootnote )
        ImplInvalidateNextPos( bNoFootnote );
 }

-inline void SwFrm::Calc() const
-{
-    if ( !mbValidPos || !mbValidPrtArea || !mbValidSize )
-        const_cast<SwFrm*>(this)->PrepareMake();
-}
 inline void SwFrm::OptCalc() const
 {
    if ( !mbValidPos || !mbValidPrtArea || !mbValidSize )

--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -1786,6 +1786,12 @@ bool SwFrm::OnFirstPage() const
    return bRet;
 }

+void SwFrm::Calc() const
+{
+    if ( !mbValidPos || !mbValidPrtArea || !mbValidSize )
+        const_cast<SwFrm*>(this)->PrepareMake();
+}
+
 Point SwFrm::GetRelPos() const
 {
    Point aRet( maFrm.Pos() );