diff options
author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-09 23:04:18 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-09 23:04:18 +0100 |
commit | 988e47f24b5cd7257c330f0c1b19fe4bbd0fbd4e (patch) | |
tree | 372942ae4ffbd006731f85450b396b7700828e9c | |
parent | 7b03e2ffd167241b1bbcb1b0e9bb4939401612c5 (diff) |
slidecopy: fixed ItemContentType handling
-rw-r--r-- | svtools/source/toolpanel/paneltabbar.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index fd359efd7090..91a477006002 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -545,8 +545,8 @@ namespace svt Rectangle aContentArea; Size aCompleteSize( impl_calculateItemContentSize( pPanel, TABITEM_IMAGE_AND_TEXT ) ); - Size aIconOnlySize( impl_calculateItemContentSize( pPanel, TABITEM_IMAGE_AND_TEXT ) ); - Size aTextOnlySize( impl_calculateItemContentSize( pPanel, TABITEM_IMAGE_AND_TEXT ) ); + Size aIconOnlySize( impl_calculateItemContentSize( pPanel, TABITEM_IMAGE_ONLY ) ); + Size aTextOnlySize( impl_calculateItemContentSize( pPanel, TABITEM_TEXT_ONLY ) ); // TODO: have one method calculating all sizes? @@ -763,7 +763,7 @@ namespace svt m_rTabBar.DrawBitmapEx( aActualBounds.TopLeft(), aBitmap ); // render the actual item content - impl_renderItemContent( rItem.pPanel, aActualContent, m_aGeometry.getItemContent() ); + impl_renderItemContent( rItem.pPanel, aActualContent, rItem.eContent ); // render item "foreground" layer m_pRenderer->postRenderItem( m_rTabBar, aActualBounds, nItemFlags ); @@ -780,7 +780,7 @@ namespace svt return; } impl_calcItemRects(); - OSL_POSTCOND( m_bItemsDirty == false, "EnsureItemsCache: cache still dirty!" ); + OSL_POSTCOND( m_bItemsDirty == false, "PanelTabBar_Impl::EnsureItemsCache: cache still dirty!" ); DBG_CHECK( *this ); } |