diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-06-30 20:30:33 +0300 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2015-07-07 12:34:44 +0000 |
| commit | 7c7836141b6f2e71b4c41227718b4b916f464f5a (patch) | |
| tree | a9239340aa3e35de9787b5a048e20d51fbf1cfee /dbaccess | |
| parent | f408edabd52f865abb29401dbff995921b394e6c (diff) | |
tdf#92431 Keep thumbnail for modified but unsaved doc
A regression of 1166966eb4112fdf332c656eae5082d82a3ec2f2.
We need to consider 2 use-cases:
1. Protecting an existing document with a password (by overwriting
the original file). In this case we don't want to generate a
thumbnail from the now encrypted file, but we do want to erase
the stored thumbnail and show a generic icon instead.
2. Closing a modified document without saving the changes. Here we
don't want to generate a thumbnail either, because it may
contain the unsaved changes, but either we don't want to replace
the stored thumbnail, because most likely it correctly represents
the last saved state of the document.
Conflicts:
sfx2/source/appl/newhelp.cxx
sfx2/source/appl/sfxpicklist.cxx
Reviewed-on: https://gerrit.libreoffice.org/16659
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit d9c476bfbb4a8f1858c072d2fba33aa9e8e0ae92)
Change-Id: Ia7b1f3dbc9fbbc2ef1d87442c1dee25306f65826
Reviewed-on: https://gerrit.libreoffice.org/16765
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 90d29b51778c..ff19b7958214 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -401,7 +401,7 @@ void SAL_CALL OApplicationController::disposing() aFilter, getStrippedDatabaseName(), OUString(), - OUString()); + boost::none); // add to recent document list if ( aURL.GetProtocol() == INET_PROT_FILE ) |