diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-04-24 17:35:40 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-04-25 09:11:05 +0200 |
| commit | ee242df844d1a2b85e0d7b86dbdb8bf3643fc74f (patch) | |
| tree | 542d50009f23df47cb611fdf0ad5c0103a98ffde /writerfilter | |
| parent | f839984910f0fd4ef385552df3af5e09190e15b9 (diff) | |
msfilter::util: avoid code duplication by merging from sw and writerfilter
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/Library_rtftok.mk | 1 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 16 |
2 files changed, 3 insertions, 14 deletions
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk index 5521362eeca7..b7df627bdffe 100644 --- a/writerfilter/Library_rtftok.mk +++ b/writerfilter/Library_rtftok.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_add_defs,rtftok,\ $(eval $(call gb_Library_use_libraries,rtftok,\ cppu \ cppuhelper \ + msfilter \ oox \ sal \ svt \ diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 50f84c41797c..6bcfdc7998b5 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -45,6 +45,7 @@ #include <vcl/graph.hxx> #include <svtools/grfmgr.hxx> #include <vcl/svapp.hxx> +#include <filter/msfilter/util.hxx> #include <doctok/sprmids.hxx> // NS_sprm namespace #include <doctok/resourceids.hxx> // NS_rtf namespace @@ -513,26 +514,13 @@ sal_uInt32 RTFDocumentImpl::getColorTable(sal_uInt32 nIndex) return 0; } -rtl_TextEncoding lcl_getDefaultTextEncoding() -{ - - const OUString& rLanguage = Application::GetSettings().GetLocale().Language; - - if (rLanguage == "ru" || rLanguage == "uk") - return RTL_TEXTENCODING_MS_1251; - if (rLanguage == "tr") - return RTL_TEXTENCODING_MS_1254; - else - return RTL_TEXTENCODING_MS_1252; -} - rtl_TextEncoding RTFDocumentImpl::getEncoding(sal_uInt32 nFontIndex) { if (!m_pSuperstream) { if (nFontIndex < m_aFontEncodings.size()) return m_aFontEncodings[nFontIndex]; - return lcl_getDefaultTextEncoding(); + return msfilter::util::GetDefaultTextEncoding(); } else return m_pSuperstream->getEncoding(nFontIndex); |