From 52bce8fadde39e32c0008babadc2c22cc501f753 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 16 Jul 2013 09:12:42 +0100 Subject: convert versions of dialog to .ui Change-Id: I1be2211b5c936e6e00f2fe81883b8fb1e67ef550 --- cui/source/options/certpath.cxx | 4 ++-- cui/source/options/certpath.hxx | 6 +++--- cui/source/options/dbregister.cxx | 2 +- cui/source/options/fontsubs.cxx | 12 ++++++------ cui/source/options/fontsubs.hxx | 14 +++++++------- cui/source/options/optHeaderTabListbox.cxx | 6 +++--- cui/source/options/optHeaderTabListbox.hxx | 6 +++--- cui/source/options/optfltr.cxx | 6 +++--- cui/source/options/optfltr.hxx | 14 ++++++-------- cui/source/options/optjava.cxx | 10 +++++----- cui/source/options/optjava.hxx | 5 +++-- cui/source/options/radiobtnbox.cxx | 10 +++++----- cui/source/options/webconninfo.cxx | 12 ++++++------ cui/source/options/webconninfo.hxx | 8 ++++---- 14 files changed, 57 insertions(+), 58 deletions(-) (limited to 'cui/source/options') diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index e3ebcbe0375b..482873d73ea9 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -44,7 +44,7 @@ CertPathDialog::CertPathDialog( Window* pParent ) : 3, 0, 15, 75 }; - m_aCertPathList.SvxSimpleTable::SetTabs( aStaticTabs ); + m_aCertPathList.SvSimpleTable::SetTabs( aStaticTabs ); OUString sProfile(CUI_RESSTR(STR_PROFILE)); OUString sDirectory(CUI_RESSTR(STR_DIRECTORY)); @@ -157,7 +157,7 @@ CertPathDialog::~CertPathDialog() } } -IMPL_LINK( CertPathDialog, CheckHdl_Impl, SvxSimpleTable *, pList ) +IMPL_LINK( CertPathDialog, CheckHdl_Impl, SvSimpleTable *, pList ) { SvTreeListEntry* pEntry = pList ? m_aCertPathList.GetEntry(m_aCertPathList.GetCurMousePoint()) : m_aCertPathList.FirstSelected(); diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index e82f50e16eaf..3753bf652bf3 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -11,7 +11,7 @@ #define _CUI_CERTPATH_HXX #include -#include +#include #include #include #include "radiobtnbox.hxx" @@ -21,7 +21,7 @@ class CertPathDialog : public ModalDialog private: FixedLine m_aCertPathFL; FixedText m_aCertPathFT; - SvxSimpleTableContainer m_aCertPathListContainer; + SvSimpleTableContainer m_aCertPathListContainer; svx::SvxRadioButtonListBox m_aCertPathList; PushButton m_aAddBtn; FixedLine m_aButtonsFL; @@ -31,7 +31,7 @@ private: OUString m_sAddDialogText; OUString m_sManual; - DECL_LINK(CheckHdl_Impl, SvxSimpleTable *); + DECL_LINK(CheckHdl_Impl, SvSimpleTable *); DECL_LINK(AddHdl_Impl, void *); DECL_LINK(OKHdl_Impl, void *); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 25d34e63161d..1e4ce41275c2 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -151,7 +151,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx pPathBox->SetSelectionMode( SINGLE_SELECTION ); pPathBox->SetPosSizePixel( Point( 0, aHeadSize.Height() ), Size( aBoxSize.Width(), aBoxSize.Height() - aHeadSize.Height() ) ); - pPathBox->SvxSimpleTable::SetTabs( aTabs, MAP_APPFONT ); + pPathBox->SvSimpleTable::SetTabs( aTabs, MAP_APPFONT ); pPathBox->SetHighlightRange(); pPathBox->SetHelpId( HID_DBPATH_CTL_PATH ); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 91ecf40936cb..86e26aee7f59 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -57,7 +57,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, get(m_pNonPropFontsOnlyCB, "nonpropfontonly"); get(m_pFontHeightLB, "fontheight"); - SvxSimpleTableContainer *pCheckLBContainer = get("checklb"); + SvSimpleTableContainer *pCheckLBContainer = get("checklb"); Size aControlSize(248, 75); aControlSize = LogicToPixel(aControlSize, MAP_APPFONT); pCheckLBContainer->set_width_request(aControlSize.Width()); @@ -70,7 +70,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, m_pCheckLB->SetSelectionMode(MULTIPLE_SELECTION); m_pCheckLB->SortByCol(2); long aStaticTabs[] = { 4, 0, 0, 0, 0 }; - m_pCheckLB->SvxSimpleTable::SetTabs(&aStaticTabs[0]); + m_pCheckLB->SvSimpleTable::SetTabs(&aStaticTabs[0]); OUString sHeader1(get("always")->GetText()); OUString sHeader2(get("screenonly")->GetText()); @@ -404,18 +404,18 @@ void SvxFontSubstCheckListBox::setColSizes() aStaticTabs[2] = nMax; aStaticTabs[3] = nDoubleMax; aStaticTabs[4] = nDoubleMax + nRest/2; - SvxSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); + SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); } void SvxFontSubstCheckListBox::Resize() { - SvxSimpleTable::Resize(); + SvSimpleTable::Resize(); setColSizes(); } void SvxFontSubstCheckListBox::SetTabs() { - SvxSimpleTable::SetTabs(); + SvSimpleTable::SetTabs(); sal_uInt16 nAdjust = SV_LBOXTAB_ADJUST_RIGHT|SV_LBOXTAB_ADJUST_LEFT|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_ADJUST_NUMERIC|SV_LBOXTAB_FORCE; SvLBoxTab* pTab = aTabs[1]; @@ -451,7 +451,7 @@ void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt ) } } else - SvxSimpleTable::KeyInput(rKEvt); + SvSimpleTable::KeyInput(rKEvt); } void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked) diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index fbc29def2035..d5fb69ac150b 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -20,18 +20,18 @@ #define _SVX_FONT_SUBSTITUTION_HXX #include +#include +#include +#include #include -#include #include -#include -#include "svtools/treelistentry.hxx" // class SvxFontSubstCheckListBox ------------------------------------------ -class SvxFontSubstCheckListBox : public SvxSimpleTable +class SvxFontSubstCheckListBox : public SvSimpleTable { friend class SvxFontSubstTabPage; - using SvxSimpleTable::SetTabs; + using SvSimpleTable::SetTabs; using SvTreeListBox::GetCheckButtonState; using SvTreeListBox::SetCheckButtonState; @@ -41,8 +41,8 @@ class SvxFontSubstCheckListBox : public SvxSimpleTable virtual void Resize(); public: - SvxFontSubstCheckListBox(SvxSimpleTableContainer& rParent, WinBits nBits) - : SvxSimpleTable(rParent, nBits) + SvxFontSubstCheckListBox(SvSimpleTableContainer& rParent, WinBits nBits) + : SvSimpleTable(rParent, nBits) { } diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 0ad304972b75..5d8db124a66b 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -21,7 +21,7 @@ #include #include #include -#include "svtools/treelistentry.hxx" +#include namespace svx { @@ -53,8 +53,8 @@ void OptLBoxString_Impl::Paint( } // ----------------------------------------------------------------------------- -OptHeaderTabListBox::OptHeaderTabListBox(SvxSimpleTableContainer& rParent, WinBits nWinStyle) - : SvxSimpleTable(rParent, nWinStyle) +OptHeaderTabListBox::OptHeaderTabListBox(SvSimpleTableContainer& rParent, WinBits nWinStyle) + : SvSimpleTable(rParent, nWinStyle) { } diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx index cb4e1f2e8f0f..eb2751283e1c 100644 --- a/cui/source/options/optHeaderTabListbox.hxx +++ b/cui/source/options/optHeaderTabListbox.hxx @@ -19,16 +19,16 @@ #ifndef SVX_OPTHEADERTABLISTBOX_HXX #define SVX_OPTHEADERTABLISTBOX_HXX -#include +#include namespace svx { // class OptHeaderTabListBox --------------------------------------------- - class OptHeaderTabListBox : public SvxSimpleTable + class OptHeaderTabListBox : public SvSimpleTable { public: - OptHeaderTabListBox(SvxSimpleTableContainer& rParent, WinBits nBits); + OptHeaderTabListBox(SvSimpleTableContainer& rParent, WinBits nBits); virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); }; diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 2271fab7e057..a42702042531 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -147,7 +147,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, FreeResource(); static long aStaticTabs[] = { 3, 0, 20, 40 }; - aCheckLB.SvxSimpleTable::SetTabs( aStaticTabs ); + aCheckLB.SvSimpleTable::SetTabs( aStaticTabs ); String sHeader( sHeader1 ); (( sHeader += '\t' ) += sHeader2 ) += '\t'; @@ -309,7 +309,7 @@ SvTreeListEntry* OfaMSFilterTabPage2::GetEntry4Type( sal_IntPtr _nType ) const void OfaMSFilterTabPage2::MSFltrSimpleTable::SetTabs() { - SvxSimpleTable::SetTabs(); + SvSimpleTable::SetTabs(); sal_uInt16 nAdjust = SV_LBOXTAB_ADJUST_RIGHT|SV_LBOXTAB_ADJUST_LEFT|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_ADJUST_NUMERIC|SV_LBOXTAB_FORCE; if( aTabs.size() > 1 ) @@ -409,7 +409,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt ) } } else - SvxSimpleTable::KeyInput(rKEvt); + SvSimpleTable::KeyInput(rKEvt); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index fb4fd067e270..bdcaf49f4edf 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -23,9 +23,7 @@ #include #include #include -#include - - +#include class OfaMSFilterTabPage : public SfxTabPage { @@ -54,11 +52,11 @@ public: class OfaMSFilterTabPage2 : public SfxTabPage { - class MSFltrSimpleTable : public SvxSimpleTable + class MSFltrSimpleTable : public SvSimpleTable { using SvTreeListBox::GetCheckButtonState; using SvTreeListBox::SetCheckButtonState; - using SvxSimpleTable::SetTabs; + using SvSimpleTable::SetTabs; void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked); SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; @@ -69,13 +67,13 @@ class OfaMSFilterTabPage2 : public SfxTabPage virtual void KeyInput( const KeyEvent& rKEvt ); public: - MSFltrSimpleTable(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER) - : SvxSimpleTable(rParent, nBits) + MSFltrSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER) + : SvSimpleTable(rParent, nBits) { } }; - SvxSimpleTableContainer m_aCheckLBContainer; + SvSimpleTableContainer m_aCheckLBContainer; MSFltrSimpleTable aCheckLB; FixedText aHeader1FT, aHeader2FT; String sHeader1, sHeader2; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index fbf91b9acde5..8d5248e5ac34 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -90,7 +90,7 @@ class SvxJavaListBox : public svx::SvxRadioButtonListBox private: const OUString m_sAccessibilityText; public: - SvxJavaListBox(SvxSimpleTableContainer& rParent, const OUString &rAccessibilityText) + SvxJavaListBox(SvSimpleTableContainer& rParent, const OUString &rAccessibilityText) : SvxRadioButtonListBox(rParent, 0) , m_sAccessibilityText(rAccessibilityText) { @@ -116,7 +116,7 @@ public: aStaticTabs[2] = nCheckWidth; aStaticTabs[3] = aStaticTabs[2] + nVendorWidth; aStaticTabs[4] = aStaticTabs[3] + nVersionWidth; - SvxSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); + SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); } virtual void Resize() { @@ -153,7 +153,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet m_sAccessibilityText = get("a11y")->GetText(); m_sAddDialogText = get("selectruntime")->GetText(); - SvxSimpleTableContainer *pJavaListContainer = get("javas"); + SvSimpleTableContainer *pJavaListContainer = get("javas"); Size aControlSize(177, 60); aControlSize = LogicToPixel(aControlSize, MAP_APPFONT); pJavaListContainer->set_width_request(aControlSize.Width()); @@ -162,7 +162,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet long aStaticTabs[]= { 4, 0, 0, 0, 0 }; - m_pJavaList->SvxSimpleTable::SetTabs( aStaticTabs ); + m_pJavaList->SvSimpleTable::SetTabs( aStaticTabs ); OUStringBuffer sHeader; sHeader.append("\t").append(get("vendor")->GetText()) @@ -223,7 +223,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl) // ----------------------------------------------------------------------- -IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvxSimpleTable *, pList ) +IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvSimpleTable *, pList ) { SvTreeListEntry* pEntry = pList ? m_pJavaList->GetEntry( m_pJavaList->GetCurMousePoint() ) : m_pJavaList->FirstSelected(); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 81ab96777cdb..11c5424fd033 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -23,11 +23,12 @@ #include #include #include +#include #include #include -#include #include #include +#include #include "radiobtnbox.hxx" // forward --------------------------------------------------------------- @@ -81,7 +82,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker; DECL_LINK(EnableHdl_Impl, void *); - DECL_LINK( CheckHdl_Impl, SvxSimpleTable * ); + DECL_LINK( CheckHdl_Impl, SvSimpleTable * ); DECL_LINK(SelectHdl_Impl, void *); DECL_LINK(AddHdl_Impl, void *); DECL_LINK(ParameterHdl_Impl, void *); diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index a19c89cef714..47d37eb2f73c 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -26,8 +26,8 @@ namespace svx { // class SvxRadioButtonListBox ---------------------------------------------------- -SvxRadioButtonListBox::SvxRadioButtonListBox(SvxSimpleTableContainer& rParent, WinBits nBits) - : SvxSimpleTable(rParent, nBits) +SvxRadioButtonListBox::SvxRadioButtonListBox(SvSimpleTableContainer& rParent, WinBits nBits) + : SvSimpleTable(rParent, nBits) { EnableCheckButton( new SvLBoxButtonData( this, true ) ); @@ -39,13 +39,13 @@ SvxRadioButtonListBox::~SvxRadioButtonListBox() void SvxRadioButtonListBox::SetTabs() { - SvxSimpleTable::SetTabs(); + SvSimpleTable::SetTabs(); } void SvxRadioButtonListBox::MouseButtonUp( const MouseEvent& _rMEvt ) { m_aCurMousePoint = _rMEvt.GetPosPixel(); - SvxSimpleTable::MouseButtonUp( _rMEvt ); + SvSimpleTable::MouseButtonUp( _rMEvt ); } void SvxRadioButtonListBox::KeyInput( const KeyEvent& rKEvt ) @@ -61,7 +61,7 @@ void SvxRadioButtonListBox::KeyInput( const KeyEvent& rKEvt ) } } - SvxSimpleTable::KeyInput( rKEvt ); + SvSimpleTable::KeyInput( rKEvt ); } void SvxRadioButtonListBox::HandleEntryChecked( SvTreeListEntry* _pEntry ) diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 56ca925ccbfa..7ba03b9d3f14 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -39,8 +39,8 @@ namespace svx // class PasswordTable --------------------------------------------------- -PasswordTable::PasswordTable(SvxSimpleTableContainer& rParent, WinBits nBits) - : SvxSimpleTable(rParent, nBits | WB_NOINITIALSELECTION) +PasswordTable::PasswordTable(SvSimpleTableContainer& rParent, WinBits nBits) + : SvSimpleTable(rParent, nBits | WB_NOINITIALSELECTION) { } @@ -78,7 +78,7 @@ void PasswordTable::Resort( bool bForced ) void PasswordTable::Resize() { - SvxSimpleTable::Resize(); + SvSimpleTable::Resize(); if (isInitialLayout(this)) setColWidths(); } @@ -96,7 +96,7 @@ void PasswordTable::setColWidths() GetSizePixel().Width() - nUserNameWidth); long aStaticTabs[]= { 2, 0, 0 }; aStaticTabs[2] = nWebSiteWidth; - SvxSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); + SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); } // class WebConnectionInfoDialog ----------------------------------------- @@ -110,7 +110,7 @@ WebConnectionInfoDialog::WebConnectionInfoDialog(Window* pParent) get(m_pRemoveAllBtn, "removeall"); get(m_pChangeBtn, "change"); - SvxSimpleTableContainer *pPasswordsLBContainer = get("logins"); + SvSimpleTableContainer *pPasswordsLBContainer = get("logins"); m_pPasswordsLB = new PasswordTable(*pPasswordsLBContainer, 0); long aStaticTabs[]= { 2, 0, 0 }; @@ -146,7 +146,7 @@ WebConnectionInfoDialog::~WebConnectionInfoDialog() } // ----------------------------------------------------------------------- -IMPL_LINK( WebConnectionInfoDialog, HeaderBarClickedHdl, SvxSimpleTable*, pTable ) +IMPL_LINK( WebConnectionInfoDialog, HeaderBarClickedHdl, SvSimpleTable*, pTable ) { m_pPasswordsLB->Resort( NULL == pTable ); return 0; diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index 03a15e13d8ac..c469dad79796 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -22,18 +22,18 @@ #include #include #include +#include #include -#include //........................................................................ namespace svx { //........................................................................ - class PasswordTable : public SvxSimpleTable + class PasswordTable : public SvSimpleTable { public: - PasswordTable(SvxSimpleTableContainer& rParent, WinBits nBits); + PasswordTable(SvSimpleTableContainer& rParent, WinBits nBits); void InsertHeaderItem(sal_uInt16 nColumn, const OUString& rText, HeaderBarItemBits nBits); void setColWidths(); @@ -53,7 +53,7 @@ namespace svx PushButton* m_pChangeBtn; sal_Int32 m_nPos; - DECL_LINK( HeaderBarClickedHdl, SvxSimpleTable* ); + DECL_LINK( HeaderBarClickedHdl, SvSimpleTable* ); DECL_LINK(RemovePasswordHdl, void *); DECL_LINK(RemoveAllPasswordsHdl, void *); DECL_LINK(ChangePasswordHdl, void *); -- cgit