diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-08-21 11:05:32 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-08-31 15:11:21 +0200 |
commit | d7180aeade507e0b709104e827cb14cd8fe919d7 (patch) | |
tree | 70b97655a466a9dd232cadb724ccb159dac7bc96 /avmedia/source | |
parent | 4363606f9b495accf1e342408557b991bfd64da5 (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.)
Reviewed-on: https://gerrit.libreoffice.org/17891
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 53e3fb1d9337e450e926e163221fecaca13ea957, including
fixes for the apparently inadvertent differences between
097292feab4fc3c064983e1dd08ac4bebe1fe216 "Add HKEY_CURRENT_USER registry
integration" and its unfaithful backport
1b8812e7ad17957d8982095a37e489b8455a9bda "tdf#93546 -Add HKEY_CURRENT_USER
registry integration")
Conflicts:
configmgr/source/components.cxx
instsetoo_native/CustomTarget_setup.mk
scp2/source/ooo/common_brand.scp
Change-Id: Ifbcf3284d904490891642599468470d03547f92a
Reviewed-on: https://gerrit.libreoffice.org/17905
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'avmedia/source')
0 files changed, 0 insertions, 0 deletions