diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/sdi/drtxtob.sdi | 6 | ||||
| -rw-r--r-- | sd/source/core/typemap.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/dlg/dlgchar.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/dlg/prltempl.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/dlg/tabtempl.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/func/fuchar.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/func/futext.cxx | 7 | ||||
| -rw-r--r-- | sd/source/ui/view/drtxtob.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 11 | ||||
| -rw-r--r-- | sd/source/ui/view/drviewsf.cxx | 1 |
10 files changed, 26 insertions, 7 deletions
diff --git a/sd/sdi/drtxtob.sdi b/sd/sdi/drtxtob.sdi index 3e975d4946da..ed564e492d23 100644 --- a/sd/sdi/drtxtob.sdi +++ b/sd/sdi/drtxtob.sdi @@ -92,6 +92,12 @@ shell TextObjectBar StateMethod = GetAttrState; ] + SID_ATTR_CHAR_CASEMAP // ole : ?, status : ? + [ + ExecMethod = Execute; + StateMethod = GetAttrState; + ] + SID_ATTR_PARA_ADJUST_LEFT // ole : ?, status : ? [ ExecMethod = Execute; diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index a5548a305c9c..65f7cf0ca540 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -21,6 +21,7 @@ #include <editeng/outliner.hxx> #include <editeng/eeitem.hxx> +#include <editeng/cmapitem.hxx> #include <editeng/langitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/colritem.hxx> diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index a23cd804c95a..5e44899dce38 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -60,7 +60,6 @@ void SdCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } else if (nId == mnCharEffects) { - aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP)); rPage.PageCreated(aSet); } } diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 74c010e36a03..c503c930de60 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -281,7 +281,6 @@ void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) else if (nId == mnEffects) { - aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP)); rPage.PageCreated(aSet); } } diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 61514ee29c0d..1189922c4533 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -152,7 +152,6 @@ void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } else if (nId == m_nFontEffectId) { - aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP)); rPage.PageCreated(aSet); } else if (nId == m_nTextId) diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index 174391ac74da..b8166c2cab10 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -106,6 +106,7 @@ void FuChar::DoExecute( SfxRequest& rReq ) SID_ATTR_CHAR_FONTHEIGHT, SID_ATTR_CHAR_COLOR, SID_ATTR_CHAR_KERNING, + SID_ATTR_CHAR_CASEMAP, SID_SET_SUPER_SCRIPT, SID_SET_SUB_SCRIPT, 0 }; diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index ac6fb7180214..33e5339392b0 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -85,12 +85,13 @@ static sal_uInt16 SidArray[] = { SID_ATTR_CHAR_FONT, // 10007 SID_ATTR_CHAR_POSTURE, // 10008 SID_ATTR_CHAR_WEIGHT, // 10009 - SID_ATTR_CHAR_SHADOWED, //10010 - SID_ATTR_CHAR_STRIKEOUT, //10013 + SID_ATTR_CHAR_SHADOWED, // 10010 + SID_ATTR_CHAR_STRIKEOUT, // 10013 SID_ATTR_CHAR_UNDERLINE, // 10014 SID_ATTR_CHAR_FONTHEIGHT, // 10015 SID_ATTR_CHAR_COLOR, // 10017 - SID_ATTR_CHAR_KERNING, //10018 + SID_ATTR_CHAR_KERNING, // 10018 + SID_ATTR_CHAR_CASEMAP, // 10019 SID_ATTR_PARA_ADJUST_LEFT, // 10028 SID_ATTR_PARA_ADJUST_RIGHT, // 10029 SID_ATTR_PARA_ADJUST_CENTER, // 10030 diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 25913dd91ad6..45c868f13f06 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -171,8 +171,9 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) case SID_ATTR_CHAR_FONTHEIGHT: case SID_ATTR_CHAR_WEIGHT: case SID_ATTR_CHAR_POSTURE: - case SID_ATTR_CHAR_SHADOWED: + case SID_ATTR_CHAR_SHADOWED: case SID_ATTR_CHAR_STRIKEOUT: + case SID_ATTR_CHAR_CASEMAP: { sal_uInt16 stretchX = 100; sal_uInt16 stretchY = 100; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index d4ed8fab0a6f..ffbb503d834d 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -87,6 +87,7 @@ #include <vcl/svapp.hxx> #include <vcl/waitobj.hxx> +#include <editeng/cmapitem.hxx> #include <editeng/escapementitem.hxx> #include <editeng/kernitem.hxx> #include <editeng/wghtitem.hxx> @@ -3032,6 +3033,16 @@ void DrawViewShell::ExecChar( SfxRequest &rReq ) } } break; + case SID_ATTR_CHAR_CASEMAP: + if( rReq.GetArgs() ) + { + SFX_REQUEST_ARG( rReq, pItem, SvxCaseMapItem, SID_ATTR_CHAR_CASEMAP , false ); + if (pItem) + { + aNewAttr.Put(*pItem); + } + } + break; case SID_SET_SUB_SCRIPT: { SvxEscapementItem aItem( EE_CHAR_ESCAPEMENT ); diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 56d7a88b9083..a5183c10f24f 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -409,6 +409,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet ) case SID_ATTR_CHAR_WEIGHT: case SID_ATTR_CHAR_COLOR: case SID_ATTR_CHAR_KERNING: + case SID_ATTR_CHAR_CASEMAP: case SID_SET_SUB_SCRIPT: case SID_SET_SUPER_SCRIPT: { |