diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-16 09:12:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-16 12:45:56 +0100 |
| commit | 52bce8fadde39e32c0008babadc2c22cc501f753 (patch) | |
| tree | c238b858401b18edaa27d62cd909a276ee76db73 | |
| parent | 84e5cdce3ed58c663109bb557b75cd6e45bb2dbc (diff) | |
convert versions of dialog to .ui
Change-Id: I1be2211b5c936e6e00f2fe81883b8fb1e67ef550
73 files changed, 772 insertions, 564 deletions
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 33715595cf82..183c56f27535 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -194,7 +194,7 @@ SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed { static long aStaticTabs[]= { 2, 0, 12 }; - aRadioLB.SvxSimpleTable::SetTabs( aStaticTabs ); + aRadioLB.SvSimpleTable::SetTabs( aStaticTabs ); String sHeader( CUI_RES( STR_HEADER_PATHS ) ); aRadioLB.SetQuickHelpText( sHeader ); sHeader.Insert( '\t', 0 ); 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 ); 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 <sfx2/basedlgs.hxx> -#include <svx/simptabl.hxx> +#include <svtools/simptabl.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> #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<SvxSimpleTableContainer>("checklb"); + SvSimpleTableContainer *pCheckLBContainer = get<SvSimpleTableContainer>("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<FixedText>("always")->GetText()); OUString sHeader2(get<FixedText>("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 <sfx2/tabdlg.hxx> +#include <svtools/ctrlbox.hxx> +#include <svtools/simptabl.hxx> +#include <svtools/treelistentry.hxx> #include <vcl/fixed.hxx> -#include <svx/simptabl.hxx> #include <vcl/toolbox.hxx> -#include <svtools/ctrlbox.hxx> -#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 <vcl/svapp.hxx> #include <svtools/headbar.hxx> #include <svtools/svlbitm.hxx> -#include "svtools/treelistentry.hxx" +#include <svtools/treelistentry.hxx> 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 <svx/simptabl.hxx> +#include <svtools/simptabl.hxx> 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 <vcl/group.hxx> #include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> -#include <svx/simptabl.hxx> - - +#include <svtools/simptabl.hxx> 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<FixedText>("a11y")->GetText(); m_sAddDialogText = get<FixedText>("selectruntime")->GetText(); - SvxSimpleTableContainer *pJavaListContainer = get<SvxSimpleTableContainer>("javas"); + SvSimpleTableContainer *pJavaListContainer = get<SvSimpleTableContainer>("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<FixedText>("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 <ucbhelper/content.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> +#include <vcl/lstbox.hxx> #include <vcl/timer.hxx> #include <sfx2/tabdlg.hxx> -#include <svx/simptabl.hxx> #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <svtools/dialogclosedlistener.hxx> +#include <svtools/simptabl.hxx> #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<SvxSimpleTableContainer>("logins"); + SvSimpleTableContainer *pPasswordsLBContainer = get<SvSimpleTableContainer>("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 <vcl/button.hxx> #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> +#include <svtools/simptabl.hxx> #include <svtools/stdctrl.hxx> -#include <svx/simptabl.hxx> //........................................................................ 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 *); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 11b6c7cdda04..5650ae98e84b 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -447,7 +447,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, 3, 0, 20, 40 }; - aCheckLB.SvxSimpleTable::SetTabs(aStaticTabs); + aCheckLB.SvSimpleTable::SetTabs(aStaticTabs); String sHeader( sHeader1 ); sHeader += '\t'; sHeader += sHeader2; @@ -742,7 +742,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl) void OfaACorrCheckListBox::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 ) @@ -843,7 +843,7 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt ) } } else - SvxSimpleTable::KeyInput(rKEvt); + SvSimpleTable::KeyInput(rKEvt); } OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, @@ -1801,7 +1801,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : aSwCheckLB.SetStyle(aSwCheckLB.GetStyle() | WB_HSCROLL| WB_VSCROLL); - aSwCheckLB.SvxSimpleTable::SetTabs(aStaticTabs); + aSwCheckLB.SvSimpleTable::SetTabs(aStaticTabs); String sHeader( sHeader1 ); sHeader += '\t'; sHeader += sHeader2; diff --git a/cui/uiconfig/ui/optadvancedpage.ui b/cui/uiconfig/ui/optadvancedpage.ui index f89ff035e166..3be64d132f58 100644 --- a/cui/uiconfig/ui/optadvancedpage.ui +++ b/cui/uiconfig/ui/optadvancedpage.ui @@ -232,7 +232,7 @@ </packing> </child> <child> - <object class="svxcorelo-SvxSimpleTableContainer" id="javas"> + <object class="svtlo-SvSimpleTableContainer" id="javas"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> diff --git a/cui/uiconfig/ui/optfontspage.ui b/cui/uiconfig/ui/optfontspage.ui index a5666cda8bc5..6070a25fb079 100644 --- a/cui/uiconfig/ui/optfontspage.ui +++ b/cui/uiconfig/ui/optfontspage.ui @@ -162,7 +162,7 @@ </packing> </child> <child> - <object class="svxcorelo-SvxSimpleTableContainer" id="checklb"> + <object class="svtlo-SvSimpleTableContainer" id="checklb"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="vexpand">True</property> diff --git a/cui/uiconfig/ui/optpathspage.ui b/cui/uiconfig/ui/optpathspage.ui index a273f7bc23be..887904d5707d 100644 --- a/cui/uiconfig/ui/optpathspage.ui +++ b/cui/uiconfig/ui/optpathspage.ui @@ -93,7 +93,7 @@ </packing> </child> <child> - <object class="svxcorelo-SvxSimpleTableContainer" id="paths"> + <object class="svtlo-SvSimpleTableContainer" id="paths"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> diff --git a/cui/uiconfig/ui/storedwebconnectiondialog.ui b/cui/uiconfig/ui/storedwebconnectiondialog.ui index a9a4cf6222d7..2d757e3a05ed 100644 --- a/cui/uiconfig/ui/storedwebconnectiondialog.ui +++ b/cui/uiconfig/ui/storedwebconnectiondialog.ui @@ -114,7 +114,7 @@ </packing> </child> <child> - <object class="svxcorelo-SvxSimpleTableContainer" id="logins"> + <object class="svtlo-SvSimpleTableContainer" id="logins"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 094aaa0eea5c..c1b2b7cafc93 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -177,7 +177,7 @@ <glade-widget-class title="CsvTableBox" name="sclo-ScCsvTableBox" generic-name="CSV Table Box" parent="GtkDrawingArea" icon-name="widget-gtk-drawingarea"/> - <glade-widget-class title="Table Container" name="svxcorelo-SvxSimpleTableContainer" + <glade-widget-class title="Table Container" name="svtlo-SvSimpleTableContainer" generic-name="Simple Table Container" parent="GtkTreeView" icon-name="widget-gtk-treeview"/> <glade-widget-class title="Paragraph Preview" name="svxlo-SvxParaPrevWindow" diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx index c15f23b7769a..37cd6bbc98a7 100644 --- a/include/sfx2/dialoghelper.hxx +++ b/include/sfx2/dialoghelper.hxx @@ -11,8 +11,11 @@ #define _SFX_DIALOGHELPER_HXX #include "sfx2/dllapi.h" +#include <rtl/ustring.hxx> #include <tools/gen.hxx> +class DateTime; +class LocaleDataWrapper; class Window; class VclBuilderContainer; @@ -27,6 +30,10 @@ void SFX2_DLLPUBLIC setPreviewsToSamePlace(Window *pParent, VclBuilderContainer Size SFX2_DLLPUBLIC getParagraphPreviewOptimalSize(const Window *pReference); +OUString SFX2_DLLPUBLIC getWidestTime(const LocaleDataWrapper& rWrapper); + +OUString SFX2_DLLPUBLIC formatTime(const DateTime& rDateTime, const LocaleDataWrapper& rWrapper); + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/simptabl.hxx b/include/svtools/simptabl.hxx index 8e448bc8b2c0..1b27463e09df 100644 --- a/include/svx/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -17,43 +17,37 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVX_SIMPTABL_HXX -#define _SVX_SIMPTABL_HXX +#ifndef _SV_SIMPTABL_HXX +#define _SV_SIMPTABL_HXX -#include <vcl/morebtn.hxx> - -#include <vcl/combobox.hxx> - -#include <vcl/group.hxx> +#include "svtools/svtdllapi.h" #include <svtools/headbar.hxx> #include <svtools/svtabbx.hxx> -#include <vcl/lstbox.hxx> -#include "svx/svxdllapi.h" -class SvxSimpleTable; -class SVX_DLLPUBLIC SvxSimpleTableContainer : public Control +class SvSimpleTable; +class SVT_DLLPUBLIC SvSimpleTableContainer : public Control { private: - SvxSimpleTable* m_pTable; + SvSimpleTable* m_pTable; protected: virtual long PreNotify( NotifyEvent& rNEvt ); public: - SvxSimpleTableContainer( Window* pParent, const ResId& rResId ); - SvxSimpleTableContainer( Window* pParent, WinBits nBits = WB_BORDER ); + SvSimpleTableContainer( Window* pParent, const ResId& rResId ); + SvSimpleTableContainer( Window* pParent, WinBits nBits = WB_BORDER ); - void SetTable(SvxSimpleTable* pTable); + void SetTable(SvSimpleTable* pTable); virtual void Resize(); virtual void GetFocus(); }; -class SVX_DLLPUBLIC SvxSimpleTable : public SvHeaderTabListBox +class SVT_DLLPUBLIC SvSimpleTable : public SvHeaderTabListBox { private: - SvxSimpleTableContainer& m_rParentTableContainer; + SvSimpleTableContainer& m_rParentTableContainer; Link aHeaderBarClickLink; Link aHeaderBarDblClickLink; @@ -92,8 +86,8 @@ protected: virtual StringCompare ColCompare(SvTreeListEntry*,SvTreeListEntry*); public: - SvxSimpleTable(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER); - ~SvxSimpleTable(); + SvSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER); + ~SvSimpleTable(); void UpdateViewSize(); @@ -152,6 +146,6 @@ public: }; -#endif // _SVX_SIMPTABL_HXX +#endif // _SV_SIMPTABL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 861c050fd878..a7f58cccbefc 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -20,23 +20,19 @@ #ifndef _SVX_CTREDLIN_HXX #define _SVX_CTREDLIN_HXX -#include <vcl/morebtn.hxx> -#include <vcl/combobox.hxx> #include <svtools/headbar.hxx> +#include <svtools/simptabl.hxx> +#include <svtools/svlbitm.hxx> #include <svtools/svtabbx.hxx> -#include "svtools/svlbitm.hxx" -#include <vcl/lstbox.hxx> -#include <vcl/tabpage.hxx> +#include <svtools/treelistentry.hxx> +#include <tools/datetime.hxx> +#include <vcl/combobox.hxx> #include <vcl/field.hxx> #include <vcl/fixed.hxx> - -#ifndef _SVX_SIMPTABL -#include <svx/simptabl.hxx> -#endif +#include <vcl/lstbox.hxx> +#include <vcl/tabpage.hxx> #include <vcl/tabctrl.hxx> -#include <tools/datetime.hxx> #include <unotools/textsearch.hxx> -#include "svtools/treelistentry.hxx" #include "svx/svxdllapi.h" #define FLT_DATE_BEFORE 0 @@ -85,7 +81,7 @@ public: SvLBoxItem* Create() const; }; -class SVX_DLLPUBLIC SvxRedlinTable : public SvxSimpleTable +class SVX_DLLPUBLIC SvxRedlinTable : public SvSimpleTable { using SvTabListBox::InsertEntry; @@ -116,7 +112,7 @@ protected: public: - SvxRedlinTable(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER); + SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER); ~SvxRedlinTable(); // For FilterPage only { diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index fd84d86969f0..5ef3382c6b78 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -24,12 +24,12 @@ #include <vcl/combobox.hxx> #include <vcl/group.hxx> #include <svtools/headbar.hxx> +#include <svtools/simptabl.hxx> #include <svtools/svtabbx.hxx> #include "rangenam.hxx" #include "anyrefdg.hxx" #include <vcl/lstbox.hxx> #include <svx/ctredlin.hxx> -#include <svx/simptabl.hxx> #include "chgtrack.hxx" #include "chgviset.hxx" #include <vcl/timer.hxx> diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index a70133251eeb..64e56ee3e3e0 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -138,7 +138,7 @@ class ScConflictsDlg : public ModalDialog { private: FixedText maFtConflicts; - SvxSimpleTableContainer m_aLbConflictsContainer; + SvSimpleTableContainer m_aLbConflictsContainer; SvxRedlinTable maLbConflicts; PushButton maBtnKeepMine; PushButton maBtnKeepOther; diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index b7895138df0c..34aaa5ea654f 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -24,16 +24,15 @@ #include <vcl/combobox.hxx> #include <vcl/group.hxx> #include <svtools/headbar.hxx> +#include <svtools/simptabl.hxx> #include <svtools/svtabbx.hxx> - #include "rangenam.hxx" #include "anyrefdg.hxx" #include <vcl/lstbox.hxx> #include <svx/ctredlin.hxx> -#include <svx/simptabl.hxx> #include "chgtrack.hxx" #include "chgviset.hxx" diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index 3c806cd960fb..6f11ec972dcf 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <svx/simptabl.hxx> +#include <svtools/simptabl.hxx> #include <vcl/ctrl.hxx> #include "scresid.hxx" @@ -30,7 +30,7 @@ struct ScRangeNameLine //TODO: cache the lines for performance improvements //otherwise handling of a large set of range names might get extremely slow //Need some sort of a filter to handle several range names -class SC_DLLPUBLIC ScRangeManagerTable : public SvxSimpleTable +class SC_DLLPUBLIC ScRangeManagerTable : public SvSimpleTable { private: OUString maGlobalString; @@ -51,7 +51,7 @@ private: void setColWidths(); public: - ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos ); + ScRangeManagerTable( SvSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos ); virtual ~ScRangeManagerTable(); virtual void Resize(); diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index f0760e2b32ea..bd76d8ebae02 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -23,7 +23,7 @@ #include <vcl/button.hxx> #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> -#include <svx/simptabl.hxx> +#include <svtools/simptabl.hxx> class ScViewData; class ScDocShell; @@ -38,7 +38,7 @@ class ScShareDocumentDlg : public ModalDialog private: CheckBox* m_pCbShare; FixedText* m_pFtWarning; - SvxSimpleTable* m_pLbUsers; + SvSimpleTable* m_pLbUsers; OUString m_aStrNoUserData; OUString m_aStrUnknownUser; diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index af56056ef983..9bdd24c944c9 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -18,6 +18,7 @@ */ #include <osl/security.hxx> +#include <sfx2/dialoghelper.hxx> #include <svl/sharecontrolfile.hxx> #include <unotools/useroptions.hxx> @@ -35,24 +36,19 @@ using namespace ::com::sun::star; -class ScShareTable : public SvxSimpleTable +class ScShareTable : public SvSimpleTable { private: OUString m_sWidestAccessString; public: - ScShareTable(SvxSimpleTableContainer& rParent) - : SvxSimpleTable(rParent) + ScShareTable(SvSimpleTableContainer& rParent) + : SvSimpleTable(rParent) { - Date aDate(22, 12, 2000); - Time aTime(22, 59); - DateTime aDateTime(aDate, aTime); - m_sWidestAccessString += ScGlobal::pLocaleData->getDate(aDateTime); - m_sWidestAccessString += OUString(' '); - m_sWidestAccessString += ScGlobal::pLocaleData->getTime(aDateTime, false); + m_sWidestAccessString = getWidestTime(*ScGlobal::pLocaleData); } virtual void Resize() { - SvxSimpleTable::Resize(); + SvSimpleTable::Resize(); if (isInitialLayout(this)) setColWidths(); } @@ -70,7 +66,7 @@ public: GetSizePixel().Width() - nAccessedWidth); long aStaticTabs[]= { 2, 0, 0 }; aStaticTabs[2] = nWebSiteWidth; - SvxSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); + SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); } }; @@ -90,7 +86,7 @@ ScShareDocumentDlg::ScShareDocumentDlg( Window* pParent, ScViewData* pViewData ) get(m_pCbShare, "share"); get(m_pFtWarning, "warning"); - SvxSimpleTableContainer *pCtrl = get<SvxSimpleTableContainer>("users"); + SvSimpleTableContainer *pCtrl = get<SvSimpleTableContainer>("users"); pCtrl->set_height_request(pCtrl->GetTextHeight()*9); m_pLbUsers = new ScShareTable(*pCtrl); @@ -188,9 +184,7 @@ void ScShareDocumentDlg::UpdateView() String aString( aUser ); aString += '\t'; - aString += ScGlobal::pLocaleData->getDate( aDateTime ); - aString += ' '; - aString += ScGlobal::pLocaleData->getTime( aDateTime, false ); + aString += formatTime(aDateTime, *ScGlobal::pLocaleData); m_pLbUsers->InsertEntry( aString, NULL ); } @@ -244,7 +238,7 @@ void ScShareDocumentDlg::UpdateView() Time t(uDT.Hours, uDT.Minutes, uDT.Seconds, uDT.NanoSeconds); DateTime aDateTime(d,t); - aString += ScGlobal::pLocaleData->getDate( aDateTime ); + aString += formatTime(aDateTime, *ScGlobal::pLocaleData); aString += ' '; aString += ScGlobal::pLocaleData->getTime( aDateTime, false ); diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index d3718a05c270..10080fbd6294 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -114,7 +114,7 @@ void ScNameDlg::Init() //init UI m_pFtInfo->SetStyle(WB_VCENTER); - SvxSimpleTableContainer *pCtrl = get<SvxSimpleTableContainer>("names"); + SvSimpleTableContainer *pCtrl = get<SvSimpleTableContainer>("names"); pCtrl->set_height_request(pCtrl->GetTextHeight()*12); m_pRangeManagerTable = new ScRangeManagerTable(*pCtrl, maRangeMap, maCursorPos); diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index b7305fc16b08..c7e4040a4621 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -37,8 +37,8 @@ String createEntryString(const ScRangeNameLine& rLine) return aRet; } -ScRangeManagerTable::ScRangeManagerTable( SvxSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& rRangeMap, const ScAddress& rPos ): - SvxSimpleTable( rParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ), +ScRangeManagerTable::ScRangeManagerTable( SvSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& rRangeMap, const ScAddress& rPos ): + SvSimpleTable( rParent, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ), maGlobalString( ScGlobal::GetRscString(STR_GLOBAL_SCOPE)), mrRangeMap( rRangeMap ), maPos( rPos ) @@ -73,7 +73,7 @@ ScRangeManagerTable::ScRangeManagerTable( SvxSimpleTableContainer& rParent, boos void ScRangeManagerTable::Resize() { - SvxSimpleTable::Resize(); + SvSimpleTable::Resize(); if (isInitialLayout(this)) setColWidths(); } diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index 64a296c90e0d..e29eff38e977 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -53,7 +53,7 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool ) ScViewData* pViewData = pShell->GetViewData(); ScAddress aPos(pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo()); - SvxSimpleTableContainer *pContainer = get<SvxSimpleTableContainer>("ctrl"); + SvSimpleTableContainer *pContainer = get<SvSimpleTableContainer>("ctrl"); Size aControlSize(210, 0); aControlSize = LogicToPixel(aControlSize, MAP_APPFONT); pContainer->set_width_request(aControlSize.Width()); diff --git a/sc/uiconfig/scalc/ui/insertname.ui b/sc/uiconfig/scalc/ui/insertname.ui index c4e8e33b52d7..82a5f7e4f133 100644 --- a/sc/uiconfig/scalc/ui/insertname.ui +++ b/sc/uiconfig/scalc/ui/insertname.ui @@ -85,7 +85,7 @@ </packing> </child> <child> - <object class="svxcorelo-SvxSimpleTableContainer" id="ctrl"> + <object class="svtlo-SvSimpleTableContainer" id="ctrl"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> diff --git a/sc/uiconfig/scalc/ui/managenamesdialog.ui b/sc/uiconfig/scalc/ui/managenamesdialog.ui index c509ee8942e5..d43551bad377 100644 --- a/sc/uiconfig/scalc/ui/managenamesdialog.ui +++ b/sc/uiconfig/scalc/ui/managenamesdialog.ui @@ -81,7 +81,7 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="svxcorelo-SvxSimpleTableContainer" id="names"> + <object class="svtlo-SvSimpleTableContainer" id="names"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/sc/uiconfig/scalc/ui/sharedocumentdlg.ui b/sc/uiconfig/scalc/ui/sharedocumentdlg.ui index f39a2d92e917..480553fe5fb0 100644 --- a/sc/uiconfig/scalc/ui/sharedocumentdlg.ui +++ b/sc/uiconfig/scalc/ui/sharedocumentdlg.ui @@ -193,7 +193,7 @@ </packing> </child> <child> - <object class="svxcorelo-SvxSimpleTableContainer" id="users"> + <object class="svtlo-SvSimpleTableContainer" id="users"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk index b865a7161d59..f2cc39d50927 100644 --- a/sfx2/UIConfig_sfx.mk +++ b/sfx2/UIConfig_sfx.mk @@ -24,6 +24,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\ sfx2/uiconfig/ui/querysavedialog \ sfx2/uiconfig/ui/securityinfopage \ sfx2/uiconfig/ui/singletabdialog \ + sfx2/uiconfig/ui/versionsofdialog \ sfx2/uiconfig/ui/versioncommentdialog \ )) diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc index 51c85a4a3bb5..1e36560a4374 100644 --- a/sfx2/source/dialog/dialog.hrc +++ b/sfx2/source/dialog/dialog.hrc @@ -47,8 +47,6 @@ #define MN_CONTEXT_TEMPLDLG ( RC_DIALOG_BEGIN + 46) -#define DLG_VERSIONS ( RC_DIALOG_BEGIN + 69 ) - #define STR_VIEWVERSIONCOMMENT ( RC_DIALOG_BEGIN + 71 ) #define MSG_ERROR_WRONG_CONFIRM ( RC_DIALOG_BEGIN + 76 ) diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx index 89fd3adbabad..e0ac93107780 100644 --- a/sfx2/source/dialog/dialoghelper.cxx +++ b/sfx2/source/dialog/dialoghelper.cxx @@ -8,6 +8,7 @@ */ #include <sfx2/dialoghelper.hxx> +#include <tools/datetime.hxx> #include <vcl/builder.hxx> #include <vcl/layout.hxx> #include <vector> @@ -56,4 +57,20 @@ Size getParagraphPreviewOptimalSize(const Window *pReference) return pReference->LogicToPixel(Size(68 , 112), MAP_APPFONT); } +OUString SFX2_DLLPUBLIC getWidestTime(const LocaleDataWrapper& rWrapper) +{ + Date aDate(22, 12, 2000); + Time aTime(22, 59, 59); + DateTime aDateTime(aDate, aTime); + return formatTime(aDateTime, rWrapper); +} + +OUString SFX2_DLLPUBLIC formatTime(const DateTime& rDateTime, const LocaleDataWrapper& rWrapper) +{ + OUString sString = rWrapper.getDate(rDateTime); + sString += OUString(' '); + sString += rWrapper.getTime(rDateTime, false); + return sString; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index d4976c4a2186..a0215806b327 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -24,13 +24,15 @@ #include <svl/stritem.hxx> #include <svl/itemset.hxx> #include <unotools/useroptions.hxx> +#include <vcl/layout.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include <tools/datetime.hxx> #include "svtools/treelistentry.hxx" -#include "versdlg.hrc" #include "versdlg.hxx" +#include "dialog.hrc" +#include <sfx2/dialoghelper.hxx> #include <sfx2/viewfrm.hxx> #include "sfx2/sfxresid.hxx" #include <sfx2/docfile.hxx> @@ -136,82 +138,131 @@ SfxVersionInfo::SfxVersionInfo() { } -static String ConvertDateTime_Impl(const DateTime& rTime, const LocaleDataWrapper& rWrapper) -{ - const String pDelim (", "); - String aStr(rWrapper.getDate(rTime)); - aStr += pDelim; - aStr += rWrapper.getTime(rTime, sal_True, sal_False); - return aStr; -} - -// Caution in the code this array si indexed directly (0, 1, ...) -static long nTabs_Impl[] = -{ - 3, // Number of Tabs - 0, 62, 124 -}; - -void SfxVersionsTabListBox_Impl::KeyInput( const KeyEvent& rKeyEvent ) +void SfxVersionsTabListBox_Impl::KeyInput(const KeyEvent& rKeyEvent) { const KeyCode& rCode = rKeyEvent.GetKeyCode(); - switch ( rCode.GetCode() ) + switch (rCode.GetCode()) { case KEY_RETURN : case KEY_ESCAPE : case KEY_TAB : - Window::GetParent()->KeyInput( rKeyEvent ); + { + Dialog *pParent = GetParentDialog(); + if (pParent) + pParent->KeyInput(rKeyEvent); + else + SvSimpleTable::KeyInput(rKeyEvent); break; + } default: - SvTabListBox::KeyInput( rKeyEvent ); + SvSimpleTable::KeyInput( rKeyEvent ); break; } } -SfxVersionsTabListBox_Impl::SfxVersionsTabListBox_Impl( Window* pParent, const ResId& rResId ) - : SvTabListBox( pParent, rResId ) +void SfxVersionsTabListBox_Impl::Resize() +{ + SvSimpleTable::Resize(); + if (isInitialLayout(this)) + setColSizes(); +} + +void SfxVersionsTabListBox_Impl::setColSizes() { + HeaderBar &rBar = GetTheHeaderBar(); + if (rBar.GetItemCount() < 3) + return; + + // recalculate the datetime column width + long nWidestTime(GetTextWidth(getWidestTime(Application::GetSettings().GetLocaleDataWrapper()))); + long nW1 = rBar.GetTextWidth(rBar.GetItemText(1)); + + long nMax = std::max(nWidestTime, nW1) + 12; // max width + a little offset + const long nRest = GetSizePixel().Width() - nMax; + + std::set<OUString> aAuthors; + SfxVersionInfo aInfo; + aAuthors.insert(SvtUserOptions().GetFullName()); + + for (SvTreeListEntry* pEntry = First(); pEntry; pEntry = Next(pEntry)) + { + aAuthors.insert(((SfxVersionInfo*)pEntry->GetUserData())->aAuthor); + } + + long nMaxAuthorWidth = nRest/4; + for (std::set<OUString>::iterator aI = aAuthors.begin(), aEnd = aAuthors.end(); aI != aEnd; ++aI) + { + nMaxAuthorWidth = std::max(nMaxAuthorWidth, GetTextWidth(*aI)); + if (nMaxAuthorWidth > nRest/2) + { + nMaxAuthorWidth = nRest/2; + break; + } + } + + long aStaticTabs[] = { 3, 0, 0, 0 }; + aStaticTabs[2] = nMax; + aStaticTabs[3] = nMax + nMaxAuthorWidth; + SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); } SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, sal_Bool bIsSaveVersionOnClose ) - : SfxModalDialog( NULL, SfxResId( DLG_VERSIONS ) ) - , aNewGroup( this, SfxResId( GB_NEWVERSIONS ) ) - , aSaveButton( this, SfxResId( PB_SAVE ) ) - , aSaveCheckBox( this, SfxResId( CB_SAVEONCLOSE ) ) - , aExistingGroup( this, SfxResId( GB_OLDVERSIONS ) ) - , aDateTimeText( this, SfxResId( FT_DATETIME ) ) - , aSavedByText( this, SfxResId( FT_SAVEDBY ) ) - , aCommentText( this, SfxResId( FT_COMMENTS ) ) - , aVersionBox( this, SfxResId( TLB_VERSIONS ) ) - , aCloseButton( this, SfxResId( PB_CLOSE ) ) - , aOpenButton( this, SfxResId( PB_OPEN ) ) - , aViewButton( this, SfxResId( PB_VIEW ) ) - , aDeleteButton( this, SfxResId( PB_DELETE ) ) - , aCompareButton( this, SfxResId( PB_COMPARE ) ) - , aHelpButton( this, SfxResId( PB_HELP ) ) - , pViewFrame( pVwFrame ) - , mpTable( NULL ) - , mbIsSaveVersionOnClose( bIsSaveVersionOnClose ) + : SfxModalDialog(NULL, "VersionsOfDialog", "sfx/ui/versionsofdialog.ui") + , pViewFrame(pVwFrame) + , m_pTable(NULL) + , m_bIsSaveVersionOnClose(bIsSaveVersionOnClose) { - FreeResource(); + get(m_pSaveButton, "save"); + get(m_pSaveCheckBox, "always"); + get(m_pOpenButton, "open"); + get(m_pViewButton, "show"); + get(m_pDeleteButton, "delete"); + get(m_pCompareButton, "compare"); + + SvSimpleTableContainer *pContainer = get<SvSimpleTableContainer>("versions"); + Size aControlSize(260, 114); + aControlSize = pContainer->LogicToPixel(aControlSize, MAP_APPFONT); + pContainer->set_width_request(aControlSize.Width()); + pContainer->set_height_request(aControlSize.Height()); + + m_pVersionBox = new SfxVersionsTabListBox_Impl(*pContainer, WB_TABSTOP); Link aClickLink = LINK( this, SfxVersionDialog, ButtonHdl_Impl ); - aViewButton.SetClickHdl ( aClickLink ); - aSaveButton.SetClickHdl ( aClickLink ); - aDeleteButton.SetClickHdl ( aClickLink ); - aCompareButton.SetClickHdl ( aClickLink ); - aOpenButton.SetClickHdl ( aClickLink ); - aSaveCheckBox.SetClickHdl ( aClickLink ); - - aVersionBox.SetSelectHdl( LINK( this, SfxVersionDialog, SelectHdl_Impl ) ); - aVersionBox.SetDoubleClickHdl( LINK( this, SfxVersionDialog, DClickHdl_Impl ) ); - - aVersionBox.GrabFocus(); - aVersionBox.SetStyle( aVersionBox.GetStyle() | WB_HSCROLL | WB_CLIPCHILDREN ); - aVersionBox.SetSelectionMode( SINGLE_SELECTION ); - aVersionBox.SetTabs( &nTabs_Impl[0], MAP_APPFONT ); - aVersionBox.Resize(); // OS: Hack for correct selection - RecalcDateColumn(); + m_pViewButton->SetClickHdl ( aClickLink ); + m_pSaveButton->SetClickHdl ( aClickLink ); + m_pDeleteButton->SetClickHdl ( aClickLink ); + m_pCompareButton->SetClickHdl ( aClickLink ); + m_pOpenButton->SetClickHdl ( aClickLink ); + m_pSaveCheckBox->SetClickHdl ( aClickLink ); + + m_pVersionBox->SetSelectHdl( LINK( this, SfxVersionDialog, SelectHdl_Impl ) ); + m_pVersionBox->SetDoubleClickHdl( LINK( this, SfxVersionDialog, DClickHdl_Impl ) ); + + m_pVersionBox->GrabFocus(); + m_pVersionBox->SetStyle( m_pVersionBox->GetStyle() | WB_HSCROLL | WB_CLIPCHILDREN ); + m_pVersionBox->SetSelectionMode( SINGLE_SELECTION ); + + long nTabs_Impl[] = { 3, 0, 0, 0 }; + + + m_pVersionBox->SvSimpleTable::SetTabs(&nTabs_Impl[0]); + OUString sHeader1(get<FixedText>("datetime")->GetText()); + OUString sHeader2(get<FixedText>("savedby")->GetText()); + OUString sHeader3(get<FixedText>("comments")->GetText()); + OUStringBuffer sHeader; + sHeader.append(sHeader1).append("\t").append(sHeader2) + .append("\t ").append(sHeader3); + m_pVersionBox->InsertHeaderEntry(sHeader.makeStringAndClear()); + + HeaderBar &rBar = m_pVersionBox->GetTheHeaderBar(); + HeaderBarItemBits nBits = rBar.GetItemBits(1) | HIB_FIXEDPOS | HIB_FIXED; + nBits &= ~HIB_CLICKABLE; + rBar.SetItemBits(1, nBits); + rBar.SetItemBits(2, nBits); + rBar.SetItemBits(3, nBits); + + m_pVersionBox->Resize(); // OS: Hack for correct selection + // set dialog title (filename or docinfo title) String sText = GetText(); @@ -219,6 +270,8 @@ SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, sal_Bool bIsSaveVer SetText( sText ); Init_Impl(); + + m_pVersionBox->setColSizes(); } String ConvertWhiteSpaces_Impl( const String& rText ) @@ -250,47 +303,48 @@ void SfxVersionDialog::Init_Impl() SfxObjectShell *pObjShell = pViewFrame->GetObjectShell(); SfxMedium* pMedium = pObjShell->GetMedium(); uno::Sequence < util::RevisionTag > aVersions = pMedium->GetVersionList( true ); - delete mpTable; - mpTable = new SfxVersionTableDtor( aVersions ); + delete m_pTable; + m_pTable = new SfxVersionTableDtor( aVersions ); { - for ( size_t n = 0; n < mpTable->size(); ++n ) + for ( size_t n = 0; n < m_pTable->size(); ++n ) { - SfxVersionInfo *pInfo = mpTable->at( n ); - String aEntry = ConvertDateTime_Impl( pInfo->aCreationDate, Application::GetSettings().GetLocaleDataWrapper() ); + SfxVersionInfo *pInfo = m_pTable->at( n ); + String aEntry = formatTime(pInfo->aCreationDate, Application::GetSettings().GetLocaleDataWrapper()); aEntry += '\t'; aEntry += pInfo->aAuthor; aEntry += '\t'; aEntry += ConvertWhiteSpaces_Impl( pInfo->aComment ); - SvTreeListEntry *pEntry = aVersionBox.InsertEntry( aEntry ); + SvTreeListEntry *pEntry = m_pVersionBox->InsertEntry( aEntry ); pEntry->SetUserData( pInfo ); } } - aSaveCheckBox.Check( mbIsSaveVersionOnClose ); + m_pSaveCheckBox->Check( m_bIsSaveVersionOnClose ); sal_Bool bEnable = !pObjShell->IsReadOnly(); - aSaveButton.Enable( bEnable ); - aSaveCheckBox.Enable( bEnable ); + m_pSaveButton->Enable( bEnable ); + m_pSaveCheckBox->Enable( bEnable ); - aOpenButton.Disable(); - aViewButton.Disable(); - aDeleteButton.Disable(); - aCompareButton.Disable(); + m_pOpenButton->Disable(); + m_pViewButton->Disable(); + m_pDeleteButton->Disable(); + m_pCompareButton->Disable(); - SelectHdl_Impl( &aVersionBox ); + SelectHdl_Impl(m_pVersionBox); } -SfxVersionDialog::~SfxVersionDialog () +SfxVersionDialog::~SfxVersionDialog() { - delete mpTable; + delete m_pTable; + delete m_pVersionBox; } void SfxVersionDialog::Open_Impl() { SfxObjectShell *pObjShell = pViewFrame->GetObjectShell(); - SvTreeListEntry *pEntry = aVersionBox.FirstSelected(); - sal_uIntPtr nPos = aVersionBox.GetModel()->GetRelPos( pEntry ); + SvTreeListEntry *pEntry = m_pVersionBox->FirstSelected(); + sal_uIntPtr nPos = m_pVersionBox->GetModel()->GetRelPos( pEntry ); SfxInt16Item aItem( SID_VERSION, (short)nPos+1 ); SfxStringItem aTarget( SID_TARGETNAME, "_blank" ); SfxStringItem aReferer( SID_REFERER, "private:user" ); @@ -311,35 +365,6 @@ void SfxVersionDialog::Open_Impl() Close(); } -void SfxVersionDialog::RecalcDateColumn() -{ - // recalculate the datetime column width - DateTime aNow( DateTime::SYSTEM ); - String sDateTime = ConvertDateTime_Impl( aNow, Application::GetSettings().GetLocaleDataWrapper() ); - long nWidth = aVersionBox.GetTextWidth( sDateTime ); - nWidth += 15; // a little offset - long nTab = aVersionBox.GetTab(1); - if ( nWidth > nTab ) - { - // resize columns - long nDelta = nWidth - nTab; - aVersionBox.SetTab( 1, nTab + nDelta, MAP_PIXEL ); - nTab = aVersionBox.GetTab(2); - aVersionBox.SetTab( 2, nTab + nDelta, MAP_PIXEL ); - - // resize and move header - Size aSize = aDateTimeText.GetSizePixel(); - aSize.Width() += nDelta; - aDateTimeText.SetSizePixel( aSize ); - Point aPos = aSavedByText.GetPosPixel(); - aPos.X() += nDelta; - aSavedByText.SetPosPixel( aPos ); - aPos = aCommentText.GetPosPixel(); - aPos.X() += nDelta; - aCommentText.SetPosPixel( aPos ); - } -} - IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl) { Open_Impl(); @@ -348,16 +373,16 @@ IMPL_LINK_NOARG(SfxVersionDialog, DClickHdl_Impl) IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl) { - bool bEnable = ( aVersionBox.FirstSelected() != NULL ); + bool bEnable = ( m_pVersionBox->FirstSelected() != NULL ); SfxObjectShell* pObjShell = pViewFrame->GetObjectShell(); - aDeleteButton.Enable( bEnable!= false && !pObjShell->IsReadOnly() ); - aOpenButton.Enable( bEnable!= false ); - aViewButton.Enable( bEnable!= false ); + m_pDeleteButton->Enable( bEnable!= false && !pObjShell->IsReadOnly() ); + m_pOpenButton->Enable( bEnable!= false ); + m_pViewButton->Enable( bEnable!= false ); const SfxPoolItem *pDummy=NULL; SfxItemState eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_MERGE, pDummy ); eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_COMPARE, pDummy ); - aCompareButton.Enable( bEnable!= false && eState >= SFX_ITEM_AVAILABLE ); + m_pCompareButton->Enable( bEnable!= false && eState >= SFX_ITEM_AVAILABLE ); return 0L; } @@ -365,13 +390,13 @@ IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl) IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton ) { SfxObjectShell *pObjShell = pViewFrame->GetObjectShell(); - SvTreeListEntry *pEntry = aVersionBox.FirstSelected(); + SvTreeListEntry *pEntry = m_pVersionBox->FirstSelected(); - if ( pButton == &aSaveCheckBox ) + if (pButton == m_pSaveCheckBox) { - mbIsSaveVersionOnClose = aSaveCheckBox.IsChecked(); + m_bIsSaveVersionOnClose = m_pSaveCheckBox->IsChecked(); } - else if ( pButton == &aSaveButton ) + else if (pButton == m_pSaveButton) { SfxVersionInfo aInfo; aInfo.aAuthor = SvtUserOptions().GetFullName(); @@ -385,38 +410,38 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton ) aItems[0] = &aComment; aItems[1] = NULL; pViewFrame->GetBindings().ExecuteSynchron( SID_SAVEDOC, aItems, 0 ); - aVersionBox.SetUpdateMode( sal_False ); - aVersionBox.Clear(); + m_pVersionBox->SetUpdateMode( sal_False ); + m_pVersionBox->Clear(); Init_Impl(); - aVersionBox.SetUpdateMode( sal_True ); + m_pVersionBox->SetUpdateMode( sal_True ); } delete pDlg; } - if ( pButton == &aDeleteButton && pEntry ) + if (pButton == m_pDeleteButton && pEntry) { pObjShell->GetMedium()->RemoveVersion_Impl( ((SfxVersionInfo*) pEntry->GetUserData())->aName ); pObjShell->SetModified( sal_True ); - aVersionBox.SetUpdateMode( sal_False ); - aVersionBox.Clear(); + m_pVersionBox->SetUpdateMode( sal_False ); + m_pVersionBox->Clear(); Init_Impl(); - aVersionBox.SetUpdateMode( sal_True ); + m_pVersionBox->SetUpdateMode( sal_True ); } - else if ( pButton == &aOpenButton && pEntry ) + else if (pButton == m_pOpenButton && pEntry) { Open_Impl(); } - else if ( pButton == &aViewButton && pEntry ) + else if (pButton == m_pViewButton && pEntry) { SfxVersionInfo* pInfo = (SfxVersionInfo*) pEntry->GetUserData(); SfxViewVersionDialog_Impl* pDlg = new SfxViewVersionDialog_Impl(this, *pInfo, false); pDlg->Execute(); delete pDlg; } - else if ( pEntry && pButton == &aCompareButton ) + else if (pEntry && pButton == m_pCompareButton) { SfxAllItemSet aSet( pObjShell->GetPool() ); - sal_uIntPtr nPos = aVersionBox.GetModel()->GetRelPos( pEntry ); + sal_uIntPtr nPos = m_pVersionBox->GetModel()->GetRelPos( pEntry ); aSet.Put( SfxInt16Item( SID_VERSION, (short)nPos+1 ) ); aSet.Put( SfxStringItem( SID_FILE_NAME, pObjShell->GetMedium()->GetName() ) ); @@ -447,7 +472,7 @@ SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(Window *pParent, SfxVersion get(m_pCloseButton, "close"); const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); - m_pDateTimeText->SetText(m_pDateTimeText->GetText() + ConvertDateTime_Impl(rInfo.aCreationDate, rLocaleWrapper)); + m_pDateTimeText->SetText(m_pDateTimeText->GetText() + formatTime(rInfo.aCreationDate, rLocaleWrapper)); m_pSavedByText->SetText(m_pSavedByText->GetText() + rInfo.aAuthor); m_pEdit->SetText(rInfo.aComment); m_pEdit->set_height_request(7 * m_pEdit->GetTextHeight()); diff --git a/sfx2/source/dialog/versdlg.hrc b/sfx2/source/dialog/versdlg.hrc deleted file mode 100644 index 3745a586b56b..000000000000 --- a/sfx2/source/dialog/versdlg.hrc +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <dialog.hrc> - -#define GB_NEWVERSIONS 1 -#define PB_SAVE 2 -#define CB_SAVEONCLOSE 3 -#define TLB_VERSIONS 4 -#define PB_DELETE 5 -#define PB_OPEN 6 -#define PB_HELP 7 -#define PB_CLOSE 8 -#define GB_OLDVERSIONS 9 -#define FT_DATETIME 10 -#define FT_SAVEDBY 11 -#define FT_COMMENTS 12 -#define PB_VIEW 13 -#define ME_VERSIONS 14 -#define PB_OK 15 -#define PB_CANCEL 16 -#define PB_COMPARE 17 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/versdlg.src b/sfx2/source/dialog/versdlg.src index 5b02a4b90a9b..63471ac02c89 100644 --- a/sfx2/source/dialog/versdlg.src +++ b/sfx2/source/dialog/versdlg.src @@ -17,115 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "versdlg.hrc" -ModalDialog DLG_VERSIONS -{ - HelpID = "sfx2:ModalDialog:DLG_VERSIONS"; - OutputSize = TRUE ; - Size = MAP_APPFONT ( 340 , 184 ) ; - SvLook = TRUE ; - Moveable = TRUE ; - FixedLine GB_NEWVERSIONS - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 272 , 8 ) ; - Text [ en-US ] = "New versions" ; - }; - PushButton PB_SAVE - { - HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_SAVE"; - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 90 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Save ~New Version" ; - }; - CheckBox CB_SAVEONCLOSE - { - HelpID = "sfx2:CheckBox:DLG_VERSIONS:CB_SAVEONCLOSE"; - Pos = MAP_APPFONT ( 108 , 16 ) ; - Size = MAP_APPFONT ( 164 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Always save a version on closing" ; - }; - FixedLine GB_OLDVERSIONS - { - Pos = MAP_APPFONT ( 6 , 34 ) ; - Size = MAP_APPFONT ( 272 , 8 ) ; - Text [ en-US ] = "Existing versions" ; - }; - FixedText FT_DATETIME - { - Pos = MAP_APPFONT ( 15 , 45 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text [ en-US ] = "Date and time" ; - }; - FixedText FT_SAVEDBY - { - Pos = MAP_APPFONT ( 76 , 45 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text [ en-US ] = "Saved by" ; - }; - FixedText FT_COMMENTS - { - Pos = MAP_APPFONT ( 138 , 45 ) ; - Size = MAP_APPFONT ( 60 , 10 ) ; - Text [ en-US ] = "Comments" ; - }; - Control TLB_VERSIONS - { - Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 58 ) ; - Size = MAP_APPFONT ( 260 , 114 ) ; - TabStop = TRUE ; - }; - CancelButton PB_CLOSE - { - Pos = MAP_APPFONT ( 284 , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Close" ; - }; - PushButton PB_OPEN - { - HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_OPEN"; - Pos = MAP_APPFONT ( 284 , 26 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Open" ; - }; - PushButton PB_VIEW - { - HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_VIEW"; - Pos = MAP_APPFONT ( 284 , 43 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - Text [ en-US ] = "~Show..." ; - }; - PushButton PB_DELETE - { - HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_DELETE"; - Pos = MAP_APPFONT ( 284 , 60 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Delete" ; - }; - PushButton PB_COMPARE - { - HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_COMPARE"; - Pos = MAP_APPFONT ( 284 , 77 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Compare" ; - }; - HelpButton PB_HELP - { - Pos = MAP_APPFONT ( 284 , 97 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - Text [ en-US ] = "Versions of" ; -}; +#include "dialog.hrc" + String STR_VIEWVERSIONCOMMENT { Text [ en-US ] = "View Version Comment" ; diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index 1853a3d864ed..bdb30c2c0170 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -20,56 +20,52 @@ #ifndef _VERSDLG_HXX #define _VERSDLG_HXX +#include <sfx2/basedlgs.hxx> +#include <svtools/simptabl.hxx> +#include <svtools/svmedit.hxx> +#include <svtools/svtabbx.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> -#include <svtools/svtabbx.hxx> -#include <svtools/svmedit.hxx> -#include <sfx2/basedlgs.hxx> class SfxViewFrame; struct SfxVersionInfo; -class SfxVersionsTabListBox_Impl : public SvTabListBox +class SfxVersionsTabListBox_Impl : public SvSimpleTable { - virtual void KeyInput( const KeyEvent& rKeyEvent ); - public: - SfxVersionsTabListBox_Impl( - Window* pParent, const ResId& ); + SfxVersionsTabListBox_Impl(SvSimpleTableContainer& rParent, WinBits nBits) + : SvSimpleTable(rParent, nBits) + { + } + void setColSizes(); + virtual void Resize(); + virtual void KeyInput(const KeyEvent& rKeyEvent); }; class SfxVersionTableDtor; class SfxVersionDialog : public SfxModalDialog { - FixedLine aNewGroup; - PushButton aSaveButton; - CheckBox aSaveCheckBox; - FixedLine aExistingGroup; - FixedText aDateTimeText; - FixedText aSavedByText; - FixedText aCommentText; - SfxVersionsTabListBox_Impl aVersionBox; - CancelButton aCloseButton; - PushButton aOpenButton; - PushButton aViewButton; - PushButton aDeleteButton; - PushButton aCompareButton; - HelpButton aHelpButton; + PushButton* m_pSaveButton; + CheckBox* m_pSaveCheckBox; + SfxVersionsTabListBox_Impl* m_pVersionBox; + PushButton* m_pOpenButton; + PushButton* m_pViewButton; + PushButton* m_pDeleteButton; + PushButton* m_pCompareButton; SfxViewFrame* pViewFrame; - SfxVersionTableDtor* mpTable; - sal_Bool mbIsSaveVersionOnClose; + SfxVersionTableDtor* m_pTable; + bool m_bIsSaveVersionOnClose; DECL_LINK(DClickHdl_Impl, void *); DECL_LINK(SelectHdl_Impl, void *); DECL_LINK( ButtonHdl_Impl, Button* ); void Init_Impl(); void Open_Impl(); - void RecalcDateColumn(); public: SfxVersionDialog ( SfxViewFrame* pFrame, sal_Bool ); virtual ~SfxVersionDialog (); - sal_Bool IsSaveVersionOnClose() const { return mbIsSaveVersionOnClose; } + bool IsSaveVersionOnClose() const { return m_bIsSaveVersionOnClose; } }; class SfxViewVersionDialog_Impl : public SfxModalDialog diff --git a/sfx2/uiconfig/ui/versionsofdialog.ui b/sfx2/uiconfig/ui/versionsofdialog.ui new file mode 100644 index 000000000000..00d197f374af --- /dev/null +++ b/sfx2/uiconfig/ui/versionsofdialog.ui @@ -0,0 +1,321 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.6 --> + <!-- interface-requires LibreOffice 1.0 --> + <object class="GtkDialog" id="VersionsOfDialog"> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkBox" id="dialog-vbox1"> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child internal-child="action_area"> + <object class="GtkButtonBox" id="dialog-action_area1"> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="layout_style">start</property> + <child> + <object class="GtkButton" id="close"> + <property name="label">gtk-close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="open"> + <property name="label">gtk-open</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="show"> + <property name="label" translatable="yes">_Show...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="delete"> + <property name="label">gtk-delete</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="compare"> + <property name="label" translatable="yes">_Compare</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="help"> + <property name="label">gtk-help</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + <property name="secondary">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">12</property> + <child> + <object class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkButton" id="save"> + <property name="label" translatable="yes">Save _New Version</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="always"> + <property name="label" translatable="yes">_Always save a new version on closing</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">New versions</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="spacing">12</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkLabel" id="datetime"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes">Date and time</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="savedby"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes">Saved by</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="comments"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes">Comments</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="svtlo-SvSimpleTableContainer" id="versions"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Simple Table Container-selection1"/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Existing versions</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="0">close</action-widget> + <action-widget response="0">open</action-widget> + <action-widget response="0">show</action-widget> + <action-widget response="0">delete</action-widget> + <action-widget response="0">compare</action-widget> + <action-widget response="0">help</action-widget> + </action-widgets> + </object> +</interface> diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index df2608568940..89456ecae3d0 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -96,6 +96,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/contnr/imivctl1 \ svtools/source/contnr/imivctl2 \ svtools/source/contnr/ivctrl \ + svtools/source/contnr/simptabl \ svtools/source/contnr/svimpbox \ svtools/source/contnr/svlbitm \ svtools/source/contnr/svtabbx \ diff --git a/svx/source/dialog/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 46f308d86a6b..0ed3872da4d7 100644 --- a/svx/source/dialog/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -17,42 +17,41 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/simptabl.hxx> -#include <vcl/builder.hxx> -#include <vcl/svapp.hxx> - #include <comphelper/processfactory.hxx> -#include <unotools/intlwrapper.hxx> +#include <svtools/simptabl.hxx> #include <svtools/svlbitm.hxx> -#include "svtools/treelistentry.hxx" +#include <svtools/treelistentry.hxx> +#include <unotools/intlwrapper.hxx> +#include <vcl/builder.hxx> +#include <vcl/svapp.hxx> -// SvxSimpleTableContainer ------------------------------------------------------ +// SvSimpleTableContainer ------------------------------------------------------ -SvxSimpleTableContainer::SvxSimpleTableContainer(Window* pParent, const ResId& rResId) +SvSimpleTableContainer::SvSimpleTableContainer(Window* pParent, const ResId& rResId) : Control(pParent, rResId) , m_pTable(NULL) { SetBorderStyle(WINDOW_BORDER_NOBORDER); } -SvxSimpleTableContainer::SvxSimpleTableContainer(Window* pParent, WinBits nBits) +SvSimpleTableContainer::SvSimpleTableContainer(Window* pParent, WinBits nBits) : Control(pParent, nBits) , m_pTable(NULL) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxSimpleTableContainer(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvSimpleTableContainer(Window *pParent, VclBuilder::stringmap &) { - return new SvxSimpleTableContainer(pParent); + return new SvSimpleTableContainer(pParent, WB_TABSTOP); } -void SvxSimpleTableContainer::SetTable(SvxSimpleTable* pTable) +void SvSimpleTableContainer::SetTable(SvSimpleTable* pTable) { m_pTable = pTable; } -long SvxSimpleTableContainer::PreNotify( NotifyEvent& rNEvt ) +long SvSimpleTableContainer::PreNotify( NotifyEvent& rNEvt ) { long nResult = sal_True; if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -72,23 +71,23 @@ long SvxSimpleTableContainer::PreNotify( NotifyEvent& rNEvt ) return nResult; } -void SvxSimpleTableContainer::Resize() +void SvSimpleTableContainer::Resize() { Control::Resize(); if (m_pTable) m_pTable->UpdateViewSize(); } -void SvxSimpleTableContainer::GetFocus() +void SvSimpleTableContainer::GetFocus() { Control::GetFocus(); if (m_pTable) m_pTable->GrabFocus(); } -// SvxSimpleTable ------------------------------------------------------------ +// SvSimpleTable ------------------------------------------------------------ -SvxSimpleTable::SvxSimpleTable(SvxSimpleTableContainer& rParent, WinBits nBits): +SvSimpleTable::SvSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits): SvHeaderTabListBox(&rParent, nBits | WB_CLIPCHILDREN | WB_HSCROLL | WB_TABSTOP), m_rParentTableContainer(rParent), aHeaderBar(&rParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP), @@ -102,11 +101,11 @@ SvxSimpleTable::SvxSimpleTable(SvxSimpleTableContainer& rParent, WinBits nBits): nSortCol=0xFFFF; nOldPos=0; - aHeaderBar.SetStartDragHdl(LINK( this, SvxSimpleTable, StartDragHdl)); - aHeaderBar.SetDragHdl(LINK( this, SvxSimpleTable, DragHdl)); - aHeaderBar.SetEndDragHdl(LINK( this, SvxSimpleTable, EndDragHdl)); - aHeaderBar.SetSelectHdl(LINK( this, SvxSimpleTable, HeaderBarClick)); - aHeaderBar.SetDoubleClickHdl(LINK( this, SvxSimpleTable, HeaderBarDblClick)); + aHeaderBar.SetStartDragHdl(LINK( this, SvSimpleTable, StartDragHdl)); + aHeaderBar.SetDragHdl(LINK( this, SvSimpleTable, DragHdl)); + aHeaderBar.SetEndDragHdl(LINK( this, SvSimpleTable, EndDragHdl)); + aHeaderBar.SetSelectHdl(LINK( this, SvSimpleTable, HeaderBarClick)); + aHeaderBar.SetDoubleClickHdl(LINK( this, SvSimpleTable, HeaderBarDblClick)); EnableCellFocus(); DisableTransientChildren(); @@ -118,12 +117,12 @@ SvxSimpleTable::SvxSimpleTable(SvxSimpleTableContainer& rParent, WinBits nBits): SvHeaderTabListBox::Show(); } -SvxSimpleTable::~SvxSimpleTable() +SvSimpleTable::~SvSimpleTable() { m_rParentTableContainer.SetTable(NULL); } -void SvxSimpleTable::UpdateViewSize() +void SvSimpleTable::UpdateViewSize() { Size theWinSize=m_rParentTableContainer.GetOutputSizePixel(); Size HbSize=aHeaderBar.GetSizePixel(); @@ -141,7 +140,7 @@ void SvxSimpleTable::UpdateViewSize() Invalidate(); } -void SvxSimpleTable::NotifyScrolled() +void SvSimpleTable::NotifyScrolled() { long nOffset=-GetXOffset(); if(nOldPos!=nOffset) @@ -154,7 +153,7 @@ void SvxSimpleTable::NotifyScrolled() SvHeaderTabListBox::NotifyScrolled(); } -void SvxSimpleTable::SetTabs() +void SvSimpleTable::SetTabs() { SvHeaderTabListBox::SetTabs(); @@ -176,12 +175,12 @@ void SvxSimpleTable::SetTabs() } } -void SvxSimpleTable::SetTabs( long* pTabs, MapUnit eMapUnit) +void SvSimpleTable::SetTabs( long* pTabs, MapUnit eMapUnit) { SvHeaderTabListBox::SetTabs(pTabs,eMapUnit); } -void SvxSimpleTable::Paint( const Rectangle& rRect ) +void SvSimpleTable::Paint( const Rectangle& rRect ) { SvHeaderTabListBox::Paint(rRect ); @@ -209,7 +208,7 @@ void SvxSimpleTable::Paint( const Rectangle& rRect ) } bPaintFlag=sal_True; } -void SvxSimpleTable::InsertHeaderEntry(const OUString& rText, +void SvSimpleTable::InsertHeaderEntry(const OUString& rText, sal_uInt16 nCol, HeaderBarItemBits nBits) { sal_Int32 nEnd = rText.indexOf( sal_Unicode( '\t' ) ); @@ -230,47 +229,47 @@ void SvxSimpleTable::InsertHeaderEntry(const OUString& rText, SetTabs(); } -void SvxSimpleTable::ClearHeader() +void SvSimpleTable::ClearHeader() { aHeaderBar.Clear(); } -void SvxSimpleTable::ShowTable() +void SvSimpleTable::ShowTable() { m_rParentTableContainer.Show(); } -void SvxSimpleTable::HideTable() +void SvSimpleTable::HideTable() { m_rParentTableContainer.Hide(); } -sal_Bool SvxSimpleTable::IsVisible() const +sal_Bool SvSimpleTable::IsVisible() const { return m_rParentTableContainer.IsVisible(); } -void SvxSimpleTable::EnableTable() +void SvSimpleTable::EnableTable() { m_rParentTableContainer.Enable(); } -void SvxSimpleTable::DisableTable() +void SvSimpleTable::DisableTable() { m_rParentTableContainer.Disable(); } -sal_Bool SvxSimpleTable::IsEnabled() const +sal_Bool SvSimpleTable::IsEnabled() const { return m_rParentTableContainer.IsEnabled(); } -sal_uInt16 SvxSimpleTable::GetSelectedCol() +sal_uInt16 SvSimpleTable::GetSelectedCol() { return (aHeaderBar.GetCurItemId()-1); } -void SvxSimpleTable::SortByCol(sal_uInt16 nCol,sal_Bool bDir) +void SvSimpleTable::SortByCol(sal_uInt16 nCol,sal_Bool bDir) { bSortDirection=bDir; if(nSortCol!=0xFFFF) @@ -289,7 +288,7 @@ void SvxSimpleTable::SortByCol(sal_uInt16 nCol,sal_Bool bDir) GetModel()->SetSortMode(SortDescending); } nSortCol=nCol; - GetModel()->SetCompareHdl( LINK( this, SvxSimpleTable, CompareHdl)); + GetModel()->SetCompareHdl( LINK( this, SvSimpleTable, CompareHdl)); GetModel()->Resort(); } else @@ -297,7 +296,7 @@ void SvxSimpleTable::SortByCol(sal_uInt16 nCol,sal_Bool bDir) nSortCol=nCol; } -void SvxSimpleTable::HBarClick() +void SvSimpleTable::HBarClick() { sal_uInt16 nId=aHeaderBar.GetCurItemId(); @@ -316,12 +315,12 @@ void SvxSimpleTable::HBarClick() } } -void SvxSimpleTable::HBarDblClick() +void SvSimpleTable::HBarDblClick() { aHeaderBarDblClickLink.Call(this); } -void SvxSimpleTable::HBarStartDrag() +void SvSimpleTable::HBarStartDrag() { if(!aHeaderBar.IsItemMode()) { @@ -332,7 +331,7 @@ void SvxSimpleTable::HBarStartDrag() ShowTracking( aSizeRect, SHOWTRACK_SPLIT ); } } -void SvxSimpleTable::HBarDrag() +void SvSimpleTable::HBarDrag() { HideTracking(); if(!aHeaderBar.IsItemMode()) @@ -344,7 +343,7 @@ void SvxSimpleTable::HBarDrag() ShowTracking( aSizeRect, SHOWTRACK_SPLIT ); } } -void SvxSimpleTable::HBarEndDrag() +void SvSimpleTable::HBarEndDrag() { HideTracking(); sal_uInt16 nPrivTabCount=TabCount(); @@ -368,19 +367,19 @@ void SvxSimpleTable::HBarEndDrag() Update(); } -CommandEvent SvxSimpleTable::GetCommandEvent() const +CommandEvent SvSimpleTable::GetCommandEvent() const { return aCEvt; } -void SvxSimpleTable::Command( const CommandEvent& rCEvt ) +void SvSimpleTable::Command( const CommandEvent& rCEvt ) { aCEvt=rCEvt; aCommandLink.Call(this); SvHeaderTabListBox::Command(rCEvt); } -IMPL_LINK( SvxSimpleTable, StartDragHdl, HeaderBar*, pCtr) +IMPL_LINK( SvSimpleTable, StartDragHdl, HeaderBar*, pCtr) { if(pCtr==&aHeaderBar) { @@ -389,7 +388,7 @@ IMPL_LINK( SvxSimpleTable, StartDragHdl, HeaderBar*, pCtr) return 0; } -IMPL_LINK( SvxSimpleTable, DragHdl, HeaderBar*, pCtr) +IMPL_LINK( SvSimpleTable, DragHdl, HeaderBar*, pCtr) { if(pCtr==&aHeaderBar) { @@ -398,7 +397,7 @@ IMPL_LINK( SvxSimpleTable, DragHdl, HeaderBar*, pCtr) return 0; } -IMPL_LINK( SvxSimpleTable, EndDragHdl, HeaderBar*, pCtr) +IMPL_LINK( SvSimpleTable, EndDragHdl, HeaderBar*, pCtr) { if(pCtr==&aHeaderBar) { @@ -407,7 +406,7 @@ IMPL_LINK( SvxSimpleTable, EndDragHdl, HeaderBar*, pCtr) return 0; } -IMPL_LINK( SvxSimpleTable, HeaderBarClick, HeaderBar*, pCtr) +IMPL_LINK( SvSimpleTable, HeaderBarClick, HeaderBar*, pCtr) { if(pCtr==&aHeaderBar) { @@ -416,7 +415,7 @@ IMPL_LINK( SvxSimpleTable, HeaderBarClick, HeaderBar*, pCtr) return 0; } -IMPL_LINK( SvxSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr) +IMPL_LINK( SvSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr) { if(pCtr==&aHeaderBar) { @@ -425,7 +424,7 @@ IMPL_LINK( SvxSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr) return 0; } -SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const +SvLBoxItem* SvSimpleTable::GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 nPos ) const { DBG_ASSERT(pEntry,"GetEntryText:Invalid Entry"); SvLBoxItem* pItem = NULL; @@ -446,7 +445,7 @@ SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvTreeListEntry* pEntry, sal_uInt16 n return pItem; } -StringCompare SvxSimpleTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* pRight) +StringCompare SvSimpleTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* pRight) { StringCompare eCompare=COMPARE_EQUAL; @@ -474,12 +473,11 @@ StringCompare SvxSimpleTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* return eCompare; } -IMPL_LINK( SvxSimpleTable, CompareHdl, SvSortData*, pData) +IMPL_LINK( SvSimpleTable, CompareHdl, SvSortData*, pData) { SvTreeListEntry* pLeft = (SvTreeListEntry*)(pData->pLeft ); SvTreeListEntry* pRight = (SvTreeListEntry*)(pData->pRight ); return (long) ColCompare(pLeft,pRight); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 299768d56e64..4b70cd44d1f6 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -94,7 +94,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/dialog/dlgutil \ svx/source/dialog/framelink \ svx/source/dialog/langbox \ - svx/source/dialog/simptabl \ svx/source/dialog/stddlg \ svx/source/dialog/svxdlg \ svx/source/engine3d/camera3d \ diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index d6c2a9270f58..4b3106175a83 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -127,8 +127,8 @@ void SvLBoxColorString::Paint( // class SvxRedlinTable //---------------------------------------------------------------------------- -SvxRedlinTable::SvxRedlinTable(SvxSimpleTableContainer& rParent,WinBits nBits) - : SvxSimpleTable(rParent,nBits), +SvxRedlinTable::SvxRedlinTable(SvSimpleTableContainer& rParent,WinBits nBits) + : SvSimpleTable(rParent,nBits), aDaTiFirst( DateTime::EMPTY ), aDaTiLast( DateTime::EMPTY ), aDaTiFilterFirst( DateTime::EMPTY ), @@ -178,11 +178,11 @@ StringCompare SvxRedlinTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* } } else - eCompare=SvxSimpleTable::ColCompare(pLeft,pRight); + eCompare=SvSimpleTable::ColCompare(pLeft,pRight); } else { - eCompare=SvxSimpleTable::ColCompare(pLeft,pRight); + eCompare=SvSimpleTable::ColCompare(pLeft,pRight); } } @@ -392,7 +392,7 @@ SvTreeListEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUse else aCurEntry.Erase(); - return SvxSimpleTable::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData ); + return SvSimpleTable::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData ); } @@ -414,7 +414,7 @@ SvTreeListEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUse else aCurEntry.Erase(); - return SvxSimpleTable::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData ); + return SvSimpleTable::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData ); } SvTreeListEntry* SvxRedlinTable::CreateEntry() const @@ -483,7 +483,7 @@ SvxTPView::SvxTPView(Window * pParent) pTopLevel->get(m_pRejectAll, "rejectall"); pTopLevel->get(m_pUndo, "undo"); - SvxSimpleTableContainer* pTable = get<SvxSimpleTableContainer>("changes"); + SvSimpleTableContainer* pTable = get<SvSimpleTableContainer>("changes"); Size aControlSize(221, 65); aControlSize = LogicToPixel(aControlSize, MAP_APPFONT); pTable->set_width_request(aControlSize.Width()); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 29ecb5288df4..dc1e62cb5522 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -892,8 +892,8 @@ void RecovDocListEntry::Paint( } } //=============================================== -RecovDocList::RecovDocList(SvxSimpleTableContainer& rParent, ResMgr &rResMgr) - : SvxSimpleTable ( rParent ) +RecovDocList::RecovDocList(SvSimpleTableContainer& rParent, ResMgr &rResMgr) + : SvSimpleTable ( rParent ) , m_aGreenCheckImg ( ResId(IMG_GREENCHECK, rResMgr ) ) , m_aYellowCheckImg ( ResId(IMG_YELLOWCHECK, rResMgr ) ) , m_aRedCrossImg ( ResId(IMG_REDCROSS, rResMgr ) ) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index e41f41031822..5f05502cb4f8 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -3148,7 +3148,7 @@ namespace svxform { static long aStaticTabs[]= { 3, 0, 35, 200 }; - m_aNamespacesList.SvxSimpleTable::SetTabs( aStaticTabs ); + m_aNamespacesList.SvSimpleTable::SetTabs( aStaticTabs ); String sHeader = String( SVX_RES( STR_HEADER_PREFIX ) ); sHeader += '\t'; sHeader += String( SVX_RES( STR_HEADER_URL ) ); @@ -3174,7 +3174,7 @@ namespace svxform } //------------------------------------------------------------------------ - IMPL_LINK( NamespaceItemDialog, SelectHdl, SvxSimpleTable *, EMPTYARG ) + IMPL_LINK( NamespaceItemDialog, SelectHdl, SvSimpleTable *, EMPTYARG ) { sal_Bool bEnable = ( m_aNamespacesList.FirstSelected() != NULL ); m_aEditNamespaceBtn.Enable( bEnable ); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index e12630733add..d7f1b3b9509b 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -28,11 +28,13 @@ #include <vcl/tabpage.hxx> #include <vcl/toolbox.hxx> #include <svtools/inettbc.hxx> +#include <svtools/simptabl.hxx> #include <svtools/svmedit.hxx> #include <svtools/treelistbox.hxx> #include <sfx2/dockwin.hxx> +#include <sfx2/childwin.hxx> #include <sfx2/ctrlitem.hxx> -#include <svx/simptabl.hxx> +#include <svx/svxdllapi.h> #include <rtl/ref.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XContainer.hpp> @@ -408,8 +410,8 @@ namespace svxform typedef std::vector< OUString > PrefixList; FixedText m_aNamespacesFT; - SvxSimpleTableContainer m_aNamespacesListContainer; - SvxSimpleTable m_aNamespacesList; + SvSimpleTableContainer m_aNamespacesListContainer; + SvSimpleTable m_aNamespacesList; PushButton m_aAddNamespaceBtn; PushButton m_aEditNamespaceBtn; PushButton m_aDeleteNamespaceBtn; @@ -423,7 +425,7 @@ namespace svxform XNameContainer_ref& m_rNamespaces; - DECL_LINK( SelectHdl, SvxSimpleTable * ); + DECL_LINK( SelectHdl, SvSimpleTable * ); DECL_LINK( ClickHdl, PushButton * ); DECL_LINK(OKHdl, void *); diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 1c0358003830..1e3beaaf60e5 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -20,15 +20,16 @@ #ifndef _SVX_DOCRECOVERY_HXX #define _SVX_DOCRECOVERY_HXX -#include <vcl/tabpage.hxx> -#include <vcl/tabdlg.hxx> #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> +#include <vcl/lstbox.hxx> +#include <vcl/tabdlg.hxx> +#include <vcl/tabpage.hxx> +#include <svtools/simptabl.hxx> +#include <svtools/svlbitm.hxx> #include <svtools/svmedit2.hxx> #include <svtools/treelistbox.hxx> -#include <svtools/svlbitm.hxx> -#include <svx/simptabl.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> @@ -556,7 +557,7 @@ public: }; //=============================================== -class RecovDocList : public SvxSimpleTable +class RecovDocList : public SvSimpleTable { //------------------------------------------- // member @@ -578,7 +579,7 @@ class RecovDocList : public SvxSimpleTable //--------------------------------------- /** @short TODO */ - RecovDocList(SvxSimpleTableContainer& rParent, ResMgr& rResMgr); + RecovDocList(SvSimpleTableContainer& rParent, ResMgr& rResMgr); //--------------------------------------- /** @short TODO */ virtual ~RecovDocList(); @@ -606,7 +607,7 @@ class RecoveryDialog : public IExtendedTabPage FixedText m_aProgressFT; Window m_aProgrParent; FixedText m_aFileListFT; - SvxSimpleTableContainer m_aFileListLBContainer; + SvSimpleTableContainer m_aFileListLBContainer; RecovDocList m_aFileListLB; FixedLine m_aBottomFL; PushButton m_aNextBtn; diff --git a/svx/uiconfig/ui/redlineviewpage.ui b/svx/uiconfig/ui/redlineviewpage.ui index 2d817e9f3825..f7146f971e4e 100644 --- a/svx/uiconfig/ui/redlineviewpage.ui +++ b/svx/uiconfig/ui/redlineviewpage.ui @@ -82,7 +82,7 @@ </packing> </child> <child> - <object class="svxcorelo-SvxSimpleTableContainer" id="changes"> + <object class="svtlo-SvSimpleTableContainer" id="changes"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 1dd39458f0cb..20fa51c7833b 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -28,15 +28,15 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> +#include <svtools/simptabl.hxx> +#include <svtools/treelistentry.hxx> #include <svx/dialogs.hrc> #include <svx/svxdlg.hxx> #include <svx/flagsdef.hxx> -#include <svx/simptabl.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> #include <svtools/indexentryres.hxx> -#include "svtools/treelistentry.hxx" #include <editeng/unolingu.hxx> #include <column.hxx> #include <fmtfsize.hxx> diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index d1fb135d7e40..f1276fa4a1f9 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -166,6 +166,7 @@ #define SV_BUTTONTEXT_GO_UP 10124 #define SV_BUTTONTEXT_GO_DOWN 10125 #define SV_BUTTONTEXT_CLEAR 10126 +#define SV_BUTTONTEXT_OPEN 10127 #define SV_STDTEXT_FIRST SV_STDTEXT_SERVICENOTAVAILABLE #define SV_STDTEXT_SERVICENOTAVAILABLE 10210 diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src index 8d84b7a4d22b..f4c5ae8a19c1 100644 --- a/vcl/source/src/btntext.src +++ b/vcl/source/src/btntext.src @@ -126,6 +126,11 @@ String SV_BUTTONTEXT_SAVE Text [ en-US ] = "~Save"; }; +String SV_BUTTONTEXT_OPEN +{ + Text [ en-US ] = "~Open"; +}; + String SV_BUTTONTEXT_UNDO { Text [ en-US ] = "~Undo" ; diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 7dd2f3c39710..8fa72eeab255 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -593,6 +593,8 @@ namespace return (VclResId(SV_BUTTONTEXT_APPLY).toString()); else if (rType == "gtk-save") return (VclResId(SV_BUTTONTEXT_SAVE).toString()); + else if (rType == "gtk-open") + return (VclResId(SV_BUTTONTEXT_OPEN).toString()); else if (rType == "gtk-undo") return (VclResId(SV_BUTTONTEXT_UNDO).toString()); else if (rType == "gtk-paste") diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index 51544c59a26b..3904b717e18d 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -20,10 +20,10 @@ #ifndef _XMLSECURITY_CERTIFICATECHOOSER_HXX #define _XMLSECURITY_CERTIFICATECHOOSER_HXX +#include <svtools/simptabl.hxx> #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/button.hxx> -#include <svx/simptabl.hxx> namespace com { namespace sun { @@ -47,7 +47,7 @@ private: css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > maCerts; SignatureInformations maCertsToIgnore; - SvxSimpleTable* m_pCertLB; + SvSimpleTable* m_pCertLB; PushButton* m_pViewBtn; OKButton* m_pOKBtn; diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index 78c6eb2e5f1a..540b1288a8e2 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -26,8 +26,8 @@ #include <vcl/tabdlg.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> +#include <svtools/simptabl.hxx> #include <svtools/stdctrl.hxx> -#include <svx/simptabl.hxx> #include <svtools/svmedit.hxx> namespace com { @@ -101,8 +101,8 @@ public: class CertificateViewerDetailsTP : public CertificateViewerTP { private: - SvxSimpleTableContainer m_aElementsLBContainer; - SvxSimpleTable maElementsLB; + SvSimpleTableContainer m_aElementsLBContainer; + SvSimpleTable maElementsLB; MultiLineEdit maElementML; Font maStdFont; Font maFixedWidthFont; diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx index 3ca9f757a601..d8423fcc3572 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx @@ -23,8 +23,8 @@ #include <vcl/dialog.hxx> #include <vcl/fixed.hxx> #include <vcl/button.hxx> +#include <svtools/simptabl.hxx> #include <svtools/stdctrl.hxx> -#include <svx/simptabl.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <xmlsecurity/documentsignaturehelper.hxx> @@ -70,7 +70,7 @@ private: FixedText* m_pHintDocFT; FixedText* m_pHintBasicFT; FixedText* m_pHintPackageFT; - SvxSimpleTable* m_pSignaturesLB; + SvSimpleTable* m_pSignaturesLB; FixedImage* m_pSigsValidImg; FixedText* m_pSigsValidFI; FixedImage* m_pSigsInvalidImg; diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 1136224279db..4a5ed900c6e2 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -26,8 +26,8 @@ #include <vcl/tabdlg.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabpage.hxx> +#include <svtools/simptabl.hxx> #include <svtools/stdctrl.hxx> -#include <svx/simptabl.hxx> #include <unotools/securityoptions.hxx> namespace com { @@ -112,7 +112,7 @@ class MacroSecurityTrustedSourcesTP : public MacroSecurityTP { private: FixedImage* m_pTrustCertROFI; - SvxSimpleTable* m_pTrustCertLB; + SvSimpleTable* m_pTrustCertLB; PushButton* m_pViewCertPB; PushButton* m_pRemoveCertPB; FixedImage* m_pTrustFileROFI; diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 28613293f4b2..d339cde84220 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -58,11 +58,11 @@ CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::X Size aControlSize(275, 122); const long nControlWidth = aControlSize.Width(); aControlSize = LogicToPixel(aControlSize, MAP_APPFONT); - SvxSimpleTableContainer *pSignatures = get<SvxSimpleTableContainer>("signatures"); + SvSimpleTableContainer *pSignatures = get<SvSimpleTableContainer>("signatures"); pSignatures->set_width_request(aControlSize.Width()); pSignatures->set_height_request(aControlSize.Height()); - m_pCertLB = new SvxSimpleTable(*pSignatures); + m_pCertLB = new SvSimpleTable(*pSignatures); static long nTabs[] = { 3, 0, 30*nControlWidth/100, 60*nControlWidth/100 }; m_pCertLB->SetTabs( &nTabs[0] ); OUStringBuffer sHeader; diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 71abab4313ae..866a0ded89f2 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -198,11 +198,11 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( Size aControlSize(275, 109); const long nControlWidth = aControlSize.Width(); aControlSize = LogicToPixel(aControlSize, MAP_APPFONT); - SvxSimpleTableContainer *pSignatures = get<SvxSimpleTableContainer>("signatures"); + SvSimpleTableContainer *pSignatures = get<SvSimpleTableContainer>("signatures"); pSignatures->set_width_request(aControlSize.Width()); pSignatures->set_height_request(aControlSize.Height()); - m_pSignaturesLB = new SvxSimpleTable(*pSignatures); + m_pSignaturesLB = new SvSimpleTable(*pSignatures); // #i48253# the tablistbox needs its own unique id m_pSignaturesLB->Window::SetUniqueId( HID_XMLSEC_TREE_SIGNATURESDLG ); static long aTabs[] = { 4, 0, 6*nControlWidth/100, 36*nControlWidth/100, 74*nControlWidth/100 }; diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 19c322811ac6..4ae1f481ab3a 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -325,21 +325,21 @@ void MacroSecurityTrustedSourcesTP::FillCertLB( void ) } } -class TrustCertLB : public SvxSimpleTable +class TrustCertLB : public SvSimpleTable { public: - TrustCertLB(SvxSimpleTableContainer &rContainer) - : SvxSimpleTable(rContainer, 0) + TrustCertLB(SvSimpleTableContainer &rContainer) + : SvSimpleTable(rContainer, 0) { } virtual void Resize() { - SvxSimpleTable::Resize(); + SvSimpleTable::Resize(); if (isInitialLayout(this)) { const long nControlWidth = GetSizePixel().Width(); long aTabLocs[] = { 3, 0, 35*nControlWidth/100, 70*nControlWidth/100 }; - SvxSimpleTable::SetTabs(aTabLocs, MAP_PIXEL); + SvSimpleTable::SetTabs(aTabLocs, MAP_PIXEL); } } }; @@ -356,7 +356,7 @@ MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(Window* _pParent, M get(m_pAddLocPB, "addfile"); get(m_pRemoveLocPB, "removefile"); - SvxSimpleTableContainer *pCertificates = get<SvxSimpleTableContainer>("certificates"); + SvSimpleTableContainer *pCertificates = get<SvSimpleTableContainer>("certificates"); m_pTrustCertLB = new TrustCertLB(*pCertificates); static long aTabs[] = { 3, 0, 0, 0 }; m_pTrustCertLB->SetTabs( aTabs ); diff --git a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui index 56d0e13a18ff..f5b7d73583dc 100644 --- a/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui +++ b/xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui @@ -76,7 +76,7 @@ </packing> </child> <child> - <object class="svxcorelo-SvxSimpleTableContainer" id="signatures"> + <object class="svtlo-SvSimpleTableContainer" id="signatures"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/xmlsecurity/uiconfig/ui/securitytrustpage.ui b/xmlsecurity/uiconfig/ui/securitytrustpage.ui index 57278801bba2..9b2cc18c4ce6 100644 --- a/xmlsecurity/uiconfig/ui/securitytrustpage.ui +++ b/xmlsecurity/uiconfig/ui/securitytrustpage.ui @@ -129,7 +129,7 @@ </packing> </child> <child> - <object class="svxcorelo-SvxSimpleTableContainer" id="certificates"> + <object class="svtlo-SvSimpleTableContainer" id="certificates"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui index 16dd3fa94708..52dbe1bc7dc0 100644 --- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui +++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui @@ -144,7 +144,7 @@ </packing> </child> <child> - <object class="svxcorelo-SvxSimpleTableContainer" id="signatures"> + <object class="svtlo-SvSimpleTableContainer" id="signatures"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> |