dbaccess/source/filter/xml/dbloader2.cxx | 1 -
dbaccess/source/ui/app/AppController.cxx | 1 -
dbaccess/source/ui/browser/sbagrid.cxx | 1 -
dbaccess/source/ui/browser/unodatbr.cxx | 1 -
dbaccess/source/ui/control/FieldDescControl.cxx | 1 -
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 1 -
dbaccess/source/ui/dlg/ConnectionPage.cxx | 1 -
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 1 -
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 1 -
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 1 -
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 1 -
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 1 -
dbaccess/source/ui/dlg/advancedsettings.cxx | 2 --
dbaccess/source/ui/dlg/dbadmin.cxx | 1 -
dbaccess/source/ui/dlg/dbwiz.cxx | 1 -
dbaccess/source/ui/dlg/dbwizsetup.cxx | 1 -
dbaccess/source/ui/dlg/detailpages.cxx | 1 -
dbaccess/source/ui/dlg/dlgsave.cxx | 1 -
dbaccess/source/ui/dlg/dsselect.cxx | 1 -
dbaccess/source/ui/dlg/sqlmessage.cxx | 1 -
dbaccess/source/ui/dlg/tablespage.cxx | 1 -
dbaccess/source/ui/dlg/textconnectionsettings.cxx | 2 --
dbaccess/source/ui/inc/RelationDlg.hxx | 1 -
dbaccess/source/ui/inc/dlgsave.hxx | 1 -
dbaccess/source/ui/misc/DExport.cxx | 1 -
dbaccess/source/ui/misc/RowSetDrop.cxx | 1 -
dbaccess/source/ui/misc/RtfReader.cxx | 1 -
dbaccess/source/ui/misc/TableCopyHelper.cxx | 1 -
dbaccess/source/ui/misc/UITools.cxx | 1 -
dbaccess/source/ui/misc/WCPage.cxx | 1 -
dbaccess/source/ui/misc/WCopyTable.cxx | 1 -
dbaccess/source/ui/misc/linkeddocuments.cxx | 1 -
dbaccess/source/ui/querydesign/JoinController.cxx | 1 -
dbaccess/source/ui/querydesign/JoinDesignView.cxx | 1 -
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 1 -
dbaccess/source/ui/querydesign/QueryTableView.cxx | 1 -
dbaccess/source/ui/querydesign/querycontroller.cxx | 1 -
dbaccess/source/ui/querydesign/querydlg.cxx | 1 -
dbaccess/source/ui/relationdesign/RelationDesignView.cxx | 1 -
dbaccess/source/ui/tabledesign/TEditControl.cxx | 1 -
dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 1 -
dbaccess/source/ui/uno/copytablewizard.cxx | 1 -
dbaccess/source/ui/uno/dbinteraction.cxx | 1 -
dbaccess/source/ui/uno/unoadmin.cxx | 1 -
extensions/inc/bitmaps.hlst | 1 +
extensions/source/update/ui/updatecheckui.cxx | 3 +--
include/sfx2/app.hxx | 2 ++
47 files changed, 4 insertions(+), 48 deletions(-)
New commits:
commit e3bd5ebf678ef7e5ba588d47eed2f027e84cb3cd
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Mar 20 15:06:23 2018 +0000
drop msgbox include
Change-Id: Ic7872adf8a7e8e4a8e1503dd21e22ec69509efaf
Reviewed-on: https://gerrit.libreoffice.org/51652
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx
b/dbaccess/source/filter/xml/dbloader2.cxx
index 96593afbf386..801680548972 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -68,7 +68,6 @@
#include <tools/diagnose_ex.h>
#include <ucbhelper/commandenvironment.hxx>
#include <ucbhelper/content.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
using namespace ::ucbhelper;
diff --git a/dbaccess/source/ui/app/AppController.cxx
b/dbaccess/source/ui/app/AppController.cxx
index c0cc5dded3b9..b20b68d734a1 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -79,7 +79,6 @@
#include <comphelper/interaction.hxx>
#include <comphelper/processfactory.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
#include <vcl/menu.hxx>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx
b/dbaccess/source/ui/browser/sbagrid.cxx
index 000d2da02a90..878b00ebe7f5 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -69,7 +69,6 @@
#include <comphelper/servicehelper.hxx>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
-#include <vcl/msgbox.hxx>
#include <browserids.hxx>
#include <stringconstants.hxx>
#include <strings.hrc>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index 92fec3b8b9f8..bae7b9fe57d5 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -119,7 +119,6 @@
#include <tools/multisel.hxx>
#include <tools/urlobj.hxx>
#include <unotools/confignode.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/split.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx
b/dbaccess/source/ui/control/FieldDescControl.cxx
index 05525ceeb9f3..25d31684b8ae 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -26,7 +26,6 @@
#include <vcl/button.hxx>
#include <vcl/svapp.hxx>
#include <vcl/fixed.hxx>
-#include <vcl/msgbox.hxx>
#include <vector>
#include <FieldDescriptions.hxx>
#include <dlgattr.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index cf41e45b01e3..50c3c9d3bf28 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -32,7 +32,6 @@
#include <dsitems.hxx>
#include <osl/process.h>
#include <osl/diagnose.h>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <sfx2/filedlghelper.hxx>
#include <dbadmin.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 866f0dcbec40..d0e72c72d289 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -35,7 +35,6 @@
#include <dsitems.hxx>
#include <helpids.h>
#include <osl/process.h>
-#include <vcl/msgbox.hxx>
#include <dbadmin.hxx>
#include <comphelper/types.hxx>
#include <vcl/stdtext.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index b66563156387..a6f2203eed6d 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -28,7 +28,6 @@
#include <svl/intitem.hxx>
#include <dsitems.hxx>
#include <osl/process.h>
-#include <vcl/msgbox.hxx>
#include <dbadmin.hxx>
#include <comphelper/types.hxx>
#include <vcl/stdtext.hxx>
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 8509c11dcde8..99a5d3aef1d9 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -31,7 +31,6 @@
#include <svl/intitem.hxx>
#include <dsitems.hxx>
#include "dsnItem.hxx"
-#include <vcl/msgbox.hxx>
#include <vcl/mnemonic.hxx>
#include <svl/cjkoptions.hxx>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 67638a3601ab..750bc79f6077 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -65,7 +65,6 @@
#include <osl/diagnose.h>
#include <typelib/typedescription.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/waitobj.hxx>
#include <vcl/weld.hxx>
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index fc586101bea6..b39c45a07f7b 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -20,7 +20,6 @@
#include <TablesSingleDlg.hxx>
#include "DbAdminImpl.hxx"
#include "tablespage.hxx"
-#include <vcl/msgbox.hxx>
#include <dsitems.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 2146c506a889..89e083de9127 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -36,7 +36,6 @@
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
#include <tools/diagnose_ex.h>
-#include <vcl/msgbox.hxx>
#include <vcl/stdtext.hxx>
namespace dbaui
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx
b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 745837bba65c..e8a7a4c299d6 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -35,8 +35,6 @@
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
-#include <vcl/msgbox.hxx>
-
namespace dbaui
{
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx
b/dbaccess/source/ui/dlg/dbadmin.cxx
index d94427f8e54a..3cfdc343d6ef 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -36,7 +36,6 @@
#include <stringlistitem.hxx>
#include <unotools/confignode.hxx>
-#include <vcl/msgbox.hxx>
namespace dbaui
{
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 1388511d992d..4bbbc7c7c052 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -27,7 +27,6 @@
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
-#include <vcl/msgbox.hxx>
#include <stringconstants.hxx>
#include "adminpages.hxx"
#include "generalpage.hxx"
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 46f8160a29ef..ac3dac1cf3a3 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -31,7 +31,6 @@
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
-#include <vcl/msgbox.hxx>
#include <stringconstants.hxx>
#include "adminpages.hxx"
#include <sfx2/docfilt.hxx>
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx
b/dbaccess/source/ui/dlg/detailpages.cxx
index d032f4ed0126..db0e8811d341 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -35,7 +35,6 @@
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/mnemonic.hxx>
#include <svl/cjkoptions.hxx>
#if HAVE_FEATURE_JAVA
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx
b/dbaccess/source/ui/dlg/dlgsave.cxx
index 3a33e76c2ffb..3b67391c0129 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -18,7 +18,6 @@
*/
#include <dlgsave.hxx>
-#include <vcl/msgbox.hxx>
#include <core_resource.hxx>
#include <dbu_dlg.hxx>
#include <strings.hrc>
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx
b/dbaccess/source/ui/dlg/dsselect.cxx
index 6d62c3ee0a23..c933252a031a 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -19,7 +19,6 @@
#include "dsselect.hxx"
#include <dbu_dlg.hxx>
-#include <vcl/msgbox.hxx>
#include <com/sun/star/sdbcx/XCreateCatalog.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx
b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 490b2d014a70..8b9c834220e8 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -31,7 +31,6 @@
#include <svtools/svmedit.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/sqlerror.hxx>
-#include <vcl/msgbox.hxx>
#include <unotools/configmgr.hxx>
#include <sfx2/sfxuno.hxx>
#include <UITools.hxx>
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx
b/dbaccess/source/ui/dlg/tablespage.cxx
index 76a527e43d4d..b890c084058e 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -41,7 +41,6 @@
#include <com/sun/star/sdbcx/XDrop.hpp>
#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
#include <sqlmessage.hxx>
-#include <vcl/msgbox.hxx>
#include <UITools.hxx>
#include <osl/diagnose.h>
#include <svtools/imgdef.hxx>
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
index 5fb86c173b4c..d95db68beefd 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
@@ -24,8 +24,6 @@
#include <dsitems.hxx>
#include <stringconstants.hxx>
-#include <vcl/msgbox.hxx>
-
namespace dbaui
{
// TextConnectionSettingsDialog
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx
b/dbaccess/source/ui/inc/RelationDlg.hxx
index a02ede2e6023..0793800636eb 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -23,7 +23,6 @@
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
-#include <vcl/msgbox.hxx>
#include "JoinTableView.hxx"
#include "RelControliFace.hxx"
#include <core_resource.hxx>
diff --git a/dbaccess/source/ui/inc/dlgsave.hxx
b/dbaccess/source/ui/inc/dlgsave.hxx
index 2ff7cbbec352..3b4be283fc46 100644
--- a/dbaccess/source/ui/inc/dlgsave.hxx
+++ b/dbaccess/source/ui/inc/dlgsave.hxx
@@ -24,7 +24,6 @@
#include <vcl/dialog.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <vcl/msgbox.hxx>
#include <memory>
#include <o3tl/typed_flags_set.hxx>
diff --git a/dbaccess/source/ui/misc/DExport.cxx
b/dbaccess/source/ui/misc/DExport.cxx
index e66632f02487..7127e8bb1171 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -63,7 +63,6 @@
#include <com/sun/star/sdb/application/CopyTableOperation.hpp>
#include <sqlmessage.hxx>
#include "UpdateHelperImpl.hxx"
-#include <vcl/msgbox.hxx>
#include <cppuhelper/exc_hlp.hxx>
using namespace dbaui;
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx
b/dbaccess/source/ui/misc/RowSetDrop.cxx
index 9bd1dc8a88ca..efbd212e9356 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -25,7 +25,6 @@
#include <strings.hrc>
#include <strings.hxx>
#include <sqlmessage.hxx>
-#include <vcl/msgbox.hxx>
#include <stringconstants.hxx>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx
b/dbaccess/source/ui/misc/RtfReader.cxx
index 0c0d6d6edc65..1ca5567a2cc6 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -36,7 +36,6 @@
#include <svtools/rtftoken.h>
#include <toolkit/helper/vclunohelper.hxx>
#include <strings.hrc>
-#include <vcl/msgbox.hxx>
#include <connectivity/dbconversion.hxx>
#include <connectivity/dbtools.hxx>
#include <comphelper/extract.hxx>
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx
b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index 9053225036ea..9dd156bbb27d 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -23,7 +23,6 @@
#include <strings.hrc>
#include <strings.hxx>
#include <sqlmessage.hxx>
-#include <vcl/msgbox.hxx>
#include <WCopyTable.hxx>
#include <dbaccess/genericcontroller.hxx>
#include <WCPage.hxx>
diff --git a/dbaccess/source/ui/misc/UITools.cxx
b/dbaccess/source/ui/misc/UITools.cxx
index 9f5c205b338b..ec6c9a11afcc 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -84,7 +84,6 @@
#include <svx/numinf.hxx>
#include <svl/zforlist.hxx>
#include <dlgattr.hxx>
-#include <vcl/msgbox.hxx>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/util/NumberFormatter.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
diff --git a/dbaccess/source/ui/misc/WCPage.cxx
b/dbaccess/source/ui/misc/WCPage.cxx
index 0d1a62abbab3..11717f2d04a5 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/sdbcx/XViewsSupplier.hpp>
#include <com/sun/star/sdb/application/CopyTableOperation.hpp>
-#include <vcl/msgbox.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
#include <UITools.hxx>
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx
b/dbaccess/source/ui/misc/WCopyTable.cxx
index 2d3bc6bf45a5..544c33c49746 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -58,7 +58,6 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <vcl/lstbox.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/waitobj.hxx>
#include <functional>
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx
b/dbaccess/source/ui/misc/linkeddocuments.cxx
index 297c8c2d2b5c..6c4510f086dc 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/task/XJobExecutor.hpp>
#include <comphelper/extract.hxx>
#include <comphelper/types.hxx>
-#include <vcl/msgbox.hxx>
#include <ucbhelper/content.hxx>
#include <strings.hrc>
#include <strings.hxx>
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx
b/dbaccess/source/ui/querydesign/JoinController.cxx
index 9575155533c1..8e056acb2186 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -44,7 +44,6 @@
#include <com/sun/star/io/XActiveDataSink.hpp>
#include <sqlmessage.hxx>
#include <JoinController.hxx>
-#include <vcl/msgbox.hxx>
#include <TableWindowData.hxx>
#include <TableWindow.hxx>
#include <TableConnectionData.hxx>
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 440705ab50ab..437d4c22d1ad 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -23,7 +23,6 @@
#include <svl/undo.hxx>
#include <adtabdlg.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <browserids.hxx>
#include <strings.hrc>
#include <comphelper/types.hxx>
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 7a5948c955f6..ece234f9eeee 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -30,7 +30,6 @@
#include <adtabdlg.hxx>
#include <vcl/svapp.hxx>
#include <vcl/combobox.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <browserids.hxx>
#include "SelectionBrowseBox.hxx"
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx
b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 5f7beeb47284..a424fabdf54d 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -48,7 +48,6 @@
#include <comphelper/extract.hxx>
#include <strings.hrc>
#include <strings.hxx>
-#include <vcl/msgbox.hxx>
#include <svtools/treelistentry.hxx>
using namespace dbaui;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx
b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 7f96f3f481b6..dfaefadee854 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -78,7 +78,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <osl/mutex.hxx>
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx
b/dbaccess/source/ui/querydesign/querydlg.cxx
index fc72b132033b..a8c271935054 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -28,7 +28,6 @@
#include <QueryDesignView.hxx>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <RelationControl.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#define ID_INNER_JOIN 1
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index ae0d682ec646..3d13985a545a 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -22,7 +22,6 @@
#include <RelationController.hxx>
#include <svl/undo.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <browserids.hxx>
#include <strings.hrc>
#include <comphelper/types.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx
b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index db033510843d..53ccb007dd8e 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -34,7 +34,6 @@
#include <comphelper/types.hxx>
#include <FieldDescControl.hxx>
#include <FieldDescriptions.hxx>
-#include <vcl/msgbox.hxx>
#include "TableUndo.hxx"
#include <TableController.hxx>
#include <connectivity/dbmetadata.hxx>
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
index 35ea9b85292c..9005e8acb918 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx
@@ -25,7 +25,6 @@
#include <dbwizsetup.hxx>
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
-#include <vcl/msgbox.hxx>
#include <comphelper/processfactory.hxx>
using namespace dbaui;
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx
b/dbaccess/source/ui/uno/copytablewizard.cxx
index caad6d6ba42e..b714f93ae3c8 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -69,7 +69,6 @@
#include <svtools/genericunodialog.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/sharedunocomponent.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/waitobj.hxx>
namespace dbaui
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx
b/dbaccess/source/ui/uno/dbinteraction.cxx
index 1aac50fbf4f6..af7995263938 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -22,7 +22,6 @@
#include <uiservices.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
-#include <vcl/msgbox.hxx>
#include <connectivity/dbexception.hxx>
#include <sqlmessage.hxx>
#include <com/sun/star/task/InteractionHandler.hpp>
diff --git a/dbaccess/source/ui/uno/unoadmin.cxx
b/dbaccess/source/ui/uno/unoadmin.cxx
index cfe78f244abb..a1aaca3ef8c5 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -26,7 +26,6 @@
#include <comphelper/processfactory.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/property.hxx>
-#include <vcl/msgbox.hxx>
// --- needed because of the solar mutex
#include <osl/mutex.hxx>
diff --git a/extensions/inc/bitmaps.hlst b/extensions/inc/bitmaps.hlst
index a73053a5e327..336e1b75359e 100644
--- a/extensions/inc/bitmaps.hlst
+++ b/extensions/inc/bitmaps.hlst
@@ -48,6 +48,7 @@
#define RID_EXTBMP_AUTOFILTER_LC "res/lc10716.png"
#define RID_EXTBMP_FILTERCRIT_LC "res/lc10715.png"
#define RID_EXTBMP_REMOVE_FILTER_SORT_LC "res/lc10711.png"
+#define SV_RESID_BITMAP_INFOBOX "vcl/res/infobox.png"
#endif
diff --git a/extensions/source/update/ui/updatecheckui.cxx
b/extensions/source/update/ui/updatecheckui.cxx
index b633fa7d2b58..5625ab1a102e 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -41,7 +41,6 @@
#include <vcl/menu.hxx>
#include <vcl/outdev.hxx>
#include <vcl/weld.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/lineinfo.hxx>
#include <vcl/button.hxx>
#include <vcl/settings.hxx>
@@ -269,7 +268,7 @@ Image UpdateCheckUI::GetBubbleImage( OUString const &rURL )
}
if ( aImage.GetSizePixel().Width() == 0 )
- aImage = GetStandardInfoBoxImage();
+ aImage = Image(BitmapEx(SV_RESID_BITMAP_INFOBOX));
return aImage;
}
commit c5fc1a0bbffa73d0a7249f8b38823588446831c8
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Mar 20 14:30:55 2018 +0200
Mention that SfxApplication is a singleton
Change-Id: Ib1f46c9172285245ed7bbc1fab299d29928c4d10
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index d3384e7f5a38..b4d31614917b 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -112,6 +112,8 @@ public:
GetValue() const { return aLink; }
};
+// This is a singleton class. Sad that there apparently is no other
+// way than a comment like this to indicate that to the code reader.
class SFX2_DLLPUBLIC SfxApplication: public SfxShell
{
std::unique_ptr<SfxAppData_Impl> pImpl;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
