diff options
Diffstat (limited to 'sw/source')
34 files changed, 5 insertions, 37 deletions
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index cac3b22e05fa..5737e82cde0a 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -24,7 +24,6 @@ #include <memory> #include <hintids.hxx> -#include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> #include <sot/storage.hxx> #include <fmtornt.hxx> diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 2b9f7dac8d74..c1aacf8c8bf1 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -45,7 +45,6 @@ #include <fmtinfmt.hxx> #include <swmodule.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <viewsh.hxx> #include <viewopt.hxx> #include <frmtool.hxx> diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index ae5ca42a4b39..2b2d3450cb34 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -19,7 +19,6 @@ #include <UndoManager.hxx> -#include <vcl/wrkwin.hxx> #include <svx/svdmodel.hxx> #include <swmodule.hxx> #include <doc.hxx> diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 1a5b304443e4..8a894fe58701 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -20,7 +20,6 @@ #include <hintids.hxx> #include <comphelper/string.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <svl/whiter.hxx> #include <editeng/boxitem.hxx> #include <editeng/ulspitem.hxx> diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index cc2d0753b32b..64b2100b52f3 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -23,7 +23,6 @@ #include <comphelper/string.hxx> #include <utility> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <svtools/htmlout.hxx> #include <svtools/htmlkywd.hxx> #include <svtools/htmltokn.h> diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index a3823229f6fc..606247c48b2b 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -19,7 +19,6 @@ #include <hintids.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index 64e49114f618..6b9a2035f77b 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -19,7 +19,6 @@ #include <hintids.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index 09d9593a5f12..e6c55e4bc19a 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -26,7 +26,6 @@ #include <tools/fract.hxx> #include <svl/urihelper.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <sfx2/event.hxx> #include <svtools/htmlkywd.hxx> #include <svtools/htmlout.hxx> diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index ae5940dfcd7b..c58a8e4620a5 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -21,7 +21,6 @@ #include <comphelper/documentinfo.hxx> #include <comphelper/string.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <vcl/unohelp.hxx> #include <svtools/htmlkywd.hxx> diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index a8468320b5e9..4a64e9873b3e 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -32,7 +32,6 @@ #include <hintids.hxx> #include <o3tl/any.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <svl/macitem.hxx> #include <svtools/htmlout.hxx> #include <svtools/htmltokn.h> diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 041be4358951..488edb6dce06 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -22,7 +22,6 @@ #include <comphelper/string.hxx> #include <comphelper/documentinfo.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <svx/svxids.hrc> #include <i18nlangtag/languagetag.hxx> #include <svl/stritem.hxx> diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx index 4060b7858d06..9d914eaea6da 100644 --- a/sw/source/filter/html/htmlnumreader.cxx +++ b/sw/source/filter/html/htmlnumreader.cxx @@ -27,7 +27,6 @@ #include <editeng/brushitem.hxx> #include <editeng/lrspitem.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> #include <numrule.hxx> diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx index 0d20869ee8be..416c5da16105 100644 --- a/sw/source/filter/html/htmlnumwriter.cxx +++ b/sw/source/filter/html/htmlnumwriter.cxx @@ -26,7 +26,6 @@ #include <editeng/brushitem.hxx> #include <editeng/lrspitem.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <numrule.hxx> #include <doc.hxx> #include <docary.hxx> diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index 6d5edafd5a0d..29a1e0237d2d 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -27,7 +27,6 @@ #include <sfx2/frmhtml.hxx> #include <sfx2/frmhtmlw.hxx> #include <sfx2/frmdescr.hxx> -#include <vcl/wrkwin.hxx> #include <sot/storage.hxx> #include <svx/xoutbmp.hxx> #include <editeng/ulspitem.hxx> diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 7e4e4a2358a8..54bab22c49f4 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -21,7 +21,6 @@ #include <svl/urihelper.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <editeng/adjustitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/formatbreakitem.hxx> diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index a592cd48e9b4..f04aa013330b 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -21,7 +21,6 @@ #include <hintids.hxx> #include <comphelper/flagguard.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <editeng/boxitem.hxx> #include <editeng/brushitem.hxx> #include <editeng/adjustitem.hxx> diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index c0ce2183f00a..577a9f5c7b11 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -23,7 +23,6 @@ #include <svtools/htmltokn.h> #include <svtools/htmlkywd.hxx> #include <svtools/HtmlWriter.hxx> -#include <vcl/wrkwin.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/brushitem.hxx> diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 17f6d5750128..c1a6f7312d30 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -53,7 +53,6 @@ #include <svtools/svparser.hxx> #include <swtypes.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index d638abac1052..4a5003c0dd7c 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -45,7 +45,6 @@ #include <unotools/configmgr.hxx> #include <unotools/pathoptions.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <sfx2/event.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 0f0b90fb6c9f..76ce6fb781a6 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -22,7 +22,6 @@ #include <comphelper/string.hxx> #include <svl/urihelper.hxx> #include <rtl/tencinfo.h> -#include <vcl/wrkwin.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/docfile.hxx> 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> |