diff options
Diffstat (limited to 'configmgr/source')
| -rw-r--r-- | configmgr/source/winreg.cxx | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx index eda41482a032..c7ba91fb205f 100644 --- a/configmgr/source/winreg.cxx +++ b/configmgr/source/winreg.cxx @@ -34,7 +34,8 @@ namespace { // Last element of Key becomes prop, first part is the path and optionally nodes, // when the node has oor:op attribute. // Values can be the following: Value (string), Type (string, optional), -// Final (dword, optional), External (dword, optional), ExternalBackend (string, optional) +// Final (dword, optional), External (dword, optional), ExternalBackend (string, optional), +// Nil (dword, optional) // // For example the following registry setting: // [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\LibreOffice\org.openoffice.UserProfile\Data\o] @@ -89,6 +90,28 @@ namespace { // <value oor:external="com.sun.star.configuration.backend.LdapUserProfileBe company"/> // </prop> // </item> +// +// Nil example: +// Empty value (<value></value>) and nil value (<value xsi:nil="true"/>) are different. +// In case of some path settings, the base path setting has to be cleared. +// [HKEY_CURRENT_USER\Software\Policies\LibreOffice\org.openoffice.Office.Common\Path\Current\Work] +// "Value"="" +// "Final"=dword:00000001 +// "Nil"=dword:00000001 +// [HKEY_CURRENT_USER\Software\Policies\LibreOffice\org.openoffice.Office.Paths\Paths\org.openoffice.Office.Paths:NamedPath['Work']\WritePath] +// "Value"="file:///H:/" +// "Final"=dword:00000001 +// becomes the following in configuration: +// <item oor:path="/org.openoffice.Office.Common/Path/Current"> +// <prop oor:name="Work" oor:finalized="true"> +// <value xsi:nil="true"/> +// </prop> +// </item> +// <item oor:path="/org.openoffice.Office.Paths/Paths/org.openoffice.Office.Paths:NamedPath['Work']"> +// <prop oor:name="WritePath" oor:finalized="true"> +// <value>file:///H:/</value> +// </prop> +// </item> void dumpWindowsRegistryKey(HKEY hKey, OUString const & aKeyName, TempFile &aFileHandle) { @@ -136,6 +159,7 @@ void dumpWindowsRegistryKey(HKEY hKey, OUString const & aKeyName, TempFile &aFil bool bFinal = false; bool bExternal = false; + bool bNil = false; OUString aValue; OUString aType; OUString aExternalBackend; @@ -156,6 +180,11 @@ void dumpWindowsRegistryKey(HKEY hKey, OUString const & aKeyName, TempFile &aFil if (*reinterpret_cast<DWORD*>(pValue.get()) == 1) bFinal = true; } + else if (!wcscmp(pValueName.get(), L"Nil")) + { + if (*reinterpret_cast<DWORD*>(pValue.get()) == 1) + bNil = true; + } else if (!wcscmp(pValueName.get(), L"External")) { if (*reinterpret_cast<DWORD*>(pValue.get()) == 1) @@ -231,7 +260,11 @@ void dumpWindowsRegistryKey(HKEY hKey, OUString const & aKeyName, TempFile &aFil if(bFinal) aFileHandle.writeString(" oor:finalized=\"true\""); aFileHandle.writeString("><value"); - if (bExternal) + if (aValue.isEmpty() && bNil) + { + aFileHandle.writeString(" xsi:nil=\"true\"/"); + } + else if (bExternal) { aFileHandle.writeString(" oor:external=\""); writeAttributeValue(aFileHandle, aValue); |