diff options
Diffstat (limited to 'framework/source/services/frame.cxx')
| -rw-r--r-- | framework/source/services/frame.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 621d6ffce871..144368b54b79 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -822,7 +822,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& m_xContainerWindow = xWindow; // if window is initially visible, we will never get a windowShowing event - Window* pWindow = VCLUnoHelper::GetWindow(xWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow); if (pWindow && pWindow->IsVisible()) m_bIsHidden = false; @@ -1506,7 +1506,7 @@ sal_Bool SAL_CALL Frame::setComponent( const css::uno::Reference< css::awt::X css::uno::Reference< css::awt::XWindow > xContainerWindow = m_xContainerWindow; css::uno::Reference< css::awt::XWindow > xOldComponentWindow = m_xComponentWindow; css::uno::Reference< css::frame::XController > xOldController = m_xController; - Window* pOwnWindow = VCLUnoHelper::GetWindow( xContainerWindow ); + vcl::Window* pOwnWindow = VCLUnoHelper::GetWindow( xContainerWindow ); bool bHadFocus = pOwnWindow->HasChildPathFocus(); bool bWasConnected = m_bConnected; aReadLock.clear(); @@ -2410,13 +2410,13 @@ void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& aEvent ) t // Only if no activation is done, deactivations have to be processed if the activated window // is a parent window of the last active Window! SolarMutexClearableGuard aSolarGuard; - Window* pFocusWindow = Application::GetFocusWindow(); + vcl::Window* pFocusWindow = Application::GetFocusWindow(); if ( xContainerWindow.is() && xParent.is() && !css::uno::Reference< css::frame::XDesktop >( xParent, css::uno::UNO_QUERY ).is() ) { css::uno::Reference< css::awt::XWindow > xParentWindow = xParent->getContainerWindow(); - Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); //#i70261#: dialogs opened from an OLE object will cause a deactivate on the frame of the OLE object // on Solaris/Linux at that time pFocusWindow is still NULL because the focus handling is different; right after // the deactivation the focus will be set into the dialog! @@ -2969,7 +2969,7 @@ void Frame::implts_setIconOnWindow() /* SAFE AREA ----------------------------------------------------------------------------------------------- */ { SolarMutexGuard aSolarGuard; - Window* pWindow = (VCLUnoHelper::GetWindow( xContainerWindow )); + vcl::Window* pWindow = (VCLUnoHelper::GetWindow( xContainerWindow )); if( ( pWindow != NULL ) && ( pWindow->GetType() == WINDOW_WORKWINDOW ) |