Commits

Anonymous committed 846fa55

accfixes2: fixed compile issues linux/solaris

  • Participants
  • Parent commits baaf8f7

Comments (0)

Files changed (8)

File accessibility/source/extended/accessiblelistboxentry.cxx

 		AccessibleListBoxEntry_BASE	( m_aMutex ),
 		ListBoxAccessibleBase( _rListBox ),
 
+		m_pSvLBoxEntry  ( _pEntry ),
         m_nClientId     ( 0 ),
-		m_aParent		( _xParent ),
-		m_pSvLBoxEntry  ( _pEntry )
+		m_aParent		( _xParent )
 
 	{
 		DBG_CTOR( AccessibleListBoxEntry, NULL );

File editeng/source/accessibility/AccessibleHyperlink.cxx

 
 */
 
-//-----IAccessibility2 Implementation 2009
+//-----IAccessibility2 Implementation 2009
+
+

File svtools/inc/svtools/accessibleruler.hxx

 	struct Rectangle;
 	struct Size;
 	class XFocusListener;
-} } } };
+} } } }
 
 class Rectangle;
 class Ruler;
 	//=====  XAccessibleEventBroadcaster  =====================================
 
 	virtual void SAL_CALL
-		addEventListener(
-			const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
-			throw( com::sun::star::uno::RuntimeException );
+		addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )throw( com::sun::star::uno::RuntimeException );
 
+	virtual void SAL_CALL 
+		removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException );
+
+	// Needed, because some compilers would complain about virtual functions above would hide cppu::WeakAggComponentImplHelperBase::add/removeEventListener(const Reference<lang::XEventListener>&)...
 	virtual void SAL_CALL
-		removeEventListener(
-			const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
-			throw( com::sun::star::uno::RuntimeException );
+		addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )throw( com::sun::star::uno::RuntimeException );
+
+	virtual void SAL_CALL 
+		removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException );
+
+
 	//=====  XServiceInfo  ====================================================
 
 	virtual ::rtl::OUString SAL_CALL

File svtools/source/control/accessibleruler.cxx

 		throw lang::DisposedException();
 }
 
+void SvtRulerAccessible::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )throw( com::sun::star::uno::RuntimeException )
+{
+	cppu::WeakAggComponentImplHelperBase::addEventListener( xListener );
+}
+
+void SvtRulerAccessible::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException )
+{
+	cppu::WeakAggComponentImplHelperBase::removeEventListener( xListener );
+}
+
+
 // -------------------------------------------------------------------------------------------------
 
-
-
-

File svtools/source/dialogs/colctrl.cxx

     //Methods for XAccessibleEventBroadcaster
 	sal_uInt32 mnClientId;
 
-	virtual void SAL_CALL
-		addEventListener(
-			const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
-			throw( com::sun::star::uno::RuntimeException );
+	virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException );
+	virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException );
 
-	virtual void SAL_CALL
-		removeEventListener(
-			const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
-			throw( com::sun::star::uno::RuntimeException );
+	// Needed, because some compilers would complain about virtual functions above would hide cppu::WeakAggComponentImplHelperBase::add/removeEventListener(const Reference<lang::XEventListener>&)...
+	virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )throw( com::sun::star::uno::RuntimeException );
+	virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException );
+
 	void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent );
 	//Solution: Add the event handling method
 	void FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew);
     //Methods for XAccessibleEventBroadcaster
 	sal_uInt32 mnClientId;
 
-	virtual void SAL_CALL
-		addEventListener(
-			const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
-			throw( com::sun::star::uno::RuntimeException );
+	virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException );
+	virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException );
 
