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

[Caolán McNamara]

 vcl/workben/mtfdemo.cxx |   44 ++++++++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 14 deletions(-)

New commits:
commit d4fb53e4b4659e144488223730609f30788cc51e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 11 21:01:47 2014 +0000

    why pointers
    
    Change-Id: I6b1b790bfcc94823f703679689bbd76312ee3e5b

diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index 9e76737..6e4d73d 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -68,7 +68,7 @@ void DemoMtfWin::Paint( const Rectangle& rRect )
 class DemoMtfApp : public Application
 {
     DemoMtfWin *mpWin;
-    OUString *mpFileName;
+    OUString maFileName;
 
     void showHelp()
     {
@@ -81,7 +81,6 @@ public:
 
     DemoMtfApp()
         : mpWin(NULL)
-        , mpFileName(NULL)
     {
     }
 
@@ -89,7 +88,7 @@ public:
     {
         try
         {
-            mpWin = new DemoMtfWin(*mpFileName);
+            mpWin = new DemoMtfWin(maFileName);
             mpWin->SetText(OUString("Display metafile"));
 
             mpWin->Show();
@@ -126,7 +125,7 @@ protected:
                 if (aArg == "--help" || aArg == "-h")
                     showHelp();
                 else
-                    mpFileName = new OUString(aArg);
+                    maFileName = aArg;
             }
 
             uno::Reference<uno::XComponentContext> xComponentContext
commit ee037deada8ee2ac09f58f9fdc47d0ca904b3b7f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 11 20:59:56 2014 +0000

    coverity#1257738 Uncaught exception
    
    Change-Id: I44648fb951d03090759d8afaa20cab7d945f684d

diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index fc98d1c..9e76737 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -87,13 +87,25 @@ public:
 
     virtual int Main() SAL_OVERRIDE
     {
-        mpWin = new DemoMtfWin(*mpFileName);
-        mpWin->SetText(OUString("Display metafile"));
-
-        mpWin->Show();
+        try
+        {
+            mpWin = new DemoMtfWin(*mpFileName);
+            mpWin->SetText(OUString("Display metafile"));
 
-        Application::Execute();
+            mpWin->Show();
 
+            Application::Execute();
+        }
+        catch (const css::uno::Exception& e)
+        {
+            SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+            return 1;
+        }
+        catch (const std::exception& e)
+        {
+            SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+            return 1;
+        }
         return 0;
     }
 
commit d4b7bd9966f20cb34932970b6d34c901fa733bef
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 11 20:58:01 2014 +0000

    coverity#1257742 Uninitialized pointer field
    
    Change-Id: Ie1431f24031265e6fe54c6f0523261da88d71b00

diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index 7422e50..fc98d1c 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -37,19 +37,17 @@ using namespace css;
 
 class DemoMtfWin : public WorkWindow
 {
-    GDIMetaFile *mpMtf;
+    GDIMetaFile maMtf;
 
 public:
-    DemoMtfWin(OUString& aFileName) :
-        WorkWindow(NULL, WB_APP | WB_STDWORK)
+    DemoMtfWin(OUString& aFileName)
+        : WorkWindow(NULL, WB_APP | WB_STDWORK)
     {
-
-
         SvFileStream aFileStream(aFileName, STREAM_READ);
 
         if (aFileStream.IsOpen())
         {
-            ReadWindowMetafile(aFileStream, *mpMtf);
+            ReadWindowMetafile(aFileStream, maMtf);
         }
         else
         {
@@ -62,7 +60,7 @@ public:
 
 void DemoMtfWin::Paint( const Rectangle& rRect )
 {
-    mpMtf->Play(this, mpMtf->GetActionSize());
+    maMtf.Play(this, maMtf.GetActionSize());
 
     WorkWindow::Paint( rRect );
 }
commit 7830fc983f644026eb252bbf51ea52aacbc30650
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 11 20:55:57 2014 +0000

    coverity#1257743 Uninitialized pointer field
    
    Change-Id: Iaa0c47bcd53eaaf2577a5401762afaabe44e7514

diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index 41b9fe7..7422e50 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -80,6 +80,13 @@ class DemoMtfApp : public Application
     }
 
 public:
+
+    DemoMtfApp()
+        : mpWin(NULL)
+        , mpFileName(NULL)
+    {
+    }
+
     virtual int Main() SAL_OVERRIDE
     {
         mpWin = new DemoMtfWin(*mpFileName);