[Libreoffice-commits] core.git: vcl/inc vcl/qt5

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Graphics.hxx |    2 +-
 vcl/qt5/Qt5Graphics_GDI.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bcc28ff92493dbc9a51acb1cf693b9ce3162a110
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Dec 5 09:42:53 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Dec 5 14:17:58 2018 +0100

    Adapt Qt5Graphics::SetXORMode
    
    ...to be504e8c7ef06637f055c43ad350381377df1e90 "tdf#121719: Revert fix for
    tdf#96971", which re-introduced the second "bool bInvertOnly" to virtual
    SalGraphics::SetXORMode.  It had been removed with
    258301879bcd20397c38bbd522dea2c923bd9fc2 "tdf#96971 SetXORMode - remove
    un-needed parameter" before the (back then named) Kf5Graphics::SetXORMode
    override was introduced with 9335945c7cb215f387ed1444e28533fac437c6e8 "KF5
    initial VCL plugin".
    
    Assume that actually ignoring bInvertOnly in the implementation of
    Qt5Graphics::SetXORMode is fine (as is done in various other overriding
    implementations of SetXORMode, too).
    
    Change-Id: I5481e0884350d02425f3f0356029e7625387656c
    Reviewed-on: https://gerrit.libreoffice.org/64596
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index 480f2f4a4bf5..9430be94a112 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -168,7 +168,7 @@ public:
     virtual void SetLineColor(Color nColor) override;
     virtual void SetFillColor() override;
     virtual void SetFillColor(Color nColor) override;
-    virtual void SetXORMode(bool bSet) override;
+    virtual void SetXORMode(bool bSet, bool bInvertOnly) override;
     virtual void SetROPLineColor(SalROPColor nROPColor) override;
     virtual void SetROPFillColor(SalROPColor nROPColor) override;
 
diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/Qt5Graphics_GDI.cxx
index 0280f9120baa..fb766205f654 100644
--- a/vcl/qt5/Qt5Graphics_GDI.cxx
+++ b/vcl/qt5/Qt5Graphics_GDI.cxx
@@ -657,7 +657,7 @@ void Qt5Graphics::SetFillColor() { m_aFillColor = SALCOLOR_NONE; }
 
 void Qt5Graphics::SetFillColor(Color nColor) { m_aFillColor = nColor; }
 
-void Qt5Graphics::SetXORMode(bool bSet)
+void Qt5Graphics::SetXORMode(bool bSet, bool)
 {
     if (bSet)
         m_eCompositionMode = QPainter::CompositionMode_Xor;