-	virtual void SAL_CALL
-		removeEventListener(
-			const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener )
-			throw( com::sun::star::uno::RuntimeException );
+	// Needed, because some compilers would complain about virtual functions above would hide cppu::WeakAggComponentImplHelperBase::add/removeEventListener(const Reference<lang::XEventListener>&)...
+	virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )throw( com::sun::star::uno::RuntimeException );
+	virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException );
+
 	void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent );
 	
 	//Solution: Add the event handling method
     if(pColorCtl)
     	{
 	    long width = pColorCtl->GetWidth();
-	    long height = pColorCtl->GetHeight();
+	    // IA2 CWS. MT: Not used: long height = pColorCtl->GetHeight();
 	    sal_Int32 rows = (sal_Int32)(i / width);
 	    sal_Int32 cols = (sal_Int32)(i % width);
 	    return CreateChild(i, Point(cols, rows));
 		if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount())
 			throw lang::IndexOutOfBoundsException();
 		long width = pColorCtl->GetWidth();
-		long height = pColorCtl->GetHeight();
+		// IA2 CWS. MT: Not used: long height = pColorCtl->GetHeight();
 		Point pt(0,0);
 		if(width >0)
 		{
 		}
 	}
 }
+
+void SvColorControlAccessible::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )throw( com::sun::star::uno::RuntimeException )
+{
+	cppu::WeakAggComponentImplHelperBase::addEventListener( xListener );
+}
+
+void SvColorControlAccessible::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException )
+{
+	cppu::WeakAggComponentImplHelperBase::removeEventListener( xListener );
+}
+
 void SvColorControlAccessible::CommitChange( const AccessibleEventObject& rEvent )
 {
 	if (mnClientId)
 {
 	uno::Reference<XAccessible> xChild;
 	long nX = mPoint.X();
-	long nY = mPoint.Y();
+	// IA2 CWS. MT: Not used: long nY = mPoint.Y();
 	if( Application::GetSettings().GetLayoutRTL())
 	{
 	    nX = (sal_uInt16) pColorCtl->GetWidth() - 1 - nX;
 	const uno::Reference<XAccessible>&	rxParent,
 	long nIndexInParent ) :
 	SvColorControlAccessibleChild_BASE( m_aMutex ),
+	mrParentWindow( rWindow ),
 	mxParent(rxParent),
-	mrParentWindow( rWindow ),
 	maColor(aColor),
 	maPoint(aPoint),
 	mpBoundingBox( new Rectangle( rBoundingBox ) ),
 	}
 }
 
+void SvColorControlAccessibleChild::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )throw( com::sun::star::uno::RuntimeException )
+{
+	cppu::WeakAggComponentImplHelperBase::addEventListener( xListener );
+}
+
+void SvColorControlAccessibleChild::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException )
+{
+	cppu::WeakAggComponentImplHelperBase::removeEventListener( xListener );
+}
 
 //=====  XServiceInfo  ========================================================
 

File svtools/source/misc/embedhlp.cxx

 						return String();
 					uno::Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW );
 					uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems());
-					int nCoordinateCount = aCooSysSeq.getLength();
+					// IA2 CWS. Unused: int nCoordinateCount = aCooSysSeq.getLength();
 					sal_Bool bGetChartType = sal_False;
 					for( sal_Int32 nCooSysIdx=0; nCooSysIdx<aCooSysSeq.getLength(); ++nCooSysIdx )
 					{

File toolkit/source/awt/vclxaccessiblecomponent.cxx

 				aFont = pWindow->GetFont();
 			nColor = aFont.GetColor().GetColor();
 			// COL_AUTO is not very meaningful for AT
-			if ( nColor == COL_AUTO)
+			if ( nColor == (sal_Int32)COL_AUTO)
 				nColor = pWindow->GetTextColor().GetColor();
 		}
 	}

File vcl/source/window/menu.cxx

                     pFloat->GrabFocus();
                     pFloat->KillActivePopup();
 					// IA2 CWS. Probably needed for notifications?
-		    		pFloat->ChangeHighlightItem( pFloat->GetHighlightedItem(), FALSE);
+		    		pFloat->ChangeHighlightItem( pFloat->GetHighlightedItem(), sal_False);
                 }
             }
         }