diff options
| author | Oliver Bolte <obo@openoffice.org> | 2003-09-04 10:46:25 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2003-09-04 10:46:25 +0000 |
| commit | 01b29d8ec5f91d5126d910759b48ecac425143f2 (patch) | |
| tree | 40aee2e11f504f46dddbb2c9134ed429a1574a0c /sw/source/core | |
| parent | 2d22ec4f5e28588191b8b381f5c42a885ebcf03a (diff) | |
INTEGRATION: CWS geordi2q04 (1.25.142); FILE MERGED
2003/09/02 10:37:58 rt 1.25.142.1: #111934#: Join CWS sw7pp1.
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/doc/poolfmt.cxx | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 2e2e87f928df..1318011517e4 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: poolfmt.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: vg $ $Date: 2003-06-10 13:17:42 $ + * last change: $Author: obo $ $Date: 2003-09-04 11:46:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -138,6 +138,9 @@ #ifndef _SVX_EMPHITEM_HXX #include <svx/emphitem.hxx> #endif +#ifndef _SVX_SRIPTSPACEITEM_HXX +#include <svx/scriptspaceitem.hxx> +#endif #ifndef _VIEWOPT_HXX #include <viewopt.hxx> #endif @@ -554,12 +557,21 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool { // allgemeine Inhaltsformen case RES_POOLCOLL_STANDARD: - if (bRegardLanguage && - GetDefaultFrameDirection(GetAppLanguage()) == - FRMDIR_HORI_RIGHT_TOP) + /* #111214# koreans do not like SvxScriptItem(TRUE) */ + if (bRegardLanguage) { - SvxAdjustItem aAdjust(SVX_ADJUST_RIGHT); - aSet.Put(aAdjust); + ULONG nAppLanguage = GetAppLanguage(); + if (GetDefaultFrameDirection(nAppLanguage) == + FRMDIR_HORI_RIGHT_TOP) + { + SvxAdjustItem aAdjust(SVX_ADJUST_RIGHT); + aSet.Put(aAdjust); + } + if (nAppLanguage == LANGUAGE_KOREAN) + { + SvxScriptSpaceItem aScriptSpace(FALSE); + aSet.Put(aScriptSpace); + } } break; @@ -2530,7 +2542,12 @@ void SwDoc::RemoveAllFmtLanguageDependencies() { /* #106748# Restore the language independ pool defaults and styles. */ GetAttrPool().ResetPoolDefaultItem( RES_PARATR_ADJUST ); - GetTxtCollFromPool( RES_POOLCOLL_STANDARD )->ResetAttr( RES_PARATR_ADJUST ); + + SwTxtFmtColl * pTxtFmtColl = GetTxtCollFromPool( RES_POOLCOLL_STANDARD ); + + pTxtFmtColl->ResetAttr( RES_PARATR_ADJUST ); + /* #111214# koreans do not like SvxScriptItem(TRUE) */ + pTxtFmtColl->ResetAttr( RES_PARATR_SCRIPTSPACE ); SvxFrameDirectionItem aFrameDir( FRMDIR_HORI_LEFT_TOP ); |