diff options
author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-10-11 22:18:53 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-10-11 23:35:16 -0400 |
commit | b9640634d0cf698dba1c07d9c89a6246360df792 (patch) | |
tree | 5170decc3e265662f22b5da9b3ca22062af75cc4 /svx | |
parent | Prevent infinite recursion during make check. (diff) | |
download | core-b9640634d0cf698dba1c07d9c89a6246360df792.tar.gz core-b9640634d0cf698dba1c07d9c89a6246360df792.zip |
Let's make these calls explicit too to prevent infinite recursions.
Change-Id: I9671715ce9ed06b032cf236e843c9ea0f09513a9
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/fontlb.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/filtnav.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index eaaee5f49964..99388a6b106f 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -85,9 +85,9 @@ void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry, { DBG_CHKTHIS( SvLBoxFontString, 0 ); Font aOldFont( pView->GetFont() ); - pView->SetFont( maFont ); + pView->Control::SetFont( maFont ); SvLBoxString::InitViewData( pView, pEntry, pViewData); - pView->SetFont( aOldFont ); + pView->Control::SetFont( aOldFont ); } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9a9fba93093a..4cde508a406a 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1120,10 +1120,10 @@ void FmFilterString::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvV Font aOldFont( pView->GetFont()); Font aFont( aOldFont ); aFont.SetWeight(WEIGHT_BOLD); - pView->SetFont( aFont ); + pView->Control::SetFont( aFont ); Size aSize(pView->GetTextWidth(m_aName), pView->GetTextHeight()); - pView->SetFont( aOldFont ); + pView->Control::SetFont( aOldFont ); aSize.Width() += pView->GetTextWidth(GetText()) + nxD; pViewData->aSize = aSize; } |