[Libreoffice-commits] core.git: include/vcl vcl/source

[Chris Sherlock (via logerrit)]

 include/vcl/outdev.hxx       |    2 +-
 include/vcl/print.hxx        |    2 +-
 vcl/source/gdi/print.cxx     |    2 +-
 vcl/source/gdi/print2.cxx    |    2 +-
 vcl/source/outdev/outdev.cxx |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0f593cbec826e79051a13c5b18bbe796cef12519
Author:     Chris Sherlock <chris.sherlock79 at gmail.com>
AuthorDate: Tue May 12 23:00:31 2020 +1000
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Sat May 23 17:46:33 2020 +0200

    vcl: rename misnamed OutputDevice::SetBackgroundComponentBounds()
    
    This function does not set the internal state of anything in
    OutputDevice, but rather calculates the background component bounds.
    Hence it should be a Get function, not a Set function.
    
    Change-Id: Id33d8febfa012de2b44a671e9bddad18bc86ce78
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94396
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index e7c014ee3561..64936a956cd0 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -559,7 +559,7 @@ protected:
 
     virtual void                CopyDeviceArea( SalTwoRect& aPosAry, bool bWindowInvalidate);
 
-    virtual tools::Rectangle    SetBackgroundComponentBounds();
+    virtual tools::Rectangle    GetBackgroundComponentBounds() const;
 
     virtual const OutputDevice* DrawOutDevDirectCheck(const OutputDevice* pSrcDev) const;
 
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index f188d69589a8..c5167d7bd608 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -366,7 +366,7 @@ public:
     virtual void                CopyArea( const Point& rDestPt, const Point& rSrcPt,
                                     const Size& rSrcSize, bool bWindowInvalidate = false ) override;
 
-    virtual tools::Rectangle    SetBackgroundComponentBounds() override;
+    virtual tools::Rectangle    GetBackgroundComponentBounds() const override;
 
     // These 3 together are more modular PrintJob(), allowing printing more documents as one print job
     // by repeated calls to ExecutePrintJob(). Used by mailmerge.
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 7c8a68892708..c825d25f3501 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -316,7 +316,7 @@ void Printer::CopyArea( const Point& /*rDestPt*/,
     SAL_WARN( "vcl.gdi", "Don't use OutputDevice::CopyArea(...) with printer devices!" );
 }
 
-tools::Rectangle Printer::SetBackgroundComponentBounds()
+tools::Rectangle Printer::GetBackgroundComponentBounds() const
 {
     Point aPageOffset = Point( 0, 0 ) - this->GetPageOffsetPixel();
     Size aSize  = this->GetPaperSizePixel();
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index b23daf53817e..8e4884a05a4d 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -817,7 +817,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
         // uniformly coloured). Keeping them outside the other
         // connected components often prevents whole-page bitmap
         // generation.
-        SetBackgroundColorAndBounds(aBackgroundComponent, rBackground, SetBackgroundComponentBounds());
+        SetBackgroundColorAndBounds(aBackgroundComponent, rBackground, GetBackgroundComponentBounds());
         int nLastBgAction = FindIncompletelyOccludedBackground(aBackgroundComponent, rInMtf, aMapModeVDev.get());
         int nActionNum = GetActionAfterBackgroundAction(aBackgroundComponent, pCurrAct, rInMtf, nLastBgAction, aMapModeVDev.get());
 
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index e53f1cd81f3b..18f273b8185a 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -562,7 +562,7 @@ void OutputDevice::DrawOutDevDirectProcess( const OutputDevice* pSrcDev, SalTwoR
         mpGraphics->CopyBits( rPosAry, pSrcGraphics, this, pSrcDev );
 }
 
-tools::Rectangle OutputDevice::SetBackgroundComponentBounds()
+tools::Rectangle OutputDevice::GetBackgroundComponentBounds() const
 {
     return tools::Rectangle( Point( 0, 0 ), GetOutputSizePixel() );
 }