diff options
author | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:41:40 +0100 |
---|---|---|
committer | Michael Stahl <mst@openoffice.org> | 2011-02-11 15:41:40 +0100 |
commit | 2b9ee96b5d07cff557ea25deb6d6fbd908a08f24 (patch) | |
tree | 1c918787691e9d69e1f952768a08406931cd34e9 /sw/source/ui/inc/langhelper.hxx | |
parent | a3c0c3a8762e47be72de05ac3ae1fc5032f2a1a9 (diff) | |
parent | c50e8a2df2e04d9d2c225df0ea648f0501acc250 (diff) |
sw34bf03: merge to-be-m100 DEV300_next
Diffstat (limited to 'sw/source/ui/inc/langhelper.hxx')
-rwxr-xr-x | sw/source/ui/inc/langhelper.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/inc/langhelper.hxx b/sw/source/ui/inc/langhelper.hxx index 3ff795d83f56..213092062a00 100755 --- a/sw/source/ui/inc/langhelper.hxx +++ b/sw/source/ui/inc/langhelper.hxx @@ -37,7 +37,7 @@ struct ESelection; namespace SwLangHelper { - extern USHORT GetLanguageStatus( OutlinerView* pOLV, SfxItemSet& rSet ); + extern sal_uInt16 GetLanguageStatus( OutlinerView* pOLV, SfxItemSet& rSet ); extern bool SetLanguageStatus( OutlinerView* pOLV, SfxRequest &rReq, SwView &rView, SwWrtShell &rSh ); extern void SetLanguage( SwWrtShell &rWrtSh, const String &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet ); @@ -58,10 +58,10 @@ namespace SwLangHelper extern String GetTextForLanguageGuessing( EditEngine* rEditEngine, ESelection aDocSelection ); extern String GetTextForLanguageGuessing( SwWrtShell &rSh ); - extern LanguageType GetLanguage( SfxItemSet aSet, USHORT nLangWhichId ); - extern LanguageType GetLanguage( SwWrtShell &rSh, USHORT nLangWhichId ); + extern LanguageType GetLanguage( SfxItemSet aSet, sal_uInt16 nLangWhichId ); + extern LanguageType GetLanguage( SwWrtShell &rSh, sal_uInt16 nLangWhichId ); - extern LanguageType GetCurrentLanguage( SfxItemSet aSet, USHORT nScriptType ); + extern LanguageType GetCurrentLanguage( SfxItemSet aSet, sal_uInt16 nScriptType ); extern LanguageType GetCurrentLanguage( SwWrtShell &rSh ); } |