diff options
Diffstat (limited to 'cui/source/inc')
-rw-r--r-- | cui/source/inc/autocdlg.hxx | 27 | ||||
-rw-r--r-- | cui/source/inc/dbregister.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/multipat.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/optdict.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/optpath.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/radiobtnbox.hxx | 8 |
6 files changed, 23 insertions, 24 deletions
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 3d518d2b1d01..fe732cac8830 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -19,20 +19,19 @@ #ifndef _OFA_AUTOCDLG_HXX #define _OFA_AUTOCDLG_HXX -#include <svtools/langtab.hxx> #include <sfx2/tabdlg.hxx> +#include <svtools/langtab.hxx> +#include <svtools/simptabl.hxx> +#include <svtools/svtabbx.hxx> +#include <svtools/treelistentry.hxx> #include <svx/checklbx.hxx> +#include <svx/langbox.hxx> +#include <vcl/button.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#include <vcl/metric.hxx> -#include <svx/langbox.hxx> -#include "svtools/treelistentry.hxx" - #include <vcl/group.hxx> -#include <vcl/button.hxx> #include <vcl/lstbox.hxx> -#include <svtools/svtabbx.hxx> -#include <svx/simptabl.hxx> +#include <vcl/metric.hxx> class CharClass; class CollatorWrapper; @@ -60,9 +59,9 @@ public: // class OfaACorrCheckListBox ------------------------------------------ -class OfaACorrCheckListBox : public SvxSimpleTable +class OfaACorrCheckListBox : public SvSimpleTable { - using SvxSimpleTable::SetTabs; + using SvSimpleTable::SetTabs; using SvTreeListBox::GetCheckButtonState; using SvTreeListBox::SetCheckButtonState; @@ -72,8 +71,8 @@ class OfaACorrCheckListBox : public SvxSimpleTable virtual void KeyInput( const KeyEvent& rKEvt ); public: - OfaACorrCheckListBox(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER) - : SvxSimpleTable(rParent, nBits) + OfaACorrCheckListBox(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER) + : SvSimpleTable(rParent, nBits) { } @@ -127,7 +126,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage { using TabPage::ActivatePage; - SvxSimpleTableContainer m_aCheckLBContainer; + SvSimpleTableContainer m_aCheckLBContainer; OfaACorrCheckListBox aCheckLB; PushButton aEditPB; FixedText aHeader1Expl; @@ -349,7 +348,7 @@ private: SvxCheckListBox aCheckLB; /// Just for writer - SvxSimpleTableContainer m_aSwCheckLBContainer; + SvSimpleTableContainer m_aSwCheckLBContainer; OfaACorrCheckListBox aSwCheckLB; String sHeader1; String sHeader2; diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 989dbe021585..63e9b76518ac 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -26,7 +26,7 @@ #include <svl/poolitem.hxx> #include "ControlFocusHelper.hxx" #include <sfx2/basedlgs.hxx> -#include <svx/simptabl.hxx> +#include <svtools/simptabl.hxx> class SvTreeListEntry; namespace svx @@ -47,7 +47,7 @@ namespace svx FixedLine aStdBox; FixedText aTypeText; FixedText aPathText; - SvxSimpleTableContainer aPathCtrl; + SvSimpleTableContainer aPathCtrl; PushButton m_aNew; PushButton m_aEdit; PushButton m_aDelete; diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index c36aa584a52d..d5dead1e26b7 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -47,7 +47,7 @@ class SvxMultiPathDialog : public ModalDialog protected: FixedLine aPathFL; ListBox aPathLB; - SvxSimpleTableContainer m_aRadioLBContainer; + SvSimpleTableContainer m_aRadioLBContainer; svx::SvxRadioButtonListBox aRadioLB; FixedText aRadioFT; PushButton aAddBtn; diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 6b1785299691..cd1a0a800ef7 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/uno/Sequence.hxx> -#include <svx/simptabl.hxx> +#include <svtools/simptabl.hxx> #include <svx/langbox.hxx> namespace com{namespace sun{namespace star{ diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index f01c5b17c2e3..3b5d2ea618c4 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -20,7 +20,7 @@ #define _SVX_OPTPATH_HXX #include <sfx2/tabdlg.hxx> -#include <svx/simptabl.hxx> +#include <svtools/simptabl.hxx> #include <vcl/fixed.hxx> #include <vcl/group.hxx> #include "ControlFocusHelper.hxx" @@ -42,7 +42,7 @@ class SvxPathTabPage; class SvxPathTabPage : public SfxTabPage { private: - SvxSimpleTableContainer* m_pPathCtrl; + SvSimpleTableContainer* m_pPathCtrl; PushButton* m_pStandardBtn; PushButton* m_pPathBtn; diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx index efa15794c518..b28a076467ee 100644 --- a/cui/source/inc/radiobtnbox.hxx +++ b/cui/source/inc/radiobtnbox.hxx @@ -19,15 +19,15 @@ #ifndef _SVX_RADIOBTNBOX_HXX #define _SVX_RADIOBTNBOX_HXX -#include <svx/simptabl.hxx> +#include <svtools/simptabl.hxx> namespace svx { // class SvxRadioButtonListBox ------------------------------------------- -class SvxRadioButtonListBox : public SvxSimpleTable +class SvxRadioButtonListBox : public SvSimpleTable { - using SvxSimpleTable::SetTabs; + using SvSimpleTable::SetTabs; private: Point m_aCurMousePoint; @@ -38,7 +38,7 @@ protected: virtual void KeyInput( const KeyEvent& rKEvt ); public: - SvxRadioButtonListBox(SvxSimpleTableContainer& rParent, WinBits nBits); + SvxRadioButtonListBox(SvSimpleTableContainer& rParent, WinBits nBits); ~SvxRadioButtonListBox(); void HandleEntryChecked( SvTreeListEntry* _pEntry ); |