summaryrefslogtreecommitdiff
path: root/uui/source/ids.hrc
diff options
context:
space:
mode:
authorJuergen Funk <juergen.funk_ml@cib.de>2017-04-12 11:26:10 +0200
committerKatarina Behrens <Katarina.Behrens@cib.de>2017-06-06 15:58:02 +0200
commit6ca3b3648e25ae9d4d2d29a0df83349198ec3f5e (patch)
tree664881fdfb741597f78898650a2a0e0396e1084d /uui/source/ids.hrc
parentcab3468e96552348ae46121a490f1f6160b65213 (diff)
tdf#106942 Wrong message when lock file is empty or corrupt
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 Change-Id: I35c377f85b5113e8ffb89d83b9544b8ebc81d89f Reviewed-on: https://gerrit.libreoffice.org/36658 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'uui/source/ids.hrc')
-rw-r--r--uui/source/ids.hrc41
1 files changed, 22 insertions, 19 deletions
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index bc24f7fea1a3..635c708d3d8c 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -47,26 +47,29 @@
#define STR_ALREADYOPEN_OPEN_BTN (RID_UUI_START + 42)
#define STR_LOCKFAILED_TITLE (RID_UUI_START + 43)
#define STR_LOCKFAILED_MSG (RID_UUI_START + 44)
-#define STR_LOCKFAILED_DONTSHOWAGAIN (RID_UUI_START + 45)
-#define STR_TRYLATER_TITLE (RID_UUI_START + 46)
-#define STR_TRYLATER_MSG (RID_UUI_START + 47)
-#define STR_TRYLATER_RETRYSAVING_BTN (RID_UUI_START + 48)
-#define STR_TRYLATER_SAVEAS_BTN (RID_UUI_START + 49)
-#define STR_ALREADYOPEN_SAVE_MSG (RID_UUI_START + 50)
-#define STR_ALREADYOPEN_RETRY_SAVE_BTN (RID_UUI_START + 51)
-#define STR_ALREADYOPEN_SAVE_BTN (RID_UUI_START + 52)
+#define STR_LOCKFAILED_OPENREADONLY_BTN (RID_UUI_START + 45)
+#define STR_LOCKCORRUPT_TITLE (RID_UUI_START + 46)
+#define STR_LOCKCORRUPT_MSG (RID_UUI_START + 47)
+#define STR_LOCKCORRUPT_OPENREADONLY_BTN (RID_UUI_START + 48)
+#define STR_TRYLATER_TITLE (RID_UUI_START + 49)
+#define STR_TRYLATER_MSG (RID_UUI_START + 50)
+#define STR_TRYLATER_RETRYSAVING_BTN (RID_UUI_START + 51)
+#define STR_TRYLATER_SAVEAS_BTN (RID_UUI_START + 52)
+#define STR_ALREADYOPEN_SAVE_MSG (RID_UUI_START + 53)
+#define STR_ALREADYOPEN_RETRY_SAVE_BTN (RID_UUI_START + 54)
+#define STR_ALREADYOPEN_SAVE_BTN (RID_UUI_START + 55)
-#define STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE (RID_UUI_START + 54)
-#define STR_ENTER_PASSWORD_TO_OPEN (RID_UUI_START + 56)
-#define STR_ENTER_PASSWORD_TO_MODIFY (RID_UUI_START + 57)
-#define STR_RENAME_OR_REPLACE (RID_UUI_START + 58)
-#define STR_NAME_CLASH_RENAME_ONLY (RID_UUI_START + 59)
-#define STR_SAME_NAME_USED (RID_UUI_START + 60)
-#define STR_ENTER_SIMPLE_PASSWORD (RID_UUI_START + 61)
-#define STR_CONFIRM_SIMPLE_PASSWORD (RID_UUI_START + 62)
-#define STR_TITLE_CREATE_PASSWORD (RID_UUI_START + 63)
-#define STR_TITLE_ENTER_PASSWORD (RID_UUI_START + 64)
-#define STR_PASSWORD_MISMATCH (RID_UUI_START + 65)
+#define STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE (RID_UUI_START + 56)
+#define STR_ENTER_PASSWORD_TO_OPEN (RID_UUI_START + 57)
+#define STR_ENTER_PASSWORD_TO_MODIFY (RID_UUI_START + 58)
+#define STR_RENAME_OR_REPLACE (RID_UUI_START + 59)
+#define STR_NAME_CLASH_RENAME_ONLY (RID_UUI_START + 60)
+#define STR_SAME_NAME_USED (RID_UUI_START + 61)
+#define STR_ENTER_SIMPLE_PASSWORD (RID_UUI_START + 62)
+#define STR_CONFIRM_SIMPLE_PASSWORD (RID_UUI_START + 63)
+#define STR_TITLE_CREATE_PASSWORD (RID_UUI_START + 64)
+#define STR_TITLE_ENTER_PASSWORD (RID_UUI_START + 65)
+#define STR_PASSWORD_MISMATCH (RID_UUI_START + 66)
#define ERRCODE_UUI_IO_ABORT (ERRCODE_AREA_UUI + 0)
#define ERRCODE_UUI_IO_ACCESSDENIED (ERRCODE_AREA_UUI + 1)