[Libreoffice-commits] core.git: ucb/source

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Sun Dec 6 13:20:25 UTC 2020


 ucb/source/ucp/webdav-neon/NeonUri.cxx |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit b0e4f29560671d48c3943b6d0165c91c7ba91fd5
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Dec 6 10:36:41 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Dec 6 14:19:48 2020 +0100

    Avoid relying on OString(char const *) ctor's undocumented behavior
    
    ...of treating nullptr like an empty string
    
    Change-Id: I41b8b88f27ed3d3c404781f897952b7d1e0e01e1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107279
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index c1c263421de4..f3f142123a40 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -49,24 +49,24 @@ using namespace webdav_ucp;
 namespace {
 
 const ne_uri g_sUriDefaultsHTTP  = { const_cast<char *>("http"),
-                                     nullptr,
-                                     nullptr,
+                                     const_cast<char *>(""),
+                                     const_cast<char *>(""),
                                      DEFAULT_HTTP_PORT,
-                                     nullptr,
+                                     const_cast<char *>(""),
                                      nullptr,
                                      nullptr };
 const ne_uri g_sUriDefaultsHTTPS = { const_cast<char *>("https"),
-                                     nullptr,
-                                     nullptr,
+                                     const_cast<char *>(""),
+                                     const_cast<char *>(""),
                                      DEFAULT_HTTPS_PORT,
-                                     nullptr,
+                                     const_cast<char *>(""),
                                      nullptr,
                                      nullptr };
 const ne_uri g_sUriDefaultsFTP   = { const_cast<char *>("ftp"),
-                                     nullptr,
-                                     nullptr,
+                                     const_cast<char *>(""),
+                                     const_cast<char *>(""),
                                      DEFAULT_FTP_PORT,
-                                     nullptr,
+                                     const_cast<char *>(""),
                                      nullptr,
                                      nullptr };
 } // namespace


More information about the Libreoffice-commits mailing list