diff options
| author | Sascha Ballach <sab@openoffice.org> | 2002-09-04 07:38:03 +0000 |
|---|---|---|
| committer | Sascha Ballach <sab@openoffice.org> | 2002-09-04 07:38:03 +0000 |
| commit | 1fa2fafc57a8f7560d5d27949ced4ad0fed4a497 (patch) | |
| tree | 227d54abfacfe33341fa9847f750eaffcea9d74c /sc/source/ui/dbgui/pfiltdlg.cxx | |
| parent | 054e18243938f0a5f74a5c2a1e6eabf05c50788a (diff) | |
#97084#; handle empty/nonempty conditions while opening the dialog
Diffstat (limited to 'sc/source/ui/dbgui/pfiltdlg.cxx')
| -rw-r--r-- | sc/source/ui/dbgui/pfiltdlg.cxx | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 890a5d22d7aa..da837547dc72 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pfiltdlg.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dr $ $Date: 2001-05-21 10:10:32 $ + * last change: $Author: sab $ $Date: 2002-09-04 08:38:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,6 +86,10 @@ #include "pfiltdlg.hxx" #undef _PFILTDLG_CXX +#ifndef _ZFORLIST_HXX +#include <svtools/zforlist.hxx> +#endif + //================================================================== ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent, @@ -248,6 +252,13 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) ScQueryEntry& rEntry = theQueryData.GetEntry(i); String aValStr = *rEntry.pStr; + if (!rEntry.bQueryByString && aValStr == EMPTY_STRING) + { + if (rEntry.nVal == SC_EMPTYFIELDS) + aValStr = aStrEmpty; + else if (rEntry.nVal == SC_NONEMPTYFIELDS) + aValStr = aStrNotEmpty; + } USHORT nCondPos = (USHORT)rEntry.eOp; USHORT nFieldSelPos = GetFieldSelPos( rEntry.nField ); @@ -255,6 +266,8 @@ void __EXPORT ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) aCondLbArr [i]->SelectEntryPos( nCondPos ); UpdateValueList( i+1 ); aValueEdArr[i]->SetText( aValStr ); + if (aValStr == aStrEmpty || aValStr == aStrNotEmpty) + aCondLbArr[i]->Disable(); } else { |