[Libreoffice-commits] core.git: cui/source vcl/source

[Jochen Nitschke]

 cui/source/dialogs/screenshotannotationdlg.cxx |    5 ++---
 vcl/source/window/layout.cxx                   |    9 +++------
 2 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 0140d931e17a6392ead39a0250b2266fb6dfddf4
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sun Aug 28 11:45:28 2016 +0200

    loplugin:defaultparams
    
    Change-Id: I9e6b81855e421186af92e53c71f5ba9bd8005319
    Reviewed-on: https://gerrit.libreoffice.org/28433
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
    Tested-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index e2a9b4c..6016cd0 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -206,7 +206,7 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
     if (mpText)
     {
         mpText->SetText("The quick brown fox jumps over the lazy dog :)");
-        mpText->SetReadOnly(true);
+        mpText->SetReadOnly();
     }
 
     // set click handler for save button
@@ -406,8 +406,7 @@ void ScreenshotAnnotationDlg_Impl::PaintControlDataEntry(
             // no transparency, draw without
             mpVirtualBufferDevice->DrawPolyLine(
                 aPolygon,
-                fLineWidth,
-                basegfx::B2DLineJoin::Round);
+                fLineWidth);
         }
     }
 }
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index bc548ec..56a2ac3 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -230,8 +230,7 @@ void VclContainer::Command(const CommandEvent& rCEvt)
 
                             aMenu->InsertItem(
                                 nLocalID,
-                                pChild->GetText(),
-                                MenuItemBits::NONE);
+                                pChild->GetText());
                             aMenu->SetHelpText(
                                 nLocalID,
                                 pChild->GetHelpText());
@@ -254,8 +253,7 @@ void VclContainer::Command(const CommandEvent& rCEvt)
 
                         aMenu->InsertItem(
                             nLocalID,
-                            "Screenshot",
-                            MenuItemBits::NONE);
+                            "Screenshot");
                         aMenu->SetHelpText(
                             nLocalID,
                             "Go into interactive screenshot annotation mode");
@@ -263,8 +261,7 @@ void VclContainer::Command(const CommandEvent& rCEvt)
                             nLocalID,
                             "InteractiveScreenshotMode");
                         aMenu->EnableItem(
-                            nLocalID,
-                            true);
+                            nLocalID);
                         nScreenshotButtonID = nLocalID;
                     }