summaryrefslogtreecommitdiff
path: root/sw/source/core/text/widorp.hxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-05-03 13:24:25 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-05-03 13:24:25 +0000
commit8ec6b55df45a96f191a43ab8a1af809d9546f4b9 (patch)
tree8abe4ac965d2eef9f527809446d9e3bc572f5be4 /sw/source/core/text/widorp.hxx
parentf3e5310f25251074fcbb1a4f4f03592f2b1ec1d4 (diff)
INTEGRATION: CWS swqod01 (1.3.180); FILE MERGED
2004/03/26 11:35:21 od 1.3.180.2: RESYNC: (1.3-1.4); FILE MERGED 2004/03/03 09:56:12 od 1.3.180.1: #i16128# rename method <WidowsAndOrphans::IsBreakNow> to <WidowsAndOrphans::IsBreakNowWidAndOrh>
Diffstat (limited to 'sw/source/core/text/widorp.hxx')
-rw-r--r--sw/source/core/text/widorp.hxx13
1 files changed, 8 insertions, 5 deletions
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index f3d31d642529..3286fff4856e 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: widorp.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: kz $ $Date: 2004-03-23 11:26:17 $
+ * last change: $Author: rt $ $Date: 2004-05-03 14:24:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -122,9 +122,12 @@ public:
sal_Bool FindBreak( SwTxtFrm *pFrm, SwTxtMargin &rLine, sal_Bool bHasToFit );
sal_Bool WouldFit( SwTxtMargin &rLine, SwTwips &rMaxHeight, sal_Bool bTest );
- sal_Bool IsBreakNow( SwTxtMargin &rLine )
- { return ( rLine.GetLineNr() > nOrphLines ) &&
- SwTxtFrmBreak::IsBreakNow( rLine ); }
+ // OD 2004-02-25 #i16128# - rename method to avoid confusion with base class
+ // method <SwTxtFrmBreak::IsBreakNow>, which isn't virtual.
+ sal_Bool IsBreakNowWidAndOrp( SwTxtMargin &rLine )
+ {
+ return ( rLine.GetLineNr() > nOrphLines ) && IsBreakNow( rLine );
+ }
};