Kaydet (Commit) fd8324ad authored tarafından Caolán McNamara's avatar Caolán McNamara

use a size-group for the labels to get things to align nicely

It appears I have a small bug in how size-groups and/or generic size-requests
work. It seems that margins should be part of the request, but I'm adding those
on after the request, not as part of the request. But we can workaround that by
putting a one element box around the elements with margins and put those boxes
into the size group instead. That way it works now, and will continue to work
after I change the request+margin logic

tristates are a pain, They are always set to "state unknown" on .ui load, while
in .src load they default to "state nocheck". So to be super sure that the
logic is unchanged set them explicitly initially in .cxx to "state nocheck"

restore accessibility relationship between tristate used as a label and the
labeled thing.

Change-Id: Ibf4879c3e9a4ecc4726896479377f51bf727b238
üst 3ce81279
......@@ -42,7 +42,7 @@ static sal_uInt16 aPageRg[] = {
};
SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, const SfxItemSet& rAttr ) :
SfxTabPage(pParent, "NumParaPage", "/modules/swriter/ui/numparapage.ui", rAttr),
SfxTabPage(pParent, "NumParaPage", "modules/swriter/ui/numparapage.ui", rAttr),
msOutlineNumbering( SW_RES( STR_OUTLINE_NUMBERING ) ),
bModified(sal_False),
......@@ -56,12 +56,16 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, const SfxItemSet&
get(m_pNewStartBX, "boxNEW_START");
get(m_pNewStartCB, "checkCB_NEW_START");
m_pNewStartCB->SetState(STATE_NOCHECK);
get(m_pNewStartNumberCB, "checkCB_NUMBER_NEW_START");
m_pNewStartNumberCB->SetState(STATE_NOCHECK);
get(m_pNewStartNF, "spinNF_NEW_START");
get(m_pCountParaFram, "frameFL_COUNT_PARA");
get(m_pCountParaCB, "checkCB_COUNT_PARA");
m_pCountParaCB->SetState(STATE_NOCHECK);
get(m_pRestartParaCountCB, "checkCB_RESTART_PARACOUNT");
m_pRestartParaCountCB->SetState(STATE_NOCHECK);
get(m_pRestartBX, "boxRESTART_NO");
get(m_pRestartNF, "spinNF_RESTART_PARA");
......@@ -74,8 +78,8 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, const SfxItemSet&
{
sal_uInt16 nHtmlMode = ((const SfxUInt16Item*)pItem)->GetValue();
if(HTMLMODE_ON & nHtmlMode)
m_pCountParaFram->Hide();
if (HTMLMODE_ON & nHtmlMode)
m_pCountParaFram->Hide();
}
m_pNewStartCB->SetClickHdl(LINK(this, SwParagraphNumTabPage, NewStartHdl_Impl));
......
......@@ -41,7 +41,7 @@
#include "view.hxx"
SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) :
SfxTabPage(pParent, "TextGridPage","/modules/swriter/ui/textgridpage.ui", rSet),
SfxTabPage(pParent, "TextGridPage", "modules/swriter/ui/textgridpage.ui", rSet),
m_nRubyUserValue(0),
m_bRubyUserValue(sal_False),
m_aPageSize(MM50, MM50),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment