From kde-commits  Sat Jan 31 21:40:38 2015
From: C. Boemann <cbo () boemann ! dk>
Date: Sat, 31 Jan 2015 21:40:38 +0000
To: kde-commits
Subject: [calligra/calligra/2.9] words/part: Fix compile - real fix to follow
Message-Id: <E1YHfmQ-0003w2-LK () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=142274044824152

Git commit 08b19b10ebbaed0079646ca253f151f68891a469 by C. Boemann.
Committed on 31/01/2015 at 21:40.
Pushed by boemann into branch 'calligra/2.9'.

Fix compile - real fix to follow

M  +1    -1    words/part/KWRootAreaProvider.cpp

http://commits.kde.org/calligra/08b19b10ebbaed0079646ca253f151f68891a469

diff --git a/words/part/KWRootAreaProvider.cpp b/words/part/KWRootAreaProvi=
der.cpp
index c1180f7..a606bd3 100644
--- a/words/part/KWRootAreaProvider.cpp
+++ b/words/part/KWRootAreaProvider.cpp
@@ -515,7 +515,7 @@ void KWRootAreaProvider::doPostLayout(KoTextLayoutRootA=
rea *rootArea, bool isNew
 =

                 // transfer the new minimumFrameHeight to the copy-shapes =
too
                 foreach(KWCopyShape *cs, frameSet()->copyShapes()) {
-                    cs->setMinimumFrameHeight(newSize.height());
+                    //cs->setMinimumFrameHeight(newSize.height());
                 }
                 // cause the header/footer's height changed we have to rel=
ayout the whole page
                 frameSet()->wordsDocument()->frameLayout()->layoutFramesOn=
Page(page.pageNumber());