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

[Christophe JAILLET (via logerrit)]

 cui/source/dialogs/QrCodeGenDialog.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 407f6c757af01ea71eb8a86b41c27d12573f51e6
Author:     Christophe JAILLET <christophe.jaillet at wanadoo.fr>
AuthorDate: Sun Mar 21 09:32:05 2021 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sun Mar 21 12:43:23 2021 +0100

    Fix GenerateQRCode when ENABLE_ZXING is not defined
    
    Since commit 562d7767f987, 'GenerateQRCode()' returns a OString, not a
    OUString.
    
    Fix the case where ENABLE_ZXING is not defined.
    
    Signed-off-by: Christophe JAILLET <christophe.jaillet at wanadoo.fr>
    Change-Id: I29d9c559401b49caceb8a8941bbe9962b489e3f7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112830
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx
index 2502f626572f..d4ac05e965f0 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -141,7 +141,7 @@ OString GenerateQRCode(const OUString& aQRText, tools::Long aQRECC, int aQRBorde
     (void)aQRText;
     (void)aQRECC;
     (void)aQRBorder;
-    return OUString();
+    return OString();
 #endif
 }
 }