CWS-TOOLING: integrate CWS sb126

3 files changed, 6 insertions, 11 deletions

diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index a89540a88158..78d71e73e7d5 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -241,7 +241,7 @@ Service::createInstanceWithArguments(
     if (nodepath.getLength() == 0) {
         badNodePath();
     }
-    // For backwards compatibility, allow a notepath that misses the leading
+    // For backwards compatibility, allow a nodepath that misses the leading
     // slash:
     if (nodepath[0] != '/') {
         nodepath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + nodepath;
@@ -456,7 +456,8 @@ Factory::createInstanceWithArgumentsAndContext(
                             " arguments")),
                     0);
             }
-            // For backwards compatibility, allow "Locale" in any case:
+            // For backwards compatibility, allow "Locale" and (ignored)
+            // "EnableAsync" in any case:
             if (name.equalsIgnoreAsciiCaseAsciiL(
                     RTL_CONSTASCII_STRINGPARAM("locale")))
             {
@@ -471,8 +472,9 @@ Factory::createInstanceWithArgumentsAndContext(
                                 " one, non-empty, string Locale argument")),
                         0);
                 }
-            } else {
-                //TODO
+            } else if (!name.equalsIgnoreAsciiCaseAsciiL(
+                           RTL_CONSTASCII_STRINGPARAM("enableasync")))
+            {
                 throw css::uno::Exception(
                     rtl::OUString(
                         RTL_CONSTASCII_USTRINGPARAM(
diff --git a/configmgr/source/pad.cxx b/configmgr/source/pad.cxx
index c8c7218b6da6..a8169b271bb4 100644
--- a/configmgr/source/pad.cxx
+++ b/configmgr/source/pad.cxx
@@ -65,11 +65,6 @@ void Pad::clear() {
     buffer_.setLength(0);
 }
 
-bool Pad::is() const {
-    OSL_ASSERT(!(span_.is() && buffer_.getLength() != 0));
-    return span_.is() || buffer_.getLength() != 0;
-}
-
 Span Pad::get() const {
     OSL_ASSERT(!(span_.is() && buffer_.getLength() != 0));
     if (span_.is()) {
diff --git a/configmgr/source/pad.hxx b/configmgr/source/pad.hxx
index 66a51f480023..9f6fbebcda43 100644
--- a/configmgr/source/pad.hxx
+++ b/configmgr/source/pad.hxx
@@ -45,8 +45,6 @@ public:
 
     void clear();
 
-    bool is() const;
-
     Span get() const;
 
 private: