diff options
Diffstat (limited to 'sc/source/ui/inc')
| -rw-r--r-- | sc/source/ui/inc/filtdlg.hxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/inc/inputhdl.hxx | 21 | ||||
| -rw-r--r-- | sc/source/ui/inc/pfiltdlg.hxx | 4 |
3 files changed, 17 insertions, 11 deletions
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index e62ca411614a..71dcee4e4155 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -44,6 +44,7 @@ #include <map> #include <boost/ptr_container/ptr_map.hpp> #include <boost/noncopyable.hpp> +#include <boost/scoped_ptr.hpp> //---------------------------------------------------------------------------- @@ -57,7 +58,7 @@ class ScFilterDlg : public ScAnyRefDlg { struct EntryList : boost::noncopyable { - TypedScStrCollection maList; + std::vector<TypedStrData> maList; size_t mnHeaderPos; EntryList(); }; diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 76c4daca74cc..e27891a515da 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -31,10 +31,14 @@ #include "global.hxx" #include "address.hxx" +#include "types.hxx" + #include <tools/fract.hxx> #include <tools/gen.hxx> #include <editeng/svxenum.hxx> +#include <set> + class ScDocument; class ScTabView; class ScTabViewShell; @@ -45,7 +49,7 @@ class ScEditEngineDefaulter; class EditView; class EditTextObject; class ScInputHdlState; -class TypedScStrCollection; +class TypedStrData; class ScRangeFindList; class Timer; class KeyEvent; @@ -66,20 +70,21 @@ private: EditView* pTableView; // aktive EditView dazu EditView* pTopView; // EditView in der Eingabezeile - TypedScStrCollection* pColumnData; - TypedScStrCollection* pFormulaData; - TypedScStrCollection* pFormulaDataPara; + ScTypedCaseStrSet* pColumnData; + ScTypedCaseStrSet* pFormulaData; + ScTypedCaseStrSet* pFormulaDataPara; + ScTypedCaseStrSet::const_iterator miAutoPos; + Window* pTipVisibleParent; sal_uLong nTipVisible; Window* pTipVisibleSecParent; sal_uLong nTipVisibleSec; String aManualTip; - String aAutoSearch; - sal_uInt16 nAutoPos; + rtl::OUString aAutoSearch; sal_Bool bUseTab; // Blaettern moeglich sal_Bool bTextValid; // Text noch nicht in Edit-Engine - String aCurrentText; + rtl::OUString aCurrentText; String aFormText; // fuer Funktions-Autopilot xub_StrLen nFormSelStart; // Selektion fuer Funktions-Autopilot @@ -173,7 +178,7 @@ public: eMode != SC_INPUT_TYPE); } sal_Bool IsTopMode() const { return (eMode == SC_INPUT_TOP); } - const String& GetEditString(); + const rtl::OUString& GetEditString(); const String& GetFormString() const { return aFormText; } const ScAddress& GetCursorPos() const { return aCursorPos; } diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 7953cab4b0f9..b9cd841d3d47 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -44,7 +44,7 @@ class ScViewData; class ScDocument; class ScQueryItem; -class TypedScStrCollection; +class TypedStrData; //================================================================== @@ -108,7 +108,7 @@ private: ListBox* aFieldLbArr[3]; ListBox* aCondLbArr[3]; - TypedScStrCollection* pEntryLists[MAXCOLCOUNT]; + std::vector<TypedStrData>* pEntryLists[MAXCOLCOUNT]; #ifdef _PFILTDLG_CXX private: |