summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
Diffstat (limited to 'cui')
-rw-r--r--cui/Library_cui.mk1
-rw-r--r--cui/source/dialogs/about.cxx10
2 files changed, 6 insertions, 5 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index b367ad1be29f..c9c00a98041a 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_add_defs,cui,\
$(if $(filter TRUE,$(ENABLE_TDE)),-DENABLE_TDE) \
$(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
$(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
- $(if $(EXTRA_BUILDID),-DEXTRA_BUILDID=\""$(EXTRA_BUILDID)"\") \
))
$(eval $(call gb_Library_use_sdk_api,cui))
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index b70754fdb88b..a7ddbb4cf62d 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -48,6 +48,7 @@
#include <sfx2/sfxcommands.h>
#include "about.hxx"
#include "about.hrc"
+#include <config_buildid.h>
#include <sfx2/sfxdefs.hxx>
#include <sfx2/app.hxx>
#include <rtl/ustrbuf.hxx>
@@ -489,10 +490,11 @@ rtl::OUString AboutDialog::GetVersionString()
sVersion += m_sBuildStr.replaceAll("$BUILDID", sBuildId);
}
-#ifdef EXTRA_BUILDID
- sVersion += "\n";
- sVersion += EXTRA_BUILDID;
-#endif
+ if (strlen(EXTRA_BUILDID) > 0)
+ {
+ sVersion += "\n";
+ sVersion += EXTRA_BUILDID;
+ }
return sVersion;
}