diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2019-03-04 15:59:35 +0900 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2019-03-04 12:16:53 +0100 |
commit | 96af93e5df3ea2e775cdfebf31447abaeec6dcfa (patch) | |
tree | 6101315f58c057e98b8b8087ecd20a025a522d3e | |
parent | 0b9e4f6085d147c43a86d107303eea9b86e7f34c (diff) |
Fix typo: KATAGANA -> KATAKANA
No functional change offered, but this reduces some amount of confusion.
Japanese word "Katakana" ("kata" + "kana") does not undergo Rendaku [1]
while "Hiragana" ("hira" + "kana") does.
[1] https://en.wikipedia.org/wiki/Rendaku
Change-Id: I07824147d72397c312a0774eca1fdcc7549abc59
Reviewed-on: https://gerrit.libreoffice.org/68661
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
28 files changed, 42 insertions, 42 deletions
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 5e082fa30943..2c708fc640dd 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -696,7 +696,7 @@ class SfxStringItem; #define SID_TRANSLITERATE_HALFWIDTH ( SID_SVX_START + 914 ) #define SID_TRANSLITERATE_FULLWIDTH ( SID_SVX_START + 915 ) #define SID_TRANSLITERATE_HIRAGANA ( SID_SVX_START + 916 ) -#define SID_TRANSLITERATE_KATAGANA ( SID_SVX_START + 917 ) +#define SID_TRANSLITERATE_KATAKANA ( SID_SVX_START + 917 ) // CAUTION! Range <919 .. 920> used by EditEngine (!) diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 277960fe719d..b36f0bddb972 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -6316,7 +6316,7 @@ <!-- UIHints: setup --> <info> <desc>Specifies whether case mapping to half and full width, - hiragana and katagana are available (true) or not (false).</desc> + hiragana and katakana are available (true) or not (false).</desc> </info> <value>false</value> </prop> diff --git a/sc/sdi/app.sdi b/sc/sdi/app.sdi index 7787a5956efe..bcf363ca5799 100644 --- a/sc/sdi/app.sdi +++ b/sc/sdi/app.sdi @@ -63,7 +63,7 @@ interface StarCalc SID_TRANSLITERATE_HALFWIDTH [ StateMethod = HideDisabledSlots; Export = FALSE; ] SID_TRANSLITERATE_FULLWIDTH [ StateMethod = HideDisabledSlots; Export = FALSE; ] SID_TRANSLITERATE_HIRAGANA [ StateMethod = HideDisabledSlots; Export = FALSE; ] - SID_TRANSLITERATE_KATAGANA [ StateMethod = HideDisabledSlots; Export = FALSE; ] + SID_TRANSLITERATE_KATAKANA [ StateMethod = HideDisabledSlots; Export = FALSE; ] SID_INSERT_RLM [ StateMethod = HideDisabledSlots; Export = FALSE; ] SID_INSERT_LRM [ StateMethod = HideDisabledSlots; Export = FALSE; ] diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi index e58ef8de34a8..b7b279cdf0b6 100644 --- a/sc/sdi/cellsh.sdi +++ b/sc/sdi/cellsh.sdi @@ -245,7 +245,7 @@ interface CellSelection SID_TRANSLITERATE_HALFWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] SID_TRANSLITERATE_FULLWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] SID_TRANSLITERATE_HIRAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] - SID_TRANSLITERATE_KATAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] + SID_TRANSLITERATE_KATAKANA [ ExecMethod = ExecuteTrans; StateMethod = GetBlockState; ] SID_AUTO_SUM [ ExecMethod = ExecuteEdit; ] } diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi index 1cf966be6ffa..e1a7f4aa09d1 100644 --- a/sc/sdi/drtxtob.sdi +++ b/sc/sdi/drtxtob.sdi @@ -147,7 +147,7 @@ interface TableDrawText SID_TRANSLITERATE_HALFWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] SID_TRANSLITERATE_FULLWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] SID_TRANSLITERATE_HIRAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] - SID_TRANSLITERATE_KATAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] + SID_TRANSLITERATE_KATAKANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] SID_TABLE_VERT_NONE [ExecMethod = ExecuteAttr ;StateMethod = GetStatePropPanelAttr ;] SID_TABLE_VERT_CENTER [ExecMethod = ExecuteAttr ;StateMethod = GetStatePropPanelAttr ;] diff --git a/sc/sdi/editsh.sdi b/sc/sdi/editsh.sdi index 23393e660a0f..9e1e5d4a0509 100644 --- a/sc/sdi/editsh.sdi +++ b/sc/sdi/editsh.sdi @@ -88,7 +88,7 @@ interface TableText SID_TRANSLITERATE_HALFWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] SID_TRANSLITERATE_FULLWIDTH [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] SID_TRANSLITERATE_HIRAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] - SID_TRANSLITERATE_KATAGANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] + SID_TRANSLITERATE_KATAKANA [ ExecMethod = ExecuteTrans; StateMethod = GetState; Export = FALSE; ] FN_INSERT_SOFT_HYPHEN [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] FN_INSERT_HARDHYPHEN [ ExecMethod = Execute; StateMethod = GetState; Export = FALSE; ] diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 340c5afe9ee7..70ffb7f1a4b3 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -416,8 +416,8 @@ void ScDrawTextObjectBar::GetState( SfxItemSet& rSet ) ScViewUtil::HideDisabledSlot( rSet, pViewFrm->GetBindings(), SID_TRANSLITERATE_FULLWIDTH ); if( rSet.GetItemState( SID_TRANSLITERATE_HIRAGANA ) != SfxItemState::UNKNOWN ) ScViewUtil::HideDisabledSlot( rSet, pViewFrm->GetBindings(), SID_TRANSLITERATE_HIRAGANA ); - if( rSet.GetItemState( SID_TRANSLITERATE_KATAGANA ) != SfxItemState::UNKNOWN ) - ScViewUtil::HideDisabledSlot( rSet, pViewFrm->GetBindings(), SID_TRANSLITERATE_KATAGANA ); + if( rSet.GetItemState( SID_TRANSLITERATE_KATAKANA ) != SfxItemState::UNKNOWN ) + ScViewUtil::HideDisabledSlot( rSet, pViewFrm->GetBindings(), SID_TRANSLITERATE_KATAKANA ); if ( rSet.GetItemState( SID_ENABLE_HYPHENATION ) != SfxItemState::UNKNOWN ) { diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 26880e181969..94f23c437c20 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -302,7 +302,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet ) case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: - case SID_TRANSLITERATE_KATAGANA: + case SID_TRANSLITERATE_KATAKANA: ScViewUtil::HideDisabledSlot( rSet, GetViewData()->GetBindings(), nWhich ); break; case SID_CONVERT_FORMULA_TO_VALUE: diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 1ca775cc4fb9..b65bd957ab3b 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -755,7 +755,7 @@ void ScEditShell::GetState( SfxItemSet& rSet ) case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: - case SID_TRANSLITERATE_KATAGANA: + case SID_TRANSLITERATE_KATAKANA: case SID_INSERT_RLM: case SID_INSERT_LRM: ScViewUtil::HideDisabledSlot( rSet, pViewData->GetBindings(), nWhich ); diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index 04aad19f7f29..ddfce82fa886 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -126,7 +126,7 @@ TransliterationFlags ScViewUtil::GetTransliterationType( sal_uInt16 nSlotID ) case SID_TRANSLITERATE_HIRAGANA: nType = TransliterationFlags::KATAKANA_HIRAGANA; break; - case SID_TRANSLITERATE_KATAGANA: + case SID_TRANSLITERATE_KATAKANA: nType = TransliterationFlags::HIRAGANA_KATAKANA; break; } @@ -304,7 +304,7 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, sal case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: - case SID_TRANSLITERATE_KATAGANA: + case SID_TRANSLITERATE_KATAKANA: bEnabled = aCJKOptions.IsChangeCaseMapEnabled(); break; diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index d1164103169f..e4793664eb82 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2312,7 +2312,7 @@ interface DrawView ExecMethod = FuSupport ; StateMethod = GetCtrlState ; ] - SID_TRANSLITERATE_KATAGANA // ole : no, status : ? + SID_TRANSLITERATE_KATAKANA // ole : no, status : ? [ ExecMethod = FuSupport ; StateMethod = GetCtrlState ; diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index a804e5296618..b6887aa235b0 100644 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -493,7 +493,7 @@ interface OutlineView ExecMethod = FuSupport ; StateMethod = GetCtrlState ; ] - SID_TRANSLITERATE_KATAGANA // ole : no, status : ? + SID_TRANSLITERATE_KATAKANA // ole : no, status : ? [ ExecMethod = FuSupport ; StateMethod = GetCtrlState ; diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 1289f6097066..eb50712db032 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -1368,7 +1368,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: - case SID_TRANSLITERATE_KATAGANA: + case SID_TRANSLITERATE_KATAKANA: { OutlinerView* pOLV = GetView()->GetTextEditOutlinerView(); if( pOLV ) @@ -1401,7 +1401,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_TRANSLITERATE_HIRAGANA: nType = TransliterationFlags::KATAKANA_HIRAGANA; break; - case SID_TRANSLITERATE_KATAGANA: + case SID_TRANSLITERATE_KATAKANA: nType = TransliterationFlags::HIRAGANA_KATAKANA; break; } diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 0a8af78c3014..7d39044eaf97 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -224,14 +224,14 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, false ); GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, false ); GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, false ); - GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, false ); + GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAKANA, false ); } else { GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, true ); GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, true ); GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, true ); - GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, true ); + GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAKANA, true ); } rSet.DisableItem( SID_TRANSLITERATE_SENTENCE_CASE ); @@ -242,7 +242,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) rSet.DisableItem( SID_TRANSLITERATE_HALFWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_FULLWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_HIRAGANA ); - rSet.DisableItem( SID_TRANSLITERATE_KATAGANA ); + rSet.DisableItem( SID_TRANSLITERATE_KATAKANA ); } else { @@ -252,18 +252,18 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, false ); GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, false ); GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, false ); - GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, false ); + GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAKANA, false ); rSet.DisableItem( SID_TRANSLITERATE_HALFWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_FULLWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_HIRAGANA ); - rSet.DisableItem( SID_TRANSLITERATE_KATAGANA ); + rSet.DisableItem( SID_TRANSLITERATE_KATAKANA ); } else { GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, true ); GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, true ); GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, true ); - GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, true ); + GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAKANA, true ); } } } diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 244ba1afd975..6bf39aef42c4 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -383,7 +383,7 @@ void OutlineViewShell::GetCtrlState(SfxItemSet &rSet) if ( !(SfxItemState::DEFAULT == rSet.GetItemState(SID_TRANSLITERATE_HALFWIDTH) || SfxItemState::DEFAULT == rSet.GetItemState(SID_TRANSLITERATE_FULLWIDTH) || SfxItemState::DEFAULT == rSet.GetItemState(SID_TRANSLITERATE_HIRAGANA) || - SfxItemState::DEFAULT == rSet.GetItemState(SID_TRANSLITERATE_KATAGANA)) ) + SfxItemState::DEFAULT == rSet.GetItemState(SID_TRANSLITERATE_KATAKANA)) ) return; SvtCJKOptions aCJKOptions; @@ -392,18 +392,18 @@ void OutlineViewShell::GetCtrlState(SfxItemSet &rSet) GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, false ); GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, false ); GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, false ); - GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, false ); + GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAKANA, false ); rSet.DisableItem( SID_TRANSLITERATE_HALFWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_FULLWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_HIRAGANA ); - rSet.DisableItem( SID_TRANSLITERATE_KATAGANA ); + rSet.DisableItem( SID_TRANSLITERATE_KATAKANA ); } else { GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, true ); GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, true ); GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, true ); - GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, true ); + GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAKANA, true ); } } @@ -428,7 +428,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) (nSlot == SID_TRANSLITERATE_HALFWIDTH) || (nSlot == SID_TRANSLITERATE_FULLWIDTH) || (nSlot == SID_TRANSLITERATE_HIRAGANA) || - (nSlot == SID_TRANSLITERATE_KATAGANA) || + (nSlot == SID_TRANSLITERATE_KATAKANA) || (nSlot == SID_CUT) || (nSlot == SID_PASTE) || (nSlot == SID_PASTE_UNFORMATTED) || @@ -587,7 +587,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: - case SID_TRANSLITERATE_KATAGANA: + case SID_TRANSLITERATE_KATAKANA: { OutlinerView* pOLV = pOlView ? pOlView->GetViewByWindow( GetActiveWindow() ) : nullptr; if( pOLV ) @@ -620,7 +620,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) case SID_TRANSLITERATE_HIRAGANA: nType = TransliterationFlags::KATAKANA_HIRAGANA; break; - case SID_TRANSLITERATE_KATAGANA: + case SID_TRANSLITERATE_KATAKANA: nType = TransliterationFlags::HIRAGANA_KATAKANA; break; } diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index d02007216666..5cebc14c2840 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -1045,7 +1045,7 @@ SfxVoidItem ChangeCaseToHiragana SID_TRANSLITERATE_HIRAGANA ] -SfxVoidItem ChangeCaseToKatakana SID_TRANSLITERATE_KATAGANA +SfxVoidItem ChangeCaseToKatakana SID_TRANSLITERATE_KATAKANA () [ AutoUpdate = TRUE, diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx index f761b27aa331..f0b7a8d88497 100644 --- a/sw/inc/IDocumentContentOperations.hxx +++ b/sw/inc/IDocumentContentOperations.hxx @@ -148,7 +148,7 @@ public: virtual bool InsertString(const SwPaM &rRg, const OUString&, const SwInsertFlags nInsertMode = SwInsertFlags::EMPTYEXPAND ) = 0; - /** change text to Upper/Lower/Hiragana/Katagana/... + /** change text to Upper/Lower/Hiragana/Katakana/... */ virtual void TransliterateText(const SwPaM& rPaM, utl::TransliterationWrapper&) = 0; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 9c550e96f639..37d5f49d2fe8 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -179,7 +179,7 @@ public: /// Remove a complete paragraph. bool DelFullPara(); - /// Change text to Upper/Lower/Hiragana/Katagana/... + /// Change text to Upper/Lower/Hiragana/Katakana/... void TransliterateText( TransliterationFlags nType ); /// Count words in current selection. diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 1ae373fd934e..3900f398adbd 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -741,7 +741,7 @@ public: const bool bNegative = false, const bool bDelete = false ) override; - /// change text to Upper/Lower/Hiragana/Katagana/... + /// change text to Upper/Lower/Hiragana/Katakana/... void TransliterateText( utl::TransliterationWrapper& rTrans, sal_Int32 nStart, sal_Int32 nEnd, SwUndoTransliterate* pUndo ); diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi index bba7583b1d04..b1615db79a55 100644 --- a/sw/sdi/_textsh.sdi +++ b/sw/sdi/_textsh.sdi @@ -1600,7 +1600,7 @@ interface BaseText StateMethod = GetState ; DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] - SID_TRANSLITERATE_KATAGANA + SID_TRANSLITERATE_KATAKANA [ ExecMethod = ExecTransliteration; StateMethod = GetState ; diff --git a/sw/sdi/annotsh.sdi b/sw/sdi/annotsh.sdi index f8bd227b6873..9e5014d1678d 100644 --- a/sw/sdi/annotsh.sdi +++ b/sw/sdi/annotsh.sdi @@ -230,7 +230,7 @@ interface Annotation : _Annotation DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] - SID_TRANSLITERATE_KATAGANA + SID_TRANSLITERATE_KATAKANA [ ExecMethod = ExecTransliteration; StateMethod = GetState ; diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi index 7ad13589d2d0..2046fdf585da 100644 --- a/sw/sdi/drwtxtsh.sdi +++ b/sw/sdi/drwtxtsh.sdi @@ -600,7 +600,7 @@ interface TextDrawText StateMethod = GetState ; DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] - SID_TRANSLITERATE_KATAGANA + SID_TRANSLITERATE_KATAKANA [ ExecMethod = ExecTransliteration; StateMethod = GetState ; diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 326d0f97c488..812bc5763fb2 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1730,7 +1730,7 @@ namespace }; } -// change text to Upper/Lower/Hiragana/Katagana/... +// change text to Upper/Lower/Hiragana/Katakana/... void SwTextNode::TransliterateText( utl::TransliterationWrapper& rTrans, sal_Int32 nStt, sal_Int32 nEnd, diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index d4fef3b5f36b..dbf9df01a536 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -1452,7 +1452,7 @@ void SwAnnotationShell::ExecTransliteration(SfxRequest const &rReq) case SID_TRANSLITERATE_HIRAGANA: nMode = TransliterationFlags::KATAKANA_HIRAGANA; break; - case SID_TRANSLITERATE_KATAGANA: + case SID_TRANSLITERATE_KATAKANA: nMode = TransliterationFlags::HIRAGANA_KATAKANA; break; diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 8a9ca5738e4d..3c4032cf316b 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -845,7 +845,7 @@ ASK_ESCAPE: case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: - case SID_TRANSLITERATE_KATAGANA: + case SID_TRANSLITERATE_KATAKANA: { SvtCJKOptions aCJKOptions; if(!aCJKOptions.IsChangeCaseMapEnabled()) diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 532b92a56c5d..ef583b7c8341 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -633,7 +633,7 @@ void SwDrawTextShell::ExecTransliteration( SfxRequest const & rReq ) case SID_TRANSLITERATE_HIRAGANA: nMode = TransliterationFlags::KATAKANA_HIRAGANA; break; - case SID_TRANSLITERATE_KATAGANA: + case SID_TRANSLITERATE_KATAKANA: nMode = TransliterationFlags::HIRAGANA_KATAKANA; break; diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index c9526288ea59..4a6367997bb8 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -805,7 +805,7 @@ void SwTextShell::ExecTransliteration( SfxRequest const & rReq ) case SID_TRANSLITERATE_HIRAGANA: nMode = TransliterationFlags::KATAKANA_HIRAGANA; break; - case SID_TRANSLITERATE_KATAGANA: + case SID_TRANSLITERATE_KATAKANA: nMode = TransliterationFlags::HIRAGANA_KATAKANA; break; diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 63d0fe8967a5..3a222507e9d5 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -1777,7 +1777,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: - case SID_TRANSLITERATE_KATAGANA: + case SID_TRANSLITERATE_KATAKANA: { SvtCJKOptions aCJKOptions; if(!aCJKOptions.IsChangeCaseMapEnabled()) |