diff options
| author | Noel Grandin <noel@peralex.com> | 2012-03-02 13:48:25 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-02 15:32:19 +0200 |
| commit | 1a2b84fecc9be1f9a6e4d1f4edc3ee44f221a269 (patch) | |
| tree | ddb3795558fe3e16d2c88c3558f1aa3f244bfb86 /cui/source/inc/autocdlg.hxx | |
| parent | 24b402d67eb9acc7ff1f0afeee7237f6b3b14644 (diff) | |
Convert tools/table to std::vector and std::map in cui
Convert DoubleStringArray to std::vector
Convert DoubleStringTable to std::map
Convert StringsTable to std::map
Diffstat (limited to 'cui/source/inc/autocdlg.hxx')
| -rw-r--r-- | cui/source/inc/autocdlg.hxx | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 99e1115c2ac9..5771fa9469c0 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -30,7 +30,6 @@ #include <svtools/langtab.hxx> #include <sfx2/tabdlg.hxx> -#include <tools/table.hxx> #include <svx/checklbx.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> @@ -216,9 +215,15 @@ class AutoCorrEdit : public Edit // class OfaAutocorrReplacePage ------------------------------------------ -class DoubleStringArray; -typedef DoubleStringArray* DoubleStringArrayPtr; -DECLARE_TABLE(DoubleStringTable, DoubleStringArrayPtr) + +struct DoubleString +{ + String sShort; + String sLong; + void* pUserData; // CheckBox -> form. Text Bool -> Selektionstext +}; +typedef std::vector<DoubleString> DoubleStringArray; +typedef std::map<LanguageType, DoubleStringArray> DoubleStringTable; class OfaAutocorrReplacePage : public SfxTabPage { @@ -226,6 +231,8 @@ class OfaAutocorrReplacePage : public SfxTabPage using TabPage::DeactivatePage; private: + + CheckBox aTextOnlyCB; FixedText aShortFT; AutoCorrEdit aShortED; @@ -274,9 +281,14 @@ public: // class OfaAutocorrExceptPage --------------------------------------------- -struct StringsArrays; -typedef StringsArrays* StringsArraysPtr; -DECLARE_TABLE(StringsTable, StringsArraysPtr) +struct StringsArrays +{ + std::vector<rtl::OUString> aAbbrevStrings; + std::vector<rtl::OUString> aDoubleCapsStrings; + + StringsArrays() { } +}; +typedef std::map<LanguageType, StringsArrays> StringsTable; class OfaAutocorrExceptPage : public SfxTabPage { |