Kaydet (Commit) a8a3928b authored tarafından László Németh's avatar László Németh

tdf52391 don't accept format-only changes secretly

for Reject all in Manage changes dialog window.
Now clicking on Reject all keeps format-only changes
instead of accepting them during the requested rejection
to allow to check them before acception.

Note: LibreOffice cannot reject the format-only changes.
If changes are all format-only changes, the Manage
changes dialog hides the Reject all button, also the
Reject button for the selected format-only changes.
This patch extends this workaround to avoid unintended
acceptance of rejected changes.

Change-Id: I7e60ae1ed2bec660dcb19d372dcf6892be61dad6
Reviewed-on: https://gerrit.libreoffice.org/66902
Tested-by: Jenkins
Reviewed-by: 's avatarLászló Németh <nemeth@numbertext.org>
üst 059a958a
......@@ -791,7 +791,19 @@ void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept )
RedlinData *pData = static_cast<RedlinData *>(pEntry->GetUserData());
if( !pData->bDisabled )
bool bIsNotFormatted = true;
// don't accept format-only changes secretly for Reject all
if ( !bSelect && !bAccept )
{
SwRedlineTable::size_type nPosition = GetRedlinePos( *pEntry );
const SwRangeRedline& rRedln = pSh->GetRedline(nPosition);
if( nsRedlineType_t::REDLINE_FORMAT == rRedln.GetType() )
bIsNotFormatted = false;
}
if( !pData->bDisabled && bIsNotFormatted )
aRedlines.push_back( pEntry );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment