diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-07-18 08:44:48 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-07-18 08:44:48 +0000 |
| commit | afb519544cfc91514fc1453bdc5bf3e8603fc642 (patch) | |
| tree | 7ab45e1e4ec01d16d220386314f751b10a886ce1 /sc/source/ui/view/editsh.cxx | |
| parent | 6114bc16b964a99134cfb6e36aed0185662b1727 (diff) | |
INTEGRATION: CWS tl38 (1.31.8); FILE MERGED
2007/06/27 08:21:51 tl 1.31.8.2: RESYNC: (1.31-1.32); FILE MERGED
2007/06/15 10:24:37 tl 1.31.8.1: #i78017# change char attribute behaviour for font-height, -weight and -posture
Diffstat (limited to 'sc/source/ui/view/editsh.cxx')
| -rw-r--r-- | sc/source/ui/view/editsh.cxx | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 7e8cb98e7a8c..f0149c3d5768 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -4,9 +4,9 @@ * * $RCSfile: editsh.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: kz $ $Date: 2007-05-10 17:00:21 $ + * last change: $Author: obo $ $Date: 2007-07-18 09:44:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -754,15 +754,12 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) { if (pArgs) { - USHORT nScript = pEditView->GetSelectedScriptType(); - if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType(); - - // #i55929# script type for font / height depends on input language if nothing is selected - if ( !pEditView->GetSelection().HasRange() ) + // #i78017 establish the same behaviour as in Writer + USHORT nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX; + if (nSlot == SID_ATTR_CHAR_FONT) { - LanguageType nInputLang = pViewData->GetActiveWin()->GetInputLanguage(); - if (nInputLang != LANGUAGE_DONTKNOW && nInputLang != LANGUAGE_SYSTEM) - nScript = SvtLanguageOptions::GetScriptTypeOfLanguage( nInputLang ); + nScript = pEditView->GetSelectedScriptType(); + if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType(); } SfxItemPool& rPool = GetPool(); @@ -789,8 +786,9 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) case SID_ATTR_CHAR_WEIGHT: { - USHORT nScript = pEditView->GetSelectedScriptType(); - if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType(); + // #i78017 establish the same behaviour as in Writer + USHORT nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX; + SfxItemPool& rPool = GetPool(); BOOL bOld = FALSE; @@ -811,8 +809,9 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) case SID_ATTR_CHAR_POSTURE: { - USHORT nScript = pEditView->GetSelectedScriptType(); - if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType(); + // #i78017 establish the same behaviour as in Writer + USHORT nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX; + SfxItemPool& rPool = GetPool(); BOOL bOld = FALSE; |