diff options
| author | sb <sb@openoffice.org> | 2009-09-25 15:27:34 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2009-09-25 15:27:34 +0200 |
| commit | e993d53e2a4bd6fd3eccdb885bd461d59fcec5b5 (patch) | |
| tree | 27fe95bc9c8fb6c68657abebedf795c2e2c82614 /desktop/source/deployment | |
| parent | 42345be352f413b571b83d262cc96025a9e8618d (diff) | |
| parent | ab33e14647ada2a32624fa39ec0ddbbbdc694df5 (diff) | |
merged in DEV300_m60
Diffstat (limited to 'desktop/source/deployment')
| -rw-r--r-- | desktop/source/deployment/manager/dp_manager.cxx | 12 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/help/dp_help.cxx | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 05e514305415..d7177f90dc77 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -314,6 +314,18 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create( } } + //Workaround. See issue http://www.openoffice.org/issues/show_bug.cgi?id=99257 + //This prevents the copying of the common.rdbf and native rdbs. It disables the + //feature to add shared extensions in a running office. + if (!that->m_readOnly && context.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("shared") )) + { + OUString sNoRdb; + ::rtl::Bootstrap::get(OUSTR("NORDBCOPY"), sNoRdb); + if (sNoRdb.equalsIgnoreAsciiCase(OUSTR("true")) + && dp_misc::office_is_running()) + that->m_readOnly = true; + } + if (!that->m_readOnly && logFile.getLength() > 0) { const Any any_logFile(logFile); diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 573c1c639de1..dd9e009e90cc 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -40,7 +40,7 @@ #include "comphelper/servicedecl.hxx" #include "svtools/inettype.hxx" -#include <xmlhelp/compilehelp.hxx> +#include <transex3/compilehelp.hxx> #include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/uri/XUriReferenceFactory.hpp> |