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

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/screenshotannotationdlg.cxx |    1 +
 cui/source/inc/screenshotannotationdlg.hxx     |    1 -
 helpcontent2                                   |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9ad0852245732133d2b5d454ebbaceb6b4a4cc03
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 8 17:04:23 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Oct 9 09:57:15 2019 +0200

    no need to include vcl.dialog here anymore
    
    Change-Id: Ic902f09be90ec3989a20333a13562b3af679ff92
    Reviewed-on: https://gerrit.libreoffice.org/80489
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index 582e6cf1c474..67373ec6f323 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -33,6 +33,7 @@
 #include <sfx2/filedlghelper.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
+#include <vcl/bitmapex.hxx>
 #include <vcl/customweld.hxx>
 #include <vcl/event.hxx>
 #include <vcl/pngwrite.hxx>
diff --git a/cui/source/inc/screenshotannotationdlg.hxx b/cui/source/inc/screenshotannotationdlg.hxx
index 6730ef0514fe..94972219dc9f 100644
--- a/cui/source/inc/screenshotannotationdlg.hxx
+++ b/cui/source/inc/screenshotannotationdlg.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_CUI_SOURCE_INC_SCREENSHANNDLG_HXX
 #define INCLUDED_CUI_SOURCE_INC_SCREENSHANNDLG_HXX
 
-#include <vcl/dialog.hxx>
 #include <vcl/weld.hxx>
 #include <memory>
 
commit eaa5952b01c8834bf2faac4b0e82dd063268bc32
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Tue Oct 8 17:28:39 2019 -0300
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Wed Oct 9 09:57:05 2019 +0200

    Update git submodules
    
    * Update helpcontent2 from branch 'master'
      - Typo
    
        Change-Id: I2ac2e142b2700912292a2a127ed28a99f34f6edc
        Reviewed-on: https://gerrit.libreoffice.org/80498
        Tested-by: Jenkins
        Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/helpcontent2 b/helpcontent2
index 360d9cfe12b1..658042bc3240 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 360d9cfe12b151b55b9db7daeaed60b1ce60a476
+Subproject commit 658042bc32406ef2046fbf611bcd4bad68581609