fixed bugs for linux build

3 files changed, 0 insertions, 110 deletions

diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index f68239f9712c..c61023f7cf2e 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -43,8 +43,6 @@ using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::awt::grid;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::style;
-//#define COLUMNSELECTIONALLOWED ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ColumnSelectionAllowed" ))
-//#define COLUMNRESIZED ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ColumnResized" ))
 
 namespace toolkit
 {
@@ -68,71 +66,6 @@ DefaultGridColumnModel::~DefaultGridColumnModel()
 
 //---------------------------------------------------------------------
 
-//void DefaultGridColumnModel::broadcast( broadcast_type eType, const GridColumnEvent& aEvent )
-//{
-//  ::cppu::OInterfaceContainerHelper* pIter = BrdcstHelper.getContainer( XGridColumnListener::static_type() );
-//  if( pIter )
-//  {
-//      ::cppu::OInterfaceIteratorHelper aListIter(*pIter);
-//      while(aListIter.hasMoreElements())
-//      {
-//          XGridColumnListener* pListener = static_cast<XGridColumnListener*>(aListIter.next());
-//          switch( eType )
-//          {
-//          case column_added:      pListener->columnAdded(aEvent); break;
-//          case column_removed:    pListener->columnRemoved(aEvent); break;
-//          case column_changed:    pListener->columnChanged(aEvent); break;
-//          }
-//      }
-//  }
-//}
-//
-////---------------------------------------------------------------------
-//
-//void DefaultGridColumnModel::broadcast_changed( ::rtl::OUString name, Any oldValue, Any newValue)
-//{
-//  Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
-//  GridColumnEvent aEvent( xSource, name, oldValue, newValue, 0, NULL );
-//  broadcast( column_changed, aEvent);
-//}
-//
-////---------------------------------------------------------------------
-//
-//void DefaultGridColumnModel::broadcast_add( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & rColumn )
-//{
-//  Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
-//  GridColumnEvent aEvent( xSource, ::rtl::OUString(), Any(), Any(), index, rColumn );
-//  broadcast( column_added, aEvent);
-//}
-//
-////---------------------------------------------------------------------
-//
-//void DefaultGridColumnModel::broadcast_remove( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & rColumn )
-//{
-//  Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
-//  GridColumnEvent aEvent( xSource, ::rtl::OUString(), Any(), Any(), index, rColumn );
-//  broadcast( column_removed, aEvent);
-//}
-
-//---------------------------------------------------------------------
-// XDefaultGridColumnModel
-//---------------------------------------------------------------------
-//::sal_Bool SAL_CALL DefaultGridColumnModel::getColumnSelectionAllowed() throw (::com::sun::star::uno::RuntimeException)
-//{
-//  return selectionAllowed;
-//}
-//
-////---------------------------------------------------------------------
-//
-//void SAL_CALL DefaultGridColumnModel::setColumnSelectionAllowed(::sal_Bool value) throw (::com::sun::star::uno::RuntimeException)
-//{
-//  sal_Bool oldValue = selectionAllowed;
-//  selectionAllowed = value;
-//  broadcast_changed( COLUMNSELECTIONALLOWED, Any(oldValue) , Any(selectionAllowed));
-//}
-
-//---------------------------------------------------------------------
-
 ::sal_Int32 SAL_CALL DefaultGridColumnModel::getColumnCount() throw (::com::sun::star::uno::RuntimeException)
 {
     return columns.size();
@@ -169,19 +102,6 @@ DefaultGridColumnModel::~DefaultGridColumnModel()
         return Reference< XGridColumn >();
 }
 //---------------------------------------------------------------------
-//void SAL_CALL DefaultGridColumnModel::addColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException)
-//{
-//  BrdcstHelper.addListener( XGridColumnListener::static_type(), xListener );
-//}
-//
-////---------------------------------------------------------------------
-//
-//void SAL_CALL DefaultGridColumnModel::removeColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException)
-//{
-//  BrdcstHelper.removeListener( XGridColumnListener::static_type(), xListener );
-//}
-
-//---------------------------------------------------------------------
 void SAL_CALL DefaultGridColumnModel::setColumnHeaderHeight(sal_Int32 _value) throw (::com::sun::star::uno::RuntimeException)
 {
     m_nColumnHeaderHeight = _value;
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 528e0e17c3e0..91bdd30225ed 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -41,7 +41,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::awt::grid;
 using namespace ::com::sun::star::lang;
-//using namespace ::com::sun::star::style;
 
 #define ROWHEIGHT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowHeight" ))
 #define ROWHEADERS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowHeaders" ))
@@ -182,18 +181,6 @@ void SAL_CALL DefaultGridDataModel::addRow(const ::rtl::OUString & headername, c
     std::vector< Any > newRow;
     for ( int i = 0; i < rRowdata.getLength();i++)
     {
-        //OUString title(rRowdata[i]);
-
-        // create and use interal a UnoControlFixedText for text content
-        //Reference< XFixedText > xFixedText( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.UnoControlFixedText"    ) ), UNO_QUERY_THROW );
-        //Reference< XControl > xFixedTextControl( xFixedText , UNO_QUERY );
-        //
-        //Reference< XControlModel > xFixedTextModel( m_xFactory->createInstance ( OUString::createFromAscii( "com.sun.star.awt.UnoControlFixedTextModel"   ) ), UNO_QUERY );
-        //Reference< ::com::sun::star::beans::XPropertySet > xFixedTextModelPropSet( xFixedTextModel, UNO_QUERY );
-        //xFixedTextModelPropSet->setPropertyValue( OUString::createFromAscii( "Label"), makeAny( title ) );
-
-        //xFixedTextControl->setModel( xFixedTextModel );
-
         newRow.push_back(rRowdata[i]);
     }
 
@@ -209,12 +196,6 @@ void SAL_CALL DefaultGridDataModel::removeRow(::sal_Int32 index) throw (::com::s
 {
     if ( index >= 0 && index <= getRowCount()-1)
     {
-    /*  if(Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->isSelectedIndex( index ))
-        {
-            ::com::sun::star::uno::Sequence<::sal_Int32> selectedRows = Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->getSelection();
-            selectedRow.erase(selectedRows.begin()+index);
-        }*/
-
         ::rtl::OUString headerName( (::rtl::OUString) rowHeaders[index] );
         rowHeaders.erase(rowHeaders.begin() + index);
 
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index b279ace0ef12..e397ad8158f0 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -213,17 +213,6 @@ void SAL_CALL UnoGridControl::setToolTip(const ::com::sun::star::uno::Sequence<
 {
     Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->setToolTip( text, columns );
 }
-/*
-void SAL_CALL UnoGridControl::addMouseListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & listener) throw (::com::sun::star::uno::RuntimeException)
-{
-     Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->addMouseListener( listener );
-}
-
-void SAL_CALL UnoGridControl::removeMouseListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & listener) throw (::com::sun::star::uno::RuntimeException)
-{
-    Reference< XGridControl >( getPeer(), UNO_QUERY_THROW )->removeMouseListener( listener );
-}
-*/
 // -------------------------------------------------------------------
 // XGridSelection
 // -------------------------------------------------------------------