summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Meies <fme@openoffice.org>2002-03-19 07:50:38 +0000
committerFrank Meies <fme@openoffice.org>2002-03-19 07:50:38 +0000
commit61edd72e8f279d3371ac4ce0bb29b6ede8b26d35 (patch)
tree38e30abe3a5334efef53991c728712fae09aa399
parentdc4ed103ffd198ff6d386f420920aa9a67423921 (diff)
#96678# CJK - Justified alignment - Consider SwKerningPortion during calculation
-rw-r--r--sw/source/core/text/portxt.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 8903832a4e15..5975c171fe9a 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: portxt.cxx,v $
*
- * $Revision: 1.20 $
+ * $Revision: 1.21 $
*
- * last change: $Author: fme $ $Date: 2002-03-08 10:48:20 $
+ * last change: $Author: fme $ $Date: 2002-03-19 08:50:38 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -161,7 +161,7 @@ USHORT lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr,
rInf.GetTxtFrm()->GetTxtNode()->GetLang( rInf.GetIdx(), 1, nScript ) ) )
{
const SwLinePortion* pPor = rPor.GetPortion();
- if ( pPor->IsKernPortion() )
+ if ( pPor && pPor->IsKernPortion() )
pPor = pPor->GetPortion();
nCnt += nEnd - nPos;
@@ -189,7 +189,7 @@ USHORT lcl_AddSpace( const SwTxtSizeInfo &rInf, const XubString* pStr,
{
BYTE nScript = 0;
const SwLinePortion* pPor = rPor.GetPortion();
- if ( pPor->IsKernPortion() )
+ if ( pPor && pPor->IsKernPortion() )
pPor = pPor->GetPortion();
if ( ! pBreakIt->xBreak.is() || ! pPor || pPor->InFixMargGrp() )