diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2017-04-12 11:26:10 +0200 |
|---|---|---|
| committer | Juergen Funk <juergen.funk_ml@cib.de> | 2017-06-07 11:44:59 +0200 |
| commit | c00db1075c0d7b7d23a43e1466aeb29d4c797de2 (patch) | |
| tree | f5e9a431620a3ebf09043dff65b36de8ad5d1e0b /l10ntools | |
| parent | 070b6d5f5b778b4c8e8436da025f1351c44e55d7 (diff) | |
tdf#106942 Wrong message when lock file is empty or corrupt
trac#19027
1. Erase empty or corrupt lockfile, when reading it fails and
skip "Locked Document Dialog" in that case
2. Show Dialog (use LockFileIgnoreRequest -> LockFailedQueryBox)
when create lock file is not possible.
Two Dialogs: "lock file create error" and
"empty lockfile is present"
Set the document to read-only when creating lockfile is not
possible. If lockfile is corrupt or empty, inform the user.
They can interrupt loading the document or open it read-only,
which also erases the corrupt lock file after closing
the document
3. Handling for the two Dialogs
Use LockFileIgnoreRequst for create lockfile error and
add a new LockFileCorruptRequest, (lock file is corrupt).
Change and generate new messages for both dialogs in english
Reviewed-on: https://gerrit.libreoffice.org/36658
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 6ca3b3648e25ae9d4d2d29a0df83349198ec3f5e)
Conflicts:
include/sfx2/docfile.hxx
sfx2/source/doc/docfile.cxx
uui/source/ids.hrc
Change-Id: I35c377f85b5113e8ffb89d83b9544b8ebc81d89f
Diffstat (limited to 'l10ntools')
| -rwxr-xr-x | l10ntools/source/gRun.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/l10ntools/source/gRun.sh b/l10ntools/source/gRun.sh index e0f3206f73d4..befa3a59c25f 100755 --- a/l10ntools/source/gRun.sh +++ b/l10ntools/source/gRun.sh @@ -490,7 +490,7 @@ ${MYCMD} --base sw/source/uibase/utlui --files attrdesc.src initui.src navipi.sr ${MYCMD} --files sw/source/uibase/wrtsh/wrtsh.src -${MYCMD} --base uui/source --files alreadyopen.src filechanged.src ids.src lockfailed.src nameclashdlg.src openlocked.src passworddlg.src passworderrs.src trylater.src +${MYCMD} --base uui/source --files alreadyopen.src filechanged.src ids.src lockfailed.src lockcorrupt.src nameclashdlg.src openlocked.src passworddlg.src passworderrs.src trylater.src ${MYCMD} --files vcl/source/edit/textundo.src |