diff options
| author | Olivier Hallot <olivier.hallot@edx.srv.br> | 2013-06-30 18:25:36 -0300 |
|---|---|---|
| committer | Bosdonnat Cedric <cedric.bosdonnat@free.fr> | 2013-07-03 08:01:27 +0000 |
| commit | 753624e9e423366bd60c6b128c2f0697c778d9a4 (patch) | |
| tree | 313e8da73ff6c6b6eaa12da49c398eb22b6e8a99 /sw/source/ui/chrdlg | |
| parent | e8fdd77a66fe92fae063394683c6d9f64c9f54e6 (diff) | |
Finishing touch on Drop Caps widget UI conversion.
Change-Id: I896d64d602cab9671373c619a6a02807ec6bc6ac
Reviewed-on: https://gerrit.libreoffice.org/4643
Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
Diffstat (limited to 'sw/source/ui/chrdlg')
| -rw-r--r-- | sw/source/ui/chrdlg/drpcps.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 6b33d813468d..5bd791f2ba32 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -544,11 +544,15 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) get(m_pDropCapsField,"spinFLD_DROPCAPS"); get(m_pLinesField,"spinFLD_LINES"); get(m_pDistanceField,"spinFLD_DISTANCE"); - get(m_pContentFL,"frameFL_CONTENT"); + get(m_pSwitchText,"labelFT_DROPCAPS"); + get(m_pLinesText,"labelTXT_LINES"); + get(m_pDistanceText,"labelTXT_DISTANCE"); + get(m_pTemplateText,"labelTXT_TEMPLATE"); get(m_pTextText,"labelTXT_TEXT"); get(m_pTextEdit,"entryEDT_TEXT"); get(m_pTemplateBox,"comboBOX_TEMPLATE"); get(m_pPict,"drawingareaWN_EXAMPLE"); + m_pPict->SetDropCapsPage(this); SetExchangeSupport(); @@ -563,7 +567,6 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) // Metrics SetMetric( *m_pDistanceField, GetDfltMetric(bHtmlMode) ); - m_pPict->SetBorderStyle( WINDOW_BORDER_MONO ); // Install handler @@ -675,16 +678,16 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl) m_pWholeWordCB->Enable( bChecked && !bHtmlMode ); - //aSwitchText.Enable( bChecked && !m_pWholeWordCB->IsChecked() ); + m_pSwitchText->Enable( bChecked && !m_pWholeWordCB->IsChecked() ); m_pDropCapsField->Enable( bChecked && !m_pWholeWordCB->IsChecked() ); - //aLinesText .Enable( bChecked ); + m_pLinesText->Enable( bChecked ); m_pLinesField->Enable( bChecked ); - //aDistanceText.Enable( bChecked ); + m_pDistanceText->Enable( bChecked ); m_pDistanceField->Enable( bChecked ); - //aTemplateText .Enable( bChecked ); + m_pTemplateText->Enable( bChecked ); m_pTemplateBox->Enable( bChecked ); m_pTextEdit->Enable( bChecked && !bFormat ); - //aTextText .Enable( bChecked && !bFormat ); + m_pTextText->Enable( bChecked && !bFormat ); if ( bChecked ) { @@ -692,7 +695,7 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl) m_pDropCapsField->GrabFocus(); } else - m_pPict->SetText(OUString()); + m_pPict->SetText(""); bModified = sal_True; @@ -707,6 +710,7 @@ Page: CheckBox's Click-Handler IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl) { m_pDropCapsField->Enable( !m_pWholeWordCB->IsChecked() ); + m_pSwitchText->Enable(!m_pWholeWordCB->IsChecked()); ModifyHdl(m_pDropCapsField); |