Commits

Mihaela Kedikova  committed 306ffad

bugs fixed for build on macOS

  • Participants
  • Parent commits 04b4561

Comments (0)

Files changed (25)

File offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl

 //============================================================================= 
  
 /** If you do not want to implement the <type>XGridColumnModel</type> yourself, use this service.
+	@since OOo 3.3.0
  */ 
 service DefaultGridColumnModel
 { 

File offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl

 //============================================================================= 
  
 /** If you do not want to implement the <type>XGridDataModel</type> yourself, use this service.
+
+	@since OOo 3.3.0
  */ 
 service DefaultGridDataModel
 { 

File offapi/com/sun/star/awt/grid/GridColumn.idl

  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UnoControlEdit.idl,v $
- * $Revision: 1.9 $
+ * $RCSfile: UnoControlGridColumn.idl,v $
+ * $Revision: 1.0 $
  *
  * This file is part of OpenOffice.org.
  *
 //============================================================================= 
  
 /** Represents a column as used by the <type>DefaultGridColumnModel</type>
+
+	@since OOo 3.3.0
  */ 
 service GridColumn
 { 

File offapi/com/sun/star/awt/grid/GridColumnEvent.idl

 	@see XGridColumnModel
 	@see XGridControl
 	@see XGridColumnListener
+
+	@since OOo 3.3.0
  */ 
 struct GridColumnEvent: com::sun::star::lang::EventObject
 { 

File offapi/com/sun/star/awt/grid/GridDataEvent.idl

 	@see XGridDataModel
 	@see XGridControl
 	@see XGridDataListener
+
+	@sonce OOo 3.3.0
  */ 
 struct GridDataEvent: com::sun::star::lang::EventObject
 { 

File offapi/com/sun/star/awt/grid/GridInvalidDataException.idl

  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ExpandVetoException.idl,v $
- * $Revision: 1.3 $
+ * $RCSfile: GridInvalidDataException.idl,v $
+ * $Revision: 1.0 $
  *
  * This file is part of OpenOffice.org.
  *
 //============================================================================= 
  
 /** Exception is thrown to indicate that set data is invalid, e.g. type of data is unknown 
-	or data count doesn't match with column count.   
+	or data count doesn't match with column count. 
+	
+	@since OOo 3.3.0
  */
 exception GridInvalidDataException : com::sun::star::uno::RuntimeException
 {

File offapi/com/sun/star/awt/grid/GridInvalidModelException.idl

  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ExpandVetoException.idl,v $
- * $Revision: 1.3 $
+ * $RCSfile: GridInvalidModelException.idl,v $
+ * $Revision: 1.0 $
  *
  * This file is part of OpenOffice.org.
  *
 //============================================================================= 
  
 /** Exception is thrown when data or column model isn't set.
+
+	@since OOo 3.3.0
  */
 exception GridInvalidModelException : com::sun::star::uno::RuntimeException
 {
 }; }; }; }; };
  
 #endif 
- 

File offapi/com/sun/star/awt/grid/UnoControlGrid.idl

  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UnoControlEdit.idl,v $
+ * $RCSfile: UnoControlGrid.idl,v $
  * $Revision: 1.9 $
  *
  * This file is part of OpenOffice.org.
 
 	The <type>XGridSelection</type> interface provides a bunch of methods to set and get selection for the grid control.
 	</p>
+	@since OOo 3.3.0
  */
 service UnoControlGrid
 { 

File offapi/com/sun/star/awt/grid/UnoControlGridModel.idl

  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: UnoControlEditModel.idl,v $
- * $Revision: 1.16 $
+ * $RCSfile: UnoControlGridModel.idl,v $
+ * $Revision: 1.0 $
  *
  * This file is part of OpenOffice.org.
  *
 //============================================================================= 
  
 /** specifies the standard model of a <type>UnoControlGridModel</type>.
+
+	@since OOo 3.3.0
  */
 service UnoControlGridModel
 { 

File offapi/com/sun/star/awt/grid/XGridCell.idl

  
 //============================================================================= 
 
-interface XGridCell: com::sun::star::uno::XInterface
+interface XGridCell
 { 
 
 	[attribute] string Value;

File offapi/com/sun/star/awt/grid/XGridCellRenderer.idl

  
 //============================================================================= 
 
-/** gives access to the items of a list box and makes it possible to
-	register item and action event listeners.
+/** renderer for cells
  */     
-interface XGridCellRenderer: com::sun::star::uno::XInterface
+interface XGridCellRenderer
 { 
 	//------------------------------------------------------------------------- 
 

File offapi/com/sun/star/awt/grid/XGridColumn.idl

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: XGridColumn.idl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.0 $
  *
  * This file is part of OpenOffice.org.
  *
 //============================================================================= 
 
 /** The <type>XGridColumn</types> defines the properties and behavior of a column in a grid control
+	@since OOo 3.3.0
  */     
-interface XGridColumn: com::sun::star::uno::XInterface
+interface XGridColumn
 { 
 	/** Specifies the an idendifier of the colomn.**/
 	[attribute] any Identifier;

File offapi/com/sun/star/awt/grid/XGridColumnListener.idl

  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XListBox.idl,v $
- * $Revision: 1.8 $
+ * $RCSfile: XGridColumnListener.idl,v $
+ * $Revision: 1.0 $
  *
  * This file is part of OpenOffice.org.
  *
 	
 	<p>Usually you must not implement this interface yourself, but you must notify it correctly if
 	you implement the <type>XGridColumnModel</type> yourself</p>.
+	
+	@since OOo 3.3.0
  */     
-interface XGridColumnListener: com::sun::star::uno::XInterface
+interface XGridColumnListener
 { 
     /** 
 		Invoked after a column was added to the column model.

File offapi/com/sun/star/awt/grid/XGridColumnModel.idl

  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XListBox.idl,v $
- * $Revision: 1.8 $
+ * $RCSfile: XGridColumnModel.idl,v $
+ * $Revision: 1.0 $
  *
  * This file is part of OpenOffice.org.
  *
 	retrieve the column structure that is displayed in the actual control.
 
 	If you do not need your own model implementation, you can also use the <type>DefaultGridColumnModel</type>.
+	
+	@since OOo 3.3.0
 */     
-interface XGridColumnModel: com::sun::star::uno::XInterface
+interface XGridColumnModel
 { 
 	/** Specifies whether column selection is allowed
 	*/

File offapi/com/sun/star/awt/grid/XGridControl.idl

  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XListBox.idl,v $
- * $Revision: 1.8 $
+ * $RCSfile: XGridControl.idl,v $
+ * $Revision: 1.0 $
  *
  * This file is part of OpenOffice.org.
  *
 /** An interface to a control that displays a tabular data.
 
 	@see UnoControlGrid
+	
+	@since OOo 3.3.0
  */      
 interface XGridControl: XGridSelection 
 { 
 			If only text should be shown, leave this sequence empty.
 	*/
 	void setToolTip( [in] sequence< string > textForTooltip, [in] sequence< long > columnsForTooltip);
-
-	/** registers a listener for mouse events.
-	 */    
-	//[oneway] void addMouseListener( [in] com::sun::star::awt::XMouseListener listener ); 
- 
-	/** unregisters a listener for mouse events.
-	 */    
-	//[oneway] void removeMouseListener( [in] com::sun::star::awt::XMouseListener listener ); 
  
 }; 
  

File offapi/com/sun/star/awt/grid/XGridControlListener.idl

  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XListBox.idl,v $
- * $Revision: 1.8 $
+ * $RCSfile: XGridControlListener.idl,v $
+ * $Revision: 1.0 $
  *
  * This file is part of OpenOffice.org.
  *
  
 //============================================================================= 
 
-interface XGridControlListener: com::sun::star::uno::XInterface
+interface XGridControlListener
 { 
  
 }; 

File offapi/com/sun/star/awt/grid/XGridDataListener.idl

  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XListBox.idl,v $
- * $Revision: 1.8 $
+ * $RCSfile: XGridDataListener.idl,v $
+ * $Revision: 1.0 $
  *
  * This file is part of OpenOffice.org.
  *
 	
 	<p>Usually you must not implement this interface yourself, but you must notify it correctly if
 	you implement the <type>XGridDataModel</type> yourself</p>.
+	
+	@since OOo 3.3.0
  */       
 interface XGridDataListener: com::sun::star::lang::XEventListener
 { 

File offapi/com/sun/star/awt/grid/XGridDataModel.idl

  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: XListBox.idl,v $
+ * $RCSfile: XGridDataModel.idl,v $
  *
  * This file is part of OpenOffice.org.
  *
 	retrieve the content data that is displayed in the actual control.
 
 	If you do not need your own model implementation, you can also use the <type>DefaultGridDataModel</type>.
+	
+	@since OOo 3.3.0
 */   
 interface XGridDataModel: ::com::sun::star::lang::XComponent 
 { 

File offapi/com/sun/star/awt/grid/XGridSelection.idl

 
 /** This interfaces provides access to the selection of row for <type>UnoControlGrid</type>. 
  */     
-interface XGridSelection: com::sun::star::uno::XInterface
+interface XGridSelection
 { 
 	/** Returns the lowest index of the selection. 
 		@returns

File svtools/inc/svtools/accessibletable.hxx

 #include <vcl/window.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <svtools/table/tablemodel.hxx>
 
 // ============================================================================
 

File svtools/source/table/gridtablerenderer.cxx

         _rDevice.DrawLine( _rArea.BottomRight(), _rArea.TopRight() );
 
         _rDevice.Pop();
+		(void)_rStyle;
 		(void)_bIsColHeaderArea;
 		(void)_bIsRowHeaderArea;
     }
         // TODO: active? selected?
         (void)_bActive;
         (void)_bSelected;
+		(void)_rStyle;
 		//at the moment no special paint for selected row header
         _rDevice.Pop();
     }

File svtools/source/table/tablecontrol_impl.cxx

 				::com::sun::star::uno::Any rCellData;
 				if(!aCellData.empty() && iter != aCellData.begin()+m_nLeftColumn+nActualCols)
 				{
-					TableSize nPartlyVisibleCols = impl_getVisibleColumns(false);
-					TableSize nPartlyVisibleRows = impl_getVisibleRows(false); 
 					rCellData = *iter;
 					++iter;
 					Size siz = m_rAntiImpl.GetSizePixel();
 	{
 		m_nResizingColumn = m_nCurColumn;
 		PColumnModel pColumn = m_pModel->getColumnModel(m_nResizingColumn);
-		sal_Int32 colWidth = pColumn->getWidth();
-		//impl_ni_getAccVisibleColWidths();
-		int newColWidth = m_rAntiImpl.LogicToPixel( Size( colWidth, 0 ), MAP_APPFONT ).Width();
+		//sal_Int32 colWidth = pColumn->getWidth();
+		////impl_ni_getAccVisibleColWidths();
+		//int newColWidth = m_rAntiImpl.LogicToPixel( Size( colWidth, 0 ), MAP_APPFONT ).Width();
 		if(m_aVisibleColumnWidthsPixel[m_nResizingColumn-m_nLeftColumn]-1 == rPoint.X() && pColumn->isResizable())
 		{
 			m_pDataWindow->CaptureMouse();
 			PColumnModel pColumn = m_pModel->getColumnModel(m_nResizingColumn);
 			int maxWidth = pColumn->getMaxWidth();
 			int minWidth = pColumn->getMinWidth();
-			int colWidth = pColumn->getWidth();
+			//int colWidth = pColumn->getWidth();
 			int resizeCol = m_nResizingColumn-m_nLeftColumn;
 			//new position of mouse 
 			int actX = rPoint.X();
 	//--------------------------------------------------------------------
 	rtl::OUString TableControl_Impl::impl_convertToString(::com::sun::star::uno::Any value)
 	{
-		sal_Int32 nInt;
-		sal_Bool bBool;
-		double fDouble;
+		sal_Int32 nInt = 0;
+		sal_Bool bBool = false;
+		double fDouble = 0;
 		::rtl::OUString sNewString;
 		::rtl::OUString sConvertString;
 		if(value >>= sConvertString)

File svtools/source/uno/svtxgridcontrol.cxx

 		}
 		case BASEPROPERTY_TEXTCOLOR:
 		{
-			com::sun::star::util::Color colorText;
+			sal_Int32 colorText = 0xFFFFFF;
 			if( aValue >>= colorText )
 			{
 				m_pTableModel->setTextColor(colorText);
 		}
 		case BASEPROPERTY_VERTICALALIGN:
 		{
-			com::sun::star::style::VerticalAlignment vAlign;
+			com::sun::star::style::VerticalAlignment vAlign(com::sun::star::style::VerticalAlignment(0));
 			if( aValue >>= vAlign )
 			{
 				switch( vAlign )

File toolkit/source/controls/grid/defaultgriddatamodel.cxx

 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_toolkit.hxx"
-#include "DefaultGridDataModel.hxx"
+#include "defaultgriddatamodel.hxx"
 #include <comphelper/sequence.hxx>
 #include <toolkit/helper/servicenames.hxx>
 #include <rtl/ref.hxx>

File toolkit/source/controls/grid/gridcolumn.cxx

 
 GridColumn::GridColumn()
 : identifier(Any())
+,columnWidth(10)
+,bResizeable(true)
 ,horizontalAlign(HorizontalAlignment(0))
-,columnWidth(4)
-,bResizeable(true)
+
 {
 }
 
 	bResizeable = value;
 }
 //---------------------------------------------------------------------
-HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign()
+HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign() throw (::com::sun::star::uno::RuntimeException)
 {
 	return horizontalAlign;
 }
 //---------------------------------------------------------------------
 
-void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align)
+void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align) throw (::com::sun::star::uno::RuntimeException)
 {
 	horizontalAlign = align;
 }