diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-15 12:40:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-15 12:46:19 +0100 |
| commit | b69951996967a1c79e3a55dd13dd5609b19db6a1 (patch) | |
| tree | f52f272d750678eee7468e2df846685a67a3ae17 /jvmfwk/source/elements.hxx | |
| parent | ensure translations are built before using them (diff) | |
| download | core-b69951996967a1c79e3a55dd13dd5609b19db6a1.tar.gz core-b69951996967a1c79e3a55dd13dd5609b19db6a1.zip | |
Drop support for /etc/opt/ure and ~/.ure from LibreOffice 4
For one, /etc/opt/ure was probably never used by anyone anyway, so meant just
needless file-stats during startup. For another, accidentally created
~/.ure/javasettings_*.xml that later became stale were noted to cause trouble,
so that source is now closed.
For this to work, jvmfwk needs to be silent now if it cannot read/write any
shared/user javasettings_*.xml.
Change-Id: I332b5ebb9549dc6ccf7c99c439d9a3b61aeb5829
Diffstat (limited to 'jvmfwk/source/elements.hxx')
| -rw-r--r-- | jvmfwk/source/elements.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx index 7c99c507b1a4..507ac82db802 100644 --- a/jvmfwk/source/elements.hxx +++ b/jvmfwk/source/elements.hxx @@ -127,11 +127,11 @@ private: @return JFW_E_CONFIG_READWRITE */ - void prepareSettingsDocument() const; + bool prepareSettingsDocument() const; /** helper function for prepareSettingsDocument. */ - void createSettingsDocument() const; + bool createSettingsDocument() const; /** returns the system path to the data file which is to be used. The value depends on the the member m_layer and the bootstrap parameters @@ -145,7 +145,7 @@ private: /** Verifies if the respective settings file exist. */ - jfw::FileStatus checkSettingsFileStatus() const; + jfw::FileStatus checkSettingsFileStatus(OUString const & sURL) const; /** Determines the layer for which the instance the loads and writes the data. |