summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cui/source/inc/optpath.hxx2
-rw-r--r--editeng/source/misc/hangulhanja.cxx2
-rw-r--r--include/sfx2/printopt.hxx6
-rw-r--r--sc/source/ui/inc/PivotLayoutDialog.hxx1
-rw-r--r--sc/source/ui/inc/areasdlg.hxx1
-rw-r--r--sd/source/ui/inc/prntopts.hxx2
-rw-r--r--sd/source/ui/view/drviews5.cxx2
-rw-r--r--svx/source/dialog/imapdlg.cxx2
-rw-r--r--sw/source/ui/fldui/fldpage.cxx13
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx3
10 files changed, 8 insertions, 26 deletions
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 40ceb1156805..1082f1354f85 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -21,8 +21,6 @@
#include <memory>
#include <sfx2/tabdlg.hxx>
-#include <svtools/simptabl.hxx>
-#include <vcl/button.hxx>
#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
#include <svtools/dialogclosedlistener.hxx>
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index da40ec6c103a..50130a24ae2b 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -18,7 +18,6 @@
*/
#include <editeng/hangulhanja.hxx>
-#include <vcl/button.hxx>
#include <unotools/lingucfg.hxx>
#include <unotools/linguprops.hxx>
@@ -33,7 +32,6 @@
#include <com/sun/star/i18n/TextConversionType.hpp>
#include <com/sun/star/i18n/TextConversionOption.hpp>
#include <com/sun/star/i18n/WordType.hpp>
-#include <vcl/stdtext.hxx>
#include <vcl/weld.hxx>
#include <unotools/charclass.hxx>
#include <sal/log.hxx>
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 87a8638174d0..a30fba19b292 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -22,14 +22,10 @@
#include <sal/config.h>
#include <sfx2/dllapi.h>
+#include <sfx2/tabdlg.hxx>
#include <sal/types.h>
-#include <vcl/button.hxx>
-#include <vcl/field.hxx>
-#include <vcl/lstbox.hxx>
#include <vcl/print.hxx>
-#include <sfx2/tabdlg.hxx>
-
class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage : public SfxTabPage
{
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx
index ca78e004bb74..7397972a7ada 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -11,7 +11,6 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_PIVOTLAYOUTDIALOG_HXX
#define INCLUDED_SC_SOURCE_UI_INC_PIVOTLAYOUTDIALOG_HXX
-#include <vcl/lstbox.hxx>
#include "anyrefdg.hxx"
#include <dpobject.hxx>
#include "viewdata.hxx"
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index a421049e28a4..a685120ab14b 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -21,7 +21,6 @@
#include <address.hxx>
-#include <vcl/lstbox.hxx>
#include "anyrefdg.hxx"
class ScDocument;
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index 9e71b6637647..46077ef749a1 100644
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_PRNTOPTS_HXX
#define INCLUDED_SD_SOURCE_UI_INC_PRNTOPTS_HXX
-#include <vcl/button.hxx>
-#include <vcl/layout.hxx>
#include <sfx2/tabdlg.hxx>
class SdPrintOptions : public SfxTabPage
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 3edf0bdab4c0..38e0d38ffe54 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -24,8 +24,8 @@
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
#include <svx/svdpagv.hxx>
-#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
#include <sdcommands.h>
#include <sal/log.hxx>
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index cdd3508c87c3..ab0de72dfd88 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -36,8 +36,6 @@
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
#include <unotools/localedatawrapper.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
#include <vcl/weld.hxx>
#include <svx/imapdlg.hxx>
#include <svx/dialmgr.hxx>
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index e65a0a186a58..30521244396a 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/lstbox.hxx>
#include <svl/stritem.hxx>
#include <sfx2/request.hxx>
#include <sfx2/htmlmode.hxx>
@@ -49,8 +48,8 @@ SwFieldPage::SwFieldPage(TabPageParent pParent, const OUString& rUIXMLDescriptio
: SfxTabPage(pParent, rUIXMLDescription, rID, pAttrSet)
, m_pCurField(nullptr)
, m_pWrtShell(nullptr)
- , m_nTypeSel(LISTBOX_ENTRY_NOTFOUND)
- , m_nSelectionSel(LISTBOX_ENTRY_NOTFOUND)
+ , m_nTypeSel(-1)
+ , m_nSelectionSel(-1)
, m_bFieldEdit(false)
, m_bInsert(true)
, m_bFieldDlgHtmlMode(false)
@@ -107,11 +106,9 @@ void SwFieldPage::ActivatePage()
// complete reset; edit new field
void SwFieldPage::EditNewField( bool bOnlyActivate )
{
- if( !bOnlyActivate )
- {
- m_nTypeSel = LISTBOX_ENTRY_NOTFOUND;
- }
- m_nSelectionSel = LISTBOX_ENTRY_NOTFOUND;
+ if (!bOnlyActivate)
+ m_nTypeSel = -1;
+ m_nSelectionSel = -1;
m_bRefresh = true;
Reset(nullptr);
m_bRefresh = false;
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 18636c8761d3..7d203def841a 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -26,7 +26,6 @@
#include <svx/ctredlin.hxx>
#include <svx/postattr.hxx>
#include <vcl/commandevent.hxx>
-#include <vcl/lstbox.hxx>
#include <swtypes.hxx>
#include <wrtsh.hxx>
#include <view.hxx>
@@ -272,7 +271,7 @@ void SwRedlineAcceptDlg::InitAuthors()
for (auto const & i: aStrings)
pFilterPage->InsertAuthor(i);
- if (pFilterPage->SelectAuthor(sOldAuthor) == LISTBOX_ENTRY_NOTFOUND && !aStrings.empty())
+ if (pFilterPage->SelectAuthor(sOldAuthor) == -1 && !aStrings.empty())
pFilterPage->SelectAuthor(aStrings[0]);
weld::TreeView& rTreeView = m_pTable->GetWidget();