diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-21 11:05:32 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-08-21 13:32:33 +0000 |
| commit | 53e3fb1d9337e450e926e163221fecaca13ea957 (patch) | |
| tree | a66b460d7b01ffa9a5ade497fd64a2cedc39c377 /scp2 | |
| parent | 50eda89e53914eb1272fffda8de4f15ac824a030 (diff) | |
Generalize CONFIGURATION_LAYERS "winreg:" notation
...after 097292feab4fc3c064983e1dd08ac4bebe1fe216 "Add HKEY_CURRENT_USER
registry integration" added "winuserreg:".
Even though changing from the exisiting "winreg:" to "winreg:LOCAL_MACHINE"
should be compatible, as it only ends up in fundamental.ini included in the LO
inst set, play it safe it keep treating "winreg" the same as
"winreg:LOCAL_MACHINE".
("url" is a misnomer now in configmgr's Components ctor, and should eventually
be renamed to something more accurate.)
Change-Id: Ifbcf3284d904490891642599468470d03547f92a
Reviewed-on: https://gerrit.libreoffice.org/17891
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 5c835846c502..ca165b72a289 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1124,8 +1124,8 @@ End #define CONFIGURATION_LAYERS_DCONF #endif #if defined WNT -#define CONFIGURATION_LAYERS_WINREG " winreg:" -#define CONFIGURATION_LAYERS_WINUSERREG " winuserreg:" +#define CONFIGURATION_LAYERS_WINREG " winreg:LOCAL_MACHINE" +#define CONFIGURATION_LAYERS_WINUSERREG " winreg:CURRENT_USER" #else #define CONFIGURATION_LAYERS_WINREG #define CONFIGURATION_LAYERS_WINUSERREG |