summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-08-31 13:41:14 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-08-31 16:19:21 +0200
commit53046ce16303824a231f106c2a747a02f7bb3bcf (patch)
tree1a19245fad63f289dd42bc1c3a3bb146c1cff67f /sw
parent8e0bcc9beb36628df2bf239e82dede15464f6556 (diff)
drop some unnecessary includes
Change-Id: I1abef2c2318e83aa8045d2b4763e74f45b4755e5 Reviewed-on: https://gerrit.libreoffice.org/78347 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/fldui/fldpage.cxx13
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx3
2 files changed, 6 insertions, 10 deletions
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();