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

Restore original mnemonics for view page

And remove the remaining SetPosPixel calls of layout controlled elements, they
are now unnecessary and get overridden by the layout anyway. Including the ones
left over from the printer options conversion.

Tweak things for 6/12 spacings.

Change-Id: Ifb460fb966452c10a9ac08c6f8cd57b96a2166f0
üst 56152a8f
...@@ -158,7 +158,6 @@ ...@@ -158,7 +158,6 @@
#define HID_ENV_ENV "SW_HID_ENV_ENV" #define HID_ENV_ENV "SW_HID_ENV_ENV"
#define HID_ENV_FMT "SW_HID_ENV_FMT" #define HID_ENV_FMT "SW_HID_ENV_FMT"
#define HID_FRM_URL "SW_HID_FRM_URL" #define HID_FRM_URL "SW_HID_FRM_URL"
#define HID_CONTENT_OPT "SW_HID_CONTENT_OPT"
#define HID_STD_FONT "SW_HID_STD_FONT" #define HID_STD_FONT "SW_HID_STD_FONT"
#define HID_COND_COLL "SW_HID_COND_COLL" #define HID_COND_COLL "SW_HID_COND_COLL"
#define HID_FRM_ADD "SW_HID_FRM_ADD" #define HID_FRM_ADD "SW_HID_FRM_ADD"
......
...@@ -111,13 +111,7 @@ SwContentOptPage::SwContentOptPage( Window* pParent, ...@@ -111,13 +111,7 @@ SwContentOptPage::SwContentOptPage( Window* pParent,
} }
SvtCJKOptions aCJKOptions; SvtCJKOptions aCJKOptions;
if(aCJKOptions.IsVerticalTextEnabled() ) if(!aCJKOptions.IsVerticalTextEnabled() )
{
Point aSmoothPos(m_pSmoothCBox->GetPosPixel());
aSmoothPos.Y() += aSmoothPos.Y() - m_pVRulerCBox->GetPosPixel().Y();
m_pSmoothCBox->SetPosPixel(aSmoothPos);
}
else
m_pVRulerRightCBox->Hide(); m_pVRulerRightCBox->Hide();
m_pVRulerCBox->SetClickHdl(LINK(this, SwContentOptPage, VertRulerHdl )); m_pVRulerCBox->SetClickHdl(LINK(this, SwContentOptPage, VertRulerHdl ));
m_pAnyRulerCB->SetClickHdl(LINK(this, SwContentOptPage, AnyRulerHdl)); m_pAnyRulerCB->SetClickHdl(LINK(this, SwContentOptPage, AnyRulerHdl));
...@@ -351,10 +345,6 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent, ...@@ -351,10 +345,6 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent,
m_pRightPageCB->Hide(); m_pRightPageCB->Hide();
m_pPrintHiddenTextCB->Hide(); m_pPrintHiddenTextCB->Hide();
m_pPrintTextPlaceholderCB->Hide(); m_pPrintTextPlaceholderCB->Hide();
m_pProspectCB->SetPosPixel(m_pLeftPageCB->GetPosPixel());
Point aPt( m_pRightPageCB->GetPosPixel() );
aPt.setX(aPt.getX() + 15); // indent
m_pProspectCB_RTL->SetPosPixel(aPt);
// hide m_pPrintEmptyPagesCB // hide m_pPrintEmptyPagesCB
m_pPrintEmptyPagesCB->Hide(); m_pPrintEmptyPagesCB->Hide();
......
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