diff options
| author | Palenik Mihály <palenik.mihaly@gmail.com> | 2014-10-22 19:01:05 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-10-30 13:03:44 +0000 |
| commit | f92ab4da51647a4353038b1c56b70db3672c49cf (patch) | |
| tree | de37e84439aef3b3cbd08e875a58a0f36dea0697 /cui | |
| parent | 226285b7ccc0c6880ae1005c9f0d9f47aa41fc29 (diff) | |
Improve SvSimpleTable class
It is possible to order columns. This is set in Expert Configuration
dialog. The header's itembits weren't set correctly therefore mouse
click handler didn't do anything. The comparsion was slow on big
table.
Conflicts:
include/svtools/treelist.hxx
svtools/source/contnr/simptabl.cxx
Change-Id: I7e1301d40433ef45b3d0a3fb300909345ede9d4d
Reviewed-on: https://gerrit.libreoffice.org/12070
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optaboutconfig.cxx | 14 | ||||
| -rw-r--r-- | cui/source/options/optjava.cxx | 1 |
2 files changed, 5 insertions, 10 deletions
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index d66a3691c978..87321458fff1 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -38,11 +38,6 @@ using namespace com::sun::star::container; #define LONG_LEN_LIMIT 11 #define HYPER_LEN_LIMIT 20 -#define ITEMID_PREFNAME 1 -#define ITEMID_PROPERTY 2 -#define ITEMID_TYPE 3 -#define ITEMID_VALUE 4 - struct Prop_Impl { OUString Name; @@ -141,11 +136,10 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxI m_pResetBtn->SetClickHdl( LINK( this, CuiAboutConfigTabPage, ResetBtnHdl_Impl ) ); m_pPrefBox->SetDoubleClickHdl( LINK(this, CuiAboutConfigTabPage, StandardHdl_Impl) ); - HeaderBar &rBar = m_pPrefBox->GetTheHeaderBar(); - rBar.InsertItem( ITEMID_PREFNAME, get<FixedText>("preference")->GetText(), 0, HIB_LEFT | HIB_VCENTER ); - rBar.InsertItem( ITEMID_PROPERTY, get<FixedText>("property")->GetText(), 0, HIB_LEFT | HIB_VCENTER ); - rBar.InsertItem( ITEMID_TYPE, get<FixedText>("type")->GetText(), 0, HIB_LEFT | HIB_VCENTER ); - rBar.InsertItem( ITEMID_VALUE, get<FixedText>("value")->GetText(), 0, HIB_LEFT | HIB_VCENTER ); + m_pPrefBox->InsertHeaderEntry(get<FixedText>("preference")->GetText()); + m_pPrefBox->InsertHeaderEntry(get<FixedText>("property")->GetText()); + m_pPrefBox->InsertHeaderEntry(get<FixedText>("type")->GetText()); + m_pPrefBox->InsertHeaderEntry(get<FixedText>("value")->GetText()); long aTabs[] = {4,0,0,0,0}; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index cf3b2b5bcd8a..10ee78191e37 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -430,6 +430,7 @@ IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl ) m_pExpertConfigDlg->FillItemSet();//save changes if there are any } + delete m_pExpertConfigDlg; return 0; } |