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 /filter | |
parent | f839984910f0fd4ef385552df3af5e09190e15b9 (diff) |
msfilter::util: avoid code duplication by merging from sw and writerfilter
Diffstat (limited to 'filter')
-rw-r--r-- | filter/Library_msfilter.mk | 1 | ||||
-rw-r--r-- | filter/Package_inc.mk | 1 | ||||
-rw-r--r-- | filter/inc/filter/msfilter/util.hxx | 46 | ||||
-rw-r--r-- | filter/source/msfilter/util.cxx | 55 |
4 files changed, 103 insertions, 0 deletions
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index e2e5eb2485b3..979abd728cb2 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -71,6 +71,7 @@ $(eval $(call gb_Library_add_exception_objects,msfilter,\ filter/source/msfilter/services \ filter/source/msfilter/svdfppt \ filter/source/msfilter/svxmsbas2 \ + filter/source/msfilter/util \ )) # vim: set noet sw=4 ts=4: diff --git a/filter/Package_inc.mk b/filter/Package_inc.mk index 27a6c4533257..2b113f18d38c 100644 --- a/filter/Package_inc.mk +++ b/filter/Package_inc.mk @@ -30,5 +30,6 @@ $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/mstoolbar.hxx,f $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/msvbahelper.hxx,filter/msfilter/msvbahelper.hxx)) $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/svdfppt.hxx,filter/msfilter/svdfppt.hxx)) $(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/svxmsbas.hxx,filter/msfilter/svxmsbas.hxx)) +$(eval $(call gb_Package_add_file,filter_inc,inc/filter/msfilter/util.hxx,filter/msfilter/util.hxx)) # vim: set noet sw=4 ts=4: diff --git a/filter/inc/filter/msfilter/util.hxx b/filter/inc/filter/msfilter/util.hxx new file mode 100644 index 000000000000..33a66585127c --- /dev/null +++ b/filter/inc/filter/msfilter/util.hxx @@ -0,0 +1,46 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Miklos Vajna <vmiklos@suse.cz> (SUSE, Inc.) + * Portions created by the Initial Developer are Copyright (C) 2012 the + * Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef INCLUDED_MSFILTER_UTIL_HXX +#define INCLUDED_MSFILTER_UTIL_HXX + +#include <rtl/textenc.h> +#include "filter/msfilter/msfilterdllapi.h" + +namespace msfilter { +namespace util { + +/// Returns the default encoding, based on the application's locale. +MSFILTER_DLLPUBLIC rtl_TextEncoding GetDefaultTextEncoding(); + +} +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx new file mode 100644 index 000000000000..a5fb20933d1d --- /dev/null +++ b/filter/source/msfilter/util.cxx @@ -0,0 +1,55 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * Miklos Vajna <vmiklos@suse.cz> (SUSE, Inc.) + * Portions created by the Initial Developer are Copyright (C) 2012 the + * Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#include <rtl/ustring.hxx> +#include <vcl/svapp.hxx> +#include <filter/msfilter/util.hxx> + +namespace msfilter { +namespace util { + +rtl_TextEncoding GetDefaultTextEncoding() +{ + const rtl::OUString& rLanguage = Application::GetSettings().GetLocale().Language; + + if (rLanguage == "cs" || rLanguage == "hu" || rLanguage == "pl") + return RTL_TEXTENCODING_MS_1250; + if (rLanguage == "ru" || rLanguage == "uk") + return RTL_TEXTENCODING_MS_1251; + if (rLanguage == "el") + return RTL_TEXTENCODING_MS_1253; + if (rLanguage == "tr") + return RTL_TEXTENCODING_MS_1254; + else + return RTL_TEXTENCODING_MS_1252; +} + +} +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |