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

[Chris Sherlock]

 include/vcl/ITiledRenderable.hxx |   17 +++++++++++------
 include/vcl/outdev.hxx           |   12 ++++++------
 vcl/inc/salgdiimpl.hxx           |   12 ------------
 3 files changed, 17 insertions(+), 24 deletions(-)

New commits:
commit e80433a9734ab325bd8931649f984f5fefb21b97
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Jan 8 15:19:41 2016 +1100

    vcl: this function is already documented in the base class
    
    Change-Id: I0d3b8c9026a423f95a9a0acbcd89afbc23aaff82

diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx
index f0e58d2..5aecb48 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -174,18 +174,6 @@ public:
                 const SalBitmap& rMaskBitmap,
                 const SalBitmap& rAlphaBitmap ) = 0;
 
-    /** Render bitmap with alpha channel
-
-        @param rSourceBitmap
-        Source bitmap to blit
-
-        @param rAlphaBitmap
-        Alpha channel to use for blitting
-
-        @return true, if the operation succeeded, and false
-        otherwise. In this case, clients should try to emulate alpha
-        compositing themselves
-     */
     virtual bool drawAlphaBitmap(
                 const SalTwoRect&,
                 const SalBitmap& rSourceBitmap,
commit 301f101c36d49dc98e4d9f6f436c544f3ab069d0
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Jan 8 15:18:26 2016 +1100

    vcl: fix parameter documentation in ITiledRenderable header
    
    Change-Id: I258887a332c2a990ec2f76ed06e893bd1cc38c76

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index c1cde73..ba77330 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -99,7 +99,7 @@ public:
      * Registers a callback that will be invoked whenever the tiled renderer
      * wants to notify the client about an event.
      *
-     * @param pCallBack is the callback function
+     * @param pCallback is the callback function
      * @param pData is private data of the client that will be sent back when the callback is invoked
      */
     virtual void registerCallback(LibreOfficeKitCallback pCallback, void* pData) = 0;
@@ -158,8 +158,9 @@ public:
      * @param rRectangle - if not empty, then limit the output only to the area of this rectangle
      * @return a JSON describing position/content of rows/columns
      */
-    virtual OUString getRowColumnHeaders(const Rectangle& /*rRectangle*/)
+    virtual OUString getRowColumnHeaders(const Rectangle& rRectangle)
     {
+        (void) rRectangle;
         return OUString();
     }
 
@@ -191,11 +192,15 @@ public:
      * @param nTileTwipWidth - tile width in twips
      * @param nTileTwipHeight - tile height in twips
      */
-    virtual void setClientZoom(int /*nTilePixelWidth*/,
-                               int /*nTilePixelHeight*/,
-                               int /*nTileTwipWidth*/,
-                               int /*nTileTwipHeight*/)
+    virtual void setClientZoom(int nTilePixelWidth,
+                               int nTilePixelHeight,
+                               int nTileTwipWidth,
+                               int nTileTwipHeight)
     {
+        (void) nTilePixelWidth;
+        (void) nTilePixelHeight;
+        (void) nTileTwipWidth;
+        (void) nTileTwipHeight;
     }
 };
 
commit 49b114f8f60590790a370f1707cb6e6c1006ac5e
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Jan 8 15:06:30 2016 +1100

    vcl: correct parameter documentation of outdev.hxx
    
    Change-Id: I49d520d62609ade9d074244a9bb1eabffbd43356

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index a827fce..49028e5 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1077,7 +1077,7 @@ public:
         aDevice.SetFont(aFont);
         aDevice.Erase();
 
-        ::Rectangle aRect;
+        tools::Rectangle aRect;
         aDevice.GetTextBoundRect(aRect, aText);
         aDevice.SetOutputSize(Size(aRect.BottomRight().X() + 1, aRect.BottomRight().Y() + 1));
         aDevice.SetBackground(Wallpaper(COL_TRANSPARENT));
@@ -1803,7 +1803,7 @@ public:
 
     /** Convert a logical rectangle to a rectangle in physical device pixel units.
 
-     @param         rLogicSize  Const reference to a rectangle in logical units
+     @param         rLogicRect  Const reference to a rectangle in logical units
 
      @returns Rectangle based on physical device pixel coordinates and units.
      */
@@ -1837,7 +1837,7 @@ protected:
      *
      * @param pRectangle If 0, that means the whole area, otherwise the area in logic coordinates.
      */
-    virtual void LogicInvalidate(const Rectangle* /*pRectangle*/) { }
+    virtual void LogicInvalidate(const Rectangle* pRectangle) { (void)pRectangle; }
 
 private:
 
@@ -1906,11 +1906,11 @@ private:
      To get the \em exact pixel height, it must calculate the Y-DPI of the device and the
      map scaling factor.
 
-     @param         nHeight     Exact height in logical units.
+     @param         fLogicHeight     Exact height in logical units.
 
      @returns Exact height in pixels - returns as a float to provide for subpixel value.
      */
-    SAL_DLLPRIVATE float        ImplFloatLogicHeightToDevicePixel( float ) const;
+    SAL_DLLPRIVATE float        ImplFloatLogicHeightToDevicePixel( float fLogicHeight ) const;
 
     /** Convert a logical size to the size on the physical device.
 
@@ -1954,7 +1954,7 @@ private:
 
     /** Convert a region in pixel units to a region in device pixel units and coords.
 
-     @param         rPixelRect  Const reference to region.
+     @param         rRegion  Const reference to region.
 
      @returns vcl::Region based on device pixel coordinates and units.
      */