diff options
| author | Joachim Lingner <jl@openoffice.org> | 2009-03-02 12:16:29 +0000 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2009-03-02 12:16:29 +0000 |
| commit | 8dce663711b50601d55934b182efef82e334bb71 (patch) | |
| tree | 5437d5c51be4dea87411868ca2549d90c96192c5 /desktop/source/deployment/registry | |
| parent | 632478b146d2ac1087f69033de17984118569b86 (diff) | |
#tr159202# copying of common.rdb disabled in office when NORDBCOPYING bootstrap variable is set
Diffstat (limited to 'desktop/source/deployment/registry')
| -rw-r--r-- | desktop/source/deployment/registry/component/dp_component.cxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index deddaecca0..9c65283928 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -39,6 +39,7 @@ #include "rtl/strbuf.hxx" #include "rtl/ustrbuf.hxx" #include "rtl/uri.hxx" +#include "rtl/bootstrap.hxx" #include "cppuhelper/exc_hlp.hxx" #include "ucbhelper/content.hxx" #include "comphelper/anytostring.hxx" @@ -345,7 +346,17 @@ void BackendImpl::disposing() void BackendImpl::initServiceRdbFiles() { const Reference<XCommandEnvironment> xCmdEnv; - if (! m_readOnly && ! dp_misc::office_is_running()) { + bool bCopyRdb = false; + + OUString sNoRdb; + //Workaround. See issue http://www.openoffice.org/issues/show_bug.cgi?id=99257 + ::rtl::Bootstrap::get(OUSTR("NORDBCOPY"), sNoRdb); + if (sNoRdb.equalsIgnoreAsciiCase(OUSTR("true"))) + bCopyRdb = ! m_readOnly && ! dp_misc::office_is_running(); + else + bCopyRdb = ! m_readOnly; + if (bCopyRdb) + { ::ucbhelper::Content cacheDir( getCachePath(), xCmdEnv ); ::ucbhelper::Content oldRDB; // switch common rdb: |