INTEGRATION: CWS sb59 (1.4.24); FILE MERGED

2006/08/29 14:08:18 sb 1.4.24.1: #i67487# Made code warning-free (wntmsci10).
This commit is contained in:
Oliver Bolte 2006-10-12 10:20:16 +00:00
parent d69607b49b
commit 0041c0b8ac

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: inplaceobj.cxx,v $ * $RCSfile: inplaceobj.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: obo $ $Date: 2006-09-17 00:40:38 $ * last change: $Author: obo $ $Date: 2006-10-12 11:20:16 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -71,7 +71,7 @@ void SAL_CALL OCommonEmbeddedObject::setObjectRectangles( const awt::Rectangle&
if ( m_nObjectState != embed::EmbedStates::INPLACE_ACTIVE if ( m_nObjectState != embed::EmbedStates::INPLACE_ACTIVE
&& m_nObjectState != embed::EmbedStates::UI_ACTIVE ) && m_nObjectState != embed::EmbedStates::UI_ACTIVE )
throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object is not activated inplace!\n" ), throw embed::WrongStateException( ::rtl::OUString::createFromAscii( "The object is not activated inplace!\n" ),
uno::Reference< uno::XInterface >( reinterpret_cast< ::cppu::OWeakObject* >(this) ) ); uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
awt::Rectangle aNewRectToShow = GetRectangleInterception( aPosRect, aClipRect ); awt::Rectangle aNewRectToShow = GetRectangleInterception( aPosRect, aClipRect );
awt::Rectangle aOldRectToShow = GetRectangleInterception( m_aOwnRectangle, m_aClipRectangle ); awt::Rectangle aOldRectToShow = GetRectangleInterception( m_aOwnRectangle, m_aClipRectangle );