add bDisallowPrivate parameter to LanguageTag::isValidBcp47()

Change-Id: I0924b0fa268c38c238226d082cf26595bba72f0c
(cherry picked from commit fecde4c7099fdb7c5ee396b0f68ec517f3a08955)

2 files changed, 19 insertions, 4 deletions

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index 8a96bde83f81..b9fcd7260424 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -2687,8 +2687,10 @@ com::sun::star::lang::Locale LanguageTag::convertToLocaleWithFallback( const OUS
 
 
 // static
-bool LanguageTag::isValidBcp47( const OUString& rString, OUString* o_pCanonicalized )
+bool LanguageTag::isValidBcp47( const OUString& rString, OUString* o_pCanonicalized, bool bDisallowPrivate )
 {
+    bool bValid = false;
+
     struct guard
     {
         lt_tag_t* mpLangtag;
@@ -2712,17 +2714,24 @@ bool LanguageTag::isValidBcp47( const OUString& rString, OUString* o_pCanonicali
         SAL_WARN_IF( !pTag, "i18nlangtag", "LanguageTag:isValidBcp47: could not canonicalize '" << rString << "'");
         if (pTag)
         {
+            bValid = true;
+            if (bDisallowPrivate)
+            {
+                const lt_string_t* pPrivate = lt_tag_get_privateuse( aVar.mpLangtag);
+                if (pPrivate && lt_string_length( pPrivate) > 0)
+                    bValid = false;
+            }
             if (o_pCanonicalized)
                 *o_pCanonicalized = OUString::createFromAscii( pTag);
             free( pTag);
-            return true;
+            return bValid;
         }
     }
     else
     {
         SAL_INFO( "i18nlangtag", "LanguageTag:isValidBcp47: could not parse '" << rString << "'");
     }
-    return false;
+    return bValid;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx
index 0e12235c34ba..f3cf64293cd9 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -492,8 +492,14 @@ public:
                 canonicalized form is assigned, which may differ from the
                 original string even if that was a valid tag. If rString is not
                 a valid tag, nothing is assigned.
+
+        @param  bDisallowPrivate
+                If TRUE, valid tags according to BCP 47 but reserved for
+                private use, like 'x-...', are not allowed and FALSE is
+                returned in this case.
      */
-    static bool         isValidBcp47( const OUString& rString, OUString* o_pCanonicalized = NULL );
+    static bool         isValidBcp47( const OUString& rString, OUString* o_pCanonicalized = NULL,
+                                      bool bDisallowPrivate = false );
 
     /** If nLang is a generated on-the-fly LangID */
     static bool         isOnTheFlyID( LanguageType nLang );