diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-07-18 08:45:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-07-18 08:45:01 +0000 |
| commit | c6f9cf83cf3dcd8e2aa24e68bf43a6d2224fa516 (patch) | |
| tree | 216d9043caf1f52456aac456c452bf82f20fbfd1 /sc/source/ui/view/formatsh.cxx | |
| parent | afb519544cfc91514fc1453bdc5bf3e8603fc642 (diff) | |
INTEGRATION: CWS tl38 (1.34.10); FILE MERGED
2007/06/27 08:22:01 tl 1.34.10.2: RESYNC: (1.34-1.35); FILE MERGED
2007/06/15 10:24:37 tl 1.34.10.1: #i78017# change char attribute behaviour for font-height, -weight and -posture
Diffstat (limited to 'sc/source/ui/view/formatsh.cxx')
| -rw-r--r-- | sc/source/ui/view/formatsh.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 3a1a063f4cef..87601d4c2f0e 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -4,9 +4,9 @@ * * $RCSfile: formatsh.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: kz $ $Date: 2007-05-10 17:00:34 $ + * last change: $Author: obo $ $Date: 2007-07-18 09:45:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1167,7 +1167,9 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) { case SID_ATTR_CHAR_WEIGHT: { - BYTE nScript = pTabViewShell->GetSelectionScriptType(); + // #i78017 establish the same behaviour as in Writer + BYTE nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX; + SfxItemPool& rPool = GetPool(); SvxScriptSetItem aSetItem( nSlot, rPool ); if ( pSet ) @@ -1192,7 +1194,9 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) case SID_ATTR_CHAR_POSTURE: { - BYTE nScript = pTabViewShell->GetSelectionScriptType(); + // #i78017 establish the same behaviour as in Writer + BYTE nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX; + SfxItemPool& rPool = GetPool(); SvxScriptSetItem aSetItem( nSlot, rPool ); if ( pSet ) @@ -1469,7 +1473,10 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) case SID_ATTR_CHAR_FONT: case SID_ATTR_CHAR_FONTHEIGHT: { - BYTE nScript = pTabViewShell->GetSelectionScriptType(); + // #i78017 establish the same behaviour as in Writer + BYTE nScript = SCRIPTTYPE_LATIN | SCRIPTTYPE_ASIAN | SCRIPTTYPE_COMPLEX; + if (nSlot == SID_ATTR_CHAR_FONT) + nScript = pTabViewShell->GetSelectionScriptType(); SfxItemPool& rPool = GetPool(); SvxScriptSetItem aSetItem( nSlot, rPool ); |