#87976# Set/IsKernAsianPunctuation

5 files changed, 43 insertions, 10 deletions

diff --git a/svx/source/editeng/editeng.cxx b/svx/source/editeng/editeng.cxx
index c03376ffeda4..095380aa31f3 100644
--- a/svx/source/editeng/editeng.cxx
+++ b/svx/source/editeng/editeng.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: editeng.cxx,v $
  *
- *  $Revision: 1.45 $
+ *  $Revision: 1.46 $
  *
- *  last change: $Author: mt $ $Date: 2001-08-21 11:03:39 $
+ *  last change: $Author: mt $ $Date: 2001-10-11 12:52:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -566,6 +566,18 @@ USHORT EditEngine::GetAsianCompressionMode() const
     return pImpEditEngine->GetAsianCompressionMode();
 }
 
+void EditEngine::SetKernAsianPunctuation( BOOL b )
+{
+    DBG_CHKTHIS( EditView, 0 );
+    pImpEditEngine->SetKernAsianPunctuation( b );
+}
+
+BOOL EditEngine::IsKernAsianPunctuation() const
+{
+    DBG_CHKTHIS( EditView, 0 );
+    return pImpEditEngine->IsKernAsianPunctuation();
+}
+
 void EditEngine::SetPolygon( const XPolyPolygon& rPoly )
 {
     DBG_CHKTHIS( EditEngine, 0 );
diff --git a/svx/source/editeng/impedit.hxx b/svx/source/editeng/impedit.hxx
index 1e1e013e282e..a4051aa57fef 100644
--- a/svx/source/editeng/impedit.hxx
+++ b/svx/source/editeng/impedit.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impedit.hxx,v $
  *
- *  $Revision: 1.39 $
+ *  $Revision: 1.40 $
  *
- *  last change: $Author: mt $ $Date: 2001-08-28 09:58:54 $
+ *  last change: $Author: mt $ $Date: 2001-10-11 12:52:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -457,6 +457,7 @@ private:
     sal_uInt16          nStretchY;
 
     USHORT              nAsianCompressionMode;
+    BOOL                bKernAsianPunctuation;
 
     sal_uInt16          nBigTextObjectStart;
     ::com::sun::star::uno::Reference<
@@ -885,6 +886,9 @@ public:
     void                SetAsianCompressionMode( USHORT n );
     USHORT              GetAsianCompressionMode() const { return nAsianCompressionMode; }
 
+    void                SetKernAsianPunctuation( BOOL b );
+    BOOL                IsKernAsianPunctuation() const { return bKernAsianPunctuation; }
+
     vos::ORef<SvxForbiddenCharactersTable>  GetForbiddenCharsTable( BOOL bGetInternal = TRUE ) const;
     void                SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars );
 };
diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx
index 56be3ca0fbd3..1cee0b9830fd 100644
--- a/svx/source/editeng/impedit2.cxx
+++ b/svx/source/editeng/impedit2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impedit2.cxx,v $
  *
- *  $Revision: 1.46 $
+ *  $Revision: 1.47 $
  *
- *  last change: $Author: thb $ $Date: 2001-09-03 10:13:45 $
+ *  last change: $Author: mt $ $Date: 2001-10-11 12:52:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -204,6 +204,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
     maBackgroundColor   = COL_AUTO;
 
     nAsianCompressionMode = text::CharacterCompressionType::NONE;
+    bKernAsianPunctuation = FALSE;
 
 
     aStatus.GetControlWord() =  EE_CNTRL_USECHARATTRIBS | EE_CNTRL_DOIDLEFORMAT |
diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx
index d79e24365824..bf75d6120580 100644
--- a/svx/source/editeng/impedit3.cxx
+++ b/svx/source/editeng/impedit3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impedit3.cxx,v $
  *
- *  $Revision: 1.50 $
+ *  $Revision: 1.51 $
  *
- *  last change: $Author: mt $ $Date: 2001-08-28 09:58:54 $
+ *  last change: $Author: mt $ $Date: 2001-10-11 12:52:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2208,6 +2208,9 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode, sal_uInt16 nPos, SvxFont& rF
 
     rFont.SetCJKContextLanguage( pCJKLanguageItem->GetLanguage() );
 
+    if ( rFont.GetKerning() && IsKernAsianPunctuation() && ( nScriptType == i18n::ScriptType::ASIAN ) )
+        rFont.SetKerning( rFont.GetKerning() | KERNING_ASIAN );
+
     if ( aStatus.DoNotUseColors() )
     {
         // Hack fuer DL,weil JOE staendig die Pooldefaults verbiegt!
diff --git a/svx/source/editeng/impedit4.cxx b/svx/source/editeng/impedit4.cxx
index 7a9443b166c8..9cb174a75f54 100644
--- a/svx/source/editeng/impedit4.cxx
+++ b/svx/source/editeng/impedit4.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impedit4.cxx,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: thb $ $Date: 2001-08-06 15:15:58 $
+ *  last change: $Author: mt $ $Date: 2001-10-11 12:52:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2286,6 +2286,19 @@ void ImpEditEngine::SetAsianCompressionMode( USHORT n )
     }
 }
 
+void ImpEditEngine::SetKernAsianPunctuation( BOOL b )
+{
+    if ( b != bKernAsianPunctuation )
+    {
+        bKernAsianPunctuation = b;
+        if ( ImplHasText() )
+        {
+            FormatFullDoc();
+            UpdateViews();
+        }
+    }
+}
+
 
 BOOL ImpEditEngine::ImplHasText() const
 {