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

[Julien Nabet]

 svx/source/form/filtnav.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 40c0e38a444d8a36ac4b2ff9adb01b55f57bb7c3
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Jan 6 21:37:11 2018 +0100

    filter navigator: "Filter for" for first position
    
    when opening the navigator with a blank filter
    
    Change-Id: Ib019714c3c778506633f4d4fa23e8faa0ac1851d
    Reviewed-on: https://gerrit.libreoffice.org/47518
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Lionel Elie Mamane <lionel at mamane.lu>

diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 8dd28703a9d9..99c725eef48d 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -470,7 +470,8 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& Event )
 
     const ::std::vector< FmFilterData* >::iterator insertPos = pFormItem->GetChildren().begin() + nInsertPos;
 
-    FmFilterItems* pFilterItems = new FmFilterItems(pFormItem, SvxResId(RID_STR_FILTER_FILTER_OR));
+    // "Filter for" for first position, "Or" for the other positions
+    FmFilterItems* pFilterItems = new FmFilterItems(pFormItem, (nInsertPos?SvxResId(RID_STR_FILTER_FILTER_OR):SvxResId(RID_STR_FILTER_FILTER_FOR)));
     m_pModel->Insert( insertPos, pFilterItems );
 }