Commits

Mihaela Kedikova  committed 888d3b0

gridcontrol_03:fix for #i110947#

  • Participants
  • Parent commits 3fde3f8

Comments (0)

Files changed (2)

File svtools/inc/svtools/table/abstracttablecontrol.hxx

 	virtual void resizeColumn(const Point& rPoint ) = 0;
 	virtual bool startResizeColumn(const Point& rPoint) = 0;
 	virtual bool endResizeColumn(const Point& rPoint) = 0;
-	virtual bool isRowSelected(RowPos _nRow);
+	virtual bool isRowSelected(RowPos _nRow) = 0;
 
         virtual ~IAbstractTableControl() {};
 	};

File svtools/source/uno/svtxgridcontrol.cxx

 	::vos::OGuard aGuard( GetMutex() );
 
 	TableControl* pTable = (TableControl*)GetWindow();
-	sal_Int32 fontHeight = GetWindow()->GetTextHeight();
 	switch( GetPropertyId( PropertyName ) )
 	{
 		case BASEPROPERTY_GRID_SELECTIONMODE:
 				}
 				else
 					throw GridInvalidDataException(rtl::OUString::createFromAscii("The data model isn't set!"), m_xDataModel);
+				sal_Int32 fontHeight = pTable->PixelToLogic( Size( 0, pTable->GetTextHeight() ), MAP_APPFONT ).Height();
 				if(m_xDataModel->getRowHeight() == 0)
 					m_pTableModel->setRowHeight(fontHeight);
 				else
 					Sequence<Reference< XGridColumn > > columns = m_xColumnModel->getColumns();
 					std::vector<Reference< XGridColumn > > aNewColumns(
 						comphelper::sequenceToContainer<std::vector<Reference< XGridColumn > > >(columns));
+					sal_Int32 fontHeight = pTable->PixelToLogic( Size( 0, pTable->GetTextHeight() ), MAP_APPFONT ).Height();
 					if(m_xColumnModel->getColumnHeaderHeight() == 0)
 						m_pTableModel->setColumnHeaderHeight(fontHeight);
 					else