diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /vbahelper | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'vbahelper')
| -rw-r--r-- | vbahelper/source/msforms/vbacontrol.cxx | 4 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index c3ad1300e9b8..e0a62ad9d256 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -499,7 +499,7 @@ static Pointer lcl_msoPointerToLOPointer( long msoPointerStyle ) ScVbaControl::getMousePointer() throw (::com::sun::star::uno::RuntimeException, std::exception) { PointerStyle eType = POINTER_ARROW; // default ? - Window* pWindow = VCLUnoHelper::GetWindow( getWindowPeer() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( getWindowPeer() ); if ( pWindow ) { eType = pWindow->GetPointer().GetStyle(); @@ -510,7 +510,7 @@ ScVbaControl::getMousePointer() throw (::com::sun::star::uno::RuntimeException, void SAL_CALL ScVbaControl::setMousePointer( ::sal_Int32 _mousepointer ) throw (::com::sun::star::uno::RuntimeException, std::exception) { - Window* pWindow = VCLUnoHelper::GetWindow( getWindowPeer() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( getWindowPeer() ); if ( pWindow ) { Pointer aPointer( POINTER_ARROW ); diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 7bbe9e50924e..894b6ba8e6c0 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -686,7 +686,7 @@ sal_Int32 getPointerStyle( const uno::Reference< frame::XModel >& xModel ) const uno::Reference< frame::XFrame > xFrame ( xController->getFrame(), uno::UNO_SET_THROW ); const uno::Reference< awt::XWindow > xWindow ( xFrame->getContainerWindow(), uno::UNO_SET_THROW ); // why the heck isn't there an XWindowPeer::getPointer, but a setPointer only? - const Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + const vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) nPointerStyle = pWindow->GetSystemWindow()->GetPointer().GetStyle(); } @@ -731,7 +731,7 @@ void setCursorHelper( const uno::Reference< frame::XModel >& xModel, const Point const uno::Reference< frame::XFrame > xFrame ( (*controller)->getFrame(), uno::UNO_SET_THROW ); const uno::Reference< awt::XWindow > xWindow ( xFrame->getContainerWindow(), uno::UNO_SET_THROW ); - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); SAL_WARN_IF( !pWindow, "vbahelper", "ScVbaApplication::setCursor: no window!" ); if ( !pWindow ) continue; @@ -923,7 +923,7 @@ double UserFormGeometryHelper::implGetSize( bool bHeight, bool bOuter ) const 'InnerHeight'), but the window API returns the inner size. */ if( mbDialog && bOuter ) { - if( const Window* pWindow = VCLUnoHelper::GetWindow( mxWindow ) ) + if( const vcl::Window* pWindow = VCLUnoHelper::GetWindow( mxWindow ) ) { Rectangle aOuterRect = pWindow->GetWindowExtentsRelative( NULL ); aSizePixel = awt::Size( aOuterRect.getWidth(), aOuterRect.getHeight() ); @@ -947,7 +947,7 @@ void UserFormGeometryHelper::implSetSize( double fSize, bool bHeight, bool bOute pixel height to get the same result. */ if ( mbDialog && bOuter ) { - if( const Window* pWindow = VCLUnoHelper::GetWindow( mxWindow ) ) + if( const vcl::Window* pWindow = VCLUnoHelper::GetWindow( mxWindow ) ) { Rectangle aOuterRect = pWindow->GetWindowExtentsRelative( NULL ); if( !aOuterRect.IsEmpty() ) |