diff options
| -rw-r--r-- | vcl/source/control/imivctl.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/control/imivctl1.cxx | 19 |
2 files changed, 0 insertions, 23 deletions
diff --git a/vcl/source/control/imivctl.hxx b/vcl/source/control/imivctl.hxx index aedc238cccab..1ff043def5f5 100644 --- a/vcl/source/control/imivctl.hxx +++ b/vcl/source/control/imivctl.hxx @@ -105,7 +105,6 @@ typedef sal_uLong GridId; // Implementation-class of IconChoiceCtrl -typedef std::map<sal_uInt16, std::unique_ptr<SvxIconChoiceCtrlColumnInfo>> SvxIconChoiceCtrlColumnInfoMap; typedef std::vector<SvxIconChoiceCtrlEntry*> SvxIconChoiceCtrlEntryPtrVec; class SvxIconChoiceCtrl_Impl @@ -133,7 +132,6 @@ class SvxIconChoiceCtrl_Impl tools::Long nMaxVirtWidth; // max. width aVirtOutputSize for ALIGN_TOP tools::Long nMaxVirtHeight; // max. height aVirtOutputSize for ALIGN_LEFT std::vector< SvxIconChoiceCtrlEntry* > maZOrderList; - std::unique_ptr<SvxIconChoiceCtrlColumnInfoMap> m_pColumns; WinBits nWinBits; tools::Long nMaxBoundHeight; // height of highest BoundRects IconChoiceFlags nFlags; @@ -398,8 +396,6 @@ public: void SetPositionMode( SvxIconChoiceCtrlPositionMode ); - const SvxIconChoiceCtrlColumnInfo* GetColumn( sal_uInt16 nIndex ) const; - void SetEntryHighlightFrame( SvxIconChoiceCtrlEntry* pEntry, bool bKeepHighlightFlags diff --git a/vcl/source/control/imivctl1.cxx b/vcl/source/control/imivctl1.cxx index 9579784ea818..71404180eb0d 100644 --- a/vcl/source/control/imivctl1.cxx +++ b/vcl/source/control/imivctl1.cxx @@ -107,7 +107,6 @@ SvxIconChoiceCtrl_Impl::~SvxIconChoiceCtrl_Impl() pImpCursor.reset(); pGridMap.reset(); ClearSelectedRectList(); - m_pColumns.reset(); aVerSBar.disposeAndClear(); aHorSBar.disposeAndClear(); aScrBarBox.disposeAndClear(); @@ -2060,14 +2059,6 @@ void SvxIconChoiceCtrl_Impl::SetGrid( const Size& rSize ) aSize.setHeight( aMinSize.Height() ); nGridDX = aSize.Width(); - // HACK: Detail mode is not yet fully implemented, this workaround makes it - // fly with a single column - if( nWinBits & WB_DETAILS ) - { - const SvxIconChoiceCtrlColumnInfo* pCol = GetColumn( 0 ); - if( pCol ) - const_cast<SvxIconChoiceCtrlColumnInfo*>(pCol)->SetWidth( nGridDX ); - } nGridDY = aSize.Height(); SetDefaultTextSize(); } @@ -2797,16 +2788,6 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt ) return true; } -const SvxIconChoiceCtrlColumnInfo* SvxIconChoiceCtrl_Impl::GetColumn( sal_uInt16 nIndex ) const -{ - if (!m_pColumns) - return nullptr; - auto const it = m_pColumns->find( nIndex ); - if (it == m_pColumns->end()) - return nullptr; - return it->second.get(); -} - void SvxIconChoiceCtrl_Impl::DrawHighlightFrame(vcl::RenderContext& rRenderContext, const tools::Rectangle& rBmpRect) { tools::Rectangle aBmpRect(rBmpRect); |