summaryrefslogtreecommitdiff
path: root/sw/source/core/inc/txtfrm.hxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-09-28 10:09:52 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-09-28 10:09:52 +0000
commitfc16ff6610720ae207db580fb3467e8947608c6f (patch)
tree6d8b392cf6a0c68d08c3779ae6f9c6def805c448 /sw/source/core/inc/txtfrm.hxx
parent47726e7ce743415b52f2c423384ef4482a6dda5c (diff)
INTEGRATION: CWS swqbf35 (1.45.104); FILE MERGED
2005/09/22 16:04:19 fme 1.45.104.2: RESYNC: (1.45-1.46); FILE MERGED 2005/06/30 10:26:14 od 1.45.104.1: #i47162# class <SwTxtFrm::_calcHeightOfLastLine> - add optional parameter <_bUseFont>
Diffstat (limited to 'sw/source/core/inc/txtfrm.hxx')
-rw-r--r--sw/source/core/inc/txtfrm.hxx13
1 files changed, 10 insertions, 3 deletions
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index e046199fddba..d90b4b0a70b6 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: txtfrm.hxx,v $
*
- * $Revision: 1.46 $
+ * $Revision: 1.47 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 04:02:58 $
+ * last change: $Author: hr $ $Date: 2005-09-28 11:09:52 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -216,10 +216,17 @@ class SwTxtFrm: public SwCntntFrm
/** method to determine height of last line, needed for proportional line spacing
OD 2004-03-17 #i11860#
+ OD 2005-05-20 #i47162# - introduce new optional parameter <_bUseFont>
+ in order to force the usage of the former algorithm to determine the
+ height of the last line, which uses the font.
+
+ @param _bUseFont
+ optional input parameter - boolean indicating, if the font has to be
+ used to determine the height of the last line. default value: false
@author OD
*/
- void _CalcHeightOfLastLine();
+ void _CalcHeightOfLastLine( const bool _bUseFont = false );
public: