remove unnecessary includes

Change-Id: Ia4a622b34ff3f71963cff7a1aa8658a4df12f04f
Reviewed-on: https://gerrit.libreoffice.org/81676
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

14 files changed, 5 insertions, 17 deletions

diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index 60b716d9943f..c3c7e33eedca 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -26,7 +26,6 @@
 #include <svx/svxids.hrc>
 
 #include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/printer.hxx>
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index edd697814378..8d6c5f230a17 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -26,7 +26,6 @@
 #include <comphelper/string.hxx>
 #include <o3tl/deleter.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/printer.hxx>
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 1e0f4ac20a12..2ee6242d6b9f 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -23,7 +23,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
+#include <vcl/syswin.hxx>
 #include <vcl/jobset.hxx>
 #include <svl/whiter.hxx>
 #include <svl/zforlist.hxx>
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index ecd2ffe7747a..16b42f8915eb 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -34,7 +34,6 @@
 #include <unotools/configmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/wrkwin.hxx>
 #include <svl/lckbitem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/macitem.hxx>
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index d6f9eccf4a20..0ec62470c232 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -21,7 +21,6 @@
 
 #include <hintids.hxx>
 #include <swerror.h>
-#include <vcl/wrkwin.hxx>
 #include <vcl/graph.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/accessibilityoptions.hxx>
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 12a95c773e86..3030c714e182 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -417,11 +417,11 @@ bool SwGlossaryHdl::Expand(weld::Window* pParent, const OUString& rShortName,
                     pDlg->InsertGlos(i.sTitle, i.sLongName);
                 }
                 pDlg->SelectEntryPos(0);
-                const sal_Int32 nRet = RET_OK == pDlg->Execute()?
-                                        pDlg->GetSelectedIdx():
-                                        LISTBOX_ENTRY_NOTFOUND;
+                const sal_Int32 nRet = RET_OK == pDlg->Execute() ?
+                                        pDlg->GetSelectedIdx() :
+                                        -1;
                 pDlg.disposeAndClear();
-                if (LISTBOX_ENTRY_NOTFOUND != nRet)
+                if (nRet != -1)
                 {
                     TextBlockInfo_Impl& rData = aFoundArr[nRet];
                     pGlossary = pGlossaries->GetGroupDoc(rData.sGroupName);
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 67a5d390c2e0..6484855b5555 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -42,7 +42,6 @@
 #include <osl/endian.h>
 #include <sfx2/linkmgr.hxx>
 #include <tools/urlobj.hxx>
-#include <vcl/wrkwin.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx
index 77152cafd4e8..4382a490ed99 100644
--- a/sw/source/uibase/lingu/hyp.cxx
+++ b/sw/source/uibase/lingu/hyp.cxx
@@ -24,7 +24,6 @@
 #include <globals.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/wrkwin.hxx>
 #include <linguistic/lngprops.hxx>
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
 #include <swwait.hxx>
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 12c9f4bd7765..4d5ec2aaa874 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -26,7 +26,6 @@
 #include <vcl/errinf.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/print.hxx>
-#include <vcl/wrkwin.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/textview.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index 6f0a0db5f938..9dc6d467f941 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -28,7 +28,6 @@
 #include <comphelper/servicehelper.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index c198a95dac8a..10530cffd435 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -51,7 +51,6 @@
 #include <svx/linkwarn.hxx>
 #include <sfx2/htmlmode.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 380ecebcbc27..3d85fb02edb0 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -61,7 +61,6 @@
 #include <edtwin.hxx>
 #include <ndtxt.hxx>
 #include <txtfrm.hxx>
-#include <vcl/lstbox.hxx>
 #include <cmdid.h>
 #include <globals.hrc>
 #include <strings.hrc>
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 9bc9944ca36c..6d07a2a36441 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -44,7 +44,6 @@
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <vcl/layout.hxx>
-#include <vcl/wrkwin.hxx>
 #include <editeng/unolingu.hxx>
 #include <edtwin.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx
index 034bb5eaf990..cc0385748950 100644
--- a/sw/source/uibase/utlui/uitool.cxx
+++ b/sw/source/uibase/utlui/uitool.cxx
@@ -42,7 +42,6 @@
 #include <svx/svxids.hrc>
 #include <editeng/lrspitem.hxx>
 #include <svl/style.hxx>
-#include <vcl/lstbox.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>