sw/source/uibase/app/docsh.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit 02981bec24fcbc160ac7e10aed3af6053aa1780a Author: Jochen Nitschke <j.nitschke+loger...@ok.de> Date: Sun Oct 2 15:27:56 2016 +0200 remove pointer to local Change-Id: I21cb1e1798d7ca127005fd047d84ff535eb48019 Reviewed-on: https://gerrit.libreoffice.org/29458 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 11a48da..e0d0140 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1303,12 +1303,11 @@ void SwDocShell::SetChangeRecording( bool bActivate ) void SwDocShell::SetProtectionPassword( const OUString &rNewPassword ) { const SfxAllItemSet aSet( GetPool() ); - const SfxItemSet* pArgs = &aSet; const SfxPoolItem* pItem = nullptr; IDocumentRedlineAccess& rIDRA = m_pWrtShell->getIDocumentRedlineAccess(); Sequence< sal_Int8 > aPasswd = rIDRA.GetRedlinePassword(); - if (pArgs && SfxItemState::SET == pArgs->GetItemState( FN_REDLINE_PROTECT, false, &pItem ) + if (SfxItemState::SET == aSet.GetItemState(FN_REDLINE_PROTECT, false, &pItem) && static_cast<const SfxBoolItem*>(pItem)->GetValue() == (aPasswd.getLength() > 0)) return; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits