mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo: KATAGANA -> KATAKANA

Browse Source 
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>
This commit is contained in:
Takeshi Abe 2019-03-04 15:59:35 +09:00 committed by Julien Nabet
parent 0b9e4f6085
commit 96af93e5df
28 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/svx/svxids.hrc
View File

@ -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 (!)

2
officecfg/registry/schema/org/openoffice/Office/Common.xcs
View File

@ -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>

2
sc/sdi/app.sdi
View File

@ -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; ]

2
sc/sdi/cellsh.sdi
View File

@ -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; ]
}

2
sc/sdi/drtxtob.sdi
View File

@ -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 ;]

2
sc/sdi/editsh.sdi
View File

@ -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; ]

4
sc/source/ui/drawfunc/drtxtob.cxx
View File

@ -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 )
{

2
sc/source/ui/view/cellsh.cxx
View File

@ -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:

2
sc/source/ui/view/editsh.cxx
View File

@ -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 );

4
sc/source/ui/view/viewutil.cxx
View File

@ -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;

2
sd/sdi/_drvwsh.sdi
View File

@ -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 ;

2
sd/sdi/outlnvsh.sdi
View File

@ -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 ;

4
sd/source/ui/view/drviewse.cxx
View File

@ -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;
}

12
sd/source/ui/view/drviewsf.cxx
View File

@ -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 );
}
}
}

14
sd/source/ui/view/outlnvsh.cxx
View File

@ -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;
}

2
svx/sdi/svx.sdi
View File

@ -1045,7 +1045,7 @@ SfxVoidItem ChangeCaseToHiragana SID_TRANSLITERATE_HIRAGANA
]
SfxVoidItem ChangeCaseToKatakana SID_TRANSLITERATE_KATAGANA
SfxVoidItem ChangeCaseToKatakana SID_TRANSLITERATE_KATAKANA
()
[
AutoUpdate = TRUE,

2
sw/inc/IDocumentContentOperations.hxx
View File

@ -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;

2
sw/inc/editsh.hxx
View File

@ -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.

2
sw/inc/ndtxt.hxx
View File

@ -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 );

2
sw/sdi/_textsh.sdi
View File

@ -1600,7 +1600,7 @@ interface BaseText
StateMethod = GetState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
SID_TRANSLITERATE_KATAGANA
SID_TRANSLITERATE_KATAKANA
[
ExecMethod = ExecTransliteration;
StateMethod = GetState ;

2
sw/sdi/annotsh.sdi
View File

@ -230,7 +230,7 @@ interface Annotation : _Annotation
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
SID_TRANSLITERATE_KATAGANA
SID_TRANSLITERATE_KATAKANA
[
ExecMethod = ExecTransliteration;
StateMethod = GetState ;

2
sw/sdi/drwtxtsh.sdi
View File

@ -600,7 +600,7 @@ interface TextDrawText
StateMethod = GetState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
SID_TRANSLITERATE_KATAGANA
SID_TRANSLITERATE_KATAKANA
[
ExecMethod = ExecTransliteration;
StateMethod = GetState ;

2
sw/source/core/txtnode/txtedt.cxx
View File

@ -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,

2
sw/source/uibase/shells/annotsh.cxx
View File

@ -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;

2
sw/source/uibase/shells/drwtxtex.cxx
View File

@ -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())

2
sw/source/uibase/shells/drwtxtsh.cxx
View File

@ -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;

2
sw/source/uibase/shells/textsh.cxx
View File

@ -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;

2
sw/source/uibase/shells/textsh1.cxx
View File

@ -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())