diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2021-03-21 09:32:05 +0100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-21 12:43:23 +0100 |
| commit | 407f6c757af01ea71eb8a86b41c27d12573f51e6 (patch) | |
| tree | 3541633351c9a48885eb549b95a90f0e181747a5 /cui | |
| parent | 3a5c7d98d9c875b4d87097883f1da56c17e79eea (diff) | |
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@wanadoo.fr>
Change-Id: I29d9c559401b49caceb8a8941bbe9962b489e3f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112830
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/QrCodeGenDialog.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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 } } |