summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorAndreas Martens <ama@openoffice.org>2000-11-06 08:24:36 +0000
committerAndreas Martens <ama@openoffice.org>2000-11-06 08:24:36 +0000
commit01ac0546d3b7cd98dc22689e86ba8130f817a9c2 (patch)
treed73fe10af569c2aa6634e897a65f20a5df7e1597 /sw/source/core
parent2b7d5c9aca976b787790d8837d2a884ed6cef594 (diff)
New: phonetic character aside the main text
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/text/inftxt.cxx12
-rw-r--r--sw/source/core/text/inftxt.hxx8
2 files changed, 11 insertions, 9 deletions
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index c8cc9caf191d..a7639984aa2e 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: inftxt.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: ama $ $Date: 2000-10-30 10:06:34 $
+ * last change: $Author: ama $ $Date: 2000-11-06 09:24:36 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -271,7 +271,8 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew )
bURLNotify( rNew.URLNotify() ),
bStopUnderFlow( rNew.StopUnderFlow() ),
bMulti( rNew.IsMulti() ),
- bFirstMulti( rNew.IsFirstMulti() )
+ bFirstMulti( rNew.IsFirstMulti() ),
+ bRuby( rNew.IsRuby() )
{
#ifndef PRODUCT
ChkOutDev( *this );
@@ -340,7 +341,7 @@ void SwTxtSizeInfo::CtorInit( SwTxtFrm *pFrame, SwFont *pNewFnt,
bNotEOL = sal_False;
bStopUnderFlow = sal_False;
bSpecialUnderline = sal_False;
- bMulti = bFirstMulti = sal_False;
+ bMulti = bFirstMulti = bRuby = sal_False;
SetLen( GetMinLen( *this ) );
}
@@ -362,7 +363,8 @@ SwTxtSizeInfo::SwTxtSizeInfo( const SwTxtSizeInfo &rNew, const XubString &rTxt,
bURLNotify( rNew.URLNotify() ),
bStopUnderFlow( rNew.StopUnderFlow() ),
bMulti( rNew.IsMulti() ),
- bFirstMulti( rNew.IsFirstMulti() )
+ bFirstMulti( rNew.IsFirstMulti() ),
+ bRuby( rNew.IsRuby() )
{
#ifndef PRODUCT
ChkOutDev( *this );
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 12fd1d0fe4ef..c2b611315afe 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: inftxt.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: ama $ $Date: 2000-11-06 09:20:28 $
+ * last change: $Author: ama $ $Date: 2000-11-06 09:22:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,7 +61,7 @@
#ifndef _INFTXT_HXX
#define _INFTXT_HXX
-#include <com/sun/star/linguistic/XHyphenatedWord.hpp>
+#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
#include "swtypes.hxx"
#include "txttypes.hxx"
@@ -594,7 +594,7 @@ public:
void RestoreHyphOptions();
// ruft HyphenateWord() des Hyphenators
::com::sun::star::uno::Reference<
- ::com::sun::star::linguistic::XHyphenatedWord >
+ ::com::sun::star::linguistic2::XHyphenatedWord >
HyphWord( const String &rTxt, const USHORT nMinTrail );
sal_Bool CheckFtnPortion( SwLineLayout* pCurr )