[Libreoffice-commits] core.git: cui/source

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/tpgradnt.cxx  |   10 +++++-----
 cui/source/tabpages/tphatch.cxx   |   10 +++++-----
 cui/source/tabpages/tppattern.cxx |   10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 521e194214ce09f9c70336350655f2fcf33c9da1
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Apr 4 19:53:00 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Apr 5 14:54:03 2020 +0200

    don't need vcl/lstbox.hxx in cui
    
    Change-Id: I631ff73fe49a8a3f41962c78887455f3d89a4e3d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91699
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 170d63fb96be..38bee1a8b1d7 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -158,7 +158,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet& rSet )
             aString += aURL.getBase();
 
         sal_Int32 nPos = SearchGradientList( rSet.Get(XATTR_FILLGRADIENT).GetName() );
-        if ( nPos != LISTBOX_ENTRY_NOTFOUND )
+        if ( nPos != -1)
         {
             sal_uInt16 nId = m_xGradientLB->GetItemId( static_cast<size_t>( nPos ) );
             m_xGradientLB->SelectItem( nId );
@@ -328,7 +328,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, weld::Button&, void)
     while( !bValidGradientName )
     {
         aName  = aNewName + " " + OUString::number( j++ );
-        bValidGradientName = (SearchGradientList(aName) == LISTBOX_ENTRY_NOTFOUND);
+        bValidGradientName = (SearchGradientList(aName) == -1);
     }
 
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -339,7 +339,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, weld::Button&, void)
     {
         pDlg->GetName( aName );
 
-        bValidGradientName = (SearchGradientList(aName) == LISTBOX_ENTRY_NOTFOUND);
+        bValidGradientName = (SearchGradientList(aName) == -1);
 
         if (bValidGradientName)
         {
@@ -464,7 +464,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void
         {
             pDlg->GetName( aName );
             sal_Int32 nGradientPos = SearchGradientList(aName);
-            bool bValidGradientName = (nGradientPos == static_cast<sal_Int32>(nPos) ) || (nGradientPos == LISTBOX_ENTRY_NOTFOUND);
+            bool bValidGradientName = (nGradientPos == static_cast<sal_Int32>(nPos) ) || (nGradientPos == -1);
 
             if( bValidGradientName )
             {
@@ -614,7 +614,7 @@ sal_Int32 SvxGradientTabPage::SearchGradientList(const OUString& rGradientName)
 {
     long nCount = m_pGradientList->Count();
     bool bValidGradientName = true;
-    sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;
+    sal_Int32 nPos = -1;
 
     for(long i = 0;i < nCount && bValidGradientName;i++)
     {
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index aeb5d9c85fcb..888f33e8d96a 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -159,7 +159,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
             aString += aURL.getBase();
 
         sal_Int32 nPos = SearchHatchList( rSet.Get(XATTR_FILLHATCH).GetName() );
-        if( nPos != LISTBOX_ENTRY_NOTFOUND )
+        if( nPos != -1)
         {
             sal_uInt16 nId = m_xHatchLB->GetItemId( static_cast<size_t>( nPos ) );
             m_xHatchLB->SelectItem( nId );
@@ -203,7 +203,7 @@ sal_Int32 SvxHatchTabPage::SearchHatchList(const OUString& rHatchName)
 {
     long nCount = m_pHatchingList->Count();
     bool bValidHatchName = true;
-    sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;
+    sal_Int32 nPos = -1;
 
     for(long i = 0;i < nCount && bValidHatchName;i++)
     {
@@ -409,7 +409,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, weld::Button&, void)
     while( !bValidHatchName )
     {
         aName  = aNewName + " " + OUString::number( j++ );
-        bValidHatchName = (SearchHatchList(aName) == LISTBOX_ENTRY_NOTFOUND);
+        bValidHatchName = (SearchHatchList(aName) == -1);
     }
 
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -420,7 +420,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, weld::Button&, void)
     {
         pDlg->GetName( aName );
 
-        bValidHatchName = (SearchHatchList(aName) == LISTBOX_ENTRY_NOTFOUND);
+        bValidHatchName = (SearchHatchList(aName) == -1);
         if( bValidHatchName )
         {
             nError = 0;
@@ -532,7 +532,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void )
         {
             pDlg->GetName( aName );
             sal_Int32 nHatchPos = SearchHatchList( aName );
-            bool bValidHatchName = (nHatchPos == static_cast<sal_Int32>(nPos) ) || (nHatchPos == LISTBOX_ENTRY_NOTFOUND);
+            bool bValidHatchName = (nHatchPos == static_cast<sal_Int32>(nPos) ) || (nHatchPos == -1);
 
             if(bValidHatchName)
             {
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 713a7c3a6628..cd223ed9284c 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -160,7 +160,7 @@ void SvxPatternTabPage::ActivatePage( const SfxItemSet& rSet )
         if ( aItem.isPattern() )
         {
             sal_Int32 nPos = SearchPatternList( aItem.GetName() );
-            if ( nPos != LISTBOX_ENTRY_NOTFOUND )
+            if ( nPos != -1)
             {
                 sal_uInt16 nId = m_xPatternLB->GetItemId( static_cast<size_t>( nPos ) );
                 m_xPatternLB->SelectItem( nId );
@@ -329,7 +329,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, weld::Button&, void)
     while( !bValidPatternName )
     {
         aName = aNewName + " " + OUString::number( j++ );
-        bValidPatternName = (SearchPatternList(aName) == LISTBOX_ENTRY_NOTFOUND);
+        bValidPatternName = (SearchPatternList(aName) == -1);
     }
 
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -340,7 +340,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, weld::Button&, void)
     {
         pDlg->GetName( aName );
 
-        bValidPatternName = (SearchPatternList(aName) == LISTBOX_ENTRY_NOTFOUND);
+        bValidPatternName = (SearchPatternList(aName) == -1);
 
         if( bValidPatternName ) {
             nError = 0;
@@ -443,7 +443,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void)
         {
             pDlg->GetName( aName );
             sal_Int32 nPatternPos = SearchPatternList(aName);
-            bool bValidPatternName = (nPatternPos == static_cast<sal_Int32>(nPos) ) || (nPatternPos == LISTBOX_ENTRY_NOTFOUND);
+            bool bValidPatternName = (nPatternPos == static_cast<sal_Int32>(nPos) ) || (nPatternPos == -1);
 
             if( bValidPatternName )
             {
@@ -538,7 +538,7 @@ sal_Int32 SvxPatternTabPage::SearchPatternList(const OUString& rPatternName)
 {
     long nCount = m_pPatternList->Count();
     bool bValidPatternName = true;
-    sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;
+    sal_Int32 nPos = -1;
 
     for(long i = 0;i < nCount && bValidPatternName;i++)
     {