Merge branch 'master' into Sync-weave

1 files changed, 23 insertions, 0 deletions

diff --git a/other-licenses/7zstub/src/CPP/7zip/UI/FileManager/PropertyName.cpp b/other-licenses/7zstub/src/CPP/7zip/UI/FileManager/PropertyName.cpp
new file mode 100644
index 000000000..a9552415f
--- /dev/null
+++ b/other-licenses/7zstub/src/CPP/7zip/UI/FileManager/PropertyName.cpp
@@ -0,0 +1,23 @@
+// PropertyName.cpp

+

+#include "StdAfx.h"

+

+#include "../../../Common/IntToString.h"

+

+#include "LangUtils.h"

+#include "PropertyName.h"

+

+UString GetNameOfProperty(PROPID propID, const wchar_t *name)

+{

+  if (propID < 1000)

+  {

+    UString s = LangString(1000 + propID);

+    if (!s.IsEmpty())

+      return s;

+  }

+  if (name)

+    return name;

+  wchar_t temp[16];

+  ConvertUInt32ToString(propID, temp);

+  return temp;

+}