summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-10-06 20:24:52 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-10-06 22:24:33 +0200
commit6dacf9ec5455bdad82e78470a1a7cb6d2271bec7 (patch)
tree5fa53510a43cb501b0c1b4f93fc74381aee093f7 /editeng
parent0e257f8c07de253c0a1d4e63dfdf0383bd658fab (diff)
drop some now unnecessary includes
Change-Id: Idb41ddc0ff01333bac6cfce8bdd5e80c3c101de9 Reviewed-on: https://gerrit.libreoffice.org/61478 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/inc/eerdll2.hxx1
-rw-r--r--editeng/inc/pch/precompiled_editeng.hxx1
-rw-r--r--editeng/source/editeng/editattr.cxx5
-rw-r--r--editeng/source/editeng/editdbg.cxx4
-rw-r--r--editeng/source/editeng/editdoc.cxx9
-rw-r--r--editeng/source/editeng/editeng.cxx4
-rw-r--r--editeng/source/editeng/editobj.cxx3
-rw-r--r--editeng/source/editeng/editsel.cxx3
-rw-r--r--editeng/source/editeng/editundo.cxx3
-rw-r--r--editeng/source/editeng/editview.cxx3
-rw-r--r--editeng/source/editeng/edtspell.cxx4
-rw-r--r--editeng/source/editeng/eehtml.cxx4
-rw-r--r--editeng/source/editeng/eeobj.cxx3
-rw-r--r--editeng/source/editeng/eerdll.cxx5
-rw-r--r--editeng/source/editeng/eertfpar.cxx3
-rw-r--r--editeng/source/editeng/impedit.cxx5
-rw-r--r--editeng/source/editeng/impedit2.cxx6
-rw-r--r--editeng/source/editeng/impedit3.cxx2
-rw-r--r--editeng/source/editeng/impedit4.cxx2
-rw-r--r--editeng/source/editeng/impedit5.cxx3
-rw-r--r--editeng/source/editeng/textconv.cxx4
21 files changed, 10 insertions, 67 deletions
diff --git a/editeng/inc/eerdll2.hxx b/editeng/inc/eerdll2.hxx
index 96f90ac8453e..2ce9c120b81c 100644
--- a/editeng/inc/eerdll2.hxx
+++ b/editeng/inc/eerdll2.hxx
@@ -23,6 +23,7 @@
#include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
#include <editeng/forbiddencharacterstable.hxx>
#include <rtl/ref.hxx>
+#include <vcl/virdev.hxx>
class SfxPoolItem;
class VirtualDevice;
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index c441fe1ff4ec..1b7178567675 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -99,7 +99,6 @@
#include <vcl/checksum.hxx>
#include <vcl/combobox.hxx>
#include <vcl/ctrl.hxx>
-#include <vcl/dialog.hxx>
#include <vcl/dllapi.h>
#include <vcl/dndhelp.hxx>
#include <vcl/edit.hxx>
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 516ca28f9946..41b6a0db9bcd 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -17,10 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
+#include <vcl/outdev.hxx>
#include <svl/grabbagitem.hxx>
#include <libxml/xmlwriter.h>
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index 28e9b4d53a6f..7daf8b965bf7 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -19,10 +19,8 @@
#include <memory>
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/weld.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/weld.hxx>
#include <editeng/lspcitem.hxx>
#include <editeng/lrspitem.hxx>
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 37cf24dee476..00e2698d7317 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <memory>
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
-
#include <editeng/tstpitem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/fontitem.hxx>
@@ -64,9 +59,11 @@
#include <com/sun/star/i18n/ScriptType.hpp>
#include <libxml/xmlwriter.h>
+#include <algorithm>
#include <cassert>
#include <limits>
-#include <algorithm>
+#include <memory>
+#include <set>
using namespace ::com::sun::star;
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index e082645a0d59..c78d53fb9123 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -22,8 +22,6 @@
#include <comphelper/lok.hxx>
#include <config_global.h>
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
#include <vcl/weld.hxx>
#include <vcl/svapp.hxx>
@@ -1060,7 +1058,7 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, v
bDebugPaint = !bDebugPaint;
OStringBuffer aInfo("DebugPaint: ");
aInfo.append(bDebugPaint ? "On" : "Off");
- std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(nullptr,
+ std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(pEditView->GetWindow()->GetFrameWeld(),
VclMessageType::Info, VclButtonsType::Ok,
OStringToOUString(aInfo.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)));
xInfoBox->run();
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 3c1168901a24..78f3364ac350 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -20,9 +20,6 @@
#include <memory>
#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
#include <tools/stream.hxx>
diff --git a/editeng/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx
index 33f8a26b88dc..744f082bbea5 100644
--- a/editeng/source/editeng/editsel.cxx
+++ b/editeng/source/editeng/editsel.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
#include "editsel.hxx"
#include "impedit.hxx"
#include <editeng/editview.hxx>
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 19c150d371b8..af97ad0cc6f0 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -18,9 +18,6 @@
*/
#include <memory>
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
#include "impedit.hxx"
#include "editundo.hxx"
#include <editeng/editview.hxx>
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 212bb3fc2392..aab666131456 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -21,9 +21,6 @@
#include <memory>
#include <sal/macros.h>
#include <vcl/image.hxx>
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
#include <com/sun/star/i18n/WordType.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index ed437c5df7c5..525918337381 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -18,10 +18,6 @@
*/
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
-
#include "impedit.hxx"
#include <sal/log.hxx>
#include <editeng/editview.hxx>
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index fb1e9af29528..12fb9e2e22ee 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -18,9 +18,7 @@
*/
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
#include "eehtml.hxx"
#include <editeng/adjustitem.hxx>
#include <editeng/flditem.hxx>
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index 188eb510a7ab..ddac7cb5731b 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -20,9 +20,6 @@
#include <sal/config.h>
#include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp>
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
#include "eeobj.hxx"
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index 1a2a15c4975d..ace214a1fad1 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -19,10 +19,6 @@
#include <unotools/resmgr.hxx>
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
#include <com/sun/star/linguistic2/LanguageGuessing.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -43,6 +39,7 @@
#include <editeng/numdef.hxx>
#include <svl/itempool.hxx>
#include <svl/grabbagitem.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
#include <editeng/autokernitem.hxx>
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index ccecfa5723de..dbaf1cfe0b0a 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -19,9 +19,6 @@
#include <comphelper/string.hxx>
#include <utility>
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
#include "eertfpar.hxx"
#include "impedit.hxx"
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 042b0a3d77a1..3c033198344d 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -17,11 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-
#include "impedit.hxx"
#include <sal/log.hxx>
#include <editeng/editeng.hxx>
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 9b62005b34c8..62b9382e2c13 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -17,11 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
-
+#include <vcl/window.hxx>
#include <editeng/lspcitem.hxx>
#include <editeng/flditem.hxx>
#include "impedit.hxx"
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 6d2a12983ecb..93e34d40a598 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -18,8 +18,6 @@
*/
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
#include <vcl/svapp.hxx>
#include <vcl/metaact.hxx>
#include <vcl/gdimtf.hxx>
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index ec711845fade..6fdc00971ec5 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -18,8 +18,6 @@
*/
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
#include <vcl/svapp.hxx>
#include <svl/srchitem.hxx>
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 1cd61deca16f..aa34f0db573c 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -18,9 +18,6 @@
*/
#include <memory>
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
#include "impedit.hxx"
#include <editeng/editeng.hxx>
#include "editdbg.hxx"
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 0e5f9468535f..9b029cbdb4b4 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -18,10 +18,6 @@
*/
-#include <vcl/wrkwin.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/svapp.hxx>
-
#include "impedit.hxx"
#include <editeng/editview.hxx>
#include <editeng/editeng.hxx>