[Libreoffice-commits] core.git: vcl/android

Caolán McNamara caolanm at redhat.com
Fri Apr 28 08:02:12 UTC 2017


 vcl/android/androidinst.cxx |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 83b3e6ec26d32e016d5b9909415a1c76d37af747
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 28 09:00:45 2017 +0100

    probably android build fix
    
    Change-Id: I95fe4879fe2e43e5b11165a703066ae1a029b5b1

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index c976a7c89732..ff644d33bbb3 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -96,10 +96,8 @@ class AndroidSalFrame : public SvpSalFrame
 public:
     AndroidSalFrame( AndroidSalInstance *pInstance,
                      SalFrame           *pParent,
-                     SalFrameStyleFlags  nSalFrameStyle,
-                     SystemParentData   *pSysParent )
-        : SvpSalFrame( pInstance, pParent, nSalFrameStyle,
-                       pSysParent )
+                     SalFrameStyleFlags  nSalFrameStyle )
+        : SvpSalFrame(pInstance, pParent, nSalFrameStyle)
     {
         if (pParent == NULL && viewWidth > 1 && viewHeight > 1)
             SetPosSize(0, 0, viewWidth, viewHeight, SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT);
@@ -142,14 +140,14 @@ public:
     }
 };
 
-SalFrame *AndroidSalInstance::CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle )
+SalFrame *AndroidSalInstance::CreateChildFrame( SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle )
 {
-    return new AndroidSalFrame( this, NULL, nStyle, pParent );
+    return new AndroidSalFrame( this, NULL, nStyle );
 }
 
 SalFrame *AndroidSalInstance::CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle )
 {
-    return new AndroidSalFrame( this, pParent, nStyle, NULL );
+    return new AndroidSalFrame( this, pParent, nStyle );
 }
 
 // All the interesting stuff is slaved from the AndroidSalInstance


More information about the Libreoffice-commits mailing list