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

[Chris Sherlock]

 include/vcl/outdev.hxx       |    2 +-
 include/vcl/window.hxx       |    2 +-
 vcl/source/outdev/outdev.cxx |    4 ++--
 vcl/source/window/window.cxx |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e77bb87b419567660e0a666b5b016e856f53242b
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Tue May 20 00:45:49 2014 +1000

    vcl: rename CopyAreaFinal to CopyDeviceArea
    
    The name I gave this makes no sense. Basically, this function calls on
    the SalGraphics function to copy the area, so really this name is much
    more clear.
    
    Change-Id: I842e6f2b81014a8222c39a62c5437bd53d66141c

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 676cf08..04b1877 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -515,7 +515,7 @@ public:
 
 protected:
 
-    virtual void                CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags);
+    virtual void                CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags);
 
 private:
 
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index b24e933..c9f8390 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -643,7 +643,7 @@ protected:
     // FIXME: this is a hack to workaround missing layout functionality
     SAL_DLLPRIVATE void                 ImplAdjustNWFSizes();
 
-    virtual void                        CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags) SAL_OVERRIDE;
+    virtual void                        CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags) SAL_OVERRIDE;
     virtual void                        ClipToPaintRegion( Rectangle& rDstRect ) SAL_OVERRIDE;
     virtual bool                        UsePolyPolygonForComplexGradient() SAL_OVERRIDE;
 
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 3d5241c..7be114a 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -679,7 +679,7 @@ void OutputDevice::CopyArea( const Point& rDestPt,
 
         AdjustTwoRect( aPosAry, aSrcOutRect );
 
-        CopyAreaFinal ( aPosAry, nFlags );
+        CopyDeviceArea ( aPosAry, nFlags );
     }
 
     SetRasterOp( eOldRop );
@@ -690,7 +690,7 @@ void OutputDevice::CopyArea( const Point& rDestPt,
 
 // Direct OutputDevice drawing protected function
 
-void OutputDevice::CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 /*nFlags*/)
+void OutputDevice::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 /*nFlags*/)
 {
     if (aPosAry.mnSrcWidth == 0 || aPosAry.mnSrcHeight == 0 || aPosAry.mnDestWidth == 0 || aPosAry.mnDestHeight == 0)
         return;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 063a7f5..ce8f7df 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -403,7 +403,7 @@ void Window::EnableRTL ( bool bEnable )
     OutputDevice::EnableRTL(bEnable);
 }
 
-void Window::CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags )
+void Window::CopyDeviceArea( SalTwoRect& aPosAry, sal_uInt32 nFlags )
 {
     if (aPosAry.mnSrcWidth == 0 || aPosAry.mnSrcHeight == 0 || aPosAry.mnDestWidth == 0 || aPosAry.mnDestHeight == 0)
         return;
@@ -426,7 +426,7 @@ void Window::CopyAreaFinal( SalTwoRect& aPosAry, sal_uInt32 nFlags )
         return;
     }
 
-    OutputDevice::CopyAreaFinal(aPosAry, nFlags);
+    OutputDevice::CopyDeviceArea(aPosAry, nFlags);
 }
 
 bool Window::HasMirroredGraphics() const