summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-10-18 15:36:28 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-10-18 16:27:43 +0100
commite63a0d5657c7b9c7431525ba669b3edab0e56af3 (patch)
tree690d7fcdac9f21bcf75db7e32064ab826a0611a1 /editeng
parentf6d23bbe9909545e044d497e05ebcee28a1b2552 (diff)
Related: rhbz#1020712 wrong default font shown in editengine
Only in editengine could we have this fiasco. There are two ImpEditEngine::GetScriptType's a) sal_uInt16 ImpEditEngine::GetScriptType(const EditPaM& rPaM, sal_uInt16* pEndPos) const this one returns i18n::ScriptType b) sal_uInt16 ImpEditEngine::GetScriptType(const EditSelection& rSel) const this one returns SCRIPTTYPE Could there be a better way to ensure that mistakes will be made. Anyway, within variant b, with an empty edit engine ImpEditEngine::GetScriptType calls GetI18NScriptTypeOfLanguage but *that* returns i18n::ScriptType's not SCRIPTTYPEs but when there is content then a SCRIPTTYPE is truly returned. Change-Id: I3a4a7c8746728e0fdfb25d961004c8339a24c93d
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/impedit2.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 515842ee9360..e7dbdc65b546 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1828,7 +1828,7 @@ sal_uInt16 ImpEditEngine::GetScriptType( const EditSelection& rSel ) const
}
}
}
- return nScriptType ? nScriptType : GetI18NScriptTypeOfLanguage( GetDefaultLanguage() );
+ return nScriptType ? nScriptType : SvtLanguageOptions::GetScriptTypeOfLanguage( GetDefaultLanguage() );
}
sal_Bool ImpEditEngine::IsScriptChange( const EditPaM& rPaM ) const