mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore a11y relations and some other clean up

Browse Source 
Change-Id: Ic44d45a969bc7e4c809906a59650eab1ee37c424
This commit is contained in:
Caolán McNamara
2013-07-03 13:09:15 +01:00
parent 491bb212fa
commit a4e9c5f342
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cui/source/inc/tabstpge.hxx
View File

@@ -23,6 +23,7 @@
#include <vcl/edit.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <vcl/layout.hxx>
#include <sfx2/tabdlg.hxx>
#include <editeng/tstpitem.hxx>
@@ -94,6 +95,9 @@ private:
PushButton* m_pDelAllBtn;
PushButton* m_pDelBtn;
VclContainer* m_pTypeFrame;
VclContainer* m_pFillFrame;
// local variables, internal functions
SvxTabStop aAktTab;
SvxTabStopItem aNewTabs;

13
cui/source/tabpages/tabstpge.cxx
View File

@@ -141,6 +141,9 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAt
get(m_pDelAllBtn,"buttonBTN_DELALL");
get(m_pDelBtn,"buttonBTN_DEL");
get(m_pTypeFrame, "frameFL_TABTYPE");
get(m_pFillFrame, "frameFL_FILLCHAR");
// This page needs ExchangeSupport
SetExchangeSupport();
@@ -160,7 +163,6 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAt
m_pCenterTab->SetClickHdl( aLink );
m_pDezChar->SetLoseFocusHdl( LINK( this, SvxTabulatorTabPage, GetDezCharHdl_Impl ) );
//m_pDezChar->SetMaxTextLen(1);
m_pDezChar->Disable();
m_pDezCharLabel->Disable();
@@ -171,7 +173,6 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAt
m_pFillSolidLine->SetClickHdl( aLink );
m_pFillSpecial->SetClickHdl( aLink );
m_pFillChar->SetLoseFocusHdl( LINK( this, SvxTabulatorTabPage, GetFillCharHdl_Impl ) );
//m_pFillChar->SetMaxTextLen(1);
m_pFillChar->Disable();
m_pTabBox->SetDoubleClickHdl( LINK( this, SvxTabulatorTabPage, SelectHdl_Impl ) );
@@ -336,8 +337,8 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag )
m_pDezCharLabel->Disable();
m_pDezChar->Disable();
}
// if ( ( TABTYPE_ALL & nFlag ) == TABTYPE_ALL )
// m_pTabTypeLabel->Disable();
if ( ( TABTYPE_ALL & nFlag ) == TABTYPE_ALL )
m_pTypeFrame->Disable();
if ( ( TABFILL_NONE & nFlag ) == TABFILL_NONE )
m_pNoFillChar->Disable();
if ( ( TABFILL_POINT & nFlag ) == TABFILL_POINT )
@@ -351,8 +352,8 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag )
m_pFillSpecial->Disable();
m_pFillChar->Disable();
}
// if ( ( TABFILL_ALL & nFlag ) == TABFILL_ALL )
// m_pFillLabel->Disable();
if ( ( TABFILL_ALL & nFlag ) == TABFILL_ALL )
m_pFillFrame->Disable();
}
// -----------------------------------------------------------------------

6
cui/uiconfig/ui/paratabspage.ui
View File

@@ -416,6 +416,9 @@
<property name="xalign">0.090000003576278687</property>
<property name="draw_indicator">True</property>
<property name="group">radiobuttonBTN_FILLCHAR_NO</property>
<accessibility>
<relation type="label-for" target="entryED_FILLCHAR_OTHER"/>
</accessibility>
</object>
<packing>
<property name="left_attach">0</property>
@@ -430,6 +433,9 @@
<property name="can_focus">False</property>
<property name="invisible_char">•</property>
<property name="width_chars">1</property>
<accessibility>
<relation type="labelled-by" target="radiobuttonBTN_FILLCHAR_OTHER"/>
</accessibility>
</object>
<packing>
<property name="left_attach">1</property>