diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-13 09:46:59 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-05-13 10:08:33 +0900 |
| commit | 7d6fea90d34b888e878eb7674e380c1c08522a16 (patch) | |
| tree | 193467753ba481ede2671869b8b6039afd393429 /cui | |
| parent | SvxShowCharSet cleanup (diff) | |
| download | core-7d6fea90d34b888e878eb7674e380c1c08522a16.tar.gz core-7d6fea90d34b888e878eb7674e380c1c08522a16.zip | |
fixes of SvxParaPrevWindow refactoring
Change-Id: If9ca3234f9f3ea1ed176d3fc020d4b6d7a554937
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/paragrph.hxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/paragrph.cxx | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 2dda7749cd5d..7662a9d2ea9f 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -87,7 +87,7 @@ private: void SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr ); void Init_Impl(); - void UpdateExample_Impl( bool bAll = false ); + void UpdateExample_Impl(); DECL_LINK( LineDistHdl_Impl, ListBox* ); DECL_LINK(ModifyHdl_Impl, void *); @@ -154,7 +154,7 @@ class SvxParaAlignTabPage : public SfxTabPage DECL_LINK(LastLineHdl_Impl, void *); DECL_LINK(TextDirectionHdl_Impl, void *); - void UpdateExample_Impl( bool bAll = false ); + void UpdateExample_Impl(); SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 8b647f452aab..94c007053d8c 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -819,7 +819,7 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox ) } break; } - UpdateExample_Impl( true ); + UpdateExample_Impl(); return 0; } @@ -856,7 +856,7 @@ void SvxStdParagraphTabPage::Init_Impl() m_pLineDistAtMetricBox->SetMax( m_pLineDistAtMetricBox->Normalize( nAbst ), eUnit ); } -void SvxStdParagraphTabPage::UpdateExample_Impl( bool bAll ) +void SvxStdParagraphTabPage::UpdateExample_Impl() { m_pExampleWin->SetFirstLineOfst( (short)m_pFLineIndent->Denormalize( m_pFLineIndent->GetValue( FUNIT_TWIP ) ) ); m_pExampleWin->SetLeftMargin( static_cast<long>(m_pLeftIndent->Denormalize( m_pLeftIndent->GetValue( FUNIT_TWIP ) ) ) ); @@ -886,7 +886,7 @@ void SvxStdParagraphTabPage::UpdateExample_Impl( bool bAll ) (sal_uInt16)GetCoreValue( *m_pLineDistAtMetricBox, SFX_MAPUNIT_TWIP ) ); break; } - m_pExampleWin->Draw( bAll ); + m_pExampleWin->Invalidate(); } void SvxStdParagraphTabPage::EnableRegisterMode() @@ -1260,7 +1260,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet ) m_pLastLineLB->SaveValue(); m_pExpandCB->SaveValue(); - UpdateExample_Impl(true); + UpdateExample_Impl(); } IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl) @@ -1270,7 +1270,7 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl) m_pLastLineLB->Enable(bJustify); bool bLastLineIsBlock = m_pLastLineLB->GetSelectEntryPos() == 2; m_pExpandCB->Enable(bJustify && bLastLineIsBlock); - UpdateExample_Impl(false); + UpdateExample_Impl(); return 0; } @@ -1279,7 +1279,7 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl) //fdo#41350 only enable 'Expand last word' if last line is also justified bool bLastLineIsBlock = m_pLastLineLB->GetSelectEntryPos() == 2; m_pExpandCB->Enable(bLastLineIsBlock); - UpdateExample_Impl(false); + UpdateExample_Impl(); return 0; } @@ -1301,7 +1301,7 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, TextDirectionHdl_Impl) return 0; } -void SvxParaAlignTabPage::UpdateExample_Impl( bool bAll ) +void SvxParaAlignTabPage::UpdateExample_Impl() { if ( m_pLeft->IsChecked() ) m_pExampleWin->SetAdjust( SVX_ADJUST_LEFT ); @@ -1321,7 +1321,7 @@ void SvxParaAlignTabPage::UpdateExample_Impl( bool bAll ) m_pExampleWin->SetLastLine( eLastBlock ); } - m_pExampleWin->Draw( bAll ); + m_pExampleWin->Invalidate(); } void SvxParaAlignTabPage::EnableJustifyExt() |