diff options
author | Eike Rathke <erack@redhat.com> | 2013-04-03 01:16:18 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2013-04-03 01:42:10 +0200 |
commit | da5adeada29b51dd0a65582cff9f0913e556f770 (patch) | |
tree | 2f25399d1ad58cdc3dd995d5423786b4bebfaff9 /desktop/source/deployment/inc/dp_descriptioninfoset.hxx | |
parent | e72072029ad22fdde8310e22667fd8f2f46db28e (diff) |
DescriptionInfoset with LanguageTag
Change-Id: I7957a4a773b2ea8e69c30a1152b90ce5623a26dc
Diffstat (limited to 'desktop/source/deployment/inc/dp_descriptioninfoset.hxx')
-rw-r--r-- | desktop/source/deployment/inc/dp_descriptioninfoset.hxx | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx index 8a5361be372e..1e4817fff17d 100644 --- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx +++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx @@ -31,7 +31,6 @@ /// @HTML namespace com { namespace sun { namespace star { - namespace lang { struct Locale; } namespace uno { class XComponentContext; } namespace xml { namespace dom { @@ -230,16 +229,9 @@ private: SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > getLocalizedChild( ::rtl::OUString const & sParent) const; SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode> - matchFullLocale(::com::sun::star::uno::Reference< - ::com::sun::star::xml::dom::XNode > const & xParent, ::rtl::OUString const & sLocale) const; - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode> - matchCountryAndLanguage(::com::sun::star::uno::Reference< - ::com::sun::star::xml::dom::XNode > const & xParent, - ::com::sun::star::lang::Locale const & officeLocale) const; - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode> - matchLanguage( + matchLanguageTag( ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & xParent, - ::com::sun::star::lang::Locale const & officeLocale) const; + OUString const & rTag) const; /** If there is no child element with a locale matching the office locale, then we use the first child. In the case of the simple-license we also use the former default locale, which @@ -258,9 +250,6 @@ private: SAL_DLLPRIVATE ::rtl::OUString getLocalizedHREFAttrFromChild( ::rtl::OUString const & sXPathParent, bool * out_bParentExists) const; - static SAL_DLLPRIVATE ::rtl::OUString - localeToString(::com::sun::star::lang::Locale const & locale); - /** Gets the node value for a given expression. The expression is used in m_xpath-selectSingleNode. The value of the returned node is return value of this function. |