Bugzilla – Attachment 170502 Details for
Bug 137926
storeAsURL regression between libreoffice < 7 and libreoffice >=7
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch example
bug137926.patch (text/plain), 2.07 KB, created by
libreoffice
on 2021-03-15 23:12:02 UTC
(
hide
)
Description:
patch example
Filename:
MIME Type:
Creator:
libreoffice
Created:
2021-03-15 23:12:02 UTC
Size:
2.07 KB
patch
obsolete
>From 459f28b03ebb5db17206aec8827cf8a3e4a24974 Mon Sep 17 00:00:00 2001 >From: Neowutran <me@neowutran.ovh> >Date: Tue, 16 Mar 2021 00:05:37 +0100 >Subject: [PATCH] bug 137926: fix handling passwords submitted to decrypt file > >Change-Id: I84dd2004c5e60f6c6f60bf44b1d431816ad5dc0e >--- > sfx2/source/doc/objstor.cxx | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > >diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx >index 4188ec2a7ef2..41492b5916e0 100644 >--- a/sfx2/source/doc/objstor.cxx >+++ b/sfx2/source/doc/objstor.cxx >@@ -2791,9 +2791,9 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString& > // in "SaveAs" title and password will be cleared ( maybe the new itemset contains new values, otherwise they will be empty ) > // #i119366# - As the SID_ENCRYPTIONDATA and SID_PASSWORD are using for setting password together, we need to clear them both. > // Also, ( maybe the new itemset contains new values, otherwise they will be empty ) >+ bool bPasswordProtected = true; > if (xMergedParams->HasItem(SID_ENCRYPTIONDATA)) > { >- bool bPasswordProtected = true; > const SfxUnoAnyItem* pEncryptionDataItem > = xMergedParams->GetItem<SfxUnoAnyItem>(SID_ENCRYPTIONDATA, false); > if (pEncryptionDataItem) >@@ -2815,12 +2815,13 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString& > } > } > } >- if (bPasswordProtected) >- { >- // For password protected documents remove encryption data during "Save as..." >- xMergedParams->ClearItem(SID_PASSWORD); >- xMergedParams->ClearItem(SID_ENCRYPTIONDATA); >- } >+ }else if (xMergedParams->HasItem( SID_PASSWORD )){ >+ bPasswordProtected = true; >+ } >+ if (bPasswordProtected){ >+ // For password protected documents remove encryption data during "Save as..." >+ xMergedParams->ClearItem(SID_PASSWORD); >+ xMergedParams->ClearItem(SID_ENCRYPTIONDATA); > } > > xMergedParams->ClearItem( SID_DOCINFO_TITLE ); >-- >2.30.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 137926
:
166919
|
166920
|
170499
|
170500
| 170502