[Libreoffice-commits] core.git: 2 commits - vcl/qa vcl/workben

[Tor Lillqvist]

 vcl/qa/cppunit/wmf/wmfimporttest.cxx |    2 +-
 vcl/workben/svpclient.cxx            |   18 +++++++++---------
 vcl/workben/svptest.cxx              |   18 +++++++++---------
 vcl/workben/vcldemo.cxx              |   18 +++++++++---------
 4 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 6a21c29fc6a8284aa594d8ba7cbe80eeb0c1c114
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon May 19 08:46:07 2014 +0300

    WaE: passing OUString by value, rather pass by reference
    
    Change-Id: I6a7331ab3d87cc04021e92283db938c92b066e6b

diff --git a/vcl/qa/cppunit/wmf/wmfimporttest.cxx b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
index 7460447..5204007 100644
--- a/vcl/qa/cppunit/wmf/wmfimporttest.cxx
+++ b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
@@ -29,7 +29,7 @@ class WmfTest : public test::BootstrapFixture, public XmlTestTools
 {
     OUString maDataUrl;
 
-    OUString getFullUrl(OUString sFileName)
+    OUString getFullUrl(OUString& sFileName)
     {
         return getURLFromSrc(maDataUrl) + sFileName;
     }
commit d7034051a94816e4e81bd17ed5eb81ca0c8a97f4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon May 19 08:45:31 2014 +0300

    WaE: overriding virtual function declaration not marked 'SAL_OVERRIDE'
    
    Change-Id: I00aaacadf108f2cc5d57963991e5c99ea4485056

diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 60823d0..c9c52f5 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -84,17 +84,17 @@ class MyWin : public WorkWindow
     ImageControl    m_aImage;
     PushButton      m_aQuitButton;
 public:
-                MyWin( Window* pParent, WinBits nWinStyle );
+                 MyWin( Window* pParent, WinBits nWinStyle );
 
-    void        MouseMove( const MouseEvent& rMEvt );
-    void        MouseButtonDown( const MouseEvent& rMEvt );
-    void        MouseButtonUp( const MouseEvent& rMEvt );
-    void        KeyInput( const KeyEvent& rKEvt );
-    void        KeyUp( const KeyEvent& rKEvt );
-    void        Paint( const Rectangle& rRect );
-    void        Resize();
+    virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+    virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+    virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void Resize() SAL_OVERRIDE;
 
-    bool        Close();
+    virtual bool Close() SAL_OVERRIDE;
 
     void parseList( const OString& rList );
     OString processCommand( const OString& rCommand );
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 134a4fd..8ba8277 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -69,15 +69,15 @@ class MyWin : public WorkWindow
 {
     Bitmap      m_aBitmap;
 public:
-                MyWin( Window* pParent, WinBits nWinStyle );
-
-    void        MouseMove( const MouseEvent& rMEvt );
-    void        MouseButtonDown( const MouseEvent& rMEvt );
-    void        MouseButtonUp( const MouseEvent& rMEvt );
-    void        KeyInput( const KeyEvent& rKEvt );
-    void        KeyUp( const KeyEvent& rKEvt );
-    void        Paint( const Rectangle& rRect );
-    void        Resize();
+                 MyWin( Window* pParent, WinBits nWinStyle );
+
+    virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+    virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+    virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void Resize() SAL_OVERRIDE;
 };
 
 void Main()
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 3ce00ed..8b26e37 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -63,15 +63,15 @@ SAL_IMPLEMENT_MAIN()
 class MyWin : public WorkWindow
 {
 public:
-                MyWin( Window* pParent, WinBits nWinStyle );
-
-    void        MouseMove( const MouseEvent& rMEvt );
-    void        MouseButtonDown( const MouseEvent& rMEvt );
-    void        MouseButtonUp( const MouseEvent& rMEvt );
-    void        KeyInput( const KeyEvent& rKEvt );
-    void        KeyUp( const KeyEvent& rKEvt );
-    void        Paint( const Rectangle& rRect );
-    void        Resize();
+                 MyWin( Window* pParent, WinBits nWinStyle );
+
+    virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+    virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+    virtual void KeyUp( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+    virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
+    virtual void Resize() SAL_OVERRIDE;
 };
 
 void Main()