Better string values for "empty" and "non-empty" filtering option.

Change-Id: Iecfac54143676c9f0b483c4fa8deb26bf42ea16b

sc/inc/sc.hrc

@@ -788,8 +788,8 @@
 #define SCSTR_UNDEFINED         (STR_START + 8)
 #define SCSTR_NONAME            (STR_START + 9)
 #define SCSTR_NONE              (STR_START + 10)
-#define SCSTR_EMPTY             (STR_START + 11)
-#define SCSTR_NOTEMPTY          (STR_START + 12)
+#define SCSTR_FILTER_EMPTY      (STR_START + 11)
+#define SCSTR_FILTER_NOTEMPTY   (STR_START + 12)
 #define SCSTR_COLUMN            (STR_START + 13)
 #define SCSTR_ROW               (STR_START + 14)
 #define SCSTR_NEW               (STR_START + 15)

sc/source/ui/dbgui/filtdlg.cxx

@@ -115,8 +115,8 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
         aFtDbArea       ( this, ScResId( FT_DBAREA ) ),
         aStrUndefined   ( SC_RESSTR(SCSTR_UNDEFINED) ),
         aStrNone        ( SC_RESSTR(SCSTR_NONE) ),
-        aStrEmpty       ( SC_RESSTR(SCSTR_EMPTY) ),
-        aStrNotEmpty    ( SC_RESSTR(SCSTR_NOTEMPTY) ),
+        aStrEmpty       ( SC_RESSTR(SCSTR_FILTER_EMPTY) ),
+        aStrNotEmpty    ( SC_RESSTR(SCSTR_FILTER_NOTEMPTY) ),
         aStrRow         ( SC_RESSTR(SCSTR_ROW) ),
         aStrColumn      ( SC_RESSTR(SCSTR_COLUMN) ),
         //

sc/source/ui/dbgui/pfiltdlg.cxx

@@ -90,8 +90,8 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window*             pParent,
         aBtnMore        ( this, ScResId( BTN_MORE ) ),
         aStrUndefined   ( SC_RESSTR(SCSTR_UNDEFINED) ),
         aStrNone        ( SC_RESSTR(SCSTR_NONE) ),
-        aStrEmpty       ( SC_RESSTR(SCSTR_EMPTY) ),
-        aStrNotEmpty    ( SC_RESSTR(SCSTR_NOTEMPTY) ),
+        aStrEmpty       ( SC_RESSTR(SCSTR_FILTER_EMPTY) ),
+        aStrNotEmpty    ( SC_RESSTR(SCSTR_FILTER_NOTEMPTY) ),
         aStrRow         ( SC_RESSTR(SCSTR_ROW) ),
         aStrColumn      ( SC_RESSTR(SCSTR_COLUMN) ),
         //

sc/source/ui/src/scstring.src

@@ -166,16 +166,6 @@ String SCSTR_NONE
     Text [ en-US ] = "- none -" ;
 };
 
-String SCSTR_EMPTY
-{
-    Text [ en-US ] = "- empty -" ;
-};
-
-String SCSTR_NOTEMPTY
-{
-    Text [ en-US ] = "- not empty -" ;
-};
-
 String SCSTR_NEWTABLE
 {
     Text [ en-US ] = "- new sheet -" ;
@@ -196,6 +186,16 @@ String SCSTR_TOP10FILTER
     Text [ en-US ] = "Top 10" ;
 };
 
+String SCSTR_FILTER_EMPTY
+{
+    Text [ en-US ] = "Empty" ;
+};
+
+String SCSTR_FILTER_NOTEMPTY
+{
+    Text [ en-US ] = "Not Empty" ;
+};
+
 String SCSTR_NONAME
 {
     Text [ en-US ] = "unnamed" ;

sc/source/ui/view/gridwin.cxx

@@ -707,11 +707,11 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow)
     mpAutoFilterPopup->addMenuItem(
         SC_RESSTR(SCSTR_TOP10FILTER), true, new AutoFilterAction(this, Top10));
     mpAutoFilterPopup->addMenuItem(
-        SC_RESSTR(SCSTR_STDFILTER), true, new AutoFilterAction(this, Custom));
+        SC_RESSTR(SCSTR_FILTER_EMPTY), true, new AutoFilterAction(this, Empty));
     mpAutoFilterPopup->addMenuItem(
-        SC_RESSTR(SCSTR_EMPTY), true, new AutoFilterAction(this, Empty));
+        SC_RESSTR(SCSTR_FILTER_NOTEMPTY), true, new AutoFilterAction(this, NonEmpty));
     mpAutoFilterPopup->addMenuItem(
-        SC_RESSTR(SCSTR_NOTEMPTY), true, new AutoFilterAction(this, NonEmpty));
+        SC_RESSTR(SCSTR_STDFILTER), true, new AutoFilterAction(this, Custom));
 
     ScCheckListMenuWindow::Config aConfig;
     aConfig.mbAllowEmptySet = false;
@@ -1181,7 +1181,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool bDataSelec
         long nMaxText = 0;
 
         //  default entries
-        static const sal_uInt16 nDefIDs[] = { SCSTR_ALLFILTER, SCSTR_TOP10FILTER, SCSTR_STDFILTER, SCSTR_EMPTY, SCSTR_NOTEMPTY };
+        static const sal_uInt16 nDefIDs[] = { SCSTR_ALLFILTER, SCSTR_TOP10FILTER, SCSTR_STDFILTER, SCSTR_FILTER_EMPTY, SCSTR_FILTER_NOTEMPTY };
         const size_t nDefCount = SAL_N_ELEMENTS(nDefIDs);
         for (i=0; i<nDefCount; i++)
         {