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

[Miklos Vajna]

 include/svx/sdr/overlay/overlaymanager.hxx        |    4 ++--
 svx/source/sdr/overlay/overlaymanager.cxx         |    2 +-
 svx/source/sdr/overlay/overlaymanagerbuffered.cxx |    8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d22c2f2faa34a63f7cbc8c42e0f9d68e8609f121
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Mar 7 17:22:10 2015 +0100

    sdr::overlay::OverlayManager: rmOutputDevice -> mrOutputDevice
    
    Change-Id: I8fa5cc15e2d69b572f59f254eeeae051865a5b5f
    Reviewed-on: https://gerrit.libreoffice.org/14785
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index 24e77e8..637112a 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -62,7 +62,7 @@ namespace sdr
 
         protected:
             // the OutputDevice to work on, set on construction and not to be changed
-            OutputDevice&                               rmOutputDevice;
+            OutputDevice&                               mrOutputDevice;
 
             // the vector of registered OverlayObjects
             OverlayObjectVector                         maOverlayObjects;
@@ -114,7 +114,7 @@ namespace sdr
             virtual void restoreBackground(const vcl::Region& rRegion) const;
 
             // get the OutputDevice
-            OutputDevice& getOutputDevice() const { return rmOutputDevice; }
+            OutputDevice& getOutputDevice() const { return mrOutputDevice; }
 
             // add and remove OverlayObjects
             void add(OverlayObject& rOverlayObject);
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index 1d8e778..38b3ebb 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -117,7 +117,7 @@ namespace sdr
 
         OverlayManager::OverlayManager(OutputDevice& rOutputDevice)
         :   Scheduler(),
-            rmOutputDevice(rOutputDevice),
+            mrOutputDevice(rOutputDevice),
             maOverlayObjects(),
             maStripeColorA(Color(COL_BLACK)),
             maStripeColorB(Color(COL_WHITE)),
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 077b99d..8c3a5d1 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -269,13 +269,13 @@ namespace sdr
                 aBufferRememberedRangeLogic.transform(getOutputDevice().GetInverseViewTransformation());
 
                 // prepare cursor handling
-                const bool bTargetIsWindow(OUTDEV_WINDOW == rmOutputDevice.GetOutDevType());
+                const bool bTargetIsWindow(OUTDEV_WINDOW == mrOutputDevice.GetOutDevType());
                 bool bCursorWasEnabled(false);
 
                 // #i80730# switch off VCL cursor during overlay refresh
                 if(bTargetIsWindow)
                 {
-                    vcl::Window& rWindow = static_cast< vcl::Window& >(rmOutputDevice);
+                    vcl::Window& rWindow = static_cast< vcl::Window& >(mrOutputDevice);
                     vcl::Cursor* pCursor = rWindow.GetCursor();
 
                     if(pCursor && pCursor->IsVisible())
@@ -392,7 +392,7 @@ namespace sdr
                 // To get the update, the windows in question are updated manulally here.
                 if(bTargetIsWindow)
                 {
-                    vcl::Window& rWindow = static_cast< vcl::Window& >(rmOutputDevice);
+                    vcl::Window& rWindow = static_cast< vcl::Window& >(mrOutputDevice);
 
                     const Rectangle aRegionRectanglePixel(
                         maBufferRememberedRangePixel.getMinX(),
@@ -405,7 +405,7 @@ namespace sdr
                 // #i80730# restore visibility of VCL cursor
                 if(bCursorWasEnabled)
                 {
-                    vcl::Window& rWindow = static_cast< vcl::Window& >(rmOutputDevice);
+                    vcl::Window& rWindow = static_cast< vcl::Window& >(mrOutputDevice);
                     vcl::Cursor* pCursor = rWindow.GetCursor();
 
                     if(pCursor)