strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolves: tdf#159741 canceling printing results in 'modified' document

Browse source 
Change-Id: I627487a79f819351ec38e34b3fac432c36670d7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168915
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara 2024-06-15 21:10:10 +01:00
parent ec3d7ca054
commit 402368f7ed
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sfx2/source/view/viewprn.cxx
View file

@ -68,6 +68,7 @@ class SfxPrinterController : public vcl::PrinterController, public SfxListener
mutable Reference<awt::XDevice> mxDevice;
SfxViewShell* mpViewShell;
SfxObjectShell* mpObjectShell;
bool m_bJobStarted;
bool m_bOrigStatus;
bool m_bNeedsChange;
bool m_bApi;
@ -114,6 +115,7 @@ SfxPrinterController::SfxPrinterController( const VclPtr<Printer>& i_rPrinter,
, mpLastPrinter( nullptr )
, mpViewShell( pView )
, mpObjectShell(nullptr)
, m_bJobStarted( false )
, m_bOrigStatus( false )
, m_bNeedsChange( false )
, m_bApi(i_bApi)
@ -291,6 +293,8 @@ void SfxPrinterController::jobStarted()
if ( !mpObjectShell )
return;
m_bJobStarted = true;
m_bOrigStatus = mpObjectShell->IsEnableSetModified();
// check configuration: shall update of printing information in DocInfo set the document to "modified"?
@ -348,10 +352,13 @@ void SfxPrinterController::jobFinished( css::view::PrintableState nState )
}
case view::PrintableState_JOB_ABORTED :
{
// printing not successful, reset DocInfo
uno::Reference<document::XDocumentProperties> xDocProps(mpObjectShell->getDocProperties());
xDocProps->setPrintedBy(m_aLastPrintedBy);
xDocProps->setPrintDate(m_aLastPrinted);
// printing not successful, reset DocInfo if the job started and so DocInfo was modified
if (m_bJobStarted)
{
uno::Reference<document::XDocumentProperties> xDocProps(mpObjectShell->getDocProperties());
xDocProps->setPrintedBy(m_aLastPrintedBy);
xDocProps->setPrintDate(m_aLastPrinted);
}
break;
}