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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Mon Aug 2 15:07:45 UTC 2021


 extensions/source/update/check/updatecheckconfig.cxx |   34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 0f3497ea6080df72d479a405886316da21e35885
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Aug 2 16:07:00 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Aug 2 17:07:12 2021 +0200

    Fix --enable-online-update build
    
    ...after 1597cc5b3e07dd24cb4cb10b35b1e93545e4b929 "convert #defines to
    OUStringLiteral" (partially reverting that commit),
    
    > extensions/source/update/check/updatecheckconfig.cxx:68:17: error: expected '}'
    >     RELEASE_NOTE"1",
    >                 ^
    > extensions/source/update/check/updatecheckconfig.cxx:62:47: note: to match this '{'
    > const char * const aUpdateEntryProperties[] = {
    >                                               ^
    
    etc.
    
    Change-Id: I3cebb3dbc74adaeeefc14c11986ee4c8817b31b9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119886
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 8e3c5b6dc9e9..65c3e800702a 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -41,23 +41,23 @@ namespace lang = com::sun::star::lang ;
 namespace util = com::sun::star::util ;
 namespace uno = com::sun::star::uno ;
 
-constexpr OUStringLiteral LAST_CHECK = u"LastCheck";
-constexpr OUStringLiteral UPDATE_VERSION = u"UpdateVersion";
-constexpr OUStringLiteral UPDATE_BUILDID = u"UpdateBuildId";
-constexpr OUStringLiteral UPDATE_DESCRIPTION = u"UpdateDescription";
-constexpr OUStringLiteral DOWNLOAD_URL = u"DownloadURL";
-constexpr OUStringLiteral IS_DIRECT_DOWNLOAD = u"IsDirectDownload";
-constexpr OUStringLiteral OLD_VERSION = u"UpdateFoundFor";
-constexpr OUStringLiteral AUTOCHECK_ENABLED = u"AutoCheckEnabled";
-constexpr OUStringLiteral AUTODOWNLOAD_ENABLED = u"AutoDownloadEnabled";
-constexpr OUStringLiteral CHECK_INTERVAL = u"CheckInterval";
-constexpr OUStringLiteral LOCAL_FILE = u"LocalFile";
-constexpr OUStringLiteral DOWNLOAD_SIZE = u"DownloadSize";
-constexpr OUStringLiteral DOWNLOAD_PAUSED = u"DownloadPaused";
-constexpr OUStringLiteral DOWNLOAD_DESTINATION = u"DownloadDestination";
-constexpr OUStringLiteral RELEASE_NOTE = u"ReleaseNote";
-
-constexpr OUStringLiteral PROPERTY_VERSION = u"Version";
+#define LAST_CHECK              "LastCheck"
+#define UPDATE_VERSION          "UpdateVersion"
+#define UPDATE_BUILDID          "UpdateBuildId"
+#define UPDATE_DESCRIPTION      "UpdateDescription"
+#define DOWNLOAD_URL            "DownloadURL"
+#define IS_DIRECT_DOWNLOAD      "IsDirectDownload"
+#define OLD_VERSION             "UpdateFoundFor"
+#define AUTOCHECK_ENABLED       "AutoCheckEnabled"
+#define AUTODOWNLOAD_ENABLED    "AutoDownloadEnabled"
+#define CHECK_INTERVAL          "CheckInterval"
+#define LOCAL_FILE              "LocalFile"
+#define DOWNLOAD_SIZE           "DownloadSize"
+#define DOWNLOAD_PAUSED         "DownloadPaused"
+#define DOWNLOAD_DESTINATION    "DownloadDestination"
+#define RELEASE_NOTE            "ReleaseNote"
+
+#define PROPERTY_VERSION        "Version"
 
 const char * const aUpdateEntryProperties[] = {
     UPDATE_VERSION,


More information about the Libreoffice-commits mailing list