summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-23 11:20:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-23 14:11:39 +0300
commit827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch)
tree3a84ccc45d54607c61328b18f58f914c1d6ec240 /framework
parent7cbbefae224ab85343accb42b03f9431ec693a83 (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 'framework')
-rw-r--r--framework/inc/classes/fwktabwindow.hxx8
-rw-r--r--framework/inc/helper/vclstatusindicator.hxx4
-rw-r--r--framework/inc/uielement/complextoolbarcontroller.hxx4
-rw-r--r--framework/inc/uielement/statusbar.hxx2
-rw-r--r--framework/source/classes/fwktabwindow.cxx8
-rw-r--r--framework/source/classes/menumanager.cxx4
-rw-r--r--framework/source/dispatch/closedispatcher.cxx4
-rw-r--r--framework/source/dispatch/menudispatcher.cxx4
-rw-r--r--framework/source/dispatch/windowcommanddispatch.cxx4
-rw-r--r--framework/source/helper/persistentwindowstate.cxx4
-rw-r--r--framework/source/helper/statusindicatorfactory.cxx2
-rw-r--r--framework/source/helper/tagwindowasmodified.cxx2
-rw-r--r--framework/source/helper/titlebarupdate.cxx6
-rw-r--r--framework/source/helper/vclstatusindicator.cxx6
-rw-r--r--framework/source/inc/pattern/window.hxx6
-rw-r--r--framework/source/layoutmanager/helpers.cxx12
-rw-r--r--framework/source/layoutmanager/helpers.hxx6
-rw-r--r--framework/source/layoutmanager/layoutmanager.cxx36
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.cxx84
-rw-r--r--framework/source/layoutmanager/toolbarlayoutmanager.hxx2
-rw-r--r--framework/source/loadenv/loadenv.cxx10
-rw-r--r--framework/source/services/frame.cxx10
-rw-r--r--framework/source/services/tabwindowservice.cxx2
-rw-r--r--framework/source/services/taskcreatorsrv.cxx2
-rw-r--r--framework/source/tabwin/tabwindow.cxx10
-rw-r--r--framework/source/uielement/addonstoolbarmanager.cxx4
-rw-r--r--framework/source/uielement/addonstoolbarwrapper.cxx4
-rw-r--r--framework/source/uielement/comboboxtoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/complextoolbarcontroller.cxx2
-rw-r--r--framework/source/uielement/dropdownboxtoolbarcontroller.cxx6
-rw-r--r--framework/source/uielement/edittoolbarcontroller.cxx4
-rw-r--r--framework/source/uielement/menubarmanager.cxx2
-rw-r--r--framework/source/uielement/progressbarwrapper.cxx8
-rw-r--r--framework/source/uielement/spinfieldtoolbarcontroller.cxx4
-rw-r--r--framework/source/uielement/statusbar.cxx2
-rw-r--r--framework/source/uielement/statusbarwrapper.cxx4
-rw-r--r--framework/source/uielement/toolbarmanager.cxx14
-rw-r--r--framework/source/uielement/toolbarsmenucontroller.cxx2
-rw-r--r--framework/source/uielement/toolbarwrapper.cxx4
39 files changed, 154 insertions, 154 deletions
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 323dc9d8247a..d727db4231ec 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.hxx
@@ -44,7 +44,7 @@ namespace framework
class FwkTabControl : public TabControl
{
public:
- FwkTabControl(Window* pParent);
+ FwkTabControl(vcl::Window* pParent);
void BroadcastEvent( sal_uLong nEvent );
};
@@ -63,7 +63,7 @@ private:
public:
FwkTabPage(
- Window* pParent,
+ vcl::Window* pParent,
const OUString& rPageURL,
const css::uno::Reference< css::awt::XContainerWindowEventHandler >& rEventHdl,
const css::uno::Reference< css::awt::XContainerWindowProvider >& rProvider );
@@ -93,7 +93,7 @@ struct TabEntry
typedef std::vector< TabEntry* > TabEntryList;
-class FwkTabWindow : public Window
+class FwkTabWindow : public vcl::Window
{
private:
FwkTabControl m_aTabCtrl;
@@ -109,7 +109,7 @@ private:
DECL_DLLPRIVATE_LINK(DeactivatePageHdl, void *);
public:
- FwkTabWindow( Window* pParent );
+ FwkTabWindow( vcl::Window* pParent );
virtual ~FwkTabWindow();
void AddEventListener( const Link& rEventListener );
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index c2102089b99a..634c66a5b1f5 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -94,8 +94,8 @@ class VCLStatusIndicator : public ::cppu::WeakImplHelper1< css::task::XStatusIn
private:
- static void impl_recalcLayout(Window* pStatusBar ,
- Window* pParentWindow);
+ static void impl_recalcLayout(vcl::Window* pStatusBar ,
+ vcl::Window* pParentWindow);
};
} // namespace framework
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index b849233e7102..88084f8d1661 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -30,7 +30,7 @@
#include <tools/link.hxx>
class ToolBox;
-class Window;
+namespace vcl { class Window; }
namespace framework
{
@@ -74,7 +74,7 @@ class ComplexToolbarController : public svt::ToolboxController
DECL_STATIC_LINK( ComplexToolbarController, Notify_Impl, NotifyInfo* );
protected:
- static sal_Int32 getFontSizePixel( const Window* pWindow );
+ static sal_Int32 getFontSizePixel( const vcl::Window* pWindow );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommand( const OUString& aCommand ) const;
void addNotifyInfo( const OUString& aEventName,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& xDispatch,
diff --git a/framework/inc/uielement/statusbar.hxx b/framework/inc/uielement/statusbar.hxx
index 404107850265..be957eaedfb7 100644
--- a/framework/inc/uielement/statusbar.hxx
+++ b/framework/inc/uielement/statusbar.hxx
@@ -31,7 +31,7 @@ class FrameworkStatusBar : public StatusBar
{
public:
- FrameworkStatusBar( Window* pParent,
+ FrameworkStatusBar( vcl::Window* pParent,
WinBits nWinBits );
virtual ~FrameworkStatusBar();
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 64973e673f3f..54fde624f95f 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -48,7 +48,7 @@ namespace framework
{
// class FwkTabControl ---------------------------------------------------
-FwkTabControl::FwkTabControl(Window* pParent)
+FwkTabControl::FwkTabControl(vcl::Window* pParent)
: TabControl(pParent)
{
}
@@ -66,7 +66,7 @@ void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
// class FwkTabPage ------------------------------------------------
FwkTabPage::FwkTabPage(
- Window* pParent, const OUString& rPageURL,
+ vcl::Window* pParent, const OUString& rPageURL,
const css::uno::Reference< css::awt::XContainerWindowEventHandler >& rEventHdl,
const css::uno::Reference< css::awt::XContainerWindowProvider >& rProvider ) :
@@ -104,7 +104,7 @@ void FwkTabPage::CreateDialog()
uno::Reference< awt::XWindowPeer > xWinPeer( xPageControl->getPeer() );
if ( xWinPeer.is() )
{
- Window* pWindow = VCLUnoHelper::GetWindow( xWinPeer );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWinPeer );
if ( pWindow )
pWindow->SetStyle( pWindow->GetStyle() | WB_DIALOGCONTROL | WB_CHILDDLGCTRL );
}
@@ -172,7 +172,7 @@ void FwkTabPage::Resize()
}
// class FwkTabWindow ---------------------------------------------
-FwkTabWindow::FwkTabWindow( Window* pParent )
+FwkTabWindow::FwkTabWindow( vcl::Window* pParent )
: Window(pParent)
, m_aTabCtrl(this)
{
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 4a5b1395d39b..965d4895762c 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -626,7 +626,7 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XCompone
if ( xFrame == xCurrentFrame )
nActiveItemId = nItemId;
- Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
+ vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
if ( pWin && pWin->IsVisible() )
{
aNewWindowListVector.push_back( pWin->GetText() );
@@ -846,7 +846,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
if ( xFrame.is() && nTaskId == nCurItemId )
{
- Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
+ vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
pWin->GrabFocus();
pWin->ToTop( TOTOP_RESTOREWHENMIN );
break;
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index dda9c32a37f0..86e42f1182f5 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -70,7 +70,7 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponent
uno::Reference<awt::XWindow> xWindow = xTarget->getContainerWindow();
if (xWindow.is())
{
- Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
if (pWindow->IsSystemWindow())
m_pSysWindow = dynamic_cast<SystemWindow*>(pWindow);
}
@@ -584,7 +584,7 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig
// Because sometimes VCL create "implicit border windows" as parents even we created
// a simple XWindow using the toolkit only .-(
SolarMutexGuard aSolarLock;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if (
(pWindow ) &&
(pWindow->IsSystemWindow())
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index 748d89c5b230..62a550e0adad 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -137,7 +137,7 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro
aGuard.reset();
{
- Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow );
while ( pWindow && !pWindow->IsSystemWindow() )
pWindow = pWindow->GetParent();
@@ -215,7 +215,7 @@ bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, bool bMenuFromResource
if ( xFrame.is() )
{
uno::Reference< ::com::sun::star::awt::XWindow >xContainerWindow = xFrame->getContainerWindow();
- Window* pWindow = NULL;
+ vcl::Window* pWindow = NULL;
SolarMutexGuard aSolarGuard;
{
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 725151cceba5..1619051cd74e 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -62,7 +62,7 @@ void WindowCommandDispatch::impl_startListening()
{
SolarMutexGuard aSolarLock;
- Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
if ( ! pWindow)
return;
@@ -82,7 +82,7 @@ void WindowCommandDispatch::impl_stopListening()
{
SolarMutexGuard aSolarLock;
- Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
if (!pWindow)
return;
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 1a9e07e2173b..2c1d3038beb1 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -230,7 +230,7 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::
// SOLAR SAFE -> ------------------------
SolarMutexGuard aSolarGuard;
- Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
// check for system window is necessary to guarantee correct pointer cast!
if (
(pWindow ) &&
@@ -261,7 +261,7 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere
// SOLAR SAFE -> ------------------------
SolarMutexGuard aSolarGuard;
- Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
if (!pWindow)
return;
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index a2338d44c787..b0b5f3d9c060 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -374,7 +374,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
impl_showProgress();
SolarMutexGuard aSolarGuard;
- Window* pWindow = VCLUnoHelper::GetWindow(xParentWindow);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xParentWindow);
if ( pWindow )
{
bool bForceFrontAndFocus(officecfg::Office::Common::View::NewDocumentHandling::ForceFocusAndToFront::get(xContext));
diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx
index 4200de514b30..8048b084d276 100644
--- a/framework/source/helper/tagwindowasmodified.cxx
+++ b/framework/source/helper/tagwindowasmodified.cxx
@@ -89,7 +89,7 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent
// SYNCHRONIZED ->
SolarMutexGuard aSolarGuard;
- Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
if ( ! pWindow)
return;
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index cd7ef0f3a9ea..abd968674c08 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -179,7 +179,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
// VCL SYNCHRONIZED ->
SolarMutexGuard aSolarGuard;
- Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
+ vcl::Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
if (
( pWindow ) &&
( pWindow->GetType() == WINDOW_WORKWINDOW )
@@ -296,7 +296,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra
// VCL SYNCHRONIZED ->
SolarMutexGuard aSolarGuard;
- Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
+ vcl::Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
if (
( pWindow ) &&
( pWindow->GetType() == WINDOW_WORKWINDOW )
@@ -330,7 +330,7 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr
// VCL SYNCHRONIZED ->
SolarMutexGuard aSolarGuard;
- Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
+ vcl::Window* pWindow = (VCLUnoHelper::GetWindow( xWindow ));
if (
( pWindow ) &&
( pWindow->GetType() == WINDOW_WORKWINDOW )
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index a2b062509571..856ad02b02fc 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -46,7 +46,7 @@ void SAL_CALL VCLStatusIndicator::start(const OUString& sText ,
{
SolarMutexGuard aSolarGuard;
- Window* pParentWindow = VCLUnoHelper::GetWindow(m_xParentWindow);
+ vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(m_xParentWindow);
if (!m_pStatusBar)
m_pStatusBar = new StatusBar(pParentWindow, WB_3DLOOK|WB_BORDER);
@@ -127,8 +127,8 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue)
m_pStatusBar->SetProgressValue(nPercent);
}
-void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar ,
- Window* pParentWindow)
+void VCLStatusIndicator::impl_recalcLayout(vcl::Window* pStatusBar ,
+ vcl::Window* pParentWindow)
{
if (
(!pStatusBar ) ||
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index 71744ed546ec..43afe9d9f20a 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -51,7 +51,7 @@ static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& x
{
SolarMutexGuard aSolarGuard;
- Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
// check for system window is necessary to guarantee correct pointer cast!
if (pWindow!=NULL && pWindow->IsSystemWindow())
{
@@ -77,7 +77,7 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind
// SOLAR SAFE -> ----------------------------
SolarMutexGuard aSolarGuard;
- Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
// check for system window is necessary to guarantee correct pointer cast!
if (
(pWindow ) &&
@@ -107,7 +107,7 @@ static bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWindow)
// Because sometimes VCL create "implicit border windows" as parents even we created
// a simple XWindow using the toolkit only .-(
SolarMutexGuard aSolarGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if (
(pWindow ) &&
(pWindow->IsSystemWindow())
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index f5020bb22f3e..c7958acafeb1 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -79,7 +79,7 @@ bool isHorizontalDockingArea( const sal_Int32 nDockArea )
return isHorizontalDockingArea(static_cast< ui::DockingArea >( nDockArea ));
}
-OUString retrieveToolbarNameFromHelpURL( Window* pWindow )
+OUString retrieveToolbarNameFromHelpURL( vcl::Window* pWindow )
{
OUString aToolbarName;
@@ -99,7 +99,7 @@ OUString retrieveToolbarNameFromHelpURL( Window* pWindow )
return aToolbarName;
}
-ToolBox* getToolboxPtr( Window* pWindow )
+ToolBox* getToolboxPtr( vcl::Window* pWindow )
{
ToolBox* pToolbox(NULL);
if ( pWindow->GetType() == WINDOW_TOOLBOX )
@@ -107,7 +107,7 @@ ToolBox* getToolboxPtr( Window* pWindow )
return pToolbox;
}
-Window* getWindowFromXUIElement( const uno::Reference< ui::XUIElement >& xUIElement )
+vcl::Window* getWindowFromXUIElement( const uno::Reference< ui::XUIElement >& xUIElement )
{
SolarMutexGuard aGuard;
uno::Reference< awt::XWindow > xWindow;
@@ -118,7 +118,7 @@ Window* getWindowFromXUIElement( const uno::Reference< ui::XUIElement >& xUIElem
SystemWindow* getTopSystemWindow( const uno::Reference< awt::XWindow >& xWindow )
{
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
while ( pWindow && !pWindow->IsSystemWindow() )
pWindow = pWindow->GetParent();
@@ -150,7 +150,7 @@ bool lcl_checkUIElement(const uno::Reference< ui::XUIElement >& xUIElement, awt:
_xWindow.set( xUIElement->getRealInterface(), uno::UNO_QUERY );
_rPosSize = _xWindow->getPosSize();
- Window* pWindow = VCLUnoHelper::GetWindow( _xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( _xWindow );
if ( pWindow->GetType() == WINDOW_TOOLBOX )
{
::Size aSize = ((ToolBox*)pWindow)->CalcWindowSizePixel( 1 );
@@ -291,7 +291,7 @@ bool implts_isFrameOrWindowTop( const uno::Reference< frame::XFrame >& xFrame )
// #i76867# top and system window is required.
SolarMutexGuard aGuard;
uno::Reference< awt::XWindow > xWindow( xWindowCheck, uno::UNO_QUERY );
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
return ( pWindow && pWindow->IsSystemWindow() );
}
diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx
index 14264d48e89d..7acb0266ba4f 100644
--- a/framework/source/layoutmanager/helpers.hxx
+++ b/framework/source/layoutmanager/helpers.hxx
@@ -52,9 +52,9 @@ bool isToolboxHorizontalAligned( ToolBox* pToolBox );
bool isReverseOrderDockingArea( const sal_Int32 nDockArea );
bool isHorizontalDockingArea( const sal_Int32 nDockArea );
bool isHorizontalDockingArea( const ::com::sun::star::ui::DockingArea& nDockArea );
-OUString retrieveToolbarNameFromHelpURL( Window* pWindow );
-ToolBox* getToolboxPtr( Window* pWindow );
-Window* getWindowFromXUIElement( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& xUIElement );
+OUString retrieveToolbarNameFromHelpURL( vcl::Window* pWindow );
+ToolBox* getToolboxPtr( vcl::Window* pWindow );
+vcl::Window* getWindowFromXUIElement( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement >& xUIElement );
SystemWindow* getTopSystemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& xWindow );
bool equalRectangles( const css::awt::Rectangle& rRect1, const css::awt::Rectangle& rRect2 );
void setZeroRectangle( ::Rectangle& rRect );
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index a9fad1ae8898..eb5891947eb7 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -691,7 +691,7 @@ void LayoutManager::implts_writeWindowStateData( const OUString& aName, const UI
::Size LayoutManager::implts_getContainerWindowOutputSize()
{
::Size aContainerWinSize;
- Window* pContainerWindow( 0 );
+ vcl::Window* pContainerWindow( 0 );
// Retrieve output size from container Window
SolarMutexGuard aGuard;
@@ -884,10 +884,10 @@ void LayoutManager::implts_createProgressBar()
Reference< awt::XWindow > xStatusBarWindow = pWrapper->getStatusBar();
SolarMutexGuard aGuard;
- Window* pStatusBarWnd = VCLUnoHelper::GetWindow( xStatusBarWindow );
+ vcl::Window* pStatusBarWnd = VCLUnoHelper::GetWindow( xStatusBarWindow );
if ( !pStatusBarWnd )
{
- Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow );
if ( pWindow )
{
StatusBar* pStatusBar = new StatusBar( pWindow, WinBits( WB_LEFT | WB_3DLOOK ) );
@@ -970,11 +970,11 @@ void LayoutManager::implts_setStatusBarPosSize( const ::Point& rPos, const ::Siz
if ( xWindow.is() )
{
SolarMutexGuard aGuard;
- Window* pParentWindow = VCLUnoHelper::GetWindow( xContainerWindow );
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pParentWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pParentWindow && ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR ))
{
- Window* pOldParentWindow = pWindow->GetParent();
+ vcl::Window* pOldParentWindow = pWindow->GetParent();
if ( pParentWindow != pOldParentWindow )
pWindow->SetParent( pParentWindow );
((StatusBar *)pWindow)->SetPosSizePixel( rPos, rSize );
@@ -1012,7 +1012,7 @@ bool LayoutManager::implts_showProgressBar()
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
SolarMutexGuard aGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow )
{
if ( !pWindow->IsVisible() )
@@ -1052,7 +1052,7 @@ bool LayoutManager::implts_hideProgressBar()
implts_readStatusBarState( STATUS_BAR_ALIAS );
bHideStatusBar = !m_aStatusBarElement.m_bVisible;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->IsVisible() && ( bHideStatusBar || bInternalStatusBar ))
{
implts_setOffset( 0 );
@@ -1077,7 +1077,7 @@ bool LayoutManager::implts_showStatusBar( bool bStoreState )
Reference< awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY );
SolarMutexGuard aGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && !pWindow->IsVisible() )
{
implts_setOffset( pWindow->GetSizePixel().Height() );
@@ -1103,7 +1103,7 @@ bool LayoutManager::implts_hideStatusBar( bool bStoreState )
Reference< awt::XWindow > xWindow( xStatusBar->getRealInterface(), UNO_QUERY );
SolarMutexGuard aGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->IsVisible() )
{
implts_setOffset( 0 );
@@ -1272,7 +1272,7 @@ throw ( RuntimeException, std::exception )
if ( pToolbarManager )
pToolbarManager->resetDockingArea();
- Window* pContainerWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pContainerWindow )
pContainerWindow->RemoveChildEventListener( LINK( this, LayoutManager, WindowEventListener ) );
}
@@ -1294,7 +1294,7 @@ throw ( RuntimeException, std::exception )
// and we get no notification anymore
{
SolarMutexGuard aGuard;
- Window* pContainerWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
+ vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
if( pContainerWindow )
m_bParentWindowVisible = pContainerWindow->IsVisible();
}
@@ -1310,7 +1310,7 @@ throw ( RuntimeException, std::exception )
SolarMutexGuard aGuard;
// Add layout manager as listener to get notifications about toolbar button activties
- Window* pContainerWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
+ vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
if ( pContainerWindow )
pContainerWindow->AddChildEventListener( LINK( this, LayoutManager, WindowEventListener ) );
@@ -1365,8 +1365,8 @@ void LayoutManager::implts_reparentChildWindows()
if ( xStatusBarWindow.is() )
{
SolarMutexGuard aGuard;
- Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
- Window* pWindow = VCLUnoHelper::GetWindow( xStatusBarWindow );
+ vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xStatusBarWindow );
if ( pWindow && pContainerWindow )
pWindow->SetParent( pContainerWindow );
}
@@ -1392,7 +1392,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent )
if ( pEvent && pEvent->ISA( VclWindowEvent ))
{
- Window* pWindow = static_cast< VclWindowEvent* >(pEvent)->GetWindow();
+ vcl::Window* pWindow = static_cast< VclWindowEvent* >(pEvent)->GetWindow();
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
{
SolarMutexClearableGuard aReadLock;
@@ -1644,7 +1644,7 @@ throw (uno::RuntimeException, std::exception)
// we need VCL here to pass special flags to Show()
SolarMutexGuard aGuard;
Reference< awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow )
{
pWindow->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
@@ -2102,7 +2102,7 @@ throw (RuntimeException, std::exception)
Reference< awt::XWindow > xWindow( m_aStatusBarElement.m_xUIElement->getRealInterface(), UNO_QUERY );
if ( xWindow.is() )
{
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->IsVisible() )
return sal_True;
else
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index c936f7ae05c2..a41640004164 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -281,7 +281,7 @@ Rectangle ToolbarLayoutManager::implts_calcDockingArea()
{
SolarMutexGuard aGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && !xDockWindow->isFloating() && pConstIter->m_bVisible && !pConstIter->m_bMasterHide )
{
awt::Rectangle aPosSize = xWindow->getPosSize();
@@ -533,7 +533,7 @@ bool ToolbarLayoutManager::createToolbar( const OUString& rResourceURL )
SvtCommandOptions aCmdOptions;
SolarMutexGuard aGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
{
ToolBox* pToolbar = (ToolBox *)pWindow;
@@ -660,7 +660,7 @@ bool ToolbarLayoutManager::showToolbar( const OUString& rResourceURL )
UIElement aUIElement = implts_findToolbar( rResourceURL );
SolarMutexGuard aGuard;
- Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement );
+ vcl::Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement );
// Addons appear to need to be populated at start, but we don't
// want to populate them with (scaled) images until later.
@@ -691,7 +691,7 @@ bool ToolbarLayoutManager::hideToolbar( const OUString& rResourceURL )
UIElement aUIElement = implts_findToolbar( rResourceURL );
SolarMutexGuard aGuard;
- Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement );
+ vcl::Window* pWindow = getWindowFromXUIElement( aUIElement.m_xUIElement );
if ( pWindow )
{
pWindow->Show( false );
@@ -748,7 +748,7 @@ void ToolbarLayoutManager::setFloatingToolbarsVisibility( bool bVisible )
UIElementVector::iterator pIter;
for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end(); ++pIter )
{
- Window* pWindow = getWindowFromXUIElement( pIter->m_xUIElement );
+ vcl::Window* pWindow = getWindowFromXUIElement( pIter->m_xUIElement );
if ( pWindow && pIter->m_bFloating )
{
if ( bVisible )
@@ -779,7 +779,7 @@ void ToolbarLayoutManager::setVisible( bool bVisible )
implts_setLayoutDirty();
}
- Window* pWindow = getWindowFromXUIElement( pIter->m_xUIElement );
+ vcl::Window* pWindow = getWindowFromXUIElement( pIter->m_xUIElement );
if ( pWindow )
{
bool bSetVisible( pIter->m_bVisible && bVisible );
@@ -817,7 +817,7 @@ bool ToolbarLayoutManager::dockToolbar( const OUString& rResourceURL, ui::Dockin
if ( !xDockWindow->isFloating() )
{
- Window* pWindow( 0 );
+ vcl::Window* pWindow( 0 );
ToolBox* pToolBox( 0 );
{
@@ -1158,7 +1158,7 @@ void ToolbarLayoutManager::implts_createAddonsToolBars()
{
// Set generic title for add-on toolbar
SolarMutexGuard aGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow->GetText().isEmpty() )
pWindow->SetText( aGenericAddonTitle );
if ( pWindow->GetType() == WINDOW_TOOLBOX )
@@ -1315,7 +1315,7 @@ void ToolbarLayoutManager::implts_createCustomToolBar( const OUString& aTbxResNa
{
SolarMutexGuard aGuard;
- Window* pWindow = getWindowFromXUIElement( xUIElement );
+ vcl::Window* pWindow = getWindowFromXUIElement( xUIElement );
if ( pWindow )
pWindow->SetText( aTitle );
}
@@ -1326,11 +1326,11 @@ void ToolbarLayoutManager::implts_reparentToolbars()
{
SolarMutexClearableGuard aWriteLock;
UIElementVector aUIElementVector = m_aUIElements;
- Window* pContainerWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
- Window* pTopDockWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_TOP] );
- Window* pBottomDockWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_BOTTOM] );
- Window* pLeftDockWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_LEFT] );
- Window* pRightDockWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_RIGHT] );
+ vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
+ vcl::Window* pTopDockWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_TOP] );
+ vcl::Window* pBottomDockWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_BOTTOM] );
+ vcl::Window* pLeftDockWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_LEFT] );
+ vcl::Window* pRightDockWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[ui::DockingArea_DOCKINGAREA_RIGHT] );
aWriteLock.clear();
SolarMutexGuard aGuard;
@@ -1357,7 +1357,7 @@ void ToolbarLayoutManager::implts_reparentToolbars()
{
}
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow )
{
// Reparent our child windows according to their current state.
@@ -1401,7 +1401,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno
uno::Reference< awt::XDockableWindow > xDockWindow( rDockWindow );
uno::Reference< awt::XWindow2 > xWindow( xDockWindow, uno::UNO_QUERY );
- Window* pWindow( 0 );
+ vcl::Window* pWindow( 0 );
ToolBox* pToolBox( 0 );
if ( xDockWindow.is() && xWindow.is() )
@@ -1693,10 +1693,10 @@ uno::Reference< awt::XWindow > ToolbarLayoutManager::implts_getXWindow( const OU
return xWindow;
}
-Window* ToolbarLayoutManager::implts_getWindow( const OUString& aName )
+vcl::Window* ToolbarLayoutManager::implts_getWindow( const OUString& aName )
{
uno::Reference< awt::XWindow > xWindow = implts_getXWindow( aName );
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
return pWindow;
}
@@ -1752,7 +1752,7 @@ awt::Point ToolbarLayoutManager::implts_findNextCascadeFloatingPos()
awt::Point aCurrPos( aStartPos );
awt::Rectangle aRect;
- Window* pContainerWindow( 0 );
+ vcl::Window* pContainerWindow( 0 );
if ( xContainerWindow.is() )
{
SolarMutexGuard aGuard;
@@ -1780,7 +1780,7 @@ awt::Point ToolbarLayoutManager::implts_findNextCascadeFloatingPos()
if ( xDockWindow.is() && xDockWindow->isFloating() )
{
SolarMutexGuard aGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->IsVisible() )
{
awt::Rectangle aFloatRect = xWindow->getPosSize();
@@ -2050,7 +2050,7 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D
if ( xWindow.is() )
{
SolarMutexGuard aGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
uno::Reference< awt::XDockableWindow > xDockWindow( xWindow, uno::UNO_QUERY );
if ( pWindow && pIter->m_bVisible && xDockWindow.is() && !pIter->m_bFloating )
aWindowVector.push_back( *pIter ); // docked windows
@@ -2147,8 +2147,8 @@ void ToolbarLayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( ui::D
else
{
SolarMutexClearableGuard aReadLock;
- Window* pContainerWindow( VCLUnoHelper::GetWindow( m_xContainerWindow ));
- Window* pDockingAreaWindow( VCLUnoHelper::GetWindow( m_xDockAreaWindows[DockingArea] ));
+ vcl::Window* pContainerWindow( VCLUnoHelper::GetWindow( m_xContainerWindow ));
+ vcl::Window* pDockingAreaWindow( VCLUnoHelper::GetWindow( m_xDockAreaWindows[DockingArea] ));
aReadLock.clear();
// Calc correct position of the column/row rectangle to be able to compare it with mouse pos/tracking rect
@@ -2245,7 +2245,7 @@ void ToolbarLayoutManager::implts_findNextDockingPos( ui::DockingArea DockingAre
SolarMutexClearableGuard aReadLock;
uno::Reference< awt::XWindow > xDockingWindow( m_xDockAreaWindows[DockingArea] );
::Size aDockingWinSize;
- Window* pDockingWindow( 0 );
+ vcl::Window* pDockingWindow( 0 );
aReadLock.clear();
if (( DockingArea < ui::DockingArea_DOCKINGAREA_TOP ) || ( DockingArea > ui::DockingArea_DOCKINGAREA_RIGHT ))
@@ -2471,7 +2471,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn(
SolarMutexGuard aGuard;
{
uno::Reference< awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i];
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
aMinSize = ((ToolBox *)pWindow)->CalcMinimumWindowSizePixel();
}
@@ -2524,7 +2524,7 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn(
}
SolarMutexClearableGuard aReadLock;
- Window* pDockAreaWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[nDockingArea] );
+ vcl::Window* pDockAreaWindow = VCLUnoHelper::GetWindow( m_xDockAreaWindows[nDockingArea] );
aReadLock.clear();
sal_Int32 nCurrPos( 0 );
@@ -2533,8 +2533,8 @@ void ToolbarLayoutManager::implts_calcWindowPosSizeOnSingleRowColumn(
for ( sal_uInt32 i = 0; i < nCount; i++ )
{
uno::Reference< awt::XWindow > xWindow = rRowColumnWindowData.aRowColumnWindows[i];
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
- Window* pOldParentWindow = pWindow->GetParent();
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pOldParentWindow = pWindow->GetParent();
if ( pDockAreaWindow != pOldParentWindow )
pWindow->SetParent( pDockAreaWindow );
@@ -2592,7 +2592,7 @@ void ToolbarLayoutManager::implts_calcDockingPosSize(
SolarMutexResettableGuard aReadLock;
uno::Reference< awt::XWindow2 > xContainerWindow( m_xContainerWindow );
::Size aContainerWinSize;
- Window* pContainerWindow( 0 );
+ vcl::Window* pContainerWindow( 0 );
::Rectangle aDockingAreaOffsets( m_aDockingAreaOffsets );
aReadLock.clear();
@@ -2609,8 +2609,8 @@ void ToolbarLayoutManager::implts_calcDockingPosSize(
aContainerWinSize = pContainerWindow->GetOutputSizePixel();
}
- Window* pDockWindow( 0 );
- Window* pDockingAreaWindow( 0 );
+ vcl::Window* pDockWindow( 0 );
+ vcl::Window* pDockingAreaWindow( 0 );
ToolBox* pToolBox( 0 );
uno::Reference< awt::XWindow > xWindow( rUIElement.m_xUIElement->getRealInterface(), uno::UNO_QUERY );
uno::Reference< awt::XWindow > xDockingAreaWindow;
@@ -3068,8 +3068,8 @@ framework::ToolbarLayoutManager::DockingOperation ToolbarLayoutManager::implts_d
aReadGuard.clear();
sal_Int32 nDockPosY( 0 );
- Window* pDockingAreaWindow( 0 );
- Window* pContainerWindow( 0 );
+ vcl::Window* pDockingAreaWindow( 0 );
+ vcl::Window* pContainerWindow( 0 );
{
SolarMutexGuard aGuard;
pDockingAreaWindow = VCLUnoHelper::GetWindow( xDockingAreaWindow );
@@ -3263,8 +3263,8 @@ throw (uno::RuntimeException, std::exception)
uno::Reference< awt::XWindow2 > xWindow( e.Source, uno::UNO_QUERY );
aReadGuard.clear();
- Window* pContainerWindow( 0 );
- Window* pWindow( 0 );
+ vcl::Window* pContainerWindow( 0 );
+ vcl::Window* pWindow( 0 );
::Point aMousePos;
{
SolarMutexGuard aGuard;
@@ -3360,7 +3360,7 @@ throw (uno::RuntimeException, std::exception)
::Rectangle aRightDockRect( aTmpRect.X, aTmpRect.Y, ( aTmpRect.X + aTmpRect.Width ), ( aTmpRect.Y + aTmpRect.Height ));
::Rectangle aHotZoneRightDockRect( implts_calcHotZoneRect( aRightDockRect, nMagneticZone ));
- Window* pContainerWindow( VCLUnoHelper::GetWindow( xContainerWindow ) );
+ vcl::Window* pContainerWindow( VCLUnoHelper::GetWindow( xContainerWindow ) );
::Point aMousePos( pContainerWindow->ScreenToOutputPixel( ::Point( e.MousePos.X, e.MousePos.Y )));
if ( aHotZoneTopDockRect.IsInside( aMousePos ))
@@ -3383,7 +3383,7 @@ throw (uno::RuntimeException, std::exception)
eDockingArea = ui::DockingArea_DOCKINGAREA_RIGHT;
// Determine if we have a toolbar and set alignment according to the docking area!
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
ToolBox* pToolBox = 0;
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
pToolBox = (ToolBox *)pWindow;
@@ -3536,7 +3536,7 @@ throw (uno::RuntimeException, std::exception)
if ( bDockingInProgress )
{
SolarMutexGuard aGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( uno::Reference< awt::XWindow >( e.Source, uno::UNO_QUERY ));
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( uno::Reference< awt::XWindow >( e.Source, uno::UNO_QUERY ));
ToolBox* pToolBox = 0;
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
pToolBox = (ToolBox *)pWindow;
@@ -3598,7 +3598,7 @@ throw (uno::RuntimeException, std::exception)
{
{
SolarMutexGuard aGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX )
{
ToolBox* pToolBox = static_cast< ToolBox *>( pWindow );
@@ -3630,7 +3630,7 @@ throw (uno::RuntimeException, std::exception)
aUIDockingElement = m_aDockUIElement;
aReadLock.clear();
- Window* pWindow( 0 );
+ vcl::Window* pWindow( 0 );
ToolBox* pToolBox( 0 );
uno::Reference< awt::XWindow2 > xWindow;
@@ -3857,7 +3857,7 @@ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- Window* pWindow = getWindowFromXUIElement( xUIElement );
+ vcl::Window* pWindow = getWindowFromXUIElement( xUIElement );
if ( pWindow )
pWindow->SetText( aUIName );
}
@@ -4085,7 +4085,7 @@ bool ToolbarLayoutManager::isToolbarLocked( const OUString& rResourceURL )
awt::Size ToolbarLayoutManager::getToolbarSize( const OUString& rResourceURL )
{
- Window* pWindow = implts_getWindow( rResourceURL );
+ vcl::Window* pWindow = implts_getWindow( rResourceURL );
SolarMutexGuard aGuard;
if ( pWindow )
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index b137ac03c6c3..a4aca8fdac00 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -222,7 +222,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
UIElement implts_findToolbar( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xToolbar );
UIElement& impl_findToolbar( const OUString& aName );
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > implts_getXWindow( const OUString& aName );
- Window* implts_getWindow( const OUString& aName );
+ vcl::Window* implts_getWindow( const OUString& aName );
bool implts_insertToolbar( const UIElement& rUIElement );
void implts_setToolbar( const UIElement& rUIElement );
::Size implts_getTopBottomDockingAreaSizes();
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 1616d3b9ab7f..2aa797be911c 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1463,7 +1463,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
if (xModified->isModified())
return css::uno::Reference< css::frame::XFrame >();
- Window* pWindow = VCLUnoHelper::GetWindow(xTask->getContainerWindow());
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xTask->getContainerWindow());
if (pWindow && pWindow->IsInModalMode())
return css::uno::Reference< css::frame::XFrame >();
@@ -1537,7 +1537,7 @@ void LoadEnv::impl_reactForLoadingState()
if (bMinimized)
{
SolarMutexGuard aSolarGuard;
- Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
// check for system window is necessary to guarantee correct pointer cast!
if (pWindow && pWindow->IsSystemWindow())
((WorkWindow*)pWindow)->Minimize();
@@ -1645,7 +1645,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
// <- SAFE ----------------------------------
SolarMutexGuard aSolarGuard;
- Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
if ( pWindow )
{
bool const preview( m_lMediaDescriptor.getUnpackedValueOrDefault(
@@ -1691,7 +1691,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
// SOLAR SAFE ->
SolarMutexClearableGuard aSolarGuard1;
- Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWindow);
if (!pWindow)
return;
@@ -1755,7 +1755,7 @@ void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::aw
// But if we get a valid pointer we can be sure, that it's the system window pointer
// we already checked and used before. Because nobody recycle the same uno reference for
// a new internal c++ implementation ... hopefully .-))
- Window* pWindowCheck = VCLUnoHelper::GetWindow(xWindow);
+ vcl::Window* pWindowCheck = VCLUnoHelper::GetWindow(xWindow);
if (! pWindowCheck)
return;
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 )
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index f445406c0cdb..b7d7b1b5849b 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -522,7 +522,7 @@ FwkTabWindow* TabWindowService::mem_TabWin ()
if ( ! m_xTabWin.is ())
{
- Window* pFakeParent = dynamic_cast< Window* >(Application::GetDefaultDevice ());
+ vcl::Window* pFakeParent = dynamic_cast< vcl::Window* >(Application::GetDefaultDevice ());
m_pTabWin = new FwkTabWindow (pFakeParent);
m_xTabWin = VCLUnoHelper::GetInterface (m_pTabWin);
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index 6d3195b0adee..0e30ef563722 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -218,7 +218,7 @@ void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference<
{
// SYNCHRONIZED ->
SolarMutexGuard aSolarGuard;
- Window* pVCLWindow = VCLUnoHelper::GetWindow(xWindow);
+ vcl::Window* pVCLWindow = VCLUnoHelper::GetWindow(xWindow);
if (pVCLWindow)
pVCLWindow->SetExtendedStyle(WB_EXT_DOCUMENT);
// <- SYNCHRONIZED
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index eb2c8298bf8e..4948ad5dbe99 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -140,7 +140,7 @@ void TabWindow::implts_LayoutWindows() const
TabControl* TabWindow::impl_GetTabControl( const css::uno::Reference< css::awt::XWindow >& rTabControlWindow ) const
{
- Window* pWindow = VCLUnoHelper::GetWindow( rTabControlWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( rTabControlWindow );
if ( pWindow )
return (TabControl *)pWindow;
else
@@ -151,7 +151,7 @@ void TabWindow::impl_SetTitle( const OUString& rTitle )
{
if ( m_xTopWindow.is() )
{
- Window* pWindow = VCLUnoHelper::GetWindow(
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow(
css::uno::Reference< css::awt::XWindow >(
m_xTopWindow, css::uno::UNO_QUERY ));
if ( pWindow )
@@ -387,7 +387,7 @@ throw (css::uno::Exception, css::uno::RuntimeException, std::exception)
xWindow->setPosSize( 0, 0, aSize.Width, aSize.Height, css::awt::PosSize::POSSIZE );
SolarMutexGuard aGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if( pWindow )
pWindow->Show( true );
@@ -509,7 +509,7 @@ throw( css::uno::RuntimeException, std::exception )
if ( m_xContainerWindow.is() )
{
- Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
if ( pWindow )
pWindow->Show();
}
@@ -521,7 +521,7 @@ throw( css::uno::RuntimeException, std::exception )
SolarMutexGuard g;
if ( m_xContainerWindow.is() )
{
- Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( m_xContainerWindow );
if ( pWindow )
pWindow->Hide();
}
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 93c5458c21e0..82e7596c422d 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -348,7 +348,7 @@ void AddonsToolBarManager::FillToolbar( const Sequence< Sequence< PropertyValue
Reference< XWindow > xWindow = xTbxController->createItemWindow( xToolbarWindow );
if ( xWindow.is() )
{
- Window* pItemWin = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pItemWin = VCLUnoHelper::GetWindow( xWindow );
if ( pItemWin )
{
WindowType nType = pItemWin->GetType();
@@ -477,7 +477,7 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve
for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
{
const sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
- Window* pWindow = m_pToolBar->GetItemWindow( nId );
+ vcl::Window* pWindow = m_pToolBar->GetItemWindow( nId );
if ( pWindow )
{
const DataChangedEvent& rDCEvt( *pDataChangedEvent );
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index 798cb3c96867..77987fa3c279 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -109,7 +109,7 @@ void SAL_CALL AddonsToolBarWrapper::initialize( const Sequence< Any >& aArgument
AddonsToolBarManager* pToolBarManager = 0;
{
SolarMutexGuard aSolarMutexGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
if ( pWindow )
{
sal_uLong nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
@@ -151,7 +151,7 @@ Reference< XInterface > SAL_CALL AddonsToolBarWrapper::getRealInterface() throw
AddonsToolBarManager* pToolBarManager = static_cast< AddonsToolBarManager *>( m_xToolBarManager.get() );
if ( pToolBarManager )
{
- Window* pWindow = (Window *)pToolBarManager->GetToolBar();
+ vcl::Window* pWindow = (vcl::Window *)pToolBarManager->GetToolBar();
return Reference< XInterface >( VCLUnoHelper::GetInterface( pWindow ), UNO_QUERY );
}
}
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index ba60e2bd8a19..d80fa5e63fd3 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -53,7 +53,7 @@ namespace framework
class ComboBoxControl : public ComboBox
{
public:
- ComboBoxControl( Window* pParent, WinBits nStyle, IComboBoxListener* pComboBoxListener );
+ ComboBoxControl( vcl::Window* pParent, WinBits nStyle, IComboBoxListener* pComboBoxListener );
virtual ~ComboBoxControl();
virtual void Select() SAL_OVERRIDE;
@@ -68,7 +68,7 @@ class ComboBoxControl : public ComboBox
IComboBoxListener* m_pComboBoxListener;
};
-ComboBoxControl::ComboBoxControl( Window* pParent, WinBits nStyle, IComboBoxListener* pComboBoxListener ) :
+ComboBoxControl::ComboBoxControl( vcl::Window* pParent, WinBits nStyle, IComboBoxListener* pComboBoxListener ) :
ComboBox( pParent, nStyle )
, m_pComboBoxListener( pComboBoxListener )
{
@@ -188,7 +188,7 @@ void ComboboxToolbarController::Select()
{
if ( m_pComboBox->GetEntryCount() > 0 )
{
- Window::PointerState aState = m_pComboBox->GetPointerState();
+ vcl::Window::PointerState aState = m_pComboBox->GetPointerState();
sal_uInt16 nKeyModifier = sal_uInt16( aState.mnState & KEY_MODTYPE );
execute( nKeyModifier );
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index bf0ac99eec8f..7e731b306964 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -266,7 +266,7 @@ void ComplexToolbarController::addNotifyInfo(
}
}
-sal_Int32 ComplexToolbarController::getFontSizePixel( const Window* pWindow )
+sal_Int32 ComplexToolbarController::getFontSizePixel( const vcl::Window* pWindow )
{
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
const vcl::Font& rFont = rSettings.GetAppFont();
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index dc64b4a77020..87bc1d53eb56 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -52,7 +52,7 @@ namespace framework
class ListBoxControl : public ListBox
{
public:
- ListBoxControl( Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener );
+ ListBoxControl( vcl::Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener );
virtual ~ListBoxControl();
virtual void Select() SAL_OVERRIDE;
@@ -65,7 +65,7 @@ class ListBoxControl : public ListBox
IListBoxListener* m_pListBoxListener;
};
-ListBoxControl::ListBoxControl( Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener ) :
+ListBoxControl::ListBoxControl( vcl::Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener ) :
ListBox( pParent, nStyle )
, m_pListBoxListener( pListBoxListener )
{
@@ -172,7 +172,7 @@ void DropdownToolbarController::Select()
{
if ( m_pListBoxControl->GetEntryCount() > 0 )
{
- Window::PointerState aState = m_pListBoxControl->GetPointerState();
+ vcl::Window::PointerState aState = m_pListBoxControl->GetPointerState();
sal_uInt16 nKeyModifier = sal_uInt16( aState.mnState & KEY_MODTYPE );
execute( nKeyModifier );
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 64d1d196ef16..c38a2a5526b6 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -51,7 +51,7 @@ namespace framework
class EditControl : public Edit
{
public:
- EditControl( Window* pParent, WinBits nStyle, IEditListener* pEditListener );
+ EditControl( vcl::Window* pParent, WinBits nStyle, IEditListener* pEditListener );
virtual ~EditControl();
virtual void Modify() SAL_OVERRIDE;
@@ -64,7 +64,7 @@ class EditControl : public Edit
IEditListener* m_pEditListener;
};
-EditControl::EditControl( Window* pParent, WinBits nStyle, IEditListener* pEditListener ) :
+EditControl::EditControl( vcl::Window* pParent, WinBits nStyle, IEditListener* pEditListener ) :
Edit( pParent, nStyle )
, m_pEditListener( pEditListener )
{
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 48626c1794bd..772a662b9a50 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1026,7 +1026,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
xList->getByIndex(i) >>= xFrame;
if ( xFrame.is() && nTaskId == nCurItemId )
{
- Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
+ vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
pWin->GrabFocus();
pWin->ToTop( TOTOP_RESTOREWHENMIN );
break;
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index 011e244d6ec9..8a47769cd667 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -104,7 +104,7 @@ void ProgressBarWrapper::start( const OUString& Text, ::sal_Int32 Range )
if ( xWindow.is() )
{
SolarMutexGuard aSolarMutexGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )
{
StatusBar* pStatusBar = (StatusBar *)pWindow;
@@ -142,7 +142,7 @@ void ProgressBarWrapper::end()
if ( xWindow.is() )
{
SolarMutexGuard aSolarMutexGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )
{
StatusBar* pStatusBar = (StatusBar *)pWindow;
@@ -172,7 +172,7 @@ void ProgressBarWrapper::setText( const OUString& Text )
if ( xWindow.is() )
{
SolarMutexGuard aSolarMutexGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )
{
StatusBar* pStatusBar = (StatusBar *)pWindow;
@@ -225,7 +225,7 @@ void ProgressBarWrapper::setValue( ::sal_Int32 nValue )
if ( xWindow.is() && bSetValue )
{
SolarMutexGuard aSolarMutexGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR )
{
StatusBar* pStatusBar = (StatusBar *)pWindow;
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index ae4fba5d1095..83557df32f01 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -57,7 +57,7 @@ namespace framework
class SpinfieldControl : public SpinField
{
public:
- SpinfieldControl( Window* pParent, WinBits nStyle, ISpinfieldListener* pSpinFieldListener );
+ SpinfieldControl( vcl::Window* pParent, WinBits nStyle, ISpinfieldListener* pSpinFieldListener );
virtual ~SpinfieldControl();
virtual void Up() SAL_OVERRIDE;
@@ -76,7 +76,7 @@ class SpinfieldControl : public SpinField
ISpinfieldListener* m_pSpinFieldListener;
};
-SpinfieldControl::SpinfieldControl( Window* pParent, WinBits nStyle, ISpinfieldListener* pSpinFieldListener ) :
+SpinfieldControl::SpinfieldControl( vcl::Window* pParent, WinBits nStyle, ISpinfieldListener* pSpinFieldListener ) :
SpinField( pParent, nStyle )
, m_pSpinFieldListener( pSpinFieldListener )
{
diff --git a/framework/source/uielement/statusbar.cxx b/framework/source/uielement/statusbar.cxx
index 03336916a672..75d40a2bdeca 100644
--- a/framework/source/uielement/statusbar.cxx
+++ b/framework/source/uielement/statusbar.cxx
@@ -25,7 +25,7 @@ namespace framework
{
FrameworkStatusBar::FrameworkStatusBar(
- Window* pParent,
+ vcl::Window* pParent,
WinBits nWinBits ) :
StatusBar( pParent, nWinBits ),
m_pMgr( NULL )
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index 980ef49b3460..d9fd8e1cbe46 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -105,7 +105,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments )
StatusBarManager* pStatusBarManager( 0 );
{
SolarMutexGuard aSolarMutexGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
if ( pWindow )
{
sal_uLong nStyles = WinBits( WB_LEFT | WB_3DLOOK );
@@ -169,7 +169,7 @@ Reference< XInterface > SAL_CALL StatusBarWrapper::getRealInterface() throw ( Ru
StatusBarManager* pStatusBarManager = static_cast< StatusBarManager *>( m_xStatusBarManager.get() );
if ( pStatusBarManager )
{
- Window* pWindow = (Window *)pStatusBarManager->GetStatusBar();
+ vcl::Window* pWindow = (vcl::Window *)pStatusBarManager->GetStatusBar();
if ( pWindow )
return Reference< XInterface >( VCLUnoHelper::GetInterface( pWindow ), UNO_QUERY );
}
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 74d66a4df3aa..8f2de7398760 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -197,7 +197,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
{
OSL_ASSERT( m_xContext.is() );
- Window* pWindow = m_pToolBar;
+ vcl::Window* pWindow = m_pToolBar;
while ( pWindow && !pWindow->IsSystemWindow() )
pWindow = pWindow->GetParent();
@@ -253,7 +253,7 @@ void ToolBarManager::Destroy()
SolarMutexGuard g;
if ( m_bAddedToTaskPaneList )
{
- Window* pWindow = m_pToolBar;
+ vcl::Window* pWindow = m_pToolBar;
while ( pWindow && !pWindow->IsSystemWindow() )
pWindow = pWindow->GetParent();
@@ -1042,7 +1042,7 @@ void ToolBarManager::CreateControllers()
Reference< XWindow > xWindow = xTbxController->createItemWindow( xToolbarWindow );
if ( xWindow.is() )
{
- Window* pItemWin = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pItemWin = VCLUnoHelper::GetWindow( xWindow );
if ( pItemWin )
{
WindowType nType = pItemWin->GetType();
@@ -1680,12 +1680,12 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
if ( m_pToolBar->IsCustomize() )
{
- sal_uInt16 nPos( 0 );
+ sal_uInt16 nPos( 0 );
::PopupMenu* pItemMenu( aPopupMenu.GetPopupMenu( 1 ));
bool bIsFloating( false );
- DockingManager* pDockMgr = Window::GetDockingManager();
+ DockingManager* pDockMgr = vcl::Window::GetDockingManager();
if ( pDockMgr )
bIsFloating = pDockMgr->IsFloating( m_pToolBar );
@@ -2059,7 +2059,7 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent )
for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
{
const sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
- Window* pWindow = m_pToolBar->GetItemWindow( nId );
+ vcl::Window* pWindow = m_pToolBar->GetItemWindow( nId );
if ( pWindow )
{
const DataChangedEvent& rDCEvt( *pDataChangedEvent );
@@ -2115,7 +2115,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExe
// Use docking window close to close the toolbar. The toolbar layout manager is
// listener and will react correctly according to the context sensitive
// flag of our toolbar.
- Window* pWin = VCLUnoHelper::GetWindow( pExecuteInfo->xWindow );
+ vcl::Window* pWin = VCLUnoHelper::GetWindow( pExecuteInfo->xWindow );
DockingWindow* pDockWin = dynamic_cast< DockingWindow* >( pWin );
if ( pDockWin )
pDockWin->Close();
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 857519ebdf0f..8a5f5c1fa68a 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -304,7 +304,7 @@ Sequence< Sequence< com::sun::star::beans::PropertyValue > > ToolbarsMenuControl
SolarMutexGuard aGuard;
Reference< css::awt::XWindow > xWindow( xUIElement->getRealInterface(), UNO_QUERY );
- Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow )
aToolBarInfo.aToolBarUIName = pWindow->GetText();
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 1c3ec89aac89..ad609a20cca8 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -145,7 +145,7 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< Any >& aArguments ) th
ToolBarManager* pToolBarManager = 0;
{
SolarMutexGuard aSolarMutexGuard;
- Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
+ vcl::Window* pWindow = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() );
if ( pWindow )
{
sal_uLong nStyles = WB_LINESPACING | WB_BORDER | WB_SCROLL | WB_MOVEABLE | WB_3DLOOK | WB_DOCKABLE | WB_SIZEABLE | WB_CLOSEABLE;
@@ -259,7 +259,7 @@ Reference< XInterface > SAL_CALL ToolBarWrapper::getRealInterface( ) throw (::c
ToolBarManager* pToolBarManager = static_cast< ToolBarManager *>( m_xToolBarManager.get() );
if ( pToolBarManager )
{
- Window* pWindow = (Window *)pToolBarManager->GetToolBar();
+ vcl::Window* pWindow = (vcl::Window *)pToolBarManager->GetToolBar();
return Reference< XInterface >( VCLUnoHelper::GetInterface( pWindow ), UNO_QUERY );
}
}