diff options
2857 files changed, 10040 insertions, 9938 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx index 7fad609d60b3..a10356fe276f 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx @@ -47,7 +47,7 @@ -class Window; +namespace vcl { class Window; } namespace utl { class AccessibleStateSetHelper; diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx index 904ddec28d43..93b4da974f31 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx @@ -43,7 +43,7 @@ -class Window; +namespace vcl { class Window; } namespace utl { class AccessibleStateSetHelper; diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index 2655b8950e76..bd0dbd1324a0 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx @@ -92,14 +92,14 @@ public: inline ~WindowListenerGuard() { endListening(); } // Not thread safe: - void startListening(::Window & rNotifier); + void startListening(vcl::Window & rNotifier); // Not thread safe: void endListening(); private: ::Link m_aListener; - ::Window * m_pNotifier; + vcl::Window * m_pNotifier; }; class ParagraphInfo diff --git a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx index dc3c93e54d24..c218d0e59ee2 100644 --- a/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx +++ b/accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx @@ -30,7 +30,7 @@ namespace com { namespace sun { namespace star { namespace datatransfer { namesp class Point; class Rectangle; -class Window; +namespace vcl { class Window; } namespace accessibility { class IComboListBoxHelper @@ -41,7 +41,7 @@ namespace accessibility virtual OUString GetEntry( sal_Int32 nPos ) const = 0; virtual Rectangle GetDropDownPosSizePixel( ) const = 0; virtual Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const = 0; - virtual Rectangle GetWindowExtentsRelative( Window* pRelativeWindow ) = 0; + virtual Rectangle GetWindowExtentsRelative( vcl::Window* pRelativeWindow ) = 0; virtual bool IsActive() const = 0; virtual bool IsEnabled() const = 0; virtual bool IsEntryVisible( sal_Int32 nPos ) const = 0; diff --git a/accessibility/inc/accessibility/helper/listboxhelper.hxx b/accessibility/inc/accessibility/helper/listboxhelper.hxx index 96a45909e7e4..98ee64ddcfde 100644 --- a/accessibility/inc/accessibility/helper/listboxhelper.hxx +++ b/accessibility/inc/accessibility/helper/listboxhelper.hxx @@ -76,7 +76,7 @@ public: return aRect; } - virtual Rectangle GetWindowExtentsRelative( Window* pRelativeWindow ) SAL_OVERRIDE + virtual Rectangle GetWindowExtentsRelative( vcl::Window* pRelativeWindow ) SAL_OVERRIDE { return m_aComboListBox.GetWindowExtentsRelative( pRelativeWindow ); } diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx index 7861dc397e0c..a792d51cccad 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx @@ -24,7 +24,7 @@ class VclSimpleEvent; class VclWindowEvent; -class Window; +namespace vcl { class Window; } @@ -34,7 +34,7 @@ class Window; class VCLXAccessibleMenuBar : public OAccessibleMenuComponent { protected: - Window* m_pWindow; + vcl::Window* m_pWindow; virtual bool IsFocused() SAL_OVERRIDE; diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx index 2a4defcbfad2..213a570b853c 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx @@ -49,7 +49,7 @@ private: void UpdateAllItems_Impl(); void UpdateItemName_Impl( sal_Int32 _nPos ); void UpdateItemEnabled_Impl( sal_Int32 _nPos ); - void UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen ); + void UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, bool bOpen ); void HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow ); void ReleaseSubToolBox( ToolBox* _pSubToolBox ); diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 91af550b5d23..1215c78867a5 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -208,7 +208,7 @@ OUString SAL_CALL AccessibleBrowseBox::getImplementationName() Rectangle AccessibleBrowseBox::implGetBoundingBox() { - Window* pParent = mpBrowseBox->GetAccessibleParentWindow(); + vcl::Window* pParent = mpBrowseBox->GetAccessibleParentWindow(); OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" ); return mpBrowseBox->GetWindowExtentsRelative( pParent ); } diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index bc0ad897f1a1..7427feac6b9a 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -502,7 +502,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground( ) throw (::com::sun: ensureIsAlive(); sal_Int32 nColor = 0; - Window* pInst = mpBrowseBox->GetWindowInstance(); + vcl::Window* pInst = mpBrowseBox->GetWindowInstance(); if ( pInst ) { if ( pInst->IsControlForeground() ) @@ -527,7 +527,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground( ) throw (::com::sun: ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); sal_Int32 nColor = 0; - Window* pInst = mpBrowseBox->GetWindowInstance(); + vcl::Window* pInst = mpBrowseBox->GetWindowInstance(); if ( pInst ) { if ( pInst->IsControlBackground() ) diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index 109b6cd0845d..23f2f9c70b0a 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -236,7 +236,7 @@ OUString SAL_CALL AccessibleGridControl::getImplementationName() Rectangle AccessibleGridControl::implGetBoundingBox() { - Window* pParent = m_aTable.GetAccessibleParentWindow(); + vcl::Window* pParent = m_aTable.GetAccessibleParentWindow(); OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" ); return m_aTable.GetWindowExtentsRelative( pParent ); } diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index cb9a6bf3b7a8..e523ec1c9eed 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -419,7 +419,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground( ) throw (::com::su ensureIsAlive(); sal_Int32 nColor = 0; - Window* pInst = m_aTable.GetWindowInstance(); + vcl::Window* pInst = m_aTable.GetWindowInstance(); if ( pInst ) { if ( pInst->IsControlForeground() ) @@ -443,7 +443,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground( ) throw (::com::su ensureIsAlive(); sal_Int32 nColor = 0; - Window* pInst = m_aTable.GetWindowInstance(); + vcl::Window* pInst = m_aTable.GetWindowInstance(); if ( pInst ) { if ( pInst->IsControlBackground() ) diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index 7fbf33684f03..f114bb53c1f4 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -217,7 +217,7 @@ Sequence< sal_Int8 > SAL_CALL AccessibleGridControlHeader::getImplementationId() Rectangle AccessibleGridControlHeader::implGetBoundingBox() { - Window* pParent = m_aTable.GetAccessibleParentWindow(); + vcl::Window* pParent = m_aTable.GetAccessibleParentWindow(); Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ) ); Rectangle aHeaderRect (m_aTable.calcHeaderRect(isColumnBar())); if(isColumnBar()) diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index ced105fc8acc..662328c27910 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx @@ -134,7 +134,7 @@ OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName() Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox() { - Window* pParent = m_aTable.GetAccessibleParentWindow(); + vcl::Window* pParent = m_aTable.GetAccessibleParentWindow(); Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent ) ); sal_Int32 nIndex = getAccessibleIndexInParent(); Rectangle aCellRect; diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 33aac08d4eb8..5392c54af73b 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -344,7 +344,7 @@ OUString SAL_CALL AccessibleGridControlTable::getImplementationName() Rectangle AccessibleGridControlTable::implGetBoundingBox() { - Window* pParent = m_aTable.GetAccessibleParentWindow(); + vcl::Window* pParent = m_aTable.GetAccessibleParentWindow(); DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" ); Rectangle aGridRect( m_aTable.GetWindowExtentsRelative( pParent )); Rectangle aTableRect( m_aTable.calcTableRect() ); diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index a7b02564d5eb..85f10f7c7e0b 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -338,7 +338,7 @@ namespace accessibility Rectangle AccessibleGridControlTableCell::implGetBoundingBox() { - Window* pParent = m_aTable.GetAccessibleParentWindow(); + vcl::Window* pParent = m_aTable.GetAccessibleParentWindow(); DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" ); Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( pParent ); sal_Int32 nIndex = getAccessibleIndexInParent(); diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index d1d11ed051fd..78e093d21a88 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx @@ -291,7 +291,7 @@ namespace accessibility const ::Point aRequestedPoint( VCLUnoHelper::ConvertToVCLPoint( i_rPoint ) ); // check the panel window itself - const ::Window& rActivePanelAnchor( m_pImpl->m_pPanelDeck->GetPanelWindowAnchor() ); + const vcl::Window& rActivePanelAnchor( m_pImpl->m_pPanelDeck->GetPanelWindowAnchor() ); const Rectangle aPanelAnchorArea( rActivePanelAnchor.GetPosPixel(), rActivePanelAnchor.GetOutputSizePixel() ); if ( aPanelAnchorArea.IsInside( aRequestedPoint ) ) // note that this assumes that the Window which actually implements the concrete panel covers diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx index 3bd67c112b77..658c5e9dc92c 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx @@ -337,7 +337,7 @@ namespace accessibility namespace { - bool lcl_covers( const ::Window& i_rWindow, const ::Point& i_rPoint ) + bool lcl_covers( const vcl::Window& i_rWindow, const ::Point& i_rPoint ) { const Rectangle aWindowBounds( i_rWindow.GetWindowExtentsRelative( i_rWindow.GetParent() ) ); return aWindowBounds.IsInside( i_rPoint ); diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 177210436e1f..5cf07bc2bf31 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -127,7 +127,7 @@ namespace accessibility bool bNeedFocus = false; if (pBox) { - Window* pParent = ((Window*)pBox)->GetParent(); + vcl::Window* pParent = ((vcl::Window*)pBox)->GetParent(); if (pParent && pParent->GetType() == WINDOW_FLOATINGWINDOW) { // MT: ImplGetAppSVData shouldn't be exported from VCL. diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index 1fc53c747045..5a368d7b4629 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -253,7 +253,7 @@ namespace accessibility if ( i < nCount ) { - Window* pChild = m_pTabBar->GetAccessibleChildWindow( (sal_uInt16)i ); + vcl::Window* pChild = m_pTabBar->GetAccessibleChildWindow( (sal_uInt16)i ); if ( pChild ) xChild = pChild->GetAccessible(); } @@ -279,7 +279,7 @@ namespace accessibility Reference< XAccessible > xParent; if ( m_pTabBar ) { - Window* pParent = m_pTabBar->GetAccessibleParentWindow(); + vcl::Window* pParent = m_pTabBar->GetAccessibleParentWindow(); if ( pParent ) xParent = pParent->GetAccessible(); } @@ -296,13 +296,13 @@ namespace accessibility sal_Int32 nIndexInParent = -1; if ( m_pTabBar ) { - Window* pParent = m_pTabBar->GetAccessibleParentWindow(); + vcl::Window* pParent = m_pTabBar->GetAccessibleParentWindow(); if ( pParent ) { for ( sal_uInt16 i = 0, nCount = pParent->GetAccessibleChildWindowCount(); i < nCount; ++i ) { - Window* pChild = pParent->GetAccessibleChildWindow( i ); - if ( pChild == static_cast< Window* >( m_pTabBar ) ) + vcl::Window* pChild = pParent->GetAccessibleChildWindow( i ); + if ( pChild == static_cast< vcl::Window* >( m_pTabBar ) ) { nIndexInParent = i; break; diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx index 1de69c655679..01ff84ebdea2 100644 --- a/accessibility/source/extended/accessibletabbarbase.cxx +++ b/accessibility/source/extended/accessibletabbarbase.cxx @@ -49,7 +49,7 @@ IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclSimpleEvent*, pEvent ) OSL_ENSURE( pWinEvent, "AccessibleTabBarBase::WindowEventListener - unknown window event" ); if( pWinEvent ) { - Window* pEventWindow = pWinEvent->GetWindow(); + vcl::Window* pEventWindow = pWinEvent->GetWindow(); OSL_ENSURE( pEventWindow, "AccessibleTabBarBase::WindowEventListener: no window!" ); if( ( pWinEvent->GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) && diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 24f0be2652e8..9e53b48808b0 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -46,7 +46,7 @@ void SfxListenerGuard::endListening() } } -void WindowListenerGuard::startListening(::Window & rNotifier) +void WindowListenerGuard::startListening(vcl::Window & rNotifier) { OSL_ENSURE(m_pNotifier == 0, "called more than once"); m_pNotifier = &rNotifier; @@ -267,7 +267,7 @@ css::awt::Size SAL_CALL Paragraph::getSize() void SAL_CALL Paragraph::grabFocus() throw (css::uno::RuntimeException, std::exception) { checkDisposed(); - Window* pWindow = m_xDocument->GetWindow(); + vcl::Window* pWindow = m_xDocument->GetWindow(); if ( pWindow ) { pWindow->GrabFocus(); diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 5b9bdca63b95..34e29e5f27a7 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -74,9 +74,9 @@ using namespace ::svt::table; namespace { -inline bool hasFloatingChild(Window *pWindow) +inline bool hasFloatingChild(vcl::Window *pWindow) { - Window * pChild = pWindow->GetAccessibleChildWindow(0); + vcl::Window * pChild = pWindow->GetAccessibleChildWindow(0); if( pChild && WINDOW_FLOATINGWINDOW == pChild->GetType() ) return true; @@ -304,7 +304,7 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX { Reference< XAccessibleContext > xContext; - Window* pWindow = _pXWindow->GetWindow(); + vcl::Window* pWindow = _pXWindow->GetWindow(); if ( pWindow ) { WindowType nType = pWindow->GetType(); @@ -348,7 +348,7 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX // The logic here has to match that of Window::GetAccessibleParentWindow in // vcl/source/window/window.cxx to avoid PopupMenuFloatingWindow // becoming a11y parents of themselves - Window* pChild = pWindow->GetAccessibleChildWindow(0); + vcl::Window* pChild = pWindow->GetAccessibleChildWindow(0); if (PopupMenuFloatingWindow::isPopupMenu(pChild)) { // Get the accessible context from the child window. diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 0824882917ec..1590d99510e8 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -111,7 +111,7 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException if ( m_pMenu ) { - Window* pWindow = m_pMenu->GetWindow(); + vcl::Window* pWindow = m_pMenu->GetWindow(); if ( pWindow ) { // get bounding rectangle of the window in screen coordinates @@ -183,10 +183,10 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent( ) throw if ( m_pMenu ) { - Window* pWindow = m_pMenu->GetWindow(); + vcl::Window* pWindow = m_pMenu->GetWindow(); if ( pWindow ) { - Window* pParent = pWindow->GetAccessibleParentWindow(); + vcl::Window* pParent = pWindow->GetAccessibleParentWindow(); if ( pParent ) xParent = pParent->GetAccessible(); } @@ -213,7 +213,7 @@ OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeExc OUString sDescription; if ( m_pMenu ) { - Window* pWindow = m_pMenu->GetWindow(); + vcl::Window* pWindow = m_pMenu->GetWindow(); if ( pWindow ) sDescription = pWindow->GetAccessibleDescription(); } @@ -271,7 +271,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen( ) throw (RuntimeExcep if ( m_pMenu ) { - Window* pWindow = m_pMenu->GetWindow(); + vcl::Window* pWindow = m_pMenu->GetWindow(); if ( pWindow ) { Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL ); @@ -290,7 +290,7 @@ void OAccessibleMenuComponent::grabFocus( ) throw (RuntimeException, std::excep if ( m_pMenu ) { - Window* pWindow = m_pMenu->GetWindow(); + vcl::Window* pWindow = m_pMenu->GetWindow(); if ( pWindow ) pWindow->GrabFocus(); } @@ -329,7 +329,7 @@ Reference< awt::XFont > OAccessibleMenuComponent::getFont( ) throw (RuntimeExce if ( m_pMenu ) { - Window* pWindow = m_pMenu->GetWindow(); + vcl::Window* pWindow = m_pMenu->GetWindow(); if ( pWindow ) { Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), UNO_QUERY ); diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 79fbcbc43aba..60c7b6b77e96 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -137,7 +137,7 @@ void OAccessibleMenuItemComponent::Click() // click the menu item if ( m_pParent ) { - Window* pWindow = m_pParent->GetWindow(); + vcl::Window* pWindow = m_pParent->GetWindow(); if ( pWindow ) { // #102438# Menu items are not selectable @@ -264,7 +264,7 @@ awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeExcep aBounds = AWTRectangle( m_pParent->GetBoundingRectangle( m_nItemPos ) ); // get position of containing window in screen coordinates - Window* pWindow = m_pParent->GetWindow(); + vcl::Window* pWindow = m_pParent->GetWindow(); if ( pWindow ) { Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL ); diff --git a/accessibility/source/standard/floatingwindowaccessible.cxx b/accessibility/source/standard/floatingwindowaccessible.cxx index f75e7ce5b15a..a6238c0dc977 100644 --- a/accessibility/source/standard/floatingwindowaccessible.cxx +++ b/accessibility/source/standard/floatingwindowaccessible.cxx @@ -37,10 +37,10 @@ FloatingWindowAccessible::~FloatingWindowAccessible() void FloatingWindowAccessible::FillAccessibleRelationSet(utl::AccessibleRelationSetHelper& rRelationSet) { - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { - Window* pParentWindow = pWindow->GetParent(); + vcl::Window* pParentWindow = pWindow->GetParent(); if( pParentWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index fdf2e58c0457..295bbe41153d 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -69,7 +69,7 @@ void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindo case VCLEVENT_WINDOW_SHOW: case VCLEVENT_WINDOW_HIDE: { - Window* pChildWindow = (Window *) rVclWindowEvent.GetData(); + vcl::Window* pChildWindow = (vcl::Window *) rVclWindowEvent.GetData(); // Just compare to the combo box text field. All other children // are identical to this object in which case this object will // be removed in a short time. @@ -164,7 +164,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven { pList->ProcessWindowEvent (rVclWindowEvent); } - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if( pWindow && (pWindow->HasFocus() || pWindow->HasChildPathFocus()) ) { Any aOldValue, aNewValue; diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index 078d4100340a..4e9c9f20a910 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -227,7 +227,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper(); Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { KeyEvent aKeyEvent = pWindow->GetActivationKey(); diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index a9cc86c9bc2f..bdaf8593d5b7 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -248,7 +248,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper(); Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { KeyEvent aKeyEvent = pWindow->GetActivationKey(); diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index ef800f2a754c..8a1fd5c9fdbe 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -82,7 +82,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve sal_Int32 nOldCaretPosition = m_nCaretPosition; m_nCaretPosition = getCaretPosition(); - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if (pWindow && pWindow->HasChildPathFocus()) { if (m_nCaretPosition != nOldCaretPosition) @@ -97,7 +97,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve break; case VCLEVENT_EDIT_SELECTIONCHANGED: { - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if (pWindow && pWindow->HasChildPathFocus()) { NotifyAccessibleEvent( AccessibleEventId::TEXT_SELECTION_CHANGED, Any(), Any() ); @@ -256,7 +256,7 @@ sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (Inde throw IndexOutOfBoundsException(); bool bDoAction = false; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { pWindow->GrabFocus(); diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 77c597037642..f5b103433db9 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -660,7 +660,7 @@ bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw (Ru bool bInside = false; - Window* pListBox = GetWindow(); + vcl::Window* pListBox = GetWindow(); if ( pListBox ) { Rectangle aRect( Point(0,0), pListBox->GetSizePixel() ); diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index 2cb4cc4c353d..fc541ab388d1 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -160,15 +160,15 @@ sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) throw (RuntimeEx if ( m_pMenu ) { - Window* pWindow = m_pMenu->GetWindow(); + vcl::Window* pWindow = m_pMenu->GetWindow(); if ( pWindow ) { - Window* pParent = pWindow->GetAccessibleParentWindow(); + vcl::Window* pParent = pWindow->GetAccessibleParentWindow(); if ( pParent ) { for ( sal_uInt16 n = pParent->GetAccessibleChildWindowCount(); n; ) { - Window* pChild = pParent->GetAccessibleChildWindow( --n ); + vcl::Window* pChild = pParent->GetAccessibleChildWindow( --n ); if ( pChild == pWindow ) { nIndexInParent = n; diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index 971f3194bbf8..95c59ebe4b4d 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -395,7 +395,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd if ( m_pParent ) { - Window* pWindow = m_pParent->GetWindow(); + vcl::Window* pWindow = m_pParent->GetWindow(); if ( pWindow ) { Reference< datatransfer::clipboard::XClipboard > xClipboard = pWindow->GetClipboard(); diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index a2e07ee050d8..baabdd5555f1 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -204,7 +204,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActio OAccessibleKeyBindingHelper* pKeyBindingHelper = new OAccessibleKeyBindingHelper(); Reference< XAccessibleKeyBinding > xKeyBinding = pKeyBindingHelper; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { KeyEvent aKeyEvent = pWindow->GetActivationKey(); diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index f71f561700f9..3a40f68778d1 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -271,7 +271,7 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV { if ( m_pTabControl ) { - Window* pChild = static_cast< Window* >( rVclWindowEvent.GetData() ); + vcl::Window* pChild = static_cast< vcl::Window* >( rVclWindowEvent.GetData() ); if ( pChild && pChild->GetType() == WINDOW_TABPAGE ) { for ( sal_Int32 i = 0, nCount = m_pTabControl->GetPageCount(); i < nCount; ++i ) diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx index 33e929e59832..6b43aa3d4b2c 100644 --- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx +++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx @@ -41,7 +41,7 @@ VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindo m_nPageId = 0; if ( m_pTabPage ) { - Window* pParent = m_pTabPage->GetAccessibleParentWindow(); + vcl::Window* pParent = m_pTabPage->GetAccessibleParentWindow(); if ( pParent && pParent->GetType() == WINDOW_TABCONTROL ) { m_pTabControl = static_cast< TabControl* >( pParent ); diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index 00267fca7947..003eaa517211 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -425,7 +425,7 @@ void VCLXAccessibleToolBox::UpdateAllItems_Impl() } } -void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen ) +void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, bool bOpen ) { ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() ); if( pWindow && pToolBox ) @@ -458,7 +458,7 @@ void VCLXAccessibleToolBox::UpdateItemEnabled_Impl( sal_Int32 _nPos ) void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow ) { - Window* pChildWindow = (Window *) rVclWindowEvent.GetData(); + vcl::Window* pChildWindow = (vcl::Window *) rVclWindowEvent.GetData(); ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() ); if ( pChildWindow && pToolBox @@ -605,7 +605,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow case VCLEVENT_DROPDOWN_OPEN: case VCLEVENT_DROPDOWN_CLOSE: { - UpdateCustomPopupItemp_Impl( static_cast< Window* >( rVclWindowEvent.GetData() ), rVclWindowEvent.GetId() == VCLEVENT_DROPDOWN_OPEN ); + UpdateCustomPopupItemp_Impl( static_cast< vcl::Window* >( rVclWindowEvent.GetData() ), rVclWindowEvent.GetId() == VCLEVENT_DROPDOWN_OPEN ); break; } @@ -723,7 +723,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal { sal_uInt16 nItemId = pToolBox->GetItemId( (sal_uInt16)i ); sal_uInt16 nHighlightItemId = pToolBox->GetHighlightItemId(); - Window* pItemWindow = pToolBox->GetItemWindow( nItemId ); + vcl::Window* pItemWindow = pToolBox->GetItemWindow( nItemId ); // not found -> create a new child VCLXAccessibleToolBoxItem* pChild = new VCLXAccessibleToolBoxItem( pToolBox, i ); Reference< XAccessible> xParent = pChild; @@ -772,7 +772,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( c Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const VclWindowEvent& rVclWindowEvent ) { Reference< XAccessible > xReturn; - Window* pChildWindow = (Window *) rVclWindowEvent.GetData(); + vcl::Window* pChildWindow = (vcl::Window *) rVclWindowEvent.GetData(); ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() ); if ( pChildWindow && pToolBox ) { @@ -780,7 +780,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const V for (sal_uInt16 i = 0 ; i < nCount && !xReturn.is() ; ++i) { sal_uInt16 nItemId = pToolBox->GetItemId( i ); - Window* pItemWindow = pToolBox->GetItemWindow( nItemId ); + vcl::Window* pItemWindow = pToolBox->GetItemWindow( nItemId ); if ( pItemWindow == pChildWindow ) xReturn = getAccessibleChild(i); } diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 7afe893c73ad..3f77107d42fb 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -133,7 +133,7 @@ OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName ) sRet = m_pToolBox->GetQuickHelpText( m_nItemId ); if (sRet.isEmpty()) { - Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId ); + vcl::Window* pItemWindow = m_pToolBox->GetItemWindow( m_nItemId ); if ( m_nRole == AccessibleRole::PANEL && pItemWindow && pItemWindow->GetAccessible().is() && pItemWindow->GetAccessible()->getAccessibleContext().is() ) { diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index 2e0f20b9b8d6..099a0fc73019 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -55,7 +55,7 @@ class MediaControl : public Control { public: - MediaControl( Window* pParent, MediaControlStyle eControlStyle ); + MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyle ); virtual ~MediaControl(); const Size& getMinSizePixel() const; diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 540613caaa26..2dc79fa716a0 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -62,7 +62,7 @@ namespace avmedia // - MediaControl - -MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : +MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyle ) : Control( pParent ), maImageList( SvtMiscOptions().AreCurrentSymbolsLarge() ? AVMEDIA_RESID( AVMEDIA_IMGLST_L ) : AVMEDIA_RESID( AVMEDIA_IMGLST ) ), maItem( 0, AVMEDIA_SETMASK_ALL ), diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index cc592c2caf8d..1883aadbd9cd 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -37,7 +37,7 @@ namespace avmedia // - MediaPlayer - -MediaPlayer::MediaPlayer( Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) : +MediaPlayer::MediaPlayer( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) { pWindow = new MediaFloater( _pBindings, this, _pParent ); @@ -59,7 +59,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID( MediaPlayer, SID_AVMEDIA_PLAYER ) // - MediaFloater - -MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, Window* pParent ) : +MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::Window* pParent ) : SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE ), mpMediaWindow( new MediaWindow( this, true ) ) { @@ -106,7 +106,7 @@ void MediaFloater::ToggleFloatingMode() mpMediaWindow->setPosSize( Rectangle( Point(), GetOutputSizePixel() ) ); mpMediaWindow->executeMediaItem( aRestoreItem ); - Window* pWindow = mpMediaWindow->getWindow(); + vcl::Window* pWindow = mpMediaWindow->getWindow(); if( pWindow ) pWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx index ec44381ef29e..22e5a50c0a17 100644 --- a/avmedia/source/framework/mediatoolbox.cxx +++ b/avmedia/source/framework/mediatoolbox.cxx @@ -39,7 +39,7 @@ class MediaToolBoxControl_Impl : public MediaControl { public: - MediaToolBoxControl_Impl( Window& rParent, MediaToolBoxControl& rControl ); + MediaToolBoxControl_Impl( vcl::Window& rParent, MediaToolBoxControl& rControl ); virtual ~MediaToolBoxControl_Impl(); void update() SAL_OVERRIDE; @@ -52,7 +52,7 @@ private: -MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( Window& rParent, MediaToolBoxControl& rControl ) : +MediaToolBoxControl_Impl::MediaToolBoxControl_Impl( vcl::Window& rParent, MediaToolBoxControl& rControl ) : MediaControl( &rParent, MEDIACONTROLSTYLE_SINGLELINE ), mpToolBoxControl( &rControl ) { @@ -129,7 +129,7 @@ void MediaToolBoxControl::StateChanged( sal_uInt16 /* nSID */, SfxItemState eSta -Window* MediaToolBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* MediaToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return( pParent ? new MediaToolBoxControl_Impl( *pParent, *this ) : NULL ); } diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx index 6c1c9f16a2d8..767844ddb5b4 100644 --- a/avmedia/source/opengl/oglwindow.cxx +++ b/avmedia/source/opengl/oglwindow.cxx @@ -15,7 +15,7 @@ using namespace libgltf; namespace avmedia { namespace ogl { -OGLWindow::OGLWindow( glTFHandle& rHandle, OpenGLContext& rContext, Window& rEventHandlerParent ) +OGLWindow::OGLWindow( glTFHandle& rHandle, OpenGLContext& rContext, vcl::Window& rEventHandlerParent ) : m_rHandle( rHandle ) , m_rContext( rContext ) , m_rEventHandler( rEventHandlerParent ) diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx index 5078ebedfb0b..5b0e151c9b84 100644 --- a/avmedia/source/opengl/oglwindow.hxx +++ b/avmedia/source/opengl/oglwindow.hxx @@ -28,7 +28,7 @@ class OGLWindow : public ::cppu::WeakImplHelper2 < com::sun::star::media::XPlaye com::sun::star::lang::XServiceInfo > { public: - OGLWindow( libgltf::glTFHandle& rHandle, OpenGLContext& rContext, Window& rEventHandlerParent ); + OGLWindow( libgltf::glTFHandle& rHandle, OpenGLContext& rContext, vcl::Window& rEventHandlerParent ); virtual ~OGLWindow(); virtual void SAL_CALL update() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -68,7 +68,7 @@ private: libgltf::glTFHandle& m_rHandle; OpenGLContext& m_rContext; - Window& m_rEventHandler; + vcl::Window& m_rEventHandler; bool m_bVisible; Point m_aLastMousePos; diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx index b994bd3ecdf1..2db883172d5e 100644 --- a/avmedia/source/viewer/mediaevent_impl.cxx +++ b/avmedia/source/viewer/mediaevent_impl.cxx @@ -30,7 +30,7 @@ namespace avmedia { namespace priv { // - MediaEventListenersImpl - -MediaEventListenersImpl::MediaEventListenersImpl( Window& rEventWindow ) : +MediaEventListenersImpl::MediaEventListenersImpl( vcl::Window& rEventWindow ) : mpNotifyWindow( &rEventWindow ) { } @@ -45,7 +45,7 @@ MediaEventListenersImpl::~MediaEventListenersImpl() void MediaEventListenersImpl::cleanUp() { - Application::RemoveMouseAndKeyEvents( reinterpret_cast< ::Window* >( mpNotifyWindow ) ); + Application::RemoveMouseAndKeyEvents( reinterpret_cast< vcl::Window* >( mpNotifyWindow ) ); mpNotifyWindow = NULL; } @@ -72,7 +72,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt:: ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) ); KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode ); - Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLKeyEvt ); + Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLKeyEvt ); } } @@ -91,7 +91,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt: ( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) | ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) ); KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode ); - Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLKeyEvt ); + Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLKeyEvt ); } } @@ -112,7 +112,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ), e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); + Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); } } @@ -133,7 +133,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ), e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); + Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); } } @@ -174,7 +174,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt if( mpNotifyWindow ) { MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, 0, e.Buttons, e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); + Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); } } @@ -189,7 +189,7 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt:: if( mpNotifyWindow ) { MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, 0, e.Buttons, e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< ::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); + Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow ), &aVCLMouseEvt ); } } diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx index 9f551bd2ea51..63e1a0d77ba2 100644 --- a/avmedia/source/viewer/mediaevent_impl.hxx +++ b/avmedia/source/viewer/mediaevent_impl.hxx @@ -41,7 +41,7 @@ namespace avmedia { public: - MediaEventListenersImpl( Window& rNotifyWindow ); + MediaEventListenersImpl( vcl::Window& rNotifyWindow ); virtual ~MediaEventListenersImpl(); void cleanUp(); @@ -69,7 +69,7 @@ namespace avmedia private: - Window* mpNotifyWindow; + vcl::Window* mpNotifyWindow; mutable ::osl::Mutex maMutex; }; } diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index b824c2dd4217..2e5d92fd8c1d 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -45,7 +45,7 @@ namespace avmedia { // - MediaWindow - -MediaWindow::MediaWindow( Window* parent, bool bInternalMediaControl ) : +MediaWindow::MediaWindow( vcl::Window* parent, bool bInternalMediaControl ) : mpImpl( new priv::MediaWindowImpl( parent, this, bInternalMediaControl ) ) { mpImpl->Show(); @@ -190,7 +190,7 @@ void MediaWindow::hide() -Window* MediaWindow::getWindow() const +vcl::Window* MediaWindow::getWindow() const { return mpImpl.get(); } @@ -236,7 +236,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector ) -bool MediaWindow::executeMediaURLDialog(Window* /* pParent */, +bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */, OUString& rURL, bool *const o_pbLink) { ::sfx2::FileDialogHelper aDlg( (o_pbLink) @@ -325,7 +325,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */, -void MediaWindow::executeFormatErrorBox( Window* pParent ) +void MediaWindow::executeFormatErrorBox( vcl::Window* pParent ) { MessageDialog aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_STR_ERR_URL ) ); diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index f4c88561f426..3bd2b46595f5 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -49,7 +49,7 @@ namespace avmedia { namespace priv { // - MediaWindowControl - -MediaWindowControl::MediaWindowControl( Window* pParent ) : +MediaWindowControl::MediaWindowControl( vcl::Window* pParent ) : MediaControl( pParent, MEDIACONTROLSTYLE_MULTILINE ) { } @@ -81,13 +81,13 @@ void MediaWindowControl::execute( const MediaItem& rItem ) // - MediaChildWindow - -MediaChildWindow::MediaChildWindow( Window* pParent ) : +MediaChildWindow::MediaChildWindow( vcl::Window* pParent ) : SystemChildWindow( pParent, WB_CLIPCHILDREN ) { } #if HAVE_FEATURE_GLTF -MediaChildWindow::MediaChildWindow( Window* pParent, SystemWindowData* pData ) : +MediaChildWindow::MediaChildWindow( vcl::Window* pParent, SystemWindowData* pData ) : SystemChildWindow( pParent, WB_CLIPCHILDREN, pData ) { } @@ -161,7 +161,7 @@ void MediaChildWindow::Command( const CommandEvent& rCEvt ) // - MediaWindowImpl - -MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bool bInternalMediaControl ) : +MediaWindowImpl::MediaWindowImpl( vcl::Window* pParent, MediaWindow* pMediaWindow, bool bInternalMediaControl ) : Control( pParent ), DropTargetHelper( this ), DragSourceHelper( this ), diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index 7bf7f369143f..ce2c24bb9ab9 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -48,7 +48,7 @@ namespace avmedia { public: - MediaWindowControl( Window* pParent ); + MediaWindowControl( vcl::Window* pParent ); virtual ~MediaWindowControl(); protected: @@ -65,8 +65,8 @@ namespace avmedia { public: - MediaChildWindow( Window* pParent ); - MediaChildWindow( Window* pParent, SystemWindowData* pData ); + MediaChildWindow( vcl::Window* pParent ); + MediaChildWindow( vcl::Window* pParent, SystemWindowData* pData ); virtual ~MediaChildWindow(); protected: @@ -92,7 +92,7 @@ namespace avmedia { public: - MediaWindowImpl( Window* parent, MediaWindow* pMediaWindow, bool bInternalMediaControl ); + MediaWindowImpl( vcl::Window* parent, MediaWindow* pMediaWindow, bool bInternalMediaControl ); virtual ~MediaWindowImpl(); static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 ); diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index aaec4fba9104..75dd5f8f0129 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -178,9 +178,9 @@ void AccessibleDialogControlShape::SetBounds( const awt::Rectangle& aBounds ) -Window* AccessibleDialogControlShape::GetWindow() const +vcl::Window* AccessibleDialogControlShape::GetWindow() const { - Window* pWindow = NULL; + vcl::Window* pWindow = NULL; if ( m_pDlgEdObj ) { Reference< awt::XControl > xControl( m_pDlgEdObj->GetControl(), UNO_QUERY ); @@ -495,7 +495,7 @@ sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeExceptio OExternalLockGuard aGuard( this ); sal_Int32 nColor = 0; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { if ( pWindow->IsControlForeground() ) @@ -521,7 +521,7 @@ sal_Int32 AccessibleDialogControlShape::getBackground( ) throw (RuntimeExceptio OExternalLockGuard aGuard( this ); sal_Int32 nColor = 0; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { if ( pWindow->IsControlBackground() ) @@ -542,7 +542,7 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (Runtime OExternalLockGuard aGuard( this ); Reference< awt::XFont > xFont; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), UNO_QUERY ); @@ -578,7 +578,7 @@ OUString AccessibleDialogControlShape::getToolTipText( ) throw (RuntimeExceptio OExternalLockGuard aGuard( this ); OUString sText; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) sText = pWindow->GetQuickHelpText(); diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 527da88e2dde..1d00867f3894 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -667,7 +667,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) throw ( Reference< XAccessible > xParent; if ( m_pDialogWindow ) { - Window* pParent = m_pDialogWindow->GetAccessibleParentWindow(); + vcl::Window* pParent = m_pDialogWindow->GetAccessibleParentWindow(); if ( pParent ) xParent = pParent->GetAccessible(); } @@ -684,13 +684,13 @@ sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) throw (RuntimeE sal_Int32 nIndexInParent = -1; if ( m_pDialogWindow ) { - Window* pParent = m_pDialogWindow->GetAccessibleParentWindow(); + vcl::Window* pParent = m_pDialogWindow->GetAccessibleParentWindow(); if ( pParent ) { for ( sal_uInt16 i = 0, nCount = pParent->GetAccessibleChildWindowCount(); i < nCount; ++i ) { - Window* pChild = pParent->GetAccessibleChildWindow( i ); - if ( pChild == static_cast< Window* >( m_pDialogWindow ) ) + vcl::Window* pChild = pParent->GetAccessibleChildWindow( i ); + if ( pChild == static_cast< vcl::Window* >( m_pDialogWindow ) ) { nIndexInParent = i; break; diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 194004ba392b..5699f1aacd95 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -78,7 +78,7 @@ void LibBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPool -Window* LibBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* LibBoxControl::CreateItemWindow( vcl::Window *pParent ) { return new LibBox( pParent, m_xFrame ); } @@ -87,7 +87,7 @@ Window* LibBoxControl::CreateItemWindow( Window *pParent ) //= DocListenerBox -DocListenerBox::DocListenerBox( Window* pParent ) +DocListenerBox::DocListenerBox( vcl::Window* pParent ) :ListBox( pParent, WinBits( WB_BORDER | WB_DROPDOWN ) ) ,m_aNotifier( *this ) { @@ -146,7 +146,7 @@ void DocListenerBox::onDocumentModeChanged( const ScriptDocument& /*_rDocument*/ //= basctl::LibBox -LibBox::LibBox( Window* pParent, const uno::Reference< frame::XFrame >& rFrame ) : +LibBox::LibBox( vcl::Window* pParent, const uno::Reference< frame::XFrame >& rFrame ) : DocListenerBox( pParent ), m_xFrame( rFrame ) { @@ -190,7 +190,7 @@ void LibBox::ReleaseFocus() if ( pCurSh ) { - Window* pShellWin = pCurSh->GetWindow(); + vcl::Window* pShellWin = pCurSh->GetWindow(); if ( !pShellWin ) pShellWin = Application::GetDefDialogParent(); @@ -367,14 +367,14 @@ void LanguageBoxControl::StateChanged( sal_uInt16 nID, SfxItemState eState, cons } } -Window* LanguageBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* LanguageBoxControl::CreateItemWindow( vcl::Window *pParent ) { return new LanguageBox( pParent ); } // class basctl::LanguageBox ----------------------------------------------- -LanguageBox::LanguageBox( Window* pParent ) : +LanguageBox::LanguageBox( vcl::Window* pParent ) : DocListenerBox( pParent ), diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx index ea71b7286ac6..572765bacbc4 100644 --- a/basctl/source/basicide/basicbox.hxx +++ b/basctl/source/basicide/basicbox.hxx @@ -38,7 +38,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; /** base class for list boxes which need to update their content according to the list @@ -48,7 +48,7 @@ class DocListenerBox :public ListBox ,public DocumentEventListener { protected: - DocListenerBox( Window* pParent ); + DocListenerBox( vcl::Window* pParent ); virtual ~DocListenerBox(); protected: @@ -94,7 +94,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - LibBox( Window* pParent, + LibBox( vcl::Window* pParent, const com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); virtual ~LibBox(); @@ -111,7 +111,7 @@ public: virtual ~LanguageBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; class LanguageBox : public DocListenerBox @@ -134,7 +134,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - LanguageBox( Window* pParent ); + LanguageBox( vcl::Window* pParent ); virtual ~LanguageBox(); using Window::Update; diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 57cf39d6c1f2..97a31e140aa3 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -654,7 +654,7 @@ bool ModulWindow::BasicErrorHdl( StarBASIC * pBasic ) ErrorHandler::HandleError( StarBASIC::GetErrorCode() ); // #i47002# - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( !pWindow ) return false; @@ -1443,7 +1443,7 @@ void ModulWindow::UpdateModule () -ModulWindowLayout::ModulWindowLayout (Window* pParent, ObjectCatalog& rObjectCatalog_) : +ModulWindowLayout::ModulWindowLayout (vcl::Window* pParent, ObjectCatalog& rObjectCatalog_) : Layout(pParent), pChild(0), aWatchWindow(this), diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 02ce15c3c414..df3aae8cec4a 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -75,7 +75,7 @@ class CodeCompleteWindow; OUString getTextEngineText (ExtTextEngine&); void setTextEngineText (ExtTextEngine&, OUString const&); -class EditorWindow : public Window, public SfxListener +class EditorWindow : public vcl::Window, public SfxListener { friend class CodeCompleteListBox; private: @@ -144,7 +144,7 @@ protected: bool ImpCanModify(); public: - EditorWindow (Window* pParent, ModulWindow*); + EditorWindow (vcl::Window* pParent, ModulWindow*); virtual ~EditorWindow(); ExtTextEngine* GetEditEngine() const { return pEditEngine.get(); } @@ -169,7 +169,7 @@ public: }; -class BreakPointWindow : public Window +class BreakPointWindow : public vcl::Window { private: ModulWindow& rModulWindow; @@ -192,7 +192,7 @@ protected: bool SyncYOffset(); public: - BreakPointWindow (Window* pParent, ModulWindow*); + BreakPointWindow (vcl::Window* pParent, ModulWindow*); virtual ~BreakPointWindow(); void SetMarkerPos( sal_uInt16 nLine, bool bErrorMarker = false ); @@ -216,7 +216,7 @@ protected: SbxBase* ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rbArrayElement ); public: - WatchTreeListBox( Window* pParent, WinBits nWinBits ); + WatchTreeListBox( vcl::Window* pParent, WinBits nWinBits ); virtual ~WatchTreeListBox(); void RequestingChildren( SvTreeListEntry * pParent ) SAL_OVERRIDE; @@ -277,7 +277,7 @@ public: }; -class ComplexEditorWindow : public Window +class ComplexEditorWindow : public vcl::Window { private: BreakPointWindow aBrkWindow; @@ -426,7 +426,7 @@ public: class ModulWindowLayout: public Layout { public: - ModulWindowLayout (Window* pParent, ObjectCatalog&); + ModulWindowLayout (vcl::Window* pParent, ObjectCatalog&); public: // Layout: virtual void Activating (BaseWindow&) SAL_OVERRIDE; @@ -507,7 +507,7 @@ protected: virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; }; -class CodeCompleteWindow: public Window +class CodeCompleteWindow: public vcl::Window { friend class CodeCompleteListBox; private: diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index d3e2bb48ab96..9b34fc328760 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -229,7 +229,7 @@ private: sal_uLong nCurState; }; -EditorWindow::EditorWindow (Window* pParent, ModulWindow* pModulWindow) : +EditorWindow::EditorWindow (vcl::Window* pParent, ModulWindow* pModulWindow) : Window(pParent, WB_BORDER), pEditView(0), pEditEngine(0), @@ -1355,7 +1355,7 @@ void EditorWindow::ForceSyntaxTimeout() -BreakPointWindow::BreakPointWindow (Window* pParent, ModulWindow* pModulWindow) +BreakPointWindow::BreakPointWindow (vcl::Window* pParent, ModulWindow* pModulWindow) : Window(pParent, WB_BORDER) , rModulWindow(*pModulWindow) , nCurYOffset(0) // memorize nCurYOffset and not take it from EditEngine @@ -2119,7 +2119,7 @@ EditorWindow::GetComponentInterface(bool bCreate) -WatchTreeListBox::WatchTreeListBox( Window* pParent, WinBits nWinBits ) +WatchTreeListBox::WatchTreeListBox( vcl::Window* pParent, WinBits nWinBits ) : SvHeaderTabListBox( pParent, nWinBits ) {} diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index c9973c4ba175..e294a3b825ff 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -903,11 +903,11 @@ std::vector< lang::Locale > implGetLanguagesOnlyContainedInFirstSeq class NameClashQueryBox : public MessBox { public: - NameClashQueryBox( Window* pParent, + NameClashQueryBox( vcl::Window* pParent, const OUString& rTitle, const OUString& rMessage ); }; -NameClashQueryBox::NameClashQueryBox( Window* pParent, +NameClashQueryBox::NameClashQueryBox( vcl::Window* pParent, const OUString& rTitle, const OUString& rMessage ) : MessBox( pParent, 0, rTitle, rMessage ) { @@ -928,11 +928,11 @@ NameClashQueryBox::NameClashQueryBox( Window* pParent, class LanguageMismatchQueryBox : public MessBox { public: - LanguageMismatchQueryBox( Window* pParent, + LanguageMismatchQueryBox( vcl::Window* pParent, const OUString& rTitle, const OUString& rMessage ); }; -LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent, +LanguageMismatchQueryBox::LanguageMismatchQueryBox( vcl::Window* pParent, const OUString& rTitle, const OUString& rMessage ) : MessBox( pParent, 0, rTitle, rMessage ) { @@ -950,7 +950,7 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent, } -bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ) +bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ) { bool bDone = false; @@ -1406,7 +1406,7 @@ ItemType DialogWindow::GetType () const -DialogWindowLayout::DialogWindowLayout (Window* pParent, ObjectCatalog& rObjectCatalog_) : +DialogWindowLayout::DialogWindowLayout (vcl::Window* pParent, ObjectCatalog& rObjectCatalog_) : Layout(pParent), pChild(0), rObjectCatalog(rObjectCatalog_), diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index eb05257bcb71..4b2582ee66ff 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -139,7 +139,7 @@ void Shell::ExecuteCurrent( SfxRequest& rReq ) { SfxViewFrame* pViewFrame = GetViewFrame(); SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow( SID_SEARCH_DLG ) : NULL; - Window* pParent = pChildWin ? pChildWin->GetWindow() : NULL; + vcl::Window* pParent = pChildWin ? pChildWin->GetWindow() : NULL; QueryBox aQuery(pParent, WB_YES_NO|WB_DEF_YES, IDE_RESSTR(RID_STR_SEARCHFROMSTART)); if ( aQuery.Execute() == RET_YES ) { @@ -665,7 +665,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) TextSelection aSel( TextPaM( nLine, nCol1 ), TextPaM( nLine, nCol2 ) ); pTextView->SetSelection( aSel ); pTextView->ShowCursor(); - Window* pWindow_ = pTextView->GetWindow(); + vcl::Window* pWindow_ = pTextView->GetWindow(); if ( pWindow_ ) pWindow_->GrabFocus(); } @@ -1002,8 +1002,8 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRemembe pCurWin->Init(); if (!GetExtraData()->ShellInCriticalSection()) { - Window* pFrameWindow = &GetViewFrame()->GetWindow(); - Window* pFocusWindow = Application::GetFocusWindow(); + vcl::Window* pFrameWindow = &GetViewFrame()->GetWindow(); + vcl::Window* pFocusWindow = Application::GetFocusWindow(); while ( pFocusWindow && ( pFocusWindow != pFrameWindow ) ) pFocusWindow = pFocusWindow->GetParent(); if ( pFocusWindow ) // Focus in BasicIDE diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 18be9999cbf8..aeb2acb22451 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -391,7 +391,7 @@ bool Shell::PrepareClose( bool bUI ) { if( bUI ) { - Window *pParent = &GetViewFrame()->GetWindow(); + vcl::Window *pParent = &GetViewFrame()->GetWindow(); InfoBox( pParent, IDE_RESSTR(RID_STR_CANNOTCLOSE)).Execute(); } return false; diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index eee39ba9b08e..32933e3b9bad 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -77,7 +77,7 @@ void Organize( sal_Int16 tabId ) if (BaseWindow* pCurWin = pShell->GetCurWindow()) aDesc = pCurWin->CreateEntryDescriptor(); - Window* pParent = Application::GetDefDialogParent(); + vcl::Window* pParent = Application::GetDefDialogParent(); OrganizeDialog(pParent, tabId, aDesc).Execute(); } @@ -145,7 +145,7 @@ Sequence< OUString > GetMergedLibraryNames( const Reference< script::XLibraryCon } bool RenameModule ( - Window* pErrorParent, + vcl::Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 97008a1107f6..288900794dba 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -155,7 +155,7 @@ SbMethod* CreateMacro( SbModule* pModule, const OUString& rMacroName ) } bool RenameDialog ( - Window* pErrorParent, + vcl::Window* pErrorParent, ScriptDocument const& rDocument, OUString const& rLibName, OUString const& rOldName, @@ -348,7 +348,7 @@ void BasicStopped( *pnWaitCount = nWait; } - Window* pDefParent = Application::GetDefDialogParent(); + vcl::Window* pDefParent = Application::GetDefDialogParent(); if ( pDefParent && !pDefParent->IsEnabled() ) { pDefParent->Enable(true); diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 51729f9e5619..4c9f52abc237 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -183,14 +183,14 @@ bool EntryDescriptor::operator == (EntryDescriptor const& rDesc) const -TreeListBox::TreeListBox (Window* pParent, ResId const& rRes) +TreeListBox::TreeListBox (vcl::Window* pParent, ResId const& rRes) : SvTreeListBox( pParent, IDEResId( sal::static_int_cast<sal_uInt16>( rRes.GetId() ) ) ) , m_aNotifier( *this ) { Init(); } -TreeListBox::TreeListBox (Window* pParent, WinBits nStyle) +TreeListBox::TreeListBox (vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) , m_aNotifier( *this ) { @@ -204,7 +204,7 @@ void TreeListBox::Init() nMode = 0xFF; // everything } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTreeListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx index e703d2e4613b..0eac7b8875a9 100644 --- a/basctl/source/basicide/bastype2.hxx +++ b/basctl/source/basicide/bastype2.hxx @@ -206,8 +206,8 @@ protected: virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ) SAL_OVERRIDE; public: - TreeListBox(Window* pParent, const ResId& rRes); - TreeListBox(Window* pParent, WinBits nStyle); + TreeListBox(vcl::Window* pParent, const ResId& rRes); + TreeListBox(vcl::Window* pParent, WinBits nStyle); virtual ~TreeListBox(); void ScanEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ); diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx index cf732b132676..43ad48511504 100644 --- a/basctl/source/basicide/bastype3.hxx +++ b/basctl/source/basicide/bastype3.hxx @@ -40,7 +40,7 @@ protected: DECL_LINK(ImplLoseFocusHdl, void *); public: - ExtendedEdit( Window* pParent, IDEResId nRes ); + ExtendedEdit( vcl::Window* pParent, IDEResId nRes ); void SetAccHdl( const Link& rLink ) { aAccHdl = rLink; } void SetLoseFocusHdl( const Link& rLink ) { aLoseFocusHdl = rLink; } diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 5fbdd63c2004..994ad6eafdd3 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star; TYPEINIT0( BaseWindow ) TYPEINIT1( SbxItem, SfxPoolItem ); -BaseWindow::BaseWindow( Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName ) +BaseWindow::BaseWindow( vcl::Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName ) :Window( pParent, WinBits( WB_3DLOOK ) ) ,m_aDocument( rDocument ) ,m_aLibName( aLibName ) @@ -266,7 +266,7 @@ WinBits const DockingWindow::StyleBits = WB_BORDER | WB_3DLOOK | WB_CLIPCHILDREN | WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_DOCKABLE; -DockingWindow::DockingWindow (Window* pParent) : +DockingWindow::DockingWindow (vcl::Window* pParent) : ::DockingWindow(pParent, StyleBits), pLayout(0), nShowCount(0) @@ -418,7 +418,7 @@ void DockingWindow::DockThis () -ExtendedEdit::ExtendedEdit( Window* pParent, IDEResId nRes ) : +ExtendedEdit::ExtendedEdit( vcl::Window* pParent, IDEResId nRes ) : Edit( pParent, nRes ) { aAcc.SetSelectHdl( LINK( this, ExtendedEdit, EditAccHdl ) ); @@ -454,7 +454,7 @@ IMPL_LINK_INLINE_END( ExtendedEdit, EditAccHdl, Accelerator *, pAcc ) -TabBar::TabBar( Window* pParent ) : +TabBar::TabBar( vcl::Window* pParent ) : ::TabBar( pParent, WinBits( WB_3DLOOK | WB_SCROLL | WB_BORDER | WB_SIZEABLE | WB_DRAG ) ) { EnableEditMode(true); @@ -782,7 +782,7 @@ LibInfos::Item::Item ( LibInfos::Item::~Item () { } -bool QueryDel( const OUString& rName, const ResId& rId, Window* pParent ) +bool QueryDel( const OUString& rName, const ResId& rId, vcl::Window* pParent ) { OUString aQuery(rId.toString()); OUStringBuffer aNameBuf( rName ); @@ -793,27 +793,27 @@ bool QueryDel( const OUString& rName, const ResId& rId, Window* pParent ) return ( aQueryBox.Execute() == RET_YES ); } -bool QueryDelMacro( const OUString& rName, Window* pParent ) +bool QueryDelMacro( const OUString& rName, vcl::Window* pParent ) { return QueryDel( rName, IDEResId( RID_STR_QUERYDELMACRO ), pParent ); } -bool QueryReplaceMacro( const OUString& rName, Window* pParent ) +bool QueryReplaceMacro( const OUString& rName, vcl::Window* pParent ) { return QueryDel( rName, IDEResId( RID_STR_QUERYREPLACEMACRO ), pParent ); } -bool QueryDelDialog( const OUString& rName, Window* pParent ) +bool QueryDelDialog( const OUString& rName, vcl::Window* pParent ) { return QueryDel( rName, IDEResId( RID_STR_QUERYDELDIALOG ), pParent ); } -bool QueryDelLib( const OUString& rName, bool bRef, Window* pParent ) +bool QueryDelLib( const OUString& rName, bool bRef, vcl::Window* pParent ) { return QueryDel( rName, IDEResId( bRef ? RID_STR_QUERYDELLIBREF : RID_STR_QUERYDELLIB ), pParent ); } -bool QueryDelModule( const OUString& rName, Window* pParent ) +bool QueryDelModule( const OUString& rName, vcl::Window* pParent ) { return QueryDel( rName, IDEResId( RID_STR_QUERYDELMODULE ), pParent ); } diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index 77c4c77accc3..30d94cc08873 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.cxx @@ -63,7 +63,7 @@ bool lcl_ParseText(OUString const &rText, size_t& rLineNr ) } // namespace -BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList ) +BreakPointDialog::BreakPointDialog( vcl::Window* pParent, BreakPointList& rBrkPntList ) : ModalDialog(pParent, "ManageBreakpointsDialog", "modules/BasicIDE/ui/managebreakpoints.ui") , m_rOriginalBreakPointList(rBrkPntList) diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx index da61756fecea..2ae1ff77546a 100644 --- a/basctl/source/basicide/brkdlg.hxx +++ b/basctl/source/basicide/brkdlg.hxx @@ -54,7 +54,7 @@ protected: public: - BreakPointDialog( Window* pParent, BreakPointList& rBrkList ); + BreakPointDialog( vcl::Window* pParent, BreakPointList& rBrkList ); void SetCurrentBreakPoint( BreakPoint* pBrk ); }; diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index 02fb50f5c373..50c9d5e41dc4 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -35,7 +35,7 @@ static long const nSplitThickness = 3; // ctor for derived classes // pParent: the parent window (Shell) -Layout::Layout (Window* pParent) : +Layout::Layout (vcl::Window* pParent) : Window(pParent, WB_CLIPCHILDREN), pChild(0), bFirstSize(true), diff --git a/basctl/source/basicide/layout.hxx b/basctl/source/basicide/layout.hxx index 3db298349cd5..9a6ab12fc3ca 100644 --- a/basctl/source/basicide/layout.hxx +++ b/basctl/source/basicide/layout.hxx @@ -41,7 +41,7 @@ class BaseWindow; // Layout -- the common base of ModulLayout and DialogLayout. // Handles the splitting lines and the dockable windows. -class Layout: public Window +class Layout: public vcl::Window { public: void DockaWindow (DockingWindow*); @@ -54,7 +54,7 @@ public: virtual void UpdateDebug (bool bBasicStopped ) = 0; protected: - Layout (Window* pParent); + Layout (vcl::Window* pParent); virtual ~Layout (); void AddToLeft (DockingWindow* pWin, Size const& rSize) { aLeftSide.Add(pWin, rSize); } diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index d7064e9d2485..57dde92c3cc0 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -17,7 +17,7 @@ namespace basctl { -LineNumberWindow::LineNumberWindow (Window* pParent, ModulWindow* pModulWindow) : +LineNumberWindow::LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWindow) : Window(pParent, WB_BORDER), m_pModulWindow(pModulWindow), m_nCurYOffset(0) diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx index e01c078a378f..5c539d6a767e 100644 --- a/basctl/source/basicide/linenumberwindow.hxx +++ b/basctl/source/basicide/linenumberwindow.hxx @@ -17,7 +17,7 @@ namespace basctl class ModulWindow; -class LineNumberWindow : public Window +class LineNumberWindow : public vcl::Window { private: ModulWindow* m_pModulWindow; @@ -30,7 +30,7 @@ protected: virtual void Paint( const Rectangle& ) SAL_OVERRIDE; public: - LineNumberWindow (Window* pParent, ModulWindow* pModulWin); + LineNumberWindow (vcl::Window* pParent, ModulWindow* pModulWin); virtual ~LineNumberWindow(); void DoScroll( long nHorzScroll, long nVertScroll ); diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index fb8621255a31..a88cca451cc2 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -59,7 +59,7 @@ using ::std::pair; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -MacroChooser::MacroChooser( Window* pParnt, bool bCreateEntries ) +MacroChooser::MacroChooser( vcl::Window* pParnt, bool bCreateEntries ) : SfxModalDialog(pParnt, "BasicMacroDialog", "modules/BasicIDE/ui/basicmacrodialog.ui") , bNewDelIsDel(true) // the Sfx doesn't aske the BasicManger whether modified or not @@ -232,7 +232,7 @@ short MacroChooser::Execute() if ( StarBASIC::IsRunning() ) m_pCloseButton->GrabFocus(); - Window* pPrevDlgParent = Application::GetDefDialogParent(); + vcl::Window* pPrevDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); short nRet = ModalDialog::Execute(); // #57314# If the BasicIDE has been activated, don't reset the DefModalDialogParent to the inactive document. @@ -365,7 +365,7 @@ SbMethod* MacroChooser::CreateMacro() if ( !pModule ) { - pModule = createModImpl( static_cast<Window*>( this ), + pModule = createModImpl( static_cast<vcl::Window*>( this ), aDocument, *m_pBasicBox, aLibName, aModName ); } @@ -749,7 +749,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) SvTreeListEntry* pCurEntry = m_pBasicBox->GetCurEntry(); EntryDescriptor aDesc = m_pBasicBox->GetEntryDescriptor(pCurEntry); ScriptDocument aDocument( aDesc.GetDocument() ); - createLibImpl( static_cast<Window*>( this ), aDocument, NULL, m_pBasicBox ); + createLibImpl( static_cast<vcl::Window*>( this ), aDocument, NULL, m_pBasicBox ); } else if (pButton == m_pNewModButton) { @@ -758,7 +758,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton ) ScriptDocument aDocument( aDesc.GetDocument() ); OUString aLibName( aDesc.GetLibName() ); OUString aModName; - createModImpl( static_cast<Window*>( this ), aDocument, + createModImpl( static_cast<vcl::Window*>( this ), aDocument, *m_pBasicBox, aLibName, aModName, true ); } else if (pButton == m_pOrganizeButton) diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx index 7efa94d20979..68dcd8c4c0ac 100644 --- a/basctl/source/basicide/macrodlg.hxx +++ b/basctl/source/basicide/macrodlg.hxx @@ -87,7 +87,7 @@ private: void RestoreMacroDescription(); public: - MacroChooser( Window* pParent, bool bCreateEntries = true ); + MacroChooser( vcl::Window* pParent, bool bCreateEntries = true ); virtual ~MacroChooser(); SbMethod* GetMacro(); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index e727ccf6ebe1..a889ca2d7adb 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -150,7 +150,7 @@ void LibLBoxString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDa } // namespace // basctl::CheckBox -CheckBox::CheckBox(Window* pParent, WinBits nStyle) +CheckBox::CheckBox(vcl::Window* pParent, WinBits nStyle) : SvTabListBox(pParent, nStyle) , eMode(ObjectMode::Module) , m_aDocument(ScriptDocument::getApplicationScriptDocument()) @@ -161,7 +161,7 @@ CheckBox::CheckBox(Window* pParent, WinBits nStyle) Init(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCheckBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCheckBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -364,7 +364,7 @@ IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler) return 0; } -NewObjectDialog::NewObjectDialog(Window * pParent, ObjectMode::Mode eMode, +NewObjectDialog::NewObjectDialog(vcl::Window * pParent, ObjectMode::Mode eMode, bool bCheckName) : ModalDialog(pParent, "NewLibDialog", "modules/BasicIDE/ui/newlibdialog.ui") { @@ -396,7 +396,7 @@ NewObjectDialog::NewObjectDialog(Window * pParent, ObjectMode::Mode eMode, } // GotoLineDialog -GotoLineDialog::GotoLineDialog(Window * pParent ) +GotoLineDialog::GotoLineDialog(vcl::Window * pParent ) : ModalDialog(pParent, "GotoLineDialog", "modules/BasicIDE/ui/gotolinedialog.ui") { @@ -428,7 +428,7 @@ IMPL_LINK_NOARG(ExportDialog, OkButtonHandler) return 0; } -ExportDialog::ExportDialog(Window * pParent) +ExportDialog::ExportDialog(vcl::Window * pParent) : ModalDialog(pParent, "ExportDialog", "modules/BasicIDE/ui/exportdialog.ui") , mbExportAsPackage(false) @@ -441,7 +441,7 @@ ExportDialog::ExportDialog(Window * pParent) } // LibPage -LibPage::LibPage(Window * pParent) +LibPage::LibPage(vcl::Window * pParent) : TabPage(pParent, "LibPage", "modules/BasicIDE/ui/libpage.ui") , m_aCurDocument(ScriptDocument::getApplicationScriptDocument()) @@ -689,7 +689,7 @@ IMPL_LINK_INLINE_END( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg ) void LibPage::NewLib() { - createLibImpl( static_cast<Window*>( this ), m_aCurDocument, m_pLibBox, NULL); + createLibImpl( static_cast<vcl::Window*>( this ), m_aCurDocument, m_pLibBox, NULL); } void LibPage::InsertLib() @@ -1428,7 +1428,7 @@ SvTreeListEntry* LibPage::ImpInsertLibEntry( const OUString& rLibName, sal_uLong } // Helper function -void createLibImpl( Window* pWin, const ScriptDocument& rDocument, +void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument, CheckBox* pLibBox, TreeListBox* pBasicBox ) { OSL_ENSURE( rDocument.isAlive(), "createLibImpl: invalid document!" ); diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 9586a4ff88d4..7f6359212a51 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -52,12 +52,12 @@ using namespace ::com::sun::star::resource; -ExtTreeListBox::ExtTreeListBox(Window* pParent, WinBits nStyle) +ExtTreeListBox::ExtTreeListBox(vcl::Window* pParent, WinBits nStyle) : TreeListBox(pParent, nStyle) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeExtTreeListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -462,7 +462,7 @@ TriState ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeLi } // OrganizeDialog -OrganizeDialog::OrganizeDialog(Window* pParent, sal_Int16 tabId, +OrganizeDialog::OrganizeDialog(vcl::Window* pParent, sal_Int16 tabId, EntryDescriptor& rDesc ) : TabDialog( pParent, "OrganizeDialog", "modules/BasicIDE/ui/organizedialog.ui" ) @@ -499,7 +499,7 @@ OrganizeDialog::~OrganizeDialog() short OrganizeDialog::Execute() { - Window* pPrevDlgParent = Application::GetDefDialogParent(); + vcl::Window* pPrevDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); short nRet = TabDialog::Execute(); Application::SetDefDialogParent( pPrevDlgParent ); @@ -550,7 +550,7 @@ IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl ) -ObjectPage::ObjectPage(Window *pParent, const OString &rName, sal_uInt16 nMode) +ObjectPage::ObjectPage(vcl::Window *pParent, const OString &rName, sal_uInt16 nMode) : TabPage(pParent, rName, OUString("modules/BasicIDE/ui/") + OStringToOUString(rName, RTL_TEXTENCODING_UTF8).toAsciiLowerCase() + OUString(".ui")) @@ -791,7 +791,7 @@ void ObjectPage::NewModule() if ( GetSelection( aDocument, aLibName ) ) { OUString aModName; - createModImpl( static_cast<Window*>( this ), aDocument, + createModImpl( static_cast<vcl::Window*>( this ), aDocument, *m_pBasicBox, aLibName, aModName, true ); } } @@ -912,7 +912,7 @@ void ObjectPage::EndTabDialog( sal_uInt16 nRet ) pTabDlg->EndDialog( nRet ); } -LibDialog::LibDialog( Window* pParent ) +LibDialog::LibDialog( vcl::Window* pParent ) : ModalDialog(pParent, "ImportLibDialog", "modules/BasicIDE/ui/importlibdialog.ui") { get(m_pStorageFrame, "storageframe"); @@ -931,7 +931,7 @@ void LibDialog::SetStorageName( const OUString& rName ) } // Helper function -SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, +SbModule* createModImpl( vcl::Window* pWin, const ScriptDocument& rDocument, TreeListBox& rBasicBox, const OUString& rLibName, const OUString& _aModName, bool bMain ) { OSL_ENSURE( rDocument.isAlive(), "createModImpl: invalid document!" ); diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index e57f6e870651..9ba3e894deab 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -56,7 +56,7 @@ private: DECL_LINK(OkButtonHandler, void *); public: - NewObjectDialog (Window* pParent, ObjectMode::Mode, bool bCheckName = false); + NewObjectDialog (vcl::Window* pParent, ObjectMode::Mode, bool bCheckName = false); OUString GetObjectName() const { return m_pEdit->GetText(); } void SetObjectName( const OUString& rName ) { @@ -71,7 +71,7 @@ class GotoLineDialog : public ModalDialog OKButton* m_pOKButton; DECL_LINK(OkButtonHandler, void *); public: - GotoLineDialog(Window * pParent); + GotoLineDialog(vcl::Window * pParent); sal_Int32 GetLineNumber() const; }; @@ -86,7 +86,7 @@ private: DECL_LINK(OkButtonHandler, void *); public: - ExportDialog( Window * pParent ); + ExportDialog( vcl::Window * pParent ); bool isExportAsPackage () const { return mbExportAsPackage; } }; @@ -109,7 +109,7 @@ protected: SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, bool bMove ); public: - ExtTreeListBox(Window* pParent, WinBits nStyle); + ExtTreeListBox(vcl::Window* pParent, WinBits nStyle); virtual ~ExtTreeListBox(); }; @@ -122,7 +122,7 @@ private: void Init(); public: - CheckBox(Window* pParent, WinBits nStyle); + CheckBox(vcl::Window* pParent, WinBits nStyle); virtual ~CheckBox(); SvTreeListEntry* DoInsertEntry( const OUString& rStr, sal_uLong nPos = LISTBOX_APPEND ); @@ -150,7 +150,7 @@ private: ::CheckBox* m_pReplaceBox; public: - LibDialog( Window* pParent ); + LibDialog( vcl::Window* pParent ); void SetStorageName( const OUString& rName ); @@ -169,7 +169,7 @@ private: EntryDescriptor m_aCurEntry; public: - OrganizeDialog( Window* pParent, sal_Int16 tabId, EntryDescriptor& rDesc ); + OrganizeDialog( vcl::Window* pParent, sal_Int16 tabId, EntryDescriptor& rDesc ); virtual ~OrganizeDialog(); virtual short Execute() SAL_OVERRIDE; @@ -201,7 +201,7 @@ protected: virtual void DeactivatePage() SAL_OVERRIDE; public: - ObjectPage(Window* pParent, const OString& rName, sal_uInt16 nMode); + ObjectPage(vcl::Window* pParent, const OString& rName, sal_uInt16 nMode); void SetCurrentEntry( EntryDescriptor& rDesc ); void SetTabDlg( TabDialog* p ) { pTabDlg = p;} @@ -247,16 +247,16 @@ protected: TabDialog* pTabDlg; public: - LibPage( Window* pParent ); + LibPage( vcl::Window* pParent ); virtual ~LibPage(); void SetTabDlg( TabDialog* p ) { pTabDlg = p;} }; // Helper functions -SbModule* createModImpl( Window* pWin, const ScriptDocument& rDocument, +SbModule* createModImpl( vcl::Window* pWin, const ScriptDocument& rDocument, TreeListBox& rBasicBox, const OUString& rLibName, const OUString& aModName, bool bMain = false ); -void createLibImpl( Window* pWin, const ScriptDocument& rDocument, +void createLibImpl( vcl::Window* pWin, const ScriptDocument& rDocument, CheckBox* pLibBox, TreeListBox* pBasicBox ); } // namespace basctl diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx index 3244507fc9ab..82b49f6659f9 100644 --- a/basctl/source/basicide/objdlg.cxx +++ b/basctl/source/basicide/objdlg.cxx @@ -37,7 +37,7 @@ namespace basctl { -ObjectCatalog::ObjectCatalog (Window* pParent) : +ObjectCatalog::ObjectCatalog (vcl::Window* pParent) : DockingWindow(pParent), aTitle(this), aTree(this, IDEResId(RID_TLB_MACROS)) diff --git a/basctl/source/basicide/objdlg.hxx b/basctl/source/basicide/objdlg.hxx index f91eaa4e0245..43a0953b2584 100644 --- a/basctl/source/basicide/objdlg.hxx +++ b/basctl/source/basicide/objdlg.hxx @@ -38,7 +38,7 @@ namespace basctl class ObjectCatalog : public DockingWindow { public: - ObjectCatalog (Window* pParent); + ObjectCatalog (vcl::Window* pParent); virtual ~ObjectCatalog (); public: void UpdateEntries () { aTree.UpdateEntries(); } diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index bd1edb03633d..b6c7f7f11782 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -174,7 +174,7 @@ bool DlgEditor::RemarkDialog() DlgEditor::DlgEditor ( - Window& rWindow_, DialogWindowLayout& rLayout_, + vcl::Window& rWindow_, DialogWindowLayout& rLayout_, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const& xModel, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> xDialogModel ) diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index 76c43de874b4..7beccb6ce29f 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -30,7 +30,7 @@ namespace basctl IMPL_LINK_INLINE_START( DlgEdFunc, ScrollTimeout, Timer *, pTimer ) { (void)pTimer; - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); Point aPos = rWindow.ScreenToOutputPixel( rWindow.GetPointerPosPixel() ); aPos = rWindow.PixelToLogic( aPos ); ForceScroll( aPos ); @@ -42,7 +42,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos ) { aScrollTimer.Stop(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); static Point aDefPoint; Rectangle aOutRect( aDefPoint, rWindow.GetOutputSizePixel() ); @@ -111,7 +111,7 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) bool bReturn = false; SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); vcl::KeyCode aCode = rKEvt.GetKeyCode(); sal_uInt16 nCode = aCode.GetCode(); @@ -350,7 +350,7 @@ bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) return true; SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); rView.SetActualWin(&rWindow); Point aPos = rWindow.PixelToLogic( rMEvt.GetPosPixel() ); @@ -388,7 +388,7 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) DlgEdFunc::MouseButtonUp( rMEvt ); SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); rView.SetActualWin(&rWindow); rWindow.ReleaseMouse(); @@ -418,7 +418,7 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) { SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); rView.SetActualWin(&rWindow); Point aPos = rWindow.PixelToLogic(rMEvt.GetPosPixel()); @@ -449,7 +449,7 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) { // get view from parent SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); rView.SetActualWin(&rWindow); sal_uInt16 nDrgLog = static_cast<sal_uInt16>(rWindow.PixelToLogic(Size(3, 0)).Width()); @@ -513,7 +513,7 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) // get view from parent SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); rView.SetActualWin(&rWindow); Point aPnt = rWindow.PixelToLogic(rMEvt.GetPosPixel()); @@ -544,7 +544,7 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) { SdrView& rView = rParent.GetView(); - Window& rWindow = rParent.GetWindow(); + vcl::Window& rWindow = rParent.GetWindow(); rView.SetActualWin(&rWindow); Point aPnt = rWindow.PixelToLogic(rMEvt.GetPosPixel()); diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index c91c80029c11..4d52b5f1b5ad 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -1636,7 +1636,7 @@ awt::DeviceInfo DlgEdForm::getDeviceInfo() const awt::DeviceInfo aDeviceInfo; DlgEditor& rEditor = GetDlgEditor(); - Window& rWindow = rEditor.GetWindow(); + vcl::Window& rWindow = rEditor.GetWindow(); // obtain an XControl ::utl::SharedUNOComponent< awt::XControl > xDialogControl; // ensures auto-disposal, if needed diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx index c75fd1915a22..8f07c70edad7 100644 --- a/basctl/source/dlged/dlgedview.cxx +++ b/basctl/source/dlged/dlgedview.cxx @@ -55,7 +55,7 @@ void DlgEdView::MarkListHasChanged() rDlgEditor.UpdatePropertyBrowserDelayed(); } -void DlgEdView::MakeVisible( const Rectangle& rRect, Window& rWin ) +void DlgEdView::MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) { // visible area MapMode aMap( rWin.GetMapMode() ); diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 5751fe4c24ba..55d1527fc0e7 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -55,7 +55,7 @@ bool localesAreEqual( const Locale& rLocaleLeft, const Locale& rLocaleRight ) return bRet; } -ManageLanguageDialog::ManageLanguageDialog(Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr) +ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr) : ModalDialog(pParent, "ManageLanguagesDialog", "modules/BasicIDE/ui/managelanguages.ui") , m_xLocalizationMgr(xLMgr) , m_sDefLangStr(IDE_RESSTR(RID_STR_DEF_LANG)) @@ -217,7 +217,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl) // class SetDefaultLanguageDialog ----------------------------------------------- -SetDefaultLanguageDialog::SetDefaultLanguageDialog(Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr) +SetDefaultLanguageDialog::SetDefaultLanguageDialog(vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr) : ModalDialog(pParent, "DefaultLanguageDialog", "modules/BasicIDE/ui/defaultlanguage.ui") , m_pCheckLangLB(NULL) , m_xLocalizationMgr(xLMgr) diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index ecbc219a1266..bd0fa268c427 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -25,7 +25,7 @@ #include <comphelper/accessiblecomponenthelper.hxx> #include <cppuhelper/implbase3.hxx> -class Window; +namespace vcl { class Window; } class VCLExternalSolarLock; namespace utl { @@ -74,7 +74,7 @@ protected: ::com::sun::star::awt::Rectangle GetBounds(); void SetBounds( const ::com::sun::star::awt::Rectangle& aBounds ); - Window* GetWindow() const; + vcl::Window* GetWindow() const; OUString GetModelStringProperty( const sal_Char* pPropertyName ); diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index e5fb443c08ce..b73b9e571b6e 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -50,7 +50,7 @@ class DlgEdView; class DialogWindowLayout; class ObjectCatalog; -bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ); +bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ); class DialogWindow: public BaseWindow { @@ -127,7 +127,7 @@ public: class DialogWindowLayout : public Layout { public: - DialogWindowLayout (Window* pParent, ObjectCatalog&); + DialogWindowLayout (vcl::Window* pParent, ObjectCatalog&); virtual ~DialogWindowLayout(); public: void ShowPropertyBrowser (); diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 27011d27bc82..8ded0fcda3bd 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -62,7 +62,7 @@ public: private: friend class JavaDebuggingListenerImpl; friend class LocalizationMgr; - friend bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ); // defined in baside3.cxx + friend bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const ScriptDocument& rDocument, const OUString& aLibName ); // defined in baside3.cxx WindowTable aWindowTable; sal_uInt16 nCurKey; diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx index 0c6af6cf536a..ef996125840a 100644 --- a/basctl/source/inc/basobj.hxx +++ b/basctl/source/inc/basobj.hxx @@ -30,7 +30,7 @@ class StarBASIC; class SfxUInt16Item; class SfxBindings; class SfxDispatcher; -class Window; +namespace vcl { class Window; } namespace basctl { @@ -68,7 +68,7 @@ namespace basctl Will show an error message when renaming fails because the new name is already used. */ bool RenameModule( - Window* pErrorParent, const ScriptDocument& rDocument, + vcl::Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName ); // new methods for macros @@ -91,7 +91,7 @@ namespace basctl Will show an error message when renaming fails because the new name is already used. */ bool RenameDialog( - Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName ) + vcl::Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName ) throw (css::container::ElementExistException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); bool RemoveDialog( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName ); diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index 0d0db7e94072..7ccf51130579 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -78,7 +78,7 @@ struct BasicStatus class DockingWindow : public ::DockingWindow { public: - DockingWindow (Window* pParent); + DockingWindow (vcl::Window* pParent); DockingWindow (Layout* pParent); public: void ResizeIfDocking (Point const&, Size const&); @@ -126,7 +126,7 @@ protected: virtual void EndRenaming() SAL_OVERRIDE; public: - TabBar (Window* pParent); + TabBar (vcl::Window* pParent); void Sort(); }; @@ -145,7 +145,7 @@ class EntryDescriptor; // BaseWindow -- the base of both ModulWindow and DialogWindow. -class BaseWindow : public Window +class BaseWindow : public vcl::Window { private: ScrollBar* pShellHScrollBar; @@ -166,7 +166,7 @@ protected: public: TYPEINFO(); - BaseWindow( Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName ); + BaseWindow( vcl::Window* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName ); virtual ~BaseWindow(); void Init(); @@ -295,11 +295,11 @@ void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines OUString CreateMgrAndLibStr( const OUString& rMgrName, const OUString& rLibName ); sal_uLong CalcLineCount( SvStream& rStream ); -bool QueryReplaceMacro( const OUString& rName, Window* pParent = 0 ); -bool QueryDelMacro( const OUString& rName, Window* pParent = 0 ); -bool QueryDelDialog( const OUString& rName, Window* pParent = 0 ); -bool QueryDelModule( const OUString& rName, Window* pParent = 0 ); -bool QueryDelLib( const OUString& rName, bool bRef = false, Window* pParent = 0 ); +bool QueryReplaceMacro( const OUString& rName, vcl::Window* pParent = 0 ); +bool QueryDelMacro( const OUString& rName, vcl::Window* pParent = 0 ); +bool QueryDelDialog( const OUString& rName, vcl::Window* pParent = 0 ); +bool QueryDelModule( const OUString& rName, vcl::Window* pParent = 0 ); +bool QueryDelLib( const OUString& rName, bool bRef = false, vcl::Window* pParent = 0 ); bool QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const OUString& rLibName, OUString& rPassword, bool bRepeat = false, bool bNewTitle = false ); class ModuleInfoHelper diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index c0e5c95ecc47..981bc08300d1 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -37,7 +37,7 @@ class Printer; class KeyEvent; class MouseEvent; class Timer; -class Window; +namespace vcl { class Window; } namespace basctl { @@ -118,7 +118,7 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_ClipboardDataFlavorsResource; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xSupplier; boost::scoped_ptr<DlgEdFactory> pObjFac; // never nullptr - Window& rWindow; // DialogWindow + vcl::Window& rWindow; // DialogWindow boost::scoped_ptr<DlgEdFunc> pFunc; DialogWindowLayout& rLayout; Mode eMode; @@ -137,13 +137,13 @@ private: public: DlgEditor ( - Window&, DialogWindowLayout&, + vcl::Window&, DialogWindowLayout&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const& xModel, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> xDialogModel ); virtual ~DlgEditor(); - Window& GetWindow() const { return rWindow; } + vcl::Window& GetWindow() const { return rWindow; } /** returns the control container associated with our window @see GetWindow diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx index 9b094888ba7c..7ba534d24bac 100644 --- a/basctl/source/inc/dlgedview.hxx +++ b/basctl/source/inc/dlgedview.hxx @@ -44,7 +44,7 @@ public: virtual ~DlgEdView(); virtual void MarkListHasChanged() SAL_OVERRIDE; - virtual void MakeVisible( const Rectangle& rRect, Window& rWin ) SAL_OVERRIDE; + virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) SAL_OVERRIDE; protected: // overloaded to handle HitTest for some objects special diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index de364c316c6a..1cc2db170bd2 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -73,7 +73,7 @@ private: DECL_LINK(SelectHdl, void *); public: - ManageLanguageDialog( Window* pParent, boost::shared_ptr<LocalizationMgr> _pLMgr ); + ManageLanguageDialog( vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> _pLMgr ); virtual ~ManageLanguageDialog(); }; @@ -92,7 +92,7 @@ private: void FillLanguageBox(); public: - SetDefaultLanguageDialog(Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr); + SetDefaultLanguageDialog(vcl::Window* pParent, boost::shared_ptr<LocalizationMgr> xLMgr); ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > GetLocales() const; }; diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index b8e26962de97..884600d6ed2a 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -44,12 +44,12 @@ class SvRTLInputBox : public ModalDialog DECL_LINK( CancelHdl, Button * ); public: - SvRTLInputBox( Window* pParent, const OUString& rPrompt, const OUString& rTitle, + SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, const OUString& rTitle, const OUString& rDefault, long nXTwips = -1, long nYTwips = -1 ); OUString GetText() const SAL_OVERRIDE { return aText; } }; -SvRTLInputBox::SvRTLInputBox( Window* pParent, const OUString& rPrompt, +SvRTLInputBox::SvRTLInputBox( vcl::Window* pParent, const OUString& rPrompt, const OUString& rTitle, const OUString& rDefault, long nXTwips, long nYTwips ) : ModalDialog( pParent,WB_3DLOOK | WB_MOVEABLE | WB_CLOSEABLE ), diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 865f01908761..4465743a6581 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -70,14 +70,14 @@ class SbiInputDialog : public ModalDialog { OKButton aOk; CancelButton aCancel; OUString aText; - DECL_LINK( Ok, Window * ); - DECL_LINK( Cancel, Window * ); + DECL_LINK( Ok, vcl::Window * ); + DECL_LINK( Cancel, vcl::Window * ); public: - SbiInputDialog( Window*, const OUString& ); + SbiInputDialog( vcl::Window*, const OUString& ); const OUString& GetInput() { return aText; } }; -SbiInputDialog::SbiInputDialog( Window* pParent, const OUString& rPrompt ) +SbiInputDialog::SbiInputDialog( vcl::Window* pParent, const OUString& rPrompt ) :ModalDialog( pParent, WB_3DLOOK | WB_MOVEABLE | WB_CLOSEABLE ), aInput( this, WB_3DLOOK | WB_LEFT | WB_BORDER ), aOk( this ), aCancel( this ) @@ -105,7 +105,7 @@ SbiInputDialog::SbiInputDialog( Window* pParent, const OUString& rPrompt ) aCancel.Show(); } -IMPL_LINK_INLINE_START( SbiInputDialog, Ok, Window *, pWindow ) +IMPL_LINK_INLINE_START( SbiInputDialog, Ok, vcl::Window *, pWindow ) { (void)pWindow; @@ -113,16 +113,16 @@ IMPL_LINK_INLINE_START( SbiInputDialog, Ok, Window *, pWindow ) EndDialog( 1 ); return 0; } -IMPL_LINK_INLINE_END( SbiInputDialog, Ok, Window *, pWindow ) +IMPL_LINK_INLINE_END( SbiInputDialog, Ok, vcl::Window *, pWindow ) -IMPL_LINK_INLINE_START( SbiInputDialog, Cancel, Window *, pWindow ) +IMPL_LINK_INLINE_START( SbiInputDialog, Cancel, vcl::Window *, pWindow ) { (void)pWindow; EndDialog( 0 ); return 0; } -IMPL_LINK_INLINE_END( SbiInputDialog, Cancel, Window *, pWindow ) +IMPL_LINK_INLINE_END( SbiInputDialog, Cancel, vcl::Window *, pWindow ) SbiStream::SbiStream() @@ -851,7 +851,7 @@ void SbiIoSystem::Shutdown() if( !aOut.isEmpty() ) { #if defined __GNUC__ - Window* pParent = Application::GetDefDialogParent(); + vcl::Window* pParent = Application::GetDefDialogParent(); MessBox( pParent, WinBits( WB_OK ), OUString(), aOut ).Execute(); #else MessBox( GetpApp()->GetDefDialogParent(), WinBits( WB_OK ), OUString(), aOut ).Execute(); diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index d6fcad2d509a..0d8ff6426158 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -4601,7 +4601,7 @@ RTLFUNC(MsgBox) SolarMutexGuard aSolarGuard; - Window* pParent = Application::GetDefDialogParent(); + vcl::Window* pParent = Application::GetDefDialogParent(); switch( nType ) { case 16: diff --git a/canvas/source/cairo/cairo_cairo.cxx b/canvas/source/cairo/cairo_cairo.cxx index 290235a6d25f..cb5eeb951d72 100644 --- a/canvas/source/cairo/cairo_cairo.cxx +++ b/canvas/source/cairo/cairo_cairo.cxx @@ -30,7 +30,7 @@ namespace cairo * Surface classes), see platform specific cairo_<platform>_cairo.cxx * ****************************************************************************************/ - const SystemEnvData* GetSysData(const Window *pOutputWindow) + const SystemEnvData* GetSysData(const vcl::Window *pOutputWindow) { const SystemEnvData* pSysData = NULL; // check whether we're a SysChild: have to fetch system data diff --git a/canvas/source/cairo/cairo_cairo.hxx b/canvas/source/cairo/cairo_cairo.hxx index b971988333d1..10c92038f5dd 100644 --- a/canvas/source/cairo/cairo_cairo.hxx +++ b/canvas/source/cairo/cairo_cairo.hxx @@ -28,7 +28,7 @@ struct BitmapSystemData; struct SystemGraphicsData; class VirtualDevice; class OutputDevice; -class Window; +namespace vcl { class Window; } class Size; #include <cairo.h> @@ -43,7 +43,7 @@ namespace cairo { typedef boost::shared_ptr<cairo_surface_t> CairoSurfaceSharedPtr; typedef boost::shared_ptr<Cairo> CairoSharedPtr; - const SystemEnvData* GetSysData(const Window *pOutputWindow); + const SystemEnvData* GetSysData(const vcl::Window *pOutputWindow); /** Cairo surface interface diff --git a/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx index 07951eeba94c..390402a9bde5 100644 --- a/canvas/source/cairo/cairo_quartz_cairo.cxx +++ b/canvas/source/cairo/cairo_quartz_cairo.cxx @@ -301,7 +301,7 @@ namespace cairo if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW ) { - const Window &rWindow = (const Window &) rRefDevice; + const vcl::Window &rWindow = (const vcl::Window &) rRefDevice; const SystemEnvData* pSysData = GetSysData(&rWindow); if (pSysData) surf = SurfaceSharedPtr(new QuartzSurface(pSysData->pView, x, y, width, height)); diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index 78f2450a9029..782d0433aebb 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -80,7 +80,7 @@ namespace cairocanvas uno::Reference< awt::XWindow > xParentWindow; maArguments[4] >>= xParentWindow; - Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if( !pParentWindow ) throw lang::NoSupportException( "Parent window not VCL window, or canvas out-of-process!", NULL); diff --git a/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx index 8288186c2f17..ceba72a0ac4b 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.cxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx @@ -51,7 +51,7 @@ namespace cairocanvas mbFullScreen( false ) {} - void SpriteDeviceHelper::init( Window& rOutputWindow, + void SpriteDeviceHelper::init( vcl::Window& rOutputWindow, SpriteCanvas& rSpriteCanvas, const ::basegfx::B2ISize& rSize, bool bFullscreen ) diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx index b359de0b76b2..a8be2b676b9b 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.hxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx @@ -43,7 +43,7 @@ namespace cairocanvas public: SpriteDeviceHelper(); - void init( Window& rOutputWindow, + void init( vcl::Window& rOutputWindow, SpriteCanvas& rSpriteCanvas, const ::basegfx::B2ISize& rSize, bool bFullscreen ); diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx index a70add9500a2..8d4a4d2ff680 100644 --- a/canvas/source/cairo/cairo_win32_cairo.cxx +++ b/canvas/source/cairo/cairo_win32_cairo.cxx @@ -231,7 +231,7 @@ namespace cairo if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW ) { - const Window &rWindow = (const Window &) rRefDevice; + const vcl::Window &rWindow = (const vcl::Window &) rRefDevice; const SystemEnvData* pSysData = GetSysData(&rWindow); if (pSysData && pSysData->hWnd) surf = SurfaceSharedPtr(new Win32Surface(GetDC((HWND) pSysData->hWnd), x, y)); diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx index 9b49c7e88cbc..8f496a45f39d 100644 --- a/canvas/source/cairo/cairo_xlib_cairo.cxx +++ b/canvas/source/cairo/cairo_xlib_cairo.cxx @@ -318,7 +318,7 @@ namespace cairo return SurfaceSharedPtr(new X11Surface(rSurface)); } - static X11SysData getSysData( const Window& rWindow ) + static X11SysData getSysData( const vcl::Window& rWindow ) { const SystemEnvData* pSysData = GetSysData(&rWindow); @@ -337,7 +337,7 @@ namespace cairo int x, int y, int width, int height ) { if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW ) - return SurfaceSharedPtr(new X11Surface(getSysData((const Window&)rRefDevice), + return SurfaceSharedPtr(new X11Surface(getSysData((const vcl::Window&)rRefDevice), x,y,width,height)); else if( rRefDevice.GetOutDevType() == OUTDEV_VIRDEV ) return SurfaceSharedPtr(new X11Surface(getSysData((const VirtualDevice&)rRefDevice), @@ -355,7 +355,7 @@ namespace cairo if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() ) { if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW ) - return SurfaceSharedPtr(new X11Surface(getSysData((const Window&)rRefDevice), rData )); + return SurfaceSharedPtr(new X11Surface(getSysData((const vcl::Window&)rRefDevice), rData )); else if( rRefDevice.GetOutDevType() == OUTDEV_VIRDEV ) return SurfaceSharedPtr(new X11Surface(getSysData((const VirtualDevice&)rRefDevice), rData )); } diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index e34233849fcc..cc48395d8b23 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -181,7 +181,7 @@ namespace dxcanvas class DXRenderModule : public IDXRenderModule { public: - explicit DXRenderModule( const ::Window& rWindow ); + explicit DXRenderModule( const vcl::Window& rWindow ); ~DXRenderModule(); virtual void lock() const { maMutex.acquire(); } @@ -211,7 +211,7 @@ namespace dxcanvas private: - bool create( const ::Window& rWindow ); + bool create( const vcl::Window& rWindow ); bool createDevice(); bool verifyDevice( const UINT nAdapter ); UINT getAdapterFromWindow(); @@ -563,7 +563,7 @@ namespace dxcanvas // DXRenderModule::DXRenderModule - DXRenderModule::DXRenderModule( const ::Window& rWindow ) : + DXRenderModule::DXRenderModule( const vcl::Window& rWindow ) : mhWnd(0), mpDevice(), mpDirect3D9(), @@ -660,7 +660,7 @@ namespace dxcanvas // DXRenderModule::create - bool DXRenderModule::create( const ::Window& rWindow ) + bool DXRenderModule::create( const vcl::Window& rWindow ) { // TODO(P2): get rid of those fine-grained locking ::osl::MutexGuard aGuard( maMutex ); @@ -669,7 +669,7 @@ namespace dxcanvas mpWindow.reset( new SystemChildWindow( - const_cast<Window *>(&rWindow), 0) ); + const_cast<vcl::Window *>(&rWindow), 0) ); // system child window must not receive mouse events mpWindow->SetMouseTransparent( TRUE ); @@ -1336,7 +1336,7 @@ namespace dxcanvas // createRenderModule - IDXRenderModuleSharedPtr createRenderModule( const ::Window& rParent ) + IDXRenderModuleSharedPtr createRenderModule( const vcl::Window& rParent ) { return IDXRenderModuleSharedPtr( new DXRenderModule(rParent) ); } diff --git a/canvas/source/directx/dx_rendermodule.hxx b/canvas/source/directx/dx_rendermodule.hxx index f15d3d3bd01e..6a61a64b09dc 100644 --- a/canvas/source/directx/dx_rendermodule.hxx +++ b/canvas/source/directx/dx_rendermodule.hxx @@ -26,7 +26,7 @@ #include <boost/shared_ptr.hpp> #include "dx_winstuff.hxx" -class Window; +namespace vcl { class Window; } namespace basegfx { class B2IRange; @@ -75,7 +75,7 @@ namespace dxcanvas /** Factory method, to create an IRenderModule instance for the given VCL window instance */ - IDXRenderModuleSharedPtr createRenderModule( const ::Window& rParent ); + IDXRenderModuleSharedPtr createRenderModule( const vcl::Window& rParent ); } #endif diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx index 3d36b2033962..6b72848b647d 100644 --- a/canvas/source/directx/dx_spritecanvas.cxx +++ b/canvas/source/directx/dx_spritecanvas.cxx @@ -88,7 +88,7 @@ namespace dxcanvas uno::Reference< awt::XWindow > xParentWindow; maArguments[4] >>= xParentWindow; - Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if( !pParentWindow ) throw lang::NoSupportException( "Parent window not VCL window, or canvas out-of-process!" ); diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx index 76cf78efceb0..feede348af1c 100644 --- a/canvas/source/directx/dx_spritedevicehelper.cxx +++ b/canvas/source/directx/dx_spritedevicehelper.cxx @@ -51,7 +51,7 @@ namespace dxcanvas { } - void SpriteDeviceHelper::init( Window& rWindow, + void SpriteDeviceHelper::init( vcl::Window& rWindow, SpriteCanvas& rSpriteCanvas, const awt::Rectangle& rRect, bool /*bFullscreen*/ ) diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx index 81a8bb4ee263..bd6ec175b96b 100644 --- a/canvas/source/directx/dx_spritedevicehelper.hxx +++ b/canvas/source/directx/dx_spritedevicehelper.hxx @@ -42,7 +42,7 @@ namespace dxcanvas public: SpriteDeviceHelper(); - void init( Window& rWindow, + void init( vcl::Window& rWindow, SpriteCanvas& rSpriteCanvas, const ::com::sun::star::awt::Rectangle& rRect, bool bFullscreen ); diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index a7e255fa8dda..c378baeae21e 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -64,7 +64,7 @@ namespace oglcanvas uno::Reference< awt::XWindow > xParentWindow; maArguments[4] >>= xParentWindow; - Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if( !pParentWindow ) throw lang::NoSupportException( "Parent window not VCL window, or canvas out-of-process!", NULL); diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 58a59ea1fe1c..5b712b841692 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -93,7 +93,7 @@ namespace oglcanvas SpriteDeviceHelper::~SpriteDeviceHelper() {} - void SpriteDeviceHelper::init( Window& rWindow, + void SpriteDeviceHelper::init( vcl::Window& rWindow, SpriteCanvas& rSpriteCanvas, const awt::Rectangle& rViewArea ) { diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx index bb4a976985a1..4eb3c4b0e94c 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.hxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx @@ -22,7 +22,7 @@ #include <set> -class Window; +namespace vcl { class Window; } class SystemChildWindow; namespace basegfx{ class B2IVector; class B2DHomMatrix; } namespace com { namespace sun { namespace star { @@ -43,7 +43,7 @@ namespace oglcanvas SpriteDeviceHelper(); ~SpriteDeviceHelper(); - void init( Window& rWindow, + void init( vcl::Window& rWindow, SpriteCanvas& rSpriteCanvas, const ::com::sun::star::awt::Rectangle& rViewArea ); diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index e06d0170f9df..3feb2351eddd 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -1183,7 +1183,7 @@ namespace canvas { awt::Rectangle aRetVal( rRect ); - ::Window* pWindow = VCLUnoHelper::GetWindow(xWin); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWin); if( pWindow ) { ::Point aPoint( aRetVal.X, diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index d14ec6bed060..116b4ac116c0 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -1436,14 +1436,14 @@ namespace vclcanvas { // TODO(Q3): Evil downcast. And what's more, Window::Flush is // not even const. Wah. - static_cast<Window&>(mpOutDev->getOutDev()).Flush(); + static_cast<vcl::Window&>(mpOutDev->getOutDev()).Flush(); } if( mp2ndOutDev && mp2ndOutDev->getOutDev().GetOutDevType() == OUTDEV_WINDOW ) { // TODO(Q3): Evil downcast. And what's more, Window::Flush is // not even const. Wah. - static_cast<Window&>(mp2ndOutDev->getOutDev()).Flush(); + static_cast<vcl::Window&>(mp2ndOutDev->getOutDev()).Flush(); } } diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index 58dfa55d3bb3..08c532cc8421 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -266,10 +266,10 @@ namespace vclcanvas const Size aOutDevSize( rBackOutDev.GetOutputSizePixel() ); const Point aEmptyPoint(0,0); - Window* pTargetWindow = NULL; + vcl::Window* pTargetWindow = NULL; if( rOutDev.GetOutDevType() == OUTDEV_WINDOW ) { - pTargetWindow = &static_cast<Window&>(rOutDev); // TODO(Q3): Evil downcast. + pTargetWindow = &static_cast<vcl::Window&>(rOutDev); // TODO(Q3): Evil downcast. // we're double-buffered, thus no need for paint area-limiting // clips. besides that, will interfere with animations (as for diff --git a/canvas/source/vcl/windowoutdevholder.cxx b/canvas/source/vcl/windowoutdevholder.cxx index 92f4e0ebf0eb..398ae72e829b 100644 --- a/canvas/source/vcl/windowoutdevholder.cxx +++ b/canvas/source/vcl/windowoutdevholder.cxx @@ -29,9 +29,9 @@ namespace vclcanvas { namespace { - Window& windowFromXWin( const uno::Reference<awt::XWindow>& xWin ) + vcl::Window& windowFromXWin( const uno::Reference<awt::XWindow>& xWin ) { - Window* pWindow = VCLUnoHelper::GetWindow(xWin); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(xWin); if( !pWindow ) throw lang::NoSupportException( "Parent window not VCL window, or canvas out-of-process!", diff --git a/canvas/source/vcl/windowoutdevholder.hxx b/canvas/source/vcl/windowoutdevholder.hxx index 8ac11e7fb243..1d652d1d81d2 100644 --- a/canvas/source/vcl/windowoutdevholder.hxx +++ b/canvas/source/vcl/windowoutdevholder.hxx @@ -51,7 +51,7 @@ namespace vclcanvas // vcl/source/window/window.cxx is broken, that disposes the // canvas during window deletion, we're riding a dead horse // here - Window& mrOutputWindow; + vcl::Window& mrOutputWindow; }; } diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index 2d5fa092c8c5..ac8869abdb7d 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -76,7 +76,7 @@ static void PrintHelp() class TestWindow : public Dialog { public: - TestWindow() : Dialog( (Window *) NULL ) + TestWindow() : Dialog( (vcl::Window *) NULL ) { SetText( OUString( "Canvas test" ) ); SetSizePixel( Size( 600, 450 ) ); diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 95992f425c5c..c03c0b16ad92 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -697,7 +697,7 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds() ExplicitValueProvider::getExplicitValueProvider( m_aAccInfo.m_xView )); if( pExplicitValueProvider ) { - Window* pWindow( VCLUnoHelper::GetWindow( m_aAccInfo.m_xWindow )); + vcl::Window* pWindow( VCLUnoHelper::GetWindow( m_aAccInfo.m_xWindow )); awt::Rectangle aLogicRect( pExplicitValueProvider->getRectangleOfObject( m_aAccInfo.m_aOID.getObjectCID() )); if( pWindow ) { diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 83bec76014c8..4b742f17a54c 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -76,7 +76,7 @@ awt::Rectangle AccessibleChartView::GetWindowPosSize() const awt::Rectangle aBBox( xWindow->getPosSize() ); - Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow )); + vcl::Window* pWindow( VCLUnoHelper::GetWindow( GetInfo().m_xWindow )); if( pWindow ) { SolarMutexGuard aSolarGuard; @@ -324,7 +324,7 @@ void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments aAccInfo.m_pParent = 0; aAccInfo.m_spObjectHierarchy = m_spObjectHierarchy; aAccInfo.m_pSdrView = m_pSdrView; - Window* pWindow = VCLUnoHelper::GetWindow( m_xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( m_xWindow ); if ( m_pViewForwarder ) { delete m_pViewForwarder; diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 6fcf15d9dacc..9c3f3c15dbbf 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -78,7 +78,7 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg if( m_pTextHelper ) delete m_pTextHelper; - Window* pWindow( VCLUnoHelper::GetWindow( xWindow )); + vcl::Window* pWindow( VCLUnoHelper::GetWindow( xWindow )); if( pWindow ) { SdrView * pView = m_pDrawViewWrapper; diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx index ff0b68354b4a..28fe99fa7b73 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star; namespace chart { -AccessibleViewForwarder::AccessibleViewForwarder( AccessibleChartView* pAccChartView, Window* pWindow ) +AccessibleViewForwarder::AccessibleViewForwarder( AccessibleChartView* pAccChartView, vcl::Window* pWindow ) :m_pAccChartView( pAccChartView ) ,m_pWindow( pWindow ) ,m_aMapMode( MAP_100TH_MM ) diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx index 715fa61d51f0..577a02970763 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx @@ -22,7 +22,7 @@ #include <vcl/mapmod.hxx> #include <svx/IAccessibleViewForwarder.hxx> -class Window; +namespace vcl { class Window; } namespace chart { @@ -32,7 +32,7 @@ class AccessibleChartView; class AccessibleViewForwarder : public ::accessibility::IAccessibleViewForwarder { public: - AccessibleViewForwarder( AccessibleChartView* pAccChartView, Window* pWindow ); + AccessibleViewForwarder( AccessibleChartView* pAccChartView, vcl::Window* pWindow ); virtual ~AccessibleViewForwarder(); // ________ IAccessibleViewforwarder ________ @@ -48,7 +48,7 @@ private: AccessibleViewForwarder& operator=( AccessibleViewForwarder& ); AccessibleChartView* m_pAccChartView; - Window* m_pWindow; + vcl::Window* m_pWindow; MapMode m_aMapMode; }; diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 5d6f1dd6db63..a58043df97c0 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -101,7 +101,7 @@ namespace impl class SeriesHeaderEdit : public Edit { public: - SeriesHeaderEdit( Window * pParent ); + SeriesHeaderEdit( vcl::Window * pParent ); virtual ~SeriesHeaderEdit(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -114,7 +114,7 @@ private: bool m_bShowWarningBox; }; -SeriesHeaderEdit::SeriesHeaderEdit( Window * pParent ) : +SeriesHeaderEdit::SeriesHeaderEdit( vcl::Window * pParent ) : Edit( pParent ), m_nStartColumn( 0 ), m_bShowWarningBox( false ) @@ -147,7 +147,7 @@ void SeriesHeaderEdit::MouseButtonDown( const MouseEvent& rMEvt ) class SeriesHeader { public: - explicit SeriesHeader(Window * pParent, Window *pColorParent); + explicit SeriesHeader(vcl::Window * pParent, vcl::Window *pColorParent); void SetColor( const Color & rCol ); void SetPos( const Point & rPos ); @@ -200,7 +200,7 @@ private: bool m_bSeriesNameChangePending; }; -SeriesHeader::SeriesHeader( Window * pParent, Window *pColorParent ) : +SeriesHeader::SeriesHeader( vcl::Window * pParent, vcl::Window *pColorParent ) : m_spSymbol( new FixedImage( pParent, WB_NOBORDER )), m_spSeriesName( new SeriesHeaderEdit( pParent )), m_spColorBar( new FixedText( pColorParent, WB_NOBORDER )), @@ -455,7 +455,7 @@ sal_Int32 lcl_getColumnInDataOrHeader( } // anonymous namespace -DataBrowser::DataBrowser( Window* pParent, WinBits nStyle, bool bLiveUpdate ) : +DataBrowser::DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate ) : ::svt::EditBrowseBox( pParent, nStyle, EBBF_SMART_TAB_TRAVEL | EBBF_HANDLE_COLUMN_TEXT, BROWSER_STANDARD_FLAGS ), m_nSeekRow( 0 ), m_bIsReadOnly( false ), @@ -580,8 +580,8 @@ void DataBrowser::RenewTable() GoToColumnId( ::std::min( nOldColId, static_cast< sal_uInt16 >( ColCount() - 1 ))); Dialog* pDialog = GetParentDialog(); - Window* pWin = pDialog->get<VclContainer>("columns"); - Window* pColorWin = pDialog->get<VclContainer>("colorcolumns"); + vcl::Window* pWin = pDialog->get<VclContainer>("columns"); + vcl::Window* pColorWin = pDialog->get<VclContainer>("colorcolumns"); // fill series headers clearHeaders(); @@ -1216,8 +1216,8 @@ void DataBrowser::EndScroll() void DataBrowser::RenewSeriesHeaders() { Dialog* pDialog = GetParentDialog(); - Window* pWin = pDialog->get<VclContainer>("columns"); - Window* pColorWin = pDialog->get<VclContainer>("colorcolumns"); + vcl::Window* pWin = pDialog->get<VclContainer>("columns"); + vcl::Window* pColorWin = pDialog->get<VclContainer>("colorcolumns"); clearHeaders(); DataBrowserModel::tDataHeaderVector aHeaders( m_apDataBrowserModel->getDataHeaders()); @@ -1260,8 +1260,8 @@ void DataBrowser::ImplAdjustHeaderControls() nCurrentPos += this->GetColumnWidth( 0 ); Dialog* pDialog = GetParentDialog(); - Window* pWin = pDialog->get<VclContainer>("columns"); - Window* pColorWin = pDialog->get<VclContainer>("colorcolumns"); + vcl::Window* pWin = pDialog->get<VclContainer>("columns"); + vcl::Window* pColorWin = pDialog->get<VclContainer>("colorcolumns"); pWin->set_margin_left(nCurrentPos); pColorWin->set_margin_left(nCurrentPos); diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 3d908aa4517c..f4c82b3dd012 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -67,7 +67,7 @@ protected: void SetDirty(); public: - DataBrowser( Window* pParent, WinBits nStyle, bool bLiveUpdate ); + DataBrowser( vcl::Window* pParent, WinBits nStyle, bool bLiveUpdate ); virtual ~DataBrowser(); /** GetCellText returns the text at the given position diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/chart2/source/controller/dialogs/TextDirectionListBox.cxx index 46149a6befc5..85c1def2c08d 100644 --- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx +++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx @@ -27,7 +27,7 @@ namespace chart { -TextDirectionListBox::TextDirectionListBox( Window* pParent, Window* pWindow1, Window* pWindow2 ) : +TextDirectionListBox::TextDirectionListBox( vcl::Window* pParent, vcl::Window* pWindow1, vcl::Window* pWindow2 ) : svx::FrameDirectionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_DROPDOWN) { InsertEntryValue( SCH_RESSTR( STR_TEXT_DIRECTION_LTR ), FRMDIR_HORI_LEFT_TOP ); @@ -42,7 +42,7 @@ TextDirectionListBox::TextDirectionListBox( Window* pParent, Window* pWindow1, W } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTextDirectionListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTextDirectionListBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new TextDirectionListBox(pParent); } diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index 4acb3382866e..30d03d140def 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -33,7 +33,7 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -ChartTypeDialog::ChartTypeDialog( Window* pParent +ChartTypeDialog::ChartTypeDialog( vcl::Window* pParent , const uno::Reference< frame::XModel >& xChartModel , const uno::Reference< uno::XComponentContext >& xContext ) : ModalDialog( pParent, "ChartTypeDialog", diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index 3ca294af9a3b..9cd0f7c863f1 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -84,7 +84,7 @@ void ChartTypeUnoDlg::implInitialize(const uno::Any& _rValue) else ChartTypeUnoDlg_BASE::implInitialize(_rValue); } -Dialog* ChartTypeUnoDlg::createDialog(Window* _pParent) +Dialog* ChartTypeUnoDlg::createDialog(vcl::Window* _pParent) { return new ChartTypeDialog( _pParent, m_xChartModel, m_aContext ); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index a1cf29d3d9ea..d7faca0c4571 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -50,7 +50,7 @@ namespace const sal_Int32 nPageCount = 4; } -CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XModel >& xChartModel +CreationWizard::CreationWizard( vcl::Window* pParent, const uno::Reference< frame::XModel >& xChartModel , const uno::Reference< uno::XComponentContext >& xContext , sal_Int32 nOnePageOnlyIndex ) : svt::RoadmapWizard( pParent, diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 8bc46fd193bd..edf8d85cf4f8 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -173,7 +173,7 @@ void CreationWizardUnoDlg::createDialogOnDemand() SolarMutexGuard aSolarGuard; if( !m_pDialog ) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if( !m_xParentWindow.is() && m_xChartModel.is() ) { uno::Reference< frame::XController > xController( diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index a1ebedc7bafc..4183aaf6b503 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -39,7 +39,7 @@ using ::com::sun::star::uno::Reference; namespace chart { -DataEditor::DataEditor(Window* pParent, +DataEditor::DataEditor(vcl::Window* pParent, const Reference< chart2::XChartDocument > & xChartDoc, const Reference< uno::XComponentContext > & xContext) : ModalDialog(pParent, "ChartDataDialog", @@ -48,7 +48,7 @@ DataEditor::DataEditor(Window* pParent, , m_xChartDoc(xChartDoc) , m_xContext(xContext) { - m_xBrwData.reset(new DataBrowser(get<Window>("datawindow"), WB_BORDER | WB_TABSTOP, true /* bLiveUpdate */)); + m_xBrwData.reset(new DataBrowser(get<vcl::Window>("datawindow"), WB_BORDER | WB_TABSTOP, true /* bLiveUpdate */)); m_xBrwData->set_hexpand(true); m_xBrwData->set_vexpand(true); m_xBrwData->set_expand(true); @@ -201,13 +201,13 @@ bool DataEditor::ApplyChangesToModel() // travels/no longer travels over this window. _rMemFunc may be // TaskPaneList::AddWindow or TaskPaneList::RemoveWindow void DataEditor::notifySystemWindow( - Window* pWindow, Window* pToRegister, - ::comphelper::mem_fun1_t< TaskPaneList, Window* > rMemFunc ) + vcl::Window* pWindow, vcl::Window* pToRegister, + ::comphelper::mem_fun1_t< TaskPaneList, vcl::Window* > rMemFunc ) { OSL_ENSURE( pWindow, "Window must not be null!" ); if( !pWindow ) return; - Window* pParent = pWindow->GetParent(); + vcl::Window* pParent = pWindow->GetParent(); while( pParent && ! pParent->IsSystemWindow() ) { pParent = pParent->GetParent(); diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index a0e810df8e05..bfa90c7647be 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -84,7 +84,7 @@ Reference< chart2::XChartTypeTemplate > DocumentChartTypeTemplateProvider::getCu class DataSourceTabControl : public TabControl { public: - DataSourceTabControl(Window* pParent); + DataSourceTabControl(vcl::Window* pParent); virtual bool DeactivatePage() SAL_OVERRIDE; @@ -95,7 +95,7 @@ private: bool m_bTogglingEnabled; }; -DataSourceTabControl::DataSourceTabControl(Window* pParent) +DataSourceTabControl::DataSourceTabControl(vcl::Window* pParent) : TabControl(pParent) , m_bTogglingEnabled(true) { @@ -124,7 +124,7 @@ enum DataSourceDialogPages TP_DATA_SOURCE = 2 }; -DataSourceDialog::DataSourceDialog(Window * pParent, +DataSourceDialog::DataSourceDialog(vcl::Window * pParent, const Reference< XChartDocument > & xChartDocument, const Reference< uno::XComponentContext > & xContext) : TabDialog(pParent, "DataRangeDialog", diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index 92699fee0fd9..50fbc2f57daa 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -42,7 +42,7 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData() // SchAxisDlg -SchAxisDlg::SchAxisDlg(Window* pWindow, +SchAxisDlg::SchAxisDlg(vcl::Window* pWindow, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg) : ModalDialog(pWindow, bAxisDlg ? @@ -95,7 +95,7 @@ void SchAxisDlg::getResult( InsertAxisOrGridDialogData& rOutput ) rOutput.aExistenceList[5]=m_pCbSecondaryZ->IsChecked(); } -SchGridDlg::SchGridDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput ) +SchGridDlg::SchGridDlg( vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput ) : SchAxisDlg( pParent, rInput, false )//rInAttrs, b3D, bNet, bSecondaryX, bSecondaryY, false ) { } diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx index f68e4ae955f4..83c13095025f 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx @@ -23,7 +23,7 @@ namespace chart { -DataLabelsDialog::DataLabelsDialog(Window* pWindow, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter) : +DataLabelsDialog::DataLabelsDialog(vcl::Window* pWindow, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter) : ModalDialog(pWindow ,"dlg_DataLabels" ,"modules/schart/ui/dlg_DataLabel.ui"), diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index b392b717a2df..fd7f0a0e03bb 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -39,7 +39,7 @@ namespace chart { InsertErrorBarsDialog::InsertErrorBarsDialog( - Window* pParent, const SfxItemSet& rMyAttrs, + vcl::Window* pParent, const SfxItemSet& rMyAttrs, const uno::Reference< chart2::XChartDocument > & xChartDocument, ErrorBarResources::tErrorBarType eType /* = ErrorBarResources::ERROR_BAR_Y */ ) : ModalDialog( pParent diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx index 836223934ac1..9e113052eadb 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx @@ -25,7 +25,7 @@ namespace chart using namespace ::com::sun::star; -SchLegendDlg::SchLegendDlg(Window* pWindow, const uno::Reference< uno::XComponentContext>& xCC ) +SchLegendDlg::SchLegendDlg(vcl::Window* pWindow, const uno::Reference< uno::XComponentContext>& xCC ) : ModalDialog(pWindow ,"dlg_InsertLegend" ,"modules/schart/ui/dlg_InsertLegend.ui") diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx index 5e5c83ded6ca..742d6a5ae1d6 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx @@ -25,7 +25,7 @@ namespace chart { -SchTitleDlg::SchTitleDlg(Window* pWindow, const TitleDialogData& rInput ) +SchTitleDlg::SchTitleDlg(vcl::Window* pWindow, const TitleDialogData& rInput ) : ModalDialog(pWindow, "InsertTitleDialog", "modules/schart/ui/inserttitledlg.ui") , m_xTitleResources(new TitleResources(*this, true)) { diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx index 100af2798467..a2ba7f3c0ca0 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx @@ -30,7 +30,7 @@ namespace chart { using namespace ::com::sun::star; -NumberFormatDialog::NumberFormatDialog(Window* pParent, SfxItemSet& rSet) +NumberFormatDialog::NumberFormatDialog(vcl::Window* pParent, SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "FormatNumberDialog", "cui/ui/formatnumberdialog.ui") { diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx index 0faabc29e93f..a27ff0caf7f0 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx @@ -21,7 +21,7 @@ #include <sfx2/basedlgs.hxx> -class Window; +namespace vcl { class Window; } class SfxItemSet; namespace chart @@ -30,7 +30,7 @@ namespace chart class NumberFormatDialog : public SfxSingleTabDialog { public: - NumberFormatDialog(Window* pParent, SfxItemSet& rSet); + NumberFormatDialog(vcl::Window* pParent, SfxItemSet& rSet); virtual ~NumberFormatDialog(); static SfxItemSet CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool ); diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 0bc20aea2d37..ac3157760999 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -319,7 +319,7 @@ void SchAttribTabDlg::SetAxisMinorStepWidthForErrorBarDecimals( double fMinorSte m_fAxisMinorStepWidthForErrorBarDecimals = fMinorStepWidth; } -SchAttribTabDlg::SchAttribTabDlg(Window* pParent, +SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr, const ObjectPropertiesDialogParameter* pDialogParameter, const ViewElementListProvider* pViewElementListProvider, diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx index 929c9cd846fb..95a19805471b 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star; namespace chart { -ShapeFontDialog::ShapeFontDialog( Window* pParent, const SfxItemSet* pAttr, +ShapeFontDialog::ShapeFontDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const ViewElementListProvider* pViewElementListProvider ) : SfxTabDialog(pParent, "CharDialog", "modules/schart/ui/chardialog.ui", pAttr) diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx index 44b343719d08..4ce313050cbe 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; namespace chart { -ShapeParagraphDialog::ShapeParagraphDialog(Window* pParent, +ShapeParagraphDialog::ShapeParagraphDialog(vcl::Window* pParent, const SfxItemSet* pAttr) : SfxTabDialog(pParent, "ParagraphDialog", "modules/schart/ui/paradialog.ui", pAttr) diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index b393c17c388d..c346fdd23aaa 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::chart2; sal_uInt16 View3DDialog::m_nLastPageId = 0; -View3DDialog::View3DDialog(Window* pParent, const uno::Reference< frame::XModel > & xChartModel, const XColorListRef &pColorTable ) +View3DDialog::View3DDialog(vcl::Window* pParent, const uno::Reference< frame::XModel > & xChartModel, const XColorListRef &pColorTable ) : TabDialog(pParent, "3DViewDialog", "modules/schart/ui/3dviewdialog.ui") , m_pGeometry(0) , m_pAppearance(0) diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 0057bbe99ac6..24315a3de371 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -84,7 +84,7 @@ void lcl_setBoolItemToCheckBox( const SfxItemSet& rInAttrs, sal_uInt16 nWhichId, }//end anonymous namespace -DataLabelResources::DataLabelResources(VclBuilderContainer* pWindow, Window* pParent, const SfxItemSet& rInAttrs ) +DataLabelResources::DataLabelResources(VclBuilderContainer* pWindow, vcl::Window* pParent, const SfxItemSet& rInAttrs ) : m_pNumberFormatter(0), m_bNumberFormatMixedState(true), diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index b6d278969b92..0044e4a9d26e 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -37,7 +37,7 @@ namespace chart class DataLabelResources { public: - DataLabelResources( VclBuilderContainer* pWindow, Window* pParent, const SfxItemSet& rInAttrs ); + DataLabelResources( VclBuilderContainer* pWindow, vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~DataLabelResources(); bool FillItemSet(SfxItemSet* rOutAttrs) const; @@ -83,7 +83,7 @@ private: bool m_bSourceFormatForValue; bool m_bSourceFormatForPercent; - Window* m_pWindow; + vcl::Window* m_pWindow; SfxItemPool* m_pPool; DECL_LINK(NumberFormatDialogHdl, PushButton * ); diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 911f3931ac01..9dd896f32362 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -39,7 +39,7 @@ void lcl_setValue( FormattedField& rFmtField, double fValue ) rFmtField.SetDefaultValue( fValue ); } -TrendlineResources::TrendlineResources( Window * pParent, const SfxItemSet& rInAttrs ) : +TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet& rInAttrs ) : m_eTrendLineType( CHREGRESS_LINEAR ), m_bTrendLineUnique( true ), m_pNumFormatter( NULL ), diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 128d436ab863..0d4be04cdf4d 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -34,7 +34,7 @@ namespace chart class TrendlineResources { public: - TrendlineResources( Window* pParent, const SfxItemSet& rInAttrs ); + TrendlineResources( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~TrendlineResources(); void Reset(const SfxItemSet& rInAttrs); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index ea1c355e6f4e..6a15742ff548 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -86,7 +86,7 @@ namespace chart #define POS_3DSCHEME_CUSTOM 2 ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage( - Window* pWindow + vcl::Window* pWindow , const uno::Reference< frame::XModel > & xChartModel , ControllerLockHelper & rControllerLockHelper ) : TabPage ( pWindow diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index c08cea186df6..b00718c76e9c 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -35,7 +35,7 @@ class ThreeD_SceneAppearance_TabPage : public TabPage { public: ThreeD_SceneAppearance_TabPage( - Window* pWindow, + vcl::Window* pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel, ControllerLockHelper & rControllerLockHelper ); virtual ~ThreeD_SceneAppearance_TabPage(); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index 164f930c164c..a4930b38f0f4 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -54,7 +54,7 @@ void lcl_SetMetricFieldLimits( MetricField& rField, sal_Int64 nLimit ) } } -ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow +ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow , const uno::Reference< beans::XPropertySet > & xSceneProperties , ControllerLockHelper & rControllerLockHelper ) : TabPage ( pWindow diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index decc521e87fa..21bc08a7ccc1 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -35,7 +35,7 @@ namespace chart class ThreeD_SceneGeometry_TabPage : public TabPage { public: - ThreeD_SceneGeometry_TabPage( Window* pWindow, + ThreeD_SceneGeometry_TabPage( vcl::Window* pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSceneProperties, ControllerLockHelper & rControllerLockHelper ); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 27fb132dd420..81ccc2bbfa60 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -36,14 +36,14 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -LightButton::LightButton( Window* pParent) +LightButton::LightButton( vcl::Window* pParent) : ImageButton( pParent) , m_bLightOn(false) { SetModeImage( Image( SVX_RES(RID_SVXIMAGE_LIGHT_OFF) ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLightButton(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLightButton(vcl::Window *pParent, VclBuilder::stringmap &) { return new LightButton(pParent); } @@ -225,7 +225,7 @@ namespace } } -ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( Window* pWindow +ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( vcl::Window* pWindow , const uno::Reference< beans::XPropertySet > & xSceneProperties , const uno::Reference< frame::XModel >& xChartModel , const XColorListRef & pColorTable ) diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 7bfe1ab59602..3f7af791d290 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -36,7 +36,7 @@ namespace chart class LightButton : public ImageButton { public: - LightButton( Window* pParent); + LightButton( vcl::Window* pParent); virtual ~LightButton(); void switchLightOn(bool bOn); @@ -52,7 +52,7 @@ class ThreeD_SceneIllumination_TabPage : public TabPage { public: ThreeD_SceneIllumination_TabPage( - Window* pWindow, + vcl::Window* pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xSceneProperties, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 5181402a9c3c..f80402c093a2 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -31,7 +31,7 @@ namespace chart { -SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : +SchAxisLabelTabPage::SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage( pParent, "AxisLabelTabPage","modules/schart/ui/tp_axisLabel.ui", &rInAttrs ), m_bShowStaggeringControls( true ), @@ -79,7 +79,7 @@ void SchAxisLabelTabPage::Construct() { } -SfxTabPage* SchAxisLabelTabPage::Create( Window* pParent, const SfxItemSet* rAttrs ) +SfxTabPage* SchAxisLabelTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs ) { return new SchAxisLabelTabPage( pParent, *rAttrs ); } diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index be28343340c9..059215b911b8 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -69,12 +69,12 @@ private: DECL_LINK ( ToggleShowLabel, void* ); public: - SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SchAxisLabelTabPage(); void Construct(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 71b5221e859d..8fda04263f47 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; namespace chart { -AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rInAttrs) +AxisPositionsTabPage::AxisPositionsTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow ,"tp_AxisPositions" ,"modules/schart/ui/tp_AxisPositions.ui" @@ -84,7 +84,7 @@ AxisPositionsTabPage::AxisPositionsTabPage(Window* pWindow,const SfxItemSet& rIn m_pLB_PlaceTicks->SetDropDownLineCount( m_pLB_PlaceTicks->GetEntryCount() ); } -SfxTabPage* AxisPositionsTabPage::Create(Window* pWindow,const SfxItemSet* rOutAttrs) +SfxTabPage* AxisPositionsTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs) { return new AxisPositionsTabPage(pWindow, *rOutAttrs); } diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 78ce532c13fc..3dfeecd8f3ff 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -32,9 +32,9 @@ namespace chart class AxisPositionsTabPage : public SfxTabPage { public: - AxisPositionsTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + AxisPositionsTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; using TabPage::DeactivatePage; diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 00defcfeeec0..0703e1d7a979 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -312,7 +312,7 @@ IMPL_LINK_NOARG( GL3DResourceGroup, SettingChangedHdl ) class SplinePropertiesDialog : public ModalDialog { public: - SplinePropertiesDialog( Window* pParent ); + SplinePropertiesDialog( vcl::Window* pParent ); virtual ~SplinePropertiesDialog(); void fillControls( const ChartTypeParameter& rParameter ); @@ -334,7 +334,7 @@ private: const sal_uInt16 CUBIC_SPLINE_POS = 0; const sal_uInt16 B_SPLINE_POS = 1; -SplinePropertiesDialog::SplinePropertiesDialog( Window* pParent ) +SplinePropertiesDialog::SplinePropertiesDialog( vcl::Window* pParent ) : ModalDialog( pParent, "SmoothLinesDialog", "modules/schart/ui/smoothlinesdlg.ui") { get(m_pLB_Spline_Type, "SplineTypeComboBox"); @@ -399,7 +399,7 @@ IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl) class SteppedPropertiesDialog : public ModalDialog { public: - SteppedPropertiesDialog( Window* pParent ); + SteppedPropertiesDialog( vcl::Window* pParent ); virtual ~SteppedPropertiesDialog(); void fillControls( const ChartTypeParameter& rParameter ); @@ -416,7 +416,7 @@ private: RadioButton* m_pRB_CenterY; }; -SteppedPropertiesDialog::SteppedPropertiesDialog( Window* pParent ) +SteppedPropertiesDialog::SteppedPropertiesDialog( vcl::Window* pParent ) : ModalDialog( pParent, "SteppedLinesDialog", "modules/schart/ui/steppedlinesdlg.ui") { get(m_pRB_Start, "step_start_rb"); @@ -675,7 +675,7 @@ IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl) return 0; } -ChartTypeTabPage::ChartTypeTabPage(Window* pParent +ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent , const uno::Reference< XChartDocument >& xChartModel , const uno::Reference< uno::XComponentContext >& xContext , bool bDoLiveUpdate, bool bShowDescription) diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index 81557a421db8..486ae1540805 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -48,7 +48,7 @@ class GL3DResourceGroup; class ChartTypeTabPage : public ResourceChangeListener, public svt::OWizardPage, public ChartTypeTemplateProvider { public: - ChartTypeTabPage( Window* pParent + ChartTypeTabPage( vcl::Window* pParent , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel , const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx index c5e9cce2e2c5..ef795fa2e2ca 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.cxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx @@ -25,7 +25,7 @@ namespace chart { -DataLabelsTabPage::DataLabelsTabPage(Window* pWindow, const SfxItemSet& rInAttrs) +DataLabelsTabPage::DataLabelsTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs) : SfxTabPage(pWindow , "tp_DataLabel" , "modules/schart/ui/tp_DataLabel.ui" @@ -38,7 +38,7 @@ DataLabelsTabPage::~DataLabelsTabPage() { } -SfxTabPage* DataLabelsTabPage::Create(Window* pWindow, const SfxItemSet* rOutAttrs) +SfxTabPage* DataLabelsTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs) { return new DataLabelsTabPage(pWindow, *rOutAttrs); } diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx index 5e14a412fb67..1bad928af04d 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.hxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx @@ -33,10 +33,10 @@ namespace chart class DataLabelsTabPage : public SfxTabPage { public: - DataLabelsTabPage(Window* pWindow, const SfxItemSet& rInAttrs); + DataLabelsTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs); virtual ~DataLabelsTabPage(); - static SfxTabPage* Create(Window* pWindow, const SfxItemSet* rInAttrs); + static SfxTabPage* Create(vcl::Window* pWindow, const SfxItemSet* rInAttrs); void SetNumberFormatter( SvNumberFormatter* pFormatter ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index a92298b229ba..14da20cbaaf6 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -181,7 +181,7 @@ namespace chart { DataSourceTabPage::DataSourceTabPage( - Window * pParent, + vcl::Window * pParent, DialogModel & rDialogModel, ChartTypeTemplateProvider* pTemplateProvider, Dialog * pParentDialog, diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 496333e31cdc..1cc0439a1065 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -53,7 +53,7 @@ class DataSourceTabPage : { public: explicit DataSourceTabPage( - Window * pParent, + vcl::Window * pParent, DialogModel & rDialogModel, ChartTypeTemplateProvider* pTemplateProvider, Dialog * pParentDialog, diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx index 11ebbcf9df75..54ecfe64ea79 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx @@ -31,11 +31,11 @@ namespace chart SeriesEntry::~SeriesEntry() {} -SeriesListBox::SeriesListBox(Window* pParent, WinBits nStyle) +SeriesListBox::SeriesListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) {} -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSeriesListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSeriesListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx index 82ae7addf888..e5a5ec54e333 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx @@ -45,7 +45,7 @@ public: class SeriesListBox : public ::SvTreeListBox { public: - explicit SeriesListBox(Window* pParent, WinBits nStyle); + explicit SeriesListBox(vcl::Window* pParent, WinBits nStyle); virtual SvTreeListEntry* CreateEntry() const SAL_OVERRIDE; }; diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index c240e7652db8..28280253b48f 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; namespace chart { -ErrorBarsTabPage::ErrorBarsTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : +ErrorBarsTabPage::ErrorBarsTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage( pParent ,"tp_ErrorBars" ,"modules/schart/ui/tp_ErrorBars.ui" @@ -42,7 +42,7 @@ ErrorBarsTabPage::ErrorBarsTabPage( Window* pParent, const SfxItemSet& rInAttrs } SfxTabPage* ErrorBarsTabPage::Create( - Window* pParent, const SfxItemSet* rOutAttrs ) + vcl::Window* pParent, const SfxItemSet* rOutAttrs ) { return new ErrorBarsTabPage( pParent, *rOutAttrs ); } diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx index 05f2e59607d8..6da7692d8c9f 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx @@ -29,7 +29,7 @@ namespace chart class ErrorBarsTabPage : public SfxTabPage { public: - ErrorBarsTabPage ( Window* pParent, const SfxItemSet& rInAttrs ); + ErrorBarsTabPage ( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth ); void SetErrorBarType( ErrorBarResources::tErrorBarType eNewType ); @@ -37,7 +37,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDocument ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index 1381159d24e7..c275c25660d8 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -29,7 +29,7 @@ namespace chart { -SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow, const SfxItemSet& rInAttrs) +SchLegendPosTabPage::SchLegendPosTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs) : SfxTabPage( pWindow ,"tp_LegendPosition" ,"modules/schart/ui/tp_LegendPosition.ui" @@ -41,7 +41,7 @@ SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow, const SfxItemSet& rInA m_pLbTextDirection->SetDropDownLineCount(3); } -SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow, const SfxItemSet* rOutAttrs) +SfxTabPage* SchLegendPosTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs) { return new SchLegendPosTabPage(pWindow, *rOutAttrs); } diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx index 0c767d81f44b..0d4f4acf0d07 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx @@ -36,9 +36,9 @@ private: TextDirectionListBox* m_pLbTextDirection; public: - SchLegendPosTabPage(Window* pParent, const SfxItemSet& rInAttrs); + SchLegendPosTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; }; diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index da008a1a964a..5e32432af83d 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -30,7 +30,7 @@ namespace chart { -SchLayoutTabPage::SchLayoutTabPage(Window* pWindow,const SfxItemSet& rInAttrs) +SchLayoutTabPage::SchLayoutTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, "tp_ChartType", "modules/schart/ui/tp_ChartType.ui", &rInAttrs) , m_pGeometryResources(0) { @@ -42,7 +42,7 @@ SchLayoutTabPage::~SchLayoutTabPage() delete m_pGeometryResources; } -SfxTabPage* SchLayoutTabPage::Create(Window* pWindow, +SfxTabPage* SchLayoutTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs) { return new SchLayoutTabPage(pWindow, *rOutAttrs); diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx index f0424bc57133..635768fe1178 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx @@ -28,10 +28,10 @@ class BarGeometryResources; class SchLayoutTabPage : public SfxTabPage { public: - SchLayoutTabPage(Window* pParent, const SfxItemSet& rInAttrs); + SchLayoutTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); virtual ~SchLayoutTabPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index 73a9d41439f2..32b09b5398ff 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -28,7 +28,7 @@ namespace chart { -PolarOptionsTabPage::PolarOptionsTabPage( Window* pWindow,const SfxItemSet& rInAttrs ) : +PolarOptionsTabPage::PolarOptionsTabPage( vcl::Window* pWindow,const SfxItemSet& rInAttrs ) : SfxTabPage( pWindow ,"tp_PolarOptions" ,"modules/schart/ui/tp_PolarOptions.ui" @@ -48,7 +48,7 @@ PolarOptionsTabPage::~PolarOptionsTabPage() { } -SfxTabPage* PolarOptionsTabPage::Create( Window* pWindow,const SfxItemSet* rOutAttrs ) +SfxTabPage* PolarOptionsTabPage::Create( vcl::Window* pWindow,const SfxItemSet* rOutAttrs ) { return new PolarOptionsTabPage( pWindow, *rOutAttrs ); } diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx index d0cbe2e0e98b..7d0ea5034122 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx @@ -32,10 +32,10 @@ class PolarOptionsTabPage : public SfxTabPage { public: - PolarOptionsTabPage(Window* pParent, const SfxItemSet& rInAttrs ); + PolarOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~PolarOptionsTabPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index a9e854f9e58b..451945e89ab9 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -RangeChooserTabPage::RangeChooserTabPage( Window* pParent +RangeChooserTabPage::RangeChooserTabPage( vcl::Window* pParent , DialogModel & rDialogModel , ChartTypeTemplateProvider* pTemplateProvider , Dialog * pParentDialog diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index 8c2111928d13..3b88a46dd845 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -43,7 +43,7 @@ class RangeChooserTabPage : public svt::OWizardPage, public RangeSelectionListen { public: - RangeChooserTabPage( Window* pParent + RangeChooserTabPage( vcl::Window* pParent , DialogModel & rDialogModel , ChartTypeTemplateProvider* pTemplateProvider , Dialog * pParentDialog diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index e0cefa06cf01..363de5376a87 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -51,7 +51,7 @@ void lcl_setValue( FormattedField& rFmtField, double fValue ) } -ScaleTabPage::ScaleTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : +ScaleTabPage::ScaleTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow , "tp_Scale" , "modules/schart/ui/tp_Scale.ui" @@ -236,7 +236,7 @@ IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl) return 0; } -SfxTabPage* ScaleTabPage::Create(Window* pWindow,const SfxItemSet* rOutAttrs) +SfxTabPage* ScaleTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs) { return new ScaleTabPage(pWindow, *rOutAttrs); } diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 3c65b604845f..ff8bbe7e9d1b 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -32,9 +32,9 @@ namespace chart class ScaleTabPage : public SfxTabPage { public: - ScaleTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + ScaleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; using TabPage::DeactivatePage; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index a04d2efb0d42..26c158406f6d 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -32,7 +32,7 @@ namespace chart { -SchOptionTabPage::SchOptionTabPage(Window* pWindow,const SfxItemSet& rInAttrs) +SchOptionTabPage::SchOptionTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, "TP_OPTIONS", "modules/schart/ui/tp_SeriesToAxis.ui", @@ -76,7 +76,7 @@ IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl) return 0; } -SfxTabPage* SchOptionTabPage::Create(Window* pWindow,const SfxItemSet* rOutAttrs) +SfxTabPage* SchOptionTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs) { return new SchOptionTabPage(pWindow, *rOutAttrs); } diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index 56de1da3d449..db4afb60e9fb 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -30,10 +30,10 @@ namespace chart class SchOptionTabPage : public SfxTabPage { public: - SchOptionTabPage(Window* pParent, const SfxItemSet& rInAttrs); + SchOptionTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); virtual ~SchOptionTabPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 89f78a95d534..6fc90a273926 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -31,7 +31,7 @@ namespace chart { -SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow, +SchAlignmentTabPage::SchAlignmentTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bWithRotation) : SfxTabPage(pWindow, "TitleRotationTabPage","modules/schart/ui/titlerotationtabpage.ui", &rInAttrs) { @@ -60,13 +60,13 @@ SchAlignmentTabPage::~SchAlignmentTabPage() delete m_pOrientHlp; } -SfxTabPage* SchAlignmentTabPage::Create(Window* pParent, +SfxTabPage* SchAlignmentTabPage::Create(vcl::Window* pParent, const SfxItemSet* rInAttrs) { return new SchAlignmentTabPage(pParent, *rInAttrs); } -SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(Window* pParent, +SfxTabPage* SchAlignmentTabPage::CreateWithoutRotation(vcl::Window* pParent, const SfxItemSet* rInAttrs) { return new SchAlignmentTabPage(pParent, *rInAttrs, false); diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx index 86f49e9402de..dd3ceb0902d6 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx @@ -42,11 +42,11 @@ private: FixedText* m_pFtABCD; public: - SchAlignmentTabPage(Window* pParent, const SfxItemSet& rInAttrs, bool bWithRotation = true); + SchAlignmentTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs, bool bWithRotation = true); virtual ~SchAlignmentTabPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rInAttrs); - static SfxTabPage* CreateWithoutRotation(Window* pParent, const SfxItemSet* rInAttrs); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); + static SfxTabPage* CreateWithoutRotation(vcl::Window* pParent, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE; }; diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index fe7c81f044e6..d95a213dafa9 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -25,7 +25,7 @@ namespace chart { -TrendlineTabPage::TrendlineTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : +TrendlineTabPage::TrendlineTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage( pParent, "TP_TRENDLINE", "modules/schart/ui/tp_Trendline.ui", &rInAttrs ), m_aTrendlineResources( this, rInAttrs ) { @@ -36,7 +36,7 @@ TrendlineTabPage::~TrendlineTabPage() } SfxTabPage* TrendlineTabPage::Create( - Window* pParent, const SfxItemSet* rOutAttrs ) + vcl::Window* pParent, const SfxItemSet* rOutAttrs ) { return new TrendlineTabPage( pParent, *rOutAttrs ); } diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx index c18ceb74922c..a88c858c7b9a 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.hxx +++ b/chart2/source/controller/dialogs/tp_Trendline.hxx @@ -29,10 +29,10 @@ namespace chart class TrendlineTabPage : public SfxTabPage { public: - TrendlineTabPage ( Window* pParent, const SfxItemSet& rInAttrs ); + TrendlineTabPage ( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~TrendlineTabPage (); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/TextDirectionListBox.hxx b/chart2/source/controller/inc/TextDirectionListBox.hxx index 40144e31d728..bee03f2fb247 100644 --- a/chart2/source/controller/inc/TextDirectionListBox.hxx +++ b/chart2/source/controller/inc/TextDirectionListBox.hxx @@ -22,7 +22,7 @@ #include <svx/frmdirlbox.hxx> -class Window; +namespace vcl { class Window; } namespace chart { @@ -30,8 +30,8 @@ namespace chart class TextDirectionListBox : public svx::FrameDirectionListBox { public: - explicit TextDirectionListBox( Window* pParent, - Window* pWindow1 = 0, Window* pWindow2 = 0 ); + explicit TextDirectionListBox( vcl::Window* pParent, + vcl::Window* pWindow1 = 0, vcl::Window* pWindow2 = 0 ); virtual ~TextDirectionListBox(); }; diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index 227bf968aea2..b67a06fd729b 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -32,7 +32,7 @@ class ChartTypeTabPage; class ChartTypeDialog : public ModalDialog { public: - ChartTypeDialog( Window* pWindow + ChartTypeDialog( vcl::Window* pWindow , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index 7098e9f6f9af..98bb3d160ca3 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -46,7 +46,7 @@ private: // OGenericUnoDialog overridables virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; // XTypeProvider virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index b81ae23dd37c..cc3b5d51a29a 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -42,7 +42,7 @@ class DialogModel; class CreationWizard : public svt::RoadmapWizard, public TabPageNotifiable { public: - CreationWizard( Window* pParent, + CreationWizard( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel , const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index c1caf7950d03..997cdad006b3 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -42,7 +42,7 @@ class DataBrowser; class DataEditor : public ModalDialog { public: - DataEditor( Window* pParent, + DataEditor( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDoc, const ::com::sun::star::uno::Reference< @@ -102,9 +102,9 @@ private: @note this code is taken from dbaccess/source/ui/inc/UITools.hxx */ - void notifySystemWindow( Window* pWindow, - Window* pToRegister, - ::comphelper::mem_fun1_t< TaskPaneList, Window* > rMemFunc ); + void notifySystemWindow( vcl::Window* pWindow, + vcl::Window* pToRegister, + ::comphelper::mem_fun1_t< TaskPaneList, vcl::Window* > rMemFunc ); }; } // namespace chart diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index 6341fe050094..8f4dd54c84cc 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -44,7 +44,7 @@ class DataSourceDialog : { public: explicit DataSourceDialog( - Window * pParent, + vcl::Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDocument, const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx index 82636bc2090e..bf3bf85750e7 100644 --- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx +++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx @@ -51,7 +51,7 @@ protected: CheckBox* m_pCbSecondaryZ; public: - SchAxisDlg(Window* pParent, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg=true); + SchAxisDlg(vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg=true); virtual ~SchAxisDlg(); void getResult( InsertAxisOrGridDialogData& rOutput ); @@ -65,7 +65,7 @@ public: class SchGridDlg : public SchAxisDlg { public: - SchGridDlg( Window* pParent, const InsertAxisOrGridDialogData& rInput ); + SchGridDlg( vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput ); virtual ~SchGridDlg(); }; diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx index a5cd5e2be4ce..1cbed9f9a9c0 100644 --- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx +++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx @@ -43,7 +43,7 @@ private: void Reset(); public: - DataLabelsDialog(Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter); + DataLabelsDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter); virtual ~DataLabelsDialog(); void FillItemSet(SfxItemSet& rOutAttrs); diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index 39ff9750ad41..e981b718ec63 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -32,7 +32,7 @@ namespace chart class InsertErrorBarsDialog : public ModalDialog { public: - InsertErrorBarsDialog( Window* pParent, const SfxItemSet& rMyAttrs, + InsertErrorBarsDialog( vcl::Window* pParent, const SfxItemSet& rMyAttrs, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > & xChartDocument, ErrorBarResources::tErrorBarType eType ); diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx index eee9c243e249..acfc45344e68 100644 --- a/chart2/source/controller/inc/dlg_InsertLegend.hxx +++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx @@ -37,7 +37,7 @@ private: boost::scoped_ptr < LegendPositionResources > m_xLegendPositionResources; public: - SchLegendDlg( Window* pParent, const ::com::sun::star::uno::Reference< + SchLegendDlg( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& xCC ); void init( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx b/chart2/source/controller/inc/dlg_InsertTitle.hxx index b992606512d6..510b35563676 100644 --- a/chart2/source/controller/inc/dlg_InsertTitle.hxx +++ b/chart2/source/controller/inc/dlg_InsertTitle.hxx @@ -32,7 +32,7 @@ private: boost::scoped_ptr< TitleResources > m_xTitleResources; public: - SchTitleDlg( Window* pParent, const TitleDialogData& rInput ); + SchTitleDlg( vcl::Window* pParent, const TitleDialogData& rInput ); void getResult( TitleDialogData& rOutput ); }; diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 33013c3004f0..19b1bf2539c2 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -126,7 +126,7 @@ private: DECL_LINK( OKPressed, void * ); public: - SchAttribTabDlg(Window* pParent, const SfxItemSet* pAttr, + SchAttribTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr, const ObjectPropertiesDialogParameter* pDialogParameter, const ViewElementListProvider* pViewElementListProvider, const ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx b/chart2/source/controller/inc/dlg_ShapeFont.hxx index 7a6aefbf7fc9..d9d082eb5399 100644 --- a/chart2/source/controller/inc/dlg_ShapeFont.hxx +++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx @@ -31,7 +31,7 @@ class ViewElementListProvider; class ShapeFontDialog : public SfxTabDialog { public: - ShapeFontDialog(Window* pParent, const SfxItemSet* pAttr, + ShapeFontDialog(vcl::Window* pParent, const SfxItemSet* pAttr, const ViewElementListProvider* pViewElementListProvider); private: virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx index e3b4bab64c16..8976daad1ec3 100644 --- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx +++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx @@ -29,7 +29,7 @@ namespace chart class ShapeParagraphDialog : public SfxTabDialog { public: - ShapeParagraphDialog(Window* pParent, const SfxItemSet* pAttr); + ShapeParagraphDialog(vcl::Window* pParent, const SfxItemSet* pAttr); private: virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; sal_uInt16 m_nTabPageId; diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index 6cc64087df78..fdfb35463625 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -37,7 +37,7 @@ class ThreeD_SceneIllumination_TabPage; class View3DDialog : public TabDialog { public: - View3DDialog( Window* pWindow, + View3DDialog( vcl::Window* pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel, const XColorListRef &pColorTable ); virtual ~View3DDialog(); diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index f1679922a07e..717c98b1920a 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -344,7 +344,7 @@ void SAL_CALL ChartController::attachFrame( //create view @todo is this the correct place here?? - Window* pParent = NULL; + vcl::Window* pParent = NULL; //get the window parent from the frame to use as parent for our new window if(xFrame.is()) { @@ -1427,7 +1427,7 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn SolarMutexGuard aGuard; if( m_pChartWindow ) { - Window* pParentWin( m_pChartWindow->GetAccessibleParentWindow()); + vcl::Window* pParentWin( m_pChartWindow->GetAccessibleParentWindow()); if( pParentWin ) xParent.set( pParentWin->GetAccessible()); } diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx index 726ba03266fc..aebf313603cc 100644 --- a/chart2/source/controller/main/ChartController_EditData.cxx +++ b/chart2/source/controller/main/ChartController_EditData.cxx @@ -46,7 +46,7 @@ void ChartController::executeDispatch_EditData() Reference< chart2::XChartDocument > xChartDoc( getModel(), uno::UNO_QUERY ); if( xChartDoc.is()) { - Window* pParent( NULL ); + vcl::Window* pParent( NULL ); Reference< ::com::sun::star::chart2::data::XDataProvider > xDataProvider( xChartDoc->getDataProvider()); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index d4f60ea97a81..71a233a79527 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -545,7 +545,7 @@ IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl) SolarMutexGuard aGuard; if( m_pChartWindow ) { - Window::PointerState aPointerState( m_pChartWindow->GetPointerState() ); + vcl::Window::PointerState aPointerState( m_pChartWindow->GetPointerState() ); MouseEvent aMouseEvent( aPointerState.maPos, 1/*nClicks*/, diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 4b7ea3a43a5f..93712142427c 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -45,7 +45,7 @@ namespace namespace chart { -ChartWindow::ChartWindow( ChartController* pController, Window* pParent, WinBits nStyle ) +ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, WinBits nStyle ) : Window(pParent, nStyle) , m_pWindowController( pController ) , m_bInPaint(false) @@ -215,7 +215,7 @@ uno::Reference< css::accessibility::XAccessible > ChartWindow::CreateAccessible( void ChartWindow::DataChanged( const DataChangedEvent& rDCEvt ) { - ::Window::DataChanged( rDCEvt ); + vcl::Window::DataChanged( rDCEvt ); if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) @@ -249,7 +249,7 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt ) } if( !bHelpHandled ) - ::Window::RequestHelp( rHEvt ); + vcl::Window::RequestHelp( rHEvt ); } void ChartWindow::adjustHighContrastMode() @@ -264,7 +264,7 @@ void ChartWindow::adjustHighContrastMode() void ChartWindow::ForceInvalidate() { - ::Window::Invalidate(); + vcl::Window::Invalidate(); if(m_pOpenGLWindow) { m_pOpenGLWindow->Invalidate(); @@ -274,7 +274,7 @@ void ChartWindow::Invalidate( sal_uInt16 nFlags ) { if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts" return; - ::Window::Invalidate( nFlags ); + vcl::Window::Invalidate( nFlags ); if(m_pOpenGLWindow) { m_pOpenGLWindow->Invalidate( nFlags ); @@ -284,7 +284,7 @@ void ChartWindow::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) { if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts" return; - ::Window::Invalidate( rRect, nFlags ); + vcl::Window::Invalidate( rRect, nFlags ); if(m_pOpenGLWindow) { m_pOpenGLWindow->Invalidate( rRect, nFlags ); @@ -294,7 +294,7 @@ void ChartWindow::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) { if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts" return; - ::Window::Invalidate( rRegion, nFlags ); + vcl::Window::Invalidate( rRegion, nFlags ); if(m_pOpenGLWindow) { m_pOpenGLWindow->Invalidate( rRegion, nFlags ); diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index ee5884f013e5..9dee31b22219 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -32,10 +32,10 @@ class ChartController; thus the controller can perform appropriate actions */ -class ChartWindow : public Window +class ChartWindow : public vcl::Window { public: - ChartWindow( ChartController* pController, Window* pParent, WinBits nStyle ); + ChartWindow( ChartController* pController, vcl::Window* pParent, WinBits nStyle ); virtual ~ChartWindow(); void clear(); diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index dbfecd47f887..76657d5b05a8 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -50,7 +50,7 @@ namespace static const OUString lcl_aServiceName( "com.sun.star.comp.chart.ElementSelectorToolbarController" ); } -SelectorListBox::SelectorListBox( Window* pParent, WinBits nStyle ) +SelectorListBox::SelectorListBox( vcl::Window* pParent, WinBits nStyle ) : ListBox( pParent, nStyle ) , m_bReleaseFocus( true ) { @@ -301,7 +301,7 @@ uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::create uno::Reference< awt::XWindow > xItemWindow; if( !m_apSelectorListBox.get() ) { - Window* pParent = VCLUnoHelper::GetWindow( xParent ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent ); if( pParent ) { m_apSelectorListBox.reset( new SelectorListBox( pParent, WB_DROPDOWN|WB_AUTOHSCROLL|WB_BORDER ) ); diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index 26d842880528..0b0d2b0409a1 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -47,7 +47,7 @@ struct ListBoxEntryData class SelectorListBox : public ListBox { public: - SelectorListBox( Window* pParent, WinBits nStyle ); + SelectorListBox( vcl::Window* pParent, WinBits nStyle ); virtual ~SelectorListBox(); virtual void Select() SAL_OVERRIDE; diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index dea277159f20..52b5f1f6d4e4 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -252,7 +252,7 @@ void ShapeController::executeDispatch_FormatLine() SolarMutexGuard aGuard; if ( m_pChartController ) { - Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); DrawModelWrapper* pDrawModelWrapper = m_pChartController->GetDrawModelWrapper(); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawModelWrapper && pDrawViewWrapper ) @@ -292,7 +292,7 @@ void ShapeController::executeDispatch_FormatArea() SolarMutexGuard aGuard; if ( m_pChartController ) { - Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); DrawModelWrapper* pDrawModelWrapper = m_pChartController->GetDrawModelWrapper(); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawModelWrapper && pDrawViewWrapper ) @@ -335,7 +335,7 @@ void ShapeController::executeDispatch_TextAttributes() SolarMutexGuard aGuard; if ( m_pChartController ) { - Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawViewWrapper ) { @@ -372,7 +372,7 @@ void ShapeController::executeDispatch_TransformDialog() SolarMutexGuard aGuard; if ( m_pChartController ) { - Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawViewWrapper ) { @@ -541,7 +541,7 @@ void ShapeController::executeDispatch_FontDialog() SolarMutexGuard aGuard; if ( m_pChartController ) { - Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); DrawModelWrapper* pDrawModelWrapper = m_pChartController->GetDrawModelWrapper(); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawModelWrapper && pDrawViewWrapper ) @@ -564,7 +564,7 @@ void ShapeController::executeDispatch_ParagraphDialog() SolarMutexGuard aGuard; if ( m_pChartController ) { - Window* pParent = dynamic_cast< Window* >( m_pChartController->m_pChartWindow ); + vcl::Window* pParent = dynamic_cast< vcl::Window* >( m_pChartController->m_pChartWindow ); DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper(); if ( pParent && pDrawViewWrapper ) { diff --git a/compilerplugins/clang/returnbyref.cxx b/compilerplugins/clang/returnbyref.cxx index 59bee67f9531..b3044f37f9a5 100644 --- a/compilerplugins/clang/returnbyref.cxx +++ b/compilerplugins/clang/returnbyref.cxx @@ -59,7 +59,7 @@ bool ReturnByRef::VisitCXXMethodDecl(const CXXMethodDecl * functionDecl) { return true; } // Ignore stuff like: - // operator Window *(){ return &m_rWindow; } + // operator vcl::Window *(){ return &m_rWindow; } if (dyn_cast< CXXConversionDecl >( functionDecl ) != nullptr) { return true; } diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx index 06d8d6ea81aa..02a361692f76 100644 --- a/cppcanvas/qa/unit/test.cxx +++ b/cppcanvas/qa/unit/test.cxx @@ -43,7 +43,7 @@ public: void CanvasTest::testComposite() { #ifdef LINUX - boost::scoped_ptr<Window> pWin(new WorkWindow( (Window *)NULL )); + boost::scoped_ptr<vcl::Window> pWin(new WorkWindow( (vcl::Window *)NULL )); uno::Reference<rendering::XCanvas> xCanvas = pWin->GetCanvas (); if( !xCanvas.is() ) diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx index d27afa18099d..0b5f7c33fd80 100644 --- a/cppcanvas/source/wrapper/vclfactory.cxx +++ b/cppcanvas/source/wrapper/vclfactory.cxx @@ -71,7 +71,7 @@ namespace cppcanvas new internal::ImplBitmapCanvas( xCanvas ) ); } - SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const ::Window& rVCLWindow ) const + SpriteCanvasSharedPtr VCLFactory::createSpriteCanvas( const vcl::Window& rVCLWindow ) const { return SpriteCanvasSharedPtr( new internal::ImplSpriteCanvas( diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index cedfccc00331..bb7dd750e78d 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -661,7 +661,7 @@ void SfxAccCfgLBoxString_Impl::Paint( } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSfxAccCfgTabListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxAccCfgTabListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -729,7 +729,7 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey) } -SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxItemSet& aSet ) +SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const SfxItemSet& aSet ) : SfxTabPage(pParent, "AccelConfigPage", "cui/ui/accelconfigpage.ui", &aSet) , m_pMacroInfoItem() , m_pStringItem() diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 56d4bff2c6b0..30a7b8a26cf9 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -735,22 +735,22 @@ ConvertToolbarEntry( return aPropSeq; } -SfxTabPage *CreateSvxMenuConfigPage( Window *pParent, const SfxItemSet* rSet ) +SfxTabPage *CreateSvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) { return new SvxMenuConfigPage( pParent, *rSet ); } -SfxTabPage *CreateKeyboardConfigPage( Window *pParent, const SfxItemSet* rSet ) +SfxTabPage *CreateKeyboardConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) { return new SfxAcceleratorConfigPage( pParent, *rSet ); } -SfxTabPage *CreateSvxToolbarConfigPage( Window *pParent, const SfxItemSet* rSet ) +SfxTabPage *CreateSvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) { return new SvxToolbarConfigPage( pParent, *rSet ); } -SfxTabPage *CreateSvxEventConfigPage( Window *pParent, const SfxItemSet* rSet ) +SfxTabPage *CreateSvxEventConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) { return new SvxEventConfigPage( pParent, *rSet, SvxEventConfigPage::EarlyInit() ); } @@ -780,7 +780,7 @@ bool showKeyConfigTabPage( const css::uno::Reference< css::frame::XFrame >& xFra * key bindings. * *****************************************************************************/ -SvxConfigDialog::SvxConfigDialog(Window * pParent, const SfxItemSet* pInSet) +SvxConfigDialog::SvxConfigDialog(vcl::Window * pParent, const SfxItemSet* pInSet) : SfxTabDialog(pParent, "CustomizeDialog", "cui/ui/customizedialog.ui", pInSet) , m_nMenusPageId(0) @@ -1378,7 +1378,7 @@ public: * listbox * *****************************************************************************/ -SvxMenuEntriesListBox::SvxMenuEntriesListBox(Window* pParent, SvxConfigPage* pPg) +SvxMenuEntriesListBox::SvxMenuEntriesListBox(vcl::Window* pParent, SvxConfigPage* pPg) : SvTreeListBox(pParent, WB_TABSTOP|WB_CLIPCHILDREN|WB_HIDESELECTION|WB_BORDER) , pPage(pPg) , m_bIsInternalDrag( false ) @@ -1517,7 +1517,7 @@ void SvxMenuEntriesListBox::KeyInput( const KeyEvent& rKeyEvent ) * both tabpages to add, delete, move and rename items etc. * *****************************************************************************/ -SvxConfigPage::SvxConfigPage(Window *pParent, const SfxItemSet& rSet) +SvxConfigPage::SvxConfigPage(vcl::Window *pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "MenuAssignPage", "cui/ui/menuassignpage.ui", &rSet) , bInitialised(false) , pCurrentSaveInData(0) @@ -2172,7 +2172,7 @@ bool SvxConfigPage::MoveEntryData( return false; } -SvxMenuConfigPage::SvxMenuConfigPage(Window *pParent, const SfxItemSet& rSet) +SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& rSet) : SvxConfigPage(pParent, rSet) { m_pContentsListBox = new SvxMenuEntriesListBox(m_pEntries, this); @@ -2576,7 +2576,7 @@ SaveInData* SvxMenuConfigPage::CreateSaveInData( } SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog( - Window* pParent, SvxEntries* entries, + vcl::Window* pParent, SvxEntries* entries, SvxConfigEntry* selection, bool bCreateMenu ) : ModalDialog(pParent, "MoveMenuDialog", "cui/ui/movemenu.ui") , bModified(false) @@ -2835,7 +2835,7 @@ bool SvxConfigEntry::IsRenamable() return true; } -SvxToolbarConfigPage::SvxToolbarConfigPage(Window *pParent, const SfxItemSet& rSet) +SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSet& rSet) : SvxConfigPage(pParent, rSet) { SetHelpId( HID_SVX_CONFIG_TOOLBAR ); @@ -3476,7 +3476,7 @@ void ToolbarSaveInData::SetSystemStyle( // this code is a temporary hack as the UI is not updating after // changing the toolbar style via the API uno::Reference< css::frame::XLayoutManager > xLayoutManager; - Window *window = NULL; + vcl::Window *window = NULL; uno::Reference< beans::XPropertySet > xPropSet( xFrame, uno::UNO_QUERY ); if ( xPropSet.is() ) @@ -4515,7 +4515,7 @@ SvTreeListEntry* SvxToolbarConfigPage::AddFunction( return pNewLBEntry; } -SvxToolbarEntriesListBox::SvxToolbarEntriesListBox(Window* pParent, SvxToolbarConfigPage* pPg) +SvxToolbarEntriesListBox::SvxToolbarEntriesListBox(vcl::Window* pParent, SvxToolbarConfigPage* pPg) : SvxMenuEntriesListBox(pParent, pPg) , pPage(pPg) { @@ -4697,7 +4697,7 @@ TriState SvxToolbarEntriesListBox::NotifyCopying( return TRISTATE_FALSE; } -SvxNewToolbarDialog::SvxNewToolbarDialog(Window* pWindow, const OUString& rName) +SvxNewToolbarDialog::SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& rName) : ModalDialog(pWindow, "NewToolbarDialog", "cui/ui/newtoolbardialog.ui") { get(m_pEdtName, "edit"); @@ -4724,7 +4724,7 @@ IMPL_LINK(SvxNewToolbarDialog, ModifyHdl, Edit*, pEdit) * The SvxIconSelectorDialog class * *******************************************************************************/ -SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow, +SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow, const uno::Reference< css::ui::XImageManager >& rXImageManager, const uno::Reference< css::ui::XImageManager >& rXParentImageManager ) : @@ -5302,7 +5302,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) * *******************************************************************************/ SvxIconReplacementDialog :: SvxIconReplacementDialog( - Window *pWindow, const OUString& aMessage, bool /*bYestoAll*/ ) + vcl::Window *pWindow, const OUString& aMessage, bool /*bYestoAll*/ ) : MessBox( pWindow, WB_DEF_YES, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) @@ -5317,7 +5317,7 @@ MessBox( pWindow, WB_DEF_YES, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_R } SvxIconReplacementDialog :: SvxIconReplacementDialog( - Window *pWindow, const OUString& aMessage ) + vcl::Window *pWindow, const OUString& aMessage ) : MessBox( pWindow, WB_YES_NO_CANCEL, CUI_RES( RID_SVXSTR_REPLACE_ICON_CONFIRM ), CUI_RES( RID_SVXSTR_REPLACE_ICON_WARNING ) ) { @@ -5350,7 +5350,7 @@ sal_uInt16 SvxIconReplacementDialog :: ShowDialog() * *******************************************************************************/ SvxIconChangeDialog::SvxIconChangeDialog( - Window *pWindow, const OUString& aMessage) + vcl::Window *pWindow, const OUString& aMessage) :ModalDialog(pWindow, "IconChange", "cui/ui/iconchangedialog.ui") { get(pFImageInfo, "infoImage"); diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 787534a27a60..641f3b46496f 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -249,7 +249,7 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle) return lStyles; } -SfxConfigFunctionListBox::SfxConfigFunctionListBox(Window* pParent, WinBits nStyle) +SfxConfigFunctionListBox::SfxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox( pParent, nStyle ) , pCurEntry( 0 ) , pStylesInfo( 0 ) @@ -263,7 +263,7 @@ SfxConfigFunctionListBox::SfxConfigFunctionListBox(Window* pParent, WinBits nSty LINK( this, SfxConfigFunctionListBox, TimerHdl ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSfxConfigFunctionListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -410,7 +410,7 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() : FreeResource(); } -SfxConfigGroupListBox::SfxConfigGroupListBox(Window* pParent, WinBits nStyle) +SfxConfigGroupListBox::SfxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) , pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), pStylesInfo(0) { @@ -418,7 +418,7 @@ SfxConfigGroupListBox::SfxConfigGroupListBox(Window* pParent, WinBits nStyle) SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSfxConfigGroupListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxConfigGroupListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 92238045faf3..bee41ccf336d 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star; -SvxEventConfigPage::SvxEventConfigPage(Window *pParent, const SfxItemSet& rSet, +SvxEventConfigPage::SvxEventConfigPage(vcl::Window *pParent, const SfxItemSet& rSet, SvxEventConfigPage::EarlyInit) : _SvxMacroTabPage(pParent, "EventsConfigPage", "cui/ui/eventsconfigpage.ui", rSet) diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index b883ab200f06..b6b6c61fdcb2 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -47,7 +47,7 @@ public: /// this is only to let callers know that there is a LateInit which *must* be called struct EarlyInit { }; - SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, EarlyInit ); + SvxEventConfigPage( vcl::Window *pParent, const SfxItemSet& rSet, EarlyInit ); virtual ~SvxEventConfigPage(); void LateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index f8398a924a57..336277272d07 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -129,7 +129,7 @@ bool MacroEventListBox::Notify( NotifyEvent& rNEvt ) return nRet; } -MacroEventListBox::MacroEventListBox( Window* pParent, WinBits nStyle ) +MacroEventListBox::MacroEventListBox( vcl::Window* pParent, WinBits nStyle ) : Control( pParent, nStyle ) , maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ) , maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ) @@ -140,7 +140,7 @@ MacroEventListBox::MacroEventListBox( Window* pParent, WinBits nStyle ) maListBox.EnableCellFocus(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeMacroEventListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeMacroEventListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -212,7 +212,7 @@ void _SvxMacroTabPage::EnableButtons() } } -_SvxMacroTabPage::_SvxMacroTabPage(Window* pParent, const OString& rID, +_SvxMacroTabPage::_SvxMacroTabPage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rAttrSet) : SfxTabPage( pParent, rID, rUIXMLDescription, &rAttrSet ), m_xAppEvents(0), @@ -801,7 +801,7 @@ Any _SvxMacroTabPage::GetPropsByName( const OUString& eventName, EventsHash& eve return ::std::make_pair( type, url ); } -SvxMacroTabPage::SvxMacroTabPage(Window* pParent, +SvxMacroTabPage::SvxMacroTabPage(vcl::Window* pParent, const Reference< frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, Reference< container::XNameReplace > xNameReplace, @@ -835,7 +835,7 @@ SvxMacroTabPage::SvxMacroTabPage(Window* pParent, rListBox.Select(pE); } -SvxMacroAssignDlg::SvxMacroAssignDlg( Window* pParent, const Reference< frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, +SvxMacroAssignDlg::SvxMacroAssignDlg( vcl::Window* pParent, const Reference< frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, const Reference< container::XNameReplace >& xNameReplace, sal_uInt16 nSelectedIndex ) : SvxMacroAssignSingleTabDialog(pParent, rSet) { @@ -857,7 +857,7 @@ IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler) return 0; } -AssignComponentDialog::AssignComponentDialog( Window * pParent, const OUString& rURL ) +AssignComponentDialog::AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ) : ModalDialog( pParent, "AssignComponent", "cui/ui/assigncomponentdialog.ui" ) , maURL( rURL ) { @@ -890,7 +890,7 @@ IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton ) -SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(Window *pParent, +SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "MacroAssignDialog", "cui/ui/macroassigndialog.ui") { diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 4f8e824db0b3..7babc45611a5 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -48,7 +48,7 @@ private: DECL_LINK(ButtonHandler, void *); public: - AssignComponentDialog( Window * pParent, const OUString& rURL ); + AssignComponentDialog( vcl::Window * pParent, const OUString& rURL ); virtual ~AssignComponentDialog(); OUString getURL( void ) const diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 2b3b995f19ee..5541697f4380 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -73,7 +73,7 @@ using namespace ::com::sun::star::container; * The implementations of SvxConfigFunctionListBox and * SvxConfigGroupListBox are copied from sfx2/source/dialog/cfg.cxx */ -SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent, WinBits nStyle) +SvxConfigFunctionListBox::SvxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle | WB_CLIPCHILDREN | WB_HSCROLL | WB_SORT | WB_TABSTOP) , pCurEntry(0) , m_pDraggingEntry(0) @@ -86,7 +86,7 @@ SvxConfigFunctionListBox::SvxConfigFunctionListBox(Window* pParent, WinBits nSty LINK( this, SvxConfigFunctionListBox, TimerHdl ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxConfigFunctionListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -193,7 +193,7 @@ SvxConfigFunctionListBox::AcceptDrop( const AcceptDropEvent& /*rEvt*/ ) return DND_ACTION_NONE; } -SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent, WinBits nStyle) +SvxConfigGroupListBox::SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT | WB_TABSTOP) , m_bShowSlots(false) @@ -214,7 +214,7 @@ SvxConfigGroupListBox::SvxConfigGroupListBox(Window* pParent, WinBits nStyle) ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxConfigGroupListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxConfigGroupListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -858,7 +858,7 @@ void SvxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry ) */ SvxScriptSelectorDialog::SvxScriptSelectorDialog( - Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& xFrame) + vcl::Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& xFrame) : ModelessDialog(pParent, "MacroSelectorDialog", "cui/ui/macroselectordialog.ui") , m_bShowSlots(bShowSlots) { diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index df7500531e31..a6440fce4afc 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -175,7 +175,7 @@ sal_uInt16 SpellUndoAction_Impl::GetId()const // class SvxSpellCheckDialog --------------------------------------------- SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow, - Window * pParent, SfxBindings* _pBindings) + vcl::Window * pParent, SfxBindings* _pBindings) : SfxModelessDialog (_pBindings, pChildWindow, pParent, "SpellingDialog", "cui/ui/spellingdialog.ui") , aDialogUndoLink(LINK (this, SpellDialog, DialogUndoHdl)) @@ -1009,7 +1009,7 @@ void SpellDialog::InvalidateDialog() if( bFocusLocked ) return; m_pIgnorePB->SetText(m_sResumeST); - Window* aDisableArr[] = + vcl::Window* aDisableArr[] = { m_pNotInDictFT, m_pSentenceED, @@ -1179,7 +1179,7 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe } -SentenceEditWindow_Impl::SentenceEditWindow_Impl(Window * pParent, WinBits nBits) +SentenceEditWindow_Impl::SentenceEditWindow_Impl(vcl::Window * pParent, WinBits nBits) : VclMultiLineEdit(pParent, nBits) , m_nErrorStart(0) , m_nErrorEnd(0) @@ -1188,7 +1188,7 @@ SentenceEditWindow_Impl::SentenceEditWindow_Impl(Window * pParent, WinBits nBits DisableSelectionOnFocus(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSentenceEditWindow(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSentenceEditWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new SentenceEditWindow_Impl(pParent, WB_BORDER|WB_VSCROLL|WB_IGNORETAB); diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 8236ebacc06a..0ac795a618b1 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -61,7 +61,7 @@ enum AboutDialogButton WEBSITE_BUTTON }; -AboutDialog::AboutDialog(Window* pParent) +AboutDialog::AboutDialog(vcl::Window* pParent) : SfxModalDialog(pParent, "AboutDialog", "cui/ui/aboutdialog.ui") { get(m_pLogoReplacement, "logoreplacement"); diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index d972c2c02341..3b31d409499f 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -133,7 +133,7 @@ static void RGBtoCMYK( double dR, double dG, double dB, double& fCyan, double& f class HexColorControl : public Edit { public: - HexColorControl( Window* pParent, const WinBits& nStyle ); + HexColorControl( vcl::Window* pParent, const WinBits& nStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void Paste() SAL_OVERRIDE; @@ -145,13 +145,13 @@ private: bool ImplProcessKeyInput( const KeyEvent& rKEv ); }; -HexColorControl::HexColorControl( Window* pParent, const WinBits& nStyle ) +HexColorControl::HexColorControl( vcl::Window* pParent, const WinBits& nStyle ) : Edit( pParent, nStyle ) { SetMaxTextLen( 6 ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeHexColorControl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeHexColorControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new HexColorControl(pParent, WB_BORDER); } @@ -261,7 +261,7 @@ bool HexColorControl::ImplProcessKeyInput( const KeyEvent& rKEv ) class ColorPreviewControl : public Control { public: - ColorPreviewControl( Window* pParent, const WinBits& nStyle ); + ColorPreviewControl( vcl::Window* pParent, const WinBits& nStyle ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -270,14 +270,14 @@ private: Color maColor; }; -ColorPreviewControl::ColorPreviewControl( Window* pParent, const WinBits& nStyle ) +ColorPreviewControl::ColorPreviewControl( vcl::Window* pParent, const WinBits& nStyle ) : Control( pParent, nStyle ) { SetFillColor( maColor ); SetLineColor( maColor ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorPreviewControl(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorPreviewControl(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = 0; @@ -310,7 +310,7 @@ const ColorMode DefaultMode = HUE; class ColorFieldControl : public Control { public: - ColorFieldControl( Window* pParent, const WinBits& nStyle ); + ColorFieldControl( vcl::Window* pParent, const WinBits& nStyle ); virtual ~ColorFieldControl(); virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -350,7 +350,7 @@ private: std::vector< sal_uInt16 > maPercent_Vert; }; -ColorFieldControl::ColorFieldControl( Window* pParent, const WinBits& nStyle ) +ColorFieldControl::ColorFieldControl( vcl::Window* pParent, const WinBits& nStyle ) : Control( pParent, nStyle ) , meMode( DefaultMode ) , mdX( -1.0 ) @@ -365,7 +365,7 @@ ColorFieldControl::~ColorFieldControl() delete mpBitmap; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorFieldControl(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorFieldControl(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = 0; @@ -702,7 +702,7 @@ void ColorFieldControl::UpdatePosition() class ColorSliderControl : public Control { public: - ColorSliderControl( Window* pParent, const WinBits& nStyle ); + ColorSliderControl( vcl::Window* pParent, const WinBits& nStyle ); virtual ~ColorSliderControl(); virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -734,7 +734,7 @@ private: double mdValue; }; -ColorSliderControl::ColorSliderControl( Window* pParent, const WinBits& nStyle ) +ColorSliderControl::ColorSliderControl( vcl::Window* pParent, const WinBits& nStyle ) : Control( pParent, nStyle ) , meMode( DefaultMode ) , mpBitmap( 0 ) @@ -749,7 +749,7 @@ ColorSliderControl::~ColorSliderControl() delete mpBitmap; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorSliderControl(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorSliderControl(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = 0; @@ -958,7 +958,7 @@ const sal_uInt16 UPDATE_ALL = 0xff; class ColorPickerDialog : public ModalDialog { public: - ColorPickerDialog( Window* pParent, sal_Int32 nColor, sal_Int16 nMode ); + ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode ); void update_color( sal_uInt16 n = UPDATE_ALL ); @@ -1010,7 +1010,7 @@ private: MetricField* mpMFKey; }; -ColorPickerDialog::ColorPickerDialog( Window* pParent, sal_Int32 nColor, sal_Int16 nMode ) +ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sal_Int16 nMode ) : ModalDialog( pParent, "ColorPicker", "cui/ui/colorpickerdialog.ui" ) , maPreviousColor( nColor ) , mnDialogMode( nMode ) diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 81ad04832245..ca9ca03a15c4 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -43,7 +43,7 @@ // class SvxCharacterMap ================================================= -SvxCharacterMap::SvxCharacterMap( Window* pParent, bool bOne_, const SfxItemSet* pSet ) +SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxItemSet* pSet ) : SfxModalDialog(pParent, "SpecialCharactersDialog", "cui/ui/specialcharacters.ui") , bOne( bOne_ ) , pSubsetMap( NULL ) @@ -166,13 +166,13 @@ short SvxCharacterMap::Execute() // class SvxShowText ===================================================== -SvxShowText::SvxShowText(Window* pParent, bool bCenter) +SvxShowText::SvxShowText(vcl::Window* pParent, bool bCenter) : Control(pParent) , mnY(0) , mbCenter(bCenter) {} -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxShowText(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxShowText(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxShowText(pParent); } diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 393567a098e4..d1856f453deb 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -74,7 +74,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor ) m_pbClose->SetHelpText(OUString()); } -FmSearchDialog::FmSearchDialog(Window* pParent, const OUString& sInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, +FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier) :ModalDialog(pParent, "RecordSearchDialog", "cui/ui/fmsearchdialog.ui") ,m_sCancel ( Button::GetStandardText( BUTTON_CANCEL ) ) @@ -559,7 +559,7 @@ void FmSearchDialog::EnableSearchUI(bool bEnable) if ( !bEnable ) { // if one of my children has the focus, remember it - Window* pFocusWindow = Application::GetFocusWindow( ); + vcl::Window* pFocusWindow = Application::GetFocusWindow( ); if ( pFocusWindow && IsChild( pFocusWindow ) ) m_pPreSearchFocus = pFocusWindow; else diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 0dbe89c2fb2d..eb811fee61fe 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -204,7 +204,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, // - SearchProgress - -SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL ) +SearchProgress::SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL ) : ModalDialog(pParent, "GallerySearchProgress", "cui/ui/gallerysearchprogress.ui") , parent_(pParent) , startUrl_(rStartURL) @@ -335,7 +335,7 @@ void TakeThread::execute() } // - TakeProgress - -TakeProgress::TakeProgress(Window* pWindow) +TakeProgress::TakeProgress(vcl::Window* pWindow) : ModalDialog(pWindow, "GalleryApplyProgress", "cui/ui/galleryapplyprogress.ui") , window_(pWindow) @@ -433,7 +433,7 @@ void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl ) // - ActualizeProgress - -ActualizeProgress::ActualizeProgress(Window* pWindow, GalleryTheme* pThm) +ActualizeProgress::ActualizeProgress(vcl::Window* pWindow, GalleryTheme* pThm) : ModalDialog(pWindow, "GalleryUpdateProgress", "cui/ui/galleryupdateprogress.ui") , pTimer(NULL) @@ -508,7 +508,7 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL ) return 0; } -TitleDialog::TitleDialog(Window* pParent, const OUString& rOldTitle) +TitleDialog::TitleDialog(vcl::Window* pParent, const OUString& rOldTitle) : ModalDialog(pParent, "GalleryTitleDialog", "cui/ui/gallerytitledialog.ui") { get(m_pEdit, "entry"); @@ -520,7 +520,7 @@ TitleDialog::TitleDialog(Window* pParent, const OUString& rOldTitle) // - GalleryIdDialog - -GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) +GalleryIdDialog::GalleryIdDialog( vcl::Window* pParent, GalleryTheme* _pThm ) : ModalDialog(pParent, "GalleryThemeIDDialog", "cui/ui/gallerythemeiddialog.ui") , pThm(_pThm ) { @@ -575,7 +575,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl) // - GalleryThemeProperties - -GalleryThemeProperties::GalleryThemeProperties(Window* pParent, +GalleryThemeProperties::GalleryThemeProperties(vcl::Window* pParent, ExchangeData* _pData, SfxItemSet* pItemSet) : SfxTabDialog( pParent, "GalleryThemeDialog", "cui/ui/gallerythemedialog.ui", pItemSet) @@ -608,7 +608,7 @@ void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } // - TPGalleryThemeGeneral - -TPGalleryThemeGeneral::TPGalleryThemeGeneral(Window* pParent, const SfxItemSet& rSet) +TPGalleryThemeGeneral::TPGalleryThemeGeneral(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "GalleryGeneralPage", "cui/ui/gallerygeneralpage.ui", &rSet) , pData(NULL) @@ -687,13 +687,13 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ ) -SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* TPGalleryThemeGeneral::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new TPGalleryThemeGeneral( pParent, *rSet ); } // - TPGalleryThemeProperties - -TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ) +TPGalleryThemeProperties::TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet ) : SfxTabPage(pWindow, "GalleryFilesPage", "cui/ui/galleryfilespage.ui", &rSet) , pData(NULL) , nCurFilterPos(0) @@ -771,7 +771,7 @@ TPGalleryThemeProperties::~TPGalleryThemeProperties() -SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* TPGalleryThemeProperties::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new TPGalleryThemeProperties( pParent, *rSet ); } diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index cb26be4b4251..57a853c7f74a 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -28,7 +28,7 @@ #include <cuires.hrc> #include <svx/dialogs.hrc> -GraphicPreviewWindow::GraphicPreviewWindow(Window* pParent, +GraphicPreviewWindow::GraphicPreviewWindow(vcl::Window* pParent, const WinBits nStyle) : Control(pParent, nStyle) , mpOrigGraphic(NULL) @@ -37,7 +37,7 @@ GraphicPreviewWindow::GraphicPreviewWindow(Window* pParent, { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGraphicPreviewWindow(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGraphicPreviewWindow(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -136,7 +136,7 @@ void GraphicPreviewWindow::Resize() ScaleImageToFit(); } -GraphicFilterDialog::GraphicFilterDialog(Window* pParent, +GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic) : ModalDialog(pParent, rID, rUIXMLDescription) @@ -181,7 +181,7 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl) // - FilterMosaic - -GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic, +GraphicFilterMosaic::GraphicFilterMosaic( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges ) : GraphicFilterDialog(pParent, "MosaicDialog", "cui/ui/mosaicdialog.ui", rGraphic) @@ -246,7 +246,7 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic, // - GraphicFilterSmooth - -GraphicFilterSmooth::GraphicFilterSmooth( Window* pParent, const Graphic& rGraphic, double nRadius) +GraphicFilterSmooth::GraphicFilterSmooth( vcl::Window* pParent, const Graphic& rGraphic, double nRadius) : GraphicFilterDialog(pParent, "SmoothDialog", "cui/ui/smoothdialog.ui", rGraphic) { @@ -290,7 +290,7 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double // - GraphicFilterSolarize - -GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, +GraphicFilterSolarize::GraphicFilterSolarize( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 cGreyThreshold, bool bInvert ) : GraphicFilterDialog(pParent, "SolarizeDialog", "cui/ui/solarizedialog.ui", rGraphic) @@ -345,7 +345,7 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic, // - GraphicFilterSepia - -GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic, +GraphicFilterSepia::GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ) : GraphicFilterDialog(pParent, "AgingDialog", "cui/ui/agingdialog.ui", rGraphic) @@ -386,7 +386,7 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic, // - GraphicFilterPoster - -GraphicFilterPoster::GraphicFilterPoster(Window* pParent, const Graphic& rGraphic, +GraphicFilterPoster::GraphicFilterPoster(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterCount) : GraphicFilterDialog(pParent, "PosterDialog", "cui/ui/posterdialog.ui", rGraphic) @@ -444,14 +444,14 @@ Size EmbossControl::GetOptimalSize() const return LogicToPixel(Size(77, 60), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeEmbossControl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeEmbossControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new EmbossControl(pParent); } -GraphicFilterEmboss::GraphicFilterEmboss(Window* pParent, +GraphicFilterEmboss::GraphicFilterEmboss(vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource) : GraphicFilterDialog (pParent, "EmbossDialog", "cui/ui/embossdialog.ui", rGraphic) diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index ae8cf489d18d..7224ed36c8da 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -81,7 +81,7 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState, |* |************************************************************************/ -SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) +SvxHpLinkDlg::SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings) : IconChoiceDialog( pParent, "HyperlinkDialog", "cui/ui/hyperlinkdialog.ui" ), maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ), mpBindings ( pBindings ), diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 2eeacbdaa459..118da3fc5c50 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -48,7 +48,7 @@ |* \************************************************************************/ -URLDlg::URLDlg( Window* pWindow, const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ) +URLDlg::URLDlg( vcl::Window* pWindow, const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ) : ModalDialog(pWindow, "IMapDialog", "cui/ui/cuiimapdlg.ui") { get(m_pEdtURL, "urlentry"); diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index 134712df14a9..46ae5b5e78d6 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -30,7 +30,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> -FmInputRecordNoDialog::FmInputRecordNoDialog(Window * pParent) +FmInputRecordNoDialog::FmInputRecordNoDialog(vcl::Window * pParent) : ModalDialog( pParent, "RecordNumberDialog", "cui/ui/recordnumberdialog.ui") { get(m_pRecordNo, "entry-nospin"); diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx index f032a59391b7..83ee94c07fce 100644 --- a/cui/source/dialogs/dlgname.cxx +++ b/cui/source/dialogs/dlgname.cxx @@ -31,7 +31,7 @@ |* \************************************************************************/ -SvxNameDialog::SvxNameDialog( Window* pWindow, const OUString& rName, const OUString& rDesc ) : +SvxNameDialog::SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ) : ModalDialog ( pWindow, "NameDialog", "cui/ui/namedialog.ui" ) { get(pBtnOK, "ok"); @@ -58,7 +58,7 @@ IMPL_LINK_NOARG(SvxNameDialog, ModifyHdl) // plus uniqueness-callback-linkHandler SvxObjectNameDialog::SvxObjectNameDialog( - Window* pWindow, + vcl::Window* pWindow, const OUString& rName) : ModalDialog ( pWindow, "ObjectNameDialog", "cui/ui/objectnamedialog.ui" ) { @@ -88,7 +88,7 @@ IMPL_LINK_NOARG(SvxObjectNameDialog, ModifyHdl) // Dialog for editing Object Title and Description SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( - Window* pWindow, + vcl::Window* pWindow, const OUString& rTitle, const OUString& rDescription) : ModalDialog ( pWindow, "ObjectTitleDescDialog", "cui/ui/objecttitledescdialog.ui" ) @@ -113,7 +113,7 @@ SvxObjectTitleDescDialog::SvxObjectTitleDescDialog( |* \************************************************************************/ -SvxMessDialog::SvxMessDialog( Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg ) +SvxMessDialog::SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg ) : ModalDialog(pWindow, "MessBox", "cui/ui/messbox.ui") , pImage(NULL) { diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 791bb7d340de..4ff53ba2457a 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -212,7 +212,7 @@ namespace svx { public: - RubyRadioButton( Window* _pParent, WinBits nBits ); + RubyRadioButton( vcl::Window* _pParent, WinBits nBits ); void init( const OUString& rPrimaryText, const OUString& rSecondaryText, const PseudoRubyText::RubyPosition& rPosition ); virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -223,7 +223,7 @@ namespace svx PseudoRubyText m_aRubyText; }; - RubyRadioButton::RubyRadioButton( Window* _pParent, WinBits nBits ) + RubyRadioButton::RubyRadioButton( vcl::Window* _pParent, WinBits nBits ) :RadioButton( _pParent, nBits ) { } @@ -322,7 +322,7 @@ namespace svx return minimumSize; } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRubyRadioButton( Window *pParent, VclBuilder::stringmap & ) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRubyRadioButton( vcl::Window *pParent, VclBuilder::stringmap & ) { return new RubyRadioButton( pParent, WB_LEFT|WB_VCENTER ); } @@ -330,7 +330,7 @@ namespace svx //= SuggestionSet - SuggestionSet::SuggestionSet( Window* pParent ) + SuggestionSet::SuggestionSet( vcl::Window* pParent ) : ValueSet( pParent, pParent->GetStyle() | WB_BORDER ) { @@ -363,7 +363,7 @@ namespace svx //= SuggestionDisplay - SuggestionDisplay::SuggestionDisplay( Window* pParent, WinBits nBits ) + SuggestionDisplay::SuggestionDisplay( vcl::Window* pParent, WinBits nBits ) : Control( pParent, nBits ) , m_bDisplayListBox( true ) , m_aValueSet( this ) @@ -522,7 +522,7 @@ namespace svx m_aListBox.SetHelpId( HID_HANGULDLG_SUGGESTIONS_LIST ); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSuggestionDisplay( Window *pParent, VclBuilder::stringmap & ) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSuggestionDisplay( vcl::Window *pParent, VclBuilder::stringmap & ) { return new SuggestionDisplay( pParent, WB_ITEMBORDER | WB_FLATVALUESET | WB_VSCROLL ); } @@ -530,7 +530,7 @@ namespace svx //= HangulHanjaConversionDialog - HangulHanjaConversionDialog::HangulHanjaConversionDialog( Window* _pParent, HHC::ConversionDirection _ePrimaryDirection ) + HangulHanjaConversionDialog::HangulHanjaConversionDialog( vcl::Window* _pParent, HHC::ConversionDirection _ePrimaryDirection ) :ModalDialog( _pParent, "HangulHanjaConversionDialog", "cui/ui/hangulhanjaconversiondialog.ui" ) ,m_pIgnoreNonPrimary( NULL ) ,m_bDocumentMode( true ) @@ -744,7 +744,7 @@ namespace svx namespace { - void lcl_modifyWindowStyle( Window* _pWin, WinBits _nSet, WinBits _nReset ) + void lcl_modifyWindowStyle( vcl::Window* _pWin, WinBits _nSet, WinBits _nReset ) { DBG_ASSERT( 0 == ( _nSet & _nReset ), "lcl_modifyWindowStyle: set _and_ reset the same bit?" ); if ( _pWin ) @@ -767,8 +767,8 @@ namespace svx // switch the def button depending if we're working for document text if ( bOldDocumentMode != m_bDocumentMode ) { - Window* pOldDefButton = NULL; - Window* pNewDefButton = NULL; + vcl::Window* pOldDefButton = NULL; + vcl::Window* pNewDefButton = NULL; if ( m_bDocumentMode ) { pOldDefButton = m_pFind; @@ -1077,7 +1077,7 @@ namespace svx return 0L; } - HangulHanjaOptionsDialog::HangulHanjaOptionsDialog(Window* _pParent) + HangulHanjaOptionsDialog::HangulHanjaOptionsDialog(vcl::Window* _pParent) : ModalDialog( _pParent, "HangulHanjaOptDialog", "cui/ui/hangulhanjaoptdialog.ui" ) , m_pCheckButtonData(NULL) @@ -1172,7 +1172,7 @@ namespace svx return 0; } - HangulHanjaNewDictDialog::HangulHanjaNewDictDialog(Window* pParent) + HangulHanjaNewDictDialog::HangulHanjaNewDictDialog(vcl::Window* pParent) : ModalDialog(pParent, "HangulHanjaAddDialog", "cui/ui/hangulhanjaadddialog.ui") , m_bEntered(false) { @@ -1350,7 +1350,7 @@ namespace svx ( static_cast< HangulHanjaEditDictDialog* >( GetParentDialog() ) )->UpdateScrollbar(); } - SuggestionEdit::SuggestionEdit( Window* pParent, WinBits nBits ) + SuggestionEdit::SuggestionEdit( vcl::Window* pParent, WinBits nBits ) : Edit(pParent, nBits) , m_pPrev(NULL) , m_pNext(NULL) @@ -1418,7 +1418,7 @@ namespace svx m_pNext = pNext; } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSuggestionEdit( Window *pParent, VclBuilder::stringmap & ) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSuggestionEdit( vcl::Window *pParent, VclBuilder::stringmap & ) { return new SuggestionEdit( pParent, WB_LEFT|WB_VCENTER|WB_BORDER ); } @@ -1703,7 +1703,7 @@ namespace svx UpdateButtonStates(); } - HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ) + HangulHanjaEditDictDialog::HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ) :ModalDialog ( _pParent, "HangulHanjaEditDictDialog", "cui/ui/hangulhanjaeditdictdialog.ui" ) ,m_aEditHintText ( CUI_RESSTR(RID_SVXSTR_EDITHINT) ) ,m_rDictList ( _rDictList ) diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index b9ed4cad71d4..97ea77ddd274 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -98,7 +98,7 @@ bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUStri |* |************************************************************************/ -SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) +SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) : SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkNewDocPage", "cui/ui/hyperlinknewdocpage.ui", rItemSet ) { get(m_pRbtEditNow, "editnow"); @@ -233,7 +233,7 @@ void SvxHyperlinkNewDocTp::GetCurentItemData ( OUString& rStrURL, OUString& aStr |* |************************************************************************/ -IconChoicePage* SvxHyperlinkNewDocTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) +IconChoicePage* SvxHyperlinkNewDocTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { return( new SvxHyperlinkNewDocTp( pWindow, pDlg, rItemSet ) ); } diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 2a8308168d96..3764ddc52d0d 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -34,7 +34,7 @@ sal_Char const sFileScheme[] = INET_FILE_SCHEME; |* |************************************************************************/ -SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) +SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) : SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkDocPage", "cui/ui/hyperlinkdocpage.ui", rItemSet ), mbMarkWndOpen ( false ) { @@ -157,7 +157,7 @@ void SvxHyperlinkDocTp::GetCurentItemData ( OUString& rStrURL, OUString& aStrNam |* |************************************************************************/ -IconChoicePage* SvxHyperlinkDocTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) +IconChoicePage* SvxHyperlinkDocTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { return( new SvxHyperlinkDocTp( pWindow, pDlg, rItemSet ) ); } diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 832f3c4dec9d..433d06f08978 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -34,7 +34,7 @@ sal_Char const sFTPScheme[] = INET_FTP_SCHEME; |* |************************************************************************/ -SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, +SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) : SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkInternetPage", "cui/ui/hyperlinkinternetpage.ui", @@ -187,7 +187,7 @@ OUString SvxHyperlinkInternetTp::CreateAbsoluteURL() const |* |************************************************************************/ -IconChoicePage* SvxHyperlinkInternetTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) +IconChoicePage* SvxHyperlinkInternetTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { return( new SvxHyperlinkInternetTp( pWindow, pDlg, rItemSet ) ); } diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index daaec31ed649..00f8c97131d4 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; |* |************************************************************************/ -SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) +SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet) : SvxHyperlinkTabPageBase ( pParent, pDlg, "HyperlinkMailPage", "cui/ui/hyperlinkmailpage.ui", rItemSet ) { @@ -169,7 +169,7 @@ OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const |* |************************************************************************/ -IconChoicePage* SvxHyperlinkMailTp::Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) +IconChoicePage* SvxHyperlinkMailTp::Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ) { return( new SvxHyperlinkMailTp( pWindow, pDlg, rItemSet ) ); } diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 0f45021c63fc..77ea1b8e17d7 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -66,14 +66,14 @@ struct TargetData //# # //# Tree-Window # //# # -SvxHlmarkTreeLBox::SvxHlmarkTreeLBox(Window* pParent, WinBits nStyle) +SvxHlmarkTreeLBox::SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) , mpParentWnd(NULL) { SetNodeDefaultImages(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxHlmarkTreeLBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxHlmarkTreeLBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 7719ffb1dbda..369f4ee7b8ba 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -35,13 +35,13 @@ using namespace ::ucbhelper; //# ComboBox-Control for URL's with History and Autocompletion # -SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart ) +SvxHyperURLBox::SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart ) : SvtURLBox ( pParent, eSmart ), DropTargetHelper ( this ) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxHyperURLBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxHyperURLBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxHyperURLBox(pParent, INET_PROT_HTTP); } @@ -85,7 +85,7 @@ bool SvxHyperURLBox::PreNotify( NotifyEvent& rNEvt ) //# Hyperlink-Dialog: Tabpages-Baseclass # -SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent, +SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( vcl::Window *pParent, IconChoiceDialog* pDlg, const OString& rID, const OUString& rUIXMLDescription, @@ -178,7 +178,7 @@ bool SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, bool bDisConnectDlg // Show Extra-Window void SvxHyperlinkTabPageBase::ShowMarkWnd () { - ( ( Window* ) mpMarkWnd )->Show(); + ( ( vcl::Window* ) mpMarkWnd )->Show(); // Size of dialog-window in screen pixels Rectangle aDlgRect( mpDialog->GetWindowExtentsRelative( NULL ) ); diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 383c45423fdd..4fd8aab64a4e 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -36,12 +36,12 @@ using namespace css; -HyphenEdit::HyphenEdit(Window* pParent) +HyphenEdit::HyphenEdit(vcl::Window* pParent) : Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK|WB_TABSTOP) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeHyphenEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeHyphenEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new HyphenEdit(pParent); } @@ -454,7 +454,7 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, GetFocusHdl_Impl) SvxHyphenWordDialog::SvxHyphenWordDialog( const OUString &rWord, LanguageType nLang, - Window* pParent, + vcl::Window* pParent, uno::Reference< linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper) : SfxModalDialog(pParent, "HyphenateDialog", "cui/ui/hyphenate.ui") diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 4b1e48062e32..122a339c34ce 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -40,7 +40,7 @@ using ::std::vector; | \**********************************************************************/ -IconChoicePage::IconChoicePage( Window *pParent, const OString& rID, +IconChoicePage::IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ) : TabPage ( pParent, rID, rUIXMLDescription ), @@ -106,7 +106,7 @@ bool IconChoicePage::QueryClose() void IconChoicePage::ImplInitSettings() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); @@ -166,14 +166,14 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt ) | \**********************************************************************/ -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtIconChoiceCtrl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvtIconChoiceCtrl(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvtIconChoiceCtrl(pParent, WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP); } -IconChoiceDialog::IconChoiceDialog ( Window* pParent, const OString& rID, +IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *pItemSet ) : ModalDialog ( pParent, rID, rUIXMLDescription ), diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 6a092a64bda1..cf22d8d858a7 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -91,7 +91,7 @@ uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified( return uno::Reference< io::XInputStream >(); } -InsertObjectDialog_Impl::InsertObjectDialog_Impl(Window * pParent, const OString& rID, +InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID, const OUString& rUIXMLDescription, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage) : ModalDialog(pParent, rID, rUIXMLDescription) @@ -167,7 +167,7 @@ void SvInsertOleDlg::SelectDefault() SvInsertOleDlg::SvInsertOleDlg ( - Window* pParent, + vcl::Window* pParent, const Reference < embed::XStorage >& xStorage, const SvObjectServerList* pServers ) @@ -383,7 +383,7 @@ IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl) -SvInsertPlugInDialog::SvInsertPlugInDialog(Window* pParent, +SvInsertPlugInDialog::SvInsertPlugInDialog(vcl::Window* pParent, const uno::Reference < embed::XStorage >& xStorage) : InsertObjectDialog_Impl(pParent, "InsertPluginDialog", "cui/ui/insertplugin.ui", xStorage) , m_pURL(0) @@ -472,7 +472,7 @@ short SvInsertPlugInDialog::Execute() return nRet; } -SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, +SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( vcl::Window *pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ) : InsertObjectDialog_Impl( pParent, "InsertFloatingFrameDialog", "cui/ui/insertfloatingframe.ui", xStorage ) @@ -480,7 +480,7 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, Init(); } -SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, +SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( vcl::Window *pParent, const uno::Reference < embed::XEmbeddedObject >& xObj ) : InsertObjectDialog_Impl( pParent, "InsertFloatingFrameDialog", "cui/ui/insertfloatingframe.ui", uno::Reference < embed::XStorage >() ) @@ -718,7 +718,7 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB ) IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG ) { - Window* pOldParent = Application::GetDefDialogParent(); + vcl::Window* pOldParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pThis ); // create the file dialog diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index cf6319cc1cfe..c3c167cca62d 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -32,7 +32,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const return static_cast< sal_uInt16 >( m_pCountEdit->GetValue() ); } -SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const OString& sHelpId ) +SvxInsRowColDlg::SvxInsRowColDlg(vcl::Window* pParent, bool bCol, const OString& sHelpId ) : ModalDialog(pParent, "InsertRowColumnDialog", "cui/ui/insertrowcolumn.ui") , aRow(CUI_RESSTR(RID_SVXSTR_ROW)) , aCol(CUI_RESSTR(RID_SVXSTR_COL)) diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 45c5801fe6a6..ce2078554c29 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -85,7 +85,7 @@ static long nTabs[] = }; -SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, bool bHtml ) +SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool bHtml ) : ModalDialog( pParent, "BaseLinksDialog", "cui/ui/baselinksdialog.ui"), aStrAutolink( CUI_RES( STR_AUTOLINK ) ), aStrManuallink( CUI_RES( STR_MANUALLINK ) ), diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index b353e2dfe747..1685afb527e7 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -176,7 +176,7 @@ IMPL_LINK_NOARG(SvxPathSelectDialog, DelHdl_Impl) return 0; } -SvxMultiPathDialog::SvxMultiPathDialog(Window* pParent) +SvxMultiPathDialog::SvxMultiPathDialog(vcl::Window* pParent) : ModalDialog(pParent, "MultiPathDialog", "cui/ui/multipathdialog.ui") { get(m_pAddBtn, "add"); @@ -205,7 +205,7 @@ SvxMultiPathDialog::SvxMultiPathDialog(Window* pParent) m_pRadioLB->ShowTable(); } -SvxPathSelectDialog::SvxPathSelectDialog(Window* pParent) +SvxPathSelectDialog::SvxPathSelectDialog(vcl::Window* pParent) : ModalDialog(pParent, "SelectPathDialog", "cui/ui/selectpathdialog.ui") { get(m_pAddBtn, "add"); diff --git a/cui/source/dialogs/newtabledlg.cxx b/cui/source/dialogs/newtabledlg.cxx index d9a1844e1d8c..1fcf49d2ee04 100644 --- a/cui/source/dialogs/newtabledlg.cxx +++ b/cui/source/dialogs/newtabledlg.cxx @@ -21,7 +21,7 @@ #include "dialmgr.hxx" #include "newtabledlg.hxx" -SvxNewTableDialog::SvxNewTableDialog( Window* pParent ) +SvxNewTableDialog::SvxNewTableDialog( vcl::Window* pParent ) : ModalDialog( pParent, "NewTableDialog", "cui/ui/newtabledialog.ui" ) { get(mpNumRows, "rows"); diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index cf9faf80336f..bca8cd9c211e 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -142,7 +142,7 @@ IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG } PasswordToOpenModifyDialog::PasswordToOpenModifyDialog( - Window * pParent, sal_uInt16 nMinPasswdLen, + vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify) : SfxModalDialog( pParent, "PasswordDialog", "cui/ui/password.ui" ) { diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index e1e984d8105e..d8bff176376c 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -37,7 +37,7 @@ #include <dialmgr.hxx> #include <boost/scoped_ptr.hpp> -SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent ) +SvPasteObjectDialog::SvPasteObjectDialog( vcl::Window* pParent ) : ModalDialog(pParent, "PasteSpecialDialog", "cui/ui/pastespecial.ui") { get(m_pFtObjectSource, "source"); diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index bf2d6a33f3bd..3bec42caa6ad 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -38,7 +38,7 @@ // class SvxPostItDialog ------------------------------------------------- -SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, +SvxPostItDialog::SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext) : SfxModalDialog(pParent, "CommentDialog", "cui/ui/comment.ui") , rSet(rCoreSet) diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 358e5d540605..23d46bf10627 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -74,7 +74,7 @@ void ShowErrorDialog( const Any& aException ) pDlg->Execute(); } -SFTreeListBox::SFTreeListBox(Window* pParent) +SFTreeListBox::SFTreeListBox(vcl::Window* pParent) : SvTreeListBox(pParent) , m_hdImage(CUI_RES(RID_CUIIMG_HARDDISK)) , m_libImage(CUI_RES(RID_CUIIMG_LIB)) @@ -93,7 +93,7 @@ SFTreeListBox::SFTreeListBox(Window* pParent) nMode = 0xFF; // everything } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSFTreeListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSFTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new SFTreeListBox(pParent); } @@ -425,7 +425,7 @@ void SFTreeListBox::ExpandedHdl() // CuiInputDialog ------------------------------------------------------------ -CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode ) +CuiInputDialog::CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode ) : ModalDialog(pParent, "NewLibDialog", "cui/ui/newlibdialog.ui") { @@ -453,7 +453,7 @@ CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode ) // ScriptOrgDialog ------------------------------------------------------------ -SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, const OUString& language ) +SvxScriptOrgDialog::SvxScriptOrgDialog( vcl::Window* pParent, const OUString& language ) : SfxModalDialog(pParent, "ScriptOrganizerDialog", "cui/ui/scriptorganizer.ui") , m_sLanguage(language) @@ -525,7 +525,7 @@ short SvxScriptOrgDialog::Execute() } m_pScriptsBox->ExpandAllTrees(); - Window* pPrevDlgParent = Application::GetDefDialogParent(); + vcl::Window* pPrevDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); short nRet = ModalDialog::Execute(); Application::SetDefDialogParent( pPrevDlgParent ); @@ -890,7 +890,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) } } - boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<Window*>(this), nMode ) ); + boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<vcl::Window*>(this), nMode ) ); xNewDlg->SetObjectName( aNewName ); do @@ -906,7 +906,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) bValid = false; OUString aError( m_createErrStr ); aError += m_createDupStr; - MessageDialog aErrorBox(static_cast<Window*>(this), aError); + MessageDialog aErrorBox(static_cast<vcl::Window*>(this), aError); aErrorBox.SetText( m_createErrTitleStr ); aErrorBox.Execute(); xNewDlg->SetObjectName( aNewName ); @@ -993,7 +993,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) { //ISSUE L10N & message from exception? OUString aError( m_createErrStr ); - MessageDialog aErrorBox(static_cast<Window*>(this), aError); + MessageDialog aErrorBox(static_cast<vcl::Window*>(this), aError); aErrorBox.SetText( m_createErrTitleStr ); aErrorBox.Execute(); } @@ -1018,7 +1018,7 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry ) } sal_uInt16 nMode = INPUTMODE_RENAME; - boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<Window*>(this), nMode ) ); + boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<vcl::Window*>(this), nMode ) ); xNewDlg->SetObjectName( aNewName ); bool bValid; @@ -1069,7 +1069,7 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry ) { //ISSUE L10N & message from exception? OUString aError( m_renameErrStr ); - MessageDialog aErrorBox(static_cast<Window*>(this), aError); + MessageDialog aErrorBox(static_cast<vcl::Window*>(this), aError); aErrorBox.SetText( m_renameErrTitleStr ); aErrorBox.Execute(); } @@ -1080,7 +1080,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) Reference< browse::XBrowseNode > node = getBrowseNode( pEntry ); // ISSUE L10N string & can we centre list? OUString aQuery = m_delQueryStr + getListOfChildren( node, 0 ); - MessageDialog aQueryBox(static_cast<Window*>(this), aQuery, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); + MessageDialog aQueryBox(static_cast<vcl::Window*>(this), aQuery, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); aQueryBox.SetText( m_delQueryTitleStr ); if ( aQueryBox.Execute() == RET_NO ) { @@ -1115,7 +1115,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) else { //ISSUE L10N & message from exception? - MessageDialog aErrorBox(static_cast<Window*>(this), m_delErrStr); + MessageDialog aErrorBox(static_cast<vcl::Window*>(this), m_delErrStr); aErrorBox.SetText( m_delErrTitleStr ); aErrorBox.Execute(); } @@ -1450,7 +1450,7 @@ OUString GetErrorMessage( const com::sun::star::uno::Any& aException ) } SvxScriptErrorDialog::SvxScriptErrorDialog( - Window* , ::com::sun::star::uno::Any aException ) + vcl::Window* , ::com::sun::star::uno::Any aException ) : m_sMessage() { SolarMutexGuard aGuard; diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 400e9a834021..b8848e54f129 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -27,7 +27,7 @@ #include "border.hxx" #include <svx/dialogs.hrc> -SvxFormatCellsDialog::SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ) +SvxFormatCellsDialog::SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ) : SfxTabDialog(pParent, "FormatCellsDialog", "cui/ui/formatcellsdialog.ui", pAttr) , mrOutAttrs(*pAttr) , mpColorTab(pModel->GetColorList()) diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 45c5cf8fd6ee..1c87ff9609f5 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -28,7 +28,7 @@ #define CUIFM_PROP_HIDDEN "Hidden" #define CUIFM_PROP_LABEL "Label" -FmShowColsDialog::FmShowColsDialog(Window* pParent) +FmShowColsDialog::FmShowColsDialog(vcl::Window* pParent) : ModalDialog(pParent, "ShowColDialog", "cui/ui/showcoldialog.ui") { get(m_pOK, "ok"); diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 8c809e93d3bd..e3b6d18c58a3 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -24,7 +24,7 @@ #include "splitcelldlg.hxx" #include "cuires.hrc" -SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, +SvxSplitTableDlg::SvxSplitTableDlg( vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) : SvxStandardDialog(pParent, "SplitCellsDialog", "cui/ui/splitcellsdialog.ui") , mnMaxVertical(nMaxVertical) diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index cdaf0090595c..fe23c29bf210 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -36,7 +36,7 @@ #include <rtl/strbuf.hxx> #include "svtools/treelistentry.hxx" -SvxSearchFormatDialog::SvxSearchFormatDialog(Window* pParent, const SfxItemSet& rSet) +SvxSearchFormatDialog::SvxSearchFormatDialog(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabDialog(pParent, "SearchFormatDialog", "cui/ui/searchformatdialog.ui", &rSet) , m_pFontList(NULL) , m_nNamePageId(0) @@ -110,7 +110,7 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) } } -SvxSearchAttributeDialog::SvxSearchAttributeDialog(Window* pParent, +SvxSearchAttributeDialog::SvxSearchAttributeDialog(vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges) : ModalDialog(pParent, "SearchAttrDialog", "cui/ui/searchattrdialog.ui") , rList(rLst) @@ -222,7 +222,7 @@ IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl) SvxSearchSimilarityDialog::SvxSearchSimilarityDialog ( - Window* pParent, + vcl::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index abd225bb3f7b..a9d30d66b74a 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star; // class LookUpComboBox -------------------------------------------------- -LookUpComboBox::LookUpComboBox(Window *pParent) +LookUpComboBox::LookUpComboBox(vcl::Window *pParent) : ComboBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP) , m_pDialog(NULL) { @@ -67,7 +67,7 @@ LookUpComboBox::LookUpComboBox(Window *pParent) EnableAutocomplete( false ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLookUpComboBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLookUpComboBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new LookUpComboBox(pParent); } @@ -95,13 +95,13 @@ IMPL_LINK( LookUpComboBox, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ ) // class ReplaceEdit -------------------------------------------------- -ReplaceEdit::ReplaceEdit(Window *pParent) +ReplaceEdit::ReplaceEdit(vcl::Window *pParent) : Edit(pParent, WB_BORDER | WB_TABSTOP) , m_pBtn(NULL) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeReplaceEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeReplaceEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new ReplaceEdit(pParent); } @@ -159,7 +159,7 @@ void AlternativesString::Paint( rDev.SetFont( aOldFont ); } -ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(Window* pParent) +ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(vcl::Window* pParent) : SvxCheckListBox(pParent) , m_pDialog(NULL) { @@ -167,7 +167,7 @@ ThesaurusAlternativesCtrl::ThesaurusAlternativesCtrl(Window* pParent) SetHighlightRange(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeThesaurusAlternativesCtrl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeThesaurusAlternativesCtrl(vcl::Window *pParent, VclBuilder::stringmap &) { return new ThesaurusAlternativesCtrl(pParent); } @@ -437,7 +437,7 @@ IMPL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, SvxCheckListBox *, pB // class SvxThesaurusDialog ---------------------------------------------- SvxThesaurusDialog::SvxThesaurusDialog( - Window* pParent, + vcl::Window* pParent, uno::Reference< linguistic2::XThesaurus > xThes, const OUString &rWord, LanguageType nLanguage) diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index c25377390c7c..e4a5040084d8 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -126,7 +126,7 @@ void SvxZoomDialog::SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) -SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) +SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SfxModalDialog(pParent, "ZoomDialog", "cui/ui/zoomdialog.ui") , rSet(rCoreSet) , pOutSet(NULL) diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 523c6414ddb4..5dc045dbabb0 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -356,7 +356,7 @@ sal_uInt16 AbstractThesaurusDialog_Impl::GetLanguage() const return pDlg->GetLanguage(); }; -Window* AbstractThesaurusDialog_Impl::GetWindow() +vcl::Window* AbstractThesaurusDialog_Impl::GetWindow() { return pDlg; } @@ -371,7 +371,7 @@ void AbstractHyphenWordDialog_Impl::SelRight() pDlg->SelRight(); } -Window* AbstractHyphenWordDialog_Impl::GetWindow() +vcl::Window* AbstractHyphenWordDialog_Impl::GetWindow() { return pDlg; } @@ -443,7 +443,7 @@ void AbstractSpellDialog_Impl::Invalidate() pDlg->InvalidateDialog(); } -Window* AbstractSpellDialog_Impl::GetWindow() +vcl::Window* AbstractSpellDialog_Impl::GetWindow() { return pDlg; } @@ -544,7 +544,7 @@ OUString AbstractURLDlg_Impl::GetName() const void AbstractSvxHlinkDlgMarkWnd_Impl::Hide() { - ((Window*)pDlg)->Hide(); + ((vcl::Window*)pDlg)->Hide(); } void AbstractSvxHlinkDlgMarkWnd_Impl::SetSizePixel( const Size& rNewSize ) @@ -559,12 +559,12 @@ Size AbstractSvxHlinkDlgMarkWnd_Impl::GetSizePixel() const bool AbstractSvxHlinkDlgMarkWnd_Impl::IsVisible( ) const { - return (( Window* )pDlg)->IsVisible(); + return (( vcl::Window* )pDlg)->IsVisible(); } void AbstractSvxHlinkDlgMarkWnd_Impl::Invalidate( sal_uInt16 nFlags ) { - (( Window* )pDlg)->Invalidate(nFlags); + (( vcl::Window* )pDlg)->Invalidate(nFlags); } bool AbstractSvxHlinkDlgMarkWnd_Impl::MoveTo( Point aNewPos )const @@ -817,9 +817,9 @@ void AbstractSvxPathSelectDialog_Impl::SetTitle( const OUString& rNewTitle ) pDlg->SetText( rNewTitle ); } -Window * AbstractSvxHpLinkDlg_Impl::GetWindow() +vcl::Window * AbstractSvxHpLinkDlg_Impl::GetWindow() { - return (Window *)pDlg; + return (vcl::Window *)pDlg; } bool AbstractSvxHpLinkDlg_Impl::QueryClose() @@ -949,9 +949,9 @@ IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, PrevHdl) aPrevHdl.Call(this); return 0; } -Window * AbstractSvxPostItDialog_Impl::GetWindow() +vcl::Window * AbstractSvxPostItDialog_Impl::GetWindow() { - return (Window *)pDlg; + return (vcl::Window *)pDlg; } OUString AbstractPasswordToOpenModifyDialog_Impl::GetPasswordToOpen() const @@ -968,7 +968,7 @@ bool AbstractPasswordToOpenModifyDialog_Impl::IsRecommendToOpenReadonly() const } // Create dialogs with simplest interface -VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, sal_uInt32 nResId ) +VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) { Dialog* pDlg=NULL; switch ( nResId ) @@ -1009,13 +1009,13 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateVclDialog( Window* pParent, } // dialogs that use SfxBindings -VclAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* /*pParent*/, const SfxBindings&, sal_uInt32 ) +VclAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* /*pParent*/, const SfxBindings&, sal_uInt32 ) { return 0; } VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog( - Window* pParent, const Reference< frame::XFrame >& rxFrame, + vcl::Window* pParent, const Reference< frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) { Dialog* pDlg = NULL; @@ -1039,7 +1039,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog( // TabDialog outside the drawing layer SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, SfxViewFrame* , bool /*bEditFmt*/, @@ -1064,7 +1064,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR } SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, const Reference< frame::XFrame >& xViewFrame, bool /*bEditFmt*/, @@ -1093,7 +1093,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR } // TabDialog that use functionality of the drawing layer -SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* pParent, +SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttrSet, SdrView* pView, SdrModel* ) @@ -1103,7 +1103,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* p } // TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog -AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( Window* pParent, +AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( vcl::Window* pParent, const SdrView* pView, sal_uInt16 nAnchorTypes ) { @@ -1111,7 +1111,7 @@ AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( return new AbstractSvxCaptionDialog_Impl( pDlg ); } -AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(Window* pParent, +AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor , SvxDistributeVertical eVer) @@ -1120,14 +1120,14 @@ AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeD return new AbstractSvxDistributeDialog_Impl( pDlg ); } -AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(Window* pParent, +AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(vcl::Window* pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) { HangulHanjaConversionDialog* pDlg = new HangulHanjaConversionDialog( pParent, _ePrimaryDirection); return new AbstractHangulHanjaConversionDialog_Impl( pDlg ); } -AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Window* pParent, +AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( vcl::Window* pParent, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, const OUString &rWord, sal_Int16 nLanguage ) { @@ -1135,7 +1135,7 @@ AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Wind return new AbstractThesaurusDialog_Impl( pDlg ); } -AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog( Window* pParent, +AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog( vcl::Window* pParent, const OUString &rWord, LanguageType nLang, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) @@ -1144,12 +1144,12 @@ AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog( Wi return new AbstractHyphenWordDialog_Impl( pDlg ); } -AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( Window* pParent ) +AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( vcl::Window* pParent ) { FmShowColsDialog* pDlg = new FmShowColsDialog( pParent); return new AbstractFmShowColsDialog_Impl( pDlg ); } -AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( Window* pParent, +AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet) { SvxZoomDialog* pDlg = new SvxZoomDialog( pParent, rCoreSet); @@ -1157,7 +1157,7 @@ AbstractSvxZoomDialog * AbstractDialogFactory_Impl::CreateSvxZoomDialog( Window* } AbstractSpellDialog * AbstractDialogFactory_Impl::CreateSvxSpellDialog( - Window* pParent, + vcl::Window* pParent, SfxBindings* pBindings, svx::SpellDialogChildWindow* pSpellChildWindow ) { @@ -1165,20 +1165,20 @@ AbstractSpellDialog * AbstractDialogFactory_Impl::CreateSvxSpellDialog( return new AbstractSpellDialog_Impl(pDlg); } -VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm ) +VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgressDialog( vcl::Window* pParent, GalleryTheme* pThm ) { Dialog* pDlg = new ActualizeProgress( pParent, pThm); return new VclAbstractRefreshableDialog_Impl( pDlg ); } -AbstractSearchProgress * AbstractDialogFactory_Impl::CreateSearchProgressDialog( Window* pParent, +AbstractSearchProgress * AbstractDialogFactory_Impl::CreateSearchProgressDialog( vcl::Window* pParent, const INetURLObject& rStartURL ) { SearchProgress* pDlg = new SearchProgress( pParent, rStartURL); return new AbstractSearchProgress_Impl( pDlg ); } -AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( Window* pParent ) +AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( vcl::Window* pParent ) { TakeProgress* pDlg = new TakeProgress( pParent ); return new AbstractTakeProgress_Impl( pDlg ); @@ -1186,14 +1186,14 @@ AbstractTakeProgress * AbstractDialogFactory_Impl::CreateTakeProgressDialog( Win VclAbstractDialog* AbstractDialogFactory_Impl::CreateScriptErrorDialog( - Window* pParent, ::com::sun::star::uno::Any aException ) + vcl::Window* pParent, ::com::sun::star::uno::Any aException ) { return new SvxScriptErrorDialog( pParent, aException ); } AbstractScriptSelectorDialog* AbstractDialogFactory_Impl::CreateScriptSelectorDialog( - Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& _rxFrame ) + vcl::Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& _rxFrame ) { SvxScriptSelectorDialog* pDlg = new SvxScriptSelectorDialog(pParent, bShowSlots, _rxFrame); return new AbstractScriptSelectorDialog_Impl(pDlg); @@ -1213,7 +1213,7 @@ void AbstractScriptSelectorDialog_Impl::SetRunLabel() return; } -VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window* pParent, +VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( vcl::Window* pParent, const OUString& rLanguage) { Dialog* pDlg=NULL; @@ -1225,21 +1225,21 @@ VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window return 0; } -AbstractTitleDialog * AbstractDialogFactory_Impl::CreateTitleDialog( Window* pParent, +AbstractTitleDialog * AbstractDialogFactory_Impl::CreateTitleDialog( vcl::Window* pParent, const OUString& rOldText) { TitleDialog* pDlg = new TitleDialog( pParent, rOldText); return new AbstractTitleDialog_Impl( pDlg ); } -AbstractGalleryIdDialog * AbstractDialogFactory_Impl::CreateGalleryIdDialog( Window* pParent, +AbstractGalleryIdDialog * AbstractDialogFactory_Impl::CreateGalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ) { GalleryIdDialog* pDlg = new GalleryIdDialog( pParent, pThm); return new AbstractGalleryIdDialog_Impl( pDlg ); } -VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog( Window* pParent, +VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDialog( vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet) { @@ -1247,7 +1247,7 @@ VclAbstractDialog2 * AbstractDialogFactory_Impl::CreateGalleryThemePropertiesDia return new VclAbstractDialog2_Impl( pDlg ); } -AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( Window* pParent, +AbstractURLDlg * AbstractDialogFactory_Impl::CreateURLDialog( vcl::Window* pParent, const OUString& rURL, const OUString& rAltText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ) @@ -1274,7 +1274,7 @@ AbstractSvxHlinkDlgMarkWnd* AbstractDialogFactory_Impl::CreateSvxHlinkDlgMarkWnd } SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32, - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& , const SfxItemSet* pAttrSet ) { @@ -1282,14 +1282,14 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32, return new CuiAbstractSfxDialog_Impl( pDlg ); } -SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog(Window* pParent, +SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog(vcl::Window* pParent, const SfxItemSet& rSet) { SfxTabDialog* pDlg = new SvxSearchFormatDialog(pParent, rSet); return new CuiAbstractTabDialog_Impl(pDlg); } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( Window* pParent, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges ) { @@ -1297,7 +1297,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDial return new CuiVclAbstractDialog_Impl( pDlg ); } -AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( Window* pParent, +AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( vcl::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, @@ -1311,7 +1311,7 @@ AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchS //UUUU SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bEnableSelector, bool bEnableDrawingLayerFillStyles) @@ -1325,7 +1325,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( return new CuiAbstractTabDialog_Impl(pDlg); } -AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( Window* pParent, +AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, sal_uInt16 nAnchorTypes ) @@ -1334,7 +1334,7 @@ AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTab return new AbstractSvxTransformTabDialog_Impl( pDlg ); } -SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( Window* pParent, +SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView, sal_uInt32 nResId, @@ -1366,7 +1366,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( W return 0; } -AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( Window* pParent, +AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( vcl::Window* pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags) { @@ -1374,20 +1374,20 @@ AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOp return new AbstractSvxJSearchOptionsDialog_Impl( pDlg ); } -AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( Window* pParent ) +AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( vcl::Window* pParent ) { FmInputRecordNoDialog* pDlg = new FmInputRecordNoDialog( pParent ); return new AbstractFmInputRecordNoDialog_Impl( pDlg ); } -AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( Window* pParent, +AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( vcl::Window* pParent, ::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) { SvxNewDictionaryDialog* pDlg = new SvxNewDictionaryDialog( pParent, xSpl ); return new AbstractSvxNewDictionaryDialog_Impl( pDlg ); } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( Window* pParent, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, ::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId ) @@ -1407,43 +1407,43 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialo return 0; } -AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( Window* pParent, +AbstractSvxNameDialog * AbstractDialogFactory_Impl::CreateSvxNameDialog( vcl::Window* pParent, const OUString& rName, const OUString& rDesc ) { SvxNameDialog* pDlg = new SvxNameDialog( pParent, rName, rDesc ); return new AbstractSvxNameDialog_Impl( pDlg ); } -AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(Window* pParent, const OUString& rName ) +AbstractSvxObjectNameDialog* AbstractDialogFactory_Impl::CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) { return new AbstractSvxObjectNameDialog_Impl(new SvxObjectNameDialog(pParent, rName)); } -AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(Window* pParent, const OUString& rTitle, const OUString& rDescription) +AbstractSvxObjectTitleDescDialog* AbstractDialogFactory_Impl::CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) { return new AbstractSvxObjectTitleDescDialog_Impl(new SvxObjectTitleDescDialog(pParent, rTitle, rDescription)); } -AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window* pParent, sal_uInt32, +AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( vcl::Window* pParent, sal_uInt32, const OUString& rText, const OUString& rDesc, Image* pImg ) { SvxMessDialog* pDlg = new SvxMessDialog( pParent, rText, rDesc, pImg ); return new AbstractSvxMessDialog_Impl( pDlg ); } -AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog(Window* pParent) +AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog(vcl::Window* pParent) { SvxMultiPathDialog* pDlg = new SvxMultiPathDialog(pParent); return new AbstractSvxMultiPathDialog_Impl( pDlg ); } -AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxPathSelectDialog(Window* pParent) +AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxPathSelectDialog(vcl::Window* pParent) { SvxPathSelectDialog* pDlg = new SvxPathSelectDialog(pParent); return new AbstractSvxPathSelectDialog_Impl( pDlg ); } -AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* pParent, +AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings, sal_uInt32 nResId) { @@ -1462,7 +1462,7 @@ AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* p return 0; } -AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window* pParent, +AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, @@ -1474,7 +1474,7 @@ AbstractFmSearchDialog* AbstractDialogFactory_Impl::CreateFmSearchDialog(Window return 0; } -AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (Window* pParent, +AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmboss (vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource) { @@ -1482,7 +1482,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmb return new AbstractGraphicFilterDialog_Impl( pDlg ); } -AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPoster(Window* pParent, +AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPoster(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount) { @@ -1490,7 +1490,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPos return new AbstractGraphicFilterDialog_Impl( pDlg ); } -AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSepia (Window* pParent, +AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSepia (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount) { @@ -1498,21 +1498,21 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSep return new AbstractGraphicFilterDialog_Impl( pDlg ); } -AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSmooth(Window* pParent, +AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSmooth(vcl::Window* pParent, const Graphic& rGraphic, double nRadius) { GraphicFilterDialog* pDlg = new GraphicFilterSmooth( pParent, rGraphic, nRadius ); return new AbstractGraphicFilterDialog_Impl( pDlg ); } -AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (Window* pParent, +AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert) { GraphicFilterDialog* pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert ); return new AbstractGraphicFilterDialog_Impl( pDlg ); } -AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (Window* pParent, +AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges) { @@ -1520,7 +1520,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMos return new AbstractGraphicFilterDialog_Impl( pDlg ); } -AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( Window* pParent, +AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow) @@ -1529,7 +1529,7 @@ AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( Wi return new AbstractSvxAreaTabDialog_Impl( pDlg ); } -SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog +SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog SdrModel* pModel, const SdrObject* pObj , bool bHasObj) @@ -1538,7 +1538,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window return new CuiAbstractTabDialog_Impl( pDlg ); } -SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, +SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const Reference< XFrame >& _rxDocumentFrame, sal_uInt32 nResId @@ -1562,7 +1562,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, return 0; } -SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, +SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, sal_uInt32 nResId @@ -1591,7 +1591,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, return 0; } -AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( Window* pParent, +AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext ) { @@ -1602,7 +1602,7 @@ AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( Wind class SvxMacroAssignDialog : public VclAbstractDialog { public: - SvxMacroAssignDialog( Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, + SvxMacroAssignDialog( vcl::Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, const Reference< XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) :m_aItems( SfxGetpApp()->GetPool(), SID_ATTR_MACROITEM, SID_ATTR_MACROITEM ) { @@ -1628,7 +1628,7 @@ SvxMacroAssignDialog::~SvxMacroAssignDialog() } VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxMacroAssignDlg( - Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, + vcl::Window* _pParent, const Reference< XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, const Reference< XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) { return new SvxMacroAssignDialog( _pParent, _rxDocumentFrame, _bUnoDialogMode, _rxEvents, _nInitiallySelectedEvent ); @@ -1777,7 +1777,7 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nI return 0; } -SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( Window* pParent, const OUString& rCommand, +SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand, const Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList ) { @@ -1797,7 +1797,7 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia return 0; } -VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* pParent, const OUString& rCommand, +VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand, const Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) { InsertObjectDialog_Impl* pDlg=0; @@ -1812,12 +1812,12 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* p -SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* pParent ) +SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( vcl::Window* pParent ) { return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) ); } -SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p) +SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p) { SvBaseLinksDlg* pLinkDlg = new SvBaseLinksDlg( pParent, pMgr, bHTML ); if ( p ) @@ -1825,34 +1825,34 @@ SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* p return new AbstractLinksDialog_Impl( pLinkDlg ); } -SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* /*pObj*/ ) +SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* /*pObj*/ ) { return new CuiAbstractTabDialog_Impl( new SvxFormatCellsDialog( pParent, pAttr, pModel ) ); } -SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) +SvxAbstractSplittTableDialog* AbstractDialogFactory_Impl::CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) { return new SvxSplitTableDlg( pParent, bIsTableVertical, nMaxVertical, nMaxHorizontal ); } -SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( Window* pParent ) +SvxAbstractNewTableDialog* AbstractDialogFactory_Impl::CreateSvxNewTableDialog( vcl::Window* pParent ) { return new SvxNewTableDialog( pParent ); } VclAbstractDialog* AbstractDialogFactory_Impl::CreateOptionsDialog( - Window* pParent, const OUString& rExtensionId, const OUString& /*rApplicationContext*/ ) + vcl::Window* pParent, const OUString& rExtensionId, const OUString& /*rApplicationContext*/ ) { return new CuiVclAbstractDialog_Impl( new OfaTreeOptionsDialog( pParent, rExtensionId ) ); } -SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ) +SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ) { return new SvxInsRowColDlg( pParent, bCol, sHelpId ); } AbstractPasswordToOpenModifyDialog * AbstractDialogFactory_Impl::CreatePasswordToOpenModifyDialog( - Window * pParent, + vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) { PasswordToOpenModifyDialog * pDlg = new PasswordToOpenModifyDialog( pParent, nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ); diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index df9a0870ff6f..081a7373c3d0 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -172,7 +172,7 @@ class AbstractThesaurusDialog_Impl : public AbstractThesaurusDialog DECL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl,SvxThesaurusDialog) virtual OUString GetWord() SAL_OVERRIDE; virtual sal_uInt16 GetLanguage() const SAL_OVERRIDE; - virtual Window* GetWindow() SAL_OVERRIDE; + virtual vcl::Window* GetWindow() SAL_OVERRIDE; }; class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog @@ -180,7 +180,7 @@ class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog DECL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl,SvxHyphenWordDialog) virtual void SelLeft() SAL_OVERRIDE; virtual void SelRight() SAL_OVERRIDE; - virtual Window* GetWindow() SAL_OVERRIDE; + virtual vcl::Window* GetWindow() SAL_OVERRIDE; }; class FmShowColsDialog; @@ -208,7 +208,7 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog virtual void SetLanguage( sal_uInt16 nLang ) SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; virtual void Invalidate() SAL_OVERRIDE; - virtual Window* GetWindow() SAL_OVERRIDE; + virtual vcl::Window* GetWindow() SAL_OVERRIDE; virtual SfxBindings& GetBindings() SAL_OVERRIDE; }; @@ -413,7 +413,7 @@ class SvxHpLinkDlg; class AbstractSvxHpLinkDlg_Impl :public AbstractSvxHpLinkDlg { DECL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl,SvxHpLinkDlg) - virtual Window* GetWindow() SAL_OVERRIDE; + virtual vcl::Window* GetWindow() SAL_OVERRIDE; virtual bool QueryClose() SAL_OVERRIDE; }; @@ -487,7 +487,7 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog virtual void HideAuthor() SAL_OVERRIDE ; virtual void SetReadonlyPostIt(bool bDisable) SAL_OVERRIDE ; virtual bool IsOkEnabled() const SAL_OVERRIDE; - virtual Window * GetWindow() SAL_OVERRIDE; + virtual vcl::Window * GetWindow() SAL_OVERRIDE; private: Link aNextHdl; Link aPrevHdl; @@ -509,167 +509,167 @@ class AbstractPasswordToOpenModifyDialog_Impl : public AbstractPasswordToOpenMod class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory { public: - virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE; virtual SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, const SfxItemSet* pAttrSet=0 ); - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, sal_uInt32 nResId ) SAL_OVERRIDE; - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, sal_uInt32 nResId ) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, SfxViewFrame* pViewFrame, bool bEditFmt=false, const OUString *pUserButtonText=0 ) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, bool bEditFmt=false, const OUString *pUserButtonText=0 ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent, + virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttrSet, SdrView* pView, SdrModel* pModel=0 ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateTabItemDialog(Window* pParent, + virtual SfxAbstractTabDialog* CreateTabItemDialog(vcl::Window* pParent, const SfxItemSet& rSet) SAL_OVERRIDE; - virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, + virtual AbstractSvxCaptionDialog* CreateCaptionDialog( vcl::Window* pParent, const SdrView* pView, sal_uInt16 nAnchorTypes = 0 ) SAL_OVERRIDE; - virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, + virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone) SAL_OVERRIDE; - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const OUString& rCommmand, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 ) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommmand, + virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) SAL_OVERRIDE; - virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent ) SAL_OVERRIDE; - virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 ) SAL_OVERRIDE; + virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent ) SAL_OVERRIDE; + virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 ) SAL_OVERRIDE; - virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, + virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( vcl::Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) SAL_OVERRIDE; - virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, + virtual AbstractThesaurusDialog* CreateThesaurusDialog( vcl::Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, const OUString &rWord, sal_Int16 nLanguage ) SAL_OVERRIDE; - virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( Window*, + virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( vcl::Window*, const OUString &rWord, LanguageType nLang, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) SAL_OVERRIDE; - virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) SAL_OVERRIDE; - virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, + virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window* pParent ) SAL_OVERRIDE; + virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet) SAL_OVERRIDE; //UUUU add for SvxBorderBackgroundDlg virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bEnableSelector = false, bool bEnableDrawingLayerFillStyles = false) SAL_OVERRIDE; - virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, + virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, sal_uInt16 nAnchorTypes = 0) SAL_OVERRIDE ; - virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, + virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView, sal_uInt32 nResId, bool bSizeTabPage = false ) SAL_OVERRIDE; virtual AbstractSpellDialog * CreateSvxSpellDialog( - Window* pParent, + vcl::Window* pParent, SfxBindings* pBindings, svx::SpellDialogChildWindow* pSpellChildWindow ) SAL_OVERRIDE; - virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, GalleryTheme* pThm ) SAL_OVERRIDE; - virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, + virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( vcl::Window* pParent, GalleryTheme* pThm ) SAL_OVERRIDE; + virtual AbstractSearchProgress * CreateSearchProgressDialog( vcl::Window* pParent, const INetURLObject& rStartURL) SAL_OVERRIDE; - virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ) SAL_OVERRIDE; - virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent, + virtual AbstractTakeProgress * CreateTakeProgressDialog( vcl::Window* pParent ) SAL_OVERRIDE; + virtual AbstractTitleDialog * CreateTitleDialog( vcl::Window* pParent, const OUString& rOldText) SAL_OVERRIDE; - virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent, + virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm) SAL_OVERRIDE; - virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent, + virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet) SAL_OVERRIDE; - virtual AbstractURLDlg * CreateURLDialog( Window* pParent, + virtual AbstractURLDlg * CreateURLDialog( vcl::Window* pParent, const OUString& rURL, const OUString& rAltText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ) SAL_OVERRIDE; virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, + virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges) SAL_OVERRIDE; - virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, + virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( vcl::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, sal_uInt16 nLonger) SAL_OVERRIDE; - virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent, + virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( vcl::Window* pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags) SAL_OVERRIDE; - virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) SAL_OVERRIDE; - virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, + virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) SAL_OVERRIDE; + virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent, + virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId) SAL_OVERRIDE; - virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent, + virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent, const OUString& rName, const OUString& rDesc ) SAL_OVERRIDE; // #i68101# - virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const OUString& rName ) SAL_OVERRIDE; - virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const OUString& rTitle, const OUString& rDescription) SAL_OVERRIDE; + virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) SAL_OVERRIDE; + virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) SAL_OVERRIDE; - virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId, + virtual AbstractSvxMessDialog * CreateSvxMessDialog( vcl::Window* pParent, sal_uInt32 nResId, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ) SAL_OVERRIDE; - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(Window* pParent) SAL_OVERRIDE; - virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(Window* pParent) SAL_OVERRIDE; - virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(vcl::Window* pParent) SAL_OVERRIDE; + virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(vcl::Window* pParent) SAL_OVERRIDE; + virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings, sal_uInt32 nResId) SAL_OVERRIDE; - virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, + virtual AbstractFmSearchDialog* CreateFmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier) SAL_OVERRIDE; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource) SAL_OVERRIDE; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount) SAL_OVERRIDE; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount) SAL_OVERRIDE; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (vcl::Window* pParent, const Graphic& rGraphic, double nRadius) SAL_OVERRIDE; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert) SAL_OVERRIDE; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges) SAL_OVERRIDE; - virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent, + virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, + virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL, bool bHasObj = true ) SAL_OVERRIDE; - virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, + virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext = false ) SAL_OVERRIDE; @@ -679,38 +679,38 @@ public: virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) SAL_OVERRIDE; virtual DialogGetRanges GetDialogGetRangesFunc() SAL_OVERRIDE; - virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateSvxScriptOrgDialog( vcl::Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE; virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( - Window* pParent, + vcl::Window* pParent, bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) SAL_OVERRIDE; virtual VclAbstractDialog* CreateScriptErrorDialog( - Window* pParent, ::com::sun::star::uno::Any aException) SAL_OVERRIDE; + vcl::Window* pParent, ::com::sun::star::uno::Any aException) SAL_OVERRIDE; virtual VclAbstractDialog* CreateSvxMacroAssignDlg( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL ) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL ) SAL_OVERRIDE; - virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) SAL_OVERRIDE; + virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ) SAL_OVERRIDE; - virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) SAL_OVERRIDE ; + virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( vcl::Window* pParent ) SAL_OVERRIDE ; virtual VclAbstractDialog* CreateOptionsDialog( - Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) SAL_OVERRIDE; + vcl::Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) SAL_OVERRIDE; - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ) SAL_OVERRIDE; + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ) SAL_OVERRIDE; - virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) SAL_OVERRIDE; + virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) SAL_OVERRIDE; }; #endif diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx index cff22986fc77..eb24820e3351 100644 --- a/cui/source/factory/init.cxx +++ b/cui/source/factory/init.cxx @@ -25,7 +25,7 @@ // caution: needs C-Linkage since dynamically loaded via symbol name extern "C" { -SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rResult) +SAL_DLLPUBLIC_EXPORT bool GetSpecialCharsForEdit(vcl::Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rResult) { bool bRet = false; boost::scoped_ptr<SvxCharacterMap> aDlg(new SvxCharacterMap( i_pParent )); diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx index ed1357658df2..b984838fa09c 100644 --- a/cui/source/inc/ControlFocusHelper.hxx +++ b/cui/source/inc/ControlFocusHelper.hxx @@ -29,7 +29,7 @@ private: Control* m_pFocusCtrl; public: - SvxControlFocusHelper( Window* pParent, const ResId& rId ) : + SvxControlFocusHelper( vcl::Window* pParent, const ResId& rId ) : Control( pParent, rId ), m_pFocusCtrl( NULL ) {} void SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; } diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index cd0179b88b79..5bbe67ab91de 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -75,7 +75,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SentenceEditWindow_Impl(Window* pParent, WinBits nBits); + SentenceEditWindow_Impl(vcl::Window* pParent, WinBits nBits); virtual ~SentenceEditWindow_Impl(); void SetModifyHdl(const Link& rLink) SAL_OVERRIDE { m_aModifyLink = rLink;} @@ -217,7 +217,7 @@ protected: public: SpellDialog( svx::SpellDialogChildWindow* pChildWindow, - Window * pParent, + vcl::Window * pParent, SfxBindings* pBindings); virtual ~SpellDialog(); diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index dd275a06dc96..72c45c2bc728 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -64,7 +64,7 @@ protected: virtual void Resize() SAL_OVERRIDE; public: - AboutDialog(Window* pParent); + AboutDialog(vcl::Window* pParent); DECL_LINK( HandleClick, PushButton* ); }; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 7ece823d5b88..88d096f8425f 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -62,7 +62,7 @@ protected: const Image&, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE; public: - SfxAccCfgTabListBox_Impl(Window *pParent, WinBits nStyle) + SfxAccCfgTabListBox_Impl(vcl::Window *pParent, WinBits nStyle) : SvTabListBox(pParent, nStyle) , m_pAccelConfigPage(NULL) { @@ -170,7 +170,7 @@ private: void CreateCustomItems( SvTreeListEntry* pEntry, const OUString& aCol1, const OUString& aCol2 ); public: - SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet ); + SfxAcceleratorConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SfxAcceleratorConfigPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 3aa641cbe318..bb249b5822ce 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -59,7 +59,7 @@ class AlignmentTabPage : public SfxTabPage public: virtual ~AlignmentTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -68,7 +68,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: - explicit AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreSet ); + explicit AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); void InitVsRefEgde(); void UpdateEnableControls(); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 5d70cc9d9fea..2ca4b4c440c7 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -52,7 +52,7 @@ class OfaAutoCorrDlg : public SfxTabDialog DECL_LINK(SelectLanguageHdl, ListBox*); public: - OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet); + OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet *pSet); void EnableLanguage(bool bEnable); }; @@ -108,9 +108,9 @@ private: OUString m_sAccidentalCaps; public: - OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet& rSet); + OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -165,12 +165,12 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); - OfaSwAutoFmtOptionsPage( Window* pParent, + OfaSwAutoFmtOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaSwAutoFmtOptionsPage(); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -185,9 +185,9 @@ class AutoCorrEdit : public Edit bool bSpaces; public: - AutoCorrEdit(Window* pParent, const ResId& rResId) : + AutoCorrEdit(vcl::Window* pParent, const ResId& rResId) : Edit(pParent, rResId), bSpaces(false){} - AutoCorrEdit(Window* pParent) : + AutoCorrEdit(vcl::Window* pParent) : Edit(pParent), bSpaces(false){} void SetActionHdl( const Link& rLink ) @@ -260,10 +260,10 @@ private: void setTabs(); public: - OfaAutocorrReplacePage( Window* pParent, const SfxItemSet& rSet ); + OfaAutocorrReplacePage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaAutocorrReplacePage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -318,10 +318,10 @@ private: LanguageType eOldLanguage, LanguageType eNewLanguage); public: - OfaAutocorrExceptPage( Window* pParent, const SfxItemSet& rSet ); + OfaAutocorrExceptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaAutocorrExceptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -383,11 +383,11 @@ private: SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); - OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaQuoteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~OfaQuoteTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -404,7 +404,7 @@ public: { OfaAutoCompleteTabPage* m_pPage; public: - AutoCompleteMultiListBox(Window *pParent, WinBits nBits) + AutoCompleteMultiListBox(vcl::Window *pParent, WinBits nBits) : MultiListBox(pParent, nBits) , m_pPage(NULL) { @@ -432,12 +432,12 @@ private: DECL_LINK( CheckHdl, CheckBox* ); - OfaAutoCompleteTabPage( Window* pParent, + OfaAutoCompleteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~OfaAutoCompleteTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -466,7 +466,7 @@ private: PushButton* m_pPropertiesPB; /// construction via Create() - OfaSmartTagOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); /** Inserts items into m_aSmartTagTypesLB @@ -504,7 +504,7 @@ public: virtual ~OfaSmartTagOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 0402ecb85c0d..ab4145fcece1 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -46,13 +46,13 @@ class SvxBackgroundTabPage : public SvxTabPage { using TabPage::DeactivatePage; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; /// Shift-ListBox activation void ShowSelector(); @@ -67,7 +67,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: - SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet ); + SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~SvxBackgroundTabPage(); VclContainer* m_pAsGrid; diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx index f5fc9d242f88..ca5d43550925 100644 --- a/cui/source/inc/bbdlg.hxx +++ b/cui/source/inc/bbdlg.hxx @@ -28,7 +28,7 @@ class SvxBorderBackgroundDlg: public SfxTabDialog { public: - SvxBorderBackgroundDlg(Window *pParent, + SvxBorderBackgroundDlg(vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bEnableSelector = false, bool bEnableDrawingLayerFillStyles = false); diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index e3e352b72af9..0a5aea5504b6 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -43,7 +43,7 @@ class SvxBorderTabPage : public SfxTabPage using TabPage::DeactivatePage; public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); static const sal_uInt16* GetRanges(); @@ -58,7 +58,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: - SvxBorderTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ); + SvxBorderTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); virtual ~SvxBorderTabPage(); // Controls diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 6d786a227c35..ebbff4af7b1f 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -64,7 +64,7 @@ private: sal_uInt16 m_nEventsPageId; public: - SvxConfigDialog( Window*, const SfxItemSet* ); + SvxConfigDialog( vcl::Window*, const SfxItemSet* ); virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); @@ -321,7 +321,7 @@ protected: bool m_bIsInternalDrag; public: - SvxMenuEntriesListBox(Window*, SvxConfigPage*); + SvxMenuEntriesListBox(vcl::Window*, SvxConfigPage*); virtual ~SvxMenuEntriesListBox(); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; @@ -390,7 +390,7 @@ protected: ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; - SvxConfigPage( Window*, const SfxItemSet& ); + SvxConfigPage( vcl::Window*, const SfxItemSet& ); DECL_LINK( MoveHdl, Button * ); @@ -481,7 +481,7 @@ private: void DeleteSelectedTopLevel() SAL_OVERRIDE; public: - SvxMenuConfigPage( Window *pParent, const SfxItemSet& rItemSet ); + SvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SvxMenuConfigPage(); SaveInData* CreateSaveInData( @@ -513,7 +513,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog public: SvxMainMenuOrganizerDialog ( - Window*, SvxEntries*, + vcl::Window*, SvxEntries*, SvxConfigEntry*, bool bCreateMenu = false ); virtual ~SvxMainMenuOrganizerDialog (); @@ -542,7 +542,7 @@ protected: public: - SvxToolbarEntriesListBox(Window* pParent, SvxToolbarConfigPage* pPg); + SvxToolbarEntriesListBox(vcl::Window* pParent, SvxToolbarConfigPage* pPg); virtual ~SvxToolbarEntriesListBox(); void SetChangedListener( const Link& aChangedListener ) @@ -582,7 +582,7 @@ private: void DeleteSelectedTopLevel() SAL_OVERRIDE; public: - SvxToolbarConfigPage( Window *pParent, const SfxItemSet& rItemSet ); + SvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SvxToolbarConfigPage(); SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = NULL, @@ -670,7 +670,7 @@ private: DECL_LINK(ModifyHdl, Edit*); public: - SvxNewToolbarDialog(Window* pWindow, const OUString& rName); + SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& rName); ListBox* m_pSaveInListBox; @@ -733,7 +733,7 @@ private: public: SvxIconSelectorDialog( - Window *pWindow, + vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager >& rXImageManager, const ::com::sun::star::uno::Reference< @@ -754,12 +754,12 @@ class SvxIconReplacementDialog : public MessBox { public: SvxIconReplacementDialog( - Window *pWindow, + vcl::Window *pWindow, const OUString& aMessage, bool aYestoAll); SvxIconReplacementDialog( - Window *pWindow, + vcl::Window *pWindow, const OUString& aMessage ); OUString ReplaceIconName( const OUString& ); @@ -772,7 +772,7 @@ private: FixedImage* pFImageInfo; VclMultiLineEdit* pLineEditDescription; public: - SvxIconChangeDialog(Window *pWindow, const OUString& aMessage); + SvxIconChangeDialog(vcl::Window *pWindow, const OUString& aMessage); }; #endif // INCLUDED_CUI_SOURCE_INC_CFG_HXX diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index f14200363424..c2c124298101 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -111,7 +111,7 @@ class SfxConfigFunctionListBox : public SvTreeListBox virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: - SfxConfigFunctionListBox(Window*, WinBits nStyle); + SfxConfigFunctionListBox(vcl::Window*, WinBits nStyle); virtual ~SfxConfigFunctionListBox(); void ClearAll(); @@ -163,7 +163,7 @@ protected: virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE; public: - SfxConfigGroupListBox(Window* pParent, WinBits nStyle); + SfxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SfxConfigGroupListBox(); void ClearAll(); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index ab2841623eba..424a976b4df0 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -51,7 +51,7 @@ protected: bool m_bPreviewBackgroundToCharacter; - SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset); + SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset); virtual ~SvxCharBasePage(); @@ -113,7 +113,7 @@ private: SvxCharNamePage_Impl* m_pImpl; - SvxCharNamePage( Window* pParent, const SfxItemSet& rSet ); + SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rSet ); void Initialize(); const FontList* GetFontList() const; @@ -152,7 +152,7 @@ public: public: virtual ~SvxCharNamePage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -210,7 +210,7 @@ private: OUString m_aTransparentColorName; - SvxCharEffectsPage( Window* pParent, const SfxItemSet& rSet ); + SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxCharEffectsPage(); void Initialize(); @@ -231,7 +231,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -284,7 +284,7 @@ private: sal_uInt8 m_nSuperProp; sal_uInt8 m_nSubProp; - SvxCharPositionPage( Window* pParent, const SfxItemSet& rSet ); + SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxCharPositionPage(); void Initialize(); @@ -310,7 +310,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -334,7 +334,7 @@ private: sal_uInt16 m_nStartBracketPosition; sal_uInt16 m_nEndBracketPosition; - SvxCharTwoLinesPage(Window* pParent, const SfxItemSet& rSet); + SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxCharTwoLinesPage(); void UpdatePreview_Impl(); @@ -353,7 +353,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index b0e034ea16f3..e66fcd65f9f2 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -60,10 +60,10 @@ private: public: - SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ); + SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxConnectionPage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -79,7 +79,7 @@ public: class SvxConnectionDialog : public SfxSingleTabDialog { public: - SvxConnectionDialog( Window* pParent, const SfxItemSet& rAttr, + SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView ); virtual ~SvxConnectionDialog(); }; diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 0c982672ce74..a4d95279c2ac 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -39,7 +39,7 @@ namespace svx class SvxShowText : public Control { public: - SvxShowText( Window* pParent, + SvxShowText( vcl::Window* pParent, bool bCenter = false ); virtual ~SvxShowText(); @@ -97,7 +97,7 @@ private: void fillAllSubsets(ListBox &rListBox); public: - SvxCharacterMap( Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 ); + SvxCharacterMap( vcl::Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 ); virtual ~SvxCharacterMap(); void DisableFontSelection(); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 84fabd0d5eeb..d163b3d44b6f 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -76,7 +76,7 @@ class FmSearchDialog : public ModalDialog OUString m_sSearch; OUString m_sCancel; - Window* m_pPreSearchFocus; + vcl::Window* m_pPreSearchFocus; Link m_lnkFoundHandler; ///< Handler for "found" Link m_lnkCanceledNotFoundHdl; ///< Handler for Positioning the Cursors @@ -107,7 +107,7 @@ public: (of course needed : the string number i in strUsedFields of a context must correspond with the interface number i in the arrFields of the context) */ - FmSearchDialog(Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, + FmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier); virtual ~FmSearchDialog(); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 8106bc725973..83f234f9724c 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -83,7 +83,7 @@ private: FixedText* m_pFtSearchDir; FixedText* m_pFtSearchType; CancelButton* m_pBtnCancel; - Window * parent_; + vcl::Window * parent_; INetURLObject startUrl_; rtl::Reference< SearchThread > maSearchThread; @@ -91,7 +91,7 @@ private: void Terminate(); public: - SearchProgress( Window* pParent, const INetURLObject& rStartURL ); + SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL ); virtual ~SearchProgress() {}; DECL_LINK( CleanUpHdl, void* ); @@ -127,7 +127,7 @@ class TakeProgress : public ModalDialog private: FixedText* m_pFtTakeFile; CancelButton* m_pBtnCancel; - Window * window_; + vcl::Window * window_; rtl::Reference< TakeThread > maTakeThread; TokenList_impl maTakenList; @@ -136,7 +136,7 @@ private: public: - TakeProgress( Window* pWindow ); + TakeProgress( vcl::Window* pWindow ); DECL_LINK( CleanUpHdl, void* ); @@ -159,7 +159,7 @@ private: DECL_LINK( ActualizeHdl, INetURLObject* pURL ); public: - ActualizeProgress( Window* pWindow, GalleryTheme* pThm ); + ActualizeProgress( vcl::Window* pWindow, GalleryTheme* pThm ); virtual ~ActualizeProgress() {}; virtual short Execute() SAL_OVERRIDE; @@ -170,7 +170,7 @@ class TitleDialog : public ModalDialog private: Edit* m_pEdit; public: - TitleDialog(Window* pParent, const OUString& rOldText); + TitleDialog(vcl::Window* pParent, const OUString& rOldText); OUString GetTitle() const { return m_pEdit->GetText(); } }; @@ -184,7 +184,7 @@ private: DECL_LINK( ClickOkHdl, void* ); DECL_LINK( ClickResNameHdl, void* ); public: - GalleryIdDialog( Window* pParent, GalleryTheme* pThm ); + GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); sal_uLong GetId() const { return m_pLbResName->GetSelectEntryPos(); } }; @@ -198,7 +198,7 @@ class GalleryThemeProperties : public SfxTabDialog virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE; public: - GalleryThemeProperties(Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet); + GalleryThemeProperties(vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet); }; class TPGalleryThemeGeneral : public SfxTabPage @@ -219,13 +219,13 @@ private: public: - TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& rSet ); + TPGalleryThemeGeneral( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~TPGalleryThemeGeneral() {} void SetXChgData( ExchangeData* pData ); const ExchangeData* GetXChgData() const { return pData; } - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); }; typedef ::std::vector< FilterEntry* > FilterEntryList_impl; @@ -284,7 +284,7 @@ class TPGalleryThemeProperties : public SfxTabPage DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); public: - TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ); + TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet ); virtual ~TPGalleryThemeProperties(); void SetXChgData( ExchangeData* pData ); @@ -292,7 +292,7 @@ public: void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); }; #endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index f501472c7560..f4faabb50960 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -50,7 +50,7 @@ private: public: - GraphicPreviewWindow(Window* pParent, WinBits nStyle); + GraphicPreviewWindow(vcl::Window* pParent, WinBits nStyle); void init(const Graphic* pOrigGraphic, const Link& rLink) { mpOrigGraphic = pOrigGraphic; @@ -84,7 +84,7 @@ protected: public: - GraphicFilterDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic); + GraphicFilterDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0; }; @@ -101,7 +101,7 @@ private: public: - GraphicFilterSmooth( Window* pParent, const Graphic& rGraphic, double nRadius); + GraphicFilterSmooth( vcl::Window* pParent, const Graphic& rGraphic, double nRadius); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; double GetRadius() const { return mpMtrRadius->GetValue() / 10.0; } @@ -120,7 +120,7 @@ private: public: - GraphicFilterMosaic(Window* pParent, const Graphic& rGraphic, + GraphicFilterMosaic(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; @@ -141,7 +141,7 @@ private: public: - GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, + GraphicFilterSolarize( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; @@ -158,7 +158,7 @@ class GraphicFilterSepia : public GraphicFilterDialog private: MetricField* mpMtrSepia; public: - GraphicFilterSepia( Window* pParent, const Graphic& rGraphic, + GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt16 GetSepiaPercent() const @@ -176,7 +176,7 @@ class GraphicFilterPoster : public GraphicFilterDialog private: NumericField* mpNumPoster; public: - GraphicFilterPoster( Window* pParent, const Graphic& rGraphic, + GraphicFilterPoster( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterColorCount ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; @@ -194,7 +194,7 @@ private: virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; public: - EmbossControl(Window* pParent) + EmbossControl(vcl::Window* pParent) : SvxRectCtl(pParent) {} void SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; } @@ -205,7 +205,7 @@ class GraphicFilterEmboss : public GraphicFilterDialog private: EmbossControl* mpCtlLight; public: - GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic, + GraphicFilterEmboss( vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 244c195ce817..8ef2930ae952 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -78,7 +78,7 @@ protected: void Apply(); public: - SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings ); + SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings ); virtual ~SvxHpLinkDlg (); virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx index 2a22bc5b3312..3266a2a3449c 100644 --- a/cui/source/inc/cuiimapwnd.hxx +++ b/cui/source/inc/cuiimapwnd.hxx @@ -41,7 +41,7 @@ class URLDlg : public ModalDialog public: - URLDlg( Window* pWindow, + URLDlg( vcl::Window* pWindow, const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ); diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 49a3f0637016..86190a8c0ce3 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -64,10 +64,10 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; public: - SvxGeneralTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxGeneralTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxGeneralTabPage (); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 660e3c79eb9a..10b3b5bccd11 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -44,7 +44,7 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ); public: - SvxJSearchOptionsDialog(Window *pParent, + SvxJSearchOptionsDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags); // Window diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index adc998ad08cc..5bfbe3cc0044 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -75,7 +75,7 @@ protected: void SavePalettes(); public: - SvxAreaTabDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow ); + SvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow ); virtual ~SvxAreaTabDialog(); void SetNewColorList( XColorListRef pColTab ) @@ -159,17 +159,17 @@ class SvxTransparenceTabPage : public SvxTabPage void InvalidatePreview (bool bEnable = true ); public: - SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs); + SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); void Construct(); - static SfxTabPage* Create(Window*, const SfxItemSet*); + static SfxTabPage* Create(vcl::Window*, const SfxItemSet*); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE; - virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; + virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; } @@ -288,18 +288,18 @@ private: void ClickBitmapHdl_Impl(); public: - SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetGradientList( XGradientListRef pGrdLst) @@ -354,17 +354,17 @@ private: DECL_LINK( ModifyShadowHdl_Impl, void * ); public: - SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } @@ -433,11 +433,11 @@ private: void SetControlState_Impl( XGradientStyle eXGS ); public: - SvxGradientTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxGradientTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -509,18 +509,18 @@ private: long CheckChanges_Impl(); public: - SvxHatchTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxHatchTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetHatchingList( XHatchListRef pHtchLst) @@ -594,19 +594,19 @@ private: long CheckChanges_Impl(); public: - SvxBitmapTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxBitmapTabPage(); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetBitmapList( XBitmapListRef pBmpLst) { pBitmapList = pBmpLst; } @@ -627,7 +627,7 @@ public: Return a label control that provides a name for the specified control. */ - virtual Window* GetParentLabeledBy( const Window* pLabeled ) const SAL_OVERRIDE; + virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabeled ) const SAL_OVERRIDE; }; /************************************************************************/ @@ -729,12 +729,12 @@ private: void UpdateModified(); public: - SvxColorTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxColorTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxColorTabPage(); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 83aac99004f3..bc4fffcd48bf 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -61,7 +61,7 @@ protected: void SavePalettes(); public: - SvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, + SvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL, bool bHasObj = true ); virtual ~SvxLineTabDialog(); @@ -202,12 +202,12 @@ public: void ShowSymbolControls(bool bOn); - SvxLineTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxLineTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxLineTabPage(); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -216,7 +216,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; @@ -301,11 +301,11 @@ private: void CheckChanges_Impl(); public: - SvxLineDefTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxLineDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -370,12 +370,12 @@ private: void CheckChanges_Impl(); public: - SvxLineEndDefTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxLineEndDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxLineEndDefTabPage(); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 42e905ee73f3..1f2b34d616db 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -32,7 +32,7 @@ public: NumericField* m_pRecordNo; public: - FmInputRecordNoDialog(Window * pParent); + FmInputRecordNoDialog(vcl::Window * pParent); void SetValue(long dNew) { m_pRecordNo->SetValue(dNew); } long GetValue() const { return static_cast<long>(m_pRecordNo->GetValue()); } diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 37cf8b5e8c3b..f35f2adb57c8 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -89,10 +89,10 @@ namespace svx #endif public: - DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ); + DbRegistrationOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~DbRegistrationOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -128,7 +128,7 @@ namespace svx ,public SfxSingleTabDialog { public: - DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rAttr ); + DatabaseRegistrationDialog( vcl::Window* pParent, const SfxItemSet& rAttr ); virtual ~DatabaseRegistrationDialog(); virtual short Execute() SAL_OVERRIDE; diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index a4a306f564f1..e6d9ea26c9fd 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -39,7 +39,7 @@ private: DECL_LINK(ModifyHdl, void *); public: - SvxNameDialog( Window* pWindow, const OUString& rName, const OUString& rDesc ); + SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ); void GetName( OUString& rName ){rName = pEdtName->GetText();} @@ -87,7 +87,7 @@ private: public: // constructor - SvxObjectNameDialog(Window* pWindow, const OUString& rName); + SvxObjectNameDialog(vcl::Window* pWindow, const OUString& rName); // data access void GetName(OUString& rName) {rName = pEdtName->GetText(); } @@ -117,7 +117,7 @@ private: public: // constructor - SvxObjectTitleDescDialog(Window* pWindow, const OUString& rTitle, const OUString& rDesc); + SvxObjectTitleDescDialog(vcl::Window* pWindow, const OUString& rTitle, const OUString& rDesc); // data access void GetTitle(OUString& rTitle) {rTitle = pEdtTitle->GetText(); } @@ -138,7 +138,7 @@ private: DECL_LINK(Button2Hdl, void *); public: - SvxMessDialog( Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ); + SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ); virtual ~SvxMessDialog(); void SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt ); diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index ad54f935ff4d..e0be5f3dd87e 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -41,15 +41,15 @@ class SvxDistributePage : public SvxTabPage RadioButton* m_pBtnVerBottom; public: - SvxDistributePage(Window* pWindow, const SfxItemSet& rInAttrs, + SvxDistributePage(vcl::Window* pWindow, const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); - static SfxTabPage* Create(Window*, const SfxItemSet&, + static SfxTabPage* Create(vcl::Window*, const SfxItemSet&, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; - virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; + virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; SvxDistributeHorizontal GetDistributeHor() const { return m_eDistributeHor; } SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; } @@ -60,7 +60,7 @@ class SvxDistributeDialog : public SfxSingleTabDialog SvxDistributePage* mpPage; public: - SvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, + SvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index e10d09bfedf0..8d7392ac26ac 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -26,14 +26,14 @@ #include <vcl/graph.hxx> #include <sfx2/tabdlg.hxx> -class SvxCropExample : public Window +class SvxCropExample : public vcl::Window { Size aFrameSize; Point aTopLeft, aBottomRight; Graphic aGrf; public: - SvxCropExample( Window* pPar, WinBits nStyle ); + SvxCropExample( vcl::Window* pPar, WinBits nStyle ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; @@ -93,7 +93,7 @@ class SvxGrfCropPage : public SfxTabPage bool bSetOrigSize; - SvxGrfCropPage( Window *pParent, const SfxItemSet &rSet ); + SvxGrfCropPage( vcl::Window *pParent, const SfxItemSet &rSet ); virtual ~SvxGrfCropPage(); DECL_LINK( ZoomHdl, MetricField * ); @@ -111,7 +111,7 @@ class SvxGrfCropPage : public SfxTabPage Size GetGrfOrigSize( const Graphic& ) const; public: - static SfxTabPage *Create( Window *pParent, const SfxItemSet *rSet ); + static SfxTabPage *Create( vcl::Window *pParent, const SfxItemSet *rSet ); virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index cbee8ef6b0d7..4cea2af82cd2 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -41,7 +41,7 @@ namespace svx class SuggestionSet : public ValueSet { public: - SuggestionSet( Window* pParent ); + SuggestionSet( vcl::Window* pParent ); virtual ~SuggestionSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; @@ -51,7 +51,7 @@ namespace svx class SuggestionDisplay : public Control { public: - SuggestionDisplay( Window* pParent, WinBits nBits ); + SuggestionDisplay( vcl::Window* pParent, WinBits nBits ); virtual ~SuggestionDisplay(); void DisplayListBox( bool bDisplayListBox ); @@ -134,7 +134,7 @@ namespace svx public: HangulHanjaConversionDialog( - Window* _pParent, + vcl::Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); virtual ~HangulHanjaConversionDialog( ); @@ -220,7 +220,7 @@ namespace svx void Init( void ); ///< reads settings from core and init controls public: - HangulHanjaOptionsDialog( Window* _pParent ); + HangulHanjaOptionsDialog( vcl::Window* _pParent ); virtual ~HangulHanjaOptionsDialog(); void AddDict( const OUString& _rName, bool _bChecked ); @@ -238,7 +238,7 @@ namespace svx DECL_LINK( OKHdl, void* ); DECL_LINK( ModifyHdl, void* ); public: - HangulHanjaNewDictDialog( Window* _pParent ); + HangulHanjaNewDictDialog( vcl::Window* _pParent ); bool GetName( OUString& _rRetName ) const; }; @@ -256,7 +256,7 @@ namespace svx bool ShouldScroll( bool _bUp ) const; void DoJump( bool _bUp ); public: - SuggestionEdit( Window* pParent, WinBits nBits ); + SuggestionEdit( vcl::Window* pParent, WinBits nBits ); virtual ~SuggestionEdit(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void init( ScrollBar* pScrollBar, SuggestionEdit* pPrev, SuggestionEdit* pNext); @@ -310,7 +310,7 @@ namespace svx bool DeleteEntryFromDictionary( const OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict ); public: - HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); + HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); virtual ~HangulHanjaEditDictDialog(); void UpdateScrollbar( void ); diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 18b22a252c18..f536a1d77b57 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -33,7 +33,7 @@ protected: DECL_LINK( HeaderEndDrag_Impl, HeaderBar* ); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - MacroEventListBox( Window* pParent, WinBits nStyle ); + MacroEventListBox( vcl::Window* pParent, WinBits nStyle ); virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 04159107b07b..98731d7e6172 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -50,10 +50,10 @@ protected: SvxLinkInsertMode& eMode ) SAL_OVERRIDE; public: - SvxHyperlinkNewDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkNewDocTp (); - static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual bool AskApply () SAL_OVERRIDE; virtual void DoApply () SAL_OVERRIDE; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index ea69d978a6e7..1b7e3525840d 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -66,10 +66,10 @@ protected: OUString GetCurrentURL (); public: - SvxHyperlinkDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkDocTp (); - static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE; diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index 11f1eb8d4c30..e11b74456b32 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -77,10 +77,10 @@ protected: virtual void SetMarkWndShouldOpen (bool bOpen) SAL_OVERRIDE {mbMarkWndOpen=bOpen;} public: - SvxHyperlinkInternetTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + SvxHyperlinkInternetTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkInternetTp (); - static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE; diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 9a366bc10684..44aacc78453d 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -55,10 +55,10 @@ protected: SvxLinkInsertMode& eMode ) SAL_OVERRIDE; public: - SvxHyperlinkMailTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkMailTp (); - static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual void SetInitFocus() SAL_OVERRIDE; }; diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index b858f51f54d9..2108beb587b4 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -42,7 +42,7 @@ private: SvxHlinkDlgMarkWnd* mpParentWnd; public: - SvxHlmarkTreeLBox(Window* pParent, WinBits nStyle); + SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle); void SetParentWnd(SvxHlinkDlgMarkWnd* pParent) { diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index d63bd1c563ca..02e42c5e7e71 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -59,7 +59,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE ); + SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart = INET_PROT_FILE ); }; @@ -79,7 +79,7 @@ private: mxDocumentFrame; protected: - Window* mpDialog; + vcl::Window* mpDialog; bool mbStdControlsInit; @@ -111,7 +111,7 @@ protected: public: SvxHyperlinkTabPageBase ( - Window *pParent, + vcl::Window *pParent, IconChoiceDialog* pDlg, const OString& rID, const OUString& rUIXMLDescription, @@ -134,7 +134,7 @@ public: virtual void ActivatePage( const SfxItemSet& rItemSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - bool IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); } + bool IsMarkWndVisible () { return ((vcl::Window*)mpMarkWnd)->IsVisible(); } Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } bool MoveToExtraWnd ( Point aNewPos, bool bDisConnectDlg = false ); @@ -147,8 +147,8 @@ protected: virtual void SetMarkWndShouldOpen(bool bOpen); void ShowMarkWnd (); - void HideMarkWnd () { ( ( Window* ) mpMarkWnd )->Hide(); } - void InvalidateMarkWnd () { ( ( Window* ) mpMarkWnd )->Invalidate(); } + void HideMarkWnd () { ( ( vcl::Window* ) mpMarkWnd )->Hide(); } + void InvalidateMarkWnd () { ( ( vcl::Window* ) mpMarkWnd )->Invalidate(); } SfxDispatcher* GetDispatcher() const; diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index f4e4293ad958..4d0b7ba7c489 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -34,7 +34,7 @@ class SvxSpellWrapper; class HyphenEdit : public Edit { public: - HyphenEdit(Window* pParent); + HyphenEdit(vcl::Window* pParent); protected: virtual void KeyInput(const KeyEvent &rKEvt) SAL_OVERRIDE; @@ -82,7 +82,7 @@ class SvxHyphenWordDialog : public SfxModalDialog public: SvxHyphenWordDialog( const OUString &rWord, LanguageType nLang, - Window* pParent, + vcl::Window* pParent, css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ); virtual ~SvxHyphenWordDialog(); diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 8248a720c5ff..269e61d3e006 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -41,7 +41,7 @@ class IconChoiceDialog; class IconChoicePage; // Create-Function -typedef IconChoicePage* (*CreatePage)(Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet &rAttrSet); +typedef IconChoicePage* (*CreatePage)(vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet &rAttrSet); typedef const sal_uInt16* (*GetPageRanges)(); // gives international Which-value /// Data-structure for pages in dialog @@ -84,7 +84,7 @@ private : void ImplInitSettings(); protected : - IconChoicePage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ); + IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ); sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } sal_uInt16 GetWhich( sal_uInt16 nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } @@ -182,7 +182,7 @@ protected : public : // the IconChoiceCtrl's could also be set in the Ctor - IconChoiceDialog ( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + IconChoiceDialog ( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet * pItemSet = 0 ); virtual ~IconChoiceDialog (); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index bd793a7b0ece..f845ea80289a 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -44,7 +44,7 @@ protected: const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& m_xStorage; comphelper::EmbeddedObjectContainer aCnt; - InsertObjectDialog_Impl(Window * pParent, const OString& rID, + InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID, const OUString& rUIXMLDescription, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage); public: @@ -83,7 +83,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl { return m_pRbNewObject->IsChecked(); } public: - SvInsertOleDlg( Window* pParent, + SvInsertOleDlg( vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, const SvObjectServerList* pServers = NULL ); virtual short Execute() SAL_OVERRIDE; @@ -106,7 +106,7 @@ private: OUString GetPlugInOptions() const { return m_pEdPluginsOptions->GetText(); } public: - SvInsertPlugInDialog(Window* pParent, + SvInsertPlugInDialog(vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage); virtual ~SvInsertPlugInDialog(); virtual short Execute() SAL_OVERRIDE; @@ -139,9 +139,9 @@ private: void Init(); public: - SfxInsertFloatingFrameDialog(Window *pParent, + SfxInsertFloatingFrameDialog(vcl::Window *pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ); - SfxInsertFloatingFrameDialog( Window* pParent, + SfxInsertFloatingFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); virtual short Execute() SAL_OVERRIDE; }; diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 65932047dc04..012916b89423 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -42,7 +42,7 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog bool bColumn; public: - SvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ); + SvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ); virtual short Execute(void) SAL_OVERRIDE; diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 1b73b594c2eb..743ba930f0eb 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -73,9 +73,9 @@ private: const SdrView* pView; public: - SvxCaptionTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxCaptionTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -104,7 +104,7 @@ private: virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: - SvxCaptionTabDialog(Window* pParent, const SdrView* pView, + SvxCaptionTabDialog(vcl::Window* pParent, const SdrView* pView, sal_uInt16 nAnchorTypes = 0); /// link for the Writer to validate positions diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index f42889593a31..d5440bda7a1b 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -91,7 +91,7 @@ class SvBaseLinksDlg : public ModalDialog void SetManager( sfx2::LinkManager* ); public: - SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, bool bHtml = false ); + SvBaseLinksDlg( vcl::Window * pParent, sfx2::LinkManager*, bool bHtml = false ); virtual ~SvBaseLinksDlg(); void SetActLink( sfx2::SvBaseLink * pLink ); }; diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 988ff02abd9e..bdcd93c6f724 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -47,7 +47,7 @@ class _SfxMacroTabPage : public SfxTabPage protected: _SfxMacroTabPage_Impl* mpImpl; - _SfxMacroTabPage( Window* pParent, const SfxItemSet& rItemSet ); + _SfxMacroTabPage( vcl::Window* pParent, const SfxItemSet& rItemSet ); void InitAndSetHandler(); void FillEvents(); @@ -90,20 +90,20 @@ class SfxMacroTabPage : public _SfxMacroTabPage { public: SfxMacroTabPage( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet ); // --------- inherit from the base ------------- - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); }; class SfxMacroAssignDlg : public SfxSingleTabDialog { public: SfxMacroAssignDlg( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet ); }; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 19ee9d2459f1..f151c36ba6e7 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -72,7 +72,7 @@ protected: bool bReadOnly, bDocModified, bAppEvents, bInitialized; EventDisplayNames aDisplayNames; - _SvxMacroTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet ); + _SvxMacroTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet ); void EnableButtons(); ::com::sun::star::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash ); @@ -97,7 +97,7 @@ class SvxMacroTabPage : public _SvxMacroTabPage { public: SvxMacroTabPage( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xNameReplace, @@ -112,7 +112,7 @@ typedef const sal_uInt16* (*GetTabPageRanges)(); // gives international Which-va class SvxMacroAssignSingleTabDialog : public SfxSingleTabDialog { public: - SvxMacroAssignSingleTabDialog(Window* pParent, const SfxItemSet& rOptionsSet); + SvxMacroAssignSingleTabDialog(vcl::Window* pParent, const SfxItemSet& rOptionsSet); private: DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * ); @@ -123,7 +123,7 @@ class SvxMacroAssignDlg : public SvxMacroAssignSingleTabDialog { public: SvxMacroAssignDlg( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& xNameReplace, diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 260937710207..a42ea5e7c4e4 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -64,16 +64,16 @@ private: public: - SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ); + SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxMeasurePage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } @@ -86,7 +86,7 @@ public: class SvxMeasureDialog : public SfxSingleTabDialog { public: - SvxMeasureDialog(Window* pParent, const SfxItemSet& rAttr, + SvxMeasureDialog(vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView); }; diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 095ce1ad3fe5..0508ff40aba1 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -49,7 +49,7 @@ private: DECL_LINK(CheckHdl_Impl, svx::SvxRadioButtonListBox*); public: - SvxMultiPathDialog(Window* pParent); + SvxMultiPathDialog(vcl::Window* pParent); virtual ~SvxMultiPathDialog(); OUString GetPath() const; @@ -68,7 +68,7 @@ private: DECL_LINK(SelectHdl_Impl, void *); public: - SvxPathSelectDialog(Window* pParent); + SvxPathSelectDialog(vcl::Window* pParent); virtual ~SvxPathSelectDialog(); OUString GetPath() const; diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 37d1ce46bd28..63ed48b9943b 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -33,7 +33,7 @@ private: NumericField* mpNumRows; public: - SvxNewTableDialog( Window* pWindow ); + SvxNewTableDialog( vcl::Window* pWindow ); virtual short Execute(void) SAL_OVERRIDE; virtual void Apply(void); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 10c311c2c8d5..0bbec43c9fe4 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -41,7 +41,7 @@ class vector; -class SvxNumberPreview : public Window +class SvxNumberPreview : public vcl::Window { private: OUString aPrevStr; @@ -56,7 +56,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SvxNumberPreview(Window* pParent, WinBits nStyle = WB_BORDER); + SvxNumberPreview(vcl::Window* pParent, WinBits nStyle = WB_BORDER); void NotifyChange( const OUString& rPrevStr, const Color* pColor = NULL ); }; @@ -70,7 +70,7 @@ class SvxNumberFormatTabPage : public SfxTabPage public: virtual ~SvxNumberFormatTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); @@ -87,7 +87,7 @@ public: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; private: - SvxNumberFormatTabPage( Window* pParent, + SvxNumberFormatTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); FixedText* m_pFtCategory; ListBox* m_pLbCategory; @@ -128,7 +128,7 @@ private: OUString sAutomaticEntry; - Window* pLastActivWindow; + vcl::Window* pLastActivWindow; void Init_Impl(); void FillCurrencyBox(); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 5ead54c2c0bc..83987766ba73 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -38,7 +38,7 @@ class SvxBmpNumValueSet; class SvxNumValueSet; class SvxBrushItem; -class SvxNumberingPreview : public Window +class SvxNumberingPreview : public vcl::Window { const SvxNumRule* pActNum; vcl::Font aStdFont; @@ -51,7 +51,7 @@ class SvxNumberingPreview : public Window virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - SvxNumberingPreview(Window* pParent, WinBits nWinBits = WB_BORDER); + SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits = WB_BORDER); void SetNumRule(const SvxNumRule* pNum) {pActNum = pNum; Invalidate();}; @@ -106,11 +106,11 @@ class SvxSingleNumPickTabPage : public SfxTabPage DECL_LINK(DoubleClickHdl_Impl, void *); public: - SvxSingleNumPickTabPage(Window* pParent, + SvxSingleNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxSingleNumPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -142,11 +142,11 @@ class SvxBulletPickTabPage : public SfxTabPage DECL_LINK(NumSelectHdl_Impl, void *); DECL_LINK(DoubleClickHdl_Impl, void *); public: - SvxBulletPickTabPage(Window* pParent, + SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxBulletPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -185,11 +185,11 @@ class SvxNumPickTabPage : public SfxTabPage DECL_LINK(DoubleClickHdl_Impl, void *); public: - SvxNumPickTabPage(Window* pParent, + SvxNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -230,11 +230,11 @@ class SvxBitmapPickTabPage : public SfxTabPage DECL_LINK(LinkBmpHdl_Impl, void *); public: - SvxBitmapPickTabPage(Window* pParent, + SvxBitmapPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxBitmapPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -342,11 +342,11 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_STATIC_LINK( SvxNumOptionsTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* ); public: - SvxNumOptionsTabPage(Window* pParent, + SvxNumOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -445,7 +445,7 @@ class SvxNumPositionTabPage : public SfxTabPage DECL_LINK( IndentAtHdl_Impl, MetricField* ); public: - SvxNumPositionTabPage(Window* pParent, + SvxNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumPositionTabPage(); @@ -454,7 +454,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetMetric(FieldUnit eSet); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index be965554cfcc..d2d182420783 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -52,12 +52,12 @@ class SvxAsianLayoutPage : public SfxTabPage DECL_LINK(ChangeStandardHdl, CheckBox*); DECL_LINK(ModifyHdl, Edit*); - SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ); + SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~SvxAsianLayoutPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 4e0a5779b2da..e26a4b37f253 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -63,7 +63,7 @@ private: DECL_LINK(ModifyHdl_Impl, void *); public: - SvxNewDictionaryDialog( Window* pParent, + SvxNewDictionaryDialog( vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ); @@ -80,9 +80,9 @@ class SvxDictEdit : public Edit bool bSpaces; public: - SvxDictEdit(Window* pParent, const ResId& rResId) : + SvxDictEdit(vcl::Window* pParent, const ResId& rResId) : Edit(pParent, rResId), bSpaces(false){} - SvxDictEdit(Window* pParent, WinBits aWB) : + SvxDictEdit(vcl::Window* pParent, WinBits aWB) : Edit(pParent, aWB), bSpaces(false){} void SetActionHdl( const Link& rLink ) @@ -148,7 +148,7 @@ protected: // virtual void Paint( const Rectangle& rRect ); public: - SvxEditDictionaryDialog( Window* pParent, + SvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl ); diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 8d31b7b3fb18..0a914642a354 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -84,7 +84,7 @@ class SvxEditModulesDlg : public ModalDialog DECL_LINK(OpenURLHdl_Impl, void *); public: - SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData); + SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData); virtual ~SvxEditModulesDlg(); }; @@ -130,7 +130,7 @@ private: SvxLinguData_Impl* pLinguData; - SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet ); + SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); @@ -148,7 +148,7 @@ private: public: virtual ~SvxLinguTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 0d4de78e4e61..8db65294ce6d 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -69,10 +69,10 @@ private: const OUString& _rUserPath, const OUString& _rWritablePath ); public: - SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxPathTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxPathTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index dcbdc212807f..d95220e13a15 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -178,7 +178,7 @@ private: void CheckMarginEdits( bool _bClear ); bool IsMarginOutOfRange(); - SvxPageDescPage( Window* pParent, const SfxItemSet& rSet ); + SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rSet ); //UUUU void EnableDrawingLayerFillStyles(bool bNew) { mbEnableDrawingLayerFillStyles = bNew; } @@ -188,7 +188,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 08a370acd4ef..4209e04339a6 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -48,7 +48,7 @@ class SvxStdParagraphTabPage: public SfxTabPage using TabPage::DeactivatePage; private: - SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // indention SvxRelativeField* m_pLeftIndent; @@ -99,7 +99,7 @@ protected: public: DECL_LINK(ELRLoseFocusHdl, void *); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -153,14 +153,14 @@ class SvxParaAlignTabPage : public SfxTabPage void UpdateExample_Impl( bool bAll = false ); - SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxParaAlignTabPage(); protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -191,7 +191,7 @@ class SvxExtParagraphTabPage: public SfxTabPage public: virtual ~SvxExtParagraphTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); @@ -204,7 +204,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: - SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // hyphenation TriStateBox* m_pHyphenBox; @@ -263,7 +263,7 @@ class SvxAsianTabPage : public SfxTabPage CheckBox* m_pHangingPunctCB; CheckBox* m_pScriptSpaceCB; - SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); DECL_LINK( ClickHdl_Impl, CheckBox* ); @@ -271,7 +271,7 @@ public: virtual ~SvxAsianTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index c201c5f8f55a..1fe8c58551f8 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -37,7 +37,7 @@ class PasswordToOpenModifyDialog : public SfxModalDialog PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ); public: - PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, + PasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */, bool bIsPasswordToModify ); virtual ~PasswordToOpenModifyDialog(); diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index a667ae5c914a..c7b815f764cb 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -54,7 +54,7 @@ class SvPasteObjectDialog : public ModalDialog DECL_LINK( DoubleClickHdl, ListBox * ); public: - SvPasteObjectDialog( Window* pParent ); + SvPasteObjectDialog( vcl::Window* pParent ); virtual ~SvPasteObjectDialog(); void Insert( SotFormatStringId nFormat, const OUString & rFormatName ); diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 1f0f200cdfe2..624649689e6a 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -43,7 +43,7 @@ class SvxPostItDialog : public SfxModalDialog { public: - SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, + SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext = false); virtual ~SvxPostItDialog(); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index f51c2f6dd365..3b7240675e13 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -75,7 +75,7 @@ public: void Init( const OUString& language ); void RequestSubEntries( SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model ); - SFTreeListBox(Window* pParent); + SFTreeListBox(vcl::Window* pParent); virtual ~SFTreeListBox(); void ExpandAllTrees(); @@ -100,7 +100,7 @@ class CuiInputDialog : public ModalDialog private: Edit* m_pEdit; public: - CuiInputDialog(Window * pParent, sal_uInt16 nMode); + CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode); OUString GetObjectName() const { return m_pEdit->GetText(); } void SetObjectName(const OUString& rName) @@ -177,7 +177,7 @@ protected: public: // prob need another arg in the ctor // to specify the language or provider - SvxScriptOrgDialog( Window* pParent, const OUString& language ); + SvxScriptOrgDialog( vcl::Window* pParent, const OUString& language ); virtual ~SvxScriptOrgDialog(); virtual short Execute() SAL_OVERRIDE; @@ -195,7 +195,7 @@ private: public: SvxScriptErrorDialog( - Window* parent, ::com::sun::star::uno::Any aException ); + vcl::Window* parent, ::com::sun::star::uno::Any aException ); virtual ~SvxScriptErrorDialog(); diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx index bcae0d840c38..66080975ca5d 100644 --- a/cui/source/inc/sdrcelldlg.hxx +++ b/cui/source/inc/sdrcelldlg.hxx @@ -42,7 +42,7 @@ protected: virtual void Apply(); public: - SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ); + SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ); virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 3f4c1f211a2d..b22b85e30f30 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -100,7 +100,7 @@ friend class SvxConfigGroupListBox; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: - SvxConfigFunctionListBox(Window* pParent, WinBits nStyle); + SvxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SvxConfigFunctionListBox(); void ClearAll(); OUString GetHelpText( SvTreeListEntry *pEntry ); @@ -160,7 +160,7 @@ protected: virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE; public: - SvxConfigGroupListBox(Window* pParent, WinBits nStyle); + SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SvxConfigGroupListBox(); void Init(bool bShowSlots, const ::com::sun::star::uno::Reference @@ -198,7 +198,7 @@ class SvxScriptSelectorDialog : public ModelessDialog public: SvxScriptSelectorDialog ( - Window* pParent = NULL, + vcl::Window* pParent = NULL, bool bShowSlots = false, const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >& xFrame = 0 diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index d43868a4f5da..dceddb7e3a00 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -41,7 +41,7 @@ class FmShowColsDialog : public ModalDialog ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xColumns; public: - FmShowColsDialog(Window* pParent); + FmShowColsDialog(vcl::Window* pParent); void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols); diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index 94c3b983f985..212559f32968 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -39,7 +39,7 @@ protected: virtual void Apply() SAL_OVERRIDE; public: - SvxSplitTableDlg(Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); + SvxSplitTableDlg(vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); virtual ~SvxSplitTableDlg(); DECL_LINK( ClickHdl, Button * ); diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index c81a79d86003..0965484c9c45 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -29,7 +29,7 @@ class SvxSearchFormatDialog : public SfxTabDialog { public: - SvxSearchFormatDialog( Window* pParent, const SfxItemSet& rSet ); + SvxSearchFormatDialog( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSearchFormatDialog(); protected: @@ -48,7 +48,7 @@ private: class SvxSearchAttributeDialog : public ModalDialog { public: - SvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst, + SvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges ); private: @@ -71,7 +71,7 @@ private: CheckBox* m_pRelaxBox; public: - SvxSearchSimilarityDialog( Window* pParent, + SvxSearchSimilarityDialog( vcl::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 315fb57654a4..94f34aa489ac 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -122,10 +122,10 @@ class SvxSwPosSizeTabPage : public SfxTabPage void setOptimalRelWidth(); public: - SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxSwPosSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxSwPosSizeTabPage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index e5b64a687335..c5bf5475bdf8 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -50,7 +50,7 @@ class SvxTabulatorTabPage : public SfxTabPage public: virtual ~SvxTabulatorTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -62,7 +62,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: - SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // tabulators and positions MetricBox* m_pTabBox; diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index f043b8583c97..2981c4ae8005 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -73,10 +73,10 @@ private: sal_uInt16 GetSelectedDirection(); public: - SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ); + SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxTextAnimationPage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -101,7 +101,7 @@ private: public: - SvxTextTabDialog( Window* pParent, const SfxItemSet* pAttr, + SvxTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView ); virtual ~SvxTextTabDialog() {}; }; diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 1cac8d762b6a..4f67dbfb902f 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -74,16 +74,16 @@ private: public: - SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ); + SvxTextAttrPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxTextAttrPage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 4ab94e7c2bd6..95e712c2af6e 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -42,7 +42,7 @@ class LookUpComboBox : public ComboBox LookUpComboBox& operator = ( const LookUpComboBox & ); public: - LookUpComboBox(Window *pParent); + LookUpComboBox(vcl::Window *pParent); virtual ~LookUpComboBox(); DECL_LINK( ModifyTimer_Hdl, Timer * ); @@ -83,7 +83,7 @@ class ThesaurusAlternativesCtrl ThesaurusAlternativesCtrl & operator = ( const ThesaurusAlternativesCtrl & ); public: - ThesaurusAlternativesCtrl(Window* pParent); + ThesaurusAlternativesCtrl(vcl::Window* pParent); void init(SvxThesaurusDialog *pDialog); virtual ~ThesaurusAlternativesCtrl(); @@ -108,7 +108,7 @@ class ReplaceEdit : public Edit ReplaceEdit & operator = ( const ReplaceEdit & ); public: - ReplaceEdit(Window *pParent); + ReplaceEdit(vcl::Window *pParent); virtual ~ReplaceEdit(); void init(Button *pBtn) { m_pBtn = pBtn; } @@ -159,7 +159,7 @@ public: virtual void Apply() SAL_OVERRIDE; public: - SvxThesaurusDialog( Window* pParent, + SvxThesaurusDialog( vcl::Window* pParent, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, const OUString &rWord, LanguageType nLanguage ); virtual ~SvxThesaurusDialog(); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 6e388159673a..f4f692593fe1 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -59,7 +59,7 @@ private: public: - SvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr, + SvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, sal_uInt16 nAnchorTypes = 0); virtual ~SvxTransformTabDialog(); @@ -145,9 +145,9 @@ private: void SetMaxSize( Rectangle aRect ); public: - SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -156,7 +156,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { mpView = pSdrView; } @@ -200,9 +200,9 @@ private: FieldUnit eDlgUnit; public: - SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxAngleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -211,7 +211,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } @@ -244,9 +244,9 @@ private: FieldUnit eDlgUnit; public: - SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxSlantTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -255,7 +255,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 447723d3ebb5..ac2d360734e6 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -196,10 +196,10 @@ protected: virtual short Execute() SAL_OVERRIDE; public: - OfaTreeOptionsDialog( Window* pParent, + OfaTreeOptionsDialog( vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame, bool bActivateLastSelection = true ); - OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId ); + OfaTreeOptionsDialog( vcl::Window* pParent, const OUString& rExtensionId ); virtual ~OfaTreeOptionsDialog(); OptionsPageInfo* AddTabPage( sal_uInt16 nId, const OUString& rPageName, sal_uInt16 nGroup ); @@ -272,7 +272,7 @@ private: public: ExtensionsTabPage( - Window* pParent, WinBits nStyle, + vcl::Window* pParent, WinBits nStyle, const OUString& rPageURL, const OUString& rEvtHdl, const com::sun::star::uno::Reference< com::sun::star::awt::XContainerWindowProvider >& rProvider ); diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 64c46b53ac42..a8b3176ddb56 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -55,7 +55,7 @@ private: DECL_LINK( OKHdl, Button* ); public: - SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ); + SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~SvxZoomDialog(); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 2d55e4ed9bc5..a31c25211a50 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star; -CertPathDialog::CertPathDialog(Window* pParent) +CertPathDialog::CertPathDialog(vcl::Window* pParent) : ModalDialog(pParent, "CertDialog", "cui/ui/certdialog.ui") { get(m_pOKBtn, "ok"); diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index aa2128e29738..bdc083c987d8 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -33,7 +33,7 @@ private: void HandleCheckEntry(SvTreeListEntry* _pEntry); void AddCertPath(const OUString &rProfile, const OUString &rPath); public: - CertPathDialog(Window* pParent); + CertPathDialog(vcl::Window* pParent); virtual ~CertPathDialog(); OUString getDirectory() const; diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 9adf2b546413..dd73fb46be9f 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -45,7 +45,7 @@ namespace offapp Link m_aRowChangeHandler; public: - DriverListControl(Window* _pParent); + DriverListControl(vcl::Window* _pParent); virtual void Init() SAL_OVERRIDE; void Update(const DriverPoolingSettings& _rSettings); @@ -87,7 +87,7 @@ namespace offapp }; - DriverListControl::DriverListControl(Window* _pParent) + DriverListControl::DriverListControl(vcl::Window* _pParent) :EditBrowseBox(_pParent, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL | WB_BORDER) ,m_aSeekRow(m_aSettings.end()) ,m_sYes(CUI_RES(RID_SVXSTR_YES)) @@ -98,7 +98,7 @@ namespace offapp SetUniqueId(UID_OFA_CONNPOOL_DRIVERLIST_BACK); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDriverListControl(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDriverListControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new DriverListControl(pParent); } @@ -300,7 +300,7 @@ namespace offapp //= ConnectionPoolOptionsPage - ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet) + ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet) : SfxTabPage(_pParent, "ConnPoolPage", "cui/ui/connpooloptions.ui", &_rAttrSet) { get(m_pEnablePooling, "connectionpooling"); @@ -326,7 +326,7 @@ namespace offapp } - SfxTabPage* ConnectionPoolOptionsPage::Create(Window* _pParent, const SfxItemSet* _rAttrSet) + SfxTabPage* ConnectionPoolOptionsPage::Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet) { return new ConnectionPoolOptionsPage(_pParent, *_rAttrSet); } diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index f865438cf50b..868c42702a16 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -48,10 +48,10 @@ namespace offapp NumericField* m_pTimeout; protected: - ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet); + ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet); public: - static SfxTabPage* Create(Window* _pParent, const SfxItemSet* _rAttrSet); + static SfxTabPage* Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet); protected: virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index eb552d63ef9a..ef45114ddc09 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -47,7 +47,7 @@ // class SvxJSearchOptionsDialog ----------------------------------------- -SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(Window *pParent, +SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags) : SfxSingleTabDialog(pParent, rOptionsSet) , nInitialTlFlags( nInitialFlags ) diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 303a7b570183..0258322d67fe 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -74,7 +74,7 @@ RegistrationItemSetHolder::~RegistrationItemSetHolder() // class DatabaseRegistrationDialog ------------------------------------------------ -DatabaseRegistrationDialog::DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rInAttrs ) +DatabaseRegistrationDialog::DatabaseRegistrationDialog( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : RegistrationItemSetHolder(rInAttrs) , SfxSingleTabDialog(pParent, getRegistrationItems()) { @@ -101,7 +101,7 @@ short DatabaseRegistrationDialog::Execute() // class DbRegistrationOptionsPage -------------------------------------------------- -DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ) : +DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "DbRegisterPage", "cui/ui/dbregisterpage.ui", &rSet ), @@ -174,7 +174,7 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage() -SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent, +SfxTabPage* DbRegistrationOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new DbRegistrationOptionsPage( pParent, *rAttrSet ) ); diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index ad1ba1fd97c3..068f361ce61d 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -43,7 +43,7 @@ namespace svx //= ODocumentLinkDialog - ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, bool _bCreateNew ) + ODocumentLinkDialog::ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew ) : ModalDialog(_pParent, "DatabaseLinkDialog", "cui/ui/databaselinkdialog.ui") ,m_bCreatingNew(_bCreateNew) diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index d14566902e3c..0584734b761d 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -50,7 +50,7 @@ namespace svx Link m_aNameValidator; public: - ODocumentLinkDialog( Window* _pParent, bool _bCreateNew ); + ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew ); // name validation has to be done by an external instance // the validator link gets a pointer to a String, and should return 0 if the string is not diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 96014db525ea..4668b48f1508 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -36,7 +36,7 @@ /* */ /*********************************************************************/ -SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, +SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptFontsPage", "cui/ui/optfontspage.ui", &rSet) , pConfig(new SvtFontSubstConfig) @@ -143,7 +143,7 @@ SvxFontSubstTabPage::~SvxFontSubstTabPage() delete m_pCheckLB; } -SfxTabPage* SvxFontSubstTabPage::Create( Window* pParent, +SfxTabPage* SvxFontSubstTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxFontSubstTabPage(pParent, *rAttrSet); @@ -238,7 +238,7 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet* ) m_pFontHeightLB->SaveValue(); } -IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) +IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin) { if (pWin == m_pApply || pWin == m_pDelete) { diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 91f87d74e9cd..d73e2b0f9926 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -84,18 +84,18 @@ class SvxFontSubstTabPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; - DECL_LINK(SelectHdl, Window *pWin = 0); + DECL_LINK(SelectHdl, vcl::Window *pWin = 0); DECL_LINK(NonPropFontsHdl, CheckBox* pBox); SvTreeListEntry* CreateEntry(OUString& rFont1, OUString& rFont2); void CheckEnable(); - SvxFontSubstTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxFontSubstTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxFontSubstTabPage(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 2baf4f9e6a7d..d16723e130b8 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -56,7 +56,7 @@ struct Prop_Impl {} }; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCuiCustomMultilineEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCuiCustomMultilineEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new CuiCustomMultilineEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); } @@ -124,7 +124,7 @@ Size CuiCustomMultilineEdit::GetOptimalSize() const return LogicToPixel(Size(150, GetTextHeight()), MAP_APPFONT); } -CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent/*, const SfxItemSet& rItemSet*/ ) : +CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxItemSet& rItemSet*/ ) : ModelessDialog( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui"), m_pPrefCtrl( get<SvSimpleTableContainer>("preferences") ), m_pResetBtn( get<PushButton>("reset") ), @@ -456,7 +456,7 @@ std::vector< OUString > CuiAboutConfigTabPage::commaStringToSequence( const OUSt return tempVector; } -CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( Window* pWindow, +CuiAboutConfigValueDialog::CuiAboutConfigValueDialog( vcl::Window* pWindow, const OUString& rValue, int limit ) : ModalDialog( pWindow, "AboutConfigValueDialog", "cui/ui/aboutconfigvaluedialog.ui" ), diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index e848cc427bff..4714cb2e01e5 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -30,7 +30,7 @@ class CuiCustomMultilineEdit : public Edit { public: bool bNumericOnly; - CuiCustomMultilineEdit( Window* pParent, WinBits nStyle ) + CuiCustomMultilineEdit( vcl::Window* pParent, WinBits nStyle ) : Edit( pParent, nStyle ) , bNumericOnly(false) {} @@ -56,7 +56,7 @@ private: DECL_LINK( ResetBtnHdl_Impl, void * ); public: - CuiAboutConfigTabPage(Window* pParent); + CuiAboutConfigTabPage(vcl::Window* pParent); void InsertEntry(const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue); void Reset(); void FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess); @@ -70,7 +70,7 @@ private: CuiCustomMultilineEdit* m_pEDValue; public: - CuiAboutConfigValueDialog( Window* pWindow, const OUString& rValue , int limit = 0); + CuiAboutConfigValueDialog( vcl::Window* pWindow, const OUString& rValue , int limit = 0); OUString getValue() { diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx index f63e7aee11b0..ea94d53b95d6 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -31,7 +31,7 @@ struct SvxAccessibilityOptionsTabPage_Impl : m_aConfig(){} }; -SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(Window* pParent, +SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptAccessibilityPage", "cui/ui/optaccessibilitypage.ui", &rSet) @@ -61,7 +61,7 @@ SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage() delete m_pImpl; } -SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxAccessibilityOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxAccessibilityOptionsTabPage(pParent, *rAttrSet); } diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index c25316008654..c63c37dac682 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -40,12 +40,12 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage SvxAccessibilityOptionsTabPage_Impl* m_pImpl; - SvxAccessibilityOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxAccessibilityOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~SvxAccessibilityOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 9877760e70d0..2a2336afd9d1 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -121,7 +121,7 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters( static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX; -SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) : +SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptAsianPage", "cui/ui/optasianpage.ui", &rSet), pImpl(new SvxAsianLayoutPage_Impl) { @@ -154,7 +154,7 @@ SvxAsianLayoutPage::~SvxAsianLayoutPage() delete pImpl; } -SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxAsianLayoutPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxAsianLayoutPage(pParent, *rAttrSet); } diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 826ac04c4706..db24702e6124 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -25,7 +25,7 @@ #include <boost/shared_ptr.hpp> #include <cuires.hrc> -SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet ) +SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", &rSet) { SvtMiscOptions aMiscOpt; @@ -136,7 +136,7 @@ void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) pUseExtendedTypesChk->SaveValue(); } -SfxTabPage* SvxBasicIDEOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxBasicIDEOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxBasicIDEOptionsPage( pParent, *rAttrSet ) ); } diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx index a843a4eb4925..5b1959d9f5a6 100644 --- a/cui/source/options/optbasic.hxx +++ b/cui/source/options/optbasic.hxx @@ -37,10 +37,10 @@ private: void LoadConfig(); public: - SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet ); + SvxBasicIDEOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxBasicIDEOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index ac3d5a2df736..c8bbffd2f621 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -39,7 +39,7 @@ namespace } } -SvxDefaultColorOptPage::SvxDefaultColorOptPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxDefaultColorOptPage::SvxDefaultColorOptPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "OptChartColorsPage","cui/ui/optchartcolorspage.ui", &rInAttrs) { get(m_pPBRemove, "delete"); @@ -103,7 +103,7 @@ void SvxDefaultColorOptPage::Construct() } -SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet* rAttrs ) +SfxTabPage* SvxDefaultColorOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs ) { return new SvxDefaultColorOptPage( pParent, *rAttrs ); } diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 610e29743208..0f210e1ccd15 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -53,12 +53,12 @@ private: long GetColorIndex( const Color& rCol ); public: - SvxDefaultColorOptPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxDefaultColorOptPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxDefaultColorOptPage(); void Construct(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rInAttrs ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 2bf8b38bd8fb..cf749f635df4 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -173,7 +173,7 @@ class ColorConfigWindow_Impl , public VclBuilderContainer { public: - ColorConfigWindow_Impl(Window* pParent); + ColorConfigWindow_Impl(vcl::Window* pParent); virtual ~ColorConfigWindow_Impl(); public: @@ -196,7 +196,7 @@ private: FixedText *m_pText; public: Chapter(FixedText *pText, bool bShow); - Chapter(Window *pGrid, unsigned nYPos, const OUString& sDisplayName); + Chapter(vcl::Window *pGrid, unsigned nYPos, const OUString& sDisplayName); ~Chapter(); public: void SetBackground(const Wallpaper& W) { m_pText->SetBackground(W); } @@ -210,7 +210,7 @@ private: { public: Entry(ColorConfigWindow_Impl& rParent, unsigned iEntry, long nCheckBoxLabelOffset, bool bShow); - Entry(Window* pGrid, unsigned nYPos, const ExtendedColorConfigValue& aColorEntry, + Entry(vcl::Window* pGrid, unsigned nYPos, const ExtendedColorConfigValue& aColorEntry, long nCheckBoxLabelOffset); ~Entry(); public: @@ -238,7 +238,7 @@ private: // color list box ColorListBox* m_pColorList; // color preview box - Window* m_pPreview; + vcl::Window* m_pPreview; // default color Color m_aDefaultColor; private: @@ -290,7 +290,7 @@ ColorConfigWindow_Impl::Chapter::Chapter(FixedText* pText, bool bShow) } // ctor for extended groups -ColorConfigWindow_Impl::Chapter::Chapter(Window *pGrid, +ColorConfigWindow_Impl::Chapter::Chapter(vcl::Window *pGrid, unsigned nYPos, const OUString& rDisplayName) : m_bOwnsWidget(true) { @@ -343,7 +343,7 @@ ColorConfigWindow_Impl::Entry::Entry(ColorConfigWindow_Impl& rParent, unsigned i } // ctor for extended entries -ColorConfigWindow_Impl::Entry::Entry( Window *pGrid, unsigned nYPos, +ColorConfigWindow_Impl::Entry::Entry( vcl::Window *pGrid, unsigned nYPos, ExtendedColorConfigValue const& rColorEntry, long nCheckBoxLabelOffset) : m_bOwnsWidgets(true) , m_aDefaultColor(rColorEntry.getDefaultColor()) @@ -360,7 +360,7 @@ ColorConfigWindow_Impl::Entry::Entry( Window *pGrid, unsigned nYPos, m_pColorList->set_grid_left_attach(1); m_pColorList->set_grid_top_attach(nYPos); - m_pPreview = new Window(pGrid, WB_BORDER); + m_pPreview = new vcl::Window(pGrid, WB_BORDER); m_pPreview->set_grid_left_attach(2); m_pPreview->set_grid_top_attach(nYPos); m_pPreview->set_margin_right(6); @@ -500,7 +500,7 @@ void ColorConfigWindow_Impl::Entry::SetColor (Color aColor) // ColorConfigWindow_Impl -ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent) +ColorConfigWindow_Impl::ColorConfigWindow_Impl(vcl::Window* pParent) : VclContainer(pParent) { m_pUIBuilder = new VclBuilder(this, getUIRootDir(), "cui/ui/colorconfigwin.ui"); @@ -646,9 +646,9 @@ void ColorConfigWindow_Impl::AdjustHeaderBar() { // horizontal positions unsigned const nX0 = 0; - unsigned const nX1 = get<Window>("doccolor")->GetPosPixel().X(); - unsigned const nX2 = get<Window>("doccolor_lb")->GetPosPixel().X(); - unsigned const nX3 = get<Window>("doccolor_wn")->GetPosPixel().X(); + unsigned const nX1 = get<vcl::Window>("doccolor")->GetPosPixel().X(); + unsigned const nX2 = get<vcl::Window>("doccolor_lb")->GetPosPixel().X(); + unsigned const nX3 = get<vcl::Window>("doccolor_wn")->GetPosPixel().X(); unsigned const nX4 = m_pHeaderHB->GetSizePixel().Width(); m_pHeaderHB->SetItemSize(1, nX1 - nX0); m_pHeaderHB->SetItemSize(2, nX2 - nX1); @@ -840,7 +840,7 @@ class ColorConfigCtrl_Impl : public VclVBox virtual void Command (CommandEvent const& rCEvt) SAL_OVERRIDE; virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE; public: - ColorConfigCtrl_Impl(Window* pParent); + ColorConfigCtrl_Impl(vcl::Window* pParent); virtual ~ColorConfigCtrl_Impl(); void InitHeaderBar(const OUString &rOn, const OUString &rUIElems, @@ -859,7 +859,7 @@ public: } }; -ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(Window* pParent) +ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent) : VclVBox(pParent) , pColorConfig(0) , pExtColorConfig(0) @@ -916,7 +916,7 @@ ColorConfigCtrl_Impl::~ColorConfigCtrl_Impl() delete m_pHeaderHB; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorConfigCtrl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorConfigCtrl(vcl::Window *pParent, VclBuilder::stringmap &) { return new ColorConfigCtrl_Impl(pParent); } @@ -1030,7 +1030,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl) SvxColorOptionsTabPage::SvxColorOptionsTabPage( - Window* pParent, const SfxItemSet& rCoreSet) + vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "OptAppearancePage", "cui/ui/optappearancepage.ui", &rCoreSet) , bFillItemSetCalled(false) , pColorConfig(0) @@ -1043,10 +1043,10 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage( get(m_pColorConfigCT, "colorconfig"); m_pColorConfigCT->InitHeaderBar( - get<Window>("on")->GetText(), - get<Window>("uielements")->GetText(), - get<Window>("colorsetting")->GetText(), - get<Window>("preview")->GetText()); + get<vcl::Window>("on")->GetText(), + get<vcl::Window>("uielements")->GetText(), + get<vcl::Window>("colorsetting")->GetText(), + get<vcl::Window>("preview")->GetText()); m_pColorSchemeLB->SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl)); Link aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl ); @@ -1075,7 +1075,7 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage() delete pExtColorConfig; } -SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxColorOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxColorOptionsTabPage( pParent, *rAttrSet ) ); } diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index d19c6c628875..509d9f13ab7a 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -47,10 +47,10 @@ class SvxColorOptionsTabPage : public SfxTabPage void UpdateColorConfig(); public: - SvxColorOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxColorOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxColorOptionsTabPage( ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index 92ff2a7b81e6..45430195bc94 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -38,7 +38,7 @@ IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl) return 0; } -SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ) : +SvxCTLOptionsPage::SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "OptCTLPage", "cui/ui/optctlpage.ui", &rSet ) @@ -61,7 +61,7 @@ SvxCTLOptionsPage::~SvxCTLOptionsPage() { } -SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxCTLOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxCTLOptionsPage( pParent, *rAttrSet ); } diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index b61cf56bc3c9..3ab62ad2c09d 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -41,13 +41,13 @@ private: DECL_LINK( SequenceCheckingCB_Hdl, void* ); - SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet ); + SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~SvxCTLOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index f7ca6510f43f..a214b5952507 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -95,7 +95,7 @@ static CDE_RESULT cmpDicEntry_Impl( const OUString &rText1, const OUString &rTex // class SvxNewDictionaryDialog ------------------------------------------- -SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent, +SvxNewDictionaryDialog::SvxNewDictionaryDialog( vcl::Window* pParent, Reference< XSpellChecker1 > &xSpl ) : ModalDialog( pParent, "OptNewDictionaryDialog" , "cui/ui/optnewdictionarydialog.ui" ), @@ -208,7 +208,7 @@ IMPL_LINK_NOARG_INLINE_END(SvxNewDictionaryDialog, ModifyHdl_Impl) -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxDictEdit(Window *pParent, VclBuilder::stringmap&) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxDictEdit(vcl::Window *pParent, VclBuilder::stringmap&) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK; SvxDictEdit *pEdit = new SvxDictEdit(pParent, nWinStyle); @@ -216,7 +216,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxDictEdit(Window *pParent }; SvxEditDictionaryDialog::SvxEditDictionaryDialog( - Window* pParent, + vcl::Window* pParent, const OUString& rName, Reference< XSpellChecker1 > &xSpl ) : diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 1749c0ae84e0..7170a7cfd926 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -38,7 +38,7 @@ enum MSFltrPg2_CheckBoxEntries { -OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet) +OfaMSFilterTabPage::OfaMSFilterTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, "OptFltrPage", "cui/ui/optfltrpage.ui", &rSet ) { get( aWBasicCodeCB , "wo_basic" ); @@ -70,7 +70,7 @@ IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl) return 0; } -SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent, +SfxTabPage* OfaMSFilterTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaMSFilterTabPage( pParent, *rAttrSet ); @@ -128,7 +128,7 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet* ) aPBasicStgCB->SaveValue(); } -OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ) : +OfaMSFilterTabPage2::OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "OptFilterPage", "cui/ui/optfltrembedpage.ui", &rSet ), sHeader1(CUI_RES(RID_SVXSTR_HEADER1)), sHeader2(CUI_RES(RID_SVXSTR_HEADER2)), @@ -163,7 +163,7 @@ OfaMSFilterTabPage2::~OfaMSFilterTabPage2() delete m_pCheckLB; } -SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent, +SfxTabPage* OfaMSFilterTabPage2::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaMSFilterTabPage2( pParent, *rAttrSet ); diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 0f4ed12634c1..d5e43d323ec0 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -36,14 +36,14 @@ class OfaMSFilterTabPage : public SfxTabPage CheckBox* aPBasicCodeCB; CheckBox* aPBasicStgCB; - OfaMSFilterTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaMSFilterTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage(); DECL_LINK(LoadWordBasicCheckHdl_Impl, void *); DECL_LINK(LoadExcelBasicCheckHdl_Impl, void *); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -83,7 +83,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage sChgToFromSmartArt; SvLBoxButtonData* pCheckButtonData; - OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSet ); + OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage2(); void InsertEntry( const OUString& _rTxt, sal_IntPtr _nType ); @@ -93,7 +93,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index e6d07105012a..f45b4a4dca44 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -183,7 +183,7 @@ namespace -OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet) +OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", &rSet) { get(m_pToolTipsCB, "tooltips"); @@ -236,7 +236,7 @@ OfaMiscTabPage::~OfaMiscTabPage() -SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaMiscTabPage( pParent, *rAttrSet ); } @@ -535,7 +535,7 @@ void CanvasSettings::EnabledHardwareAcceleration( bool _bEnabled ) const // class OfaViewTabPage -------------------------------------------------- -OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) +OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", &rSet) , nSizeLB_InitialSelection(0) , nStyleLB_InitialSelection(0) @@ -647,7 +647,7 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN ) return 0; } -SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* OfaViewTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaViewTabPage(pParent, *rAttrSet); } @@ -839,7 +839,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) if(bRepaintWindows) { - Window* pAppWindow = Application::GetFirstTopLevelWindow(); + vcl::Window* pAppWindow = Application::GetFirstTopLevelWindow(); while(pAppWindow) { @@ -997,7 +997,7 @@ static OUString lcl_getDatePatternsConfigString( const LocaleDataWrapper& rLocal return aBuf.makeStringAndClear(); } -OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) : +OfaLanguagesTabPage::OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent,"OptLanguagesPage","cui/ui/optlanguagespage.ui", &rSet ), pLangConfig(new LanguageConfig_Impl) { @@ -1149,7 +1149,7 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage() delete pLangConfig; } -SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* OfaLanguagesTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaLanguagesTabPage(pParent, *rAttrSet); } diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 9610eff0e89a..f559a0c00a03 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -65,10 +65,10 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: - OfaMiscTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaMiscTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMiscTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -120,10 +120,10 @@ private: DECL_LINK( OnSelectionToggled, void* ); public: - OfaViewTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaViewTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaViewTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -164,10 +164,10 @@ class OfaLanguagesTabPage : public SfxTabPage DECL_LINK( DatePatternsHdl, Edit* ) ; public: - OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaLanguagesTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaLanguagesTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 20303de88311..1408274a7643 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -209,7 +209,7 @@ public: -SvxGeneralTabPage::SvxGeneralTabPage(Window* pParent, const SfxItemSet& rCoreSet) +SvxGeneralTabPage::SvxGeneralTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "OptUserPage", "cui/ui/optuserpage.ui", &rCoreSet) { @@ -296,7 +296,7 @@ void SvxGeneralTabPage::SetLinks () -SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxGeneralTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxGeneralTabPage( pParent, *rAttrSet ) ); } diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 0f3d5125dc03..b95873784cd0 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -42,7 +42,7 @@ const sal_uInt16 aExportToPosArr[] = }; -OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) : +OfaHtmlTabPage::OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", &rSet ) { get(aSize1NF,"size1"); @@ -88,7 +88,7 @@ OfaHtmlTabPage::~OfaHtmlTabPage() { } -SfxTabPage* OfaHtmlTabPage::Create( Window* pParent, +SfxTabPage* OfaHtmlTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaHtmlTabPage(pParent, *rAttrSet); diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 14052496703f..c79e2393e831 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -52,11 +52,11 @@ class OfaHtmlTabPage : public SfxTabPage DECL_LINK(ExportHdl_Impl, ListBox*); DECL_LINK(CheckBoxHdl_Impl, CheckBox*); - OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet); + OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~OfaHtmlTabPage(); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 760d1ceb94a6..49e6ff064f51 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -96,7 +96,7 @@ using namespace ::sfx2; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNoSpaceEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNoSpaceEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxNoSpaceEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); } @@ -152,7 +152,7 @@ bool SvxNoSpaceEdit::set_property(const OString &rKey, const OString &rValue) /* */ /********************************************************************/ -SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet) +SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptProxyPage","cui/ui/optproxypage.ui", &rSet) , aProxyModePN("ooInetProxyType") , aHttpProxyPN("ooInetHTTPProxyName") @@ -214,7 +214,7 @@ SvxProxyTabPage::~SvxProxyTabPage() { } -SfxTabPage* SvxProxyTabPage::Create(Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxProxyTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxProxyTabPage(pParent, *rAttrSet); } @@ -574,7 +574,7 @@ void SvxScriptExecListBox::RequestHelp( const HelpEvent& rHEvt ) /* */ /********************************************************************/ -SvxSecurityTabPage::SvxSecurityTabPage(Window* pParent, const SfxItemSet& rSet) +SvxSecurityTabPage::SvxSecurityTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptSecurityPage", "cui/ui/optsecuritypage.ui", &rSet) , mpSecOptions(new SvtSecurityOptions) , mpSecOptDlg(NULL) @@ -853,7 +853,7 @@ void SvxSecurityTabPage::InitControls() } } -SfxTabPage* SvxSecurityTabPage::Create(Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxSecurityTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxSecurityTabPage(pParent, *rAttrSet); } @@ -1018,7 +1018,7 @@ struct SvxEMailTabPage_Impl MailerProgramCfg_Impl aMailConfig; }; -SvxEMailTabPage::SvxEMailTabPage(Window* pParent, const SfxItemSet& rSet) +SvxEMailTabPage::SvxEMailTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, "OptEmailPage", "cui/ui/optemailpage.ui", &rSet) , pImpl(new SvxEMailTabPage_Impl) { @@ -1039,7 +1039,7 @@ SvxEMailTabPage::~SvxEMailTabPage() /* -------------------------------------------------------------------------*/ -SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxEMailTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxEMailTabPage(pParent, *rAttrSet); } diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 4182f76efd02..c7d81b756f12 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -43,7 +43,7 @@ class SvxNoSpaceEdit : public Edit private: bool bOnlyNumeric; public: - SvxNoSpaceEdit(Window* pParent, WinBits nStyle) + SvxNoSpaceEdit(vcl::Window* pParent, WinBits nStyle) : Edit(pParent, nStyle) , bOnlyNumeric(false) {} @@ -98,11 +98,11 @@ private: DECL_LINK( ProxyHdl_Impl, ListBox * ); DECL_LINK( LoseFocusHdl_Impl, Edit * ); - SvxProxyTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxProxyTabPage(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; @@ -111,9 +111,9 @@ public: class SvxScriptExecListBox : public ListBox { // for adding tooltips to ListBox public: - SvxScriptExecListBox( Window* pParent, WinBits nStyle = WB_BORDER ) + SvxScriptExecListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER ) :ListBox(pParent, nStyle) {} - SvxScriptExecListBox( Window* pParent, const ResId& rResId ) + SvxScriptExecListBox( vcl::Window* pParent, const ResId& rResId ) :ListBox(pParent, rResId) {} protected: @@ -164,7 +164,7 @@ private: void InitControls(); - SvxSecurityTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxSecurityTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSecurityTabPage(); protected: @@ -172,7 +172,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; @@ -192,10 +192,10 @@ class SvxEMailTabPage : public SfxTabPage DECL_LINK( FileDialogHdl_Impl, PushButton* ) ; public: - SvxEMailTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxEMailTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxEMailTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 533bd97e1fca..4f9a7963a5db 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -131,7 +131,7 @@ public: // class SvxJavaOptionsPage ---------------------------------------------- -SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet ) +SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptAdvancedPage", "cui/ui/optadvancedpage.ui", &rSet) , m_pParamDlg(NULL) , m_pPathDlg(NULL) @@ -195,7 +195,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet #if HAVE_FEATURE_JAVA jfw_lock(); #else - get<Window>("javaframe")->Disable(); + get<vcl::Window>("javaframe")->Disable(); #endif } @@ -635,7 +635,7 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) -SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SvxJavaOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxJavaOptionsPage( pParent, *rAttrSet ) ); } @@ -786,7 +786,7 @@ void SvxJavaOptionsPage::FillUserData() // class SvxJavaParameterDlg --------------------------------------------- -SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) : +SvxJavaParameterDlg::SvxJavaParameterDlg( vcl::Window* pParent ) : ModalDialog( pParent, "JavaStartParameters", "cui/ui/javastartparametersdialog.ui" ) @@ -919,7 +919,7 @@ void SvxJavaParameterDlg::SetParameters( Sequence< OUString >& rParams ) // class SvxJavaClassPathDlg --------------------------------------------- -SvxJavaClassPathDlg::SvxJavaClassPathDlg(Window* pParent) +SvxJavaClassPathDlg::SvxJavaClassPathDlg(vcl::Window* pParent) : ModalDialog(pParent, "JavaClassPath", "cui/ui/javaclasspathdialog.ui") { get( m_pPathList, "paths"); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index ab9a9376ceec..353b749f32f5 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -104,10 +104,10 @@ private: void AddFolder( const OUString& _rFolder ); public: - SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet ); + SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxJavaOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -138,7 +138,7 @@ private: public: - SvxJavaParameterDlg( Window* pParent ); + SvxJavaParameterDlg( vcl::Window* pParent ); virtual ~SvxJavaParameterDlg(); virtual short Execute() SAL_OVERRIDE; @@ -170,7 +170,7 @@ private: m_pPathList->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } public: - SvxJavaClassPathDlg( Window* pParent ); + SvxJavaClassPathDlg( vcl::Window* pParent ); virtual ~SvxJavaClassPathDlg(); inline const OUString& GetOldPath() const { return m_sOldPath; } diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx index 43f32220590d..96bc0146811f 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -27,7 +27,7 @@ using namespace com::sun::star::i18n; -SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ) : +SvxJSearchOptionsPage::SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "OptJSearchPage", "cui/ui/optjsearchpage.ui", &rSet ) { get( m_pMatchCase, "matchcase"); @@ -61,7 +61,7 @@ SvxJSearchOptionsPage::~SvxJSearchOptionsPage() } -SfxTabPage* SvxJSearchOptionsPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxJSearchOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxJSearchOptionsPage( pParent, *rSet ); } diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 8a8bf0e96110..bb5ac7a4606e 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -24,7 +24,7 @@ #include <vcl/button.hxx> #include <sfx2/tabdlg.hxx> -class Window; +namespace vcl { class Window; } class SfxItemSet; @@ -59,12 +59,12 @@ private: sal_Int32 GetTransliterationFlags_Impl(); protected: - SvxJSearchOptionsPage( Window* pParent, const SfxItemSet& rSet ); + SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~SvxJSearchOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index bd6edfd16cc3..e59f541c7e46 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -343,7 +343,7 @@ class OptionsBreakSet : public ModalDialog NumericField* m_pBreakNF; public: - OptionsBreakSet(Window* pParent, sal_uInt16 nRID) + OptionsBreakSet(vcl::Window* pParent, sal_uInt16 nRID) : ModalDialog(pParent, "BreakNumberOption", "cui/ui/breaknumberoption.ui") , m_pBreakNF(NULL) @@ -1031,7 +1031,7 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, bool bEnable // class SvxLinguTabPage ------------------------------------------------- -SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ) : +SvxLinguTabPage::SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptLinguPage", "cui/ui/optlingupage.ui", &rSet), sCapitalWords (CUI_RES(RID_SVXSTR_CAPITAL_WORDS)), @@ -1147,7 +1147,7 @@ const sal_uInt16* SvxLinguTabPage::GetRanges() -SfxTabPage* SvxLinguTabPage::Create( Window* pParent, +SfxTabPage* SvxLinguTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxLinguTabPage( pParent, *rAttrSet ) ); @@ -1837,7 +1837,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp ) } } -SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) +SvxEditModulesDlg::SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData) : ModalDialog( pParent, "EditModulesDialog", "cui/ui/editmodulesdialog.ui") , sSpell(CUI_RES(RID_SVXSTR_SPELL)) diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index bae13c5c5fe6..787cf6f0a7f2 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -111,7 +111,7 @@ int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet ) -OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rSet) +OfaMemoryOptionsPage::OfaMemoryOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptMemoryPage", "cui/ui/optmemorypage.ui", &rSet) { get(m_pUndoEdit, "undo"); @@ -148,7 +148,7 @@ OfaMemoryOptionsPage::~OfaMemoryOptionsPage() -SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* OfaMemoryOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new OfaMemoryOptionsPage( pParent, *rAttrSet ); } diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index b1bf5826a769..b3aaff18715d 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -56,10 +56,10 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: - OfaMemoryOptionsPage( Window* pParent, const SfxItemSet& rSet ); + OfaMemoryOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaMemoryOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index eb212b30701e..d231aa10542b 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -195,7 +195,7 @@ bool IsMultiPath_Impl( const sal_uInt16 nIndex ) // class SvxPathTabPage -------------------------------------------------- -SvxPathTabPage::SvxPathTabPage(Window* pParent, const SfxItemSet& rSet) +SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet) :SfxTabPage( pParent, "OptPathsPage", "cui/ui/optpathspage.ui", &rSet) , xDialogListener ( new ::svt::DialogClosedListener() ) { @@ -255,7 +255,7 @@ SvxPathTabPage::~SvxPathTabPage() -SfxTabPage* SvxPathTabPage::Create( Window* pParent, +SfxTabPage* SvxPathTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxPathTabPage( pParent, *rAttrSet ) ); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index abdcbbd526cc..bb0188866e7a 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -80,7 +80,7 @@ SvxSaveTabPage_Impl::~SvxSaveTabPage_Impl() // class SvxSaveTabPage -------------------------------------------------- -SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) : +SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage( pParent, "OptSavePage", "cui/ui/optsavepage.ui", &rCoreSet ), pImpl ( new SvxSaveTabPage_Impl ) { @@ -204,7 +204,7 @@ SfxSaveTabPage::~SfxSaveTabPage() -SfxTabPage* SfxSaveTabPage::Create( Window* pParent, +SfxTabPage* SfxSaveTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SfxSaveTabPage( pParent, *rAttrSet ) ); diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 97f49b72c310..b5fe40ad204e 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -71,10 +71,10 @@ private: void DetectHiddenControls(); public: - SvxSaveTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSaveTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 6de31e2bb4da..702373b53009 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star; // class SvxOnlineUpdateTabPage -------------------------------------------------- -SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(Window* pParent, const SfxItemSet& rSet) +SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptOnlineUpdatePage", "cui/ui/optonlineupdatepage.ui", &rSet) { m_aNeverChecked = get<FixedText>("neverchecked")->GetText(); @@ -149,7 +149,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText() SfxTabPage* -SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SvxOnlineUpdateTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SvxOnlineUpdateTabPage( pParent, *rAttrSet ); } diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index a9d397305c74..54bb2a3791f8 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -51,10 +51,10 @@ private: void UpdateLastCheckedText(); public: - SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxOnlineUpdateTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxOnlineUpdateTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 9500026f4354..5f02689b955c 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::beans; -SelectPersonaDialog::SelectPersonaDialog( Window *pParent ) +SelectPersonaDialog::SelectPersonaDialog( vcl::Window *pParent ) : ModalDialog( pParent, "SelectPersonaDialog", "cui/ui/select_persona_dialog.ui" ) { get( m_pSearchButton, "search_personas" ); @@ -258,7 +258,7 @@ void SelectPersonaDialog::ClearSearchResults() } } -SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet ) +SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent, const SfxItemSet &rSet ) : SfxTabPage( pParent, "PersonalizationTabPage", "cui/ui/personalization_tab.ui", &rSet ) { // persona @@ -295,7 +295,7 @@ SvxPersonalizationTabPage::~SvxPersonalizationTabPage() { } -SfxTabPage* SvxPersonalizationTabPage::Create( Window *pParent, const SfxItemSet *rSet ) +SfxTabPage* SvxPersonalizationTabPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) { return new SvxPersonalizationTabPage( pParent, *rSet ); } diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index 4df2a68838b4..95da0717c932 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -40,10 +40,10 @@ private: public: ::rtl::Reference< SearchAndParseThread > m_rApplyThread; - SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet ); + SvxPersonalizationTabPage( vcl::Window *pParent, const SfxItemSet &rSet ); virtual ~SvxPersonalizationTabPage(); - static SfxTabPage* Create( Window *pParent, const SfxItemSet *rSet ); + static SfxTabPage* Create( vcl::Window *pParent, const SfxItemSet *rSet ); /// Apply the settings ([OK] button). virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; @@ -91,7 +91,7 @@ private: OUString m_aAppliedPersona; public: - SelectPersonaDialog( Window *pParent ); + SelectPersonaDialog( vcl::Window *pParent ); ::rtl::Reference< SearchAndParseThread > m_rSearchThread; OUString GetSelectedPersona() const; diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index e779aa17a966..b046f218bbb6 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -42,7 +42,7 @@ namespace svx { -SecurityOptionsDialog::SecurityOptionsDialog(Window* pParent, SvtSecurityOptions* pOptions) +SecurityOptionsDialog::SecurityOptionsDialog(vcl::Window* pParent, SvtSecurityOptions* pOptions) : ModalDialog(pParent, "SecurityOptionsDialog", "cui/ui/securityoptionsdialog.ui") { DBG_ASSERT( pOptions, "SecurityOptionsDialog::SecurityOptionsDialog(): invalid SvtSecurityOptions" ); diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx index 0838e2b39b69..614e3f72dfa3 100644 --- a/cui/source/options/securityoptions.hxx +++ b/cui/source/options/securityoptions.hxx @@ -48,7 +48,7 @@ namespace svx CheckBox* m_pBlockUntrustedRefererLinksCB; public: - SecurityOptionsDialog( Window* pParent, SvtSecurityOptions* pOptions ); + SecurityOptionsDialog( vcl::Window* pParent, SvtSecurityOptions* pOptions ); virtual ~SecurityOptionsDialog(); bool IsSaveOrSendDocsChecked() const { return m_pSaveOrSendDocsCB->IsChecked(); } diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index ab9356619845..88900347d401 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -286,8 +286,8 @@ void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< OUString >& { } -//typedef SfxTabPage* (*FNCreateTabPage)( Window *pParent, const SfxItemSet &rAttrSet ); -SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) +//typedef SfxTabPage* (*FNCreateTabPage)( vcl::Window *pParent, const SfxItemSet &rAttrSet ); +SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) { CreateTabPage fnCreate = 0; switch(nId) @@ -510,7 +510,7 @@ void OfaTreeOptionsDialog::InitWidgets() // Ctor() with Frame ----------------------------------------------------- using namespace ::com::sun::star; OfaTreeOptionsDialog::OfaTreeOptionsDialog( - Window* pParent, + vcl::Window* pParent, const Reference< XFrame >& _xFrame, bool bActivateLastSelection ) : @@ -529,7 +529,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( } // Ctor() with ExtensionId ----------------------------------------------- -OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId ) : +OfaTreeOptionsDialog::OfaTreeOptionsDialog( vcl::Window* pParent, const OUString& rExtensionId ) : SfxModalDialog( pParent, "OptionsDialog", "cui/ui/optionsdialog.ui" ), INI_LIST() @@ -1131,7 +1131,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() pNewPage = pPageInfo->m_pPage; // restore lost focus, if necessary - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); // if the focused window is not the options treebox and the old page has the focus if ( pFocusWin && pFocusWin != pBox && pOldPage && pOldPage->HasChildPathFocus() ) // then set the focus to the new page or if we are on a group set the focus to the options treebox @@ -1142,7 +1142,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() OString sHelpId(HID_OFADLG_TREELISTBOX); if (::isLayoutEnabled(pNewPage)) { - Window *pFirstChild = pNewPage->GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pFirstChild = pNewPage->GetWindow(WINDOW_FIRSTCHILD); assert(pFirstChild); sHelpId = pFirstChild->GetHelpId(); } @@ -2151,7 +2151,7 @@ short OfaTreeOptionsDialog::Execute() // class ExtensionsTabPage ----------------------------------------------- ExtensionsTabPage::ExtensionsTabPage( - Window* pParent, WinBits nStyle, const OUString& rPageURL, + vcl::Window* pParent, WinBits nStyle, const OUString& rPageURL, const OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) : TabPage( pParent, nStyle ), @@ -2214,7 +2214,7 @@ void ExtensionsTabPage::CreateDialogWithHandler() 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 ); } diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 427145a9e659..7d5a483cd647 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -102,7 +102,7 @@ void PasswordTable::setColWidths() // class WebConnectionInfoDialog ----------------------------------------- -WebConnectionInfoDialog::WebConnectionInfoDialog(Window* pParent) +WebConnectionInfoDialog::WebConnectionInfoDialog(vcl::Window* pParent) : ModalDialog(pParent, "StoredWebConnectionDialog", "cui/ui/storedwebconnectiondialog.ui") , m_nPos( -1 ) { diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index 0d8c278cabc4..366bcfc31283 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -62,7 +62,7 @@ namespace svx void FillPasswordList(); public: - WebConnectionInfoDialog( Window* pParent ); + WebConnectionInfoDialog( vcl::Window* pParent ); virtual ~WebConnectionInfoDialog(); }; diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index c2f07521ab3f..7eac0ade3164 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -150,7 +150,7 @@ void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const -AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ) : +AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage( pParent, "CellAlignPage","cui/ui/cellalignment.ui", &rCoreAttrs ) @@ -253,7 +253,7 @@ AlignmentTabPage::~AlignmentTabPage() delete m_pOrientHlp; } -SfxTabPage* AlignmentTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* AlignmentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new AlignmentTabPage( pParent, *rAttrSet ); } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 498a677b341a..7475cd1af6f9 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star; using namespace ::rtl; -OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) +OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet ) : SfxTabDialog(pParent, "AutoCorrectDialog", "cui/ui/autocorrectdialog.ui", _pSet) { get(m_pLanguageBox, "langbox"); @@ -179,7 +179,7 @@ IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox*, pBox) return 0; } -OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet& rSet) +OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "AutocorrectOptionsPage", "cui/ui/acoroptionspage.ui", &rSet) , m_sInput(CUI_RESSTR(RID_SVXSTR_USE_REPLACE)) , m_sDoubleCaps(CUI_RESSTR(RID_SVXSTR_CPTL_STT_WORD)) @@ -193,7 +193,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet get(m_pCheckLB, "checklist"); } -SfxTabPage* OfaAutocorrOptionsPage::Create( Window* pParent, +SfxTabPage* OfaAutocorrOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaAutocorrOptionsPage(pParent, *rSet); @@ -285,7 +285,7 @@ class OfaAutoFmtPrcntSet : public ModalDialog { MetricField* m_pPrcntMF; public: - OfaAutoFmtPrcntSet(Window* pParent) + OfaAutoFmtPrcntSet(vcl::Window* pParent) : ModalDialog(pParent, "PercentDialog","cui/ui/percentdialog.ui") { get(m_pPrcntMF, "margin"); @@ -387,7 +387,7 @@ enum OfaAutoFmtOptions MERGE_SINGLE_LINE_PARA }; -OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, +OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "ApplyAutoFmtPage", "cui/ui/applyautofmtpage.ui", &rSet) , sDeleteEmptyPara(CUI_RESSTR(RID_SVXSTR_DEL_EMPTY_PARA)) @@ -431,9 +431,9 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, }; m_pCheckLB->SvSimpleTable::SetTabs(aStaticTabs); - OUStringBuffer sHeader(get<Window>("m")->GetText()); + OUStringBuffer sHeader(get<vcl::Window>("m")->GetText()); sHeader.append('\t'); - sHeader.append(get<Window>("t")->GetText()); + sHeader.append(get<vcl::Window>("t")->GetText()); sHeader.append('\t'); m_pCheckLB->InsertHeaderEntry(sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED); @@ -477,7 +477,7 @@ OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage() delete m_pCheckLB; } -SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent, +SfxTabPage* OfaSwAutoFmtOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new OfaSwAutoFmtOptionsPage(pParent, *rAttrSet); @@ -831,7 +831,7 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt ) SvSimpleTable::KeyInput(rKEvt); } -OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* pParent, +OfaAutocorrReplacePage::OfaAutocorrReplacePage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "AcorReplacePage", "cui/ui/acorreplacepage.ui", &rSet) , eLang(eLastDialogLanguage) @@ -905,7 +905,7 @@ OfaAutocorrReplacePage::~OfaAutocorrReplacePage() delete pCharClass; } -SfxTabPage* OfaAutocorrReplacePage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* OfaAutocorrReplacePage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaAutocorrReplacePage(pParent, *rSet); } @@ -1361,7 +1361,7 @@ static bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rSt return false; } -OfaAutocorrExceptPage::OfaAutocorrExceptPage(Window* pParent, const SfxItemSet& rSet) +OfaAutocorrExceptPage::OfaAutocorrExceptPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "AcorExceptPage", "cui/ui/acorexceptpage.ui", &rSet) , eLang(eLastDialogLanguage) { @@ -1405,7 +1405,7 @@ OfaAutocorrExceptPage::~OfaAutocorrExceptPage() delete pCompareClass; } -SfxTabPage* OfaAutocorrExceptPage::Create( Window* pParent, +SfxTabPage* OfaAutocorrExceptPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaAutocorrExceptPage(pParent, *rSet); @@ -1685,7 +1685,7 @@ IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit*, pEdt) return 0; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCorrEdit(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoCorrEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new AutoCorrEdit(pParent); @@ -1740,7 +1740,7 @@ SvTreeListEntry* OfaQuoteTabPage::CreateEntry(OUString& rTxt, sal_uInt16 nCol) return pEntry; } -OfaQuoteTabPage::OfaQuoteTabPage(Window* pParent, const SfxItemSet& rSet) +OfaQuoteTabPage::OfaQuoteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "ApplyLocalizedPage", "cui/ui/applylocalizedpage.ui", &rSet) , sNonBrkSpace(CUI_RESSTR(RID_SVXSTR_NON_BREAK_SPACE)) , sOrdinal(CUI_RESSTR(RID_SVXSTR_ORDINAL)) @@ -1795,9 +1795,9 @@ OfaQuoteTabPage::OfaQuoteTabPage(Window* pParent, const SfxItemSet& rSet) m_pSwCheckLB->SetStyle(m_pSwCheckLB->GetStyle() | WB_HSCROLL| WB_VSCROLL); m_pSwCheckLB->SvSimpleTable::SetTabs(aStaticTabs); - OUString sHeader(get<Window>("m")->GetText()); + OUString sHeader(get<vcl::Window>("m")->GetText()); sHeader += "\t"; - sHeader += get<Window>("t")->GetText(); + sHeader += get<vcl::Window>("t")->GetText(); sHeader += "\t"; m_pSwCheckLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED); @@ -1822,7 +1822,7 @@ OfaQuoteTabPage::~OfaQuoteTabPage() delete m_pSwCheckLB; } -SfxTabPage* OfaQuoteTabPage::Create( Window* pParent, +SfxTabPage* OfaQuoteTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new OfaQuoteTabPage(pParent, *rAttrSet); @@ -2085,7 +2085,7 @@ OUString OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar ) return aOUStr; } -OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(Window* pParent, +OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "WordCompletionPage", "cui/ui/wordcompletionpage.ui", &rSet) @@ -2146,7 +2146,7 @@ OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage() { } -SfxTabPage* OfaAutoCompleteTabPage::Create( Window* pParent, +SfxTabPage* OfaAutoCompleteTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaAutoCompleteTabPage( pParent, *rSet ); @@ -2315,7 +2315,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const sData.append(aLineEnd); } pCntnr->CopyByteString( SOT_FORMAT_STRING, sData.makeStringAndClear() ); - pCntnr->CopyToClipboard( (Window*)this ); + pCntnr->CopyToClipboard( (vcl::Window*)this ); } } @@ -2346,7 +2346,7 @@ bool OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify( return nHandled; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCompleteMultiListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoCompleteMultiListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -2359,7 +2359,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoCompleteMultiListBox(Wi // class OfaSmartTagOptionsTabPage --------------------------------------------- -OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( Window* pParent, +OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "SmartTagOptionsPage", "cui/ui/smarttagoptionspage.ui", &rSet) { @@ -2385,7 +2385,7 @@ OfaSmartTagOptionsTabPage::~OfaSmartTagOptionsTabPage() } -SfxTabPage* OfaSmartTagOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* OfaSmartTagOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new OfaSmartTagOptionsTabPage( pParent, *rSet ); } diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 3f48db5ccea3..9929334ee452 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -176,10 +176,10 @@ sal_uInt16 GetItemId_Impl( ValueSet& rValueSet, const Color& rCol ) preview window for brush or bitmap */ -class BackgroundPreviewImpl : public Window +class BackgroundPreviewImpl : public vcl::Window { public: - BackgroundPreviewImpl(Window* pParent); + BackgroundPreviewImpl(vcl::Window* pParent); void setBmp(bool bBmp); virtual ~BackgroundPreviewImpl(); @@ -203,7 +203,7 @@ private: sal_uInt8 nTransparency; }; -BackgroundPreviewImpl::BackgroundPreviewImpl(Window* pParent) +BackgroundPreviewImpl::BackgroundPreviewImpl(vcl::Window* pParent) : Window(pParent, WB_BORDER) , bIsBmp(false) , pBitmap(NULL) @@ -214,7 +214,7 @@ BackgroundPreviewImpl::BackgroundPreviewImpl(Window* pParent) Paint(aDrawRect); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBackgroundPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBackgroundPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new BackgroundPreviewImpl(pParent); } @@ -350,7 +350,7 @@ void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) #define HDL(hdl) LINK(this,SvxBackgroundTabPage,hdl) -SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, const SfxItemSet& rCoreSet) +SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SvxTabPage(pParent, "BackgroundPage", "cui/ui/backgroundpage.ui", rCoreSet) , nHtmlMode(0) , bAllowShowSelector(true) @@ -456,7 +456,7 @@ const sal_uInt16* SvxBackgroundTabPage::GetRanges() -SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent, +SfxTabPage* SvxBackgroundTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) /* [Description] @@ -1068,7 +1068,7 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet ) -void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT ) +void SvxBackgroundTabPage::PointChanged( vcl::Window* , RECT_POINT ) { // has to be implemented so that position control can work } @@ -1423,7 +1423,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl) return 0; bool bHtml = 0 != ( nHtmlMode & HTMLMODE_ON ); - OUString aStrBrowse(get<Window>("findgraphicsft")->GetText()); + OUString aStrBrowse(get<vcl::Window>("findgraphicsft")->GetText()); pImportDlg = new SvxOpenGraphicDialog( aStrBrowse ); if ( bHtml || bLinkOnly ) pImportDlg->EnableLink(false); diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index d0d7752d4fff..2116a64364be 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -24,7 +24,7 @@ #include "svx/svxids.hrc" #include "cuitabarea.hxx" -SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(Window *pParent, +SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bEnableSelector, bool bEnableDrawingLayerFillStyles) diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 6ccba2efba01..b514300acd1a 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -85,7 +85,7 @@ static void lcl_SetDecimalDigitsTo1(MetricField& rField) } -SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs) +SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "BorderPage", "cui/ui/borderpage.ui", &rCoreAttrs) , @@ -349,7 +349,7 @@ const sal_uInt16* SvxBorderTabPage::GetRanges() -SfxTabPage* SvxBorderTabPage::Create( Window* pParent, +SfxTabPage* SvxBorderTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxBorderTabPage( pParent, *rAttrSet ) ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 05781ce7a99a..fc59a487e6b1 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -175,7 +175,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont() -SvxCharBasePage::SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) +SvxCharBasePage::SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset) : SfxTabPage( pParent, rID, rUIXMLDescription, &rItemset ) , m_pPreviewWin(NULL) , m_bPreviewBackgroundToCharacter( false ) @@ -262,7 +262,7 @@ struct SvxCharNamePage_Impl // class SvxCharNamePage ------------------------------------------------- -SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) +SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rInSet ) : SvxCharBasePage(pParent, "CharNamePage", "cui/ui/charnamepage.ui", rInSet) , m_pImpl(new SvxCharNamePage_Impl) { @@ -1180,7 +1180,7 @@ int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharNamePage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxCharNamePage( pParent, *rSet ); } @@ -1313,7 +1313,7 @@ void SvxCharNamePage::PageCreated(const SfxAllItemSet& aSet) } // class SvxCharEffectsPage ---------------------------------------------- -SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSet ) +SvxCharEffectsPage::SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& rInSet ) : SvxCharBasePage(pParent, "EffectsPage", "cui/ui/effectspage.ui", rInSet) , m_aTransparentColorName(CUI_RES(RID_SVXSTR_CHARNAME_TRANSPARENT)) { @@ -1727,7 +1727,7 @@ int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharEffectsPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxCharEffectsPage( pParent, *rSet ); } @@ -2564,7 +2564,7 @@ void SvxCharEffectsPage::PageCreated(const SfxAllItemSet& aSet) // class SvxCharPositionPage --------------------------------------------- -SvxCharPositionPage::SvxCharPositionPage( Window* pParent, const SfxItemSet& rInSet ) +SvxCharPositionPage::SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet& rInSet ) : SvxCharBasePage(pParent, "PositionPage", "cui/ui/positionpage.ui", rInSet) , m_nSuperEsc((short)DFLT_ESC_SUPER) , m_nSubEsc((short)DFLT_ESC_SUB) @@ -2901,7 +2901,7 @@ int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharPositionPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxCharPositionPage( pParent, *rSet ); } @@ -3328,7 +3328,7 @@ void SvxCharPositionPage::PageCreated(const SfxAllItemSet& aSet) } // class SvxCharTwoLinesPage ------------------------------------------------ -SvxCharTwoLinesPage::SvxCharTwoLinesPage(Window* pParent, const SfxItemSet& rInSet) +SvxCharTwoLinesPage::SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& rInSet) : SvxCharBasePage(pParent, "TwoLinesPage", "cui/ui/twolinespage.ui", rInSet) , m_nStartBracketPosition( 0 ) , m_nEndBracketPosition( 0 ) @@ -3473,7 +3473,7 @@ int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) -SfxTabPage* SvxCharTwoLinesPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxCharTwoLinesPage( pParent, *rSet ); } diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 61ac6853975d..b4269d3e8145 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -50,7 +50,7 @@ static const sal_uInt16 pRanges[] = |* \************************************************************************/ -SvxConnectionDialog::SvxConnectionDialog( Window* pParent, const SfxItemSet& rInAttrs, +SvxConnectionDialog::SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet& rInAttrs, const SdrView* pSdrView ) : SfxSingleTabDialog(pParent, rInAttrs) { @@ -79,7 +79,7 @@ SvxConnectionDialog::~SvxConnectionDialog() |* \************************************************************************/ -SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ) +SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ) : SfxTabPage(pWindow ,"ConnectorTabPage" ,"cui/ui/connectortabpage.ui" ,&rInAttrs) , rOutAttrs(rInAttrs) @@ -388,7 +388,7 @@ void SvxConnectionPage::Construct() |* \************************************************************************/ -SfxTabPage* SvxConnectionPage::Create( Window* pWindow, +SfxTabPage* SvxConnectionPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxConnectionPage( pWindow, *rAttrs ) ); diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index edfbed3dcc9e..86d23299112b 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -30,7 +30,7 @@ |* \************************************************************************/ -SvxDistributeDialog::SvxDistributeDialog(Window* pParent, +SvxDistributeDialog::SvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) : SfxSingleTabDialog(pParent, rInAttrs, "DistributionDialog", @@ -47,7 +47,7 @@ SvxDistributeDialog::SvxDistributeDialog(Window* pParent, |* \************************************************************************/ -SvxDistributePage::SvxDistributePage(Window* pWindow, +SvxDistributePage::SvxDistributePage(vcl::Window* pWindow, const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) : SvxTabPage(pWindow, "DistributionPage", "cui/ui/distributionpage.ui", @@ -74,13 +74,13 @@ SvxDistributePage::SvxDistributePage(Window* pWindow, |* \************************************************************************/ -SfxTabPage* SvxDistributePage::Create(Window* pWindow, const SfxItemSet& rAttrs, +SfxTabPage* SvxDistributePage::Create(vcl::Window* pWindow, const SfxItemSet& rAttrs, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer) { return new SvxDistributePage(pWindow, rAttrs, eHor, eVer); } -void SvxDistributePage::PointChanged(Window* /*pWindow*/, RECT_POINT /*eRP*/) +void SvxDistributePage::PointChanged(vcl::Window* /*pWindow*/, RECT_POINT /*eRP*/) { } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index dad147e7d54b..0fcd835987ab 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -48,7 +48,7 @@ static inline long lcl_GetValue( MetricField& rMetric, FieldUnit eUnit ) description: crop graphic --------------------------------------------------------------------*/ -SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) +SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet ) : SfxTabPage(pParent, "CropPage", "cui/ui/croppage.ui", &rSet) , pLastCropField(0) , nOldWidth(0) @@ -129,7 +129,7 @@ SvxGrfCropPage::~SvxGrfCropPage() aTimer.Stop(); } -SfxTabPage* SvxGrfCropPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SvxGrfCropPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SvxGrfCropPage( pParent, *rSet ); } @@ -749,7 +749,7 @@ Size SvxGrfCropPage::GetGrfOrigSize( const Graphic& rGrf ) const /*****************************************************************/ -SvxCropExample::SvxCropExample( Window* pPar, WinBits nStyle ) +SvxCropExample::SvxCropExample( vcl::Window* pPar, WinBits nStyle ) : Window( pPar, nStyle) , aFrameSize( OutputDevice::LogicToLogic( Size( CM_1_TO_TWIP / 2, CM_1_TO_TWIP / 2 ), @@ -765,7 +765,7 @@ Size SvxCropExample::GetOptimalSize() const return LogicToPixel(Size(78, 78), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxCropExample(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxCropExample(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 37bfe3e0ff8d..e1dcee776491 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -70,7 +70,7 @@ static const sal_uInt16 pCaptionRanges[] = 0 }; -SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxCaptionTabPage::SvxCaptionTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "CalloutPage", "cui/ui/calloutpage.ui", &rInAttrs) , nCaptionType(0) , nGap(0) @@ -336,7 +336,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxCaptionTabPage::Create( Window* pWindow, +SfxTabPage* SvxCaptionTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxCaptionTabPage( pWindow, *rOutAttrs ) ); @@ -514,7 +514,7 @@ void SvxCaptionTabPage::FillValueSet() -SvxCaptionTabDialog::SvxCaptionTabDialog(Window* pParent, const SdrView* pSdrView, +SvxCaptionTabDialog::SvxCaptionTabDialog(vcl::Window* pParent, const SdrView* pSdrView, sal_uInt16 nAnchorTypes) : SfxTabDialog( pParent, "CalloutDialog", "cui/ui/calloutdialog.ui") , pView(pSdrView) diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 52788fb317e2..3af840679e2b 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -135,7 +135,7 @@ void _SfxMacroTabPage::EnableButtons() mpImpl->pAssignPB->Enable( false ); } -_SfxMacroTabPage::_SfxMacroTabPage(Window* pParent, const SfxItemSet& rAttrSet) +_SfxMacroTabPage::_SfxMacroTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "EventAssignPage", "cui/ui/eventassignpage.ui", &rAttrSet) { mpImpl = new _SfxMacroTabPage_Impl; @@ -433,7 +433,7 @@ void _SfxMacroTabPage::FillEvents() } } -SfxMacroTabPage::SfxMacroTabPage(Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet ) +SfxMacroTabPage::SfxMacroTabPage(vcl::Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet ) : _SfxMacroTabPage( pParent, rSet ) { mpImpl->sStrEvent = get<FixedText>("eventft")->GetText(); @@ -456,18 +456,18 @@ SfxMacroTabPage::SfxMacroTabPage(Window* pParent, const Reference< XFrame >& rxD namespace { - SfxMacroTabPage* CreateSfxMacroTabPage( Window* pParent, const SfxItemSet& rAttrSet ) + SfxMacroTabPage* CreateSfxMacroTabPage( vcl::Window* pParent, const SfxItemSet& rAttrSet ) { return new SfxMacroTabPage( pParent, NULL, rAttrSet ); } } -SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SfxMacroTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return CreateSfxMacroTabPage(pParent, *rAttrSet); } -SfxMacroAssignDlg::SfxMacroAssignDlg(Window* pParent, +SfxMacroAssignDlg::SfxMacroAssignDlg(vcl::Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "EventAssignDialog", "cui/ui/eventassigndialog.ui") diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 6104a2a5fdf3..dfeb8fef7cc0 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -60,7 +60,7 @@ static const sal_uInt16 pRanges[] = |* \************************************************************************/ -SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const SfxItemSet& rInAttrs, +SvxMeasureDialog::SvxMeasureDialog( vcl::Window* pParent, const SfxItemSet& rInAttrs, const SdrView* pSdrView ) : SfxSingleTabDialog(pParent, rInAttrs) { @@ -79,7 +79,7 @@ SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const SfxItemSet& rInAttrs, |* \************************************************************************/ -SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) : +SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ) : SvxTabPage ( pWindow ,"DimensionLinesTabPage" ,"cui/ui/dimensionlinestabpage.ui" @@ -593,7 +593,7 @@ void SvxMeasurePage::Construct() |* \************************************************************************/ -SfxTabPage* SvxMeasurePage::Create( Window* pWindow, +SfxTabPage* SvxMeasurePage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxMeasurePage( pWindow, *rAttrs ) ); @@ -604,7 +604,7 @@ const sal_uInt16* SvxMeasurePage::GetRanges() return( pRanges ); } -void SvxMeasurePage::PointChanged( Window* pWindow, RECT_POINT /*eRP*/ ) +void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RECT_POINT /*eRP*/ ) { ChangeAttrHdl_Impl( pWindow ); } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 6937e0c5cd16..19d42733f858 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -76,7 +76,7 @@ static const sal_uInt16 pRanges[] = #* #************************************************************************/ -SvxNumberPreview::SvxNumberPreview(Window* pParent, WinBits nStyle) +SvxNumberPreview::SvxNumberPreview(vcl::Window* pParent, WinBits nStyle) : Window(pParent, nStyle) , mnPos(-1) , mnChar(0x0) @@ -89,7 +89,7 @@ SvxNumberPreview::SvxNumberPreview(Window* pParent, WinBits nStyle) SetBorderStyle( WINDOW_BORDER_MONO ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNumberPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumberPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxNumberPreview(pParent); } @@ -235,7 +235,7 @@ void SvxNumberPreview::DataChanged( const DataChangedEvent& rDCEvt ) #define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl ) -SvxNumberFormatTabPage::SvxNumberFormatTabPage(Window* pParent, +SvxNumberFormatTabPage::SvxNumberFormatTabPage(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "NumberingFormatPage", "cui/ui/numberingformatpage.ui", &rCoreAttrs) @@ -375,7 +375,7 @@ const sal_uInt16* SvxNumberFormatTabPage::GetRanges() #* #************************************************************************/ -SfxTabPage* SvxNumberFormatTabPage::Create( Window* pParent, +SfxTabPage* SvxNumberFormatTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SvxNumberFormatTabPage( pParent, *rAttrSet ) ); @@ -1664,7 +1664,7 @@ bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt ) { if(rNEvt.GetType()==EVENT_LOSEFOCUS) { - if ( rNEvt.GetWindow() == dynamic_cast< Window* >( m_pEdComment ) && !m_pEdComment->IsVisible() ) + if ( rNEvt.GetWindow() == dynamic_cast< vcl::Window* >( m_pEdComment ) && !m_pEdComment->IsVisible() ) { pLastActivWindow = NULL; } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 2e087739a05a..558536153a8d 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -173,7 +173,7 @@ static vcl::Font& lcl_GetDefaultBulletFont() return aDefBulletFont; } -SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, +SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickNumberingPage", "cui/ui/picknumberingpage.ui", &rSet) , pActNum(0) @@ -223,7 +223,7 @@ SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage() delete pSaveNum; } -SfxTabPage* SvxSingleNumPickTabPage::Create( Window* pParent, +SfxTabPage* SvxSingleNumPickTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxSingleNumPickTabPage(pParent, *rAttrSet); @@ -361,7 +361,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl) } -SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, +SvxBulletPickTabPage::SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickBulletPage", "cui/ui/pickbulletpage.ui", &rSet) , pActNum(0) @@ -384,7 +384,7 @@ SvxBulletPickTabPage::~SvxBulletPickTabPage() delete pSaveNum; } -SfxTabPage* SvxBulletPickTabPage::Create( Window* pParent, +SfxTabPage* SvxBulletPickTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxBulletPickTabPage(pParent, *rAttrSet); @@ -524,7 +524,7 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet) } -SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, +SvxNumPickTabPage::SvxNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickOutlinePage", "cui/ui/pickoutlinepage.ui", &rSet) , pActNum(0) @@ -581,7 +581,7 @@ SvxNumPickTabPage::~SvxNumPickTabPage() delete pSaveNum; } -SfxTabPage* SvxNumPickTabPage::Create( Window* pParent, +SfxTabPage* SvxNumPickTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxNumPickTabPage(pParent, *rAttrSet); @@ -772,7 +772,7 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet) SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue()); } -SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, +SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PickGraphicPage", "cui/ui/pickgraphicpage.ui", &rSet) , pActNum(0) @@ -822,7 +822,7 @@ SvxBitmapPickTabPage::~SvxBitmapPickTabPage() delete pSaveNum; } -SfxTabPage* SvxBitmapPickTabPage::Create( Window* pParent, +SfxTabPage* SvxBitmapPickTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxBitmapPickTabPage(pParent, *rAttrSet); @@ -1021,7 +1021,7 @@ void SvxNumOptionsTabPage::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotR } // tabpage numbering options -SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent, +SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "NumberingOptionsPage", "cui/ui/numberingoptionspage.ui", &rSet) , pActNum(0) @@ -1141,7 +1141,7 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) m_pHeightMF->SetUnit( eMetric ); } -SfxTabPage* SvxNumOptionsTabPage::Create( Window* pParent, +SfxTabPage* SvxNumOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxNumOptionsTabPage(pParent, *rAttrSet); @@ -2265,7 +2265,7 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, return nRet; } -SvxNumberingPreview::SvxNumberingPreview(Window* pParent, WinBits nWinBits) +SvxNumberingPreview::SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits) : Window(pParent, nWinBits) , pActNum(0) , nPageWidth(0) @@ -2276,7 +2276,7 @@ SvxNumberingPreview::SvxNumberingPreview(Window* pParent, WinBits nWinBits) SetBorderStyle(WINDOW_BORDER_MONO); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNumberingPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumberingPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxNumberingPreview(pParent, WB_BORDER); } @@ -2580,7 +2580,7 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) //dialog to this one, except with a different preview window impl. //TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be //merged -SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent, +SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "NumberingPositionPage", "cui/ui/numberingpositionpage.ui", &rSet) , pActNum(0) @@ -3093,7 +3093,7 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive ); } -SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent, +SfxTabPage* SvxNumPositionTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SvxNumPositionTabPage(pParent, *rAttrSet); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 56877bf9dba8..97b662be8846 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -171,12 +171,12 @@ const sal_uInt16* SvxPageDescPage::GetRanges() -SfxTabPage* SvxPageDescPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxPageDescPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxPageDescPage( pParent, *rSet ); } -SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : +SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage( pParent, "PageFormatPage", "cui/ui/pageformatpage.ui", &rAttr ), diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index a205605d183a..cf984bedbb22 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -194,7 +194,7 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl) return 0; } -SfxTabPage* SvxStdParagraphTabPage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SvxStdParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new SvxStdParagraphTabPage( pParent, *rSet ); } @@ -618,7 +618,7 @@ int SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) : +SvxStdParagraphTabPage::SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage( pParent, "ParaIndentSpacing","cui/ui/paraindentspacing.ui", &rAttr ), nAbst ( MAX_DURCH ), @@ -964,7 +964,7 @@ void SvxStdParagraphTabPage::PageCreated(const SfxAllItemSet& aSet) #define LASTLINECOUNT_OLD 3 #define LASTLINECOUNT_NEW 4 -SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet ) +SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "ParaAlignPage", "cui/ui/paragalignpage.ui",&rSet) { @@ -1046,7 +1046,7 @@ int SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SfxTabPage* SvxParaAlignTabPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxParaAlignTabPage(pParent, *rSet); } @@ -1324,7 +1324,7 @@ void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet) EnableJustifyExt(); } -SfxTabPage* SvxExtParagraphTabPage::Create( Window* pParent, +SfxTabPage* SvxExtParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxExtParagraphTabPage( pParent, *rSet ); @@ -1829,7 +1829,7 @@ void SvxExtParagraphTabPage::DisablePageBreak() m_pPagenumEdit->Enable(false); } -SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rAttr ) : +SvxExtParagraphTabPage::SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage( pParent, "TextFlowPage","cui/ui/textflowpage.ui", &rAttr ), bPageBreak ( true ), @@ -2119,7 +2119,7 @@ void SvxExtParagraphTabPage::PageCreated(const SfxAllItemSet& aSet) DisablePageBreak(); } -SvxAsianTabPage::SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ) : +SvxAsianTabPage::SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "AsianTypography","cui/ui/asiantypography.ui", &rSet) { @@ -2138,7 +2138,7 @@ SvxAsianTabPage::~SvxAsianTabPage() { } -SfxTabPage* SvxAsianTabPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxAsianTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxAsianTabPage(pParent, *rSet); } diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index ca0cff406751..ffd6bd3207c2 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -502,7 +502,7 @@ static sal_uLong lcl_GetLBRelationsForStrID( const FrmMap* _pMap, return nLBRelations; } -SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "SwPosSizePage", "cui/ui/swpossizepage.ui", &rInAttrs) , m_pVMap(0) , m_pHMap(0) @@ -693,7 +693,7 @@ SvxSwPosSizeTabPage::~SvxSwPosSizeTabPage() { } -SfxTabPage* SvxSwPosSizeTabPage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SvxSwPosSizeTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new SvxSwPosSizeTabPage(pParent, *rSet); } diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 3d3b3f82a17b..e5ab37b6f16f 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -37,7 +37,7 @@ SvxAreaTabDialog::SvxAreaTabDialog ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 01ac68b57cc3..c473966340ad 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -35,7 +35,7 @@ SvxLineTabDialog::SvxLineTabDialog ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pSdrObj, diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 0f528e4e8a17..de67049d9e11 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -36,7 +36,7 @@ // class TabWin_Impl ----------------------------------------------------- -class TabWin_Impl : public Window +class TabWin_Impl : public vcl::Window { SvxTabulatorTabPage* mpPage; private: @@ -44,7 +44,7 @@ private: public: - TabWin_Impl(Window* pParent, WinBits nBits) + TabWin_Impl(vcl::Window* pParent, WinBits nBits) : Window(pParent, nBits) , mpPage(0) , nTabStyle(0) @@ -57,7 +57,7 @@ public: void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; } }; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTabWin_Impl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTabWin_Impl(vcl::Window *pParent, VclBuilder::stringmap &) { return new TabWin_Impl(pParent, 0); } @@ -96,7 +96,7 @@ void TabWin_Impl::Paint( const Rectangle& ) // class SvxTabulatorTabPage --------------------------------------------- -SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAttr ): +SvxTabulatorTabPage::SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rAttr ): SfxTabPage( pParent, "ParagraphTabsPage","cui/ui/paratabspage.ui", &rAttr ), @@ -259,7 +259,7 @@ bool SvxTabulatorTabPage::FillItemSet( SfxItemSet* rSet ) -SfxTabPage* SvxTabulatorTabPage::Create( Window* pParent, +SfxTabPage* SvxTabulatorTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return ( new SvxTabulatorTabPage( pParent, *rSet ) ); diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 4ba2bb7c623f..4e1761d0a18d 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -41,7 +41,7 @@ static const sal_uInt16 pRanges[] = |* \************************************************************************/ -SvxTextTabDialog::SvxTextTabDialog( Window* pParent, +SvxTextTabDialog::SvxTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView ) : SfxTabDialog ( pParent @@ -76,7 +76,7 @@ void SvxTextTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) |* \************************************************************************/ -SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ) : +SvxTextAnimationPage::SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ) : SfxTabPage ( pWindow ,"TextAnimation" ,"cui/ui/textanimtabpage.ui" @@ -450,7 +450,7 @@ const sal_uInt16* SvxTextAnimationPage::GetRanges() |* \************************************************************************/ -SfxTabPage* SvxTextAnimationPage::Create( Window* pWindow, +SfxTabPage* SvxTextAnimationPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxTextAnimationPage( pWindow, *rAttrs ) ); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index d97cca54836a..3f74020f47c6 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -53,7 +53,7 @@ static const sal_uInt16 pRanges[] = |* dialog (page) for copying objects |* \************************************************************************/ -SvxTextAttrPage::SvxTextAttrPage(Window* pWindow, const SfxItemSet& rInAttrs) +SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs) : SvxTabPage(pWindow,"TextAttributesPage","cui/ui/textattrtabpage.ui", rInAttrs) , rOutAttrs(rInAttrs) , pView(NULL) @@ -520,7 +520,7 @@ void SvxTextAttrPage::Construct() |* \************************************************************************/ -SfxTabPage* SvxTextAttrPage::Create( Window* pWindow, +SfxTabPage* SvxTextAttrPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxTextAttrPage( pWindow, *rAttrs ) ); @@ -533,7 +533,7 @@ const sal_uInt16* SvxTextAttrPage::GetRanges() /** Check whether we have to uncheck the "Full width" check box. */ -void SvxTextAttrPage::PointChanged( Window*, RECT_POINT eRP ) +void SvxTextAttrPage::PointChanged( vcl::Window*, RECT_POINT eRP ) { if (m_pTsbFullWidth->GetState() == TRISTATE_TRUE) { diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 698d0a5de0ab..0dfd93040826 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -224,7 +224,7 @@ void SvxTransparenceTabPage::SetControlState_Impl(XGradientStyle eXGS) } } -SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage ( pParent, "TransparencyTabPage", "cui/ui/transparencytabpage.ui", @@ -289,7 +289,7 @@ void SvxTransparenceTabPage::Construct() { } -SfxTabPage* SvxTransparenceTabPage::Create(Window* pWindow, const SfxItemSet* rAttrs) +SfxTabPage* SvxTransparenceTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rAttrs) { return(new SvxTransparenceTabPage(pWindow, *rAttrs)); } @@ -486,7 +486,7 @@ int SvxTransparenceTabPage::DeactivatePage(SfxItemSet* _pSet) return(LEAVE_PAGE); } -void SvxTransparenceTabPage::PointChanged(Window* , RECT_POINT eRcPt) +void SvxTransparenceTabPage::PointChanged(vcl::Window* , RECT_POINT eRcPt) { eRP = eRcPt; } @@ -579,7 +579,7 @@ void SvxTransparenceTabPage::PageCreated(const SfxAllItemSet& aSet) |* \************************************************************************/ -SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : +SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SvxTabPage( pParent, "AreaTabPage", @@ -1756,7 +1756,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxAreaTabPage::Create( Window* pWindow, +SfxTabPage* SvxAreaTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxAreaTabPage( pWindow, *rAttrs ) ); @@ -2365,7 +2365,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl) -void SvxAreaTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) +void SvxAreaTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) { eRP = eRcPt; diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 42915cd6e848..b6b9280235dd 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -50,7 +50,7 @@ using namespace com::sun::star; -SvxBitmapTabPage::SvxBitmapTabPage( Window* pParent, const SfxItemSet& rInAttrs) : +SvxBitmapTabPage::SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage ( pParent, "BitmapTabPage", @@ -291,7 +291,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxBitmapTabPage::Create( Window* pWindow, +SfxTabPage* SvxBitmapTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { return new SvxBitmapTabPage( pWindow, *rSet ); @@ -949,7 +949,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl) -void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT ) +void SvxBitmapTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT ) { if( pWindow == m_pCtlPixel ) { @@ -967,7 +967,7 @@ void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT ) -Window* SvxBitmapTabPage::GetParentLabeledBy( const Window* pLabeled ) const +vcl::Window* SvxBitmapTabPage::GetParentLabeledBy( const vcl::Window* pLabeled ) const { if (pLabeled == m_pLbBitmaps) return const_cast<FixedText*>(m_pLbBitmapsHidden); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 7d2def85d888..2fc15158a11a 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -300,7 +300,7 @@ struct SvxColorTabPageShadow -SvxColorTabPage::SvxColorTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", &rInAttrs) , meType( XCOLOR_LIST ) , mpXPool( (XOutdevItemPool*) rInAttrs.GetPool() ) @@ -619,7 +619,7 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet ) -SfxTabPage* SvxColorTabPage::Create( Window* pWindow, +SfxTabPage* SvxColorTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxColorTabPage( pWindow, *rOutAttrs ) ); @@ -657,7 +657,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl) IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl) { - Window *pWindow = this; + vcl::Window *pWindow = this; while( pWindow ) { pWindow = pWindow->GetParent(); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index bc1050e54a37..085ba9ce144f 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -46,7 +46,7 @@ using namespace com::sun::star; SvxGradientTabPage::SvxGradientTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage ( pParent, "GradientPage", "cui/ui/gradientpage.ui", &rInAttrs ), @@ -366,7 +366,7 @@ void SvxGradientTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxGradientTabPage::Create( Window* pWindow, +SfxTabPage* SvxGradientTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return new SvxGradientTabPage( pWindow, *rOutAttrs ); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 85768a5cb066..ee0c8a2a666f 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -48,7 +48,7 @@ using namespace com::sun::star; SvxHatchTabPage::SvxHatchTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : @@ -339,7 +339,7 @@ void SvxHatchTabPage::Reset( const SfxItemSet* rSet ) -SfxTabPage* SvxHatchTabPage::Create( Window* pWindow, +SfxTabPage* SvxHatchTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { return new SvxHatchTabPage( pWindow, *rSet ); @@ -799,7 +799,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl) -void SvxHatchTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) +void SvxHatchTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) { if( pWindow == m_pCtlAngle ) { diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 20efb0e3b754..5da506f3d745 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -76,7 +76,7 @@ static const sal_uInt16 pLineRanges[] = SvxLineTabPage::SvxLineTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SvxTabPage ( pParent @@ -1483,7 +1483,7 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxLineTabPage::Create( Window* pWindow, +SfxTabPage* SvxLineTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxLineTabPage( pWindow, *rAttrs ) ); @@ -1673,7 +1673,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl) -void SvxLineTabPage::PointChanged( Window*, RECT_POINT eRcPt ) +void SvxLineTabPage::PointChanged( vcl::Window*, RECT_POINT eRcPt ) { eRP = eRcPt; } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 8d8583eabbce..cf945d689375 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -48,7 +48,7 @@ SvxLineDefTabPage::SvxLineDefTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : @@ -320,7 +320,7 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxLineDefTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs ) +SfxTabPage* SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxLineDefTabPage( pWindow, *rOutAttrs ) ); } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 94cf7635bc3f..a71ce58192b1 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -50,7 +50,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rInAttrs ) : @@ -264,7 +264,7 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxLineEndDefTabPage::Create( Window* pWindow, const SfxItemSet* rSet ) +SfxTabPage* SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) { return( new SvxLineEndDefTabPage( pWindow, *rSet ) ); } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 97ba83597c3d..7bd6076eb6c9 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -45,7 +45,7 @@ static const sal_uInt16 pShadowRanges[] = 0 }; -SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : +SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SvxTabPage ( pParent, "ShadowTabPage", @@ -456,7 +456,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) -SfxTabPage* SvxShadowTabPage::Create( Window* pWindow, +SfxTabPage* SvxShadowTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SvxShadowTabPage( pWindow, *rAttrs ) ); @@ -533,7 +533,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl) -void SvxShadowTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt ) +void SvxShadowTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRcPt ) { eRP = eRcPt; diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 0245dcf1ba59..c6273945c7cb 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -102,7 +102,7 @@ static void lcl_ScaleRect(basegfx::B2DRange& rRange, const Fraction aUIScale) |* \************************************************************************/ -SvxTransformTabDialog::SvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr, +SvxTransformTabDialog::SvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView, sal_uInt16 nAnchorTypes ) : SfxTabDialog( pParent ,"PositionAndSizeDialog" @@ -197,7 +197,7 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink) |* angle and the rotation angle of the graphic objects |* \************************************************************************/ -SvxAngleTabPage::SvxAngleTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxAngleTabPage::SvxAngleTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage( pParent,"Rotation","cui/ui/rotationtabpage.ui", rInAttrs) , rOutAttrs(rInAttrs) , pView(NULL) @@ -330,7 +330,7 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) -SfxTabPage* SvxAngleTabPage::Create( Window* pWindow, const SfxItemSet* rSet) +SfxTabPage* SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) { return(new SvxAngleTabPage(pWindow, *rSet)); } @@ -362,7 +362,7 @@ int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet ) -void SvxAngleTabPage::PointChanged(Window* pWindow, RECT_POINT eRP) +void SvxAngleTabPage::PointChanged(vcl::Window* pWindow, RECT_POINT eRP) { if(pWindow == m_pCtlRect) { @@ -431,7 +431,7 @@ void SvxAngleTabPage::PointChanged(Window* pWindow, RECT_POINT eRP) |* dialog for changing slant and corner radius |* \************************************************************************/ -SvxSlantTabPage::SvxSlantTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxSlantTabPage::SvxSlantTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage( pParent,"SlantAndCornerRadius","cui/ui/slantcornertabpage.ui", rInAttrs) , rOutAttrs(rInAttrs) @@ -564,7 +564,7 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) -SfxTabPage* SvxSlantTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs ) +SfxTabPage* SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxSlantTabPage( pWindow, *rOutAttrs ) ); } @@ -603,7 +603,7 @@ int SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet ) -void SvxSlantTabPage::PointChanged( Window* , RECT_POINT ) +void SvxSlantTabPage::PointChanged( vcl::Window* , RECT_POINT ) { } @@ -612,7 +612,7 @@ void SvxSlantTabPage::PointChanged( Window* , RECT_POINT ) |* Dialog for changing position and size of graphic objects |* \************************************************************************/ -SvxPositionSizeTabPage::SvxPositionSizeTabPage(Window* pParent, const SfxItemSet& rInAttrs) +SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SvxTabPage(pParent,"PositionAndSize","cui/ui/possizetabpage.ui", rInAttrs) , mrOutAttrs(rInAttrs) , mpView(NULL) @@ -1003,7 +1003,7 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) -SfxTabPage* SvxPositionSizeTabPage::Create( Window* pWindow, const SfxItemSet* rOutAttrs ) +SfxTabPage* SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SvxPositionSizeTabPage( pWindow, *rOutAttrs ) ); } @@ -1349,7 +1349,7 @@ void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const -void SvxPositionSizeTabPage::PointChanged( Window* pWindow, RECT_POINT eRP ) +void SvxPositionSizeTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) { if( pWindow == m_pCtlPos ) { diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 136290f8d8d0..c643e8042942 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -126,7 +126,7 @@ namespace dbmm }; // MacroMigrationDialog - MacroMigrationDialog::MacroMigrationDialog(Window* _pParent, const Reference<XComponentContext>& _rContext, + MacroMigrationDialog::MacroMigrationDialog(vcl::Window* _pParent, const Reference<XComponentContext>& _rContext, const Reference< XOfficeDatabaseDocument >& _rxDocument) : MacroMigrationDialog_Base(_pParent) , m_pData( new MacroMigrationDialog_Data( _rContext, _rxDocument ) ) diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx index 9db62481463f..b5ee3d1be704 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx @@ -36,7 +36,7 @@ namespace dbmm { public: MacroMigrationDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XOfficeDatabaseDocument >& _rxDocument ); diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index 04c9cc7aaf73..3a2f559fdab8 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -45,7 +45,7 @@ namespace dbmm using ::com::sun::star::uno::Sequence; using ::com::sun::star::frame::XModel; - MacroMigrationPage::MacroMigrationPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription) + MacroMigrationPage::MacroMigrationPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription) : MacroMigrationPage_Base(pParent, rID, rUIXMLDescription) { } @@ -61,7 +61,7 @@ namespace dbmm } // PreparationPage - PreparationPage::PreparationPage(Window *pParent) + PreparationPage::PreparationPage(vcl::Window *pParent) : MacroMigrationPage(pParent, "PreparePage" ,"dbaccess/ui/preparepage.ui") { get(m_pCloseDocError, "closedocerror"); @@ -162,7 +162,7 @@ namespace dbmm } // ProgressPage - ProgressPage::ProgressPage(Window* pParent) + ProgressPage::ProgressPage(vcl::Window* pParent) : MacroMigrationPage(pParent, "MigratePage" ,"dbaccess/ui/migratepage.ui") { get(m_pObjectCount, "count"); @@ -246,7 +246,7 @@ namespace dbmm } // ResultPage - ResultPage::ResultPage(Window* pParent) + ResultPage::ResultPage(vcl::Window* pParent) : MacroMigrationPage(pParent, "SummaryPage" ,"dbaccess/ui/summarypage.ui") { get(m_pChanges, "textview"); diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx index 46989c58cb78..fc6ffc934521 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx @@ -45,7 +45,7 @@ namespace dbmm class MacroMigrationPage : public MacroMigrationPage_Base { public: - MacroMigrationPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription); + MacroMigrationPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription); protected: const MacroMigrationDialog& getDialog() const; @@ -56,7 +56,7 @@ namespace dbmm class PreparationPage : public MacroMigrationPage { public: - PreparationPage(Window *pParent); + PreparationPage(vcl::Window *pParent); static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); @@ -100,7 +100,7 @@ namespace dbmm class ProgressPage : public MacroMigrationPage, public IMigrationProgress { public: - ProgressPage(Window *pParent); + ProgressPage(vcl::Window *pParent); static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); @@ -131,7 +131,7 @@ namespace dbmm class ResultPage : public MacroMigrationPage { public: - ResultPage(Window *pParent); + ResultPage(vcl::Window *pParent); static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 4913bcd737ae..f61045458791 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -88,7 +88,7 @@ namespace dbmm virtual ~MacroMigrationDialogService(); protected: - virtual Dialog* createDialog( Window* _pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE; virtual void destroyDialog() SAL_OVERRIDE; private: @@ -121,7 +121,7 @@ namespace dbmm return *(new MacroMigrationDialogService( _rxContext ) ); } - Dialog* MacroMigrationDialogService::createDialog( Window* _pParent ) + Dialog* MacroMigrationDialogService::createDialog( vcl::Window* _pParent ) { return new MacroMigrationDialog( _pParent, m_aContext, m_xDocument ); } diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 570e32821377..0c03368c977a 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -405,7 +405,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto uno::Reference< ::com::sun::star::awt::XWindow > xWindow; { SolarMutexGuard aGuard; - Window* pFocusWindow = Application::GetFocusWindow(); + vcl::Window* pFocusWindow = Application::GetFocusWindow(); xWindow = VCLUnoHelper::GetInterface( pFocusWindow ); if( pFocusWindow ) pFocusWindow->EnterWait(); @@ -418,7 +418,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto if ( xWindow.is() ) { SolarMutexGuard aGuard; - Window* pFocusWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pFocusWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pFocusWindow ) pFocusWindow->LeaveWait(); } diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 4996d491ce68..092ee4a909b1 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -312,7 +312,7 @@ OApplicationController::~OApplicationController() dispose(); } SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< Window> aTemp( getView() ); + ::std::auto_ptr< vcl::Window> aTemp( getView() ); SAL_WNODEPRECATED_DECLARATIONS_POP clearView(); @@ -429,7 +429,7 @@ void SAL_CALL OApplicationController::disposing() OApplicationController_CBASE::disposing(); // here the m_refCount must be equal 5 } -bool OApplicationController::Construct(Window* _pParent) +bool OApplicationController::Construct(vcl::Window* _pParent) { setView( * new OApplicationView( _pParent, getORB(), *this, m_ePreviewMode ) ); getView()->SetUniqueId(UID_APP_VIEW); @@ -452,7 +452,7 @@ bool OApplicationController::Construct(Window* _pParent) if ( !bSuccess ) { SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< Window> aTemp( getView() ); + ::std::auto_ptr< vcl::Window> aTemp( getView() ); SAL_WNODEPRECATED_DECLARATIONS_POP clearView(); return false; diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 18fdb41d14fc..2e262c67d22f 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -546,7 +546,7 @@ namespace dbaui virtual void disconnect(); // late construction - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; virtual void describeSupportedFeatures() SAL_OVERRIDE; protected: diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 691775f20836..af80ee80ad34 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -125,17 +125,17 @@ namespace return (nIndex != -1 ? lcl_findEntry_impl(rTree,_rName.copy(sErase.getLength() + 1),_pFirst) : NULL); } // class OPreviewWindow - class OTablePreviewWindow : public Window + class OTablePreviewWindow : public vcl::Window { DECL_LINK(OnDisableInput, void*); void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OTablePreviewWindow( Window* pParent, WinBits nStyle = 0 ); + OTablePreviewWindow( vcl::Window* pParent, WinBits nStyle = 0 ); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; - OTablePreviewWindow::OTablePreviewWindow(Window* pParent, WinBits nStyle) : Window( pParent, nStyle) + OTablePreviewWindow::OTablePreviewWindow(vcl::Window* pParent, WinBits nStyle) : Window( pParent, nStyle) { ImplInitSettings( true, true, true ); } @@ -186,7 +186,7 @@ namespace } // class OAppDetailPageHelper -OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL) +OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL) ,m_rBorderWin(_rBorderWin) ,m_aFL(this,WB_VERT) ,m_aTBPreview(this,WB_TABSTOP ) @@ -675,10 +675,10 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA } } -void OAppDetailPageHelper::setDetailPage(Window* _pWindow) +void OAppDetailPageHelper::setDetailPage(vcl::Window* _pWindow) { OSL_ENSURE(_pWindow,"OAppDetailPageHelper::setDetailPage: Window is NULL!"); - Window* pCurrent = getCurrentView(); + vcl::Window* pCurrent = getCurrentView(); if ( pCurrent ) pCurrent->Hide(); @@ -965,7 +965,7 @@ void OAppDetailPageHelper::Resize() long nOutputWidth = aOutputSize.Width(); long nOutputHeight = aOutputSize.Height(); - Window* pWindow = getCurrentView(); + vcl::Window* pWindow = getCurrentView(); if ( pWindow ) { Size aFLSize = LogicToPixel( Size( 2, 6 ), MAP_APPFONT ); @@ -1273,7 +1273,7 @@ void OAppDetailPageHelper::ImplInitSettings() m_pTablePreview->SetBackground( rStyleSettings.GetFieldColor() ); } -OPreviewWindow::OPreviewWindow(Window* _pParent) +OPreviewWindow::OPreviewWindow(vcl::Window* _pParent) : Window(_pParent) { ImplInitSettings( true, true, true ); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index f102e5e37708..24affd63da1e 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -47,7 +47,7 @@ namespace dbaui class OAppBorderWindow; class DBTreeListBox; - class OPreviewWindow : public Window + class OPreviewWindow : public vcl::Window { GraphicObject m_aGraphicObj; Rectangle m_aPreviewRect; @@ -66,7 +66,7 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OPreviewWindow(Window* _pParent); + OPreviewWindow(vcl::Window* _pParent); // window overloads virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; @@ -75,7 +75,7 @@ namespace dbaui }; // A helper class for the controls in the detail page. // Combines general functionality. - class OAppDetailPageHelper : public Window + class OAppDetailPageHelper : public vcl::Window { DBTreeListBox* m_pLists[ELEMENT_COUNT]; OAppBorderWindow& m_rBorderWin; @@ -85,7 +85,7 @@ namespace dbaui OPreviewWindow m_aPreview; ::svtools::ODocumentInfoPreview m_aDocumentInfo; - Window* m_pTablePreview; + vcl::Window* m_pTablePreview; ::std::auto_ptr<PopupMenu> m_aMenu; PreviewMode m_ePreviewMode; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > @@ -129,7 +129,7 @@ namespace dbaui @param _pWindow The control which should be visible. */ - void setDetailPage(Window* _pWindow); + void setDetailPage(vcl::Window* _pWindow); /** sets all HandleCallbacks @param _pTreeView @@ -167,7 +167,7 @@ namespace dbaui void ImplInitSettings(); public: - OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode); + OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode); virtual ~OAppDetailPageHelper(); // window overloads diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index e6e01c4e9809..4882593c2526 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -339,7 +339,7 @@ void OCreationList::KeyInput( const KeyEvent& rKEvt ) } } -OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView) +OTasksWindow::OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetailView) : Window(_pParent,WB_DIALOGCONTROL ) ,m_aCreation(*this) ,m_aDescription(this) @@ -886,7 +886,7 @@ bool OApplicationDetailView::isSortUp() const return m_pControlHelper->isSortUp(); } -Window* OApplicationDetailView::getTreeWindow() const +vcl::Window* OApplicationDetailView::getTreeWindow() const { return m_pControlHelper->getCurrentView(); } diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 4f83589343b7..ac12a0d0cfe8 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -109,7 +109,7 @@ namespace dbaui sal_uInt16 nTitleId; }; - class OTasksWindow : public Window + class OTasksWindow : public vcl::Window { OCreationList m_aCreation; FixedText m_aDescription; @@ -122,7 +122,7 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView); + OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetailView); virtual ~OTasksWindow(); // window overloads @@ -352,7 +352,7 @@ namespace dbaui SvTreeListEntry* getEntry( const Point& _aPoint ) const; - Window* getTreeWindow() const; + vcl::Window* getTreeWindow() const; private: void impl_createPage( ElementType _eType, diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 62afddd51d2a..ff73ba0fdafc 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -29,7 +29,7 @@ using namespace ::dbaui; // class OApplicationIconControl -OApplicationIconControl::OApplicationIconControl(Window* _pParent) +OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent) : SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/ WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER) ,DropTargetHelper(this) diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx index f8038ace0142..5fcecef90022 100644 --- a/dbaccess/source/ui/app/AppIconControl.hxx +++ b/dbaccess/source/ui/app/AppIconControl.hxx @@ -32,7 +32,7 @@ namespace dbaui IControlActionListener* m_pActionListener; public: - OApplicationIconControl(Window* _pParent); + OApplicationIconControl(vcl::Window* _pParent); virtual ~OApplicationIconControl(); void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 4f12cb9eb566..8c3d451bd0e3 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; // class OApplicationSwapWindow -OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWindow& _rBorderWindow ) +OApplicationSwapWindow::OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow ) :Window(_pParent,WB_DIALOGCONTROL ) ,m_aIconControl(this) ,m_eLastType(E_NONE) diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index 2282039f9995..5c10903cf9be 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -27,7 +27,7 @@ namespace dbaui { class OAppBorderWindow; - class OApplicationSwapWindow : public Window, + class OApplicationSwapWindow : public vcl::Window, public IClipboardTest { OApplicationIconControl m_aIconControl; @@ -41,7 +41,7 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OApplicationSwapWindow( Window* _pParent, OAppBorderWindow& _rBorderWindow ); + OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow ); virtual ~OApplicationSwapWindow(); // window overloads virtual void Resize() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index 72e37369f362..4276a553122b 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -27,7 +27,7 @@ namespace dbaui { -OTitleWindow::OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift) +OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift) : Window(_pParent,_nBits | WB_DIALOGCONTROL) , m_aSpace1(this) , m_aSpace2(this) @@ -40,7 +40,7 @@ OTitleWindow::OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits, SetBorderStyle(WINDOW_BORDER_MONO); ImplInitSettings( true, true, true ); - Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle }; + vcl::Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle }; for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i) pWindows[i]->Show(); } @@ -50,13 +50,13 @@ OTitleWindow::~OTitleWindow() if ( m_pChild ) { m_pChild->Hide(); - boost::scoped_ptr<Window> aTemp(m_pChild); + boost::scoped_ptr<vcl::Window> aTemp(m_pChild); m_pChild = NULL; } } -void OTitleWindow::setChildWindow(Window* _pChild) +void OTitleWindow::setChildWindow(vcl::Window* _pChild) { m_pChild = _pChild; } @@ -151,7 +151,7 @@ void OTitleWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackgro if( bBackground ) SetBackground( rStyleSettings.GetFieldColor() ); - Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle}; + vcl::Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle}; for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i) { vcl::Font aFont = pWindows[i]->GetFont(); diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index 0f1bedafd939..e33144a87395 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -23,18 +23,18 @@ namespace dbaui { - class OTitleWindow : public Window + class OTitleWindow : public vcl::Window { FixedText m_aSpace1; FixedText m_aSpace2; FixedText m_aTitle; - Window* m_pChild; + vcl::Window* m_pChild; bool m_bShift; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true); + OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true); virtual ~OTitleWindow(); // window overloads @@ -45,14 +45,14 @@ namespace dbaui @param _pChild The child window. */ - void setChildWindow(Window* _pChild); + void setChildWindow(vcl::Window* _pChild); /** gets the child window. @return The child winodw. */ - inline Window* getChildWindow() const { return m_pChild; } + inline vcl::Window* getChildWindow() const { return m_pChild; } /** sets the title text out of the resource @param _nTitleId diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 3b22fd88badc..a3375b651fb0 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -90,13 +90,13 @@ OAppBorderWindow::~OAppBorderWindow() if ( m_pPanel ) { m_pPanel->Hide(); - boost::scoped_ptr<Window> aTemp(m_pPanel); + boost::scoped_ptr<vcl::Window> aTemp(m_pPanel); m_pPanel = NULL; } if ( m_pDetailView ) { m_pDetailView->Hide(); - boost::scoped_ptr<Window> aTemp(m_pDetailView); + boost::scoped_ptr<vcl::Window> aTemp(m_pDetailView); m_pDetailView = NULL; } @@ -177,7 +177,7 @@ OApplicationSwapWindow* OAppBorderWindow::getPanel() const // class OApplicationView -OApplicationView::OApplicationView( Window* pParent +OApplicationView::OApplicationView( vcl::Window* pParent ,const Reference< XComponentContext >& _rxOrb ,IApplicationController& _rAppController ,PreviewMode _ePreviewMode @@ -208,7 +208,7 @@ OApplicationView::~OApplicationView() { stopComponentListening(m_xObject); m_pWin->Hide(); - boost::scoped_ptr<Window> aTemp(m_pWin); + boost::scoped_ptr<vcl::Window> aTemp(m_pWin); m_pWin = NULL; } } diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 109f63114ca1..a19118ac1917 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -42,7 +42,7 @@ namespace dbaui class OApplicationDetailView; class OApplicationSwapWindow; class OTitleWindow; - class OAppBorderWindow : public Window + class OAppBorderWindow : public vcl::Window { OTitleWindow* m_pPanel; OApplicationDetailView* m_pDetailView; @@ -97,7 +97,7 @@ namespace dbaui // Window virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - OApplicationView( Window* pParent + OApplicationView( vcl::Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ,IApplicationController& _rAppController ,PreviewMode _ePreviewMode diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 96ee1a44b88a..dfa6774cb25f 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -722,7 +722,7 @@ void SbaXDataBrowserController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:FormSlots/insertRecord", ID_BROWSER_INSERT_ROW, CommandGroup::INSERT ); } -bool SbaXDataBrowserController::Construct(Window* pParent) +bool SbaXDataBrowserController::Construct(vcl::Window* pParent) { // create/initialize the form and the grid model m_xRowSet = CreateForm(); diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 6be18a14ae17..9292887c63e3 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -65,7 +65,7 @@ namespace // UnoDataBrowserView -UnoDataBrowserView::UnoDataBrowserView( Window* pParent, +UnoDataBrowserView::UnoDataBrowserView( vcl::Window* pParent, IController& _rController, const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) :ODataView(pParent,_rController,_rxContext) @@ -161,7 +161,7 @@ void UnoDataBrowserView::setTreeView(DBTreeView* _pTreeView) { if (m_pTreeView) { - boost::scoped_ptr<Window> aTemp(m_pTreeView); + boost::scoped_ptr<vcl::Window> aTemp(m_pTreeView); m_pTreeView = NULL; } m_pTreeView = _pTreeView; diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index ec220d3b562a..bf06baa5ebbe 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -59,7 +59,7 @@ namespace dbaui } }; - ODataView::ODataView( Window* pParent, + ODataView::ODataView( vcl::Window* pParent, IController& _rController, const Reference< XComponentContext >& _rxContext, WinBits nStyle) diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index e769f378ebd2..2d140c3b1326 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; // class DBTreeView -DBTreeView::DBTreeView( Window* pParent, WinBits nBits) +DBTreeView::DBTreeView( vcl::Window* pParent, WinBits nBits) : Window( pParent, nBits ) , m_pTreeListBox(NULL) { @@ -53,7 +53,7 @@ DBTreeView::~DBTreeView() m_pTreeListBox->GetModel()->RemoveView(m_pTreeListBox); m_pTreeListBox->DisconnectFromModel(); } - boost::scoped_ptr<Window> aTemp(m_pTreeListBox); + boost::scoped_ptr<vcl::Window> aTemp(m_pTreeListBox); m_pTreeListBox = NULL; } } diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx index b084411f63e1..99bf4416ce8c 100644 --- a/dbaccess/source/ui/browser/dbtreeview.hxx +++ b/dbaccess/source/ui/browser/dbtreeview.hxx @@ -28,7 +28,7 @@ namespace dbaui class DBTreeListBox; // - DBTreeView - - class DBTreeView : public Window + class DBTreeView : public vcl::Window { private: DBTreeListBox* m_pTreeListBox; @@ -37,7 +37,7 @@ namespace dbaui virtual void Resize() SAL_OVERRIDE; public: - DBTreeView( Window* pParent, + DBTreeView( vcl::Window* pParent, WinBits nBits ); virtual ~DBTreeView(); diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index c06a5047ccd2..c8526427cbf3 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -226,7 +226,7 @@ OGenericUnoController::~OGenericUnoController() } -bool OGenericUnoController::Construct(Window* /*pParent*/) +bool OGenericUnoController::Construct(vcl::Window* /*pParent*/) { OSL_ENSURE( getView(), "the view is NULL!" ); @@ -297,7 +297,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen xParent = xFrame->getContainerWindow(); VCLXWindow* pParentComponent = VCLXWindow::GetImplementation(xParent); - Window* pParentWin = pParentComponent ? pParentComponent->GetWindow() : NULL; + vcl::Window* pParentWin = pParentComponent ? pParentComponent->GetWindow() : NULL; if (!pParentWin) { throw IllegalArgumentException("Parent window is null", *this, 1 ); @@ -318,7 +318,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen catch(Exception&) { // no one clears my view if I won't - boost::scoped_ptr<Window> aTemp(m_pView); + boost::scoped_ptr<vcl::Window> aTemp(m_pView); m_pView = NULL; throw; } diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 2d7d9c1804c2..125b881af63c 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -145,7 +145,7 @@ SbaXGridControl::~SbaXGridControl() { } -FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent) +FmXGridPeer* SbaXGridControl::imp_CreatePeer(vcl::Window* pParent) { FmXGridPeer* pReturn = new SbaXGridPeer(m_xContext); @@ -549,7 +549,7 @@ SbaXGridPeer* SbaXGridPeer::getImplementation(const Reference< XInterface >& _rx return NULL; } -FmGridControl* SbaXGridPeer::imp_CreateControl(Window* pParent, WinBits nStyle) +FmGridControl* SbaXGridPeer::imp_CreateControl(vcl::Window* pParent, WinBits nStyle) { return new SbaGridControl( m_xContext, pParent, this, nStyle); } @@ -706,7 +706,7 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM // SbaGridControl SbaGridControl::SbaGridControl(Reference< XComponentContext > _rM, - Window* pParent, FmXGridPeer* _pPeer, WinBits nBits) + vcl::Window* pParent, FmXGridPeer* _pPeer, WinBits nBits) :FmGridControl(_rM,pParent, _pPeer, nBits) ,m_pMasterListener(NULL) ,m_nAsyncDropEvent(0) diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index a088b29feaf6..6d59880cf35b 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -325,7 +325,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing() SbaXDataBrowserController::disposing(); } -bool SbaTableQueryBrowser::Construct(Window* pParent) +bool SbaTableQueryBrowser::Construct(vcl::Window* pParent) { if ( !SbaXDataBrowserController::Construct( pParent ) ) return false; @@ -1339,7 +1339,7 @@ void SbaTableQueryBrowser::implCheckExternalSlot( sal_uInt16 _nId ) if ( !m_xMainToolbar.is() ) return; - Window* pToolboxWindow = VCLUnoHelper::GetWindow( m_xMainToolbar ); + vcl::Window* pToolboxWindow = VCLUnoHelper::GetWindow( m_xMainToolbar ); ToolBox* pToolbox = dynamic_cast< ToolBox* >( pToolboxWindow ); OSL_ENSURE( pToolbox, "SbaTableQueryBrowser::implCheckExternalSlot: cannot obtain the toolbox window!" ); diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index a6d8810f7b0b..a4d44cbc6464 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; // OColumnControlWindow -OColumnControlWindow::OColumnControlWindow(Window* pParent +OColumnControlWindow::OColumnControlWindow(vcl::Window* pParent ,const Reference<XComponentContext>& _rxContext) : OFieldDescControl(pParent,NULL) , m_xContext(_rxContext) diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx index 3a14cdd3d2cf..9335be836606 100644 --- a/dbaccess/source/ui/control/FieldControls.cxx +++ b/dbaccess/source/ui/control/FieldControls.cxx @@ -26,7 +26,7 @@ namespace dbaui { namespace { -void lcl_setSpecialReadOnly( bool _bReadOnly, Window* _pWin ) +void lcl_setSpecialReadOnly( bool _bReadOnly, vcl::Window* _pWin ) { StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings(); const Color& rNewColor = _bReadOnly ? aSystemStyle.GetDialogColor() : aSystemStyle.GetFieldColor(); @@ -36,7 +36,7 @@ void lcl_setSpecialReadOnly( bool _bReadOnly, Window* _pWin ) } -OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, +OPropColumnEditCtrl::OPropColumnEditCtrl(vcl::Window* pParent, rtl::OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition, @@ -56,7 +56,7 @@ OPropColumnEditCtrl::SetSpecialReadOnly(bool _bReadOnly) -OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) +OPropEditCtrl::OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) :Edit(pParent, nWinStyle) ,m_nPos(nPosition) { @@ -78,14 +78,14 @@ OPropNumericEditCtrl::SetSpecialReadOnly(bool _bReadOnly) } -OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) +OPropNumericEditCtrl::OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) :NumericField(pParent, nWinStyle) ,m_nPos(nPosition) { m_strHelpText = ModuleRes(nHelpId); } -OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) +OPropListBoxCtrl::OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) :ListBox(pParent, nWinStyle) ,m_nPos(nPosition) { diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 44bf027627b3..d0c35b7cd759 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -93,7 +93,7 @@ namespace } // class OFieldDescControl -OFieldDescControl::OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar ) +OFieldDescControl::OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar ) :TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL ) ,pHelp( pHelpBar ) ,pLastFocusWindow(NULL) @@ -163,11 +163,11 @@ OFieldDescControl::~OFieldDescControl() { { - boost::scoped_ptr<Window> aTemp(m_pVertScroll); + boost::scoped_ptr<vcl::Window> aTemp(m_pVertScroll); m_pVertScroll = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pHorzScroll); + boost::scoped_ptr<vcl::Window> aTemp(m_pHorzScroll); m_pHorzScroll = NULL; } if ( m_bAdded ) @@ -226,7 +226,7 @@ IMPL_LINK(OFieldDescControl, OnScroll, ScrollBar*, /*pBar*/) namespace { - void getMaxXPosition(Window* _pWindow,long& _rnMaxXPosition) + void getMaxXPosition(vcl::Window* _pWindow,long& _rnMaxXPosition) { if (_pWindow) { @@ -1556,7 +1556,7 @@ void OFieldDescControl::GetFocus() } } -void OFieldDescControl::implFocusLost(Window* _pWhich) +void OFieldDescControl::implFocusLost(vcl::Window* _pWhich) { OSL_ENSURE(!_pWhich || IsChild(_pWhich), "OFieldDescControl::implFocusLost : invalid window !"); diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 9082511dded4..35bf2e2f0d00 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -78,7 +78,7 @@ namespace dbaui */ sal_uInt16 getColumnIdent( sal_uInt16 _nColId ) const; public: - ORelationControl(Window *pParent); + ORelationControl(vcl::Window *pParent); void SetController(OTableListBoxControl* pController) { m_pBoxControl = pController; @@ -127,7 +127,7 @@ namespace dbaui }; // class ORelationControl - ORelationControl::ORelationControl(Window *pParent) + ORelationControl::ORelationControl(vcl::Window *pParent) : EditBrowseBox(pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, WB_TABSTOP | WB_BORDER | BROWSER_AUTOSIZE_LASTCOL) @@ -138,7 +138,7 @@ namespace dbaui { } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeORelationControl(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeORelationControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new ORelationControl(pParent); } diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx index 1d4fe29ad2e9..bd3fd01c8f09 100644 --- a/dbaccess/source/ui/control/SqlNameEdit.cxx +++ b/dbaccess/source/ui/control/SqlNameEdit.cxx @@ -81,12 +81,12 @@ namespace dbaui } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOSQLNameEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOSQLNameEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new dbaui::OSQLNameEdit(pParent); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOSQLNameComboBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOSQLNameComboBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new dbaui::OSQLNameComboBox(pParent); } diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index abf2d5f489f4..f334c2b621b1 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -46,7 +46,7 @@ const sal_uInt16 COL_DROP = 8; // OTableGrantControl -OTableGrantControl::OTableGrantControl( Window* pParent, WinBits nBits) +OTableGrantControl::OTableGrantControl( vcl::Window* pParent, WinBits nBits) :EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, nBits ) ,m_pCheckCell( NULL ) ,m_pEdit( NULL ) diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index 975cefd84de9..d199b6f32fef 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -28,7 +28,7 @@ using namespace ::dbaui; // class OSplitterView -OSplitterView::OSplitterView(Window* _pParent,bool _bVertical) : Window(_pParent,WB_DIALOGCONTROL) // ,WB_BORDER +OSplitterView::OSplitterView(vcl::Window* _pParent,bool _bVertical) : Window(_pParent,WB_DIALOGCONTROL) // ,WB_BORDER ,m_pSplitter( NULL ) ,m_pLeft(NULL) ,m_pRight(NULL) @@ -183,7 +183,7 @@ void OSplitterView::Resize() } -void OSplitterView::set(Window* _pRight,Window* _pLeft) +void OSplitterView::set(vcl::Window* _pRight,Window* _pLeft) { m_pLeft = _pLeft; m_pRight = _pRight; diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx index 7327a5889f6d..3181a82a53aa 100644 --- a/dbaccess/source/ui/control/charsetlistbox.cxx +++ b/dbaccess/source/ui/control/charsetlistbox.cxx @@ -25,7 +25,7 @@ namespace dbaui { - CharSetListBox::CharSetListBox( Window* _pParent, WinBits _nBits = WB_DROPDOWN ) + CharSetListBox::CharSetListBox( vcl::Window* _pParent, WinBits _nBits = WB_DROPDOWN ) : ListBox( _pParent, _nBits ) { SetDropDownLineCount( 20 ); @@ -38,7 +38,7 @@ namespace dbaui } } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCharSetListBox(Window *pParent) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCharSetListBox(vcl::Window *pParent) { return new CharSetListBox(pParent); } diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index 3c856db50c18..22d8241448ca 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -25,7 +25,7 @@ namespace dbaui { -OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, WinBits _nBits,bool _bShowPrefix) +OConnectionURLEdit::OConnectionURLEdit(vcl::Window* _pParent, WinBits _nBits,bool _bShowPrefix) :Edit(_pParent, _nBits) ,m_pTypeCollection(NULL) ,m_pForcedPrefix(NULL) @@ -33,7 +33,7 @@ OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, WinBits _nBits,bool _bS { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeConnectionURLEdit(Window *pParent) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeConnectionURLEdit(vcl::Window *pParent) { return new OConnectionURLEdit(pParent, WB_BORDER, false); } diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index cdc185fb3e4c..71120eca7bc1 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::view; #define SPACEBETWEENENTRIES 4 // class DBTreeListBox -DBTreeListBox::DBTreeListBox( Window* pParent, WinBits nWinStyle ,bool _bHandleEnterKey) +DBTreeListBox::DBTreeListBox( vcl::Window* pParent, WinBits nWinStyle ,bool _bHandleEnterKey) :SvTreeListBox(pParent,nWinStyle) ,m_pDragedEntry(NULL) ,m_pActionListener(NULL) diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 3cb9c7d6c158..d51db97fb548 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -28,7 +28,7 @@ namespace dbaui using namespace ::com::sun::star::lang; -OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, WinBits nWinStyle ) +OMarkableTreeListBox::OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle ) : DBTreeListBox(pParent, nWinStyle) { diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index e696386b6f4b..f808ae9ae2e6 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -156,13 +156,13 @@ namespace dbaui // OpenButton - OpenDocumentButton::OpenDocumentButton( Window* _pParent, const sal_Char* _pAsciiModuleName ) + OpenDocumentButton::OpenDocumentButton( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName ) :PushButton( _pParent ) { impl_init( _pAsciiModuleName ); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentButton( Window *pParent, VclBuilder::stringmap & ) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOpenDocumentButton( vcl::Window *pParent, VclBuilder::stringmap & ) { return new OpenDocumentButton( pParent, "com.sun.star.sdb.OfficeDatabaseDocument" ); } @@ -186,13 +186,13 @@ namespace dbaui // OpenDocumentListBox - OpenDocumentListBox::OpenDocumentListBox( Window* _pParent, const sal_Char* _pAsciiModuleName ) + OpenDocumentListBox::OpenDocumentListBox( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName ) :ListBox( _pParent, WB_BORDER | WB_DROPDOWN ) { impl_init( _pAsciiModuleName ); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentListBox( Window *pParent, VclBuilder::stringmap & ) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOpenDocumentListBox( vcl::Window *pParent, VclBuilder::stringmap & ) { return new OpenDocumentListBox( pParent, "com.sun.star.sdb.OfficeDatabaseDocument" ); } diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 86dbf17aa0b3..20cacd7db203 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -65,7 +65,7 @@ namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject; namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer; // OTableTreeListBox -OTableTreeListBox::OTableTreeListBox(Window* pParent, WinBits nWinStyle) +OTableTreeListBox::OTableTreeListBox(vcl::Window* pParent, WinBits nWinStyle) :OMarkableTreeListBox(pParent, nWinStyle) ,m_xImageProvider( new ImageProvider ) ,m_bVirtualRoot(false) @@ -74,7 +74,7 @@ OTableTreeListBox::OTableTreeListBox(Window* pParent, WinBits nWinStyle) implSetDefaultImages(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOTableTreeListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOTableTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 6d82fc53b2d9..0a54a5a92a13 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::task; using namespace ::com::sun::star::sdbc; using namespace comphelper; -OCollectionView::OCollectionView( Window * pParent +OCollectionView::OCollectionView( vcl::Window * pParent ,const Reference< XContent>& _xContent ,const OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 5c4dc6ab3c6c..b31c067e4690 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -87,7 +87,7 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - OConnectionHelper::OConnectionHelper( Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs) + OConnectionHelper::OConnectionHelper( vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs) : OGenericAdministrationPage(pParent, _rId, _rUIXMLDescription, _rCoreAttrs) , m_bUserGrabFocus(false) , m_pCollection(NULL) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 78aa62db9293..117295bea89d 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -40,7 +40,7 @@ namespace dbaui bool m_bUserGrabFocus : 1; public: - OConnectionHelper( Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs); + OConnectionHelper( vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs); virtual ~OConnectionHelper(); FixedText *m_pFT_Connection; OConnectionURLEdit *m_pConnectionURL; diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index c76327c0e883..4e7b8cc39987 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -81,12 +81,12 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - SfxTabPage* OConnectionTabPage::Create( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* OConnectionTabPage::Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OConnectionTabPage( pParent, *_rAttrSet ) ); } // OConnectionTabPage - OConnectionTabPage::OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs) + OConnectionTabPage::OConnectionTabPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs) :OConnectionHelper(pParent, "ConnectionPage", "dbaccess/ui/connectionpage.ui", _rCoreAttrs) { get(m_pFL2, "userlabel"); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 692d5536440f..5e1c84fb88a1 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -55,7 +55,7 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ); virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; @@ -68,7 +68,7 @@ namespace dbaui affect the type may be changed (compared to the previous URL).</p> */ private: - OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs); + OConnectionTabPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); // nControlFlags is a combination of the CBTP_xxx-constants virtual ~OConnectionTabPage(); diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index e362b451b7e0..db19ebb9d21b 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -63,32 +63,32 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE); } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE); } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL); } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE); } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL); } - OConnectionTabPageSetup::OConnectionTabPageSetup(Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId) + OConnectionTabPageSetup::OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId) :OConnectionHelper(pParent, _rId, _rUIXMLDescription, _rCoreAttrs) ,m_bUserGrabFocus(true) { diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index 02dbbdfc0d49..5705c1530cc2 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -46,11 +46,11 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); public: - static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateDbaseTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateMSAccessTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateADOTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateODBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateUserDefinedTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; @@ -68,7 +68,7 @@ namespace dbaui OUString getConnectionURL( ) const; protected: - OConnectionTabPageSetup(Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId); + OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId); virtual bool checkTestConnection() SAL_OVERRIDE; // nControlFlags is a combination of the CBTP_xxx-constants virtual ~OConnectionTabPageSetup(); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index d025ab71141e..ceef0fe6f67f 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -60,13 +60,13 @@ namespace dbaui { using namespace ::com::sun::star; - OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OTextConnectionPageSetup( pParent, _rAttrSet ) ); } // OTextConnectionPageSetup - OTextConnectionPageSetup::OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OTextConnectionPageSetup::OTextConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OConnectionTabPageSetup(pParent, "DBWizTextPage", "dbaccess/ui/dbwiztextpage.ui", _rCoreAttrs, STR_TEXT_HELPTEXT, STR_TEXT_HEADERTEXT, STR_TEXT_PATH_OR_FILE) { @@ -124,13 +124,13 @@ using namespace ::com::sun::star; return m_pTextConnectionHelper->prepareLeave(); } - OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OLDAPConnectionPageSetup( pParent, _rAttrSet ) ); } // OLDAPPageSetup - OLDAPConnectionPageSetup::OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OLDAPConnectionPageSetup::OLDAPConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage(pParent, "LDAPConnectionPage", "dbaccess/ui/ldapconnectionpage.ui",_rCoreAttrs) { get(m_pFTHelpText, "helpLabel"); @@ -217,13 +217,13 @@ using namespace ::com::sun::star; return 0L; } - OMySQLIntroPageSetup* OMySQLIntroPageSetup::CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet ) + OMySQLIntroPageSetup* OMySQLIntroPageSetup::CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet ) { return ( new OMySQLIntroPageSetup( _pParent, _rAttrSet) ); } - OMySQLIntroPageSetup::OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OMySQLIntroPageSetup::OMySQLIntroPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage(pParent, "DBWizMysqlIntroPage", "dbaccess/ui/dbwizmysqlintropage.ui", _rCoreAttrs) { get(m_pODBCDatabase, "odbc"); @@ -290,7 +290,7 @@ using namespace ::com::sun::star; } // MySQLNativeSetupPage - MySQLNativeSetupPage::MySQLNativeSetupPage( Window* _pParent, const SfxItemSet& _rCoreAttrs ) + MySQLNativeSetupPage::MySQLNativeSetupPage( vcl::Window* _pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage( _pParent, "DBWizMysqlNativePage", "dbaccess/ui/dbwizmysqlnativepage.ui", _rCoreAttrs ) ,m_aMySQLSettings ( *get<VclVBox>("MySQLSettingsContainer"), getControlModifiedLink() ) { @@ -300,7 +300,7 @@ using namespace ::com::sun::star; SetRoadmapStateValue(false); } - OGenericAdministrationPage* MySQLNativeSetupPage::Create( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* MySQLNativeSetupPage::Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return new MySQLNativeSetupPage( pParent, _rAttrSet ); } @@ -343,7 +343,7 @@ using namespace ::com::sun::star; } // OMySQLJDBCConnectionPageSetup - OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId) + OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId) :OGenericAdministrationPage(pParent, "SpecialJDBCConnectionPage", "dbaccess/ui/specialjdbcconnectionpage.ui", _rCoreAttrs) ,m_nPortId(_nPortId) { @@ -387,7 +387,7 @@ using namespace ::com::sun::star; SetRoadmapStateValue(false); } - OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, _rAttrSet, @@ -398,7 +398,7 @@ using namespace ::com::sun::star; STR_MYSQL_DRIVERCLASSTEXT) ); } - OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, _rAttrSet, @@ -512,13 +512,13 @@ using namespace ::com::sun::star; return 0L; } - OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OJDBCConnectionPageSetup( pParent, _rAttrSet)); } // OMySQLJDBCConnectionPageSetup - OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs) + OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs) :OConnectionTabPageSetup(pParent, "JDBCConnectionPage", "dbaccess/ui/jdbcconnectionpage.ui", _rCoreAttrs, STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL) { @@ -621,13 +621,13 @@ using namespace ::com::sun::star; return 0L; } - OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OSpreadSheetConnectionPageSetup( pParent, _rAttrSet ) ); } - OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OConnectionTabPageSetup(pParent, "DBWizSpreadsheetPage", "dbaccess/ui/dbwizspreadsheetpage.ui", _rCoreAttrs, STR_SPREADSHEET_HELPTEXT, STR_SPREADSHEET_HEADERTEXT, STR_SPREADSHEETPATH) { get(m_pPasswordrequired, "passwordrequired"); @@ -662,13 +662,13 @@ using namespace ::com::sun::star; return bChangedSomething; } - OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OAuthentificationPageSetup( pParent, _rAttrSet) ); } - OAuthentificationPageSetup::OAuthentificationPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OAuthentificationPageSetup::OAuthentificationPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage(pParent, "AuthentificationPage", "dbaccess/ui/authentificationpage.ui", _rCoreAttrs ) { get(m_pFTHelpText, "helptext"); @@ -729,13 +729,13 @@ using namespace ::com::sun::star; return bChangedSomething; } - OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet) + OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet) { return ( new OFinalDBPageSetup( pParent, _rAttrSet) ); } - OFinalDBPageSetup::OFinalDBPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs) + OFinalDBPageSetup::OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs) : OGenericAdministrationPage(pParent, "PageFinal", "dbaccess/ui/finalpagewizard.ui", _rCoreAttrs) { diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 6ffd08b5c770..4756b6c75b57 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -40,8 +40,8 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); + static OGenericAdministrationPage* CreateSpreadSheetTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + OSpreadSheetConnectionPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); protected: CheckBox *m_pPasswordrequired; @@ -59,8 +59,8 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateTextTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + OTextConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; private: @@ -81,8 +81,8 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateLDAPTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + OLDAPConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); } protected: @@ -111,9 +111,9 @@ namespace dbaui MySQLNativeSettings m_aMySQLSettings; public: - MySQLNativeSetupPage( Window* _pParent, const SfxItemSet& _rCoreAttrs ); + MySQLNativeSetupPage( vcl::Window* _pParent, const SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE; @@ -132,15 +132,15 @@ namespace dbaui class OGeneralSpecialJDBCConnectionPageSetup : public OGenericAdministrationPage { public: - OGeneralSpecialJDBCConnectionPageSetup( Window* pParent + OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent , const SfxItemSet& _rCoreAttrs , sal_uInt16 _nPortId , sal_uInt16 _nDefaultPortResId , sal_uInt16 _nHelpTextResId , sal_uInt16 _nHeaderTextResId , sal_uInt16 _nDriverClassId ); - static OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateOracleJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; @@ -173,8 +173,8 @@ namespace dbaui class OJDBCConnectionPageSetup : public OConnectionTabPageSetup { public: - OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + OJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: virtual bool checkTestConnection() SAL_OVERRIDE; @@ -202,9 +202,9 @@ namespace dbaui VIA_NATIVE }; - OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs); + OMySQLIntroPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); - static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet ); ConnectionType getMySQLMode(); Link maClickHdl; void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } @@ -232,8 +232,8 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); + static OGenericAdministrationPage* CreateAuthentificationTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + OAuthentificationPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); protected: FixedText* m_pFTHelpText; @@ -254,7 +254,7 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet); + static OGenericAdministrationPage* CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet); FixedText* m_pFTFinalHeader; FixedText* m_pFTFinalHelpText; @@ -265,7 +265,7 @@ namespace dbaui CheckBox* m_pCBStartTableWizard; FixedText* m_pFTFinalText; - OFinalDBPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); + OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); bool IsDatabaseDocumentToBeRegistered(); bool IsDatabaseDocumentToBeOpened(); bool IsTableWizardToBeStarted(); diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 5387c6359e0f..f459c81add7f 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -139,7 +139,7 @@ namespace } // ODbDataSourceAdministrationHelper -ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Reference< XComponentContext >& _xORB,Window* _pParent,IItemSetHelper* _pItemSetHelper) +ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Reference< XComponentContext >& _xORB, vcl::Window* _pParent,IItemSetHelper* _pItemSetHelper) : m_xContext(_xORB) , m_pParent(_pParent) , m_pItemSetHelper(_pItemSetHelper) diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index de06359af2bd..4b46778afb92 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <svl/poolitem.hxx> -class Window; +namespace vcl { class Window; } namespace dbaui { namespace DataSourceInfoConverter @@ -68,12 +68,12 @@ namespace dbaui MapInt2String m_aDirectPropTranslator; /// translating property id's into names (direct properties of a data source) MapInt2String m_aIndirectPropTranslator; /// translating property id's into names (indirect properties of a data source) - Window* m_pParent; + vcl::Window* m_pParent; IItemSetHelper* m_pItemSetHelper; public: ODbDataSourceAdministrationHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xORB - ,Window* _pParent + ,vcl::Window* _pParent ,IItemSetHelper* _pItemSetHelper); /** translate the current dialog SfxItems into driver relevant PropertyValues diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index a31fd62625fd..6a6ed636f295 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -24,7 +24,7 @@ #include <vector> class SfxTabPage; -class Window; +namespace vcl { class Window; } namespace dbaui { /// a collection class for all details a driver needs @@ -44,53 +44,53 @@ namespace dbaui /** Creates the detail page for Dbase */ - static SfxTabPage* CreateDbase2( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateDbase2( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for ado */ - static SfxTabPage* CreateDbase( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateDbase( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for ado */ - static SfxTabPage* CreateAdo( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateAdo( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for ODBC */ - static SfxTabPage* CreateODBC( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateODBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for user */ - static SfxTabPage* CreateUser( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateUser( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for MySQLODBC */ - static SfxTabPage* CreateMySQLODBC( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateMySQLODBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for MySQLJDBC */ - static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateMySQLJDBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for MySQLNATIVE */ - static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateMySQLNATIVE( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for Oracle JDBC */ - static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateOracleJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for LDAP */ - static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateLDAP( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /// Creates the detail page for Text - static SfxTabPage* CreateText( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateText( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /// creates the GeneratedValues page - static SfxTabPage* CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateGeneratedValuesPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /// creates the "Special Settings" page of the "Advanced Settings" dialog - static SfxTabPage* CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateSpecialSettingsPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); }; } diff --git a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx index 1907630ada63..2c8b9b68ab48 100644 --- a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx +++ b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx @@ -13,7 +13,7 @@ namespace dbaui { QueryPropertiesDialog::QueryPropertiesDialog( - Window* pParent, const bool bDistinct, const sal_Int64 nLimit ) + vcl::Window* pParent, const bool bDistinct, const sal_Int64 nLimit ) : ModalDialog(pParent, "QueryPropertiesDialog", "dbaccess/ui/querypropertiesdialog.ui") , m_pRB_Distinct( 0 ) , m_pRB_NonDistinct( 0 ) diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index f7f2789ef8b2..a4a51e3d2623 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::container; // OTableSubscriptionDialog -OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent +OTableSubscriptionDialog::OTableSubscriptionDialog(vcl::Window* pParent ,SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName) diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index aab6965310df..c99292a925ef 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -56,7 +56,7 @@ namespace dbaui { - OTextConnectionHelper::OTextConnectionHelper( Window* pParent, const short _nAvailableSections ) + OTextConnectionHelper::OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections ) :TabPage(pParent, "TextPage", "dbaccess/ui/textpage.ui") ,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST)) ,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST)) @@ -114,7 +114,7 @@ namespace dbaui struct SectionDescriptor { short nFlag; - Window* pFirstControl; + vcl::Window* pFirstControl; } aSections[] = { { TC_EXTENSION, m_pExtensionHeader }, { TC_SEPARATORS, m_pFormatHeader }, @@ -131,14 +131,14 @@ namespace dbaui continue; } - Window* pThisSection = aSections[section].pFirstControl; - Window* pNextSection = aSections[section+1].pFirstControl; + vcl::Window* pThisSection = aSections[section].pFirstControl; + vcl::Window* pNextSection = aSections[section+1].pFirstControl; // hide all elements from this section - Window* pControl = pThisSection; + vcl::Window* pControl = pThisSection; while ( ( pControl != pNextSection ) && pControl ) { - Window* pRealWindow = pControl->GetWindow( WINDOW_CLIENT ); + vcl::Window* pRealWindow = pControl->GetWindow( WINDOW_CLIENT ); #if OSL_DEBUG_LEVEL > 0 OUString sWindowText( pRealWindow->GetText() ); (void)sWindowText; diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index a45574ba8a9b..b9317f8b46b6 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -47,7 +47,7 @@ namespace dbaui Link m_aModifiedHandler; /// to be called if something on the page has been modified public: - OTextConnectionHelper( Window* pParent, const short _nAvailableSections ); + OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections ); virtual ~OTextConnectionHelper(); private: diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index d6dc4f2bae98..6afe53364b3b 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -61,13 +61,13 @@ class OPasswordDialog : public ModalDialog DECL_LINK( ModifiedHdl, Edit * ); public: - OPasswordDialog( Window* pParent,const OUString& _sUserName); + OPasswordDialog( vcl::Window* pParent,const OUString& _sUserName); OUString GetOldPassword() const { return m_pEDOldPassword->GetText(); } OUString GetNewPassword() const { return m_pEDPassword->GetText(); } }; -OPasswordDialog::OPasswordDialog(Window* _pParent,const OUString& _sUserName) +OPasswordDialog::OPasswordDialog(vcl::Window* _pParent,const OUString& _sUserName) : ModalDialog(_pParent, "PasswordDialog", "dbaccess/ui/password.ui") { get(m_pUser, "userframe"); @@ -108,7 +108,7 @@ IMPL_LINK( OPasswordDialog, ModifiedHdl, Edit *, pEdit ) } // OUserAdmin -OUserAdmin::OUserAdmin(Window* pParent,const SfxItemSet& _rAttrSet) +OUserAdmin::OUserAdmin(vcl::Window* pParent,const SfxItemSet& _rAttrSet) : OGenericAdministrationPage( pParent, "UserAdminPage", "dbaccess/ui/useradminpage.ui", _rAttrSet) , m_pUSER(0) , m_pNEWUSER(0) @@ -181,7 +181,7 @@ void OUserAdmin::FillUserNames() } -SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet* _rAttrSet ) +SfxTabPage* OUserAdmin::Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OUserAdmin( pParent, *_rAttrSet ) ); } diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 8d8115cce534..605baea7b30e 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -60,9 +60,9 @@ protected: void FillUserNames(); - OUserAdmin( Window* pParent, const SfxItemSet& _rCoreAttrs); + OUserAdmin( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ); virtual ~OUserAdmin(); OUString GetUser(); diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 633e83e2998c..2b17eccec0f9 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -46,7 +46,7 @@ namespace dbaui using namespace ::com::sun::star::sdbcx; // OUserAdminDlg - OUserAdminDlg::OUserAdminDlg(Window* _pParent + OUserAdminDlg::OUserAdminDlg(vcl::Window* _pParent , SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName @@ -119,7 +119,7 @@ namespace dbaui static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( m_pImpl->getORB() ); static_cast<OGenericAdministrationPage&>(_rPage).SetAdminDialog(this,this); - Window *pWin = GetViewWindow(); + vcl::Window *pWin = GetViewWindow(); if(pWin) pWin->Invalidate(); diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 94459d8be876..ddff2e67b7cf 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -56,14 +56,14 @@ namespace dbaui } // IWindowOperator - virtual void operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const SAL_OVERRIDE; + virtual void operateOn( const VclWindowEvent& _rTrigger, vcl::Window& _rOperateOn ) const SAL_OVERRIDE; private: const OUString m_sDisabledText; OUString m_sUserText; }; - void TextResetOperator::operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const + void TextResetOperator::operateOn( const VclWindowEvent& _rTrigger, vcl::Window& _rOperateOn ) const { OSL_ENSURE( _rTrigger.GetWindow() == &_rOperateOn, "TextResetOperator::operateOn: you're misusing this implementation!" ); @@ -116,7 +116,7 @@ namespace dbaui ,public ::svt::DialogController { public: - TextResetOperatorController( Window& _rObservee, const OUString& _rDisabledText ) + TextResetOperatorController( vcl::Window& _rObservee, const OUString& _rDisabledText ) :TextResetOperatorController_Base( _rDisabledText ) ,::svt::DialogController( _rObservee, getEventFilter(), getOperator() ) { @@ -125,7 +125,7 @@ namespace dbaui }; // MySQLNativeSettings - MySQLNativeSettings::MySQLNativeSettings( Window& _rParent, const Link& _rControlModificationLink ) + MySQLNativeSettings::MySQLNativeSettings( vcl::Window& _rParent, const Link& _rControlModificationLink ) :TabPage( &_rParent, "MysqlNativeSettings", "dbaccess/ui/mysqlnativesettings.ui" ) { get(m_pDatabaseNameLabel, "dbnamelabel"); diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index daff95a6a918..e6e214dca1b9 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -52,7 +52,7 @@ namespace dbaui m_aControlDependencies; public: - MySQLNativeSettings( Window& _rParent, const Link& _rControlModificationLink ); + MySQLNativeSettings( vcl::Window& _rParent, const Link& _rControlModificationLink ); virtual ~MySQLNativeSettings(); void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 8a5991e6a0b0..0d1510998831 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -56,7 +56,7 @@ namespace dbaui { } - OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) + OGenericAdministrationPage::OGenericAdministrationPage(vcl::Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, _rId, _rUIXMLDescription, &_rAttrSet) ,m_abEnableRoadmap(false) ,m_pAdminDialog(NULL) @@ -258,7 +258,7 @@ namespace dbaui Point aReference = _rReference.GetPosPixel(); aReference.Y() += _rReference.GetSizePixel().Height(); - const Window* pConverter = _rControl.GetParent(); + const vcl::Window* pConverter = _rControl.GetParent(); Size aOffset = pConverter->LogicToPixel( Size( _nIndentAppFont, ( _eRelation == RelatedControls ? 3 : 6 ) ), MAP_APPFONT ); Point aControlPos( aReference.X() + aOffset.Width(), aReference.Y() + aOffset.Height() ); diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index bf6ec61d005f..d822a6a64031 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -102,7 +102,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xORB; public: - OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet); + OGenericAdministrationPage(vcl::Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet); /// set a handler which gets called every time something on the page has been modified void SetModifiedHandler(const Link& _rHandler) { m_aModifiedHandler = _rHandler; } @@ -256,7 +256,7 @@ namespace dbaui /** fits the button size to be large enough to contain the buttons text */ static void fitSizeRightAligned( PushButton& io_button ); - // why is CalcMinimumSize not a virtual method of ::Window? + // why is CalcMinimumSize not a virtual method of vcl::Window? }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index e5721abe2ecc..d10b40cd32d6 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -314,7 +314,7 @@ bool QueryListFacade::isLeafSelected() const return pEntry && !m_rQueryList.GetModel()->HasChildren( pEntry ); } -OAddTableDlg::OAddTableDlg( Window* pParent, IAddTableDialogContext& _rContext ) +OAddTableDlg::OAddTableDlg( vcl::Window* pParent, IAddTableDialogContext& _rContext ) : ModelessDialog(pParent, "TablesJoinDialog", "dbaccess/ui/tablesjoindialog.ui") , m_rContext(_rContext) { diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 27c202e58799..dadbb5c467fb 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -55,7 +55,7 @@ namespace dbaui }; // SpecialSettingsPage - SpecialSettingsPage::SpecialSettingsPage( Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ) + SpecialSettingsPage::SpecialSettingsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ) : OGenericAdministrationPage(pParent, "SpecialSettingsPage", "dbaccess/ui/specialsettingspage.ui", _rCoreAttrs) , m_pIsSQL92Check( NULL ) @@ -295,7 +295,7 @@ namespace dbaui } // GeneratedValuesPage - GeneratedValuesPage::GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + GeneratedValuesPage::GeneratedValuesPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) : OGenericAdministrationPage(pParent, "GeneratedValuesPage", "dbaccess/ui/generatedvaluespage.ui", _rCoreAttrs) { @@ -368,7 +368,7 @@ namespace dbaui } // AdvancedSettingsDialog - AdvancedSettingsDialog::AdvancedSettingsDialog( Window* _pParent, SfxItemSet* _pItems, + AdvancedSettingsDialog::AdvancedSettingsDialog( vcl::Window* _pParent, SfxItemSet* _pItems, const Reference< XComponentContext >& _rxContext, const Any& _aDataSourceName ) : SfxTabDialog(_pParent, "AdvancedSettingsDialog", "dbaccess/ui/advancedsettingsdialog.ui", _pItems) @@ -435,7 +435,7 @@ namespace dbaui static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( getORB() ); static_cast<OGenericAdministrationPage&>(_rPage).SetAdminDialog(this,this); - Window *pWin = GetViewWindow(); + vcl::Window *pWin = GetViewWindow(); if(pWin) pWin->Invalidate(); diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index ff28557b804d..af8d91a8d258 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -74,7 +74,7 @@ namespace dbaui public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - SpecialSettingsPage(Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ); + SpecialSettingsPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ); protected: virtual ~SpecialSettingsPage(); @@ -110,7 +110,7 @@ namespace dbaui public: virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; - GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + GeneratedValuesPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: // nControlFlags is a combination of the CBTP_xxx-constants diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 8f99adbb4533..ff60c14f8995 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -47,7 +47,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::container; // ODbAdminDialog -ODbAdminDialog::ODbAdminDialog(Window* _pParent +ODbAdminDialog::ODbAdminDialog(vcl::Window* _pParent , SfxItemSet* _pItems , const Reference< XComponentContext >& _rxContext) : SfxTabDialog(_pParent, "AdminDialog", @@ -85,7 +85,7 @@ void ODbAdminDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( getORB() ); static_cast<OGenericAdministrationPage&>(_rPage).SetAdminDialog(this,this); - Window *pWin = GetViewWindow(); + vcl::Window *pWin = GetViewWindow(); if(pWin) pWin->Invalidate(); diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index ad111503149d..238a8ba415aa 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -40,7 +40,7 @@ using namespace ::svt; const OString aGroupIdent("dBase III"); -ODbaseIndexDialog::ODbaseIndexDialog(Window * pParent, const OUString& aDataSrcName) +ODbaseIndexDialog::ODbaseIndexDialog(vcl::Window * pParent, const OUString& aDataSrcName) : ModalDialog(pParent, "DBaseIndexDialog", "dbaccess/ui/dbaseindexdialog.ui") , m_aDSN(aDataSrcName) , m_bCaseSensitiv(true) diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index e2cc016a9085..58aae3b04091 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -112,7 +112,7 @@ protected: void checkButtons(); public: - ODbaseIndexDialog( Window * pParent, const OUString& aDataSrcName ); + ODbaseIndexDialog( vcl::Window * pParent, const OUString& aDataSrcName ); }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 03ffa016812c..00dcddd2d87d 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -62,7 +62,7 @@ using namespace com::sun::star::container; #define ADDITIONAL_PAGE_MYSQL_NATIVE 12 // ODbTypeWizDialog -ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent +ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent ,SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 175f6c8d37c0..5649db4547ea 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -100,7 +100,7 @@ using namespace ::comphelper; using namespace ::cppu; // ODbTypeWizDialogSetup -ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent +ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent ,SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index a0257d58dd4f..0904d6d1967c 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -56,7 +56,7 @@ namespace dbaui using namespace ::com::sun::star::container; using namespace ::dbtools; - OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, const OString& rId, + OCommonBehaviourTabPage::OCommonBehaviourTabPage(vcl::Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags) @@ -187,7 +187,7 @@ namespace dbaui } // ODbaseDetailsPage - ODbaseDetailsPage::ODbaseDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + ODbaseDetailsPage::ODbaseDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "DbasePage", "dbaccess/ui/dbasepage.ui", _rCoreAttrs, CBTP_USE_CHARSET) { get(m_pShowDeleted, "showDelRowsCheckbutton"); @@ -204,7 +204,7 @@ namespace dbaui } - SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateDbase( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new ODbaseDetailsPage( pParent, *_rAttrSet ) ); } @@ -260,7 +260,7 @@ namespace dbaui } // OAdoDetailsPage - OAdoDetailsPage::OAdoDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OAdoDetailsPage::OAdoDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "AutoCharset", "dbaccess/ui/autocharsetpage.ui", _rCoreAttrs, CBTP_USE_CHARSET ) { @@ -270,20 +270,20 @@ namespace dbaui { } - SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateAdo( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OAdoDetailsPage( pParent, *_rAttrSet ) ); } // OOdbcDetailsPage - OOdbcDetailsPage::OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OOdbcDetailsPage::OOdbcDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "ODBC", "dbaccess/ui/odbcpage.ui", _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS) { get(m_pUseCatalog, "useCatalogCheckbutton"); m_pUseCatalog->SetToggleHdl(getControlModifiedLink()); } - SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateODBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OOdbcDetailsPage( pParent, *_rAttrSet ) ); } @@ -308,7 +308,7 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } // OOdbcDetailsPage - OUserDriverDetailsPage::OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OUserDriverDetailsPage::OUserDriverDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) : OCommonBehaviourTabPage(pParent, "UserDetailsPage", "dbaccess/ui/userdetailspage.ui", _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS) { @@ -321,7 +321,7 @@ namespace dbaui m_pUseCatalog->SetToggleHdl(getControlModifiedLink()); } - SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateUser( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OUserDriverDetailsPage( pParent, *_rAttrSet ) ); } @@ -373,18 +373,18 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } // OMySQLODBCDetailsPage - OMySQLODBCDetailsPage::OMySQLODBCDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OMySQLODBCDetailsPage::OMySQLODBCDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "AutoCharset", "dbaccess/ui/autocharsetpage.ui", _rCoreAttrs, CBTP_USE_CHARSET ) { } - SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLODBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OMySQLODBCDetailsPage( pParent, *_rAttrSet ) ); } // OMySQLJDBCDetailsPage - OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, bool bShowSocket ) + OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, bool bShowSocket ) :OCommonBehaviourTabPage(pParent, "GeneralSpecialJDBCDetails", "dbaccess/ui/generalspecialjdbcdetailspage.ui", _rCoreAttrs, CBTP_USE_CHARSET) ,m_nPortId(_nPortId) ,m_bUseClass(true) @@ -514,7 +514,7 @@ namespace dbaui } // MySQLNativePage - MySQLNativePage::MySQLNativePage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + MySQLNativePage::MySQLNativePage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "MysqlNativePage", "dbaccess/ui/mysqlnativepage.ui", _rCoreAttrs, CBTP_USE_CHARSET ) ,m_aMySQLSettings ( *get<VclVBox>("MySQLSettingsContainer"), getControlModifiedLink() ) { @@ -584,22 +584,22 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OGeneralSpecialJDBCDetailsPage( pParent, *_rAttrSet,DSID_MYSQL_PORTNUMBER ) ); } - SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLNATIVE( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new MySQLNativePage( pParent, *_rAttrSet ) ); } - SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateOracleJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OGeneralSpecialJDBCDetailsPage( pParent, *_rAttrSet,DSID_ORACLE_PORTNUMBER, false) ); } // OLDAPDetailsPage - OLDAPDetailsPage::OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OLDAPDetailsPage::OLDAPDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "LDAP", "dbaccess/ui/ldappage.ui", _rCoreAttrs, 0) { get(m_pETBaseDN, "baseDNEntry"); @@ -619,7 +619,7 @@ namespace dbaui m_pCBUseSSL->SetClickHdl(LINK(this, OLDAPDetailsPage,OnCheckBoxClick)); } - SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateLDAP( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OLDAPDetailsPage( pParent, *_rAttrSet ) ); } @@ -676,7 +676,7 @@ namespace dbaui } // OTextDetailsPage - OTextDetailsPage::OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OTextDetailsPage::OTextDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "EmptyPage", "dbaccess/ui/emptypage.ui", _rCoreAttrs, 0) { @@ -689,7 +689,7 @@ namespace dbaui } - SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateText( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OTextDetailsPage( pParent, *_rAttrSet ) ); } @@ -727,12 +727,12 @@ namespace dbaui return m_pTextConnectionHelper->prepareLeave(); } - SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ) { return new GeneratedValuesPage( _pParent, *_rAttrSet ); } - SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ) { OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( *_rAttrSet ); DataSourceMetaData aMetaData( eType ); diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 8fbba3c536fa..6ffef01e1434 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -73,7 +73,7 @@ namespace dbaui virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; // nControlFlags is a combination of the CBTP_xxx-constants - OCommonBehaviourTabPage(Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags); + OCommonBehaviourTabPage(vcl::Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags); protected: virtual ~OCommonBehaviourTabPage(); @@ -94,7 +94,7 @@ namespace dbaui public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - ODbaseDetailsPage(Window* pParent, const SfxItemSet& _rCoreAttrs); + ODbaseDetailsPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); private: CheckBox* m_pShowDeleted; FixedText* m_pFT_Message; @@ -120,7 +120,7 @@ namespace dbaui virtual ~OAdoDetailsPage(); public: - OAdoDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OAdoDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); }; // OOdbcDetailsPage @@ -129,7 +129,7 @@ namespace dbaui public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OOdbcDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; private: @@ -142,7 +142,7 @@ namespace dbaui public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OUserDriverDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -159,14 +159,14 @@ namespace dbaui class OMySQLODBCDetailsPage : public OCommonBehaviourTabPage { public: - OMySQLODBCDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OMySQLODBCDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); }; // OGeneralSpecialJDBCDetailsPage class OGeneralSpecialJDBCDetailsPage : public OCommonBehaviourTabPage { public: - OGeneralSpecialJDBCDetailsPage( Window* pParent + OGeneralSpecialJDBCDetailsPage( vcl::Window* pParent , const SfxItemSet& _rCoreAttrs , sal_uInt16 _nPortId , bool bShowSocket = true @@ -198,7 +198,7 @@ namespace dbaui class MySQLNativePage : public OCommonBehaviourTabPage { public: - MySQLNativePage( Window* pParent, + MySQLNativePage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); private: @@ -223,7 +223,7 @@ namespace dbaui public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OLDAPDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; private: @@ -244,7 +244,7 @@ namespace dbaui virtual ~OMozillaDetailsPage(); public: - OMozillaDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OMozillaDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); }; // OTextDetailsPage @@ -253,7 +253,7 @@ namespace dbaui public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OTextDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; private: diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index e78dd8387beb..b02b73332e6f 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -35,7 +35,7 @@ namespace dbaui using namespace ::com::sun::star::lang; // DirectSQLDialog - DirectSQLDialog::DirectSQLDialog( Window* _pParent, const Reference< XConnection >& _rxConn ) + DirectSQLDialog::DirectSQLDialog( vcl::Window* _pParent, const Reference< XConnection >& _rxConn ) :ModalDialog(_pParent, "DirectSQLDialog" , "dbaccess/ui/directsqldialog.ui") ,m_nHistoryLimit(20) ,m_nStatusCount(1) diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index 8af7569c36b6..468233f5c748 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -34,7 +34,7 @@ using namespace dbaui; -SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs, +SbaSbAttrDlg::SbaSbAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs, SvNumberFormatter* pFormatter, bool bHasFormat, bool bRow) : SfxTabDialog(pParent, "FieldDialog", "dbaccess/ui/fielddialog.ui", pCellAttrs) , m_nNumberFormatId(0) diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index 72219bb317ab..e2817a3d9b7a 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -176,7 +176,7 @@ namespace } } -OSaveAsDlg::OSaveAsDlg( Window * pParent, +OSaveAsDlg::OSaveAsDlg( vcl::Window * pParent, const sal_Int32& _rType, const Reference< XComponentContext >& _rxContext, const Reference< XConnection>& _xConnection, @@ -269,7 +269,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, implInit(); } -OSaveAsDlg::OSaveAsDlg( Window * pParent, +OSaveAsDlg::OSaveAsDlg( vcl::Window * pParent, const Reference< XComponentContext >& _rxContext, const OUString& rDefault, const OUString& _sLabel, diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index 209aecebb219..f73a1a27e95f 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -27,7 +27,7 @@ namespace dbaui #define DEF_ROW_HEIGHT 45 #define DEF_COL_WIDTH 227 -DlgSize::DlgSize( Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard ) +DlgSize::DlgSize( vcl::Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard ) : ModalDialog(pParent, bRow ? OString("RowHeightDialog") : OString("ColWidthDialog"), bRow ? OUString("dbaccess/ui/rowheightdialog.ui") : OUString("dbaccess/ui/colwidthdialog.ui")) , m_nPrevValue(nVal) diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 5583bfc5abb1..bcd1dc6add60 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::ui::dialogs; using namespace ::comphelper; -ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet) +ODatasourceSelectDialog::ODatasourceSelectDialog(vcl::Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet) : ModalDialog(_pParent, "ChooseDataSourceDialog", "dbaccess/ui/choosedatasourcedialog.ui") , m_pOutputSet(_pOutputSet) diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index d1e0deaddc67..298d7464fb87 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -52,7 +52,7 @@ protected: #endif public: - ODatasourceSelectDialog( Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet = NULL ); + ODatasourceSelectDialog( vcl::Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet = NULL ); virtual ~ODatasourceSelectDialog(); OUString GetSelected() const { return m_pDatasource->GetSelectEntry();} diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 77f970304606..29b08e0c7091 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -51,7 +51,7 @@ namespace dbaui using namespace ::com::sun::star::container; // OGeneralPage - OGeneralPage::OGeneralPage( Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ) + OGeneralPage::OGeneralPage( vcl::Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ) :OGenericAdministrationPage( pParent, "PageGeneral", _rUIXMLDescription, _rItems ) ,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN ) ,m_pSpecialMessage ( NULL ) @@ -439,7 +439,7 @@ namespace dbaui } // OGeneralPageDialog - OGeneralPageDialog::OGeneralPageDialog( Window* pParent, const SfxItemSet& _rItems ) + OGeneralPageDialog::OGeneralPageDialog( vcl::Window* pParent, const SfxItemSet& _rItems ) :OGeneralPage( pParent, "dbaccess/ui/generalpagedialog.ui", _rItems ) { } @@ -482,7 +482,7 @@ namespace dbaui } // OGeneralPageWizard - OGeneralPageWizard::OGeneralPageWizard( Window* pParent, const SfxItemSet& _rItems ) + OGeneralPageWizard::OGeneralPageWizard( vcl::Window* pParent, const SfxItemSet& _rItems ) :OGeneralPage( pParent, "dbaccess/ui/generalpagewizard.ui", _rItems ) ,m_pRB_CreateDatabase ( NULL ) ,m_pRB_OpenExistingDatabase ( NULL ) diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 8fe77e17845c..0668f679721a 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -33,7 +33,7 @@ namespace dbaui class OGeneralPage : public OGenericAdministrationPage { protected: - OGeneralPage( Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ); + OGeneralPage( vcl::Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ); virtual ~OGeneralPage(); OUString m_eCurrentSelection; /// currently selected type @@ -102,7 +102,7 @@ namespace dbaui class OGeneralPageDialog : public OGeneralPage { public: - OGeneralPageDialog( Window* pParent, const SfxItemSet& _rItems ); + OGeneralPageDialog( vcl::Window* pParent, const SfxItemSet& _rItems ); protected: virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; @@ -115,7 +115,7 @@ namespace dbaui class OGeneralPageWizard : public OGeneralPage { public: - OGeneralPageWizard( Window* pParent, const SfxItemSet& _rItems ); + OGeneralPageWizard( vcl::Window* pParent, const SfxItemSet& _rItems ); public: enum CreationMode diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 278af5a99388..9f2989efc949 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -87,7 +87,7 @@ namespace dbaui } // DbaIndexList - DbaIndexList::DbaIndexList(Window* _pParent, WinBits nWinBits) + DbaIndexList::DbaIndexList(vcl::Window* _pParent, WinBits nWinBits) :SvTreeListBox(_pParent, nWinBits) ,m_bSuspendSelectHdl(false) { @@ -158,13 +158,13 @@ namespace dbaui return bReturn; } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDbaIndexList(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDbaIndexList(vcl::Window *pParent, VclBuilder::stringmap &) { return new DbaIndexList (pParent, WB_BORDER); } // DbaIndexDialog - DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< OUString >& _rFieldNames, + DbaIndexDialog::DbaIndexDialog( vcl::Window* _pParent, const Sequence< OUString >& _rFieldNames, const Reference< XNameAccess >& _rxIndexes, const Reference< XConnection >& _rxConnection, const Reference< XComponentContext >& _rxContext,sal_Int32 _nMaxColumnsInIndex) diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index b82f719ba14d..08901ac03c97 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -90,7 +90,7 @@ namespace dbaui } // IndexFieldsControl - IndexFieldsControl::IndexFieldsControl( Window* _pParent, WinBits nWinStyle) + IndexFieldsControl::IndexFieldsControl( vcl::Window* _pParent, WinBits nWinStyle) : EditBrowseBox(_pParent, EBBF_SMART_TAB_TRAVEL | EBBF_ACTIVATE_ON_BUTTONDOWN, nWinStyle, BROWSER_STANDARD_FLAGS) , m_aSeekRow(m_aFields.end()) , m_pSortingCell(NULL) @@ -103,7 +103,7 @@ namespace dbaui GetDataWindow().SetUniqueId( UID_DLGINDEX_INDEXDETAILS_MAIN ); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDbaIndexFieldsControl(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDbaIndexFieldsControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new IndexFieldsControl (pParent, WB_BORDER | WB_NOTABSTOP); } diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 0d4267e5f182..d21d742670f8 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -51,7 +51,7 @@ namespace dbaui OParameterDialog::OParameterDialog( - Window* pParent, const Reference< XIndexAccess > & rParamContainer, + vcl::Window* pParent, const Reference< XIndexAccess > & rParamContainer, const Reference< XConnection > & _rxConnection, const Reference< XComponentContext >& rxContext) :ModalDialog( pParent, "Parameters", "dbaccess/ui/parametersdialog.ui") ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND) @@ -341,7 +341,7 @@ namespace dbaui m_pOKBtn->SetStyle(m_pOKBtn->GetStyle() | WB_DEFBUTTON); // set to focus to one of the buttons temporary (with this their "default"-state is really updated) - Window* pOldFocus = Application::GetFocusWindow(); + vcl::Window* pOldFocus = Application::GetFocusWindow(); // if the old focus window is the value edit do some preparations ... Selection aSel; diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 21b05b13ce2c..c686ae53f19b 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -62,7 +62,7 @@ void Replace_SQL_PlaceHolder(OUString& aString) } -DlgFilterCrit::DlgFilterCrit(Window * pParent, +DlgFilterCrit::DlgFilterCrit(vcl::Window * pParent, const Reference< XComponentContext >& rxContext, const Reference< XConnection>& _rxConnection, const Reference< XSingleSelectQueryComposer >& _rxComposer, diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 47f42749ffcb..69f5fe4ae4e3 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::beans; -DlgOrderCrit::DlgOrderCrit(Window * pParent, +DlgOrderCrit::DlgOrderCrit(vcl::Window * pParent, const Reference< XConnection>& _rxConnection, const Reference< XSingleSelectQueryComposer >& _rxComposer, const Reference< XNameAccess>& _rxCols) diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 991319d1b880..2ab17aac08b2 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -301,13 +301,13 @@ class OExceptionChainDialog : public ModalDialog ExceptionDisplayChain m_aExceptions; public: - OExceptionChainDialog( Window* pParent, const ExceptionDisplayChain& _rExceptions ); + OExceptionChainDialog( vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions ); protected: DECL_LINK(OnExceptionSelected, void*); }; -OExceptionChainDialog::OExceptionChainDialog(Window* pParent, const ExceptionDisplayChain& _rExceptions) +OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions) : ModalDialog(pParent, "SQLExceptionDialog", "dbaccess/ui/sqlexception.ui") , m_aExceptions(_rExceptions) { @@ -413,7 +413,7 @@ struct SQLMessageBox_Impl namespace { - void lcl_positionInAppFont( const Window& _rParent, Window& _rChild, long _nX, long _nY, long _Width, long _Height ) + void lcl_positionInAppFont( const vcl::Window& _rParent, vcl::Window& _rChild, long _nX, long _nY, long _Width, long _Height ) { Point aPos = _rParent.LogicToPixel( Point( _nX, _nY ), MAP_APPFONT ); Size aSize = _rParent.LogicToPixel( Size( _Width, _Height ), MAP_APPFONT ); @@ -664,7 +664,7 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage ) impl_addDetailsButton(); } -OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rException, WinBits _nStyle, const OUString& _rHelpURL ) +OSQLMessageBox::OSQLMessageBox(vcl::Window* _pParent, const SQLExceptionInfo& _rException, WinBits _nStyle, const OUString& _rHelpURL ) :ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG ) ,m_aInfoImage( this ) ,m_aTitle( this, WB_WORDBREAK | WB_LEFT ) @@ -675,7 +675,7 @@ OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rExcep Construct( _nStyle, AUTO ); } -OSQLMessageBox::OSQLMessageBox( Window* _pParent, const OUString& _rTitle, const OUString& _rMessage, WinBits _nStyle, MessageType _eType, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) +OSQLMessageBox::OSQLMessageBox( vcl::Window* _pParent, const OUString& _rTitle, const OUString& _rMessage, WinBits _nStyle, MessageType _eType, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) :ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG ) ,m_aInfoImage( this ) ,m_aTitle( this, WB_WORDBREAK | WB_LEFT ) @@ -704,14 +704,14 @@ IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, /*pButton*/ ) } // OSQLWarningBox -OSQLWarningBox::OSQLWarningBox( Window* _pParent, const OUString& _rMessage, WinBits _nStyle, +OSQLWarningBox::OSQLWarningBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) :OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_WARNING ), _rMessage, _nStyle, OSQLMessageBox::Warning, _pAdditionalErrorInfo ) { } // OSQLErrorBox -OSQLErrorBox::OSQLErrorBox( Window* _pParent, const OUString& _rMessage, WinBits _nStyle, +OSQLErrorBox::OSQLErrorBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) :OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_ERROR ), _rMessage, _nStyle, OSQLMessageBox::Error, _pAdditionalErrorInfo ) { diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index a45578c1b8c7..4a34d3809877 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -69,7 +69,7 @@ namespace dbaui using namespace ::comphelper; // OTableSubscriptionPage - OTableSubscriptionPage::OTableSubscriptionPage(Window* pParent, const SfxItemSet& _rCoreAttrs, + OTableSubscriptionPage::OTableSubscriptionPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs, OTableSubscriptionDialog* _pTablesDlg) : OGenericAdministrationPage(pParent, "TablesFilterPage", "dbaccess/ui/tablesfilterpage.ui", _rCoreAttrs) diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index acfeaa45834f..fe217b06f703 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -62,7 +62,7 @@ namespace dbaui */ virtual void resizeControls(const Size& _rDiff); - OTableSubscriptionPage( Window* pParent, const SfxItemSet& _rCoreAttrs ,OTableSubscriptionDialog* _pTablesDlg); + OTableSubscriptionPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,OTableSubscriptionDialog* _pTablesDlg); virtual ~OTableSubscriptionPage(); protected: diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index 6d8a27bad872..11f84162318b 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -29,7 +29,7 @@ namespace dbaui { // TextConnectionSettingsDialog - TextConnectionSettingsDialog::TextConnectionSettingsDialog( Window* _pParent, SfxItemSet& _rItems ) + TextConnectionSettingsDialog::TextConnectionSettingsDialog( vcl::Window* _pParent, SfxItemSet& _rItems ) :ModalDialog( _pParent, "TextConnectionSettingsDialog", "dbaccess/ui/textconnectionsettings.ui" ) ,m_rItems( _rItems ) { diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 6c6fecb8bac0..80dc9bbaa45e 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -54,7 +54,7 @@ namespace dbaui /// sets the fixedtext to the right content void initCurrentPath(); public: - OCollectionView( Window * pParent + OCollectionView( vcl::Window * pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent ,const OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index 19c55b9b69ce..b09d6ff6e030 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -53,7 +53,7 @@ namespace dbaui virtual void CellModified(long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; public: - OColumnControlWindow(Window* pParent + OColumnControlWindow(vcl::Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); virtual ~OColumnControlWindow(); diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 3d7c3cd45890..ff1bfec69880 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -34,7 +34,7 @@ namespace dbaui short m_nPos; OUString m_strHelpText; public: - OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropColumnEditCtrl(vcl::Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } @@ -52,7 +52,7 @@ namespace dbaui OUString m_strHelpText; public: - OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } @@ -68,7 +68,7 @@ namespace dbaui OUString m_strHelpText; public: - OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } @@ -85,7 +85,7 @@ namespace dbaui OUString m_strHelpText; public: - OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); bool IsModified() const { return IsValueChangedFromSaved(); } diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 01bb0591b54d..4205212e7bd8 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -66,8 +66,8 @@ namespace dbaui { private: OTableDesignHelpBar* pHelp; - Window* pLastFocusWindow; - Window* m_pActFocusWindow; + vcl::Window* pLastFocusWindow; + vcl::Window* m_pActFocusWindow; FixedText* pDefaultText; FixedText* pRequiredText; @@ -170,10 +170,10 @@ namespace dbaui const OPropColumnEditCtrl* getColumnCtrl() const { return m_pColumnName; } - void implFocusLost(Window* _pWhich); + void implFocusLost(vcl::Window* _pWhich); public: - OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar); + OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar); virtual ~OFieldDescControl(); void DisplayData(OFieldDescription* pFieldDescr ); diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index be666126f457..ff86d28f8eaf 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -38,7 +38,7 @@ namespace dbaui OJoinController& m_rController; public: - OJoinDesignView(Window* pParent, + OJoinDesignView(vcl::Window* pParent, OJoinController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~OJoinDesignView(); diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index 448a8c7820f3..18ab49a2c4fd 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -54,7 +54,7 @@ namespace dbaui // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener ); + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener ); static OJoinExchangeData GetSourceDescription(const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxObject); static bool isFormatAvailable( const DataFlavorExVector& _rFormats ,SotFormatStringId _nSlotID=SOT_FORMATSTR_ID_SBA_JOIN); diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index f3e39b917018..c9c500263402 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -48,18 +48,18 @@ namespace dbaui // this class conatins only the scrollbars to avoid that // the tablewindows clip the scrollbars class OJoinTableView; - class OScrollWindowHelper : public Window + class OScrollWindowHelper : public vcl::Window { ScrollBar m_aHScrollBar; ScrollBar m_aVScrollBar; - Window* m_pCornerWindow; + vcl::Window* m_pCornerWindow; OJoinTableView* m_pTableView; protected: virtual void Resize() SAL_OVERRIDE; public: - OScrollWindowHelper( Window* pParent); + OScrollWindowHelper( vcl::Window* pParent); virtual ~OScrollWindowHelper(); void setTableView(OJoinTableView* _pTableView); @@ -72,7 +72,7 @@ namespace dbaui }; - class OJoinTableView : public Window, + class OJoinTableView : public vcl::Window, public IDragTransferableListener, public DropTargetHelper { @@ -109,7 +109,7 @@ namespace dbaui OJoinDesignViewAccess* m_pAccessible; public: - OJoinTableView( Window* pParent, OJoinDesignView* pView ); + OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView ); virtual ~OJoinTableView(); // window override diff --git a/dbaccess/source/ui/inc/LimitBox.hxx b/dbaccess/source/ui/inc/LimitBox.hxx index 5e5db54b797b..5f9187a38bba 100644 --- a/dbaccess/source/ui/inc/LimitBox.hxx +++ b/dbaccess/source/ui/inc/LimitBox.hxx @@ -23,7 +23,7 @@ namespace dbaui class LimitBox: public NumericBox { public: - LimitBox( Window* pParent, WinBits nStyle ); + LimitBox( vcl::Window* pParent, WinBits nStyle ); virtual ~LimitBox(); virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx index 442668be6cc4..6b19daedb287 100644 --- a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx +++ b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx @@ -28,7 +28,7 @@ class QueryPropertiesDialog : public ModalDialog public: QueryPropertiesDialog( - Window* pParent, const bool bDistinct, const sal_Int64 nLimit ); + vcl::Window* pParent, const bool bDistinct, const sal_Int64 nLimit ); virtual ~QueryPropertiesDialog(); bool getDistinct() const; diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index f42285e4fc01..ef4174c19878 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -57,7 +57,7 @@ namespace dbaui virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const SAL_OVERRIDE; public: - OQueryTableView(Window* pParent,OQueryDesignView* pView); + OQueryTableView(vcl::Window* pParent,OQueryDesignView* pView); virtual ~OQueryTableView(); /// base class overwritten: create and delete windows diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index f1f7c0422733..9e9cdc4c6392 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -25,7 +25,7 @@ namespace dbaui { class OSqlEdit; - class OQueryTextView : public Window + class OQueryTextView : public vcl::Window { friend class OQueryViewSwitch; OSqlEdit* m_pEdit; diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 5953f3b310cf..00868b542329 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -55,7 +55,7 @@ namespace dbaui void mergeData(const TTableConnectionData& _aConnectionData); - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index b2c8936aac7b..f7a97a9687f5 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -32,7 +32,7 @@ namespace dbaui class ORelationDesignView : public OJoinDesignView { public: - ORelationDesignView(Window* pParent, ORelationController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + ORelationDesignView(vcl::Window* pParent, ORelationController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~ORelationDesignView(); // set the statement for representation diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index aec50985d581..9b38d8fb47b6 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -52,7 +52,7 @@ namespace dbaui virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: - ORelationTableView( Window* pParent, ORelationDesignView* pView ); + ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView ); virtual ~ORelationTableView(); virtual void RemoveTabWin( OTableWindow* pTabWin ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index 8430dc4d4f38..4368648429d9 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -56,12 +56,12 @@ namespace dbaui ,public OSQLNameChecker { public: - OSQLNameEdit(Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) + OSQLNameEdit(vcl::Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) : Edit(_pParent,nStyle) ,OSQLNameChecker(_rAllowedChars) { } - OSQLNameEdit(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) + OSQLNameEdit(vcl::Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) : Edit(_pParent,_rRes) ,OSQLNameChecker(_rAllowedChars) { @@ -77,12 +77,12 @@ namespace dbaui ,public OSQLNameChecker { public: - OSQLNameComboBox(Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) + OSQLNameComboBox(vcl::Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) : ComboBox(_pParent,nStyle) , OSQLNameChecker(_rAllowedChars) { } - OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) + OSQLNameComboBox(vcl::Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) : ComboBox(_pParent,_rRes) , OSQLNameChecker(_rAllowedChars) { diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index 95f60752ae65..76428fb60b24 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -36,7 +36,7 @@ namespace dbaui class OJoinTableView; class OConnectionLine; - class OTableConnection : public Window + class OTableConnection : public vcl::Window { ::std::vector<OConnectionLine*> m_vConnLine; TTableConnectionData::value_type diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index d0f6b4d8f543..999a7fe15aee 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -113,7 +113,7 @@ namespace dbaui inline TOTypeInfoSP getTypeInfoFallBack() const { return m_pTypeInfo; } - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index ca99ce7464ce..e1a9f1e84ae4 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -46,7 +46,7 @@ namespace dbaui bool m_bClipboardFilled; public: - OTableRowView(Window* pParent); + OTableRowView(vcl::Window* pParent); virtual ~OTableRowView(); virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) = 0; diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index a025d341afe8..900c32374754 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -39,7 +39,7 @@ namespace dbaui virtual void Resize() SAL_OVERRIDE; public: - OTableDesignHelpBar( Window* pParent ); + OTableDesignHelpBar( vcl::Window* pParent ); virtual ~OTableDesignHelpBar(); void SetHelpText( const OUString& rText ); diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index c37bc7969450..1643aaccb037 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -30,7 +30,7 @@ namespace dbaui class OTableController; class OTableFieldDescWin; class OTableEditorCtrl; - class OTableBorderWindow : public Window + class OTableBorderWindow : public vcl::Window { Splitter m_aHorzSplitter; OTableFieldDescWin* m_pFieldDescWin; @@ -42,7 +42,7 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OTableBorderWindow(Window* pParent); + OTableBorderWindow(vcl::Window* pParent); virtual ~OTableBorderWindow(); // window overloads virtual void Resize() SAL_OVERRIDE; @@ -73,7 +73,7 @@ namespace dbaui virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE; public: - OTableDesignView( Window* pParent, + OTableDesignView( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&, OTableController& _rController); virtual ~OTableDesignView(); diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index 376d958e089f..9a6992bd732c 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -33,7 +33,7 @@ namespace comphelper class NamedValueCollection; } -class Window; +namespace vcl { class Window; } namespace dbaui { @@ -49,7 +49,7 @@ namespace dbaui OUString m_aFieldAlias; ///< column alias OUString m_aFunctionName;///< contains the function name (only if m_eFunctionType != FKT_NONE) - Window* m_pTabWindow; + vcl::Window* m_pTabWindow; sal_Int32 m_eDataType; sal_Int32 m_eFunctionType; @@ -79,7 +79,7 @@ namespace dbaui void SetVisible( bool bVis=true ) { m_bVisible = bVis; } void SetGroupBy( bool bGb=false ) { m_bGroupBy = bGb; } - void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin; } + void SetTabWindow( vcl::Window* pWin ){ m_pTabWindow = pWin; } void SetField( const OUString& rF ) { m_aFieldName = rF; } void SetFieldAlias( const OUString& rF ) { m_aFieldAlias = rF; } void SetTable( const OUString& rT ) { m_aTableName = rT; } @@ -105,7 +105,7 @@ namespace dbaui OUString GetCriteria( sal_uInt16 nIdx ) const; sal_Int32 GetColWidth() const { return m_nColWidth; } sal_Int32 GetFieldIndex() const { return m_nIndex; } - Window* GetTabWindow() const { return m_pTabWindow;} + vcl::Window* GetTabWindow() const { return m_pTabWindow;} sal_Int32 GetFunctionType() const { return m_eFunctionType; } sal_uInt16 GetColumnId() const { return m_nColumnId;} diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 32e0f519ad94..c16cba5d5568 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -59,7 +59,7 @@ class OTableGrantControl : public ::svt::EditBrowseBox ImplSVEvent * m_nDeactivateEvent; public: - OTableGrantControl( Window* pParent, WinBits nBits); + OTableGrantControl( vcl::Window* pParent, WinBits nBits); virtual ~OTableGrantControl(); void UpdateTables(); void setUserName(const OUString& _sUserName); diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 82028e1607be..7fc4bfdb70ae 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -48,7 +48,7 @@ namespace dbaui class OTableWindow : public ::cppu::BaseMutex ,public ::comphelper::OContainerListener - ,public Window + ,public vcl::Window { friend class OTableWindowTitle; friend class OTableWindowListBox; @@ -121,7 +121,7 @@ namespace dbaui */ void impl_updateImage(); - OTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData ); + OTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData ); public: virtual ~OTableWindow(); diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index 3761026ec4c7..3ded3cef2e91 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -49,7 +49,7 @@ class ODbDataSourceAdministrationHelper; SfxItemSet* m_pOutSet; public: - OTableSubscriptionDialog(Window* pParent + OTableSubscriptionDialog(vcl::Window* pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index e005461d8465..6e0cc172a7b7 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -196,7 +196,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xTargetRowUpdate; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; - Window* m_pParent; + vcl::Window* m_pParent; bool m_bAlreadyAsked; bool insertNewRow(); @@ -205,7 +205,7 @@ namespace dbaui public: // export data - ORowSetImportExport(Window* _pParent, + ORowSetImportExport(vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >& _xResultSetUpdate, const ::svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 7be8fd7b505c..ec384984cd0d 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -65,7 +65,7 @@ namespace svt class EditBrowseBox; } -class Window; +namespace vcl { class Window; } class ToolBox; namespace vcl { class Font; } class SvNumberFormatter; @@ -107,7 +107,7 @@ namespace dbaui @param _rxContext need to create the dialog */ void showError( const ::dbtools::SQLExceptionInfo& _rInfo, - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); /** fills a map and a vector with localized type names @@ -163,7 +163,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSourceByName( const OUString& _rDataSourceName, - Window* _pErrorMessageParent, + vcl::Window* _pErrorMessageParent, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo ); @@ -187,11 +187,11 @@ namespace dbaui void callColumnFormatDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xAffectedCol, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xField, SvNumberFormatter* _pFormatter, - Window* _pParent); + vcl::Window* _pParent); /** second variant of the function before */ - bool callColumnFormatDialog(Window* _pParent, + bool callColumnFormatDialog(vcl::Window* _pParent, SvNumberFormatter* _pFormatter, sal_Int32 _nDataType, sal_Int32& _nFormatKey, @@ -207,7 +207,7 @@ namespace dbaui bool appendToFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const OUString& _sName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - Window* _pParent); + vcl::Window* _pParent); /** notifySystemWindow adds or remove the given window _pToRegister at the Systemwindow found when search _pWindow. @param _pWindow @@ -220,9 +220,9 @@ namespace dbaui ::comphelper::mem_fun(&TaskPaneList::AddWindow) ::comphelper::mem_fun(&TaskPaneList::RemoveWindow) */ - void notifySystemWindow(Window* _pWindow, - Window* _pToRegister, - ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc); + void notifySystemWindow(vcl::Window* _pWindow, + vcl::Window* _pToRegister, + ::comphelper::mem_fun1_t<TaskPaneList,vcl::Window*> _rMemFunc); /** adjustToolBoxSize checks if the size of the ToolBox is still valid. If not it will be resized. @param _pToolBox @@ -327,7 +327,7 @@ namespace dbaui @return RET_YES, RET_NO, RET_ALL */ - sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName); + sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName); /** creates a new view from a query or table @param _sName @@ -389,7 +389,7 @@ namespace dbaui <TRUE/> if the insert opertions was successful, otherwise <FALSE/>. */ bool insertHierachyElement( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameContainer>& _xNames, const OUString& _sParentFolder, diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 9e136c1968e4..a342856b7aad 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -53,7 +53,7 @@ namespace dbaui protected: virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE; public: - OUserAdminDlg( Window* _pParent + OUserAdminDlg( vcl::Window* _pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index cdc635e187cf..f34af430a936 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -25,11 +25,11 @@ class Splitter; namespace dbaui { - class OSplitterView : public Window + class OSplitterView : public vcl::Window { Splitter* m_pSplitter; - Window* m_pLeft; - Window* m_pRight; + vcl::Window* m_pLeft; + vcl::Window* m_pRight; bool m_bVertical; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); @@ -37,13 +37,13 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OSplitterView(Window* _pParent,bool _bVertical = true); + OSplitterView(vcl::Window* _pParent,bool _bVertical = true); virtual ~OSplitterView(); // window overloads virtual void GetFocus() SAL_OVERRIDE; void setSplitter(Splitter* _pSplitter); - void set(Window* _pRight,Window* _pLeft = NULL); + void set(vcl::Window* _pRight,Window* _pLeft = NULL); virtual void Resize() SAL_OVERRIDE; }; } diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index 0c0e1ff3ea41..e99fcf810529 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -64,7 +64,7 @@ namespace dbaui virtual bool LeavePage() SAL_OVERRIDE; virtual OUString GetTitle() const SAL_OVERRIDE ; - OCopyTable( Window * pParent ); + OCopyTable( vcl::Window * pParent ); virtual ~OCopyTable(); bool IsOptionDefData() const { return m_pRB_DefData->IsChecked(); } diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index 20288dfb1c40..98f029c6c665 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -78,7 +78,7 @@ namespace dbaui virtual bool LeavePage() SAL_OVERRIDE; virtual OUString GetTitle() const SAL_OVERRIDE ; - OWizColumnSelect(Window* pParent); + OWizColumnSelect(vcl::Window* pParent); virtual ~OWizColumnSelect(); }; } diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 671bdc943e60..388ee1c27a1d 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -298,7 +298,7 @@ namespace dbaui public: // used for copy tables or queries OCopyTableWizard( - Window * pParent, + vcl::Window * pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ICopyTableSourceObject& _rSourceObject, @@ -310,7 +310,7 @@ namespace dbaui // used for importing rtf/html sources OCopyTableWizard( - Window* pParent, + vcl::Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ODatabaseExport::TColumns& _rDestColumns, diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx index effb2399bc8e..e9d19621457f 100644 --- a/dbaccess/source/ui/inc/WExtendPages.hxx +++ b/dbaccess/source/ui/inc/WExtendPages.hxx @@ -30,12 +30,12 @@ namespace dbaui protected: virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE; public: - OWizHTMLExtend(Window* pParent, SvStream& _rStream) + OWizHTMLExtend(vcl::Window* pParent, SvStream& _rStream) : OWizTypeSelect( pParent, &_rStream ) { } - static OWizTypeSelect* Create( Window* _pParent, SvStream& _rInput ) { return new OWizHTMLExtend( _pParent, _rInput ); } + static OWizTypeSelect* Create( vcl::Window* _pParent, SvStream& _rInput ) { return new OWizHTMLExtend( _pParent, _rInput ); } virtual ~OWizHTMLExtend(){} }; @@ -45,12 +45,12 @@ namespace dbaui protected: virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE; public: - OWizRTFExtend(Window* pParent,SvStream& _rStream) + OWizRTFExtend(vcl::Window* pParent,SvStream& _rStream) : OWizTypeSelect( pParent, &_rStream ) { } - static OWizTypeSelect* Create( Window* _pParent, SvStream& _rInput ) { return new OWizRTFExtend( _pParent, _rInput ); } + static OWizTypeSelect* Create( vcl::Window* _pParent, SvStream& _rInput ) { return new OWizRTFExtend( _pParent, _rInput ); } virtual ~OWizRTFExtend(){} }; @@ -61,7 +61,7 @@ namespace dbaui protected: virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE; public: - OWizNormalExtend(Window* pParent); + OWizNormalExtend(vcl::Window* pParent); }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WEXTENDPAGES_HXX diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index 0c713685c0d3..3feb7dc28e01 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -36,7 +36,7 @@ namespace dbaui virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE; public: - OColumnTreeBox( Window* pParent, WinBits nBits = WB_BORDER ); + OColumnTreeBox( vcl::Window* pParent, WinBits nBits = WB_BORDER ); void FillListBox( const ODatabaseExport::TColumnVector& _rList); void SetReadOnly(bool _bRo=true) { m_bReadOnly = _bRo; } @@ -77,7 +77,7 @@ namespace dbaui virtual bool LeavePage() SAL_OVERRIDE; virtual OUString GetTitle() const SAL_OVERRIDE ; - OWizNameMatching(Window* pParent); + OWizNameMatching(vcl::Window* pParent); virtual ~OWizNameMatching(); }; diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx index 83398f7e385f..9a30d7c311fb 100644 --- a/dbaccess/source/ui/inc/WTabPage.hxx +++ b/dbaccess/source/ui/inc/WTabPage.hxx @@ -32,7 +32,7 @@ namespace dbaui OCopyTableWizard* m_pParent; bool m_bFirstTime; // Page wird das erste mal gerufen ; should be set in the reset methode - OWizardPage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); + OWizardPage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); public: virtual void Reset ( ) = 0; diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index 0967c5c06252..5f587481e867 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -37,7 +37,7 @@ namespace dbaui class OWizTypeSelectControl : public OFieldDescControl { protected: - Window* m_pParentTabPage; + vcl::Window* m_pParentTabPage; virtual void ActivateAggregate( EControlType eType ) SAL_OVERRIDE; virtual void DeactivateAggregate( EControlType eType ) SAL_OVERRIDE; @@ -51,7 +51,7 @@ namespace dbaui virtual OUString getAutoIncrementValue() const SAL_OVERRIDE; public: - OWizTypeSelectControl(Window* pParent, Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=NULL); + OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=NULL); virtual ~OWizTypeSelectControl(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE; @@ -69,15 +69,15 @@ namespace dbaui bool _bSet = false); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - Window* m_pParentTabPage; + vcl::Window* m_pParentTabPage; public: - OWizTypeSelectList( Window* pParent, WinBits nStyle = WB_BORDER ) + OWizTypeSelectList( vcl::Window* pParent, WinBits nStyle = WB_BORDER ) : MultiListBox(pParent,nStyle) , m_bPKey(false) , m_pParentTabPage(NULL) {} void SetPKey(bool bPKey) { m_bPKey = bPKey; } - void SetParentTabPage(Window* pParentTabPage) { m_pParentTabPage = pParentTabPage; } + void SetParentTabPage(vcl::Window* pParentTabPage) { m_pParentTabPage = pParentTabPage; } }; // Wizard Page: OWizTypeSelect @@ -116,14 +116,14 @@ namespace dbaui virtual bool LeavePage() SAL_OVERRIDE; virtual OUString GetTitle() const SAL_OVERRIDE; - OWizTypeSelect(Window* pParent, SvStream* _pStream = NULL ); + OWizTypeSelect(vcl::Window* pParent, SvStream* _pStream = NULL ); virtual ~OWizTypeSelect(); inline void setDisplayRow(sal_Int32 _nRow) { m_nDisplayRow = _nRow - 1; } inline void setDuplicateName(bool _bDuplicateName) { m_bDuplicateName = _bDuplicateName; } }; - typedef OWizTypeSelect* (*TypeSelectionPageFactory)( Window*, SvStream& ); + typedef OWizTypeSelect* (*TypeSelectionPageFactory)( vcl::Window*, SvStream& ); } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WTYPESELECT_HXX diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index d33ea5f0570a..360ee70fa9eb 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -50,7 +50,7 @@ namespace dbaui virtual bool allowQueries() const = 0; virtual bool allowAddition() const = 0; virtual void addTableWindow( const OUString& _rQualifiedTableName, const OUString& _rAliasName ) = 0; - virtual void onWindowClosing( const Window* _pWindow ) = 0; + virtual void onWindowClosing( const vcl::Window* _pWindow ) = 0; protected: ~IAddTableDialogContext() {} @@ -78,7 +78,7 @@ namespace dbaui public: OAddTableDlg( - Window* _pParent, + vcl::Window* _pParent, IAddTableDialogContext& _rContext ); virtual ~OAddTableDlg(); diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index ef0622bf0f62..3520485684be 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -45,7 +45,7 @@ namespace dbaui virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE; public: - AdvancedSettingsDialog( Window* _pParent + AdvancedSettingsDialog( vcl::Window* _pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName); diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index bb2d19c087a6..f28f54185f1a 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -149,7 +149,7 @@ namespace dbaui UnoDataBrowserView* getBrowserView() const { return static_cast< UnoDataBrowserView*>(getView()); } // late construction - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // UNO virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index 0f799f87075e..b0c9852de938 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -49,7 +49,7 @@ namespace dbaui DBTreeView* m_pTreeView; Splitter* m_pSplitter; mutable SbaGridControl* m_pVclControl; // our grid's VCL representation - Window* m_pStatus; + vcl::Window* m_pStatus; DECL_LINK( SplitHdl, void* ); // attribute access @@ -58,7 +58,7 @@ namespace dbaui SbaGridControl* getVclControl() const; public: - UnoDataBrowserView( Window* pParent, + UnoDataBrowserView( vcl::Window* pParent, IController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~UnoDataBrowserView(); diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx index 990c9df4f4e2..78f2da4f4a28 100644 --- a/dbaccess/source/ui/inc/charsetlistbox.hxx +++ b/dbaccess/source/ui/inc/charsetlistbox.hxx @@ -33,7 +33,7 @@ namespace dbaui class CharSetListBox : public ListBox { public: - CharSetListBox( Window* _pParent, WinBits _nBits ); + CharSetListBox( vcl::Window* _pParent, WinBits _nBits ); virtual ~CharSetListBox(); void SelectEntryByIanaName( const OUString& _rIanaName ); diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index 4a1238dbb4ad..dc1a42986116 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -41,7 +41,7 @@ class OConnectionURLEdit : public Edit bool m_bShowPrefix; // when <TRUE> the prefix will be visible, otherwise not public: - OConnectionURLEdit(Window* pParent, WinBits _nBits,bool _bShowPrefix = false); + OConnectionURLEdit(vcl::Window* pParent, WinBits _nBits,bool _bShowPrefix = false); virtual ~OConnectionURLEdit(); public: diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index f87f4681a9ab..f5d64a0f48cd 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -30,7 +30,7 @@ namespace dbtools class SQLExceptionInfo; } -class Window; +namespace vcl { class Window; } namespace dbaui { @@ -38,7 +38,7 @@ namespace dbaui class ODatasourceConnector { protected: - Window* m_pErrorMessageParent; + vcl::Window* m_pErrorMessageParent; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; OUString m_sContextInformation; @@ -46,11 +46,11 @@ namespace dbaui public: ODatasourceConnector( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - Window* _pMessageParent + vcl::Window* _pMessageParent ); ODatasourceConnector( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - Window* _pMessageParent, + vcl::Window* _pMessageParent, const OUString& _rContextInformation ); diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index ddce2e2250ef..66989228b351 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -61,7 +61,7 @@ public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed after the dialog has been destroyed */ - ODbAdminDialog(Window* pParent, + ODbAdminDialog(vcl::Window* pParent, SfxItemSet* _pItems, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index ce9ad84ea2d4..ab15137087bb 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -80,7 +80,7 @@ namespace dbaui DECL_LINK( ScrollDownHdl, SvTreeListBox* ); public: - DBTreeListBox( Window* pParent + DBTreeListBox( vcl::Window* pParent ,WinBits nWinStyle=0 ,bool _bHandleEnterKey = false); virtual ~DBTreeListBox(); diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 124b6a8b6eb6..0f84ea6404f4 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -70,7 +70,7 @@ public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed after the dialog has been destroyed */ - ODbTypeWizDialog(Window* pParent + ODbTypeWizDialog(vcl::Window* pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 067907ca335f..bdd22395f9c6 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -96,7 +96,7 @@ public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed after the dialog has been destroyed */ - ODbTypeWizDialogSetup(Window* pParent + ODbTypeWizDialogSetup(vcl::Window* pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index ef4aff479b3d..d27de6c58125 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -66,7 +66,7 @@ namespace dbaui public: DirectSQLDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn); virtual ~DirectSQLDialog(); diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx index f6956361fbdc..b6614cf62701 100644 --- a/dbaccess/source/ui/inc/dlgattr.hxx +++ b/dbaccess/source/ui/inc/dlgattr.hxx @@ -33,7 +33,7 @@ namespace dbaui sal_uInt32 m_nNumberFormatId; public: - SbaSbAttrDlg(Window * pParent, const SfxItemSet*, SvNumberFormatter*, bool bHasFormat, bool bRow = false); + SbaSbAttrDlg(vcl::Window * pParent, const SfxItemSet*, SvNumberFormatter*, bool bHasFormat, bool bRow = false); virtual ~SbaSbAttrDlg(); virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 5d30bd92bff5..5217e1fcb0a0 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -52,14 +52,14 @@ namespace dbaui OSaveAsDlgImpl* m_pImpl; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; public: - OSaveAsDlg( Window * pParent,const sal_Int32& _rType, + OSaveAsDlg( vcl::Window * pParent,const sal_Int32& _rType, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const OUString& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS); - OSaveAsDlg( Window* _pParent, + OSaveAsDlg( vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const OUString& _rDefault, const OUString& _sLabel, diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index 25e35964efe6..e145cf7675ad 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -43,7 +43,7 @@ namespace dbaui CheckBox* m_pCB_STANDARD; public: - DlgSize( Window * pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard = -1 ); + DlgSize( vcl::Window * pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard = -1 ); sal_Int32 GetValue(); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 3aa05ffafe8e..f204c8c3cf89 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -48,7 +48,7 @@ namespace dbaui bool m_bSuspendSelectHdl; public: - DbaIndexList(Window* _pParent, WinBits nWinBits); + DbaIndexList(vcl::Window* _pParent, WinBits nWinBits); void SetSelectHdl(const Link& _rHdl) { m_aSelectHdl = _rHdl; } Link GetSelectHdl() const { return m_aSelectHdl; } @@ -103,7 +103,7 @@ namespace dbaui m_xContext; public: DbaIndexDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Sequence< OUString >& _rFieldNames, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 7151d6dc9b38..fb1347d2b3eb 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -50,7 +50,7 @@ namespace dbaui bool m_bAddIndexAppendix; public: - IndexFieldsControl( Window* _pParent, WinBits nWinStyle); + IndexFieldsControl( vcl::Window* _pParent, WinBits nWinStyle); virtual ~IndexFieldsControl(); void Init(const ::com::sun::star::uno::Sequence< OUString >& _rAvailableFields, sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix); diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index ebe50f47c8e7..7c597b24624e 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <comphelper/namedvaluecollection.hxx> -class Window; +namespace vcl { class Window; } namespace dbaui { @@ -49,13 +49,13 @@ namespace dbaui m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI > m_xDocumentUI; - Window* m_pDialogParent; + vcl::Window* m_pDialogParent; OUString m_sCurrentlyEditing; OUString m_sDataSourceName; public: OLinkedDocumentsAccess( - Window* _pDialogParent, + vcl::Window* _pDialogParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& i_rDocumentUI, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index cd86e1a8eba1..2e10a99b82c6 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -38,7 +38,7 @@ class OMarkableTreeListBox : public DBTreeListBox Link m_aCheckButtonHandler; public: - OMarkableTreeListBox( Window* pParent, WinBits nWinStyle=0 ); + OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 ); virtual ~OMarkableTreeListBox(); virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 1dcd219a818a..24d475cb8c3d 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -40,7 +40,7 @@ namespace dbaui OUString m_sModule; public: - OpenDocumentButton( Window* _pParent, const sal_Char* _pAsciiModuleName ); + OpenDocumentButton( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName ); protected: void impl_init( const sal_Char* _pAsciiModuleName ); @@ -57,7 +57,7 @@ namespace dbaui MapIndexToStringPair m_aURLs; public: - OpenDocumentListBox( Window* _pParent, const sal_Char* _pAsciiModuleName ); + OpenDocumentListBox( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName ); OUString GetSelectedDocumentURL() const; OUString GetSelectedDocumentFilter() const; diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 71b1f4b347e9..edc37862a366 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -79,7 +79,7 @@ namespace dbaui m_aFinalValues; /// the final values as entered by the user public: - OParameterDialog(Window* _pParent, + OParameterDialog(vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & _rParamContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > & _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext); diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index e895a0dae32d..64f828ecb721 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -35,7 +35,7 @@ namespace dbaui class OBeamer : public DockingWindow { public: - OBeamer(Window* _pParent) : DockingWindow(_pParent,0){} + OBeamer(vcl::Window* _pParent) : DockingWindow(_pParent,0){} }; // OQueryContainerWindow @@ -48,7 +48,7 @@ namespace dbaui DECL_LINK( SplitHdl, void* ); public: - OQueryContainerWindow(Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); + OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); virtual ~OQueryContainerWindow(); virtual void Construct() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index 6d94e84fc02b..35d9165d0ae1 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -165,7 +165,7 @@ namespace dbaui ::connectivity::OSQLParser& getParser() { return m_aSqlParser; } ::connectivity::OSQLParseTreeIterator& getParseIterator() { return *m_pSqlIterator; } - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index 25694f44ff76..b9d76cccca97 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -106,7 +106,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getQueryColumn( const OUString& _rFieldName ) const; public: - DlgFilterCrit( Window * pParent, + DlgFilterCrit( vcl::Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer, diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index a4a535ada1d0..007c42966a6a 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -79,7 +79,7 @@ namespace dbaui void EnableLines(); public: - DlgOrderCrit( Window * pParent, + DlgOrderCrit( vcl::Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxCols); diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index 467b09f040b0..0a05a3153b40 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -27,7 +27,7 @@ namespace dbaui class OQueryView : public OJoinDesignView { public: - OQueryView(Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + OQueryView(vcl::Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~OQueryView(); virtual bool isCutAllowed() = 0; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index e9c7e3ba586e..3141c0cf96b3 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -88,7 +88,7 @@ namespace dbaui virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: - virtual FmXGridPeer* imp_CreatePeer(Window* pParent) SAL_OVERRIDE; + virtual FmXGridPeer* imp_CreatePeer(vcl::Window* pParent) SAL_OVERRIDE; }; // SbaXGridPeer @@ -127,7 +127,7 @@ namespace dbaui virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: - virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle) SAL_OVERRIDE; + virtual FmGridControl* imp_CreateControl(vcl::Window* pParent, WinBits nStyle) SAL_OVERRIDE; #ifdef _MSC_VER typedef ::com::sun::star::frame::XStatusListener xstlist_type; typedef ::com::sun::star::uno::Reference< xstlist_type > xlistener_type; diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 6a6387445e2b..d91ec74cac56 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -70,7 +70,7 @@ public: detailed field of an <type scope="com::sun::star::sdb">SQLContext</type>). */ OSQLMessageBox( - Window* _pParent, + vcl::Window* _pParent, const dbtools::SQLExceptionInfo& _rException, WinBits _nStyle = WB_OK | WB_DEF_OK, const OUString& _rHelpURL = OUString() @@ -82,7 +82,7 @@ public: @param rMessage the detailed message to display @param _eType determines the image to use. AUTO is disallowed in this constructor version */ - OSQLMessageBox(Window* pParent, + OSQLMessageBox(vcl::Window* pParent, const OUString& rTitle, const OUString& rMessage, WinBits nStyle = WB_OK | WB_DEF_OK, @@ -107,7 +107,7 @@ private: class OSQLWarningBox : public OSQLMessageBox { public: - OSQLWarningBox( Window* _pParent, + OSQLWarningBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle = WB_OK | WB_DEF_OK, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); @@ -117,7 +117,7 @@ public: class OSQLErrorBox : public OSQLMessageBox { public: - OSQLErrorBox( Window* _pParent, + OSQLErrorBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle = WB_OK | WB_DEF_OK, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 3114ef511525..52afd2764b40 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -46,7 +46,7 @@ protected: bool m_bNoEmptyFolders; // should empty catalogs/schematas be prevented from being displayed? public: - OTableTreeListBox(Window* pParent, WinBits nWinStyle); + OTableTreeListBox(vcl::Window* pParent, WinBits nWinStyle); void init(bool bVirtualRoot) { m_bVirtualRoot = bVirtualRoot; } diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index 080025084dd6..40ab9616095b 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -37,7 +37,7 @@ namespace dbaui class TextConnectionSettingsDialog : public ModalDialog { public: - TextConnectionSettingsDialog( Window* _pParent, SfxItemSet& _rItems ); + TextConnectionSettingsDialog( vcl::Window* _pParent, SfxItemSet& _rItems ); virtual ~TextConnectionSettingsDialog(); /** initializes a set of PropertyStorage instaces, which are bound to diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 1c004917d8d8..e28f3e2adff5 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -147,7 +147,7 @@ namespace dbaui DECLARE_UNO3_DEFAULTS(SbaTableQueryBrowser,SbaXDataBrowserController) // late construction - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 5bae185c4528..45cfaf2ec921 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -69,7 +69,7 @@ protected: virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& _rConvertedValue, com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const com::sun::star::uno::Any& _rValue) throw(com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 6f374f003933..5a061ea0c448 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::lang; // export data -ORowSetImportExport::ORowSetImportExport( Window* _pParent, +ORowSetImportExport::ORowSetImportExport( vcl::Window* _pParent, const Reference< XResultSetUpdate >& _xResultSetUpdate, const ::svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XComponentContext >& _rM, diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index d0e69379d20e..83f6ac0298ac 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -208,7 +208,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP } Reference< XDataSource > getDataSourceByName( const OUString& _rDataSourceName, - Window* _pErrorMessageParent, Reference< XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo ) + vcl::Window* _pErrorMessageParent, Reference< XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo ) { Reference< XDatabaseContext > xDatabaseContext = DatabaseContext::create(_rxContext); @@ -280,7 +280,7 @@ Reference< XInterface > getDataSourceOrModel(const Reference< XInterface >& _xOb return xRet; } -void showError(const SQLExceptionInfo& _rInfo,Window* _pParent,const Reference< XComponentContext >& _rxContext) +void showError(const SQLExceptionInfo& _rInfo, vcl::Window* _pParent,const Reference< XComponentContext >& _rxContext) { OSL_ENSURE(_pParent,"showError: Parent window must be NOT NULL!"); ::dbtools::showError(_rInfo,VCLUnoHelper::GetInterface(_pParent), _rxContext); @@ -753,7 +753,7 @@ SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment) void callColumnFormatDialog(const Reference<XPropertySet>& xAffectedCol, const Reference<XPropertySet>& xField, SvNumberFormatter* _pFormatter, - Window* _pParent) + vcl::Window* _pParent) { if (xAffectedCol.is() && xField.is()) { @@ -786,7 +786,7 @@ void callColumnFormatDialog(const Reference<XPropertySet>& xAffectedCol, } } -bool callColumnFormatDialog(Window* _pParent, +bool callColumnFormatDialog(vcl::Window* _pParent, SvNumberFormatter* _pFormatter, sal_Int32 _nDataType, sal_Int32& _nFormatKey, @@ -908,7 +908,7 @@ const SfxFilter* getStandardDatabaseFilter() bool appendToFilter(const Reference<XConnection>& _xConnection, const OUString& _sName, const Reference< XComponentContext >& _rxContext, - Window* _pParent) + vcl::Window* _pParent) { bool bRet = false; Reference< XChild> xChild(_xConnection,UNO_QUERY); @@ -956,7 +956,7 @@ bool appendToFilter(const Reference<XConnection>& _xConnection, return bRet; } -void notifySystemWindow(Window* _pWindow,Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc) +void notifySystemWindow(vcl::Window* _pWindow, vcl::Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,vcl::Window*> _rMemFunc) { OSL_ENSURE(_pWindow,"Window can not be null!"); SystemWindow* pSystemWindow = _pWindow ? _pWindow->GetSystemWindow() : NULL; @@ -1281,7 +1281,7 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType return pTypeInfo; } -sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName) +sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName) { SolarMutexGuard aGuard; OUString aMsg = ModuleRes(_nText); @@ -1385,7 +1385,7 @@ Reference<XPropertySet> createView( const OUString& _rName, const Reference< XCo return createView( _rName, _rxConnection, sCommand ); } -bool insertHierachyElement( Window* _pParent, const Reference< XComponentContext >& _rxContext, +bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentContext >& _rxContext, const Reference<XHierarchicalNameContainer>& _xNames, const OUString& _sParentFolder, bool _bForm, diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index f73c73c2ca27..ae647cf79972 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star::sdbcx; namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation; // Klasse OCopyTable -OCopyTable::OCopyTable(Window * pParent) +OCopyTable::OCopyTable(vcl::Window * pParent) : OWizardPage(pParent, "CopyTablePage", "dbaccess/ui/copytablepage.ui") , m_nOldOperation(0) , m_pPage2(NULL) diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 62cce5672ff3..0df651f41212 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -43,7 +43,7 @@ namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOper OUString OWizColumnSelect::GetTitle() const { return ModuleRes(STR_WIZ_COLUMN_SELECT_TITEL); } -OWizardPage::OWizardPage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) +OWizardPage::OWizardPage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : TabPage(pParent, rID, rUIXMLDescription) ,m_pParent(static_cast<OCopyTableWizard*>(pParent)) ,m_bFirstTime(true) @@ -51,7 +51,7 @@ OWizardPage::OWizardPage(Window* pParent, const OString& rID, const OUString& rU } // OWizColumnSelect -OWizColumnSelect::OWizColumnSelect( Window* pParent) +OWizColumnSelect::OWizColumnSelect( vcl::Window* pParent) :OWizardPage( pParent, "ApplyColPage", "dbaccess/ui/applycolpage.ui") { get(m_pOrgColumnNames, "from"); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 755d22bbc7c4..505ef7793602 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -499,7 +499,7 @@ namespace } // OCopyTableWizard -OCopyTableWizard::OCopyTableWizard( Window * pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, +OCopyTableWizard::OCopyTableWizard( vcl::Window * pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ICopyTableSourceObject& _rSourceObject, const Reference< XConnection >& _xSourceConnection, const Reference< XConnection >& _xConnection, const Reference< XComponentContext >& _rxContext, const Reference< XInteractionHandler>& _xInteractionHandler) @@ -591,7 +591,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const OUString& _rDefaultN ActivatePage(); } -OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, +OCopyTableWizard::OCopyTableWizard( vcl::Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ODatabaseExport::TColumns& _rSourceColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, const Reference< XConnection >& _xConnection, const Reference< XNumberFormatter >& _xFormatter, TypeSelectionPageFactory _pTypeSelectionPageFactory, SvStream& _rTypeSelectionPageArg, const Reference< XComponentContext >& _rxContext ) diff --git a/dbaccess/source/ui/misc/WExtendPages.cxx b/dbaccess/source/ui/misc/WExtendPages.cxx index 9ec4d842f36f..6a21d512bd0f 100644 --- a/dbaccess/source/ui/misc/WExtendPages.cxx +++ b/dbaccess/source/ui/misc/WExtendPages.cxx @@ -48,7 +48,7 @@ SvParser* OWizRTFExtend::createReader(sal_Int32 _nRows) m_pParent->shouldCreatePrimaryKey()); } -OWizNormalExtend::OWizNormalExtend(Window* pParent) : OWizTypeSelect( pParent ) +OWizNormalExtend::OWizNormalExtend(vcl::Window* pParent) : OWizTypeSelect( pParent ) { EnableAuto(false); } diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index fcdd0ae60e2f..8126f1cf804a 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -30,7 +30,7 @@ using namespace ::dbaui; // OWizColumnSelect -OWizNameMatching::OWizNameMatching( Window* pParent) +OWizNameMatching::OWizNameMatching( vcl::Window* pParent) :OWizardPage( pParent, "NameMatching", "dbaccess/ui/namematchingpage.ui" ) , m_aImgUp(ModuleRes(IMG_UP)) , m_aImgDown(ModuleRes(IMG_DOWN)) @@ -344,7 +344,7 @@ void OColumnString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDa rDev.DrawText( rPos, GetText() ); } -OColumnTreeBox::OColumnTreeBox( Window* pParent, WinBits nBits ) +OColumnTreeBox::OColumnTreeBox( vcl::Window* pParent, WinBits nBits ) : OMarkableTreeListBox(pParent, nBits) , m_bReadOnly(false) { @@ -354,7 +354,7 @@ OColumnTreeBox::OColumnTreeBox( Window* pParent, WinBits nBits ) SetSelectionMode( SINGLE_SELECTION ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOColumnTreeBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOColumnTreeBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new OColumnTreeBox(pParent); } diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index a0bca4b20eaa..46f952f2dd14 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::sdbc; // OWizTypeSelectControl -OWizTypeSelectControl::OWizTypeSelectControl(Window* pParent, Window* pParentTabPage, OTableDesignHelpBar* pHelpBar) +OWizTypeSelectControl::OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar) : OFieldDescControl(pParent, pHelpBar) { @@ -211,7 +211,7 @@ OUString OWizTypeSelectControl::getAutoIncrementValue() const } #define IMG_PRIMARY_KEY 1 -OWizTypeSelect::OWizTypeSelect( Window* pParent, SvStream* _pStream ) +OWizTypeSelect::OWizTypeSelect( vcl::Window* pParent, SvStream* _pStream ) :OWizardPage( pParent, "TypeSelect", "dbaccess/ui/typeselectpage.ui") ,m_pTypeControl(new OWizTypeSelectControl(get<VclVBox>("control_container"), this) ) ,m_pParserStream( _pStream ) @@ -373,7 +373,7 @@ void OWizTypeSelectList::setPrimaryKey(OFieldDescription* _pFieldDescr, sal_uInt SetEntryData(_nPos,_pFieldDescr); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOWizTypeSelectList(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOWizTypeSelectList(vcl::Window *pParent, VclBuilder::stringmap &) { return new OWizTypeSelectList(pParent); } diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index 3bfd496321b1..fae7d7555961 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -262,7 +262,7 @@ namespace dbaui const Reference< XWindow > xContainerWindow( m_pData->m_xFrame->getContainerWindow(), UNO_SET_THROW ); if ( _bRegister ) { - const Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); + const vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); ENSURE_OR_THROW( pContainerWindow, "no Window implementation for the frame's container window!" ); m_pData->m_bIsTopLevelDocumentWindow = ( pContainerWindow->GetExtendedStyle() & WB_EXT_DOCUMENT ) != 0; diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 8150e76a7201..bd5de5f1c238 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -133,7 +133,7 @@ namespace dbaui // "ThisComponent"-game for the global application Basic. const Reference< XFrame > xFrame( m_xFrameLoader, UNO_QUERY_THROW ); const Reference< XWindow > xFrameWindow( xFrame->getContainerWindow(), UNO_SET_THROW ); - Window* pContainerWindow = VCLUnoHelper::GetWindow( xFrameWindow ); + vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xFrameWindow ); ENSURE_OR_THROW( pContainerWindow, "no implementation access to the frame's container window!" ); pContainerWindow->SetExtendedStyle( pContainerWindow->GetExtendedStyle() | WB_EXT_DOCUMENT ); } diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index 9b072e4d7225..24eca91203af 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -57,13 +57,13 @@ namespace dbaui using ::svt::OFileNotation; // ODatasourceConnector - ODatasourceConnector::ODatasourceConnector(const Reference< XComponentContext >& _rxContext, Window* _pMessageParent) + ODatasourceConnector::ODatasourceConnector(const Reference< XComponentContext >& _rxContext, vcl::Window* _pMessageParent) :m_pErrorMessageParent(_pMessageParent) ,m_xContext(_rxContext) { } - ODatasourceConnector::ODatasourceConnector( const Reference< XComponentContext >& _rxContext, Window* _pMessageParent, + ODatasourceConnector::ODatasourceConnector( const Reference< XComponentContext >& _rxContext, vcl::Window* _pMessageParent, const OUString& _rContextInformation ) :m_pErrorMessageParent(_pMessageParent) ,m_xContext(_rxContext) diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index a9cc5e19de5c..edd50cf2534e 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -451,7 +451,7 @@ namespace dbaui { OUString aMessage(ModuleRes(RID_STR_CONNECTION_LOST)); Reference< XWindow > xWindow = getTopMostContainerWindow(); - Window* pWin = NULL; + vcl::Window* pWin = NULL; if ( xWindow.is() ) pWin = VCLUnoHelper::GetWindow(xWindow); if ( !pWin ) diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index e3bff76e76f8..04d417a67b2c 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -102,7 +102,7 @@ namespace dbaui } // OLinkedDocumentsAccess - OLinkedDocumentsAccess::OLinkedDocumentsAccess( Window* _pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI, + OLinkedDocumentsAccess::OLinkedDocumentsAccess( vcl::Window* _pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI, const Reference< XComponentContext >& _rxContext, const Reference< XNameAccess >& _rxContainer, const Reference< XConnection>& _xConnection, const OUString& _sDataSourceName ) :m_xContext(_rxContext) diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index c80ad3fbd40e..826a8a6203e6 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -96,7 +96,7 @@ public: virtual bool allowQueries() const SAL_OVERRIDE; virtual bool allowAddition() const SAL_OVERRIDE; virtual void addTableWindow( const OUString& _rQualifiedTableName, const OUString& _rAliasName ) SAL_OVERRIDE; - virtual void onWindowClosing( const Window* _pWindow ) SAL_OVERRIDE; + virtual void onWindowClosing( const vcl::Window* _pWindow ) SAL_OVERRIDE; private: OJoinTableView* getTableView() const; @@ -127,13 +127,13 @@ void AddTableDialogContext::addTableWindow( const OUString& _rQualifiedTableName getTableView()->AddTabWin( _rQualifiedTableName, _rAliasName, true ); } -void AddTableDialogContext::onWindowClosing( const Window* _pWindow ) +void AddTableDialogContext::onWindowClosing( const vcl::Window* _pWindow ) { if ( !m_rController.getView() ) return; ::dbaui::notifySystemWindow( - m_rController.getView(), const_cast< Window* >( _pWindow ), ::comphelper::mem_fun( &TaskPaneList::RemoveWindow ) ); + m_rController.getView(), const_cast< vcl::Window* >( _pWindow ), ::comphelper::mem_fun( &TaskPaneList::RemoveWindow ) ); m_rController.InvalidateFeature( ID_BROWSER_ADDTABLE ); m_rController.getView()->GrabFocus(); @@ -171,7 +171,7 @@ OJoinDesignView* OJoinController::getJoinView() void OJoinController::disposing() { { - boost::scoped_ptr< Window > pEnsureDelete( m_pAddTableDialog ); + boost::scoped_ptr< vcl::Window > pEnsureDelete( m_pAddTableDialog ); m_pAddTableDialog = NULL; } diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index 45014975512b..b61a512c1de6 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -51,7 +51,7 @@ namespace dbaui { // OJoinDesignView -OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController& _rController,const Reference< XComponentContext >& _rxContext) +OJoinDesignView::OJoinDesignView(vcl::Window* _pParent, OJoinController& _rController,const Reference< XComponentContext >& _rxContext) :ODataView( _pParent, _rController, _rxContext ) ,m_pTableView(NULL) ,m_rController( _rController ) @@ -61,9 +61,9 @@ OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController& _rController OJoinDesignView::~OJoinDesignView() { - boost::scoped_ptr<Window> aT3(m_pScrollWindow); + boost::scoped_ptr<vcl::Window> aT3(m_pScrollWindow); m_pScrollWindow = NULL; - boost::scoped_ptr<Window> aT2(m_pTableView); + boost::scoped_ptr<vcl::Window> aT2(m_pTableView); m_pTableView = NULL; } diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index e2531a5dce60..eb05f2009faa 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -43,7 +43,7 @@ namespace dbaui { } - void OJoinExchObj::StartDrag( Window* _pWindow, sal_Int8 _nDragSourceActions, IDragTransferableListener* _pListener ) + void OJoinExchObj::StartDrag( vcl::Window* _pWindow, sal_Int8 _nDragSourceActions, IDragTransferableListener* _pListener ) { m_pDragListener = _pListener; TransferableHelper::StartDrag(_pWindow, _nDragSourceActions); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 668d5434923c..8d64d01840ff 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -64,7 +64,7 @@ using namespace ::com::sun::star::lang; #define TABWIN_WIDTH_STD 120 #define TABWIN_HEIGHT_STD 120 -OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent) +OScrollWindowHelper::OScrollWindowHelper( vcl::Window* pParent) : Window( pParent) ,m_aHScrollBar( this, WB_HSCROLL|WB_REPEAT|WB_DRAG ) ,m_aVScrollBar( this, WB_VSCROLL|WB_REPEAT|WB_DRAG ) ,m_pCornerWindow(new ScrollBarBox(this, WB_3DLOOK)) @@ -89,7 +89,7 @@ OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent) OScrollWindowHelper::~OScrollWindowHelper() { - boost::scoped_ptr<Window> aTemp(m_pCornerWindow); + boost::scoped_ptr<vcl::Window> aTemp(m_pCornerWindow); m_pCornerWindow = NULL; m_pTableView = NULL; } @@ -152,7 +152,7 @@ void OScrollWindowHelper::Resize() // class OJoinTableView -OJoinTableView::OJoinTableView( Window* pParent, OJoinDesignView* pView ) +OJoinTableView::OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView ) :Window( pParent,WB_BORDER ) ,DropTargetHelper(this) ,m_aDragOffset( Point(0,0) ) @@ -1391,10 +1391,10 @@ bool OJoinTableView::PreNotify(NotifyEvent& rNEvt) if (m_aTableMap.empty()) // no tab wins -> no conns -> no focus change break; - Window* pSource = rNEvt.GetWindow(); + vcl::Window* pSource = rNEvt.GetWindow(); if (pSource) { - Window* pSearchFor = NULL; + vcl::Window* pSearchFor = NULL; if (pSource->GetParent() == this) // it may be one of the tab wins pSearchFor = pSource; @@ -1517,7 +1517,7 @@ void OJoinTableView::clearLayoutInformation() { if ( aIter->second ) aIter->second->clearListBox(); - boost::scoped_ptr<Window> aTemp(aIter->second); + boost::scoped_ptr<vcl::Window> aTemp(aIter->second); aIter->second = NULL; } diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx index 194f029c2d32..4f4175be859b 100644 --- a/dbaccess/source/ui/querydesign/LimitBox.cxx +++ b/dbaccess/source/ui/querydesign/LimitBox.cxx @@ -32,7 +32,7 @@ namespace dbaui { -LimitBox::LimitBox( Window* pParent, WinBits nStyle ) +LimitBox::LimitBox( vcl::Window* pParent, WinBits nStyle ) : NumericBox( pParent, nStyle ) { SetShowTrailingZeros( false ); @@ -112,7 +112,7 @@ void LimitBox::LoadDefaultLimits() } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLimitBox( Window *pParent, VclBuilder::stringmap & ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLimitBox( vcl::Window *pParent, VclBuilder::stringmap & ) { LimitBox* pBox = new LimitBox( pParent, WB_DROPDOWN | WB_VSCROLL ); return pBox; diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index 77cb02340194..85a3e45bc2ca 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace dbaui; // class OQueryTableWindow -OQueryTableWindow::OQueryTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias) +OQueryTableWindow::OQueryTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias) :OTableWindow( pParent, pTabWinData ) ,m_nAliasNum(0) { diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index e1b2d4b38cbd..95c674107e77 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -31,7 +31,7 @@ namespace dbaui sal_Int32 m_nAliasNum; OUString m_strInitialAlias; public: - OQueryTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias = NULL ); + OQueryTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias = NULL ); virtual ~OQueryTableWindow(); OUString GetAliasName() const diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 3601fd0b0127..c095a73ee036 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2517,7 +2517,7 @@ OQueryDesignView::~OQueryDesignView() { if ( m_pTableView ) ::dbaui::notifySystemWindow(this,m_pTableView,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); - boost::scoped_ptr<Window> aTemp(m_pSelectionBox); + boost::scoped_ptr<vcl::Window> aTemp(m_pSelectionBox); m_pSelectionBox = NULL; } @@ -2776,7 +2776,7 @@ bool OQueryDesignView::PreNotify(NotifyEvent& rNEvt) case EVENT_GETFOCUS: #if OSL_DEBUG_LEVEL > 0 { - Window* pFocus = Application::GetFocusWindow(); + vcl::Window* pFocus = Application::GetFocusWindow(); (void)pFocus; } #endif diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 0d44b0ded818..a12731cb4786 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -222,7 +222,7 @@ namespace } // class OQueryTableView -OQueryTableView::OQueryTableView( Window* pParent,OQueryDesignView* pView) +OQueryTableView::OQueryTableView( vcl::Window* pParent,OQueryDesignView* pView) : OJoinTableView( pParent,pView) { SetHelpId(HID_CTL_QRYDGNTAB); diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 3d1f4b0cfcaa..eca9e830f14a 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -52,7 +52,7 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent) OQueryTextView::~OQueryTextView() { - boost::scoped_ptr<Window> aTemp(m_pEdit); + boost::scoped_ptr<vcl::Window> aTemp(m_pEdit); m_pEdit = NULL; } diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index 4d97d18297d9..e506dbeddbbd 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -43,11 +43,11 @@ OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryContro OQueryViewSwitch::~OQueryViewSwitch() { { - boost::scoped_ptr<Window> aTemp(m_pTextView); + boost::scoped_ptr<vcl::Window> aTemp(m_pTextView); m_pTextView = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pDesignView); + boost::scoped_ptr<vcl::Window> aTemp(m_pDesignView); m_pDesignView = NULL; } } @@ -167,7 +167,7 @@ void OQueryViewSwitch::paste() OQueryContainerWindow* OQueryViewSwitch::getContainer() const { - Window* pDesignParent = getDesignView() ? getDesignView()->GetParent() : NULL; + vcl::Window* pDesignParent = getDesignView() ? getDesignView()->GetParent() : NULL; return static_cast< OQueryContainerWindow* >( pDesignParent ); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 217604dc7529..97ca36ac2660 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -97,7 +97,7 @@ namespace } } -OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) +OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent ) :EditBrowseBox( pParent,EBBF_NOROWPICTURE, WB_3DLOOK, BROWSER_COLUMNSELECTION | BROWSER_KEEPSELECTION | BROWSER_HIDESELECT | BROWSER_HIDECURSOR | BROWSER_HLINESFULL | BROWSER_VLINESFULL ) ,m_nSeekRow(0) diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index e42c24ee5507..fd84856e3092 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -78,7 +78,7 @@ namespace dbaui bool m_bInUndoMode; DECL_LINK(OnInvalidateTimer, void*); - public: OSelectionBrowseBox( Window* pParent ); + public: OSelectionBrowseBox( vcl::Window* pParent ); virtual ~OSelectionBrowseBox(); void initialize(); diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 027f49e4c311..78b212ff2437 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -66,7 +66,7 @@ namespace DatabaseObject = css::sdb::application::DatabaseObject; #define TABWIN_HEIGHT_MIN 80 // class OTableWindow -OTableWindow::OTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData ) +OTableWindow::OTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData ) : ::comphelper::OContainerListener(m_aMutex) ,Window( pParent, WB_3DLOOK|WB_MOVEABLE ) ,m_aTypeImage( this ) @@ -103,7 +103,7 @@ OTableWindow::~OTableWindow() if (m_pListBox) { OSL_ENSURE(m_pListBox->GetEntryCount()==0,"Forgot to call EmptyListbox()!"); - boost::scoped_ptr<Window> aTemp(m_pListBox); + boost::scoped_ptr<vcl::Window> aTemp(m_pListBox); m_pListBox = NULL; } if ( m_pContainerListener.is() ) diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 75ab9389f1c9..636dc9a26d7e 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -343,7 +343,7 @@ void OTableWindowListBox::GetFocus() IMPL_LINK( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, /*pBox*/ ) { // tell my parent - Window* pParent = Window::GetParent(); + vcl::Window* pParent = Window::GetParent(); OSL_ENSURE(pParent != NULL, "OTableWindowListBox::OnDoubleClick : habe kein Parent !"); static_cast<OTableWindow*>(pParent)->OnEntryDoubleClicked(GetHdlEntry()); diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 4978043ef2ff..ed2768b958bc 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -32,7 +32,7 @@ namespace dbaui class LimitBoxImpl: public LimitBox { public: - LimitBoxImpl( Window* pParent, LimitBoxController* pCtrl ); + LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl ); virtual ~LimitBoxImpl(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -41,7 +41,7 @@ class LimitBoxImpl: public LimitBox LimitBoxController* m_pControl; }; -LimitBoxImpl::LimitBoxImpl( Window* pParent, LimitBoxController* pCtrl ) +LimitBoxImpl::LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl ) : LimitBox( pParent, WinBits( WB_DROPDOWN | WB_VSCROLL) ) , m_pControl( pCtrl ) { @@ -199,7 +199,7 @@ uno::Reference< awt::XWindow > SAL_CALL LimitBoxController::createItemWindow( uno::Reference< awt::XWindow > xItemWindow; uno::Reference< awt::XWindow > xParent( Parent ); - Window* pParent = VCLUnoHelper::GetWindow( xParent ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent ); if ( pParent ) { SolarMutexGuard aSolarMutexGuard; diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 87713caab9b5..5465148be499 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -42,7 +42,7 @@ namespace dbaui using namespace ::com::sun::star::beans; // OQueryContainerWindow - OQueryContainerWindow::OQueryContainerWindow(Window* pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext) + OQueryContainerWindow::OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext) :ODataView( pParent, _rController, _rxContext ) ,m_pViewSwitch(NULL) ,m_pBeamer(NULL) @@ -71,7 +71,7 @@ namespace dbaui xCloseable->close(sal_False); // false - holds the owner ship of this frame } - boost::scoped_ptr<Window> aTemp(m_pSplitter); + boost::scoped_ptr<vcl::Window> aTemp(m_pSplitter); m_pSplitter = NULL; } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 71bb2720d26a..f773f71c3354 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -289,7 +289,7 @@ namespace if (xUIElement.is()) { Reference< XWindow > xWindow(xUIElement->getRealInterface(), css::uno::UNO_QUERY); - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if( pWindow || pWindow->HasChildPathFocus() ) { pWindow->GrabFocusToDocument(); @@ -762,7 +762,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& ::connectivity::OSQLParseNode* pNode = m_aSqlParser.parseTree( aErrorMsg, m_sStatement, m_bGraphicalDesign ); if ( pNode ) { - Window* pView = getView(); + vcl::Window* pView = getView(); ModalDialog* pWindow = new ModalDialog( pView, WB_STDMODAL | WB_SIZEMOVE | WB_CENTER ); pWindow->SetSizePixel( ::Size( pView->GetSizePixel().Width() / 2, pView->GetSizePixel().Height() / 2 ) ); SvTreeListBox* pTreeBox = new SvTreeListBox( pWindow, WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HASLINESATROOT | WB_VSCROLL ); @@ -1113,7 +1113,7 @@ void OQueryController::setQueryComposer() } } -bool OQueryController::Construct(Window* pParent) +bool OQueryController::Construct(vcl::Window* pParent) { // TODO: we have to check if we should create the text view or the design view diff --git a/dbaccess/source/ui/querydesign/queryview.cxx b/dbaccess/source/ui/querydesign/queryview.cxx index 4a125c0b877f..a10a73045a0b 100644 --- a/dbaccess/source/ui/querydesign/queryview.cxx +++ b/dbaccess/source/ui/querydesign/queryview.cxx @@ -24,7 +24,7 @@ using namespace dbaui; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -OQueryView::OQueryView(Window* _pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext) +OQueryView::OQueryView(vcl::Window* _pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext) :OJoinDesignView( _pParent, _rController, _rxContext ) { diff --git a/dbaccess/source/ui/relationdesign/RTableWindow.hxx b/dbaccess/source/ui/relationdesign/RTableWindow.hxx index e315edb4ee36..27d31189a098 100644 --- a/dbaccess/source/ui/relationdesign/RTableWindow.hxx +++ b/dbaccess/source/ui/relationdesign/RTableWindow.hxx @@ -26,7 +26,7 @@ namespace dbaui class ORelationTableWindow : public OTableWindow { public: - ORelationTableWindow( Window* pParent,const TTableWindowData::value_type& pTabWinData) + ORelationTableWindow( vcl::Window* pParent,const TTableWindowData::value_type& pTabWinData) : OTableWindow(pParent, pTabWinData) {} /** returns the name which should be used when displaying join or relations diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 0237d46212e4..184a20e27f0e 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -243,7 +243,7 @@ OUString ORelationController::getPrivateTitle( ) const return ::dbaui::getStrippedDatabaseName(getDataSource(),sName); } -bool ORelationController::Construct(Window* pParent) +bool ORelationController::Construct(vcl::Window* pParent) { setView( * new ORelationDesignView( pParent, *this, getORB() ) ); OJoinController::Construct(pParent); diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index 02a826e88dd5..0305b4603736 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; -ORelationDesignView::ORelationDesignView(Window* _pParent, ORelationController& _rController,const Reference< XComponentContext >& _rxContext) +ORelationDesignView::ORelationDesignView(vcl::Window* _pParent, ORelationController& _rController,const Reference< XComponentContext >& _rxContext) :OJoinDesignView( _pParent, _rController, _rxContext ) { } diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 84a84f5cc792..a5ce0cf4714e 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::accessibility; // class ORelationTableView -ORelationTableView::ORelationTableView( Window* pParent, ORelationDesignView* pView ) +ORelationTableView::ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView ) :OJoinTableView( pParent, pView ) , ::comphelper::OContainerListener(m_aMutex) ,m_pExistingConnection(NULL) diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 167cc017574a..94f646154b58 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -28,7 +28,7 @@ using namespace dbaui; // class OFieldDescGenWin -OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp ) : +OFieldDescGenWin::OFieldDescGenWin( vcl::Window* pParent, OTableDesignHelpBar* pHelp ) : TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL ) { m_pFieldControl = new OTableFieldControl(this,pHelp); @@ -38,7 +38,7 @@ OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp OFieldDescGenWin::~OFieldDescGenWin() { - boost::scoped_ptr<Window> aTemp(m_pFieldControl); + boost::scoped_ptr<vcl::Window> aTemp(m_pFieldControl); m_pFieldControl = NULL; } diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx index e4a8c541515c..aaf01fd35d3c 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx @@ -37,7 +37,7 @@ namespace dbaui virtual void Resize() SAL_OVERRIDE; public: - OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelpBar ); + OFieldDescGenWin( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar ); virtual ~OFieldDescGenWin(); virtual void GetFocus() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 2f0a4572377e..566906a08aba 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -138,7 +138,7 @@ void OTableEditorCtrl::UpdateAll() Invalidate(); } -OTableEditorCtrl::OTableEditorCtrl(Window* pWindow) +OTableEditorCtrl::OTableEditorCtrl(vcl::Window* pWindow) :OTableRowView(pWindow) ,pNameCell(NULL) ,pTypeCell(NULL) diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index d09060a24458..623c48ea8aa3 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -122,7 +122,7 @@ namespace dbaui DECL_LINK(ControlPreNotifyHdl, NotifyEvent*); public: - OTableEditorCtrl(Window* pParentWin); + OTableEditorCtrl(vcl::Window* pParentWin); virtual ~OTableEditorCtrl(); virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) SAL_OVERRIDE; virtual void UpdateAll(); diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index dfdbcf4aa7dc..8dbaf5672843 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -538,7 +538,7 @@ void OTableController::impl_initialize() } } -bool OTableController::Construct(Window* pParent) +bool OTableController::Construct(vcl::Window* pParent) { setView( * new OTableDesignView( pParent, getORB(), *this ) ); OTableController_BASE::Construct(pParent); diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 9db53a80e726..f4348d5ebdfb 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::util; // Defines #define HANDLE_ID 0 -OTableRowView::OTableRowView(Window* pParent) +OTableRowView::OTableRowView(vcl::Window* pParent) :EditBrowseBox(pParent, ModuleRes(RID_DB_TAB_EDITOR),EBBF_NONE, BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_AUTOSIZE_LASTCOL | BROWSER_KEEPSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL) diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 36161117a219..5a69fc0b7ead 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -26,7 +26,7 @@ using namespace dbaui; #define STANDARD_MARGIN 6 // class OTableDesignHelpBar -OTableDesignHelpBar::OTableDesignHelpBar( Window* pParent ) : +OTableDesignHelpBar::OTableDesignHelpBar( vcl::Window* pParent ) : TabPage( pParent, WB_3DLOOK ) { m_pTextWin = new MultiLineEdit( this, WB_VSCROLL | WB_LEFT | WB_BORDER | WB_NOTABSTOP | WB_READONLY); @@ -38,7 +38,7 @@ OTableDesignHelpBar::OTableDesignHelpBar( Window* pParent ) : OTableDesignHelpBar::~OTableDesignHelpBar() { - boost::scoped_ptr<Window> aTemp(m_pTextWin); + boost::scoped_ptr<vcl::Window> aTemp(m_pTextWin); m_pTextWin = NULL; } diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 46d20a980e4e..b1743c5d35cd 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; // class OTableBorderWindow -OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORDER) +OTableBorderWindow::OTableBorderWindow(vcl::Window* pParent) : Window(pParent,WB_BORDER) ,m_aHorzSplitter( this ) { @@ -68,11 +68,11 @@ OTableBorderWindow::~OTableBorderWindow() m_pFieldDescWin->Hide(); { - boost::scoped_ptr<Window> aTemp(m_pEditorCtrl); + boost::scoped_ptr<vcl::Window> aTemp(m_pEditorCtrl); m_pEditorCtrl = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pFieldDescWin); + boost::scoped_ptr<vcl::Window> aTemp(m_pFieldDescWin); m_pFieldDescWin = NULL; } @@ -167,7 +167,7 @@ void OTableBorderWindow::GetFocus() } // class OTableDesignView -OTableDesignView::OTableDesignView( Window* pParent, +OTableDesignView::OTableDesignView( vcl::Window* pParent, const Reference< XComponentContext >& _rxOrb, OTableController& _rController ) : @@ -193,7 +193,7 @@ OTableDesignView::~OTableDesignView() m_pWin->Hide(); { - boost::scoped_ptr<Window> aTemp(m_pWin); + boost::scoped_ptr<vcl::Window> aTemp(m_pWin); m_pWin = NULL; } } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index 11e313bfea23..6016da7e79c7 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace dbaui; -OTableFieldControl::OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar) :OFieldDescControl(pParent,pHelpBar) +OTableFieldControl::OTableFieldControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar) :OFieldDescControl(pParent,pHelpBar) { } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx index 0e2a6d9ee8f8..80e6bd5aa114 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -46,7 +46,7 @@ namespace dbaui virtual OUString getAutoIncrementValue() const SAL_OVERRIDE; public: - OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar); + OTableFieldControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar); OUString BoolStringPersistent(const OUString& rUIString) const { return OFieldDescControl::BoolStringPersistent(rUIString); } OUString BoolStringUI(const OUString& rPersistentString) const { return OFieldDescControl::BoolStringUI(rPersistentString); } diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index aa3ab08bc6de..eef570c905d2 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -45,7 +45,7 @@ using namespace dbaui; // class OTableFieldDescWin -OTableFieldDescWin::OTableFieldDescWin( Window* pParent) +OTableFieldDescWin::OTableFieldDescWin( vcl::Window* pParent) : TabPage(pParent, WB_3DLOOK) , m_eChildFocus(NONE) { @@ -72,15 +72,15 @@ OTableFieldDescWin::~OTableFieldDescWin() m_pHeader->Hide(); { - boost::scoped_ptr<Window> aTemp(m_pGenPage); + boost::scoped_ptr<vcl::Window> aTemp(m_pGenPage); m_pGenPage = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pHeader); + boost::scoped_ptr<vcl::Window> aTemp(m_pHeader); m_pHeader = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pHelpBar); + boost::scoped_ptr<vcl::Window> aTemp(m_pHelpBar); m_pHelpBar = NULL; } } diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index ac3beafa252d..8f1ef89bbaa0 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -53,7 +53,7 @@ namespace dbaui virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - OTableFieldDescWin( Window* pParent); + OTableFieldDescWin( vcl::Window* pParent); virtual ~OTableFieldDescWin(); virtual void Init(); diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index c6d98828b4eb..cf90db45463b 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -63,7 +63,7 @@ namespace dbaui virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; OAdvancedSettingsDialog::OAdvancedSettingsDialog(const Reference< XComponentContext >& _rxORB) @@ -119,7 +119,7 @@ namespace dbaui describeProperties(aProps); return new ::cppu::OPropertyArrayHelper(aProps); } - Dialog* OAdvancedSettingsDialog::createDialog(Window* _pParent) + Dialog* OAdvancedSettingsDialog::createDialog(vcl::Window* _pParent) { AdvancedSettingsDialog* pDlg = new AdvancedSettingsDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection); return pDlg; diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index a91c0949c3d3..fe7a24e969c6 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -65,7 +65,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit { mbCreatingPeer = true; - Window* pParentWin = NULL; + vcl::Window* pParentWin = NULL; if (rParentPeer.is()) { VCLXWindow* pParent = VCLXWindow::GetImplementation(rParentPeer); diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index 2de839f8382b..1422c629b3a1 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; -OColumnPeer::OColumnPeer(Window* _pParent,const Reference<XComponentContext>& _rxContext) +OColumnPeer::OColumnPeer(vcl::Window* _pParent,const Reference<XComponentContext>& _rxContext) :m_pActFieldDescr(NULL) { osl_atomic_increment( &m_refCount ); diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx index 6ce446c385d7..5e15a10ed344 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.hxx +++ b/dbaccess/source/ui/uno/ColumnPeer.hxx @@ -33,7 +33,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xColumn; public: - OColumnPeer(Window* _pParent + OColumnPeer(vcl::Window* _pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); void setColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn); diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index ef1d0cde8bf0..bc1873982ea0 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -92,7 +92,7 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialog::getPropertySetInfo() thr return new ::cppu::OPropertyArrayHelper(aProps); } -Dialog* ODBTypeWizDialog::createDialog(Window* _pParent) +Dialog* ODBTypeWizDialog::createDialog(vcl::Window* _pParent) { ODbTypeWizDialog* pDlg = new ODbTypeWizDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection); return pDlg; diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index 3958b98f8e9e..4a3a265a6a68 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -55,7 +55,7 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index ddc72538b3ec..a6db1563e1d3 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -106,7 +106,7 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo( return new ::cppu::OPropertyArrayHelper(aProps); } -Dialog* ODBTypeWizDialogSetup::createDialog(Window* _pParent) +Dialog* ODBTypeWizDialogSetup::createDialog(vcl::Window* _pParent) { return new ODbTypeWizDialogSetup(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection); } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index e5a2b0945a65..8ed555e4014a 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -58,7 +58,7 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE; }; diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index 0a2d346700ff..9f284263bb1e 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -92,7 +92,7 @@ Reference<XPropertySetInfo> SAL_CALL OTableFilterDialog::getPropertySetInfo() t return new ::cppu::OPropertyArrayHelper(aProps); } -Dialog* OTableFilterDialog::createDialog(Window* _pParent) +Dialog* OTableFilterDialog::createDialog(vcl::Window* _pParent) { OTableSubscriptionDialog* pDlg = new OTableSubscriptionDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection); return pDlg; diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 1dc2bface661..408457ea8cc1 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -55,7 +55,7 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index 4ab1a5fa57db..e66d888c25a1 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -92,7 +92,7 @@ Reference<XPropertySetInfo> SAL_CALL OUserSettingsDialog::getPropertySetInfo() return new ::cppu::OPropertyArrayHelper(aProps); } -Dialog* OUserSettingsDialog::createDialog(Window* _pParent) +Dialog* OUserSettingsDialog::createDialog(vcl::Window* _pParent) { OUserAdminDlg* pDlg = new OUserAdminDlg(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection, m_xActiveConnection); return pDlg; diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index f0440cfb5d95..043fa1a52410 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -55,7 +55,7 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index e14a46fcf8ae..f2f52d656174 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -92,7 +92,7 @@ Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetI return new ::cppu::OPropertyArrayHelper(aProps); } -Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent) +Dialog* ODataSourcePropertyDialog::createDialog(vcl::Window* _pParent) { ODbAdminDialog* pDialog = new ODbAdminDialog(_pParent, m_pDatasourceItems, m_aContext); diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index 352251e31ec3..c791129851f3 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -55,7 +55,7 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index e5584465a520..7cf58cdec9d8 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -77,7 +77,7 @@ namespace dbaui IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ComposerDialog ) - Dialog* ComposerDialog::createDialog(Window* _pParent) + Dialog* ComposerDialog::createDialog(vcl::Window* _pParent) { // obtain all the objects needed for the dialog Reference< XConnection > xConnection; @@ -140,7 +140,7 @@ namespace dbaui return static_cast< XServiceInfo* >(new RowsetFilterDialog( comphelper::getComponentContext(_rxORB))); } - Dialog* RowsetFilterDialog::createComposerDialog( Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns ) + Dialog* RowsetFilterDialog::createComposerDialog( vcl::Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns ) { return new DlgFilterCrit( _pParent, m_aContext, _rxConnection, m_xComposer, _rxColumns ); } @@ -188,7 +188,7 @@ namespace dbaui return static_cast< XServiceInfo* >(new RowsetOrderDialog( comphelper::getComponentContext(_rxORB))); } - Dialog* RowsetOrderDialog::createComposerDialog( Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns ) + Dialog* RowsetOrderDialog::createComposerDialog( vcl::Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns ) { return new DlgOrderCrit( _pParent, _rxConnection, m_xComposer, _rxColumns ); } diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index 9d3b8580107a..4eb6fe8c2de1 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -63,14 +63,14 @@ namespace dbaui protected: // own overridables virtual Dialog* createComposerDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns ) = 0; private: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; // RowsetFilterDialog @@ -86,7 +86,7 @@ namespace dbaui protected: // own overridables virtual Dialog* createComposerDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns ) SAL_OVERRIDE; @@ -111,7 +111,7 @@ namespace dbaui protected: // own overridables virtual Dialog* createComposerDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 49dd9aef75c2..1f6f0b8cdb2b 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -193,7 +193,7 @@ namespace dbaui virtual ~CopyTableWizard(); // OGenericUnoDialog overridables - virtual Dialog* createDialog( Window* _pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE; virtual void executedDialog( sal_Int16 _nExecutionResult ) SAL_OVERRIDE; private: @@ -1521,7 +1521,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) return new ::cppu::OPropertyArrayHelper( aProps ); } -Dialog* CopyTableWizard::createDialog( Window* _pParent ) +Dialog* CopyTableWizard::createDialog( vcl::Window* _pParent ) { OSL_PRECOND( isInitialized(), "CopyTableWizard::createDialog: not initialized!" ); // this should have been prevented in ::execute already diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 6e81e7667789..d0c4969b57fb 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -104,7 +104,7 @@ namespace dbaui protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog( Window* _pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE; virtual void implInitialize( const com::sun::star::uno::Any& _rValue ) SAL_OVERRIDE; protected: using OTextConnectionSettingsDialog_BASE::getFastPropertyValue; @@ -204,7 +204,7 @@ namespace dbaui return new ::cppu::OPropertyArrayHelper( aProps ); } - Dialog* OTextConnectionSettingsDialog::createDialog(Window* _pParent) + Dialog* OTextConnectionSettingsDialog::createDialog(vcl::Window* _pParent) { return new TextConnectionSettingsDialog( _pParent, *m_pDatasourceItems ); } diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index bc58efbae59e..9c214d5a4dce 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -78,7 +78,7 @@ namespace dbaui IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ODirectSQLDialog ) - Dialog* ODirectSQLDialog::createDialog(Window* _pParent) + Dialog* ODirectSQLDialog::createDialog(vcl::Window* _pParent) { // obtain all the objects needed for the dialog Reference< XConnection > xConnection = m_xActiveConnection; diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 4fa7ec69ff81..43844874009e 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -57,7 +57,7 @@ namespace dbaui protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; }; diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 9235528c52a4..7ba1725b0b16 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -141,7 +141,7 @@ Reference<XPropertySetInfo> SAL_CALL OSQLMessageDialog::getPropertySetInfo() th return new ::cppu::OPropertyArrayHelper(aProps); } -Dialog* OSQLMessageDialog::createDialog(Window* _pParent) +Dialog* OSQLMessageDialog::createDialog(vcl::Window* _pParent) { if ( m_aException.hasValue() ) return new OSQLMessageBox( _pParent, SQLExceptionInfo( m_aException ), WB_OK | WB_DEF_OK, m_sHelpURL ); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 126704867aa8..6a59eee1f002 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2620,7 +2620,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) xStartModule->attachFrame(xBackingFrame); xContainerWindow->setVisible(sal_True); - Window* pCompWindow = VCLUnoHelper::GetWindow(xBackingFrame->getComponentWindow()); + vcl::Window* pCompWindow = VCLUnoHelper::GetWindow(xBackingFrame->getComponentWindow()); if (pCompWindow) pCompWindow->Update(); } @@ -2843,7 +2843,7 @@ void Desktop::ShowBackingComponent(Desktop * progress) // set the WB_EXT_DOCUMENT style. Normally, this is done by the TaskCreator service when a "_blank" // frame/window is created. Since we do not use the TaskCreator here, we need to mimic its behavior, // otherwise documents loaded into this frame will later on miss functionality depending on the style. - Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); + vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); SAL_WARN_IF( !pContainerWindow, "desktop.app", "Desktop::Main: no implementation access to the frame's container window!" ); pContainerWindow->SetExtendedStyle( pContainerWindow->GetExtendedStyle() | WB_EXT_DOCUMENT ); if (progress != 0) diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index bcdf2320e78f..da831ad9b38f 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx @@ -31,12 +31,12 @@ #include "dp_gui_dependencydialog.hxx" #include "dp_gui_shared.hxx" -class Window; +namespace vcl { class Window; } using dp_gui::DependencyDialog; DependencyDialog::DependencyDialog( - Window * parent, std::vector< OUString > const & dependencies): + vcl::Window * parent, std::vector< OUString > const & dependencies): ModalDialog(parent, "Dependencies", "desktop/ui/dependenciesdialog.ui") { get(m_list, "depListTreeview"); diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index e9397e221925..a778ad37630a 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -29,14 +29,14 @@ #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> -class Window; +namespace vcl { class Window; } namespace dp_gui { class DependencyDialog: public ModalDialog { public: DependencyDialog( - Window * parent, std::vector< OUString > const & dependencies); + vcl::Window * parent, std::vector< OUString > const & dependencies); virtual ~DependencyDialog(); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index e5ba333ff85d..e40c2910d468 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -136,7 +136,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl DECL_DLLPRIVATE_LINK( HandleRemoveBtn, void * ); public: - ExtBoxWithBtns_Impl(Window* pParent); + ExtBoxWithBtns_Impl(vcl::Window* pParent); virtual ~ExtBoxWithBtns_Impl(); void InitFromDialog(ExtMgrDialog *pParentDialog); @@ -150,7 +150,7 @@ public: void enableButtons( bool bEnable ); }; -ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl(Window* pParent) +ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl(vcl::Window* pParent) : ExtensionBox_Impl(pParent) , m_bInterfaceLocked(false) , m_pOptionsBtn(NULL) @@ -195,7 +195,7 @@ void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog *pParentDialog) } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeExtBoxWithBtns(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtBoxWithBtns(vcl::Window *pParent, VclBuilder::stringmap &) { return new ExtBoxWithBtns_Impl(pParent); } @@ -581,7 +581,7 @@ bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage > bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::XPackage > &xPackage, - Window *pParent, + vcl::Window *pParent, const sal_uInt16 nResID, bool &bHadWarning ) { @@ -662,7 +662,7 @@ void DialogHelper::PostUserEvent( const Link& rLink, void* pCaller ) } // ExtMgrDialog -ExtMgrDialog::ExtMgrDialog(Window *pParent, TheExtensionManager *pManager) +ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager) : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/extensionmanager.ui") , DialogHelper(pManager->getContext(), (Dialog*) this) , m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES)) @@ -1153,7 +1153,7 @@ bool ExtMgrDialog::Close() } //UpdateRequiredDialog -UpdateRequiredDialog::UpdateRequiredDialog(Window *pParent, TheExtensionManager *pManager) +UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionManager *pManager) : ModalDialog(pParent, "UpdateRequiredDialog", "desktop/ui/updaterequireddialog.ui") , DialogHelper(pManager->getContext(), (Dialog*) this) , m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES)) @@ -1560,7 +1560,7 @@ void UpdateRequiredDialog::disableAllEntries() // ShowLicenseDialog -ShowLicenseDialog::ShowLicenseDialog( Window * pParent, +ShowLicenseDialog::ShowLicenseDialog( vcl::Window * pParent, const uno::Reference< deployment::XPackage > &xPackage ) : ModalDialog(pParent, "ShowLicenseDialog", "desktop/ui/showlicensedialog.ui") { diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index df9622dd5025..36e40e1b62af 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -84,7 +84,7 @@ public: static OUString getResourceString( sal_uInt16 id ); static bool IsSharedPkgMgr( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &); static bool continueOnSharedExtension( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &, - Window *pParent, + vcl::Window *pParent, const sal_uInt16 nResID, bool &bHadWarning ); @@ -138,7 +138,7 @@ class ExtMgrDialog : public ModelessDialog, DECL_DLLPRIVATE_LINK( startProgress, void * ); public: - ExtMgrDialog( Window * pParent, TheExtensionManager *pManager ); + ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager ); virtual ~ExtMgrDialog(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -209,7 +209,7 @@ class UpdateRequiredDialog : public ModalDialog, void disableAllEntries(); public: - UpdateRequiredDialog( Window * pParent, TheExtensionManager *pManager ); + UpdateRequiredDialog( vcl::Window * pParent, TheExtensionManager *pManager ); virtual ~UpdateRequiredDialog(); virtual short Execute() SAL_OVERRIDE; @@ -241,7 +241,7 @@ class ShowLicenseDialog : public ModalDialog { VclMultiLineEdit* m_pLicenseText; public: - ShowLicenseDialog(Window * pParent, const css::uno::Reference< css::deployment::XPackage > &xPackage); + ShowLicenseDialog(vcl::Window * pParent, const css::uno::Reference< css::deployment::XPackage > &xPackage); }; diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 8e7225629bb2..4894fabecb82 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -175,7 +175,7 @@ ExtensionRemovedListener::~ExtensionRemovedListener() // ExtensionBox_Impl -ExtensionBox_Impl::ExtensionBox_Impl(Window* pParent) : +ExtensionBox_Impl::ExtensionBox_Impl(vcl::Window* pParent) : IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ), m_bHasScrollBar( false ), m_bHasActive( false ), @@ -837,7 +837,7 @@ Size ExtensionBox_Impl::GetOptimalSize() const return LogicToPixel(Size(250, 150), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeExtensionBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeExtensionBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new ExtensionBox_Impl(pParent); } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index e94eb41554b9..79be76e05c11 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -182,7 +182,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox void Init(); public: - ExtensionBox_Impl(Window* pParent); + ExtensionBox_Impl(vcl::Window* pParent); virtual ~ExtensionBox_Impl(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 218a9977c5b0..b8b5ba94e6e5 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -49,7 +49,7 @@ namespace dp_gui { // TheExtensionManager -TheExtensionManager::TheExtensionManager( Window *pParent, +TheExtensionManager::TheExtensionManager( vcl::Window *pParent, const uno::Reference< uno::XComponentContext > &xContext ) : m_xContext( xContext ), m_pParent( pParent ), @@ -488,7 +488,7 @@ void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ ) return s_ExtMgr; } - Window* pParent = DIALOG_NO_PARENT; + vcl::Window* pParent = DIALOG_NO_PARENT; if (xParent.is()) pParent = VCLUnoHelper::GetWindow(xParent); diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index 0d1352eb102e..f5e1665e31a4 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -53,7 +53,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > m_xExtensionManager; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xNameAccessNodes; - Window *m_pParent; + vcl::Window *m_pParent; ExtMgrDialog *m_pExtMgrDialog; UpdateRequiredDialog *m_pUpdReqDialog; ExtensionCmdQueue *m_pExecuteCmdQueue; @@ -63,7 +63,7 @@ private: public: static ::rtl::Reference<TheExtensionManager> s_ExtMgr; - TheExtensionManager( Window * pParent, + TheExtensionManager( vcl::Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext ); virtual ~TheExtensionManager(); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index adcc1657f8aa..01420bf6d7ca 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -116,7 +116,7 @@ class KeyEvent; class MouseEvent; -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } @@ -487,7 +487,7 @@ bool UpdateDialog::Thread::update( // UpdateDialog ---------------------------------------------------------- UpdateDialog::UpdateDialog( uno::Reference< uno::XComponentContext > const & context, - Window * parent, + vcl::Window * parent, const std::vector<uno::Reference< deployment::XPackage > > &vExtensionList, std::vector< dp_gui::UpdateData > * updateData): ModalDialog(parent, "UpdateDialog", "desktop/ui/updatedialog.ui"), @@ -589,7 +589,7 @@ short UpdateDialog::Execute() { return ModalDialog::Execute(); } -UpdateDialog::CheckListBox::CheckListBox( Window* pParent, UpdateDialog & dialog): +UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & dialog): SvxCheckListBox( pParent, WinBits(WB_BORDER) ), m_ignoreUpdate( DPGUI_RESSTR( RID_DLG_UPDATE_IGNORE ) ), m_ignoreAllUpdates( DPGUI_RESSTR( RID_DLG_UPDATE_IGNORE_ALL ) ), diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index e5365498b635..de861673fb29 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -45,7 +45,7 @@ class Image; class KeyEvent; class MouseEvent; class ResId; -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace deployment { class XExtensionManager; @@ -79,7 +79,7 @@ public: */ UpdateDialog( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context, - Window * parent, + vcl::Window * parent, const std::vector< com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > > & vExtensionList, std::vector< dp_gui::UpdateData > * updateData); @@ -109,7 +109,7 @@ private: class CheckListBox: public SvxCheckListBox { public: CheckListBox( - Window* pParent, UpdateDialog & dialog); + vcl::Window* pParent, UpdateDialog & dialog); virtual ~CheckListBox(); diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 1a2cef33a0e6..501cdd04cc8a 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -70,7 +70,7 @@ #include <vector> -class Window; +namespace vcl { class Window; } namespace cssu = ::com::sun::star::uno; @@ -200,7 +200,7 @@ void UpdateInstallDialog::Thread::execute() } UpdateInstallDialog::UpdateInstallDialog( - Window * parent, + vcl::Window * parent, std::vector<dp_gui::UpdateData> & aVecUpdateData, cssu::Reference< cssu::XComponentContext > const & xCtx): ModalDialog( diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index 434b1a188afa..3bad18abe96d 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -37,7 +37,7 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; }}}} -class Window; +namespace vcl { class Window; } namespace dp_gui { @@ -56,7 +56,7 @@ public: @param parent the parent window, may be null */ - UpdateInstallDialog(Window * parent, std::vector<UpdateData> & aVecUpdateData, + UpdateInstallDialog(vcl::Window * parent, std::vector<UpdateData> & aVecUpdateData, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xCtx); virtual ~UpdateInstallDialog(); diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 183504801d00..ff375208630d 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -55,7 +55,7 @@ class LicenseView : public MultiLineEdit, public SfxListener Link maScrolledHdl; public: - LicenseView( Window* pParent, WinBits nStyle ); + LicenseView( vcl::Window* pParent, WinBits nStyle ); virtual ~LicenseView(); void ScrollDown( ScrollType eScroll ); @@ -94,7 +94,7 @@ struct LicenseDialogImpl : public ModalDialog bool m_bLicenseRead; LicenseDialogImpl( - Window * pParent, + vcl::Window * pParent, css::uno::Reference< css::uno::XComponentContext > const & xContext, const OUString & sExtensionName, const OUString & sLicenseText); @@ -103,7 +103,7 @@ struct LicenseDialogImpl : public ModalDialog }; -LicenseView::LicenseView( Window* pParent, WinBits nStyle ) +LicenseView::LicenseView( vcl::Window* pParent, WinBits nStyle ) : MultiLineEdit( pParent, nStyle ) { SetLeftMargin( 5 ); @@ -111,7 +111,7 @@ LicenseView::LicenseView( Window* pParent, WinBits nStyle ) StartListening( *GetTextEngine() ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLicenseView(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLicenseView(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -182,7 +182,7 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint ) LicenseDialogImpl::LicenseDialogImpl( - Window * pParent, + vcl::Window * pParent, cssu::Reference< cssu::XComponentContext > const & xContext, const OUString & sExtensionName, const OUString & sLicenseText) diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index 58388e4d34ad..f03157c138a6 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx @@ -152,7 +152,7 @@ namespace drawinglayer if(pVCLXWindow) { - Window* pWindow = pVCLXWindow->GetWindow(); + vcl::Window* pWindow = pVCLXWindow->GetWindow(); if(pWindow) { diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 00355e7a0213..7d292e34ec0d 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -951,7 +951,7 @@ void EditEngine::SetInSelectionMode(bool b) pImpEditEngine->bInSelection = b; } -bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, Window* pFrameWin ) +bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditView, vcl::Window* pFrameWin ) { DBG_ASSERT( pEditView, "no View - no cookie !" ); diff --git a/editeng/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx index 861ddb17ef18..1cbc655bb3b1 100644 --- a/editeng/source/editeng/editsel.cxx +++ b/editeng/source/editeng/editsel.cxx @@ -82,7 +82,7 @@ void EditSelFunctionSet::DeselectAll() // class EditSelectionEngine -EditSelectionEngine::EditSelectionEngine() : SelectionEngine( (Window*)0 ) +EditSelectionEngine::EditSelectionEngine() : SelectionEngine( (vcl::Window*)0 ) { SetSelectionMode( RANGE_SELECTION ); EnableDrag( true ); @@ -96,7 +96,7 @@ void EditSelectionEngine::SetCurView( EditView* pNewView ) if ( pNewView ) SetWindow( pNewView->GetWindow() ); else - SetWindow( (Window*)0 ); + SetWindow( (vcl::Window*)0 ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index db0444b62ec5..f972ad75cecb 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -151,7 +151,7 @@ LanguageType EditView::CheckLanguage( // class EditView -EditView::EditView( EditEngine* pEng, Window* pWindow ) +EditView::EditView( EditEngine* pEng, vcl::Window* pWindow ) { pImpEditView = new ImpEditView( this, pEng, pWindow ); } @@ -276,13 +276,13 @@ void EditView::SetEditEngine( EditEngine* pEditEng ) pImpEditView->SetEditSelection( aStartSel ); } -void EditView::SetWindow( Window* pWin ) +void EditView::SetWindow( vcl::Window* pWin ) { pImpEditView->pOutWin = pWin; pImpEditView->pEditEngine->pImpEditEngine->GetSelEngine().Reset(); } -Window* EditView::GetWindow() const +vcl::Window* EditView::GetWindow() const { return pImpEditView->pOutWin; } @@ -355,7 +355,7 @@ void EditView::InsertText( const OUString& rStr, bool bSelect ) pEE->FormatAndUpdate( this ); } -bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin ) +bool EditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin ) { return pImpEditView->PostKeyEvent( rKeyEvent, pFrameWin ); } @@ -673,7 +673,7 @@ void EditView::TransliterateText( sal_Int32 nTransliterationMode ) } } -void EditView::CompleteAutoCorrect( Window* pFrameWin ) +void EditView::CompleteAutoCorrect( vcl::Window* pFrameWin ) { if ( !pImpEditView->HasSelection() && pImpEditView->pEditEngine->pImpEditEngine->GetStatus().DoAutoCorrect() ) { diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 52196a668426..41f754996a61 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -40,7 +40,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::linguistic2; -EditSpellWrapper::EditSpellWrapper( Window* _pWin, +EditSpellWrapper::EditSpellWrapper( vcl::Window* _pWin, Reference< XSpellChecker1 > &xChecker, bool bIsStart, bool bIsAllRight, EditView* pView ) : SvxSpellWrapper( _pWin, xChecker, bIsStart, bIsAllRight ) diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx index 797e41b1143e..a3b1382090e3 100644 --- a/editeng/source/editeng/edtspell.hxx +++ b/editeng/source/editeng/edtspell.hxx @@ -57,7 +57,7 @@ protected: virtual void AutoCorrect( const OUString& rOldWord, const OUString& rNewWord ) SAL_OVERRIDE; public: - EditSpellWrapper( Window* pWin, + EditSpellWrapper( vcl::Window* pWin, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xChecker, bool bIsStart, diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index e45abb4213b3..bdd5065ec6a9 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -67,7 +67,7 @@ static inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, shor // class ImpEditView -ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) : +ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindow ) : aOutArea( Point(), pEng->GetPaperSize() ) { pEditView = pView; @@ -333,7 +333,7 @@ void ImpEditView::ImplDrawHighlightRect( OutputDevice* _pTarget, const Point& rD } else { - Window* pWindow = dynamic_cast< Window* >(_pTarget); + vcl::Window* pWindow = dynamic_cast< vcl::Window* >(_pTarget); if(pWindow) { @@ -985,7 +985,7 @@ Pair ImpEditView::Scroll( long ndX, long ndY, sal_uInt8 nRangeCheck ) return Pair( nRealDiffX, nRealDiffY ); } -bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin ) +bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin ) { bool bDone = false; @@ -1964,7 +1964,7 @@ void ImpEditView::dragOver(const ::com::sun::star::datatransfer::dnd::DropTarget void ImpEditView::AddDragAndDropListeners() { - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( !bActiveDragAndDropListener && pWindow && pWindow->GetDragGestureRecognizer().is() ) { vcl::unohelper::DragAndDropWrapper* pDnDWrapper = new vcl::unohelper::DragAndDropWrapper( this ); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 634aaa0b8b92..b0756c7c73a6 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -79,7 +79,7 @@ class TextRanger; class SvKeyValueIterator; class SvxForbiddenCharactersTable; class SvtCTLOptions; -class Window; +namespace vcl { class Window; } class SvxNumberFormat; @@ -215,7 +215,7 @@ private: vcl::Cursor* pCursor; Color* pBackgroundColor; EditEngine* pEditEngine; - Window* pOutWin; + vcl::Window* pOutWin; Pointer* pPointer; DragAndDropInfo* pDragAndDropInfo; @@ -263,7 +263,7 @@ protected: void ImplDrawHighlightRect( OutputDevice* _pTarget, const Point& rDocPosTopLeft, const Point& rDocPosBottomRight, PolyPolygon* pPolyPoly ); public: - ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ); + ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindow ); virtual ~ImpEditView(); EditView* GetEditViewPtr() { return pEditView; } @@ -284,7 +284,7 @@ public: bool IsVertical() const; - bool PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL ); + bool PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin = NULL ); bool MouseButtonUp( const MouseEvent& rMouseEvent ); bool MouseButtonDown( const MouseEvent& rMouseEvent ); @@ -310,7 +310,7 @@ public: void DrawSelection() { DrawSelection( aEditSelection ); } void DrawSelection( EditSelection, Region* pRegion = NULL, OutputDevice* pTargetDevice = NULL ); - Window* GetWindow() const { return pOutWin; } + vcl::Window* GetWindow() const { return pOutWin; } EESelectionMode GetSelectionMode() const { return eSelectionMode; } void SetSelectionMode( EESelectionMode eMode ); @@ -760,7 +760,7 @@ public: EditPaM DeleteSelected( EditSelection aEditSelection); EditPaM InsertText( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, bool bIsUserInput = false ); EditPaM InsertText(const EditSelection& aCurEditSelection, const OUString& rStr); - EditPaM AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, Window* pFrameWin = NULL ); + EditPaM AutoCorrect( const EditSelection& rCurEditSelection, sal_Unicode c, bool bOverwrite, vcl::Window* pFrameWin = NULL ); EditPaM DeleteLeftOrRight( const EditSelection& rEditSelection, sal_uInt8 nMode, sal_uInt8 nDelMode = DELMODE_SIMPLE ); EditPaM InsertParaBreak( EditSelection aEditSelection ); EditPaM InsertLineBreak(const EditSelection& aEditSelection); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 63ccd0e36aec..6dd731e2f2f1 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2465,7 +2465,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_Int32 nPara ) } EditPaM ImpEditEngine::AutoCorrect( const EditSelection& rCurSel, sal_Unicode c, - bool bOverwrite, Window* pFrameWin ) + bool bOverwrite, vcl::Window* pFrameWin ) { EditSelection aSel( rCurSel ); SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx index 92035210ae69..e5230587185e 100644 --- a/editeng/source/editeng/textconv.cxx +++ b/editeng/source/editeng/textconv.cxx @@ -42,7 +42,7 @@ using namespace com::sun::star::linguistic2; -TextConvWrapper::TextConvWrapper( Window* pWindow, +TextConvWrapper::TextConvWrapper( vcl::Window* pWindow, const Reference< XComponentContext >& rxContext, const Locale& rSourceLocale, const Locale& rTargetLocale, diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx index d8073b758925..1dabca5d45b4 100644 --- a/editeng/source/editeng/textconv.hxx +++ b/editeng/source/editeng/textconv.hxx @@ -39,7 +39,7 @@ class TextConvWrapper : public editeng::HangulHanjaConversion // starts from the cursor position EditView * m_pEditView; - Window * m_pWin; + vcl::Window * m_pWin; bool m_bStartChk; bool m_bStartDone; @@ -94,7 +94,7 @@ protected: public: - TextConvWrapper( Window* pWindow, + TextConvWrapper( vcl::Window* pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::lang::Locale& rSourceLocale, const ::com::sun::star::lang::Locale& rTargetLocale, diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 506ed316f1e0..ef7e58c7b508 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -69,7 +69,7 @@ namespace editeng // general AbstractHangulHanjaConversionDialog* m_pConversionDialog; // the dialog to display for user interaction - Window* m_pUIParent; // the parent window for any UI we raise + vcl::Window* m_pUIParent; // the parent window for any UI we raise Reference< XComponentContext > m_xContext; // the service factory to use Reference< XExtendedTextConversion > @@ -119,7 +119,7 @@ namespace editeng public: HangulHanjaConversion_Impl( - Window* _pUIParent, + vcl::Window* _pUIParent, const Reference< XComponentContext >& rxContext, const Locale& _rSourceLocale, const Locale& _rTargetLocale, @@ -229,7 +229,7 @@ namespace editeng HangulHanjaConversion_Impl::StringMap HangulHanjaConversion_Impl::m_aRecentlyUsedList = HangulHanjaConversion_Impl::StringMap(); - HangulHanjaConversion_Impl::HangulHanjaConversion_Impl( Window* _pUIParent, + HangulHanjaConversion_Impl::HangulHanjaConversion_Impl( vcl::Window* _pUIParent, const Reference< XComponentContext >& rxContext, const Locale& _rSourceLocale, const Locale& _rTargetLocale, @@ -965,7 +965,7 @@ namespace editeng bool HangulHanjaConversion::m_bTryBothDirectionsSave = false; HHC::ConversionDirection HangulHanjaConversion::m_ePrimaryConversionDirectionSave = HHC::eHangulToHanja; - HangulHanjaConversion::HangulHanjaConversion( Window* _pUIParent, + HangulHanjaConversion::HangulHanjaConversion( vcl::Window* _pUIParent, const Reference< XComponentContext >& rxContext, const Locale& _rSourceLocale, const Locale& _rTargetLocale, const vcl::Font* _pTargetFont, diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 35a493335115..68449743ec87 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -143,7 +143,7 @@ SvxSpellWrapper::~SvxSpellWrapper() * --------------------------------------------------------------------*/ -SvxSpellWrapper::SvxSpellWrapper( Window* pWn, +SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, Reference< XSpellChecker1 > &xSpellChecker, const bool bStart, const bool bIsAllRight, const bool bOther, const bool bRevAllow ) : @@ -168,7 +168,7 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn, -SvxSpellWrapper::SvxSpellWrapper( Window* pWn, +SvxSpellWrapper::SvxSpellWrapper( vcl::Window* pWn, Reference< XHyphenator > &xHyphenator, const bool bStart, const bool bOther ) : pWin ( pWn ), @@ -372,7 +372,7 @@ void SvxSpellWrapper::SpellDocument( ) Reference< XSpellAlternatives > xAlt( GetLast(), UNO_QUERY ); Reference< XHyphenatedWord > xHyphWord( GetLast(), UNO_QUERY ); - Window *pOld = pWin; + vcl::Window *pOld = pWin; bDialog = true; if (xHyphWord.is()) { diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index f22cb42d871f..191bbe833291 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1205,7 +1205,7 @@ OUString SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, sal_Int32 nInsPos, sal_uLong SvxAutoCorrect::DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt, sal_Int32 nInsPos, sal_Unicode cChar, - bool bInsert, Window* pFrameWin ) + bool bInsert, vcl::Window* pFrameWin ) { sal_uLong nRet = 0; bool bIsNextRun = bRunNext; diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index 4a9da15201ad..2a356199e94b 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -823,7 +823,7 @@ SvxDicListChgClamp::~SvxDicListChgClamp() } } -short SvxDicError( Window *pParent, sal_Int16 nError ) +short SvxDicError( vcl::Window *pParent, sal_Int16 nError ) { short nRes = 0; if (DIC_ERR_NONE != nError) diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 5ca6729b3b83..bbd89edf3538 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star; -OutlinerView::OutlinerView( Outliner* pOut, Window* pWin ) +OutlinerView::OutlinerView( Outliner* pOut, vcl::Window* pWin ) { pOwner = pOut; @@ -73,7 +73,7 @@ void OutlinerView::Paint( const Rectangle& rRect, OutputDevice* pTargetDevice ) pEditView->Paint( rRect, pTargetDevice ); } -bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin ) +bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin ) { // For the first Paint/KeyInput/Drop an emty Outliner is turned into // an Outliner with exactly one paragraph. @@ -1234,12 +1234,12 @@ void OutlinerView::HideCursor() pEditView->HideCursor(); } -void OutlinerView::SetWindow( Window* pWin ) +void OutlinerView::SetWindow( vcl::Window* pWin ) { pEditView->SetWindow( pWin ); } -Window* OutlinerView::GetWindow() const +vcl::Window* OutlinerView::GetWindow() const { return pEditView->GetWindow(); } diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index bfe4cb17e423..45abc6bf7036 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -58,7 +58,7 @@ namespace abp //= OAddessBookSourcePilot - OAddessBookSourcePilot::OAddessBookSourcePilot(Window* _pParent, const Reference< XComponentContext >& _rxORB) + OAddessBookSourcePilot::OAddessBookSourcePilot(vcl::Window* _pParent, const Reference< XComponentContext >& _rxORB) :OAddessBookSourcePilot_Base( _pParent, static_cast<sal_uInt32>(WZB_HELP | WZB_FINISH | WZB_CANCEL | WZB_NEXT | WZB_PREVIOUS) ) ,m_xORB(_rxORB) diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index 9a83389b193e..cd4e818f41c5 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.hxx @@ -47,7 +47,7 @@ namespace abp public: /// ctor OAddessBookSourcePilot( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); /// dtor virtual ~OAddessBookSourcePilot(); diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 955c10952e17..d924faf64149 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -48,7 +48,7 @@ namespace abp OAdminDialogInvokation::OAdminDialogInvokation(const Reference< XComponentContext >& _rxContext , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xDataSource - , Window* _pMessageParent) + , vcl::Window* _pMessageParent) :m_xContext(_rxContext) ,m_xDataSource(_xDataSource) ,m_pMessageParent(_pMessageParent) diff --git a/extensions/source/abpilot/admininvokationimpl.hxx b/extensions/source/abpilot/admininvokationimpl.hxx index 32d895e0a367..e71b5ec55802 100644 --- a/extensions/source/abpilot/admininvokationimpl.hxx +++ b/extensions/source/abpilot/admininvokationimpl.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -class Window; +namespace vcl { class Window; } namespace abp { @@ -36,13 +36,13 @@ namespace abp ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDataSource; - Window* m_pMessageParent; + vcl::Window* m_pMessageParent; public: OAdminDialogInvokation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xDataSource, - Window* _pMessageParent + vcl::Window* _pMessageParent ); bool invokeAdministration( bool _bFixedType ); diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 8d2f36f9fbbf..b5b3d86eb120 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -502,7 +502,7 @@ namespace abp } - bool ODataSource::connect( Window* _pMessageParent ) + bool ODataSource::connect( vcl::Window* _pMessageParent ) { if ( isConnected( ) ) // nothing to do diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index 61b6855e31fa..7515c1516f79 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { } } } } -class Window; +namespace vcl { class Window; } @@ -157,7 +157,7 @@ namespace abp at all. @see isConnected */ - bool connect( Window* _pMessageParent ); + bool connect( vcl::Window* _pMessageParent ); /// returns <TRUE/> if the object has a valid connection, obtained from it's data source bool isConnected( ) const; diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 8717ea75413b..99c93ef2c58e 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -69,7 +69,7 @@ namespace abp - bool invokeDialog( const Reference< XComponentContext >& _rxORB, class Window* _pParent, + bool invokeDialog( const Reference< XComponentContext >& _rxORB, class vcl::Window* _pParent, const Reference< XPropertySet >& _rxDataSource, AddressSettings& _rSettings ) { _rSettings.aFieldMapping.clear(); diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx index df5e71ae5052..7ac1e5fb7fb3 100644 --- a/extensions/source/abpilot/fieldmappingimpl.hxx +++ b/extensions/source/abpilot/fieldmappingimpl.hxx @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { class XPropertySet; } } } } -class Window; +namespace vcl { class Window; } namespace abp @@ -61,7 +61,7 @@ namespace abp */ bool invokeDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, - class Window* _pParent, + class vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDataSource, AddressSettings& _rSettings ); diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index 1ed507b60dc2..063bac1f8846 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -152,7 +152,7 @@ namespace abp } - Dialog* OABSPilotUno::createDialog(Window* _pParent) + Dialog* OABSPilotUno::createDialog(vcl::Window* _pParent) { return new OAddessBookSourcePilot(_pParent, m_aContext ); } diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx index 845423d07954..ff58b6e9a456 100644 --- a/extensions/source/abpilot/unodialogabp.hxx +++ b/extensions/source/abpilot/unodialogabp.hxx @@ -84,7 +84,7 @@ namespace abp using OABSPilotUno_DBase::execute; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE; }; diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index c48327763351..72120f8d36ce 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -47,9 +47,9 @@ namespace bib using namespace ::com::sun::star::uno; - void HandleTaskPaneList( Window* pWindow, bool bAddToList ) + void HandleTaskPaneList( vcl::Window* pWindow, bool bAddToList ) { - Window* pParent = pWindow->GetParent(); + vcl::Window* pParent = pWindow->GetParent(); DBG_ASSERT( pParent, "-GetTaskPaneList(): everybody here should have a parent!" ); @@ -69,7 +69,7 @@ namespace bib class BibGridwin - :public Window //DockingWindow + :public vcl::Window //DockingWindow { private: Reference< awt::XWindow > m_xGridWin; @@ -85,7 +85,7 @@ namespace bib public: - BibGridwin(Window* pParent, WinBits nStyle = WB_3DLOOK ); + BibGridwin(vcl::Window* pParent, WinBits nStyle = WB_3DLOOK ); virtual ~BibGridwin(); void createGridWin(const Reference< awt::XControlModel > & xDbForm); @@ -98,7 +98,7 @@ namespace bib virtual void GetFocus() SAL_OVERRIDE; }; - BibGridwin::BibGridwin( Window* _pParent, WinBits _nStyle ) : Window( _pParent, _nStyle ) + BibGridwin::BibGridwin( vcl::Window* _pParent, WinBits _nStyle ) : Window( _pParent, _nStyle ) { m_xControlContainer = VCLUnoHelper::CreateControlContainer(this); @@ -180,7 +180,7 @@ namespace bib m_xGridWin->setFocus(); } - BibBeamer::BibBeamer( Window* _pParent, BibDataManager* _pDM, WinBits _nStyle ) + BibBeamer::BibBeamer( vcl::Window* _pParent, BibDataManager* _pDM, WinBits _nStyle ) :BibSplitWindow( _pParent, _nStyle | WB_NOSPLITDRAW ) ,pDatMan( _pDM ) ,pToolBar( NULL ) diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index c4e15925ffe1..e36bc7906453 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.hxx @@ -70,7 +70,7 @@ namespace bib virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception > getDispatchProviderInterception(); - BibBeamer(Window* pParent,BibDataManager* pDatMan, WinBits nStyle = WB_3DLOOK ); + BibBeamer(vcl::Window* pParent,BibDataManager* pDatMan, WinBits nStyle = WB_3DLOOK ); virtual ~BibBeamer(); void SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &); diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx index 955f47919f2c..b48aa514b361 100644 --- a/extensions/source/bibliography/bibcont.cxx +++ b/extensions/source/bibliography/bibcont.cxx @@ -43,7 +43,7 @@ bool BibShortCutHandler::HandleShortCutKey( const KeyEvent& ) } -BibWindow::BibWindow( Window* pParent, WinBits nStyle ) : Window( pParent, nStyle ), BibShortCutHandler( this ) +BibWindow::BibWindow( vcl::Window* pParent, WinBits nStyle ) : Window( pParent, nStyle ), BibShortCutHandler( this ) { } @@ -52,7 +52,7 @@ BibWindow::~BibWindow() } -BibSplitWindow::BibSplitWindow( Window* pParent, WinBits nStyle ) : SplitWindow( pParent, nStyle ), BibShortCutHandler( this ) +BibSplitWindow::BibSplitWindow( vcl::Window* pParent, WinBits nStyle ) : SplitWindow( pParent, nStyle ), BibShortCutHandler( this ) { } @@ -60,7 +60,7 @@ BibSplitWindow::~BibSplitWindow() { } -BibTabPage::BibTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : +BibTabPage::BibTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : TabPage( pParent, rID, rUIXMLDescription ), BibShortCutHandler( this ) { } @@ -80,13 +80,13 @@ using namespace ::rtl; #define WIN_MIN_HEIGHT 10 #define WIN_STEP_SIZE 5 -BibWindowContainer::BibWindowContainer( Window* pParent, BibShortCutHandler* pChildWin, WinBits nStyle ) : +BibWindowContainer::BibWindowContainer( vcl::Window* pParent, BibShortCutHandler* pChildWin, WinBits nStyle ) : BibWindow( pParent, nStyle ), pChild( pChildWin ) { if(pChild!=NULL) { - Window* pChildWindow = GetChild(); + vcl::Window* pChildWindow = GetChild(); pChildWindow->SetParent(this); pChildWindow->Show(); pChildWindow->SetPosPixel(Point(0,0)); @@ -97,7 +97,7 @@ BibWindowContainer::~BibWindowContainer() { if( pChild ) { - Window* pDel = GetChild(); + vcl::Window* pDel = GetChild(); pChild = NULL; // prevents GetFocus for child while deleting! delete pDel; } @@ -121,7 +121,7 @@ bool BibWindowContainer::HandleShortCutKey( const KeyEvent& rKeyEvent ) } -BibBookContainer::BibBookContainer(Window* pParent, WinBits nStyle): +BibBookContainer::BibBookContainer(vcl::Window* pParent, WinBits nStyle): BibSplitWindow(pParent,nStyle), pTopWin(NULL), pBottomWin(NULL) @@ -140,14 +140,14 @@ BibBookContainer::~BibBookContainer() if( pTopWin ) { - Window* pDel = pTopWin; + vcl::Window* pDel = pTopWin; pTopWin = NULL; // prevents GetFocus for child while deleting! delete pDel; } if( pBottomWin ) { - Window* pDel = pBottomWin; + vcl::Window* pDel = pBottomWin; pBottomWin = NULL; // prevents GetFocus for child while deleting! delete pDel; } diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx index 67f7241973fe..7b2dacc01533 100644 --- a/extensions/source/bibliography/bibcont.hxx +++ b/extensions/source/bibliography/bibcont.hxx @@ -40,10 +40,10 @@ class BibWindowContainer : public BibWindow //Window virtual void Resize() SAL_OVERRIDE; public: - BibWindowContainer( Window* pParent, BibShortCutHandler* pChild, WinBits nStyle = WB_3DLOOK); + BibWindowContainer( vcl::Window* pParent, BibShortCutHandler* pChild, WinBits nStyle = WB_3DLOOK); virtual ~BibWindowContainer(); - inline Window* GetChild(); + inline vcl::Window* GetChild(); virtual void GetFocus() SAL_OVERRIDE; @@ -52,7 +52,7 @@ class BibWindowContainer : public BibWindow //Window using Window::GetChild; }; -inline Window* BibWindowContainer::GetChild() +inline vcl::Window* BibWindowContainer::GetChild() { return pChild? pChild->GetWindow() : NULL; } @@ -83,7 +83,7 @@ class BibBookContainer: public BibSplitWindow public: - BibBookContainer(Window* pParent, WinBits nStyle = WB_3DLOOK ); + BibBookContainer(vcl::Window* pParent, WinBits nStyle = WB_3DLOOK ); virtual ~BibBookContainer(); inline BibWindow* GetTopWin() {return pTopWin;} diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index feec3e9ede85..8a732ccb2b58 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -272,7 +272,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUSt VCLXWindow* pParentComponent = VCLXWindow::GetImplementation(aWindow); assert(pParentComponent); - Window* pParent = VCLUnoHelper::GetWindow( aWindow ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( aWindow ); BibBookContainer *pMyWindow = new BibBookContainer( pParent ); pMyWindow->Show(); diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx index 6eb4231b3182..f8c87f395fb5 100644 --- a/extensions/source/bibliography/bibshortcuthandler.hxx +++ b/extensions/source/bibliography/bibshortcuthandler.hxx @@ -31,45 +31,45 @@ class BibShortCutHandler { private: - Window* pBaseClass; // in cases, where BibShortCutHandler also has to be a window + vcl::Window* pBaseClass; // in cases, where BibShortCutHandler also has to be a window protected: - inline BibShortCutHandler( Window* pBaseClass ); + inline BibShortCutHandler( vcl::Window* pBaseClass ); public: virtual ~BibShortCutHandler(); virtual bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled - inline Window* GetWindow( void ); + inline vcl::Window* GetWindow( void ); }; -inline BibShortCutHandler::BibShortCutHandler( Window* _pBaseClass ) : pBaseClass( _pBaseClass ) +inline BibShortCutHandler::BibShortCutHandler( vcl::Window* _pBaseClass ) : pBaseClass( _pBaseClass ) { } -inline Window* BibShortCutHandler::GetWindow( void ) +inline vcl::Window* BibShortCutHandler::GetWindow( void ) { return pBaseClass; } -class BibWindow : public Window, public BibShortCutHandler +class BibWindow : public vcl::Window, public BibShortCutHandler { public: - BibWindow( Window* pParent,WinBits nStyle = WB_3DLOOK); + BibWindow( vcl::Window* pParent,WinBits nStyle = WB_3DLOOK); virtual ~BibWindow(); }; class BibSplitWindow : public SplitWindow, public BibShortCutHandler { public: - BibSplitWindow( Window* pParent,WinBits nStyle = WB_3DLOOK); + BibSplitWindow( vcl::Window* pParent,WinBits nStyle = WB_3DLOOK); virtual ~BibSplitWindow(); }; class BibTabPage : public TabPage, public BibShortCutHandler { public: - BibTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + BibTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~BibTabPage(); }; diff --git a/extensions/source/bibliography/bibtools.hxx b/extensions/source/bibliography/bibtools.hxx index 4b0af71175b4..86a316fdb7ef 100644 --- a/extensions/source/bibliography/bibtools.hxx +++ b/extensions/source/bibliography/bibtools.hxx @@ -26,15 +26,15 @@ namespace bib { // source in bibbeam.cxx - void HandleTaskPaneList( Window* pWindow, bool bAddToList ); + void HandleTaskPaneList( vcl::Window* pWindow, bool bAddToList ); // pWindow: just an system window or something which is child of a system window - inline void AddToTaskPaneList( Window* pWindowToBeHandled ) + inline void AddToTaskPaneList( vcl::Window* pWindowToBeHandled ) { HandleTaskPaneList( pWindowToBeHandled, true ); } - inline void RemoveFromTaskPaneList( Window* pWindowToBeHandled ) + inline void RemoveFromTaskPaneList( vcl::Window* pWindowToBeHandled ) { HandleTaskPaneList( pWindowToBeHandled, false ); } diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 1ecbe3db04f6..64929b2d8f47 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -47,7 +47,7 @@ namespace bib - BibView::BibView( Window* _pParent, BibDataManager* _pManager, WinBits _nStyle ) + BibView::BibView( vcl::Window* _pParent, BibDataManager* _pManager, WinBits _nStyle ) :BibWindow( _pParent, _nStyle ) ,m_pDatMan( _pManager ) ,m_xDatMan( _pManager ) diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx index a8d73ad7408a..add53d7c2bbe 100644 --- a/extensions/source/bibliography/bibview.hxx +++ b/extensions/source/bibliography/bibview.hxx @@ -59,7 +59,7 @@ namespace bib virtual void _reloaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; public: - BibView( Window* _pParent, BibDataManager* _pDatMan, WinBits nStyle = WB_3DLOOK ); + BibView( vcl::Window* _pParent, BibDataManager* _pDatMan, WinBits nStyle = WB_3DLOOK ); virtual ~BibView(); void UpdatePages(); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index f314500fccf5..49fa9581a30a 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -237,7 +237,7 @@ class MappingDialog_Impl : public ModalDialog DECL_LINK(ListBoxSelectHdl, ListBox*); public: - MappingDialog_Impl(Window* pParent, BibDataManager* pDatMan); + MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pDatMan); virtual ~MappingDialog_Impl(); void SetModified() {bModified = true;} @@ -255,7 +255,7 @@ static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig , return USHRT_MAX; } -MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) +MappingDialog_Impl::MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pMan) : ModalDialog(pParent, "MappingDialog", "modules/sbibliography/ui/mappingdialog.ui") , pDatMan(pMan) , sNone(BIB_RESSTR(RID_BIB_STR_NONE)) @@ -432,13 +432,13 @@ class DBChangeDialog_Impl : public ModalDialog DECL_LINK(DoubleClickHdl, SvTabListBox*); public: - DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ); + DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* pMan ); virtual ~DBChangeDialog_Impl(); OUString GetCurrentURL()const; }; -DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) +DBChangeDialog_Impl::DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* pMan ) : ModalDialog(pParent, "ChooseDataSourceDialog", "modules/sbibliography/ui/choosedatasourcedialog.ui") , @@ -1432,7 +1432,7 @@ void BibDataManager::RemoveMeAsUidListener() } } -void BibDataManager::CreateMappingDialog(Window* pParent) +void BibDataManager::CreateMappingDialog(vcl::Window* pParent) { boost::scoped_ptr<MappingDialog_Impl> pDlg(new MappingDialog_Impl(pParent, this)); if(RET_OK == pDlg->Execute() && pBibView) @@ -1441,7 +1441,7 @@ void BibDataManager::CreateMappingDialog(Window* pParent) } } -OUString BibDataManager::CreateDBChangeDialog(Window* pParent) +OUString BibDataManager::CreateDBChangeDialog(vcl::Window* pParent) { OUString uRet; boost::scoped_ptr<DBChangeDialog_Impl> pDlg(new DBChangeDialog_Impl(pParent, this )); diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index 1bdd48b4a89f..fa52d0b7491a 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <cppuhelper/implbase1.hxx> -class Window; +namespace vcl { class Window; } namespace bib @@ -167,8 +167,8 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > loadControlModel(const OUString& rName, bool bForceListBox = false); - void CreateMappingDialog(Window* pParent); - OUString CreateDBChangeDialog(Window* pParent); + void CreateMappingDialog(vcl::Window* pParent); + OUString CreateDBChangeDialog(vcl::Window* pParent); void DispatchDBChangeDialog(); bool HasActiveConnection() const; diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 7f997e5dd88a..13763bc8a575 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -183,7 +183,7 @@ BibFrameController_Impl::BibFrameController_Impl( const uno::Reference< awt::XWi ,pDatMan( pDataManager ) ,pBibMod(NULL) { - Window* pParent = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xWindow ); pParent->SetUniqueId(UID_BIB_FRAME_WINDOW); bDisposing=false; bHierarchical=true; @@ -398,15 +398,15 @@ bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::XForm return bResult; } -static Window* lcl_GetFocusChild( Window* pParent ) +static vcl::Window* lcl_GetFocusChild( vcl::Window* pParent ) { sal_uInt16 nChildren = pParent->GetChildCount(); for( sal_uInt16 nChild = 0; nChild < nChildren; ++nChild) { - Window* pChild = pParent->GetChild( nChild ); + vcl::Window* pChild = pParent->GetChild( nChild ); if(pChild->HasFocus()) return pChild; - Window* pSubChild = lcl_GetFocusChild( pChild ); + vcl::Window* pSubChild = lcl_GetFocusChild( pChild ); if(pSubChild) return pSubChild; } @@ -421,7 +421,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen if ( !bDisposing ) { ::SolarMutexGuard aGuard; - Window* pParent = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xWindow ); WaitObject aWaitObject( pParent ); OUString aCommand( _rURL.Path); @@ -613,7 +613,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen } else if(aCommand == "Cut") { - Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); + vcl::Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); if(pChild) { KeyEvent aEvent( 0, KEYFUNC_CUT ); @@ -622,7 +622,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen } else if(aCommand == "Copy") { - Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); + vcl::Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); if(pChild) { KeyEvent aEvent( 0, KEYFUNC_COPY ); @@ -631,7 +631,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen } else if(aCommand == "Paste") { - Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); + vcl::Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); if(pChild) { KeyEvent aEvent( 0, KEYFUNC_PASTE ); @@ -708,14 +708,14 @@ void BibFrameController_Impl::addStatusListener( } else if(aURL.Path == "Cut") { - Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); + vcl::Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); Edit* pEdit = dynamic_cast<Edit*>( pChild ); if( pEdit ) aEvent.IsEnabled = !pEdit->IsReadOnly() && pEdit->GetSelection().Len(); } if(aURL.Path == "Copy") { - Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); + vcl::Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); Edit* pEdit = dynamic_cast<Edit*>( pChild ); if( pEdit ) aEvent.IsEnabled = pEdit->GetSelection().Len() > 0; @@ -723,7 +723,7 @@ void BibFrameController_Impl::addStatusListener( else if(aURL.Path == "Paste" ) { aEvent.IsEnabled = sal_False; - Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); + vcl::Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); if(pChild) { uno::Reference< datatransfer::clipboard::XClipboard > xClip = pChild->GetClipboard(); diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index d139d61398b6..7c2ca8d81842 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -166,7 +166,7 @@ void BibPosListener::disposing(const lang::EventObject& /*Source*/) throw( uno:: { } -BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): +BibGeneralPage::BibGeneralPage(vcl::Window* pParent, BibDataManager* pMan): BibTabPage(pParent, "GeneralPage", "modules/sbibliography/ui/generalpage.ui"), sErrorPrefix(BIB_RESSTR(ST_ERROR_PREFIX)), pDatMan(pMan) @@ -246,7 +246,7 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): xCtrlContnr = VCLUnoHelper::CreateControlContainer(pGrid); - std::vector<Window*> aChildren; + std::vector<vcl::Window*> aChildren; AddControlWithError(lcl_GetColumnName(pMapping, IDENTIFIER_POS), *pIdentifierFT, sTableErrorString, @@ -400,7 +400,7 @@ void BibGeneralPage::CommitActiveControl() } void BibGeneralPage::AddControlWithError( const OUString& rColumnName, FixedText &rLabel, - OUString& rErrorString, const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<Window*> &rChildren) + OUString& rErrorString, const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<vcl::Window*> &rChildren) { const OUString aColumnUIName(rLabel.GetText()); // adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT @@ -426,7 +426,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, FixedText uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( const OUString& rName, FixedText& rLabel, const OString& sHelpId, sal_Int16& rIndex, - std::vector<Window*>& rChildren) + std::vector<vcl::Window*>& rChildren) { uno::Reference< awt::XControlModel > xCtrModel; try @@ -514,7 +514,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( xCtrWin->setVisible( sal_True ); xControl->setDesignMode( sal_True ); - Window* pWindow = VCLUnoHelper::GetWindow(xControl->getPeer()); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(xControl->getPeer()); pWindow->set_grid_top_attach(rLabel.get_grid_top_attach()); pWindow->set_grid_left_attach(rLabel.get_grid_left_attach()+1); pWindow->set_valign(VCL_ALIGN_CENTER); @@ -674,7 +674,7 @@ bool BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent ) uno::Reference< awt::XControl > xControl( aControls[ nCtrlIndex ], UNO_QUERY ); DBG_ASSERT( xControl.is(), "-BibGeneralPage::HandleShortCutKey(): a control which is not a control!" ); - Window* pWindow = VCLUnoHelper::GetWindow( xControl->getPeer() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xControl->getPeer() ); if( pWindow ) { diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 409ccf58873d..9e96c3343f7b 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -119,17 +119,17 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > AddXControl( const OUString& rName, FixedText& rLabel, const OString& sHelpId, - sal_Int16& rIndex, std::vector<Window*>& rChildren ); + sal_Int16& rIndex, std::vector<vcl::Window*>& rChildren ); void AddControlWithError( const OUString& rColumnName, FixedText& rLabel, OUString& rErrorString, - const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<Window*>& rChildren ); + const OString& sHelpId, sal_uInt16 nIndexInFTArray, std::vector<vcl::Window*>& rChildren ); protected: void InitFixedTexts( void ); // create mnemonics and set text an all fixed texts public: - BibGeneralPage(Window* pParent, BibDataManager* pDatMan); + BibGeneralPage(vcl::Window* pParent, BibDataManager* pDatMan); virtual ~BibGeneralPage(); inline const OUString& GetErrorString() const; diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 54a0ef09c30d..2a5d07b55fd1 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -176,7 +176,7 @@ void BibTBEditListener::statusChanged(const frame::FeatureStateEvent& rEvt)throw } } -BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle): +BibToolBar::BibToolBar(vcl::Window* pParent, Link aLink, WinBits nStyle): ToolBox(pParent,BibResId(RID_BIB_TOOLBAR)), aImgLst(BibResId( RID_TOOLBAR_IMGLIST )), aBigImgLst(BibResId( RID_TOOLBAR_BIGIMGLIST )), diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index b14c231c7d86..a1e7886a3171 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -148,7 +148,7 @@ class BibToolBar: public ToolBox public: - BibToolBar(Window* pParent, Link aLink, WinBits nStyle = WB_3DLOOK ); + BibToolBar(vcl::Window* pParent, Link aLink, WinBits nStyle = WB_3DLOOK ); virtual ~BibToolBar(); void SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &); diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index d51aef5fd4ac..c67fc94bfbf2 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -228,7 +228,7 @@ namespace dbp OControlWizardPage_Base::initializePage(); } - OControlWizard::OControlWizard( Window* _pParent, + OControlWizard::OControlWizard( vcl::Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OWizardMachine(_pParent, WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT | WZB_FINISH) ,m_xContext(_rxContext) @@ -455,7 +455,7 @@ namespace dbp return initContext(); } - Reference< XInteractionHandler > OControlWizard::getInteractionHandler(Window* _pWindow) const + Reference< XInteractionHandler > OControlWizard::getInteractionHandler(vcl::Window* _pWindow) const { Reference< XInteractionHandler > xHandler; try diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 6df51b8d3427..2d0fdbac7aa1 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -108,7 +108,7 @@ namespace dbp public: OControlWizard( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObjectModel, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); @@ -130,7 +130,7 @@ namespace dbp /** returns the com.sun.star.task.InteractionHandler @param _pWindow The window will be used when an error message has to be shown. */ - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler(Window* _pWindow) const; + ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler(vcl::Window* _pWindow) const; protected: // initialize the derivees settings (which have to be derived from OControlWizardSettings) diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 2b982ad9b47d..003bd2d029ed 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -52,7 +52,7 @@ namespace dbp //= OGridWizard - OGridWizard::OGridWizard( Window* _pParent, + OGridWizard::OGridWizard( vcl::Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OControlWizard(_pParent, _rxObjectModel, _rxContext) ,m_bHadDataSelection(true) diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx index d3aac825857e..91da2fd5bee7 100644 --- a/extensions/source/dbpilots/gridwizard.hxx +++ b/extensions/source/dbpilots/gridwizard.hxx @@ -47,7 +47,7 @@ namespace dbp public: OGridWizard( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObjectModel, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 3816e32111e5..3f1f91c2d0ef 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -47,7 +47,7 @@ namespace dbp //= OGroupBoxWizard - OGroupBoxWizard::OGroupBoxWizard( Window* _pParent, + OGroupBoxWizard::OGroupBoxWizard( vcl::Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OControlWizard(_pParent, _rxObjectModel, _rxContext) ,m_bVisitedDefault(false) diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx index a2e1c3e47ae2..e37840f88216 100644 --- a/extensions/source/dbpilots/groupboxwiz.hxx +++ b/extensions/source/dbpilots/groupboxwiz.hxx @@ -53,7 +53,7 @@ namespace dbp public: OGroupBoxWizard( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObjectModel, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 83bcfecd446d..6349c0796c58 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -49,7 +49,7 @@ namespace dbp //= OListComboWizard - OListComboWizard::OListComboWizard( Window* _pParent, + OListComboWizard::OListComboWizard( vcl::Window* _pParent, const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext ) :OControlWizard(_pParent, _rxObjectModel, _rxContext) ,m_bListBox(false) diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx index a2ac8e136d00..6d4908cdda5c 100644 --- a/extensions/source/dbpilots/listcombowizard.hxx +++ b/extensions/source/dbpilots/listcombowizard.hxx @@ -57,7 +57,7 @@ namespace dbp public: OListComboWizard( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObjectModel, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ); diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index ac053f9ea038..29b6b79b7dfb 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.hxx @@ -85,7 +85,7 @@ namespace dbp protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; }; diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl index 4796e23bf0cd..4d6452be578b 100644 --- a/extensions/source/dbpilots/unoautopilot.inl +++ b/extensions/source/dbpilots/unoautopilot.inl @@ -96,7 +96,7 @@ template <class TYPE, class SERVICEINFO> template <class TYPE, class SERVICEINFO> -Dialog* OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(Window* _pParent) +Dialog* OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(::vcl::Window* _pParent) { return new TYPE(_pParent, m_xObjectModel, m_aContext); } diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx index bceeaa61afb9..b8973e0ec8f0 100644 --- a/extensions/source/plugin/base/plctrl.cxx +++ b/extensions/source/plugin/base/plctrl.cxx @@ -166,7 +166,7 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo _xParentWindow = Reference< ::com::sun::star::awt::XWindow > ( xParentPeer, UNO_QUERY ); DBG_ASSERT( _xParentWindow.is(), "### no parent peer window!" ); - Window* pImpl = VCLUnoHelper::GetWindow( xParentPeer ); + vcl::Window* pImpl = VCLUnoHelper::GetWindow( xParentPeer ); if (pImpl) { _pSysChild = new SystemChildWindow( pImpl, WB_CLIPCHILDREN ); diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index 788aabbc4ed2..1b94ac756bbb 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -103,7 +103,7 @@ namespace pcr } - Dialog* MasterDetailLinkDialog::createDialog(Window* _pParent) + Dialog* MasterDetailLinkDialog::createDialog(vcl::Window* _pParent) { return new FormLinkDialog(_pParent,m_xDetail,m_xMaster, m_aContext ,m_sExplanation,m_sDetailLabel,m_sMasterLabel); diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx index 392310085e91..3ff5f64ec0cf 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx @@ -60,7 +60,7 @@ namespace pcr virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xDetail; diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index ab72d013db29..8cfbc3cabe21 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -53,7 +53,7 @@ namespace pcr //= OBrowserLine - OBrowserLine::OBrowserLine( const OUString& _rEntryName, Window* pParent ) + OBrowserLine::OBrowserLine( const OUString& _rEntryName, vcl::Window* pParent ) :m_sEntryName( _rEntryName ) ,m_aFtTitle(pParent) ,m_pControlWindow( NULL ) @@ -121,13 +121,13 @@ namespace pcr } - Window* OBrowserLine::GetRefWindow() + vcl::Window* OBrowserLine::GetRefWindow() { - Window* pRefWindow=&m_aFtTitle; + vcl::Window* pRefWindow=&m_aFtTitle; if(m_pBrowseButton) { - pRefWindow=(Window*)m_pBrowseButton; + pRefWindow=(vcl::Window*)m_pBrowseButton; } else if ( m_pControlWindow ) { @@ -137,11 +137,11 @@ namespace pcr } - void OBrowserLine::SetTabOrder(Window* pRefWindow, sal_uInt16 nFlags ) + void OBrowserLine::SetTabOrder(vcl::Window* pRefWindow, sal_uInt16 nFlags ) { m_aFtTitle.SetZOrder(pRefWindow,nFlags); if ( m_pControlWindow ) - m_pControlWindow->SetZOrder( (Window*)&m_aFtTitle, WINDOW_ZORDER_BEHIND ); + m_pControlWindow->SetZOrder( (vcl::Window*)&m_aFtTitle, WINDOW_ZORDER_BEHIND ); if ( m_pBrowseButton && m_pControlWindow ) m_pBrowseButton->SetZOrder( m_pControlWindow, WINDOW_ZORDER_BEHIND ); @@ -325,13 +325,13 @@ namespace pcr } } - void implEnable( Window* _pWindow, sal_uInt16 _nEnabledBits, sal_uInt16 _nMatchBits ) + void implEnable( vcl::Window* _pWindow, sal_uInt16 _nEnabledBits, sal_uInt16 _nMatchBits ) { if ( _pWindow ) _pWindow->Enable( ( _nEnabledBits & _nMatchBits ) == _nMatchBits ); } - void implEnable( Window* _pWindow, bool _bEnable ) + void implEnable( vcl::Window* _pWindow, bool _bEnable ) { if ( _pWindow ) _pWindow->Enable( _bEnable ); diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index 8f39ae82b3e7..cdc91c712fd0 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -56,18 +56,18 @@ namespace pcr Point m_aLinePos; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl > m_xControl; - Window* m_pControlWindow; + vcl::Window* m_pControlWindow; PushButton* m_pBrowseButton; PushButton* m_pAdditionalBrowseButton; IButtonClickListener* m_pClickListener; - Window* m_pTheParent; + vcl::Window* m_pTheParent; sal_uInt16 m_nNameWidth; sal_uInt16 m_nEnableFlags; bool m_bIndentTitle; bool m_bReadOnly; public: - OBrowserLine( const OUString& _rEntryName, Window* pParent); + OBrowserLine( const OUString& _rEntryName, vcl::Window* pParent); ~OBrowserLine(); void setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); @@ -75,7 +75,7 @@ namespace pcr { return m_xControl; } - inline Window* getControlWindow() const + inline vcl::Window* getControlWindow() const { return m_pControlWindow; } @@ -95,8 +95,8 @@ namespace pcr void Hide(); bool IsVisible(); - Window* GetRefWindow(); - void SetTabOrder(Window* pRefWindow, sal_uInt16 nFlags ); + vcl::Window* GetRefWindow(); + void SetTabOrder(vcl::Window* pRefWindow, sal_uInt16 nFlags ); bool GrabFocus(); void ShowBrowseButton( const OUString& _rImageURL, bool _bPrimary ); diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 05d672822053..66664193ad9b 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -343,7 +343,7 @@ namespace pcr //= OBrowserListBox - OBrowserListBox::OBrowserListBox( Window* pParent, WinBits nWinStyle) + OBrowserListBox::OBrowserListBox( vcl::Window* pParent, WinBits nWinStyle) :Control(pParent, nWinStyle| WB_CLIPCHILDREN) ,m_aLinesPlayground(this,WB_DIALOGCONTROL | WB_CLIPCHILDREN) ,m_aVScroll(this,WB_VSCROLL|WB_REPEAT|WB_DRAG) @@ -1096,7 +1096,7 @@ namespace pcr if ( nPos < m_aLines.size() ) { - Window* pRefWindow = NULL; + vcl::Window* pRefWindow = NULL; if ( nPos > 0 ) pRefWindow = m_aLines[nPos-1].pLine->GetRefWindow(); @@ -1105,7 +1105,7 @@ namespace pcr // the old control and some data about it Reference< XPropertyControl > xControl = rLine.pLine->getControl(); - Window* pControlWindow = rLine.pLine->getControlWindow(); + vcl::Window* pControlWindow = rLine.pLine->getControlWindow(); Point aControlPos; if ( pControlWindow ) aControlPos = pControlWindow->GetPosPixel(); @@ -1189,7 +1189,7 @@ namespace pcr // So, we manually switch this to read-only. if ( xControl.is() && ( xControl->getControlType() == PropertyControlType::Unknown ) ) { - Window *pWindow = rLine.pLine->getControlWindow(); + vcl::Window *pWindow = rLine.pLine->getControlWindow(); Edit* pControlWindowAsEdit = dynamic_cast<Edit*>(pWindow); if (pControlWindowAsEdit) pControlWindowAsEdit->SetReadOnly(true); diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index dca5005c7c7c..b61911c66fb9 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -122,7 +122,7 @@ namespace pcr void Resize() SAL_OVERRIDE; public: - OBrowserListBox( Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL ); + OBrowserListBox( vcl::Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL ); virtual ~OBrowserListBox(); diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx index 00bce2cd7f00..8f03f67ea1ca 100644 --- a/extensions/source/propctrlr/browserpage.cxx +++ b/extensions/source/propctrlr/browserpage.cxx @@ -33,7 +33,7 @@ namespace pcr // class OBrowserPage - OBrowserPage::OBrowserPage(Window* pParent,WinBits nWinStyle) + OBrowserPage::OBrowserPage(vcl::Window* pParent,WinBits nWinStyle) :TabPage(pParent,nWinStyle) ,m_aListBox(this) { diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx index bb368df0ed45..6ef6ef80bce9 100644 --- a/extensions/source/propctrlr/browserpage.hxx +++ b/extensions/source/propctrlr/browserpage.hxx @@ -41,7 +41,7 @@ namespace pcr virtual void StateChanged(StateChangedType nType) SAL_OVERRIDE; public: - OBrowserPage(Window* pParent, WinBits nWinStyle = 0); + OBrowserPage(vcl::Window* pParent, WinBits nWinStyle = 0); virtual ~OBrowserPage(); sal_Int32 getMinimumWidth(); diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 3ce6501c41c9..f56532cab6d0 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -30,7 +30,7 @@ namespace pcr //= class OPropertyBrowserView - OPropertyBrowserView::OPropertyBrowserView(Window* _pParent, WinBits nBits) + OPropertyBrowserView::OPropertyBrowserView(vcl::Window* _pParent, WinBits nBits) :Window(_pParent, nBits | WB_3DLOOK) ,m_nActivePage(0) { @@ -58,7 +58,7 @@ namespace pcr sal_uInt16 nTmpPage = m_pPropBox->GetCurPage(); if (nTmpPage) m_nActivePage = nTmpPage; - boost::scoped_ptr<Window> aTemp(m_pPropBox); + boost::scoped_ptr<vcl::Window> aTemp(m_pPropBox); m_pPropBox = NULL; } diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 58ffb6c3dad9..c87dd55b3c0a 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -35,7 +35,7 @@ namespace pcr //= - class OPropertyBrowserView : public Window + class OPropertyBrowserView : public vcl::Window { OPropertyEditor* m_pPropBox; sal_uInt16 m_nActivePage; @@ -47,7 +47,7 @@ namespace pcr virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; public: - OPropertyBrowserView( Window* pParent, WinBits nBits = 0); + OPropertyBrowserView( vcl::Window* pParent, WinBits nBits = 0); virtual ~OPropertyBrowserView(); diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index ae676b764c06..0e95203be50a 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -40,7 +40,7 @@ namespace pcr //= ControlHelper - ControlHelper::ControlHelper( Window* _pControlWindow, sal_Int16 _nControlType, XPropertyControl& _rAntiImpl, IModifyListener* _pModifyListener ) + ControlHelper::ControlHelper( vcl::Window* _pControlWindow, sal_Int16 _nControlType, XPropertyControl& _rAntiImpl, IModifyListener* _pModifyListener ) :m_pControlWindow( _pControlWindow ) ,m_nControlType( _nControlType ) ,m_rAntiImpl( _rAntiImpl ) @@ -144,7 +144,7 @@ namespace pcr } - IMPL_LINK( ControlHelper, ModifiedHdl, Window*, /*_pWin*/ ) + IMPL_LINK( ControlHelper, ModifiedHdl, vcl::Window*, /*_pWin*/ ) { if ( m_pModifyListener ) m_pModifyListener->modified(); @@ -152,7 +152,7 @@ namespace pcr } - IMPL_LINK( ControlHelper, GetFocusHdl, Window*, /*_pWin*/ ) + IMPL_LINK( ControlHelper, GetFocusHdl, vcl::Window*, /*_pWin*/ ) { try { @@ -167,7 +167,7 @@ namespace pcr } - IMPL_LINK( ControlHelper, LoseFocusHdl, Window*, /*_pWin*/ ) + IMPL_LINK( ControlHelper, LoseFocusHdl, vcl::Window*, /*_pWin*/ ) { // TODO/UNOize: should this be outside the default control's implementations? If somebody // has an own control implementation, which does *not* do this - would this be allowed? diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index ea838ea44cc2..629660eda8d7 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -47,7 +47,7 @@ namespace pcr ControlHelper* m_pHelper; public: - ControlWindow( Window* _pParent, WinBits _nStyle ) + ControlWindow( vcl::Window* _pParent, WinBits _nStyle ) :WindowType( _pParent, _nStyle ) ,m_pHelper( NULL ) { @@ -86,7 +86,7 @@ namespace pcr class ControlHelper { private: - Window* m_pControlWindow; + vcl::Window* m_pControlWindow; sal_Int16 m_nControlType; ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlContext > m_xContext; @@ -116,7 +116,7 @@ namespace pcr would just call our <member>setModified</member>. */ ControlHelper( - Window* _pControlWindow, + vcl::Window* _pControlWindow, sal_Int16 _nControlType, ::com::sun::star::inspection::XPropertyControl& _rAntiImpl, IModifyListener* _pModifyListener ); @@ -126,8 +126,8 @@ namespace pcr /** sets our "modified" flag to <TRUE/> */ inline void setModified() { m_bModified = true; } - inline Window* getVclControlWindow() { return m_pControlWindow; } - inline const Window* getVclControlWindow() const { return m_pControlWindow; } + inline vcl::Window* getVclControlWindow() { return m_pControlWindow; } + inline const vcl::Window* getVclControlWindow() const { return m_pControlWindow; } public: // XPropertyControl @@ -153,9 +153,9 @@ namespace pcr void autoSizeWindow(); /// may be used by derived classes, they forward the event to the PropCtrListener - DECL_LINK( ModifiedHdl, Window* ); - DECL_LINK( GetFocusHdl, Window* ); - DECL_LINK( LoseFocusHdl, Window* ); + DECL_LINK( ModifiedHdl, vcl::Window* ); + DECL_LINK( GetFocusHdl, vcl::Window* ); + DECL_LINK( LoseFocusHdl, vcl::Window* ); private: /** fail-safe wrapper around calling our context's activateNextControl @@ -191,7 +191,7 @@ namespace pcr ControlHelper m_aImplControl; protected: - inline CommonBehaviourControl( sal_Int16 _nControlType, Window* _pParentWindow, WinBits _nWindowStyle, bool _bDoSetHandlers = true ); + inline CommonBehaviourControl( sal_Int16 _nControlType, vcl::Window* _pParentWindow, WinBits _nWindowStyle, bool _bDoSetHandlers = true ); // XPropertyControl - delegated to ->m_aImplControl virtual ::sal_Int16 SAL_CALL getControlType() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; @@ -244,7 +244,7 @@ namespace pcr template< class CONTROL_INTERFACE, class CONTROL_WINDOW > - inline CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::CommonBehaviourControl ( sal_Int16 _nControlType, Window* _pParentWindow, WinBits _nWindowStyle, bool _bDoSetHandlers ) + inline CommonBehaviourControl< CONTROL_INTERFACE, CONTROL_WINDOW >::CommonBehaviourControl ( sal_Int16 _nControlType, vcl::Window* _pParentWindow, WinBits _nWindowStyle, bool _bDoSetHandlers ) :ComponentBaseClass( m_aMutex ) ,m_aImplControl( new WindowType( _pParentWindow, _nWindowStyle ), _nControlType, *this, this ) { diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index 54f1a3819cb6..5be7ba9215e0 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -141,7 +141,7 @@ namespace pcr } - Dialog* OControlFontDialog::createDialog(Window* _pParent) + Dialog* OControlFontDialog::createDialog(vcl::Window* _pParent) { ControlCharacterDialog::createItemSet(m_pFontItems, m_pItemPool, m_pItemPoolDefaults); diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx index efe72404f4de..a5bd97d45b81 100644 --- a/extensions/source/propctrlr/controlfontdialog.hxx +++ b/extensions/source/propctrlr/controlfontdialog.hxx @@ -82,7 +82,7 @@ namespace pcr protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void destroyDialog() SAL_OVERRIDE; virtual void executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE; }; diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index 3e09a79a9181..8016a2da0831 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -151,9 +151,9 @@ namespace pcr } - Window* DefaultHelpProvider::impl_getVclControlWindow_nothrow( const Reference< XPropertyControl >& _rxControl ) + vcl::Window* DefaultHelpProvider::impl_getVclControlWindow_nothrow( const Reference< XPropertyControl >& _rxControl ) { - Window* pControlWindow = NULL; + vcl::Window* pControlWindow = NULL; OSL_PRECOND( _rxControl.is(), "DefaultHelpProvider::impl_getVclControlWindow_nothrow: illegal control!" ); if ( !_rxControl.is() ) return pControlWindow; @@ -179,7 +179,7 @@ namespace pcr if ( !_rxControl.is() ) return sHelpText; - Window* pControlWindow( impl_getVclControlWindow_nothrow( _rxControl ) ); + vcl::Window* pControlWindow( impl_getVclControlWindow_nothrow( _rxControl ) ); OSL_ENSURE( pControlWindow, "DefaultHelpProvider::impl_getHelpText_nothrow: could not determine the VCL window!" ); if ( !pControlWindow ) return sHelpText; diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index d16f327fe72f..2fafe3d979a4 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -27,7 +27,7 @@ #include <cppuhelper/implbase2.hxx> -class Window; +namespace vcl { class Window; } namespace pcr @@ -71,7 +71,7 @@ namespace pcr void create( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxUI ); private: - Window* impl_getVclControlWindow_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); + vcl::Window* impl_getVclControlWindow_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); OUString impl_getHelpText_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControl >& _rxControl ); }; diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index f8698dbff07e..8030bf8c42a7 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -171,7 +171,7 @@ namespace pcr //= ControlCharacterDialog - ControlCharacterDialog::ControlCharacterDialog(Window* _pParent, const SfxItemSet& _rCoreSet) + ControlCharacterDialog::ControlCharacterDialog(vcl::Window* _pParent, const SfxItemSet& _rCoreSet) : SfxTabDialog(_pParent, "ControlFontDialog", "modules/spropctrlr/ui/controlfontdialog.ui", &_rCoreSet) , m_nCharsId(0) diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx index a96ddc4c0a29..cb157913e77a 100644 --- a/extensions/source/propctrlr/fontdialog.hxx +++ b/extensions/source/propctrlr/fontdialog.hxx @@ -35,7 +35,7 @@ namespace pcr class ControlCharacterDialog : public SfxTabDialog { public: - ControlCharacterDialog(Window* _pParent, const SfxItemSet& _rCoreSet); + ControlCharacterDialog(vcl::Window* _pParent, const SfxItemSet& _rCoreSet); virtual ~ControlCharacterDialog(); /// creates an item set to be used with this dialog diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 6b4ff90b1127..5eed30a9d960 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -454,7 +454,7 @@ namespace pcr ::std::auto_ptr< WaitObject > m_aWaitObject; public: - WaitCursor( Window* _pWindow ) + WaitCursor( vcl::Window* _pWindow ) { if ( _pWindow ) m_aWaitObject.reset( new WaitObject( _pWindow ) ); diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 6a79a3de496e..e421a5b2c4ce 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -70,7 +70,7 @@ namespace pcr Link m_aLinkChangeHandler; public: - FieldLinkRow( Window* _pParent ); + FieldLinkRow( vcl::Window* _pParent ); inline void SetLinkChangeHandler( const Link& _rHdl ) { m_aLinkChangeHandler = _rHdl; } @@ -92,7 +92,7 @@ namespace pcr }; - FieldLinkRow::FieldLinkRow( Window* _pParent ) + FieldLinkRow::FieldLinkRow( vcl::Window* _pParent ) :TabPage( _pParent, "FieldLinkRow", "modules/spropctrlr/ui/fieldlinkrow.ui" ) { get(m_pDetailColumn, "detailCombobox"); @@ -140,7 +140,7 @@ namespace pcr return 0L; } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFieldLinkRow(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFieldLinkRow(vcl::Window *pParent, VclBuilder::stringmap &) { return new FieldLinkRow(pParent); } @@ -149,7 +149,7 @@ namespace pcr //= FormLinkDialog - FormLinkDialog::FormLinkDialog( Window* _pParent, const Reference< XPropertySet >& _rxDetailForm, + FormLinkDialog::FormLinkDialog( vcl::Window* _pParent, const Reference< XPropertySet >& _rxDetailForm, const Reference< XPropertySet >& _rxMasterForm, const Reference< XComponentContext >& _rxContext, const OUString& _sExplanation, const OUString& _sDetailLabel, diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index db85f6f0da81..e4fc3f01a766 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -73,7 +73,7 @@ namespace pcr public: FormLinkDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDetailForm, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxMasterForm, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 5859c1eff48b..54fa2ef2e0d8 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -275,9 +275,9 @@ namespace pcr } - Window* PropertyHandlerHelper::getDialogParentWindow( const Reference<XComponentContext>& _rContext ) + vcl::Window* PropertyHandlerHelper::getDialogParentWindow( const Reference<XComponentContext>& _rContext ) { - Window* pInspectorWindow = NULL; + vcl::Window* pInspectorWindow = NULL; try { Reference< XWindow > xInspectorWindow( _rContext->getValueByName( "DialogParentWindow" ), UNO_QUERY_THROW ); diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index f3482aafeb65..f60f5672ad57 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -30,7 +30,7 @@ #include <vector> -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace inspection { struct LineDescriptor; @@ -174,13 +174,13 @@ namespace pcr /** gets the window of the ObjectInspector in which an property handler lives The method looks up a value called "DialogParentWindow" in the given UNO copmonent context, - queries it for XWindow, and returns the respective Window*. If either of those steps fails, + queries it for XWindow, and returns the respective vcl::Window*. If either of those steps fails, this is asserted in a non-product version, and silently ignore otherwise. @param _rContext the component context which was used to create the component calling this method */ - static Window* getDialogParentWindow( const css::uno::Reference< css::uno::XComponentContext > & _rContext ); + static vcl::Window* getDialogParentWindow( const css::uno::Reference< css::uno::XComponentContext > & _rContext ); /** determines whether given PropertyAttributes require a to-be-created diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index 1ea7bbf26c87..b62010cf6cd9 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx @@ -27,7 +27,7 @@ namespace pcr //= InspectorHelpWindow - InspectorHelpWindow::InspectorHelpWindow( Window* _pParent ) + InspectorHelpWindow::InspectorHelpWindow( vcl::Window* _pParent ) :Window( _pParent, WB_DIALOGCONTROL ) ,m_aSeparator( this ) ,m_aHelpText( this, WB_LEFT | WB_READONLY | WB_AUTOVSCROLL ) diff --git a/extensions/source/propctrlr/inspectorhelpwindow.hxx b/extensions/source/propctrlr/inspectorhelpwindow.hxx index b24d461938e0..9419a72ec7a9 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.hxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.hxx @@ -30,7 +30,7 @@ namespace pcr //= InspectorHelpWindow - class InspectorHelpWindow : public Window + class InspectorHelpWindow : public vcl::Window { private: FixedLine m_aSeparator; @@ -40,7 +40,7 @@ namespace pcr sal_Int32 m_nMaxLines; public: - InspectorHelpWindow( Window* _pParent ); + InspectorHelpWindow( vcl::Window* _pParent ); virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index 7808c276c0d3..fdb6229dc370 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -29,7 +29,7 @@ namespace pcr using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; - ListSelectionDialog::ListSelectionDialog(Window* _pParent, const Reference< XPropertySet >& _rxListBox, + ListSelectionDialog::ListSelectionDialog(vcl::Window* _pParent, const Reference< XPropertySet >& _rxListBox, const OUString& _rPropertyName, const OUString& _rPropertyUIName) : ModalDialog( _pParent, "ListSelectDialog", "modules/spropctrlr/ui/listselectdialog.ui" ) ,m_xListBox ( _rxListBox ) diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx index 7dd905e9dd96..aaccb0754ec2 100644 --- a/extensions/source/propctrlr/listselectiondlg.hxx +++ b/extensions/source/propctrlr/listselectiondlg.hxx @@ -39,7 +39,7 @@ namespace pcr public: ListSelectionDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxListBox, const OUString& _rPropertyName, const OUString& _rPropertyUIName diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index 43638d7f103c..62cc6da9c247 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -29,7 +29,7 @@ namespace pcr //= NewDataTypeDialog - NewDataTypeDialog::NewDataTypeDialog( Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ) + NewDataTypeDialog::NewDataTypeDialog( vcl::Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ) : ModalDialog( _pParent, "DataTypeDialog", "modules/spropctrlr/ui/datatypedialog.ui" ) , m_aProhibitedNames( _rProhibitedNames.begin(), _rProhibitedNames.end() ) diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx index f9d64045a5aa..135514aaa271 100644 --- a/extensions/source/propctrlr/newdatatype.hxx +++ b/extensions/source/propctrlr/newdatatype.hxx @@ -41,7 +41,7 @@ namespace pcr ::std::set< OUString > m_aProhibitedNames; public: - NewDataTypeDialog(Window* _pParent, const OUString& _rNameBase, + NewDataTypeDialog(vcl::Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames ); OUString GetName() const { return m_pName->GetText(); } diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index de4ebe669192..6b1c71c45e4a 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -130,7 +130,7 @@ namespace pcr } - Dialog* OTabOrderDialog::createDialog( Window* _pParent ) + Dialog* OTabOrderDialog::createDialog( vcl::Window* _pParent ) { return new TabOrderDialog( _pParent, m_xTabbingModel, m_xControlContext, m_aContext ); } diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 7ad83a94c4f4..61a76bf24f4c 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -78,7 +78,7 @@ namespace pcr protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index ff37ef1ba4d6..4e5dda00b2e4 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -373,7 +373,7 @@ namespace pcr // announcement is responsible for calling setComponent, too. Reference< XWindow > xContainerWindow = m_xFrame->getContainerWindow(); VCLXWindow* pContainerWindow = VCLXWindow::GetImplementation(xContainerWindow); - Window* pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : NULL; + vcl::Window* pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : NULL; if (!pParentWin) throw RuntimeException("The frame is invalid. Unable to extract the container window.",*this); @@ -696,7 +696,7 @@ namespace pcr } - bool OPropertyBrowserController::Construct(Window* _pParentWin) + bool OPropertyBrowserController::Construct(vcl::Window* _pParentWin) { DBG_ASSERT(!haveView(), "OPropertyBrowserController::Construct: already have a view!"); DBG_ASSERT(_pParentWin, "OPropertyBrowserController::Construct: invalid parent window!"); diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index f5aa70673268..62c73a6fe3b6 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -60,7 +60,7 @@ #include <vector> #include <memory> -class Window; +namespace vcl { class Window; } namespace pcr @@ -310,7 +310,7 @@ namespace pcr */ bool impl_findObjectProperty_nothrow( const OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty = NULL ); - bool Construct(Window* _pParentWin); + bool Construct(vcl::Window* _pParentWin); /** retrieves the property handler for a given property name @param _rPropertyName diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 364d07ff7ba9..24bbd498ec01 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -41,7 +41,7 @@ namespace pcr // class OPropertyEditor - OPropertyEditor::OPropertyEditor( Window* pParent, WinBits nWinStyle) + OPropertyEditor::OPropertyEditor( vcl::Window* pParent, WinBits nWinStyle) :Control(pParent, nWinStyle) ,m_aTabControl( this ) ,m_pListener(NULL) diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index e80dceeffdd2..53e48fd10fbf 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -71,7 +71,7 @@ namespace pcr void GetFocus() SAL_OVERRIDE; public: - OPropertyEditor (Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL); + OPropertyEditor (vcl::Window* pParent, WinBits nWinStyle = WB_DIALOGCONTROL); virtual ~OPropertyEditor(); diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index 8bc0651126a9..862ab4b84a57 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -307,7 +307,7 @@ namespace pcr ) ); } - Window* PropertyHandler::impl_getDefaultDialogParent_nothrow() const + vcl::Window* PropertyHandler::impl_getDefaultDialogParent_nothrow() const { return PropertyHandlerHelper::getDialogParentWindow( m_xContext ); } diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index c086b5d4f67a..ee669ca76d93 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -52,7 +52,7 @@ namespace com { namespace sun { namespace star { } } } } -class Window; +namespace vcl { class Window; } namespace pcr { @@ -138,7 +138,7 @@ namespace pcr /** retrieves a window which can be used as parent for dialogs */ - Window* impl_getDefaultDialogParent_nothrow() const; + vcl::Window* impl_getDefaultDialogParent_nothrow() const; /** retrieves the property id for a given property name @throw com::sun::star::beans::UnknownPropertyException diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index d786b27350aa..c1302009bd99 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -47,7 +47,7 @@ namespace pcr // OSelectLabelDialog - OSelectLabelDialog::OSelectLabelDialog( Window* pParent, Reference< XPropertySet > _xControlModel ) + OSelectLabelDialog::OSelectLabelDialog( vcl::Window* pParent, Reference< XPropertySet > _xControlModel ) :ModalDialog(pParent, "LabelSelectionDialog", "modules/spropctrlr/ui/labelselectiondialog.ui") ,m_aModelImages(PcrRes(RID_IL_FORMEXPLORER)) ,m_xControlModel(_xControlModel) diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 8c627155ab63..abb138248f97 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -56,7 +56,7 @@ namespace pcr bool m_bHaveAssignableControl; public: - OSelectLabelDialog(Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xControlModel); + OSelectLabelDialog(vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xControlModel); virtual ~OSelectLabelDialog(); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetSelected() const { return m_pNoAssignment->IsChecked() ? ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > () : m_xSelectedControl; } diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 413273410e66..cd9815167d8d 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -68,7 +68,7 @@ namespace pcr //= OTimeControl - OTimeControl::OTimeControl( Window* pParent, WinBits nWinStyle ) + OTimeControl::OTimeControl( vcl::Window* pParent, WinBits nWinStyle ) :OTimeControl_Base( PropertyControlType::TimeField, pParent, nWinStyle ) { getTypedControlWindow()->SetStrictFormat( true ); @@ -113,7 +113,7 @@ namespace pcr //= ODateControl - ODateControl::ODateControl( Window* pParent, WinBits nWinStyle ) + ODateControl::ODateControl( vcl::Window* pParent, WinBits nWinStyle ) :ODateControl_Base( PropertyControlType::DateField, pParent, nWinStyle | WB_DROPDOWN ) { WindowType* pControlWindow = getTypedControlWindow(); @@ -167,7 +167,7 @@ namespace pcr //= OEditControl - OEditControl::OEditControl(Window* _pParent, bool _bPW, WinBits _nWinStyle) + OEditControl::OEditControl(vcl::Window* _pParent, bool _bPW, WinBits _nWinStyle) :OEditControl_Base( _bPW ? PropertyControlType::CharacterField : PropertyControlType::TextField, _pParent, _nWinStyle ) { m_bIsPassword = _bPW; @@ -253,7 +253,7 @@ namespace pcr // class ODateTimeControl - ODateTimeControl::ODateTimeControl( Window* _pParent, WinBits _nWinStyle) + ODateTimeControl::ODateTimeControl( vcl::Window* _pParent, WinBits _nWinStyle) :ODateTimeControl_Base( PropertyControlType::DateTimeField, _pParent, _nWinStyle ) { getTypedControlWindow()->EnableEmptyField( true ); @@ -326,7 +326,7 @@ namespace pcr //= HyperlinkInput - HyperlinkInput::HyperlinkInput( Window* _pParent, WinBits _nWinStyle ) + HyperlinkInput::HyperlinkInput( vcl::Window* _pParent, WinBits _nWinStyle ) :Edit( _pParent, _nWinStyle ) { ::svtools::ColorConfig aColorConfig; @@ -411,7 +411,7 @@ namespace pcr //= OHyperlinkControl - OHyperlinkControl::OHyperlinkControl( Window* _pParent, WinBits _nWinStyle ) + OHyperlinkControl::OHyperlinkControl( vcl::Window* _pParent, WinBits _nWinStyle ) :OHyperlinkControl_Base( PropertyControlType::HyperlinkField, _pParent, _nWinStyle ) ,m_aActionListeners( m_aMutex ) { @@ -477,7 +477,7 @@ namespace pcr //= ONumericControl - ONumericControl::ONumericControl( Window* _pParent, WinBits _nWinStyle ) + ONumericControl::ONumericControl( vcl::Window* _pParent, WinBits _nWinStyle ) :ONumericControl_Base( PropertyControlType::NumericField, _pParent, _nWinStyle ) ,m_eValueUnit( FUNIT_NONE ) ,m_nFieldToUNOValueFactor( 1 ) @@ -664,7 +664,7 @@ namespace pcr } - OColorControl::OColorControl(Window* pParent, WinBits nWinStyle) + OColorControl::OColorControl(vcl::Window* pParent, WinBits nWinStyle) :OColorControl_Base( PropertyControlType::ColorListBox, pParent, nWinStyle ) { // initialize the color listbox @@ -798,7 +798,7 @@ namespace pcr //= OListboxControl - OListboxControl::OListboxControl( Window* pParent, WinBits nWinStyle) + OListboxControl::OListboxControl( vcl::Window* pParent, WinBits nWinStyle) :OListboxControl_Base( PropertyControlType::ListBox, pParent, nWinStyle ) { getTypedControlWindow()->SetDropDownLineCount( LB_DEFAULT_COUNT ); @@ -890,7 +890,7 @@ namespace pcr //= OComboboxControl - OComboboxControl::OComboboxControl( Window* pParent, WinBits nWinStyle) + OComboboxControl::OComboboxControl( vcl::Window* pParent, WinBits nWinStyle) :OComboboxControl_Base( PropertyControlType::ComboBox, pParent, nWinStyle ) { getTypedControlWindow()->SetDropDownLineCount( LB_DEFAULT_COUNT ); @@ -967,7 +967,7 @@ namespace pcr virtual void Resize() SAL_OVERRIDE; public: - OMultilineFloatingEdit(Window* _pParen); + OMultilineFloatingEdit(vcl::Window* _pParen); MultiLineEdit& getEdit() { return m_aImplEdit; } protected: @@ -975,7 +975,7 @@ namespace pcr }; - OMultilineFloatingEdit::OMultilineFloatingEdit(Window* _pParent) + OMultilineFloatingEdit::OMultilineFloatingEdit(vcl::Window* _pParent) :FloatingWindow(_pParent, WB_BORDER) ,m_aImplEdit(this, WB_VSCROLL|WB_IGNORETAB|WB_NOBORDER) { @@ -1022,7 +1022,7 @@ namespace pcr //= DropDownEditControl_Base - DropDownEditControl::DropDownEditControl( Window* _pParent, WinBits _nStyle ) + DropDownEditControl::DropDownEditControl( vcl::Window* _pParent, WinBits _nStyle ) :DropDownEditControl_Base( _pParent, _nStyle ) ,m_pFloatingEdit( NULL ) ,m_pImplEdit( NULL ) @@ -1064,16 +1064,16 @@ namespace pcr DropDownEditControl::~DropDownEditControl() { { - boost::scoped_ptr<Window> aTemp(m_pFloatingEdit); + boost::scoped_ptr<vcl::Window> aTemp(m_pFloatingEdit); m_pFloatingEdit = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pImplEdit); + boost::scoped_ptr<vcl::Window> aTemp(m_pImplEdit); SetSubEdit( NULL ); m_pImplEdit = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pDropdownButton); + boost::scoped_ptr<vcl::Window> aTemp(m_pDropdownButton); m_pDropdownButton = NULL; } } @@ -1142,7 +1142,7 @@ namespace pcr ShowDropDown( true ); m_pFloatingEdit->getEdit().GrabFocus(); m_pFloatingEdit->getEdit().SetSelection( aSel ); - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); pFocusWin->KeyInput( *rNEvt.GetKeyEvent() ); } } @@ -1355,7 +1355,7 @@ namespace pcr //= OMultilineEditControl - OMultilineEditControl::OMultilineEditControl( Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle ) + OMultilineEditControl::OMultilineEditControl( vcl::Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle ) :OMultilineEditControl_Base( _eMode == eMultiLineText ? PropertyControlType::MultiLineTextField : PropertyControlType::StringListField , pParent , ( nWinStyle | WB_DIALOGCONTROL ) & ( ~WB_READONLY | ~WB_DROPDOWN ) diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 1cf13284a28f..fdfb1dc638d1 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -58,7 +58,7 @@ namespace pcr typedef ControlWindow< LISTBOX_WINDOW > ListBoxType; public: - ListLikeControlWithModifyHandler( Window* _pParent, WinBits _nStyle ) + ListLikeControlWithModifyHandler( vcl::Window* _pParent, WinBits _nStyle ) :ListBoxType( _pParent, _nStyle ) { } @@ -100,7 +100,7 @@ namespace pcr class OTimeControl : public OTimeControl_Base { public: - OTimeControl( Window* pParent, WinBits nWinStyle ); + OTimeControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -115,7 +115,7 @@ namespace pcr class ODateControl : public ODateControl_Base { public: - ODateControl( Window* pParent, WinBits nWinStyle ); + ODateControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -133,7 +133,7 @@ namespace pcr bool m_bIsPassword : 1; public: - OEditControl( Window* _pParent, bool _bPassWord, WinBits nWinStyle ); + OEditControl( vcl::Window* _pParent, bool _bPassWord, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -151,7 +151,7 @@ namespace pcr class ODateTimeControl : public ODateTimeControl_Base { public: - ODateTimeControl( Window* pParent,WinBits nWinStyle ); + ODateTimeControl( vcl::Window* pParent,WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -169,7 +169,7 @@ namespace pcr Link m_aClickHandler; public: - HyperlinkInput( Window* _pParent, WinBits _nWinStyle ); + HyperlinkInput( vcl::Window* _pParent, WinBits _nWinStyle ); /** sets the handler which will (asynchronously, with locked SolarMutex) be called when the hyperlink has been clicked by the user @@ -198,7 +198,7 @@ namespace pcr ::cppu::OInterfaceContainerHelper m_aActionListeners; public: - OHyperlinkControl( Window* _pParent, WinBits _nWinStyle ); + OHyperlinkControl( vcl::Window* _pParent, WinBits _nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -225,7 +225,7 @@ namespace pcr typedef ControlWindow< MetricField > BaseClass; public: - CustomConvertibleNumericField( Window* _pParent, WinBits _nStyle ) + CustomConvertibleNumericField( vcl::Window* _pParent, WinBits _nStyle ) :BaseClass( _pParent, _nStyle ) { } @@ -244,7 +244,7 @@ namespace pcr sal_Int16 m_nFieldToUNOValueFactor; public: - ONumericControl( Window* pParent, WinBits nWinStyle ); + ONumericControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -289,7 +289,7 @@ namespace pcr ::std::set< OUString > m_aNonColorEntries; public: - OColorControl( Window* pParent, WinBits nWinStyle ); + OColorControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -315,7 +315,7 @@ namespace pcr class OListboxControl : public OListboxControl_Base { public: - OListboxControl( Window* pParent, WinBits nWinStyle ); + OListboxControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -339,7 +339,7 @@ namespace pcr class OComboboxControl : public OComboboxControl_Base { public: - OComboboxControl( Window* pParent, WinBits nWinStyle ); + OComboboxControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -381,7 +381,7 @@ namespace pcr bool m_bDropdown : 1; public: - DropDownEditControl( Window* _pParent, WinBits _nStyle ); + DropDownEditControl( vcl::Window* _pParent, WinBits _nStyle ); virtual ~DropDownEditControl(); void setOperationMode( MultiLineOperationMode _eMode ) { m_nOperationMode = _eMode; } @@ -419,7 +419,7 @@ namespace pcr class OMultilineEditControl : public OMultilineEditControl_Base { public: - OMultilineEditControl( Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle ); + OMultilineEditControl( vcl::Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 1f768cb148a3..554c069775e3 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -71,7 +71,7 @@ namespace pcr //= TabOrderDialog - TabOrderDialog::TabOrderDialog( Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel, + TabOrderDialog::TabOrderDialog( vcl::Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel, const Reference< XControlContainer >& _rxControlCont, const Reference< XComponentContext >& _rxORB ) :ModalDialog( _pParent, "TabOrderDialog", "modules/spropctrlr/ui/taborder.ui") ,m_xModel( _rxTabModel ) @@ -289,7 +289,7 @@ namespace pcr //= TabOrderListBox - TabOrderListBox::TabOrderListBox( Window* pParent, WinBits nBits ) + TabOrderListBox::TabOrderListBox( vcl::Window* pParent, WinBits nBits ) :SvTreeListBox( pParent, nBits ) { SetDragDropMode(0xFFFF/*SV_DRAGDROP_CTRL_MOVE*/); @@ -298,7 +298,7 @@ namespace pcr SetSelectionMode( MULTIPLE_SELECTION ); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTabOrderListBox(Window *pParent, + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTabOrderListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index 688c5300a7c2..d70e60cce47f 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -46,7 +46,7 @@ namespace pcr class TabOrderListBox : public SvTreeListBox { public: - TabOrderListBox( Window* pParent, WinBits nBits ); + TabOrderListBox( vcl::Window* pParent, WinBits nBits ); virtual ~TabOrderListBox(); void MoveSelection( long nRelPos ); @@ -95,7 +95,7 @@ namespace pcr public: TabOrderDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >& _rxTabModel, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxControlCont, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 043535b501bf..9007f570aef8 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -87,7 +87,7 @@ namespace pcr // OFormatSampleControl - OFormatSampleControl::OFormatSampleControl( Window* pParent, WinBits nWinStyle ) + OFormatSampleControl::OFormatSampleControl( vcl::Window* pParent, WinBits nWinStyle ) :OFormatSampleControl_Base( PropertyControlType::Unknown, pParent, nWinStyle ) { } @@ -169,7 +169,7 @@ namespace pcr // class OFormattedNumericControl - OFormattedNumericControl::OFormattedNumericControl( Window* pParent, WinBits nWinStyle ) + OFormattedNumericControl::OFormattedNumericControl( vcl::Window* pParent, WinBits nWinStyle ) :OFormattedNumericControl_Base( PropertyControlType::Unknown, pParent, nWinStyle ) { getTypedControlWindow()->TreatAsNumber(true); @@ -261,7 +261,7 @@ namespace pcr //= OFileUrlControl - OFileUrlControl::OFileUrlControl( Window* pParent, WinBits nWinStyle ) + OFileUrlControl::OFileUrlControl( vcl::Window* pParent, WinBits nWinStyle ) :OFileUrlControl_Base( PropertyControlType::Unknown, pParent, nWinStyle | WB_DROPDOWN ) { getTypedControlWindow()->SetDropDownLineCount( 10 ); @@ -307,7 +307,7 @@ namespace pcr //= OTimeDurationControl - OTimeDurationControl::OTimeDurationControl( ::Window* pParent, WinBits nWinStyle ) + OTimeDurationControl::OTimeDurationControl( vcl::Window* pParent, WinBits nWinStyle ) :ONumericControl( pParent, nWinStyle ) { getTypedControlWindow()->SetUnit( FUNIT_CUSTOM ); diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index a5a9f23c9aba..3fe258a7d9bd 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -41,7 +41,7 @@ namespace pcr typedef ControlWindow< FormattedField > BaseClass; public: - NumberFormatSampleField( Window* _pParent, WinBits _nStyle ) + NumberFormatSampleField( vcl::Window* _pParent, WinBits _nStyle ) :BaseClass( _pParent, _nStyle ) { } @@ -59,7 +59,7 @@ namespace pcr class OFormatSampleControl : public OFormatSampleControl_Base { public: - OFormatSampleControl( Window* pParent, WinBits nWinStyle ); + OFormatSampleControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -102,7 +102,7 @@ namespace pcr sal_Int32 m_nLastDecimalDigits; public: - OFormattedNumericControl( Window* pParent, WinBits nWinStyle = WB_TABSTOP); + OFormattedNumericControl( vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -128,7 +128,7 @@ namespace pcr class OFileUrlControl : public OFileUrlControl_Base { public: - OFileUrlControl( Window* pParent, WinBits nWinStyle ); + OFileUrlControl( vcl::Window* pParent, WinBits nWinStyle ); // XPropertyControl virtual ::com::sun::star::uno::Any SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -145,7 +145,7 @@ namespace pcr class OTimeDurationControl : public ONumericControl { public: - OTimeDurationControl( ::Window* pParent, WinBits nWinStyle ); + OTimeDurationControl( vcl::Window* pParent, WinBits nWinStyle ); virtual ~OTimeDurationControl(); // XPropertyControl diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 5a593b0b1377..38c951c7c171 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -30,7 +30,7 @@ #include <algorithm> #include <boost/scoped_array.hpp> -class GridWindow : public Window +class GridWindow : public vcl::Window { // helper class for handles struct impHandle @@ -49,13 +49,13 @@ class GridWindow : public Window return (maPos.X() < rComp.maPos.X()); } - void draw(Window& rWin, const BitmapEx& rBitmapEx) + void draw(vcl::Window& rWin, const BitmapEx& rBitmapEx) { const Point aOffset(rWin.PixelToLogic(Point(mnOffX, mnOffY))); rWin.DrawBitmapEx(maPos - aOffset, rBitmapEx); } - bool isHit(Window& rWin, const Point& rPos) + bool isHit(vcl::Window& rWin, const Point& rPos) { const Point aOffset(rWin.PixelToLogic(Point(mnOffX, mnOffY))); const Rectangle aTarget(maPos - aOffset, maPos + aOffset); @@ -117,7 +117,7 @@ class GridWindow : public Window virtual Size GetOptimalSize() const SAL_OVERRIDE; void drawLine( double x1, double y1, double x2, double y2 ); public: - GridWindow(Window* pParent); + GridWindow(vcl::Window* pParent); void Init(double* pXValues, double* pYValues, int nValues, bool bCutValues, const BitmapEx &rMarkerBitmap); virtual ~GridWindow(); @@ -130,7 +130,7 @@ public: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; }; -GridWindow::GridWindow(Window* pParent) +GridWindow::GridWindow(vcl::Window* pParent) : Window(pParent, 0) , m_aGridArea(50, 15, 100, 100) , m_fMinX(0.0) @@ -198,7 +198,7 @@ Size GridWindow::GetOptimalSize() const return LogicToPixel(Size(240, 200), MAP_APPFONT); } -GridDialog::GridDialog(double* pXValues, double* pYValues, int nValues, Window* pParent, bool bCutValues ) +GridDialog::GridDialog(double* pXValues, double* pYValues, int nValues, vcl::Window* pParent, bool bCutValues ) : ModalDialog(pParent, "GridDialog", "modules/scanner/ui/griddialog.ui") { get(m_pOKButton, "ok"); @@ -694,7 +694,7 @@ double* GridDialog::getNewYValues() return m_pGridWindow->getNewYValues(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGridWindow(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGridWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new GridWindow(pParent); } diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx index 7416c6abcfe4..6fca647facd5 100644 --- a/extensions/source/scanner/grid.hxx +++ b/extensions/source/scanner/grid.hxx @@ -48,7 +48,7 @@ class GridDialog : public ModalDialog public: GridDialog(double* pXValues, double* pYValues, int nValues, - Window* pParent, bool bCutValues = true); + vcl::Window* pParent, bool bCutValues = true); void setBoundings(double fMinX, double fMinY, double fMaxX, double fMaxY); double* getNewYValues(); diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index c47e1a6096d9..bc7ee8e4a978 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -33,7 +33,7 @@ #define PREVIEW_WIDTH 113 #define PREVIEW_HEIGHT 160 -class ScanPreview : public Window +class ScanPreview : public vcl::Window { private: enum DragDirection { TopLeft, Top, TopRight, Right, BottomRight, Bottom, @@ -51,7 +51,7 @@ private: void DrawRectangles(Point& rUL, Point& rBR); public: - ScanPreview(Window* pParent, WinBits nStyle) + ScanPreview(vcl::Window* pParent, WinBits nStyle) : Window(pParent, nStyle) , maMaxBottomRight(PREVIEW_WIDTH, PREVIEW_HEIGHT) , mpParentDialog(NULL) @@ -145,7 +145,7 @@ public: } }; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScanPreview(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScanPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -155,7 +155,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScanPreview(Window *pParent return pWindow; } -SaneDlg::SaneDlg( Window* pParent, Sane& rSane, bool bScanEnabled ) : +SaneDlg::SaneDlg( vcl::Window* pParent, Sane& rSane, bool bScanEnabled ) : ModalDialog(pParent, "SaneDialog", "modules/scanner/ui/sanedialog.ui"), mrSane( rSane ), mbScanEnabled( bScanEnabled ), diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index 45750e5a452b..57eaa54b0cb3 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -103,7 +103,7 @@ private: // helper bool SetAdjustedNumericalValue( const char* pOption, double fValue, int nElement = 0 ); public: - SaneDlg( Window*, Sane&, bool ); + SaneDlg( vcl::Window*, Sane&, bool ); virtual ~SaneDlg(); virtual short Execute() SAL_OVERRIDE; diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index fed6d02e5dd8..38a7bd155b80 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -104,7 +104,7 @@ private: void RecalcTextRects(); public: - BubbleWindow( Window* pParent, const OUString& rTitle, + BubbleWindow( vcl::Window* pParent, const OUString& rTitle, const OUString& rText, const Image& rImage ); virtual ~BubbleWindow(); @@ -259,7 +259,7 @@ UpdateCheckUI::supportsService( OUString const & serviceName ) throw (uno::Runti Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar ) { sal_uInt32 nResID; - Window *pMBarWin = pMBar->GetWindow(); + vcl::Window *pMBarWin = pMBar->GetWindow(); sal_uInt32 nMBarHeight = 20; if ( pMBarWin ) @@ -641,11 +641,11 @@ IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl) { SolarMutexGuard aGuard; - Window *pTopWin = Application::GetFirstTopLevelWindow(); - Window *pActiveWin = Application::GetActiveTopWindow(); + vcl::Window *pTopWin = Application::GetFirstTopLevelWindow(); + vcl::Window *pActiveWin = Application::GetActiveTopWindow(); SystemWindow *pActiveSysWin = NULL; - Window *pBubbleWin = NULL; + vcl::Window *pBubbleWin = NULL; if ( mpBubbleWin ) pBubbleWin = mpBubbleWin; @@ -686,7 +686,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) else if ( VCLEVENT_WINDOW_MENUBARADDED == nEventID ) { SolarMutexGuard aGuard; - Window *pWindow = pEvent->GetWindow(); + vcl::Window *pWindow = pEvent->GetWindow(); if ( pWindow ) { SystemWindow *pSysWin = pWindow->GetSystemWindow(); @@ -731,7 +731,7 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent) case VCLEVENT_WINDOW_GETFOCUS: { SolarMutexGuard aGuard; - Window *pWindow = static_cast< VclWindowEvent * >(pEvent)->GetWindow(); + vcl::Window *pWindow = static_cast< VclWindowEvent * >(pEvent)->GetWindow(); if ( pWindow && pWindow->IsTopWindow() ) { SystemWindow *pSysWin = pWindow->GetSystemWindow(); @@ -758,7 +758,7 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent) #define TEXT_MAX_HEIGHT 200 -BubbleWindow::BubbleWindow( Window* pParent, const OUString& rTitle, +BubbleWindow::BubbleWindow( vcl::Window* pParent, const OUString& rTitle, const OUString& rText, const Image& rImage ) : FloatingWindow( pParent, WB_SYSTEMWINDOW | WB_OWNERDRAWDECORATION diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx index 3de33b2bacf5..fe6b7fe7c485 100644 --- a/filter/source/flash/impswfdialog.cxx +++ b/filter/source/flash/impswfdialog.cxx @@ -28,7 +28,7 @@ using namespace com::sun::star::beans; // - ImpPDFDialog - -ImpSWFDialog::ImpSWFDialog( Window* pParent, Sequence< PropertyValue >& rFilterData ) : +ImpSWFDialog::ImpSWFDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFilterData ) : ModalDialog( pParent, "ImpSWFDialog", "filter/ui/impswfdialog.ui" ), maConfigItem( "Office.Common/Filter/Flash/Export/", &rFilterData ) diff --git a/filter/source/flash/impswfdialog.hxx b/filter/source/flash/impswfdialog.hxx index 0726e2de3729..cb128448112e 100644 --- a/filter/source/flash/impswfdialog.hxx +++ b/filter/source/flash/impswfdialog.hxx @@ -36,7 +36,7 @@ class ResMgr; -class Window; +namespace vcl { class Window; } class ImpSWFDialog : public ModalDialog { @@ -55,7 +55,7 @@ private: DECL_LINK( OnToggleCheckbox, CheckBox* ); public: - ImpSWFDialog( Window* pParent, + ImpSWFDialog( vcl::Window* pParent, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData ); virtual ~ImpSWFDialog(); diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx index e13fc4bd03b2..1b5f5fa287f4 100644 --- a/filter/source/flash/swfdialog.cxx +++ b/filter/source/flash/swfdialog.cxx @@ -146,7 +146,7 @@ Sequence< OUString > SAL_CALL SWFDialog::getSupportedServiceNames() -Dialog* SWFDialog::createDialog( Window* pParent ) +Dialog* SWFDialog::createDialog( vcl::Window* pParent ) { Dialog* pRet = NULL; diff --git a/filter/source/flash/swfdialog.hxx b/filter/source/flash/swfdialog.hxx index 793d6eea0f83..931432e33c4c 100644 --- a/filter/source/flash/swfdialog.hxx +++ b/filter/source/flash/swfdialog.hxx @@ -29,7 +29,7 @@ // - SWFDialog - -class Window; +namespace vcl { class Window; } class ResMgr; class SWFDialog : public ::svt::OGenericUnoDialog, @@ -54,7 +54,7 @@ protected: virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Dialog* createDialog( Window* pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* pParent ) SAL_OVERRIDE; virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx index 069e50642f13..13d5505febe6 100644 --- a/filter/source/msfilter/mstoolbar.cxx +++ b/filter/source/msfilter/mstoolbar.cxx @@ -61,7 +61,7 @@ void CustomToolBarImportHelper::applyIcons() uno::Reference< ui::XImageManager > xImageManager( getCfgManager()->getImageManager(), uno::UNO_QUERY_THROW ); sal_uInt16 nColor = ui::ImageType::COLOR_NORMAL; - Window* topwin = Application::GetActiveTopWindow(); + vcl::Window* topwin = Application::GetActiveTopWindow(); if ( topwin != NULL && topwin->GetDisplayBackground().GetColor().IsDark() ) nColor = css::ui::ImageType::COLOR_HIGHCONTRAST; diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index ba74e6f93d00..108a781a98f8 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star; // please note: the default used here are the same as per specification, // they should be the same in PDFFilter::implExport and in PDFExport::PDFExport -ImpPDFTabDialog::ImpPDFTabDialog(Window* pParent, Sequence< PropertyValue >& rFilterData, +ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >& rFilterData, const Reference< XComponent >& rxDoc) : SfxTabDialog(pParent, "PdfOptionsDialog","filter/ui/pdfoptionsdialog.ui"), maConfigItem( "Office.Common/Filter/PDF/Export/", &rFilterData ), @@ -510,7 +510,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData() } -ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(Window* pParent, const SfxItemSet& rCoreSet) +ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "PdfGeneralPage","filter/ui/pdfgeneralpage.ui", &rCoreSet) , mbTaggedPDFUserSelection(false) , mbExportFormFieldsUserSelection(false) @@ -704,7 +704,7 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) } -SfxTabPage* ImpPDFTabGeneralPage::Create( Window* pParent, +SfxTabPage* ImpPDFTabGeneralPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return ( new ImpPDFTabGeneralPage( pParent, *rAttrSet ) ); @@ -822,7 +822,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl) } // the option features tab page -ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(Window* pParent, const SfxItemSet& rCoreSet) +ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "PdfViewPage","filter/ui/pdfviewpage.ui", &rCoreSet) , mbUseCTLFont(false) { @@ -855,7 +855,7 @@ ImpPDFTabOpnFtrPage::~ImpPDFTabOpnFtrPage() } -SfxTabPage* ImpPDFTabOpnFtrPage::Create( Window* pParent, +SfxTabPage* ImpPDFTabOpnFtrPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return ( new ImpPDFTabOpnFtrPage( pParent, *rAttrSet ) ); @@ -984,7 +984,7 @@ IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, void*, ) // The Viewer preferences tab page -ImpPDFTabViewerPage::ImpPDFTabViewerPage( Window* pParent, +ImpPDFTabViewerPage::ImpPDFTabViewerPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage(pParent, "PdfUserInterfacePage","filter/ui/pdfuserinterfacepage.ui", &rCoreSet) , mbIsPresentation(false) @@ -1015,7 +1015,7 @@ IMPL_LINK( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, void*, ) return 0; } -SfxTabPage* ImpPDFTabViewerPage::Create( Window* pParent, +SfxTabPage* ImpPDFTabViewerPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return ( new ImpPDFTabViewerPage( pParent, *rAttrSet ) ); @@ -1064,7 +1064,7 @@ void ImpPDFTabViewerPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent } // The Security preferences tab page -ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(Window* i_pParent, const SfxItemSet& i_rCoreSet) +ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(vcl::Window* i_pParent, const SfxItemSet& i_rCoreSet) : SfxTabPage(i_pParent, "PdfSecurityPage","filter/ui/pdfsecuritypage.ui", &i_rCoreSet) , msUserPwdTitle( PDFFilterResId( STR_PDF_EXPORT_UDPWD ) ) , mbHaveOwnerPassword( false ) @@ -1072,7 +1072,7 @@ ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(Window* i_pParent, const SfxItemSet , msOwnerPwdTitle( PDFFilterResId( STR_PDF_EXPORT_ODPWD ) ) { get(mpPbSetPwd, "setpassword"); - msStrSetPwd = get<Window>("setpasswordstitle")->GetText(); + msStrSetPwd = get<vcl::Window>("setpasswordstitle")->GetText(); get(mpUserPwdSet, "userpwdset"); get(mpUserPwdUnset, "userpwdunset"); @@ -1107,7 +1107,7 @@ ImpPDFTabSecurityPage::~ImpPDFTabSecurityPage() } -SfxTabPage* ImpPDFTabSecurityPage::Create( Window* pParent, +SfxTabPage* ImpPDFTabSecurityPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return ( new ImpPDFTabSecurityPage( pParent, *rAttrSet ) ); @@ -1306,7 +1306,7 @@ void ImpPDFTabSecurityPage::ImplPDFASecurityControl( bool bEnableSecurity ) // The link preferences tab page (relative and other stuff) -ImpPDFTabLinksPage::ImpPDFTabLinksPage( Window* pParent, +ImpPDFTabLinksPage::ImpPDFTabLinksPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage( pParent, "PdfLinksPage","filter/ui/pdflinkspage.ui",&rCoreSet ), @@ -1328,7 +1328,7 @@ ImpPDFTabLinksPage::~ImpPDFTabLinksPage() } -SfxTabPage* ImpPDFTabLinksPage::Create( Window* pParent, +SfxTabPage* ImpPDFTabLinksPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return ( new ImpPDFTabLinksPage( pParent, *rAttrSet ) ); @@ -1527,7 +1527,7 @@ IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl) // The digital signatures tab page -ImpPDFTabSigningPage::ImpPDFTabSigningPage(Window* pParent, const SfxItemSet& rCoreSet) +ImpPDFTabSigningPage::ImpPDFTabSigningPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "PdfSignPage","filter/ui/pdfsignpage.ui", &rCoreSet) , maSignCertificate() { @@ -1585,7 +1585,7 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear ) } -SfxTabPage* ImpPDFTabSigningPage::Create( Window* pParent, +SfxTabPage* ImpPDFTabSigningPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return ( new ImpPDFTabSigningPage( pParent, *rAttrSet ) ); diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index 9dbd624fb28f..244d4b904552 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -165,7 +165,7 @@ public: friend class ImpPDFTabLinksPage; friend class ImpPDFTabSigningPage; - ImpPDFTabDialog( Window* pParent, + ImpPDFTabDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFilterData, const Reference< XComponent >& rDoc ); @@ -238,11 +238,11 @@ class ImpPDFTabGeneralPage : public SfxTabPage public: DECL_LINK( ToggleExportPDFAHdl, void* ); - ImpPDFTabGeneralPage( Window* pParent, + ImpPDFTabGeneralPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabGeneralPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void GetFilterConfigItem(ImpPDFTabDialog* paParent); @@ -277,11 +277,11 @@ class ImpPDFTabOpnFtrPage : public SfxTabPage DECL_LINK( ToggleRbMagnHdl, void* ); public: - ImpPDFTabOpnFtrPage( Window* pParent, + ImpPDFTabOpnFtrPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabOpnFtrPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); @@ -310,11 +310,11 @@ class ImpPDFTabViewerPage : public SfxTabPage DECL_LINK( ToggleRbBookmarksHdl, void* ); public: - ImpPDFTabViewerPage( Window* pParent, + ImpPDFTabViewerPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabViewerPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); @@ -365,11 +365,11 @@ class ImpPDFTabSecurityPage : public SfxTabPage void enablePermissionControls(); public: - ImpPDFTabSecurityPage( Window* pParent, + ImpPDFTabSecurityPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabSecurityPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); @@ -396,11 +396,11 @@ class ImpPDFTabLinksPage : public SfxTabPage DECL_LINK( ClickRbOpnLnksBrowserHdl, void* ); public: - ImpPDFTabLinksPage( Window* pParent, + ImpPDFTabLinksPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabLinksPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); @@ -425,11 +425,11 @@ class ImpPDFTabSigningPage : public SfxTabPage DECL_LINK( ClickmaPbSignCertClear, void* ); public: - ImpPDFTabSigningPage( Window* pParent, + ImpPDFTabSigningPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ImpPDFTabSigningPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx index dbfcfea780cf..02d6a8e374e2 100644 --- a/filter/source/pdf/pdfdialog.cxx +++ b/filter/source/pdf/pdfdialog.cxx @@ -108,7 +108,7 @@ Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames() -Dialog* PDFDialog::createDialog( Window* pParent ) +Dialog* PDFDialog::createDialog( vcl::Window* pParent ) { Dialog* pRet = NULL; diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx index 86ae9b19aa2e..85135fa24079 100644 --- a/filter/source/pdf/pdfdialog.hxx +++ b/filter/source/pdf/pdfdialog.hxx @@ -29,7 +29,7 @@ // - PDFDialog - -class Window; +namespace vcl { class Window; } typedef ::svt::OGenericUnoDialog PDFDialog_DialogBase; typedef ::cppu::ImplInheritanceHelper2 < @@ -51,7 +51,7 @@ protected: virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) SAL_OVERRIDE; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual Dialog* createDialog( Window* pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* pParent ) SAL_OVERRIDE; virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index 31332b362ca4..cdaa4d521697 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -131,7 +131,7 @@ bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) class FocusWindowWaitCursor { - Window* m_pFocusWindow; + vcl::Window* m_pFocusWindow; public: FocusWindowWaitCursor() : m_pFocusWindow( Application::GetFocusWindow() ) diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx index 1f41db43d9ea..7a7a958b2447 100644 --- a/filter/source/svg/impsvgdialog.cxx +++ b/filter/source/svg/impsvgdialog.cxx @@ -25,7 +25,7 @@ using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::beans; -inline sal_Int32 implMap( Window& /*rWnd*/, sal_Int32 nVal ) +inline sal_Int32 implMap( vcl::Window& /*rWnd*/, sal_Int32 nVal ) { //return( rWnd.LogicToLogic( Size( nVal, nVal ) ).Height(), MAP_APPFONT, MAP_APPFONT ); return( nVal << 1 ); @@ -35,7 +35,7 @@ inline sal_Int32 implMap( Window& /*rWnd*/, sal_Int32 nVal ) // - ImpSVGDialog - -ImpSVGDialog::ImpSVGDialog( Window* pParent, Sequence< PropertyValue >& rFilterData ) : +ImpSVGDialog::ImpSVGDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFilterData ) : ModalDialog( pParent ), maFI( this ), maCBTinyProfile( this ), diff --git a/filter/source/svg/impsvgdialog.hxx b/filter/source/svg/impsvgdialog.hxx index 7add6c83019f..657cd9a47bb9 100644 --- a/filter/source/svg/impsvgdialog.hxx +++ b/filter/source/svg/impsvgdialog.hxx @@ -42,7 +42,7 @@ class ResMgr; -class Window; +namespace vcl { class Window; } class ImpSVGDialog : public ModalDialog { @@ -64,7 +64,7 @@ private: public: - ImpSVGDialog( Window* pParent, /*ResMgr& rResMgr,*/ + ImpSVGDialog( vcl::Window* pParent, /*ResMgr& rResMgr,*/ com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData ); virtual ~ImpSVGDialog(); diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx index 9d9dd4b302a9..ee307a3c27ff 100644 --- a/filter/source/svg/svgdialog.cxx +++ b/filter/source/svg/svgdialog.cxx @@ -143,7 +143,7 @@ Sequence< OUString > SAL_CALL SVGDialog::getSupportedServiceNames() -Dialog* SVGDialog::createDialog( Window* pParent ) +Dialog* SVGDialog::createDialog( vcl::Window* pParent ) { return( ( /*KA: *mapResMgr.get() &&*/ mxSrcDoc.is() ) ? new ImpSVGDialog( pParent/*KA: , *mapResMgr*/, maFilterData ) : diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx index 5cc335bf77f2..5cc62a7cf3b0 100644 --- a/filter/source/svg/svgdialog.hxx +++ b/filter/source/svg/svgdialog.hxx @@ -55,7 +55,7 @@ protected: virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Dialog* createDialog( Window* pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* pParent ) SAL_OVERRIDE; virtual void executedDialog( sal_Int16 nExecutionResult ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 2ca7de74249c..4da938250940 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -92,7 +92,7 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window* pFocusWindow = Application::GetFocusWindow(); + vcl::Window* pFocusWindow = Application::GetFocusWindow(); bool bRet; if( pFocusWindow ) diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx index 80bfc9112543..6e55c266787d 100644 --- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx +++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx @@ -331,7 +331,7 @@ sal_Int16 SAL_CALL XMLFilterDialogComponent::execute( ) throw(RuntimeException, if( NULL == mpDialog ) { - Window* pParent = DIALOG_NO_PARENT; + vcl::Window* pParent = DIALOG_NO_PARENT; if (mxParent.is()) pParent = VCLUnoHelper::GetWindow(mxParent); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 444559b6f368..4c715e589b33 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -54,7 +54,7 @@ using namespace com::sun::star::util; using ::rtl::Uri; -XMLFilterSettingsDialog::XMLFilterSettingsDialog(Window* pParent, +XMLFilterSettingsDialog::XMLFilterSettingsDialog(vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext) : ModelessDialog(pParent, "XMLFilterSettingsDialog", "filter/ui/xmlfiltersettings.ui") , mxContext( rxContext ) @@ -1336,7 +1336,7 @@ OUString getApplicationUIName( const OUString& rServiceName ) } } -SvxPathControl::SvxPathControl(Window* pParent) +SvxPathControl::SvxPathControl(vcl::Window* pParent) : VclVBox(pParent) , bHasBeenShown(false) { @@ -1376,7 +1376,7 @@ SvxPathControl::~SvxPathControl() delete m_pHeaderBar; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPathControl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPathControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxPathControl(pParent); } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 1af868fdb975..6ed617fd40de 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -46,7 +46,7 @@ private: protected: virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; public: - SvxPathControl(Window* pParent); + SvxPathControl(vcl::Window* pParent); HeaderBar* getHeaderBar() { return m_pHeaderBar; } XMLFilterListBox* getListBox() { return m_pFocusCtrl; } virtual ~SvxPathControl(); @@ -85,7 +85,7 @@ public: class XMLFilterSettingsDialog : public ModelessDialog { public: - XMLFilterSettingsDialog(Window* pParent, + XMLFilterSettingsDialog(vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext); DECL_LINK(ClickHdl_Impl, PushButton * ); diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 72b52189e573..4494a74ba799 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star::container; using namespace com::sun::star::beans; using namespace com::sun::star::lang; -XMLFilterTabDialog::XMLFilterTabDialog(Window *pParent, ResMgr& rResMgr, +XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, const Reference< XComponentContext >& rxContext, const filter_info_impl* pInfo) : TabDialog(pParent, "XSLTFilterDialog","filter/ui/xsltfilterdialog.ui") , mxContext(rxContext) @@ -89,7 +89,7 @@ bool XMLFilterTabDialog::onOk() sal_uInt16 nErrorPage = 0; sal_uInt16 nErrorId = 0; - Window* pFocusWindow = NULL; + vcl::Window* pFocusWindow = NULL; OUString aReplace1; OUString aReplace2; diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index c44c8a5ee042..1ec8594ceac4 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -24,7 +24,7 @@ #include <vcl/tabdlg.hxx> #include <vcl/button.hxx> -class Window; +namespace vcl { class Window; } class ResMgr; class filter_info_impl; @@ -34,7 +34,7 @@ class XMLFilterTabPageXSLT; class XMLFilterTabDialog: public TabDialog { public: - XMLFilterTabDialog(Window *pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo); + XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, const filter_info_impl* pInfo); virtual ~XMLFilterTabDialog(); bool onOk(); diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx index 88670c874a11..fb1d35ac2599 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx @@ -23,7 +23,7 @@ #include "xmlfiltertabpagebasic.hxx" #include "xmlfiltersettingsdialog.hxx" -XMLFilterTabPageBasic::XMLFilterTabPageBasic(Window* pParent) +XMLFilterTabPageBasic::XMLFilterTabPageBasic(vcl::Window* pParent) : TabPage(pParent, "XmlFilterTabPageGeneral", "filter/ui/xmlfiltertabpagegeneral.ui") { get(m_pEDFilterName, "filtername"); diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx index dfb918c087b2..13d38d11e046 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx @@ -25,14 +25,14 @@ #include <vcl/combobox.hxx> #include <svtools/svmedit.hxx> -class Window; +namespace vcl { class Window; } class ResMgr; class filter_info_impl; class XMLFilterTabPageBasic : public TabPage { public: - XMLFilterTabPageBasic(Window* pParent); + XMLFilterTabPageBasic(vcl::Window* pParent); virtual ~XMLFilterTabPageBasic(); bool FillInfo( filter_info_impl* pInfo ); diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index edb9ffe896eb..1edc50fb25a7 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; -XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent) : +XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( vcl::Window* pParent) : TabPage( pParent, "XmlFilterTabPageTransformation", "filter/ui/xmlfiltertabpagetransformation.ui" ), sHTTPSchema( "http://" ), diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index efc7bfad38ab..5f09a33c067f 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -26,14 +26,14 @@ #include <vcl/combobox.hxx> #include <svtools/inettbc.hxx> -class Window; +namespace vcl { class Window; } class ResMgr; class filter_info_impl; class XMLFilterTabPageXSLT : public TabPage { public: - XMLFilterTabPageXSLT( Window* pParent); + XMLFilterTabPageXSLT( vcl::Window* pParent); virtual ~XMLFilterTabPageXSLT(); bool FillInfo( filter_info_impl* pInfo ); diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx index de7761009e52..03672fd7f7f8 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx @@ -133,7 +133,7 @@ static bool checkComponent( Reference< XComponent >& rxComponent, const OUString return false; } -XMLFilterTestDialog::XMLFilterTestDialog(Window* pParent, +XMLFilterTestDialog::XMLFilterTestDialog(vcl::Window* pParent, const Reference<XComponentContext>& rxContext) : ModalDialog(pParent, "TestXMLFilterDialog", "filter/ui/testxmlfilter.ui") , mxContext(rxContext) diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx index 6bdb429c81ca..45953483b43a 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx @@ -34,7 +34,7 @@ class filter_info_impl; class XMLFilterTestDialog : public ModalDialog { public: - XMLFilterTestDialog(Window* pParent, + XMLFilterTestDialog(vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext); virtual ~XMLFilterTestDialog(); diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 5ca9cac35c8e..58d2f6939af3 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -134,7 +134,7 @@ namespace frm } - static void adjustTwoStateWinBit( Window* _pWindow, const Any& _rValue, WinBits _nFlag, bool _bInvert = false ) + static void adjustTwoStateWinBit( vcl::Window* _pWindow, const Any& _rValue, WinBits _nFlag, bool _bInvert = false ) { WinBits nBits = _pWindow->GetStyle(); implAdjustTwoStateFlag( _rValue, nBits, _nFlag, _bInvert ); @@ -197,7 +197,7 @@ namespace frm mbCreatingPeer = true; // determine the VLC window for the parent - Window* pParentWin = NULL; + vcl::Window* pParentWin = NULL; if ( _rParentPeer.is() ) { VCLXWindow* pParentXWin = VCLXWindow::GetImplementation( _rParentPeer ); @@ -300,7 +300,7 @@ namespace frm // ORichTextPeer - ORichTextPeer* ORichTextPeer::Create( const Reference< XControlModel >& _rxModel, Window* _pParentWindow, WinBits _nStyle ) + ORichTextPeer* ORichTextPeer::Create( const Reference< XControlModel >& _rxModel, vcl::Window* _pParentWindow, WinBits _nStyle ) { DBG_TESTSOLARMUTEX(); diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index 38dabbf593eb..e81e5b9afe40 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -97,7 +97,7 @@ namespace frm */ static ORichTextPeer* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel, - Window* _pParentWindow, + vcl::Window* _pParentWindow, WinBits _nStyle ); diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx index 3795a49ac11b..8153fd201042 100644 --- a/forms/source/richtext/richtextimplcontrol.hxx +++ b/forms/source/richtext/richtextimplcontrol.hxx @@ -29,7 +29,7 @@ class EditView; class EditStatus; -class Window; +namespace vcl { class Window; } class SvxScriptSetItem; namespace frm @@ -67,7 +67,7 @@ namespace frm struct GrantAccess { friend class RichTextControl; private: GrantAccess() { } }; inline EditView* getView( const GrantAccess& ) const { return m_pView; } inline RichTextEngine* getEngine( const GrantAccess& ) const { return m_pEngine; } - inline Window* getViewport( const GrantAccess& ) const { return m_pViewport; } + inline vcl::Window* getViewport( const GrantAccess& ) const { return m_pViewport; } public: RichTextControlImpl( Control* _pAntiImpl, RichTextEngine* _pEngine, diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 54c00b4ba290..5b293b34fcd2 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -41,7 +41,7 @@ namespace frm { - RichTextControl::RichTextControl( RichTextEngine* _pEngine, Window* _pParent, WinBits _nStyle, + RichTextControl::RichTextControl( RichTextEngine* _pEngine, vcl::Window* _pParent, WinBits _nStyle, ITextAttributeListener* _pTextAttribListener, ITextSelectionListener* _pSelectionListener ) :Control( _pParent, implInitStyle( _nStyle ) ) ,m_pImpl( NULL ) @@ -314,7 +314,7 @@ namespace frm } - Window& RichTextControl::getViewport() const + vcl::Window& RichTextControl::getViewport() const { return *m_pImpl->getViewport( RichTextControlImpl::GrantAccess() ); } diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index 2c1ab680a3bf..4e3123d0b75a 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -45,7 +45,7 @@ namespace frm public: RichTextControl( RichTextEngine* _pEngine, - Window* _pParent, + vcl::Window* _pParent, WinBits _nStyle, ITextAttributeListener* _pTextAttribListener, ITextSelectionListener* _pSelectionListener @@ -116,7 +116,7 @@ namespace frm private: EditEngine& getEngine() const; - Window& getViewport() const; + vcl::Window& getViewport() const; }; diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx index b18995f6af9d..440b3a43f82f 100644 --- a/forms/source/richtext/richtextviewport.cxx +++ b/forms/source/richtext/richtextviewport.cxx @@ -24,7 +24,7 @@ namespace frm { - RichTextViewPort::RichTextViewPort( Window* _pParent ) + RichTextViewPort::RichTextViewPort( vcl::Window* _pParent ) :Control ( _pParent ) ,m_pView(NULL) ,m_bHideInactiveSelection( true ) diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx index fdd4bb005999..a6250a894545 100644 --- a/forms/source/richtext/richtextviewport.hxx +++ b/forms/source/richtext/richtextviewport.hxx @@ -34,7 +34,7 @@ namespace frm bool m_bHideInactiveSelection; public: - RichTextViewPort( Window* _pParent ); + RichTextViewPort( vcl::Window* _pParent ); void setView( EditView& _rView ); diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 274851f58824..5f056420a601 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -129,7 +129,7 @@ namespace frm mbCreatingPeer = true; // determine the VLC window for the parent - Window* pParentWin = NULL; + vcl::Window* pParentWin = NULL; if ( _rParentPeer.is() ) { VCLXWindow* pParentXWin = VCLXWindow::GetImplementation( _rParentPeer ); @@ -230,7 +230,7 @@ namespace frm ONavigationBarPeer* ONavigationBarPeer::Create( const Reference< XComponentContext >& _rxORB, - Window* _pParentWindow, const Reference< XControlModel >& _rxModel ) + vcl::Window* _pParentWindow, const Reference< XControlModel >& _rxModel ) { DBG_TESTSOLARMUTEX(); diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index 57e5af6754b4..b511418fcf1d 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -91,7 +91,7 @@ namespace frm */ static ONavigationBarPeer* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, - Window* _pParentWindow, + vcl::Window* _pParentWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel ); diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index f51c81cd58d4..7b332a24e79a 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -101,7 +101,7 @@ namespace frm const IFeatureDispatcher* m_pDispatcher; public: - ImplNavToolBar( Window* _pParent ) + ImplNavToolBar( vcl::Window* _pParent ) :ToolBox( _pParent, WB_3DLOOK ) ,m_pDispatcher( NULL ) { @@ -132,7 +132,7 @@ namespace frm } } - NavigationToolBar::NavigationToolBar( Window* _pParent, WinBits _nStyle, const PCommandImageProvider& _pImageProvider, + NavigationToolBar::NavigationToolBar( vcl::Window* _pParent, WinBits _nStyle, const PCommandImageProvider& _pImageProvider, const PCommandDescriptionProvider& _pDescriptionProvider ) :Window( _pParent, _nStyle ) ,m_pDispatcher( NULL ) @@ -147,7 +147,7 @@ namespace frm NavigationToolBar::~NavigationToolBar( ) { - for ( ::std::vector< Window* >::iterator loopChildWins = m_aChildWins.begin(); + for ( ::std::vector< vcl::Window* >::iterator loopChildWins = m_aChildWins.begin(); loopChildWins != m_aChildWins.end(); ++loopChildWins ) @@ -224,7 +224,7 @@ namespace frm DBG_ASSERT( m_pToolbar->GetItemPos( (sal_uInt16)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND, "NavigationToolBar::checkFeature: invalid id!" ); - Window* pItemWindow = m_pToolbar->GetItemWindow( (sal_uInt16)_nFeatureId ); + vcl::Window* pItemWindow = m_pToolbar->GetItemWindow( (sal_uInt16)_nFeatureId ); if ( pItemWindow ) pItemWindow->SetText( _rText ); else @@ -296,7 +296,7 @@ namespace frm if ( pSupportedFeatures->bItemWindow ) { - Window* pItemWindow = NULL; + vcl::Window* pItemWindow = NULL; if ( FormFeature::MoveAbsolute == pSupportedFeatures->nId ) { pItemWindow = new RecordPositionInput( m_pToolbar ); @@ -558,14 +558,14 @@ namespace frm for ( sal_uInt16 item = 0; item < m_pToolbar->GetItemCount(); ++item ) { sal_uInt16 nItemId = m_pToolbar->GetItemId( item ); - Window* pItemWindow = m_pToolbar->GetItemWindow( nItemId ); + vcl::Window* pItemWindow = m_pToolbar->GetItemWindow( nItemId ); if ( pItemWindow ) (this->*_handler)( nItemId, pItemWindow, _pParam ); } } - void NavigationToolBar::setItemBackground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const + void NavigationToolBar::setItemBackground( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* _pColor ) const { if ( _pColor ) _pItemWindow->SetControlBackground( *static_cast< const Color* >( _pColor ) ); @@ -574,7 +574,7 @@ namespace frm } - void NavigationToolBar::setTextLineColor( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const + void NavigationToolBar::setTextLineColor( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* _pColor ) const { if ( _pColor ) _pItemWindow->SetTextLineColor( *static_cast< const Color* >( _pColor ) ); @@ -583,14 +583,14 @@ namespace frm } #if 0 - void NavigationToolBar::setItemWindowZoom( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const + void NavigationToolBar::setItemWindowZoom( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const { _pItemWindow->SetZoom( GetZoom() ); _pItemWindow->SetZoomedPointFont( IsControlFont() ? GetControlFont() : GetPointFont() ); } #endif - void NavigationToolBar::setItemControlFont( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const + void NavigationToolBar::setItemControlFont( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const { if ( IsControlFont() ) _pItemWindow->SetControlFont( GetControlFont() ); @@ -599,7 +599,7 @@ namespace frm } - void NavigationToolBar::setItemControlForeground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const + void NavigationToolBar::setItemControlForeground( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const { if ( IsControlForeground() ) _pItemWindow->SetControlForeground( GetControlForeground() ); @@ -609,7 +609,7 @@ namespace frm } - void NavigationToolBar::adjustItemWindowWidth( sal_uInt16 _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const + void NavigationToolBar::adjustItemWindowWidth( sal_uInt16 _nItemId, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const { OUString sItemText; switch ( _nItemId ) @@ -639,12 +639,12 @@ namespace frm } - void NavigationToolBar::enableItemRTL( sal_uInt16 /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const + void NavigationToolBar::enableItemRTL( sal_uInt16 /*_nItemId*/, vcl::Window* _pItemWindow, const void* _pIsRTLEnabled ) const { _pItemWindow->EnableRTL( *static_cast< const sal_Bool* >( _pIsRTLEnabled ) ); } - RecordPositionInput::RecordPositionInput( Window* _pParent ) + RecordPositionInput::RecordPositionInput( vcl::Window* _pParent ) :NumericField( _pParent, WB_BORDER | WB_VCENTER ) ,m_pDispatcher( NULL ) { diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx index 1c0800759b7a..5be47c86c5f1 100644 --- a/forms/source/solar/inc/navtoolbar.hxx +++ b/forms/source/solar/inc/navtoolbar.hxx @@ -36,7 +36,7 @@ namespace frm class ImplNavToolBar; - class NavigationToolBar : public Window + class NavigationToolBar : public vcl::Window { public: enum ImageSize @@ -61,11 +61,11 @@ namespace frm m_pDescriptionProvider; ImageSize m_eImageSize; ImplNavToolBar* m_pToolbar; - ::std::vector< Window* > m_aChildWins; + ::std::vector< vcl::Window* > m_aChildWins; public: NavigationToolBar( - Window* _pParent, + vcl::Window* _pParent, WinBits _nStyle, const ::boost::shared_ptr< const ICommandImageProvider >& _pImageProvider, const ::boost::shared_ptr< const ICommandDescriptionProvider >& _pDescriptionProvider @@ -137,18 +137,18 @@ namespace frm void updateFeatureStates( ); // iterating through item windows - typedef void (NavigationToolBar::*ItemWindowHandler) (sal_uInt16, Window*, const void*) const; + typedef void (NavigationToolBar::*ItemWindowHandler) (sal_uInt16, vcl::Window*, const void*) const; void forEachItemWindow( ItemWindowHandler _handler, const void* _pParam ); - void setItemBackground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const; - void setTextLineColor( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const; + void setItemBackground( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* _pColor ) const; + void setTextLineColor( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* _pColor ) const; #if 0 - void setItemWindowZoom( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const; + void setItemWindowZoom( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const; #endif - void setItemControlFont( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const; - void setItemControlForeground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const; - void adjustItemWindowWidth( sal_uInt16 _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const; - void enableItemRTL( sal_uInt16 /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const; + void setItemControlFont( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const; + void setItemControlForeground( sal_uInt16 /* _nItemId */, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const; + void adjustItemWindowWidth( sal_uInt16 _nItemId, vcl::Window* _pItemWindow, const void* /* _pParam */ ) const; + void enableItemRTL( sal_uInt16 /*_nItemId*/, vcl::Window* _pItemWindow, const void* _pIsRTLEnabled ) const; }; class RecordPositionInput : public NumericField @@ -157,7 +157,7 @@ namespace frm const IFeatureDispatcher* m_pDispatcher; public: - RecordPositionInput( Window* _pParent ); + RecordPositionInput( vcl::Window* _pParent ); virtual ~RecordPositionInput(); /** sets the dispatcher which is to be used for the features diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 61ce2c161842..b36cf4058a50 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -44,7 +44,7 @@ protected: public: - EditBox( Window* pParent, WinBits nBits ); + EditBox( vcl::Window* pParent, WinBits nBits ); virtual ~EditBox(); @@ -62,7 +62,7 @@ public: class ArgEdit : public RefEdit { public: - ArgEdit( Window* pParent, WinBits nBits ); + ArgEdit( vcl::Window* pParent, WinBits nBits ); void Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit, ScrollBar& rArgSlider, sal_uInt16 nArgCount ); diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 25dde889fd67..c8489ceb7abf 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -391,13 +391,13 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) sal_uInt16 nSwitch=rNEvt.GetType(); if(nSwitch==EVENT_GETFOCUS && !bIsShutDown) { - Window* pWin=rNEvt.GetWindow(); + vcl::Window* pWin=rNEvt.GetWindow(); if(pWin!=NULL) { aActivWinId = pWin->GetUniqueId(); if(aActivWinId.isEmpty()) { - Window* pParent=pWin->GetParent(); + vcl::Window* pParent=pWin->GetParent(); while(pParent!=NULL) { aActivWinId=pParent->GetUniqueId(); @@ -1643,7 +1643,7 @@ void FormulaDlg_Impl::SetEdSelection() } // if( pEd ) } -FormulaModalDialog::FormulaModalDialog( Window* pParent +FormulaModalDialog::FormulaModalDialog( vcl::Window* pParent , bool _bSupportFunctionResult , bool _bSupportResult , bool _bSupportMatrix @@ -1692,7 +1692,7 @@ void FormulaModalDialog::RefInputDoneAfter( bool bForced ) m_pImpl->RefInputDoneAfter( bForced ); } -void FormulaModalDialog::SetFocusWin(Window *pWin,const OString& nUniqueId) +void FormulaModalDialog::SetFocusWin(vcl::Window *pWin,const OString& nUniqueId) { if(pWin->GetUniqueId()==nUniqueId) { @@ -1704,7 +1704,7 @@ void FormulaModalDialog::SetFocusWin(Window *pWin,const OString& nUniqueId) for(sal_uInt16 i=0;i<nCount;i++) { - Window* pChild=pWin->GetChild(i); + vcl::Window* pChild=pWin->GetChild(i); SetFocusWin(pChild,nUniqueId); } } @@ -1726,7 +1726,7 @@ void FormulaModalDialog::StoreFormEditData(FormEditData* pData) // Initialisation / General functions for Dialog FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent + vcl::Window* pParent , bool _bSupportFunctionResult , bool _bSupportResult , bool _bSupportMatrix @@ -1795,7 +1795,7 @@ void FormulaDlg::RefInputDoneAfter( bool bForced ) m_pImpl->RefInputDoneAfter( bForced ); } -void FormulaDlg::SetFocusWin(Window *pWin,const OString& nUniqueId) +void FormulaDlg::SetFocusWin(vcl::Window *pWin,const OString& nUniqueId) { if(pWin->GetUniqueId()==nUniqueId) { @@ -1807,7 +1807,7 @@ void FormulaDlg::SetFocusWin(Window *pWin,const OString& nUniqueId) for(sal_uInt16 i=0;i<nCount;i++) { - Window* pChild=pWin->GetChild(i); + vcl::Window* pChild=pWin->GetChild(i); SetFocusWin(pChild,nUniqueId); } } diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 731c4f012154..e99674f50623 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -31,7 +31,7 @@ namespace formula { -FormulaListBox::FormulaListBox( Window* pParent, WinBits nBits ): +FormulaListBox::FormulaListBox( vcl::Window* pParent, WinBits nBits ): ListBox(pParent, nBits) {} @@ -57,7 +57,7 @@ bool FormulaListBox::PreNotify( NotifyEvent& rNEvt ) return nResult; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFormulaListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFormulaListBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new FormulaListBox(pParent, WB_BORDER | WB_SORT); } @@ -71,7 +71,7 @@ inline sal_uInt16 Lb2Cat( sal_uInt16 nLbPos ) return nLbPos; } -FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager): +FuncPage::FuncPage(vcl::Window* pParent,const IFunctionManager* _pFunctionManager): TabPage(pParent, "FunctionPage", "formula/ui/functionpage.ui"), m_pFunctionManager(_pFunctionManager) { diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 424acefe57bc..62d803dd8ed6 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -50,7 +50,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - FormulaListBox( Window* pParent, WinBits nBits ); + FormulaListBox( vcl::Window* pParent, WinBits nBits ); }; @@ -85,7 +85,7 @@ protected: public: - FuncPage( Window* pParent,const IFunctionManager* _pFunctionManager); + FuncPage( vcl::Window* pParent,const IFunctionManager* _pFunctionManager); void SetCategory(sal_Int32 nCat); void SetFunction(sal_Int32 nFunc); diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index a6ca58b37c66..c02ed91cc37f 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -33,7 +33,7 @@ namespace formula { // class ArgEdit -ArgEdit::ArgEdit( Window* pParent, WinBits nBits ) +ArgEdit::ArgEdit( vcl::Window* pParent, WinBits nBits ) : RefEdit( pParent, NULL, nBits ), pEdPrev ( NULL ), pEdNext ( NULL ), @@ -42,7 +42,7 @@ ArgEdit::ArgEdit( Window* pParent, WinBits nBits ) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeArgEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeArgEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new ArgEdit(pParent, WB_BORDER); } @@ -333,7 +333,7 @@ IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd ) // class EditBox -EditBox::EditBox( Window* pParent, WinBits nBits ) +EditBox::EditBox( vcl::Window* pParent, WinBits nBits ) :Control(pParent,nBits), bMouseFlag(false) { @@ -354,7 +354,7 @@ EditBox::EditBox( Window* pParent, WinBits nBits ) SetHelpId( "" ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeEditBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeEditBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new EditBox(pParent, WB_BORDER); } @@ -457,7 +457,7 @@ void EditBox::UpdateOldSel() #define SC_ENABLE_TIME 100 -RefEdit::RefEdit( Window* _pParent, Window* pShrinkModeLabel, WinBits nStyle ) +RefEdit::RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits nStyle ) : Edit( _pParent, nStyle ) , pAnyRefDlg( NULL ) , pLabelWidget(pShrinkModeLabel) @@ -466,8 +466,8 @@ RefEdit::RefEdit( Window* _pParent, Window* pShrinkModeLabel, WinBits nStyle ) aTimer.SetTimeout( SC_ENABLE_TIME ); } -RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, - Window* pShrinkModeLabel, const ResId& rResId ) +RefEdit::RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent, + vcl::Window* pShrinkModeLabel, const ResId& rResId ) : Edit( _pParent, rResId ) , pAnyRefDlg( pParent ) , pLabelWidget(pShrinkModeLabel) @@ -476,7 +476,7 @@ RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, aTimer.SetTimeout( SC_ENABLE_TIME ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRefEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new RefEdit(pParent, NULL, WB_BORDER); } @@ -517,7 +517,7 @@ void RefEdit::StartUpdateData() aTimer.Start(); } -void RefEdit::SetReferences( IControlReferenceHandler* pDlg, Window* pLabel ) +void RefEdit::SetReferences( IControlReferenceHandler* pDlg, vcl::Window* pLabel ) { pAnyRefDlg = pDlg; pLabelWidget = pLabel; @@ -571,7 +571,7 @@ IMPL_LINK_NOARG(RefEdit, UpdateHdl) } //class RefButton -RefButton::RefButton( Window* _pParent, WinBits nStyle ) : +RefButton::RefButton( vcl::Window* _pParent, WinBits nStyle ) : ImageButton( _pParent, nStyle ), aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ), aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ), @@ -583,7 +583,7 @@ RefButton::RefButton( Window* _pParent, WinBits nStyle ) : SetStartImage(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRefButton(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefButton(vcl::Window *pParent, VclBuilder::stringmap &) { return new RefButton(pParent, 0); } diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index d499a6d6d57c..9e3a647eed04 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -35,7 +35,7 @@ namespace formula { -ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg): +ParaWin::ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg): TabPage (pParent, "ParameterPage", "formula/ui/parameter.ui"), pFuncDesc ( NULL ), pMyParent (_pDlg), @@ -81,7 +81,7 @@ ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg): get(m_pSlider, "scrollbar"); //lock down initial preferences - Window *pGrid = get<Window>("paramgrid"); + vcl::Window *pGrid = get<vcl::Window>("paramgrid"); pGrid->set_height_request(pGrid->get_preferred_size().Height()); Size aSize(get_preferred_size()); set_width_request(aSize.Width()); diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index adb2e74e862b..a490133ecd1e 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -123,7 +123,7 @@ protected: void UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i ); public: - ParaWin(Window* pParent,IControlReferenceHandler* _pDlg); + ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg); virtual ~ParaWin(); void SetFunctionDesc(const IFunctionDescription* pFDesc); diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 74a9de07f7d4..ea3cd2af9663 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -32,7 +32,7 @@ namespace formula { -StructListBox::StructListBox(Window* pParent, WinBits nBits ): +StructListBox::StructListBox(vcl::Window* pParent, WinBits nBits ): SvTreeListBox(pParent, nBits) { bActiveFlag=false; @@ -77,12 +77,12 @@ void StructListBox::LoseFocus() SvTreeListBox::LoseFocus(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeStructListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeStructListBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new StructListBox(pParent, WB_BORDER); } -StructPage::StructPage(Window* pParent): +StructPage::StructPage(vcl::Window* pParent): TabPage(pParent, "StructPage", "formula/ui/structpage.ui"), maImgEnd ( ModuleRes( BMP_STR_END ) ), maImgError ( ModuleRes( BMP_STR_ERROR ) ), diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index 7b3c60655cf2..bdd4fcd7d70d 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -48,7 +48,7 @@ protected: public: - StructListBox(Window* pParent, WinBits nBits ); + StructListBox(vcl::Window* pParent, WinBits nBits ); /** Inserts an entry with static image (no difference between collapsed/expanded). */ SvTreeListEntry* InsertStaticEntry( @@ -89,7 +89,7 @@ protected: public: - StructPage( Window* pParent); + StructPage( vcl::Window* pParent); void ClearStruct(); virtual SvTreeListEntry* InsertEntry(const OUString& rText, SvTreeListEntry* pParent, diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 1ac55e03fa52..486200822d9f 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -178,7 +178,7 @@ namespace svt } - void OControlAccess::setHelpURL( Window* _pControl, const OUString& sHelpURL, bool _bFileView ) + void OControlAccess::setHelpURL( vcl::Window* _pControl, const OUString& sHelpURL, bool _bFileView ) { OUString sHelpID( sHelpURL ); INetURLObject aHID( sHelpURL ); @@ -195,7 +195,7 @@ namespace svt } - OUString OControlAccess::getHelpURL( Window* _pControl, bool _bFileView ) + OUString OControlAccess::getHelpURL( vcl::Window* _pControl, bool _bFileView ) { OString aHelpId = _pControl->GetHelpId(); if ( _bFileView ) diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx index 857035e8f15a..3214ebe534b4 100644 --- a/fpicker/source/office/OfficeControlAccess.hxx +++ b/fpicker/source/office/OfficeControlAccess.hxx @@ -68,8 +68,8 @@ namespace svt OUString getLabel( sal_Int16 _nId ) const; void enableControl( sal_Int16 _nId, bool _bEnable ); - static void setHelpURL( Window* _pControl, const OUString& _rURL, bool _bFileView ); - static OUString getHelpURL( Window* _pControl, bool _bFileView ); + static void setHelpURL( vcl::Window* _pControl, const OUString& _rURL, bool _bFileView ); + static OUString getHelpURL( vcl::Window* _pControl, bool _bFileView ); private: /** implements the various methods for setting properties on controls diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 3c83a32942a2..9b442e2792ee 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -463,7 +463,7 @@ sal_Int16 SvtFilePicker::implExecutePicker( ) } -SvtFileDialog* SvtFilePicker::implCreateDialog( Window* _pParent ) +SvtFileDialog* SvtFilePicker::implCreateDialog( vcl::Window* _pParent ) { WinBits nExtraBits; WinBits nBits = getWinBits( nExtraBits ); diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index b49d7721e4f6..65e4eab4b970 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -205,7 +205,7 @@ protected: // OCommonPicker overridables - virtual SvtFileDialog* implCreateDialog( Window* _pParent ) SAL_OVERRIDE; + virtual SvtFileDialog* implCreateDialog( vcl::Window* _pParent ) SAL_OVERRIDE; virtual sal_Int16 implExecutePicker( ) SAL_OVERRIDE; virtual bool implHandleInitializationArgument( const OUString& _rName, diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index 700985011a13..de062ac8e7cc 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -69,7 +69,7 @@ void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< ::com::sun::s getDialog()->StartExecuteModal( LINK( this, SvtFolderPicker, DialogClosedHdl ) ); } -SvtFileDialog* SvtFolderPicker::implCreateDialog( Window* _pParent ) +SvtFileDialog* SvtFolderPicker::implCreateDialog( vcl::Window* _pParent ) { return new SvtFileDialog( _pParent, SFXWB_PATHDIALOG ); } diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx index a285ea0cd727..6261c50f74f0 100644 --- a/fpicker/source/office/OfficeFolderPicker.hxx +++ b/fpicker/source/office/OfficeFolderPicker.hxx @@ -99,7 +99,7 @@ protected: // OCommonPicker overridables - virtual SvtFileDialog* implCreateDialog( Window* _pParent ) SAL_OVERRIDE; + virtual SvtFileDialog* implCreateDialog( vcl::Window* _pParent ) SAL_OVERRIDE; virtual sal_Int16 implExecutePicker( ) SAL_OVERRIDE; }; diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index 09141b6848fa..4e4bbb363f75 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -53,7 +53,7 @@ void PlacesListBox_Impl::MouseButtonUp( const MouseEvent& rMEvt ) mpParent->updateView( ); } -PlacesListBox::PlacesListBox( Window* pParent, SvtFileDialog* pFileDlg, const OUString& rTitle, WinBits nBits ) : +PlacesListBox::PlacesListBox( vcl::Window* pParent, SvtFileDialog* pFileDlg, const OUString& rTitle, WinBits nBits ) : Control( pParent, nBits ), maPlaces( ), mpDlg( pFileDlg ), diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx index c92b80e8c701..4dd95a414e11 100644 --- a/fpicker/source/office/PlacesListBox.hxx +++ b/fpicker/source/office/PlacesListBox.hxx @@ -48,7 +48,7 @@ class PlacesListBox : public Control bool mbSelectionChanged; public: - PlacesListBox( Window* pParent, SvtFileDialog* pFileDlg, const OUString& rTitle, WinBits nBits ); + PlacesListBox( vcl::Window* pParent, SvtFileDialog* pFileDlg, const OUString& rTitle, WinBits nBits ); virtual ~PlacesListBox( ); void AppendPlace( PlacePtr pPlace ); diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx index 9e71b1176d18..49733bbb46a4 100644 --- a/fpicker/source/office/QueryFolderName.hxx +++ b/fpicker/source/office/QueryFolderName.hxx @@ -36,7 +36,7 @@ private: DECL_LINK( NameHdl, void * ); public: - QueryFolderNameDialog(Window* _pParent, const OUString& rTitle, + QueryFolderNameDialog(vcl::Window* _pParent, const OUString& rTitle, const OUString& rDefaultText, OUString* pGroupName = NULL); OUString GetName() const { return m_pNameEdit->GetText(); } }; diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx index 004cdaa15c67..a0cb97896b4c 100644 --- a/fpicker/source/office/commonpicker.hxx +++ b/fpicker/source/office/commonpicker.hxx @@ -35,7 +35,7 @@ #include <tools/link.hxx> class SvtFileDialog; -class Window; +namespace vcl { class Window; } struct ImplSVEvent; namespace svt @@ -92,7 +92,7 @@ namespace svt // overridables // will be called with locked SolarMutex - virtual SvtFileDialog* implCreateDialog( Window* _pParent ) = 0; + virtual SvtFileDialog* implCreateDialog( vcl::Window* _pParent ) = 0; virtual sal_Int16 implExecutePicker( ) = 0; // do NOT override XExecutableDialog::execute! We need to do some stuff there ourself ... diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 1d84dc00a241..74b612f40ed1 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -302,7 +302,7 @@ namespace SvtFileDialog::SvtFileDialog ( - Window* _pParent, + vcl::Window* _pParent, WinBits nBits, WinBits nExtraBits ) : @@ -329,7 +329,7 @@ SvtFileDialog::SvtFileDialog -SvtFileDialog::SvtFileDialog ( Window* _pParent, WinBits nBits ) +SvtFileDialog::SvtFileDialog ( vcl::Window* _pParent, WinBits nBits ) :ModalDialog( _pParent, "ExplorerFileDialog", "fps/ui/explorerfiledialog.ui" ) ,_pCbReadOnly( NULL ) ,_pCbLinkBox( NULL) @@ -348,14 +348,14 @@ SvtFileDialog::SvtFileDialog ( Window* _pParent, WinBits nBits ) Init_Impl( nBits ); } -class CustomContainer : public Window +class CustomContainer : public vcl::Window { SvtExpFileDlg_Impl* _pImp; SvtFileView* _pFileView; Splitter* _pSplitter; public: - CustomContainer(Window *pParent) + CustomContainer(vcl::Window *pParent) : Window(pParent) , _pImp(NULL) , _pFileView(NULL) @@ -476,7 +476,7 @@ void SvtFileDialog::Init_Impl _pImp->_pLbFilter->setMaxWidthChars(40); m_aImages = ImageList( SvtResId( RID_FILEPICKER_IMAGES ) ); - Window *pUpContainer = get<Window>("up"); + vcl::Window *pUpContainer = get<vcl::Window>("up"); _pImp->_pBtnUp = new SvtUpButton_Impl(pUpContainer, this, 0); _pImp->_pBtnUp->SetHelpId( HID_FILEOPEN_LEVELUP ); _pImp->_pBtnUp->set_vexpand(true); @@ -519,7 +519,7 @@ void SvtFileDialog::Init_Impl if ( ( nStyle & SFXWB_MULTISELECTION ) == SFXWB_MULTISELECTION ) _pImp->_bMultiSelection = true; - _pContainer = new CustomContainer(get<Window>("container")); + _pContainer = new CustomContainer(get<vcl::Window>("container")); Size aSize(LogicToPixel(Size(270, 85), MAP_APPFONT)); _pContainer->set_height_request(aSize.Height()); _pContainer->set_width_request(aSize.Width()); @@ -1628,10 +1628,10 @@ long SvtFileDialog::OK() class SvtDefModalDialogParent_Impl { private: - Window* _pOld; + vcl::Window* _pOld; public: - SvtDefModalDialogParent_Impl( Window *pNew ) : + SvtDefModalDialogParent_Impl( vcl::Window *pNew ) : _pOld( Application::GetDefDialogParent() ) { Application::SetDefDialogParent( pNew ); } @@ -2832,7 +2832,7 @@ IMPL_LINK_NOARG( SvtFileDialog, Split_Hdl ) return 0; } -QueryFolderNameDialog::QueryFolderNameDialog(Window* _pParent, +QueryFolderNameDialog::QueryFolderNameDialog(vcl::Window* _pParent, const OUString& rTitle, const OUString& rDefaultText, OUString* pGroupName) : ModalDialog(_pParent, "FolderNameDialog", "fps/ui/foldernamedialog.ui") { diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index c7b38a31796c..c727cfa28c03 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -89,7 +89,7 @@ private: CheckBox* _pCbPreviewBox; CheckBox* _pCbSelection; PushButton* _pPbPlay; - Window* _pPrevWin; + vcl::Window* _pPrevWin; FixedBitmap* _pPrevBmp; CustomContainer* _pContainer; SvtFileView* _pFileView; @@ -193,8 +193,8 @@ protected: short PrepareExecute(); public: - SvtFileDialog( Window* _pParent, WinBits nBits, WinBits nExtraBits ); - SvtFileDialog( Window* _pParent, WinBits nBits ); + SvtFileDialog( vcl::Window* _pParent, WinBits nBits, WinBits nExtraBits ); + SvtFileDialog( vcl::Window* _pParent, WinBits nBits ); virtual ~SvtFileDialog(); virtual long OK(); diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 48ac401dd885..949ffafede4e 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -91,7 +91,7 @@ SvtFileDialogFilter_Impl::~SvtFileDialogFilter_Impl() -SvtFileDialogURLSelector::SvtFileDialogURLSelector( Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId ) +SvtFileDialogURLSelector::SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId ) :MenuButton ( _pParent, nBits ) ,m_pDlg ( _pDlg ) ,m_pMenu ( new PopupMenu ) @@ -123,7 +123,7 @@ void SvtFileDialogURLSelector::Activate() -SvtUpButton_Impl::SvtUpButton_Impl( Window *pParent, SvtFileDialog* pDlg, WinBits nBits ) +SvtUpButton_Impl::SvtUpButton_Impl( vcl::Window *pParent, SvtFileDialog* pDlg, WinBits nBits ) :SvtFileDialogURLSelector( pParent, pDlg, nBits, IMG_FILEDLG_BTN_UP ) { } diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 9461af970e8e..db2987c401ac 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -90,7 +90,7 @@ protected: virtual void FillURLMenu( PopupMenu* _pMenu ) = 0; protected: - SvtFileDialogURLSelector( Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId ); + SvtFileDialogURLSelector( vcl::Window* _pParent, SvtFileDialog* _pDlg, WinBits nBits, sal_uInt16 _nButtonId ); virtual ~SvtFileDialogURLSelector(); virtual void Activate() SAL_OVERRIDE; @@ -102,7 +102,7 @@ private: std::vector<OUString> _aURLs; public: - SvtUpButton_Impl( Window* pParent, SvtFileDialog* pDlg, WinBits nBits ); + SvtUpButton_Impl( vcl::Window* pParent, SvtFileDialog* pDlg, WinBits nBits ); virtual ~SvtUpButton_Impl(); protected: diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx index b4127c212cf6..1f4bc6b58e9f 100644 --- a/fpicker/test/svdem.cxx +++ b/fpicker/test/svdem.cxx @@ -90,7 +90,7 @@ SAL_IMPLEMENT_MAIN() class MyWin : public WorkWindow { public: - MyWin( Window* pParent, WinBits nWinStyle ); + MyWin( vcl::Window* pParent, WinBits nWinStyle ); void MouseMove( const MouseEvent& rMEvt ); void MouseButtonDown( const MouseEvent& rMEvt ); @@ -120,7 +120,7 @@ void Main() -MyWin::MyWin( Window* pParent, WinBits nWinStyle ) +MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) :WorkWindow( pParent, nWinStyle ) ,aOKBtn(this) { 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 ); } } diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx index e7c16c8c67d9..52d351ec6e12 100644 --- a/include/avmedia/mediaplayer.hxx +++ b/include/avmedia/mediaplayer.hxx @@ -31,7 +31,7 @@ namespace avmedia class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow { public: - MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); + MediaPlayer( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); virtual ~MediaPlayer(); SFX_DECL_CHILDWINDOW_WITHID( MediaPlayer ); @@ -43,7 +43,7 @@ class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow { public: - MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, Window* pParent ); + MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, vcl::Window* pParent ); virtual ~MediaFloater(); void setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately ); diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx index 3e4d636ca7d0..4c512979288a 100644 --- a/include/avmedia/mediatoolbox.hxx +++ b/include/avmedia/mediatoolbox.hxx @@ -45,7 +45,7 @@ public: virtual ~MediaToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; private: diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index a42e95efbc40..1ab2c0552fa6 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -32,7 +32,7 @@ #define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME -1.0 -class Window; +namespace vcl { class Window; } class KeyEvent; class MouseEvent; class CommandEvent; @@ -53,7 +53,7 @@ namespace avmedia class AVMEDIA_DLLPUBLIC MediaWindow { public: - MediaWindow( Window* parent, bool bInternalMediaControl ); + MediaWindow( vcl::Window* parent, bool bInternalMediaControl ); virtual ~MediaWindow(); void setURL( const OUString& rURL, const OUString& rReferer ); @@ -62,7 +62,7 @@ namespace avmedia bool isValid() const; Size getPreferredSize() const; - Window* getWindow() const; + vcl::Window* getWindow() const; void setPosSize( const Rectangle& rNewRect ); @@ -97,9 +97,9 @@ namespace avmedia static void getMediaFilters( FilterNameVector& rFilterNameVector ); /// @param o_pbLink if not 0, this is an "insert" dialog: display link /// checkbox and store its state in *o_pbLink - static bool executeMediaURLDialog( Window* pParent, + static bool executeMediaURLDialog( vcl::Window* pParent, OUString& rURL, bool *const o_pbLink ); - static void executeFormatErrorBox( Window* pParent ); + static void executeFormatErrorBox( vcl::Window* pParent ); static bool isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep = false, Size* pPreferredSizePixel = NULL ); static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 ); diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx index cb42627114ff..9d85248f9340 100644 --- a/include/cppcanvas/vclfactory.hxx +++ b/include/cppcanvas/vclfactory.hxx @@ -31,7 +31,7 @@ #include <cppcanvas/cppcanvasdllapi.h> -class Window; +namespace vcl { class Window; } class Bitmap; class BitmapEx; class Polygon; @@ -70,7 +70,7 @@ namespace cppcanvas BitmapCanvasSharedPtr createBitmapCanvas( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& xCanvas ); - SpriteCanvasSharedPtr createSpriteCanvas( const ::Window& rVCLWindow ) const; + SpriteCanvasSharedPtr createSpriteCanvas( const vcl::Window& rVCLWindow ) const; SpriteCanvasSharedPtr createSpriteCanvas( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas >& xCanvas ) const; diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 448d864aba25..47292d09a7ac 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -32,7 +32,7 @@ class FixedLine; namespace dbaui { class IController; - class DBACCESS_DLLPUBLIC ODataView : public Window + class DBACCESS_DLLPUBLIC ODataView : public vcl::Window { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; // the service factory to work with @@ -42,7 +42,7 @@ namespace dbaui ::std::auto_ptr< ::svt::AcceleratorExecute> m_pAccel; public: - ODataView( Window* pParent, + ODataView( vcl::Window* pParent, IController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& , WinBits nStyle = 0 ); diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index e11098df228a..4bdd59c5d9af 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -65,7 +65,7 @@ namespace dbtools class SQLExceptionInfo; } -class Window; +namespace vcl { class Window; } namespace dbaui { class ODataView; @@ -424,7 +424,7 @@ namespace dbaui */ virtual void InvalidateAll(); // late construction - virtual bool Construct(Window* pParent); + virtual bool Construct(vcl::Window* pParent); /** get the layout manager @param _xFrame diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 715d519ec2ae..e10b7a1b826c 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -83,7 +83,7 @@ class Rectangle; class SvStream; class Link; class OutputDevice; -class Window; +namespace vcl { class Window; } class SfxPoolItem; class SvxNumBulletItem; class SvxBulletItem; @@ -142,7 +142,7 @@ private: EDITENG_DLLPRIVATE EditEngine( const EditEngine& ); EDITENG_DLLPRIVATE EditEngine& operator=( const EditEngine& ); - EDITENG_DLLPRIVATE bool PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, Window* pFrameWin = NULL ); + EDITENG_DLLPRIVATE bool PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, vcl::Window* pFrameWin = NULL ); EDITENG_DLLPRIVATE void CursorMoved(ContentNode* pPrevNode); EDITENG_DLLPRIVATE void CheckIdleFormatter(); diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 62c37d942cca..176de82f65e5 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -33,7 +33,7 @@ class ImpEditEngine; class ImpEditView; class SvxSearchItem; class SvxFieldItem; -class Window; +namespace vcl { class Window; } class Pointer; class KeyEvent; class MouseEvent; @@ -85,14 +85,14 @@ private: EDITENG_DLLPRIVATE EditView& operator=( const EditView& ); public: - EditView( EditEngine* pEng, Window* pWindow ); + EditView( EditEngine* pEng, vcl::Window* pWindow ); virtual ~EditView(); void SetEditEngine( EditEngine* pEditEngine ); EditEngine* GetEditEngine() const; - void SetWindow( Window* pWin ); - Window* GetWindow() const; + void SetWindow( vcl::Window* pWin ); + vcl::Window* GetWindow() const; void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 ); void Invalidate(); @@ -136,7 +136,7 @@ public: void InsertText( const OUString& rNew, bool bSelect = false ); - bool PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL ); + bool PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin = NULL ); bool MouseButtonUp( const MouseEvent& rMouseEvent ); bool MouseButtonDown( const MouseEvent& rMouseEvent ); @@ -187,7 +187,7 @@ public: void SetAnchorMode( EVAnchorMode eMode ); EVAnchorMode GetAnchorMode() const; - void CompleteAutoCorrect( Window* pFrameWin = NULL ); + void CompleteAutoCorrect( vcl::Window* pFrameWin = NULL ); EESpellState StartSpeller( bool bMultipleDoc = false ); EESpellState StartThesaurus(); diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx index 6a2567909330..a767061454cb 100644 --- a/include/editeng/edtdlg.hxx +++ b/include/editeng/edtdlg.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace linguistic2 class XHyphenator; } } } } -class Window; +namespace vcl { class Window; } class ResId; class Link; class SvxSpellWrapper; @@ -42,7 +42,7 @@ class AbstractThesaurusDialog : public VclAbstractDialog public: virtual OUString GetWord() = 0; virtual sal_uInt16 GetLanguage() const = 0; - virtual Window* GetWindow() = 0; + virtual vcl::Window* GetWindow() = 0; }; class AbstractHyphenWordDialog : public VclAbstractDialog @@ -50,7 +50,7 @@ class AbstractHyphenWordDialog : public VclAbstractDialog public: virtual void SelLeft() = 0; virtual void SelRight() = 0; - virtual Window* GetWindow() = 0; + virtual vcl::Window* GetWindow() = 0; }; class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog @@ -87,14 +87,14 @@ class EDITENG_DLLPUBLIC EditAbstractDialogFactory : virtual public VclAbstractDi public: virtual ~EditAbstractDialogFactory(); // needed for export of vtable static EditAbstractDialogFactory* Create(); - virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, + virtual AbstractThesaurusDialog* CreateThesaurusDialog( vcl::Window*, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, const OUString &rWord, sal_Int16 nLanguage ) = 0; - virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( Window*, + virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( vcl::Window*, const OUString &rWord, LanguageType nLang, css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) = 0; - virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, + virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( vcl::Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0; }; diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx index 178e6be93cd8..08f8b4e21ebc 100644 --- a/include/editeng/hangulhanja.hxx +++ b/include/editeng/hangulhanja.hxx @@ -110,7 +110,7 @@ namespace editeng public: HangulHanjaConversion( - Window* _pUIParent, + vcl::Window* _pUIParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::lang::Locale& _rSourceLocale, const ::com::sun::star::lang::Locale& _rTargetLocale, diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 18ac8316d799..5a020c147830 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -49,7 +49,7 @@ class SvxBulletItem; class SvxFont; class SvxSearchItem; class SvxFieldItem; -class Window; +namespace vcl { class Window; } class KeyEvent; class MouseEvent; class Pointer; @@ -203,7 +203,7 @@ private: EDITENG_DLLPRIVATE sal_Int32 ImpCalcSelectedPages( bool bIncludeFirstSelected ); public: - OutlinerView( Outliner* pOut, Window* pWindow ); + OutlinerView( Outliner* pOut, vcl::Window* pWindow ); virtual ~OutlinerView(); EditView& GetEditView() const { return *pEditView; } @@ -211,7 +211,7 @@ public: void Scroll( long nHorzScroll, long nVertScroll ); void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 ); - bool PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin = NULL ); + bool PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin = NULL ); bool MouseButtonDown( const MouseEvent& ); bool MouseButtonUp( const MouseEvent& ); bool MouseMove( const MouseEvent& ); @@ -221,8 +221,8 @@ public: Outliner* GetOutliner() const { return pOwner; } - void SetWindow( Window* pWindow ); - Window* GetWindow() const; + void SetWindow( vcl::Window* pWindow ); + vcl::Window* GetWindow() const; void SetReadOnly( bool bReadOnly ); bool IsReadOnly() const; diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index 0039f440d101..2763be8ecaae 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenator; }}}} -class Window; +namespace vcl { class Window; } class SdrObject; // misc functions --------------------------------------------------------------- @@ -48,7 +48,7 @@ private: friend class SvxHyphenWordDialog; friend struct SvxHyphenWordDialog_Impl; - Window* pWin; + vcl::Window* pWin; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xLast; // result of last spelling/hyphenation attempt ::com::sun::star::uno::Reference< @@ -72,12 +72,12 @@ private: bool FindSpellError(); // Check for errors (over areas) public: - SvxSpellWrapper( Window* pWn, + SvxSpellWrapper( vcl::Window* pWn, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpellChecker, const bool bStart = false, const bool bIsAllRight = false, const bool bOther = false, const bool bRevAllow = true ); - SvxSpellWrapper( Window* pWn, + SvxSpellWrapper( vcl::Window* pWn, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphenator, const bool bStart = false, const bool bOther = false ); @@ -109,7 +109,7 @@ public: ::com::sun::star::linguistic2::XHyphenator > GetXHyphenator() { return xHyph; } inline bool IsAllRight() { return bAllRight; } - inline Window* GetWin() { return pWin; } + inline vcl::Window* GetWin() { return pWin; } inline void EnableAutoCorrect() { bAuto = true; } protected: diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index 9564de3b6ef3..aff3c036f4e3 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -40,7 +40,7 @@ class CharClass; class SfxPoolItem; class SvxAutoCorrect; class SfxObjectShell; -class Window; +namespace vcl { class Window; } struct CompareSvStringsISortDtor { @@ -291,7 +291,7 @@ public: // to the actual SwTxtNode/EditNode string because it inserts the character // in rDoc and expects that to side-effect rTxt sal_uLong DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt, - sal_Int32 nPos, sal_Unicode cInsChar, bool bInsert, Window* pFrameWin = NULL ); + sal_Int32 nPos, sal_Unicode cInsChar, bool bInsert, vcl::Window* pFrameWin = NULL ); // Return for the autotext expansion the previous word, // AutoCorrect - corresponding algorithm diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx index 8ed168f50c72..72d1567e7b9e 100644 --- a/include/editeng/unolingu.hxx +++ b/include/editeng/unolingu.hxx @@ -34,7 +34,7 @@ class LinguMgrExitLstnr; -class Window; +namespace vcl { class Window; } @@ -183,7 +183,7 @@ EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< // misc functions -EDITENG_DLLPUBLIC short SvxDicError( Window *pParent, sal_Int16 nError ); +EDITENG_DLLPUBLIC short SvxDicError( vcl::Window *pParent, sal_Int16 nError ); #endif diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 6aa3f4d4ed15..ed412c58ac64 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -50,7 +50,7 @@ class FORMULA_DLLPUBLIC FormulaModalDialog : public ModalDialog, public formul { friend class FormulaDlg_Impl; public: - FormulaModalDialog( Window* pParent + FormulaModalDialog( vcl::Window* pParent , bool _bSupportFunctionResult , bool _bSupportResult , bool _bSupportMatrix @@ -69,7 +69,7 @@ protected: ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( bool bForced = false ); - void SetFocusWin(Window *pWin,const OString& nUniqueId); + void SetFocusWin(vcl::Window *pWin,const OString& nUniqueId); void SetMeText(const OUString& _sText); void Update(); @@ -91,7 +91,7 @@ class FORMULA_DLLPUBLIC FormulaDlg: public: FormulaDlg( SfxBindings* pB , SfxChildWindow* pCW - , Window* pParent + , vcl::Window* pParent , bool _bSupportFunctionResult , bool _bSupportResult , bool _bSupportMatrix @@ -113,7 +113,7 @@ protected: ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( bool bForced = false ); - void SetFocusWin(Window *pWin,const OString& nUniqueId); + void SetFocusWin(vcl::Window *pWin,const OString& nUniqueId); void HighlightFunctionParas(const OUString& aFormula); void SetMeText(const OUString& _sText); diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index 5752cf078de8..097d73772bf5 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -34,7 +34,7 @@ class FORMULA_DLLPUBLIC RefEdit : public Edit private: Timer aTimer; IControlReferenceHandler* pAnyRefDlg; // parent dialog - Window* pLabelWidget; + vcl::Window* pLabelWidget; DECL_LINK( UpdateHdl, void* ); @@ -44,8 +44,8 @@ protected: virtual void LoseFocus() SAL_OVERRIDE; public: - RefEdit( Window* _pParent,IControlReferenceHandler* pParent, Window* pShrinkModeLabel, const ResId& rResId ); - RefEdit( Window* _pParent, Window* pShrinkModeLabel, WinBits nStyle = WB_BORDER ); + RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent, vcl::Window* pShrinkModeLabel, const ResId& rResId ); + RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits nStyle = WB_BORDER ); virtual ~RefEdit(); @@ -64,14 +64,14 @@ public: void StartUpdateData(); - void SetReferences( IControlReferenceHandler* pDlg, Window *pLabelWidget ); + void SetReferences( IControlReferenceHandler* pDlg, vcl::Window *pLabelWidget ); IControlReferenceHandler* GetRefDialog() { return pAnyRefDlg; } - Window* GetLabelWidgetForShrinkMode() + vcl::Window* GetLabelWidgetForShrinkMode() { return pLabelWidget; } @@ -95,7 +95,7 @@ protected: virtual void LoseFocus() SAL_OVERRIDE; public: - RefButton(Window* _pParent, WinBits nStyle = 0); + RefButton(vcl::Window* _pParent, WinBits nStyle = 0); void SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit ); void SetStartImage(); void SetEndImage(); diff --git a/include/postx.h b/include/postx.h index bb97adb09921..1b02f2b78c98 100644 --- a/include/postx.h +++ b/include/postx.h @@ -25,7 +25,6 @@ #endif /* X Types */ -#undef Window #undef Region #undef Icon #undef Time diff --git a/include/prex.h b/include/prex.h index 63d93906623a..97fc31352715 100644 --- a/include/prex.h +++ b/include/prex.h @@ -32,7 +32,6 @@ /* Types from <X11/X.h> that clash, but we do use. */ #define Region XLIB_Region #define Time XLIB_Time -#define Window XLIB_Window #if defined __cplusplus extern "C" { diff --git a/include/sfx2/QuerySaveDocument.hxx b/include/sfx2/QuerySaveDocument.hxx index 5c84050fcca4..09922feb60ba 100644 --- a/include/sfx2/QuerySaveDocument.hxx +++ b/include/sfx2/QuerySaveDocument.hxx @@ -22,7 +22,7 @@ #include <rtl/ustring.hxx> #include <sfx2/dllapi.h> -class Window; +namespace vcl { class Window; } /** Opens the general query save document dialog. @param _pParent @@ -31,7 +31,7 @@ class Window; The title of the document. */ SFX2_DLLPUBLIC short ExecuteQuerySaveDocument( - Window* _pParent, const OUString& _rTitle); + vcl::Window* _pParent, const OUString& _rTitle); #endif // INCLUDED_SFX2_QUERYSAVEDOCUMENT_HXX diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index ca2200067552..5c456af41ded 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -81,7 +81,7 @@ class SfxWorkWindow; class SfxFilterMatcher; class SfxModule; class SfxModule; -class Window; +namespace vcl { class Window; } struct SfxChildWinFactory; struct SfxMenuCtrlFactory; struct SfxStbCtrlFactory; @@ -176,7 +176,7 @@ public: */ sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const OUString& rFileName, bool bCopy=true, SfxItemSet* pArgs = 0 ); SfxTemplateDialog* GetTemplateDialog(); - Window* GetTopWindow() const; + vcl::Window* GetTopWindow() const; // members SfxFilterMatcher& GetFilterMatcher(); diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 6c4c1f49d99b..864cf09734c6 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -44,7 +44,7 @@ class FixedLine; //and SfxDockingWindow, where it is changed into a UniqueId and cleared //This reverses the clear of the HelpId -inline void reverseUniqueHelpIdHack(Window &rWindow) +inline void reverseUniqueHelpIdHack(vcl::Window &rWindow) { if (rWindow.GetHelpId().isEmpty()) rWindow.SetHelpId(rWindow.GetUniqueId()); @@ -68,7 +68,7 @@ private: SAL_DLLPRIVATE void init(); protected: - SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription); + SfxModalDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription); OUString& GetExtraData() { return aExtraData; } sal_uInt32 GetUniqId() const { return nUniqId; } @@ -100,7 +100,7 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog protected: SfxModelessDialog( SfxBindings*, SfxChildWindow*, - Window*, const OString& rID, const OUString& rUIXMLDescription ); + vcl::Window*, const OString& rID, const OUString& rUIXMLDescription ); virtual ~SfxModelessDialog(); virtual bool Close() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; @@ -132,11 +132,11 @@ class SFX2_DLLPUBLIC SfxFloatingWindow: public FloatingWindow protected: SfxFloatingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, WinBits nWinBits=WB_STDMODELESS); SfxFloatingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~SfxFloatingWindow(); @@ -178,11 +178,11 @@ typedef const sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog { public: - SfxSingleTabDialog(Window *pParent, const SfxItemSet& rOptionsSet, + SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet, const OString& rID = OString("SingleTabDialog"), const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui")); - SfxSingleTabDialog(Window *pParent, const SfxItemSet* pInSet = 0, + SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet* pInSet = 0, const OString& rID = OString("SingleTabDialog"), const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui")); diff --git a/include/sfx2/checkin.hxx b/include/sfx2/checkin.hxx index b5b87b0c9f31..c5d93f68846d 100644 --- a/include/sfx2/checkin.hxx +++ b/include/sfx2/checkin.hxx @@ -24,7 +24,7 @@ class SfxCheckinDialog : public ModalDialog DECL_DLLPRIVATE_LINK(OKHdl, void *); public: - SfxCheckinDialog( Window* pParent ); + SfxCheckinDialog( vcl::Window* pParent ); OUString GetComment( ); bool IsMajor( ); diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 966056e20682..74818e24ac85 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -71,13 +71,13 @@ struct SfxChildWinInfo }; // ChildWindow factory methods -typedef SfxChildWindow* (*SfxChildWinCtor)( ::Window *pParentWindow, +typedef SfxChildWindow* (*SfxChildWinCtor)( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); // ChildWindowsContexts factory methods -typedef SfxChildWindowContext* (*SfxChildWinContextCtor)( ::Window *pParentWindow, +typedef SfxChildWindowContext* (*SfxChildWinContextCtor)( vcl::Window *pParentWindow, SfxBindings *pBindings, SfxChildWinInfo *pInfo); struct SfxChildWinContextFactory @@ -122,7 +122,7 @@ struct SfxChildWindow_Impl; class SFX2_DLLPUBLIC SfxChildWindowContext { friend class SfxChildWindow; - ::Window* pWindow; + vcl::Window* pWindow; sal_uInt16 nContextId; protected: @@ -131,9 +131,9 @@ protected: public: virtual ~SfxChildWindowContext(); - void SetWindow( ::Window* pWin ) + void SetWindow( vcl::Window* pWin ) { pWindow=pWin; } - ::Window* GetWindow() const + vcl::Window* GetWindow() const { return pWindow; } sal_uInt16 GetContextId() const { return nContextId; } @@ -147,12 +147,12 @@ public: class SFX2_DLLPUBLIC SfxChildWindow { - ::Window* pParent; // parent window ( Topwindow ) + vcl::Window* pParent; // parent window ( Topwindow ) sal_uInt16 nType; // ChildWindow-Id protected: SfxChildAlignment eChildAlignment; // Current ::com::sun::star::drawing::Alignment - ::Window* pWindow; // actual contents + vcl::Window* pWindow; // actual contents SfxChildWindow_Impl* pImp; // Implementation data private: @@ -163,14 +163,14 @@ private: { return pContext; } protected: - SfxChildWindow(::Window *pParentWindow, sal_uInt16 nId); + SfxChildWindow(vcl::Window *pParentWindow, sal_uInt16 nId); public: virtual ~SfxChildWindow(); void Destroy(); - ::Window* GetWindow() const + vcl::Window* GetWindow() const { return pWindow; } - ::Window* GetParent() const + vcl::Window* GetParent() const { return pParent; } SfxChildAlignment GetAlignment() const { return eChildAlignment; } @@ -194,17 +194,17 @@ public: sal_uInt16 GetContextId() const { return pContext ? pContext->GetContextId(): 0; } - ::Window* GetContextWindow() const + vcl::Window* GetContextWindow() const { return pContext ? pContext->GetWindow(): 0; } - ::Window* GetContextWindow( SfxModule *pModule ) const; + vcl::Window* GetContextWindow( SfxModule *pModule ) const; virtual SfxChildWinInfo GetInfo() const; void SaveStatus(const SfxChildWinInfo& rInfo); static void RegisterChildWindow(SfxModule*, SfxChildWinFactory*); - static SfxChildWindow* CreateChildWindow( sal_uInt16, ::Window*, SfxBindings*, SfxChildWinInfo&); + static SfxChildWindow* CreateChildWindow( sal_uInt16, vcl::Window*, SfxBindings*, SfxChildWinInfo&); void SetHideNotDelete( bool bOn ); bool IsHideNotDelete() const; bool IsHideAtToggle() const; @@ -231,19 +231,19 @@ public: //! soon obsolete ! #define SFX_DECL_CHILDWINDOW_CONTEXT(Class) \ - static SfxChildWindowContext* CreateImpl(::Window *pParent, \ + static SfxChildWindowContext* CreateImpl(vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ static void RegisterChildWindowContext(SfxModule *pMod=0); \ //! The Macro of the future ... #define SFX_DECL_CHILDWINDOWCONTEXT(Class) \ - static SfxChildWindowContext* CreateImpl(::Window *pParent, \ + static SfxChildWindowContext* CreateImpl(vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ static void RegisterChildWindowContext(sal_uInt16, SfxModule *pMod=0); \ //! soon obsolete ! #define SFX_IMPL_CHILDWINDOW_CONTEXT(Class, MyID, ShellClass) \ - SfxChildWindowContext* Class::CreateImpl( ::Window *pParent, \ + SfxChildWindowContext* Class::CreateImpl( vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ { \ SfxChildWindowContext *pContext = new Class(pParent, \ @@ -264,7 +264,7 @@ public: // factory. As long as Id is set to 0 and patched in // SfxChildWindow::CreateContext #define SFX_IMPL_CHILDWINDOWCONTEXT(Class, MyID) \ - SfxChildWindowContext* Class::CreateImpl( ::Window *pParent, \ + SfxChildWindowContext* Class::CreateImpl( vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ { \ SfxChildWindowContext *pContext = new Class(pParent,0,pBindings,pInfo);\ @@ -279,7 +279,7 @@ public: #define SFX_DECL_CHILDWINDOW(Class) \ public : \ - static SfxChildWindow* CreateImpl(::Window *pParent, sal_uInt16 nId, \ + static SfxChildWindow* CreateImpl(vcl::Window *pParent, sal_uInt16 nId, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ static void RegisterChildWindow (bool bVisible=false, SfxModule *pMod=NULL, sal_uInt16 nFlags=0); \ virtual SfxChildWinInfo GetInfo() const SAL_OVERRIDE @@ -295,7 +295,7 @@ public: SFX_IMPL_POS_CHILDWINDOW_WITHID(Class, MyID, CHILDWIN_NOPOS) #define SFX_IMPL_POS_CHILDWINDOW(Class, MyID, Pos) \ - SfxChildWindow* Class::CreateImpl( ::Window *pParent, \ + SfxChildWindow* Class::CreateImpl( vcl::Window *pParent, \ sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ { \ SfxChildWindow *pWin = new Class(pParent, nId, pBindings, pInfo);\ diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index 52eda07573fe..447bf5cb54d3 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -221,10 +221,10 @@ private: hide a control, if an item is unknown. */ class SFX2_DLLPUBLIC DummyWindowWrapper: - public SingleControlWrapper< Window, void* > + public SingleControlWrapper< vcl::Window, void* > { public: - explicit DummyWindowWrapper( Window& rWindow ); + explicit DummyWindowWrapper( vcl::Window& rWindow ); virtual bool IsControlDontKnow() const SAL_OVERRIDE; virtual void SetControlDontKnow( bool ) SAL_OVERRIDE; diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx index 74a3af3cd4a8..1d2a2a994efe 100644 --- a/include/sfx2/dialoghelper.hxx +++ b/include/sfx2/dialoghelper.hxx @@ -16,7 +16,7 @@ class DateTime; class LocaleDataWrapper; -class Window; +namespace vcl { class Window; } class VclBuilderContainer; //when two tab pages both have the same basic layout with a preview on the @@ -26,17 +26,17 @@ class VclBuilderContainer; //there has to be a "maingrid" container which contains all the widgets //except for the preview widget -void SFX2_DLLPUBLIC setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage); +void SFX2_DLLPUBLIC setPreviewsToSamePlace(vcl::Window *pParent, VclBuilderContainer *pPage); -Size SFX2_DLLPUBLIC getParagraphPreviewOptimalSize(const Window *pReference); +Size SFX2_DLLPUBLIC getParagraphPreviewOptimalSize(const vcl::Window *pReference); -Size SFX2_DLLPUBLIC getDrawPreviewOptimalSize(const Window *pReference); +Size SFX2_DLLPUBLIC getDrawPreviewOptimalSize(const vcl::Window *pReference); -Size SFX2_DLLPUBLIC getDrawListBoxOptimalSize(const Window *pReference); +Size SFX2_DLLPUBLIC getDrawListBoxOptimalSize(const vcl::Window *pReference); -Size SFX2_DLLPUBLIC getPreviewStripSize(const Window *pReference); +Size SFX2_DLLPUBLIC getPreviewStripSize(const vcl::Window *pReference); -Size SFX2_DLLPUBLIC getPreviewOptionsSize(const Window *pReference); +Size SFX2_DLLPUBLIC getPreviewOptionsSize(const vcl::Window *pReference); OUString SFX2_DLLPUBLIC getWidestTime(const LocaleDataWrapper& rWrapper); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 111043d3e499..a70b5ee16f46 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -217,13 +217,13 @@ private: void ImplCheckPasswordState(); protected: - SfxDocumentPage( Window* pParent, const SfxItemSet& ); + SfxDocumentPage( vcl::Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); void EnableUseUserData(); }; @@ -240,13 +240,13 @@ private: SfxDocumentInfoItem* m_pInfoItem; protected: - SfxDocumentDescPage( Window* pParent, const SfxItemSet& ); + SfxDocumentDescPage( vcl::Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); }; // class SfxDocumentInfoDialog ------------------------------------------- @@ -259,7 +259,7 @@ protected: virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) SAL_OVERRIDE; public: - SfxDocumentInfoDialog( Window* pParent, const SfxItemSet& ); + SfxDocumentInfoDialog( vcl::Window* pParent, const SfxItemSet& ); void AddFontTabPage(); }; @@ -274,7 +274,7 @@ private: public: inline CustomPropertiesEdit( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : Edit( pParent, rResId ), m_pLine( pLine ) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -287,7 +287,7 @@ private: public: inline CustomPropertiesTypeBox( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : ListBox( pParent, rResId ), m_pLine( pLine ) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -302,7 +302,7 @@ public: ::boost::optional<sal_Int16> m_TZ; inline CustomPropertiesDateField( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : DateField( pParent, rResId ), m_pLine( pLine ) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -316,7 +316,7 @@ public: bool m_isUTC; inline CustomPropertiesTimeField( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : TimeField( pParent, rResId ), m_pLine( pLine ), m_isUTC(false) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -328,7 +328,7 @@ class CustomPropertiesDurationField : public Edit protected: virtual void RequestHelp(const HelpEvent& rEvt) SAL_OVERRIDE; public: - CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); + CustomPropertiesDurationField( vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); virtual ~CustomPropertiesDurationField(); void SetDuration( const com::sun::star::util::Duration& rDuration ); @@ -340,7 +340,7 @@ class CustomPropertiesEditButton : public PushButton CustomPropertyLine* m_pLine; public: - CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); + CustomPropertiesEditButton( vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); virtual ~CustomPropertiesEditButton(); DECL_LINK(ClickHdl, void *); @@ -353,7 +353,7 @@ private: public: inline CustomPropertiesRemoveButton( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : ImageButton( pParent, rResId ), m_pLine( pLine ) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -366,7 +366,7 @@ private: RadioButton m_aNoButton; public: - CustomPropertiesYesNoButton( Window* pParent, const ResId& rResId ); + CustomPropertiesYesNoButton( vcl::Window* pParent, const ResId& rResId ); virtual void Resize() SAL_OVERRIDE; @@ -394,14 +394,14 @@ struct CustomPropertyLine bool m_bIsRemoved; bool m_bTypeLostFocus; - CustomPropertyLine( Window* pParent ); + CustomPropertyLine( vcl::Window* pParent ); void SetRemoved(); }; // class CustomPropertiesWindow ------------------------------------------ -class CustomPropertiesWindow : public Window +class CustomPropertiesWindow : public vcl::Window { private: FixedText* m_pHeaderAccName; @@ -441,7 +441,7 @@ private: void ValidateLine( CustomPropertyLine* pLine, bool bIsFromTypeBox ); public: - CustomPropertiesWindow(Window* pParent, + CustomPropertiesWindow(vcl::Window* pParent, FixedText *pHeaderAccName, FixedText *pHeaderAccType, FixedText *pHeaderAccValue); @@ -479,7 +479,7 @@ private: DECL_LINK( RemovedHdl, void* ); public: - CustomPropertiesControl(Window* pParent); + CustomPropertiesControl(vcl::Window* pParent); virtual ~CustomPropertiesControl(); void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny, bool bInteractive ); @@ -505,21 +505,21 @@ private: using TabPage::DeactivatePage; protected: - SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& ); + SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); }; struct CmisValue : public VclBuilderContainer { Edit* m_aValueEdit; - CmisValue( Window* pParent, const OUString& aStr ); + CmisValue( vcl::Window* pParent, const OUString& aStr ); }; struct CmisDateTime : public VclBuilderContainer @@ -527,7 +527,7 @@ struct CmisDateTime : public VclBuilderContainer DateField* m_aDateField; TimeField* m_aTimeField; - CmisDateTime( Window* pParent, const ::com::sun::star::util::DateTime& aDateTime ); + CmisDateTime( vcl::Window* pParent, const ::com::sun::star::util::DateTime& aDateTime ); }; struct CmisYesNo : public VclBuilderContainer @@ -535,7 +535,7 @@ struct CmisYesNo : public VclBuilderContainer RadioButton* m_aYesButton; RadioButton* m_aNoButton; - CmisYesNo( Window* pParent, bool bValue); + CmisYesNo( vcl::Window* pParent, bool bValue); }; // struct CmisPropertyLine --------------------------------------------- @@ -556,7 +556,7 @@ struct CmisPropertyLine : public VclBuilderContainer std::vector< CmisYesNo* > m_aYesNos; sal_Int32 m_nNumValue; long getItemHeight() const; - CmisPropertyLine( Window* pParent ); + CmisPropertyLine( vcl::Window* pParent ); virtual ~CmisPropertyLine(); }; @@ -627,14 +627,14 @@ private: DECL_LINK(UpdateHdl, void *); protected: - SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& ); + SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); }; #endif // #ifndef _ INCLUDED_SFX2_DINFDLG_HXX diff --git a/include/sfx2/dinfedt.hxx b/include/sfx2/dinfedt.hxx index 84c59666d31f..f56409a49c6d 100644 --- a/include/sfx2/dinfedt.hxx +++ b/include/sfx2/dinfedt.hxx @@ -29,7 +29,7 @@ class InfoEdit_Impl : public Edit { public: - InfoEdit_Impl( Window* pParent, const ResId& rResId ) : + InfoEdit_Impl( vcl::Window* pParent, const ResId& rResId ) : Edit( pParent, rResId ) {} virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 2319e8c99e02..eac691e0ad05 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -152,12 +152,12 @@ public: SfxViewFrame* GetFrame() const; SfxModule* GetModule() const; // caller has to clean up the Manager on his own - static SfxPopupMenuManager* Popup( sal_uInt16 nConfigId,Window *pWin, const Point *pPos ); + static SfxPopupMenuManager* Popup( sal_uInt16 nConfigId, vcl::Window *pWin, const Point *pPos ); void ExecutePopup( const ResId &rId, - Window *pWin = 0, const Point *pPosPixel = 0 ); + vcl::Window *pWin = 0, const Point *pPosPixel = 0 ); static void ExecutePopup( sal_uInt16 nConfigId = 0, - Window *pWin = 0, const Point *pPosPixel = 0 ); + vcl::Window *pWin = 0, const Point *pPosPixel = 0 ); bool IsAppDispatcher() const; bool IsFlushed() const; diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index d90f9bef74c9..4e00ab2cc55e 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -73,11 +73,11 @@ protected: public: SfxDockingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, WinBits nWinBits=0); SfxDockingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const ResId& rResId); virtual ~SfxDockingWindow(); @@ -116,7 +116,7 @@ public: class SfxDockingWrapper : public SfxChildWindow { public: - SfxDockingWrapper( Window* pParent , + SfxDockingWrapper( vcl::Window* pParent , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index 96ebdcda01ae..99f77fb76f43 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.hxx @@ -35,7 +35,7 @@ #include <boost/utility.hpp> -class Window; +namespace vcl { class Window; } class SfxFilter; class SfxObjectFactory; class SfxMedium; @@ -60,17 +60,17 @@ public: class SfxFrameWindow { - Window* pWindow; + vcl::Window* pWindow; public: - SfxFrameWindow( Window *pWin ) + SfxFrameWindow( vcl::Window *pWin ) : pWindow( pWin ) {} virtual ~SfxFrameWindow() { delete pWindow; } - Window* GetWindow() const + vcl::Window* GetWindow() const { return pWindow; } - void SetWindow( Window *pWin ) + void SetWindow( vcl::Window *pWin ) { pWindow = pWin; } }; diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 000f502a664a..10a2a12b158c 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -55,7 +55,7 @@ namespace com } class SfxItemSet; -class Window; +namespace vcl { class Window; } // the SFXWB constants are for the nFlags parameter of the constructor #define SFXWB_INSERT 0x04000000L // turn Open into Insert dialog @@ -103,7 +103,7 @@ private: public: FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, - Window* _pPreferredParent = NULL ); + vcl::Window* _pPreferredParent = NULL ); FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, @@ -126,7 +126,7 @@ public: const OUString& aExtName, const OUString& rStandardDir, const ::com::sun::star::uno::Sequence< OUString >& rBlackList, - Window* _pPreferredParent = NULL ); + vcl::Window* _pPreferredParent = NULL ); virtual ~FileDialogHelper(); diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 7a64d9b2f52d..954846855339 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -63,7 +63,7 @@ namespace com class SvBorder; class SfxWorkWindow; -class Window; +namespace vcl { class Window; } class SfxFrame; class SfxFrame_Impl; class SfxObjectShell; @@ -105,7 +105,7 @@ private: SfxFrame* pParentFrame; SfxFrameArr_Impl* pChildArr; SfxFrame_Impl* pImp; - Window* pWindow; + vcl::Window* pWindow; protected: bool Close(); @@ -114,7 +114,7 @@ protected: SAL_DLLPRIVATE void RemoveChildFrame_Impl( SfxFrame* ); SfxFrame( ); // not implemented - SAL_DLLPRIVATE SfxFrame( Window& i_rContainerWindow, bool bHidden ); + SAL_DLLPRIVATE SfxFrame( vcl::Window& i_rContainerWindow, bool bHidden ); public: TYPEINFO(); @@ -122,9 +122,9 @@ public: static SfxFrame* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > CreateBlankFrame(); - static SfxFrame* Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden ); + static SfxFrame* Create( SfxObjectShell& rDoc, vcl::Window& rWindow, sal_uInt16 nViewId, bool bHidden ); - Window& GetWindow() const { return *pWindow;} + vcl::Window& GetWindow() const { return *pWindow;} void CancelTransfers( bool bCancelLoadEnv = true ); bool DoClose(); sal_uInt16 GetChildFrameCount() const; diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 383ebc868b59..386e4150dfca 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -25,7 +25,7 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow SfxBindings* m_pBindings; public: - SfxInfoBarContainerChild( Window* pParent, + SfxInfoBarContainerChild( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); @@ -38,7 +38,7 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow /** Class representing a single InfoBar to be added in a SfxInfoBarContainerWindow. */ -class SfxInfoBarWindow : public Window +class SfxInfoBarWindow : public vcl::Window { private: OUString m_sId; @@ -47,7 +47,7 @@ class SfxInfoBarWindow : public Window std::vector< PushButton* > m_aActionBtns; public: - SfxInfoBarWindow( Window* parent, const OUString& sId, + SfxInfoBarWindow( vcl::Window* parent, const OUString& sId, const OUString& sMessage, std::vector< PushButton* > aButtons ); virtual ~SfxInfoBarWindow( ); @@ -60,7 +60,7 @@ class SfxInfoBarWindow : public Window DECL_LINK( CloseHandler, void* ); }; -class SfxInfoBarContainerWindow : public Window +class SfxInfoBarContainerWindow : public vcl::Window { private: SfxInfoBarContainerChild* m_pChildWin; diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 0a8b5f8a72b0..10ab174bbdbd 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -33,7 +33,7 @@ class SfxInPlaceClient_Impl; class SfxViewShell; class SfxObjectShell; -class Window; +namespace vcl { class Window; } class Fraction; @@ -44,7 +44,7 @@ friend class SfxInPlaceClient_Impl; SfxInPlaceClient_Impl* m_pImp; SfxViewShell* m_pViewSh; - Window* m_pEditWin; + vcl::Window* m_pEditWin; // called after the requested new object area was negotiated SAL_DLLPRIVATE virtual void ObjectAreaChanged(); @@ -59,11 +59,11 @@ friend class SfxInPlaceClient_Impl; SAL_DLLPRIVATE virtual void MakeVisible(); public: - SfxInPlaceClient( SfxViewShell* pViewShell, Window* pDraw, sal_Int64 nAspect = com::sun::star::embed::Aspects::MSOLE_CONTENT ); + SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window* pDraw, sal_Int64 nAspect = com::sun::star::embed::Aspects::MSOLE_CONTENT ); virtual ~SfxInPlaceClient(); SfxViewShell* GetViewShell() const { return m_pViewSh; } - Window* GetEditWin() const { return m_pEditWin; } + vcl::Window* GetEditWin() const { return m_pEditWin; } com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject() const; void SetObject( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rObject ); void SetObjectState( sal_Int32 ); diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index f7e36c7f538b..a0f2eb6d78df 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -286,7 +286,7 @@ class SFX2_DLLPUBLIC DummyItemConnection: public ItemConnectionBase, public DummyWindowWrapper { public: - explicit DummyItemConnection( sal_uInt16 nSlot, Window& rWindow, + explicit DummyItemConnection( sal_uInt16 nSlot, vcl::Window& rWindow, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); protected: diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx index 2bc866cf5e97..9dc778fe8f76 100644 --- a/include/sfx2/linkmgr.hxx +++ b/include/sfx2/linkmgr.hxx @@ -129,7 +129,7 @@ public: void UpdateAllLinks( bool bAskUpdate = true, bool bCallErrHdl = true, bool bUpdateGrfLinks = false, - Window* pParentWin = 0 ); + vcl::Window* pParentWin = 0 ); // Call for list of links (eg for link-dialog) const SvBaseLinks& GetLinks() const { return aLinkTbl; } diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx index 19ad30e8a81c..c39e5310ef67 100644 --- a/include/sfx2/linksrc.hxx +++ b/include/sfx2/linksrc.hxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; }}}} -class Window; +namespace vcl { class Window; } namespace rtl { class OUString; } @@ -85,7 +85,7 @@ public: virtual bool IsDataComplete() const; // Link impl: DECL_LINK( MyEndEditHdl, sfx2::FileDialogHelper* ); <= param is the dialog - virtual void Edit( Window *, SvBaseLink *, const Link& rEndEditHdl ); + virtual void Edit( vcl::Window *, SvBaseLink *, const Link& rEndEditHdl ); void AddDataAdvise( SvBaseLink *, const rtl::OUString & rMimeType, diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index d57b10533e4e..a68bf499f638 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -144,7 +144,7 @@ public: void Disconnect(); // Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this - virtual void Edit( Window*, const Link& rEndEditHdl ); + virtual void Edit( vcl::Window*, const Link& rEndEditHdl ); // should the link appear in the dialog? (to the left in the link in the...) bool IsVisible() const { return bVisible; } diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index dbf6538cee72..06deead04eae 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -73,10 +73,10 @@ friend class SfxStyleDialog; void UpdateName_Impl(ListBox *, const OUString &rNew); void SetDescriptionText_Impl(); - SfxManageStyleSheetPage(Window *pParent, const SfxItemSet &rAttrSet ); + SfxManageStyleSheetPage(vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SfxManageStyleSheetPage(); - static SfxTabPage* Create(Window *pParent, const SfxItemSet *rAttrSet ); + static SfxTabPage* Create(vcl::Window *pParent, const SfxItemSet *rAttrSet ); protected: virtual bool FillItemSet(SfxItemSet *) SAL_OVERRIDE; diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index 66c9d6f7dfa7..93106583d6ea 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -93,13 +93,13 @@ private: public: SfxPopupMenuManager( PopupMenu*, SfxBindings& ); ~SfxPopupMenuManager(); - static void ExecutePopup( const ResId&, SfxViewFrame* pViewFrame, const Point& rPoint, Window* pWindow ); + static void ExecutePopup( const ResId&, SfxViewFrame* pViewFrame, const Point& rPoint, vcl::Window* pWindow ); // @deprecated!! // Don't use this method any longer. The whole class will be removed in the future. // Changing code which relies on Popup would need much more effort. - static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow ); + static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, vcl::Window* pWindow ); - sal_uInt16 Execute( const Point& rPos, Window *pWindow ); + sal_uInt16 Execute( const Point& rPos, vcl::Window *pWindow ); void RemoveDisabledEntries(); Menu* GetSVMenu(); diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index cf9130f97b8a..77ba76675543 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -46,7 +46,7 @@ struct SfxMenuCtrlFactory; struct SfxStbCtrlFactory; struct SfxTbxCtrlFactory; class SfxTabPage; -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace frame { class XFrame; @@ -86,7 +86,7 @@ public: void RegisterMenuControl(SfxMenuCtrlFactory*); virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rSet ); virtual void Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE; diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx index 9d40799f40e1..37f7a144dce9 100644 --- a/include/sfx2/navigat.hxx +++ b/include/sfx2/navigat.hxx @@ -27,7 +27,7 @@ class SfxNavigatorWrapper : public SfxChildWindow { public: - SfxNavigatorWrapper( Window* pParent , + SfxNavigatorWrapper( vcl::Window* pParent , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); @@ -42,7 +42,7 @@ class SFX2_DLLPUBLIC SfxNavigator : public SfxDockingWindow public: SfxNavigator( SfxBindings* pBindings , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits ); virtual void Resize() SAL_OVERRIDE; diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index c817282bed5e..aa53d4ce4ae7 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -56,7 +56,7 @@ private: public: - SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags = 0); + SfxNewFileDialog(vcl::Window *pParent, sal_uInt16 nFlags = 0); virtual ~SfxNewFileDialog(); // Returns false, when '- No -' is set as Template diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index e6494905b3fe..f0f47e26bb15 100644 --- a/include/sfx2/newstyle.hxx +++ b/include/sfx2/newstyle.hxx @@ -43,7 +43,7 @@ private: DECL_DLLPRIVATE_LINK( ModifyHdl, ComboBox * ); public: - SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& ); + SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& ); virtual ~SfxNewStyleDlg(); OUString GetName() const { return comphelper::string::stripStart(m_pColBox->GetText(), ' '); } diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 9b8a01c4a217..d9d4e956e5cd 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -344,7 +344,7 @@ public: void SignScriptingContent(); virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( - Window *pParent, const SfxItemSet& ); + vcl::Window *pParent, const SfxItemSet& ); ErrCode CallBasic( const OUString& rMacro, const OUString& rBasicName, SbxArray* pArgs = 0, SbxValue* pRet = 0 ); @@ -407,7 +407,7 @@ public: virtual bool PrepareClose(bool bUI = true); virtual bool IsInformationLost(); virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ); - sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, Window* pParent ); + sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent ); virtual bool HasSecurityOptOpenReadOnly() const; bool IsSecurityOptOpenReadOnly() const; void SetSecurityOptOpenReadOnly( bool bOpenReadOnly = true ); @@ -510,7 +510,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames(); - Window* GetDialogParent( SfxMedium* pMedium=0 ); + vcl::Window* GetDialogParent( SfxMedium* pMedium=0 ); static SfxObjectShell* CreateObject( const OUString& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static SfxObjectShell* CreateObjectByFactoryName( const OUString& rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index ed96e330cc18..363e9b9e1c71 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -74,7 +74,7 @@ private: void SetPasswdText(); public: - SfxPasswordDialog(Window* pParent, const OUString* pGroupText = NULL); + SfxPasswordDialog(vcl::Window* pParent, const OUString* pGroupText = NULL); OUString GetUser() const { diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 5d84648453fd..4857ce4b1235 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -93,15 +93,15 @@ protected: public: - SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + SfxCommonPrintOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SfxCommonPrintOptionsTabPage(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual Window* GetParentLabeledBy( const Window* pLabel ) const SAL_OVERRIDE; - virtual Window* GetParentLabelFor( const Window* pLabel ) const SAL_OVERRIDE; + virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabel ) const SAL_OVERRIDE; + virtual vcl::Window* GetParentLabelFor( const vcl::Window* pLabel ) const SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); }; #endif // INCLUDED_SFX2_PRINTOPT_HXX diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index eead7a37b489..1468ee81fe82 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -41,7 +41,7 @@ private: SfxTabPage* pPage; public: - SfxPrintOptionsDialog( Window *pParent, + SfxPrintOptionsDialog( vcl::Window *pParent, SfxViewShell *pViewShell, const SfxItemSet *rOptions ); virtual ~SfxPrintOptionsDialog(); diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index c7280672bb42..68176cf8a7eb 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -41,7 +41,7 @@ enum ApplicationType class SFX2_DLLPUBLIC RecentDocsView : public ThumbnailView { public: - RecentDocsView( Window* pParent ); + RecentDocsView( vcl::Window* pParent ); virtual ~RecentDocsView(); void insertItem(const OUString &rURL, const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId); diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index dca4430aa094..eecaf318ab0a 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -33,14 +33,14 @@ class SfxSecurityPage : public SfxTabPage std::auto_ptr< SfxSecurityPage_Impl > m_pImpl; protected: - SfxSecurityPage( Window* pParent, const SfxItemSet& ); + SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& ); virtual ~SfxSecurityPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); }; diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index fcfd9bb8140e..d5b8352dd062 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -37,7 +37,7 @@ class SfxViewFrame; class SfxBindings; class SfxItemSet; class ResId; -class Window; +namespace vcl { class Window; } namespace rtl { class OUString; }; @@ -118,43 +118,43 @@ class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialog public: virtual ~SfxAbstractDialogFactory(); // needed for export of vtable static SfxAbstractDialogFactory* Create(); - virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0; - virtual VclAbstractDialog* CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0; + virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0; + virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, SfxViewFrame* pViewFrame, bool bEditFmt=false, const rtl::OUString *pUserButtonText=0 ) = 0; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, bool bEditFmt=false, const rtl::OUString *pUserButtonText=0 ) = 0; virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0; - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const OUString& rCommand, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 )=0; - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommand, + virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0; - virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent )=0; - virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=0 )=0; - virtual VclAbstractDialog * CreateSvxScriptOrgDialog( Window* pParent, const rtl::OUString& rLanguage ) = 0; + virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent )=0; + virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=0 )=0; + virtual VclAbstractDialog * CreateSvxScriptOrgDialog( vcl::Window* pParent, const rtl::OUString& rLanguage ) = 0; virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( - Window* pParent, + vcl::Window* pParent, bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) = 0; virtual VclAbstractDialog* CreateScriptErrorDialog( - Window* pParent, com::sun::star::uno::Any aException ) = 0; + vcl::Window* pParent, com::sun::star::uno::Any aException ) = 0; virtual VclAbstractDialog* CreateOptionsDialog( - Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) = 0; + vcl::Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) = 0; }; #endif diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx index d3ab2cec93bb..84250598312d 100644 --- a/include/sfx2/sfxhelp.hxx +++ b/include/sfx2/sfxhelp.hxx @@ -35,9 +35,9 @@ class SFX2_DLLPUBLIC SfxHelp : public Help SfxHelp_Impl* pImp; private: - SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const Window* pWindow, const OUString& rKeyword ); + SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const vcl::Window* pWindow, const OUString& rKeyword ); SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const Window* pWindow ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const vcl::Window* pWindow ) SAL_OVERRIDE; SAL_DLLPRIVATE OUString GetHelpModuleName_Impl(); SAL_DLLPRIVATE OUString CreateHelpURL_Impl( const OUString& aCommandURL, const OUString& rModuleName ); @@ -48,7 +48,7 @@ public: inline void SetTicket( const OUString& rTicket ) { aTicket = rTicket; } inline void SetUser( const OUString& rUser ) { aUser = rUser; } - virtual OUString GetHelpText( const OUString&, const Window* pWindow ) SAL_OVERRIDE; + virtual OUString GetHelpText( const OUString&, const vcl::Window* pWindow ) SAL_OVERRIDE; static OUString CreateHelpURL( const OUString& aCommandURL, const OUString& rModuleName ); static OUString GetDefaultHelpModule(); diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index d0a13ddfba55..c574b6f45c8c 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -29,7 +29,7 @@ #include <tools/rtti.hxx> class ResMgr; -class Window; +namespace vcl { class Window; } class ToolBox; class SfxItemPool; class SfxPoolItem; diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx index aebb0b348eb4..a078e00c20c2 100644 --- a/include/sfx2/sidebar/ControlFactory.hxx +++ b/include/sfx2/sidebar/ControlFactory.hxx @@ -39,9 +39,9 @@ class SFX2_DLLPUBLIC ControlFactory public: /** Create the menu button for the task bar. */ - static CheckBox* CreateMenuButton (Window* pParentWindow); + static CheckBox* CreateMenuButton (vcl::Window* pParentWindow); - static ImageRadioButton* CreateTabItem (Window* pParentWindow); + static ImageRadioButton* CreateTabItem (vcl::Window* pParentWindow); }; diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx index a6c65e1a1293..5f482786e7a8 100644 --- a/include/sfx2/sidebar/ILayoutableWindow.hxx +++ b/include/sfx2/sidebar/ILayoutableWindow.hxx @@ -24,7 +24,7 @@ #include <sal/types.h> #include <com/sun/star/ui/LayoutSize.hpp> -class Window; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/SidebarChildWindow.hxx b/include/sfx2/sidebar/SidebarChildWindow.hxx index defc03c75fcf..50caeb6114c0 100644 --- a/include/sfx2/sidebar/SidebarChildWindow.hxx +++ b/include/sfx2/sidebar/SidebarChildWindow.hxx @@ -35,14 +35,14 @@ class SFX2_DLLPUBLIC SidebarChildWindow { public: SidebarChildWindow( - Window* pParent, + vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); SFX_DECL_CHILDWINDOW_WITHID(SidebarChildWindow); - static sal_Int32 GetDefaultWidth (Window* pWindow); + static sal_Int32 GetDefaultWidth (vcl::Window* pWindow); }; diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index 537c085280f4..6215f6d03e64 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -35,7 +35,7 @@ #include <boost/function.hpp> -class Window; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { @@ -61,7 +61,7 @@ public: static css::uno::Reference<css::ui::XUIElement> Create ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pControl, + vcl::Window* pControl, const css::ui::LayoutSize& rLayoutSize); // XContextChangeEventListener @@ -103,7 +103,7 @@ protected: SidebarPanelBase ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pWindow, + vcl::Window* pWindow, const css::ui::LayoutSize& rLayoutSize); virtual ~SidebarPanelBase (void); @@ -111,7 +111,7 @@ protected: throw (css::uno::RuntimeException) SAL_OVERRIDE; private: - Window* mpControl; + vcl::Window* mpControl; const ::rtl::OUString msResourceURL; const css::ui::LayoutSize maLayoutSize; }; diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 8bcc6be00f82..0a6f37fa8463 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -39,7 +39,7 @@ class SFX2_DLLPUBLIC SidebarToolBox : public ToolBox { public: - SidebarToolBox(Window* pParentWindow); + SidebarToolBox(vcl::Window* pParentWindow); virtual ~SidebarToolBox (void); using ToolBox::InsertItem; diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx index 41a90204a538..e428d9abe58b 100644 --- a/include/sfx2/styledlg.hxx +++ b/include/sfx2/styledlg.hxx @@ -37,7 +37,7 @@ protected: virtual const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; public: - SfxStyleDialog(Window* pParent, const OString& rID, + SfxStyleDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, SfxStyleSheetBase&); virtual ~SfxStyleDialog(); diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index d916df3bb2d1..5e88ed9471cd 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -37,7 +37,7 @@ class SfxViewFrame; class SfxTabPage; class SfxBindings; -typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet *rAttrSet); +typedef SfxTabPage* (*CreateTabPage)(vcl::Window *pParent, const SfxItemSet *rAttrSet); typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value struct TabPageImpl; @@ -124,10 +124,10 @@ protected: void SavePosAndId(); public: - SfxTabDialog(Window* pParent, + SfxTabDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet * = 0, bool bEditFmt = false); - SfxTabDialog(SfxViewFrame *pViewFrame, Window* pParent, + SfxTabDialog(SfxViewFrame *pViewFrame, vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet * = 0, bool bEditFmt = false); virtual ~SfxTabDialog(); @@ -237,7 +237,7 @@ private: SAL_DLLPRIVATE void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; } protected: - SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet); + SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet); sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index f7b6ef0d455f..da1f70140728 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -60,7 +60,7 @@ namespace sfx2 { public: TaskPaneWrapper( - Window* i_pParent, + vcl::Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo @@ -102,7 +102,7 @@ namespace sfx2 /** SFX-less version of a module dependent task pane, filled with tool panels as specified in the respective module's configuration */ - class SFX2_DLLPUBLIC ModuleTaskPane : public Window + class SFX2_DLLPUBLIC ModuleTaskPane : public vcl::Window { public: /** creates a new instance @@ -114,7 +114,7 @@ namespace sfx2 responsible for, thus controlling which tool panels are actually available. */ ModuleTaskPane( - Window& i_rParentWindow, + vcl::Window& i_rParentWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame ); virtual ~ModuleTaskPane(); @@ -186,7 +186,7 @@ namespace sfx2 { public: TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, - Window* i_pParent, WinBits i_nBits ); + vcl::Window* i_pParent, WinBits i_nBits ); // ITaskPaneToolPanelAccess virtual void ActivateToolPanel( const OUString& i_rPanelURL ) SAL_OVERRIDE; diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 27bcb9e31171..a1c99d1672bc 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -142,13 +142,13 @@ public: const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); - SfxPopupWindow(sal_uInt16 nId, Window *pParent, + SfxPopupWindow(sal_uInt16 nId, vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow, + vcl::Window* pParentWindow, WinBits nBits ); virtual ~SfxPopupWindow(); @@ -202,7 +202,7 @@ protected: virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); virtual SfxPopupWindow* CreatePopupWindowCascading(); - virtual Window* CreateItemWindow( Window *pParent ); + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ); // Must be called by subclass to set a new popup window instance void SetPopupWindow( SfxPopupWindow* pWindow ); @@ -294,7 +294,7 @@ class SfxDragButton_Impl : public FixedImage { public: - SfxDragButton_Impl( Window *pParent ); + SfxDragButton_Impl( vcl::Window *pParent ); virtual void Command ( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -305,7 +305,7 @@ class SfxDragToolBoxControl_Impl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox ); - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE; }; diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index 00ecf03c4cf3..b2a500bae4c9 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -80,8 +80,8 @@ class SFX2_DLLPUBLIC TemplateAbstractView : public ThumbnailView { public: - TemplateAbstractView(Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren); - TemplateAbstractView(Window* pParent); + TemplateAbstractView(vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren); + TemplateAbstractView(vcl::Window* pParent); virtual ~TemplateAbstractView (); diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index de9dead245c0..984b06a2d16d 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -48,7 +48,7 @@ class SFX2_DLLPUBLIC SfxTemplateManagerDlg : public ModelessDialog public: - SfxTemplateManagerDlg (Window *parent = DIALOG_NO_PARENT); + SfxTemplateManagerDlg (vcl::Window *parent = DIALOG_NO_PARENT); virtual ~SfxTemplateManagerDlg (); diff --git a/include/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx index a38f9817e0ce..9f5d9dfd2965 100644 --- a/include/sfx2/templateinfodlg.hxx +++ b/include/sfx2/templateinfodlg.hxx @@ -25,7 +25,7 @@ class SfxTemplateInfoDlg : public ModalDialog { public: - SfxTemplateInfoDlg (Window *pParent = NULL); + SfxTemplateInfoDlg (vcl::Window *pParent = NULL); virtual ~SfxTemplateInfoDlg (); @@ -40,7 +40,7 @@ private: PushButton* mpBtnClose; VclBox* mpBox; - Window *mpPreviewView; // gets released when xWindows get destroyed (dont delete in constructor) + vcl::Window *mpPreviewView; // gets released when xWindows get destroyed (dont delete in constructor) svtools::ODocumentInfoPreview *mpInfoView; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > m_xFrame; diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index a6f4e336b62d..6d2e1d044dcf 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -29,7 +29,7 @@ class SFX2_DLLPUBLIC TemplateLocalView : public TemplateAbstractView public: - TemplateLocalView ( Window* pParent ); + TemplateLocalView ( vcl::Window* pParent ); virtual ~TemplateLocalView (); diff --git a/include/sfx2/templateremoteview.hxx b/include/sfx2/templateremoteview.hxx index 0b6e9d897e77..6c64e9a6dcaf 100644 --- a/include/sfx2/templateremoteview.hxx +++ b/include/sfx2/templateremoteview.hxx @@ -21,7 +21,7 @@ class TemplateRemoteView : public TemplateAbstractView { public: - TemplateRemoteView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren); + TemplateRemoteView (vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren); virtual ~TemplateRemoteView (); diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index a15d4e7095af..4bd6ac4292d6 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -45,7 +45,7 @@ friend class SfxTemplateDialog_Impl; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; public: - SfxTemplateDialog( SfxBindings*, SfxChildWindow*, Window* ); + SfxTemplateDialog( SfxBindings*, SfxChildWindow*, vcl::Window* ); virtual ~SfxTemplateDialog(); virtual void Update(); @@ -62,7 +62,7 @@ class SFX2_DLLPUBLIC SfxTemplateDialogWrapper : public SfxChildWindow { public: SfxTemplateDialogWrapper - (Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*); + (vcl::Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*); SFX_DECL_CHILDWINDOW_WITHID(SfxTemplateDialogWrapper); }; @@ -71,7 +71,7 @@ public: class SFX2_DLLPUBLIC SfxTemplatePanelControl : public DockingWindow { public: - SfxTemplatePanelControl (SfxBindings* pBindings, Window* pParentWindow); + SfxTemplatePanelControl (SfxBindings* pBindings, vcl::Window* pParentWindow); virtual ~SfxTemplatePanelControl(); virtual void Update(); diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 31faaf7c40b0..298ea3df3157 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -180,7 +180,7 @@ class SFX2_DLLPUBLIC ThumbnailView : public Control { public: - ThumbnailView(Window* pParent, WinBits nWinStyle = WB_TABSTOP, bool bDisableTransientChildren = false); + ThumbnailView(vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP, bool bDisableTransientChildren = false); virtual ~ThumbnailView(); diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index e1295f948efd..f2fa42dca7f3 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -36,7 +36,7 @@ const int THUMBNAILVIEW_ITEM_CORNER = 5; class CheckBox; namespace vcl { class Font; } -class Window; +namespace vcl { class Window; } class ThumbnailView; namespace basegfx { diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index 0b1f4dc5ec77..6e45253c9c02 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -39,11 +39,11 @@ namespace sfx2 public: TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, - Window* i_pParent, WinBits i_nStyle = 0 + vcl::Window* i_pParent, WinBits i_nStyle = 0 ); TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, - Window* i_pParent, const ResId& i_rResId + vcl::Window* i_pParent, const ResId& i_rResId ); virtual ~TitledDockingWindow(); @@ -81,8 +81,8 @@ namespace sfx2 /** returns the content window, which is to be used as parent window for any content to be displayed in the docking window. */ - ::Window& GetContentWindow() { return m_aContentWindow; } - const ::Window& GetContentWindow() const { return m_aContentWindow; } + vcl::Window& GetContentWindow() { return m_aContentWindow; } + const vcl::Window& GetContentWindow() const { return m_aContentWindow; } ToolBox& GetToolBox() { return m_aToolbox; } const ToolBox& GetToolBox() const { return m_aToolbox; } diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx index 687be03d1b1a..541b18fecb32 100644 --- a/include/sfx2/viewfac.hxx +++ b/include/sfx2/viewfac.hxx @@ -26,7 +26,7 @@ class SfxViewFrame; class SfxViewShell; -class Window; +namespace vcl { class Window; } typedef SfxViewShell* (*SfxViewCtor)(SfxViewFrame*, SfxViewShell*); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 919ed9da96a3..1d043fcd2ded 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -117,7 +117,7 @@ public: SfxDispatcher* GetDispatcher() { return pDispatcher; } SfxBindings& GetBindings() { return *pBindings; } const SfxBindings& GetBindings() const { return *pBindings; } - Window& GetWindow() const; + vcl::Window& GetWindow() const; virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); SfxProgress* GetProgress() const; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index b32c78930768..20114cfac991 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -40,7 +40,7 @@ class SfxBaseController; class Size; class Fraction; -class Window; +namespace vcl { class Window; } class KeyEvent; class WorkWindow; class SvBorder; @@ -137,7 +137,7 @@ friend class SfxPrinterController; SfxInPlaceClientList* pIPClientList; SfxViewFrame* pFrame; SfxShell* pSubShell; - Window* pWindow; + vcl::Window* pWindow; bool bNoNewWindow; protected: @@ -176,7 +176,7 @@ public: SfxInPlaceClient* GetIPClient() const; SfxInPlaceClient* GetUIActiveClient() const; - SfxInPlaceClient* FindIPClient( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, Window *pObjParentWin ) const; + SfxInPlaceClient* FindIPClient( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, vcl::Window *pObjParentWin ) const; virtual ErrCode DoVerb(long nVerb); @@ -218,8 +218,8 @@ public: bool Escape(); // Viewing Interface - Window* GetWindow() const { return pWindow; } - void SetWindow( Window *pViewPort ); + vcl::Window* GetWindow() const { return pWindow; } + void SetWindow( vcl::Window *pViewPort ); virtual void AdjustPosSizePixel( const Point &rOfs, const Size &rSize ); const SvBorder& GetBorderPixel() const; void SetBorderPixel( const SvBorder &rBorder ); @@ -230,7 +230,7 @@ public: virtual SfxPrinter* GetPrinter( bool bCreate = false ); virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); virtual bool HasPrintOptionsPage() const; - virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); + virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ); virtual JobSetup GetJobSetup() const; Printer* GetActivePrinter() const; diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx index 8f21baac5177..ee671b7a0f8a 100644 --- a/include/svtools/DocumentInfoPreview.hxx +++ b/include/svtools/DocumentInfoPreview.hxx @@ -39,9 +39,9 @@ namespace com { namespace sun { namespace star { namespace svtools { -class SVT_DLLPUBLIC ODocumentInfoPreview: public Window { +class SVT_DLLPUBLIC ODocumentInfoPreview: public vcl::Window { public: - ODocumentInfoPreview(Window * pParent, WinBits nBits); + ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits); virtual ~ODocumentInfoPreview(); diff --git a/include/svtools/GraphicExportOptionsDialog.hxx b/include/svtools/GraphicExportOptionsDialog.hxx index 803467a082c6..1982aa1bc679 100644 --- a/include/svtools/GraphicExportOptionsDialog.hxx +++ b/include/svtools/GraphicExportOptionsDialog.hxx @@ -61,7 +61,7 @@ private: DECL_LINK( resolutionModifiedHandle, void* ); public: - GraphicExportOptionsDialog( Window* pWindow, const css::uno::Reference<css::lang::XComponent>& rxSourceDocument ); + GraphicExportOptionsDialog( vcl::Window* pWindow, const css::uno::Reference<css::lang::XComponent>& rxSourceDocument ); virtual ~GraphicExportOptionsDialog(); css::uno::Sequence<css::beans::PropertyValue> getFilterData(); diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 9d79ff9b558c..7990542d3c07 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -48,8 +48,8 @@ private : public : - PlaceEditDialog( Window* pParent); - PlaceEditDialog(Window* pParent, const boost::shared_ptr<Place> &pPlace ); + PlaceEditDialog( vcl::Window* pParent); + PlaceEditDialog(vcl::Window* pParent, const boost::shared_ptr<Place> &pPlace ); virtual ~PlaceEditDialog(); // Returns a place instance with given information diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index 23557fefdb28..23ffc5008c73 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -48,7 +48,7 @@ namespace com { namespace sun { namespace star { namespace awt { class Rectangle; class Ruler; -class Window; +namespace vcl { class Window; } typedef ::cppu::WeakAggComponentImplHelper5< diff --git a/include/svtools/accessibletable.hxx b/include/svtools/accessibletable.hxx index 29fb95f6f70a..1f88a354972d 100644 --- a/include/svtools/accessibletable.hxx +++ b/include/svtools/accessibletable.hxx @@ -86,11 +86,11 @@ public: AccessibleTableControlObjType eObjType ) const= 0; // Window - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0; + virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const = 0; virtual void GrabFocus()= 0; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true )= 0; - virtual Window* GetAccessibleParentWindow() const= 0; - virtual Window* GetWindowInstance()= 0; + virtual vcl::Window* GetAccessibleParentWindow() const= 0; + virtual vcl::Window* GetWindowInstance()= 0; virtual sal_Int32 GetAccessibleControlCount() const = 0; virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )= 0; virtual long GetRowCount() const= 0; diff --git a/include/svtools/accessibletableprovider.hxx b/include/svtools/accessibletableprovider.hxx index acd3feace9a9..bd219963c96f 100644 --- a/include/svtools/accessibletableprovider.hxx +++ b/include/svtools/accessibletableprovider.hxx @@ -116,11 +116,11 @@ public: virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0; // Window - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0; + virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const = 0; virtual void GrabFocus() = 0; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) = 0; - virtual Window* GetAccessibleParentWindow() const = 0; - virtual Window* GetWindowInstance() = 0; + virtual vcl::Window* GetAccessibleParentWindow() const = 0; + virtual vcl::Window* GetWindowInstance() = 0; virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) = 0; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) = 0; diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 0ade142d02f8..020d38c70e55 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -69,7 +69,7 @@ namespace svt m_pImpl; public: - AddressBookSourceDialog( Window* _pParent, + AddressBookSourceDialog( vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); /** if you use this ctor, the dialog @@ -91,7 +91,7 @@ namespace svt the table name to display. It must refer to a valid table, relative to a connection obtained from <arg>_rxTransientDS</arg> */ - AddressBookSourceDialog( Window* _pParent, + AddressBookSourceDialog( vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxTransientDS, const OUString& _rDataSourceName, diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index c4e1b998772a..34eb59335a88 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -128,7 +128,7 @@ typedef sal_uLong BrowserMode; class BrowseEvent { - Window* pWin; + vcl::Window* pWin; long nRow; Rectangle aRect; sal_uInt16 nCol; @@ -136,12 +136,12 @@ class BrowseEvent public: BrowseEvent(); - BrowseEvent( Window* pWindow, + BrowseEvent( vcl::Window* pWindow, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ); - Window* GetWindow() const { return pWin; } + vcl::Window* GetWindow() const { return pWin; } long GetRow() const { return nRow; } sal_uInt16 GetColumn() const { return nCol; } sal_uInt16 GetColumnId() const { return nColId; } @@ -157,7 +157,7 @@ class BrowserMouseEvent: public MouseEvent, public BrowseEvent public: BrowserMouseEvent(); BrowserMouseEvent( BrowserDataWin* pWin, const MouseEvent& rEvt ); - BrowserMouseEvent( Window* pWin, const MouseEvent& rEvt, + BrowserMouseEvent( vcl::Window* pWin, const MouseEvent& rEvt, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ); }; @@ -217,7 +217,7 @@ public: static const sal_uInt16 HandleColumnId = 0; private: - Window* pDataWin; // window to display data rows + vcl::Window* pDataWin; // window to display data rows ScrollBar* pVScroll; // vertical scrollbar ScrollBar aHScroll; // horizontal scrollbar @@ -339,7 +339,7 @@ protected: virtual bool SeekRow( long nRow ) = 0; virtual void DrawCursor(); virtual void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); - virtual void PaintData( Window& rWin, const Rectangle& rRect ); + virtual void PaintData( vcl::Window& rWin, const Rectangle& rRect ); virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const = 0; // Advice for the subclass: the visible scope of rows has changed. @@ -397,9 +397,9 @@ protected: virtual void ImplEndTracking(); public: - BrowseBox( Window* pParent, WinBits nBits = 0, + BrowseBox( vcl::Window* pParent, WinBits nBits = 0, BrowserMode nMode = 0 ); - BrowseBox( Window* pParent, const ResId& rId, + BrowseBox( vcl::Window* pParent, const ResId& rId, BrowserMode nMode = 0 ); virtual ~BrowseBox(); @@ -520,7 +520,7 @@ public: bool IsResizing() const { return bResizing; } // access to positions of fields, column and rows - Window& GetDataWindow() const { return *pDataWin; } + vcl::Window& GetDataWindow() const { return *pDataWin; } Rectangle GetRowRectPixel( long nRow, bool bRelToBrowser = true ) const; Rectangle GetFieldRectPixel( long nRow, sal_uInt16 nColId, @@ -788,11 +788,11 @@ public: virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; virtual OUString GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const SAL_OVERRIDE; virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) SAL_OVERRIDE; - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const SAL_OVERRIDE; + virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; - virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE; - virtual Window* GetWindowInstance() SAL_OVERRIDE; + virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; private: // the following declares some Window/OutputDevice methods private. This happened in the course diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 03b5d2345e34..3ad7b9718276 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -257,7 +257,7 @@ protected: DECL_STATIC_LINK( Calendar, ScrollHdl, Timer *); public: - Calendar( Window* pParent, WinBits nWinStyle = 0 ); + Calendar( vcl::Window* pParent, WinBits nWinStyle = 0 ); virtual ~Calendar(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -415,13 +415,13 @@ private: DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* ); public: - CalendarField( Window* pParent, WinBits nWinStyle ); + CalendarField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~CalendarField(); virtual void Select(); virtual bool ShowDropDown( bool bShow ) SAL_OVERRIDE; - virtual Calendar* CreateCalendar( Window* pParent ); + virtual Calendar* CreateCalendar( vcl::Window* pParent ); Calendar* GetCalendar(); void SetDefaultDate( const Date& rDate ) { maDefaultDate = rDate; } diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx index 3db4fb4bdc40..5df3ae5350c0 100644 --- a/include/svtools/cliplistener.hxx +++ b/include/svtools/cliplistener.hxx @@ -25,7 +25,7 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp> -class Window; +namespace vcl { class Window; } class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelper1< @@ -38,7 +38,7 @@ public: TransferableClipboardListener( const Link& rCallback ); virtual ~TransferableClipboardListener(); - void AddRemoveListener( Window* pWin, bool bAdd ); + void AddRemoveListener( vcl::Window* pWin, bool bAdd ); void ClearCallbackLink(); // XEventListener diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index 37bfc6d1799f..daee9bb1fef6 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -24,7 +24,7 @@ #include <tools/color.hxx> -class Window; +namespace vcl { class Window; } // - ColorDialog - @@ -39,7 +39,7 @@ namespace svtools class SVT_DLLPUBLIC SvColorDialog { public: - SvColorDialog( ::Window* pParent ); + SvColorDialog( vcl::Window* pParent ); virtual ~SvColorDialog(); void SetColor( const Color& rColor ); @@ -50,7 +50,7 @@ public: virtual short Execute(); private: - Window* mpParent; + vcl::Window* mpParent; Color maColor; sal_Int16 meMode; }; diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 5d728141791e..de433f61389d 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -155,9 +155,9 @@ class SVT_DLLPUBLIC ColorListBox : public ListBox SVT_DLLPRIVATE void ImplDestroyColorEntries(); public: - ColorListBox( Window* pParent, + ColorListBox( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER ); - ColorListBox( Window* pParent, const ResId& rResId ); + ColorListBox( vcl::Window* pParent, const ResId& rResId ); virtual ~ColorListBox(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; @@ -302,7 +302,7 @@ public: typedef Color (*ColorFunc)(Color); typedef Color (*ColorDistFunc)(Color, Color); - LineListBox( Window* pParent, WinBits nWinStyle = WB_BORDER ); + LineListBox( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER ); virtual ~LineListBox(); /** Set the width in Twips */ @@ -404,7 +404,7 @@ protected: void LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep = ';' ); void SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep = ';' ) const; public: - FontNameBox( Window* pParent, + FontNameBox( vcl::Window* pParent, WinBits nWinStyle = WB_SORT ); virtual ~FontNameBox(); @@ -432,7 +432,7 @@ class SVT_DLLPUBLIC FontStyleBox : public ComboBox private: using ComboBox::SetText; public: - FontStyleBox( Window* pParent, WinBits nBits ); + FontStyleBox( vcl::Window* pParent, WinBits nBits ); virtual ~FontStyleBox(); virtual void Select() SAL_OVERRIDE; @@ -477,7 +477,7 @@ protected: virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; public: - FontSizeBox( Window* pParent, WinBits nWinStyle = 0 ); + FontSizeBox( vcl::Window* pParent, WinBits nWinStyle = 0 ); virtual ~FontSizeBox(); void Reformat() SAL_OVERRIDE; diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index 1b7bf1ed5bc7..cf455bea9f3b 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -49,7 +49,7 @@ namespace svt @param _rOperateOn the window on which to operate */ - virtual void operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const = 0; + virtual void operateOn( const VclWindowEvent& _rTrigger, vcl::Window& _rOperateOn ) const = 0; virtual ~IWindowOperator(); }; @@ -93,7 +93,7 @@ namespace svt ::std::auto_ptr< DialogController_Data > m_pImpl; public: - DialogController( Window& _rInstigator, const PWindowEventFilter& _pEventFilter, const PWindowOperator& _pOperator ); + DialogController( vcl::Window& _rInstigator, const PWindowEventFilter& _pEventFilter, const PWindowOperator& _pOperator ); virtual ~DialogController(); /** adds a window to the list of dependent windows @@ -104,7 +104,7 @@ namespace svt The caller is responsible for life-time control: The given window must live at least as long as the ->DialogController instance does. */ - void addDependentWindow( Window& _rWindow ); + void addDependentWindow( vcl::Window& _rWindow ); /** resets the controller so that no actions happened anymore. @@ -115,7 +115,7 @@ namespace svt private: void impl_Init(); void impl_updateAll( const VclWindowEvent& _rTriggerEvent ); - void impl_update( const VclWindowEvent& _rTriggerEvent, Window& _rWindow ); + void impl_update( const VclWindowEvent& _rTriggerEvent, vcl::Window& _rWindow ); DECL_LINK( OnWindowEvent, const VclWindowEvent* ); @@ -156,10 +156,10 @@ namespace svt denotes the window which should be enabled when ->_rRadio is checked, and disabled when it's unchecked */ - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2 ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 ); + void enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow ); + void enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2 ); + void enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3 ); + void enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3, vcl::Window& _rDependentWindow4, vcl::Window& _rDependentWindow5 ); /** ensures that a given window is enabled or disabled, according to the mark state of a given check box @@ -169,9 +169,9 @@ namespace svt denotes the window which should be enabled when ->_rBox is marked, and disabled when it's unmarked */ - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2 ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 ); + void enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow ); + void enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2 ); + void enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3, vcl::Window& _rDependentWindow4 ); /** adds a non-standard controller whose functionality is not covered by the other methods @@ -215,7 +215,7 @@ namespace svt { } - virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, Window& _rOperateOn ) const SAL_OVERRIDE + virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, vcl::Window& _rOperateOn ) const SAL_OVERRIDE { _rOperateOn.Enable( m_rCheckable.IsChecked() ); } @@ -232,9 +232,9 @@ namespace svt */ class SVT_DLLPUBLIC FilterForRadioOrCheckToggle : public IWindowEventFilter { - const Window& m_rWindow; + const vcl::Window& m_rWindow; public: - FilterForRadioOrCheckToggle( const Window& _rWindow ) + FilterForRadioOrCheckToggle( const vcl::Window& _rWindow ) :m_rWindow( _rWindow ) { } diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 4cb50bd8b89b..db10afd92f49 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -189,7 +189,7 @@ namespace svt class SVT_DLLPUBLIC MultiLineTextCell : public MultiLineEdit { public: - MultiLineTextCell( Window* _pParent, WinBits _nStyle ) + MultiLineTextCell( vcl::Window* _pParent, WinBits _nStyle ) :MultiLineEdit( _pParent, _nStyle ) { } @@ -277,7 +277,7 @@ namespace svt Link m_aClickLink,m_aModifyLink; public: - CheckBoxControl(Window* pParent, WinBits nWinStyle = 0); + CheckBoxControl(vcl::Window* pParent, WinBits nWinStyle = 0); virtual ~CheckBoxControl(); virtual void GetFocus() SAL_OVERRIDE; @@ -327,7 +327,7 @@ namespace svt friend class ComboBoxCellController; public: - ComboBoxControl(Window* pParent, WinBits nWinStyle = 0); + ComboBoxControl(vcl::Window* pParent, WinBits nWinStyle = 0); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -360,7 +360,7 @@ namespace svt friend class ListBoxCellController; public: - ListBoxControl(Window* pParent, WinBits nWinStyle = 0); + ListBoxControl(vcl::Window* pParent, WinBits nWinStyle = 0); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -472,7 +472,7 @@ namespace svt aOldController; ImplSVEvent * nStartEvent, * nEndEvent, * nCellModifiedEvent; // event ids - Window* m_pFocusWhileRequest; + vcl::Window* m_pFocusWhileRequest; // In ActivateCell, we grab the focus asynchronously, but if between requesting activation // and the asynchornous event the focus has changed, we won't grab it for ourself. @@ -588,8 +588,8 @@ namespace svt // secure starting of StartEditHdl public: - EditBrowseBox(Window* pParent, sal_Int32 nBrowserFlags = EBBF_NONE, WinBits nBits = WB_TABSTOP, BrowserMode nMode = 0 ); - EditBrowseBox(Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags = EBBF_NONE, BrowserMode nMode = 0 ); + EditBrowseBox(vcl::Window* pParent, sal_Int32 nBrowserFlags = EBBF_NONE, WinBits nBits = WB_TABSTOP, BrowserMode nMode = 0 ); + EditBrowseBox(vcl::Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags = EBBF_NONE, BrowserMode nMode = 0 ); virtual ~EditBrowseBox(); bool IsEditing() const {return aController.Is();} diff --git a/include/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx index 98c13b38e26a..8ec02d388281 100644 --- a/include/svtools/editsyntaxhighlighter.hxx +++ b/include/svtools/editsyntaxhighlighter.hxx @@ -39,7 +39,7 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER , HighlighterLanguage aLanguage = HIGHLIGHT_SQL); + MultiLineEditSyntaxHighlight( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER , HighlighterLanguage aLanguage = HIGHLIGHT_SQL); virtual ~MultiLineEditSyntaxHighlight(); virtual void UpdateData() SAL_OVERRIDE; diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index d5038c7bd590..991e9e8033fd 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -26,17 +26,17 @@ #include <tools/errinf.hxx> -class Window; +namespace vcl { class Window; } class ResMgr; class SVT_DLLPUBLIC SfxErrorContext : private ErrorContext { public: SfxErrorContext( - sal_uInt16 nCtxIdP, Window *pWin=0, + sal_uInt16 nCtxIdP, vcl::Window *pWin=0, sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); SfxErrorContext( - sal_uInt16 nCtxIdP, const OUString &aArg1, Window *pWin=0, + sal_uInt16 nCtxIdP, const OUString &aArg1, vcl::Window *pWin=0, sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); bool GetString(sal_uLong nErrId, OUString &rStr) SAL_OVERRIDE; diff --git a/include/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx index 42a7523d9b5a..57f7725d6d8c 100644 --- a/include/svtools/extensionlistbox.hxx +++ b/include/svtools/extensionlistbox.hxx @@ -38,7 +38,7 @@ class IExtensionListBox: public Control public: enum { ENTRY_NOTFOUND = -1 }; - IExtensionListBox( Window* pParent, WinBits nWinStyle = 0 ): Control( pParent, nWinStyle ){} + IExtensionListBox( vcl::Window* pParent, WinBits nWinStyle = 0 ): Control( pParent, nWinStyle ){} /** @return The count of the entries in the list box. */ virtual sal_Int32 getItemCount() const = 0; diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index aa591df7edc4..04e6e0a2819c 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -39,7 +39,7 @@ typedef sal_uInt16 FileControlMode_Internal; #define FILECTRL_ORIGINALBUTTONTEXT ((sal_uInt16)0x0002) -class SVT_DLLPUBLIC FileControl : public Window +class SVT_DLLPUBLIC FileControl : public vcl::Window { private: Edit maEdit; @@ -64,7 +64,7 @@ protected: DECL_DLLPRIVATE_LINK( ButtonHdl, void* ); public: - FileControl( Window* pParent, WinBits nStyle, FileControlMode = 0 ); + FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode = 0 ); virtual ~FileControl(); Edit& GetEdit() { return maEdit; } diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index f75cb5c0ec4a..c1dfde0f65fb 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -37,7 +37,7 @@ namespace svt OUString m_sPreservedText; public: - FileURLBox( Window* _pParent, WinBits _nStyle ); + FileURLBox( vcl::Window* _pParent, WinBits _nStyle ); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index 334f6ca7901d..283f4aa3e899 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -80,7 +80,7 @@ protected: virtual void GetFocus() SAL_OVERRIDE; public: - SvtFileView( Window* pParent, WinBits nBits, bool bOnlyFolder, bool bMultiSelection ); + SvtFileView( vcl::Window* pParent, WinBits nBits, bool bOnlyFolder, bool bMultiSelection ); virtual ~SvtFileView(); virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -214,7 +214,7 @@ private: PushButton* m_pAllButton; public: - QueryDeleteDlg_Impl(Window* pParent, const OUString& rName); + QueryDeleteDlg_Impl(vcl::Window* pParent, const OUString& rName); void EnableAllButton() { m_pAllButton->Enable(true); } }; diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index d7bd1f1f1eac..3c13f0fefb5d 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -94,7 +94,7 @@ protected: bool m_bUseInputStringForFormatting; public: - FormattedField(Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0); + FormattedField(vcl::Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0); virtual ~FormattedField(); // Min-/Max-Verwaltung @@ -266,7 +266,7 @@ protected: validation::NumberValidator* m_pNumberValidator; public: - DoubleNumericField(Window* pParent, WinBits nStyle = 0) + DoubleNumericField(vcl::Window* pParent, WinBits nStyle = 0) :FormattedField(pParent, nStyle) ,m_pNumberValidator( NULL ) { @@ -294,7 +294,7 @@ class DoubleCurrencyField : public FormattedField bool m_bChangingFormat; public: - DoubleCurrencyField(Window* pParent, WinBits nStyle = 0); + DoubleCurrencyField(vcl::Window* pParent, WinBits nStyle = 0); OUString getCurrencySymbol() const { return m_sCurrencySymbol; } void setCurrencySymbol(const OUString& rSymbol); diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 19a34f1dafbf..f0445ff96405 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -40,7 +40,7 @@ #include <tools/link.hxx> class Dialog; -class Window; +namespace vcl { class Window; } class VclWindowEvent; @@ -124,7 +124,7 @@ namespace svt but the application-wide solar mutex is (to guard the not thread-safe ctor of the dialog). @param pParent the parent window for the new dialog */ - virtual Dialog* createDialog(Window* _pParent) = 0; + virtual Dialog* createDialog(vcl::Window* _pParent) = 0; /// called to destroy the dialog used. the default implementation just deletes m_pDialog and resets it to NULL virtual void destroyDialog(); diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 63fb5e91e6f1..39210b4e631e 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -233,7 +233,7 @@ typedef sal_uInt16 HeaderBarItemBits; class VCLXHeaderBar; -class SVT_DLLPUBLIC HeaderBar : public Window +class SVT_DLLPUBLIC HeaderBar : public vcl::Window { private: ImplHeadItemList* mpItemList; @@ -291,7 +291,7 @@ private: SVT_DLLPRIVATE void ImplEndDrag( bool bCancel ); public: - HeaderBar( Window* pParent, WinBits nWinBits = WB_STDHEADERBAR ); + HeaderBar( vcl::Window* pParent, WinBits nWinBits = WB_STDHEADERBAR ); virtual ~HeaderBar(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index aa38892b60ab..eacfe4896372 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -52,7 +52,7 @@ namespace svt void implInit(); public: - HyperLabel( Window* _pParent, WinBits _nWinStyle = 0 ); + HyperLabel( vcl::Window* _pParent, WinBits _nWinStyle = 0 ); virtual ~HyperLabel( ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 8d073a88765a..b9852ce6fc7b 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -59,9 +59,9 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SvtURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); - SvtURLBox( Window* pParent, WinBits _nStyle, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); - SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); + SvtURLBox( vcl::Window* pParent, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); + SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); + SvtURLBox( vcl::Window* pParent, const ResId& _rResId, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); virtual ~SvtURLBox(); void SetBaseURL( const OUString& rURL ); diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index f93200899de3..f336a9858036 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -261,7 +261,7 @@ protected: public: - SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle = WB_ICON | WB_BORDER ); + SvtIconChoiceCtrl( vcl::Window* pParent, WinBits nWinStyle = WB_ICON | WB_BORDER ); virtual ~SvtIconChoiceCtrl(); void SetStyle( WinBits nWinStyle ); diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx index 86466f08059a..27fbf710ac2d 100644 --- a/include/svtools/popupwindowcontroller.hxx +++ b/include/svtools/popupwindowcontroller.hxx @@ -27,7 +27,7 @@ #include <svtools/toolboxcontroller.hxx> #include <boost/scoped_ptr.hpp> -class Window; +namespace vcl { class Window; } namespace svt { @@ -41,7 +41,7 @@ public: const OUString& aCommandURL ); virtual ~PopupWindowController(); - virtual ::Window* createPopupWindow( ::Window* pParent ) = 0; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) = 0; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index c4df80474254..b7ed0fd8f3dc 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -59,7 +59,7 @@ private: DECL_DLLPRIVATE_LINK( ImplStatusHdl, void* ); public: - PrinterSetupDialog( Window* pWindow ); + PrinterSetupDialog( vcl::Window* pWindow ); virtual ~PrinterSetupDialog(); void SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; } diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx index 5d354621bc26..48aa5b2bcf3f 100644 --- a/include/svtools/restartdialog.hxx +++ b/include/svtools/restartdialog.hxx @@ -15,7 +15,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <svtools/svtdllapi.h> -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } @@ -38,7 +38,7 @@ enum RestartReason { SVT_DLLPUBLIC void executeRestartDialog( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context, - Window * parent, RestartReason reason); + vcl::Window * parent, RestartReason reason); } diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index 7abcd48c05e8..578ba284adb8 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -68,12 +68,12 @@ namespace svt public: RoadmapWizard( - Window* _pParent, + vcl::Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags = WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP ); RoadmapWizard( - Window* _pParent, + vcl::Window* _pParent, sal_uInt32 _nButtonFlags = WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP ); virtual ~RoadmapWizard( ); diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 67eb55d84035..49d4e424da4b 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -607,7 +607,7 @@ struct RulerUnitData class ImplRulerData; -class SVT_DLLPUBLIC Ruler : public Window +class SVT_DLLPUBLIC Ruler : public vcl::Window { private: VirtualDevice maVirDev; @@ -712,7 +712,7 @@ protected: RulerUnitData GetCurrentRulerUnit() const; public: - Ruler( Window* pParent, WinBits nWinStyle = WB_STDRULER ); + Ruler( vcl::Window* pParent, WinBits nWinStyle = WB_STDRULER ); virtual ~Ruler(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index 7b86396c88f8..41a6a00ca341 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -41,7 +41,7 @@ typedef sal_uInt16 ScrollableWindowFlags; // - ScrollableWindow - -class SVT_DLLPUBLIC ScrollableWindow: public Window +class SVT_DLLPUBLIC ScrollableWindow: public vcl::Window { private: Point aPixOffset; // offset to virtual window (pixel) @@ -62,7 +62,7 @@ private: DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar * ); public: - ScrollableWindow( Window* pParent, WinBits nBits = 0, + ScrollableWindow( vcl::Window* pParent, WinBits nBits = 0, ScrollableWindowFlags = SCRWIN_DEFAULT ); virtual void Resize() SAL_OVERRIDE; diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 53fc594e0c00..5ade4fbbbe6a 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -34,7 +34,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SvSimpleTableContainer( Window* pParent, WinBits nBits = WB_BORDER ); + SvSimpleTableContainer( vcl::Window* pParent, WinBits nBits = WB_BORDER ); void SetTable(SvSimpleTable* pTable); diff --git a/include/svtools/stdctrl.hxx b/include/svtools/stdctrl.hxx index 271b5d3de6b9..38c548caffd2 100644 --- a/include/svtools/stdctrl.hxx +++ b/include/svtools/stdctrl.hxx @@ -28,7 +28,7 @@ class SVT_DLLPUBLIC FixedInfo : public FixedText { public: - FixedInfo( Window* pParent, const ResId& rResId ); + FixedInfo( vcl::Window* pParent, const ResId& rResId ); }; #endif // INCLUDED_SVTOOLS_STDCTRL_HXX diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index 9f3869af6dd2..dea0989121ad 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -55,16 +55,16 @@ namespace svt <p>Beware: In opposite to the old DragServer::CopyString, this method does not <em>add</em> the string to the clipboard, instead the old clipboard content is <em>replaced</em>!</p> */ - SVT_DLLPUBLIC static void CopyString( const OUString& _rContent, Window* _pWindow = NULL ); + SVT_DLLPUBLIC static void CopyString( const OUString& _rContent, vcl::Window* _pWindow = NULL ); /** extracts a string from the system clipboard given @return <TRUE/> if the extraction was successful, i.e. if the clipboard contained a string content */ - SVT_DLLPUBLIC static bool PasteString( OUString& _rContent, Window* _pWindow = NULL ); + SVT_DLLPUBLIC static bool PasteString( OUString& _rContent, vcl::Window* _pWindow = NULL ); /** starts dragging a simple string */ - SVT_DLLPUBLIC static void StartStringDrag( const OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ); + SVT_DLLPUBLIC static void StartStringDrag( const OUString& _rContent, vcl::Window* _pWindow, sal_Int8 _nDragSourceActions ); }; diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 8c66b83511e7..ff9c00f05317 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -140,7 +140,7 @@ class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem sal_uInt16 nItemFlags; sal_uInt16 nBaseOffs; - void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, Window* pParent ); + void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, vcl::Window* pParent ); public: // An SvLBoxButton can be of three different kinds: an // enabled checkbox (the normal kind), a disabled checkbox diff --git a/include/svtools/svmedit.hxx b/include/svtools/svmedit.hxx index 892d80fcc18f..33c2b90fe6f2 100644 --- a/include/svtools/svmedit.hxx +++ b/include/svtools/svmedit.hxx @@ -31,7 +31,7 @@ class SVT_DLLPUBLIC MultiLineEdit : public VclMultiLineEdit { public: - MultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); + MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface(bool bCreate = true) SAL_OVERRIDE; diff --git a/include/svtools/svmedit2.hxx b/include/svtools/svmedit2.hxx index 9c9a6aed4180..2e17023629c9 100644 --- a/include/svtools/svmedit2.hxx +++ b/include/svtools/svmedit2.hxx @@ -27,7 +27,7 @@ class TextAttrib; class SVT_DLLPUBLIC ExtMultiLineEdit : public MultiLineEdit { public: - ExtMultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); + ExtMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); virtual ~ExtMultiLineEdit(); // methods of TextView diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index 8ade2a01fbd5..24450a3083a2 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -63,7 +63,7 @@ protected: SvTreeListEntry* GetChildOnPos( SvTreeListEntry* _pParent, sal_uLong _nEntryPos, sal_uLong& _rPos ) const; public: - SvTabListBox( Window* pParent, WinBits = WB_BORDER ); + SvTabListBox( vcl::Window* pParent, WinBits = WB_BORDER ); virtual ~SvTabListBox(); void SetTabs( long* pTabs, MapUnit = MAP_APPFONT ); sal_uInt16 TabCount() const { return (sal_uInt16)nTabCount; } @@ -137,7 +137,7 @@ private: void RecalculateAccessibleChildren(); public: - SvHeaderTabListBox( Window* pParent, WinBits nBits ); + SvHeaderTabListBox( vcl::Window* pParent, WinBits nBits ); virtual ~SvHeaderTabListBox(); virtual void Paint( const Rectangle& ) SAL_OVERRIDE; @@ -223,7 +223,7 @@ public: virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const SAL_OVERRIDE; virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const SAL_OVERRIDE; - virtual Window* GetWindowInstance() SAL_OVERRIDE; + virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; using SvTreeListBox::FillAccessibleStateSet; virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const SAL_OVERRIDE; @@ -234,10 +234,10 @@ public: virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) SAL_OVERRIDE; // Window - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const SAL_OVERRIDE; + virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; - virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; /** Creates and returns the accessible object of the whole BrowseBox. */ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index bc15dd4c298e..bf53f75998d0 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -327,7 +327,7 @@ enum TabBarAllowRenamingReturnCode { struct TabBar_Impl; struct ImplTabBarItem; -class SVT_DLLPUBLIC TabBar : public Window +class SVT_DLLPUBLIC TabBar : public vcl::Window { friend class ImplTabButton; friend class ImplTabSizer; @@ -404,7 +404,7 @@ public: static const sal_uInt16 PAGE_NOT_FOUND; static const sal_uInt16 INSERT_TAB_POS; - TabBar( Window* pParent, WinBits nWinStyle = WB_STDTABBAR ); + TabBar( vcl::Window* pParent, WinBits nWinStyle = WB_STDTABBAR ); virtual ~TabBar(); virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx index a365f33b6d56..9e66e1b01326 100644 --- a/include/svtools/table/tablerenderer.hxx +++ b/include/svtools/table/tablerenderer.hxx @@ -210,14 +210,14 @@ namespace svt { namespace table The cell cursor is used to indicate the active/current cell of a table control. */ - virtual void ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect) = 0; + virtual void ShowCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) = 0; /** hides the cell cursor previously drawn into the given rectangle The cell cursor is used to indicate the active/current cell of a table control. */ - virtual void HideCellCursor( Window& _rView, const Rectangle& _rCursorRect) = 0; + virtual void HideCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) = 0; /** checks whether a given cell content fits into a given target area on a given device. diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 5f2f0f26e310..86a49dbf2b5e 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -47,11 +47,11 @@ class SVT_DLLPUBLIC ToolbarMenu : public DockingWindow friend struct ToolbarMenu_Impl; public: ToolbarMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow, + vcl::Window* pParentWindow, WinBits nBits ); ToolbarMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow, + vcl::Window* pParentWindow, const ResId& rResId ); virtual ~ToolbarMenu(); diff --git a/include/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx index 2cef5d718d68..93b11f4f17e0 100644 --- a/include/svtools/toolpanel/drawerlayouter.hxx +++ b/include/svtools/toolpanel/drawerlayouter.hxx @@ -45,7 +45,7 @@ namespace svt { public: DrawerDeckLayouter( - ::Window& i_rParentWindow, + vcl::Window& i_rParentWindow, IToolPanelDeck& i_rPanels ); virtual ~DrawerDeckLayouter(); @@ -71,13 +71,13 @@ namespace svt private: // triggers a re-arrance of the panel deck elements void impl_triggerRearrange() const; - size_t impl_getPanelPositionFromWindow( const Window* i_pDrawerWindow ) const; + size_t impl_getPanelPositionFromWindow( const vcl::Window* i_pDrawerWindow ) const; void impl_removeDrawer( const size_t i_nPosition ); DECL_LINK( OnWindowEvent, VclSimpleEvent* ); private: - Window& m_rParentWindow; + vcl::Window& m_rParentWindow; IToolPanelDeck& m_rPanelDeck; ::std::vector< PToolPanelDrawer > m_aDrawers; ::boost::optional< size_t > m_aLastKnownActivePanel; diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx index 190b86bf5668..0964d79c9e40 100644 --- a/include/svtools/toolpanel/paneltabbar.hxx +++ b/include/svtools/toolpanel/paneltabbar.hxx @@ -50,7 +50,7 @@ namespace svt class SVT_DLLPUBLIC PanelTabBar : public Control { public: - PanelTabBar( Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ); + PanelTabBar( vcl::Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ); virtual ~PanelTabBar(); // attribute access diff --git a/include/svtools/toolpanel/tablayouter.hxx b/include/svtools/toolpanel/tablayouter.hxx index db89736db832..3ad6060df5df 100644 --- a/include/svtools/toolpanel/tablayouter.hxx +++ b/include/svtools/toolpanel/tablayouter.hxx @@ -30,7 +30,7 @@ #include <boost/noncopyable.hpp> -class Window; +namespace vcl { class Window; } namespace svt @@ -59,7 +59,7 @@ namespace svt specifies the content to show on the tab items */ TabDeckLayouter( - Window& i_rParent, + vcl::Window& i_rParent, IToolPanelDeck& i_rPanels, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent diff --git a/include/svtools/toolpanel/toolpanel.hxx b/include/svtools/toolpanel/toolpanel.hxx index 27084d8bd460..fafeb3981e11 100644 --- a/include/svtools/toolpanel/toolpanel.hxx +++ b/include/svtools/toolpanel/toolpanel.hxx @@ -30,7 +30,7 @@ #include <boost/noncopyable.hpp> class Rectangle; -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } @@ -66,7 +66,7 @@ namespace svt method will always get the same parent window. The complete area of this window is available, and should be used, for the panel window. */ - virtual void Activate( Window& i_rParentWindow ) = 0; + virtual void Activate( vcl::Window& i_rParentWindow ) = 0; /** deactivates the panel diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx index 1f2497c1aeec..48127c569fd6 100644 --- a/include/svtools/toolpanel/toolpaneldeck.hxx +++ b/include/svtools/toolpanel/toolpaneldeck.hxx @@ -136,7 +136,7 @@ namespace svt ,public IToolPanelDeck { public: - ToolPanelDeck( Window& i_rParent, const WinBits i_nStyle = WB_DIALOGCONTROL ); + ToolPanelDeck( vcl::Window& i_rParent, const WinBits i_nStyle = WB_DIALOGCONTROL ); virtual ~ToolPanelDeck(); // attributes @@ -148,8 +148,8 @@ namespace svt This is a single dedicated window, which is passed to the IToolPanel::ActivatePanel method whenever a panel is activated, to act as parent window for the panel's VCL-Window. */ - ::Window& GetPanelWindowAnchor(); - const ::Window& GetPanelWindowAnchor() const; + vcl::Window& GetPanelWindowAnchor(); + const vcl::Window& GetPanelWindowAnchor() const; // IToolPanelDeck virtual size_t GetPanelCount() const SAL_OVERRIDE; diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 03932c561600..3013a62a28eb 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -48,7 +48,7 @@ class ImageMap; class INetBookmark; class INetImage; class FileList; -class Window; +namespace vcl { class Window; } class Link; // Drag&Drop defines @@ -251,13 +251,13 @@ public: void PrepareOLE( const TransferableObjectDescriptor& rObjDesc ); - void CopyToClipboard( Window *pWindow ) const; - void CopyToSelection( Window *pWindow ) const; - void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, + void CopyToClipboard( vcl::Window *pWindow ) const; + void CopyToSelection( vcl::Window *pWindow ) const; + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ); - static void ClearSelection( Window *pWindow ); + static void ClearSelection( vcl::Window *pWindow ); static ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetSystemClipboard(); static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); @@ -367,8 +367,8 @@ public: public: - static TransferableDataHelper CreateFromSystemClipboard( Window * pWindow ); - static TransferableDataHelper CreateFromSelection( Window * pWindow ); + static TransferableDataHelper CreateFromSystemClipboard( vcl::Window * pWindow ); + static TransferableDataHelper CreateFromSelection( vcl::Window * pWindow ); static bool IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor, const ::com::sun::star::datatransfer::DataFlavor& rRequestFlavor, bool bCompareParameters = false ); @@ -416,7 +416,7 @@ public: // to be overridden by the application virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - DragSourceHelper( Window* pWindow ); + DragSourceHelper( vcl::Window* pWindow ); virtual ~DragSourceHelper(); }; @@ -475,7 +475,7 @@ public: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - DropTargetHelper( Window* pWindow ); + DropTargetHelper( vcl::Window* pWindow ); DropTargetHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget >& rxDropTarget ); virtual ~DropTargetHelper(); @@ -519,7 +519,7 @@ public: bool HasAnyData() const; using TransferableHelper::StartDrag; - void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, const Link& rCallbck, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ); diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 12b75979f922..ac8a2812d569 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -344,8 +344,8 @@ protected: public: - SvTreeListBox( Window* pParent, WinBits nWinStyle=0 ); - SvTreeListBox( Window* pParent, const ResId& rResId ); + SvTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 ); + SvTreeListBox( vcl::Window* pParent, const ResId& rResId ); virtual ~SvTreeListBox(); SvTreeList* GetModel() const { return pModel; } @@ -807,7 +807,7 @@ class SvInplaceEdit2 DECL_LINK( EscapeHdl_Impl, void * ); public: - SvInplaceEdit2( Window* pParent, const Point& rPos, const Size& rSize, + SvInplaceEdit2( vcl::Window* pParent, const Point& rPos, const Size& rSize, const OUString& rData, const Link& rNotifyEditEnd, const Selection&, bool bMultiLine = false ); ~SvInplaceEdit2(); diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index 38c3099da9fd..a85c0fd9e84d 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -37,7 +37,7 @@ namespace svt OUString m_sPreservedText; public: - OFileURLControl(Window* _pParent, WinBits nStyle); + OFileURLControl(vcl::Window* _pParent, WinBits nStyle); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 0670ee094ace..8ade613810df 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -284,8 +284,8 @@ protected: virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; public: - ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren = false ); - ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false ); + ValueSet( vcl::Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren = false ); + ValueSet( vcl::Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false ); virtual ~ValueSet(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index 9618af1a6af5..56bd679a0d89 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -98,7 +98,7 @@ namespace svt if the OWizardPage is used in an OWizardMachine, this parameter must be the OWizardMachine (which is derived from Window) */ - OWizardPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription); + OWizardPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription); virtual ~OWizardPage(); // IWizardPageController overridables @@ -165,15 +165,15 @@ namespace svt m_pImpl; // hold members in this structure to allow keeping compatible when members are added - SVT_DLLPRIVATE void addButtons(Window* _pParent, sal_uInt32 _nButtonFlags); + SVT_DLLPRIVATE void addButtons(vcl::Window* _pParent, sal_uInt32 _nButtonFlags); public: /** ctor For the button flags, use any combination of the WZB_* flags. */ - OWizardMachine(Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ); - OWizardMachine(Window* _pParent, sal_uInt32 _nButtonFlags ); + OWizardMachine(vcl::Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ); + OWizardMachine(vcl::Window* _pParent, sal_uInt32 _nButtonFlags ); virtual ~OWizardMachine(); /// enable (or disable) buttons @@ -349,7 +349,7 @@ namespace svt DECL_DLLPRIVATE_LINK(OnPrevPage, void*); DECL_DLLPRIVATE_LINK(OnFinish, void*); - SVT_DLLPRIVATE void implResetDefault(Window* _pWindow); + SVT_DLLPRIVATE void implResetDefault(vcl::Window* _pWindow); SVT_DLLPRIVATE void implUpdateTitle(); SVT_DLLPRIVATE void implConstruct( const sal_uInt32 _nButtonFlags ); }; diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 7680d41aeff3..e65d596ec880 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -210,7 +210,7 @@ private: TabPage* mpCurTabPage; PushButton* mpPrevBtn; PushButton* mpNextBtn; - Window* mpViewWindow; + vcl::Window* mpViewWindow; sal_uInt16 mnCurLevel; WindowAlign meViewAlign; Link maActivateHdl; @@ -244,8 +244,8 @@ private: SVT_DLLPRIVATE TabPage* ImplGetPage( sal_uInt16 nLevel ) const; public: - WizardDialog( Window* pParent, WinBits nStyle = WB_STDTABDIALOG ); - WizardDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + WizardDialog( vcl::Window* pParent, WinBits nStyle = WB_STDTABDIALOG ); + WizardDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~WizardDialog(); virtual void Resize() SAL_OVERRIDE; @@ -276,8 +276,8 @@ public: void SetNextButton( PushButton* pButton ) { mpNextBtn = pButton; } PushButton* GetNextButton() const { return mpNextBtn; } - void SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; } - Window* GetViewWindow() const { return mpViewWindow; } + void SetViewWindow( vcl::Window* pWindow ) { mpViewWindow = pWindow; } + vcl::Window* GetViewWindow() const { return mpViewWindow; } void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; } WindowAlign GetViewAlign() const { return meViewAlign; } diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index d9df9dc9d34c..470b09ed4b09 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/awt/XWindow.hpp> -class Window; +namespace vcl { class Window; } @@ -47,7 +47,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; virtual bool operator == ( const SfxPoolItem& rAttr ) const SAL_OVERRIDE; - Window * GetWindowPtr() const { return VCLUnoHelper::GetWindow( m_xWin ); } + vcl::Window * GetWindowPtr() const { return VCLUnoHelper::GetWindow( m_xWin ); } com::sun::star::uno::Reference< com::sun::star::awt::XWindow > GetXWindow() const { return m_xWin; } }; diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx index d56663384819..ec316f2498bb 100644 --- a/include/svx/AccessibleShapeTreeInfo.hxx +++ b/include/svx/AccessibleShapeTreeInfo.hxx @@ -28,7 +28,7 @@ #include <svx/svxdllapi.h> class SdrView; -class Window; +namespace vcl { class Window; } namespace accessibility { @@ -140,13 +140,13 @@ public: /** Set the window that is used to construct SvxTextEditSources which in turn is used to create accessible edit engines. */ - void SetWindow (Window* pWindow); + void SetWindow (vcl::Window* pWindow); /** Return the current Window. @return The returned value may be NULL. */ - Window* GetWindow (void) const { return mpWindow;} + vcl::Window* GetWindow (void) const { return mpWindow;} /** The view forwarder allows the transformation between internal and pixel coordinates and can be asked for the visible area. @@ -188,7 +188,7 @@ private: /** This window is necessary to construct an SvxTextEditSource which in turn is used to create an accessible edit engine. */ - Window* mpWindow; + vcl::Window* mpWindow; /** The view forwarder allows the transformation between internal and pixel coordinates and can be asked for the visible area. diff --git a/include/svx/SpellDialogChildWindow.hxx b/include/svx/SpellDialogChildWindow.hxx index 2c9e826e510f..2f6bc5cae067 100644 --- a/include/svx/SpellDialogChildWindow.hxx +++ b/include/svx/SpellDialogChildWindow.hxx @@ -49,7 +49,7 @@ class SVX_DLLPUBLIC SpellDialogChildWindow AbstractSpellDialog* m_pAbstractSpellDialog; public: SpellDialogChildWindow ( - Window*pParent, + vcl::Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); diff --git a/include/svx/SvxColorChildWindow.hxx b/include/svx/SvxColorChildWindow.hxx index 220f47c8ea20..1cceb372878d 100644 --- a/include/svx/SvxColorChildWindow.hxx +++ b/include/svx/SvxColorChildWindow.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC SvxColorChildWindow : public SfxChildWindow { public: - SvxColorChildWindow( Window*, sal_uInt16, SfxBindings*, + SvxColorChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW_WITHID(SvxColorChildWindow); diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx index a3130ed4a731..585b54ff7b0c 100644 --- a/include/svx/SvxColorValueSet.hxx +++ b/include/svx/SvxColorValueSet.hxx @@ -29,8 +29,8 @@ class SVX_DLLPUBLIC SvxColorValueSet : public ValueSet private: protected: public: - SvxColorValueSet(Window* pParent, WinBits nWinStyle = WB_ITEMBORDER); - SvxColorValueSet(Window* pParent, const ResId& rResId); + SvxColorValueSet(vcl::Window* pParent, WinBits nWinStyle = WB_ITEMBORDER); + SvxColorValueSet(vcl::Window* pParent, const ResId& rResId); virtual void Resize() SAL_OVERRIDE; diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index 95a7b8669724..480e8e2fdf6b 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -59,7 +59,7 @@ public: class SVX_DLLPUBLIC SvxBmpMaskChildWindow : public SfxChildWindow { public: - SvxBmpMaskChildWindow( Window*, + SvxBmpMaskChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); @@ -146,7 +146,7 @@ public: SvxBmpMask( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const ResId& rResId ); virtual ~SvxBmpMask(); diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 073f4f10e6ae..1615fa2ed025 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -42,7 +42,7 @@ namespace svx class SVX_DLLPUBLIC SvxShowCharSet : public Control { public: - SvxShowCharSet( Window* pParent ); + SvxShowCharSet( vcl::Window* pParent ); virtual ~SvxShowCharSet(); void SetFont( const vcl::Font& rFont ); diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx index 405f4649fcb8..a709487f1a56 100644 --- a/include/svx/checklbx.hxx +++ b/include/svx/checklbx.hxx @@ -43,7 +43,7 @@ private: SvLBoxButtonKind eButtonKind ) SAL_OVERRIDE; public: - SvxCheckListBox( Window* pParent, WinBits nWinStyle = 0 ); + SvxCheckListBox( vcl::Window* pParent, WinBits nWinStyle = 0 ); void SetNormalStaticImage(const Image& rNormalStaticImage); virtual ~SvxCheckListBox(); diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index 2a1df616d24e..e4d4975e6a59 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -58,8 +58,8 @@ protected: DECL_STATIC_LINK(SvxColorValueSet_docking, ExecDragHdl, void*); public: - SvxColorValueSet_docking( Window* pParent, WinBits nWinStyle = WB_ITEMBORDER ); - SvxColorValueSet_docking( Window* pParent, const ResId& rResId ); + SvxColorValueSet_docking( vcl::Window* pParent, WinBits nWinStyle = WB_ITEMBORDER ); + SvxColorValueSet_docking( vcl::Window* pParent, const ResId& rResId ); bool IsLeftButton() const { return mbLeftButton; } }; @@ -102,7 +102,7 @@ protected: public: SvxColorDockingWindow( SfxBindings* pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const ResId& rResId ); virtual ~SvxColorDockingWindow(); diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index d1d6318821e0..b8dcf80da12a 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -81,8 +81,8 @@ private: sal_uLong GetSelectedInterpolationType(); public: - CompressGraphicsDialog( Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings ); - CompressGraphicsDialog( Window* pParent, Graphic& rGraphic, Size rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings ); + CompressGraphicsDialog( vcl::Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings ); + CompressGraphicsDialog( vcl::Window* pParent, Graphic& rGraphic, Size rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings ); virtual ~CompressGraphicsDialog(); diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx index d8a8924253f5..6caac030eb93 100644 --- a/include/svx/connctrl.hxx +++ b/include/svx/connctrl.hxx @@ -44,7 +44,7 @@ private: SVX_DLLPRIVATE void SetStyles(); SVX_DLLPRIVATE void AdaptSize(); public: - SvxXConnectionPreview( Window* pParent, WinBits nStyle); + SvxXConnectionPreview( vcl::Window* pParent, WinBits nStyle); virtual ~SvxXConnectionPreview(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index 4d42c1d47d84..75954e0f2b2c 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -37,7 +37,7 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow { public: - SvxContourDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); + SvxContourDlgChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW_WITHID( SvxContourDlgChildWindow ); }; @@ -74,7 +74,7 @@ protected: public: SvxContourDlg(SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent); + vcl::Window* pParent); virtual ~SvxContourDlg(); const Graphic& GetGraphic() const; diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index f2f7dbf38ed6..685696106672 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -202,7 +202,7 @@ protected: void EnableDateLine2(bool bFlag); public: - SvxTPFilter( Window * pParent); + SvxTPFilter( vcl::Window * pParent); virtual void DeactivatePage() SAL_OVERRIDE; void SetRedlinTable(SvxRedlinTable*); @@ -314,7 +314,7 @@ private: DECL_LINK( PbClickHdl, PushButton* ); public: - SvxTPView(Window * pParent); + SvxTPView(vcl::Window * pParent); virtual ~SvxTPView(); void InsertWriterHeader(); @@ -373,7 +373,7 @@ private: sal_uInt16 m_nFilterPageId; public: - SvxAcceptChgCtr(Window* pParent); + SvxAcceptChgCtr(vcl::Window* pParent); virtual ~SvxAcceptChgCtr(); diff --git a/include/svx/databaseregistrationui.hxx b/include/svx/databaseregistrationui.hxx index 80df7133279b..625f08887b65 100644 --- a/include/svx/databaseregistrationui.hxx +++ b/include/svx/databaseregistrationui.hxx @@ -22,7 +22,7 @@ #include <svx/svxdllapi.h> -class Window; +namespace vcl { class Window; } #define SID_SB_POOLING_ENABLED (RID_OFA_START + 247) #define SID_SB_DRIVER_TIMEOUTS (RID_OFA_START + 248) @@ -32,7 +32,7 @@ namespace svx { /** opens a dialog which allows the user to administrate the database registrations */ - sal_uInt16 SVX_DLLPUBLIC administrateDatabaseRegistration( Window* _parentWindow ); + sal_uInt16 SVX_DLLPUBLIC administrateDatabaseRegistration( vcl::Window* _parentWindow ); } // namespace svx diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 36a6931e8190..800bb1a90f1e 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -36,7 +36,7 @@ namespace svx { class DialControlBmp : public VirtualDevice { public: - explicit DialControlBmp( Window& rParent ); + explicit DialControlBmp( vcl::Window& rParent ); void InitBitmap(const vcl::Font& rFont); void SetSize(const Size& rSize); @@ -58,7 +58,7 @@ private: void Init(); - Window& mrParent; + vcl::Window& mrParent; long mnCenterX; long mnCenterY; }; @@ -80,7 +80,7 @@ private: class SVX_DLLPUBLIC DialControl : public Control { public: - explicit DialControl( Window* pParent, WinBits nBits ); + explicit DialControl( vcl::Window* pParent, WinBits nBits ); virtual ~DialControl(); @@ -143,7 +143,7 @@ protected: long mnCenterY; bool mbNoRot; - explicit DialControl_Impl( Window& rParent ); + explicit DialControl_Impl( vcl::Window& rParent ); void Init( const Size& rWinSize, const vcl::Font& rWinFont ); void SetSize( const Size& rWinSize ); }; diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 3ebb61fb21c2..8d3901bc3a5e 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -55,8 +55,8 @@ protected: void Construct(); public: - Svx3DPreviewControl(Window* pParent, const ResId& rResId); - Svx3DPreviewControl(Window* pParent, WinBits nStyle = 0); + Svx3DPreviewControl(vcl::Window* pParent, const ResId& rResId); + Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle = 0); virtual ~Svx3DPreviewControl(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -111,7 +111,7 @@ class SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewControl void TrySelection(Point aPosPixel); public: - Svx3DLightControl(Window* pParent, WinBits nStyle = 0); + Svx3DLightControl(vcl::Window* pParent, WinBits nStyle = 0); virtual ~Svx3DLightControl(); virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; @@ -165,8 +165,8 @@ private: Link maUserSelectionChangeCallback; public: - SvxLightCtl3D( Window* pParent, const ResId& rResId); - SvxLightCtl3D( Window* pParent); + SvxLightCtl3D( vcl::Window* pParent, const ResId& rResId); + SvxLightCtl3D( vcl::Window* pParent); virtual ~SvxLightCtl3D(); // react to size changes diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 6127f70d26b2..21cba2546081 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -42,11 +42,11 @@ class SvxTabPage : public SfxTabPage { public: - SvxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) + SvxTabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) : SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet) { } - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) = 0; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) = 0; }; /************************************************************************* @@ -95,7 +95,7 @@ protected: Point GetApproxLogPtFromPixPt( const Point& rRoughPixelPoint ) const; public: - SvxRectCtl( Window* pParent, RECT_POINT eRpt = RP_MM, + SvxRectCtl( vcl::Window* pParent, RECT_POINT eRpt = RP_MM, sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT ); void SetControlSettings(RECT_POINT eRpt = RP_MM, sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT); @@ -142,7 +142,7 @@ protected: const sal_uInt16* pBmpArray; public: - SvxBitmapCtl( Window* pParent, const Size& rSize ); + SvxBitmapCtl( vcl::Window* pParent, const Size& rSize ); ~SvxBitmapCtl(); BitmapEx GetBitmapEx(); @@ -176,7 +176,7 @@ protected: void ChangePixel( sal_uInt16 nPixel ); public: - SvxPixelCtl( Window* pParent, sal_uInt16 nNumber = 8 ); + SvxPixelCtl( vcl::Window* pParent, sal_uInt16 nNumber = 8 ); virtual ~SvxPixelCtl(); @@ -225,8 +225,8 @@ class SVX_DLLPUBLIC ColorLB : public ColorListBox { public: - ColorLB( Window* pParent, ResId Id ) : ColorListBox( pParent, Id ) {} - ColorLB( Window* pParent, WinBits aWB ) : ColorListBox( pParent, aWB ) {} + ColorLB( vcl::Window* pParent, ResId Id ) : ColorListBox( pParent, Id ) {} + ColorLB( vcl::Window* pParent, WinBits aWB ) : ColorListBox( pParent, aWB ) {} virtual void Fill( const XColorListRef &pTab ); @@ -240,7 +240,7 @@ class SVX_DLLPUBLIC HatchingLB : public ListBox { XHatchListRef mpList; public: - explicit HatchingLB(Window* pParent, WinBits aWB); + explicit HatchingLB(vcl::Window* pParent, WinBits aWB); virtual void Fill( const XHatchListRef &pList ); @@ -254,7 +254,7 @@ class SVX_DLLPUBLIC GradientLB : public ListBox { XGradientListRef mpList; public: - explicit GradientLB(Window* pParent, WinBits aWB); + explicit GradientLB(vcl::Window* pParent, WinBits aWB); virtual void Fill( const XGradientListRef &pList ); @@ -269,7 +269,7 @@ public: class SVX_DLLPUBLIC BitmapLB : public ListBox { public: - explicit BitmapLB(Window* pParent, WinBits aWB); + explicit BitmapLB(vcl::Window* pParent, WinBits aWB); virtual void Fill(const XBitmapListRef &pList); @@ -291,7 +291,7 @@ private: BitmapEx maBitmapEx; public: - FillAttrLB( Window* pParent, WinBits aWB ); + FillAttrLB( vcl::Window* pParent, WinBits aWB ); virtual void Fill( const XColorListRef &pList ); virtual void Fill( const XHatchListRef &pList ); @@ -305,8 +305,8 @@ class FillTypeLB : public ListBox { public: - FillTypeLB( Window* pParent, ResId Id ) : ListBox( pParent, Id ) {} - FillTypeLB( Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {} + FillTypeLB( vcl::Window* pParent, ResId Id ) : ListBox( pParent, Id ) {} + FillTypeLB( vcl::Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {} virtual void Fill(); }; @@ -321,7 +321,7 @@ private: bool mbAddStandardFields : 1; public: - LineLB(Window* pParent, WinBits aWB); + LineLB(vcl::Window* pParent, WinBits aWB); virtual ~LineLB(); virtual void Fill(const XDashListRef &pList); @@ -340,7 +340,7 @@ class SVX_DLLPUBLIC LineEndLB : public ListBox { public: - LineEndLB( Window* pParent, WinBits aWB ); + LineEndLB( vcl::Window* pParent, WinBits aWB ); virtual ~LineEndLB (void); virtual void Fill( const XLineEndListRef &pList, bool bStart = true ); @@ -371,7 +371,7 @@ protected: void LocalPostPaint(); public: - SvxPreviewBase(Window* pParent); + SvxPreviewBase(vcl::Window* pParent); virtual ~SvxPreviewBase(); // change support @@ -401,7 +401,7 @@ private: Size maSymbolSize; public: - SvxXLinePreview( Window* pParent ); + SvxXLinePreview( vcl::Window* pParent ); virtual ~SvxXLinePreview(); void SetLineAttributes(const SfxItemSet& rItemSet); @@ -427,7 +427,7 @@ private: SdrObject* mpRectangleObject; public: - SvxXRectPreview(Window* pParent); + SvxXRectPreview(vcl::Window* pParent); virtual ~SvxXRectPreview(); void SetAttributes(const SfxItemSet& rItemSet); @@ -451,7 +451,7 @@ private: SdrObject* mpRectangleShadow; public: - SvxXShadowPreview(Window *pParent); + SvxXShadowPreview(vcl::Window *pParent); virtual ~SvxXShadowPreview(); diff --git a/include/svx/f3dchild.hxx b/include/svx/f3dchild.hxx index 87eeb5313e81..a306f2f3d7fc 100644 --- a/include/svx/f3dchild.hxx +++ b/include/svx/f3dchild.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC Svx3DChildWindow : public SfxChildWindow { public: - Svx3DChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); + Svx3DChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW_WITHID(Svx3DChildWindow); }; diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index 215ce4de56a8..c8878d9f8355 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -67,12 +67,12 @@ public: virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) SAL_OVERRIDE; void Update(const SfxPoolItem* pState); - virtual Window* CreateItemWindow(Window* pParent) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow(vcl::Window* pParent) SAL_OVERRIDE; }; -class FillControl : public Window +class FillControl : public vcl::Window { private: friend class SvxFillToolBoxControl; @@ -99,7 +99,7 @@ private: void updateLastFillAttrControlSelectEntryPos(); public: - FillControl(Window* pParent, WinBits nStyle = 0); + FillControl(vcl::Window* pParent, WinBits nStyle = 0); virtual ~FillControl(); virtual void Resize() SAL_OVERRIDE; diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index c88fa556f392..610ec06b896a 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -238,7 +238,7 @@ protected: public: Svx3DWin( SfxBindings* pBindings, SfxChildWindow *pCW, - Window* pParent ); + vcl::Window* pParent ); virtual ~Svx3DWin(); void InitColorLB( const SdrModel* pDoc ); diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 914758f31475..f373f5e59787 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -106,7 +106,7 @@ class SVX_DLLPUBLIC FmGridControl : public DbGridControl public: FmGridControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&, - Window* pParent, + vcl::Window* pParent, FmXGridPeer* _pPeer, WinBits nBits); diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 4d5fd549840b..a14bb5b4a960 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -309,7 +309,7 @@ public: virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual FmXGridPeer* imp_CreatePeer(Window* pParent); + virtual FmXGridPeer* imp_CreatePeer(vcl::Window* pParent); // ImplCreatePeer would be better, but doesn't work because it's not exported }; @@ -376,7 +376,7 @@ public: virtual ~FmXGridPeer(); // spaeter Constructor, immer nach dem realen Constructor zu rufen ! - void Create(Window* pParent, WinBits nStyle); + void Create(vcl::Window* pParent, WinBits nStyle); // UNO connection DECLARE_UNO3_DEFAULTS(FmXGridPeer, VCLXWindow) @@ -515,7 +515,7 @@ public: virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle); + virtual FmGridControl* imp_CreateControl(vcl::Window* pParent, WinBits nStyle); static ::com::sun::star::uno::Sequence< ::com::sun::star::util::URL>& getSupportedURLs(); static ::com::sun::star::uno::Sequence<sal_uInt16>& getSupportedGridSlots(); diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index 7331b1de0eea..e381a64bada7 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -70,7 +70,7 @@ public: const OUString& GetName() const { return m_sPageName; } void SetName( const OUString& rName ) { m_sPageName = rName; } bool RequestHelp( - Window* pWin, + vcl::Window* pWin, SdrView* pView, const HelpEvent& rEvt ); }; diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index f8ecdcc994f6..1d1309854a0e 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -89,7 +89,7 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell class FormShellWaitObject { - Window* m_pWindow; + vcl::Window* m_pWindow; public: FormShellWaitObject(const FmFormShell* _pShell); ~FormShellWaitObject(); diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 946599ec8107..61edca34e54b 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -70,18 +70,18 @@ #include <set> -class Window; +namespace vcl { class Window; } // common types // displaying a database exception for the user // display info about a simple css::sdbc::SQLException -void displayException(const css::sdbc::SQLException&, Window* _pParent = NULL); -void displayException(const css::sdbc::SQLWarning&, Window* _pParent = NULL); -SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, Window* _pParent = NULL); -void displayException(const css::sdb::SQLErrorEvent&, Window* _pParent = NULL); -void displayException(const css::uno::Any&, Window* _pParent = NULL); +void displayException(const css::sdbc::SQLException&, vcl::Window* _pParent = NULL); +void displayException(const css::sdbc::SQLWarning&, vcl::Window* _pParent = NULL); +SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* _pParent = NULL); +void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent = NULL); +void displayException(const css::uno::Any&, vcl::Window* _pParent = NULL); sal_Int32 getElementPos(const css::uno::Reference< css::container::XIndexAccess>& xCont, const css::uno::Reference< css::uno::XInterface>& xElement); diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 21e27fa9500e..3e116f0a278c 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -109,7 +109,7 @@ public: // for copying complete form structures, not only control models virtual SdrModel* GetMarkedObjModel() const SAL_OVERRIDE; - virtual bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ) SAL_OVERRIDE; + virtual bool MouseButtonDown( const MouseEvent& _rMEvt, vcl::Window* _pWin ) SAL_OVERRIDE; /** grab the focus to the first form control on the view @param _bForceSync @@ -123,7 +123,7 @@ public: GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; // SdrView - bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; + bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) SAL_OVERRIDE; /// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL" FmFormPage* GetCurPage(); diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index aaa73142dd7f..0c9461f73891 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -34,7 +34,7 @@ class FontPrevWin_Impl; // class SvxFontPrevWindow ----------------------------------------------- -class SVX_DLLPUBLIC SvxFontPrevWindow : public Window +class SVX_DLLPUBLIC SvxFontPrevWindow : public vcl::Window { using OutputDevice::SetFont; private: @@ -46,8 +46,8 @@ private: SVX_DLLPRIVATE void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); public: - SvxFontPrevWindow( Window* pParent, const ResId& rId ); - SvxFontPrevWindow(Window* pParent, WinBits nStyle); + SvxFontPrevWindow( vcl::Window* pParent, const ResId& rId ); + SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle); virtual ~SvxFontPrevWindow(); virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index d5a1b25bdff1..5755a308e0c0 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -70,7 +70,7 @@ private: bool mbUseFont; /// true = Use maEntryFont/mpEntryColor in InitEntry(). public: - SvxFontListBox(Window* pParent, WinBits nStyle = WB_BORDER); + SvxFontListBox(vcl::Window* pParent, WinBits nStyle = WB_BORDER); /** Inserts a list entry and sets the font used for this entry. @param pColor The font color. NULL = use default listbox text color. */ diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index 5292cc180f69..656eb91a0beb 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -75,7 +75,7 @@ public: class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow { public: - SvxFontWorkChildWindow(Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); + SvxFontWorkChildWindow(vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW_WITHID(SvxFontWorkChildWindow); }; @@ -158,7 +158,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow public: SvxFontWorkDialog( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const ResId& rResId ); virtual ~SvxFontWorkDialog(); diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index fba83a09f8e2..7bd4534a83ae 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -36,7 +36,7 @@ class FmFormModel; class SdrView; -class Window; +namespace vcl { class Window; } class SdrTextObj; class SdrObject; class SdrModel; @@ -67,7 +67,7 @@ class FontworkCharacterSpacingDialog : public ModalDialog MetricField* m_pMtrScale; public: - FontworkCharacterSpacingDialog( Window* pParent, sal_Int32 nScale ); + FontworkCharacterSpacingDialog( vcl::Window* pParent, sal_Int32 nScale ); sal_Int32 getScale() const; }; @@ -97,7 +97,7 @@ class SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog std::vector< BitmapEx> maFavoritesHorizontal; public: - FontWorkGalleryDialog( SdrView* pView, Window* pParent, sal_uInt16 nSID ); + FontWorkGalleryDialog( SdrView* pView, vcl::Window* pParent, sal_uInt16 nSID ); virtual ~FontWorkGalleryDialog(); // SJ: if the SdrObject** is set, the SdrObject is not inserted into the page when executing the dialog diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index a738659aa54a..80bd1b12f0ad 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -39,7 +39,7 @@ namespace svx { class SVX_DLLPUBLIC FrameDirectionListBox : public ListBox { public: - explicit FrameDirectionListBox( Window* pParent, WinBits nBits ); + explicit FrameDirectionListBox( vcl::Window* pParent, WinBits nBits ); virtual ~FrameDirectionListBox(); /** Inserts a string with corresponding direction enum into the listbox. */ diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 4a3f0ffeb8be..29d1ddfbfbfc 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -83,7 +83,7 @@ enum FrameBorderState class SVX_DLLPUBLIC FrameSelector : public Control { public: - FrameSelector(Window* pParent); + FrameSelector(vcl::Window* pParent); virtual ~FrameSelector(); /** Initializes the control, enables/disables frame borders according to flags. */ diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index 752fdf38cc6c..4abfde111486 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -40,7 +40,7 @@ class GalleryTheme; class GalleryBrowser2; -class SVX_DLLPUBLIC GalleryPreview : public Window, public DropTargetHelper, public DragSourceHelper +class SVX_DLLPUBLIC GalleryPreview : public vcl::Window, public DropTargetHelper, public DragSourceHelper { private: @@ -71,7 +71,7 @@ private: public: - GalleryPreview(Window* pParent, + GalleryPreview(vcl::Window* pParent, WinBits nStyle = WB_TABSTOP | WB_BORDER, GalleryTheme* pTheme = NULL); diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index def4f9b01c17..4feff17a0f2c 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -181,8 +181,8 @@ protected: virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; virtual void ObjectReleased() SAL_OVERRIDE; - void CopyToClipboard( Window* pWindow ); - void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, + void CopyToClipboard( vcl::Window* pWindow ); + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ); }; diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index d7f36437d396..e36d804b13c9 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -216,8 +216,8 @@ public: SAL_DLLPRIVATE bool InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos ); - SAL_DLLPRIVATE void CopyToClipboard( Window* pWindow, sal_uIntPtr nPos ); - SAL_DLLPRIVATE void StartDrag( Window* pWindow, sal_uIntPtr nPos ); + SAL_DLLPRIVATE void CopyToClipboard( vcl::Window* pWindow, sal_uIntPtr nPos ); + SAL_DLLPRIVATE void StartDrag( vcl::Window* pWindow, sal_uIntPtr nPos ); public: diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index a5412f2b5985..acfd5f356cfa 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -68,7 +68,7 @@ public: virtual ~SvxGrafToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; @@ -160,7 +160,7 @@ public: virtual ~SvxGrafModeToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 1e04dc6d31c2..4e8060d77717 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -80,7 +80,7 @@ protected: public: - GraphCtrl( Window* pParent, WinBits nStyle ); + GraphCtrl( vcl::Window* pParent, WinBits nStyle ); virtual ~GraphCtrl(); void SetWinStyle( WinBits nWinBits ); diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 662b9b2501a2..3aaecfea60f3 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -142,7 +142,7 @@ public: class AbsolutePos : public NumericField { public: - AbsolutePos(Window* pParent, WinBits nStyle = 0); + AbsolutePos(vcl::Window* pParent, WinBits nStyle = 0); virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; @@ -182,7 +182,7 @@ public: RECORD_NEW }; - NavigationBar(Window* pParent, WinBits nStyle = 0); + NavigationBar(vcl::Window* pParent, WinBits nStyle = 0); // Status methods for Controls void InvalidateAll(sal_Int32 nCurrentPos = -1, bool bAll = false); @@ -366,7 +366,7 @@ protected: public: DbGridControl( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >, - Window* pParent, + vcl::Window* pParent, WinBits nBits = WB_BORDER); virtual ~DbGridControl(); diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 1569f9ed73d9..d7f15be412e2 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -31,7 +31,7 @@ namespace svx { - SVX_DLLPUBLIC bool ShowBorderBackgroundDlg( Window* pParent, SfxItemSet* pBBSet, + SVX_DLLPUBLIC bool ShowBorderBackgroundDlg( vcl::Window* pParent, SfxItemSet* pBBSet, bool bEnableBackgroundSelector ); } @@ -65,7 +65,7 @@ protected: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); + SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); FixedText* m_pPageLbl; CheckBox* m_pTurnOnBox; @@ -110,11 +110,11 @@ private: class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: - SvxHeaderPage( Window* pParent, const SfxItemSet& rSet ); + SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; // class SvxFooterPage --------------------------------------------------- @@ -122,17 +122,17 @@ private: class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: - SVX_DLLPRIVATE SvxFooterPage( Window* pParent, const SfxItemSet& rSet ); + SVX_DLLPRIVATE SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class SVX_DLLPUBLIC DeleteHeaderDialog : public MessageDialog { public: - DeleteHeaderDialog(Window *pParent) + DeleteHeaderDialog(vcl::Window *pParent) : MessageDialog(pParent, "DeleteHeaderDialog", "svx/ui/deleteheaderdialog.ui") { @@ -142,7 +142,7 @@ public: class SVX_DLLPUBLIC DeleteFooterDialog : public MessageDialog { public: - DeleteFooterDialog(Window *pParent) + DeleteFooterDialog(vcl::Window *pParent) : MessageDialog(pParent, "DeleteFooterDialog", "svx/ui/deletefooterdialog.ui") { diff --git a/include/svx/hyperdlg.hxx b/include/svx/hyperdlg.hxx index 4baa8e9807e0..86f02bfca409 100644 --- a/include/svx/hyperdlg.hxx +++ b/include/svx/hyperdlg.hxx @@ -37,7 +37,7 @@ private: AbstractSvxHpLinkDlg* mpDlg; public: - SvxHlinkDlgWrapper( Window*pParent, sal_uInt16 nId, + SvxHlinkDlgWrapper( vcl::Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW_WITHID(SvxHlinkDlgWrapper); diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 200fa88bdb31..76bc59fe4c53 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -47,7 +47,7 @@ class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public SfxChildWindow { public: - SvxIMapDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); + SvxIMapDlgChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW_WITHID( SvxIMapDlgChildWindow ); @@ -134,7 +134,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow public: SvxIMapDlg( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent ); + vcl::Window* pParent ); virtual ~SvxIMapDlg(); void SetExecState( bool bEnable ); diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 2bbb824b2d7e..0df5118feda8 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -46,7 +46,7 @@ class SvxLineBox : public LineLB void ReleaseFocus_Impl(); public: - SvxLineBox( Window* pParent, + SvxLineBox( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); virtual ~SvxLineBox(); @@ -84,7 +84,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SvxMetricField( Window* pParent, + SvxMetricField( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); virtual ~SvxMetricField(); @@ -99,7 +99,7 @@ public: class SvxFillTypeBox : public FillTypeLB { public: - SvxFillTypeBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); + SvxFillTypeBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); virtual ~SvxFillTypeBox(); void Selected() { bSelect = true; } @@ -122,7 +122,7 @@ private: class SvxFillAttrBox : public FillAttrLB { public: - SvxFillAttrBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); + SvxFillAttrBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); virtual ~SvxFillAttrBox(); bool IsRelease() { return bRelease;} diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 909c1c8d9984..da82e900453b 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -114,7 +114,7 @@ protected: class SVX_DLLPUBLIC SvxLanguageBox : public ListBox, public SvxLanguageBoxBase { public: - SvxLanguageBox( Window* pParent, WinBits nBits, bool bCheck = false ); + SvxLanguageBox( vcl::Window* pParent, WinBits nBits, bool bCheck = false ); virtual ~SvxLanguageBox(); private: @@ -141,7 +141,7 @@ private: class SVX_DLLPUBLIC SvxLanguageComboBox : public ComboBox, public SvxLanguageBoxBase { public: - SvxLanguageComboBox( Window* pParent, WinBits nBits, bool bCheck = false ); + SvxLanguageComboBox( vcl::Window* pParent, WinBits nBits, bool bCheck = false ); virtual ~SvxLanguageComboBox(); enum EditedAndValid diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index 4beb9bde5fce..c7c80a48b15a 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -52,7 +52,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; void Update( const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; @@ -69,7 +69,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; @@ -115,7 +115,7 @@ public: const OUString& rWndTitle ); SvxLineEndWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow, + vcl::Window* pParentWindow, const OUString& rWndTitle ); virtual ~SvxLineEndWindow(); diff --git a/include/svx/linkwarn.hxx b/include/svx/linkwarn.hxx index beb715452238..8fc66afffb18 100644 --- a/include/svx/linkwarn.hxx +++ b/include/svx/linkwarn.hxx @@ -30,7 +30,7 @@ private: CheckBox* m_pWarningOnBox; public: - SvxLinkWarningDialog(Window* pParent, const OUString& _rFileName); + SvxLinkWarningDialog(vcl::Window* pParent, const OUString& _rFileName); virtual ~SvxLinkWarningDialog(); }; diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index 2c037e2320a2..83161ca627ed 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -41,7 +41,7 @@ private: SdrModel* pModel; public: - SvxXMeasurePreview(Window* pParent, WinBits nStyle); + SvxXMeasurePreview(vcl::Window* pParent, WinBits nStyle); virtual ~SvxXMeasurePreview(); virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index ff64b4850175..eefdcb9c8ed7 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -66,7 +66,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet com::sun::star::container::XIndexAccess> > aOutlineSettings; public: - SvxNumValueSet(Window* pParent, WinBits nWinBits = WB_TABSTOP); + SvxNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP); void init(sal_uInt16 nType); virtual ~SvxNumValueSet(); @@ -105,7 +105,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet Timer& GetFormatTimer() {return aFormatTimer;} public: - SvxBmpNumValueSet(Window* pParent, WinBits nWinBits = WB_TABSTOP); + SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP); virtual ~SvxBmpNumValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 86e5e1d5ee96..1d6e62b6c0f5 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -100,9 +100,9 @@ class SVX_DLLPUBLIC SvxGridTabPage : public SfxTabPage using TabPage::DeactivatePage; public: - SvxGridTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx index 7401b9153c6c..c7946c94c16d 100644 --- a/include/svx/orienthelper.hxx +++ b/include/svx/orienthelper.hxx @@ -68,7 +68,7 @@ public: TRISTATE_TRUE: Window always disabled, if stacked text is turned on. TRISTATE_FALSE: Window always disabled, if stacked text is turned off. TRISTATE_INDET: Window will be enabled/disabled independent from stacked text. */ - void AddDependentWindow( Window& rWindow, TriState eDisableIfStacked = TRISTATE_INDET ); + void AddDependentWindow( vcl::Window& rWindow, TriState eDisableIfStacked = TRISTATE_INDET ); /** Enables or disables the dial control and all dependent windows. */ void Enable( bool bEnable = true ); diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index ee1ffbb030f5..8b6da4dd29f0 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -27,7 +27,7 @@ class SvxBoxItem; // class SvxPageWindow --------------------------------------------------- -class SVX_DLLPUBLIC SvxPageWindow : public Window +class SVX_DLLPUBLIC SvxPageWindow : public vcl::Window { using Window::GetBorder; @@ -87,7 +87,7 @@ protected: const Rectangle& rDefineRange); public: - SvxPageWindow( Window* pParent ); + SvxPageWindow( vcl::Window* pParent ); virtual ~SvxPageWindow(); //UUUU diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index a67f6f07eeb4..bfbd6a2687bc 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -37,7 +37,7 @@ enum SvxPrevLineSpace // class SvxParaPrevWindow ----------------------------------------------- -class SVX_DLLPUBLIC SvxParaPrevWindow : public Window +class SVX_DLLPUBLIC SvxParaPrevWindow : public vcl::Window { using Window::Draw; private: @@ -68,7 +68,7 @@ protected: void DrawParagraph( bool bAll ); public: - SvxParaPrevWindow( Window* pParent, WinBits nBits); + SvxParaPrevWindow( vcl::Window* pParent, WinBits nBits); void SetFirstLineOfst( short nNew ) { nFirstLineOfst = nNew; } void SetLeftMargin( long nNew ) { nLeftMargin = nNew; } diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index 3b2f95800d5b..920fa19c7c68 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -51,7 +51,7 @@ private: DECL_LINK(EditModifyHdl, void *); public: - SvxPasswordDialog( Window* pParent, bool bAllowEmptyPasswords = false, bool bDisableOldPassword = false ); + SvxPasswordDialog( vcl::Window* pParent, bool bAllowEmptyPasswords = false, bool bDisableOldPassword = false ); virtual ~SvxPasswordDialog(); OUString GetOldPassword() const { return m_pOldPasswdED->GetText(); } diff --git a/include/svx/pfiledlg.hxx b/include/svx/pfiledlg.hxx index 39599affb16b..0b4e52ce733b 100644 --- a/include/svx/pfiledlg.hxx +++ b/include/svx/pfiledlg.hxx @@ -36,7 +36,7 @@ private: public: // with nKind = SID_INSERT_SOUND or // nKind = SID_INSERT_VIDEO - SvxPluginFileDlg (Window *pParent, sal_uInt16 nKind ); + SvxPluginFileDlg (vcl::Window *pParent, sal_uInt16 nKind ); ~SvxPluginFileDlg (); ErrCode Execute(); diff --git a/include/svx/prtqry.hxx b/include/svx/prtqry.hxx index 3a1446610639..afe6b9b6d85a 100644 --- a/include/svx/prtqry.hxx +++ b/include/svx/prtqry.hxx @@ -25,7 +25,7 @@ class SVX_DLLPUBLIC SvxPrtQryBox : public MessBox { public: - SvxPrtQryBox(Window* pParent); + SvxPrtQryBox(vcl::Window* pParent); virtual ~SvxPrtQryBox(); }; diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx index 91fb36d6d709..d5825d7ffbe0 100644 --- a/include/svx/relfld.hxx +++ b/include/svx/relfld.hxx @@ -40,7 +40,7 @@ protected: void Modify() SAL_OVERRIDE; public: - SvxRelativeField(Window* pParent, WinBits nBits, FieldUnit eUnit); + SvxRelativeField(vcl::Window* pParent, WinBits nBits, FieldUnit eUnit); void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150, sal_uInt16 nStep = 5 ); diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index c9daaaa85811..bd605a17778e 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -40,14 +40,14 @@ namespace com{namespace sun{namespace star{ class SvxRubyDialog; -class RubyPreview : public Window +class RubyPreview : public vcl::Window { protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; SvxRubyDialog* m_pParentDlg; public: - RubyPreview(Window *pParent); + RubyPreview(vcl::Window *pParent); void setRubyDialog(SvxRubyDialog* pParentDlg) { m_pParentDlg = pParentDlg; @@ -59,7 +59,7 @@ class SVX_DLLPUBLIC SvxRubyChildWindow : public SfxChildWindow { public: - SvxRubyChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); + SvxRubyChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW( SvxRubyChildWindow ); @@ -72,11 +72,11 @@ class RubyEdit : public Edit virtual void GetFocus() SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - RubyEdit(Window* pParent, const ResId& rResId) + RubyEdit(vcl::Window* pParent, const ResId& rResId) : Edit(pParent, rResId) { } - RubyEdit(Window* pParent) + RubyEdit(vcl::Window* pParent) : Edit(pParent, WB_BORDER) { } @@ -161,7 +161,7 @@ protected: public: SvxRubyDialog(SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent); + vcl::Window* pParent); virtual ~SvxRubyDialog(); virtual void Activate() SAL_OVERRIDE; diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index fee6b3c855b5..96f301229928 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -57,7 +57,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener boost::scoped_ptr<SvxColumnItem> mpColumnItem; // columns boost::scoped_ptr<SvxObjectItem> mpObjectItem; // object - Window* pEditWin; + vcl::Window* pEditWin; boost::scoped_ptr<SvxRuler_Impl> mpRulerImpl; @@ -251,7 +251,7 @@ public: #define SVXRULER_SUPPORT_PARAGRAPH_MARGINS_VERTICAL 0x0040 #define SVXRULER_SUPPORT_REDUCED_METRIC 0x0080 //shorten the context menu to select metric - SvxRuler(Window* pParent, Window *pEditWin, sal_uInt16 nRulerFlags, + SvxRuler(vcl::Window* pParent, vcl::Window *pEditWin, sal_uInt16 nRulerFlags, SfxBindings &rBindings, WinBits nWinStyle = WB_STDRULER); virtual ~SvxRuler(); diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 0f2de215415f..11824be41b17 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -46,10 +46,10 @@ public: SVX_DLLPRIVATE virtual ~SvxTableController(); // from sdr::SelectionController - SVX_DLLPRIVATE virtual bool onKeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; SVX_DLLPRIVATE virtual bool DeleteMarked() SAL_OVERRIDE; @@ -134,12 +134,12 @@ private: SVX_DLLPRIVATE void MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow ); - SVX_DLLPRIVATE void EditCell( const CellPos& rPos, ::Window* pWindow, const ::com::sun::star::awt::MouseEvent* pMouseEvent = 0, sal_uInt16 nAction = 0 ); + SVX_DLLPRIVATE void EditCell( const CellPos& rPos, vcl::Window* pWindow, const ::com::sun::star::awt::MouseEvent* pMouseEvent = 0, sal_uInt16 nAction = 0 ); SVX_DLLPRIVATE bool StopTextEdit(); - SVX_DLLPRIVATE sal_uInt16 getKeyboardAction( const KeyEvent& rKEvt, Window* pWindow ); - SVX_DLLPRIVATE bool executeAction( sal_uInt16 nAction, bool bSelect, Window* pWindow ); - SVX_DLLPRIVATE void gotoCell( const CellPos& rCell, bool bSelect, Window* pWindow, sal_uInt16 nAction = 0 ); + SVX_DLLPRIVATE sal_uInt16 getKeyboardAction( const KeyEvent& rKEvt, vcl::Window* pWindow ); + SVX_DLLPRIVATE bool executeAction( sal_uInt16 nAction, bool bSelect, vcl::Window* pWindow ); + SVX_DLLPRIVATE void gotoCell( const CellPos& rCell, bool bSelect, vcl::Window* pWindow, sal_uInt16 nAction = 0 ); SVX_DLLPRIVATE void StartSelection( const CellPos& rPos ); SVX_DLLPRIVATE void UpdateSelection( const CellPos& rPos ); diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index abdbcc016d72..ca65289bf220 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -44,7 +44,7 @@ namespace sdr /// paint the transparent children of rWin that overlap rPixelRect /// (for example, transparent form controls like check boxes) void SVX_DLLPUBLIC -PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect); +PaintTransparentChildren(vcl::Window & rWindow, Rectangle const& rPixelRect); class SdrPreRenderDevice diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx index 9836527459df..98532141ae87 100644 --- a/include/svx/selectioncontroller.hxx +++ b/include/svx/selectioncontroller.hxx @@ -28,7 +28,7 @@ class KeyEvent; class MouseEvent; -class Window; +namespace vcl { class Window; } class SfxItemSet; class SfxRequest; class SfxStyleSheet; @@ -41,10 +41,10 @@ namespace sdr class SVX_DLLPUBLIC SelectionController: public cppu::OWeakObject { public: - virtual bool onKeyInput(const KeyEvent& rKEvt, Window* pWin); - virtual bool onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin); - virtual bool onMouseButtonUp(const MouseEvent& rMEvt, Window* pWin); - virtual bool onMouseMove(const MouseEvent& rMEvt, Window* pWin); + virtual bool onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWin); + virtual bool onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin); + virtual bool onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin); + virtual bool onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWin); virtual void onSelectionHasChanged(); diff --git a/include/svx/sidebar/ColorControl.hxx b/include/svx/sidebar/ColorControl.hxx index 8888dcbd66d1..87ebf3013e67 100644 --- a/include/svx/sidebar/ColorControl.hxx +++ b/include/svx/sidebar/ColorControl.hxx @@ -26,7 +26,7 @@ #include <boost/function.hpp> #include <svx/SvxColorValueSet.hxx> -class Window; +namespace vcl { class Window; } class SfxBindings; class RedId; class FloatingWindow; @@ -58,7 +58,7 @@ public: When zero is given then no such field is created. */ ColorControl ( - Window* pParent, + vcl::Window* pParent, SfxBindings* pBindings, const ResId& rControlResId, const ResId& rValueSetResId, diff --git a/include/svx/sidebar/ColorPopup.hxx b/include/svx/sidebar/ColorPopup.hxx index 12e99342da88..3226be019e32 100644 --- a/include/svx/sidebar/ColorPopup.hxx +++ b/include/svx/sidebar/ColorPopup.hxx @@ -38,7 +38,7 @@ class SVX_DLLPUBLIC ColorPopup { public : ColorPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~ColorPopup (void); diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index 13b6086b63fd..9e8b90aac1fe 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -30,7 +30,7 @@ private: DECL_DLLPRIVATE_LINK( ImplHandlePanelLayoutTimerHdl, void* ); public: - PanelLayout(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> &rFrame); virtual ~PanelLayout(); diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx index e5e23b88ce48..c5a1eee729dd 100644 --- a/include/svx/sidebar/Popup.hxx +++ b/include/svx/sidebar/Popup.hxx @@ -26,7 +26,7 @@ #include <boost/function.hpp> #include <boost/scoped_ptr.hpp> -class Window; +namespace vcl { class Window; } class ToolBox; namespace svx { namespace sidebar { @@ -51,7 +51,7 @@ public : PopupControl). */ Popup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator, const ::rtl::OUString& rsAccessibleName); virtual ~Popup (void); @@ -90,7 +90,7 @@ protected: virtual void CreateContainerAndControl (void); private: - Window* mpParent; + vcl::Window* mpParent; ::boost::function<PopupControl*(PopupContainer*)> maControlCreator; ::boost::function<void(void)> maPopupModeEndCallback; const ::rtl::OUString msAccessibleName; diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx index b9ed9286704c..f8f6f524573f 100644 --- a/include/svx/sidebar/PopupContainer.hxx +++ b/include/svx/sidebar/PopupContainer.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC PopupContainer : public FloatingWindow { public: - PopupContainer (Window* pParent); + PopupContainer (vcl::Window* pParent); virtual ~PopupContainer (void); virtual bool Notify (NotifyEvent& rNEvt) SAL_OVERRIDE; diff --git a/include/svx/sidebar/PopupControl.hxx b/include/svx/sidebar/PopupControl.hxx index ccc361f910a8..84bed5af5870 100644 --- a/include/svx/sidebar/PopupControl.hxx +++ b/include/svx/sidebar/PopupControl.hxx @@ -36,7 +36,7 @@ class SVX_DLLPUBLIC PopupControl { public : PopupControl ( - Window* pParent, + vcl::Window* pParent, const ResId& rResId); virtual ~PopupControl (void); diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx index c897e9e4051a..a77d0f412419 100644 --- a/include/svx/sidebar/SidebarDialControl.hxx +++ b/include/svx/sidebar/SidebarDialControl.hxx @@ -28,7 +28,7 @@ namespace svx { namespace sidebar { class SVX_DLLPUBLIC SidebarDialControl : public svx::DialControl { public: - SidebarDialControl (Window* pParent, WinBits nBits = 0); + SidebarDialControl (vcl::Window* pParent, WinBits nBits = 0); virtual ~SidebarDialControl (void); virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx index 5542e2bac2cb..4cb6fbd9c5bc 100644 --- a/include/svx/sidebar/ValueSetWithTextControl.hxx +++ b/include/svx/sidebar/ValueSetWithTextControl.hxx @@ -65,7 +65,7 @@ public: ValueSetWithTextControl( const tControlType eControlType, - Window* pParent, + vcl::Window* pParent, const ResId& rResId); virtual ~ValueSetWithTextControl(void); @@ -129,7 +129,7 @@ class SVX_DLLPUBLIC SvxNumValueSet2 : public ValueSet public: - SvxNumValueSet2( Window* pParent, const ResId& rResId); + SvxNumValueSet2( vcl::Window* pParent, const ResId& rResId); virtual ~SvxNumValueSet2(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; @@ -146,7 +146,7 @@ class SVX_DLLPUBLIC SvxNumValueSet2 : public ValueSet class SVX_DLLPUBLIC SvxNumValueSet3 : public ValueSet { public: - SvxNumValueSet3( Window* pParent, const ResId& rResId); + SvxNumValueSet3( vcl::Window* pParent, const ResId& rResId); virtual ~SvxNumValueSet3(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 7ec864e14544..15d221bcd773 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -91,7 +91,7 @@ class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow { SvxSearchDialog *dialog; public: - SvxSearchDialogWrapper( Window*pParent, sal_uInt16 nId, + SvxSearchDialogWrapper( vcl::Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); virtual ~SvxSearchDialogWrapper (); @@ -118,7 +118,7 @@ friend class SvxSearchDialogWrapper; friend class SvxJSearchOptionsDialog; public: - SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ); + SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ); virtual ~SvxSearchDialog(); virtual bool Close() SAL_OVERRIDE; @@ -138,8 +138,8 @@ public: sal_Int32 GetTransliterationFlags() const; - void SetDocWin( Window* pDocWin ) { mpDocWin = pDocWin; } - Window* GetDocWin() { return mpDocWin; } + void SetDocWin( vcl::Window* pDocWin ) { mpDocWin = pDocWin; } + vcl::Window* GetDocWin() { return mpDocWin; } void SetSrchFlag( bool bSuccess = false ) { mbSuccess = bSuccess; } bool GetSrchFlag() { return mbSuccess; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > @@ -150,7 +150,7 @@ public: void SetSearchLabel(const OUString& rStr) { m_pSearchLabel->SetText(rStr); } private: - Window* mpDocWin; + vcl::Window* mpDocWin; bool mbSuccess; VclFrame* m_pSearchFrame; diff --git a/include/svx/stddlg.hxx b/include/svx/stddlg.hxx index 44ef8246b864..9251475d4194 100644 --- a/include/svx/stddlg.hxx +++ b/include/svx/stddlg.hxx @@ -27,7 +27,7 @@ class SVX_DLLPUBLIC SvxStandardDialog: public SfxModalDialog { public: - SvxStandardDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + SvxStandardDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~SvxStandardDialog(); short Execute() SAL_OVERRIDE; diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index 64130cd3b954..5a5730c7c8de 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -82,7 +82,7 @@ public: virtual void BrkAction() SAL_OVERRIDE; virtual void TakeActionRect(Rectangle& rRect) const SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; void SetMeasureLayer(const OUString& rName) { aMeasureLayer=rName; } const OUString& GetMeasureLayer() const { return aMeasureLayer; } diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 1e6c1348d044..70f661237e2d 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -66,12 +66,12 @@ protected: SdrPageView* pTextEditPV; SdrOutliner* pTextEditOutliner; // Na eben der Outliner fuers TextEdit OutlinerView* pTextEditOutlinerView; // die aktuelle View des Outliners - Window* pTextEditWin; // passendes Win zu pTextEditOutlinerView + vcl::Window* pTextEditWin; // passendes Win zu pTextEditOutlinerView vcl::Cursor* pTextEditCursorMerker; // Zum Restaurieren des Cursors am jeweiligen Win ImpSdrEditPara* pEditPara; // Da hau' ich erstmal alles rein um kompatibel zu bleiben... SdrObject* pMacroObj; SdrPageView* pMacroPV; - Window* pMacroWin; + vcl::Window* pMacroWin; Rectangle aTextEditArea; Rectangle aMinTextEditArea; @@ -102,11 +102,11 @@ protected: // provide their document UndoManager and derive it from SdrUndoManager. virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const; - OutlinerView* ImpFindOutlinerView(Window* pWin) const; + OutlinerView* ImpFindOutlinerView(vcl::Window* pWin) const; // Eine neue OutlinerView auf dem Heap anlegen und alle erforderlichen Parameter setzen. // pTextEditObj, pTextEditPV und pTextEditOutliner muessen initiallisiert sein. - OutlinerView* ImpMakeOutlinerView(Window* pWin, bool bNoPaint, OutlinerView* pGivenView) const; + OutlinerView* ImpMakeOutlinerView(vcl::Window* pWin, bool bNoPaint, OutlinerView* pGivenView) const; void ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectangle& rRect, OutputDevice& rTargetDevice) const; void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const; @@ -172,7 +172,7 @@ public: // dieser Instanz und ausserdem auch den StatusEventHdl. // Ebenso kann eine spezifische OutlinerView vorgegeben werden. - virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, bool bIsNewObj = false, + virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, vcl::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true); // bDontDeleteReally ist ein Spezialparameter fuer den Writer. @@ -203,8 +203,8 @@ public: virtual SdrPageView* GetTextEditPageView() const SAL_OVERRIDE; // Das aktuelle Win des Outliners - Window* GetTextEditWin() const { return pTextEditWin; } - void SetTextEditWin(Window* pWin); + vcl::Window* GetTextEditWin() const { return pTextEditWin; } + void SetTextEditWin(vcl::Window* pWin); // An den hier abgeholten Outliner kann man schliesslich // Events versenden, Attribute setzen, Cut/Copy/Paste rufen, @@ -214,11 +214,11 @@ public: const OutlinerView* GetTextEditOutlinerView() const { return pTextEditOutlinerView; } OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; } - virtual bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool Command(const CommandEvent& rCEvt, Window* pWin) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool Command(const CommandEvent& rCEvt, vcl::Window* pWin) SAL_OVERRIDE; // #97766# make virtual to change implementation e.g. for SdOutlineView virtual sal_uInt16 GetScriptType() const; @@ -245,8 +245,8 @@ public: // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==sal_True). void SetMacroMode(bool bOn) { bMacroMode=bOn; } bool IsMacroMode() const { return bMacroMode; } - bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin); - bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); } + bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin); + bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); } void MovMacroObj(const Point& rPnt); void BrkMacroObj(); bool EndMacroObj(); diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index d49e71b0ede4..165a7f8ff517 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_SVDGLUE_HXX #define INCLUDED_SVX_SVDGLUE_HXX -class Window; +namespace vcl { class Window; } class OutputDevice; class SvStream; class SdrObject; @@ -92,7 +92,7 @@ public: sal_uInt16 GetVertAlign() const { return nAlign&0xFF00; } void SetVertAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); } bool IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; - void Invalidate(Window& rWin, const SdrObject* pObj) const; + void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const; Point GetAbsolutePos(const SdrObject& rObj) const; void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj); long GetAlignAngle() const; @@ -130,7 +130,7 @@ public: const SdrGluePoint& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } sal_uInt16 FindGluePoint(sal_uInt16 nId) const; sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack = false, bool bNext = false, sal_uInt16 nId0=0) const; - void Invalidate(Window& rWin, const SdrObject* pObj) const; + void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt void SetReallyAbsolute(bool bOn, const SdrObject& rObj); void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj); diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 5f9435baf6e1..5d59a1c20df7 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -36,7 +36,7 @@ class VirtualDevice; class OutputDevice; class Region; -class Window; +namespace vcl { class Window; } class SdrHdlList; class SdrMarkView; class SdrObject; diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 5de8fa0db933..fe6742afaa05 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -147,7 +147,7 @@ protected: virtual void SetMarkRects(); // Rects at the PageViews virtual void CheckMarked(); // Scan MarkList after Del and Lock Layer ... virtual void AddDragModeHdl(SdrDragMode eMode); - virtual bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; // add custom handles (used by other apps, e.g. AnchorPos) virtual void AddCustomHdl(); diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 57475455553b..0a796da753ba 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -124,7 +124,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > GetTemporaryControlForWindow( - const Window& _rWindow, + const vcl::Window& _rWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const; diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index c248e8c83de9..1c63d3faede7 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -439,8 +439,8 @@ public: // Wenn die View kein Invalidate() an den Fenstern durchfuehren soll, muss // man diese beiden folgenden Methoden ueberladen und entsprechend anders // reagieren. - virtual void InvalidateOneWin(Window& rWin); - virtual void InvalidateOneWin(Window& rWin, const Rectangle& rRect); + virtual void InvalidateOneWin(vcl::Window& rWin); + virtual void InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect); void SetActiveLayer(const OUString& rName) { aAktLayer=rName; } const OUString& GetActiveLayer() const { return aAktLayer; } @@ -477,15 +477,15 @@ public: // Default=FALSE. Flag ist nicht persistent. bool IsSwapAsynchron() const { return bSwapAsynchron; } void SetSwapAsynchron(bool bJa=true) { bSwapAsynchron=bJa; } - virtual bool KeyInput(const KeyEvent& rKEvt, Window* pWin); + virtual bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin); - virtual bool MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return false; } - virtual bool MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return false; } - virtual bool MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return false; } - virtual bool Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return false; } + virtual bool MouseButtonDown(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; } + virtual bool MouseButtonUp(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; } + virtual bool MouseMove(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; } + virtual bool Command(const CommandEvent& /*rCEvt*/, vcl::Window* /*pWin*/) { return false; } bool Cut(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; } bool Yank(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; } - bool Paste(Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; } + bool Paste(vcl::Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; } /* new interface src537 */ bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const; @@ -494,7 +494,7 @@ public: SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const; bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); - virtual void MakeVisible(const Rectangle& rRect, Window& rWin); + virtual void MakeVisible(const Rectangle& rRect, vcl::Window& rWin); // Fuer PlugIn. Wird vom Paint des OLE-Obj gerufen. virtual void DoConnect(SdrOle2Obj* pOleObj); @@ -519,8 +519,8 @@ public: // bei bShow=sal_False wird der Browser destruiert #ifdef DBG_UTIL void ShowItemBrowser(bool bShow=true); - bool IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); } - Window* GetItemBrowser() const { return (Window*)pItemBrowser; } + bool IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((vcl::Window*)pItemBrowser)->IsVisible(); } + vcl::Window* GetItemBrowser() const { return (vcl::Window*)pItemBrowser; } #endif // Muss von App beim Scrollen usw. gerufen werden, damit ein u.U. diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index 81debfd248df..fca5eb484505 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -194,11 +194,11 @@ public: void SetMasterPagePaintCaching(bool bOn); bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; } - bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool Command(const CommandEvent& rCEvt, Window* pWin) SAL_OVERRIDE; + bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool Command(const CommandEvent& rCEvt, vcl::Window* pWin) SAL_OVERRIDE; virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; @@ -270,17 +270,17 @@ public: // ~~~~~~~~~~~~~~~~~~~~ // Einfache Events: // ~~~~~~~~~~~~~~~~ -// sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); -// sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); -// sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); -// sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); -// sal_Bool Command(const CommandEvent& rCEvt, Window* pWin); +// sal_Bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin); +// sal_Bool MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin); +// sal_Bool MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin); +// sal_Bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin); +// sal_Bool Command(const CommandEvent& rCEvt, vcl::Window* pWin); // // Exchange (Clipboard derzeit noch ohne SdrPrivateData): // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT); // sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT); -// sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT); +// sal_Bool Paste(vcl::Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT); // // SfxItems: // ~~~~~~~~~ diff --git a/include/svx/svdviter.hxx b/include/svx/svdviter.hxx index 4dfb92741602..56870623826f 100644 --- a/include/svx/svdviter.hxx +++ b/include/svx/svdviter.hxx @@ -34,7 +34,7 @@ Using this class, you can find out: - All PageViews in which a model is displayed - All PageViews in which a certain page is visible (also as MasterPage) - All PageViews in which a certain object is visible (also as MasterPage) -- Window* First/NextWindow() +- vcl::Window* First/NextWindow() - All Windows in which a model is displayed - All Windows in which a certain page is visible (also as MasterPage) - All Windows in which a certain object is visible (also as MasterPage) @@ -53,7 +53,7 @@ Not considered are: */ class OutputDevice; -class Window; +namespace vcl { class Window; } class SdrView; class SdrPageView; class SdrModel; diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx index f92a2f0c1f5b..2f7bd106c273 100644 --- a/include/svx/svdxcgv.hxx +++ b/include/svx/svdxcgv.hxx @@ -114,7 +114,7 @@ public: bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT ); - bool Paste( Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT ); + bool Paste( vcl::Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT ); bool PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 ); }; diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 06376c51711a..6ec31bef4251 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -42,7 +42,7 @@ namespace linguistic2{ }}}} class SvxSpellWrapper; -typedef SfxTabPage* (*CreateSvxDistributePage)(Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); +typedef SfxTabPage* (*CreateSvxDistributePage)(vcl::Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); typedef const sal_uInt16* (*DialogGetRanges)(); struct ExchangeData; @@ -86,7 +86,7 @@ class AbstractSpellDialog : public VclAbstractDialog virtual void SetLanguage( sal_uInt16 nLang ) = 0; virtual bool Close() = 0; virtual void Invalidate() = 0; - virtual Window* GetWindow() = 0; + virtual vcl::Window* GetWindow() = 0; virtual SfxBindings& GetBindings() = 0; }; @@ -215,7 +215,7 @@ public: class AbstractSvxHpLinkDlg : public VclAbstractDialog { public: - virtual Window* GetWindow() = 0; + virtual vcl::Window* GetWindow() = 0; virtual bool QueryClose() = 0; }; @@ -264,7 +264,7 @@ public: virtual void HideAuthor() = 0; virtual void SetReadonlyPostIt(bool bDisable) = 0; virtual bool IsOkEnabled() const = 0; - virtual Window * GetWindow() = 0; + virtual vcl::Window * GetWindow() = 0; }; class SvxAbstractSplittTableDialog : public VclAbstractDialog @@ -297,175 +297,175 @@ public: // define dtor as this will create typeinfo and in svx library and export vtable virtual ~SvxAbstractDialogFactory(); - virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent, + virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttrSet, SdrView* pView, SdrModel* pModel=0 ) = 0 ; - virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, + virtual AbstractSvxCaptionDialog* CreateCaptionDialog( vcl::Window* pParent, const SdrView* pView, sal_uInt16 nAnchorTypes = 0 ) = 0; - virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, + virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone)= 0; - virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0; + virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window* pParent ) = 0; - virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, + virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )=0; - virtual AbstractSpellDialog * CreateSvxSpellDialog(Window* pParent, + virtual AbstractSpellDialog * CreateSvxSpellDialog(vcl::Window* pParent, SfxBindings* pBindings, svx::SpellDialogChildWindow* pSpellChildWindow )=0; - virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, + virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( vcl::Window* pParent, GalleryTheme* pThm ) = 0; - virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, + virtual AbstractSearchProgress * CreateSearchProgressDialog( vcl::Window* pParent, const INetURLObject& rStartURL ) = 0; - virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ) = 0; - virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent, + virtual AbstractTakeProgress * CreateTakeProgressDialog( vcl::Window* pParent ) = 0; + virtual AbstractTitleDialog * CreateTitleDialog( vcl::Window* pParent, const OUString& rOldText ) = 0; - virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent, + virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ) = 0; - virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent, + virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet ) = 0; - virtual AbstractURLDlg * CreateURLDialog( Window* pParent, + virtual AbstractURLDlg * CreateURLDialog( vcl::Window* pParent, const OUString& rURL, const OUString& rAltText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ) = 0; virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ) =0; - virtual SfxAbstractTabDialog* CreateTabItemDialog(Window* pParent, + virtual SfxAbstractTabDialog* CreateTabItemDialog(vcl::Window* pParent, const SfxItemSet& rSet) = 0; - virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, + virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges)=0; - virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, + virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( vcl::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, sal_uInt16 nLonger ) = 0; //UUUU add for SvxBorderBackgroundDlg virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bEnableSelector = false, bool bEnableDrawingLayerFillStyles = false) = 0; - virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, + virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, sal_uInt16 nAnchorTypes = 0) = 0; - virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, + virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView, sal_uInt32 nResId, bool bSizeTabPage = false )=0; - virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent, + virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( vcl::Window* pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags )=0; - virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) = 0; - virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, + virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) = 0; + virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) = 0; - virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent, + virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId) = 0; - virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent, + virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent, const OUString& rName, const OUString& rDesc ) = 0; // #i68101# - virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const OUString& rName ) = 0; - virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const OUString& rTitle, const OUString& rDescription) = 0; + virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) = 0; + virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) = 0; - virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId, + virtual AbstractSvxMessDialog * CreateSvxMessDialog( vcl::Window* pParent, sal_uInt32 nResId, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ) = 0; - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(Window* pParent) = 0 ; - virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(Window* pParent) = 0 ; - virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(vcl::Window* pParent) = 0 ; + virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(vcl::Window* pParent) = 0 ; + virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings, sal_uInt32 nResId)=0; - virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, + virtual AbstractFmSearchDialog* CreateFmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (vcl::Window* pParent, const Graphic& rGraphic, double nRadius)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges)=0; - virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent, + virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow) = 0 ; - virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog + virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog SdrModel* pModel, const SdrObject* pObj = NULL, bool bHasObj = true )=0; - virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE = 0; - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, + virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE = 0; + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, sal_uInt32 nResId )=0; - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, sal_uInt32 nResId )=0; - virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, + virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext = false) = 0; - virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE = 0; + virtual VclAbstractDialog* CreateSvxScriptOrgDialog( vcl::Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE = 0; virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() = 0; virtual DialogGetRanges GetDialogGetRangesFunc() = 0; virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( - Window* pParent, + vcl::Window* pParent, bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) SAL_OVERRIDE = 0; virtual VclAbstractDialog* CreateScriptErrorDialog( - Window* pParent, com::sun::star::uno::Any aException) SAL_OVERRIDE = 0; + vcl::Window* pParent, com::sun::star::uno::Any aException) SAL_OVERRIDE = 0; virtual VclAbstractDialog* CreateSvxMacroAssignDlg( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) = 0; - virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL )=0; + virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL )=0; - virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )=0; + virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )=0; - virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) = 0; + virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( vcl::Window* pParent ) = 0; - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ) = 0; + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ) = 0; }; #endif diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx index b5de0c81f162..b6f698c0773f 100644 --- a/include/svx/swframeexample.hxx +++ b/include/svx/swframeexample.hxx @@ -27,7 +27,7 @@ // class SwFrmPagePreview ------------------------------------------------------- -class SVX_DLLPUBLIC SvxSwFrameExample : public Window +class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window { Color m_aTransColor; // transparency Color m_aBgCol; // background @@ -73,7 +73,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SvxSwFrameExample(Window* pParent, WinBits nStyle); + SvxSwFrameExample(vcl::Window* pParent, WinBits nStyle); virtual ~SvxSwFrameExample(); inline void SetWrap(sal_uInt16 nW) { nWrap = nW; } diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 3d2fa357d5b8..5b6a88fe782a 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -159,7 +159,7 @@ public: SvxStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxStyleToolBoxControl(); - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -209,7 +209,7 @@ public: virtual void StateChanged ( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow ( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow ( vcl::Window *pParent ) SAL_OVERRIDE; }; diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx index 2e88a2bb1aee..e0df5adeef38 100644 --- a/include/svx/txencbox.hxx +++ b/include/svx/txencbox.hxx @@ -33,7 +33,7 @@ private: SVX_DLLPRIVATE sal_Int32 EncodingToPos_Impl( rtl_TextEncoding nEnc ) const; public: - SvxTextEncodingBox( Window* pParent, WinBits nBits ); + SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits ); virtual ~SvxTextEncodingBox(); /** Fill with all known encodings but exclude those matching one or more diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx index 42a20ec8f5b1..2a702106d785 100644 --- a/include/svx/unoshtxt.hxx +++ b/include/svx/unoshtxt.hxx @@ -37,7 +37,7 @@ class SvxTextForwarder; class SdrObject; class SdrModel; class SdrView; -class Window; +namespace vcl { class Window; } class SvxTextEditSourceImpl; class SdrText; @@ -51,7 +51,7 @@ public: The window is necessary, since our views can display on multiple windows */ - SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const Window& rViewWindow ); + SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const vcl::Window& rViewWindow ); virtual ~SvxTextEditSource(); diff --git a/include/svx/wrapfield.hxx b/include/svx/wrapfield.hxx index 02b4f961bccd..ff7cf3ada785 100644 --- a/include/svx/wrapfield.hxx +++ b/include/svx/wrapfield.hxx @@ -32,7 +32,7 @@ namespace svx { class SVX_DLLPUBLIC WrapField : public NumericField { public: - explicit WrapField( Window* pParent, WinBits nBits ); + explicit WrapField( vcl::Window* pParent, WinBits nBits ); protected: /** Up event with wrap-around functionality. */ diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx index 86be3cbc7c66..0f2c93f2d590 100644 --- a/include/toolkit/awt/scrollabledialog.hxx +++ b/include/toolkit/awt/scrollabledialog.hxx @@ -57,7 +57,7 @@ namespace toolkit ScrollBarVisibility maScrollVis; void lcl_Scroll( long nX, long nY ); public: - ScrollableWrapper( Window* pParent, WinBits nStyle = WB_STDDIALOG ); + ScrollableWrapper( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG ); virtual ~ScrollableWrapper(); virtual void SetScrollWidth( long nWidth ) SAL_OVERRIDE; virtual long GetScrollWidth() SAL_OVERRIDE { return maScrollArea.Width(); } diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 9faf70655f11..d27228c8a09a 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -34,7 +34,7 @@ #include <tools/link.hxx> -class Window; +namespace vcl { class Window; } class VCLXWindow; class VclSimpleEvent; class VclWindowEvent; @@ -83,7 +83,7 @@ public: virtual ~VCLXAccessibleComponent(); VCLXWindow* GetVCLXWindow() const { return mpVCLXindow; } - Window* GetWindow() const; + vcl::Window* GetWindow() const; virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx index d0839302829f..a8b5e2b0b472 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/include/toolkit/awt/vclxtopwindow.hxx @@ -46,7 +46,7 @@ protected: bool isSystemDependentWindowPeer() const { return m_bWHWND; } - virtual Window* GetWindowImpl() = 0; + virtual vcl::Window* GetWindowImpl() = 0; virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl() = 0; VCLXTopWindow_Base( const bool _bSupportSystemWindowPeer ); @@ -86,7 +86,7 @@ class TOOLKIT_DLLPUBLIC VCLXTopWindow: public VCLXTopWindow_Base, public VCLXContainer { protected: - virtual Window* GetWindowImpl() SAL_OVERRIDE; + virtual vcl::Window* GetWindowImpl() SAL_OVERRIDE; virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl() SAL_OVERRIDE; public: diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index 7970959412be..f3f1e133bd53 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -46,7 +46,7 @@ #include <list> #include <boost/function.hpp> -class Window; +namespace vcl { class Window; } class VclSimpleEvent; class VclWindowEvent; struct SystemParentData; @@ -128,13 +128,13 @@ public: VCLXWindow( bool bWithDefaultProps = false ); virtual ~VCLXWindow(); - virtual void SetWindow( Window* pWindow ); - Window* GetWindow() const { return (Window*)GetOutputDevice(); } + virtual void SetWindow( vcl::Window* pWindow ); + vcl::Window* GetWindow() const { return (vcl::Window*)GetOutputDevice(); } void suspendVclEventListening( ); void resumeVclEventListening( ); - void notifyWindowRemoved( Window& _rWindow ); + void notifyWindowRemoved( vcl::Window& _rWindow ); // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 7fcf873354d2..1985154b0f6e 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -674,7 +674,7 @@ public: // ::com::sun::star::awt::XLayoutConstrains ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static ::com::sun::star::awt::Size SAL_CALL implGetMinimumSize( Window* p ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::awt::Size SAL_CALL implGetMinimumSize( vcl::Window* p ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index a1c9ea92c4c9..928c37bdf914 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XWindow.hpp> -class Window; +namespace vcl { class Window; } namespace toolkit { @@ -117,7 +117,7 @@ namespace toolkit // stops listening at the control model void stopModelListening( ); - Window* implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const; + vcl::Window* implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const; }; diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx index 42e7856842d7..08f5a89cb78a 100644 --- a/include/toolkit/helper/vclunohelper.hxx +++ b/include/toolkit/helper/vclunohelper.hxx @@ -60,7 +60,7 @@ namespace com { namespace sun { namespace star { namespace awt { #include <tools/fldunit.hxx> #include <tools/poly.hxx> -class Window; +namespace vcl { class Window; } class OutputDevice; class MouseEvent; class KeyEvent; @@ -79,10 +79,10 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap> CreateBitmap( const BitmapEx& rBitmap ); // Window - static Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ); - static Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow2 ); - static Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindowPeer ); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> GetInterface( Window* pWindow ); + static vcl::Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ); + static vcl::Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow2 ); + static vcl::Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindowPeer ); + static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> GetInterface( vcl::Window* pWindow ); // OutputDevice static OutputDevice* GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice>& rxDevice ); @@ -112,7 +112,7 @@ public: // Rectangle static bool IsZero( ::com::sun::star::awt::Rectangle rRect ); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> CreateControlContainer( Window* pWindow ); + static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> CreateControlContainer( vcl::Window* pWindow ); // MapUnits static MapUnit UnoEmbed2VCLMapUnit( sal_Int32 nUnoEmbedMapUnit ); diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx index 89155398e59e..a16b56a179f4 100644 --- a/include/tools/errinf.hxx +++ b/include/tools/errinf.hxx @@ -30,7 +30,7 @@ class EDcr_Impl; class ErrHdl_Impl; -class Window; +namespace vcl { class Window; } class ErrorInfo { @@ -121,20 +121,20 @@ class TOOLS_DLLPUBLIC ErrorContext private: ErrorContext* pNext; - Window* pWin; + vcl::Window* pWin; public: - ErrorContext(Window *pWin=0); + ErrorContext(vcl::Window *pWin=0); virtual ~ErrorContext(); virtual bool GetString( sal_uIntPtr nErrId, OUString& rCtxStr ) = 0; - Window* GetParent() { return pWin; } + vcl::Window* GetParent() { return pWin; } static ErrorContext* GetContext(); }; typedef sal_uInt16 WindowDisplayErrorFunc( - Window *, sal_uInt16 nMask, const OUString &rErr, const OUString &rAction); + vcl::Window *, sal_uInt16 nMask, const OUString &rErr, const OUString &rAction); typedef void BasicDisplayErrorFunc( const OUString &rErr, const OUString &rAction); diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx index 3464d03de94c..d877e6d3dc46 100644 --- a/include/vcl/abstdlg.hxx +++ b/include/vcl/abstdlg.hxx @@ -22,7 +22,7 @@ #include <rtl/ustring.hxx> #include <vcl/dllapi.h> -class Window; +namespace vcl { class Window; } class ResId; class Link; @@ -69,10 +69,10 @@ public: static VclAbstractDialogFactory* Create(); // nDialogId was previously a ResId without ResMgr; the ResourceId is now // an implementation detail of the factory - virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId ) = 0; + virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) = 0; // creates instance of PasswordToOpenModifyDialog from cui - virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) = 0; + virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) = 0; }; #endif diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 3a955433bc33..958b0f394be9 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -61,7 +61,7 @@ protected: SAL_DLLPRIVATE long ImplGetButtonSize(); public: - ButtonDialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); + ButtonDialog( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG ); virtual ~ButtonDialog(); virtual void Resize() SAL_OVERRIDE; diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index f9adddb84585..4e62f41f95fc 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -44,7 +44,7 @@ class VCL_DLLPUBLIC VclBuilder: private boost::noncopyable { public: typedef std::map<OString, OString> stringmap; - typedef ::Window* (*customMakeWidget)(::Window *pParent, stringmap &rVec); + typedef vcl::Window* (*customMakeWidget)(vcl::Window *pParent, stringmap &rVec); private: typedef boost::ptr_map<OUString, osl::Module> ModuleMap; //We store these until the builder is deleted, that way we can use the @@ -73,10 +73,10 @@ private: struct WinAndId { OString m_sID; - ::Window *m_pWindow; + vcl::Window *m_pWindow; short m_nResponseId; PackingData m_aPackingData; - WinAndId(const OString &rId, ::Window *pWindow, bool bVertical) + WinAndId(const OString &rId, vcl::Window *pWindow, bool bVertical) : m_sID(rId) , m_pWindow(pWindow) , m_nResponseId(RET_CANCEL) @@ -184,7 +184,7 @@ private: } }; - typedef std::map< ::Window*, stringmap> AtkMap; + typedef std::map< vcl::Window*, stringmap> AtkMap; struct ParserState { @@ -209,7 +209,7 @@ private: Translations m_aTranslations; - std::map< ::Window*, ::Window*> m_aRedundantParentWidgets; + std::map< vcl::Window*, vcl::Window*> m_aRedundantParentWidgets; std::vector<SizeGroup> m_aSizeGroups; @@ -232,17 +232,17 @@ private: OString m_sID; OString m_sHelpRoot; ResHookProc m_pStringReplace; - ::Window *m_pParent; + vcl::Window *m_pParent; bool m_bToplevelHasDeferredInit; bool m_bToplevelHasDeferredProperties; bool m_bToplevelParentFound; ParserState *m_pParserState; - ::Window *get_by_name(const OString& sID); + vcl::Window *get_by_name(const OString& sID); void delete_by_name(const OString& sID); class sortIntoBestTabTraversalOrder - : public std::binary_function<const ::Window*, const ::Window*, bool> + : public std::binary_function<const vcl::Window*, const vcl::Window*, bool> { VclBuilder *m_pBuilder; public: @@ -250,22 +250,22 @@ private: : m_pBuilder(pBuilder) { } - bool operator()(const ::Window *pA, const ::Window *pB) const; + bool operator()(const vcl::Window *pA, const vcl::Window *pB) const; }; /// XFrame to be able to extract labels and other properties of the UNO commands (like of .uno:Bold). css::uno::Reference<css::frame::XFrame> m_xFrame; public: - VclBuilder(::Window *pParent, const OUString& sUIRootDir, const OUString& sUIFile, + VclBuilder(vcl::Window *pParent, const OUString& sUIRootDir, const OUString& sUIFile, const OString& sID = OString(), const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); ~VclBuilder(); - ::Window *get_widget_root(); + vcl::Window *get_widget_root(); //sID must exist and be of type T template <typename T> T* get(T*& ret, const OString& sID) { - ::Window *w = get_by_name(sID); + vcl::Window *w = get_by_name(sID); SAL_WARN_IF(!w, "vcl.layout", "widget \"" << sID.getStr() << "\" not found in .ui"); SAL_WARN_IF(!dynamic_cast<T*>(w), "vcl.layout", ".ui widget \"" << sID.getStr() << "\" needs to correspond to vcl type " << typeid(T).name()); @@ -281,9 +281,9 @@ public: return ret; } //sID may not exist, but must be of type T if it does - template <typename T /*= ::Window if we had c++11*/> T* get(const OString& sID) + template <typename T /*= vcl::Window if we had c++11*/> T* get(const OString& sID) { - ::Window *w = get_by_name(sID); + vcl::Window *w = get_by_name(sID); SAL_WARN_IF(w && !dynamic_cast<T*>(w), "vcl.layout", ".ui widget \"" << sID.getStr() << "\" needs to correspond to vcl type " << typeid(T).name()); assert(!w || dynamic_cast<T*>(w)); @@ -293,16 +293,16 @@ public: PopupMenu* get_menu(const OString& sID); //given an sID return the response value for that widget - short get_response(const ::Window *pWindow) const; + short get_response(const vcl::Window *pWindow) const; - OString get_by_window(const ::Window *pWindow) const; - void delete_by_window(const ::Window *pWindow); + OString get_by_window(const vcl::Window *pWindow) const; + void delete_by_window(const vcl::Window *pWindow); //release ownership of pWindow, i.e. don't delete it - void drop_ownership(const ::Window *pWindow); + void drop_ownership(const vcl::Window *pWindow); //apply the properties of rProps to pWindow - static void set_properties(::Window *pWindow, const stringmap &rProps); + static void set_properties(vcl::Window *pWindow, const stringmap &rProps); //Convert _ gtk markup to ~ vcl markup static OString convertMnemonicMarkup(const OString &rIn); @@ -322,8 +322,8 @@ public: void setDeferredProperties(); //Helpers to retrofit all the existing code to the builder - static void reorderWithinParent(std::vector< ::Window*>& rChilds, bool bIsButtonBox); - static void reorderWithinParent(::Window &rWindow, sal_uInt16 nNewPosition); + static void reorderWithinParent(std::vector< vcl::Window*>& rChilds, bool bIsButtonBox); + static void reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition); /// Get label of the command (like of .uno:Save) from the description service static OUString getCommandLabel(const OUString& rCommand, const css::uno::Reference<css::uno::XComponentContext>& rContext, const OUString& rModuleId); @@ -335,12 +335,12 @@ public: css::uno::Reference<css::frame::XFrame> getFrame() { return m_xFrame; } private: - ::Window *insertObject(::Window *pParent, + vcl::Window *insertObject(vcl::Window *pParent, const OString &rClass, const OString &rID, stringmap &rProps, stringmap &rPangoAttributes, stringmap &rAtkProps, std::vector<OString> &rItems); - ::Window *makeObject(::Window *pParent, + vcl::Window *makeObject(vcl::Window *pParent, const OString &rClass, const OString &rID, stringmap &rVec, const std::vector<OString> &rItems); @@ -358,10 +358,10 @@ private: void handleTranslations(xmlreader::XmlReader &reader); - void handleChild(::Window *pParent, xmlreader::XmlReader &reader); - ::Window* handleObject(::Window *pParent, xmlreader::XmlReader &reader); - void handlePacking(::Window *pCurrent, ::Window *pParent, xmlreader::XmlReader &reader); - void applyPackingProperty(::Window *pCurrent, ::Window *pParent, xmlreader::XmlReader &reader); + void handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader); + vcl::Window* handleObject(vcl::Window *pParent, xmlreader::XmlReader &reader); + void handlePacking(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader); + void applyPackingProperty(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader); void collectProperty(xmlreader::XmlReader &reader, const OString &rID, stringmap &rVec); void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &rMap); void collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rMap); @@ -376,21 +376,21 @@ private: void handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 nRowIndex); void handleAdjustment(const OString &rID, stringmap &rProperties); void handleTextBuffer(const OString &rID, stringmap &rProperties); - void handleTabChild(::Window *pParent, xmlreader::XmlReader &reader); + void handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &reader); void handleMenu(xmlreader::XmlReader &reader, const OString &rID); std::vector<OString> handleItems(xmlreader::XmlReader &reader, const OString &rID); void handleSizeGroup(xmlreader::XmlReader &reader, const OString &rID); - void handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, ::Window *pWindow); + void handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, vcl::Window *pWindow); void handleActionWidget(xmlreader::XmlReader &reader); - PackingData get_window_packing_data(const ::Window *pWindow) const; - void set_window_packing_position(const ::Window *pWindow, sal_Int32 nPosition); + PackingData get_window_packing_data(const vcl::Window *pWindow) const; + void set_window_packing_position(const vcl::Window *pWindow, sal_Int32 nPosition); - ::Window* prepareWidgetOwnScrolling(::Window *pParent, WinBits &rWinStyle); - void cleanupWidgetOwnScrolling(::Window *pScrollParent, ::Window *pWindow, stringmap &rMap); + vcl::Window* prepareWidgetOwnScrolling(vcl::Window *pParent, WinBits &rWinStyle); + void cleanupWidgetOwnScrolling(vcl::Window *pScrollParent, vcl::Window *pWindow, stringmap &rMap); void set_response(const OString& sID, short nResponse); }; @@ -421,7 +421,7 @@ public: { return m_pUIBuilder->get<T>(ret, sID); } - template <typename T /*= ::Window if we had c++11*/> T* get(const OString & sID) + template <typename T /*= vcl::Window if we had c++11*/> T* get(const OString & sID) { return m_pUIBuilder->get<T>(sID); } diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index c06ff8c766c8..7a9623286569 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -112,7 +112,7 @@ protected: Link maToggleHdl; SAL_DLLPRIVATE void ImplInitPushButtonData(); - SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); + SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawFlags, const Rectangle& rRect, bool bLayout, bool bMenuBtnSep ); @@ -126,14 +126,14 @@ protected: SAL_DLLPRIVATE PushButton( const PushButton & ); SAL_DLLPRIVATE PushButton& operator=( const PushButton & ); - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); using Control::ImplInitSettings; using Window::ImplInit; public: SAL_DLLPRIVATE void ImplSetDefButton( bool bSet ); - SAL_DLLPRIVATE static void ImplDrawPushButtonFrame( Window* pDev, Rectangle& rRect, sal_uInt16 nStyle ); - SAL_DLLPRIVATE static bool ImplHitTestPushButton( Window* pDev, const Point& rPos ); + SAL_DLLPRIVATE static void ImplDrawPushButtonFrame( vcl::Window* pDev, Rectangle& rRect, sal_uInt16 nStyle ); + SAL_DLLPRIVATE static bool ImplHitTestPushButton( vcl::Window* pDev, const Point& rPos ); SAL_DLLPRIVATE bool ImplIsDefButton() const; protected: @@ -145,8 +145,8 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: - explicit PushButton( Window* pParent, WinBits nStyle = 0 ); - explicit PushButton( Window* pParent, const ResId& ); + explicit PushButton( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit PushButton( vcl::Window* pParent, const ResId& ); virtual ~PushButton(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -210,14 +210,14 @@ class VCL_DLLPUBLIC OKButton : public PushButton protected: using PushButton::ImplInit; private: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE OKButton (const OKButton &); SAL_DLLPRIVATE OKButton & operator= (const OKButton &); public: - explicit OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON ); + explicit OKButton( vcl::Window* pParent, WinBits nStyle = WB_DEFBUTTON ); virtual void Click() SAL_OVERRIDE; }; @@ -228,14 +228,14 @@ class VCL_DLLPUBLIC CancelButton : public PushButton protected: using PushButton::ImplInit; private: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE CancelButton (const CancelButton &); SAL_DLLPRIVATE CancelButton & operator= (const CancelButton &); public: - explicit CancelButton( Window* pParent, WinBits nStyle = 0 ); + explicit CancelButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void Click() SAL_OVERRIDE; }; @@ -243,7 +243,7 @@ public: class VCL_DLLPUBLIC CloseButton : public CancelButton { public: - explicit CloseButton(Window* pParent, WinBits nStyle = 0); + explicit CloseButton(vcl::Window* pParent, WinBits nStyle = 0); }; @@ -256,15 +256,15 @@ class VCL_DLLPUBLIC HelpButton : public PushButton protected: using PushButton::ImplInit; private: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE HelpButton( const HelpButton & ); SAL_DLLPRIVATE HelpButton & operator= ( const HelpButton & ); public: - explicit HelpButton( Window* pParent, WinBits nStyle = 0 ); - explicit HelpButton( Window* pParent, const ResId& ); + explicit HelpButton( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit HelpButton( vcl::Window* pParent, const ResId& ); virtual void Click() SAL_OVERRIDE; }; @@ -291,7 +291,7 @@ private: // to the left or right ( depending on RTL or LTR settings ) bool mbLegacyNoTextAlign; SAL_DLLPRIVATE void ImplInitRadioButtonData(); - SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); + SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDrawRadioButtonState(); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, @@ -311,7 +311,7 @@ private: protected: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: @@ -335,8 +335,8 @@ protected: void DrawRadioButtonState( ); public: - explicit RadioButton( Window* pParent, WinBits nWinStyle = 0 ); - explicit RadioButton( Window* pParent, const ResId& ); + explicit RadioButton( vcl::Window* pParent, WinBits nWinStyle = 0 ); + explicit RadioButton( vcl::Window* pParent, const ResId& ); virtual ~RadioButton(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -420,7 +420,7 @@ private: // to the left or right ( depending on RTL or LTR settings ) bool mbLegacyNoTextAlign; SAL_DLLPRIVATE void ImplInitCheckBoxData(); - SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); + SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplInvalidateOrDrawCheckBoxState(); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, @@ -438,7 +438,7 @@ private: protected: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); virtual void FillLayoutData() const SAL_OVERRIDE; virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; @@ -452,8 +452,8 @@ public: SAL_DLLPRIVATE void ImplCheck(); SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); public: - explicit CheckBox( Window* pParent, WinBits nStyle = 0 ); - explicit CheckBox( Window* pParent, const ResId& ); + explicit CheckBox( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit CheckBox( vcl::Window* pParent, const ResId& ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; @@ -522,8 +522,8 @@ private: SAL_DLLPRIVATE ImageButton & operator= ( const ImageButton & ); public: - ImageButton( Window* pParent, WinBits nStyle = 0 ); - ImageButton( Window* pParent, const ResId& rResId ); + ImageButton( vcl::Window* pParent, WinBits nStyle = 0 ); + ImageButton( vcl::Window* pParent, const ResId& rResId ); virtual ~ImageButton(); }; @@ -534,7 +534,7 @@ class VCL_DLLPUBLIC ImageRadioButton : public RadioButton SAL_DLLPRIVATE ImageRadioButton & operator= ( const ImageRadioButton & ); public: - explicit ImageRadioButton( Window* pParent, WinBits nStyle = 0 ); + explicit ImageRadioButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~ImageRadioButton(); }; @@ -545,7 +545,7 @@ class VCL_DLLPUBLIC TriStateBox : public CheckBox SAL_DLLPRIVATE TriStateBox & operator= ( const TriStateBox & ); public: - explicit TriStateBox( Window* pParent, WinBits nStyle = 0 ); + explicit TriStateBox( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~TriStateBox(); }; @@ -554,7 +554,7 @@ class VCL_DLLPUBLIC DisclosureButton : public CheckBox protected: SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState() SAL_OVERRIDE; public: - explicit DisclosureButton( Window* pParent, WinBits nStyle = 0 ); + explicit DisclosureButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; }; diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index b80d088ab748..3928a4cb1be6 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -81,7 +81,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplCalcEditHeight(); @@ -92,8 +92,8 @@ protected: virtual void FillLayoutData() const SAL_OVERRIDE; public: - explicit ComboBox( Window* pParent, WinBits nStyle = 0 ); - explicit ComboBox( Window* pParent, const ResId& ); + explicit ComboBox( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit ComboBox( vcl::Window* pParent, const ResId& ); virtual ~ComboBox(); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 02b1acb2669e..11582347936d 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -34,7 +34,7 @@ class StyleSettings; // - Control - -class VCL_DLLPUBLIC Control : public Window +class VCL_DLLPUBLIC Control : public vcl::Window { protected: ::vcl::ImplControlData* mpControlData; @@ -125,8 +125,8 @@ public: SAL_DLLPRIVATE void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect ); public: - explicit Control( Window* pParent, WinBits nWinStyle = 0 ); - explicit Control( Window* pParent, const ResId& ); + explicit Control( vcl::Window* pParent, WinBits nWinStyle = 0 ); + explicit Control( vcl::Window* pParent, const ResId& ); virtual ~Control(); virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index 0fa4b8277ec5..2d3b83c0b119 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -25,7 +25,7 @@ #include <vcl/dllapi.h> struct ImplCursorData; -class Window; +namespace vcl { class Window; } // Cursor styles #define CURSOR_SHADOW ((sal_uInt16)0x0001) @@ -40,7 +40,7 @@ class VCL_DLLPUBLIC Cursor { private: ImplCursorData* mpData; - Window* mpWindow; // only for shadow cursor + vcl::Window* mpWindow; // only for shadow cursor long mnSlant; Size maSize; Point maPos; @@ -71,8 +71,8 @@ public: void Hide(); bool IsVisible() const { return mbVisible; } - void SetWindow( Window* pWindow ); - Window* GetWindow() const { return mpWindow; } + void SetWindow( vcl::Window* pWindow ); + vcl::Window* GetWindow() const { return mpWindow; } void SetPos( const Point& rNewPos ); const Point& GetPos() const { return maPos; } diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx index c61f93f9632f..3c6e9aa303c0 100644 --- a/include/vcl/debugevent.hxx +++ b/include/vcl/debugevent.hxx @@ -21,7 +21,7 @@ class VCL_DLLPUBLIC DebugEventInjector : Timer { sal_uInt32 mnEventsLeft; DebugEventInjector( sal_uInt32 nMaxEvents ); - Window *ChooseWindow(); + vcl::Window *ChooseWindow(); void InjectTextEvent(); void InjectMenuEvent(); void InjectMouseEvent(); diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index ff9f249f3367..85060404a3f4 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -27,7 +27,7 @@ // parameter to pass to the dialog constructor if really no parent is wanted // whereas NULL chooses the default dialog parent -#define DIALOG_NO_PARENT ((Window*)0xffffffff) +#define DIALOG_NO_PARENT ((vcl::Window*)0xffffffff) // - Dialog - @@ -61,7 +61,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); public: SAL_DLLPRIVATE bool IsInClose() const { return mbInClose; } @@ -69,7 +69,7 @@ public: protected: explicit Dialog( WindowType nType ); - explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType ); + explicit Dialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void settingOptimalLayoutSize(VclBox *pBox) SAL_OVERRIDE; @@ -79,8 +79,8 @@ protected: void set_content_area(VclBox *pBox); public: - explicit Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); - explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit Dialog( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG ); + explicit Dialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~Dialog(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -111,7 +111,7 @@ public: void EndDialog( long nResult = 0 ); - static void EndAllDialogs( Window* pParent=NULL ); + static void EndAllDialogs( vcl::Window* pParent=NULL ); void GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; @@ -131,15 +131,15 @@ class VCL_DLLPUBLIC ModelessDialog : public Dialog SAL_DLLPRIVATE ModelessDialog & operator= (const ModelessDialog &); public: - explicit ModelessDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit ModelessDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); }; // - ModalDialog - class VCL_DLLPUBLIC ModalDialog : public Dialog { public: - explicit ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL ); - explicit ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit ModalDialog( vcl::Window* pParent, WinBits nStyle = WB_STDMODAL ); + explicit ModalDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); protected: using Window::Show; diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx index 0208557ca0e5..c0b75181159e 100644 --- a/include/vcl/dockingarea.hxx +++ b/include/vcl/dockingarea.hxx @@ -24,7 +24,7 @@ // A simple container for docked toolbars // - its main purpose is theming support -class VCL_DLLPUBLIC DockingAreaWindow : public Window +class VCL_DLLPUBLIC DockingAreaWindow : public vcl::Window { class ImplData; @@ -36,7 +36,7 @@ private: SAL_DLLPRIVATE DockingAreaWindow & operator= (const DockingAreaWindow &); public: - explicit DockingAreaWindow( Window* pParent ); + explicit DockingAreaWindow( vcl::Window* pParent ); virtual ~DockingAreaWindow(); void SetAlign( WindowAlign eNewAlign ); diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index f60e895f03d8..f683cc83dda2 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -72,19 +72,19 @@ struct EndPopupModeData class ImplDockingWindowWrapper { - friend class Window; + friend class ::vcl::Window; friend class DockingManager; friend class DockingWindow; private: // the original 'Docking'window - Window *mpDockingWindow; + vcl::Window *mpDockingWindow; // the original DockingWindow members FloatingWindow* mpFloatWin; - Window* mpOldBorderWin; - Window* mpParent; + vcl::Window* mpOldBorderWin; + vcl::Window* mpParent; Point maFloatPos; Point maDockPos; Point maMouseOff; @@ -122,10 +122,10 @@ private: bool ImplStartDockingEnabled() { return mbStartDockingEnabled; } public: - ImplDockingWindowWrapper( const Window *pWindow ); + ImplDockingWindowWrapper( const vcl::Window *pWindow ); virtual ~ImplDockingWindowWrapper(); - Window* GetWindow() { return mpDockingWindow; } + vcl::Window* GetWindow() { return mpDockingWindow; } bool ImplStartDocking( const Point& rPos ); // those methods actually call the corresponding handlers @@ -191,43 +191,43 @@ public: DockingManager(); ~DockingManager(); - void AddWindow( const Window *pWin ); - void RemoveWindow( const Window *pWin ); + void AddWindow( const vcl::Window *pWin ); + void RemoveWindow( const vcl::Window *pWin ); - ImplDockingWindowWrapper* GetDockingWindowWrapper( const Window *pWin ); - bool IsDockable( const Window *pWin ); + ImplDockingWindowWrapper* GetDockingWindowWrapper( const vcl::Window *pWin ); + bool IsDockable( const vcl::Window *pWin ); - bool IsFloating( const Window *pWin ); - void SetFloatingMode( const Window *pWin, bool bFloating ); + bool IsFloating( const vcl::Window *pWin ); + void SetFloatingMode( const vcl::Window *pWin, bool bFloating ); - void Lock( const Window *pWin ); - void Unlock( const Window *pWin ); - bool IsLocked( const Window *pWin ); + void Lock( const vcl::Window *pWin ); + void Unlock( const vcl::Window *pWin ); + bool IsLocked( const vcl::Window *pWin ); - void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin ); - void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin, sal_uLong nPopupModeFlags ); + void StartPopupMode( ToolBox *pParentToolBox, const vcl::Window *pWin ); + void StartPopupMode( ToolBox *pParentToolBox, const vcl::Window *pWin, sal_uLong nPopupModeFlags ); - bool IsInPopupMode( const Window *pWin ); - void EndPopupMode( const Window *pWin ); + bool IsInPopupMode( const vcl::Window *pWin ); + void EndPopupMode( const vcl::Window *pWin ); // required because those methods are not virtual in Window (!!!) and must // be availbale from the toolkit - void SetPosSizePixel( Window *pWin, long nX, long nY, + void SetPosSizePixel( vcl::Window *pWin, long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); - Rectangle GetPosSizePixel( const Window *pWin ); + Rectangle GetPosSizePixel( const vcl::Window *pWin ); }; // - DockingWindow - -class VCL_DLLPUBLIC DockingWindow : public Window +class VCL_DLLPUBLIC DockingWindow : public vcl::Window { class ImplData; private: FloatingWindow* mpFloatWin; - Window* mpOldBorderWin; + vcl::Window* mpOldBorderWin; ImplData* mpImplData; Point maFloatPos; Point maDockPos; @@ -266,7 +266,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); @@ -277,8 +277,8 @@ protected: DockingWindow( WindowType nType ); public: - DockingWindow( Window* pParent, WinBits nStyle = WB_STDDOCKWIN ); - DockingWindow( Window* pParent, const ResId& rResId ); + DockingWindow( vcl::Window* pParent, WinBits nStyle = WB_STDDOCKWIN ); + DockingWindow( vcl::Window* pParent, const ResId& rResId ); virtual ~DockingWindow(); virtual void StartDocking(); diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 966eacffd2bc..58a49db4733f 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -45,7 +45,7 @@ struct Impl_IMEInfos; #define EDIT_NOLIMIT SAL_MAX_INT32 #define EDIT_UPDATEDATA_TIMEOUT 350 -typedef OUString (*FncGetSpecialChars)( Window* pWin, const vcl::Font& rFont ); +typedef OUString (*FncGetSpecialChars)( vcl::Window* pWin, const vcl::Font& rFont ); class VCL_DLLPUBLIC TextFilter { @@ -131,14 +131,14 @@ private: protected: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplSetSelection( const Selection& rSelection, bool bPaint = true ); SAL_DLLPRIVATE int ImplGetNativeControlType() const; SAL_DLLPRIVATE long ImplGetExtraOffset() const; - static SAL_DLLPRIVATE void ImplInvalidateOutermostBorder( Window* pWin ); + static SAL_DLLPRIVATE void ImplInvalidateOutermostBorder( vcl::Window* pWin ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener > mxDnDListener; @@ -161,8 +161,8 @@ public: // public because needed in button.cxx SAL_DLLPRIVATE bool ImplUseNativeBorder( WinBits nStyle ); - Edit( Window* pParent, WinBits nStyle = WB_BORDER ); - Edit( Window* pParent, const ResId& rResId ); + Edit( vcl::Window* pParent, WinBits nStyle = WB_BORDER ); + Edit( vcl::Window* pParent, const ResId& rResId ); virtual ~Edit(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -177,7 +177,7 @@ public: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual void Modify(); virtual void UpdateData(); @@ -250,7 +250,7 @@ public: sal_Int32 GetCharPos( const Point& rWindowPos ) const; // shows a warning box saying "text too long, truncated" - static void ShowTruncationWarning( Window* pParent ); + static void ShowTruncationWarning( vcl::Window* pParent ); static void SetGetSpecialCharsFunction( FncGetSpecialChars fn ); static FncGetSpecialChars GetGetSpecialCharsFunction(); diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 9f7ab05f8ecf..3cd5f8ac1708 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -28,7 +28,7 @@ class AllSettings; class OutputDevice; -class Window; +namespace vcl { class Window; } struct IDataObject; namespace com { namespace sun { namespace star { namespace awt { @@ -393,7 +393,7 @@ inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt, class VCL_DLLPUBLIC NotifyEvent { private: - Window* mpWindow; + vcl::Window* mpWindow; void* mpData; sal_uInt16 mnType; long mnRetValue; @@ -401,12 +401,12 @@ private: public: NotifyEvent(); NotifyEvent( sal_uInt16 nType, - Window* pWindow, + vcl::Window* pWindow, const void* pEvent = NULL, long nRet = 0 ); sal_uInt16 GetType() const { return mnType; } - Window* GetWindow() const { return mpWindow; } + vcl::Window* GetWindow() const { return mpWindow; } void* GetData() const { return mpData; } void SetReturnValue( long nRet ) { mnRetValue = nRet; } @@ -425,7 +425,7 @@ inline NotifyEvent::NotifyEvent() mnRetValue = 0; } -inline NotifyEvent::NotifyEvent( sal_uInt16 nType, Window* pWindow, +inline NotifyEvent::NotifyEvent( sal_uInt16 nType, vcl::Window* pWindow, const void* pEvent, long nRet ) { mpWindow = pWindow; diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index ad3e31044e18..1bf15e177a36 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -483,7 +483,7 @@ public: class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter { public: - explicit PatternField( Window* pParent, WinBits nWinStyle ); + explicit PatternField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~PatternField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -502,8 +502,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit NumericField( Window* pParent, WinBits nWinStyle ); - explicit NumericField( Window* pParent, const ResId& ); + explicit NumericField( vcl::Window* pParent, WinBits nWinStyle ); + explicit NumericField( vcl::Window* pParent, const ResId& ); virtual ~NumericField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -532,8 +532,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit MetricField( Window* pParent, WinBits nWinStyle ); - explicit MetricField( Window* pParent, const ResId& ); + explicit MetricField( vcl::Window* pParent, WinBits nWinStyle ); + explicit MetricField( vcl::Window* pParent, const ResId& ); virtual ~MetricField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -600,7 +600,7 @@ public: class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter { public: - CurrencyField( Window* pParent, WinBits nWinStyle ); + CurrencyField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~CurrencyField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -631,8 +631,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit DateField( Window* pParent, WinBits nWinStyle ); - explicit DateField( Window* pParent, const ResId& ); + explicit DateField( vcl::Window* pParent, WinBits nWinStyle ); + explicit DateField( vcl::Window* pParent, const ResId& ); virtual ~DateField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -667,8 +667,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit TimeField( Window* pParent, WinBits nWinStyle ); - explicit TimeField( Window* pParent, const ResId& ); + explicit TimeField( vcl::Window* pParent, WinBits nWinStyle ); + explicit TimeField( vcl::Window* pParent, const ResId& ); virtual ~TimeField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -698,7 +698,7 @@ public: class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter { public: - PatternBox( Window* pParent, WinBits nWinStyle ); + PatternBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~PatternBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -717,7 +717,7 @@ public: class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter { public: - explicit NumericBox( Window* pParent, WinBits nWinStyle ); + explicit NumericBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~NumericBox(); virtual Size CalcMinimumSize() const SAL_OVERRIDE; @@ -741,7 +741,7 @@ public: class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter { public: - explicit MetricBox( Window* pParent, WinBits nWinStyle ); + explicit MetricBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~MetricBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -774,7 +774,7 @@ public: class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter { public: - explicit CurrencyBox( Window* pParent, WinBits nWinStyle ); + explicit CurrencyBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~CurrencyBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -795,7 +795,7 @@ public: class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter { public: - explicit DateBox( Window* pParent, WinBits nWinStyle ); + explicit DateBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~DateBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -815,7 +815,7 @@ public: class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter { public: - explicit TimeBox( Window* pParent, WinBits nWinStyle ); + explicit TimeBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~TimeBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index f875f19b7afc..4e335516d021 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -38,11 +38,11 @@ class VCL_DLLPUBLIC FixedText : public Control private: sal_Int32 m_nMaxWidthChars; sal_Int32 m_nMinWidthChars; - Window *m_pMnemonicWindow; + vcl::Window *m_pMnemonicWindow; using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, @@ -56,11 +56,11 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; - virtual Window* getAccessibleRelationLabelFor() const SAL_OVERRIDE; + virtual vcl::Window* getAccessibleRelationLabelFor() const SAL_OVERRIDE; public: - explicit FixedText( Window* pParent, WinBits nStyle = 0 ); - explicit FixedText( Window* pParent, const ResId& rResId ); + explicit FixedText( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit FixedText( vcl::Window* pParent, const ResId& rResId ); virtual ~FixedText(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -78,14 +78,14 @@ public: Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const; virtual Size GetOptimalSize() const SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; - void set_mnemonic_widget(Window *pWindow); - Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } + void set_mnemonic_widget(vcl::Window *pWindow); + vcl::Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } }; class VCL_DLLPUBLIC SelectableFixedText : public Edit { public: - explicit SelectableFixedText( Window* pParent, WinBits nStyle = 0 ); + explicit SelectableFixedText( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void LoseFocus() SAL_OVERRIDE; }; @@ -99,7 +99,7 @@ class VCL_DLLPUBLIC FixedLine : public Control private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( bool bLayout = false ); @@ -112,8 +112,8 @@ protected: GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: - explicit FixedLine( Window* pParent, WinBits nStyle = WB_HORZ ); - explicit FixedLine( Window* pParent, const ResId& ); + explicit FixedLine( vcl::Window* pParent, WinBits nStyle = WB_HORZ ); + explicit FixedLine( vcl::Window* pParent, const ResId& ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; @@ -132,14 +132,14 @@ private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ); public: - explicit FixedBitmap( Window* pParent, WinBits nStyle = 0 ); + explicit FixedBitmap( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~FixedBitmap(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -166,7 +166,7 @@ private: private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); @@ -176,8 +176,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit FixedImage( Window* pParent, WinBits nStyle = 0 ); - explicit FixedImage( Window* pParent, const ResId& ); + explicit FixedImage( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit FixedImage( vcl::Window* pParent, const ResId& ); virtual ~FixedImage(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx index 8181dbc64a41..c85bd1cb6ac0 100644 --- a/include/vcl/fixedhyper.hxx +++ b/include/vcl/fixedhyper.hxx @@ -64,7 +64,7 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText With ResId or WinBits. */ - FixedHyperlink( Window* pParent, WinBits nWinStyle = 0 ); + FixedHyperlink( vcl::Window* pParent, WinBits nWinStyle = 0 ); /** dtor diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 580c6c16229a..5ad30a7282e5 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -75,7 +75,7 @@ class VCL_DLLPUBLIC FloatingWindow : public SystemWindow class ImplData; private: FloatingWindow* mpNextFloat; - Window* mpFirstPopupModeWin; + vcl::Window* mpFirstPopupModeWin; ImplData* mpImplData; Rectangle maFloatRect; ImplSVEvent * mnPostId; @@ -101,16 +101,16 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); public: - SAL_DLLPRIVATE FloatingWindow* ImplFloatHitTest( Window* pReference, const Point& rPos, HitTest& rHitTest ); + SAL_DLLPRIVATE FloatingWindow* ImplFloatHitTest( vcl::Window* pReference, const Point& rPos, HitTest& rHitTest ); SAL_DLLPRIVATE FloatingWindow* ImplFindLastLevelFloat(); - SAL_DLLPRIVATE bool ImplIsFloatPopupModeWindow( const Window* pWindow ); + SAL_DLLPRIVATE bool ImplIsFloatPopupModeWindow( const vcl::Window* pWindow ); SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = true; } SAL_DLLPRIVATE bool ImplIsMouseDown() const { return mbMouseDown; } - SAL_DLLPRIVATE static Point ImplCalcPos( Window* pWindow, + SAL_DLLPRIVATE static Point ImplCalcPos( vcl::Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); SAL_DLLPRIVATE void ImplEndPopupMode( sal_uInt16 nFlags = 0, sal_uLong nFocusId = 0 ); @@ -119,8 +119,8 @@ public: virtual void doDeferredInit(WinBits nBits) SAL_OVERRIDE; public: - explicit FloatingWindow(Window* pParent, WinBits nStyle = WB_STDFLOATWIN); - explicit FloatingWindow(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + explicit FloatingWindow(vcl::Window* pParent, WinBits nStyle = WB_STDFLOATWIN); + explicit FloatingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~FloatingWindow(); @@ -136,7 +136,7 @@ public: void StartPopupMode( const Rectangle& rRect, sal_uLong nFlags = 0 ); void StartPopupMode( ToolBox* pBox, sal_uLong nFlags = 0 ); void EndPopupMode( sal_uInt16 nFlags = 0 ); - void AddPopupModeWindow( Window* pWindow ); + void AddPopupModeWindow( vcl::Window* pWindow ); sal_uLong GetPopupModeFlags() const { return mnPopupModeFlags; } void SetPopupModeFlags( sal_uLong nFlags ) { mnPopupModeFlags = nFlags; } bool IsInPopupMode() const { return mbPopupMode; } @@ -149,7 +149,7 @@ public: bool GrabsFocus() const { return mbGrabFocus; } - static Point CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); + static Point CalcFloatingPosition( vcl::Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); }; #endif // INCLUDED_VCL_FLOATWIN_HXX diff --git a/include/vcl/fltcall.hxx b/include/vcl/fltcall.hxx index ca64e68f0902..6e7ab514ea5a 100644 --- a/include/vcl/fltcall.hxx +++ b/include/vcl/fltcall.hxx @@ -28,12 +28,12 @@ class FilterConfigItem; class SvStream; class Graphic; -class Window; +namespace vcl { class Window; } struct FltCallDialogParameter { - Window* pWindow; + vcl::Window* pWindow; ResMgr* pResMgr; FieldUnit eFieldUnit; OUString aFilterExt; @@ -41,7 +41,7 @@ struct FltCallDialogParameter // In and Out PropertySequence for all filter dialogs ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterData; - FltCallDialogParameter( Window* pW, ResMgr* pRsMgr, FieldUnit eFiUni ) : + FltCallDialogParameter( vcl::Window* pW, ResMgr* pRsMgr, FieldUnit eFiUni ) : pWindow ( pW ), pResMgr ( pRsMgr ), eFieldUnit ( eFiUni ) {}; diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index d600bb15041d..9e7b933fe228 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -33,7 +33,7 @@ class VCL_DLLPUBLIC GroupBox : public Control private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, @@ -46,7 +46,7 @@ private: GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: - explicit GroupBox( Window* pParent, WinBits nStyle = 0 ); + explicit GroupBox( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx index b41f6adb51ad..42c9e55d540a 100644 --- a/include/vcl/help.hxx +++ b/include/vcl/help.hxx @@ -26,7 +26,7 @@ class Point; class Rectangle; -class Window; +namespace vcl { class Window; } // - Help-Types - @@ -59,9 +59,9 @@ public: Help(); virtual ~Help(); - virtual bool Start( const OUString& rHelpId, const Window* pWindow ); + virtual bool Start( const OUString& rHelpId, const vcl::Window* pWindow ); virtual bool SearchKeyword( const OUString& rKeyWord ); - virtual OUString GetHelpText( const OUString& aHelpURL, const Window* pWindow ); + virtual OUString GetHelpText( const OUString& aHelpURL, const vcl::Window* pWindow ); static void EnableContextHelp(); static void DisableContextHelp(); @@ -76,10 +76,10 @@ public: static void EnableBalloonHelp(); static void DisableBalloonHelp(); static bool IsBalloonHelpEnabled(); - static bool ShowBalloon( Window* pParent, + static bool ShowBalloon( vcl::Window* pParent, const Point& rScreenPos, const OUString& rHelpText ); - static bool ShowBalloon( Window* pParent, + static bool ShowBalloon( vcl::Window* pParent, const Point& rScreenPos, const Rectangle&, const OUString& rHelpText ); @@ -87,12 +87,12 @@ public: static void EnableQuickHelp(); static void DisableQuickHelp(); static bool IsQuickHelpEnabled(); - static bool ShowQuickHelp( Window* pParent, + static bool ShowQuickHelp( vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rHelpText, const OUString& rLongHelpText, sal_uInt16 nStyle = 0 ); - static bool ShowQuickHelp( Window* pParent, + static bool ShowQuickHelp( vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rHelpText, sal_uInt16 nStyle = 0 ) @@ -100,11 +100,11 @@ public: static void HideBalloonAndQuickHelp(); - static sal_uLong ShowTip( Window* pParent, + static sal_uLong ShowTip( vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rText, sal_uInt16 nStyle = 0 ); static void UpdateTip( sal_uLong nId, - Window* pParent, + vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rText ); static void HideTip( sal_uLong nId ); diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx index bbe9cb48022e..753ad9f126d2 100644 --- a/include/vcl/imgctrl.hxx +++ b/include/vcl/imgctrl.hxx @@ -35,7 +35,7 @@ private: ::sal_Int16 mnScaleMode; public: - ImageControl( Window* pParent, WinBits nStyle = 0 ); + ImageControl( vcl::Window* pParent, WinBits nStyle = 0 ); // set/get the scale mode. This is one of the css.awt.ImageScaleMode constants void SetScaleMode( const ::sal_Int16 _nMode ); diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index b7e745c365c9..1c8a2661d557 100644 --- a/include/vcl/keycod.hxx +++ b/include/vcl/keycod.hxx @@ -26,7 +26,7 @@ #include <vcl/keycodes.hxx> #include <vcl/vclenum.hxx> -class Window; +namespace vcl { class Window; } namespace vcl { @@ -56,27 +56,27 @@ public: { return (nCode & KEY_MODTYPE); } sal_uInt16 GetAllModifier() const { return (nCode & KEY_ALLMODTYPE); } - bool IsShift() const + bool IsShift() const { return ((nCode & KEY_SHIFT) != 0); } - bool IsMod1() const + bool IsMod1() const { return ((nCode & KEY_MOD1) != 0); } - bool IsMod2() const + bool IsMod2() const { return ((nCode & KEY_MOD2) != 0); } - bool IsMod3() const + bool IsMod3() const { return ((nCode & KEY_MOD3) != 0); } sal_uInt16 GetGroup() const { return (nCode & KEYGROUP_TYPE); } - OUString GetName( Window* pWindow = NULL ) const; + OUString GetName( vcl::Window* pWindow = NULL ) const; - bool IsFunction() const + bool IsFunction() const { return (eFunc != KEYFUNC_DONTKNOW); } - KeyFuncType GetFunction() const; + KeyFuncType GetFunction() const; - KeyCode& operator = ( const KeyCode& rKeyCode ); - bool operator ==( const KeyCode& rKeyCode ) const; - bool operator !=( const KeyCode& rKeyCode ) const; + KeyCode& operator = ( const KeyCode& rKeyCode ); + bool operator ==( const KeyCode& rKeyCode ) const; + bool operator !=( const KeyCode& rKeyCode ) const; }; } // namespace vcl diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index cddac9ed8e87..374a42c6e9fe 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -20,20 +20,20 @@ #include <boost/multi_array.hpp> #include <set> -class VCL_DLLPUBLIC VclContainer : public Window +class VCL_DLLPUBLIC VclContainer : public vcl::Window { public: - VclContainer(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN); + VclContainer(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN); //These take into account the external margins of the rWindow widget //while GetOptimalSize/get_preferred_size and SetPosSizePixel are //oblivious to them - static Size getLayoutRequisition(const Window &rWindow); - static void setLayoutPosSize(Window &rWindow, const Point &rPos, const Size &rSize); + static Size getLayoutRequisition(const vcl::Window &rWindow); + static void setLayoutPosSize(vcl::Window &rWindow, const Point &rPos, const Size &rSize); //applies the allocation pos and size onto rWindow via setLayoutPosSize taking into account //the rWindows alignment desires within that allocation - static void setLayoutAllocation(Window &rWindow, const Point &rPos, const Size &rSize); + static void setLayoutAllocation(vcl::Window &rWindow, const Point &rPos, const Size &rSize); void markLayoutDirty() { @@ -66,7 +66,7 @@ protected: bool m_bVerticalContainer; int m_nSpacing; public: - VclBox(Window *pParent, bool bHomogeneous, int nSpacing) + VclBox(vcl::Window *pParent, bool bHomogeneous, int nSpacing) : VclContainer(pParent) , m_bHomogeneous(bHomogeneous) , m_bVerticalContainer(false) @@ -107,13 +107,13 @@ protected: virtual long getSecondaryCoordinate(const Point &rPos) const = 0; virtual void setSecondaryCoordinate(Point &rPos, long) const = 0; - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const = 0; + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const = 0; }; class VCL_DLLPUBLIC VclVBox : public VclBox { public: - VclVBox(Window *pParent, bool bHomogeneous = false, int nSpacing = 0) + VclVBox(vcl::Window *pParent, bool bHomogeneous = false, int nSpacing = 0) : VclBox(pParent, bHomogeneous, nSpacing) { m_bVerticalContainer = true; @@ -151,7 +151,7 @@ protected: { rPos.setX(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_vexpand(); } @@ -160,7 +160,7 @@ protected: class VCL_DLLPUBLIC VclHBox : public VclBox { public: - VclHBox(Window *pParent, bool bHomogeneous = false, int nSpacing = 0) + VclHBox(vcl::Window *pParent, bool bHomogeneous = false, int nSpacing = 0) : VclBox(pParent, bHomogeneous, nSpacing) { m_bVerticalContainer = false; @@ -198,7 +198,7 @@ protected: { rPos.setY(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_hexpand(); } @@ -217,7 +217,7 @@ enum VclButtonBoxStyle class VCL_DLLPUBLIC VclButtonBox : public VclBox { public: - VclButtonBox(Window *pParent, int nSpacing) + VclButtonBox(vcl::Window *pParent, int nSpacing) : VclBox(pParent, false, nSpacing) , m_eLayoutStyle(VCL_BUTTONBOX_DEFAULT_STYLE) { @@ -252,7 +252,7 @@ private: class VCL_DLLPUBLIC VclVButtonBox : public VclButtonBox { public: - VclVButtonBox(Window *pParent, int nSpacing = 0) + VclVButtonBox(vcl::Window *pParent, int nSpacing = 0) : VclButtonBox(pParent, nSpacing) { m_bVerticalContainer = true; @@ -290,7 +290,7 @@ protected: { rPos.setX(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_vexpand(); } @@ -299,7 +299,7 @@ protected: class VCL_DLLPUBLIC VclHButtonBox : public VclButtonBox { public: - VclHButtonBox(Window *pParent, int nSpacing = 0) + VclHButtonBox(vcl::Window *pParent, int nSpacing = 0) : VclButtonBox(pParent, nSpacing) { m_bVerticalContainer = false; @@ -337,7 +337,7 @@ protected: { rPos.setY(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_hexpand(); } @@ -353,7 +353,7 @@ private: struct GridEntry { - Window *pChild; + vcl::Window *pChild; sal_Int32 nSpanWidth; sal_Int32 nSpanHeight; GridEntry() @@ -395,7 +395,7 @@ private: virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; public: - VclGrid(Window *pParent) + VclGrid(vcl::Window *pParent) : VclContainer(pParent) , m_bRowHomogeneous(false), m_bColumnHomogeneous(false) , m_nRowSpacing(0), m_nColumnSpacing(0) @@ -436,18 +436,18 @@ public: virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; -VCL_DLLPUBLIC void setGridAttach(Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, +VCL_DLLPUBLIC void setGridAttach(vcl::Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nWidth = 1, sal_Int32 nHeight = 1); class VCL_DLLPUBLIC VclBin : public VclContainer { public: - VclBin(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN) + VclBin(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN) : VclContainer(pParent, nStyle) { } - virtual Window *get_child(); - virtual const Window *get_child() const; + virtual vcl::Window *get_child(); + virtual const vcl::Window *get_child() const; virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; }; @@ -455,22 +455,22 @@ public: class VCL_DLLPUBLIC VclFrame : public VclBin { private: - Window *m_pLabel; + vcl::Window *m_pLabel; private: friend class VclBuilder; - void designate_label(Window *pWindow); + void designate_label(vcl::Window *pWindow); public: - VclFrame(Window *pParent) + VclFrame(vcl::Window *pParent) : VclBin(pParent) , m_pLabel(NULL) { } void set_label(const OUString &rLabel); OUString get_label() const; - virtual Window *get_child() SAL_OVERRIDE; - virtual const Window *get_child() const SAL_OVERRIDE; - Window *get_label_widget(); - const Window *get_label_widget() const; + virtual vcl::Window *get_child() SAL_OVERRIDE; + virtual const vcl::Window *get_child() const SAL_OVERRIDE; + vcl::Window *get_label_widget(); + const vcl::Window *get_label_widget() const; protected: virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; @@ -480,7 +480,7 @@ protected: class VCL_DLLPUBLIC VclAlignment : public VclBin { public: - VclAlignment(Window *pParent) + VclAlignment(vcl::Window *pParent) : VclBin(pParent) , m_nBottomPadding(0) , m_nLeftPadding(0) @@ -510,7 +510,7 @@ private: class VCL_DLLPUBLIC VclExpander : public VclBin { public: - VclExpander(Window *pParent) + VclExpander(vcl::Window *pParent) : VclBin(pParent) , m_bResizeTopLevel(true) , m_aDisclosureButton(this) @@ -518,8 +518,8 @@ public: m_aDisclosureButton.SetToggleHdl(LINK(this, VclExpander, ClickHdl)); m_aDisclosureButton.Show(); } - virtual Window *get_child() SAL_OVERRIDE; - virtual const Window *get_child() const SAL_OVERRIDE; + virtual vcl::Window *get_child() SAL_OVERRIDE; + virtual const vcl::Window *get_child() const SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; bool get_expanded() const { @@ -553,9 +553,9 @@ private: class VCL_DLLPUBLIC VclScrolledWindow : public VclBin { public: - VclScrolledWindow(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL); - virtual Window *get_child() SAL_OVERRIDE; - virtual const Window *get_child() const SAL_OVERRIDE; + VclScrolledWindow(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL); + virtual vcl::Window *get_child() SAL_OVERRIDE; + virtual const vcl::Window *get_child() const SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; ScrollBar& getVertScrollBar() { return m_aVScroll; } ScrollBar& getHorzScrollBar() { return m_aHScroll; } @@ -579,7 +579,7 @@ private: class VCL_DLLPUBLIC VclViewport : public VclBin { public: - VclViewport(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN) + VclViewport(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN) : VclBin(pParent, nStyle) { } @@ -598,10 +598,10 @@ private: //Any Commands an EventBoxHelper receives are forwarded to its parent //The VclEventBox ensures that m_aEventBoxHelper is the //first child and is transparent, but covers the rest of the children - class EventBoxHelper : public Window + class EventBoxHelper : public vcl::Window { public: - EventBoxHelper(Window* pParent) + EventBoxHelper(vcl::Window* pParent) : Window(pParent, 0) { SetSizePixel(pParent->GetSizePixel()); @@ -617,14 +617,14 @@ private: EventBoxHelper m_aEventBoxHelper; public: - VclEventBox(Window* pParent) + VclEventBox(vcl::Window* pParent) : VclBin(pParent) , m_aEventBoxHelper(this) { m_aEventBoxHelper.Show(); } - virtual Window *get_child() SAL_OVERRIDE; - virtual const Window *get_child() const SAL_OVERRIDE; + virtual vcl::Window *get_child() SAL_OVERRIDE; + virtual const vcl::Window *get_child() const SAL_OVERRIDE; virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; @@ -642,7 +642,7 @@ enum VclSizeGroupMode class VCL_DLLPUBLIC VclSizeGroup { private: - std::set<Window*> m_aWindows; + std::set<vcl::Window*> m_aWindows; bool m_bIgnoreHidden; VclSizeGroupMode m_eMode; @@ -653,19 +653,19 @@ public: , m_eMode(VCL_SIZE_GROUP_HORIZONTAL) { } - void insert(Window *pWindow) + void insert(vcl::Window *pWindow) { m_aWindows.insert(pWindow); } - void erase(Window *pWindow) + void erase(vcl::Window *pWindow) { m_aWindows.erase(pWindow); } - const std::set<Window*>& get_widgets() const + const std::set<vcl::Window*>& get_widgets() const { return m_aWindows; } - std::set<Window*>& get_widgets() + std::set<vcl::Window*>& get_widgets() { return m_aWindows; } @@ -712,24 +712,24 @@ private: VclMultiLineEdit* m_pPrimaryMessage; VclMultiLineEdit* m_pSecondaryMessage; std::vector<PushButton*> m_aOwnedButtons; - std::map<const Window*, short> m_aResponses; + std::map<const vcl::Window*, short> m_aResponses; OUString m_sPrimaryString; OUString m_sSecondaryString; DECL_DLLPRIVATE_LINK(ButtonHdl, Button *); void setButtonHandlers(VclButtonBox *pButtonBox); - short get_response(const Window *pWindow) const; + short get_response(const vcl::Window *pWindow) const; void create_owned_areas(); friend class VclBuilder; - MessageDialog(Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); + MessageDialog(vcl::Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); public: - MessageDialog(Window* pParent, + MessageDialog(vcl::Window* pParent, const OUString &rMessage, VclMessageType eMessageType = VCL_MESSAGE_ERROR, VclButtonsType eButtonsType = VCL_BUTTONS_OK, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); - MessageDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription); + MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; ///Emitted when an action widget is clicked @@ -740,7 +740,7 @@ public: void set_secondary_text(const OUString &rSecondaryString); virtual ~MessageDialog(); - static void SetMessagesWidths(Window *pParent, VclMultiLineEdit *pPrimaryMessage, + static void SetMessagesWidths(vcl::Window *pParent, VclMultiLineEdit *pPrimaryMessage, VclMultiLineEdit *pSecondaryMessage); }; @@ -751,57 +751,57 @@ VCL_DLLPUBLIC Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize); //i.e. acts like pChild = pChild->GetWindow(WINDOW_FIRSTCHILD); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC Window* firstLogicalChildOfParent(Window *pTopLevel); +VCL_DLLPUBLIC vcl::Window* firstLogicalChildOfParent(vcl::Window *pTopLevel); //Get next window after pChild of a pTopLevel window as //if any intermediate layout widgets didn't exist //i.e. acts like pChild = pChild->GetWindow(WINDOW_NEXT); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC Window* nextLogicalChildOfParent(Window *pTopLevel, Window *pChild); +VCL_DLLPUBLIC vcl::Window* nextLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChild); //Get previous window before pChild of a pTopLevel window as //if any intermediate layout widgets didn't exist //i.e. acts like pChild = pChild->GetWindow(WINDOW_PREV); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC Window* prevLogicalChildOfParent(Window *pTopLevel, Window *pChild); +VCL_DLLPUBLIC vcl::Window* prevLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChild); //Returns true is the Window has a single child which is a container -VCL_DLLPUBLIC bool isLayoutEnabled(const Window *pWindow); +VCL_DLLPUBLIC bool isLayoutEnabled(const vcl::Window *pWindow); -inline bool isContainerWindow(const Window &rWindow) +inline bool isContainerWindow(const vcl::Window &rWindow) { WindowType eType = rWindow.GetType(); return (eType == WINDOW_CONTAINER || eType == WINDOW_SCROLLWINDOW); } -inline bool isContainerWindow(const Window *pWindow) +inline bool isContainerWindow(const vcl::Window *pWindow) { return pWindow && isContainerWindow(*pWindow); } //Returns true if the containing dialog is doing its initial //layout and isn't visible yet -VCL_DLLPUBLIC bool isInitialLayout(const Window *pWindow); +VCL_DLLPUBLIC bool isInitialLayout(const vcl::Window *pWindow); // retro-fitting utilities //Get a Size which is large enough to contain all children with //an equal amount of space at top left and bottom right -Size getLegacyBestSizeForChildren(const Window &rWindow); +Size getLegacyBestSizeForChildren(const vcl::Window &rWindow); //Get first parent which is not a layout widget -VCL_DLLPUBLIC Window* getNonLayoutParent(Window *pParent); +VCL_DLLPUBLIC vcl::Window* getNonLayoutParent(vcl::Window *pParent); //Get first real parent which is not a layout widget -Window* getNonLayoutRealParent(Window *pParent); +vcl::Window* getNonLayoutRealParent(vcl::Window *pParent); //return true if this window and its stack of containers are all shown -bool isVisibleInLayout(const Window *pWindow); +bool isVisibleInLayout(const vcl::Window *pWindow); //return true if this window and its stack of containers are all enabled -bool isEnabledInLayout(const Window *pWindow); +bool isEnabledInLayout(const vcl::Window *pWindow); #endif diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index 89b8364788c4..74de049e8f5a 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -89,7 +89,7 @@ private: BigInt mnLast; public: - LongCurrencyField( Window* pParent, WinBits nWinStyle ); + LongCurrencyField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~LongCurrencyField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -116,7 +116,7 @@ public: class VCL_DLLPUBLIC LongCurrencyBox : public ComboBox, public LongCurrencyFormatter { public: - LongCurrencyBox( Window* pParent, WinBits nWinStyle ); + LongCurrencyBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~LongCurrencyBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 29bf86d0b784..621b571c224a 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -69,7 +69,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); bool IsDropDownBox() const { return mpFloatWin ? true : false; } @@ -80,8 +80,8 @@ protected: virtual void FillLayoutData() const SAL_OVERRIDE; public: - explicit ListBox( Window* pParent, WinBits nStyle = WB_BORDER ); - explicit ListBox( Window* pParent, const ResId& ); + explicit ListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER ); + explicit ListBox( vcl::Window* pParent, const ResId& ); virtual ~ListBox(); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; @@ -95,7 +95,7 @@ public: virtual void DoubleClick(); virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual const Wallpaper& GetDisplayBackground() const SAL_OVERRIDE; @@ -255,7 +255,7 @@ private: bool IsValueChangedFromSaved() const; public: - explicit MultiListBox( Window* pParent, WinBits nStyle = 0 ); + explicit MultiListBox( vcl::Window* pParent, WinBits nStyle = 0 ); }; diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 77313014bde8..6ca076fc1473 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -44,7 +44,7 @@ class Image; class PopupMenu; class KeyEvent; class MenuFloatingWindow; -class Window; +namespace vcl { class Window; } class SalMenu; class IMenuBarWindow; struct SystemMenuData; @@ -122,7 +122,7 @@ private: MenuItemList* pItemList; // Liste mit den MenuItems MenuLogo* pLogo; Menu* pStartedFrom; - Window* pWindow; + vcl::Window* pWindow; Link aActivateHdl; // Active-Handler Link aDeactivateHdl; // Deactivate-Handler @@ -158,14 +158,14 @@ protected: SAL_DLLPRIVATE Menu* ImplGetStartMenu(); SAL_DLLPRIVATE Menu* ImplFindSelectMenu(); SAL_DLLPRIVATE Menu* ImplFindMenu( sal_uInt16 nId ); - SAL_DLLPRIVATE Size ImplCalcSize( const Window* pWin ); + SAL_DLLPRIVATE Size ImplCalcSize( const vcl::Window* pWin ); SAL_DLLPRIVATE bool ImplIsVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE bool ImplIsSelectable( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const; SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisible() const; SAL_DLLPRIVATE sal_uInt16 ImplGetPrevVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetNextVisible( sal_uInt16 nPos ) const; - SAL_DLLPRIVATE void ImplPaint( Window* pWin, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) const; + SAL_DLLPRIVATE void ImplPaint( vcl::Window* pWin, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) const; SAL_DLLPRIVATE void ImplSelect(); SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem ); SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ); @@ -178,11 +178,11 @@ protected: // returns native check and option menu symbol height in rCheckHeight and rRadioHeight // return value is maximum width and height of checkboxes and radiobuttons - SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize( const Window*, long& rCheckHeight, long& rRadioHeight ) const; + SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize( const vcl::Window*, long& rCheckHeight, long& rRadioHeight ) const; // returns native submenu arrow size and spacing from right border // return value is whether it's supported natively - SAL_DLLPRIVATE bool ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long& rArrowSpacing ) const; + SAL_DLLPRIVATE bool ImplGetNativeSubmenuArrowSize( vcl::Window* pWin, Size& rArrowSize, long& rArrowSpacing ) const; SAL_DLLPRIVATE void ImplAddDel( ImplMenuDelData &rDel ); SAL_DLLPRIVATE void ImplRemoveDel( ImplMenuDelData &rDel ); @@ -200,7 +200,7 @@ public: SAL_DLLPRIVATE void ImplKillLayoutData() const; SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const { return pStartedFrom; } - SAL_DLLPRIVATE Window* ImplGetWindow() const { return pWindow; } + SAL_DLLPRIVATE vcl::Window* ImplGetWindow() const { return pWindow; } void ImplSelectWithStart( Menu* pStartMenu = NULL ); protected: @@ -365,7 +365,7 @@ public: // gets the activation key of the specified item KeyEvent GetActivationKey( sal_uInt16 nItemId ) const; - Window* GetWindow() const { return pWindow; } + vcl::Window* GetWindow() const { return pWindow; } void SetAccessibleName( sal_uInt16 nItemId, const OUString& rStr ); OUString GetAccessibleName( sal_uInt16 nItemId ) const; @@ -408,9 +408,9 @@ class VCL_DLLPUBLIC MenuBar : public Menu friend class MenuFloatingWindow; friend class SystemWindow; - SAL_DLLPRIVATE static Window* ImplCreate(Window* pParent, Window* pWindow, MenuBar* pMenu, const css::uno::Reference<css::frame::XFrame> &rFrame); - SAL_DLLPRIVATE static void ImplDestroy( MenuBar* pMenu, bool bDelete ); - SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu = true ); + SAL_DLLPRIVATE static vcl::Window* ImplCreate(vcl::Window* pParent, vcl::Window* pWindow, MenuBar* pMenu, const css::uno::Reference<css::frame::XFrame> &rFrame); + SAL_DLLPRIVATE static void ImplDestroy( MenuBar* pMenu, bool bDelete ); + SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu = true ); protected: @@ -507,7 +507,7 @@ private: SAL_DLLPRIVATE MenuFloatingWindow* ImplGetFloatingWindow() const { return (MenuFloatingWindow*)Menu::ImplGetWindow(); } protected: - SAL_DLLPRIVATE sal_uInt16 ImplExecute( Window* pWindow, const Rectangle& rRect, sal_uLong nPopupFlags, Menu* pStaredFrom, bool bPreSelectFirst ); + SAL_DLLPRIVATE sal_uInt16 ImplExecute( vcl::Window* pWindow, const Rectangle& rRect, sal_uLong nPopupFlags, Menu* pStaredFrom, bool bPreSelectFirst ); SAL_DLLPRIVATE long ImplCalcHeight( sal_uInt16 nEntries ) const; SAL_DLLPRIVATE sal_uInt16 ImplCalcVisEntries( long nMaxHeight, sal_uInt16 nStartEntry = 0, sal_uInt16* pLastVisible = NULL ) const; @@ -525,8 +525,8 @@ public: void SetText( const OUString& rTitle ) { aTitleText = rTitle; } const OUString& GetText() const { return aTitleText; } - sal_uInt16 Execute( Window* pWindow, const Point& rPopupPos ); - sal_uInt16 Execute( Window* pWindow, const Rectangle& rRect, sal_uInt16 nFlags = 0 ); + sal_uInt16 Execute( vcl::Window* pWindow, const Point& rPopupPos ); + sal_uInt16 Execute( vcl::Window* pWindow, const Rectangle& rRect, sal_uInt16 nFlags = 0 ); // Fuer das TestTool void EndExecute( sal_uInt16 nSelect = 0 ); diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index 22ca3091daf8..78209c818d47 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -54,10 +54,10 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); public: - explicit MenuButton( Window* pParent, WinBits nStyle = 0 ); + explicit MenuButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~MenuButton(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index 12293fec20e3..f77339136ba3 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -46,10 +46,10 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); public: - explicit MoreButton( Window* pParent, WinBits nStyle = 0 ); + explicit MoreButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~MoreButton(); void Click() SAL_OVERRIDE; diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index f06704786b81..04ea155cb6d8 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -46,7 +46,7 @@ protected: SAL_DLLPRIVATE void ImplPosControls(); public: - MessBox( Window* pParent, WinBits nStyle, + MessBox( vcl::Window* pParent, WinBits nStyle, const OUString& rTitle, const OUString& rMessage ); virtual ~MessBox(); @@ -72,8 +72,8 @@ private: SAL_DLLPRIVATE void ImplInitInfoBoxData(); public: - InfoBox( Window* pParent, const OUString& rMessage ); - InfoBox( Window* pParent, WinBits nStyle, + InfoBox( vcl::Window* pParent, const OUString& rMessage ); + InfoBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ); static Image GetStandardImage(); @@ -85,7 +85,7 @@ private: SAL_DLLPRIVATE void ImplInitWarningBoxData(); public: - WarningBox( Window* pParent, WinBits nStyle, + WarningBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ); void SetDefaultCheckBoxText(); @@ -99,7 +99,7 @@ private: SAL_DLLPRIVATE void ImplInitErrorBoxData(); public: - ErrorBox( Window* pParent, WinBits nStyle, + ErrorBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ); static Image GetStandardImage(); @@ -111,7 +111,7 @@ private: SAL_DLLPRIVATE void ImplInitQueryBoxData(); public: - QueryBox( Window* pParent, WinBits nStyle, + QueryBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ); void SetDefaultCheckBoxText(); diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 4d8436d30d43..4017923c5464 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -100,8 +100,8 @@ struct GLWindow #elif defined( ANDROID ) #elif defined( UNX ) Display* dpy; - int screen; - XLIB_Window win; + int screen; + Window win; #if defined( GLX_EXT_texture_from_pixmap ) GLXFBConfig fbc; #endif @@ -155,7 +155,7 @@ public: void requestLegacyContext(); - bool init(Window* pParent = 0); + bool init(vcl::Window* pParent = 0); bool init(SystemChildWindow* pChildWindow); void makeCurrent(); @@ -180,7 +180,7 @@ public: bool supportMultiSampling() const; - static SystemWindowData generateWinData(Window* pParent, bool bRequestLegacyContext); + static SystemWindowData generateWinData(vcl::Window* pParent, bool bRequestLegacyContext); private: SAL_DLLPRIVATE bool initWindow(); @@ -191,8 +191,8 @@ private: #endif GLWindow m_aGLWin; - boost::scoped_ptr<Window> m_pWindow; - Window* mpWindow; //points to m_pWindow or the parent window, don't delete it + boost::scoped_ptr<vcl::Window> m_pWindow; + vcl::Window* mpWindow; //points to m_pWindow or the parent window, don't delete it SystemChildWindow* m_pChildWindow; boost::scoped_ptr<SystemChildWindow> m_pChildWindowGC; bool mbInitialized; diff --git a/include/vcl/openglwin.hxx b/include/vcl/openglwin.hxx index 1419dda33e2f..c95b02d5261a 100644 --- a/include/vcl/openglwin.hxx +++ b/include/vcl/openglwin.hxx @@ -32,10 +32,10 @@ public: }; // pImpl Pattern to avoid linking against OpenGL libs when using the class without the context -class VCLOPENGL_DLLPUBLIC OpenGLWindow : public Window +class VCLOPENGL_DLLPUBLIC OpenGLWindow : public vcl::Window { public: - OpenGLWindow(Window* pParent); + OpenGLWindow(vcl::Window* pParent); virtual ~OpenGLWindow(); OpenGLContext& getContext(); diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 8089cc16bb5a..a0e18f2c79dc 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -94,7 +94,7 @@ class SalLayout; class ImplLayoutArgs; class ImplFontAttributes; class VirtualDevice; -class Window; +namespace vcl { class Window; } struct SalTwoRect; // Layout options @@ -258,10 +258,10 @@ class VCL_DLLPUBLIC OutputDevice: private boost::noncopyable friend class Printer; friend class System; friend class VirtualDevice; - friend class Window; + friend class vcl::Window; friend class WorkWindow; friend class vcl::PDFWriterImpl; - friend void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ); + friend void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight ); private: mutable SalGraphics* mpGraphics; ///< Graphics context to draw on diff --git a/include/vcl/popupmenuwindow.hxx b/include/vcl/popupmenuwindow.hxx index 87ef34c60c08..266738a170c3 100644 --- a/include/vcl/popupmenuwindow.hxx +++ b/include/vcl/popupmenuwindow.hxx @@ -28,7 +28,7 @@ private: struct ImplData; ImplData* mpImplData; public: - PopupMenuFloatingWindow( Window* pParent, WinBits nStyle = (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER) ); + PopupMenuFloatingWindow( vcl::Window* pParent, WinBits nStyle = (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER) ); virtual ~PopupMenuFloatingWindow(); sal_uInt16 GetMenuStackLevel() const; @@ -36,7 +36,7 @@ public: bool IsPopupMenu() const; //determine if a given window is an activated PopupMenuFloatingWindow - static bool isPopupMenu(const Window *pWindow); + static bool isPopupMenu(const vcl::Window *pWindow); }; #endif diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 943dd54d1b94..782b2c549a9a 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -55,7 +55,7 @@ // - ProgressBar - -class VCL_DLLPUBLIC ProgressBar : public Window +class VCL_DLLPUBLIC ProgressBar : public vcl::Window { private: Point maPos; @@ -71,7 +71,7 @@ private: SAL_DLLPRIVATE void ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ); public: - ProgressBar( Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); + ProgressBar( vcl::Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); virtual ~ProgressBar(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 01c343027d0d..8cb430d4619b 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -43,7 +43,7 @@ class SalInfoPrinter; struct SalPrinterQueueInfo; class SalPrinter; class VirtualDevice; -class Window; +namespace vcl { class Window; } namespace vcl { class PrinterController; @@ -232,7 +232,7 @@ private: SAL_DLLPRIVATE void ImplInitData(); SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); - SAL_DLLPRIVATE void ImplInitDisplay( const Window* pWindow ); + SAL_DLLPRIVATE void ImplInitDisplay( const vcl::Window* pWindow ); SAL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const OUString& rPrinterName, const OUString* pDriver ); SAL_DLLPRIVATE void ImplUpdatePageData(); @@ -318,7 +318,7 @@ public: bool SetJobSetup( const JobSetup& rSetup ); const JobSetup& GetJobSetup() const { return maJobSetup; } - bool Setup( Window* pWindow = NULL ); + bool Setup( vcl::Window* pWindow = NULL ); bool SetPrinterProps( const Printer* pPrinter ); // SetPrinterOptions is used internally only now @@ -557,7 +557,7 @@ public: SAL_DLLPRIVATE void pushPropertiesToPrinter(); SAL_DLLPRIVATE void resetPaperToLastConfigured(); VCL_PLUGIN_PUBLIC void setJobState( com::sun::star::view::PrintableState ); - SAL_DLLPRIVATE bool setupPrinter( Window* i_pDlgParent ); + SAL_DLLPRIVATE bool setupPrinter( vcl::Window* i_pDlgParent ); SAL_DLLPRIVATE int getPageCountProtected() const; SAL_DLLPRIVATE css::uno::Sequence< css::beans::PropertyValue > getPageParametersProtected( int i_nPage ) const; diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx index 7211885e03c1..6f334f7e11fe 100644 --- a/include/vcl/region.hxx +++ b/include/vcl/region.hxx @@ -30,6 +30,7 @@ class ImplRegionBand; class RegionBand; class Polygon; class PolyPolygon; +namespace vcl { class Window; } typedef boost::shared_ptr< RegionBand > RegionBandPtr; typedef boost::shared_ptr< PolyPolygon > PolyPolygonPtr; @@ -40,7 +41,7 @@ class VCL_DLLPUBLIC Region { private: friend class OutputDevice; - friend class Window; + friend class vcl::Window; friend class Bitmap; // possible contents diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index febefc08c1fe..65bbca0dc2fe 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -70,7 +70,7 @@ private: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplUpdateRects( bool bUpdate = true ); SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos ); @@ -89,7 +89,7 @@ private: DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, void* ); public: - explicit ScrollBar( Window* pParent, WinBits nStyle = WB_VERT ); + explicit ScrollBar( vcl::Window* pParent, WinBits nStyle = WB_VERT ); virtual ~ScrollBar(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -145,15 +145,15 @@ public: // - ScrollBarBox - -class VCL_DLLPUBLIC ScrollBarBox : public Window +class VCL_DLLPUBLIC ScrollBarBox : public vcl::Window { private: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); public: - explicit ScrollBarBox( Window* pParent, WinBits nStyle = 0 ); + explicit ScrollBarBox( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index bdb2e3cb4248..afe30c39a87a 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -24,7 +24,7 @@ #include <vcl/timer.hxx> #include <vcl/event.hxx> -class Window; +namespace vcl { class Window; } class CommandEvent; // Timerticks @@ -77,7 +77,7 @@ class VCL_DLLPUBLIC SelectionEngine { private: FunctionSet* pFunctionSet; - Window* pWin; + vcl::Window* pWin; Rectangle aArea; Timer aWTimer; // generate fake mouse moves MouseEvent aLastMove; @@ -91,7 +91,7 @@ private: // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging public: - SelectionEngine( Window* pWindow, + SelectionEngine( vcl::Window* pWindow, FunctionSet* pFunctions = NULL, sal_uLong nAutoRepeatInterval = SELENG_AUTOREPEAT_INTERVAL ); ~SelectionEngine(); @@ -129,8 +129,8 @@ public: { return aLastMove.GetPosPixel(); } const MouseEvent& GetMouseEvent() const { return aLastMove; } - void SetWindow( Window*); - Window* GetWindow() const { return pWin; } + void SetWindow( vcl::Window*); + vcl::Window* GetWindow() const { return pWin; } void LockModifiers( sal_uInt16 nModifiers ) { nLockedMods = nModifiers; } diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index b0ce5303110d..bc30d29d4060 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -55,7 +55,7 @@ private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplUpdateRects( bool bUpdate = true ); SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos ); @@ -71,7 +71,7 @@ private: SAL_DLLPRIVATE long ImplDoSlideAction( ScrollType eScrollType ); public: - Slider( Window* pParent, WinBits nStyle = WB_HORZ ); + Slider( vcl::Window* pParent, WinBits nStyle = WB_HORZ ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx index 136f2fdc0ed2..14bc46b57cf9 100644 --- a/include/vcl/sound.hxx +++ b/include/vcl/sound.hxx @@ -22,7 +22,7 @@ #include <vcl/dllapi.h> -class Window; +namespace vcl { class Window; } // - Sound - @@ -31,7 +31,7 @@ class Window; class VCL_DLLPUBLIC Sound { public: - static void Beep( Window* pWindow = NULL ); + static void Beep( vcl::Window* pWindow = NULL ); }; #endif // INCLUDED_VCL_SOUND_HXX diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 5ba88e9cd19b..1900822b1844 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -52,11 +52,11 @@ private: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); DECL_DLLPRIVATE_LINK( ImplTimeout, Timer* ); public: - explicit SpinButton( Window* pParent, WinBits nStyle = 0 ); + explicit SpinButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~SpinButton(); virtual void Up(); diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 2d09032d4e2e..fe5431be04b6 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -51,7 +51,7 @@ protected: mbInDropDown:1; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); private: DECL_DLLPRIVATE_LINK( ImplTimeout, Timer* ); @@ -70,8 +70,8 @@ protected: Rectangle * ImplFindPartRect( const Point& rPt ); public: - explicit SpinField( Window* pParent, WinBits nWinStyle = 0 ); - explicit SpinField( Window* pParent, const ResId& ); + explicit SpinField( vcl::Window* pParent, WinBits nWinStyle = 0 ); + explicit SpinField( vcl::Window* pParent, const ResId& ); virtual ~SpinField(); virtual bool ShowDropDown( bool bShow ); diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index ff42f32030b3..b478317fe718 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -25,10 +25,10 @@ #define SPLITTER_DEFAULTSTEPSIZE 0xFFFF -class VCL_DLLPUBLIC Splitter : public Window +class VCL_DLLPUBLIC Splitter : public vcl::Window { private: - Window* mpRefWin; + vcl::Window* mpRefWin; long mnSplitPos; long mnLastSplitPos; long mnStartSplitPos; @@ -59,11 +59,11 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nWinStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nWinStyle ); public: - explicit Splitter( Window* pParent, WinBits nStyle = WB_VSCROLL ); - explicit Splitter( Window* pParent, const ResId& ); + explicit Splitter( vcl::Window* pParent, WinBits nStyle = WB_VSCROLL ); + explicit Splitter( vcl::Window* pParent, const ResId& ); virtual ~Splitter(); virtual void StartSplit(); @@ -86,9 +86,9 @@ public: void StartDrag(); void SetDragRectPixel( const Rectangle& rDragRect, - Window* pRefWin = NULL ); + vcl::Window* pRefWin = NULL ); const Rectangle& GetDragRectPixel() const { return maDragRect; } - Window* GetDragWindow() const { return mpRefWin; } + vcl::Window* GetDragWindow() const { return mpRefWin; } virtual void SetSplitPosPixel( long nPos ); long GetSplitPosPixel() const { return mnSplitPos; } diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index b71b8e745b6e..83f640696814 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -88,7 +88,7 @@ private: Link maFadeOutHdl; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplCalcLayout(); SAL_DLLPRIVATE void ImplUpdate(); @@ -125,7 +125,7 @@ private: SAL_DLLPRIVATE SplitWindow (const SplitWindow &); SAL_DLLPRIVATE SplitWindow & operator= (const SplitWindow &); public: - SplitWindow( Window* pParent, WinBits nStyle = 0 ); + SplitWindow( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~SplitWindow(); virtual void StartSplit(); @@ -146,7 +146,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void InsertItem( sal_uInt16 nId, Window* pWindow, long nSize, + void InsertItem( sal_uInt16 nId, vcl::Window* pWindow, long nSize, sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nSetId = 0, SplitWindowItemBits nBits = 0 ); void InsertItem( sal_uInt16 nId, long nSize, @@ -173,7 +173,7 @@ public: */ long GetItemSize( sal_uInt16 nId, SplitWindowItemBits nBits ) const; sal_uInt16 GetSet( sal_uInt16 nId ) const; - sal_uInt16 GetItemId( Window* pWindow ) const; + sal_uInt16 GetItemId( vcl::Window* pWindow ) const; sal_uInt16 GetItemId( const Point& rPos ) const; sal_uInt16 GetItemPos( sal_uInt16 nId, sal_uInt16 nSetId = 0 ) const; sal_uInt16 GetItemId( sal_uInt16 nPos, sal_uInt16 nSetId = 0 ) const; diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 250d08d5fbe1..0f74411eaec2 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -32,7 +32,7 @@ typedef ::std::vector< ImplStatusItem* > ImplStatusItemList; // - Progress-Ausgabe - -void VCL_DLLPUBLIC DrawProgress( Window* pWindow, const Point& rPos, +void VCL_DLLPUBLIC DrawProgress( vcl::Window* pWindow, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, const Rectangle& rFramePosSize @@ -69,7 +69,7 @@ typedef sal_uInt16 StatusBarItemBits; // - StatusBar - -class VCL_DLLPUBLIC StatusBar : public Window +class VCL_DLLPUBLIC StatusBar : public vcl::Window { class ImplData; private: @@ -96,7 +96,7 @@ private: Link maDoubleClickHdl; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplFormat(); SAL_DLLPRIVATE bool ImplIsItemUpdate(); @@ -110,7 +110,7 @@ private: SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisiblePos() const; public: - StatusBar( Window* pParent, + StatusBar( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER | WB_RIGHT ); virtual ~StatusBar(); diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx index cfd865c748c0..205b008a8b2d 100644 --- a/include/vcl/stdtext.hxx +++ b/include/vcl/stdtext.hxx @@ -23,7 +23,7 @@ #include <rtl/ustring.hxx> #include <vcl/dllapi.h> -class Window; +namespace vcl { class Window; } #define STANDARD_TEXT_FIRST STANDARD_TEXT_SERVICE_NOT_AVAILABLE #define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((sal_uInt16)0) @@ -31,7 +31,7 @@ class Window; OUString VCL_DLLPUBLIC GetStandardText(sal_uInt16 nStdText); -void VCL_DLLPUBLIC ShowServiceNotAvailableError(Window* pParent, const OUString& rServiceName, bool bError); +void VCL_DLLPUBLIC ShowServiceNotAvailableError(vcl::Window* pParent, const OUString& rServiceName, bool bError); #endif // INCLUDED_VCL_STDTEXT_HXX diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index f4b7abc97d2c..e303bc6ec708 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -48,7 +48,7 @@ class DataChangedEvent; class Accelerator; class Help; class OutputDevice; -class Window; +namespace vcl { class Window; } class WorkWindow; class MenuBar; class UnoWrapperBase; @@ -313,7 +313,7 @@ public: class TheWindow : public WorkWindow { public: - TheWindow(Window *parent, WinBits windowStyle) : + TheWindow(vcl::Window *parent, WinBits windowStyle) : WorkWindow(parent, windowStyle) {} virtual void Paint(const Rectangle &); @@ -811,7 +811,7 @@ public: @see ImplCallEventListeners(VclSimpleEvent* pEvent) */ - static void ImplCallEventListeners( sal_uLong nEvent, Window* pWin, void* pData ); + static void ImplCallEventListeners( sal_uLong nEvent, vcl::Window* pWin, void* pData ); /** Send event to all VCL application event listeners @@ -829,7 +829,7 @@ public: @see PostKeyEvent */ - static bool HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); + static bool HandleKey( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ); /** Send keypress event @@ -839,7 +839,7 @@ public: @see HandleKey */ - static ImplSVEvent * PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); + static ImplSVEvent * PostKeyEvent( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ); /** Send mouse event @@ -847,7 +847,7 @@ public: @param pWin Pointer to window to which the event is sent @param pKeyEvent Mouse event to send */ - static ImplSVEvent * PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent ); + static ImplSVEvent * PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, MouseEvent* pMouseEvent ); /** Send zoom event @@ -858,7 +858,7 @@ public: @param pWin Pointer to window to which the event is sent @param pZoomEvent Zoom event to send */ - static ImplSVEvent * PostZoomEvent( sal_uLong nEvent, Window *pWin, ZoomEvent* pZoomEvent ); + static ImplSVEvent * PostZoomEvent( sal_uLong nEvent, vcl::Window *pWin, ZoomEvent* pZoomEvent ); /* Send scroll event @@ -869,7 +869,7 @@ public: @param pWin Pointer to window to which the event is sent @param pScrollEvent Scroll event to send */ - static ImplSVEvent * PostScrollEvent( sal_uLong nEvent, Window *pWin, ScrollEvent* pScrollEvent ); + static ImplSVEvent * PostScrollEvent( sal_uLong nEvent, vcl::Window *pWin, ScrollEvent* pScrollEvent ); /** Remove mouse and keypress events from a window... any also zoom and scroll events if the platform supports it. @@ -878,7 +878,7 @@ public: @see HandleKey, PostKeyEvent, PostMouseEvent, PostZoomEvent, PostScrollEvent */ - static void RemoveMouseAndKeyEvents( Window *pWin ); + static void RemoveMouseAndKeyEvents( vcl::Window *pWin ); /** Post a user event to the default window. @@ -962,7 +962,7 @@ public: @see GetAppWindow, GetDefaultDevice */ - static Window* GetFocusWindow(); + static vcl::Window* GetFocusWindow(); /** Get the default "device" (in this case the default window). @@ -980,7 +980,7 @@ public: @see GetNextTopLevelWindow, GetTopWindowCount, GetTopWindow, GetActiveTopWindow */ - static Window* GetFirstTopLevelWindow(); + static vcl::Window* GetFirstTopLevelWindow(); /** Get the next top level window. @@ -989,7 +989,7 @@ public: @returns Pointer to next top window. */ - static Window* GetNextTopLevelWindow( Window* pWindow ); + static vcl::Window* GetNextTopLevelWindow( vcl::Window* pWindow ); /** Return the number of top-level windows being used by the application @@ -1013,7 +1013,7 @@ public: @see GetFirstTopLevelWindow, GetNextTopLevelWindow, GetTopWindowCount, GetActiveTopWindow */ - static Window* GetTopWindow( long nIndex ); + static vcl::Window* GetTopWindow( long nIndex ); /** Get the "active" top window. @@ -1025,7 +1025,7 @@ public: @see GetFirstTopLevelWindow, GetNextTopLevelWindow, GetTopWindowCount, GetTopWindow */ - static Window* GetActiveTopWindow(); + static vcl::Window* GetActiveTopWindow(); ///@} @@ -1265,7 +1265,7 @@ public: @see GetDefDialogParent */ - static void SetDefDialogParent( Window* pWindow ); + static void SetDefDialogParent( vcl::Window* pWindow ); /** Get the default parent window for dialog boxes. @@ -1278,7 +1278,7 @@ public: @returns Pointer to the default window. */ - static Window* GetDefDialogParent(); + static vcl::Window* GetDefDialogParent(); /** Gets the dialog cancel mode for headless environments. diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx index 1fe833eda532..9a8c57d6ec5b 100644 --- a/include/vcl/syschild.hxx +++ b/include/vcl/syschild.hxx @@ -26,11 +26,11 @@ struct SystemEnvData; struct SystemWindowData; -class VCL_DLLPUBLIC SystemChildWindow : public Window +class VCL_DLLPUBLIC SystemChildWindow : public vcl::Window { private: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = false ); + SAL_DLLPRIVATE void ImplInitSysChild( vcl::Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = false ); SAL_DLLPRIVATE void ImplTestJavaException( void* pEnv ); // Copy assignment is forbidden and not implemented. @@ -38,9 +38,9 @@ private: SAL_DLLPRIVATE SystemChildWindow & operator= (const SystemChildWindow &); public: - explicit SystemChildWindow( Window* pParent, WinBits nStyle = 0 ); + explicit SystemChildWindow( vcl::Window* pParent, WinBits nStyle = 0 ); // create a SystemChildWindow using the given SystemWindowData - explicit SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = true ); + explicit SystemChildWindow( vcl::Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = true ); virtual ~SystemChildWindow(); const SystemEnvData* GetSystemData() const; diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 382e9b1e2c03..11877a000cbb 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -130,7 +130,7 @@ public: // - SystemWindow - class VCL_DLLPUBLIC SystemWindow - : public Window + : public vcl::Window , public VclBuilderContainer { friend class WorkWindow; @@ -155,22 +155,22 @@ private: Timer maLayoutTimer; protected: bool mbIsDefferedInit; - Window* mpDialogParent; + vcl::Window* mpDialogParent; public: using Window::ImplIsInTaskPaneList; - SAL_DLLPRIVATE bool ImplIsInTaskPaneList( Window* pWin ); + SAL_DLLPRIVATE bool ImplIsInTaskPaneList( vcl::Window* pWin ); SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; } private: SAL_DLLPRIVATE void Init(); - SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin ); + SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin ); SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, VclContainer &rBox); DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, void* ); protected: // Single argument ctors shall be explicit. explicit SystemWindow(WindowType nType); - void loadUI(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); + void loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); void SetWindowStateData( const WindowStateData& rData ); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index f1c0f1ab4594..5351e452e924 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -72,7 +72,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); virtual void FillLayoutData() const SAL_OVERRIDE; virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; @@ -80,7 +80,7 @@ protected: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); public: - TabControl( Window* pParent, + TabControl( vcl::Window* pParent, WinBits nStyle = WB_STDTABCONTROL ); virtual ~TabControl(); diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx index 312a6a32fee0..e4f42482c23a 100644 --- a/include/vcl/tabdlg.hxx +++ b/include/vcl/tabdlg.hxx @@ -30,7 +30,7 @@ class VCL_DLLPUBLIC TabDialog : public Dialog { private: FixedLine* mpFixedLine; - Window* mpViewWindow; + vcl::Window* mpViewWindow; WindowAlign meViewAlign; bool mbPosControls; @@ -38,15 +38,15 @@ private: SAL_DLLPRIVATE void ImplPosControls(); public: - TabDialog( Window* pParent, + TabDialog( vcl::Window* pParent, WinBits nStyle = WB_STDTABDIALOG ); - TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + TabDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~TabDialog(); virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - void SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; } - Window* GetViewWindow() const { return mpViewWindow; } + void SetViewWindow( vcl::Window* pWindow ) { mpViewWindow = pWindow; } + vcl::Window* GetViewWindow() const { return mpViewWindow; } void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; } WindowAlign GetViewAlign() const { return meViewAlign; } }; diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index 86f994618d4e..c7361972ccb1 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -30,17 +30,17 @@ class VCL_DLLPUBLIC TabPage - : public Window + : public vcl::Window , public VclBuilderContainer { private: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); public: - explicit TabPage( Window* pParent, WinBits nStyle = 0 ); - explicit TabPage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit TabPage( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit TabPage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; diff --git a/include/vcl/taskpanelist.hxx b/include/vcl/taskpanelist.hxx index 8910ca2873c3..6e8888dc4eec 100644 --- a/include/vcl/taskpanelist.hxx +++ b/include/vcl/taskpanelist.hxx @@ -27,19 +27,19 @@ class VCL_DLLPUBLIC TaskPaneList { - ::std::vector<Window *> mTaskPanes; - Window *FindNextFloat( Window *pWindow, bool bForward = true ); - Window *FindNextSplitter( Window *pWindow, bool bForward = true ); + ::std::vector<vcl::Window *> mTaskPanes; + vcl::Window *FindNextFloat( vcl::Window *pWindow, bool bForward = true ); + vcl::Window *FindNextSplitter( vcl::Window *pWindow, bool bForward = true ); public: - bool IsInList( Window *pWindow ); + bool IsInList( vcl::Window *pWindow ); public: TaskPaneList(); ~TaskPaneList(); - void AddWindow( Window *pWindow ); - void RemoveWindow( Window *pWindow ); + void AddWindow( vcl::Window *pWindow ); + void RemoveWindow( vcl::Window *pWindow ); bool HandleKeyEvent( KeyEvent aKeyEvent ); }; diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index e4cd946f190f..9aa9498a6bf2 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -28,7 +28,7 @@ class TextEngine; class OutputDevice; -class Window; +namespace vcl { class Window; } class KeyEvent; class MouseEvent; class CommandEvent; @@ -100,11 +100,11 @@ protected: using DragAndDropClient::dragOver; public: - TextView( TextEngine* pEng, Window* pWindow ); + TextView( TextEngine* pEng, vcl::Window* pWindow ); virtual ~TextView(); TextEngine* GetTextEngine() const; - Window* GetWindow() const; + vcl::Window* GetWindow() const; void Invalidate(); void Scroll( long nHorzScroll, long nVertScroll ); diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx index a8102bd133e7..aaf8edf5fba5 100644 --- a/include/vcl/throbber.hxx +++ b/include/vcl/throbber.hxx @@ -46,7 +46,7 @@ public: }; public: - Throbber(Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet = IMAGES_AUTO); + Throbber(vcl::Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet = IMAGES_AUTO); virtual ~Throbber(); // Properties diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index c27c1b2e2aef..13a8ddc40f9f 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -202,7 +202,7 @@ private: public: using Window::ImplInit; private: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); using DockingWindow::ImplInitSettings; SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); @@ -285,8 +285,8 @@ protected: void SetCurItemId(sal_uInt16 nSet) { mnCurItemId = nSet; } public: - ToolBox( Window* pParent, WinBits nStyle = 0 ); - ToolBox( Window* pParent, const ResId& rResId ); + ToolBox( vcl::Window* pParent, WinBits nStyle = 0 ); + ToolBox( vcl::Window* pParent, const ResId& rResId ); virtual ~ToolBox(); virtual void Click(); @@ -341,7 +341,7 @@ public: void InsertItem( sal_uInt16 nItemId, const OUString& rText, ToolBoxItemBits nBits = 0, sal_uInt16 nPos = TOOLBOX_APPEND ); - void InsertWindow( sal_uInt16 nItemId, Window* pWindow, + void InsertWindow( sal_uInt16 nItemId, vcl::Window* pWindow, ToolBoxItemBits nBits = 0, sal_uInt16 nPos = TOOLBOX_APPEND ); void InsertSpace( sal_uInt16 nPos = TOOLBOX_APPEND ); @@ -412,8 +412,8 @@ public: void SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror ); void SetItemText( sal_uInt16 nItemId, const OUString& rText ); const OUString& GetItemText( sal_uInt16 nItemId ) const; - void SetItemWindow( sal_uInt16 nItemId, Window* pNewWindow ); - Window* GetItemWindow( sal_uInt16 nItemId ) const; + void SetItemWindow( sal_uInt16 nItemId, vcl::Window* pNewWindow ); + vcl::Window* GetItemWindow( sal_uInt16 nItemId ) const; sal_uInt16 GetHighlightItemId() const { return mnHighItemId; } void StartSelection(); diff --git a/include/vcl/unowrap.hxx b/include/vcl/unowrap.hxx index 5cd880215483..84035e90eadc 100644 --- a/include/vcl/unowrap.hxx +++ b/include/vcl/unowrap.hxx @@ -26,7 +26,7 @@ class XWindowPeer; class XToolkit; class EventList; -class Window; +namespace vcl { class Window; } class OutputDevice; class MouseEvent; class CommandEvent; @@ -67,10 +67,10 @@ public: virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) = 0; // Window - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, bool bCreate ) = 0; - virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow, bool bCreate ) = 0; + virtual void SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0; - virtual void WindowDestroyed( Window* pWindow ) = 0; + virtual void WindowDestroyed( vcl::Window* pWindow ) = 0; // Accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index 25bc14709115..276321b0e5df 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -30,7 +30,7 @@ #include <list> #include <vector> -class Window; +namespace vcl { class Window; } class Menu; namespace com { namespace sun { namespace star { @@ -42,15 +42,15 @@ namespace com { namespace sun { namespace star { #define VCLEVENT_OBJECT_DYING 1 // VclWindowEvent: -#define VCLEVENT_WINDOW_CHILDCREATED 500 // pData = Window* -#define VCLEVENT_WINDOW_CHILDDESTROYED 501 // pData = Window* +#define VCLEVENT_WINDOW_CHILDCREATED 500 // pData = vcl::Window* +#define VCLEVENT_WINDOW_CHILDDESTROYED 501 // pData = vcl::Window* #define VCLEVENT_WINDOW_PAINT 1000 // pData = Rectangle* #define VCLEVENT_WINDOW_MOVE 1001 #define VCLEVENT_WINDOW_RESIZE 1002 #define VCLEVENT_WINDOW_SHOW 1003 #define VCLEVENT_WINDOW_HIDE 1004 #define VCLEVENT_WINDOW_ACTIVATE 1005 -#define VCLEVENT_WINDOW_DEACTIVATE 1006 // pData = Window* = pPrevActiveWindow +#define VCLEVENT_WINDOW_DEACTIVATE 1006 // pData = vcl::Window* = pPrevActiveWindow #define VCLEVENT_WINDOW_CLOSE 1007 #define VCLEVENT_WINDOW_GETFOCUS 1008 #define VCLEVENT_WINDOW_LOSEFOCUS 1009 @@ -217,15 +217,15 @@ public: class VCL_DLLPUBLIC VclWindowEvent : public VclSimpleEvent { private: - Window* pWindow; + vcl::Window* pWindow; void* pData; public: - VclWindowEvent( Window* pWin, sal_uLong n, void* pDat = NULL ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } + VclWindowEvent( vcl::Window* pWin, sal_uLong n, void* pDat = NULL ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } virtual ~VclWindowEvent() {} TYPEINFO_OVERRIDE(); - Window* GetWindow() const { return pWindow; } + vcl::Window* GetWindow() const { return pWindow; } void* GetData() const { return pData; } }; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 29cb6fbcccf7..fe5280d1ba2d 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -58,7 +58,7 @@ protected: ScrollBar* GetVScrollBar() const; public: - VclMultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); + VclMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); virtual ~VclMultiLineEdit(); void SelectionChanged(); diff --git a/include/vcl/waitobj.hxx b/include/vcl/waitobj.hxx index 2ef2f69f0ee9..d6deecf33f29 100644 --- a/include/vcl/waitobj.hxx +++ b/include/vcl/waitobj.hxx @@ -26,9 +26,9 @@ class VCL_DLLPUBLIC WaitObject { private: - Window* mpWindow; + vcl::Window* mpWindow; public: - WaitObject( Window* pWindow ) + WaitObject( vcl::Window* pWindow ) { mpWindow = pWindow; if ( mpWindow ) diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index bf8a8294c6fe..ce75def7b31f 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -317,11 +317,33 @@ const char* ImplDbgCheckWindow( const void* pObj ); bool ImplDoTiledRendering(); +namespace vcl { class Window; } +vcl::Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); + +namespace vcl { class Cursor; } class Dialog; class WindowImpl; class PaintHelper; class VclBuilder; class VclSizeGroup; +class OutputDevice; +class Application; +class SystemWindow; +class WorkWindow; +class Dialog; +class MessBox; +class DockingWindow; +class FloatingWindow; +class GroupBox; +class PushButton; +class RadioButton; +class SystemChildWindow; +class ImplBorderWindow; +class VclBuilder; +class ImplDockingWindowWrapper; +class ImplPopupFloatWin; +class MenuFloatingWindow; +namespace svt { class PopupWindowControllerImpl; } struct WindowResHeader { @@ -330,30 +352,32 @@ struct WindowResHeader sal_uLong nRSStyle; }; +namespace vcl { + class VCL_DLLPUBLIC Window : public OutputDevice, public Resource { friend class vcl::Cursor; - friend class OutputDevice; - friend class Application; - friend class SystemWindow; - friend class WorkWindow; - friend class Dialog; - friend class MessBox; - friend class DockingWindow; - friend class FloatingWindow; - friend class GroupBox; - friend class PushButton; - friend class RadioButton; - friend class SystemChildWindow; - friend class ImplBorderWindow; - friend class VclBuilder; - friend class PaintHelper; + friend class ::OutputDevice; + friend class ::Application; + friend class ::SystemWindow; + friend class ::WorkWindow; + friend class ::Dialog; + friend class ::MessBox; + friend class ::DockingWindow; + friend class ::FloatingWindow; + friend class ::GroupBox; + friend class ::PushButton; + friend class ::RadioButton; + friend class ::SystemChildWindow; + friend class ::ImplBorderWindow; + friend class ::VclBuilder; + friend class ::PaintHelper; // TODO: improve missing functionality // only required because of SetFloatingMode() - friend class ImplDockingWindowWrapper; - friend class ImplPopupFloatWin; - friend class MenuFloatingWindow; + friend class ::ImplDockingWindowWrapper; + friend class ::ImplPopupFloatWin; + friend class ::MenuFloatingWindow; friend class svt::PopupWindowControllerImpl; @@ -374,9 +398,9 @@ private: OutputDevice* mpOutputDevice; #ifdef DBG_UTIL - friend const char* ImplDbgCheckWindow( const void* pObj ); + friend const char* ::ImplDbgCheckWindow( const void* pObj ); #endif - friend Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); + friend vcl::Window* ::ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); public: @@ -388,26 +412,26 @@ public: DECL_DLLPRIVATE_LINK( ImplHideOwnerDrawWindowsHdl, void* ); - SAL_DLLPRIVATE static void ImplInitAppFontData( Window* pWindow ); + SAL_DLLPRIVATE static void ImplInitAppFontData( vcl::Window* pWindow ); - SAL_DLLPRIVATE Window* ImplGetFrameWindow() const; + SAL_DLLPRIVATE vcl::Window* ImplGetFrameWindow() const; SalFrame* ImplGetFrame() const; SAL_DLLPRIVATE ImplFrameData* ImplGetFrameData(); - SAL_DLLPRIVATE Window* ImplGetWindow(); + SAL_DLLPRIVATE vcl::Window* ImplGetWindow(); SAL_DLLPRIVATE ImplWinData* ImplGetWinData() const; - SAL_DLLPRIVATE Window* ImplGetClientWindow() const; - SAL_DLLPRIVATE Window* ImplGetDlgWindow( sal_uInt16 n, sal_uInt16 nType, sal_uInt16 nStart = 0, sal_uInt16 nEnd = 0xFFFF, sal_uInt16* pIndex = NULL ); - SAL_DLLPRIVATE Window* ImplGetParent() const; - SAL_DLLPRIVATE Window* ImplFindWindow( const Point& rFramePos ); + SAL_DLLPRIVATE vcl::Window* ImplGetClientWindow() const; + SAL_DLLPRIVATE vcl::Window* ImplGetDlgWindow( sal_uInt16 n, sal_uInt16 nType, sal_uInt16 nStart = 0, sal_uInt16 nEnd = 0xFFFF, sal_uInt16* pIndex = NULL ); + SAL_DLLPRIVATE vcl::Window* ImplGetParent() const; + SAL_DLLPRIVATE vcl::Window* ImplFindWindow( const Point& rFramePos ); SAL_DLLPRIVATE void ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplInvalidateOverlapFrameRegion( const Region& rRegion ); SAL_DLLPRIVATE bool ImplSetClipFlag( bool bSysObjOnlySmaller = false ); - SAL_DLLPRIVATE bool ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow = false ) const; - SAL_DLLPRIVATE bool ImplIsChild( const Window* pWindow, bool bSystemWindow = false ) const; + SAL_DLLPRIVATE bool ImplIsWindowOrChild( const vcl::Window* pWindow, bool bSystemWindow = false ) const; + SAL_DLLPRIVATE bool ImplIsChild( const vcl::Window* pWindow, bool bSystemWindow = false ) const; SAL_DLLPRIVATE bool ImplIsFloatingWindow() const; SAL_DLLPRIVATE bool ImplIsPushButton() const; SAL_DLLPRIVATE bool ImplIsSplitter() const; @@ -454,7 +478,7 @@ public: protected: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ); SAL_DLLPRIVATE Point ImplOutputToFrame( const Point& rPos ); @@ -464,7 +488,7 @@ protected: SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); - SAL_DLLPRIVATE Window* ImplGetBorderWindow() const; + SAL_DLLPRIVATE vcl::Window* ImplGetBorderWindow() const; SAL_DLLPRIVATE void ImplInvalidate( const Region* rRegion, sal_uInt16 nFlags ); @@ -491,18 +515,18 @@ private: SAL_DLLPRIVATE void ImplInitWindowData( WindowType nType ); - SAL_DLLPRIVATE void ImplSetFrameParent( const Window* pParent ); + SAL_DLLPRIVATE void ImplSetFrameParent( const vcl::Window* pParent ); - SAL_DLLPRIVATE void ImplInsertWindow( Window* pParent ); + SAL_DLLPRIVATE void ImplInsertWindow( vcl::Window* pParent ); SAL_DLLPRIVATE void ImplRemoveWindow( bool bRemoveFrameData ); SAL_DLLPRIVATE SalGraphics* ImplGetFrameGraphics() const; - SAL_DLLPRIVATE void ImplCallFocusChangeActivate( Window* pNewOverlapWindow, Window* pOldOverlapWindow ); - SAL_DLLPRIVATE Window* ImplGetFirstOverlapWindow(); - SAL_DLLPRIVATE const Window* ImplGetFirstOverlapWindow() const; + SAL_DLLPRIVATE void ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow, vcl::Window* pOldOverlapWindow ); + SAL_DLLPRIVATE vcl::Window* ImplGetFirstOverlapWindow(); + SAL_DLLPRIVATE const vcl::Window* ImplGetFirstOverlapWindow() const; - SAL_DLLPRIVATE bool ImplIsRealParentPath( const Window* pWindow ) const; + SAL_DLLPRIVATE bool ImplIsRealParentPath( const vcl::Window* pWindow ) const; SAL_DLLPRIVATE bool ImplTestMousePointerSet(); @@ -546,7 +570,7 @@ private: SAL_DLLPRIVATE void ImplCallOverlapPaint(); SAL_DLLPRIVATE void ImplPostPaint(); - SAL_DLLPRIVATE void ImplUpdateWindowPtr( Window* pWindow ); + SAL_DLLPRIVATE void ImplUpdateWindowPtr( vcl::Window* pWindow ); SAL_DLLPRIVATE void ImplUpdateWindowPtr(); SAL_DLLPRIVATE void ImplUpdateOverlapWindowPtr( bool bNewFrame ); @@ -584,18 +608,18 @@ private: SAL_DLLPRIVATE bool ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ); SAL_DLLPRIVATE bool ImplHasDlgCtrl(); SAL_DLLPRIVATE void ImplDlgCtrlNextWindow(); - SAL_DLLPRIVATE void ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus ); - SAL_DLLPRIVATE Window* ImplFindDlgCtrlWindow( Window* pWindow ); + SAL_DLLPRIVATE void ImplDlgCtrlFocusChanged( vcl::Window* pWindow, bool bGetFocus ); + SAL_DLLPRIVATE vcl::Window* ImplFindDlgCtrlWindow( vcl::Window* pWindow ); SAL_DLLPRIVATE long ImplLogicUnitToPixelX( long nX, MapUnit eUnit ); SAL_DLLPRIVATE long ImplLogicUnitToPixelY( long nY, MapUnit eUnit ); - SAL_DLLPRIVATE bool ImplIsWindowInFront( const Window* pTestWindow ) const; + SAL_DLLPRIVATE bool ImplIsWindowInFront( const vcl::Window* pTestWindow ) const; SAL_DLLPRIVATE static void ImplNewInputContext(); - SAL_DLLPRIVATE void ImplCallActivateListeners(Window*); - SAL_DLLPRIVATE void ImplCallDeactivateListeners(Window*); + SAL_DLLPRIVATE void ImplCallActivateListeners(vcl::Window*); + SAL_DLLPRIVATE void ImplCallDeactivateListeners(vcl::Window*); SAL_DLLPRIVATE void ImplHandleScroll( ScrollBar* pHScrl, long nX, ScrollBar* pVScrl, long nY ); @@ -603,11 +627,11 @@ private: SAL_DLLPRIVATE long ImplGetUnmirroredOutOffX(); // retrieves the list of owner draw decorated windows for this window hiearchy - SAL_DLLPRIVATE ::std::vector<Window *>& ImplGetOwnerDrawList(); + SAL_DLLPRIVATE ::std::vector<vcl::Window *>& ImplGetOwnerDrawList(); - SAL_DLLPRIVATE Window* ImplGetTopmostFrameWindow(); + SAL_DLLPRIVATE vcl::Window* ImplGetTopmostFrameWindow(); - SAL_DLLPRIVATE Rectangle ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bClientOnly ) const; + SAL_DLLPRIVATE Rectangle ImplGetWindowExtentsRelative( vcl::Window *pRelativeWindow, bool bClientOnly ) const; SAL_DLLPRIVATE bool ImplStopDnd(); SAL_DLLPRIVATE void ImplStartDnd(); @@ -649,9 +673,9 @@ public: public: // Single argument ctors shall be explicit. - explicit Window( Window* pParent, WinBits nStyle = 0 ); + explicit Window( vcl::Window* pParent, WinBits nStyle = 0 ); - Window( Window* pParent, const ResId& rResId ); + Window( vcl::Window* pParent, const ResId& rResId ); virtual ~Window(); OutputDevice const* GetOutDev() const { return mpOutputDevice; }; @@ -683,7 +707,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); - virtual Window* GetPreferredKeyInputWindow(); + virtual vcl::Window* GetPreferredKeyInputWindow(); /*virtual*/ void AddEventListener( const Link& rEventListener ); /*virtual*/ void RemoveEventListener( const Link& rEventListener ); @@ -798,8 +822,8 @@ public: // paint additional parts of your window if necessary void ExpandPaintClipRegion( const Region& rRegion ); - void SetParent( Window* pNewParent ); - Window* GetParent() const; + void SetParent( vcl::Window* pNewParent ); + vcl::Window* GetParent() const; // return the dialog we are contained in or NULL if un-contained Dialog* GetParentDialog() const; @@ -816,7 +840,7 @@ public: void EnableInput( bool bEnable = true, bool bChild = true ); void EnableInput( bool bEnable, bool bChild, bool bSysWin, - const Window* pExcludeWindow = NULL ); + const vcl::Window* pExcludeWindow = NULL ); bool IsInputEnabled() const; /** Override <code>EnableInput</code>. This can be necessary due to other people @@ -891,7 +915,7 @@ public: sal_uInt16 GetActivateMode() const; void ToTop( sal_uInt16 nFlags = 0 ); - void SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ); + void SetZOrder( vcl::Window* pRefWindow, sal_uInt16 nFlags ); void EnableAlwaysOnTop( bool bEnable = true ); bool IsAlwaysOnTopEnabled() const; @@ -918,9 +942,9 @@ public: Point AbsoluteScreenToOutputPixel( const Point& rPos ) const; Rectangle GetDesktopRectPixel() const; // window extents including border and decoratrion - Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; + Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const; // window extents of the client window, coordinates to be used in SetPosPixel - Rectangle GetClientWindowExtentsRelative( Window *pRelativeWindow ) const; + Rectangle GetClientWindowExtentsRelative( vcl::Window *pRelativeWindow ) const; virtual bool IsScrollable() const; virtual void Scroll( long nHorzScroll, long nVertScroll, @@ -1013,19 +1037,19 @@ public: void SetUniqueId( const OString& ); const OString& GetUniqueId() const; - Window* FindWindow( const Point& rPos ) const; + vcl::Window* FindWindow( const Point& rPos ) const; sal_uInt16 GetChildCount() const; - Window* GetChild( sal_uInt16 nChild ) const; - Window* GetWindow( sal_uInt16 nType ) const; - bool IsChild( const Window* pWindow, bool bSystemWindow = false ) const; - bool IsWindowOrChild( const Window* pWindow, bool bSystemWindow = false ) const; + vcl::Window* GetChild( sal_uInt16 nChild ) const; + vcl::Window* GetWindow( sal_uInt16 nType ) const; + bool IsChild( const vcl::Window* pWindow, bool bSystemWindow = false ) const; + bool IsWindowOrChild( const vcl::Window* pWindow, bool bSystemWindow = false ) const; void SetData( void* pNewData ); void* GetData() const; /// Add all children to @rAllChildren recursively. - SAL_DLLPRIVATE void CollectChildren(::std::vector<Window *>& rAllChildren ); + SAL_DLLPRIVATE void CollectChildren(::std::vector<vcl::Window *>& rAllChildren ); void ShowFocus( const Rectangle& rRect ); void HideFocus(); @@ -1083,9 +1107,9 @@ public: void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ); - Window* GetAccessibleParentWindow() const; + vcl::Window* GetAccessibleParentWindow() const; sal_uInt16 GetAccessibleChildWindowCount(); - Window* GetAccessibleChildWindow( sal_uInt16 n ); + vcl::Window* GetAccessibleChildWindow( sal_uInt16 n ); void SetAccessibleRole( sal_uInt16 nRole ); sal_uInt16 GetAccessibleRole() const; @@ -1096,14 +1120,14 @@ public: void SetAccessibleDescription( const OUString& rDescr ); OUString GetAccessibleDescription() const; - void SetAccessibleRelationLabeledBy( Window* pLabeledBy ); - Window* GetAccessibleRelationLabeledBy() const; + void SetAccessibleRelationLabeledBy( vcl::Window* pLabeledBy ); + vcl::Window* GetAccessibleRelationLabeledBy() const; - void SetAccessibleRelationLabelFor( Window* pLabelFor ); - Window* GetAccessibleRelationLabelFor() const; + void SetAccessibleRelationLabelFor( vcl::Window* pLabelFor ); + vcl::Window* GetAccessibleRelationLabelFor() const; - void SetAccessibleRelationMemberOf( Window* pMemberOf ); - Window* GetAccessibleRelationMemberOf() const; + void SetAccessibleRelationMemberOf( vcl::Window* pMemberOf ); + vcl::Window* GetAccessibleRelationMemberOf() const; // to avoid sending accessibility events in cases like closing dialogs @@ -1112,19 +1136,19 @@ public: void SetAccessibilityEventsSuppressed(bool bSuppressed); // Deprecated - can use SetAccessibleRelationLabelFor/By nowadys - virtual Window* GetParentLabelFor( const Window* pLabel ) const; - virtual Window* GetParentLabeledBy( const Window* pLabeled ) const; + virtual vcl::Window* GetParentLabelFor( const vcl::Window* pLabel ) const; + virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabeled ) const; KeyEvent GetActivationKey() const; protected: // These eventually are supposed to go when everything is converted to .ui - SAL_DLLPRIVATE Window* getLegacyNonLayoutAccessibleRelationMemberOf() const; - SAL_DLLPRIVATE Window* getLegacyNonLayoutAccessibleRelationLabeledBy() const; - SAL_DLLPRIVATE Window* getLegacyNonLayoutAccessibleRelationLabelFor() const; + SAL_DLLPRIVATE vcl::Window* getLegacyNonLayoutAccessibleRelationMemberOf() const; + SAL_DLLPRIVATE vcl::Window* getLegacyNonLayoutAccessibleRelationLabeledBy() const; + SAL_DLLPRIVATE vcl::Window* getLegacyNonLayoutAccessibleRelationLabelFor() const; // Let Label override the code part of GetAccessibleRelationLabelFor - virtual Window* getAccessibleRelationLabelFor() const; + virtual vcl::Window* getAccessibleRelationLabelFor() const; virtual sal_uInt16 getDefaultAccessibleRole() const; virtual OUString getDefaultAccessibleName() const; @@ -1146,7 +1170,7 @@ private: SAL_DLLPRIVATE bool ImplIsAccessibleCandidate() const; SAL_DLLPRIVATE bool ImplIsAccessibleNativeFrame() const; SAL_DLLPRIVATE sal_uInt16 ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirstWindowType ) const; - SAL_DLLPRIVATE Window* ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, bool bTopLevel = true ) const; + SAL_DLLPRIVATE vcl::Window* ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, bool bTopLevel = true ) const; SAL_DLLPRIVATE bool ImplRegisterAccessibleNativeFrame(); SAL_DLLPRIVATE void ImplRevokeAccessibleNativeFrame(); ///@} @@ -1410,6 +1434,7 @@ public: virtual Selection GetSurroundingTextSelection() const; }; +} #endif // INCLUDED_VCL_WINDOW_HXX diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index 1c06d52d83bc..5b3a266790f2 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -50,7 +50,7 @@ private: mbFullScreenMode:1; SAL_DLLPRIVATE void ImplInitWorkWindowData(); - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ); private: SAL_DLLPRIVATE WorkWindow( const WorkWindow& rWin ); @@ -58,12 +58,12 @@ private: protected: explicit WorkWindow( WindowType nType ); - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL ); SAL_DLLPRIVATE void ImplSetFrameState( sal_uLong aFrameState ); public: - explicit WorkWindow( Window* pParent, WinBits nStyle = WB_STDWORK ); - explicit WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); + explicit WorkWindow( vcl::Window* pParent, WinBits nStyle = WB_STDWORK ); + explicit WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); explicit WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version virtual ~WorkWindow(); diff --git a/include/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx index fa29f7c5f18c..c5dd3770851f 100644 --- a/include/vcl/xtextedt.hxx +++ b/include/vcl/xtextedt.hxx @@ -52,7 +52,7 @@ protected: bool ImpIndentBlock( bool bRight ); public: - ExtTextView( ExtTextEngine* pEng, Window* pWindow ); + ExtTextView( ExtTextEngine* pEng, vcl::Window* pWindow ); virtual ~ExtTextView(); bool MatchGroup(); diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index 710475b67e71..c0c35b68e8be 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -24,7 +24,7 @@ #include <svx/svdmodel.hxx> #include <com/sun/star/report/XReportDefinition.hpp> -class Window; +namespace vcl { class Window; } namespace dbaui { class DBSubComponentController; diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index d40a480caacc..217a84cdb793 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -406,7 +406,7 @@ uno::Sequence< OUString > ORptFilter::getSupportedServiceNames_Static( ) throw( sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception) { - Window* pFocusWindow = Application::GetFocusWindow(); + vcl::Window* pFocusWindow = Application::GetFocusWindow(); bool bRet = false; if( pFocusWindow ) diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 686c97f9925c..c572af9c6a90 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -144,7 +144,7 @@ void OAddFieldWindowListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_r // class OAddFieldWindow -OAddFieldWindow::OAddFieldWindow(Window* pParent +OAddFieldWindow::OAddFieldWindow(vcl::Window* pParent ,const uno::Reference< beans::XPropertySet >& _xRowSet ) :FloatingWindow(pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE)) diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 6f73a53e9b22..fcbfbce03bac 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -66,10 +66,10 @@ namespace rptui class UpdateLocker { - Window& m_rWindow; + vcl::Window& m_rWindow; public: - UpdateLocker( Window& _rWindow ) + UpdateLocker( vcl::Window& _rWindow ) :m_rWindow( _rWindow ) { _rWindow.SetUpdateMode( false ); @@ -103,7 +103,7 @@ namespace rptui // class ConditionalFormattingDialog ConditionalFormattingDialog::ConditionalFormattingDialog( - Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController ) + vcl::Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController ) :ModalDialog( _pParent, "CondFormat", "modules/dbreport/ui/condformatdialog.ui" ) ,m_rController( _rController ) ,m_xFormatConditions( _rxFormatConditions ) @@ -496,11 +496,11 @@ namespace rptui if ( m_bDeletingCondition ) break; - const Window* pGetFocusWindow( _rNEvt.GetWindow() ); + const vcl::Window* pGetFocusWindow( _rNEvt.GetWindow() ); // determine whether the new focus window is part of an (currently invisible) condition - const Window* pConditionCandidate = pGetFocusWindow->GetParent(); - const Window* pPlaygroundCandidate = pConditionCandidate ? pConditionCandidate->GetParent() : NULL; + const vcl::Window* pConditionCandidate = pGetFocusWindow->GetParent(); + const vcl::Window* pPlaygroundCandidate = pConditionCandidate ? pConditionCandidate->GetParent() : NULL; while ( ( pPlaygroundCandidate ) && ( pPlaygroundCandidate != this ) && ( pPlaygroundCandidate != m_pConditionPlayground ) diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index fe37e1bf2d58..47ea6c0db641 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -100,7 +100,7 @@ class OColorPopup : public FloatingWindow Condition* m_pCondition; sal_uInt16 m_nSlotId; public: - OColorPopup(Window* _pParent,Condition* _pCondition); + OColorPopup(vcl::Window* _pParent,Condition* _pCondition); ValueSet m_aColorSet; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; @@ -110,7 +110,7 @@ public: void SetSlotId(sal_uInt16 _nSlotId); }; -OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition) +OColorPopup::OColorPopup(vcl::Window* _pParent,Condition* _pCondition) :FloatingWindow(_pParent, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK|WB_DIALOGCONTROL )) ,m_pCondition(_pCondition) ,m_nSlotId(0) @@ -202,7 +202,7 @@ IMPL_LINK_NOARG(OColorPopup, SelectHdl) // = Condition -Condition::Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController ) +Condition::Condition( vcl::Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController ) :VclHBox(_pParent) ,m_rController( _rController ) ,m_rAction( _rAction ) diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index b1270887c654..14fa15fba7cc 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -105,7 +105,7 @@ namespace rptui DECL_LINK( OnConditionAction, Button* ); public: - Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController ); + Condition( vcl::Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController ); virtual ~Condition(); /** will be called when the id of the image list needs to change. diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 54e3ef47e621..7de87826a339 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -47,7 +47,7 @@ using namespace ::comphelper; // class ODateTimeDialog -ODateTimeDialog::ODateTimeDialog( Window* _pParent +ODateTimeDialog::ODateTimeDialog( vcl::Window* _pParent ,const uno::Reference< report::XSection >& _xHoldAlive ,OReportController* _pController) : ModalDialog( _pParent, "DateTimeDialog" , "modules/dbreport/ui/datetimedialog.ui" ) diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 5fe7375a6549..5fd26171884f 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -42,7 +42,7 @@ namespace rptui // Initialisierung / gemeinsame Funktionen fuer Dialog -FormulaDialog::FormulaDialog(Window* pParent +FormulaDialog::FormulaDialog(vcl::Window* pParent , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory , const ::boost::shared_ptr< IFunctionManager >& _pFunctionMgr , const OUString& _sFormula @@ -91,7 +91,7 @@ FormulaDialog::~FormulaDialog() SvtViewOptions aDlgOpt( E_WINDOW, OUString( HID_RPT_FIELD_SEL_WIN ) ); aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)), RTL_TEXTENCODING_ASCII_US)); - boost::scoped_ptr<Window> aTemp2(m_pAddField); + boost::scoped_ptr<vcl::Window> aTemp2(m_pAddField); m_pAddField = NULL; } diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 1931592e3730..eea629ba096d 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -95,7 +95,7 @@ class OFieldExpressionControl : public TContainerListenerBase bool SaveModified(bool _bAppend); public: - OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, Window *_pParent); + OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, vcl::Window *_pParent); virtual ~OFieldExpressionControl(); // XEventListener @@ -164,7 +164,7 @@ public: }; // class OFieldExpressionControl -OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, Window *_pParent) +OFieldExpressionControl::OFieldExpressionControl(OGroupsSortingDialog* _pParentDialog, vcl::Window *_pParent) :EditBrowseBox( _pParent, EBBF_NONE, WB_TABSTOP | BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_AUTOSIZE_LASTCOL | BROWSER_KEEPSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL) ,m_aGroupPositions(GROUPS_START_LEN,-1) @@ -913,7 +913,7 @@ Size OFieldExpressionControl::GetOptimalSize() const } // class OGroupsSortingDialog -OGroupsSortingDialog::OGroupsSortingDialog(Window* _pParent, bool _bReadOnly, +OGroupsSortingDialog::OGroupsSortingDialog(vcl::Window* _pParent, bool _bReadOnly, OReportController* _pController) : FloatingWindow(_pParent, "FloatingSort", "modules/dbreport/ui/floatingsort.ui") , OPropertyChangeListener(m_aMutex) @@ -935,7 +935,7 @@ OGroupsSortingDialog::OGroupsSortingDialog(Window* _pParent, bool _bReadOnly, get(m_pHelpWindow, "helptext"); m_pHelpWindow->set_height_request(GetTextHeight() * 4); get(m_pProperties, "properties"); - m_pFieldExpression = new OFieldExpressionControl(this, get<Window>("box")); + m_pFieldExpression = new OFieldExpressionControl(this, get<vcl::Window>("box")); m_pFieldExpression->set_hexpand(true); m_pFieldExpression->set_vexpand(true); diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 9b8864f79fc7..6b485f5554bf 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -180,7 +180,7 @@ protected: void _elementReplaced( const container::ContainerEvent& _rEvent ); public: - NavigatorTree(Window* pParent,OReportController& _rController ); + NavigatorTree(vcl::Window* pParent,OReportController& _rController ); virtual ~NavigatorTree(); DECL_LINK(OnEntrySelDesel, NavigatorTree*); @@ -212,7 +212,7 @@ private: using SvTreeListBox::ExecuteDrop; }; -NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController ) +NavigatorTree::NavigatorTree( vcl::Window* pParent,OReportController& _rController ) :SvTreeListBox( pParent, WB_TABSTOP| WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL|WB_HASBUTTONSATROOT ) ,comphelper::OSelectionChangeListener(m_aMutex) ,OPropertyChangeListener(m_aMutex) @@ -886,7 +886,7 @@ public: ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pParent) :m_xReport(_rController.getReportDefinition()) ,m_rController(_rController) - ,m_pNavigatorTree(new NavigatorTree(_pParent->get<Window>("box"),_rController)) + ,m_pNavigatorTree(new NavigatorTree(_pParent->get<vcl::Window>("box"),_rController)) { reportdesign::OReportVisitor aVisitor(m_pNavigatorTree.get()); aVisitor.start(m_xReport); @@ -896,7 +896,7 @@ ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pPar } // class ONavigator -ONavigator::ONavigator(Window* _pParent ,OReportController& _rController) +ONavigator::ONavigator(vcl::Window* _pParent ,OReportController& _rController) : FloatingWindow( _pParent, "FloatingNavigator", "modules/dbreport/ui/floatingnavigator.ui") { m_pImpl.reset(new ONavigatorImpl(_rController,this)); diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index d1d17c1d835b..bc2419b412f2 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -41,7 +41,7 @@ using namespace ::comphelper; // class OPageNumberDialog -OPageNumberDialog::OPageNumberDialog( Window* _pParent +OPageNumberDialog::OPageNumberDialog( vcl::Window* _pParent ,const uno::Reference< report::XReportDefinition >& _xHoldAlive ,OReportController* _pController) : ModalDialog( _pParent, "PageNumberDialog" , "modules/dbreport/ui/pagenumberdialog.ui" ) diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index f303c14296ba..821648d6b542 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -37,7 +37,7 @@ namespace rptui |* \************************************************************************/ -ORptPageDialog::ORptPageDialog( Window* pParent, const SfxItemSet* pAttr, const OString &rDialog) +ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const OString &rDialog) : SfxTabDialog (pParent, rDialog, OUString("modules/dbreport/ui/") + OStringToOUString(rDialog, RTL_TEXTENCODING_UTF8).toAsciiLowerCase() + OUString(".ui"), pAttr) diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 3c188f925d4c..b598cd4d8cc9 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -76,7 +76,7 @@ class OAddFieldWindow :public FloatingWindow OAddFieldWindow(const OAddFieldWindow&); void operator =(const OAddFieldWindow&); public: - OAddFieldWindow(Window* pParent + OAddFieldWindow(vcl::Window* pParent , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xRowSet); virtual ~OAddFieldWindow(); diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index c38b7f492aaa..1dd15ba00f0b 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -27,7 +27,7 @@ namespace rptui { - class OColorListener : public Window, public SfxListener + class OColorListener : public vcl::Window, public SfxListener { OColorListener(const OColorListener&); void operator =(const OColorListener&); @@ -46,7 +46,7 @@ namespace rptui protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - OColorListener(Window* _pParent,const OUString& _sColorEntry); + OColorListener(vcl::Window* _pParent,const OUString& _sColorEntry); virtual ~OColorListener(); using Window::Notify; diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 130caa73367c..254edf95fe3b 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -74,7 +74,7 @@ namespace rptui typedef ::std::vector< ConditionPtr > Conditions; OModuleClient m_aModuleClient; - Window* m_pConditionPlayground; + vcl::Window* m_pConditionPlayground; Conditions m_aConditions; VclScrolledWindow* m_pScrollWindow; ScrollBar* m_pCondScroll; @@ -90,7 +90,7 @@ namespace rptui public: ConditionalFormattingDialog( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlModel>& _xHoldAlive, ::rptui::OReportController& _rController ); diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index c4ae66d6d778..0421f6b25c7d 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -77,7 +77,7 @@ class ODateTimeDialog : public ModalDialog // fill methods void InsertEntry(sal_Int16 _nNumberFormatId); public: - ODateTimeDialog( Window* pParent + ODateTimeDialog( vcl::Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xHoldAlive ,::rptui::OReportController* _pController); virtual ~ODateTimeDialog(); diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index 18379fed6647..2b219ea3ee63 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -44,7 +44,7 @@ class KeyEvent; class MouseEvent; class Timer; -class Window; +namespace vcl { class Window; } namespace rptui { @@ -63,7 +63,7 @@ namespace rptui ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xReportComponent; OReportController& m_rReportController; OScrollWindowHelper m_aScrollWindow; - Window* m_pTaskPane; + vcl::Window* m_pTaskPane; PropBrw* m_pPropWin; OAddFieldWindow* m_pAddField; OSectionView* m_pCurrentView; @@ -95,7 +95,7 @@ namespace rptui virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - ODesignView(Window* pParent, + ODesignView(vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&, OReportController& _rController); virtual ~ODesignView(); diff --git a/reportdesign/source/ui/inc/EndMarker.hxx b/reportdesign/source/ui/inc/EndMarker.hxx index e189585c63ad..78a03b3761c0 100644 --- a/reportdesign/source/ui/inc/EndMarker.hxx +++ b/reportdesign/source/ui/inc/EndMarker.hxx @@ -33,7 +33,7 @@ namespace rptui protected: virtual void ImplInitSettings() SAL_OVERRIDE; public: - OEndMarker(Window* _pParent,const OUString& _sColorEntry); + OEndMarker(vcl::Window* _pParent,const OUString& _sColorEntry); virtual ~OEndMarker(); // windows diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index d0643a489bcb..46036de6107a 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -60,7 +60,7 @@ class FormulaDialog : public formula::FormulaModalDialog, DECL_LINK( OnClickHdl, OAddFieldWindow*); public: - FormulaDialog( Window* pParent + FormulaDialog( vcl::Window* pParent , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _xServiceFactory , const ::boost::shared_ptr< formula::IFunctionManager >& _pFunctionMgr , const OUString& _sFormula diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 4b9be4c94ad0..17f12fd6c00a 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -143,7 +143,7 @@ protected: // OPropertyChangeListener virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; public: - OGroupsSortingDialog( Window* pParent + OGroupsSortingDialog( vcl::Window* pParent ,bool _bReadOnly ,::rptui::OReportController* _pController); virtual ~OGroupsSortingDialog(); diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx index 9f7942aa3bad..66b67de16a03 100644 --- a/reportdesign/source/ui/inc/Navigator.hxx +++ b/reportdesign/source/ui/inc/Navigator.hxx @@ -33,7 +33,7 @@ namespace rptui ONavigator(const ONavigator&); void operator =(const ONavigator&); public: - ONavigator( Window* pParent + ONavigator( vcl::Window* pParent ,OReportController& _rController); // window diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index f90377b303f7..2e987b0ea321 100644 --- a/reportdesign/source/ui/inc/PageNumber.hxx +++ b/reportdesign/source/ui/inc/PageNumber.hxx @@ -53,7 +53,7 @@ class OPageNumberDialog : public ModalDialog OPageNumberDialog(const OPageNumberDialog&); void operator =(const OPageNumberDialog&); public: - OPageNumberDialog( Window* pParent + OPageNumberDialog( vcl::Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xHoldAlive ,::rptui::OReportController* _pController); virtual ~OPageNumberDialog(); diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 8e9b426ad248..cd347f242ab2 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -351,7 +351,7 @@ namespace rptui bool isFormatCommandEnabled(sal_uInt16 _nCommand ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xControlFormat) const; - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index 1954f8681f83..14da5b1b5e6e 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -38,7 +38,7 @@ namespace rptui class OSectionView; class OSectionWindow; - class OReportSection : public Window + class OReportSection : public vcl::Window , public ::cppu::BaseMutex , public ::comphelper::OPropertyChangeListener , public DropTargetHelper diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index 9b6d234253d5..02439686dc44 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -40,7 +40,7 @@ namespace rptui class OSectionView; class DlgEdFactory; - class OReportWindow : public Window + class OReportWindow : public vcl::Window , public IMarkedSection , public ::cppu::BaseMutex , public ::comphelper::OPropertyChangeListener diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index db8e73e1364e..e62233f84490 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -41,11 +41,11 @@ namespace rptui /** This class defines the scrollable area of the report design. It includes the h-ruler and the sections, and end marker. Not the start marker. */ - typedef Window OScrollWindowHelper_BASE; + typedef ::vcl::Window OScrollWindowHelper_BASE; class OScrollWindowHelper : public ::cppu::BaseMutex , public OScrollWindowHelper_BASE/*TabPage*/ , public ::comphelper::OPropertyChangeListener - , public IMarkedSection + , public IMarkedSection { private: ScrollBar m_aHScroll; diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx index 0cfc1ed3a714..11651ab4072a 100644 --- a/reportdesign/source/ui/inc/SectionView.hxx +++ b/reportdesign/source/ui/inc/SectionView.hxx @@ -48,7 +48,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; virtual void MarkListHasChanged() SAL_OVERRIDE; - virtual void MakeVisible( const Rectangle& rRect, Window& rWin ) SAL_OVERRIDE; + virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) SAL_OVERRIDE; inline OReportSection* getReportSection() const { return m_pSectionWindow; } diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index 0fd8c2cb44b0..ce8615862cee 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -43,7 +43,7 @@ namespace comphelper namespace rptui { class OViewsWindow; - class OSectionWindow : public Window + class OSectionWindow : public vcl::Window , public ::cppu::BaseMutex , public ::comphelper::OPropertyChangeListener { diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx index 5f08bb180bee..1471152e99a1 100644 --- a/reportdesign/source/ui/inc/UITools.hxx +++ b/reportdesign/source/ui/inc/UITools.hxx @@ -126,7 +126,7 @@ namespace rptui ::comphelper::mem_fun(&TaskPaneList::AddWindow) ::comphelper::mem_fun(&TaskPaneList::RemoveWindow) */ - void notifySystemWindow(Window* _pWindow,Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc); + void notifySystemWindow(::vcl::Window* _pWindow, ::vcl::Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList, ::vcl::Window*> _rMemFunc); const sal_Int16 ISOVER_IGNORE_CUSTOMSHAPES = 1; @@ -176,7 +176,7 @@ namespace rptui @param _aZoom the zoom scale @param _rWindow where to set the map mode */ - void setZoomFactor(const Fraction& _aZoom,Window& _rWindow); + void setZoomFactor(const Fraction& _aZoom, ::vcl::Window& _rWindow); } #endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_UITOOLS_HXX diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index f4c457728e81..fb8fff7cb894 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -75,24 +75,24 @@ namespace rptui class OWindowPositionCorrector { - ::std::vector< ::std::pair<Window*,Point> > m_aChildren; + ::std::vector< ::std::pair<vcl::Window*,Point> > m_aChildren; long m_nDeltaX; long m_nDeltaY; public: - OWindowPositionCorrector(Window* _pWindow,long _nDeltaX, long _nDeltaY) :m_nDeltaX(_nDeltaX), m_nDeltaY(_nDeltaY) + OWindowPositionCorrector(vcl::Window* _pWindow,long _nDeltaX, long _nDeltaY) :m_nDeltaX(_nDeltaX), m_nDeltaY(_nDeltaY) { sal_uInt16 nCount = _pWindow->GetChildCount(); m_aChildren.reserve(nCount); while( nCount ) { - Window* pChild = _pWindow->GetChild(--nCount); - m_aChildren.push_back(::std::pair<Window*,Point>(pChild,pChild->GetPosPixel())); + vcl::Window* pChild = _pWindow->GetChild(--nCount); + m_aChildren.push_back(::std::pair<vcl::Window*,Point>(pChild,pChild->GetPosPixel())); } } ~OWindowPositionCorrector() { - ::std::vector< ::std::pair<Window*,Point> >::iterator aIter = m_aChildren.begin(); - ::std::vector< ::std::pair<Window*,Point> >::iterator aEnd = m_aChildren.end(); + ::std::vector< ::std::pair<vcl::Window*,Point> >::iterator aIter = m_aChildren.begin(); + ::std::vector< ::std::pair<vcl::Window*,Point> >::iterator aEnd = m_aChildren.end(); for (; aIter != aEnd; ++aIter) { const Point aPos = aIter->first->GetPosPixel(); @@ -102,7 +102,7 @@ namespace rptui } }; - class OViewsWindow : public Window + class OViewsWindow : public vcl::Window , public utl::ConfigurationListener , public IMarkedSection { diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index 672207469db0..ff39900f0a64 100644 --- a/reportdesign/source/ui/inc/dlgpage.hxx +++ b/reportdesign/source/ui/inc/dlgpage.hxx @@ -37,7 +37,7 @@ private: void operator =(const ORptPageDialog&); public: - ORptPageDialog(Window* pParent, const SfxItemSet* pAttr, const OString &rDialog); + ORptPageDialog(vcl::Window* pParent, const SfxItemSet* pAttr, const OString &rDialog); }; } // namespace rptui diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 519ccfbcb1cf..60982c678f55 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -2032,7 +2032,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF try { uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName("DialogParentWindow") ,uno::UNO_QUERY); - Window* pInspectorWindow = VCLUnoHelper::GetWindow( xInspectorWindow ); + vcl::Window* pInspectorWindow = VCLUnoHelper::GetWindow( xInspectorWindow ); WaitObject aWaitCursor( pInspectorWindow ); uno::Reference< sdbc::XPreparedStatement > xStatement; diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index 8c33970dcc9c..c1c330eb7156 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -26,7 +26,7 @@ namespace rptui { -OColorListener::OColorListener(Window* _pParent ,const OUString& _sColorEntry) +OColorListener::OColorListener(vcl::Window* _pParent ,const OUString& _sColorEntry) : Window(_pParent) ,m_sColorEntry(_sColorEntry) ,m_nColor(COL_LIGHTBLUE) diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 793b49849d4f..db2f37bc873d 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -648,7 +648,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep { SID_ATTR_CHAR_CTL_POSTURE, SFX_ITEM_POOLABLE }, { SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE } }; - Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow ); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<FontList> pFontList(new FontList( pParent )); XColorListRef pColorList( XColorList::CreateStdColorList() ); @@ -752,7 +752,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R ::boost::shared_ptr<rptui::OReportModel> pModel = ::reportdesign::OReportDefinition::getSdrModel(_xShape->getSection()->getReportDefinition()); - Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( _rxParentWindow ); bool bSuccess = false; try @@ -843,7 +843,7 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat } -void notifySystemWindow(Window* _pWindow,Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc) +void notifySystemWindow(vcl::Window* _pWindow, vcl::Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,vcl::Window*> _rMemFunc) { OSL_ENSURE(_pWindow,"Window can not be null!"); SystemWindow* pSystemWindow = _pWindow ? _pWindow->GetSystemWindow() : NULL; @@ -1001,7 +1001,7 @@ void correctOverlapping(SdrObject* _pControl,OReportSection& _aReportSection,boo rSectionView.InsertObjectAtView(_pControl,*rSectionView.GetSdrPageView(),SDRINSERT_ADDMARK); } -void setZoomFactor(const Fraction& _aZoom,Window& _rWindow) +void setZoomFactor(const Fraction& _aZoom, vcl::Window& _rWindow) { MapMode aMapMode( _rWindow.GetMapMode() ); aMapMode.SetScaleX(_aZoom); @@ -1027,7 +1027,7 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula { xFactory = _xContext->getServiceManager(); xServiceFactory.set(xFactory,uno::UNO_QUERY); - Window* pParent = VCLUnoHelper::GetWindow( _xInspectorWindow ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( _xInspectorWindow ); uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext("org.libreoffice.report.pentaho.SOFunctionManager",_xContext),uno::UNO_QUERY); if ( xMgr.is() ) diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 99fd6cba2c44..2659914ad393 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -57,11 +57,11 @@ using namespace container; #define REPORT_ID 2 #define TASKPANE_ID 3 -class OTaskWindow : public Window +class OTaskWindow : public vcl::Window { PropBrw* m_pPropWin; public: - OTaskWindow(Window* _pParent) : Window(_pParent),m_pPropWin(NULL){} + OTaskWindow(vcl::Window* _pParent) : Window(_pParent),m_pPropWin(NULL){} inline void setPropertyBrowser(PropBrw* _pPropWin) { @@ -80,7 +80,7 @@ public: // class ODesignView -ODesignView::ODesignView( Window* pParent, +ODesignView::ODesignView( vcl::Window* pParent, const Reference< XComponentContext >& _rxOrb, OReportController& _rController) : ODataView( pParent, _rController, _rxOrb, WB_DIALOGCONTROL ) @@ -133,7 +133,7 @@ ODesignView::~ODesignView() { notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<Window> aTemp2(m_pPropWin); + ::std::auto_ptr<vcl::Window> aTemp2(m_pPropWin); SAL_WNODEPRECATED_DECLARATIONS_POP m_pPropWin = NULL; } @@ -143,7 +143,7 @@ ODesignView::~ODesignView() aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<Window> aTemp2(m_pAddField); + ::std::auto_ptr<vcl::Window> aTemp2(m_pAddField); SAL_WNODEPRECATED_DECLARATIONS_POP m_pAddField = NULL; } @@ -153,13 +153,13 @@ ODesignView::~ODesignView() aDlgOpt.SetWindowState(OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL), RTL_TEXTENCODING_ASCII_US)); notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<Window> aTemp2(m_pReportExplorer); + ::std::auto_ptr<vcl::Window> aTemp2(m_pReportExplorer); SAL_WNODEPRECATED_DECLARATIONS_POP m_pReportExplorer = NULL; } { SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr<Window> aTemp2(m_pTaskPane); + ::std::auto_ptr<vcl::Window> aTemp2(m_pTaskPane); SAL_WNODEPRECATED_DECLARATIONS_POP m_pTaskPane = NULL; } diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index daf41a8e56a1..0621f61cb08b 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -32,7 +32,7 @@ namespace rptui { -OEndMarker::OEndMarker(Window* _pParent ,const OUString& _sColorEntry) +OEndMarker::OEndMarker(vcl::Window* _pParent ,const OUString& _sColorEntry) : OColorListener(_pParent,_sColorEntry) { SetUniqueId(HID_RPT_ENDMARKER); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 0a55d3963a93..3aded47f3db2 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1789,7 +1789,7 @@ void OReportController::doOpenHelpAgent() } } -bool OReportController::Construct(Window* pParent) +bool OReportController::Construct(vcl::Window* pParent) { ODesignView* pMyOwnView = new ODesignView( pParent, m_xContext, *this ); StartListening( *pMyOwnView ); diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index d892ef30a5f9..c36108b32ba5 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -71,7 +71,7 @@ void OSectionView::MarkListHasChanged() -void OSectionView::MakeVisible( const Rectangle& rRect, Window& rWin ) +void OSectionView::MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) { // visible area MapMode aMap( rWin.GetMapMode() ); diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 2fd6bdd88b34..ef15b49d9b30 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -354,13 +354,13 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter ) return 0L; } -void lcl_scroll(Window& _rWindow,const Point& _aDelta) +void lcl_scroll(vcl::Window& _rWindow,const Point& _aDelta) { _rWindow.Scroll(-_aDelta.X(),-_aDelta.Y()); _rWindow.Invalidate(INVALIDATE_TRANSPARENT); } -void lcl_setOrigin(Window& _rWindow,long _nX, long _nY) +void lcl_setOrigin(vcl::Window& _rWindow,long _nX, long _nY) { MapMode aMap = _rWindow.GetMapMode(); aMap.SetOrigin( Point(- _nX, - _nY)); diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index bd7be0fe74c2..bb6f92fa10ec 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -92,7 +92,7 @@ namespace -PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, Window* pParent, ODesignView* _pDesignView) +PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pParent, ODesignView* _pDesignView) :DockingWindow(pParent,WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE)) ,m_xORB(_xORB) ,m_pDesignView(_pDesignView) diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx index d2dbfb04d0ca..5bbbab5a4d2d 100644 --- a/rsc/source/res/rscall.cxx +++ b/rsc/source/res/rscall.cxx @@ -40,7 +40,7 @@ void InitRscCompiler() pStdPar1 = new OString('('); pStdPar2 = new OString('('); - pWinParType = new OString("( Window * pParent, const ResId & rResId, sal_Bool"); + pWinParType = new OString("( vcl::Window * pParent, const ResId & rResId, sal_Bool"); pWinPar1 = new OString("( pParent,"); pWinPar2 = new OString("( this,"); nRefDeep = 10; diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index b3bab58b0348..49209b65bc0d 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -54,7 +54,7 @@ public: virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; - virtual void Edit( Window*, const Link& rEndEditHdl ) SAL_OVERRIDE; + virtual void Edit( vcl::Window*, const Link& rEndEditHdl ) SAL_OVERRIDE; bool Refresh( const OUString& rNewFile, const OUString& rNewFilter, const OUString& rNewArea, sal_uLong nNewRefresh ); diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index c30cea833b5d..9c462d7536dc 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -107,7 +107,7 @@ namespace sfx2 { class LinkManager; } class SvxSearchItem; -class Window; +namespace vcl { class Window; } class XColorList; struct ScAttrEntry; @@ -713,7 +713,7 @@ public: ScFormulaParserPool& GetFormulaParserPool() const; bool HasAreaLinks() const; - void UpdateExternalRefLinks(Window* pWin); + void UpdateExternalRefLinks(vcl::Window* pWin); void UpdateAreaLinks(); // originating DDE links @@ -779,7 +779,7 @@ public: void SetChartRangeList( const OUString& rChartName, const ScRangeListRef& rNewRangeListRef ); - void StartAnimations( SCTAB nTab, Window* pWin ); + void StartAnimations( SCTAB nTab, vcl::Window* pWin ); bool HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ) const; bool HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect ) const; diff --git a/sc/inc/documentlinkmgr.hxx b/sc/inc/documentlinkmgr.hxx index 4c43adfe1585..0af5cf896c63 100644 --- a/sc/inc/documentlinkmgr.hxx +++ b/sc/inc/documentlinkmgr.hxx @@ -15,7 +15,7 @@ class ScDocument; class SfxObjectShell; -class Window; +namespace vcl { class Window; } namespace sfx2 { @@ -54,7 +54,7 @@ public: bool hasDdeLinks() const; - bool updateDdeLinks( Window* pWin ); + bool updateDdeLinks( vcl::Window* pWin ); bool updateDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem ); diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index 40096d936aa1..7d917bb626c4 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -190,7 +190,7 @@ public: static ScIMapInfo* GetIMapInfo( SdrObject* pObj ); static IMapObject* GetHitIMapObject( SdrObject* pObject, - const Point& rWinPoint, const Window& rCmpWnd ); + const Point& rWinPoint, const vcl::Window& rCmpWnd ); static ScMacroInfo* GetMacroInfo( SdrObject* pObj, bool bCreate = false ); diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index cd5518e92bc6..383186ef715f 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -44,7 +44,7 @@ class ScDocument; class ScTokenArray; -class Window; +namespace vcl { class Window; } class ScFormulaCell; class ScExternalRefCache; @@ -70,7 +70,7 @@ public: virtual void Closed() SAL_OVERRIDE; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue) SAL_OVERRIDE; - virtual void Edit(Window* pParent, const Link& rEndEditHdl) SAL_OVERRIDE; + virtual void Edit(vcl::Window* pParent, const Link& rEndEditHdl) SAL_OVERRIDE; void SetDoReferesh(bool b); diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 4d7ada8be307..6e6841b58cdb 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -326,43 +326,43 @@ class ScAbstractDialogFactory public: SC_DLLPUBLIC static ScAbstractDialogFactory* Create(); - virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, const OUString& aDatName, + virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall) = 0; - virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent) = 0; + virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(vcl::Window* pParent) = 0; - virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg(Window* pParent, + virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg(vcl::Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScViewData *pViewData) = 0; - virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, + virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (vcl::Window* pParent, bool bCol = false, bool bRow = false) = 0; - virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) = 0; + virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) = 0; - virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, + virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos, int nId ) = 0; - virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(Window* pParent) = 0; + virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(vcl::Window* pParent) = 0; - virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg(Window* pParent, + virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bEnableExternal) = 0; - virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, + virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( vcl::Window* pParent, const com::sun::star::uno::Sequence<OUString>& rServices, int nId ) = 0; - virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false) = 0 ; + virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove = false) = 0 ; //for dataform - virtual AbstractScDataFormDlg * CreateScDataFormDlg(Window* pParent, + virtual AbstractScDataFormDlg * CreateScDataFormDlg(vcl::Window* pParent, ScTabViewShell* pTabViewShell) = 0; - virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, + virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(vcl::Window* pParent, InsertDeleteFlags nCheckDefaults = IDF_NONE) = 0; - virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, + virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( vcl::Window* pParent, ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, @@ -372,26 +372,26 @@ public: double fMax, sal_uInt16 nPossDir) = 0; - virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, + virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( vcl::Window* pParent, bool bUnGroup = false, bool bRows = true ) = 0; - virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, + virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( vcl::Window* pParent, int nId, bool bDisallowCellMove = false ) = 0; - virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, + virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults = IDF_NONE, const OUString* pStrTitle = NULL ) = 0; - virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData, + virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(vcl::Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile) = 0; - virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, + virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( vcl::Window* pParent, const std::vector<OUString> &rEntryList ) = 0; - virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent) = 0; + virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(vcl::Window* pParent) = 0; - virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, + virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( vcl::Window* pParent, const OString& sDialogName, long nCurrent, long nDefault, @@ -402,60 +402,60 @@ public: long nFirst = 1, long nLast = 100 ) = 0; - virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(Window * pParent, + virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(vcl::Window * pParent, const OUString& rDefault) = 0; - virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent, + virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(vcl::Window * pParent, sal_uInt16 nFlags) = 0; - virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ) = 0; + virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( vcl::Window * pParent, ScDocShell* pShell, bool bInsList=true ) = 0; - virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg(Window* pParent, + virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgSet, sal_uInt16 nSourceTab) = 0; - virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, + virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ) = 0; - virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent, + virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, const ScDPNameVec& rDataFields, bool bEnableLayout ) = 0; - virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( Window* pParent, + virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( vcl::Window* pParent, int nId, const ScDPNumGroupInfo& rInfo ) = 0; - virtual AbstractScDPDateGroupDlg * CreateScDPDateGroupDlg( Window* pParent, + virtual AbstractScDPDateGroupDlg * CreateScDPDateGroupDlg( vcl::Window* pParent, int nId, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) = 0; - virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( Window* pParent, int nId, + virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( vcl::Window* pParent, int nId, ScDPObject& rDPObj, sal_uInt16 nOrient ) = 0; - virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const OUString& rName, + virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( vcl::Window* pParent, const OUString& rName, bool bEdit = false, bool bSheetProtected = false ) = 0; - virtual AbstractScShowTabDlg * CreateScShowTabDlg(Window* pParent) = 0; + virtual AbstractScShowTabDlg * CreateScShowTabDlg(vcl::Window* pParent) = 0; - virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent, + virtual AbstractScStringInputDlg * CreateScStringInputDlg ( vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, const OString& sHelpId, const OString& sEditHelpId ) = 0; - virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, + virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( vcl::Window* pParent, const OUString& rTitle, //Dialog Title const OUString& rTabBgColorNoColorText, //Label for no tab color const Color& rDefaultColor, //Currently selected Color const OString& ) = 0; - virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, + virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( vcl::Window* pParent, bool bAscii = true, const ScImportOptions* pOptions = NULL, const OUString* pStrTitle = NULL, @@ -464,32 +464,32 @@ public: bool bImport = true ) = 0; virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pCellAttrs ) = 0; virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, sal_uInt16 nResId = RID_SCDLG_HFEDIT ) = 0; - virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent, + virtual SfxAbstractTabDialog * CreateScStyleDlg( vcl::Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId, int nId) = 0; - virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, + virtual SfxAbstractTabDialog * CreateScSubTotalDlg( vcl::Window* pParent, const SfxItemSet* pArgSet ) = 0; - virtual SfxAbstractTabDialog * CreateScCharDlg(Window* pParent, + virtual SfxAbstractTabDialog * CreateScCharDlg(vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) = 0; - virtual SfxAbstractTabDialog * CreateScParagraphDlg(Window* pParent, + virtual SfxAbstractTabDialog * CreateScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr) = 0; - virtual SfxAbstractTabDialog * CreateScValidationDlg(Window* pParent, + virtual SfxAbstractTabDialog * CreateScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh) = 0; - virtual SfxAbstractTabDialog * CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet) = 0; + virtual SfxAbstractTabDialog * CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) = 0; // for tabpage virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index df6bbfe1a6f2..136f08fbd573 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -111,7 +111,7 @@ class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener bool mbIsInSharedDocLoading:1; bool mbIsInSharedDocSaving:1; - std::map<sal_uInt16, std::list<Window*> > m_mapRefWindow; + std::map<sal_uInt16, std::list<vcl::Window*> > m_mapRefWindow; std::stack<ScAnyRefModalDlg*> maAnyRefDlgStack; public: SFX_DECL_INTERFACE(SCID_APP) @@ -246,16 +246,16 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO // virtual methods for the options dialog virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; void SetInSharedDocLoading( bool bNew ) { mbIsInSharedDocLoading = bNew; } bool IsInSharedDocLoading() const { return mbIsInSharedDocLoading; } void SetInSharedDocSaving( bool bNew ) { mbIsInSharedDocSaving = bNew; } bool IsInSharedDocSaving() const { return mbIsInSharedDocSaving; } - SC_DLLPUBLIC bool RegisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ); - SC_DLLPUBLIC bool UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ); - SC_DLLPUBLIC Window * Find1RefWindow( sal_uInt16 nSlotId, Window *pWndAncestor ); + SC_DLLPUBLIC bool RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); + SC_DLLPUBLIC bool UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ); + SC_DLLPUBLIC vcl::Window * Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAncestor ); ScAnyRefModalDlg* GetCurrentAnyRefDlg(); void PushNewAnyRefDlg( ScAnyRefModalDlg* pDlg ); diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx index 785fd70a035e..f0b7bf60e2e9 100644 --- a/sc/inc/scopetools.hxx +++ b/sc/inc/scopetools.hxx @@ -13,7 +13,7 @@ #include "scdllapi.h" class ScDocument; -class Window; +namespace vcl { class Window; } namespace sc { @@ -58,9 +58,9 @@ public: class WaitPointerSwitch { - Window* mpFrameWin; + vcl::Window* mpFrameWin; public: - WaitPointerSwitch(Window* pWin); + WaitPointerSwitch(vcl::Window* pWin); ~WaitPointerSwitch(); }; diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index f4125f38527e..fb85482d3ab2 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -52,7 +52,7 @@ public: virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; - virtual void Edit( Window*, const Link& rEndEditHdl ) SAL_OVERRIDE; + virtual void Edit( vcl::Window*, const Link& rEndEditHdl ) SAL_OVERRIDE; bool Refresh(const OUString& rNewFile, const OUString& rNewFilter, const OUString* pNewOptions /* = NULL */, sal_uLong nNewRefresh ); diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index 724ea9643a73..4076b2179e0a 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -73,10 +73,10 @@ private: OUString aErrorMessage; bool DoMacro( const ScAddress& rPos, const OUString& rInput, - ScFormulaCell* pCell, Window* pParent ) const; + ScFormulaCell* pCell, vcl::Window* pParent ) const; bool DoScript( const ScAddress& rPos, const OUString& rInput, - ScFormulaCell* pCell, Window* pParent ) const; + ScFormulaCell* pCell, vcl::Window* pParent ) const; using ScConditionEntry::operator==; @@ -133,7 +133,7 @@ public: bool IsDataValid( ScRefCellValue& rCell, const ScAddress& rPos ) const; // TRUE -> break - bool DoError( Window* pParent, const OUString& rInput, const ScAddress& rPos ) const; + bool DoError( vcl::Window* pParent, const OUString& rInput, const ScAddress& rPos ) const; void DoCalcError( ScFormulaCell* pCell ) const; bool IsEmpty() const; diff --git a/sc/inc/waitoff.hxx b/sc/inc/waitoff.hxx index 2f211b3d6cfe..0e7672022809 100644 --- a/sc/inc/waitoff.hxx +++ b/sc/inc/waitoff.hxx @@ -22,15 +22,15 @@ #include <sal/types.h> -class Window; +namespace vcl { class Window; } class ScWaitCursorOff { private: - Window* pWin; + vcl::Window* pWin; sal_uInt32 nWaiters; public: - ScWaitCursorOff( Window* pWin ); + ScWaitCursorOff( vcl::Window* pWin ); ~ScWaitCursorOff(); }; diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 705d886ad28e..88169a589134 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -779,7 +779,7 @@ bool ScDocument::IsInLinkUpdate() const return bInLinkUpdate || IsInDdeLinkUpdate(); } -void ScDocument::UpdateExternalRefLinks(Window* pWin) +void ScDocument::UpdateExternalRefLinks(vcl::Window* pWin) { if (!pExternalRefMgr.get()) return; diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index e3669557393e..c296cfd9a2e5 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -342,7 +342,7 @@ bool ScDocument::HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* p return false; } -void ScDocument::StartAnimations( SCTAB nTab, Window* pWin ) +void ScDocument::StartAnimations( SCTAB nTab, vcl::Window* pWin ) { if (!pDrawLayer) return; diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 43354e14ca71..ca702d97de48 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -1932,7 +1932,7 @@ ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) } IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, - const Point& rWinPoint, const Window& rCmpWnd ) + const Point& rWinPoint, const vcl::Window& rCmpWnd ) { const MapMode aMap100( MAP_100TH_MM ); MapMode aWndMode = rCmpWnd.GetMapMode(); diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index c85ad2527b24..f5a757151d22 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -180,7 +180,7 @@ bool ScValidationData::GetErrMsg( OUString& rTitle, OUString& rMsg, } bool ScValidationData::DoScript( const ScAddress& rPos, const OUString& rInput, - ScFormulaCell* pCell, Window* pParent ) const + ScFormulaCell* pCell, vcl::Window* pParent ) const { ScDocument* pDocument = GetDocument(); SfxObjectShell* pDocSh = pDocument->GetDocumentShell(); @@ -261,7 +261,7 @@ bool ScValidationData::DoScript( const ScAddress& rPos, const OUString& rInput, // true -> abort bool ScValidationData::DoMacro( const ScAddress& rPos, const OUString& rInput, - ScFormulaCell* pCell, Window* pParent ) const + ScFormulaCell* pCell, vcl::Window* pParent ) const { if ( SfxApplication::IsXScriptURL( aErrorTitle ) ) { @@ -372,7 +372,7 @@ void ScValidationData::DoCalcError( ScFormulaCell* pCell ) const // true -> abort -bool ScValidationData::DoError( Window* pParent, const OUString& rInput, +bool ScValidationData::DoError( vcl::Window* pParent, const OUString& rInput, const ScAddress& rPos ) const { if ( eErrorStyle == SC_VALERR_MACRO ) diff --git a/sc/source/core/tool/scopetools.cxx b/sc/source/core/tool/scopetools.cxx index 0664219904a3..cb5942b9e677 100644 --- a/sc/source/core/tool/scopetools.cxx +++ b/sc/source/core/tool/scopetools.cxx @@ -57,7 +57,7 @@ IdleSwitch::~IdleSwitch() mrDoc.EnableIdle(mbOldValue); } -WaitPointerSwitch::WaitPointerSwitch(Window* pWin) : +WaitPointerSwitch::WaitPointerSwitch(vcl::Window* pWin) : mpFrameWin(pWin) { if (mpFrameWin) diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 944e083074ca..ff4dce6f59a0 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1710,7 +1710,7 @@ SdrObject* XclImpChartObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const R inserted into the draw page. */ sal_Int64 nAspect = ::com::sun::star::embed::Aspects::MSOLE_CONTENT; MapUnit aUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xEmbObj->getMapUnit( nAspect ) ); - Size aSize( Window::LogicToLogic( rAnchorRect.GetSize(), MapMode( MAP_100TH_MM ), MapMode( aUnit ) ) ); + Size aSize( vcl::Window::LogicToLogic( rAnchorRect.GetSize(), MapMode( MAP_100TH_MM ), MapMode( aUnit ) ) ); ::com::sun::star::awt::Size aAwtSize( aSize.Width(), aSize.Height() ); xEmbObj->setVisualAreaSize( nAspect, aAwtSize ); diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 9fd32a04e7ca..2989da515245 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -154,7 +154,7 @@ Rectangle ScAccessibleCell::GetBoundingBoxOnScreen(void) const Rectangle aCellRect(GetBoundingBox()); if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) { Rectangle aRect = pWindow->GetWindowExtentsRelative(NULL); @@ -177,7 +177,7 @@ Rectangle ScAccessibleCell::GetBoundingBox() const aCellRect.SetSize(Size(nSizeX, nSizeY)); aCellRect.SetPos(mpViewShell->GetViewData().GetScrPos(maCellAddress.Col(), maCellAddress.Row(), meSplitPos, true)); - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) { Rectangle aRect(pWindow->GetWindowExtentsRelative(pWindow->GetAccessibleParentWindow())); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 4c66e032611b..975dfc7ab344 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1414,14 +1414,14 @@ ScAccessibleDocument::ScAccessibleDocument( if (pViewShell) { pViewShell->AddAccessibilityObject(*this); - Window *pWin = pViewShell->GetWindowByPos(eSplitPos); + vcl::Window *pWin = pViewShell->GetWindowByPos(eSplitPos); if( pWin ) { pWin->AddChildEventListener( LINK( this, ScAccessibleDocument, WindowChildEventListener )); sal_uInt16 nCount = pWin->GetChildCount(); for( sal_uInt16 i=0; i < nCount; ++i ) { - Window *pChildWin = pWin->GetChild( i ); + vcl::Window *pChildWin = pWin->GetChild( i ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) AddChild( pChildWin->GetAccessible(), false ); @@ -1461,7 +1461,7 @@ void SAL_CALL ScAccessibleDocument::disposing() FreeAccessibleSpreadsheet(); if (mpViewShell) { - Window *pWin = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window *pWin = mpViewShell->GetWindowByPos(meSplitPos); if( pWin ) pWin->RemoveChildEventListener( LINK( this, ScAccessibleDocument, WindowChildEventListener )); @@ -1493,7 +1493,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEve { case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children { - Window* pChildWin = static_cast < Window * >( pVclEvent->GetData() ); + vcl::Window* pChildWin = static_cast < vcl::Window * >( pVclEvent->GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) { AddChild( pChildWin->GetAccessible(), true ); @@ -1502,7 +1502,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEve break; case VCLEVENT_WINDOW_HIDE: // send destroy on hide for direct accessible children { - Window* pChildWin = static_cast < Window * >( pVclEvent->GetData() ); + vcl::Window* pChildWin = static_cast < vcl::Window * >( pVclEvent->GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) { RemoveChild( pChildWin->GetAccessible(), true ); @@ -2228,7 +2228,7 @@ Rectangle ScAccessibleDocument::GetBoundingBoxOnScreen() const Rectangle aRect; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) aRect = pWindow->GetWindowExtentsRelative(NULL); } @@ -2241,7 +2241,7 @@ Rectangle ScAccessibleDocument::GetBoundingBox() const Rectangle aRect; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) aRect = pWindow->GetWindowExtentsRelative(pWindow->GetAccessibleParentWindow()); } diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index bd2c99cda1ff..aaae4ef6649a 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -542,7 +542,7 @@ Rectangle ScIAccessibleViewForwarder::GetVisibleArea() const { SolarMutexGuard aGuard; Rectangle aVisRect; - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin) { aVisRect.SetSize(pWin->GetOutputSizePixel()); @@ -558,7 +558,7 @@ Point ScIAccessibleViewForwarder::LogicToPixel (const Point& rPoint) const { SolarMutexGuard aGuard; Point aPoint; - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin && mpAccDoc) { Rectangle aRect(mpAccDoc->GetBoundingBoxOnScreen()); @@ -572,7 +572,7 @@ Size ScIAccessibleViewForwarder::LogicToPixel (const Size& rSize) const { SolarMutexGuard aGuard; Size aSize; - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin) aSize = pWin->LogicToPixel(rSize, maMapMode); return aSize; @@ -582,7 +582,7 @@ Point ScIAccessibleViewForwarder::PixelToLogic (const Point& rPoint) const { SolarMutexGuard aGuard; Point aPoint; - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin && mpAccDoc) { Rectangle aRect(mpAccDoc->GetBoundingBoxOnScreen()); @@ -595,7 +595,7 @@ Size ScIAccessibleViewForwarder::PixelToLogic (const Size& rSize) const { SolarMutexGuard aGuard; Size aSize; - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin) aSize = pWin->PixelToLogic(rSize, maMapMode); return aSize; @@ -1085,7 +1085,7 @@ void ScShapeChildren::FillShapes(const Rectangle& aPixelPaintRect, const MapMode { OSL_ENSURE(nRangeId < maShapeRanges.size(), "this is not a valid range for draw objects"); SdrPage* pPage = GetDrawPage(); - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pPage && pWin) { bool bForeAdded(false); @@ -1183,7 +1183,7 @@ struct ScPagePreviewCountData long nForeShapes; long nControls; - ScPagePreviewCountData( const ScPreviewLocationData& rData, Window* pSizeWindow, + ScPagePreviewCountData( const ScPreviewLocationData& rData, vcl::Window* pSizeWindow, ScNotesChildren* pNotesChildren, ScShapeChildren* pShapeChildren ); long GetTotal() const @@ -1193,7 +1193,7 @@ struct ScPagePreviewCountData }; ScPagePreviewCountData::ScPagePreviewCountData( const ScPreviewLocationData& rData, - Window* pSizeWindow, ScNotesChildren* pNotesChildren, + vcl::Window* pSizeWindow, ScNotesChildren* pNotesChildren, ScShapeChildren* pShapeChildren) : nBackShapes( 0 ), nHeaders( 0 ), @@ -1321,7 +1321,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint } Size aOutputSize; - Window* pSizeWindow = mpViewShell->GetWindow(); + vcl::Window* pSizeWindow = mpViewShell->GetWindow(); if ( pSizeWindow ) aOutputSize = pSizeWindow->GetOutputSizePixel(); Point aPoint; @@ -1359,7 +1359,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint else if (pSimpleHint->GetId() == SC_HINT_ACC_VISAREACHANGED) { Size aOutputSize; - Window* pSizeWindow = mpViewShell->GetWindow(); + vcl::Window* pSizeWindow = mpViewShell->GetWindow(); if ( pSizeWindow ) aOutputSize = pSizeWindow->GetOutputSizePixel(); Point aPoint; @@ -1627,7 +1627,7 @@ Rectangle ScAccessibleDocumentPagePreview::GetBoundingBoxOnScreen() const throw Rectangle aRect; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) aRect = pWindow->GetWindowExtentsRelative(NULL); } @@ -1639,7 +1639,7 @@ Rectangle ScAccessibleDocumentPagePreview::GetBoundingBox() const throw (uno::Ru Rectangle aRect; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) aRect = pWindow->GetWindowExtentsRelative(pWindow->GetAccessibleParentWindow()); } diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index fe59b03703d7..6981ece98856 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::accessibility; ScAccessibleEditObject::ScAccessibleEditObject( const uno::Reference<XAccessible>& rxParent, - EditView* pEditView, Window* pWin, const OUString& rName, + EditView* pEditView, vcl::Window* pWin, const OUString& rName, const OUString& rDescription, EditObjectType eObjectType) : ScAccessibleContextBase(rxParent, AccessibleRole::TEXT_FRAME), @@ -513,19 +513,19 @@ uno::Reference< XAccessibleRelationSet > ScAccessibleEditObject::getAccessibleRe throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window* pWindow = mpWindow; + vcl::Window* pWindow = mpWindow; utl::AccessibleRelationSetHelper* rRelationSet = new utl::AccessibleRelationSetHelper; uno::Reference< XAccessibleRelationSet > rSet = rRelationSet; if ( pWindow ) { - Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); + vcl::Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); if ( pLabeledBy && pLabeledBy != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); aSequence[0] = pLabeledBy->GetAccessible(); rRelationSet->AddRelation( AccessibleRelation( AccessibleRelationType::LABELED_BY, aSequence ) ); } - Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf(); + vcl::Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf(); if ( pMemberOf && pMemberOf != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 4eafb7a46005..5749093d83e3 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -350,7 +350,7 @@ Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const throw (uno::Run Rectangle aCellRect(GetBoundingBox()); if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) { Rectangle aRect = pWindow->GetWindowExtentsRelative(NULL); @@ -374,7 +374,7 @@ Rectangle ScAccessiblePageHeader::GetBoundingBox() const throw (uno::RuntimeExce // the Rectangle could contain negative coordinates so it should be cliped Rectangle aClipRect(Point(0, 0), aRect.GetSize()); - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) aClipRect = pWindow->GetWindowExtentsRelative(pWindow->GetAccessibleParentWindow()); aRect = aClipRect.GetIntersection(aRect); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 3f6b018126b1..68e8cd664340 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -211,7 +211,7 @@ Rectangle ScAccessiblePreviewCell::GetBoundingBoxOnScreen() const throw (uno::Ru if (mpViewShell) { mpViewShell->GetLocationData().GetCellPosition( maCellAddress, aCellRect ); - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) { Rectangle aRect = pWindow->GetWindowExtentsRelative(NULL); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 12221e5d0117..4b50e6383f4a 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -341,7 +341,7 @@ Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() const throw (u if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) { Rectangle aRect = pWindow->GetWindowExtentsRelative(NULL); @@ -438,7 +438,7 @@ void ScAccessiblePreviewHeaderCell::FillTableInfo() const if ( mpViewShell && !mpTableInfo ) { Size aOutputSize; - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if ( pWindow ) aOutputSize = pWindow->GetOutputSizePixel(); Point aPoint; diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index 79a67150840b..f8cda3b2e754 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -633,7 +633,7 @@ Rectangle ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const throw (uno::R Rectangle aCellRect(GetBoundingBox()); if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) { Rectangle aRect = pWindow->GetWindowExtentsRelative(NULL); @@ -679,7 +679,7 @@ void ScAccessiblePreviewTable::FillTableInfo() const if ( mpViewShell && !mpTableInfo ) { Size aOutputSize; - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if ( pWindow ) aOutputSize = pWindow->GetOutputSizePixel(); Point aPoint; diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index a1e9b8b49229..f1c5b4402317 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1355,7 +1355,7 @@ Rectangle ScAccessibleSpreadsheet::GetBoundingBoxOnScreen() const Rectangle aRect; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) aRect = pWindow->GetWindowExtentsRelative(NULL); } @@ -1368,7 +1368,7 @@ Rectangle ScAccessibleSpreadsheet::GetBoundingBox() const Rectangle aRect; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) //#101986#; extends to the same window, because the parent is the document and it has the same window aRect = pWindow->GetWindowExtentsRelative(pWindow); @@ -1439,7 +1439,7 @@ Rectangle ScAccessibleSpreadsheet::GetVisArea(ScTabViewShell* pViewShell, ScSpli Rectangle aVisArea; if (pViewShell) { - Window* pWindow = pViewShell->GetWindowByPos(eSplitPos); + vcl::Window* pWindow = pViewShell->GetWindowByPos(eSplitPos); if (pWindow) { aVisArea.SetPos(pViewShell->GetViewData().GetPixPos(eSplitPos)); diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 3dc8ba52fdd7..9e1e37bb4728 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -82,7 +82,7 @@ Rectangle ScViewForwarder::GetVisArea() const Rectangle aVisArea; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) { aVisArea.SetSize(pWindow->GetSizePixel()); @@ -109,7 +109,7 @@ Point ScViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMod { if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) return pWindow->LogicToPixel( rPoint, rMapMode ); } @@ -124,7 +124,7 @@ Point ScViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMapMod { if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) return pWindow->PixelToLogic( rPoint, rMapMode ); } @@ -142,11 +142,11 @@ void ScViewForwarder::SetInvalid() class ScEditObjectViewForwarder : public SvxViewForwarder { - Window* mpWindow; + vcl::Window* mpWindow; // #i49561# EditView needed for access to its visible area. const EditView* mpEditView; public: - ScEditObjectViewForwarder( Window* pWindow, + ScEditObjectViewForwarder( vcl::Window* pWindow, const EditView* _pEditView); virtual ~ScEditObjectViewForwarder(); @@ -158,7 +158,7 @@ public: void SetInvalid(); }; -ScEditObjectViewForwarder::ScEditObjectViewForwarder( Window* pWindow, +ScEditObjectViewForwarder::ScEditObjectViewForwarder( vcl::Window* pWindow, const EditView* _pEditView ) : mpWindow(pWindow), @@ -290,7 +290,7 @@ Point ScPreviewViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& { if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) { MapMode aMapMode(pWindow->GetMapMode().GetMapUnit()); @@ -309,7 +309,7 @@ Point ScPreviewViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& { if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) { MapMode aMapMode(pWindow->GetMapMode()); @@ -338,7 +338,7 @@ Rectangle ScPreviewViewForwarder::GetVisRect() const if ( mpViewShell ) { Size aOutputSize; - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if ( pWindow ) aOutputSize = pWindow->GetOutputSizePixel(); Point aPoint; @@ -353,7 +353,7 @@ Rectangle ScPreviewViewForwarder::CorrectVisArea(const Rectangle& rVisArea) cons Rectangle aVisArea(rVisArea); Point aPos = aVisArea.TopLeft(); // get first the position to remember negative positions after clipping - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin) aVisArea = pWin->GetWindowExtentsRelative(pWin).GetIntersection(aVisArea); @@ -545,9 +545,9 @@ Rectangle ScPreviewNoteViewForwarder::GetVisArea() const class ScEditViewForwarder : public SvxEditViewForwarder { EditView* mpEditView; - Window* mpWindow; + vcl::Window* mpWindow; public: - ScEditViewForwarder(EditView* pEditView, Window* pWin); + ScEditViewForwarder(EditView* pEditView, vcl::Window* pWin); virtual ~ScEditViewForwarder(); virtual bool IsValid() const SAL_OVERRIDE; @@ -565,7 +565,7 @@ public: void SetInvalid(); }; -ScEditViewForwarder::ScEditViewForwarder(EditView* pEditView, Window* pWin) +ScEditViewForwarder::ScEditViewForwarder(EditView* pEditView, vcl::Window* pWin) : mpEditView(pEditView), mpWindow(pWin) { @@ -815,7 +815,7 @@ SvxTextForwarder* ScAccessibleCellTextData::GetTextForwarder() aSize.setWidth( nWidth ); aSize.setHeight( aSize.getHeight() - nTopM - nBottomM ); - Window* pWin = mpViewShell->GetWindowByPos( meSplitPos ); + vcl::Window* pWin = mpViewShell->GetWindowByPos( meSplitPos ); if ( pWin ) { aSize = pWin->PixelToLogic( aSize, pEditEngine->GetRefMapMode() ); @@ -962,7 +962,7 @@ ScDocShell* ScAccessibleCellTextData::GetDocShell(ScTabViewShell* pViewShell) return pDocSh; } -ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, bool isClone) +ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, vcl::Window* pWin, bool isClone) : mpViewForwarder(NULL), mpEditViewForwarder(NULL), @@ -1073,7 +1073,7 @@ IMPL_LINK(ScAccessibleEditObjectTextData, NotifyHdl, EENotify*, aNotify) return 0; } -ScAccessibleEditLineTextData::ScAccessibleEditLineTextData(EditView* pEditView, Window* pWin) +ScAccessibleEditLineTextData::ScAccessibleEditLineTextData(EditView* pEditView, vcl::Window* pWin) : ScAccessibleEditObjectTextData(pEditView, pWin), mbEditEngineCreated(false) @@ -1284,7 +1284,7 @@ SvxTextForwarder* ScAccessiblePreviewCellTextData::GetTextForwarder() if (!bEditEngineBefore && pEditEngine) { Size aSize(mpViewShell->GetLocationData().GetCellOutputRect(aCellPos).GetSize()); - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin) aSize = pWin->PixelToLogic(aSize, pEditEngine->GetRefMapMode()); pEditEngine->SetPaperSize(aSize); @@ -1384,7 +1384,7 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder() if ( mpViewShell ) { Size aOutputSize; - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if ( pWindow ) aOutputSize = pWindow->GetOutputSizePixel(); Point aPoint; @@ -1515,7 +1515,7 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder() Rectangle aVisRect; mpViewShell->GetLocationData().GetHeaderPosition(aVisRect); Size aSize(aVisRect.GetSize()); - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin) aSize = pWin->PixelToLogic(aSize, mpEditEngine->GetRefMapMode()); mpEditEngine->SetPaperSize(aSize); @@ -1618,7 +1618,7 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder() if ( mpViewShell ) { Size aOutputSize; - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if ( pWindow ) aOutputSize = pWindow->GetOutputSizePixel(); Point aPoint; @@ -1650,10 +1650,10 @@ SvxViewForwarder* ScAccessibleNoteTextData::GetViewForwarder() class ScCsvViewForwarder : public SvxViewForwarder { Rectangle maBoundBox; - Window* mpWindow; + vcl::Window* mpWindow; public: - explicit ScCsvViewForwarder( Window* pWindow, const Rectangle& rBoundBox ); + explicit ScCsvViewForwarder( vcl::Window* pWindow, const Rectangle& rBoundBox ); virtual bool IsValid() const SAL_OVERRIDE; virtual Rectangle GetVisArea() const SAL_OVERRIDE; @@ -1663,7 +1663,7 @@ public: void SetInvalid(); }; -ScCsvViewForwarder::ScCsvViewForwarder( Window* pWindow, const Rectangle& rBoundBox ) : +ScCsvViewForwarder::ScCsvViewForwarder( vcl::Window* pWindow, const Rectangle& rBoundBox ) : maBoundBox( rBoundBox ), mpWindow( pWindow ) { @@ -1697,7 +1697,7 @@ void ScCsvViewForwarder::SetInvalid() } ScAccessibleCsvTextData::ScAccessibleCsvTextData( - Window* pWindow, EditEngine* pEditEngine, + vcl::Window* pWindow, EditEngine* pEditEngine, const OUString& rCellText, const Rectangle& rBoundBox, const Size& rCellSize ) : mpWindow( pWindow ), mpEditEngine( pEditEngine ), diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx index a764c1397321..efb130e1a97b 100644 --- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx @@ -96,7 +96,7 @@ void lclMakeSubRangesList(ScRangeList& rRangeList, ScRange& rInputRange, ScStati ScAnalysisOfVarianceDialog::ScAnalysisOfVarianceDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsInputOutputDialog( pSfxBindings, pChildWindow, pParent, pViewData, "AnalysisOfVarianceDialog", "modules/scalc/ui/analysisofvariancedialog.ui" ), diff --git a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx index 2591b9f47322..3184b2281e0c 100644 --- a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx @@ -22,7 +22,7 @@ namespace ScCorrelationDialog::ScCorrelationDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScMatrixComparisonGenerator( pSfxBindings, pChildWindow, pParent, pViewData, "CorrelationDialog", "modules/scalc/ui/correlationdialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx index b4ed14e74564..e26c650f5566 100644 --- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx @@ -22,7 +22,7 @@ namespace ScCovarianceDialog::ScCovarianceDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScMatrixComparisonGenerator( pSfxBindings, pChildWindow, pParent, pViewData, "CovarianceDialog", "modules/scalc/ui/covariancedialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx index 0d98e79d9a1e..157e974fadae 100644 --- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx @@ -61,7 +61,7 @@ static const OUString strWildcardNumber("%NUMBER%"); ScDescriptiveStatisticsDialog::ScDescriptiveStatisticsDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsInputOutputDialog( pSfxBindings, pChildWindow, pParent, pViewData, "DescriptiveStatisticsDialog", "modules/scalc/ui/descriptivestatisticsdialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx index 091f1a05833b..8063b4ab82d9 100644 --- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx @@ -28,7 +28,7 @@ ScExponentialSmoothingDialog::ScExponentialSmoothingDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsInputOutputDialog( pSfxBindings, pChildWindow, pParent, pViewData, "ExponentialSmoothingDialog", "modules/scalc/ui/exponentialsmoothingdialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx index 785d47550214..2b3eb52944be 100644 --- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx @@ -38,7 +38,7 @@ static const OUString strWildcardVariable2Range("%VAR2_RANGE%"); ScFTestDialog::ScFTestDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsTwoVariableDialog( pSfxBindings, pChildWindow, pParent, pViewData, "TTestDialog", "modules/scalc/ui/ttestdialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx index ac7039ae9251..4ac7c8eed48a 100644 --- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx +++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx @@ -53,7 +53,7 @@ namespace ScMatrixComparisonGenerator::ScMatrixComparisonGenerator( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData, const OString& rID, + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUiXmlDescription) : ScStatisticsInputOutputDialog(pSfxBindings, pChildWindow, pParent, pViewData, rID, rUiXmlDescription) {} diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx index 2786e53b6626..7a76c2fc9095 100644 --- a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx @@ -28,7 +28,7 @@ ScMovingAverageDialog::ScMovingAverageDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsInputOutputDialog( pSfxBindings, pChildWindow, pParent, pViewData, "MovingAverageDialog", "modules/scalc/ui/movingaveragedialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index f3e14e7ebb34..905f409b5d7b 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -56,7 +56,7 @@ const sal_Int64 DIGITS = 4; ScRandomNumberGeneratorDialog::ScRandomNumberGeneratorDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, "RandomNumberGeneratorDialog", "modules/scalc/ui/randomnumbergenerator.ui" ), mpViewData ( pViewData ), diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index afe5d64a8081..49b2d4315577 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -28,7 +28,7 @@ ScSamplingDialog::ScSamplingDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, "SamplingDialog", "modules/scalc/ui/samplingdialog.ui" ), mpActiveEdit ( NULL ), diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx index d8e835a538cd..1c104a6506f8 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx @@ -55,7 +55,7 @@ ScRangeList ScStatisticsInputOutputDialog::MakeRowRangeList(SCTAB aTab, ScAddres ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) : + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) : ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, rID, rUIXMLDescription ), mViewData ( pViewData ), mDocument ( pViewData->GetDocument() ), diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx index a55da6df51ad..190704beabe8 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx @@ -27,7 +27,7 @@ ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) : + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) : ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, rID, rUIXMLDescription ), mViewData ( pViewData ), mDocument ( pViewData->GetDocument() ), diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx index 07a61c8c0fa6..684b40f9a2b1 100644 --- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx @@ -38,7 +38,7 @@ static const OUString strWildcardVariable2Range("%VAR2_RANGE%"); ScTTestDialog::ScTTestDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsTwoVariableDialog( pSfxBindings, pChildWindow, pParent, pViewData, "TTestDialog", "modules/scalc/ui/ttestdialog.ui" ) diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx index 0982b2ed42e7..7472b7435d5f 100644 --- a/sc/source/ui/app/client.cxx +++ b/sc/source/ui/app/client.cxx @@ -39,7 +39,7 @@ using namespace com::sun::star; -ScClient::ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ) : +ScClient::ScClient( ScTabViewShell* pViewShell, vcl::Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ) : SfxInPlaceClient( pViewShell, pDraw, pObj->GetAspect() ), pModel( pSdrModel ), pGrafEdit( 0 ) @@ -229,7 +229,7 @@ void ScClient::ViewChanged() ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, pSfxViewSh ); if ( pViewSh ) { - Window* pWin = pViewSh->GetActiveWin(); + vcl::Window* pWin = pViewSh->GetActiveWin(); if ( pWin->LogicToPixel( aVisSize ) != pWin->LogicToPixel( aLogicRect.GetSize() ) ) { aLogicRect.SetSize( aVisSize ); diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 83b67b22d1ba..c2f2f1ac96ad 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -248,7 +248,7 @@ ScDrawTransferObj::~ScDrawTransferObj() delete pDragSourceView; } -ScDrawTransferObj* ScDrawTransferObj::GetOwnClipboard( Window* ) +ScDrawTransferObj* ScDrawTransferObj::GetOwnClipboard( vcl::Window* ) { ScDrawTransferObj* pObj = SC_MOD()->GetClipData().pDrawClipboard; return pObj; diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 940f856f0c31..87cdfebb4d34 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1688,7 +1688,7 @@ void ScInputHandler::UpdateActiveView() // GetActiveWin (the currently active pane) fails for ref input across the // panes of a split view. - Window* pShellWin = pActiveViewSh ? + vcl::Window* pShellWin = pActiveViewSh ? pActiveViewSh->GetWindowByPos( pActiveViewSh->GetViewData().GetEditActivePart() ) : NULL; @@ -1699,7 +1699,7 @@ void ScInputHandler::UpdateActiveView() for (sal_uInt16 i=1; i<nCount; i++) { EditView* pThis = pEngine->GetView(i); - Window* pWin = pThis->GetWindow(); + vcl::Window* pWin = pThis->GetWindow(); if ( pWin==pShellWin ) pTableView = pThis; } @@ -2412,7 +2412,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) lcl_SelectionToEnd(pTableView); } - Window* pFrameWin = pActiveViewSh ? pActiveViewSh->GetFrameWin() : NULL; + vcl::Window* pFrameWin = pActiveViewSh ? pActiveViewSh->GetFrameWin() : NULL; if (pTopView) pTopView->CompleteAutoCorrect(); // CompleteAutoCorrect for both Views @@ -2439,7 +2439,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) pActiveViewSh->StopMarking(); // (the InfoBox consumes the MouseButtonUp) //FIXME: We still run into problems if the input is triggered by activating another View - Window* pParent = Application::GetDefDialogParent(); + vcl::Window* pParent = Application::GetDefDialogParent(); if ( pData->DoError( pParent, aString, aCursorPos ) ) bForget = true; // Do not take over input } @@ -3163,7 +3163,7 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, bool bStartEdit /* = false { if (pTableView) { - Window* pFrameWin = pActiveViewSh ? pActiveViewSh->GetFrameWin() : NULL; + vcl::Window* pFrameWin = pActiveViewSh ? pActiveViewSh->GetFrameWin() : NULL; if ( pTableView->PostKeyEvent( rKEvt, pFrameWin ) ) bUsed = true; } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 7c78b001c6d1..9b9457f33bed 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -104,7 +104,7 @@ enum ScNameInputType SC_MANAGE_NAMES }; -ScTextWndBase::ScTextWndBase( Window* pParent, WinBits nStyle ) +ScTextWndBase::ScTextWndBase( vcl::Window* pParent, WinBits nStyle ) : Window ( pParent, nStyle ) { if ( IsNativeControlSupported( CTRL_EDITBOX, PART_ENTIRE_CONTROL ) ) @@ -118,7 +118,7 @@ ScTextWndBase::ScTextWndBase( Window* pParent, WinBits nStyle ) SFX_IMPL_CHILDWINDOW_WITHID(ScInputWindowWrapper,FID_INPUTLINE_STATUS) -ScInputWindowWrapper::ScInputWindowWrapper( Window* pParentP, +ScInputWindowWrapper::ScInputWindowWrapper( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* /* pInfo */ ) @@ -154,7 +154,7 @@ static bool lcl_isExperimentalMode() // class ScInputWindow -static ScTextWndBase* lcl_chooseRuntimeImpl( Window* pParent, SfxBindings* pBind ) +static ScTextWndBase* lcl_chooseRuntimeImpl( vcl::Window* pParent, SfxBindings* pBind ) { ScTabViewShell* pViewSh = NULL; SfxDispatcher* pDisp = pBind->GetDispatcher(); @@ -170,7 +170,7 @@ static ScTextWndBase* lcl_chooseRuntimeImpl( Window* pParent, SfxBindings* pBind return new ScInputBarGroup( pParent, pViewSh ); } -ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) : +ScInputWindow::ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ) : // With WB_CLIPCHILDREN otherwise we get flickering ToolBox ( pParent, WinBits(WB_CLIPCHILDREN) ), aWndPos ( this ), @@ -895,7 +895,7 @@ void ScInputWindow::MouseButtonUp( const MouseEvent& rMEvt ) ToolBox::MouseButtonUp( rMEvt ); } -ScInputBarGroup::ScInputBarGroup(Window* pParent, ScTabViewShell* pViewSh) +ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, ScTabViewShell* pViewSh) : ScTextWndBase ( pParent, WinBits(WB_HIDE | WB_TABSTOP ) ), aMultiTextWnd ( this, pViewSh ), aButton ( this, WB_TABSTOP | WB_RECTSTYLE | WB_SMALLSTYLE ), @@ -949,7 +949,7 @@ void ScInputBarGroup::SetTextString( const OUString& rString ) void ScInputBarGroup::Resize() { - Window *w=GetParent(); + vcl::Window *w=GetParent(); ScInputWindow *pParent; pParent=dynamic_cast<ScInputWindow*>(w); @@ -1054,7 +1054,7 @@ void ScInputBarGroup::DecrementVerticalSize() IMPL_LINK_NOARG(ScInputBarGroup, ClickHdl) { - Window *w=GetParent(); + vcl::Window *w=GetParent(); ScInputWindow *pParent; pParent=dynamic_cast<ScInputWindow*>(w); @@ -1081,7 +1081,7 @@ IMPL_LINK_NOARG(ScInputBarGroup, ClickHdl) void ScInputBarGroup::TriggerToolboxLayout() { - Window *w=GetParent(); + vcl::Window *w=GetParent(); ScInputWindow &rParent = dynamic_cast<ScInputWindow&>(*w); SfxViewFrame* pViewFrm = SfxViewFrame::Current(); @@ -1436,7 +1436,7 @@ void ScMultiTextWnd::SetTextString( const OUString& rNewString ) DoScroll(); } -ScTextWnd::ScTextWnd( Window* pParent, ScTabViewShell* pViewSh ) +ScTextWnd::ScTextWnd( vcl::Window* pParent, ScTabViewShell* pViewSh ) : ScTextWndBase ( pParent, WinBits(WB_HIDE | WB_BORDER) ), DragSourceHelper( this ), pEditEngine ( NULL ), @@ -2049,7 +2049,7 @@ void ScTextWnd::TextGrabFocus() // Position window -ScPosWnd::ScPosWnd( Window* pParent ) : +ScPosWnd::ScPosWnd( vcl::Window* pParent ) : ComboBox ( pParent, WinBits(WB_HIDE | WB_DROPDOWN) ), pAccel ( NULL ), nTipVisible ( 0 ), @@ -2321,7 +2321,7 @@ void ScPosWnd::Modify() { // show the help tip at the text cursor position - Window* pWin = GetSubEdit(); + vcl::Window* pWin = GetSubEdit(); if (!pWin) pWin = this; Point aPos; @@ -2519,7 +2519,7 @@ void ScPosWnd::ReleaseFocus_Impl() // Set focus to active View if ( pCurSh ) { - Window* pShellWnd = pCurSh->GetWindow(); + vcl::Window* pShellWnd = pCurSh->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index fde742995a1e..7922e40097b8 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -260,7 +260,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 } else if ( pViewShell->ISA(ScPreviewShell) ) { - Window* pWin = pViewShell->GetWindow(); + vcl::Window* pWin = pViewShell->GetWindow(); if (pWin) pWin->Invalidate(); } @@ -2093,7 +2093,7 @@ void ScModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) } } -SfxTabPage* ScModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) { SfxTabPage* pRet = NULL; ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -2215,9 +2215,9 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo ) return 0; } -bool ScModule::RegisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ) +bool ScModule::RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ) { - std::list<Window*> & rlRefWindow = m_mapRefWindow[nSlotId]; + std::list<vcl::Window*> & rlRefWindow = m_mapRefWindow[nSlotId]; if( std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ) == rlRefWindow.end() ) { @@ -2228,16 +2228,16 @@ bool ScModule::RegisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ) return false; } -bool ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ) +bool ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ) { - std::map<sal_uInt16, std::list<Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId ); + std::map<sal_uInt16, std::list<vcl::Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId ); if( iSlot == m_mapRefWindow.end() ) return false; - std::list<Window*> & rlRefWindow = iSlot->second; + std::list<vcl::Window*> & rlRefWindow = iSlot->second; - std::list<Window*>::iterator i = std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ); + std::list<vcl::Window*>::iterator i = std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ); if( i == rlRefWindow.end() ) return false; @@ -2250,21 +2250,21 @@ bool ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ) return true; } -Window * ScModule::Find1RefWindow( sal_uInt16 nSlotId, Window *pWndAncestor ) +vcl::Window * ScModule::Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAncestor ) { if (!pWndAncestor) return NULL; - std::map<sal_uInt16, std::list<Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId ); + std::map<sal_uInt16, std::list<vcl::Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId ); if( iSlot == m_mapRefWindow.end() ) return NULL; - std::list<Window*> & rlRefWindow = iSlot->second; + std::list<vcl::Window*> & rlRefWindow = iSlot->second; - while( Window *pParent = pWndAncestor->GetParent() ) pWndAncestor = pParent; + while( vcl::Window *pParent = pWndAncestor->GetParent() ) pWndAncestor = pParent; - for( std::list<Window*>::iterator i = rlRefWindow.begin(); i!=rlRefWindow.end(); ++i ) + for( std::list<vcl::Window*>::iterator i = rlRefWindow.begin(); i!=rlRefWindow.end(); ++i ) if ( pWndAncestor->IsWindowOrChild( *i, (*i)->IsSystemWindow() ) ) return *i; diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 36759531bfbd..02733c174912 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -197,7 +197,7 @@ ScTransferObj::~ScTransferObj() } -ScTransferObj* ScTransferObj::GetOwnClipboard( Window* pUIWin ) +ScTransferObj* ScTransferObj::GetOwnClipboard( vcl::Window* pUIWin ) { ScTransferObj* pObj = SC_MOD()->GetClipData().pCellClipboard; if ( pObj && pUIWin ) diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 8c7c350e5789..de389644c4d7 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -34,7 +34,7 @@ #include <editeng/flstitem.hxx> #include <sfx2/app.hxx> -ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet* pCellAttrs) +ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, vcl::Window* pParent, const SfxItemSet* pCellAttrs) : SfxTabDialog(pFrameP, pParent, "FormatCellsDialog", "modules/scalc/ui/formatcellsdialog.ui", pCellAttrs) { SvtCJKOptions aCJKOptions; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 85667ea63435..2bb26ceb8706 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -600,20 +600,20 @@ bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const } // =========================Factories for createdialog =================== -AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( Window* pParent, const OUString& aDatName, +AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( vcl::Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall ) { ScImportAsciiDlg* pDlg = new ScImportAsciiDlg( pParent, aDatName,pInStream, eCall ); return new AbstractScImportAsciiDlg_Impl( pDlg ); } -AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg(Window* pParent) +AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg(vcl::Window* pParent) { ScTextImportOptionsDlg* pDlg = new ScTextImportOptionsDlg(pParent); return new AbstractScTextImportOptionsDlg_Impl(pDlg); } -AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg(Window* pParent, +AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg(vcl::Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScViewData *pViewData) @@ -622,7 +622,7 @@ AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg(Wi return new AbstractScAutoFormatDlg_Impl(pDlg); } -AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg(Window* pParent, +AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg(vcl::Window* pParent, bool bCol , bool bRow) { @@ -630,13 +630,13 @@ AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg return new AbstractScColRowLabelDlg_Impl( pDlg ); } -AbstractScSortWarningDlg* ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) +AbstractScSortWarningDlg* ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) { ScSortWarningDlg* pDlg = new ScSortWarningDlg(pParent, rExtendText, rCurrentText ); return new AbstractScSortWarningDlg_Impl( pDlg ); } -AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, +AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos, int nId ) { ScCondFormatManagerDlg* pDlg = NULL; @@ -654,20 +654,20 @@ AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormat return NULL; } -AbstractScDataPilotDatabaseDlg * ScAbstractDialogFactory_Impl::CreateScDataPilotDatabaseDlg(Window* pParent) +AbstractScDataPilotDatabaseDlg * ScAbstractDialogFactory_Impl::CreateScDataPilotDatabaseDlg(vcl::Window* pParent) { ScDataPilotDatabaseDlg * pDlg = new ScDataPilotDatabaseDlg( pParent ); return new AbstractScDataPilotDatabaseDlg_Impl( pDlg ); } AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg( - Window* pParent, bool bEnableExternal) + vcl::Window* pParent, bool bEnableExternal) { ScDataPilotSourceTypeDlg* pDlg = new ScDataPilotSourceTypeDlg(pParent, bEnableExternal); return new AbstractScDataPilotSourceTypeDlg_Impl(pDlg); } -AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( Window* pParent, +AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( vcl::Window* pParent, const com::sun::star::uno::Sequence<OUString>& rServices, int nId ) { @@ -686,28 +686,28 @@ AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSe return 0; } -AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(Window* pParent, +AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove) { ScDeleteCellDlg * pDlg = new ScDeleteCellDlg(pParent, bDisallowCellMove); return new AbstractScDeleteCellDlg_Impl( pDlg ); } -AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg(Window* pParent, +AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg(vcl::Window* pParent, ScTabViewShell* pTabViewShell) { ScDataFormDlg* pDlg = new ScDataFormDlg(pParent, pTabViewShell); return new AbstractScDataFormDlg_Impl(pDlg); } -AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent, +AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(vcl::Window* pParent, InsertDeleteFlags nCheckDefaults) { ScDeleteContentsDlg* pDlg = new ScDeleteContentsDlg(pParent, nCheckDefaults); return new AbstractScDeleteContentsDlg_Impl( pDlg ); } -AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Window* pParent, +AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( vcl::Window* pParent, ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, @@ -721,7 +721,7 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi return new AbstractScFillSeriesDlg_Impl( pDlg ); } -AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Window* pParent, +AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( vcl::Window* pParent, bool bUnGroup, bool bRows ) { @@ -729,7 +729,7 @@ AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Wind return new AbstractScGroupDlg_Impl( pDlg ); } -AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( Window* pParent, +AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( vcl::Window* pParent, int nId, bool bDisallowCellMove ) { @@ -748,7 +748,7 @@ AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( W return 0; } -AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( Window* pParent, +AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults, const OUString* pStrTitle ) { @@ -756,27 +756,27 @@ AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertConten return new AbstractScInsertContentsDlg_Impl( pDlg ); } -AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData, +AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg(vcl::Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile) { ScInsertTableDlg* pDlg = new ScInsertTableDlg( pParent, rViewData,nTabCount, bFromFile ); return new AbstractScInsertTableDlg_Impl( pDlg ); } -AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Window* pParent, +AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( vcl::Window* pParent, const std::vector<OUString> &rEntryList ) { ScSelEntryDlg * pDlg = new ScSelEntryDlg( pParent, rEntryList ); return new AbstractScSelEntryDlg_Impl( pDlg ); } -AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg(Window* pParent) +AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg(vcl::Window* pParent) { ScLinkedAreaDlg* pDlg = new ScLinkedAreaDlg( pParent ); return new AbstractScLinkedAreaDlg_Impl( pDlg ); } -AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg ( Window* pParent, +AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg ( vcl::Window* pParent, const OString& sDialogName, long nCurrent, long nDefault, @@ -792,33 +792,33 @@ AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg return new AbstractScMetricInputDlg_Impl( pDlg ); } -AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg(Window* pParent, +AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg(vcl::Window* pParent, const OUString& rDefault) { ScMoveTableDlg * pDlg = new ScMoveTableDlg( pParent, rDefault ); return new AbstractScMoveTableDlg_Impl( pDlg ); } -AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg(Window * pParent, sal_uInt16 nFlags) +AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg(vcl::Window * pParent, sal_uInt16 nFlags) { ScNameCreateDlg * pDlg = new ScNameCreateDlg( pParent, nFlags ); return new AbstractScNameCreateDlg_Impl( pDlg ); } -AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList ) +AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( vcl::Window * pParent, ScDocShell* pShell, bool bInsList ) { ScNamePasteDlg * pDlg = new ScNamePasteDlg( pParent, pShell, bInsList ); return new AbstractScNamePasteDlg_Impl( pDlg ); } -AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg(Window* pParent, +AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgSet, sal_uInt16 nSourceTab) { ScPivotFilterDlg *pDlg = new ScPivotFilterDlg(pParent, rArgSet, nSourceTab); return new AbstractScPivotFilterDlg_Impl(pDlg); } -AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg ( Window* pParent, +AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg ( vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ) @@ -827,7 +827,7 @@ AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg ( return new AbstractScDPFunctionDlg_Impl( pDlg ); } -AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( Window* pParent, +AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, @@ -839,7 +839,7 @@ AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( } AbstractScDPNumGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg( - Window* pParent, int nId, const ScDPNumGroupInfo& rInfo ) + vcl::Window* pParent, int nId, const ScDPNumGroupInfo& rInfo ) { if( nId == RID_SCDLG_DPNUMGROUP ) return new AbstractScDPNumGroupDlg_Impl( new ScDPNumGroupDlg( pParent, rInfo ) ); @@ -847,7 +847,7 @@ AbstractScDPNumGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg( } AbstractScDPDateGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg( - Window* pParent, int nId, + vcl::Window* pParent, int nId, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) { if( nId == RID_SCDLG_DPDATEGROUP ) @@ -856,27 +856,27 @@ AbstractScDPDateGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg( } AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDlg ( - Window* pParent, int nId, ScDPObject& rDPObj, sal_uInt16 nOrient ) + vcl::Window* pParent, int nId, ScDPObject& rDPObj, sal_uInt16 nOrient ) { if( nId == RID_SCDLG_DPSHOWDETAIL ) return new AbstractScDPShowDetailDlg_Impl( new ScDPShowDetailDlg( pParent, rDPObj, nOrient ) ); return 0; } -AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg(Window* pParent, const OUString& rName, +AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg(vcl::Window* pParent, const OUString& rName, bool bEdit, bool bSheetProtected) { ScNewScenarioDlg *pDlg = new ScNewScenarioDlg(pParent, rName, bEdit, bSheetProtected); return new AbstractScNewScenarioDlg_Impl( pDlg ); } -AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg(Window* pParent) +AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg(vcl::Window* pParent) { ScShowTabDlg * pDlg = new ScShowTabDlg( pParent); return new AbstractScShowTabDlg_Impl( pDlg ); } -AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg ( Window* pParent, +AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg ( vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, @@ -887,7 +887,7 @@ AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg } AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg( - Window* pParent, + vcl::Window* pParent, const OUString& rTitle, const OUString& rTabBgColorNoColorText, const Color& rDefaultColor, @@ -897,7 +897,7 @@ AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg( return new AbstractScTabBgColorDlg_Impl( pDlg ); } -AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( Window* pParent, +AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( vcl::Window* pParent, bool bAscii, const ScImportOptions* pOptions, const OUString* pStrTitle, @@ -910,14 +910,14 @@ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptions } SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg(SfxViewFrame* pFrame, - Window* pParent, const SfxItemSet* pCellAttrs) + vcl::Window* pParent, const SfxItemSet* pCellAttrs) { SfxTabDialog* pDlg = new ScAttrDlg(pFrame, pParent, pCellAttrs); return new ScAbstractTabDialog_Impl(pDlg); } SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame* pFrame, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, sal_uInt16 nResId ) @@ -964,7 +964,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF return pDlg ? new ScAbstractTabDialog_Impl( pDlg ) : NULL; } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* pParent, +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( vcl::Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId, int nId) @@ -985,34 +985,34 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* return 0; } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet) +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) { SfxTabDialog* pDlg = new ScSubTotalDlg( pParent, pArgSet ); return new ScAbstractTabDialog_Impl( pDlg ); } SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg( - Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) + vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) { SfxTabDialog* pDlg = new ScCharDlg(pParent, pAttr, pDocShell); return new ScAbstractTabDialog_Impl(pDlg); } SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( - Window* pParent, const SfxItemSet* pAttr) + vcl::Window* pParent, const SfxItemSet* pAttr) { SfxTabDialog* pDlg = new ScParagraphDlg(pParent, pAttr); return new ScAbstractTabDialog_Impl(pDlg); } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg(Window* pParent, +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh) { SfxTabDialog* pDlg = new ScValidationDlg(pParent, pArgSet, pTabVwSh); return new ScAbstractTabDialog_Impl(pDlg); } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet) +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) { SfxTabDialog* pDlg = new ScSortDlg( pParent, pArgSet ); return new ScAbstractTabDialog_Impl( pDlg ); diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index a0c8be1fed69..6e493396bad5 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -394,43 +394,43 @@ class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory public: virtual ~ScAbstractDialogFactory_Impl() {} - virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, const OUString& aDatName, + virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall) SAL_OVERRIDE; - virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent) SAL_OVERRIDE; + virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(vcl::Window* pParent) SAL_OVERRIDE; - virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg(Window* pParent, + virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg(vcl::Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScViewData *pViewData) SAL_OVERRIDE; - virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, + virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (vcl::Window* pParent, bool bCol = false, bool bRow = false) SAL_OVERRIDE; - virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) SAL_OVERRIDE; + virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) SAL_OVERRIDE; - virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, + virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos, int nId ) SAL_OVERRIDE; - virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(Window* pParent) SAL_OVERRIDE; + virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(vcl::Window* pParent) SAL_OVERRIDE; - virtual AbstractScDataPilotSourceTypeDlg* CreateScDataPilotSourceTypeDlg(Window* pParent, + virtual AbstractScDataPilotSourceTypeDlg* CreateScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bEnableExternal) SAL_OVERRIDE; - virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, + virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( vcl::Window* pParent, const com::sun::star::uno::Sequence<OUString>& rServices, int nId ) SAL_OVERRIDE; - virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false ) SAL_OVERRIDE; + virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove = false ) SAL_OVERRIDE; //for dataform - virtual AbstractScDataFormDlg* CreateScDataFormDlg(Window* pParent, + virtual AbstractScDataFormDlg* CreateScDataFormDlg(vcl::Window* pParent, ScTabViewShell* pTabViewShell) SAL_OVERRIDE; - virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, + virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(vcl::Window* pParent, InsertDeleteFlags nCheckDefaults = IDF_NONE) SAL_OVERRIDE; - virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, + virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( vcl::Window* pParent, ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, @@ -439,27 +439,27 @@ public: double fStep, double fMax, sal_uInt16 nPossDir) SAL_OVERRIDE; - virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, + virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( vcl::Window* pParent, bool bUnGroup = false, bool bRows = true) SAL_OVERRIDE; - virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, + virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( vcl::Window* pParent, int nId, bool bDisallowCellMove = false ) SAL_OVERRIDE; - virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, + virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults = IDF_NONE, const OUString* pStrTitle = NULL ) SAL_OVERRIDE; - virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData, + virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(vcl::Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile) SAL_OVERRIDE; - virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, + virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( vcl::Window* pParent, const std::vector<OUString> &rEntryList ) SAL_OVERRIDE; - virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent) SAL_OVERRIDE; + virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(vcl::Window* pParent) SAL_OVERRIDE; - virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, + virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( vcl::Window* pParent, const OString& sDialogName, long nCurrent, long nDefault, @@ -470,60 +470,60 @@ public: long nFirst = 1, long nLast = 100 ) SAL_OVERRIDE; - virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(Window * pParent, + virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(vcl::Window * pParent, const OUString& rDefault) SAL_OVERRIDE; - virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent, + virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(vcl::Window * pParent, sal_uInt16 nFlags) SAL_OVERRIDE; - virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ) SAL_OVERRIDE; + virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( vcl::Window * pParent, ScDocShell* pShell, bool bInsList=true ) SAL_OVERRIDE; - virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg(Window* pParent, + virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgSet, sal_uInt16 nSourceTab) SAL_OVERRIDE; - virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, + virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ) SAL_OVERRIDE; - virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent, + virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, const ScDPNameVec& rDataFields, bool bEnableLayout ) SAL_OVERRIDE; - virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( Window* pParent, + virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( vcl::Window* pParent, int nId, const ScDPNumGroupInfo& rInfo ) SAL_OVERRIDE; - virtual AbstractScDPDateGroupDlg * CreateScDPDateGroupDlg( Window* pParent, + virtual AbstractScDPDateGroupDlg * CreateScDPDateGroupDlg( vcl::Window* pParent, int nId, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) SAL_OVERRIDE; - virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( Window* pParent, int nId, + virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( vcl::Window* pParent, int nId, ScDPObject& rDPObj, sal_uInt16 nOrient ) SAL_OVERRIDE; - virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const OUString& rName, + virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( vcl::Window* pParent, const OUString& rName, bool bEdit = false, bool bSheetProtected = false ) SAL_OVERRIDE; - virtual AbstractScShowTabDlg * CreateScShowTabDlg(Window* pParent) SAL_OVERRIDE; + virtual AbstractScShowTabDlg * CreateScShowTabDlg(vcl::Window* pParent) SAL_OVERRIDE; - virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent, + virtual AbstractScStringInputDlg * CreateScStringInputDlg ( vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, const OString& sHelpId, const OString& sEditHelpId ) SAL_OVERRIDE; - virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, + virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( vcl::Window* pParent, const OUString& rTitle, //Dialog Title const OUString& rTabBgColorNoColorText, //Label for no tab color const Color& rDefaultColor, //Currently selected Color const OString& sHelpId ) SAL_OVERRIDE; - virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, + virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( vcl::Window* pParent, bool bAscii = true, const ScImportOptions* pOptions = NULL, const OUString* pStrTitle = NULL, @@ -531,32 +531,32 @@ public: bool bOnlyDbtoolsEncodings = false, bool bImport = true ) SAL_OVERRIDE; virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pCellAttrs ) SAL_OVERRIDE; virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, sal_uInt16 nResId = RID_SCDLG_HFEDIT ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent, + virtual SfxAbstractTabDialog * CreateScStyleDlg( vcl::Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId, int nId) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, + virtual SfxAbstractTabDialog * CreateScSubTotalDlg( vcl::Window* pParent, const SfxItemSet* pArgSet ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateScCharDlg(Window* pParent, + virtual SfxAbstractTabDialog * CreateScCharDlg(vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateScParagraphDlg(Window* pParent, + virtual SfxAbstractTabDialog * CreateScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateScValidationDlg(Window* pParent, + virtual SfxAbstractTabDialog * CreateScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet) SAL_OVERRIDE; + virtual SfxAbstractTabDialog * CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) SAL_OVERRIDE; // For TabPage virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) SAL_OVERRIDE; diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 2884663d4df0..2989420dfbf8 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -38,7 +38,7 @@ static const sal_uInt16 pProtectionRanges[] = // Zellschutz-Tabpage: -ScTabPageProtection::ScTabPageProtection(Window* pParent, const SfxItemSet& rCoreAttrs) +ScTabPageProtection::ScTabPageProtection(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "CellProtectionPage", "modules/scalc/ui/cellprotectionpage.ui", &rCoreAttrs) { @@ -64,7 +64,7 @@ const sal_uInt16* ScTabPageProtection::GetRanges() return pProtectionRanges; } -SfxTabPage* ScTabPageProtection::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* ScTabPageProtection::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new ScTabPageProtection( pParent, *rAttrSet ) ); } diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 570117ea5caf..dd3e57d364f2 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -71,7 +71,7 @@ IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999; -ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel) : +ScMenuFloatingWindow::ScMenuFloatingWindow(vcl::Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel) : PopupMenuFloatingWindow(pParent), maOpenTimer(this), maCloseTimer(this), @@ -852,7 +852,7 @@ void ScCheckListMenuWindow::CancelButton::Click() ::CancelButton::Click(); } -ScCheckListMenuWindow::ScCheckListMenuWindow(Window* pParent, ScDocument* pDoc) : +ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* pDoc) : ScMenuFloatingWindow(pParent, pDoc), maChecks(this, WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT ), maChkToggleAll(this, 0), @@ -1210,7 +1210,7 @@ void ScCheckListMenuWindow::Paint(const Rectangle& rRect) DrawRect(Rectangle(aPos,aSize)); } -Window* ScCheckListMenuWindow::GetPreferredKeyInputWindow() +vcl::Window* ScCheckListMenuWindow::GetPreferredKeyInputWindow() { return maTabStopCtrls[mnCurTabStop]; } @@ -1327,7 +1327,7 @@ void ScCheckListMenuWindow::addMember(const OUString& rName, bool bVisible) maMembers.push_back(aMember); } -ScCheckListBox::ScCheckListBox( Window* pParent, WinBits nWinStyle ) +ScCheckListBox::ScCheckListBox( vcl::Window* pParent, WinBits nWinStyle ) : SvTreeListBox( pParent, nWinStyle ), mpCheckButton( NULL ) { Init(); diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index 6c8755cfe4fd..59da99c4933b 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -41,12 +41,12 @@ sal_Unicode lclGetGroupSep() } // namespace -ScDoubleField::ScDoubleField( Window* pParent, WinBits nStyle ) : +ScDoubleField::ScDoubleField( vcl::Window* pParent, WinBits nStyle ) : Edit( pParent, nStyle ) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScDoubleField(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScDoubleField(vcl::Window *pParent, VclBuilder::stringmap &rMap) { VclBuilder::ensureDefaultWidthChars(rMap); return new ScDoubleField(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index bf00d6d6d462..6e2e8bc501c0 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -79,7 +79,7 @@ void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState } } -Window* ScZoomSliderControl::CreateItemWindow( Window *pParent ) +vcl::Window* ScZoomSliderControl::CreateItemWindow( vcl::Window *pParent ) { // #i98000# Don't try to get a value via SfxViewFrame::Current here. // The view's value is always notified via StateChanged later. @@ -216,7 +216,7 @@ long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const return nRect; } -ScZoomSliderWnd::ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, +ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , sal_uInt16 nCurrentZoom ): Window( pParent ), mpImpl( new ScZoomSliderWnd_Impl( nCurrentZoom ) ), diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index 6de2470aa2dd..b3fa94ebe8ee 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -60,7 +60,7 @@ void SetValue( ScColorScaleEntry* pEntry, Edit& aEdit) } -ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, const ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos): +ScDataBarSettingsDlg::ScDataBarSettingsDlg(vcl::Window* pWindow, const ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos): ModalDialog( pWindow, "DataBarOptions", "modules/scalc/ui/databaroptions.ui" ), mpNumberFormatter( pDoc->GetFormatTable() ), mpDoc(pDoc), diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index d9a08f85d987..b868e20b5bfb 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -34,7 +34,7 @@ #include "globstr.hrc" -ScCondFormatList::ScCondFormatList(Window* pParent, WinBits nStyle) +ScCondFormatList::ScCondFormatList(vcl::Window* pParent, WinBits nStyle) : Control(pParent, nStyle | WB_DIALOGCONTROL) , mbHasScrollBar(false) , mpScrollBar(new ScrollBar(this, WB_VERT )) @@ -127,7 +127,7 @@ void ScCondFormatList::init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent, RecalcAll(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScCondFormatList(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScCondFormatList(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = 0; @@ -395,7 +395,7 @@ IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl ) //ScCondFormatDlg -ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, +ScCondFormatDlg::ScCondFormatDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType) : ScAnyRefModalDlg(pParent, "ConditionalFormatDialog", diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index fa54d2afce6e..5f92b615280c 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -33,7 +33,7 @@ #include <set> -ScCondFrmtEntry::ScCondFrmtEntry(Window* pParent, ScDocument* pDoc, const ScAddress& rPos): +ScCondFrmtEntry::ScCondFrmtEntry(vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos): Control(pParent, ScResId( RID_COND_ENTRY ) ), mbActive(false), maFtCondNr( this, ScResId( FT_COND_NR ) ), @@ -90,7 +90,7 @@ void ScCondFrmtEntry::SetHeight() long nMaxHeight = 0; for(sal_uInt16 i = 0; i < nChildren; i++) { - Window *pChild = GetChild(i); + vcl::Window *pChild = GetChild(i); if(!pChild || !pChild->IsVisible()) continue; Point aPos = pChild->GetPosPixel(); @@ -164,7 +164,7 @@ void FillStyleListBox( ScDocument* pDoc, ListBox& rLbStyle ) } -ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, +ScConditionFrmtEntry::ScConditionFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbCondType( this, ScResId( LB_CELLIS_TYPE ) ), @@ -548,7 +548,7 @@ IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl) // formula -ScFormulaFrmtEntry::ScFormulaFrmtEntry( Window* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormat ): +ScFormulaFrmtEntry::ScFormulaFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maFtStyle( this, ScResId( FT_STYLE ) ), maLbStyle( this, ScResId( LB_STYLE ) ), @@ -716,7 +716,7 @@ ScColorScaleEntry* createColorScaleEntry( const ListBox& rType, const ColorListB } -ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): +ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE_MIN ) ), @@ -867,7 +867,7 @@ IMPL_LINK( ScColorScale2FrmtEntry, EntryTypeHdl, ListBox*, pBox ) return 0; } -ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): +ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE_MIN ) ), @@ -1103,7 +1103,7 @@ void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Ed } -ScDataBarFrmtEntry::ScDataBarFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat ): +ScDataBarFrmtEntry::ScDataBarFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), maLbDataBarMinType( this, ScResId( LB_TYPE_COL_SCALE_MIN ) ), @@ -1229,7 +1229,7 @@ IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl ) return 0; } -ScDateFrmtEntry::ScDateFrmtEntry( Window* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat ): +ScDateFrmtEntry::ScDateFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat ): ScCondFrmtEntry( pParent, pDoc, ScAddress() ), maLbDateEntry( this, ScResId( LB_DATE_TYPE ) ), maFtStyle( this, ScResId( FT_STYLE ) ), @@ -1330,7 +1330,7 @@ class ScIconSetFrmtDataEntry : public Control ListBox maLbEntryType; public: - ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, ScDocument* pDoc, + ScIconSetFrmtDataEntry( vcl::Window* pParent, ScIconSetType eType, ScDocument* pDoc, sal_Int32 i, const ScColorScaleEntry* pEntry = NULL ); ScColorScaleEntry* CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const; @@ -1338,7 +1338,7 @@ class ScIconSetFrmtDataEntry : public Control void SetFirstEntry(); }; -ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, ScDocument* pDoc, sal_Int32 i, const ScColorScaleEntry* pEntry ): +ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( vcl::Window* pParent, ScIconSetType eType, ScDocument* pDoc, sal_Int32 i, const ScColorScaleEntry* pEntry ): Control( pParent, ScResId( RID_ICON_SET_ENTRY ) ), maImgIcon( this, ScResId( IMG_ICON ) ), maFtEntry( this, ScResId( FT_ICON_SET_ENTRY_TEXT ) ), @@ -1420,7 +1420,7 @@ void ScIconSetFrmtDataEntry::SetFirstEntry() maLbEntryType.SelectEntryPos(1); } -ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat ): +ScIconSetFrmtEntry::ScIconSetFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), maLbIconSetType( this, ScResId( LB_ICONSET_TYPE ) ) diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 92e2bca67baa..d61fd36a669a 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -106,7 +106,7 @@ void ScCondFormatManagerWindow::setColSizes() SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); } -ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos): +ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos): ModalDialog(pParent, "CondFormatManager", "modules/scalc/ui/condformatmanager.ui"), mpFormatList( pFormatList ? new ScConditionalFormatList(*pFormatList) : NULL), mpDoc(pDoc), diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index 1a4954cffca6..ec241f3ad917 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -65,7 +65,7 @@ ScRange lclGetRangeForNamedRange(OUString const & aName, ScDocument* pDocument) } ScPivotLayoutDialog::ScPivotLayoutDialog( - SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, Window* pParent, + SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, vcl::Window* pParent, ScViewData* pViewData, const ScDPObject* pPivotTableObject, bool bNewPivotTable) : ScAnyRefDlg (pSfxBindings, pChildWindow, pParent, "PivotTableLayout", "modules/scalc/ui/pivottablelayoutdialog.ui"), maPivotTableObject (*pPivotTableObject), diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx index eedd01e2b469..7f75da8968a5 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx @@ -18,12 +18,12 @@ using namespace std; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScPivotLayoutTreeList(Window *pParent, VclBuilder::stringmap& ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScPivotLayoutTreeList(vcl::Window *pParent, VclBuilder::stringmap& ) { return new ScPivotLayoutTreeList(pParent, WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE); } -ScPivotLayoutTreeList::ScPivotLayoutTreeList(Window* pParent, WinBits nBits) : +ScPivotLayoutTreeList::ScPivotLayoutTreeList(vcl::Window* pParent, WinBits nBits) : ScPivotLayoutTreeListBase(pParent, nBits) {} diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx index 3710e4ca0f03..84b61d466996 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx @@ -18,7 +18,7 @@ using namespace std; -ScPivotLayoutTreeListBase::ScPivotLayoutTreeListBase(Window* pParent, WinBits nBits, SvPivotTreeListType eType) +ScPivotLayoutTreeListBase::ScPivotLayoutTreeListBase(vcl::Window* pParent, WinBits nBits, SvPivotTreeListType eType) : SvTreeListBox(pParent, nBits) , meType(eType) , mpParent(NULL) diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx index a9daa316b513..3b9b4f1cd4c4 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx @@ -18,7 +18,7 @@ using namespace std; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScPivotLayoutTreeListData(Window *pParent, VclBuilder::stringmap& ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScPivotLayoutTreeListData(vcl::Window *pParent, VclBuilder::stringmap& ) { return new ScPivotLayoutTreeListData(pParent, WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE); } @@ -64,7 +64,7 @@ OUString lclCreateDataItemName(const sal_uInt16 nFunctionMask, const OUString& r } // anonymous namespace -ScPivotLayoutTreeListData::ScPivotLayoutTreeListData(Window* pParent, WinBits nBits) : +ScPivotLayoutTreeListData::ScPivotLayoutTreeListData(vcl::Window* pParent, WinBits nBits) : ScPivotLayoutTreeListBase(pParent, nBits, DATA_LIST) {} diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx index 705693441c6b..1780161bd6ac 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx @@ -18,12 +18,12 @@ using namespace std; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScPivotLayoutTreeListLabel(Window *pParent, VclBuilder::stringmap& ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScPivotLayoutTreeListLabel(vcl::Window *pParent, VclBuilder::stringmap& ) { return new ScPivotLayoutTreeListLabel(pParent, WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE); } -ScPivotLayoutTreeListLabel::ScPivotLayoutTreeListLabel(Window* pParent, WinBits nBits) +ScPivotLayoutTreeListLabel::ScPivotLayoutTreeListLabel(vcl::Window* pParent, WinBits nBits) : ScPivotLayoutTreeListBase(pParent, nBits, LABEL_LIST) , maDataItem(0) { diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index fc70a15d9c93..bf401cee91a5 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -58,7 +58,7 @@ public: bool bIsDbArea; }; -ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet ) : ScAnyRefDlg ( pB, pCW, pParent, "ConsolidateDialog" , "modules/scalc/ui/consolidatedialog.ui" ), diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 381309dd7efd..56c8eb7cf6be 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -64,7 +64,7 @@ ScCsvControl::ScCsvControl( ScCsvControl& rParent ) : { } -ScCsvControl::ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ) : +ScCsvControl::ScCsvControl( vcl::Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ) : Control( pParent, nBits ), mrData( rData ), mpAccessible( NULL ), diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index f65704846918..c78aabaeab67 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -23,7 +23,7 @@ #include <vcl/settings.hxx> #include "editutil.hxx" -ScCsvTableBox::ScCsvTableBox( Window* pParent, WinBits nBits ) : +ScCsvTableBox::ScCsvTableBox( vcl::Window* pParent, WinBits nBits ) : ScCsvControl( pParent, maData, nBits ), maRuler( *this ), maGrid( *this ), @@ -54,7 +54,7 @@ ScCsvTableBox::ScCsvTableBox( Window* pParent, WinBits nBits ) : InitControls(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScCsvTableBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScCsvTableBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new ScCsvTableBox(pParent, WB_BORDER); } diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 95ca794d69ff..5cf72605ee55 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -43,7 +43,7 @@ using namespace com::sun::star; #define DP_TYPELIST_QUERY 1 #define DP_TYPELIST_SQLNAT 3 -ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) : +ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( vcl::Window* pParent ) : ModalDialog(pParent, "SelectDataSourceDialog", "modules/scalc/ui/selectdatasource.ui") { diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 4d50ebd96bf6..f32ce2bf0ad1 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -25,7 +25,7 @@ using namespace com::sun::star; -ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal) +ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bEnableExternal) : ModalDialog( pParent, "SelectSourceDialog", "modules/scalc/ui/selectsource.ui" ) { get(m_pBtnSelection, "selection"); @@ -93,7 +93,7 @@ IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn ) return 0; } -ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent, +ScDataPilotServiceDlg::ScDataPilotServiceDlg( vcl::Window* pParent, const uno::Sequence<OUString>& rServices ) : ModalDialog ( pParent, "DapiserviceDialog", "modules/scalc/ui/dapiservicedialog.ui" ) { diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 022283e06e78..c46be30d3661 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -111,7 +111,7 @@ void DBSaveData::Restore() // class ScDbNameDlg -ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData) : ScAnyRefDlg(pB, pCW, pParent, "DefineDatabaseRangeDialog", @@ -140,9 +140,9 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, get(m_pBtnCancel, "cancel"); get(m_pBtnAdd, "add"); aStrAdd = m_pBtnAdd->GetText(); - aStrModify = get<Window>("modify")->GetText(); + aStrModify = get<vcl::Window>("modify")->GetText(); get(m_pBtnRemove, "delete"); - aStrInvalid = get<Window>("invalid")->GetText(); + aStrInvalid = get<vcl::Window>("invalid")->GetText(); m_pFTSource->SetStyle(m_pFTSource->GetStyle() | WB_NOLABEL); m_pFTOperations->SetStyle(m_pFTOperations->GetStyle() | WB_NOLABEL); diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index ce688274b838..77ae5247a2d1 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -146,7 +146,7 @@ void ScDPDateGroupEditHelper::ImplSetValue( double fValue ) mpEdValue->SetDate( aDate ); } -ScDPNumGroupDlg::ScDPNumGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo ) : +ScDPNumGroupDlg::ScDPNumGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& rInfo ) : ModalDialog ( pParent, "PivotTableGroupByNumber", "modules/scalc/ui/groupbynumber.ui" ), mpRbAutoStart ( get<RadioButton>("auto_start") ), mpRbManStart ( get<RadioButton>("manual_start") ), @@ -194,7 +194,7 @@ ScDPNumGroupInfo ScDPNumGroupDlg::GetGroupInfo() const return aInfo; } -ScDPDateGroupDlg::ScDPDateGroupDlg( Window* pParent, +ScDPDateGroupDlg::ScDPDateGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) : ModalDialog( pParent, "PivotTableGroupByDate", "modules/scalc/ui/groupbydate.ui" ), mpRbAutoStart ( get<RadioButton>("auto_start") ), diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index c80dede2be71..f3fa5d401e6d 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -49,7 +49,7 @@ ScFilterDlg::EntryList::EntryList() : mnHeaderPos(INVALID_HEADER_POS) {} -ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet) : ScAnyRefDlg ( pB, pCW, pParent, "StandardFilterDialog", "modules/scalc/ui/standardfilterdialog.ui" ) diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 5ffa9fabadd5..c5032bb9aa17 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -39,7 +39,7 @@ #include <svl/zforlist.hxx> #include <svl/sharedstringpool.hxx> -ScPivotFilterDlg::ScPivotFilterDlg(Window* pParent, const SfxItemSet& rArgSet, +ScPivotFilterDlg::ScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgSet, SCTAB nSourceTab ) : ModalDialog(pParent, "PivotFilterDialog", "modules/scalc/ui/pivotfilterdialog.ui" ) diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 8813613b4a08..935e02a982d8 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -151,13 +151,13 @@ static const ScDPListBoxWrapper::MapEntryType spShowFromMap[] = } // namespace -ScDPFunctionListBox::ScDPFunctionListBox(Window* pParent, WinBits nStyle) +ScDPFunctionListBox::ScDPFunctionListBox(vcl::Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) { FillFunctionNames(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScDPFunctionListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScDPFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -193,7 +193,7 @@ void ScDPFunctionListBox::FillFunctionNames() } ScDPFunctionDlg::ScDPFunctionDlg( - Window* pParent, const ScDPLabelDataVector& rLabelVec, + vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData) : ModalDialog(pParent, "DataFieldDialog", "modules/scalc/ui/datafielddialog.ui") @@ -406,7 +406,7 @@ IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl) return 0; } -ScDPSubtotalDlg::ScDPSubtotalDlg( Window* pParent, ScDPObject& rDPObj, +ScDPSubtotalDlg::ScDPSubtotalDlg( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, const ScDPNameVec& rDataFields, bool bEnableLayout ) : ModalDialog(pParent, "PivotFieldDialog", @@ -507,7 +507,7 @@ IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn ) return 0; } -ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( Window* pParent, ScDPObject& rDPObj, +ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields, bool bEnableLayout ) : ModalDialog(pParent, "DataFieldOptionsDialog", @@ -757,7 +757,7 @@ IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox ) return 0; } -ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) : +ScDPShowDetailDlg::ScDPShowDetailDlg( vcl::Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) : ModalDialog ( pParent, "ShowDetail", "modules/scalc/ui/showdetaildialog.ui" ), mrDPObj(rDPObj) { diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 0d7de73194fd..9ba5f255481b 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -36,7 +36,7 @@ #include "scresid.hxx" #include "scendlg.hxx" -ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const OUString& rName, bool bEdit, bool bSheetProtected) +ScNewScenarioDlg::ScNewScenarioDlg( vcl::Window* pParent, const OUString& rName, bool bEdit, bool bSheetProtected) : ModalDialog(pParent, "ScenarioDialog", "modules/scalc/ui/scenariodialog.ui") diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index a625ecbf6f4f..b5101c3b3147 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -228,7 +228,7 @@ static void save_Separators( aItem.PutProperties(aNames, aValues); } -ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent, const OUString& aDatName, +ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall ) : ModalDialog (pParent, "TextImportCsvDialog", "modules/scalc/ui/textimportcsv.ui"), diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index b7d682a40211..98ee9d90c898 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -99,7 +99,7 @@ OUString ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const // ScImportOptionsDlg ScImportOptionsDlg::ScImportOptionsDlg( - Window* pParent, + vcl::Window* pParent, bool bAscii, const ScImportOptions* pOptions, const OUString* pStrTitle, diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index af6fe97c2900..1815e03b496c 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -42,7 +42,7 @@ // class ScSpecialFilterDialog -ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet ) : ScAnyRefDlg ( pB, pCW, pParent, "AdvancedFilterDialog", "modules/scalc/ui/advancedfilterdialog.ui" ), diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 8129dc42cd0d..97c6b98641c8 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.cxx @@ -24,7 +24,7 @@ #include "sortdlg.hxx" #include "scresid.hxx" -ScSortDlg::ScSortDlg(Window* pParent, const SfxItemSet* pArgSet) +ScSortDlg::ScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) : SfxTabDialog(pParent, "SortDialog", "modules/scalc/ui/sortdialog.ui", pArgSet) , bIsHeaders(false) , bIsByRows(false) @@ -33,7 +33,7 @@ ScSortDlg::ScSortDlg(Window* pParent, const SfxItemSet* pArgSet) AddTabPage("options", ScTabPageSortOptions::Create, 0); } -ScSortWarningDlg::ScSortWarningDlg(Window* pParent, +ScSortWarningDlg::ScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText) : ModalDialog(pParent, "SortWarning", "modules/scalc/ui/sortwarning.ui") { diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index f82f72ae6045..9e0b76e821f8 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -11,7 +11,7 @@ #include "sortdlg.hxx" #include <vcl/layout.hxx> -ScSortKeyItem::ScSortKeyItem(Window* pParent) +ScSortKeyItem::ScSortKeyItem(vcl::Window* pParent) { m_pUIBuilder = new VclBuilder(pParent, getUIRootDir(), "modules/scalc/ui/sortkey.ui"); diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index b1fe324f3dca..c4a718a9e6d7 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -23,7 +23,7 @@ #include "scresid.hxx" #include "subtdlg.hxx" -ScSubTotalDlg::ScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet) +ScSubTotalDlg::ScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) : SfxTabDialog(pParent, "SubTotalDialog", "modules/scalc/ui/subtotaldialog.ui", pArgSet) { diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index 485dc48cbee1..fb1b34945c14 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -25,7 +25,7 @@ #include <vcl/window.hxx> #include <vcl/settings.hxx> -ScTextImportOptionsDlg::ScTextImportOptionsDlg(Window* pParent) +ScTextImportOptionsDlg::ScTextImportOptionsDlg(vcl::Window* pParent) : ModalDialog(pParent, "TextImportOptionsDialog", "modules/scalc/ui/textimportoptions.ui") { get(m_pBtnOk, "ok"); diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index d0ad201f6228..8b8a0a8375bd 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -67,7 +67,7 @@ using namespace com::sun::star; // Sort Criteria Tab page -ScTabPageSortFields::ScTabPageSortFields(Window* pParent, +ScTabPageSortFields::ScTabPageSortFields(vcl::Window* pParent, const SfxItemSet& rArgSet) : SfxTabPage(pParent, "SortCriteriaPage", "modules/scalc/ui/sortcriteriapage.ui", &rArgSet) @@ -135,7 +135,7 @@ void ScTabPageSortFields::Init() } } -SfxTabPage* ScTabPageSortFields::Create( Window* pParent, +SfxTabPage* ScTabPageSortFields::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTabPageSortFields( pParent, *rArgSet ) ); @@ -477,7 +477,7 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) // Sort option Tab Page: -ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, +ScTabPageSortOptions::ScTabPageSortOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage(pParent, "SortOptionsPage", "modules/scalc/ui/sortoptionspage.ui", &rArgSet) @@ -608,7 +608,7 @@ void ScTabPageSortOptions::Init() } SfxTabPage* ScTabPageSortOptions::Create( - Window* pParent, + vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTabPageSortOptions( pParent, *rArgSet ) ); diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index c8fd47da5408..fcddba84506f 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -34,7 +34,7 @@ // Subtotals group tabpage: -ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, +ScTpSubTotalGroup::ScTpSubTotalGroup( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage ( pParent, "SubTotalGrpPage", "modules/scalc/ui/subtotalgrppage.ui", @@ -378,27 +378,27 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) // Derived Group TabPages: -SfxTabPage* ScTpSubTotalGroup1::Create( Window* pParent, +SfxTabPage* ScTpSubTotalGroup1::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTpSubTotalGroup1( pParent, *rArgSet ) ); } -SfxTabPage* ScTpSubTotalGroup2::Create( Window* pParent, +SfxTabPage* ScTpSubTotalGroup2::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTpSubTotalGroup2( pParent, *rArgSet ) ); } -SfxTabPage* ScTpSubTotalGroup3::Create( Window* pParent, +SfxTabPage* ScTpSubTotalGroup3::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTpSubTotalGroup3( pParent, *rArgSet ) ); } -ScTpSubTotalGroup1::ScTpSubTotalGroup1( Window* pParent, const SfxItemSet& rArgSet ) : +ScTpSubTotalGroup1::ScTpSubTotalGroup1( vcl::Window* pParent, const SfxItemSet& rArgSet ) : ScTpSubTotalGroup( pParent, rArgSet ) {} -ScTpSubTotalGroup2::ScTpSubTotalGroup2( Window* pParent, const SfxItemSet& rArgSet ) : +ScTpSubTotalGroup2::ScTpSubTotalGroup2( vcl::Window* pParent, const SfxItemSet& rArgSet ) : ScTpSubTotalGroup( pParent, rArgSet ) {} -ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgSet ) : +ScTpSubTotalGroup3::ScTpSubTotalGroup3( vcl::Window* pParent, const SfxItemSet& rArgSet ) : ScTpSubTotalGroup( pParent, rArgSet ) {} @@ -416,7 +416,7 @@ bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet* rArgSet ) { return FILLSET(3); // Optionen-Tabpage: -ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, +ScTpSubTotalOptions::ScTpSubTotalOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage ( pParent, @@ -462,7 +462,7 @@ void ScTpSubTotalOptions::Init() FillUserSortListBox(); } -SfxTabPage* ScTpSubTotalOptions::Create( Window* pParent, +SfxTabPage* ScTpSubTotalOptions::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTpSubTotalOptions( pParent, *rArgSet ) ); diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 703556626491..78413609218e 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -80,7 +80,7 @@ static const sal_uInt16 pValueRanges[] = 0 }; -ScValidationDlg::ScValidationDlg(Window* pParent, const SfxItemSet* pArgSet, +ScValidationDlg::ScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh, SfxBindings *pB /*= NULL*/) : ScValidationDlgBase(pParent ? pParent : SfxGetpApp()->GetTopWindow(), "ValidationDialog", "modules/scalc/ui/validationdialog.ui", pArgSet, pB) @@ -124,7 +124,7 @@ void ScTPValidationValue::RefInputStartPreHdl( formula::RefEdit* pEdit, formula: { if ( ScValidationDlg *pValidationDlg = GetValidationDlg() ) { - Window *pNewParent = pValidationDlg->get_refinput_shrink_parent(); + vcl::Window *pNewParent = pValidationDlg->get_refinput_shrink_parent(); if( pEdit == m_pRefEdit && m_pRefEdit->GetParent() != pNewParent ) { m_pRefEdit->SetParent(pNewParent); @@ -290,7 +290,7 @@ bool lclGetStringListFromFormula( OUString& rStringList, const OUString& rFmlaSt } // namespace -ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rArgSet ) +ScTPValidationValue::ScTPValidationValue( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage( pParent, "ValidationCriteriaPage", "modules/scalc/ui/validationcriteriapage.ui", &rArgSet) , maStrMin(ScResId(SCSTR_VALID_MINIMUM)) @@ -356,7 +356,7 @@ void ScTPValidationValue::Init() CheckHdl( NULL ); } -SfxTabPage* ScTPValidationValue::Create( Window* pParent, const SfxItemSet* rArgSet ) +SfxTabPage* ScTPValidationValue::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return( new ScTPValidationValue( pParent, *rArgSet ) ); } @@ -467,7 +467,7 @@ void ScTPValidationValue::SetSecondFormula( const OUString& rFmlaStr ) ScValidationDlg * ScTPValidationValue::GetValidationDlg() { - if( Window *pParent = GetParent() ) + if( vcl::Window *pParent = GetParent() ) do{ if ( dynamic_cast<ScValidationDlg*>( pParent ) ) return static_cast< ScValidationDlg * >( pParent ); @@ -487,7 +487,7 @@ void ScTPValidationValue::SetupRefDlg() pValidationDlg->SetRefInputStartPreHdl( (ScRefHandlerHelper::PINPUTSTARTDLTYPE)( &ScTPValidationValue::RefInputStartPreHdl ) ); pValidationDlg->SetRefInputDonePostHdl( (ScRefHandlerHelper::PCOMMONHDLTYPE)( &ScTPValidationValue::RefInputDonePostHdl ) ); - Window *pLabel = NULL; + vcl::Window *pLabel = NULL; if ( m_pEdMax->IsVisible() ) { @@ -544,7 +544,7 @@ IMPL_LINK_NOARG(ScTPValidationValue, EditSetFocusHdl) return 0; } -IMPL_LINK( ScTPValidationValue, KillFocusHdl, Window *, pWnd ) +IMPL_LINK( ScTPValidationValue, KillFocusHdl, vcl::Window *, pWnd ) { if( pWnd == m_pRefEdit || pWnd == m_pBtnRef ) if( ScValidationDlg *pValidationDlg = GetValidationDlg() ) @@ -627,7 +627,7 @@ IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl) // Input Help Page -ScTPValidationHelp::ScTPValidationHelp( Window* pParent, +ScTPValidationHelp::ScTPValidationHelp( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage ( pParent, @@ -651,7 +651,7 @@ void ScTPValidationHelp::Init() pTsbHelp->EnableTriState( false ); } -SfxTabPage* ScTPValidationHelp::Create( Window* pParent, +SfxTabPage* ScTPValidationHelp::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTPValidationHelp( pParent, *rArgSet ) ); @@ -688,7 +688,7 @@ bool ScTPValidationHelp::FillItemSet( SfxItemSet* rArgSet ) // Error Alert Page -ScTPValidationError::ScTPValidationError( Window* pParent, +ScTPValidationError::ScTPValidationError( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage ( pParent, @@ -721,7 +721,7 @@ void ScTPValidationError::Init() SelectActionHdl( NULL ); } -SfxTabPage* ScTPValidationError::Create( Window* pParent, +SfxTabPage* ScTPValidationError::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTPValidationError( pParent, *rArgSet ) ); @@ -778,7 +778,7 @@ IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl) IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl) { - Window* pOld = Application::GetDefDialogParent(); + vcl::Window* pOld = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); // Use static SfxApplication method to bring up selector dialog for @@ -872,7 +872,7 @@ bool ScValidationDlg::RemoveRefDlg( bool bRestoreModal /* = true */ ) return true; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScRefButtonEx(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScRefButtonEx(vcl::Window *pParent, VclBuilder::stringmap &) { return new ScTPValidationValue::ScRefButtonEx(pParent, 0); } @@ -893,7 +893,7 @@ void ScTPValidationValue::OnClick( Button *pBtn ) bool ScValidationDlg::IsChildFocus() { - if ( const Window *pWin = Application::GetFocusWindow() ) + if ( const vcl::Window *pWin = Application::GetFocusWindow() ) while( NULL != ( pWin = pWin->GetParent() ) ) if( pWin == this ) return true; diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index ba6e8ddaa372..f317734af97e 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -22,7 +22,7 @@ namespace sc { -SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, Window* pParent, sal_uInt16 /* nId */ ) : +SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent, sal_uInt16 /* nId */ ) : ModelessDialog(pParent, "SearchResultsDialog", "modules/scalc/ui/searchresults.ui"), mpBindings(_pBindings), mpDoc(NULL) { @@ -115,7 +115,7 @@ IMPL_LINK_NOARG( SearchResultsDlg, ListSelectHdl ) } SearchResultsDlgWrapper::SearchResultsDlgWrapper( - Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* /*pInfo*/ ) : + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* /*pInfo*/ ) : SfxChildWindow(_pParent, nId) { pWindow = new SearchResultsDlg(pBindings, _pParent, nId); diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 7239ad0bf9e4..e02e795773e8 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -84,7 +84,7 @@ ScAreaLink::~ScAreaLink() delete pImpl; } -void ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ ) +void ScAreaLink::Edit(vcl::Window* pParent, const Link& /* rEndEditHdl */ ) { // use own dialog instead of SvBaseLink::Edit... // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index ea6e52a41f02..6c0b23772d5a 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -137,7 +137,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } } - Window* pWaitWin = rDocShell.GetActiveDialogParent(); + vcl::Window* pWaitWin = rDocShell.GetActiveDialogParent(); if (pWaitWin) pWaitWin->EnterWait(); ScDocShellModificator aModificator( rDocShell ); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index a235b332e40a..b220f716afc4 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -369,7 +369,7 @@ bool ScDocFunc::DetectiveMarkInvalid(SCTAB nTab) bool bUndo (rDoc.IsUndoEnabled()); ScDrawLayer* pModel = rDoc.GetDrawLayer(); - Window* pWaitWin = rDocShell.GetActiveDialogParent(); + vcl::Window* pWaitWin = rDocShell.GetActiveDialogParent(); if (pWaitWin) pWaitWin->EnterWait(); if (bUndo) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 36e1c2d9a30a..0db4a22e40ec 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1604,10 +1604,10 @@ bool ScDocShell::Save() SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this ); if (pFrame1) { - Window* pWindow = &pFrame1->GetWindow(); + vcl::Window* pWindow = &pFrame1->GetWindow(); if ( pWindow ) { - Window* pSysWin = pWindow->GetSystemWindow(); + vcl::Window* pSysWin = pWindow->GetSystemWindow(); if ( pSysWin ) { pSysWin->SetAccessibleName(OUString()); @@ -2508,7 +2508,7 @@ bool ScDocShell::PrepareClose( bool bUI ) ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); if(pViewSh!=NULL) { - Window *pWin=pViewSh->GetWindow(); + vcl::Window *pWin=pViewSh->GetWindow(); if(pWin!=NULL) pWin->GrabFocus(); } } @@ -2887,7 +2887,7 @@ void ScDocShell::GetDocStat( ScDocStat& rDocStat ) } SfxDocumentInfoDialog* ScDocShell::CreateDocumentInfoDialog( - Window *pParent, const SfxItemSet &rSet ) + vcl::Window *pParent, const SfxItemSet &rSet ) { SfxDocumentInfoDialog* pDlg = new SfxDocumentInfoDialog( pParent, rSet ); ScDocShell* pDocSh = PTR_CAST(ScDocShell,SfxObjectShell::Current()); @@ -2908,7 +2908,7 @@ SfxDocumentInfoDialog* ScDocShell::CreateDocumentInfoDialog( return pDlg; } -Window* ScDocShell::GetActiveDialogParent() +vcl::Window* ScDocShell::GetActiveDialogParent() { ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); if ( pViewSh ) diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 4a81000ea5e0..74ed3063c01e 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -620,7 +620,7 @@ void ScDocShell::SetChangeComment( ScChangeAction* pAction, const OUString& rCom } } -void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent, bool bPrevNext) +void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, vcl::Window* pParent, bool bPrevNext) { if (!pAction) return; // ohne Aktion ist nichts.. diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 631f61b136b6..8027dc8577ff 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -303,7 +303,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); if (pViewSh && bValid && !aChartName.isEmpty() ) { - Window* pParent = pViewSh->GetDialogParent(); + vcl::Window* pParent = pViewSh->GetDialogParent(); SCCOL nCol1 = aSingleRange.aStart.Col(); SCROW nRow1 = aSingleRange.aStart.Row(); @@ -562,7 +562,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) // xmlsec05/06: // getting real parent window when called from Security-Options TP - Window* pParent = NULL; + vcl::Window* pParent = NULL; const SfxPoolItem* pParentItem; if( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr(); @@ -621,7 +621,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) case SID_CHG_PROTECT : { - Window* pParent = NULL; + vcl::Window* pParent = NULL; const SfxPoolItem* pParentItem; if( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr(); @@ -1116,7 +1116,7 @@ void UpdateAcceptChangesDialog() } } -bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQueryIfProtected ) +bool ScDocShell::ExecuteChangeProtectionDialog( vcl::Window* _pParent, bool bJustQueryIfProtected ) { bool bDone = false; ScChangeTrack* pChangeTrack = aDocument.GetChangeTrack(); diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index f0bb58fd6caa..06186c769aac 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -69,7 +69,7 @@ void ScDocShell::ErrorMessage( sal_uInt16 nGlobStrId ) { //! StopMarking an der (aktiven) View? - Window* pParent = GetActiveDialogParent(); + vcl::Window* pParent = GetActiveDialogParent(); ScWaitCursorOff aWaitOff( pParent ); bool bFocus = pParent && pParent->HasFocus(); diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 8468f47c5c04..61f97e60cee9 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -136,7 +136,7 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, bool bModifyStart SvInPlaceEnvironment* pEnv = GetIPEnv(); if (pEnv) { - Window* pWin = pEnv->GetEditWin(); + vcl::Window* pWin = pEnv->GetEditWin(); pEnv->MakeScale( aArea.GetSize(), MAP_100TH_MM, pWin->LogicToPixel( aArea.GetSize() ) ); } */ @@ -530,7 +530,7 @@ void ScDocShell::CheckConfigOptions() ScTabViewShell* pViewShell = GetBestViewShell(); if (pViewShell) { - Window* pParent = pViewShell->GetFrameWin(); + vcl::Window* pParent = pViewShell->GetFrameWin(); InfoBox aBox(pParent, ScGlobal::GetRscString(STR_OPTIONS_WARN_SEPARATORS)); aBox.Execute(); } diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx index 419778f0bf29..7da7c3855d8c 100644 --- a/sc/source/ui/docshell/documentlinkmgr.cxx +++ b/sc/source/ui/docshell/documentlinkmgr.cxx @@ -129,7 +129,7 @@ bool DocumentLinkManager::hasDdeLinks() const return false; } -bool DocumentLinkManager::updateDdeLinks( Window* pWin ) +bool DocumentLinkManager::updateDdeLinks( vcl::Window* pWin ) { if (!mpImpl->mpLinkManager) return false; diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index adcf1e98e931..bfed0655d84f 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1328,7 +1328,7 @@ void ScExternalRefLink::Closed() return SUCCESS; } -void ScExternalRefLink::Edit(Window* pParent, const Link& /*rEndEditHdl*/) +void ScExternalRefLink::Edit(vcl::Window* pParent, const Link& /*rEndEditHdl*/) { SvBaseLink::Edit(pParent, LINK(this, ScExternalRefLink, ExternalRefEndEditHdl)); } diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 446530cfd96c..b9a462c6dce9 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -48,7 +48,7 @@ struct TableLink_Impl { ScDocShell* m_pDocSh; - Window* m_pOldParent; + vcl::Window* m_pOldParent; Link m_aEndEditLink; TableLink_Impl() : m_pDocSh( NULL ), m_pOldParent( NULL ) {} @@ -106,7 +106,7 @@ ScTableLink::~ScTableLink() delete pImpl; } -void ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl ) +void ScTableLink::Edit( vcl::Window* pParent, const Link& rEndEditHdl ) { // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom // ein Optionen-Dialog kommt... diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 892cc1d2008f..7895be53451e 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -27,12 +27,12 @@ // Dokumentinfo-Tabpage: -SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet* rSet ) +SfxTabPage* ScDocStatPage::Create( vcl::Window *pParent, const SfxItemSet* rSet ) { return new ScDocStatPage( pParent, *rSet ); } -ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) +ScDocStatPage::ScDocStatPage( vcl::Window *pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "StatisticsInfoPage", "modules/scalc/ui/statisticsinfopage.ui", &rSet ) { get(m_pFtTables,"nosheets"); diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 4cf5ca959641..32257f897f1d 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -101,7 +101,7 @@ static void lcl_setModified( SfxObjectShell* pShell ) void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) { sal_uInt16 nSlot = rReq.GetSlot(); - Window* pWin = pViewData->GetActiveWin(); + vcl::Window* pWin = pViewData->GetActiveWin(); ScDrawView* pView = pViewData->GetScDrawView(); SdrModel* pDoc = pViewData->GetDocument()->GetDrawLayer(); @@ -314,7 +314,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) } } -void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin ) +void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, vcl::Window* pWin ) { SvxMacroItem aItem ( SfxGetpApp()->GetPool().GetWhich( SID_ATTR_MACROITEM ) ); ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, true ); diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 9c7a9bbc0437..73ab0cd8ff5b 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -282,7 +282,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet ) { Point aMousePos = pViewData->GetMousePosPixel(); - Window* pWindow = pViewData->GetActiveWin(); + vcl::Window* pWindow = pViewData->GetActiveWin(); ScDrawView* pDrView = pViewData->GetScDrawView(); Point aPos = pWindow->PixelToLogic(aMousePos); bool bHasMarked = pDrView->AreObjectsMarked(); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 83bb2c0ad6bf..5a82ec95bc23 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -502,7 +502,7 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet ) // create listener pClipEvtLstnr = new TransferableClipboardListener( LINK( this, ScDrawTextObjectBar, ClipboardChanged ) ); pClipEvtLstnr->acquire(); - Window* pWin = pViewData->GetActiveWin(); + vcl::Window* pWin = pViewData->GetActiveWin(); pClipEvtLstnr->AddRemoveListener( pWin, true ); // get initial state diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx index 1ded6ea6741d..0340bcfe1d8b 100644 --- a/sc/source/ui/drawfunc/fuconarc.cxx +++ b/sc/source/ui/drawfunc/fuconarc.cxx @@ -32,7 +32,7 @@ |* \************************************************************************/ -FuConstArc::FuConstArc( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuConstArc::FuConstArc( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) : FuConstruct( pViewSh, pWin, pViewP, pDoc, rReq ) { diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 17ccbd4d8cac..d37d247b8ed0 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star; -FuConstCustomShape::FuConstCustomShape( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) +FuConstCustomShape::FuConstCustomShape( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) : FuConstruct( pViewSh, pWin, pViewP, pDoc, rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index 250e54cc6322..6265683fdd68 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -33,7 +33,7 @@ |* \************************************************************************/ -FuConstPolygon::FuConstPolygon(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuConstPolygon::FuConstPolygon(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq) { diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 7d08431a6145..846de7792fd9 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -37,7 +37,7 @@ |* \************************************************************************/ -FuConstRectangle::FuConstRectangle(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuConstRectangle::FuConstRectangle(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq) { diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 4d7f695cd499..5a2fd1f62419 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -42,7 +42,7 @@ |* \************************************************************************/ -FuConstruct::FuConstruct(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuConstruct::FuConstruct(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuDraw(pViewSh, pWin, pViewP, pDoc, rReq) { diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx index 94419c60eb51..83e8c18ed06f 100644 --- a/sc/source/ui/drawfunc/fuconuno.cxx +++ b/sc/source/ui/drawfunc/fuconuno.cxx @@ -28,7 +28,7 @@ |* \************************************************************************/ -FuConstUnoControl::FuConstUnoControl(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuConstUnoControl::FuConstUnoControl(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq) , nInventor(0) diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 1a49040ffecf..23ba487d8342 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -47,7 +47,7 @@ |* \************************************************************************/ -FuDraw::FuDraw(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuDraw::FuDraw(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuPoor (pViewSh, pWin, pViewP, pDoc, rReq), aNewPointer ( POINTER_ARROW ), @@ -704,7 +704,7 @@ void FuDraw::Deactivate() |* \************************************************************************/ -static bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, Window* pWindow ) +static bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, vcl::Window* pWindow ) { SdrViewEvent aVEvt; MouseEvent aMEvt( rPosPixel, 1, 0, MOUSE_LEFT ); diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 3b96207d14ca..3c92010345c7 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -90,7 +90,7 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r static void lcl_InsertGraphic( const Graphic& rGraphic, const OUString& rFileName, const OUString& rFilterName, bool bAsLink, bool bApi, - ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView ) + ScTabViewShell* pViewSh, vcl::Window* pWindow, SdrView* pView ) { ScDrawView* pDrawView = pViewSh->GetScDrawView(); @@ -175,7 +175,7 @@ static void lcl_InsertGraphic( const Graphic& rGraphic, } static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi, - ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView, + ScTabViewShell* pViewSh, vcl::Window* pWindow, SdrView* pView, const Size& rPrefSize, bool const bLink ) { SdrPageView* pPV = pView->GetSdrPageView(); @@ -226,7 +226,7 @@ static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi, \************************************************************************/ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh, - Window* pWin, + vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) @@ -331,7 +331,7 @@ void FuInsertGraphic::Deactivate() \************************************************************************/ FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh, - Window* pWin, + vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) : diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 0a7703d78142..535309bb7c01 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -195,7 +195,7 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie } -FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) { @@ -346,11 +346,11 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie xObj->setVisualAreaSize( nAspect, aSz ); // re-convert aSize to 1/100th mm to avoid rounding errors in comparison below - aSize = Window::LogicToLogic( aTmp, + aSize = vcl::Window::LogicToLogic( aTmp, MapMode( aMapUnit ), aMap100 ); } else - aSize = Window::LogicToLogic( aSize, + aSize = vcl::Window::LogicToLogic( aSize, MapMode( aMapUnit ), aMap100 ); } @@ -426,7 +426,7 @@ void FuInsertOLE::Deactivate() FuPoor::Deactivate(); } -FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) { @@ -533,7 +533,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* } if (bSizeCh) { - aSize = Window::LogicToLogic( aSize, MapMode( MAP_100TH_MM ), MapMode( aMapUnit ) ); + aSize = vcl::Window::LogicToLogic( aSize, MapMode( MAP_100TH_MM ), MapMode( aMapUnit ) ); aSz.Width = aSize.Width(); aSz.Height = aSize.Height(); xObj->setVisualAreaSize( nAspect, aSz ); @@ -776,7 +776,7 @@ void FuInsertChart::Deactivate() FuPoor::Deactivate(); } -FuInsertChartFromFile::FuInsertChartFromFile( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuInsertChartFromFile::FuInsertChartFromFile( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq, const OUString& rURL): FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) { diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 5d5b4ebd8867..9a331363c95d 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -30,7 +30,7 @@ #include <vcl/svapp.hxx> #include <svx/sdrhittesthelper.hxx> -FuPoor::FuPoor(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuPoor::FuPoor(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : pView(pViewP), pViewShell(pViewSh), diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 75fea9f31369..35feb3fd0b50 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -63,7 +63,7 @@ using namespace com::sun::star; |* \************************************************************************/ -FuSelection::FuSelection(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuSelection::FuSelection(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) : FuDraw(pViewSh, pWin, pViewP, pDoc, rReq), bVCAction(false) diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index ec407b1fe328..cb33a3260966 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -106,7 +106,7 @@ static void lcl_UpdateHyphenator( Outliner& rOutliner, SdrObject* pObj ) |* \************************************************************************/ -FuText::FuText(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuText::FuText(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq), pTextObj(NULL) diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 2951cae85d51..e602a5608641 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -57,7 +57,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID( ScFunctionChildWindow, FID_FUNCTION_BOX ) #* #************************************************************************/ -ScFunctionChildWindow::ScFunctionChildWindow( Window* pParentP, +ScFunctionChildWindow::ScFunctionChildWindow( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -87,7 +87,7 @@ ScFunctionChildWindow::ScFunctionChildWindow( Window* pParentP, #************************************************************************/ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, - SfxChildWindow *pCW, Window* pParent, const ResId& rResId ) : + SfxChildWindow *pCW, vcl::Window* pParent, const ResId& rResId ) : SfxDockingWindow( pBindingsP, pCW, pParent, rResId ), aPrivatSplit ( this, ResId( FT_SPLIT, *rResId.GetResMgr() ),SC_SPLIT_VERT), @@ -915,7 +915,7 @@ void ScFunctionDockWin::DoEnter() } if ( pCurSh ) { - Window* pShellWnd = pCurSh->GetWindow(); + vcl::Window* pShellWnd = pCurSh->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index e12f796451e4..aca2b706c5d7 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -64,7 +64,7 @@ ScAddress ScFormulaDlg::aCursorPos; // Initialisierung / gemeinsame Funktionen fuer Dialog ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData,formula::IFunctionManager* _pFunctionMgr ) + vcl::Window* pParent, ScViewData* pViewData,formula::IFunctionManager* _pFunctionMgr ) : formula::FormulaDlg( pB, pCW, pParent, true,true,true, _pFunctionMgr,this) , m_aHelper(this,pB) { diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx index 6bdfa3b022a5..d111b7970f34 100644 --- a/sc/source/ui/formdlg/privsplt.cxx +++ b/sc/source/ui/formdlg/privsplt.cxx @@ -34,7 +34,7 @@ #* #************************************************************************/ -ScPrivatSplit::ScPrivatSplit(Window* pParent, const ResId& rResId, +ScPrivatSplit::ScPrivatSplit(vcl::Window* pParent, const ResId& rResId, SC_SPLIT_DIRECTION eSplit) : Control(pParent, rResId) , nDeltaX(0) diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 2339a7b35d4a..5b5f96345655 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -30,7 +30,7 @@ namespace accessibility class AccessibleTextHelper; } class EditView; -class Window; +namespace vcl { class Window; } /** @descr This base class provides an implementation of the @@ -51,7 +51,7 @@ public: ScAccessibleEditObject( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - EditView* pEditView, Window* pWin, const OUString& rName, + EditView* pEditView, vcl::Window* pWin, const OUString& rName, const OUString& rDescription, EditObjectType eObjectType); protected: @@ -188,7 +188,7 @@ public: private: accessibility::AccessibleTextHelper* mpTextHelper; EditView* mpEditView; - Window* mpWindow; + vcl::Window* mpWindow; EditObjectType meObjectType; bool mbHasFocus; diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 0f5179d8d4ff..61cd3ae7c9a3 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -117,7 +117,7 @@ class ScAccessibleEditObjectTextData : public ScAccessibleTextData { public: // Add a para to indicate whether the object is cloned - ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, bool isClone = false); + ScAccessibleEditObjectTextData(EditView* pEditView, vcl::Window* pWin, bool isClone = false); virtual ~ScAccessibleEditObjectTextData(); virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; @@ -139,14 +139,14 @@ protected: EditView* mpEditView; EditEngine* mpEditEngine; SvxEditEngineForwarder* mpForwarder; - Window* mpWindow; + vcl::Window* mpWindow; bool mbIsCloned; }; class ScAccessibleEditLineTextData : public ScAccessibleEditObjectTextData { public: - ScAccessibleEditLineTextData(EditView* pEditView, Window* pWin); + ScAccessibleEditLineTextData(EditView* pEditView, vcl::Window* pWin); virtual ~ScAccessibleEditLineTextData(); virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; @@ -285,7 +285,7 @@ private: typedef ::std::auto_ptr< SvxTextForwarder > TextForwarderPtr; typedef ::std::auto_ptr< ScCsvViewForwarder > ViewForwarderPtr; - Window* mpWindow; + vcl::Window* mpWindow; EditEngine* mpEditEngine; TextForwarderPtr mpTextForwarder; ViewForwarderPtr mpViewForwarder; @@ -295,7 +295,7 @@ private: public: explicit ScAccessibleCsvTextData( - Window* pWindow, + vcl::Window* pWindow, EditEngine* pEditEngine, const OUString& rCellText, const Rectangle& rBoundBox, diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index e033be5f0dd1..a6808a53b3e5 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -52,7 +52,7 @@ private: public: ScAnalysisOfVarianceDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScAnalysisOfVarianceDialog(); diff --git a/sc/source/ui/inc/ChildWindowWrapper.hxx b/sc/source/ui/inc/ChildWindowWrapper.hxx index 8cc06ebfc093..6e50bf951cb4 100644 --- a/sc/source/ui/inc/ChildWindowWrapper.hxx +++ b/sc/source/ui/inc/ChildWindowWrapper.hxx @@ -22,7 +22,7 @@ template <sal_Int16 WindowID> class ChildWindowWrapper : public SfxChildWindow { public: - ChildWindowWrapper( Window* pParentP, sal_uInt16 nId, + ChildWindowWrapper( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow(pParentP, nId) { @@ -41,7 +41,7 @@ public: } static SfxChildWindow* CreateImpl( - Window *pParent, sal_uInt16 nId, + vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) { SfxChildWindow* pWindow = new ChildWindowWrapper(pParent, nId, pBindings, pInfo); diff --git a/sc/source/ui/inc/CorrelationDialog.hxx b/sc/source/ui/inc/CorrelationDialog.hxx index 42747a31ba14..ce2fee57ef48 100644 --- a/sc/source/ui/inc/CorrelationDialog.hxx +++ b/sc/source/ui/inc/CorrelationDialog.hxx @@ -18,7 +18,7 @@ class ScCorrelationDialog : public ScMatrixComparisonGenerator public: ScCorrelationDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData); + vcl::Window* pParent, ScViewData* pViewData); virtual bool Close() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/CovarianceDialog.hxx b/sc/source/ui/inc/CovarianceDialog.hxx index 6d97dfdab752..e3727ba35816 100644 --- a/sc/source/ui/inc/CovarianceDialog.hxx +++ b/sc/source/ui/inc/CovarianceDialog.hxx @@ -18,7 +18,7 @@ class ScCovarianceDialog : public ScMatrixComparisonGenerator public: ScCovarianceDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData); + vcl::Window* pParent, ScViewData* pViewData); virtual bool Close() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx index 380a75719e0f..b455fae7d517 100644 --- a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx +++ b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx @@ -26,7 +26,7 @@ class ScDescriptiveStatisticsDialog : public ScStatisticsInputOutputDialog public: ScDescriptiveStatisticsDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScDescriptiveStatisticsDialog(); diff --git a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx index 4572ac3e14f1..9012c6755435 100644 --- a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx +++ b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx @@ -29,7 +29,7 @@ private: public: ScExponentialSmoothingDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScExponentialSmoothingDialog(); diff --git a/sc/source/ui/inc/FTestDialog.hxx b/sc/source/ui/inc/FTestDialog.hxx index 1dce57264dd3..2a8c59711313 100644 --- a/sc/source/ui/inc/FTestDialog.hxx +++ b/sc/source/ui/inc/FTestDialog.hxx @@ -18,7 +18,7 @@ class ScFTestDialog : public ScStatisticsTwoVariableDialog public: ScFTestDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScFTestDialog(); diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx index b6819102c502..863a835f79af 100644 --- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx +++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx @@ -26,7 +26,7 @@ class ScMatrixComparisonGenerator : public ScStatisticsInputOutputDialog public: ScMatrixComparisonGenerator( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData, + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUiXmlDescription ); virtual ~ScMatrixComparisonGenerator(); diff --git a/sc/source/ui/inc/MovingAverageDialog.hxx b/sc/source/ui/inc/MovingAverageDialog.hxx index 7183453925d3..dab6acc8e5a2 100644 --- a/sc/source/ui/inc/MovingAverageDialog.hxx +++ b/sc/source/ui/inc/MovingAverageDialog.hxx @@ -29,7 +29,7 @@ private: public: ScMovingAverageDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScMovingAverageDialog(); diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 3635d831808e..e94d9bda1984 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -107,7 +107,7 @@ private: bool GetDestination(ScRange& aDestinationRange, bool& bToNewSheet); public: - ScPivotLayoutDialog(SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, Window* pParent, + ScPivotLayoutDialog(SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, vcl::Window* pParent, ScViewData* pViewData, const ScDPObject* pPivotTableObject, bool bCreateNewPivotTable); virtual ~ScPivotLayoutDialog(); diff --git a/sc/source/ui/inc/PivotLayoutTreeList.hxx b/sc/source/ui/inc/PivotLayoutTreeList.hxx index c4dbcf156b75..858d9afa1dcf 100644 --- a/sc/source/ui/inc/PivotLayoutTreeList.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeList.hxx @@ -16,7 +16,7 @@ class ScPivotLayoutTreeList : public ScPivotLayoutTreeListBase { public: - ScPivotLayoutTreeList(Window* pParent, WinBits nBits); + ScPivotLayoutTreeList(vcl::Window* pParent, WinBits nBits); virtual ~ScPivotLayoutTreeList(); virtual bool DoubleClickHdl() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx index 4d2d415bf1fd..eaa1d9cb84c9 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx @@ -40,7 +40,7 @@ protected: public: void Setup(ScPivotLayoutDialog* pParent); - ScPivotLayoutTreeListBase(Window* pParent, WinBits nBits, SvPivotTreeListType eType = UNDEFINED); + ScPivotLayoutTreeListBase(vcl::Window* pParent, WinBits nBits, SvPivotTreeListType eType = UNDEFINED); virtual ~ScPivotLayoutTreeListBase(); virtual sal_Int8 AcceptDrop(const AcceptDropEvent& rEvent) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/PivotLayoutTreeListData.hxx b/sc/source/ui/inc/PivotLayoutTreeListData.hxx index 327d379fbddb..c8c83b469508 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListData.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListData.hxx @@ -20,7 +20,7 @@ private: boost::ptr_vector<ScItemValue> maDataItemValues; public: - ScPivotLayoutTreeListData(Window* pParent, WinBits nBits); + ScPivotLayoutTreeListData(vcl::Window* pParent, WinBits nBits); virtual ~ScPivotLayoutTreeListData(); virtual bool DoubleClickHdl() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx b/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx index 82019dcc6484..168f6275c8dd 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx @@ -21,7 +21,7 @@ private: SCCOL maDataItem; public: - ScPivotLayoutTreeListLabel(Window* pParent, WinBits nBits); + ScPivotLayoutTreeListLabel(vcl::Window* pParent, WinBits nBits); virtual ~ScPivotLayoutTreeListLabel(); void FillLabelFields(ScDPLabelDataVector& rLabelVector); ScItemValue* GetItem(SCCOL nColumn); diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index 66163925a37f..d940b39689ce 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -26,7 +26,7 @@ class ScRandomNumberGeneratorDialog : public ScAnyRefDlg public: ScRandomNumberGeneratorDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScRandomNumberGeneratorDialog(); diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 8e4269f004d7..022b5e8075d0 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -24,7 +24,7 @@ class ScSamplingDialog : public ScAnyRefDlg public: ScSamplingDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScSamplingDialog(); diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index ee879f584b4d..1ed3e59105f1 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -29,7 +29,7 @@ public: ScStatisticsInputOutputDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData, + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ); virtual ~ScStatisticsInputOutputDialog(); diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 99d0f98b46cb..960e96664aa5 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -29,7 +29,7 @@ public: ScStatisticsTwoVariableDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData, + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ); virtual ~ScStatisticsTwoVariableDialog(); diff --git a/sc/source/ui/inc/TTestDialog.hxx b/sc/source/ui/inc/TTestDialog.hxx index d90519c4ca98..b56008a563d5 100644 --- a/sc/source/ui/inc/TTestDialog.hxx +++ b/sc/source/ui/inc/TTestDialog.hxx @@ -18,7 +18,7 @@ class ScTTestDialog : public ScStatisticsTwoVariableDialog public: ScTTestDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScTTestDialog(); diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 4f2041931ed9..93f1c4dcd370 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -202,7 +202,7 @@ protected: SvTreeListEntry* pEntry, bool bFilter = false); public: - ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData); virtual ~ScAcceptChgDlg(); diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 18d19a3ae3d7..b189a2820492 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -47,11 +47,11 @@ class ScFormulaReferenceHelper ::std::auto_ptr<ScCompiler> pRefComp; formula::RefEdit* pRefEdit; // active input field formula::RefButton* pRefBtn; // associated button - Window* m_pWindow; + vcl::Window* m_pWindow; SfxBindings* m_pBindings; ::std::auto_ptr<Accelerator> pAccel; // for Enter/Escape - ::std::vector<Window*> m_aHiddenWidgets; // vector of hidden Controls + ::std::vector<vcl::Window*> m_aHiddenWidgets; // vector of hidden Controls sal_Int32 m_nOldBorderWidth; // border width for expanded dialog SCTAB nRefTab; // used for ShowReference @@ -61,7 +61,7 @@ class ScFormulaReferenceHelper Size aOldEditSize; // Original size of the input field long mnOldEditWidthReq; Point aOldButtonPos; // Original position of the button - Window* mpOldEditParent; // Original parent of the edit field and the button + vcl::Window* mpOldEditParent; // Original parent of the edit field and the button bool mbOldDlgLayoutEnabled; // Original layout state of parent dialog bool mbOldEditParentLayoutEnabled; // Original layout state of edit widget parent @@ -87,7 +87,7 @@ public: void RefInputDone( bool bForced = false ); void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); - inline void SetWindow(Window* _pWindow) { m_pWindow = _pWindow; } + inline void SetWindow(vcl::Window* _pWindow) { m_pWindow = _pWindow; } bool DoClose( sal_uInt16 nId ); void SetDispatcherLock( bool bLock ); void EnableSpreadsheets( bool bFlag = true, bool bChildren = true ); @@ -96,7 +96,7 @@ public: static void enableInput(bool _bInput); protected: - Window * GetWindow(){ return m_pWindow; } + vcl::Window* GetWindow(){ return m_pWindow; } public: bool CanInputStart( const formula::RefEdit *pEdit ){ return !!pEdit; } @@ -106,12 +106,12 @@ public: class SC_DLLPUBLIC ScRefHandler : public IAnyRefDialog { - Window & m_rWindow; + vcl::Window & m_rWindow; bool m_bInRefMode; public: - operator Window *(){ return &m_rWindow; } - Window * operator ->() { return static_cast<Window *>(*this); } + operator vcl::Window *(){ return &m_rWindow; } + vcl::Window* operator ->() { return static_cast<vcl::Window *>(*this); } friend class formula::RefButton; friend class formula::RefEdit; @@ -120,7 +120,7 @@ private: m_aHelper; SfxBindings* pMyBindings; - Window* pActiveWin; + vcl::Window* pActiveWin; Timer aTimer; OUString aDocName; // document on which the dialog was opened @@ -142,7 +142,7 @@ protected: void stateChanged(const StateChangedType nStateChange, const bool bBindRef); public: - ScRefHandler( Window &rWindow, SfxBindings* pB, bool bBindRef ); + ScRefHandler( vcl::Window &rWindow, SfxBindings* pB, bool bBindRef ); virtual ~ScRefHandler(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE = 0; @@ -177,7 +177,7 @@ public: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; protected: - ScRefHdlModalImpl(Window* pParent, const OString& rID, + ScRefHdlModalImpl(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); private: @@ -264,7 +264,7 @@ void ScRefHdlrImplBase<TWindow, bBindRef>::StateChanged( StateChangedType nState class ScAnyRefModalDlg : public ScRefHdlModalImpl { public: - ScAnyRefModalDlg(Window* pParent, const OString& rID, + ScAnyRefModalDlg(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); }; diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index 430c1d8a2733..dab930898c55 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -33,7 +33,7 @@ class ScViewData; class ScPrintAreasDlg : public ScAnyRefDlg { public: - ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ); + ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent ); virtual ~ScPrintAreasDlg(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 852685349be7..456274c0d2f0 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -22,7 +22,7 @@ #include <sfx2/tabdlg.hxx> -class Window; +namespace vcl { class Window; } class SfxViewFrame; class SfxItemSet; @@ -30,7 +30,7 @@ class ScAttrDlg : public SfxTabDialog { public: ScAttrDlg( SfxViewFrame* pFrame, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pCellAttrs ); virtual ~ScAttrDlg(); diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index 291681c7b5ea..59879825d07b 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -40,10 +40,10 @@ class ScDocument; enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; -class SC_DLLPUBLIC ScAutoFmtPreview : public Window +class SC_DLLPUBLIC ScAutoFmtPreview : public vcl::Window { public: - ScAutoFmtPreview(Window* pParent); + ScAutoFmtPreview(vcl::Window* pParent); void DetectRTL(ScViewData *pViewData); virtual ~ScAutoFmtPreview(); diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 744c9bffea76..aa2adc004049 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -45,7 +45,7 @@ public: virtual void execute() = 0; }; - explicit ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel = 0); + explicit ScMenuFloatingWindow(vcl::Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel = 0); virtual ~ScMenuFloatingWindow(); virtual void PopupModeEnd() SAL_OVERRIDE; @@ -194,7 +194,7 @@ class ScCheckListBox : public SvTreeListBox public: - ScCheckListBox( Window* pParent, WinBits nWinStyle = 0 ); + ScCheckListBox( vcl::Window* pParent, WinBits nWinStyle = 0 ); virtual ~ScCheckListBox() { delete mpCheckButton; } void Init(); void CheckEntry( const OUString& sName, SvTreeListEntry* pParent, bool bCheck = true ); @@ -234,13 +234,13 @@ public: Config(); }; - explicit ScCheckListMenuWindow(Window* pParent, ScDocument* pDoc); + explicit ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* pDoc); virtual ~ScCheckListMenuWindow(); virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; void setMemberSize(size_t n); @@ -334,7 +334,7 @@ private: OKButton maBtnOk; CancelButton maBtnCancel; - ::std::vector<Window*> maTabStopCtrls; + ::std::vector<vcl::Window*> maTabStopCtrls; size_t mnCurTabStop; ::std::vector<Member> maMembers; diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx index 4c53384b227a..43841987d74e 100644 --- a/sc/source/ui/inc/client.hxx +++ b/sc/source/ui/inc/client.hxx @@ -39,7 +39,7 @@ private: virtual void MakeVisible() SAL_OVERRIDE; public: - ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ); + ScClient( ScTabViewShell* pViewShell, vcl::Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ); virtual ~ScClient(); SdrGrafObj* GetGrafEdit() const { return pGrafEdit; } diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index cc261d1855d3..f5c1c159877a 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -49,7 +49,7 @@ private: void Init(); public: - ScDataBarSettingsDlg(Window* pParent, const ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos); + ScDataBarSettingsDlg(vcl::Window* pParent, const ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos); ScDataBarFormatData* GetData(); }; diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index e52c6fd03b65..308d75591789 100644 --- a/sc/source/ui/inc/colrowba.hxx +++ b/sc/source/ui/inc/colrowba.hxx @@ -33,7 +33,7 @@ class ScColBar : public ScHeaderControl ScHeaderFunctionSet* pFuncSet; public: - ScColBar( Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, + ScColBar( vcl::Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ); virtual ~ScColBar(); @@ -65,7 +65,7 @@ class ScRowBar : public ScHeaderControl ScHeaderFunctionSet* pFuncSet; public: - ScRowBar( Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, + ScRowBar( vcl::Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ); virtual ~ScRowBar(); diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 833578f4ba4f..6f6d2c0c7d04 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -70,7 +70,7 @@ private: void DoScroll(long nDiff); public: - ScCondFormatList(Window* pParent, WinBits nStyle); + ScCondFormatList(vcl::Window* pParent, WinBits nStyle); void init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScConditionalFormat* pFormat, const ScRangeList& rRanges, const ScAddress& rPos, @@ -114,7 +114,7 @@ protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: - SC_DLLPUBLIC ScCondFormatDlg(Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, + SC_DLLPUBLIC ScCondFormatDlg(vcl::Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); virtual ~ScCondFormatDlg(); diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index fd6ba0a8623a..bc4d79b8dce8 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -65,7 +65,7 @@ protected: virtual OUString GetExpressionString() = 0; public: - ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos ); + ScCondFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos ); virtual ~ScCondFrmtEntry(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -101,7 +101,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener DECL_LINK( ConditionTypeSelectHdl, void* ); public: - ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, + ScConditionFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; @@ -128,7 +128,7 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry DECL_LINK( StyleSelectHdl, void* ); public: - ScFormulaFrmtEntry( Window* pParent, ScDocument* PDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); + ScFormulaFrmtEntry( vcl::Window* pParent, ScDocument* PDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; virtual void SetActive() SAL_OVERRIDE; @@ -159,7 +159,7 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry DECL_LINK( EntryTypeHdl, ListBox* ); public: - ScColorScale2FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); + ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; virtual void SetActive() SAL_OVERRIDE; virtual void SetInactive() SAL_OVERRIDE; @@ -192,7 +192,7 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry DECL_LINK( EntryTypeHdl, ListBox* ); public: - ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); + ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; virtual void SetActive() SAL_OVERRIDE; virtual void SetInactive() SAL_OVERRIDE; @@ -222,7 +222,7 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry DECL_LINK( OptionBtnHdl, void* ); DECL_LINK( DataBarTypeSelectHdl, void* ); public: - ScDataBarFrmtEntry( Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = NULL ); + ScDataBarFrmtEntry( vcl::Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; virtual void SetActive() SAL_OVERRIDE; virtual void SetInactive() SAL_OVERRIDE; @@ -233,7 +233,7 @@ public: class ScDateFrmtEntry : public ScCondFrmtEntry, public SfxListener { public: - ScDateFrmtEntry( Window* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat = NULL ); + ScDateFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; virtual void SetActive() SAL_OVERRIDE; virtual void SetInactive() SAL_OVERRIDE; @@ -275,7 +275,7 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry DECL_LINK( IconSetTypeHdl, void* ); public: - ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat = NULL ); + ScIconSetFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; virtual void SetActive() SAL_OVERRIDE; virtual void SetInactive() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 4531b9defc96..ee25532926b3 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -48,7 +48,7 @@ public: class ScCondFormatManagerDlg : public ModalDialog { public: - ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos); + ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos); virtual ~ScCondFormatManagerDlg(); ScConditionalFormatList* GetConditionalFormatList(); diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 05d16ff85a23..461a7c7d20a9 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -157,7 +157,7 @@ private: DECL_LINK( KeepAllOthersHandle, void* ); public: - ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ); + ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ); virtual ~ScConflictsDlg(); void UpdateView(); diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 80b862cf9be7..0f3c60c69781 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -36,7 +36,7 @@ class ScAreaData; class ScConsolidateDlg : public ScAnyRefDlg { public: - ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScConsolidateDlg(); diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 20aaab6f5fdb..d98bdb825053 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -122,7 +122,7 @@ protected: virtual void InitEntry(SvTreeListEntry*,const OUString&,const Image&,const Image&, SvLBoxButtonKind) SAL_OVERRIDE; public: - ScContentTree( Window* pParent, const ResId& rResId ); + ScContentTree( vcl::Window* pParent, const ResId& rResId ); virtual ~ScContentTree(); OUString getAltLongDescText(SvTreeListEntry* pEntry, bool isAltText) const; diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx index d9ccf31f2360..1f6de3df6b05 100644 --- a/sc/source/ui/inc/corodlg.hxx +++ b/sc/source/ui/inc/corodlg.hxx @@ -26,7 +26,7 @@ class ScColRowLabelDlg : public ModalDialog { public: - ScColRowLabelDlg(Window* pParent, + ScColRowLabelDlg(vcl::Window* pParent, bool bCol = false, bool bRow = false) : ModalDialog(pParent, "ChangeSourceDialog", diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index 488d9a48930b..571d04a20bea 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.hxx @@ -28,7 +28,7 @@ class ScColOrRowDlg : public ModalDialog { public: - ScColOrRowDlg(Window* pParent, const OUString& rStrTitle, + ScColOrRowDlg(vcl::Window* pParent, const OUString& rStrTitle, const OUString& rStrLabel, bool bColDefault = true); private: VclFrame* m_pFrame; diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 8bdeda1442af..be92e60efdad 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -33,7 +33,7 @@ class ScDocument; class ScColRowNameRangesDlg : public ScAnyRefDlg { public: - ScColRowNameRangesDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScColRowNameRangesDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData ); virtual ~ScColRowNameRangesDlg(); diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index f8db0c894928..c66bac55d988 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -239,7 +239,7 @@ private: public: explicit ScCsvControl( ScCsvControl& rParent ); - explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ); + explicit ScCsvControl( vcl::Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ); virtual ~ScCsvControl(); // event handling --------------------------------------------------------- diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 789f7c234e58..cda528abf86c 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -61,7 +61,7 @@ private: bool mbFixedMode; /// false = Separators, true = Fixed width. public: - explicit ScCsvTableBox( Window* pParent, WinBits nBits ); + explicit ScCsvTableBox( vcl::Window* pParent, WinBits nBits ); /** Finishes initialization. Must be called after constructing a new object. */ void Init(); diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index a9d213e1ed41..b157c05cf6e4 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.hxx @@ -39,7 +39,7 @@ private: DECL_LINK( SelectHdl, void* ); public: - ScDataPilotDatabaseDlg(Window* pParent); + ScDataPilotDatabaseDlg(vcl::Window* pParent); void GetValues( ScImportSourceDesc& rDesc ); }; diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index e3e3180313b2..e024ba3f5451 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -37,7 +37,7 @@ private: ListBox* m_pLbNamedRange; public: - ScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal); + ScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bEnableExternal); virtual ~ScDataPilotSourceTypeDlg(); bool IsDatabase() const; @@ -60,7 +60,7 @@ private: Edit *m_pEdPasswd; public: - ScDataPilotServiceDlg( Window* pParent, + ScDataPilotServiceDlg( vcl::Window* pParent, const com::sun::star::uno::Sequence<OUString>& rServices ); virtual ~ScDataPilotServiceDlg(); diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index 8587241b2497..00460ece6b8f 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -55,7 +55,7 @@ private: boost::ptr_vector<boost::nullable<Edit> > maEdits; public: - ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShell); + ScDataFormDlg( vcl::Window* pParent, ScTabViewShell* pTabViewShell); virtual ~ScDataFormDlg(); void FillCtrls(SCROW nCurrentRow); diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index 793c359d868c..03baa2fad810 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -25,7 +25,7 @@ class ScDocShell; class ScDocument; -class Window; +namespace vcl { class Window; } namespace sc { diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx index bde22e836ebf..09b461fa8635 100644 --- a/sc/source/ui/inc/datastreamdlg.hxx +++ b/sc/source/ui/inc/datastreamdlg.hxx @@ -53,7 +53,7 @@ class DataStreamDlg : public ModalDialog ScRange GetStartRange(); public: - DataStreamDlg(ScDocShell *pDocShell, Window* pParent); + DataStreamDlg(ScDocShell *pDocShell, vcl::Window* pParent); void Init( const DataStream& rStrm ); diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 72c376c55ae7..207fdbfdbce9 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -42,7 +42,7 @@ private: void GetSelectedMemberList(ScDPUniqueStringSet& rEntries, long& rDimension); public: - ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); + ScDBFunc( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); virtual ~ScDBFunc(); // only UISort repeat the partial results if necessary diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 5dd4ab1885bd..ae2fdda42293 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -35,7 +35,7 @@ class ScDocument; class ScDbNameDlg : public ScAnyRefDlg { public: - ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData ); virtual ~ScDbNameDlg(); diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx index 2898be599fe9..6683fcb81a02 100644 --- a/sc/source/ui/inc/delcldlg.hxx +++ b/sc/source/ui/inc/delcldlg.hxx @@ -35,7 +35,7 @@ private: RadioButton* m_pBtnDelCols; public: - ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false); + ScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove = false); DelCellCmd GetDelCellCmd() const; }; diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index c119b495a1f0..6bc898a82134 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -46,7 +46,7 @@ private: DECL_LINK( DelAllHdl, void * ); public: - ScDeleteContentsDlg( Window* pParent, + ScDeleteContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults = IDF_NONE ); virtual ~ScDeleteContentsDlg(); void DisableObjects(); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 65724103cbe7..98f71096f23d 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -235,7 +235,7 @@ public: void SetVisAreaOrSize( const Rectangle& rVisArea, bool bModifyStart ); - virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( Window *pParent, + virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( vcl::Window *pParent, const SfxItemSet &rSet ) SAL_OVERRIDE; void GetDocStat( ScDocStat& rDocStat ); @@ -269,13 +269,13 @@ public: ScChangeAction* GetChangeAction( const ScAddress& rPos ); void SetChangeComment( ScChangeAction* pAction, const OUString& rComment ); - void ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent, bool bPrevNext = true ); + void ExecuteChangeCommentDialog( ScChangeAction* pAction, vcl::Window* pParent, bool bPrevNext = true ); /// Protect/unprotect ChangeTrack and return <TRUE/> if /// protection was successfully changed. /// If bJustQueryIfProtected==sal_True protection is not /// changed and <TRUE/> is returned if not protected or /// password was entered correctly. - bool ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQueryIfProtected = false ); + bool ExecuteChangeProtectionDialog( vcl::Window* _pParent, bool bJustQueryIfProtected = false ); void SetPrintZoom( SCTAB nTab, sal_uInt16 nScale, sal_uInt16 nPages ); bool AdjustPrintZoom( const ScRange& rRange ); @@ -287,7 +287,7 @@ public: void NotifyStyle( const SfxStyleSheetHint& rHint ); void DoAutoStyle( const ScRange& rRange, const OUString& rStyle ); - Window* GetActiveDialogParent(); + vcl::Window* GetActiveDialogParent(); void ErrorMessage( sal_uInt16 nGlobStrId ); bool IsEditable() const; diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index dd5c6dbe2b2b..5317ada395bb 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -92,7 +92,7 @@ private: class ScDPNumGroupDlg : public ModalDialog { public: - explicit ScDPNumGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo ); + explicit ScDPNumGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& rInfo ); ScDPNumGroupInfo GetGroupInfo() const; @@ -112,7 +112,7 @@ private: class ScDPDateGroupDlg : public ModalDialog { public: - explicit ScDPDateGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo, + explicit ScDPDateGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ); ScDPNumGroupInfo GetGroupInfo() const; diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 713cd21fbd48..50b90bcf4b6d 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -78,7 +78,7 @@ public: void ExecFormatPaintbrush(SfxRequest& rReq); void StateFormatPaintbrush(SfxItemSet& rSet); - void ExecuteMacroAssign( SdrObject* pObj, Window* pWin ); + void ExecuteMacroAssign( SdrObject* pObj, vcl::Window* pWin ); void ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff ); void ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff ); void ExecuteTextAttrDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff ); diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index 21c785aff16d..d19cb263a746 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -66,14 +66,14 @@ public: virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE; - virtual void MakeVisible( const Rectangle& rRect, Window& rWin ) SAL_OVERRIDE; + virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) SAL_OVERRIDE; virtual void DeleteMarked() SAL_OVERRIDE; virtual bool SdrBeginTextEdit( SdrObject* pObj, SdrPageView* pPV = 0L, - ::Window* pWin = 0L, + vcl::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, @@ -90,7 +90,7 @@ public: void InvalidateAttribs(); void InvalidateDrawTextAttrs(); - bool BeginDrag( Window* pWindow, const Point& rStartPos ); + bool BeginDrag( vcl::Window* pWindow, const Point& rStartPos ); void DoCut(); void DoCopy(); @@ -105,8 +105,8 @@ public: void SetCellAnchored(); ScAnchorType GetAnchorType() const; - void VCAddWin( Window* pWin ); - void VCRemoveWin( Window* pWin ); + void VCAddWin( vcl::Window* pWin ); + void VCRemoveWin( vcl::Window* pWin ); void UpdateIMap( SdrObject* pObj ); diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index a74d4ae3a673..f56bd95c2252 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -98,7 +98,7 @@ public: { nSourceDocID = nVal; } sal_uInt32 GetSourceDocID() const { return nSourceDocID; } - static ScDrawTransferObj* GetOwnClipboard( Window* pUIWin ); + static ScDrawTransferObj* GetOwnClipboard( vcl::Window* pUIWin ); virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 34e173d2eb0a..80408668dde0 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -36,7 +36,7 @@ class ScFunctionChildWindow : public SfxChildWindow { public: - ScFunctionChildWindow( Window*, sal_uInt16, SfxBindings*, + ScFunctionChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW_WITHID(ScFunctionChildWindow); @@ -101,7 +101,7 @@ protected: public: ScFunctionDockWin( SfxBindings* pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const ResId& rResId ); virtual ~ScFunctionDockWin(); diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx index 6ef8666afb78..81c370bb1255 100644 --- a/sc/source/ui/inc/editfield.hxx +++ b/sc/source/ui/inc/editfield.hxx @@ -26,7 +26,7 @@ class ScDoubleField : public Edit { public: - explicit ScDoubleField( Window* pParent, WinBits nStyle ); + explicit ScDoubleField( vcl::Window* pParent, WinBits nStyle ); bool GetValue( double& rfValue ) const; void SetValue( double fValue, diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index a1df80ebc9d0..c68b604cee46 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -33,7 +33,7 @@ class ScDocument; class ScFillSeriesDlg : public ModalDialog { public: - ScFillSeriesDlg( Window* pParent, + ScFillSeriesDlg( vcl::Window* pParent, ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 330a426abccc..1b1fdc54c1f9 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -53,7 +53,7 @@ class ScFilterDlg : public ScAnyRefDlg }; typedef boost::ptr_map<SCCOL,EntryList> EntryListsMap; public: - ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScFilterDlg(); @@ -160,7 +160,7 @@ private: class ScSpecialFilterDlg : public ScAnyRefDlg { public: - ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScSpecialFilterDlg(); diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 70d795968d4a..62d4ebd572d0 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -53,7 +53,7 @@ class ScFormulaDlg : public formula::FormulaDlg, static ScAddress aCursorPos; public: ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ,formula::IFunctionManager* _pFunctionMgr); + vcl::Window* pParent, ScViewData* pViewData ,formula::IFunctionManager* _pFunctionMgr); virtual ~ScFormulaDlg(); // IFormulaEditorHelper diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx index ac34403416fe..201d3ec92efa 100644 --- a/sc/source/ui/inc/fuconarc.hxx +++ b/sc/source/ui/inc/fuconarc.hxx @@ -26,7 +26,7 @@ class FuConstArc : public FuConstruct { public: - FuConstArc( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuConstArc( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuConstArc(); diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index 56289a5b2a5a..1eed3b80d92c 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.hxx @@ -29,7 +29,7 @@ class FuConstCustomShape : public FuConstruct void SetAttributes( SdrObject* pObj ); public: - FuConstCustomShape(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuConstCustomShape(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuConstCustomShape(); diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx index 0051ed185e60..aae5648253f0 100644 --- a/sc/source/ui/inc/fuconpol.hxx +++ b/sc/source/ui/inc/fuconpol.hxx @@ -28,7 +28,7 @@ class FuConstPolygon : public FuConstruct Point aLastPos; public: - FuConstPolygon(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuConstPolygon(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuConstPolygon(); diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx index 92fa41a81bfe..7f65782e7d57 100644 --- a/sc/source/ui/inc/fuconrec.hxx +++ b/sc/source/ui/inc/fuconrec.hxx @@ -26,7 +26,7 @@ class FuConstRectangle : public FuConstruct { public: - FuConstRectangle(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuConstRectangle(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuConstRectangle(); diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index 60c6d6472aa8..2acbc8c58d30 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -26,7 +26,7 @@ class FuConstruct : public FuDraw { public: - FuConstruct(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuConstruct(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuConstruct(); diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index 407c9b593e69..69884c55f0ad 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -30,7 +30,7 @@ protected: sal_uInt16 nIdentifier; public: - FuConstUnoControl(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuConstUnoControl(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuConstUnoControl(); diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index 10a6adef5a4c..760d8bb0f58e 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -31,7 +31,7 @@ class FuDraw : public FuPoor Pointer aOldPointer; public: - FuDraw(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuDraw(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuDraw(); diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx index 6d30688b12f6..f6b8f7d4f969 100644 --- a/sc/source/ui/inc/fuinsert.hxx +++ b/sc/source/ui/inc/fuinsert.hxx @@ -26,7 +26,7 @@ class FuInsertGraphic : public FuPoor { public: - FuInsertGraphic( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuInsertGraphic( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertGraphic(); @@ -37,7 +37,7 @@ class FuInsertGraphic : public FuPoor class FuInsertOLE : public FuPoor { public: - FuInsertOLE( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuInsertOLE( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual void Activate() SAL_OVERRIDE; @@ -47,7 +47,7 @@ class FuInsertOLE : public FuPoor class FuInsertChart : public FuPoor { public: - FuInsertChart( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuInsertChart( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual void Activate() SAL_OVERRIDE; @@ -57,7 +57,7 @@ class FuInsertChart : public FuPoor class FuInsertChartFromFile : public FuPoor { public: - FuInsertChartFromFile( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuInsertChartFromFile( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq, const OUString& rURL); virtual void Activate() SAL_OVERRIDE; @@ -67,7 +67,7 @@ class FuInsertChartFromFile : public FuPoor class FuInsertMedia : public FuPoor { public: - FuInsertMedia( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuInsertMedia( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertMedia(); diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 1226d1b5ef85..49494c609133 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -45,7 +45,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ); public: - ScListBox( Window* pParent, const ResId& rResId ); + ScListBox( vcl::Window* pParent, const ResId& rResId ); }; class ScFuncPage : public TabPage @@ -72,7 +72,7 @@ protected: public: - ScFuncPage( Window* pParent); + ScFuncPage( vcl::Window* pParent); void SetCategory(sal_uInt16 nCat); void SetFunction(sal_uInt16 nFunc); diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index ca9762d46906..5bbab26c8457 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -26,7 +26,7 @@ class ScDrawView; class ScTabViewShell; -class Window; +namespace vcl { class Window; } class SdrModel; class Dialog; @@ -44,7 +44,7 @@ class FuPoor protected: ScDrawView* pView; ScTabViewShell* pViewShell; - Window* pWindow; + vcl::Window* pWindow; SdrModel* pDrDoc; SfxRequest aSfxRequest; @@ -66,7 +66,7 @@ private: sal_uInt16 mnCode; public: - FuPoor(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuPoor(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuPoor(); @@ -74,7 +74,7 @@ public: void SetMouseButtonCode(sal_uInt16 nNew) { if(nNew != mnCode) mnCode = nNew; } sal_uInt16 GetMouseButtonCode() const { return mnCode; } - virtual void Paint(const Rectangle&, Window*) {} + virtual void Paint(const Rectangle&, vcl::Window*) {} virtual void DoCut(); virtual void DoCopy(); @@ -95,7 +95,7 @@ public: virtual void Activate(); virtual void Deactivate(); - void SetWindow(Window* pWin) { pWindow = pWin; } + void SetWindow(vcl::Window* pWin) { pWindow = pWin; } sal_uInt16 GetSlotID() const { return( aSfxRequest.GetSlot() ); } diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index 89f3b392998f..5009f1b60c5b 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.hxx @@ -28,7 +28,7 @@ class SdrPageView; class FuSelection : public FuDraw { public: - FuSelection(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuSelection(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq ); virtual ~FuSelection(); diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx index cad47c949697..330d628f557e 100644 --- a/sc/source/ui/inc/futext.hxx +++ b/sc/source/ui/inc/futext.hxx @@ -33,7 +33,7 @@ protected: SdrTextObj* pTextObj; public: - FuText(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuText(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuText(); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 808633561987..05f99946a4b9 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -83,7 +83,7 @@ struct SpellCallbackInfo; // predefines namespace sdr { namespace overlay { class OverlayObjectList; }} -class ScGridWindow : public Window, public DropTargetHelper, public DragSourceHelper +class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSourceHelper { // ScFilterListBox is always used for selection list friend class ScFilterListBox; @@ -305,7 +305,7 @@ protected: public: enum AutoFilterMode { Normal, Top10, Custom, Empty, NonEmpty, SortAscending, SortDescending }; - ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ); + ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ); virtual ~ScGridWindow(); // #i70788# flush and get overlay diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx index 73c5889f2558..04a98c6a15c5 100644 --- a/sc/source/ui/inc/groupdlg.hxx +++ b/sc/source/ui/inc/groupdlg.hxx @@ -27,7 +27,7 @@ class ScGroupDlg : public ModalDialog { public: - ScGroupDlg(Window* pParent, bool bUnGroup = false, bool bRows = true); + ScGroupDlg(vcl::Window* pParent, bool bUnGroup = false, bool bRows = true); virtual ~ScGroupDlg(); bool GetColsChecked() const; diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index f4ebde0e210b..5320494d7427 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -29,7 +29,7 @@ // Size of the sliders #define HDR_SLIDERSIZE 2 -class ScHeaderControl : public Window +class ScHeaderControl : public vcl::Window { private: SelectionEngine* pSelEngine; @@ -101,7 +101,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; public: - ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine, + ScHeaderControl( vcl::Window* pParent, SelectionEngine* pSelectionEngine, SCCOLROW nNewSize, bool bNewVertical ); virtual ~ScHeaderControl(); diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index 5d1f64574c5b..dfc68829613a 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -29,7 +29,7 @@ class ScHFEditDlg : public SfxTabDialog { SvxNumType eNumType; protected: - ScHFEditDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, const OString& rID, const OUString& rUIXMLDescription ); public: @@ -39,70 +39,70 @@ public: class ScHFEditHeaderDlg : public ScHFEditDlg { public: - ScHFEditHeaderDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditFooterDlg : public ScHFEditDlg { public: - ScHFEditFooterDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditLeftHeaderDlg : public ScHFEditDlg { public: - ScHFEditLeftHeaderDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditLeftHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditRightHeaderDlg : public ScHFEditDlg { public: - ScHFEditRightHeaderDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditRightHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditLeftFooterDlg : public ScHFEditDlg { public: - ScHFEditLeftFooterDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditLeftFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditRightFooterDlg : public ScHFEditDlg { public: - ScHFEditRightFooterDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditRightFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditSharedHeaderDlg : public ScHFEditDlg { public: - ScHFEditSharedHeaderDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditSharedHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditSharedFooterDlg : public ScHFEditDlg { public: - ScHFEditSharedFooterDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditSharedFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditAllDlg : public ScHFEditDlg { public: - ScHFEditAllDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditAllDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditActiveDlg : public ScHFEditDlg { public: - ScHFEditActiveDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditActiveDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 9dae49bc8e10..dc07789af6f0 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -78,7 +78,7 @@ protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: - ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData); virtual ~ScHighlightChgDlg(); diff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxx index 89ab1eeb0337..f3e8b03c2f86 100644 --- a/sc/source/ui/inc/hintwin.hxx +++ b/sc/source/ui/inc/hintwin.hxx @@ -22,7 +22,7 @@ #include <vcl/window.hxx> -class ScHintWindow : public Window +class ScHintWindow : public vcl::Window { private: OUString aTitle; @@ -36,7 +36,7 @@ protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - ScHintWindow( Window* pParent, const OUString& rTit, const OUString& rMsg ); + ScHintWindow( vcl::Window* pParent, const OUString& rTit, const OUString& rMsg ); virtual ~ScHintWindow(); }; diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index c34d7629a3c7..65ea47c3c927 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -66,9 +66,9 @@ private: ScTypedCaseStrSet::const_iterator miAutoPosColumn; ScTypedCaseStrSet::const_iterator miAutoPosFormula; - Window* pTipVisibleParent; + vcl::Window* pTipVisibleParent; sal_uLong nTipVisible; - Window* pTipVisibleSecParent; + vcl::Window* pTipVisibleSecParent; sal_uLong nTipVisibleSec; OUString aManualTip; OUString aAutoSearch; diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index bfce54fed442..e9ac66ca69fd 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -40,10 +40,10 @@ class ScRangeList; class ScTabViewShell; class Accelerator; -class ScTextWndBase : public Window +class ScTextWndBase : public vcl::Window { public: - ScTextWndBase( Window* pParent, WinBits nStyle ); + ScTextWndBase( vcl::Window* pParent, WinBits nStyle ); virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) = 0; virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) = 0; virtual void SetTextString( const OUString& rString ) = 0; @@ -60,7 +60,7 @@ public: class ScTextWnd : public ScTextWndBase, public DragSourceHelper // edit window { public: - ScTextWnd( Window* pParent, ScTabViewShell* pViewSh ); + ScTextWnd( vcl::Window* pParent, ScTabViewShell* pViewSh ); virtual ~ScTextWnd(); virtual void SetTextString( const OUString& rString ) SAL_OVERRIDE; @@ -137,7 +137,7 @@ private: bool bFormulaMode; public: - ScPosWnd( Window* pParent ); + ScPosWnd( vcl::Window* pParent ); virtual ~ScPosWnd(); void SetPos( const OUString& rPosStr ); // Displayed Text @@ -199,7 +199,7 @@ class ScInputBarGroup : public ScTextWndBase { public: - ScInputBarGroup( Window* Parent, ScTabViewShell* pViewSh ); + ScInputBarGroup( vcl::Window* Parent, ScTabViewShell* pViewSh ); virtual ~ScInputBarGroup(); virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE; virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE; @@ -236,7 +236,7 @@ private: class ScInputWindow : public ToolBox // Parent toolbox { public: - ScInputWindow( Window* pParent, SfxBindings* pBind ); + ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ); virtual ~ScInputWindow(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -301,7 +301,7 @@ private: class ScInputWindowWrapper : public SfxChildWindow { public: - ScInputWindowWrapper( Window* pParent, + ScInputWindowWrapper( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx index 8ce7449a5cc9..dd9a250f7acb 100644 --- a/sc/source/ui/inc/inscldlg.hxx +++ b/sc/source/ui/inc/inscldlg.hxx @@ -35,7 +35,7 @@ private: RadioButton* m_pBtnInsCol; public: - ScInsertCellDlg( Window* pParent,bool bDisallowCellMove = false ); + ScInsertCellDlg( vcl::Window* pParent,bool bDisallowCellMove = false ); virtual ~ScInsertCellDlg(); InsCellCmd GetInsCellCmd() const; diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 92bcfbd03ec2..30f89fe35eda 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -30,7 +30,7 @@ class ScInsertContentsDlg : public ModalDialog { public: - ScInsertContentsDlg( Window* pParent, + ScInsertContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults = IDF_NONE, const OUString* pStrTitle = NULL ); virtual ~ScInsertContentsDlg(); diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index ad68712fe22a..a6361e7a6d64 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -42,7 +42,7 @@ namespace sfx2 { class FileDialogHelper; } class ScInsertTableDlg : public ModalDialog { public: - ScInsertTableDlg( Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile ); + ScInsertTableDlg( vcl::Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile ); virtual ~ScInsertTableDlg(); virtual short Execute() SAL_OVERRIDE; // overloaded to set parent dialog diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index 5b09058cc091..39c2fd61a67b 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -35,7 +35,7 @@ private: DECL_LINK( DblClkHdl, void * ); public: - ScSelEntryDlg(Window* pParent, const std::vector<OUString> &rEntryList); + ScSelEntryDlg(vcl::Window* pParent, const std::vector<OUString> &rEntryList); OUString GetSelectEntry() const; }; diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 1601e24969de..6c11b2f0053b 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -62,7 +62,7 @@ private: const OUString& rOptions ); public: - ScLinkedAreaDlg( Window* pParent ); + ScLinkedAreaDlg( vcl::Window* pParent ); virtual ~ScLinkedAreaDlg(); void InitFromOldLink( const OUString& rFile, const OUString& rFilter, diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index 0337f9dfcc11..ab422cf22819 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -28,7 +28,7 @@ class ScMetricInputDlg : public ModalDialog { public: - ScMetricInputDlg( Window* pParent, + ScMetricInputDlg( vcl::Window* pParent, const OString& sDialogName, long nCurrent, long nDefault, diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 2b703ec612bb..0087e42927e6 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -30,7 +30,7 @@ class ScMoveTableDlg : public ModalDialog { public: - ScMoveTableDlg(Window* pParent, const OUString& rDefault); + ScMoveTableDlg(vcl::Window* pParent, const OUString& rDefault); virtual ~ScMoveTableDlg(); sal_uInt16 GetSelectedDocument () const { return nDocument; } diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx index 7757bf265bcd..ef8762605dbc 100644 --- a/sc/source/ui/inc/namecrea.hxx +++ b/sc/source/ui/inc/namecrea.hxx @@ -33,7 +33,7 @@ protected: CheckBox* m_pBottomBox; CheckBox* m_pRightBox; public: - ScNameCreateDlg( Window * pParent, sal_uInt16 nFlags ); + ScNameCreateDlg( vcl::Window * pParent, sal_uInt16 nFlags ); sal_uInt16 GetFlags() const; }; diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index 2b262a642fe6..b21a0be4924b 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -73,7 +73,7 @@ protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: - ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* pViewData, const std::map<OUString, ScRangeName*>& aRangeMap, const ScAddress& aCursorPos, const bool bUndo); diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 63c749778afb..cb586b928554 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -119,7 +119,7 @@ protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: - ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData, const ScAddress& aCursorPos, boost::ptr_map<OUString, ScRangeName>* pRangeMap = NULL ); virtual ~ScNameDlg(); diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index 44910754d2f0..62d4a4d89061 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -46,7 +46,7 @@ private: std::vector<OUString> maSelectedNames; boost::ptr_map<OUString, ScRangeName> maRangeMap; public: - ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool bInsList=true ); + ScNamePasteDlg( vcl::Window * pParent, ScDocShell* pShell, bool bInsList=true ); virtual ~ScNamePasteDlg(); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 4cc39795b60c..cb31d364db9c 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -91,10 +91,10 @@ private: // class ScScenarioWindow ------------------------------------------------ -class ScScenarioWindow : public Window +class ScScenarioWindow : public vcl::Window { public: - ScScenarioWindow( Window* pParent, const OUString& aQH_List, const OUString& aQH_Comment); + ScScenarioWindow( vcl::Window* pParent, const OUString& aQH_List, const OUString& aQH_Comment); virtual ~ScScenarioWindow(); void NotifyState( const SfxPoolItem* pState ); @@ -205,7 +205,7 @@ private: // class ScNavigatorDlg -class ScNavigatorDlg : public Window, public SfxListener +class ScNavigatorDlg : public vcl::Window, public SfxListener { friend class ScNavigatorControllerItem; friend class ScNavigatorDialogWrapper; @@ -305,7 +305,7 @@ protected: virtual void Resizing( Size& rSize ); public: - ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Window* pParent, + ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl::Window* pParent, const bool bUseStyleSettingsBackground); virtual ~ScNavigatorDlg(); @@ -322,7 +322,7 @@ public: class ScNavigatorDialogWrapper: public SfxChildWindowContext { public: - ScNavigatorDialogWrapper( Window* pParent, + ScNavigatorDialogWrapper( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index 72d4ef2db96c..537837aa7af3 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -31,10 +31,10 @@ class SdrObject; class ScNoteMarker { private: - Window* pWindow; - Window* pRightWin; - Window* pBottomWin; - Window* pDiagWin; + vcl::Window* pWindow; + vcl::Window* pRightWin; + vcl::Window* pBottomWin; + vcl::Window* pDiagWin; ScDocument* pDoc; ScAddress aDocPos; OUString aUserText; @@ -52,7 +52,7 @@ private: DECL_LINK( TimeHdl, void* ); public: - ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal, + ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight, vcl::Window* pBottom, vcl::Window* pDiagonal, ScDocument* pD, ScAddress aPos, const OUString& rUser, const MapMode& rMap, bool bLeftEdge, bool bForce, bool bKeyboard ); ~ScNoteMarker(); diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index ecc83948550c..107447d8529e 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -29,7 +29,7 @@ enum ScOutlineMode { SC_OUTLINE_HOR, SC_OUTLINE_VER }; /** The window left of or above the spreadsheet containing the outline groups and controls to expand/collapse them. */ -class ScOutlineWindow : public Window +class ScOutlineWindow : public vcl::Window { private: ScViewData& mrViewData; /// View data containing the document. @@ -57,7 +57,7 @@ private: public: ScOutlineWindow( - Window* pParent, + vcl::Window* pParent, ScOutlineMode eMode, ScViewData* pViewData, ScSplitPos eWhich ); diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 56129165239e..0e5e07c6b518 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -45,10 +45,10 @@ class ScRedlineOptionsTabPage : public SfxTabPage public: - ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + ScRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ScRedlineOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 1ae4aa78d913..6d1fd0f35f1b 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -40,7 +40,7 @@ class ScCursorRefEdit : public formula::RefEdit Link maCursorDownLink; public: - ScCursorRefEdit( Window* pParent, Window *pLabel ); + ScCursorRefEdit( vcl::Window* pParent, vcl::Window *pLabel ); void SetCursorLinks( const Link& rUp, const Link& rDown ); protected: @@ -93,7 +93,7 @@ public: class ScOptSolverDlg : public ScAnyRefDlg { public: - ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocShell* pDocSh, ScAddress aCursorPos ); virtual ~ScOptSolverDlg(); @@ -205,7 +205,7 @@ class ScSolverProgressDialog : public ModelessDialog FixedText* m_pFtTime; public: - ScSolverProgressDialog( Window* pParent ); + ScSolverProgressDialog( vcl::Window* pParent ); void HideTimeLimit(); void SetTimeLimit( sal_Int32 nSeconds ); @@ -216,7 +216,7 @@ class ScSolverNoSolutionDialog : public ModalDialog FixedText* m_pFtErrorText; public: - ScSolverNoSolutionDialog(Window* pParent, const OUString& rErrorText); + ScSolverNoSolutionDialog(vcl::Window* pParent, const OUString& rErrorText); }; class ScSolverSuccessDialog : public ModalDialog @@ -228,7 +228,7 @@ class ScSolverSuccessDialog : public ModalDialog DECL_LINK(ClickHdl, PushButton*); public: - ScSolverSuccessDialog( Window* pParent, const OUString& rSolution ); + ScSolverSuccessDialog( vcl::Window* pParent, const OUString& rSolution ); }; #endif diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 8651c8f1384b..7032928fe4c0 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -38,7 +38,7 @@ class ScTypedStrData; class ScPivotFilterDlg : public ModalDialog { public: - ScPivotFilterDlg(Window* pParent, const SfxItemSet& rArgSet, SCTAB nSourceTab); + ScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgSet, SCTAB nSourceTab); virtual ~ScPivotFilterDlg(); const ScQueryItem& GetOutputItem(); diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 4a57af5759bc..e6a247add44a 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -29,7 +29,7 @@ class ScDocShell; class ScPreviewShell; class FmFormView; -class ScPreview : public Window +class ScPreview : public vcl::Window { private: ScMarkData::MarkedTabsType maSelectedTabs; @@ -116,7 +116,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; public: - ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ); + ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ); virtual ~ScPreview(); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 4ae03f6ef50e..660812fea376 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -44,7 +44,7 @@ class ScPreviewShell: public SfxViewShell ScPreview* pPreview; // Output window ScrollBar* pHorScroll; ScrollBar* pVerScroll; - Window* pCorner; + vcl::Window* pCorner; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSourceData; // ViewData sal_uInt8 nSourceDesignMode; // form design mode from TabView @@ -54,7 +54,7 @@ class ScPreviewShell: public SfxViewShell SfxBroadcaster* pAccessibilityBroadcaster; bool GetPageSize( Size& aPageSize ); private: - void Construct( Window* pParent ); + void Construct( vcl::Window* pParent ); DECL_LINK(ScrollHandler, ScrollBar* ); DECL_LINK(CloseHdl, SystemWindow*); void DoScroll( sal_uInt16 nMode ); @@ -111,7 +111,7 @@ public: virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; + virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; void AddAccessibilityObject( SfxListener& rObject ); void RemoveAccessibilityObject( SfxListener& rObject ); diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index c4e53a92203f..b1451d5ff54d 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -51,7 +51,7 @@ class ScPrivatSplit : public Control public: - ScPrivatSplit( Window* pWindow, const ResId& rResId, + ScPrivatSplit( vcl::Window* pWindow, const ResId& rResId, SC_SPLIT_DIRECTION eScSplit); virtual short GetDeltaX(); diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index 7c9c58873948..812b40258dc7 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -27,13 +27,13 @@ #include <vcl/layout.hxx> #include <svx/checklbx.hxx> -class Window; +namespace vcl { class Window; } class ScTableProtection; class ScTableProtectionDlg : public ModalDialog { public: - explicit ScTableProtectionDlg(Window* pParent); + explicit ScTableProtectionDlg(vcl::Window* pParent); virtual ~ScTableProtectionDlg(); virtual short Execute() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 986c9e09a6f5..3d0cc117ef73 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -47,7 +47,7 @@ class ScDPObject; class ScDPFunctionListBox : public ListBox { public: - ScDPFunctionListBox(Window* pParent, WinBits nStyle); + ScDPFunctionListBox(vcl::Window* pParent, WinBits nStyle); void SetSelection( sal_uInt16 nFuncMask ); sal_uInt16 GetSelection() const; @@ -60,7 +60,7 @@ class ScDPFunctionDlg : public ModalDialog { typedef ::boost::unordered_map< OUString, OUString, OUStringHash > NameMapType; public: - explicit ScDPFunctionDlg( Window* pParent, const ScDPLabelDataVector& rLabelVec, + explicit ScDPFunctionDlg( vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); sal_uInt16 GetFuncMask() const; @@ -100,7 +100,7 @@ private: class ScDPSubtotalDlg : public ModalDialog { public: - explicit ScDPSubtotalDlg( Window* pParent, ScDPObject& rDPObj, + explicit ScDPSubtotalDlg( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, const ScDPNameVec& rDataFields, bool bEnableLayout ); @@ -135,7 +135,7 @@ private: class ScDPSubtotalOptDlg : public ModalDialog { public: - explicit ScDPSubtotalOptDlg( Window* pParent, ScDPObject& rDPObj, + explicit ScDPSubtotalOptDlg( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields, bool bEnableLayout ); @@ -187,7 +187,7 @@ private: class ScDPShowDetailDlg : public ModalDialog { public: - explicit ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ); + explicit ScDPShowDetailDlg( vcl::Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ); virtual short Execute() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx index a65e2f5658bc..86e2588f416b 100644 --- a/sc/source/ui/inc/redcom.hxx +++ b/sc/source/ui/inc/redcom.hxx @@ -47,7 +47,7 @@ protected: public: - ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet, + ScRedComDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, ScDocShell *pShell, ScChangeAction *pAction, bool bPrevNext = false); ~ScRedComDialog(); diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index f2f23effa63e..7ae4a9f0a29e 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -31,7 +31,7 @@ class Class : public SfxChildWindow \ { \ public: \ - Class( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); \ + Class( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); \ SFX_DECL_CHILDWINDOW_WITHID(Class); \ }; @@ -124,7 +124,7 @@ private: class ScAcceptChgDlgWrapper: public SfxChildWindow { public: - ScAcceptChgDlgWrapper( Window*, + ScAcceptChgDlgWrapper( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); @@ -137,7 +137,7 @@ class ScAcceptChgDlgWrapper: public SfxChildWindow class ScSimpleRefDlgWrapper: public SfxChildWindow { public: - ScSimpleRefDlgWrapper( Window*, + ScSimpleRefDlgWrapper( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); @@ -159,9 +159,9 @@ class SC_DLLPUBLIC ScValidityRefChildWin : public SfxChildWindow { bool m_bVisibleLock:1; bool m_bFreeWindowLock:1; - Window * m_pSavedWndParent; + vcl::Window * m_pSavedWndParent; public: - ScValidityRefChildWin( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); + ScValidityRefChildWin( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW_WITHID(ScValidityRefChildWin); virtual ~ScValidityRefChildWin(); bool LockVisible( bool bLock ){ bool bVis = m_bVisibleLock; m_bVisibleLock = bLock; return bVis; } diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index a01b791cf338..2763202b0395 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -33,7 +33,7 @@ #include <boost/shared_ptr.hpp> -class Window; +namespace vcl { class Window; } class ScDocProtection; class ScTableProtection; class ScDocument; @@ -44,7 +44,7 @@ public: typedef ::boost::shared_ptr<ScDocProtection> DocProtectionPtr; typedef ::boost::shared_ptr<ScTableProtection> TabProtectionPtr; - explicit ScRetypePassDlg(Window* pParent); + explicit ScRetypePassDlg(vcl::Window* pParent); virtual ~ScRetypePassDlg(); virtual short Execute() SAL_OVERRIDE; @@ -102,7 +102,7 @@ private: class ScRetypePassInputDlg : public ModalDialog { public: - explicit ScRetypePassInputDlg(Window* pParent, ScPassHashProtectable* pProtected); + explicit ScRetypePassInputDlg(vcl::Window* pParent, ScPassHashProtectable* pProtected); virtual ~ScRetypePassInputDlg(); virtual short Execute() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 80b22a5b284c..2675f3b346a3 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -30,7 +30,7 @@ class ScNewScenarioDlg : public ModalDialog { public: - ScNewScenarioDlg(Window* pParent, const OUString& rName, bool bEdit = false, bool bSheetProtected = false); + ScNewScenarioDlg(vcl::Window* pParent, const OUString& rName, bool bEdit = false, bool bSheetProtected = false); void SetScenarioData( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ); diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 1fff0a436b4b..646e4ef4bf77 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -77,7 +77,7 @@ class ScImportAsciiDlg : public ModalDialog public: ScImportAsciiDlg( - Window* pParent, const OUString& aDatName, + vcl::Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall ); virtual ~ScImportAsciiDlg(); diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 66508e84fae4..c8ad3276b271 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -23,7 +23,7 @@ class ScAutoFormatDlg : public ModalDialog { public: - ScAutoFormatDlg(Window* pParent, + ScAutoFormatDlg(vcl::Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScViewData *pViewData); diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 4ab267d299bd..adb8f2032725 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -28,7 +28,7 @@ class ScDelimiterTable; class ScImportOptionsDlg : public ModalDialog { public: - ScImportOptionsDlg( Window* pParent, + ScImportOptionsDlg( vcl::Window* pParent, bool bAscii = true, const ScImportOptions* pOptions = NULL, const OUString* pStrTitle = NULL, diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index f3720363e2c1..b2d133c2cdb8 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -52,7 +52,7 @@ public: void ClearTextAreas(); protected: - ScHFEditPage( Window* pParent, + ScHFEditPage( vcl::Window* pParent, const SfxItemSet& rCoreSet, sal_uInt16 nWhich, bool bHeader ); @@ -104,37 +104,37 @@ private: class ScRightHeaderEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); private: - ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); + ScRightHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class ScLeftHeaderEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); private: - ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); + ScLeftHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class ScRightFooterEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); private: - ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet ); + ScRightFooterEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class ScLeftFooterEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); private: - ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rSet ); + ScLeftFooterEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; #endif diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx index 0d6d435f9f3e..437d90a3adc8 100644 --- a/sc/source/ui/inc/searchresults.hxx +++ b/sc/source/ui/inc/searchresults.hxx @@ -27,7 +27,7 @@ class SearchResultsDlg : public ModelessDialog DECL_LINK( ListSelectHdl, void * ); public: - SearchResultsDlg( SfxBindings* _pBindings, Window* pParent, sal_uInt16 nId ); + SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent, sal_uInt16 nId ); virtual ~SearchResultsDlg(); void FillResults( ScDocument* pDoc, const ScRangeList& rMatchedRanges ); @@ -39,7 +39,7 @@ class SearchResultsDlgWrapper : public SfxChildWindow { public: SearchResultsDlgWrapper( - Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); virtual ~SearchResultsDlgWrapper(); diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index 4f2988436c8b..ca027f040ee4 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.hxx @@ -32,7 +32,7 @@ class ScViewSelectionEngine : public SelectionEngine private: ScSplitPos eWhich; public: - ScViewSelectionEngine( Window* pWindow, ScTabView* pView, + ScViewSelectionEngine( vcl::Window* pWindow, ScTabView* pView, ScSplitPos eSplitPos ); ScSplitPos GetWhich() const { return eWhich; } @@ -103,7 +103,7 @@ public: class ScHeaderSelectionEngine : public SelectionEngine { public: - ScHeaderSelectionEngine( Window* pWindow, ScHeaderFunctionSet* pFuncSet ); + ScHeaderSelectionEngine( vcl::Window* pWindow, ScHeaderFunctionSet* pFuncSet ); }; #endif diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index cb4c6b27c480..f8d746fd4cc9 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -47,7 +47,7 @@ private: DECL_LINK( ToggleHandle, void* ); public: - ScShareDocumentDlg( Window* pParent, ScViewData* pViewData ); + ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScShareDocumentDlg(); bool IsShareDocumentChecked() const; diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 75e56b1afea7..6c55a64d51f7 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -34,7 +34,7 @@ private: DECL_LINK( DblClkHdl, void * ); public: - ScShowTabDlg( Window* pParent ); + ScShowTabDlg( vcl::Window* pParent ); /** Sets dialog title, fixed text for listbox and help IDs. */ void SetDescription( diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index a45de80bcd6a..5a03ca5b279b 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -67,7 +67,7 @@ protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: - ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData ); virtual ~ScSimpleRefDlg(); diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index b2db7ac5a709..eb03c6e61e5f 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -55,7 +55,7 @@ class ScSolverOptionsDialog : public ModalDialog void EditOption(); public: - ScSolverOptionsDialog( Window* pParent, + ScSolverOptionsDialog( vcl::Window* pParent, const com::sun::star::uno::Sequence<OUString>& rImplNames, const com::sun::star::uno::Sequence<OUString>& rDescriptions, const OUString& rEngine, @@ -73,7 +73,7 @@ class ScSolverIntegerDialog : public ModalDialog NumericField* m_pNfValue; public: - ScSolverIntegerDialog( Window * pParent ); + ScSolverIntegerDialog( vcl::Window * pParent ); void SetOptionName( const OUString& rName ); void SetValue( sal_Int32 nValue ); @@ -86,7 +86,7 @@ class ScSolverValueDialog : public ModalDialog Edit* m_pEdValue; public: - ScSolverValueDialog( Window * pParent ); + ScSolverValueDialog( vcl::Window * pParent ); void SetOptionName( const OUString& rName ); void SetValue( double fValue ); diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 5c6ff014b2b6..2799c58975a8 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -38,7 +38,7 @@ enum ScSolverErr class ScSolverDlg : public ScAnyRefDlg { public: - ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocument* pDocument, ScAddress aCursorPos ); virtual ~ScSolverDlg(); diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx index 3ec193ebd31d..d627f02623bb 100644 --- a/sc/source/ui/inc/sortdlg.hxx +++ b/sc/source/ui/inc/sortdlg.hxx @@ -29,7 +29,7 @@ class ScSortDlg : public SfxTabDialog { public: - ScSortDlg(Window* pParent, const SfxItemSet* pArgSet); + ScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet); void SetHeaders( bool bHeaders ) { bIsHeaders = bHeaders; } void SetByRows ( bool bByRows ) { bIsByRows = bByRows; } @@ -44,7 +44,7 @@ private: class ScSortWarningDlg : public ModalDialog { public: - ScSortWarningDlg( Window* pParent, const OUString& rExtendText,const OUString& rCurrentText ); + ScSortWarningDlg( vcl::Window* pParent, const OUString& rExtendText,const OUString& rCurrentText ); DECL_LINK( BtnHdl, PushButton* ); private: FixedText* aFtText; diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index 8913acfd514a..5c9c1fa833bc 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -31,7 +31,7 @@ struct ScSortKeyItem : public VclBuilderContainer RadioButton* m_pBtnUp; RadioButton* m_pBtnDown; - ScSortKeyItem(Window* pParent); + ScSortKeyItem(vcl::Window* pParent); void DisableField(); void EnableField(); diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx index f3b1fc473f5c..d2a359e0e6a4 100644 --- a/sc/source/ui/inc/spelldialog.hxx +++ b/sc/source/ui/inc/spelldialog.hxx @@ -42,7 +42,7 @@ class ScSpellDialogChildWindow : public ::svx::SpellDialogChildWindow public: SFX_DECL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow ); - explicit ScSpellDialogChildWindow( Window* pParent, sal_uInt16 nId, + explicit ScSpellDialogChildWindow( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); virtual ~ScSpellDialogChildWindow(); diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index e1160930d010..d2e46d22a7f4 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -121,7 +121,7 @@ protected: private: /** Returns the spelling dialog if it is open. */ - Window* GetDialogParent(); + vcl::Window* GetDialogParent(); }; /** Edit engine for text conversion. */ diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx index 2b4703de824f..367d32d8811e 100644 --- a/sc/source/ui/inc/strindlg.hxx +++ b/sc/source/ui/inc/strindlg.hxx @@ -27,7 +27,7 @@ class ScStringInputDlg : public ModalDialog { public: - ScStringInputDlg(Window* pParent, + ScStringInputDlg(vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index d49365b62060..04a70a1f7633 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -27,7 +27,7 @@ class SfxStyleSheetBase; class ScStyleDlg : public SfxStyleDialog { public: - ScStyleDlg( Window* pParent, + ScStyleDlg( vcl::Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId ); diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 4c08dad42737..6496689d3a75 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -27,7 +27,7 @@ class ScSubTotalDlg : public SfxTabDialog { public: - ScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet); + ScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet); private: PushButton* m_pBtnRemove; DECL_LINK( RemoveHdl, PushButton * ); diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 63fbe9eabb05..86d46e3c9240 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -28,7 +28,7 @@ class ScTabBgColorDlg : public ModalDialog { public: - ScTabBgColorDlg( Window* pParent, + ScTabBgColorDlg( vcl::Window* pParent, const OUString& rTitle, const OUString& rTabBgColorNoColorText, const Color& rDefaultColor, @@ -39,7 +39,7 @@ public: class ScTabBgColorValueSet : public SvxColorValueSet { public: - ScTabBgColorValueSet(Window* pParent, WinBits nStyle); + ScTabBgColorValueSet(vcl::Window* pParent, WinBits nStyle); void SetDialog(ScTabBgColorDlg* pTabBgColorDlg) { m_pTabBgColorDlg = pTabBgColorDlg; diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index 02ce3e0cb221..b058d39c1434 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -62,7 +62,7 @@ protected: virtual void Mirror() SAL_OVERRIDE; public: - ScTabControl( Window* pParent, ScViewData* pData ); + ScTabControl( vcl::Window* pParent, ScViewData* pData ); virtual ~ScTabControl(); using TabBar::StartDrag; diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 3b6cf707babd..a1806c1153c9 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -40,7 +40,7 @@ enum ScTabOpErr class ScTabOpDlg : public ScAnyRefDlg { public: - ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocument* pDocument, const ScRefAddress& rCursorPos ); virtual ~ScTabOpDlg(); diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 5f8087506785..e13b70def98b 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -27,7 +27,7 @@ class ScTabPageProtection : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges (); virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; @@ -38,7 +38,7 @@ protected: virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; private: - ScTabPageProtection( Window* pParent, + ScTabPageProtection( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); private: TriStateBox* m_pBtnHideCell; diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx index ee889bdec6d4..a05aca5075b4 100644 --- a/sc/source/ui/inc/tabsplit.hxx +++ b/sc/source/ui/inc/tabsplit.hxx @@ -37,7 +37,7 @@ protected: virtual void Splitting( Point& rSplitPos ) SAL_OVERRIDE; public: - ScTabSplitter( Window* pParent, WinBits nWinStyle, + ScTabSplitter( vcl::Window* pParent, WinBits nWinStyle, ScViewData* pData ); virtual ~ScTabSplitter(); diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 891af9e82567..0bc4751487c4 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -64,7 +64,7 @@ namespace chart2 { namespace data { // Help - Window -class ScCornerButton : public Window +class ScCornerButton : public vcl::Window { private: ScViewData* pViewData; @@ -75,7 +75,7 @@ protected: virtual void Resize() SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: - ScCornerButton( Window* pParent, ScViewData* pData, bool bAdditional ); + ScCornerButton( vcl::Window* pParent, ScViewData* pData, bool bAdditional ); virtual ~ScCornerButton(); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; @@ -87,7 +87,7 @@ class ScTabView : boost::noncopyable private: enum BlockMode { None = 0, Normal = 1, Own = 2 }; - Window* pFrameWin; // First !!! + vcl::Window* pFrameWin; // First !!! ScViewData aViewData; // must be at the front ! ScViewSelectionEngine* pSelEngine; @@ -227,7 +227,7 @@ protected: void UpdateIMap( SdrObject* pObj ); public: - ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); + ScTabView( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); ~ScTabView(); void MakeDrawLayer(); @@ -319,9 +319,9 @@ public: void FakeButtonUp( ScSplitPos eWhich ); ScGridWindow* GetActiveWin(); - Window* GetWindowByPos( ScSplitPos ePos ) { return pGridWin[ePos]; } + vcl::Window* GetWindowByPos( ScSplitPos ePos ) { return pGridWin[ePos]; } - ScSplitPos FindWindow( Window* pWindow ) const; + ScSplitPos FindWindow( vcl::Window* pWindow ) const; void SetActivePointer( const Pointer& rPointer ); @@ -508,7 +508,7 @@ public: void EnableRefInput(bool bFlag = true); - Window* GetFrameWin() const { return pFrameWin; } + vcl::Window* GetFrameWin() const { return pFrameWin; } bool HasPaintBrush() const { return pBrushDocument || pDrawBrushSet; } ScDocument* GetBrushDocument() const { return pBrushDocument; } diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index e6573085524f..9020c2184c84 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -243,7 +243,7 @@ public: virtual ~ScTabViewShell(); - SC_DLLPUBLIC Window* GetDialogParent(); + SC_DLLPUBLIC vcl::Window* GetDialogParent(); bool IsRefInputMode() const; void ExecuteInputDirect(); @@ -348,7 +348,7 @@ public: sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false ) SAL_OVERRIDE; virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; + virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; void ConnectObject( SdrOle2Obj* pObj ); bool ActivateObject( SdrOle2Obj* pObj, long nVerb ); @@ -358,7 +358,7 @@ public: SC_DLLPUBLIC static ScTabViewShell* GetActiveViewShell(); SfxModelessDialog* CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW, SfxChildWinInfo* pInfo, - Window* pParent, sal_uInt16 nSlotId ); + vcl::Window* pParent, sal_uInt16 nSlotId ); void UpdateOleZoom(); inline SbxObject* GetScSbxObject() const diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 83c3b4bef254..d2c6cbccaaaf 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -34,10 +34,10 @@ public: virtual ~ScZoomSliderControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; -class ScZoomSliderWnd: public Window +class ScZoomSliderWnd: public vcl::Window { private: struct ScZoomSliderWnd_Impl; @@ -51,7 +51,7 @@ private: void DoPaint( const Rectangle& rRect ); public: - ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, + ScZoomSliderWnd( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , sal_uInt16 nCurrentZoom ); virtual ~ScZoomSliderWnd(); void UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ); diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx index dd199546695c..1bea02d2a0ea 100644 --- a/sc/source/ui/inc/textdlgs.hxx +++ b/sc/source/ui/inc/textdlgs.hxx @@ -33,7 +33,7 @@ private: virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE; public: - ScCharDlg(Window* pParent, const SfxItemSet* pAttr, + ScCharDlg(vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell); }; @@ -45,7 +45,7 @@ private: virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE; public: - ScParagraphDlg(Window* pParent, const SfxItemSet* pAttr); + ScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr); }; #endif diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index 3cdfa31dcada..b944ce19a8d3 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -29,7 +29,7 @@ class ScTextImportOptionsDlg : public ModalDialog { public: - ScTextImportOptionsDlg(Window* pParent); + ScTextImportOptionsDlg(vcl::Window* pParent); virtual ~ScTextImportOptionsDlg(); virtual short Execute() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 2b47c7869ff4..629eb735c7be 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -32,7 +32,7 @@ class ScDocOptions; class ScTpCalcOptions : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; @@ -40,7 +40,7 @@ public: virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; private: - ScTpCalcOptions( Window* pParent, + ScTpCalcOptions( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~ScTpCalcOptions(); diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 07167ce8a31c..6ddeeeca0b1f 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -19,14 +19,14 @@ class ScTpCompatOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static SfxTabPage* Create (Window* pParent, const SfxItemSet* rCoreAttrs); + static SfxTabPage* Create (vcl::Window* pParent, const SfxItemSet* rCoreAttrs); virtual bool FillItemSet(SfxItemSet* rCoreAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rCoreAttrs) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: - explicit ScTpCompatOptions(Window* pParent, const SfxItemSet& rCoreAttrs); + explicit ScTpCompatOptions(vcl::Window* pParent, const SfxItemSet& rCoreAttrs); virtual ~ScTpCompatOptions(); private: diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 7da63f45c3e7..251c3676a391 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -19,14 +19,14 @@ class ScTpDefaultsOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static SfxTabPage* Create (Window* pParent, const SfxItemSet* rCoreSet); + static SfxTabPage* Create (vcl::Window* pParent, const SfxItemSet* rCoreSet); virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: - explicit ScTpDefaultsOptions(Window* pParent, const SfxItemSet& rCoreSet); + explicit ScTpDefaultsOptions(vcl::Window* pParent, const SfxItemSet& rCoreSet); virtual ~ScTpDefaultsOptions(); void CheckNumSheets(); diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index fac10841d727..adf1c64a8eac 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -33,14 +33,14 @@ class ScTpFormulaOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static SfxTabPage* Create (Window* pParent, const SfxItemSet* rCoreSet); + static SfxTabPage* Create (vcl::Window* pParent, const SfxItemSet* rCoreSet); virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: - explicit ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreSet); + explicit ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& rCoreSet); virtual ~ScTpFormulaOptions(); void ResetSeparators(); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 15acb7d8b256..526aad0f19be 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -36,7 +36,7 @@ public: void SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; } protected: - ScHFPage( Window* pParent, + ScHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); @@ -60,21 +60,21 @@ private: class ScHeaderPage : public ScHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: - ScHeaderPage( Window* pParent, const SfxItemSet& rSet ); + ScHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class ScFooterPage : public ScHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: - ScFooterPage( Window* pParent, const SfxItemSet& rSet ); + ScFooterPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPHF_HXX diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 9f0f28d0d91a..d304ebd68f97 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -53,7 +53,7 @@ enum ScEditWindowLocation class SC_DLLPUBLIC ScEditWindow : public Control { public: - ScEditWindow( Window* pParent, WinBits nBits , ScEditWindowLocation eLoc ); + ScEditWindow( vcl::Window* pParent, WinBits nBits , ScEditWindowLocation eLoc ); virtual ~ScEditWindow(); using Control::SetFont; @@ -118,7 +118,7 @@ protected: public: - ScExtIButton(Window* pParent, WinBits nBits ); + ScExtIButton(vcl::Window* pParent, WinBits nBits ); void SetPopupMenu(PopupMenu* pPopUp); diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 35f5a68f3769..cc987a98adfc 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -29,11 +29,11 @@ class ScTpPrintOptions : public SfxTabPage CheckBox* m_pSelectedSheetsCB; CheckBox* m_pForceBreaksCB; - ScTpPrintOptions( Window* pParent, const SfxItemSet& rCoreSet ); + ScTpPrintOptions( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~ScTpPrintOptions(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 7a900e70aec3..8eaf1ec057da 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -47,11 +47,11 @@ struct ScSortParam; class ScTabPageSortFields : public SfxTabPage { public: - ScTabPageSortFields( Window* pParent, + ScTabPageSortFields( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTabPageSortFields(); - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -106,13 +106,13 @@ class CollatorWrapper; class ScTabPageSortOptions : public SfxTabPage { public: - ScTabPageSortOptions( Window* pParent, + ScTabPageSortOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTabPageSortOptions(); #undef SfxTabPage #define SfxTabPage ::SfxTabPage - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index b661f85321e9..96f141fdbdd8 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -27,10 +27,10 @@ class ScDocStatPage: public SfxTabPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); private: - ScDocStatPage( Window *pParent, const SfxItemSet& rSet ); + ScDocStatPage( vcl::Window *pParent, const SfxItemSet& rSet ); virtual ~ScDocStatPage(); protected: diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 24a6e3670d15..79e3727e751c 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -36,7 +36,7 @@ struct ScSubTotalParam; class ScTpSubTotalGroup : public SfxTabPage { protected: - ScTpSubTotalGroup( Window* pParent, + ScTpSubTotalGroup( vcl::Window* pParent, const SfxItemSet& rArgSet ); public: @@ -76,13 +76,13 @@ private: class ScTpSubTotalGroup1 : public ScTpSubTotalGroup { protected: - ScTpSubTotalGroup1( Window* pParent, + ScTpSubTotalGroup1( vcl::Window* pParent, const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup1(); - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -91,13 +91,13 @@ public: class ScTpSubTotalGroup2 : public ScTpSubTotalGroup { protected: - ScTpSubTotalGroup2( Window* pParent, + ScTpSubTotalGroup2( vcl::Window* pParent, const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup2(); - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -106,13 +106,13 @@ public: class ScTpSubTotalGroup3 : public ScTpSubTotalGroup { protected: - ScTpSubTotalGroup3( Window* pParent, + ScTpSubTotalGroup3( vcl::Window* pParent, const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup3(); - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -121,13 +121,13 @@ public: class ScTpSubTotalOptions : public SfxTabPage { protected: - ScTpSubTotalOptions( Window* pParent, + ScTpSubTotalOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalOptions(); - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 5053babb0f9e..182c1fd530af 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -28,7 +28,7 @@ class ScTablePage : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); static const sal_uInt16* GetRanges (); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; @@ -38,7 +38,7 @@ public: virtual void DataChanged ( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: - ScTablePage( Window* pParent, const SfxItemSet& rCoreSet ); + ScTablePage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~ScTablePage(); void ShowImage(); diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 8345335966c3..5e84d88a0beb 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -33,7 +33,7 @@ class ScRangeUtil; class ScTpUserLists : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; @@ -41,7 +41,7 @@ public: virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; private: - ScTpUserLists( Window* pParent, + ScTpUserLists( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTpUserLists(); diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 49c8e815fdb0..e426d9c742a9 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -64,12 +64,12 @@ class ScTpContentOptions : public SfxTabPage DECL_LINK( SelLbObjHdl, ListBox* ); DECL_LINK( CBHdl, CheckBox* ); - ScTpContentOptions( Window* pParent, + ScTpContentOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTpContentOptions(); public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; @@ -112,12 +112,12 @@ class ScTpLayoutOptions : public SfxTabPage DECL_LINK( UpdateHdl, CheckBox* ); - ScTpLayoutOptions( Window* pParent, + ScTpLayoutOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTpLayoutOptions(); public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index 6ee2855b7d0c..bd11836bcf97 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -99,7 +99,7 @@ public: void SetDragWasInternal(); SC_DLLPUBLIC void SetUseInApi( bool bSet ); - static SC_DLLPUBLIC ScTransferObj* GetOwnClipboard( Window* pUIWin ); + static SC_DLLPUBLIC ScTransferObj* GetOwnClipboard( vcl::Window* pUIWin ); static SfxObjectShell* SetDrawClipDoc( bool bAnyOle ); // update ScGlobal::pDrawClipDocShellRef virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 9876d4c7e724..9fb3b77a6119 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -83,9 +83,9 @@ class ScValidationDlg; class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage { public: - explicit ScTPValidationValue( Window* pParent, const SfxItemSet& rArgSet ); + explicit ScTPValidationValue( vcl::Window* pParent, const SfxItemSet& rArgSet ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rArgSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rArgSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -125,7 +125,7 @@ private: sal_Unicode mcFmlaSep; /// List separator in formulas. DECL_LINK(EditSetFocusHdl, void *); - DECL_LINK( KillFocusHdl, Window *); + DECL_LINK( KillFocusHdl, vcl::Window *); void OnClick( Button *pBtn ); formula::RefEdit* m_pRefEdit; public: @@ -134,7 +134,7 @@ public: ScTPValidationValue* m_pPage; virtual void Click() SAL_OVERRIDE; public: - ScRefButtonEx(Window* pParent, WinBits nStyle) + ScRefButtonEx(vcl::Window* pParent, WinBits nStyle) : ::formula::RefButton(pParent, nStyle) , m_pPage(NULL) { @@ -183,13 +183,13 @@ class ScValidationDlg bool LeaveRefStatus(); public: - explicit ScValidationDlg( Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = NULL ); + explicit ScValidationDlg( vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = NULL ); virtual ~ScValidationDlg() { if( m_bOwnRefHdlr ) RemoveRefDlg( false ); } - static ScValidationDlg * Find1AliveObject( Window *pAncestor ) + static ScValidationDlg * Find1AliveObject( vcl::Window *pAncestor ) { return static_cast<ScValidationDlg *>( SC_MOD()->Find1RefWindow( SLOTID, pAncestor ) ); } @@ -226,7 +226,7 @@ public: } bool IsRefInputting(){ return m_bRefInputting; } - Window* get_refinput_shrink_parent() { return m_pHBox; } + vcl::Window* get_refinput_shrink_parent() { return m_pHBox; } virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE { @@ -285,10 +285,10 @@ private: // DECL_LINK( SelectHdl, ListBox * ); public: - ScTPValidationHelp( Window* pParent, const SfxItemSet& rArgSet ); + ScTPValidationHelp( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTPValidationHelp(); - static SfxTabPage* Create ( Window* pParent, const SfxItemSet* rArgSet ); + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; @@ -310,10 +310,10 @@ private: DECL_LINK(ClickSearchHdl, void *); public: - ScTPValidationError( Window* pParent, const SfxItemSet& rArgSet ); + ScTPValidationError( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTPValidationError(); - static SfxTabPage* Create ( Window* pParent, const SfxItemSet* rArgSet ); + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index bb3e26373158..515bc67a4f75 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -94,7 +94,7 @@ class ScEditEngineDefaulter; class EditView; class EditStatus; class Outliner; -class Window; +namespace vcl { class Window; } class SfxObjectShell; class SfxBindings; class SfxDispatcher; @@ -240,7 +240,7 @@ public: ScMarkData& GetMarkData(); const ScMarkData& GetMarkData() const; - Window* GetDialogParent(); // forwarded from tabvwsh + vcl::Window* GetDialogParent(); // forwarded from tabvwsh ScGridWindow* GetActiveWin(); // from View ScDrawView* GetScDrawView(); // from View bool IsMinimized(); // from View @@ -404,7 +404,7 @@ public: void ResetEditView(); void SetEditEngine( ScSplitPos eWhich, ScEditEngineDefaulter* pNewEngine, - Window* pWin, SCCOL nNewX, SCROW nNewY ); + vcl::Window* pWin, SCCOL nNewX, SCROW nNewY ); void GetEditView( ScSplitPos eWhich, EditView*& rViewPtr, SCCOL& rCol, SCROW& rRow ); bool HasEditView( ScSplitPos eWhich ) const { return pEditView[eWhich] && bEditActive[eWhich]; } @@ -422,7 +422,7 @@ public: SCCOL GetEditEndCol() const { return nEditEndCol; } SCROW GetEditEndRow() const { return nEditEndRow; } - Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, Window* pWin, + Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, vcl::Window* pWin, const ScPatternAttr* pPattern, bool bForceToTop ); void SetTabNo( SCTAB nNewTab ); diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index a764bf2129bc..cd664cd5b45d 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -68,7 +68,7 @@ private: bool bFormatValid; public: - ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); + ScViewFunc( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); ~ScViewFunc(); const ScPatternAttr* GetSelectionPattern (); diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx index 3111fa511cad..1030abf4818d 100644 --- a/sc/source/ui/inc/warnbox.hxx +++ b/sc/source/ui/inc/warnbox.hxx @@ -28,7 +28,7 @@ class ScCbWarningBox : public WarningBox public: /** @param rMsgStr Resource ID for the message text. @param bDefYes true = "Yes" focused, false = "No" focused. */ - ScCbWarningBox( Window* pParent, const OUString& rMsgStr, bool bDefYes = true ); + ScCbWarningBox( vcl::Window* pParent, const OUString& rMsgStr, bool bDefYes = true ); /** Opens dialog if IsDialogEnabled() returns true. @descr If after executing the dialog the checkbox "Do not show again" is set, @@ -45,7 +45,7 @@ public: class ScReplaceWarnBox : public ScCbWarningBox { public: - ScReplaceWarnBox( Window* pParent ); + ScReplaceWarnBox( vcl::Window* pParent ); /** Reads the configuration key "ReplaceCellsWarning". */ virtual bool IsDialogEnabled() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index c9614895eaf1..1a4407821d97 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -56,7 +56,7 @@ class ScXMLSourceDlg : public ScAnyRefDlg public: ScXMLSourceDlg( - SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDoc); + SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocument* pDoc); virtual bool IsRefInputMode() const SAL_OVERRIDE; virtual void SetReference(const ScRange& rRange, ScDocument* pDoc) SAL_OVERRIDE; diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index aa65b05f7da9..36758e5fdde1 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -79,7 +79,7 @@ ScRedlinData::~ScRedlinData() // class ScAcceptChgDlg -ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData) : SfxModelessDialog(pB, pCW, pParent, "AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui"), @@ -874,7 +874,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, RefHandle) pWnd->SetCloseHdl(LINK( this, ScAcceptChgDlg,RefInfoHandle)); pWnd->SetRefString(pTPFilter->GetRange()); ScSimpleRefDlgWrapper::SetAutoReOpen(false); - Window* pWin=pWnd->GetWindow(); + vcl::Window* pWin=pWnd->GetWindow(); pWin->SetPosSizePixel(GetPosPixel(),GetSizePixel()); Hide(); pWin->SetText(GetText()); @@ -900,7 +900,7 @@ IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, OUString*, pResult) if(pWnd!=NULL) { - Window* pWin=pWnd->GetWindow(); + vcl::Window* pWin=pWnd->GetWindow(); Size aWinSize=pWin->GetSizePixel(); aWinSize.Width()=GetSizePixel().Width(); SetPosSizePixel(pWin->GetPosPixel(),aWinSize); diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 6e1dd5c3d4ba..c402daf3d240 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -95,10 +95,10 @@ void ScFormulaReferenceHelper::enableInput( bool bEnable ) ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); if(pViewSh!=NULL) { - Window *pWin=pViewSh->GetWindow(); + vcl::Window *pWin=pViewSh->GetWindow(); if(pWin) { - Window *pParent=pWin->GetParent(); + vcl::Window *pParent=pWin->GetParent(); if(pParent) { pParent->EnableInput(bEnable,true); @@ -345,7 +345,7 @@ IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator *, pSelAccel ) return long(true); } -typedef std::vector<Window*> winvec; +typedef std::vector<vcl::Window*> winvec; void ScFormulaReferenceHelper::RefInputDone( bool bForced ) { @@ -397,7 +397,7 @@ void ScFormulaReferenceHelper::RefInputDone( bool bForced ) // All others: Show(); for (winvec::iterator aI = m_aHiddenWidgets.begin(); aI != m_aHiddenWidgets.end(); ++aI) { - Window *pWindow = *aI; + vcl::Window *pWindow = *aI; pWindow->Show(); } m_aHiddenWidgets.clear(); @@ -407,7 +407,7 @@ void ScFormulaReferenceHelper::RefInputDone( bool bForced ) pRefEdit->set_width_request(mnOldEditWidthReq); Dialog* pResizeDialog = pRefEdit->GetParentDialog(); pResizeDialog->set_border_width(m_nOldBorderWidth); - if (Window *pActionArea = pResizeDialog->get_action_area()) + if (vcl::Window *pActionArea = pResizeDialog->get_action_area()) pActionArea->Show(); pResizeDialog->setOptimalLayoutSize(); } @@ -417,14 +417,14 @@ void ScFormulaReferenceHelper::RefInputDone( bool bForced ) } } -typedef std::set<Window*> winset; +typedef std::set<vcl::Window*> winset; namespace { - void hideUnless(Window *pTop, const winset& rVisibleWidgets, + void hideUnless(vcl::Window *pTop, const winset& rVisibleWidgets, winvec &rWasVisibleWidgets) { - for (Window* pChild = pTop->GetWindow(WINDOW_FIRSTCHILD); pChild; + for (vcl::Window* pChild = pTop->GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { if (!pChild->IsVisible()) @@ -476,7 +476,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: // Save and adjust window title sOldDialogText = m_pWindow->GetText(); - if (Window *pLabel = pRefEdit->GetLabelWidgetForShrinkMode()) + if (vcl::Window *pLabel = pRefEdit->GetLabelWidgetForShrinkMode()) { OUString sLabel = pLabel->GetText(); if (!sLabel.isEmpty()) @@ -492,11 +492,11 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: if (!mbOldDlgLayoutEnabled) { - for (Window* pChild = m_pWindow->GetWindow(WINDOW_FIRSTCHILD); pChild; + for (vcl::Window* pChild = m_pWindow->GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { - Window *pWin = pChild->GetWindow(WINDOW_CLIENT); - if (pWin == (Window*)pRefEdit || pWin == (Window*)pRefBtn) + vcl::Window *pWin = pChild->GetWindow(WINDOW_CLIENT); + if (pWin == (vcl::Window*)pRefEdit || pWin == (vcl::Window*)pRefBtn) continue; // do nothing else if (pWin->IsVisible()) { @@ -512,8 +512,8 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: //and all its direct parents. winset m_aVisibleWidgets; pResizeDialog = pRefEdit->GetParentDialog(); - Window *pContentArea = pResizeDialog->get_content_area(); - for (Window *pCandidate = pRefEdit; + vcl::Window *pContentArea = pResizeDialog->get_content_area(); + for (vcl::Window *pCandidate = pRefEdit; pCandidate && (pCandidate != pContentArea && pCandidate->IsVisible()); pCandidate = pCandidate->GetWindow(WINDOW_REALPARENT)) { @@ -521,7 +521,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: } //same again with pRefBtn, except stop if there's a //shared parent in the existing widgets - for (Window *pCandidate = pRefBtn; + for (vcl::Window *pCandidate = pRefBtn; pCandidate && (pCandidate != pContentArea && pCandidate->IsVisible()); pCandidate = pCandidate->GetWindow(WINDOW_REALPARENT)) { @@ -581,7 +581,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: pRefEdit->set_width_request(aOldEditSize.Width()); m_nOldBorderWidth = pResizeDialog->get_border_width(); pResizeDialog->set_border_width(0); - if (Window *pActionArea = pResizeDialog->get_action_area()) + if (vcl::Window *pActionArea = pResizeDialog->get_action_area()) pActionArea->Hide(); pResizeDialog->setOptimalLayoutSize(); } @@ -693,10 +693,10 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag, bool bChildren) ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); if(pViewSh!=NULL) { - Window *pWin=pViewSh->GetWindow(); + vcl::Window *pWin=pViewSh->GetWindow(); if(pWin) { - Window *pParent=pWin->GetParent(); + vcl::Window *pParent=pWin->GetParent(); if(pParent) { pParent->EnableInput(bFlag,false); @@ -729,10 +729,10 @@ static void lcl_InvalidateWindows() ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); if(pViewSh!=NULL) { - Window *pWin=pViewSh->GetWindow(); + vcl::Window *pWin=pViewSh->GetWindow(); if(pWin) { - Window *pParent=pWin->GetParent(); + vcl::Window *pParent=pWin->GetParent(); if(pParent) pParent->Invalidate(); } @@ -759,7 +759,7 @@ static void lcl_HideAllReferences() //The class of ScAnyRefDlg is rewritten by PengYunQuan for Validity Cell Range Picker // class ScRefHandler -ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB, bool bBindRef ): +ScRefHandler::ScRefHandler( vcl::Window &rWindow, SfxBindings* pB, bool bBindRef ): m_rWindow( rWindow ), m_bInRefMode( false ), m_aHelper(this,pB), @@ -835,7 +835,7 @@ bool ScRefHandler::LeaveRefMode() lcl_HideAllReferences(); - if( Dialog *pDlg = dynamic_cast<Dialog*>( static_cast<Window*>(*this) ) ) + if( Dialog *pDlg = dynamic_cast<Dialog*>( static_cast<vcl::Window*>(*this) ) ) pDlg->SetModalInputMode(false); SetDispatcherLock( false ); //! here and in DoClose ? @@ -1001,7 +1001,7 @@ void ScRefHandler::RefInputDone( bool bForced ) m_aHelper.RefInputDone( bForced ); } -ScRefHdlModalImpl::ScRefHdlModalImpl(Window* pParent, const OString& rID, +ScRefHdlModalImpl::ScRefHdlModalImpl(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : ModalDialog( pParent, rID, rUIXMLDescription) , ScRefHandler(dynamic_cast<Window&>(*this), NULL, true) @@ -1020,7 +1020,7 @@ void ScRefHdlModalImpl::StateChanged( StateChangedType nStateChange ) ScRefHandler::stateChanged( nStateChange, true ); } -ScAnyRefModalDlg::ScAnyRefModalDlg(Window* pParent, const OString& rID, +ScAnyRefModalDlg::ScAnyRefModalDlg(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : ScRefHdlModalImpl(pParent, rID, rUIXMLDescription) { diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index ec571cec12e4..81253359236d 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -54,7 +54,7 @@ // ScAutoFmtPreview -ScAutoFmtPreview::ScAutoFmtPreview(Window* pParent) +ScAutoFmtPreview::ScAutoFmtPreview(vcl::Window* pParent) : Window(pParent) , pCurData(NULL) , aVD(*this) @@ -73,7 +73,7 @@ ScAutoFmtPreview::ScAutoFmtPreview(Window* pParent) Init(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScAutoFmtPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScAutoFmtPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new ScAutoFmtPreview(pParent); } diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index cda2832adb06..90a42345bb38 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -371,7 +371,7 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA // class ScConflictsDlg -ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ) +ScConflictsDlg::ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ) :ModalDialog( pParent, "ConflictsDialog", "modules/scalc/ui/conflictsdialog.ui" ) ,m_pLbConflictsContainer ( get<SvSimpleTableContainer>("container") ) ,m_pLbConflicts ( new SvxRedlinTable(*m_pLbConflictsContainer) ) diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index c009bd4752c2..5d5e833ca768 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -23,7 +23,7 @@ #include "scresid.hxx" #include "miscdlgs.hrc" -ScColOrRowDlg::ScColOrRowDlg(Window* pParent, const OUString& rStrTitle, +ScColOrRowDlg::ScColOrRowDlg(vcl::Window* pParent, const OUString& rStrTitle, const OUString& rStrLabel, bool bColDefault) : ModalDialog(pParent, "ColOrRowDialog", "modules/scalc/ui/colorrowdialog.ui") diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index a8496f6c0015..9fc3a5145c58 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -38,7 +38,7 @@ const sal_uLong nEntryDataDelim = 2; // note: some of the initialisation is done in Init ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, + vcl::Window* pParent, ScViewData* ptrViewData ) : ScAnyRefDlg ( pB, pCW, pParent, "NameRangesDialog" , "modules/scalc/ui/namerangesdialog.ui" ), diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 3c91496db987..460fd58024d4 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -20,7 +20,7 @@ #define HDL(hdl) LINK( this, ScDataFormDlg, hdl ) -ScDataFormDlg::ScDataFormDlg(Window* pParent, ScTabViewShell* pTabViewShellOri) +ScDataFormDlg::ScDataFormDlg(vcl::Window* pParent, ScTabViewShell* pTabViewShellOri) : ModalDialog(pParent, "DataFormDialog", "modules/scalc/ui/dataform.ui") , pTabViewShell(pTabViewShellOri) , bNoSelection(false) diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index 5dc52bde35a8..345293b81201 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -17,7 +17,7 @@ namespace sc { -DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, Window* pParent) +DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, vcl::Window* pParent) : ModalDialog(pParent, "DataStreamDialog", "modules/scalc/ui/datastreams.ui") , mpDocShell(pDocShell) { diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index e63c58cc142b..06e43a4b5e19 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -25,7 +25,7 @@ static sal_uInt8 nDelItemChecked=0; -ScDeleteCellDlg::ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove) +ScDeleteCellDlg::ScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove) : ModalDialog(pParent, "DeleteCellsDialog", "modules/scalc/ui/deletecells.ui") { get(m_pBtnCellsUp, "up"); diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index 52a48716743f..21eccac2c1b1 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -28,7 +28,7 @@ InsertDeleteFlags ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_S IDF_NOTE | IDF_FORMULA | IDF_VALUE); -ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, +ScDeleteContentsDlg::ScDeleteContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults ) : ModalDialog ( pParent, "DeleteContentsDialog", "modules/scalc/ui/deletecontents.ui" ), diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index deb798d1738f..9067a15bb28c 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -31,7 +31,7 @@ // class ScFillSeriesDlg -ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, +ScFillSeriesDlg::ScFillSeriesDlg( vcl::Window* pParent, ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index 31dff0c2f333..47de6c1b1fe9 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -22,7 +22,7 @@ #include "groupdlg.hxx" #include "scresid.hxx" -ScGroupDlg::ScGroupDlg(Window* pParent, bool bUngroup, bool bRows) +ScGroupDlg::ScGroupDlg(vcl::Window* pParent, bool bUngroup, bool bRows) : ModalDialog(pParent, bUngroup ? OString("UngroupDialog") : diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index e44a966cddf0..c7f5a684168d 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -38,7 +38,7 @@ // class ScHighlightChgDlg -ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData) : ScAnyRefDlg(pB, pCW, pParent, "ShowChangesDialog", "modules/scalc/ui/showchangesdialog.ui") @@ -51,7 +51,7 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind get(m_pCbAccept, "showaccepted"); get(m_pCbReject, "showrejected"); get(m_pEdAssign, "range"); - m_pEdAssign->SetReferences(this, m_pFilterCtr->get<Window>("range")); + m_pEdAssign->SetReferences(this, m_pFilterCtr->get<vcl::Window>("range")); m_pEdAssign->SetSizePixel(m_pEdAssign->get_preferred_size()); get(m_pRbAssign, "rangeref"); m_pRbAssign->SetReferences(this, m_pEdAssign); diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index 3d1f338cd75c..b2f805974027 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -25,7 +25,7 @@ static sal_uInt8 nInsItemChecked=0; -ScInsertCellDlg::ScInsertCellDlg( Window* pParent,bool bDisallowCellMove) : +ScInsertCellDlg::ScInsertCellDlg( vcl::Window* pParent,bool bDisallowCellMove) : ModalDialog ( pParent, "InsertCellsDialog", "modules/scalc/ui/insertcells.ui") { get(m_pBtnCellsDown, "down"); diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 13ad6a460cbc..dcb74f2c7946 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -29,7 +29,7 @@ sal_uInt16 ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0; sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd -ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, +ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults, const OUString* pStrTitle ) diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 8242d3b31740..eda2e79bb4dd 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -34,7 +34,7 @@ #include "globstr.hrc" #include "instbdlg.hxx" -ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile ) +ScInsertTableDlg::ScInsertTableDlg( vcl::Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile ) : ModalDialog(pParent, "InsertSheetDialog", "modules/scalc/ui/insertsheet.ui") , rViewData(rData) , rDoc(*rData.GetDocument()) @@ -120,7 +120,7 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile ) short ScInsertTableDlg::Execute() { // set Parent of DocumentInserter and Doc-Manager - Window* pOldDefParent = Application::GetDefDialogParent(); + vcl::Window* pOldDefParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); if ( m_pBtnFromFile->IsChecked() ) diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 69ef6f032c1e..9fd2f570c257 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -25,7 +25,7 @@ #include "scresid.hxx" #include "miscdlgs.hrc" -ScSelEntryDlg::ScSelEntryDlg(Window* pParent, const std::vector<OUString> &rEntryList) +ScSelEntryDlg::ScSelEntryDlg(vcl::Window* pParent, const std::vector<OUString> &rEntryList) : ModalDialog(pParent, "SelectRangeDialog", "modules/scalc/ui/selectrange.ui") { get(m_pLb, "treeview"); diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 4b9d90ca84b2..b85753ee1f1b 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -37,7 +37,7 @@ #include "docsh.hxx" #include "tablink.hxx" -ScLinkedAreaDlg::ScLinkedAreaDlg(Window* pParent) +ScLinkedAreaDlg::ScLinkedAreaDlg(vcl::Window* pParent) : ModalDialog(pParent, "ExternalDataDialog", "modules/scalc/ui/externaldata.ui") , pSourceShell(NULL) , pDocInserter(NULL) @@ -69,7 +69,7 @@ short ScLinkedAreaDlg::Execute() { // set parent for file dialog or filter options - Window* pOldDefParent = Application::GetDefDialogParent(); + vcl::Window* pOldDefParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); short nRet = ModalDialog::Execute(); diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 107f0b5fe6bf..c6782d1a25a2 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -23,7 +23,7 @@ #include "scresid.hxx" #include "miscdlgs.hrc" -ScMetricInputDlg::ScMetricInputDlg( Window* pParent, +ScMetricInputDlg::ScMetricInputDlg( vcl::Window* pParent, const OString& sDialogName, long nCurrent, long nDefault, diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 65dc45acd880..32d997b971b2 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -29,7 +29,7 @@ #include "scresid.hxx" #include "globstr.hrc" -ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const OUString& rDefault) +ScMoveTableDlg::ScMoveTableDlg(vcl::Window* pParent, const OUString& rDefault) : ModalDialog ( pParent, "MoveCopySheetDialog", "modules/scalc/ui/movecopysheet.ui" ), maDefaultName( rDefault ), diff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxx index 72308b838371..fa876ba2bccc 100644 --- a/sc/source/ui/miscdlgs/namecrea.cxx +++ b/sc/source/ui/miscdlgs/namecrea.cxx @@ -22,7 +22,7 @@ #include "namecrea.hxx" #include "scresid.hxx" -ScNameCreateDlg::ScNameCreateDlg( Window * pParent, sal_uInt16 nFlags ) +ScNameCreateDlg::ScNameCreateDlg( vcl::Window * pParent, sal_uInt16 nFlags ) : ModalDialog(pParent, "CreateNamesDialog", "modules/scalc/ui/createnamesdialog.ui") { get(m_pTopBox, "top"); diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 36050651c662..e65e0cbae03b 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -46,7 +46,7 @@ using namespace com::sun::star; -ScSolverProgressDialog::ScSolverProgressDialog(Window* pParent) +ScSolverProgressDialog::ScSolverProgressDialog(vcl::Window* pParent) : ModelessDialog(pParent, "SolverProgressDialog", "modules/scalc/ui/solverprogressdialog.ui") { @@ -65,14 +65,14 @@ void ScSolverProgressDialog::SetTimeLimit( sal_Int32 nSeconds ) m_pFtTime->SetText( aNew ); } -ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( Window* pParent, const OUString& rErrorText ) +ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( vcl::Window* pParent, const OUString& rErrorText ) : ModalDialog(pParent, "NoSolutionDialog", "modules/scalc/ui/nosolutiondialog.ui") { get(m_pFtErrorText, "error"); m_pFtErrorText->SetText(rErrorText); } -ScSolverSuccessDialog::ScSolverSuccessDialog( Window* pParent, const OUString& rSolution ) +ScSolverSuccessDialog::ScSolverSuccessDialog( vcl::Window* pParent, const OUString& rSolution ) : ModalDialog(pParent, "SolverSuccessDialog", "modules/scalc/ui/solversuccessdialog.ui") { get(m_pFtResult, "result"); @@ -93,12 +93,12 @@ IMPL_LINK( ScSolverSuccessDialog, ClickHdl, PushButton*, pBtn ) return 0; } -ScCursorRefEdit::ScCursorRefEdit( Window* pParent, Window *pLabel ) +ScCursorRefEdit::ScCursorRefEdit( vcl::Window* pParent, vcl::Window *pLabel ) : formula::RefEdit( pParent, pLabel ) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScCursorRefEdit(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScCursorRefEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new ScCursorRefEdit(pParent, NULL); @@ -145,7 +145,7 @@ ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bM // class ScOptSolverDlg -ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocShell* pDocSh, ScAddress aCursorPos ) : ScAnyRefDlg(pB, pCW, pParent, "SolverDialog", "modules/scalc/ui/solverdlg.ui") diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index f82217514d79..5c2e89582887 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -31,7 +31,7 @@ static const ScTableProtection::Option aOptions[] = { }; static const sal_uInt16 nOptionCount = sizeof(aOptions) / sizeof (aOptions[0]); -ScTableProtectionDlg::ScTableProtectionDlg(Window* pParent) +ScTableProtectionDlg::ScTableProtectionDlg(vcl::Window* pParent) : ModalDialog( pParent, "ProtectSheetDialog", "modules/scalc/ui/protectsheetdlg.ui" ) { get(m_pPasswords, "passwords"); diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index 158376a8be8b..f9af84eab2b2 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -26,7 +26,7 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> -ScRedComDialog::ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet, +ScRedComDialog::ScRedComDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, ScDocShell *pShell, ScChangeAction *pAction, bool bPrevNext) : pChangeAction(NULL) , pDocShell(NULL) diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index a029bae05be6..d804ea16a353 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -27,7 +27,7 @@ #include <vcl/msgbox.hxx> -ScRetypePassDlg::ScRetypePassDlg(Window* pParent) : +ScRetypePassDlg::ScRetypePassDlg(vcl::Window* pParent) : ModalDialog(pParent, "RetypePass", "modules/scalc/ui/retypepassdialog.ui"), maTextNotProtected(ScResId(STR_NOT_PROTECTED)), @@ -43,7 +43,7 @@ ScRetypePassDlg::ScRetypePassDlg(Window* pParent) : get(mpBtnOk ,"ok"); get(mpTextDocStatus, "docStatusLabel"); get(mpBtnRetypeDoc, "retypeDocButton"); - Window *pScrolledWindow = get<Window>("scrolledwindow"); + vcl::Window *pScrolledWindow = get<vcl::Window>("scrolledwindow"); Size aSize(LogicToPixel(Size(190, 90), MAP_APPFONT)); pScrolledWindow->set_width_request(aSize.Width()); pScrolledWindow->set_height_request(aSize.Height()); @@ -61,11 +61,11 @@ void ScRetypePassDlg::DeleteSheets() { for(std::vector<VclHBox*>::iterator it = maSheets.begin(); it != maSheets.end(); ++it) { - Window *pWindow = (*it); - Window *pChild = pWindow->GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pWindow = (*it); + vcl::Window *pChild = pWindow->GetWindow(WINDOW_FIRSTCHILD); while (pChild) { - Window *pOldChild = pChild; + vcl::Window *pOldChild = pChild; pChild = pChild->GetWindow(WINDOW_NEXT); delete pOldChild; } @@ -305,7 +305,7 @@ IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, PushButton*, pBtn ) return 0; } -ScRetypePassInputDlg::ScRetypePassInputDlg(Window* pParent, ScPassHashProtectable* pProtected) +ScRetypePassInputDlg::ScRetypePassInputDlg(vcl::Window* pParent, ScPassHashProtectable* pProtected) : ModalDialog(pParent, "RetypePasswordDialog", "modules/scalc/ui/retypepassworddialog.ui") , mpProtected(pProtected) diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index c36b40d5e3ce..f622954d24ca 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -51,7 +51,7 @@ // AutoFormat-Dialog: -ScAutoFormatDlg::ScAutoFormatDlg(Window* pParent, +ScAutoFormatDlg::ScAutoFormatDlg(vcl::Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScViewData *pViewData) diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index ef79599353a4..562342bf20e8 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -69,7 +69,7 @@ public: // class ScShareDocumentDlg -ScShareDocumentDlg::ScShareDocumentDlg( Window* pParent, ScViewData* pViewData ) +ScShareDocumentDlg::ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewData ) : ModalDialog(pParent, "ShareDocumentDialog", "modules/scalc/ui/sharedocumentdlg.ui") , mpViewData(pViewData) , mpDocShell(NULL) diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 72db862fd30c..48ed2c95b5ce 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -25,7 +25,7 @@ #include "scresid.hxx" #include "miscdlgs.hrc" -ScShowTabDlg::ScShowTabDlg(Window* pParent) +ScShowTabDlg::ScShowTabDlg(vcl::Window* pParent) : ModalDialog(pParent, "ShowSheetDialog", "modules/scalc/ui/showsheetdialog.ui") { get(m_pFrame, "frame"); diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 484bb80cc0f7..6736f55a31c8 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -34,7 +34,7 @@ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE #define ABS_DREF3D ABS_DREF | SCA_TAB_3D -ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData) : ScAnyRefDlg(pB, pCW, pParent, "SimpleRefDialog", "modules/scalc/ui/simplerefdialog.ui") , diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 177bc5fd5f0c..25f0330b07e7 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -101,7 +101,7 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const rDev.SetFont( aOldFont ); } -ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, +ScSolverOptionsDialog::ScSolverOptionsDialog( vcl::Window* pParent, const uno::Sequence<OUString>& rImplNames, const uno::Sequence<OUString>& rDescriptions, const OUString& rEngine, @@ -380,7 +380,7 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl) return 0; } -ScSolverIntegerDialog::ScSolverIntegerDialog(Window * pParent) +ScSolverIntegerDialog::ScSolverIntegerDialog(vcl::Window * pParent) : ModalDialog( pParent, "IntegerDialog", "modules/scalc/ui/integerdialog.ui" ) { @@ -408,7 +408,7 @@ sal_Int32 ScSolverIntegerDialog::GetValue() const return (sal_Int32) nValue; } -ScSolverValueDialog::ScSolverValueDialog( Window * pParent ) +ScSolverValueDialog::ScSolverValueDialog( vcl::Window * pParent ) : ModalDialog( pParent, "DoubleDialog", "modules/scalc/ui/doubledialog.ui" ) { diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 0cd255297ae0..f4bdae6b51bd 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -33,13 +33,13 @@ namespace { - void lclErrorDialog( Window* pParent, const OUString& aString ) + void lclErrorDialog( vcl::Window* pParent, const OUString& aString ) { MessageDialog(pParent, aString).Execute(); } } -ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocument* pDocument, ScAddress aCursorPos ) diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index ae04d4b6f6c1..c053016f33fe 100644 --- a/sc/source/ui/miscdlgs/strindlg.cxx +++ b/sc/source/ui/miscdlgs/strindlg.cxx @@ -22,7 +22,7 @@ #include "strindlg.hxx" #include "scresid.hxx" -ScStringInputDlg::ScStringInputDlg( Window* pParent, +ScStringInputDlg::ScStringInputDlg( vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 1953b79225e9..aaf122f6ebbb 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -37,7 +37,7 @@ #define HDL(hdl) LINK(this,ScTabBgColorDlg,hdl) -ScTabBgColorDlg::ScTabBgColorDlg(Window* pParent, const OUString& rTitle, +ScTabBgColorDlg::ScTabBgColorDlg(vcl::Window* pParent, const OUString& rTitle, const OUString& rTabBgColorNoColorText, const Color& rDefaultColor, const OString& sHelpId) : ModalDialog(pParent, "TabColorDialog", "modules/scalc/ui/tabcolordialog.ui") @@ -130,13 +130,13 @@ IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorOKHdl_Impl) return 0; } -ScTabBgColorDlg::ScTabBgColorValueSet::ScTabBgColorValueSet(Window* pParent, WinBits nStyle) +ScTabBgColorDlg::ScTabBgColorValueSet::ScTabBgColorValueSet(vcl::Window* pParent, WinBits nStyle) : SvxColorValueSet(pParent, nStyle) , m_pTabBgColorDlg(NULL) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScTabBgColorValueSet(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScTabBgColorValueSet(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index e81850f6d64a..44d545510111 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -32,7 +32,7 @@ // class ScTabOpDlg -ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocument* pDocument, const ScRefAddress& rCursorPos ) diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 1cfb3cfbb7e7..4051d3ff3761 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -31,7 +31,7 @@ #include <svl/intitem.hxx> #include <svx/flagsdef.hxx> -ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, +ScCharDlg::ScCharDlg( vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ) : SfxTabDialog(pParent, "CharDialog", "modules/scalc/ui/chardialog.ui", pAttr) @@ -62,7 +62,7 @@ void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } } -ScParagraphDlg::ScParagraphDlg(Window* pParent, const SfxItemSet* pAttr) +ScParagraphDlg::ScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr) : SfxTabDialog(pParent, "ParagraphDialog", "modules/scalc/ui/paradialog.ui", pAttr) , m_nTabPageId(0) diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index 6a5863182d37..de69700e75f5 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -24,7 +24,7 @@ #include "scresid.hxx" #include "sc.hrc" -ScCbWarningBox::ScCbWarningBox( Window* pParent, const OUString& rMsgStr, bool bDefYes ) : +ScCbWarningBox::ScCbWarningBox( vcl::Window* pParent, const OUString& rMsgStr, bool bDefYes ) : WarningBox( pParent, WB_YES_NO | (bDefYes ? WB_DEF_YES : WB_DEF_NO), rMsgStr ) { // By default, the check box is ON, and the user needs to un-check it to @@ -54,7 +54,7 @@ void ScCbWarningBox::DisableDialog() { } -ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) : +ScReplaceWarnBox::ScReplaceWarnBox( vcl::Window* pParent ) : ScCbWarningBox( pParent, OUString( ScResId( STR_REPLCELLSWARN ) ), true ) { SetHelpId( HID_SC_REPLCELLSWARN ); diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 36a36d01feb6..214bfb152172 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -32,7 +32,7 @@ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE #define ABS_DREF3D ABS_DREF | SCA_TAB_3D -ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* pViewData, const std::map<OUString, ScRangeName*>& aRangeMap, const ScAddress& aCursorPos, const bool bUndo ) : ScAnyRefDlg( pB, pCW, pParent, "DefineNameDialog", "modules/scalc/ui/definename.ui" ) diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index daa5cf3005bb..6cc2afc689d9 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -47,7 +47,7 @@ //logic -ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData, const ScAddress& aCursorPos, boost::ptr_map<OUString, ScRangeName>* pRangeMap ) : ScAnyRefDlg(pB, pCW, pParent, "ManageNamesDialog", "modules/scalc/ui/managenamesdialog.ui") diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index b03ccf4dfa26..faf2acc87850 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -26,7 +26,7 @@ #include "rangenam.hxx" #include "viewdata.hxx" -ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool ) +ScNamePasteDlg::ScNamePasteDlg( vcl::Window * pParent, ScDocShell* pShell, bool ) : ModalDialog( pParent, "InsertNameDialog", "modules/scalc/ui/insertname.ui" ) { get(m_pBtnPasteAll, "pasteall"); diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 029eca29e968..feab52a78dea 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -112,7 +112,7 @@ ScDocShell* ScContentTree::GetManualOrCurrent() // ScContentTree -ScContentTree::ScContentTree( Window* pParent, const ResId& rResId ) : +ScContentTree::ScContentTree( vcl::Window* pParent, const ResId& rResId ) : SvTreeListBox ( pParent, rResId ), aEntryImages ( ScResId( RID_IMAGELIST_NAVCONT ) ), nRootType ( SC_CONTENT_ROOT ), @@ -483,7 +483,7 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt ) case SC_CONTENT_GRAPHIC: case SC_CONTENT_DRAWING: { - Window* pWindow=(Window*)GetParent(pEntry); + vcl::Window* pWindow=(vcl::Window*)GetParent(pEntry); ScNavigatorDlg* pScNavigatorDlg = (ScNavigatorDlg*)pWindow; ScTabViewShell* pScTabViewShell = NULL; ScDrawView* pScDrawView = NULL; @@ -965,12 +965,12 @@ void ScContentTree::GetDrawNames( sal_uInt16 nType ) SvTreeListEntry* pChild=InsertEntry( aName, pParent ); if(pChild) pChild->SetMarked(false); - Window* pWindow=NULL; + vcl::Window* pWindow=NULL; ScTabViewShell* pScTabViewShell=NULL; ScDrawView* pScDrawView=NULL; ScNavigatorDlg* pScNavigatorDlg=NULL; if(pChild) - pWindow=(Window*)GetParent(pChild); + pWindow=(vcl::Window*)GetParent(pChild); if(pWindow) pScNavigatorDlg = (ScNavigatorDlg*)pWindow; if (pScNavigatorDlg!=NULL) @@ -1219,7 +1219,7 @@ static bool lcl_GetRange( ScDocument* pDoc, sal_uInt16 nType, const OUString& rN return bFound; } -static void lcl_DoDragObject( ScDocShell* pSrcShell, const OUString& rName, sal_uInt16 nType, Window* pWin ) +static void lcl_DoDragObject( ScDocShell* pSrcShell, const OUString& rName, sal_uInt16 nType, vcl::Window* pWin ) { ScDocument& rSrcDoc = pSrcShell->GetDocument(); ScDrawLayer* pModel = rSrcDoc.GetDrawLayer(); @@ -1257,7 +1257,7 @@ static void lcl_DoDragObject( ScDocShell* pSrcShell, const OUString& rName, sal_ } } -static void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, sal_uInt16 nFlags, Window* pWin ) +static void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, sal_uInt16 nFlags, vcl::Window* pWin ) { ScMarkData aMark; aMark.SelectTable( rRange.aStart.Tab(), true ); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index f60f4b25d804..5881dc21e17b 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -70,7 +70,7 @@ void ScNavigatorDlg::ReleaseFocus() if ( pCurSh ) { - Window* pShellWnd = pCurSh->GetWindow(); + vcl::Window* pShellWnd = pCurSh->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); } @@ -480,7 +480,7 @@ ScNavigatorSettings::ScNavigatorSettings() : SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR ) ScNavigatorDialogWrapper::ScNavigatorDialogWrapper( - Window* pParent, + vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBind, SfxChildWinInfo* /* pInfo */ ) : @@ -552,7 +552,7 @@ void ScNavigatorDialogWrapper::Resizing( Size& rSize ) #define REGISTER_SLOT(i,id) \ ppBoundItems[i]=new ScNavigatorControllerItem(id,*this,rBindings); -ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Window* pParent, +ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl::Window* pParent, const bool bUseStyleSettingsBackground) : Window( pParent, ScResId(RID_SCDLG_NAVIGATOR) ), rBindings ( *pB ), // is used in CommandToolBox ctor diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 850c0b3840ca..0466e870c892 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -194,7 +194,7 @@ void ScScenarioListBox::DeleteScenario( bool bQueryBox ) // class ScScenarioWindow ------------------------------------------------ -ScScenarioWindow::ScScenarioWindow( Window* pParent, const OUString& aQH_List, +ScScenarioWindow::ScScenarioWindow( vcl::Window* pParent, const OUString& aQH_List, const OUString& aQH_Comment) : Window ( pParent, WB_TABSTOP | WB_DIALOGCONTROL ), aLbScenario ( *this ), diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 7682e20011c8..12a62b903fe7 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -121,7 +121,7 @@ ScCalcConfig::StringConversion toStringConversion(sal_Int32 nPos) } -ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rConfig) +ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window* pParent, const ScCalcConfig& rConfig) : ModalDialog(pParent, "FormulaCalculationOptions", "modules/scalc/ui/formulacalculationoptions.ui") , maCalcA1(ScResId(SCSTR_FORMULA_SYNTAX_CALC_A1).toString()) @@ -150,23 +150,23 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rC mpBtnAutomaticSelectionTrue->SetToggleHdl(LINK(this, ScCalcOptionsDialog, BtnAutomaticSelectHdl)); - maCaptionStringRefSyntax = get<Window>("ref_syntax_caption")->GetText(); - maDescStringRefSyntax = get<Window>("ref_syntax_desc")->GetText(); - maUseFormulaSyntax = get<Window>("use_formula_syntax")->GetText(); + maCaptionStringRefSyntax = get<vcl::Window>("ref_syntax_caption")->GetText(); + maDescStringRefSyntax = get<vcl::Window>("ref_syntax_desc")->GetText(); + maUseFormulaSyntax = get<vcl::Window>("use_formula_syntax")->GetText(); - maCaptionStringConversion = get<Window>("string_conversion_caption")->GetText(); - maDescStringConversion = get<Window>("string_conversion_desc")->GetText(); - maStringConversionAsError = get<Window>("string_conversion_as_error")->GetText(); - maStringConversionAsZero = get<Window>("string_conversion_as_zero")->GetText(); - maStringConversionUnambiguous = get<Window>("string_conversion_unambiguous")->GetText(); - maStringConversionLocaleDependent = get<Window>("string_conversion_locale_dependent")->GetText(); + maCaptionStringConversion = get<vcl::Window>("string_conversion_caption")->GetText(); + maDescStringConversion = get<vcl::Window>("string_conversion_desc")->GetText(); + maStringConversionAsError = get<vcl::Window>("string_conversion_as_error")->GetText(); + maStringConversionAsZero = get<vcl::Window>("string_conversion_as_zero")->GetText(); + maStringConversionUnambiguous = get<vcl::Window>("string_conversion_unambiguous")->GetText(); + maStringConversionLocaleDependent = get<vcl::Window>("string_conversion_locale_dependent")->GetText(); - maCaptionEmptyStringAsZero = get<Window>("empty_str_as_zero_caption")->GetText(); - maDescEmptyStringAsZero = get<Window>("empty_str_as_zero_desc")->GetText(); + maCaptionEmptyStringAsZero = get<vcl::Window>("empty_str_as_zero_caption")->GetText(); + maDescEmptyStringAsZero = get<vcl::Window>("empty_str_as_zero_desc")->GetText(); - maCaptionOpenCLEnabled = get<Window>("opencl_enabled")->GetText(); - maDescOpenCLEnabled = get<Window>("opencl_enabled_desc")->GetText(); - maSoftware = get<Window>("software")->GetText(); + maCaptionOpenCLEnabled = get<vcl::Window>("opencl_enabled")->GetText(); + maDescOpenCLEnabled = get<vcl::Window>("opencl_enabled_desc")->GetText(); + maSoftware = get<vcl::Window>("software")->GetText(); mpLbSettings->set_height_request(8 * mpLbSettings->GetTextHeight()); mpLbSettings->SetStyle(mpLbSettings->GetStyle() | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE); diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 9097725bf4b6..a26b34437ba7 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -28,7 +28,7 @@ class ScCalcOptionsDialog : public ModalDialog { public: - ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rConfig); + ScCalcOptionsDialog(vcl::Window* pParent, const ScCalcConfig& rConfig); virtual ~ScCalcOptionsDialog(); DECL_LINK( SettingsSelHdl, Control* ); diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index a8080ef5ee70..b19eac983ea9 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -38,7 +38,7 @@ #include "opredlin.hxx" -ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( Window* pParent, +ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent,"OptChangesPage", "modules/scalc/ui/optchangespage.ui", &rSet), aAuthorStr (ScResId(SCSTR_AUTHOR)) @@ -59,7 +59,7 @@ ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage() { } -SfxTabPage* ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* ScRedlineOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new ScRedlineOptionsTabPage( pParent, *rSet ); } diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 662eeabf3210..b8a4e2e477e4 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -35,7 +35,7 @@ #include <math.h> -ScTpCalcOptions::ScTpCalcOptions(Window* pParent, const SfxItemSet& rCoreAttrs) +ScTpCalcOptions::ScTpCalcOptions(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "OptCalculatePage", "modules/scalc/ui/optcalculatepage.ui", &rCoreAttrs) , pOldOptions(new ScDocOptions( @@ -79,7 +79,7 @@ void ScTpCalcOptions::Init() m_pBtnDate1904->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) ); } -SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* ScTpCalcOptions::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new ScTpCalcOptions( pParent, *rAttrSet ) ); } diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 9dc16bacc7fe..10dc87bc0a89 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -15,7 +15,7 @@ #include "scresid.hxx" #include "appoptio.hxx" -ScTpCompatOptions::ScTpCompatOptions(Window *pParent, const SfxItemSet &rCoreAttrs) : +ScTpCompatOptions::ScTpCompatOptions(vcl::Window *pParent, const SfxItemSet &rCoreAttrs) : SfxTabPage(pParent, "OptCompatibilityPage","modules/scalc/ui/optcompatibilitypage.ui", &rCoreAttrs) { get(m_pLbKeyBindings,"keybindings"); @@ -25,7 +25,7 @@ ScTpCompatOptions::~ScTpCompatOptions() { } -SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet *rCoreAttrs) +SfxTabPage* ScTpCompatOptions::Create(vcl::Window *pParent, const SfxItemSet *rCoreAttrs) { return new ScTpCompatOptions(pParent, *rCoreAttrs); } diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 8dd1f4219baa..c53c61395e1f 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -16,7 +16,7 @@ #include "defaultsoptions.hxx" #include "document.hxx" -ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, const SfxItemSet &rCoreSet) : +ScTpDefaultsOptions::ScTpDefaultsOptions(vcl::Window *pParent, const SfxItemSet &rCoreSet) : SfxTabPage(pParent, "OptDefaultPage", "modules/scalc/ui/optdefaultpage.ui", &rCoreSet) { @@ -32,7 +32,7 @@ ScTpDefaultsOptions::~ScTpDefaultsOptions() { } -SfxTabPage* ScTpDefaultsOptions::Create(Window *pParent, const SfxItemSet *rCoreAttrs) +SfxTabPage* ScTpDefaultsOptions::Create(vcl::Window *pParent, const SfxItemSet *rCoreAttrs) { return new ScTpDefaultsOptions(pParent, *rCoreAttrs); } diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 0cedac43dcc2..01641e8796c4 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -38,7 +38,7 @@ using ::com::sun::star::lang::Locale; using ::com::sun::star::i18n::LocaleDataItem; -ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreAttrs) : +ScTpFormulaOptions::ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "OptFormula", "modules/scalc/ui/optformula.ui", &rCoreAttrs), mnDecSep(0) { @@ -220,7 +220,7 @@ IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Edit*, pEdit ) return 0; } -SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet* rCoreSet) +SfxTabPage* ScTpFormulaOptions::Create(vcl::Window* pParent, const SfxItemSet* rCoreSet) { return new ScTpFormulaOptions(pParent, *rCoreSet); } diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 9b65283d7cd1..99d13ac98256 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -27,7 +27,7 @@ #include "scresid.hxx" #include "sc.hrc" -ScTpPrintOptions::ScTpPrintOptions( Window* pParent, +ScTpPrintOptions::ScTpPrintOptions( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage ( pParent, "optCalcPrintPage", @@ -43,7 +43,7 @@ ScTpPrintOptions::~ScTpPrintOptions() { } -SfxTabPage* ScTpPrintOptions::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* ScTpPrintOptions::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new ScTpPrintOptions( pParent, *rAttrSet ); } diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 71b038c8077a..aa331aae35db 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -44,7 +44,7 @@ static const sal_Unicode cDelimiter = ','; // Benutzerdefinierte Listen: -ScTpUserLists::ScTpUserLists( Window* pParent, +ScTpUserLists::ScTpUserLists( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage ( pParent, @@ -135,7 +135,7 @@ void ScTpUserLists::Init() } -SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* ScTpUserLists::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new ScTpUserLists( pParent, *rAttrSet ) ); } diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 0beeeb909b20..2d81b53ecdcd 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -37,7 +37,7 @@ // STATIC DATA ----------------------------------------------------------- -ScTpContentOptions::ScTpContentOptions( Window* pParent, +ScTpContentOptions::ScTpContentOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage(pParent, "TpViewPage", "modules/scalc/ui/tpviewpage.ui", &rArgSet), pLocalOptions(0) @@ -98,7 +98,7 @@ ScTpContentOptions::~ScTpContentOptions() delete pLocalOptions; } -SfxTabPage* ScTpContentOptions::Create( Window* pParent, +SfxTabPage* ScTpContentOptions::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return new ScTpContentOptions(pParent, *rCoreSet); @@ -346,7 +346,7 @@ IMPL_LINK( ScTpContentOptions, GridHdl, ListBox*, pLb ) return 0; } -ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent, +ScTpLayoutOptions::ScTpLayoutOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage( pParent, "ScGeneralPage", "modules/scalc/ui/scgeneralpage.ui", &rArgSet), @@ -408,7 +408,7 @@ ScTpLayoutOptions::~ScTpLayoutOptions() { } -SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, +SfxTabPage* ScTpLayoutOptions::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { ScTpLayoutOptions* pNew = new ScTpLayoutOptions(pParent, *rCoreSet); diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 982816334f2d..61a6ad69a0b3 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -86,7 +86,7 @@ static void printAddressFlags(sal_uInt16 nFlag) // class ScPrintAreasDlg -ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ) +ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent ) : ScAnyRefDlg(pB, pCW, pParent, "PrintAreasDialog", "modules/scalc/ui/printareasdialog.ui") , bDlgLostFocus(false) , pDoc(NULL) diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index 07d835cb649d..bfd430d0c977 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -42,7 +42,7 @@ Get(ATTR_PAGE_SHARED)).GetValue() ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, const OString& rID, const OUString& rUIXMLDescription ) @@ -58,7 +58,7 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, } ScHFEditHeaderDlg::ScHFEditHeaderDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -69,7 +69,7 @@ ScHFEditHeaderDlg::ScHFEditHeaderDlg( SfxViewFrame* pFrameP, } ScHFEditFooterDlg::ScHFEditFooterDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -80,7 +80,7 @@ ScHFEditFooterDlg::ScHFEditFooterDlg( SfxViewFrame* pFrameP, } ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -90,7 +90,7 @@ ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg( SfxViewFrame* pFrameP, } ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -100,7 +100,7 @@ ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg( SfxViewFrame* pFrameP, } ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -110,7 +110,7 @@ ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg( SfxViewFrame* pFrameP, } ScHFEditRightFooterDlg::ScHFEditRightFooterDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -120,7 +120,7 @@ ScHFEditRightFooterDlg::ScHFEditRightFooterDlg( SfxViewFrame* pFrameP, } ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -132,7 +132,7 @@ ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg( SfxViewFrame* pFrameP, } ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -144,7 +144,7 @@ ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg( SfxViewFrame* pFrameP, } ScHFEditAllDlg::ScHFEditAllDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -157,7 +157,7 @@ ScHFEditAllDlg::ScHFEditAllDlg( SfxViewFrame* pFrameP, } ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 6feb8f595fe2..d01f01c4265d 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -55,7 +55,7 @@ static ScEditWindow* pActiveEdWnd = NULL; // class ScHFEditPage -ScHFEditPage::ScHFEditPage( Window* pParent, +ScHFEditPage::ScHFEditPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs, sal_uInt16 nWhichId, bool bHeader ) @@ -114,8 +114,8 @@ ScHFEditPage::ScHFEditPage( Window* pParent, //swap left/right areas and their lables in RTL mode if( Application::GetSettings().GetLayoutRTL() ) { - Window *pLeft = get<Window>("labelFT_LEFT"); - Window *pRight = get<Window>("labelFT_RIGHT"); + vcl::Window *pLeft = get<vcl::Window>("labelFT_LEFT"); + vcl::Window *pRight = get<vcl::Window>("labelFT_RIGHT"); sal_Int32 nOldLeftAttach = pLeft->get_grid_left_attach(); sal_Int32 nOldRightAttach = pRight->get_grid_left_attach(); pLeft->set_grid_left_attach(nOldRightAttach); @@ -827,50 +827,50 @@ IMPL_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn ) // class ScRightHeaderEditPage -ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet ) +ScRightHeaderEditPage::ScRightHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_HEADERRIGHT ), true ) {} -SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScRightHeaderEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScRightHeaderEditPage( pParent, *rCoreSet ) ); }; // class ScLeftHeaderEditPage -ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet ) +ScLeftHeaderEditPage::ScLeftHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_HEADERLEFT ), true ) {} -SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScLeftHeaderEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScLeftHeaderEditPage( pParent, *rCoreSet ) ); }; // class ScRightFooterEditPage -ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet ) +ScRightFooterEditPage::ScRightFooterEditPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_FOOTERRIGHT ), false ) {} -SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScRightFooterEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScRightFooterEditPage( pParent, *rCoreSet ) ); }; // class ScLeftFooterEditPage -ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet ) +ScLeftFooterEditPage::ScLeftFooterEditPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_FOOTERLEFT ), false ) {} -SfxTabPage* ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScLeftFooterEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScLeftFooterEditPage( pParent, *rCoreSet ) ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index d5e80c0c5399..21054e5effe2 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -40,7 +40,7 @@ // class ScHFPage -ScHFPage::ScHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) +ScHFPage::ScHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) : SvxHFPage ( pParent, rSet, nSetId ), aDataSet ( *rSet.GetPool(), @@ -234,12 +234,12 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl) // class ScHeaderPage -ScHeaderPage::ScHeaderPage( Window* pParent, const SfxItemSet& rSet ) +ScHeaderPage::ScHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet ) : ScHFPage( pParent, rSet, SID_ATTR_PAGE_HEADERSET ) { } -SfxTabPage* ScHeaderPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScHeaderPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScHeaderPage( pParent, *rCoreSet ) ); } @@ -251,12 +251,12 @@ const sal_uInt16* ScHeaderPage::GetRanges() // class ScFooterPage -ScFooterPage::ScFooterPage( Window* pParent, const SfxItemSet& rSet ) +ScFooterPage::ScFooterPage( vcl::Window* pParent, const SfxItemSet& rSet ) : ScHFPage( pParent, rSet, SID_ATTR_PAGE_FOOTERSET ) { } -SfxTabPage* ScFooterPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScFooterPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScFooterPage( pParent, *rCoreSet ) ); } diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index da94badf402e..c6ce541199a7 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -68,7 +68,7 @@ static void lcl_GetFieldData( ScHeaderFieldData& rData ) // class ScEditWindow -ScEditWindow::ScEditWindow( Window* pParent, WinBits nBits, ScEditWindowLocation eLoc ) +ScEditWindow::ScEditWindow( vcl::Window* pParent, WinBits nBits, ScEditWindowLocation eLoc ) : Control( pParent, nBits ), eLocation(eLoc), pAcc(NULL) @@ -129,7 +129,7 @@ ScEditWindow::~ScEditWindow() delete pEdView; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScEditWindow(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScEditWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new ScEditWindow (pParent, WB_BORDER|WB_TABSTOP, Left); } @@ -327,7 +327,7 @@ void ScEditWindow::LoseFocus() return pAcc; } -ScExtIButton::ScExtIButton(Window* pParent, WinBits nBits ) +ScExtIButton::ScExtIButton(vcl::Window* pParent, WinBits nBits ) : ImageButton(pParent,nBits), pPopupMenu(NULL) { nSelected=0; @@ -335,7 +335,7 @@ ScExtIButton::ScExtIButton(Window* pParent, WinBits nBits ) SetDropDown(PUSHBUTTON_DROPDOWN_TOOLBOX); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScExtIButton(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScExtIButton(vcl::Window *pParent, VclBuilder::stringmap &) { return new ScExtIButton (pParent, 0);// WB_BORDER|WB_TABSTOP); } diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index aa58550fd7f7..67793662e95d 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -79,7 +79,7 @@ static bool lcl_PutBoolItem( sal_uInt16 nWhich, #define SC_TPTABLE_SCALE_TO 1 #define SC_TPTABLE_SCALE_TO_PAGES 2 -ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) : +ScTablePage::ScTablePage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage( pParent, "SheetPrintPage","modules/scalc/ui/sheetprintpage.ui", &rCoreAttrs ) { @@ -132,7 +132,7 @@ const sal_uInt16* ScTablePage::GetRanges() return pPageTableRanges; } -SfxTabPage* ScTablePage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScTablePage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScTablePage( pParent, *rCoreSet ) ); } diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 03432bec2530..3e59aea864ca 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -36,7 +36,7 @@ using namespace css::uno; namespace sc { namespace sidebar { AlignmentPropertyPanel::AlignmentPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "AlignmentPropertyPanel", "modules/scalc/ui/sidebaralignment.ui", rxFrame), @@ -186,7 +186,7 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG) } AlignmentPropertyPanel* AlignmentPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 1f0649c276cf..32c705ba2c02 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -40,7 +40,7 @@ class AlignmentPropertyPanel { public: static AlignmentPropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); @@ -92,7 +92,7 @@ private: // constructor/destuctor AlignmentPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~AlignmentPropertyPanel(); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index 49bfa73a0570..8d2ade9ab010 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -139,7 +139,7 @@ void CellAppearancePropertyPanel::EndCellBorderStylePopupMode(void) } CellAppearancePropertyPanel::CellAppearancePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "CellAppearancePropertyPanel", "modules/scalc/ui/sidebarcellappearance.ui", rxFrame), @@ -339,7 +339,7 @@ IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG) } CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 6538a70c5b3c..90cb2012d4df 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -49,7 +49,7 @@ private: public: static CellAppearancePropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); @@ -172,7 +172,7 @@ private: // constructor/destuctor CellAppearancePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~CellAppearancePropertyPanel(); diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index ab45a9236a87..31b10db7dad2 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -42,7 +42,7 @@ namespace sc { namespace sidebar { #define FRM_VALID_OUTER 0x0f #define FRM_VALID_ALL 0xff -CellBorderStyleControl::CellBorderStyleControl(Window* pParent, CellAppearancePropertyPanel& rPanel) +CellBorderStyleControl::CellBorderStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel) : svx::sidebar::PopupControl(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE)), mrCellAppearancePropertyPanel(rPanel), maTBBorder1(this, ScResId(TB_BORDER1)), diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx index 3c353cba8781..7cf04e2d68fd 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx @@ -46,7 +46,7 @@ private: DECL_LINK(TB3SelectHdl, ToolBox *); public: - CellBorderStyleControl(Window* pParent, CellAppearancePropertyPanel& rPanel); + CellBorderStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel); virtual ~CellBorderStyleControl(void); }; diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.cxx b/sc/source/ui/sidebar/CellBorderStylePopup.cxx index 972b7762bcbf..ae491f611005 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.cxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.cxx @@ -23,7 +23,7 @@ namespace sc { namespace sidebar { CellBorderStylePopup::CellBorderStylePopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator) : Popup(pParent, rControlCreator, ::OUString("CellBorderStyle")) { diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.hxx b/sc/source/ui/sidebar/CellBorderStylePopup.hxx index 2cc6d43bb19e..de5b3727cafd 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.hxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.hxx @@ -28,7 +28,7 @@ class CellBorderStylePopup : public svx::sidebar::Popup { public : CellBorderStylePopup( - Window* pParent, + vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator); virtual ~CellBorderStylePopup(void); }; diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 32455bfb0467..fcb00dfd1510 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -33,7 +33,7 @@ namespace sc { namespace sidebar { -CellLineStyleControl::CellLineStyleControl(Window* pParent, CellAppearancePropertyPanel& rPanel) +CellLineStyleControl::CellLineStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel) : svx::sidebar::PopupControl(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE)), mrCellAppearancePropertyPanel(rPanel), maPushButtonMoreOptions(this, ScResId(PB_OPTIONS)), diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index 78efddac6995..a00079ac8dbd 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -45,7 +45,7 @@ private: DECL_LINK(PBClickHdl, PushButton*); public: - CellLineStyleControl(Window* pParent, CellAppearancePropertyPanel& rPanel); + CellLineStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel); void GetFocus() SAL_OVERRIDE; void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis); diff --git a/sc/source/ui/sidebar/CellLineStylePopup.cxx b/sc/source/ui/sidebar/CellLineStylePopup.cxx index 528bce04c395..fa56a7700824 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.cxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.cxx @@ -23,7 +23,7 @@ namespace sc { namespace sidebar { CellLineStylePopup::CellLineStylePopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator) : Popup(pParent, rControlCreator, OUString("CellLineStyle")) { diff --git a/sc/source/ui/sidebar/CellLineStylePopup.hxx b/sc/source/ui/sidebar/CellLineStylePopup.hxx index 82c1a794a963..cfca1afe76b7 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.hxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.hxx @@ -28,7 +28,7 @@ class CellLineStylePopup : public svx::sidebar::Popup { public : CellLineStylePopup( - Window* pParent, + vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator); virtual ~CellLineStylePopup(void); diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx index ee2b9a7ec514..fc0d3e472dcb 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx @@ -23,7 +23,7 @@ namespace sc { namespace sidebar { -CellLineStyleValueSet::CellLineStyleValueSet( Window* pParent, const ResId& rResId) +CellLineStyleValueSet::CellLineStyleValueSet( vcl::Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ), pVDev(NULL), nSelItem(0) diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx index ad35fdc94873..969f346005d4 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx @@ -33,7 +33,7 @@ private: sal_uInt16 nSelItem; OUString maStrUnit[CELL_LINE_STYLE_ENTRIES]; public: - CellLineStyleValueSet( Window* pParent, const ResId& rResId); + CellLineStyleValueSet( vcl::Window* pParent, const ResId& rResId); virtual ~CellLineStyleValueSet(); void SetUnit(const OUString* str); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index a63f065182e7..f19d78e3a503 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -46,7 +46,7 @@ const char UNO_INSERTFIXEDTEXT[] = ".uno:InsertFixedText"; namespace sc { namespace sidebar { NumberFormatPropertyPanel::NumberFormatPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent,"NumberFormatPropertyPanel", "modules/scalc/ui/sidebarnumberformat.ui", rxFrame), @@ -167,7 +167,7 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatValueHdl, void*, EMPTYARG ) } NumberFormatPropertyPanel* NumberFormatPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 3c34b375694b..984257e92256 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -38,7 +38,7 @@ class NumberFormatPropertyPanel public: public: static NumberFormatPropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); @@ -80,7 +80,7 @@ private: // constructor/destuctor NumberFormatPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~NumberFormatPropertyPanel(); diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index cd0e946ae389..cb7a91a5b6c8 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -93,7 +93,7 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings", sal_uInt64(0))); SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue); - ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if ( ! xParentWindow.is() || pParentWindow==NULL) throw RuntimeException( "PanelFactory::createUIElement called without ParentWindow", @@ -137,7 +137,7 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( } else if (DoesResourceEndWith("/NavigatorPanel")) { - Window* pPanel = new ScNavigatorDlg(pBindings, NULL, pParentWindow, false); + vcl::Window* pPanel = new ScNavigatorDlg(pBindings, NULL, pParentWindow, false); xElement = sfx2::sidebar::SidebarPanelBase::Create( rsResourceURL, xFrame, @@ -146,7 +146,7 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( } else if (DoesResourceEndWith("/FunctionsPanel")) { - Window* pPanel = new ScFunctionDockWin(pBindings, NULL, pParentWindow, ScResId(FID_FUNCTION_BOX)); + vcl::Window* pPanel = new ScFunctionDockWin(pBindings, NULL, pParentWindow, ScResId(FID_FUNCTION_BOX)); xElement = sfx2::sidebar::SidebarPanelBase::Create( rsResourceURL, xFrame, diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index 4502b111733c..c6dfe8e5d3c8 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -39,7 +39,7 @@ #include <svl/aeitem.hxx> #include <svx/flagsdef.hxx> -ScStyleDlg::ScStyleDlg( Window* pParent, +ScStyleDlg::ScStyleDlg( vcl::Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId ) diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 9750e70d9e8e..be1db435025f 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -229,7 +229,7 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName, sal_Int64 nAspect(embed::Aspects::MSOLE_CONTENT); MapUnit aMapUnit(VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( nAspect ) )); Size aSize(aInsRect.GetSize()); - aSize = Window::LogicToLogic( aSize, MapMode( MAP_100TH_MM ), MapMode( aMapUnit ) ); + aSize = vcl::Window::LogicToLogic( aSize, MapMode( MAP_100TH_MM ), MapMode( aMapUnit ) ); awt::Size aSz; aSz.Width = aSize.Width(); aSz.Height = aSize.Height(); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 9a255233e384..4fa327f198f7 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -300,7 +300,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScViewPaneBase::getReferredCells() namespace { - bool lcl_prepareFormShellCall( ScTabViewShell* _pViewShell, sal_uInt16 _nPane, FmFormShell*& _rpFormShell, Window*& _rpWindow, SdrView*& _rpSdrView ) + bool lcl_prepareFormShellCall( ScTabViewShell* _pViewShell, sal_uInt16 _nPane, FmFormShell*& _rpFormShell, vcl::Window*& _rpWindow, SdrView*& _rpSdrView ) { if ( !_pViewShell ) return false; @@ -323,7 +323,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFor uno::Reference< form::runtime::XFormController > xController; - Window* pWindow( NULL ); + vcl::Window* pWindow( NULL ); SdrView* pSdrView( NULL ); FmFormShell* pFormShell( NULL ); if ( lcl_prepareFormShellCall( pViewShell, nPane, pFormShell, pWindow, pSdrView ) ) @@ -349,7 +349,7 @@ void SAL_CALL ScViewPaneBase::setFormDesignMode( sal_Bool _DesignMode ) throw (u { SolarMutexGuard aGuard; - Window* pWindow( NULL ); + vcl::Window* pWindow( NULL ); SdrView* pSdrView( NULL ); FmFormShell* pFormShell( NULL ); if ( lcl_prepareFormShellCall( pViewShell, nPane, pFormShell, pWindow, pSdrView ) ) @@ -366,7 +366,7 @@ uno::Reference<awt::XControl> SAL_CALL ScViewPaneBase::getControl( uno::Reference<awt::XControl> xRet; - Window* pWindow( NULL ); + vcl::Window* pWindow( NULL ); SdrView* pSdrView( NULL ); FmFormShell* pFormShell( NULL ); if ( lcl_prepareFormShellCall( pViewShell, nPane, pFormShell, pWindow, pSdrView ) ) @@ -1137,7 +1137,7 @@ uno::Reference< uno::XInterface > ScTabViewObj::GetClickedObject(const Point& rP if (pDrawPage && pDrawView && pDrawView->GetSdrPageView()) { - Window* pActiveWin = rData.GetActiveWin(); + vcl::Window* pActiveWin = rData.GetActiveWin(); Point aPos = pActiveWin->PixelToLogic(rPoint); sal_uInt16 nHitLog = (sal_uInt16) pActiveWin->PixelToLogic( @@ -1692,7 +1692,7 @@ void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRow pViewSh->RemoveSplit(); Point aWinStart; - Window* pWin = pViewSh->GetWindowByPos( SC_SPLIT_BOTTOMLEFT ); + vcl::Window* pWin = pViewSh->GetWindowByPos( SC_SPLIT_BOTTOMLEFT ); if (pWin) aWinStart = pWin->GetPosPixel(); @@ -1973,7 +1973,7 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName else if ( aString.equalsAscii( SC_UNO_VISAREASCREEN ) ) { ScViewData& rViewData = pViewSh->GetViewData(); - Window* pActiveWin = rViewData.GetActiveWin(); + vcl::Window* pActiveWin = rViewData.GetActiveWin(); if ( pActiveWin ) { Rectangle aRect = pActiveWin->GetWindowExtentsRelative( NULL ); diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 2e18439ff2c1..6a745588fc16 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -195,7 +195,7 @@ void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, InsertDele if ( pTabViewShell ) { ScViewData& rView = pTabViewShell->GetViewData(); - Window* pWin = rView.GetActiveWin(); + vcl::Window* pWin = rView.GetActiveWin(); if (pWin) { ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index a0cb6d060a67..9d76d4417fa2 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -152,24 +152,24 @@ private: void stopModelListening(); /** Returns the controller for the passed VCL window. */ - uno::Reference< frame::XController > getControllerForWindow( Window* pWindow ) const; + uno::Reference< frame::XController > getControllerForWindow( vcl::Window* pWindow ) const; /** Calls the Workbook_Window[Activate|Deactivate] event handler. */ - void processWindowActivateEvent( Window* pWindow, bool bActivate ); + void processWindowActivateEvent( vcl::Window* pWindow, bool bActivate ); /** Posts a Workbook_WindowResize user event. */ - void postWindowResizeEvent( Window* pWindow ); + void postWindowResizeEvent( vcl::Window* pWindow ); /** Callback link for Application::PostUserEvent(). */ - DECL_LINK( processWindowResizeEvent, Window* ); + DECL_LINK( processWindowResizeEvent, vcl::Window* ); private: - typedef ::std::map< Window*, uno::Reference< frame::XController > > WindowControllerMap; + typedef ::std::map< vcl::Window*, uno::Reference< frame::XController > > WindowControllerMap; ::osl::Mutex maMutex; ScVbaEventsHelper& mrVbaEvents; uno::Reference< frame::XModel > mxModel; ScDocShell* mpDocShell; WindowControllerMap maControllers; /// Maps VCL top windows to their controllers. - Window* mpActiveWindow; /// Currently activated window, to prevent multiple (de)activation. + vcl::Window* mpActiveWindow; /// Currently activated window, to prevent multiple (de)activation. bool mbWindowResized; /// True = window resize system event processed. bool mbBorderChanged; /// True = borders changed system event processed. bool mbDisposed; @@ -218,7 +218,7 @@ void ScVbaEventListener::startControllerListening( const uno::Reference< frame:: if( xControllerBorder.is() ) try { xControllerBorder->addBorderResizeListener( this ); } catch( uno::Exception& ) {} - if( Window* pWindow = VCLUnoHelper::GetWindow( xWindow ) ) + if( vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ) ) maControllers[ pWindow ] = rxController; } @@ -238,7 +238,7 @@ void ScVbaEventListener::stopControllerListening( const uno::Reference< frame::X if( xControllerBorder.is() ) try { xControllerBorder->removeBorderResizeListener( this ); } catch( uno::Exception& ) {} - if( Window* pWindow = VCLUnoHelper::GetWindow( xWindow ) ) + if( vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ) ) { maControllers.erase( pWindow ); if( pWindow == mpActiveWindow ) @@ -273,7 +273,7 @@ void SAL_CALL ScVbaEventListener::windowActivated( const lang::EventObject& rEve if( !mbDisposed ) { uno::Reference< awt::XWindow > xWindow( rEvent.Source, uno::UNO_QUERY ); - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); OSL_TRACE( "ScVbaEventListener::windowActivated - pWindow = 0x%p, mpActiveWindow = 0x%p", pWindow, mpActiveWindow ); // do not fire activation event multiple time for the same window if( pWindow && (pWindow != mpActiveWindow) ) @@ -295,7 +295,7 @@ void SAL_CALL ScVbaEventListener::windowDeactivated( const lang::EventObject& rE if( !mbDisposed ) { uno::Reference< awt::XWindow > xWindow( rEvent.Source, uno::UNO_QUERY ); - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); OSL_TRACE( "ScVbaEventListener::windowDeactivated - pWindow = 0x%p, mpActiveWindow = 0x%p", pWindow, mpActiveWindow ); // do not fire the deactivation event, if the window is not active (prevent multiple deactivation) if( pWindow && (pWindow == mpActiveWindow) ) @@ -444,13 +444,13 @@ void ScVbaEventListener::stopModelListening() } } -uno::Reference< frame::XController > ScVbaEventListener::getControllerForWindow( Window* pWindow ) const +uno::Reference< frame::XController > ScVbaEventListener::getControllerForWindow( vcl::Window* pWindow ) const { WindowControllerMap::const_iterator aIt = maControllers.find( pWindow ); return (aIt == maControllers.end()) ? uno::Reference< frame::XController >() : aIt->second; } -void ScVbaEventListener::processWindowActivateEvent( Window* pWindow, bool bActivate ) +void ScVbaEventListener::processWindowActivateEvent( vcl::Window* pWindow, bool bActivate ) { uno::Reference< frame::XController > xController = getControllerForWindow( pWindow ); if( xController.is() ) @@ -461,7 +461,7 @@ void ScVbaEventListener::processWindowActivateEvent( Window* pWindow, bool bActi } } -void ScVbaEventListener::postWindowResizeEvent( Window* pWindow ) +void ScVbaEventListener::postWindowResizeEvent( vcl::Window* pWindow ) { // check that the passed window is still alive (it must be registered in maControllers) if( pWindow && (maControllers.count( pWindow ) > 0) ) @@ -472,7 +472,7 @@ void ScVbaEventListener::postWindowResizeEvent( Window* pWindow ) } } -IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, Window*, EMPTYARG pWindow ) +IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, vcl::Window*, EMPTYARG pWindow ) { ::osl::MutexGuard aGuard( maMutex ); @@ -487,7 +487,7 @@ IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, Window*, EMPTYARG pWind if( !mbDisposed && pWindow && (maControllers.count( pWindow ) > 0) ) { // do not fire event unless all mouse buttons have been released - Window::PointerState aPointerState = pWindow->GetPointerState(); + vcl::Window::PointerState aPointerState = pWindow->GetPointerState(); if( (aPointerState.mnState & (MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT)) == 0 ) { uno::Reference< frame::XController > xController = getControllerForWindow( pWindow ); diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index a29ae357f88f..4976326d87db 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -207,7 +207,7 @@ void implnPasteSpecial(sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpt if ( pTabViewShell ) { ScViewData* pView = pTabViewShell->GetViewData(); - Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL; + vcl::Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL; if ( pView && pWin ) { if ( bAsLink && bOtherDoc ) diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 4af143c894f5..8a03fc4e8847 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -373,7 +373,7 @@ static bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDat void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ) { - Window* pWin = GetViewData()->GetActiveWin(); + vcl::Window* pWin = GetViewData()->GetActiveWin(); bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) ); @@ -467,7 +467,7 @@ bool checkDestRanges(ScViewData& rViewData) // Multiple destination ranges. ScDocument* pDoc = rViewData.GetDocument(); - Window* pWin = rViewData.GetActiveWin(); + vcl::Window* pWin = rViewData.GetActiveWin(); if (!pWin) return false; @@ -505,7 +505,7 @@ void ScCellShell::GetClipState( SfxItemSet& rSet ) // create listener pImpl->m_pClipEvtLstnr = new TransferableClipboardListener( LINK( this, ScCellShell, ClipboardChanged ) ); pImpl->m_pClipEvtLstnr->acquire(); - Window* pWin = GetViewData()->GetActiveWin(); + vcl::Window* pWin = GetViewData()->GetActiveWin(); pImpl->m_pClipEvtLstnr->AddRemoveListener( pWin, true ); // get initial state @@ -1047,7 +1047,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) if ( pViewFrame && pViewFrame->HasChildWindow( nWhich ) ) { SfxChildWindow* pChild = pViewFrame->GetChildWindow( nWhich ); - Window* pWin = ( pChild ? pChild->GetWindow() : NULL ); + vcl::Window* pWin = ( pChild ? pChild->GetWindow() : NULL ); if ( pWin && pWin->IsVisible() ) { bVisible = true; diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 93439bf32d11..bb9ce1ad1cae 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1258,7 +1258,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( nFormat ) { - Window* pWin = GetViewData()->GetActiveWin(); + vcl::Window* pWin = GetViewData()->GetActiveWin(); bool bCells = ( ScTransferObj::GetOwnClipboard( pWin ) != NULL ); bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); bool bOle = ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE ); @@ -1287,7 +1287,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) bool bAsLink = false; InsCellCmd eMoveMode = INS_NONE; - Window* pWin = GetViewData()->GetActiveWin(); + vcl::Window* pWin = GetViewData()->GetActiveWin(); ScDocument* pDoc = GetViewData()->GetDocument(); bool bOtherDoc = !pDoc->IsClipboardSource(); ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); @@ -1475,7 +1475,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) case SID_PASTE_ONLY_TEXT: case SID_PASTE_ONLY_FORMULA: { - Window* pWin = GetViewData()->GetActiveWin(); + vcl::Window* pWin = GetViewData()->GetActiveWin(); if ( ScTransferObj::GetOwnClipboard( pWin ) ) // own cell data { rReq.SetSlot( FID_INS_CELL_CONTENTS ); @@ -1499,7 +1499,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // differentiate between own cell data and draw objects/external data // this makes FID_INS_CELL_CONTENTS superfluous { - Window* pWin = GetViewData()->GetActiveWin(); + vcl::Window* pWin = GetViewData()->GetActiveWin(); // Clipboard-ID given as parameter? Basic "PasteSpecial(Format)" const SfxPoolItem* pItem=NULL; diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 273296b95ed8..09ba55e8c1fb 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -779,7 +779,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_AUTOFORMAT: { - Window* pDlgParent = pTabViewShell->GetDialogParent(); + vcl::Window* pDlgParent = pTabViewShell->GetDialogParent(); SCCOL nStartCol; SCROW nStartRow; SCTAB nStartTab; diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx index 2c3171c6b0d2..8b08840c6ba8 100644 --- a/sc/source/ui/view/cliputil.cxx +++ b/sc/source/ui/view/cliputil.cxx @@ -24,7 +24,7 @@ void ScClipUtil::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, bool bShowDialog ) { - Window* pWin = pViewData->GetActiveWin(); + vcl::Window* pWin = pViewData->GetActiveWin(); ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); ScDocument* pThisDoc = pViewData->GetDocument(); ScDPObject* pDPObj = pThisDoc->GetDPAtCursor( pViewData->GetCurX(), diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index 3bc9c474d707..e5608552ec0c 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -52,7 +52,7 @@ static OUString lcl_MetricString( long nTwips, const OUString& rText ) } } -ScColBar::ScColBar( Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, +ScColBar::ScColBar( vcl::Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : ScHeaderControl( pParent, pEng, MAXCOL+1, false ), pViewData( pData ), @@ -211,7 +211,7 @@ bool ScColBar::IsLayoutRTL() const // overloaded only for columns return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); } -ScRowBar::ScRowBar( Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, +ScRowBar::ScRowBar( vcl::Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : ScHeaderControl( pParent, pEng, MAXROW+1, true ), pViewData( pData ), diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index b0c0efc66e84..06b0f3120ba0 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -37,7 +37,7 @@ #include "queryentry.hxx" #include "markdata.hxx" -ScDBFunc::ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : +ScDBFunc::ScDBFunc( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScViewFunc( pParent, rDocSh, pViewShell ) { } diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx index 5c4396d5e8aa..1bab90d9a35d 100644 --- a/sc/source/ui/view/drawvie2.cxx +++ b/sc/source/ui/view/drawvie2.cxx @@ -28,12 +28,12 @@ void ScDrawView::UpdateBrowser() // VC's und den Browser dazu gibts nicht mehr... } -void ScDrawView::VCAddWin( Window* /* pWin */ ) +void ScDrawView::VCAddWin( vcl::Window* /* pWin */ ) { // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } -void ScDrawView::VCRemoveWin( Window* /* pWin */ ) +void ScDrawView::VCRemoveWin( vcl::Window* /* pWin */ ) { // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index d9c0a691ce6d..c2f73702bddf 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -88,7 +88,7 @@ void ScDrawView::CheckOle( const SdrMarkList& rMarkList, bool& rAnyOle, bool& rO } } -bool ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos ) +bool ScDrawView::BeginDrag( vcl::Window* pWindow, const Point& rStartPos ) { bool bReturn = false; @@ -520,7 +520,7 @@ void ScDrawView::SetMarkedOriginalSize() } if (pViewData) { - Window* pActWin = pViewData->GetActiveWin(); + vcl::Window* pActWin = pViewData->GetActiveWin(); if (pActWin) { aOriginalSize = pActWin->LogicToLogic( diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 8d7d71cd899b..718091033af3 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -509,7 +509,7 @@ void ScDrawView::MarkListHasChanged() if(OUTDEV_WINDOW == rOutDev.GetOutDevType()) { - ((Window&)rOutDev).Update(); + ((vcl::Window&)rOutDev).Update(); } } @@ -537,7 +537,7 @@ void ScDrawView::MarkListHasChanged() bool ScDrawView::SdrBeginTextEdit( SdrObject* pObj, SdrPageView* pPV, - ::Window* pWinL, + vcl::Window* pWinL, bool bIsNewObj, SdrOutliner* pGivenOutliner, OutlinerView* pGivenOutlinerView, @@ -817,7 +817,7 @@ void ScDrawView::LockCalcLayer( SdrLayerID nLayer, bool bLock ) SetLayerLocked( pLockLayer->GetName(), bLock ); } -void ScDrawView::MakeVisible( const Rectangle& rRect, Window& rWin ) +void ScDrawView::MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) { //! rWin richtig auswerten //! ggf Zoom aendern diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index e2f22472ba23..956cea9ccd59 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -780,7 +780,7 @@ void ScEditShell::GetClipState( SfxItemSet& rSet ) // create listener pClipEvtLstnr = new TransferableClipboardListener( LINK( this, ScEditShell, ClipboardChanged ) ); pClipEvtLstnr->acquire(); - Window* pWin = pViewData->GetActiveWin(); + vcl::Window* pWin = pViewData->GetActiveWin(); pClipEvtLstnr->AddRemoveListener( pWin, true ); // get initial state diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 48ec587da9b1..a2159a2856ec 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -842,7 +842,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) // If GetDefDialogParent is a dialog, it must be used // (style catalog) - Window* pParent = Application::GetDefDialogParent(); + vcl::Window* pParent = Application::GetDefDialogParent(); if ( !pParent || !pParent->IsDialog() ) { // GetDefDialogParent currently doesn't return the window diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 059d766099f9..e777df8c87f6 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -215,7 +215,7 @@ protected: void SelectHdl(); public: - ScFilterListBox( Window* pParent, ScGridWindow* pGrid, + ScFilterListBox( vcl::Window* pParent, ScGridWindow* pGrid, SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ); virtual ~ScFilterListBox(); @@ -234,7 +234,7 @@ public: }; // ListBox in einem FloatingWindow (pParent) -ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid, +ScFilterListBox::ScFilterListBox( vcl::Window* pParent, ScGridWindow* pGrid, SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ) : ListBox( pParent, WB_AUTOHSCROLL ), pGridWin( pGrid ), @@ -329,13 +329,13 @@ void ScFilterListBox::SelectHdl() class ScFilterFloatingWindow : public FloatingWindow { public: - ScFilterFloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN ); + ScFilterFloatingWindow( vcl::Window* pParent, WinBits nStyle = WB_STDFLOATWIN ); virtual ~ScFilterFloatingWindow(); // required for System FloatingWindows that will not process KeyInput by themselves - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; }; -ScFilterFloatingWindow::ScFilterFloatingWindow( Window* pParent, WinBits nStyle ) : +ScFilterFloatingWindow::ScFilterFloatingWindow( vcl::Window* pParent, WinBits nStyle ) : FloatingWindow( pParent, nStyle|WB_SYSTEMWINDOW ) // make it a system floater {} @@ -344,7 +344,7 @@ ScFilterFloatingWindow::~ScFilterFloatingWindow() EndPopupMode(); } -Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() +vcl::Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() { // redirect keyinput in the child window return GetWindow(WINDOW_FIRSTCHILD) ? GetWindow(WINDOW_FIRSTCHILD)->GetPreferredKeyInputWindow() : NULL; // will be the FilterBox @@ -422,7 +422,7 @@ static bool lcl_GetHyperlinkCell( } // WB_DIALOGCONTROL noetig fuer UNO-Controls -ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ) +ScGridWindow::ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ) : Window( pParent, WB_CLIPCHILDREN | WB_DIALOGCONTROL ), DropTargetHelper( this ), DragSourceHelper( this ), @@ -2656,7 +2656,7 @@ bool ScGridWindow::PreNotify( NotifyEvent& rNEvt ) sal_uInt16 nType = rNEvt.GetType(); if ( nType == EVENT_MOUSEBUTTONUP || nType == EVENT_MOUSEBUTTONDOWN ) { - Window* pWindow = rNEvt.GetWindow(); + vcl::Window* pWindow = rNEvt.GetWindow(); if (pWindow == this && pViewData) { SfxViewFrame* pViewFrame = pViewData->GetViewShell()->GetViewFrame(); @@ -2799,7 +2799,7 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) pViewData->GetView()->GetSelEngine()->Command( aDragEvent ); } -static void lcl_SetTextCursorPos( ScViewData* pViewData, ScSplitPos eWhich, Window* pWin ) +static void lcl_SetTextCursorPos( ScViewData* pViewData, ScSplitPos eWhich, vcl::Window* pWin ) { SCCOL nCol = pViewData->GetCurX(); SCROW nRow = pViewData->GetCurY(); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 4a2ecd02cc74..cbdd99d638fb 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -130,7 +130,7 @@ static void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, long nButtonY = bTextBelow ? aInner.Bottom() : aOuter.Top(); - ScDDComboBoxButton aComboButton((Window*)pDev); + ScDDComboBoxButton aComboButton((vcl::Window*)pDev); aComboButton.SetOptSizePixel(); long nBWidth = ( aComboButton.GetSizePixel().Width() * rZoomY.GetNumerator() ) / rZoomY.GetDenominator(); diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 9adb789f9ed7..632e79afe7be 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -189,10 +189,10 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard ) bool bHSplit = pViewData->GetHSplitMode() != SC_SPLIT_NONE; bool bVSplit = pViewData->GetVSplitMode() != SC_SPLIT_NONE; - Window* pLeft = pViewData->GetView()->GetWindowByPos( bVSplit ? SC_SPLIT_TOPLEFT : SC_SPLIT_BOTTOMLEFT ); - Window* pRight = bHSplit ? pViewData->GetView()->GetWindowByPos( bVSplit ? SC_SPLIT_TOPRIGHT : SC_SPLIT_BOTTOMRIGHT ) : 0; - Window* pBottom = bVSplit ? pViewData->GetView()->GetWindowByPos( SC_SPLIT_BOTTOMLEFT ) : 0; - Window* pDiagonal = (bHSplit && bVSplit) ? pViewData->GetView()->GetWindowByPos( SC_SPLIT_BOTTOMRIGHT ) : 0; + vcl::Window* pLeft = pViewData->GetView()->GetWindowByPos( bVSplit ? SC_SPLIT_TOPLEFT : SC_SPLIT_BOTTOMLEFT ); + vcl::Window* pRight = bHSplit ? pViewData->GetView()->GetWindowByPos( bVSplit ? SC_SPLIT_TOPRIGHT : SC_SPLIT_BOTTOMRIGHT ) : 0; + vcl::Window* pBottom = bVSplit ? pViewData->GetView()->GetWindowByPos( SC_SPLIT_BOTTOMLEFT ) : 0; + vcl::Window* pDiagonal = (bHSplit && bVSplit) ? pViewData->GetView()->GetWindowByPos( SC_SPLIT_BOTTOMRIGHT ) : 0; OSL_ENSURE( pLeft, "ScGridWindow::ShowNoteMarker - missing top-left grid window" ); /* If caption is shown from right or bottom windows, adjust diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 40997f2da53e..790786c693c4 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -44,7 +44,7 @@ #define SC_HDRPAINT_TEXT 6 #define SC_HDRPAINT_COUNT 7 -ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine, +ScHeaderControl::ScHeaderControl( vcl::Window* pParent, SelectionEngine* pSelectionEngine, SCCOLROW nNewSize, bool bNewVertical ) : Window ( pParent ), pSelEngine ( pSelectionEngine ), diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index e07cd4aa0b4d..afa1daf0944d 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.cxx @@ -24,7 +24,7 @@ #define HINT_INDENT 3 #define HINT_MARGIN 4 -ScHintWindow::ScHintWindow( Window* pParent, const OUString& rTit, const OUString& rMsg ) : +ScHintWindow::ScHintWindow( vcl::Window* pParent, const OUString& rTit, const OUString& rMsg ) : Window( pParent, WinBits( WB_BORDER ) ), aTitle( rTit ), aMessage( convertLineEnd(rMsg, LINEEND_CR) ) diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index f7171048f552..12ed0678ce46 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -34,7 +34,7 @@ #define SC_NOTEMARK_TIME 800 #define SC_NOTEMARK_SHORT 70 -ScNoteMarker::ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal, +ScNoteMarker::ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight, vcl::Window* pBottom, vcl::Window* pDiagonal, ScDocument* pD, ScAddress aPos, const OUString& rUser, const MapMode& rMap, bool bLeftEdge, bool bForce, bool bKeyboard ) : pWindow( pWin ), @@ -112,7 +112,7 @@ IMPL_LINK_NOARG(ScNoteMarker, TimeHdl) return 0; } -static void lcl_DrawWin( SdrObject* pObject, Window* pWindow, const MapMode& rMap ) +static void lcl_DrawWin( SdrObject* pObject, vcl::Window* pWindow, const MapMode& rMap ) { MapMode aOld = pWindow->GetMapMode(); pWindow->SetMapMode( rMap ); diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 88590de2b441..da59eda93515 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -38,7 +38,7 @@ const sal_uInt16 SC_OL_IMAGE_MINUS = SC_OL_IMAGE_PLUS + 1; const sal_uInt16 SC_OL_IMAGE_NOTPRESSED = SC_OL_IMAGE_MINUS + 1; const sal_uInt16 SC_OL_IMAGE_PRESSED = SC_OL_IMAGE_NOTPRESSED + 1; -ScOutlineWindow::ScOutlineWindow( Window* pParent, ScOutlineMode eMode, ScViewData* pViewData, ScSplitPos eWhich ) : +ScOutlineWindow::ScOutlineWindow( vcl::Window* pParent, ScOutlineMode eMode, ScViewData* pViewData, ScSplitPos eWhich ) : Window( pParent ), mrViewData( *pViewData ), meWhich( eWhich ), diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index f6b3f31c8248..dbd970d60af7 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -83,7 +83,7 @@ static long lcl_GetDisplayStart( SCTAB nTab, ScDocument* pDoc, std::vector<long> return nDisplayStart; } -ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ) : +ScPreview::ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ) : Window( pParent ), nPageNo( 0 ), nZoom( 100 ), diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index e1c9a71cf206..798ac3a10aa6 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -100,11 +100,11 @@ SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, "PrintPreview" ) SFX_VIEW_REGISTRATION(ScDocShell); } -void ScPreviewShell::Construct( Window* pParent ) +void ScPreviewShell::Construct( vcl::Window* pParent ) { // Find the top-most window, and set the close window handler to intercept // the window close event. - Window* pWin = pParent; + vcl::Window* pWin = pParent; while (!pWin->IsSystemWindow()) { if (pWin->GetParent()) @@ -536,7 +536,7 @@ bool ScPreviewShell::HasPrintOptionsPage() const return true; } -SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ) +SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index ff4b8782d1a1..29f4b4d92ee6 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -55,7 +55,7 @@ SfxChildWinInfo ScValidityRefChildWin::GetInfo() const { SfxChildWinInfo anInfo = SfxChildWindow::GetInfo(); - if( Window *pWnd = GetWindow() ) + if( vcl::Window *pWnd = GetWindow() ) { anInfo.aSize = pWnd->GetSizePixel(); @@ -73,7 +73,7 @@ namespace } #define IMPL_CHILD_CTOR(Class,sid) \ - Class::Class( Window* pParentP, \ + Class::Class( vcl::Window* pParentP, \ sal_uInt16 nId, \ SfxBindings* p, \ SfxChildWinInfo* pInfo ) \ @@ -132,7 +132,7 @@ static long nScSimpleRefX; static long nScSimpleRefY; static bool bAutoReOpen = true; -ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( Window* pParentP, +ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* p, SfxChildWinInfo* pInfo ) @@ -228,7 +228,7 @@ void ScSimpleRefDlgWrapper::StartRefInput() // ScAcceptChgDlgWrapper //FIXME: should be moved into ViewShell -ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP, +ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -278,7 +278,7 @@ namespace } } -ScValidityRefChildWin::ScValidityRefChildWin( Window* pParentP, +ScValidityRefChildWin::ScValidityRefChildWin( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* p, SfxChildWinInfo* /*pInfo*/ ) diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index 2ba0735db856..3dcbe415db71 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -67,7 +67,7 @@ sal_uLong ScViewFunctionSet::CalcUpdateInterval( const Size& rWinSize, const Poi bool bLeftScroll, bool bTopScroll, bool bRightScroll, bool bBottomScroll ) { sal_uLong nUpdateInterval = SELENG_AUTOREPEAT_INTERVAL_MAX; - Window* pWin = pEngine->GetWindow(); + vcl::Window* pWin = pEngine->GetWindow(); Rectangle aScrRect = pWin->GetDesktopRectPixel(); Point aRootPos = pWin->OutputToAbsoluteScreenPixel(Point(0,0)); if (bRightScroll) @@ -202,7 +202,7 @@ void ScViewFunctionSet::BeginDrag() pTransferObj->SetDragSource( pDocSh, rMark ); - Window* pWindow = pViewData->GetActiveWin(); + vcl::Window* pWindow = pViewData->GetActiveWin(); if ( pWindow->IsTracking() ) pWindow->EndTracking( ENDTRACK_CANCEL ); // abort selecting @@ -732,7 +732,7 @@ void ScViewFunctionSet::DeselectAll() bAnchor = false; } -ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView, +ScViewSelectionEngine::ScViewSelectionEngine( vcl::Window* pWindow, ScTabView* pView, ScSplitPos eSplitPos ) : SelectionEngine( pWindow, &pView->GetFunctionSet() ), eWhich( eSplitPos ) @@ -916,7 +916,7 @@ void ScHeaderFunctionSet::DeselectAll() bAnchor = false; } -ScHeaderSelectionEngine::ScHeaderSelectionEngine( Window* pWindow, ScHeaderFunctionSet* pFuncSet ) : +ScHeaderSelectionEngine::ScHeaderSelectionEngine( vcl::Window* pWindow, ScHeaderFunctionSet* pFuncSet ) : SelectionEngine( pWindow, pFuncSet ) { SetSelectionMode( MULTIPLE_SELECTION ); diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index 65fc6dcd9863..43da32180ebb 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -39,7 +39,7 @@ SFX_IMPL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow, SID_SPELL_DIALOG ) -ScSpellDialogChildWindow::ScSpellDialogChildWindow( Window* pParentP, sal_uInt16 nId, +ScSpellDialogChildWindow::ScSpellDialogChildWindow( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : ::svx::SpellDialogChildWindow( pParentP, nId, pBindings, pInfo ), mpViewShell( 0 ), diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 4d5a2e352da8..ad7e6bc54b1e 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -285,7 +285,7 @@ void ScSpellingEngine::ConvertAll( EditView& rEditView ) OSL_ENSURE( eState != EE_SPELL_NOSPELLER, "ScSpellingEngine::Convert - no spell checker" ); if( eState == EE_SPELL_NOLANGUAGE ) { - Window* pParent = GetDialogParent(); + vcl::Window* pParent = GetDialogParent(); ScWaitCursorOff aWaitOff( pParent ); InfoBox( pParent, ScGlobal::GetRscString( STR_NOLANGERR ) ).Execute(); } @@ -303,7 +303,7 @@ bool ScSpellingEngine::NeedsConversion() bool ScSpellingEngine::ShowTableWrapDialog() { - Window* pParent = GetDialogParent(); + vcl::Window* pParent = GetDialogParent(); ScWaitCursorOff aWaitOff( pParent ); MessBox aMsgBox( pParent, WinBits( WB_YES_NO | WB_DEF_YES ), ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), @@ -313,18 +313,18 @@ bool ScSpellingEngine::ShowTableWrapDialog() void ScSpellingEngine::ShowFinishDialog() { - Window* pParent = GetDialogParent(); + vcl::Window* pParent = GetDialogParent(); ScWaitCursorOff aWaitOff( pParent ); InfoBox( pParent, ScGlobal::GetRscString( STR_SPELLING_STOP_OK ) ).Execute(); } -Window* ScSpellingEngine::GetDialogParent() +vcl::Window* ScSpellingEngine::GetDialogParent() { sal_uInt16 nWinId = ScSpellDialogChildWindow::GetChildWindowId(); SfxViewFrame* pViewFrm = mrViewData.GetViewShell()->GetViewFrame(); if( pViewFrm->HasChildWindow( nWinId ) ) if( SfxChildWindow* pChild = pViewFrm->GetChildWindow( nWinId ) ) - if( Window* pWin = pChild->GetWindow() ) + if( vcl::Window* pWin = pChild->GetWindow() ) if( pWin->IsVisible() ) return pWin; diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 66484c27653d..914ead8adf0c 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -37,7 +37,7 @@ // STATIC DATA ----------------------------------------------------------- -ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) : +ScTabControl::ScTabControl( vcl::Window* pParent, ScViewData* pData ) : TabBar( pParent, WinBits(WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_RANGESELECT | WB_MULTISELECT | WB_DRAG ) ), DropTargetHelper( this ), @@ -488,7 +488,7 @@ void ScTabControl::DoDrag( const Region& /* rRegion */ ) pTransferObj->SetDragSource( pDocSh, aTabMark ); - Window* pWindow = pViewData->GetActiveWin(); + vcl::Window* pWindow = pViewData->GetActiveWin(); SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D pTransferObj->StartDrag( pWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK ); } diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index 80419ee58acd..c2f15e457bbf 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -23,7 +23,7 @@ #include <vcl/settings.hxx> -ScTabSplitter::ScTabSplitter( Window* pParent, WinBits nWinStyle, ScViewData* pData ) : +ScTabSplitter::ScTabSplitter( vcl::Window* pParent, WinBits nWinStyle, ScViewData* pData ) : Splitter( pParent, nWinStyle ), pViewData(pData) { @@ -61,7 +61,7 @@ void ScTabSplitter::MouseButtonDown( const MouseEvent& rMEvt ) void ScTabSplitter::Splitting( Point& rSplitPos ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); Point aScreenPos = pParent->OutputToNormalizedScreenPixel( rSplitPos ); pViewData->GetView()->SnapSplitPos( aScreenPos ); Point aNew = pParent->NormalizedScreenToOutputPixel( aScreenPos ); diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 40c41d55055b..9150af64bee9 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star; // Corner-Button -ScCornerButton::ScCornerButton( Window* pParent, ScViewData* pData, bool bAdditional ) : +ScCornerButton::ScCornerButton( vcl::Window* pParent, ScViewData* pData, bool bAdditional ) : Window( pParent, WinBits( 0 ) ), pViewData( pData ), bAdd( bAdditional ) @@ -184,7 +184,7 @@ static bool lcl_HasRowOutline( const ScViewData& rViewData ) return false; } -ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : +ScTabView::ScTabView( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : pFrameWin( pParent ), aViewData( &rDocSh, pViewShell ), pSelEngine( NULL ), @@ -271,7 +271,7 @@ IMPL_LINK_NOARG(ScTabView, TimerHdl) // --- Resize --------------------------------------------------------------------- -static void lcl_SetPosSize( Window& rWindow, const Point& rPos, const Size& rSize, +static void lcl_SetPosSize( vcl::Window& rWindow, const Point& rPos, const Size& rSize, long nTotalWidth, bool bLayoutRTL ) { Point aNewPos = rPos; @@ -870,7 +870,7 @@ void ScTabView::ActiveGrabFocus() pGridWin[ePos]->GrabFocus(); } -ScSplitPos ScTabView::FindWindow( Window* pWindow ) const +ScSplitPos ScTabView::FindWindow( vcl::Window* pWindow ) const { ScSplitPos eVal = SC_SPLIT_BOTTOMLEFT; // Default for (sal_uInt16 i=0; i<4; i++) @@ -1378,7 +1378,7 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY } } -inline void ShowHide( Window* pWin, bool bShow ) +inline void ShowHide( vcl::Window* pWin, bool bShow ) { OSL_ENSURE(pWin || !bShow, "Fenster ist nicht da"); if (pWin) @@ -1884,7 +1884,7 @@ Point ScTabView::GetMousePosPixel() return aPos; } -static bool lcl_MouseIsOverWin( const Point& rScreenPosPixel, Window* pWin ) +static bool lcl_MouseIsOverWin( const Point& rScreenPosPixel, vcl::Window* pWin ) { if (pWin) { @@ -1919,7 +1919,7 @@ void ScTabView::SnapSplitPos( Point& rScreenPosPixel ) if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ) ePos = SC_SPLIT_TOPLEFT; - Window* pWin = pGridWin[ePos]; + vcl::Window* pWin = pGridWin[ePos]; if (!pWin) { OSL_FAIL("Window NULL"); @@ -1950,7 +1950,7 @@ void ScTabView::FreezeSplitters( bool bFreeze ) ScSplitPos ePos = SC_SPLIT_BOTTOMLEFT; if ( eOldV != SC_SPLIT_NONE ) ePos = SC_SPLIT_TOPLEFT; - Window* pWin = pGridWin[ePos]; + vcl::Window* pWin = pGridWin[ePos]; bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); @@ -2072,7 +2072,7 @@ void ScTabView::SplitAtCursor() ScSplitPos ePos = SC_SPLIT_BOTTOMLEFT; if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ) ePos = SC_SPLIT_TOPLEFT; - Window* pWin = pGridWin[ePos]; + vcl::Window* pWin = pGridWin[ePos]; Point aWinStart = pWin->GetPosPixel(); SCCOL nPosX = aViewData.GetCurX(); @@ -2136,7 +2136,7 @@ void ScTabView::SetNewVisArea() pGridWin[i]->SetMapMode(aDrawMode[i]); } - Window* pActive = pGridWin[aViewData.GetActivePart()]; + vcl::Window* pActive = pGridWin[aViewData.GetActivePart()]; if (pActive) aViewData.GetViewShell()->VisAreaChanged( pActive->PixelToLogic(Rectangle(Point(),pActive->GetOutputSizePixel())) ); diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 93452fd1d844..c79d356065ae 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -1410,7 +1410,7 @@ void ScTabView::ErrorMessage( sal_uInt16 nGlobStrId ) StopMarking(); // falls per Focus aus MouseButtonDown aufgerufen - Window* pParent = aViewData.GetDialogParent(); + vcl::Window* pParent = aViewData.GetDialogParent(); ScWaitCursorOff aWaitOff( pParent ); bool bFocus = pParent && pParent->HasFocus(); diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 0e24bc2dc173..ba35eb87d86d 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -673,7 +673,7 @@ void ScTabView::RemoveHintWindow() } // find window that should not be over the cursor -static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) +static vcl::Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) { //! auch Spelling ??? (dann beim Aufruf Membervariable setzen) @@ -683,7 +683,7 @@ static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) SfxChildWindow* pChild = pViewFrm->GetChildWindow(SID_SEARCH_DLG); if (pChild) { - Window* pWin = pChild->GetWindow(); + vcl::Window* pWin = pChild->GetWindow(); if (pWin && pWin->IsVisible()) return pWin; } @@ -695,7 +695,7 @@ static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) SfxChildWindow* pChild = pViewFrm->GetChildWindow(FID_CHG_ACCEPT); if (pChild) { - Window* pWin = pChild->GetWindow(); + vcl::Window* pWin = pChild->GetWindow(); if (pWin && pWin->IsVisible()) return pWin; } @@ -769,13 +769,13 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, if ( eMode == SC_FOLLOW_JUMP ) { - Window* pCare = lcl_GetCareWin( aViewData.GetViewShell()->GetViewFrame() ); + vcl::Window* pCare = lcl_GetCareWin( aViewData.GetViewShell()->GetViewFrame() ); if (pCare) { bool bLimit = false; Rectangle aDlgPixel; Size aWinSize; - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); if (pWin) { aDlgPixel = pCare->GetWindowExtentsRelative( pWin ); diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 85284311e604..5ddd896dbb59 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -67,7 +67,7 @@ void ScTabView::ShowRefTip() aHelp = aHelp.replaceFirst("%2", OUString::number(nCols) ); ScSplitPos eWhich = aViewData.GetActivePart(); - Window* pWin = pGridWin[eWhich]; + vcl::Window* pWin = pGridWin[eWhich]; if ( pWin ) { Point aStart = aViewData.GetScrPos( nStartX, nStartY, eWhich ); @@ -245,7 +245,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) // Tip-Hilfe fuer Auto-Fill if ( aViewData.GetRefType() == SC_REFTYPE_FILL && Help::IsQuickHelpEnabled() ) { - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); if ( pWin ) { OUString aHelpStr; diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index e553fc1b0891..4f263d61a450 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -536,7 +536,7 @@ void ScTabView::ScrollToObject( SdrObject* pDrawObj ) void ScTabView::MakeVisible( const Rectangle& rHMMRect ) { - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); Size aWinSize = pWin->GetOutputSizePixel(); SCTAB nTab = aViewData.GetTabNo(); diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index ce22a5f73415..b67f38023dfc 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -56,7 +56,7 @@ SdrView* ScTabViewShell::GetDrawView() const void ScTabViewShell::WindowChanged() { - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); ScDrawView* pDrView = GetScDrawView(); if (pDrView) @@ -81,7 +81,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) ScTabView* pTabView = GetViewData().GetView(); SfxBindings& rBindings = GetViewFrame()->GetBindings(); - Window* pWin = pTabView->GetActiveWin(); + vcl::Window* pWin = pTabView->GetActiveWin(); ScDrawView* pView = pTabView->GetScDrawView(); SdrModel* pDoc = pView->GetModel(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 9640e60508a7..f04e93174755 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -331,7 +331,7 @@ void ScTabViewShell::UpdateOleZoom() Size aObjSize = ((const SfxObjectShell*)pDocSh)->GetVisArea().GetSize(); if ( aObjSize.Width() > 0 && aObjSize.Height() > 0 ) { - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); Size aWinHMM = pWin->PixelToLogic( pWin->GetOutputSizePixel(), MAP_100TH_MM ); SetZoomFactor( Fraction( aWinHMM.Width(),aObjSize.Width() ), Fraction( aWinHMM.Height(),aObjSize.Height() ) ); @@ -434,7 +434,7 @@ void ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const // auf ganze Zellen anpassen (in 1/100 mm) Size aPixelSize = rRect.GetSize(); - Window* pWin = ((ScTabViewShell*)this)->GetActiveWin(); + vcl::Window* pWin = ((ScTabViewShell*)this)->GetActiveWin(); Size aLogicSize = pWin->PixelToLogic( aPixelSize ); const ScViewData& rViewData = GetViewData(); @@ -505,7 +505,7 @@ void ScTabViewShell::ReadUserDataSequence (const uno::Sequence < beans::Property void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::PropertyValue >& rSettings ) { - Window* pOldWin = GetActiveWin(); + vcl::Window* pOldWin = GetActiveWin(); bool bFocus = pOldWin && pOldWin->HasFocus(); GetViewData().ReadUserDataSequence(rSettings); @@ -514,7 +514,7 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper if ( GetViewData().IsPagebreakMode() ) SetCurSubShell( GetCurObjectSelectionType(), true ); - Window* pNewWin = GetActiveWin(); + vcl::Window* pNewWin = GetActiveWin(); if (pNewWin && pNewWin != pOldWin) { SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? @@ -540,7 +540,7 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper void ScTabViewShell::DoReadUserData( const OUString& rData ) { - Window* pOldWin = GetActiveWin(); + vcl::Window* pOldWin = GetActiveWin(); bool bFocus = pOldWin && pOldWin->HasFocus(); GetViewData().ReadUserData(rData); @@ -549,7 +549,7 @@ void ScTabViewShell::DoReadUserData( const OUString& rData ) if ( GetViewData().IsPagebreakMode() ) SetCurSubShell( GetCurObjectSelectionType(), true ); - Window* pNewWin = GetActiveWin(); + vcl::Window* pNewWin = GetActiveWin(); if (pNewWin && pNewWin != pOldWin) { SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? @@ -1065,7 +1065,7 @@ bool ScTabViewShell::HasPrintOptionsPage() const return true; } -SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ) +SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); @@ -1167,7 +1167,7 @@ void ScTabViewShell::StartSimpleRefDialog( pWnd->SetRefString( rInitVal ); pWnd->SetFlags( bCloseOnButtonUp, bSingleCell, bMultiSelection ); ScSimpleRefDlgWrapper::SetAutoReOpen( false ); - Window* pWin = pWnd->GetWindow(); + vcl::Window* pWin = pWnd->GetWindow(); pWin->SetText( rTitle ); pWnd->StartRefInput(); } @@ -1181,7 +1181,7 @@ void ScTabViewShell::StopSimpleRefDialog() ScSimpleRefDlgWrapper* pWnd = (ScSimpleRefDlgWrapper*)pViewFrm->GetChildWindow( nId ); if (pWnd) { - Window* pWin = pWnd->GetWindow(); + vcl::Window* pWin = pWnd->GetWindow(); if (pWin && pWin->IsSystemWindow()) ((SystemWindow*)pWin)->Close(); // calls abort handler } diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 3e4ddf8ddb67..289c7e85ce39 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -72,7 +72,7 @@ void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj ) // wird aus dem Paint gerufen uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef(); - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); // wenn schon connected ist, nicht nochmal SetObjArea/SetSizeScale @@ -106,7 +106,7 @@ bool ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) RemoveHintWindow(); uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef(); - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); ErrCode nErr = ERRCODE_NONE; bool bErrorShown = false; @@ -274,7 +274,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) SfxBindings& rBindings = GetViewFrame()->GetBindings(); ScTabView* pTabView = GetViewData().GetView(); - Window* pWin = pTabView->GetActiveWin(); + vcl::Window* pWin = pTabView->GetActiveWin(); ScDrawView* pView = pTabView->GetScDrawView(); ScDocShell* pDocSh = GetViewData().GetDocShell(); ScDocument& rDoc = pDocSh->GetDocument(); diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 35a6089c9ee3..04abff508635 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -113,7 +113,7 @@ void ScTabViewShell::SwitchBetweenRefDialogs(SfxModelessDialog* pDialog) SfxModelessDialog* ScTabViewShell::CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW, SfxChildWinInfo* pInfo, - Window* pParent, sal_uInt16 nSlotId ) + vcl::Window* pParent, sal_uInt16 nSlotId ) { // Dialog nur aufmachen, wenn ueber ScModule::SetRefDialog gerufen, damit // z.B. nach einem Absturz offene Ref-Dialoge nicht wiederkommen (#42341#). diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx index 22be8e158d5e..de13fc68b63c 100644 --- a/sc/source/ui/view/tabvwshd.cxx +++ b/sc/source/ui/view/tabvwshd.cxx @@ -35,7 +35,7 @@ //! Parent-Window fuer Dialoge //! Problem: OLE Server! -Window* ScTabViewShell::GetDialogParent() +vcl::Window* ScTabViewShell::GetDialogParent() { // if a ref-input dialog is open, use it as parent // (necessary when a slot is executed from the dialog's OK handler) @@ -47,7 +47,7 @@ Window* ScTabViewShell::GetDialogParent() SfxChildWindow* pChild = pViewFrm->GetChildWindow(nCurRefDlgId); if (pChild) { - Window* pWin = pChild->GetWindow(); + vcl::Window* pWin = pChild->GetWindow(); if (pWin && pWin->IsVisible()) return pWin; } diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 72e10f842bc6..30fe1927d504 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -242,7 +242,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) ScTabView* pTabView = GetViewData().GetView(); if( pTabView ) { - Window* pWin = pTabView->GetActiveWin(); + vcl::Window* pWin = pTabView->GetActiveWin(); if( pWin ) { pSearchDlg->SetDocWin( pWin ); @@ -312,7 +312,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) ScTabView* pTabView = GetViewData().GetView(); if( pTabView ) { - Window* pWin = pTabView->GetActiveWin(); + vcl::Window* pWin = pTabView->GetActiveWin(); if( pWin ) { pSearchDlg->SetDocWin( pWin ); diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index a89b31ce4f9a..688813c496b9 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -905,7 +905,7 @@ void ScViewData::ResetOldCursor() } Rectangle ScViewData::GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, - Window* pWin, const ScPatternAttr* pPattern, + vcl::Window* pWin, const ScPatternAttr* pPattern, bool bForceToTop ) { return ScEditUtil( pDoc, nPosX, nPosY, nTabNo, GetScrPos(nPosX,nPosY,eWhich,true), @@ -915,7 +915,7 @@ Rectangle ScViewData::GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, void ScViewData::SetEditEngine( ScSplitPos eWhich, ScEditEngineDefaulter* pNewEngine, - Window* pWin, SCCOL nNewX, SCROW nNewY ) + vcl::Window* pWin, SCCOL nNewX, SCROW nNewY ) { bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo ); ScHSplitPos eHWhich = WhichH(eWhich); @@ -1139,7 +1139,7 @@ void ScViewData::EditGrowX() ScEditEngineDefaulter* pEngine = (ScEditEngineDefaulter*) pCurView->GetEditEngine(); - Window* pWin = pCurView->GetWindow(); + vcl::Window* pWin = pCurView->GetWindow(); SCCOL nLeft = GetPosX(eHWhich); SCCOL nRight = nLeft + VisibleCellsX(eHWhich); @@ -1326,7 +1326,7 @@ void ScViewData::EditGrowY( bool bInitial ) } EditEngine* pEngine = pCurView->GetEditEngine(); - Window* pWin = pCurView->GetWindow(); + vcl::Window* pWin = pCurView->GetWindow(); SCROW nBottom = GetPosY(eVWhich) + VisibleCellsY(eVWhich); @@ -2096,7 +2096,7 @@ const ScMarkData& ScViewData::GetMarkData() const return *mpMarkData; } -Window* ScViewData::GetDialogParent() +vcl::Window* ScViewData::GetDialogParent() { OSL_ENSURE( pViewShell, "GetDialogParent() ohne ViewShell" ); return pViewShell->GetDialogParent(); diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 8b0ace1610c0..fd2dee266295 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -439,7 +439,7 @@ void ScViewFunc::PasteDraw() ScViewData& rViewData = GetViewData(); SCCOL nPosX = rViewData.GetCurX(); SCROW nPosY = rViewData.GetCurY(); - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); Point aPos = pWin->PixelToLogic( rViewData.GetScrPos( nPosX, nPosY, rViewData.GetActivePart() ) ); ScDrawTransferObj* pDrawClip = ScDrawTransferObj::GetOwnClipboard( pWin ); @@ -455,7 +455,7 @@ void ScViewFunc::PasteFromSystem() { UpdateInputLine(); - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); ScDrawTransferObj* pDrawClip = ScDrawTransferObj::GetOwnClipboard( pWin ); @@ -582,7 +582,7 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran ScViewData& rViewData = GetViewData(); SCCOL nPosX = rViewData.GetCurX(); SCROW nPosY = rViewData.GetCurY(); - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); Point aPos = pWin->PixelToLogic( rViewData.GetScrPos( nPosX, nPosY, rViewData.GetActivePart() ) ); PasteDraw( aPos, pDrawClip->GetModel(), false, @@ -662,7 +662,7 @@ bool ScViewFunc::PasteFromSystem( sal_uLong nFormatId, bool bApi ) UpdateInputLine(); bool bRet = true; - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); if ( nFormatId == 0 && pOwnClip ) { @@ -768,7 +768,7 @@ static bool lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL namespace { -bool checkDestRangeForOverwrite(const ScRangeList& rDestRanges, const ScDocument* pDoc, const ScMarkData& rMark, Window* pParentWnd) +bool checkDestRangeForOverwrite(const ScRangeList& rDestRanges, const ScDocument* pDoc, const ScMarkData& rMark, vcl::Window* pParentWnd) { bool bIsEmpty = true; ScMarkData::const_iterator itrTab = rMark.begin(), itrTabEnd = rMark.end(); diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 05efdf5a0b10..8ddef3c7316a 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -95,11 +95,11 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, boost::scoped_ptr<ScTabEditEngine> pEngine(new ScTabEditEngine( *pPattern, rDoc.GetEnginePool() )); pEngine->EnableUndo( false ); - Window* pActWin = GetActiveWin(); + vcl::Window* pActWin = GetActiveWin(); if (pActWin) { pEngine->SetPaperSize(Size(100000,100000)); - Window aWin( pActWin ); + vcl::Window aWin( pActWin ); EditView aEditView( pEngine.get(), &aWin ); aEditView.SetOutputArea(Rectangle(0,0,100000,100000)); diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index fef41354be2b..b937eb3bf121 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -413,7 +413,7 @@ bool ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic, } Point aPos( rPos ); - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); MapMode aSourceMap = rGraphic.GetPrefMapMode(); MapMode aDestMap( MAP_100TH_MM ); diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index a7ed961f7943..c3782e46561f 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -88,7 +88,7 @@ static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDo } } -ScViewFunc::ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : +ScViewFunc::ScViewFunc( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScTabView( pParent, rDocSh, pViewShell ), bFormatValid( false ) { diff --git a/sc/source/ui/view/waitoff.cxx b/sc/source/ui/view/waitoff.cxx index e0c3a6e8f9a4..a2ff18da928e 100644 --- a/sc/source/ui/view/waitoff.cxx +++ b/sc/source/ui/view/waitoff.cxx @@ -21,7 +21,7 @@ #include "waitoff.hxx" -ScWaitCursorOff::ScWaitCursorOff( Window* pWinP ) +ScWaitCursorOff::ScWaitCursorOff( vcl::Window* pWinP ) : pWin( pWinP ), nWaiters(0) diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 1d2d1b072eb0..6a81c2248d09 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -67,7 +67,7 @@ OUString getXPath( } ScXMLSourceDlg::ScXMLSourceDlg( - SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDoc) + SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocument* pDoc) : ScAnyRefDlg(pB, pCW, pParent, "XMLSourceDialog", "modules/scalc/ui/xmlsourcedialog.ui") , mpCurRefEntry(NULL) diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index 9ce306f3d4cb..d91803c1a817 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -54,10 +54,10 @@ class MyFixedText : public FixedText protected: void RequestHelp( const HelpEvent& rHEvt ); public: - MyFixedText(Window* pParent) : FixedText(pParent) {} + MyFixedText(vcl::Window* pParent) : FixedText(pParent) {} }; -class MyWindow : public Window +class MyWindow : public vcl::Window { private: NumericField aCountField; @@ -74,7 +74,7 @@ private: PushButton aViewButton; public: - MyWindow( Window *pParent ); + MyWindow( vcl::Window *pParent ); DECL_LINK(CountHdl, PushButton*); DECL_LINK(TextHdl, PushButton*); @@ -157,7 +157,7 @@ void ScTestListener::selectionChanged(const EventObject& aEvent) pFixedText->SetText(aStr); } -extern "C" Window* SAL_CALL CreateWindow( Window *pParent, const String& rParam ) +extern "C" vcl::Window* SAL_CALL CreateWindow( vcl::Window *pParent, const String& rParam ) { MyWindow *pWin = new MyWindow( pParent ); return pWin; @@ -175,7 +175,7 @@ void MyFixedText::RequestHelp( const HelpEvent& rHEvt ) FixedText::RequestHelp( rHEvt ); } -MyWindow::MyWindow( Window *pParent ) : +MyWindow::MyWindow( vcl::Window *pParent ) : Window( pParent ), aCountField( this, WinBits(WB_SPIN | WB_REPEAT | WB_BORDER) ), aCountButton( this ), diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 7fbe423a7ca3..c05993d68ed2 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -155,7 +155,7 @@ public: /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional) for the current viewshell */ void StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLanguage, - const vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); + const ::vcl::Font *pTargetFont, sal_Int32 nOptions, bool bIsInteractive ); /** This is called internally when text conversion is started. The position of current view mode/page/object/caret position diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 1998e4d039be..f31f371f2319 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -71,7 +71,7 @@ class SfxMedium; class SvxSearchItem; class EditStatus; class Point; -class Window; +namespace vcl { class Window; } class SdTransferable; struct SpellCallbackInfo; struct StyleRequestData; @@ -445,7 +445,7 @@ public: static SdAnimationInfo* GetShapeUserData(SdrObject& rObject, bool bCreate = false ); SAL_DLLPRIVATE SdIMapInfo* GetIMapInfo( SdrObject* pObject ) const; - SAL_DLLPRIVATE IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const ::Window& rCmpWnd ); + SAL_DLLPRIVATE IMapObject* GetHitIMapObject( SdrObject* pObject, const Point& rWinPoint, const ::vcl::Window& rCmpWnd ); SAL_DLLPRIVATE CharClass* GetCharClass() const { return mpCharClass; } diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 612f27a54313..6120b20a0113 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -53,7 +53,7 @@ class SdrView; class Bitmap; class List; class SdResId; -class Window; +namespace vcl { class Window; } class SdPage; class TabPage; class ViewShell; @@ -99,7 +99,7 @@ public: virtual void HideRadioGroup() = 0; virtual void HideDeleteBtn() = 0; virtual void SetInputFields(bool bEnableX, bool bEnableY) = 0; - //from class ::Window + //from class vcl::Window virtual void SetText( const OUString& rStr ) = 0; }; @@ -107,7 +107,7 @@ class AbstractSdInsertLayerDlg : public VclAbstractDialog { public: virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; - //from class ::Window + //from class vcl::Window virtual void SetHelpId( const OString& rHelpId ) = 0; }; @@ -120,7 +120,7 @@ public: class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog { public: - virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer + virtual vcl::Window* GetWindow() = 0; //this method is added for return a vcl::Window type pointer virtual std::vector<OUString> GetList ( const sal_uInt16 nType ) = 0; virtual bool IsLink() = 0; virtual bool IsRemoveUnnessesaryMasterPages() const = 0; @@ -172,36 +172,36 @@ class SdAbstractDialogFactory public: static SdAbstractDialogFactory* Create(); - virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0; - virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) = 0; - virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0; - virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0; - virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) = 0; - virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, bool bAutoPilot) = 0; - virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) = 0; - virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0; - virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) = 0; - virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ) = 0; - virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) = 0; - virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) = 0; - virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0; - virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) = 0; - virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, + virtual VclAbstractDialog* CreateBreakDlg(vcl::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0; + virtual AbstractCopyDlg* CreateCopyDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) = 0; + virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ) = 0; + virtual SfxAbstractTabDialog* CreateSdTabCharDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) = 0; + virtual SfxAbstractTabDialog* CreateSdTabPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) = 0; + virtual AbstractAssistentDlg* CreateAssistentDlg( vcl::Window* pParent, bool bAutoPilot) = 0; + virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) = 0; + virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) = 0; + virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) = 0; + virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( vcl::Window* pWindow ) = 0; + virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) = 0; + virtual AbstractMorphDlg* CreateMorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) = 0; + virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) = 0; + virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr ) = 0; + virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) = 0; - virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow ) = 0; - virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0; - virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs) = 0; - virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0; - virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) = 0; - virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) = 0; - virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) = 0; - - virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, + virtual VclAbstractDialog* CreateRemoteDialog( vcl::Window* pWindow ) = 0; + virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) = 0; + virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, vcl::Window* pWindow, const SfxItemSet& rInAttrs) = 0; + virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) = 0; + virtual SfxAbstractDialog* CreatSdActionDialog( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) = 0; + virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) = 0; + virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( vcl::Window* pWindow, DocumentType eDocType) = 0; + + virtual VclAbstractDialog* CreateMasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* ) = 0; virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) = 0; @@ -210,7 +210,7 @@ public: virtual CreateTabPage GetSdOptionsMiscTabPageCreatorFunc() = 0; virtual CreateTabPage GetSdOptionsSnapTabPageCreatorFunc() = 0; - virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( ::Window* pWindow, SdDrawDocument* pDoc) = 0; + virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( vcl::Window* pWindow, SdDrawDocument* pDoc) = 0; protected: ~SdAbstractDialogFactory() {} diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index b3af2ebb7889..d182a301bf6a 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -120,7 +120,7 @@ public: // virtual methods for the option dialog virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; protected: diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 3bff50df9716..b8d333709ff6 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -968,7 +968,7 @@ SdIMapInfo* SdDrawDocument::GetIMapInfo( SdrObject* pObject ) const IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj, const Point& rWinPoint, - const ::Window& /* rCmpWnd */ ) + const ::vcl::Window& /* rCmpWnd */ ) { SdIMapInfo* pIMapInfo = GetIMapInfo( pObj ); IMapObject* pIMapObj = NULL; diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index ebbce887eb1a..40eef52999a3 100644 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx @@ -22,12 +22,12 @@ #include <vcl/decoview.hxx> #include <vcl/builder.hxx> -SdHtmlAttrPreview::SdHtmlAttrPreview( Window* pParent, WinBits nStyle ) +SdHtmlAttrPreview::SdHtmlAttrPreview( vcl::Window* pParent, WinBits nStyle ) :Control( pParent, nStyle ) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSdHtmlAttrPreview(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSdHtmlAttrPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx index b8dc6e529ef3..6cf5491dbb62 100644 --- a/sd/source/filter/html/htmlattr.hxx +++ b/sd/source/filter/html/htmlattr.hxx @@ -31,7 +31,7 @@ protected: Color m_aVLinkColor, m_aALinkColor; public: - SdHtmlAttrPreview( Window* pParent, WinBits nStyle ); + SdHtmlAttrPreview( vcl::Window* pParent, WinBits nStyle ); virtual ~SdHtmlAttrPreview(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index ae36786ef1e5..ca11bcdbe24b 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -3245,7 +3245,7 @@ sal_uLong EasyFile::close() } // This class helps reporting errors during file i/o -HtmlErrorContext::HtmlErrorContext(Window *_pWin) +HtmlErrorContext::HtmlErrorContext(vcl::Window *_pWin) : ErrorContext(_pWin) { mnResId = 0; diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 19709dc9a955..e5e18c086dea 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -69,7 +69,7 @@ private: OUString maURL2; public: - HtmlErrorContext(Window *pWin=0); + HtmlErrorContext(vcl::Window *pWin=0); virtual ~HtmlErrorContext() {}; virtual bool GetString( sal_uLong nErrId, OUString& rCtxStr ) SAL_OVERRIDE; diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 4bcd1fb0072a..3ec6d184c174 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -351,7 +351,7 @@ private: OKButton* m_pBtnOK; public: - SdDesignNameDlg(Window* pWindow, const OUString& aName ); + SdDesignNameDlg(vcl::Window* pWindow, const OUString& aName ); OUString GetDesignName(); DECL_LINK(ModifyHdl, void *); @@ -359,7 +359,7 @@ public: // SdPublishingDlg Methods -SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) +SdPublishingDlg::SdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType) : ModalDialog(pWindow, "PublishingDialog", "modules/simpress/ui/publishingdialog.ui") , mpButtonSet( new ButtonSet() ) , aAssistentFunc(NOOFPAGES) @@ -1532,7 +1532,7 @@ bool SdPublishingDlg::Save() } // SdDesignNameDlg Methods -SdDesignNameDlg::SdDesignNameDlg(Window* pWindow, const OUString& aName) +SdDesignNameDlg::SdDesignNameDlg(vcl::Window* pWindow, const OUString& aName) : ModalDialog(pWindow, "NameDesignDialog", "modules/sdraw/ui/namedesign.ui") { get(m_pEdit, "entry"); diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 333c165793b7..6de8d0cbe3e0 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -132,7 +132,7 @@ void AccessibleDocumentViewBase::Init (void) // Register at VCL Window to be informed of activated and deactivated // OLE objects. - Window* pWindow = maShapeTreeInfo.GetWindow(); + vcl::Window* pWindow = maShapeTreeInfo.GetWindow(); if (pWindow != NULL) { maWindowLink = LINK( @@ -143,7 +143,7 @@ void AccessibleDocumentViewBase::Init (void) sal_uInt16 nCount = pWindow->GetChildCount(); for (sal_uInt16 i=0; i<nCount; i++) { - Window* pChildWindow = pWindow->GetChild (i); + vcl::Window* pChildWindow = pWindow->GetChild (i); if (pChildWindow && (AccessibleRole::EMBEDDED_OBJECT ==pChildWindow->GetAccessibleRole())) @@ -171,8 +171,8 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, { // Window is dying. Unregister from VCL Window. // This is also attempted in the disposing() method. - Window* pWindow = maShapeTreeInfo.GetWindow(); - Window* pDyingWindow = static_cast<Window*>( + vcl::Window* pWindow = maShapeTreeInfo.GetWindow(); + vcl::Window* pDyingWindow = static_cast<vcl::Window*>( pWindowEvent->GetWindow()); if (pWindow==pDyingWindow && pWindow!=NULL && maWindowLink.IsSet()) { @@ -185,7 +185,7 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, case VCLEVENT_WINDOW_SHOW: { // A new window has been created. Is it an OLE object? - Window* pChildWindow = static_cast<Window*>( + vcl::Window* pChildWindow = static_cast<vcl::Window*>( pWindowEvent->GetData()); if (pChildWindow!=NULL && (pChildWindow->GetAccessibleRole() @@ -200,7 +200,7 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, { // A window has been destroyed. Has that been an OLE // object? - Window* pChildWindow = static_cast<Window*>( + vcl::Window* pChildWindow = static_cast<vcl::Window*>( pWindowEvent->GetData()); if (pChildWindow!=NULL && (pChildWindow->GetAccessibleRole() @@ -479,7 +479,7 @@ OUString SAL_CALL void AccessibleDocumentViewBase::impl_dispose() { // Unregister from VCL Window. - Window* pWindow = maShapeTreeInfo.GetWindow(); + vcl::Window* pWindow = maShapeTreeInfo.GetWindow(); if (maWindowLink.IsSet()) { if (pWindow) diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx index 03ad4311c42c..aa296df0deab 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx @@ -31,7 +31,7 @@ namespace accessibility SdrOutliner& rOutliner, SdrView& rView, OutlinerView& rOutlView, - const ::Window& rViewWindow ) + const vcl::Window& rViewWindow ) : mrView( rView ), mrWindow( rViewWindow ), mpOutliner( &rOutliner ), diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index c4f818b63657..8d04f48fe315 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -68,7 +68,7 @@ public: Implementation ( AccessibleSlideSorterView& rAccessibleSlideSorter, ::sd::slidesorter::SlideSorter& rSlideSorter, - ::Window* pWindow); + vcl::Window* pWindow); virtual ~Implementation (void); void RequestUpdateChildren (void); @@ -96,7 +96,7 @@ private: sal_Int32 mnFirstVisibleChild; sal_Int32 mnLastVisibleChild; bool mbListeningToDocument; - ::Window* mpWindow; + vcl::Window* mpWindow; sal_Int32 mnFocusedIndex; bool mbModelChangeLocked; ImplSVEvent * mnUpdateChildrenUserEventId; @@ -110,7 +110,7 @@ private: AccessibleSlideSorterView::AccessibleSlideSorterView( ::sd::slidesorter::SlideSorter& rSlideSorter, const Reference<XAccessible>& rxParent, - ::Window* pContentWindow) + vcl::Window* pContentWindow) : AccessibleSlideSorterViewBase(MutexOwner::maMutex), mrSlideSorter(rSlideSorter), mxParent(rxParent), @@ -223,7 +223,7 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent if (mpContentWindow != NULL) { - ::Window* pParent = mpContentWindow->GetAccessibleParentWindow(); + vcl::Window* pParent = mpContentWindow->GetAccessibleParentWindow(); if (pParent != NULL) xParent = pParent->GetAccessible(); } @@ -667,7 +667,7 @@ bool AccessibleSlideSorterView::IsDisposed (void) AccessibleSlideSorterView::Implementation::Implementation ( AccessibleSlideSorterView& rAccessibleSlideSorter, ::sd::slidesorter::SlideSorter& rSlideSorter, - ::Window* pWindow) + vcl::Window* pWindow) : mrAccessibleSlideSorter(rAccessibleSlideSorter), mrSlideSorter(rSlideSorter), maPageObjects(), diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx index 3f873f0056f3..929c92da253e 100644 --- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx +++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx @@ -84,7 +84,7 @@ Point AccessibleViewForwarder::LogicToPixel (const Point& rPoint) const { SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId); OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); - Rectangle aBBox(static_cast<Window&>(rOutDev).GetWindowExtentsRelative(0L)); + Rectangle aBBox(static_cast<::vcl::Window&>(rOutDev).GetWindowExtentsRelative(0L)); return rOutDev.LogicToPixel (rPoint) + aBBox.TopLeft(); } else @@ -114,7 +114,7 @@ Point AccessibleViewForwarder::PixelToLogic (const Point& rPoint) const { SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow((sal_uInt32)mnWindowId); OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); - Rectangle aBBox (static_cast<Window&>(rOutDev).GetWindowExtentsRelative(0L)); + Rectangle aBBox (static_cast<::vcl::Window&>(rOutDev).GetWindowExtentsRelative(0L)); return rOutDev.PixelToLogic (rPoint - aBBox.TopLeft()); } else diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index de4b5b1c9a81..4be244827f96 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -66,7 +66,7 @@ const int MISCEFFECTS = 4; class CategoryListBox : public ListBox { public: - CategoryListBox( Window* pParent ); + CategoryListBox( vcl::Window* pParent ); virtual ~CategoryListBox(); virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -83,14 +83,14 @@ private: Link maDoubleClickHdl; }; -CategoryListBox::CategoryListBox( Window* pParent ) +CategoryListBox::CategoryListBox( vcl::Window* pParent ) : ListBox( pParent, WB_TABSTOP | WB_BORDER ) { EnableUserDraw( true ); SetDoubleClickHdl( LINK( this, CategoryListBox, implDoubleClickHdl ) ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCategoryListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCategoryListBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new CategoryListBox( pParent ); } @@ -163,7 +163,7 @@ void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt ) class CustomAnimationCreateTabPage : public TabPage { public: - CustomAnimationCreateTabPage( Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath = false ); + CustomAnimationCreateTabPage( vcl::Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath = false ); virtual ~CustomAnimationCreateTabPage(); PathKind getCreatePathKind() const; @@ -224,7 +224,7 @@ bool ImplStlEffectCategorySortHelper::operator()( const CustomAnimationPresetPtr return mxCollator->compareString(p1->getLabel(), p2->getLabel()) == -1; } -CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath ) +CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( vcl::Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath ) : TabPage( pParent, "CustomAnimationCreateTab", "modules/simpress/ui/customanimationcreatetab.ui" ) , mpParent( pDialogParent ) , mnId( nTabId ) @@ -479,7 +479,7 @@ bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId ) return false; } -CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ) +CustomAnimationCreateDialog::CustomAnimationCreateDialog( vcl::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ) : TabDialog( pParent, "CustomAnimationCreate", "modules/simpress/ui/customanimationcreatedialog.ui" ) , mpPane( pPane ) , mrTargets( rTargets ) @@ -612,10 +612,10 @@ void CustomAnimationCreateDialog::preview( const CustomAnimationPresetPtr& pPres namespace { -Window * lcl_GetTopmostParent( Window * pWindow ) +vcl::Window * lcl_GetTopmostParent( vcl::Window * pWindow ) { - Window * pResult = 0; - Window * pCurrent = pWindow ? pWindow->GetParent() : 0; + vcl::Window * pResult = 0; + vcl::Window * pCurrent = pWindow ? pWindow->GetParent() : 0; while( pCurrent ) { pResult = pCurrent; @@ -636,7 +636,7 @@ void CustomAnimationCreateDialog::setPosition() else { // default position: aligned with right edge of parent - Window * pParent = lcl_GetTopmostParent( this ); + vcl::Window * pParent = lcl_GetTopmostParent( this ); if( pParent ) { Point aPos( GetPosPixel()); diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx index f248f8fbc128..177eb8550945 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.hxx @@ -39,7 +39,7 @@ class CustomAnimationCreateDialog : public TabDialog { friend class CustomAnimationCreateTabPage; public: - CustomAnimationCreateDialog( ::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ); + CustomAnimationCreateDialog( vcl::Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration ); virtual ~CustomAnimationCreateDialog(); PathKind getCreatePathKind() const; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index caec627bcaec..e307af2ad14b 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -98,7 +98,7 @@ namespace sd { class PresetPropertyBox : public PropertySubControl { public: - PresetPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl ); + PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl ); virtual ~PresetPropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -110,7 +110,7 @@ private: ListBox* mpControl; }; -PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl ) +PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl ) : PropertySubControl( nControlType ) { mpControl = new ListBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); @@ -175,7 +175,7 @@ Control* PresetPropertyBox::getControl() class ColorPropertyBox : public PropertySubControl { public: - ColorPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~ColorPropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -186,7 +186,7 @@ private: ColorListBox* mpControl; }; -ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) { mpControl = new ColorListBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); @@ -247,7 +247,7 @@ Control* ColorPropertyBox::getControl() class FontPropertyBox : public PropertySubControl { public: - FontPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~FontPropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -259,7 +259,7 @@ private: FontNameBox* mpControl; }; -FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) { mpControl = new FontNameBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); @@ -320,7 +320,7 @@ Control* FontPropertyBox::getControl() class DropdownMenuBox : public Edit { public: - DropdownMenuBox( Window* pParent, Edit* pSubControl, PopupMenu* pMenu ); + DropdownMenuBox( vcl::Window* pParent, Edit* pSubControl, PopupMenu* pMenu ); virtual ~DropdownMenuBox(); void Resize() SAL_OVERRIDE; @@ -334,7 +334,7 @@ private: PopupMenu* mpMenu; }; -DropdownMenuBox::DropdownMenuBox( Window* pParent, Edit* pSubControl, PopupMenu* pMenu ) +DropdownMenuBox::DropdownMenuBox( vcl::Window* pParent, Edit* pSubControl, PopupMenu* pMenu ) : Edit( pParent, WB_BORDER|WB_TABSTOP| WB_DIALOGCONTROL ), mpSubControl(pSubControl),mpDropdownButton(0),mpMenu(pMenu) { @@ -394,7 +394,7 @@ bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt ) class CharHeightPropertyBox : public PropertySubControl { public: - CharHeightPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~CharHeightPropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -410,7 +410,7 @@ private: MetricField* mpMetric; }; -CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) { mpMetric = new MetricField( pParent, WB_TABSTOP|WB_IGNORETAB| WB_NOBORDER); @@ -471,7 +471,7 @@ Control* CharHeightPropertyBox::getControl() class TransparencyPropertyBox : public PropertySubControl { public: - TransparencyPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~TransparencyPropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -491,7 +491,7 @@ private: Link maModifyHdl; }; -TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) , maModifyHdl( rModifyHdl ) { @@ -575,7 +575,7 @@ Control* TransparencyPropertyBox::getControl() class RotationPropertyBox : public PropertySubControl { public: - RotationPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~RotationPropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -595,7 +595,7 @@ private: Link maModifyHdl; }; -RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) , maModifyHdl( rModifyHdl ) { @@ -700,7 +700,7 @@ Control* RotationPropertyBox::getControl() class ScalePropertyBox : public PropertySubControl { public: - ScalePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~ScalePropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -721,7 +721,7 @@ private: int mnDirection; }; -ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) , maModifyHdl( rModifyHdl ) { @@ -863,7 +863,7 @@ Control* ScalePropertyBox::getControl() class FontStylePropertyBox : public PropertySubControl { public: - FontStylePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ); + FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ); virtual ~FontStylePropertyBox(); virtual Any getValue() SAL_OVERRIDE; @@ -886,7 +886,7 @@ private: sal_Int16 mnFontUnderline; }; -FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl ) +FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link& rModifyHdl ) : PropertySubControl( nControlType ) , maModifyHdl( rModifyHdl ) { @@ -984,7 +984,7 @@ Control* FontStylePropertyBox::getControl() class CustomAnimationEffectTabPage : public TabPage { public: - CustomAnimationEffectTabPage( Window* pParent, const STLPropertySet* pSet ); + CustomAnimationEffectTabPage( vcl::Window* pParent, const STLPropertySet* pSet ); virtual ~CustomAnimationEffectTabPage(); void update( STLPropertySet* pSet ); @@ -1025,7 +1025,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer; }; -CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( Window* pParent, const STLPropertySet* pSet ) +CustomAnimationEffectTabPage::CustomAnimationEffectTabPage( vcl::Window* pParent, const STLPropertySet* pSet ) : TabPage( pParent, "EffectTab", "modules/simpress/ui/customanimationeffecttab.ui" ), mbHasText( false ), mpSet(pSet ) { get(mpSettings, "settings" ); @@ -1556,7 +1556,7 @@ void CustomAnimationEffectTabPage::onSoundPreview() class CustomAnimationDurationTabPage : public TabPage { public: - CustomAnimationDurationTabPage( Window* pParent, const STLPropertySet* pSet ); + CustomAnimationDurationTabPage( vcl::Window* pParent, const STLPropertySet* pSet ); virtual ~CustomAnimationDurationTabPage(); void update( STLPropertySet* pSet ); @@ -1580,7 +1580,7 @@ private: ListBox* mpLBTrigger; }; -CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, const STLPropertySet* pSet) +CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pParent, const STLPropertySet* pSet) : TabPage( pParent, "TimingTab", "modules/simpress/ui/customanimationtimingtab.ui" ), mpSet( pSet ) { get(mpFTStart,"start_label" ); @@ -1921,7 +1921,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) class CustomAnimationTextAnimTabPage : public TabPage { public: - CustomAnimationTextAnimTabPage( Window* pParent, const STLPropertySet* pSet ); + CustomAnimationTextAnimTabPage( vcl::Window* pParent, const STLPropertySet* pSet ); void update( STLPropertySet* pSet ); @@ -1941,7 +1941,7 @@ private: bool mbHasVisibleShapes; }; -CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(Window* pParent, const STLPropertySet* pSet) +CustomAnimationTextAnimTabPage::CustomAnimationTextAnimTabPage(vcl::Window* pParent, const STLPropertySet* pSet) : TabPage( pParent, "TextAnimationTab", "modules/simpress/ui/customanimationtexttab.ui" ), mpSet( pSet ), mbHasVisibleShapes(true) @@ -2100,7 +2100,7 @@ IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl) return 0; } -CustomAnimationDialog::CustomAnimationDialog(Window* pParent, STLPropertySet* pSet, const OString& sPage) +CustomAnimationDialog::CustomAnimationDialog(vcl::Window* pParent, STLPropertySet* pSet, const OString& sPage) : TabDialog( pParent, "CustomAnimationProperties", "modules/simpress/ui/customanimationproperties.ui") , mpSet( pSet ) , mpResultSet( 0 ) @@ -2208,12 +2208,12 @@ STLPropertySet* CustomAnimationDialog::createDefaultSet() return pSet; } -PropertyControl::PropertyControl( Window* pParent ) +PropertyControl::PropertyControl( vcl::Window* pParent ) : ListBox( pParent, WB_TABSTOP | WB_BORDER | WB_DROPDOWN ), mpSubControl(0) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makePropertyControl( Window *pParent ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makePropertyControl( vcl::Window *pParent ) { return new PropertyControl( pParent ); } @@ -2258,7 +2258,7 @@ PropertySubControl::~PropertySubControl() { } -PropertySubControl* PropertySubControl::create( sal_Int32 nType, Window* pParent, const Any& rValue, const OUString& rPresetId, const Link& rModifyHdl ) +PropertySubControl* PropertySubControl::create( sal_Int32 nType, vcl::Window* pParent, const Any& rValue, const OUString& rPresetId, const Link& rModifyHdl ) { PropertySubControl* pSubControl = NULL; switch( nType ) diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index f4e922519eb4..2fcdc742073a 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -107,7 +107,7 @@ public: static PropertySubControl* create( sal_Int32 nType, - ::Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Any& rValue, const OUString& rPresetId, const Link& rModifyHdl ); @@ -121,7 +121,7 @@ protected: class PropertyControl : public ListBox { public: - PropertyControl( Window* pParent ); + PropertyControl( vcl::Window* pParent ); virtual ~PropertyControl(); void setSubControl( PropertySubControl* pSubControl ); @@ -141,7 +141,7 @@ class STLPropertySet; class CustomAnimationDialog : public TabDialog { public: - CustomAnimationDialog(Window* pParent, STLPropertySet* pSet, const OString& Page = OString()); + CustomAnimationDialog(vcl::Window* pParent, STLPropertySet* pSet, const OString& Page = OString()); virtual ~CustomAnimationDialog(); STLPropertySet* getDefaultSet() { return mpSet; } diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index e215e5b92c42..e62b84bdbbdd 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -410,7 +410,7 @@ void CustomAnimationTriggerEntryItem::Clone( SvLBoxItem* ) { } -CustomAnimationList::CustomAnimationList( ::Window* pParent ) +CustomAnimationList::CustomAnimationList( vcl::Window* pParent ) : SvTreeListBox( pParent, WB_TABSTOP | WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT ) , mbIgnorePaint(false) , mpController(0) @@ -424,7 +424,7 @@ CustomAnimationList::CustomAnimationList( ::Window* pParent ) SetNodeDefaultImages(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCustomAnimationList( ::Window *pParent ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCustomAnimationList( vcl::Window *pParent ) { return new CustomAnimationList( pParent ); } diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index b8d121df9423..a8a022e15020 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -46,7 +46,7 @@ class CustomAnimationList : public SvTreeListBox, public ISequenceListener friend struct stl_append_effect_func; public: - CustomAnimationList( ::Window* pParent ); + CustomAnimationList( vcl::Window* pParent ); virtual ~CustomAnimationList(); // methods diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 4e4fc858ce5b..e457476b51d6 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -146,7 +146,7 @@ void fillRepeatComboBox( ListBox* pBox ) pBox->SetEntryData( pBox->InsertEntry( aEndOfSlide ), (void*)((sal_Int32)-2) ); } -CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase, +CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize ) : PanelLayout( pParent, "CustomAnimationsPanel", "modules/simpress/ui/customanimationspanel.ui", rxFrame ), @@ -2256,9 +2256,9 @@ void CustomAnimationPane::updatePathFromMotionPathTag( const rtl::Reference< Mot } } -::Window * createCustomAnimationPanel( ::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) +::vcl::Window * createCustomAnimationPanel( ::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) { - ::Window* pWindow = 0; + ::vcl::Window* pWindow = 0; DrawDocShell* pDocSh = rBase.GetDocShell(); if( pDocSh ) diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index c8917a9e9838..0cbd137a1441 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -62,7 +62,7 @@ class CustomAnimationPane : public PanelLayout, public ICustomAnimationListContr { friend class MotionPathTag; public: - CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize ); + CustomAnimationPane( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame, const Size& rMinSize ); virtual ~CustomAnimationPane(); // callbacks diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 36622c71ed48..d319e9ee4bc5 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -410,7 +410,7 @@ namespace sd // SlideTransitionPane SlideTransitionPane::SlideTransitionPane( - ::Window * pParent, + Window * pParent, ViewShellBase & rBase, const Size& rMinSize, SdDrawDocument* pDoc, @@ -1069,9 +1069,9 @@ IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback) return 0; } -::Window * createSlideTransitionPanel( ::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) +::vcl::Window * createSlideTransitionPanel( ::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) { - ::Window* pWindow = 0; + ::vcl::Window* pWindow = 0; DrawDocShell* pDocSh = rBase.GetDocShell(); if( pDocSh ) diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index 13ca6cd2aa15..a75ca210a19c 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -52,7 +52,7 @@ class SlideTransitionPane : public PanelLayout { public: explicit SlideTransitionPane( - ::Window * pParent, + Window * pParent, ViewShellBase & rBase, const Size& rMinSize, SdDrawDocument* pDoc, diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 33c8cb1f0ae0..21c703e7d6a5 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -903,7 +903,7 @@ IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener, return 0; } -void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation > xAnnotation, ::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu /* = false */ ) +void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation > xAnnotation, vcl::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu /* = false */ ) { SfxDispatcher* pDispatcher( getDispatcher( mrBase ) ); if( !pDispatcher ) diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index f81c76112fcd..61f6705072fe 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -78,7 +78,7 @@ public: void DeleteAnnotationsByAuthor( const OUString& sAuthor ); void DeleteAllAnnotations(); - void ExecuteAnnotationContextMenu( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, ::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu = false ); + void ExecuteAnnotationContextMenu( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, vcl::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu = false ); Color GetColorDark(sal_uInt16 aAuthorIndex); Color GetColorLight(sal_uInt16 aAuthorIndex); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 8c22c8a62a9c..36aefb829c6a 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -301,7 +301,7 @@ bool AnnotationTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& /*rHdl*/ if( rMEvt.IsLeft() && !rMEvt.IsRight() ) { - Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); + vcl::Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); if( pWindow ) { maMouseDownPos = pWindow->PixelToLogic( rMEvt.GetPosPixel() ); @@ -371,7 +371,7 @@ bool AnnotationTag::Command( const CommandEvent& rCEvt ) { if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) { - ::Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); + vcl::Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); if( pWindow ) { Rectangle aContextRect(rCEvt.GetMousePosPixel(),Size(1,1)); @@ -512,7 +512,7 @@ void AnnotationTag::select() mrManager.onTagSelected( *this ); - Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); + vcl::Window* pWindow = mrView.GetViewShell()->GetActiveWindow(); if( pWindow ) { RealPoint2D aPosition( mxAnnotation->getPosition() ); @@ -585,7 +585,7 @@ void AnnotationTag::OpenPopup( bool bEdit ) if( !mpAnnotationWindow.get() ) { - ::Window* pWindow = dynamic_cast< ::Window* >( getView().GetFirstOutputDevice() ); + vcl::Window* pWindow = dynamic_cast< vcl::Window* >( getView().GetFirstOutputDevice() ); if( pWindow ) { RealPoint2D aPosition( mxAnnotation->getPosition() ); @@ -631,7 +631,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent*, pEvent) { if( pEvent != NULL ) { - ::Window* pWindow = pEvent->GetWindow(); + vcl::Window* pWindow = pEvent->GetWindow(); if( pWindow ) { diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index 515d7b155a07..97dda94438db 100644 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -82,10 +82,10 @@ private: std::auto_ptr<AnnotationWindow> mpAnnotationWindow; Color maColor; int mnIndex; - const vcl::Font& mrFont; + const ::vcl::Font& mrFont; Size maSize; ImplSVEvent * mnClosePopupEvent; - ::Window* mpListenWindow; + vcl::Window* mpListenWindow; Point maMouseDownPos; }; diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 336682484d44..47063aad5fc8 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -265,7 +265,7 @@ Selection AnnotationTextWindow::GetSurroundingTextSelection() const /************** AnnotationWindow***********************************++*/ -AnnotationWindow::AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShell* pDocShell, Window* pParent ) +AnnotationWindow::AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShell* pDocShell, vcl::Window* pParent ) : FloatingWindow(pParent, WB_SYSTEMWINDOW|WB_BORDER|WB_NEEDSFOCUS) , mrManager( rManager ) , mpDocShell( pDocShell ) @@ -724,7 +724,7 @@ void AnnotationWindow::MouseButtonDown( const MouseEvent& rMEvt ) { // context menu Rectangle aRect(LogicToPixel(maRectMetaButton.BottomLeft()),LogicToPixel(maRectMetaButton.BottomLeft())); - mrManager.ExecuteAnnotationContextMenu( mxAnnotation, (::Window*)this, aRect, true ); + mrManager.ExecuteAnnotationContextMenu( mxAnnotation, (vcl::Window*)this, aRect, true ); } } diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 1a7582b5d91a..b44525c493b2 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -100,7 +100,7 @@ class AnnotationWindow : public FloatingWindow DECL_LINK(ScrollHdl, ScrollBar*); public: - AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShell* pDocShell, ::Window* pParent ); + AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShell* pDocShell, vcl::Window* pParent ); virtual ~AnnotationWindow(); void StartEdit(); diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 12b5aa7b45cb..2ad2f2b13a94 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -709,7 +709,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) pViewShell->GetViewFrame()->GetBindings().InvalidateAll( true ); } -SfxTabPage* SdModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SdModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) { SfxTabPage* pRet = NULL; SfxAllItemSet aSet(*(rSet.GetPool())); diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index a086e5061fad..e5a4621571e9 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -66,7 +66,7 @@ namespace sd class LayoutToolbarMenu : public svtools::ToolbarMenu { public: - LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, ::Window* pParent, const bool bInsertPage ); + LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, vcl::Window* pParent, const bool bInsertPage ); virtual ~LayoutToolbarMenu(); protected: @@ -151,7 +151,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn pValue->SetSizePixel( pValue->CalcWindowSizePixel( aLayoutItemSize ) ); } -LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, ::Window* pParent, const bool bInsertPage ) +LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, vcl::Window* pParent, const bool bInsertPage ) : svtools::ToolbarMenu(xFrame, pParent, WB_CLIPCHILDREN ) , mrController( rController ) , mxFrame(xFrame) @@ -355,7 +355,7 @@ void SAL_CALL SlideLayoutController::initialize( const css::uno::Sequence< css:: } } -::Window* SlideLayoutController::createPopupWindow( ::Window* pParent ) +::vcl::Window* SlideLayoutController::createPopupWindow( ::vcl::Window* pParent ) { return new sd::LayoutToolbarMenu( *this, m_xFrame, pParent, mbInsertPage ); } diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx index 3c6e91be113b..0104119dc45d 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.hxx +++ b/sd/source/ui/controller/slidelayoutcontroller.hxx @@ -32,7 +32,7 @@ public: const OUString& sCommandURL, bool bInsertPage ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) diff --git a/sd/source/ui/dlg/AnimationChildWindow.cxx b/sd/source/ui/dlg/AnimationChildWindow.cxx index abe028c04a1b..e10e609783d6 100644 --- a/sd/source/ui/dlg/AnimationChildWindow.cxx +++ b/sd/source/ui/dlg/AnimationChildWindow.cxx @@ -34,7 +34,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(AnimationChildWindow, SID_ANIMATION_OBJECTS) * Derivative from SfxChildWindow as "container" for animator */ AnimationChildWindow::AnimationChildWindow( - ::Window* _pParent, + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index c12ff2a4bed8..b0e27296ce9f 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -44,7 +44,7 @@ namespace sd { /** * default constructor */ -LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent) +LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, vcl::Window* pParent) : TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL ) ), DropTargetHelper( this ), pDrViewSh(pViewSh) diff --git a/sd/source/ui/dlg/NavigatorChildWindow.cxx b/sd/source/ui/dlg/NavigatorChildWindow.cxx index 9145f0c3436b..3dd4c0188ef0 100644 --- a/sd/source/ui/dlg/NavigatorChildWindow.cxx +++ b/sd/source/ui/dlg/NavigatorChildWindow.cxx @@ -46,7 +46,7 @@ void RequestNavigatorUpdate (SfxBindings* pBindings) } NavigatorChildWindow::NavigatorChildWindow ( - ::Window* pParent, + vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* ) diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index e113db903c33..7d6e75fc7078 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -50,7 +50,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW) //===== PaneChildWindow ======================================================= PaneChildWindow::PaneChildWindow ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, @@ -90,7 +90,7 @@ PaneChildWindow::~PaneChildWindow (void) //===== LeftPaneImpressChildWindow ============================================ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) @@ -108,7 +108,7 @@ LeftPaneImpressChildWindow::LeftPaneImpressChildWindow ( //===== LeftPaneDrawChildWindow =============================================== LeftPaneDrawChildWindow::LeftPaneDrawChildWindow ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 4c960db514eb..cc2dd553bcc4 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -38,7 +38,7 @@ using ::sfx2::TitledDockingWindow; namespace sd { PaneDockingWindow::PaneDockingWindow( - SfxBindings *_pBindings, SfxChildWindow *pChildWindow, ::Window* pParent, + SfxBindings *_pBindings, SfxChildWindow *pChildWindow, vcl::Window* pParent, const ResId& rResId, const OUString& rsTitle ) :TitledDockingWindow( _pBindings, pChildWindow, pParent, rResId ) { @@ -95,7 +95,7 @@ void PaneDockingWindow::SetValidSizeRange (const Range aValidSizeRange) SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent()); if (pSplitWindow != NULL) { - const sal_uInt16 nId (pSplitWindow->GetItemId(static_cast< ::Window*>(this))); + const sal_uInt16 nId (pSplitWindow->GetItemId(static_cast< vcl::Window*>(this))); const sal_uInt16 nSetId (pSplitWindow->GetSet(nId)); // Because the PaneDockingWindow paints its own decoration, we have // to compensate the valid size range for that. diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index eb2ee3ba6b4c..0815c6940a43 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -37,7 +37,7 @@ namespace sd OUString SdPhotoAlbumDialog::sDirUrl; -SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow, SdDrawDocument* pActDoc) +SdPhotoAlbumDialog::SdPhotoAlbumDialog(vcl::Window* pWindow, SdDrawDocument* pActDoc) : ModalDialog(pWindow, "PhotoAlbumCreatorDialog", "modules/simpress/ui/photoalbum.ui"), pDoc(pActDoc) { diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index f0add4d9e77a..d97ae81c9a02 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -44,7 +44,7 @@ namespace sd class SdPhotoAlbumDialog : public ModalDialog { public: - SdPhotoAlbumDialog(Window* pWindow, SdDrawDocument* pActDoc); + SdPhotoAlbumDialog(vcl::Window* pWindow, SdDrawDocument* pActDoc); virtual ~SdPhotoAlbumDialog(); virtual short Execute() SAL_OVERRIDE; diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx index 63edf448475c..f9cd67cb8dad 100644 --- a/sd/source/ui/dlg/RemoteDialog.cxx +++ b/sd/source/ui/dlg/RemoteDialog.cxx @@ -17,7 +17,7 @@ using namespace ::sd; using namespace ::std; -RemoteDialog::RemoteDialog( Window *pWindow ) +RemoteDialog::RemoteDialog( vcl::Window *pWindow ) : ModalDialog(pWindow, "RemoteDialog", "modules/simpress/ui/remotedialog.ui") { diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx index 27adf2bfe83f..7334c4bea548 100644 --- a/sd/source/ui/dlg/RemoteDialog.hxx +++ b/sd/source/ui/dlg/RemoteDialog.hxx @@ -31,7 +31,7 @@ private: DECL_DLLPRIVATE_LINK( HandleConnectButton, void * ); DECL_LINK( CloseHdl, void * ); public: - RemoteDialog( Window* pWindow ); + RemoteDialog( vcl::Window* pWindow ); }; } diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index 0377b7c5e659..2585668bb4b1 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -61,7 +61,7 @@ ClientRemovedListener::~ClientRemovedListener() // ClientBox -ClientBox::ClientBox( Window* pParent, WinBits nStyle ) : +ClientBox::ClientBox( vcl::Window* pParent, WinBits nStyle ) : Control( pParent, nStyle ), m_bHasScrollBar( false ), m_bHasActive( false ), @@ -108,7 +108,7 @@ ClientBox::ClientBox( Window* pParent, WinBits nStyle ) : Show(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeClientBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeClientBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index bcbf6214673d..c11a15b29c5e 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -135,7 +135,7 @@ class ClientBox: void checkIndex(sal_Int32 pos) const; public: - ClientBox( Window* pParent, WinBits nStyle ); + ClientBox( vcl::Window* pParent, WinBits nStyle ); virtual ~ClientBox(); void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index 010aa4bac5ac..c535d04f6c60 100644 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -38,7 +38,7 @@ SFX_IMPL_CHILDWINDOW_WITHID(SpellDialogChildWindow, SID_SPELL_DIALOG) namespace sd { SpellDialogChildWindow::SpellDialogChildWindow ( - ::Window* _pParent, + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index d39ef489a6d7..cb4f70bae1f6 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -57,7 +57,7 @@ namespace sd { /** * SdDisplay - Control */ -SdDisplay::SdDisplay( Window* pWin, SdResId Id ) : +SdDisplay::SdDisplay( vcl::Window* pWin, SdResId Id ) : Control( pWin, Id ), aScale( 1, 1 ) { @@ -123,7 +123,7 @@ void SdDisplay::DataChanged( const DataChangedEvent& rDCEvt ) * AnimationWindow - FloatingWindow */ AnimationWindow::AnimationWindow( SfxBindings* pInBindings, - SfxChildWindow *pCW, Window* pParent, const SdResId& rSdResId ) : + SfxChildWindow *pCW, vcl::Window* pParent, const SdResId& rSdResId ) : SfxDockingWindow ( pInBindings, pCW, pParent, rSdResId ), aCtlDisplay ( this, SdResId( CTL_DISPLAY ) ), aBtnFirst ( this, SdResId( BTN_FIRST ) ), @@ -972,7 +972,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) void AnimationWindow::CreateAnimObj (::sd::View& rView ) { - ::Window* pOutWin = static_cast< ::Window*>(rView.GetFirstOutputDevice()); // GetWin( 0 ); + vcl::Window* pOutWin = static_cast< vcl::Window*>(rView.GetFirstOutputDevice()); // GetWin( 0 ); DBG_ASSERT( pOutWin, "Window does not exist!" ); // find window center diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx index 3c17c2099320..e77375bb10a0 100644 --- a/sd/source/ui/dlg/assclass.cxx +++ b/sd/source/ui/dlg/assclass.cxx @@ -34,7 +34,7 @@ Assistent::Assistent(int nNoOfPages) mpPageStatus[i] = true; } -bool Assistent::InsertControl(int nDestPage,Window* pUsedControl) +bool Assistent::InsertControl(int nDestPage, ::vcl::Window* pUsedControl) { DBG_ASSERT( (nDestPage > 0) && (nDestPage <= mnPages), "Page not aviable!"); @@ -86,8 +86,8 @@ bool Assistent::GotoPage(const int nPageToGo) { int nIndex=mnCurrentPage-1; - std::vector<Window*>::iterator iter = maPages[nIndex].begin(); - std::vector<Window*>::iterator iterEnd = maPages[nIndex].end(); + std::vector<vcl::Window*>::iterator iter = maPages[nIndex].begin(); + std::vector<vcl::Window*>::iterator iterEnd = maPages[nIndex].end(); for(; iter != iterEnd; ++iter) { diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx index cebc2cc185b8..b596addfbc8b 100644 --- a/sd/source/ui/dlg/brkdlg.cxx +++ b/sd/source/ui/dlg/brkdlg.cxx @@ -39,7 +39,7 @@ namespace sd { */ BreakDlg::BreakDlg( - ::Window* pWindow, + vcl::Window* pWindow, DrawView* _pDrView, DrawDocShell* pShell, sal_uLong nSumActionCount, diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 33e41a5c8b67..56e865215205 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -40,7 +40,7 @@ namespace sd { #define TOKEN ';' -CopyDlg::CopyDlg(::Window* pWindow, const SfxItemSet& rInAttrs, +CopyDlg::CopyDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, const XColorListRef &pColList, ::sd::View* pInView) : SfxModalDialog(pWindow, "DuplicateDialog", "modules/sdraw/ui/copydlg.ui") , mrOutAttrs(rInAttrs) diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 6a64869ece07..b5b9d933dffe 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -31,7 +31,7 @@ #include "svtools/treelistentry.hxx" // SdCustomShowDlg -SdCustomShowDlg::SdCustomShowDlg( Window* pWindow, +SdCustomShowDlg::SdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ) : ModalDialog ( pWindow, "CustomSlideShows", "modules/simpress/ui/customslideshows.ui" ), rDoc ( rDrawDoc ), @@ -261,7 +261,7 @@ bool SdCustomShowDlg::IsCustomShow() const } // SdDefineCustomShowDlg -SdDefineCustomShowDlg::SdDefineCustomShowDlg( Window* pWindow, +SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ) : ModalDialog ( pWindow, "DefineCustomSlideShow", "modules/simpress/ui/definecustomslideshow.ui" ), rDoc ( rDrawDoc ), diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 674185f0305a..999c45e6e4d8 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlDiaPages, SfxUInt16Item ) // SdPagesField -SdPagesField::SdPagesField( Window* pParent, +SdPagesField::SdPagesField( vcl::Window* pParent, const uno::Reference< frame::XFrame >& rFrame, WinBits nBits ) : SvxMetricField ( pParent, rFrame, nBits ), @@ -132,7 +132,7 @@ void SdTbxCtlDiaPages::StateChanged( sal_uInt16, } } -Window* SdTbxCtlDiaPages::CreateItemWindow( Window* pParent ) +vcl::Window* SdTbxCtlDiaPages::CreateItemWindow( vcl::Window* pParent ) { return new SdPagesField( pParent, m_xFrame ); } diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 0e7f4d39263b..dfbab91b5147 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -92,7 +92,7 @@ public: class NextButton { public: - NextButton (::Window* pParent); + NextButton (vcl::Window* pParent); void ForceFocusEventBroadcast (void); void SetClickHdl (const Link& rLink); @@ -108,7 +108,7 @@ private: class AssistentDlgImpl : public SfxListener { public: - AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, bool bAutoPilot ); + AssistentDlgImpl( vcl::Window* pWindow, const Link& rFinishLink, bool bAutoPilot ); virtual ~AssistentDlgImpl(); /// Local mutex used to serialize concurrent method calls. @@ -159,7 +159,7 @@ public: */ bool mbPreviewUpdating; - ::Window* mpWindow; + vcl::Window* mpWindow; void SavePassword( SfxObjectShellLock xDoc, const OUString& rPath ); void RestorePassword( SfxItemSet* pSet, const OUString& rPath ); @@ -318,7 +318,7 @@ public: }; -AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, bool bAutoPilot ) : +AssistentDlgImpl::AssistentDlgImpl( vcl::Window* pWindow, const Link& rFinishLink, bool bAutoPilot ) : mpTemplateRegion(NULL), mpLayoutRegion(NULL), mbUserDataDirty(false), @@ -1449,7 +1449,7 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview ) { CloseDocShell(); - ::Window *pParent = Application::GetDefDialogParent(); + vcl::Window *pParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( mpWindow ); SfxErrorContext eEC(ERRCTX_SFX_LOADTEMPLATE,mpWindow); @@ -1495,7 +1495,7 @@ void AssistentDlgImpl::UpdatePreview( bool bDocPreview ) SfxObjectShellLock xLayoutDocShell; SfxErrorContext eEC(ERRCTX_SFX_LOADTEMPLATE,mpWindow); - ::Window *pParent = Application::GetDefDialogParent(); + vcl::Window *pParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( mpWindow ); if(IsOwnFormat(aLayoutFile)) @@ -1721,7 +1721,7 @@ Image AssistentDlgImpl::GetUiIconForCommand (const OUString& sCommandURL) return aIcon; } -AssistentDlg::AssistentDlg(Window* pParent, bool bAutoPilot) : +AssistentDlg::AssistentDlg(vcl::Window* pParent, bool bAutoPilot) : ModalDialog(pParent, "Assistent", "modules/simpress/ui/assistentdialog.ui") { Link aFinishLink = LINK(this,AssistentDlg, FinishHdl); @@ -1826,7 +1826,7 @@ uno::Sequence< beans::NamedValue > AssistentDlg::GetPassword() //===== NextButton ============================================================ -NextButton::NextButton (::Window* pParent) : +NextButton::NextButton (vcl::Window* pParent) : mbIsFirstButtonActive(true) { AssistentDlg* assDlg = static_cast<AssistentDlg*>(pParent); diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index 1c11c3d3f23c..a2fe444d0b79 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -32,7 +32,7 @@ #include "dlgassim.hxx" SdPageListControl::SdPageListControl( - ::Window* pParent, + vcl::Window* pParent, const WinBits nStyle ) : SvTreeListBox(pParent, nStyle) { @@ -49,7 +49,7 @@ SdPageListControl::SdPageListControl( SetCheckButtonHdl( LINK(this,SdPageListControl,CheckButtonClickHdl) ); } -extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makeSdPageListControl(::Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSdPageListControl(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index bb9681332366..8e966f856323 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -35,7 +35,7 @@ private: void InsertTitle( SvTreeListEntry* pEntry, const OUString& rTitle ); public: - SdPageListControl( Window* pParent, const WinBits nStyle ); + SdPageListControl( vcl::Window* pParent, const WinBits nStyle ); virtual ~SdPageListControl(); void Fill( SdDrawDocument* pDoc ); diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index b51394abbfdc..5b23fe32e35c 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -31,7 +31,7 @@ /** * Constructor of tab dialog: append pages to dialog */ -SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr, +SdCharDlg::SdCharDlg( vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ) : SfxTabDialog ( pParent ,"DrawCharDialog" diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx index e0fcd2192cb3..568254163ad3 100644 --- a/sd/source/ui/dlg/dlgctrls.cxx +++ b/sd/source/ui/dlg/dlgctrls.cxx @@ -33,7 +33,7 @@ struct FadeEffectLBImpl std::vector< TransitionPresetPtr > maPresets; }; -FadeEffectLB::FadeEffectLB(Window* pParent, WinBits nStyle) +FadeEffectLB::FadeEffectLB(vcl::Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) , mpImpl(new FadeEffectLBImpl) { @@ -67,7 +67,7 @@ void FadeEffectLB::Fill() SelectEntryPos(0); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFadeEffectLB(Window* pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFadeEffectLB(vcl::Window* pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index d79043d75367..575dfe57b892 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -38,7 +38,7 @@ /** * dialog to edit field commands */ -SdModifyFieldDlg::SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) : +SdModifyFieldDlg::SdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) : ModalDialog ( pWindow, "EditFieldsDialog", "modules/simpress/ui/dlgfield.ui" ), maInputSet ( rSet ), pField ( pInField ) diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index 4db3a43b5ee5..ab1ea95b6cde 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -48,7 +48,7 @@ namespace sd { * Constructor of tab dialog: append pages to the dialog */ OutlineBulletDlg::OutlineBulletDlg( - ::Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) : SfxTabDialog( pParent, "BulletsAndNumberingDialog", diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index e2be23d53f10..347b572038c8 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -33,7 +33,7 @@ /** * Constructor of tab dialog: appends pages to the dialog */ -SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, bool bAreaPage ) : +SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage ) : SfxTabDialog ( pParent ,"DrawPageDialog" ,"modules/sdraw/ui/drawpagedialog.ui" diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index eaaf2ccf8bdb..ee8548f07c6a 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -32,7 +32,7 @@ * dialog to adjust grid (scarcely ESO!) */ SdSnapLineDlg::SdSnapLineDlg( - ::Window* pWindow, + vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) : ModalDialog(pWindow, "SnapObjectDialog", "modules/sdraw/ui/dlgsnap.ui") diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 301cc708148b..591e6322f8b9 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -61,7 +61,7 @@ void SdDocPreviewWin::SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage updateViewSettings(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSdDocPreviewWin(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSdDocPreviewWin(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; @@ -72,7 +72,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSdDocPreviewWin(Window *pPa return new SdDocPreviewWin(pParent, nWinStyle); } -SdDocPreviewWin::SdDocPreviewWin( Window* pParent, const WinBits nStyle ) +SdDocPreviewWin::SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle ) : Control(pParent, nStyle), pMetaFile( 0 ), bInEffect(false), mpObj(NULL), mnShowPage(0) { SetBorderStyle( WINDOW_BORDER_MONO ); diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 195d5d3dce0c..7cbbb8d69400 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -59,7 +59,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlGlueEscDir, SfxUInt16Item ) /** * Constructor for glue point escape direction Listbox */ -GlueEscDirLB::GlueEscDirLB( Window* pParent, const Reference< XFrame >& rFrame ) : +GlueEscDirLB::GlueEscDirLB( vcl::Window* pParent, const Reference< XFrame >& rFrame ) : ListBox( pParent, WinBits( WB_BORDER | WB_DROPDOWN ) ), m_xFrame( rFrame ) { @@ -160,7 +160,7 @@ void SdTbxCtlGlueEscDir::StateChanged( sal_uInt16 nSId, SfxToolBoxControl::StateChanged( nSId, eState, pState ); } -Window* SdTbxCtlGlueEscDir::CreateItemWindow( Window *pParent ) +vcl::Window* SdTbxCtlGlueEscDir::CreateItemWindow( vcl::Window *pParent ) { if( GetSlotId() == SID_GLUE_ESCDIR ) { diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 6fb37a750e8e..b3c7a836fe16 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -74,7 +74,7 @@ private: void Paint( OutputDevice& aOut, SdrTextObj* pObj, bool bVisible, bool bDotted = false ); public: - PresLayoutPreview( ::Window* pParent ); + PresLayoutPreview( vcl::Window* pParent ); virtual ~PresLayoutPreview(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -153,7 +153,7 @@ private: void GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet, SdPage* pPage ); public: - HeaderFooterTabPage( ::Window* pParent, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ); + HeaderFooterTabPage( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ); virtual ~HeaderFooterTabPage(); void init( const HeaderFooterSettings& rSettings, bool bNotOnTitle ); @@ -165,7 +165,7 @@ public: using namespace ::sd; -HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) : +HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) : TabDialog ( pParent, "HeaderFooterDialog", "modules/simpress/ui/headerfooterdialog.ui" ), mpDoc( pDoc ), mpCurrentPage( pCurrentPage ), @@ -389,7 +389,7 @@ void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const H pPage->setHeaderFooterSettings( rNewSettings ); } -HeaderFooterTabPage::HeaderFooterTabPage( ::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) : +HeaderFooterTabPage::HeaderFooterTabPage( vcl::Window* pWindow, SdDrawDocument* pDoc, SdPage* pActualPage, bool bHandoutMode ) : TabPage( pWindow, "HeaderFooterTab", "modules/simpress/ui/headerfootertab.ui" ), mpDoc(pDoc), mbHandoutMode( bHandoutMode ) @@ -671,13 +671,13 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo } } -PresLayoutPreview::PresLayoutPreview( ::Window* pParent ) +PresLayoutPreview::PresLayoutPreview( vcl::Window* pParent ) : Control(pParent) , mpMaster(NULL) { } -extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makePresLayoutPreview( ::Window *pParent, VclBuilder::stringmap & ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makePresLayoutPreview( vcl::Window *pParent, VclBuilder::stringmap & ) { return new PresLayoutPreview( pParent ); } diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx index acf843651910..a256990697e0 100644 --- a/sd/source/ui/dlg/ins_paste.cxx +++ b/sd/source/ui/dlg/ins_paste.cxx @@ -19,7 +19,7 @@ #include "ins_paste.hxx" -SdInsertPasteDlg::SdInsertPasteDlg(Window* pWindow) +SdInsertPasteDlg::SdInsertPasteDlg(vcl::Window* pWindow) : ModalDialog( pWindow, "InsertSlidesDialog", "modules/simpress/ui/insertslides.ui") { diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index afd20fdf28dd..a78812f516df 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/sd/source/ui/dlg/inspagob.cxx @@ -27,7 +27,7 @@ #include "ViewShell.hxx" SdInsertPagesObjsDlg::SdInsertPagesObjsDlg( - ::Window* pWindow, const SdDrawDocument* pInDoc, + vcl::Window* pWindow, const SdDrawDocument* pInDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) : ModalDialog(pWindow, "InsertSlidesDialog", "modules/sdraw/ui/insertslidesdialog.ui") diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx index 8915aacaf0f0..fbf030fd0881 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.cxx +++ b/sd/source/ui/dlg/layeroptionsdlg.cxx @@ -25,7 +25,7 @@ #include "sdresid.hxx" #include "layeroptionsdlg.hxx" -SdInsertLayerDlg::SdInsertLayerDlg( Window* pWindow, const SfxItemSet& rInAttrs, +SdInsertLayerDlg::SdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& rStr ) : ModalDialog(pWindow, "InsertLayerDialog", "modules/sdraw/ui/insertlayer.ui") , mrOutAttrs(rInAttrs) diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx index eb4e4fddef5a..d9e525f39a2f 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.cxx +++ b/sd/source/ui/dlg/masterlayoutdlg.cxx @@ -28,7 +28,7 @@ using namespace ::sd; -MasterLayoutDialog::MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) +MasterLayoutDialog::MasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) : ModalDialog(pParent, "MasterLayoutDialog", "modules/simpress/ui/masterlayoutdlg.ui") , mpDoc(pDoc) , mpCurrentPage(pCurrentPage) diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 301ef799fcfb..53796eab4c87 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star; namespace sd { -MorphDlg::MorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2 ) +MorphDlg::MorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2 ) : ModalDialog(pParent, "CrossFadeDialog", "modules/sdraw/ui/crossfadedialog.ui") { diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 12cae5bbc49d..34d3c48c8a92 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -62,12 +62,12 @@ static const sal_uInt16 nShowAllShapesFilter=2; * SdNavigatorWin - FloatingWindow */ SdNavigatorWin::SdNavigatorWin( - ::Window* pParent, + vcl::Window* pParent, ::sd::NavigatorChildWindow* pChWinCtxt, const SdResId& rSdResId, SfxBindings* pInBindings, const UpdateRequestFunctor& rUpdateRequest) - : ::Window( pParent, rSdResId ) + : vcl::Window( pParent, rSdResId ) , maToolbox ( this, SdResId( 1 ) ) , maTlbObjects( this, SdResId( TLB_OBJECTS ) ) , maLbDocs ( this, SdResId( LB_DOCS ) ) @@ -407,7 +407,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl) if ( pCurSh ) { - Window* pShellWnd = pCurSh->GetWindow(); + vcl::Window* pShellWnd = pCurSh->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); } diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index b571cbbf83ff..d87c3d615a6e 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -37,10 +37,10 @@ class SdParagraphNumTabPage : public SfxTabPage { public: - SdParagraphNumTabPage(Window* pParent, const SfxItemSet& rSet ); + SdParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SdParagraphNumTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -55,7 +55,7 @@ private: DECL_LINK( ImplNewStartHdl, void* ); }; -SdParagraphNumTabPage::SdParagraphNumTabPage(Window* pParent, const SfxItemSet& rAttr ) +SdParagraphNumTabPage::SdParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage(pParent, "DrawParaNumbering", "modules/sdraw/ui/paranumberingtab.ui", @@ -74,7 +74,7 @@ SdParagraphNumTabPage::~SdParagraphNumTabPage() { } -SfxTabPage* SdParagraphNumTabPage::Create(Window *pParent, const SfxItemSet * rAttrSet) +SfxTabPage* SdParagraphNumTabPage::Create(vcl::Window *pParent, const SfxItemSet * rAttrSet) { return new SdParagraphNumTabPage( pParent, *rAttrSet ); } @@ -153,7 +153,7 @@ IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl) return 0; } -SdParagraphDlg::SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) +SdParagraphDlg::SdParagraphDlg( vcl::Window* pParent, const SfxItemSet* pAttr ) : SfxTabDialog( pParent, "DrawParagraphPropertiesDialog", "modules/sdraw/ui/drawparadialog.ui", diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index 0ab868f88990..a39d7e4a9110 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; -SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow, +SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) : ModalDialog ( pWindow, "PresentationDialog", "modules/simpress/ui/presentationdialog.ui" ), diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 428a98c0e494..ceafcc5a4ea3 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -49,7 +49,7 @@ * Constructor of Tab dialog: appends pages to the dialog */ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, - Window* pParent, + vcl::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects _ePO, diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index e886dbc83996..1be0be54e5f6 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -28,7 +28,7 @@ /** * dialog to adjust print options */ -SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) : +SdPrintOptions::SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage ( pParent, "prntopts" , "modules/simpress/ui/prntopts.ui" , &rInAttrs ), rOutAttrs ( rInAttrs ) { @@ -182,7 +182,7 @@ void SdPrintOptions::Reset( const SfxItemSet* rAttrs ) ClickBookletHdl( NULL ); } -SfxTabPage* SdPrintOptions::Create( Window* pWindow, +SfxTabPage* SdPrintOptions::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) { return( new SdPrintOptions( pWindow, *rOutAttrs ) ); diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 8ea43f36e032..cd9e452b61c3 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -279,9 +279,9 @@ bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const return pDlg->IsInsertBefore(); } -::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow() +::vcl::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow() { - return (::Window*)pDlg; + return (vcl::Window*)pDlg; } std::vector<OUString> AbstractSdInsertPagesObjsDlg_Impl::GetList(const sal_uInt16 nType) @@ -372,7 +372,7 @@ void AbstractHeaderFooterDialog_Impl::Cancel() //-------------- SdAbstractDialogFactory implementation-------------- VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( - ::Window* pWindow, + vcl::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, @@ -382,110 +382,110 @@ VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( } AbstractCopyDlg * SdAbstractDialogFactory_Impl::CreateCopyDlg( - ::Window* pWindow, const SfxItemSet& rInAttrs, + vcl::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) { return new AbstractCopyDlg_Impl( new ::sd::CopyDlg( pWindow, rInAttrs, pColTab, pView ) ); } -AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) +AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ) { return new AbstractSdCustomShowDlg_Impl( new SdCustomShowDlg( pWindow, rDrawDoc ) ); } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabCharDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) { return new SdAbstractTabDialog_Impl( new SdCharDlg( pParent, pAttr, pDocShell ) ); } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage ) { return new SdAbstractTabDialog_Impl( new SdPageDlg( pDocShell, pParent, pAttr, bAreaPage ) ); } -AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( ::Window* pParent, bool bAutoPilot) +AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( vcl::Window* pParent, bool bAutoPilot) { return new AbstractAssistentDlg_Impl( new AssistentDlg( pParent, bAutoPilot ) ); } -AbstractSdModifyFieldDlg * SdAbstractDialogFactory_Impl::CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) +AbstractSdModifyFieldDlg * SdAbstractDialogFactory_Impl::CreateSdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) { return new AbstractSdModifyFieldDlg_Impl( new SdModifyFieldDlg( pWindow, pInField, rSet ) ); } -AbstractSdSnapLineDlg * SdAbstractDialogFactory_Impl::CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) +AbstractSdSnapLineDlg * SdAbstractDialogFactory_Impl::CreateSdSnapLineDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) { return new AbstractSdSnapLineDlg_Impl( new SdSnapLineDlg( pWindow, rInAttrs, pView ) ); } -AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) +AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) { return new AbstractSdInsertLayerDlg_Impl( new SdInsertLayerDlg( pWindow, rInAttrs, bDeletable, aStr ) ); } -AbstractSdInsertPasteDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPasteDlg( ::Window* pWindow ) +AbstractSdInsertPasteDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPasteDlg( vcl::Window* pWindow ) { return new AbstractSdInsertPasteDlg_Impl( new SdInsertPasteDlg( pWindow ) ); } -AbstractSdInsertPagesObjsDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) +AbstractSdInsertPagesObjsDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) { return new AbstractSdInsertPagesObjsDlg_Impl( new SdInsertPagesObjsDlg( pParent, pDoc, pSfxMedium, rFileName ) ); } -AbstractMorphDlg * SdAbstractDialogFactory_Impl::CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) +AbstractMorphDlg * SdAbstractDialogFactory_Impl::CreateMorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) { return new AbstractMorphDlg_Impl( new ::sd::MorphDlg( pParent, pObj1, pObj2 ) ); } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDlg( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDlg( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) { return new AbstractBulletDialog_Impl( new ::sd::OutlineBulletDlg( pParent, pAttr, pView ) ); } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg( ::Window* pParent, const SfxItemSet* pAttr ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg( vcl::Window* pParent, const SfxItemSet* pAttr ) { return new SdAbstractTabDialog_Impl( new SdParagraphDlg( pParent, pAttr ) ); } -AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, +AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) { return new AbstractSdStartPresDlg_Impl( new SdStartPresentationDlg( pWindow, rInAttrs, rPageNames, pCSList ) ); } -VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateRemoteDialog( ::Window* pWindow ) +VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateRemoteDialog( vcl::Window* pWindow ) { return new SdVclAbstractDialog_Impl( new ::sd::RemoteDialog( pWindow ) ); } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) { return new SdPresLayoutTemplateDlg_Impl( new SdPresLayoutTemplateDlg( pDocSh, pParent, DlgId, rStyleBase, ePO, pSSPool ) ); } -AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs) +AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, vcl::Window* pWindow, const SfxItemSet& rInAttrs) { return new AbstractSdPresLayoutDlg_Impl( new SdPresLayoutDlg( pDocShell, pWindow, rInAttrs ) ); } -SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) +SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) { return new SdAbstractTabDialog_Impl( new SdTabTemplateDlg( pParent, pDocShell, rStyleBase, pModel, pView ) ); } -SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) +SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) { return new SdAbstractSfxDialog_Impl( new SdActionDlg( pParent, pAttr, pView ) ); } -AbstractSdVectorizeDlg * SdAbstractDialogFactory_Impl::CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) +AbstractSdVectorizeDlg * SdAbstractDialogFactory_Impl::CreateSdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) { return new AbstractSdVectorizeDlg_Impl( new SdVectorizeDlg( pParent, rBmp, pDocShell ) ); } -AbstractSdPublishingDlg * SdAbstractDialogFactory_Impl::CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) +AbstractSdPublishingDlg * SdAbstractDialogFactory_Impl::CreateSdPublishingDlg( vcl::Window* pWindow, DocumentType eDocType) { return new AbstractSdPublishingDlg_Impl( new SdPublishingDlg( pWindow, eDocType ) ); } @@ -511,19 +511,19 @@ CreateTabPage SdAbstractDialogFactory_Impl::GetSdOptionsSnapTabPageCreatorFunc() return SdTpOptionsSnap::Create; } -VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( ::Window* pParent, +VclAbstractDialog* SdAbstractDialogFactory_Impl::CreateMasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) { return new SdVclAbstractDialog_Impl( new ::sd::MasterLayoutDialog( pParent, pDoc, pCurrentPage )); } AbstractHeaderFooterDialog* SdAbstractDialogFactory_Impl::CreateHeaderFooterDialog( ViewShell* pViewShell, - ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) + vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) { return new AbstractHeaderFooterDialog_Impl( new ::sd::HeaderFooterDialog( (::sd::ViewShell*)pViewShell, pParent, pDoc, pCurrentPage )); } -VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateSdPhotoAlbumDialog( ::Window* pWindow, SdDrawDocument* pDoc ) +VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateSdPhotoAlbumDialog( vcl::Window* pWindow, SdDrawDocument* pDoc ) { return new SdVclAbstractDialog_Impl( new ::sd::SdPhotoAlbumDialog( pWindow, pDoc ) ); } diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 15b91e11f1b0..cc146f645fcb 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -165,7 +165,7 @@ class SdInsertPagesObjsDlg; class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) - virtual ::Window * GetWindow() SAL_OVERRIDE; + virtual vcl::Window * GetWindow() SAL_OVERRIDE; virtual std::vector<OUString> GetList ( const sal_uInt16 nType ) SAL_OVERRIDE; virtual bool IsLink() SAL_OVERRIDE; virtual bool IsRemoveUnnessesaryMasterPages() const SAL_OVERRIDE; @@ -231,38 +231,38 @@ class SdAbstractDialogFactory_Impl : public SdAbstractDialogFactory public: virtual ~SdAbstractDialogFactory_Impl() {} - virtual VclAbstractDialog* CreateBreakDlg(::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) SAL_OVERRIDE; - virtual AbstractCopyDlg* CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) SAL_OVERRIDE; - virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) SAL_OVERRIDE; - virtual AbstractAssistentDlg* CreateAssistentDlg( ::Window* pParent, bool bAutoPilot) SAL_OVERRIDE; - virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) SAL_OVERRIDE; - virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) SAL_OVERRIDE; - virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( ::Window* pWindow ) SAL_OVERRIDE; - virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) SAL_OVERRIDE; - virtual AbstractMorphDlg* CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( ::Window* pParent, const SfxItemSet* pAttr ) SAL_OVERRIDE; - virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, + virtual VclAbstractDialog* CreateBreakDlg(vcl::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) SAL_OVERRIDE; + virtual AbstractCopyDlg* CreateCopyDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) SAL_OVERRIDE; + virtual AbstractSdCustomShowDlg* CreateSdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdTabCharDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdTabPageDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, bool bAreaPage = true ) SAL_OVERRIDE; + virtual AbstractAssistentDlg* CreateAssistentDlg( vcl::Window* pParent, bool bAutoPilot) SAL_OVERRIDE; + virtual AbstractSdModifyFieldDlg* CreateSdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual AbstractSdSnapLineDlg* CreateSdSnapLineDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) SAL_OVERRIDE; + virtual AbstractSdInsertLayerDlg* CreateSdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) SAL_OVERRIDE; + virtual AbstractSdInsertPasteDlg* CreateSdInsertPasteDlg( vcl::Window* pWindow ) SAL_OVERRIDE; + virtual AbstractSdInsertPagesObjsDlg* CreateSdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) SAL_OVERRIDE; + virtual AbstractMorphDlg* CreateMorphDlg( vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdOutlineBulletTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView = NULL ) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdParagraphTabDlg ( vcl::Window* pParent, const SfxItemSet* pAttr ) SAL_OVERRIDE; + virtual AbstractSdStartPresDlg* CreateSdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateRemoteDialog( ::Window* pWindow ) SAL_OVERRIDE; // ad for RemoteDialog - virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) SAL_OVERRIDE; - virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) SAL_OVERRIDE; - virtual SfxAbstractDialog* CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) SAL_OVERRIDE; - virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) SAL_OVERRIDE; - virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateRemoteDialog( vcl::Window* pWindow ) SAL_OVERRIDE; // ad for RemoteDialog + virtual SfxAbstractTabDialog* CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) SAL_OVERRIDE; + virtual AbstractSdPresLayoutDlg* CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, vcl::Window* pWindow, const SfxItemSet& rInAttrs) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSdTabTemplateDlg( vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) SAL_OVERRIDE; + virtual SfxAbstractDialog* CreatSdActionDialog( vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) SAL_OVERRIDE; + virtual AbstractSdVectorizeDlg* CreateSdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) SAL_OVERRIDE; + virtual AbstractSdPublishingDlg* CreateSdPublishingDlg( vcl::Window* pWindow, DocumentType eDocType) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( ::Window* pWindow, SdDrawDocument* pDoc) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateSdPhotoAlbumDialog( vcl::Window* pWindow, SdDrawDocument* pDoc) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, + virtual VclAbstractDialog* CreateMasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* ) SAL_OVERRIDE; virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ) SAL_OVERRIDE; diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 13c92f49f622..6f0bc81600fa 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -32,7 +32,7 @@ #include <boost/scoped_ptr.hpp> SdPresLayoutDlg::SdPresLayoutDlg(::sd::DrawDocShell* pDocShell, - ::Window* pWindow, const SfxItemSet& rInAttrs) + vcl::Window* pWindow, const SfxItemSet& rInAttrs) : ModalDialog(pWindow, "SlideDesignDialog", "modules/simpress/ui/slidedesigndialog.ui") , mpDocSh(pDocShell) diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 6836212831d0..e8dee4a407b8 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -97,7 +97,7 @@ SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable( { } -extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makeSdPageObjsTLB(::Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSdPageObjsTLB(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -191,7 +191,7 @@ sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::GetListBoxDropFormatId (void) return mnListBoxDropFormatId; } -SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) +SdPageObjsTLB::SdPageObjsTLB( vcl::Window* pParentWin, const SdResId& rSdResId ) : SvTreeListBox ( pParentWin, rSdResId ) , bisInSdNavigatorWin ( false ) , mpParent ( pParentWin ) @@ -222,7 +222,7 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId ) SV_DRAGDROP_APP_MOVE | SV_DRAGDROP_APP_COPY | SV_DRAGDROP_APP_DROP ); } -SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, WinBits nStyle ) +SdPageObjsTLB::SdPageObjsTLB( vcl::Window* pParentWin, WinBits nStyle ) : SvTreeListBox ( pParentWin, nStyle ) , bisInSdNavigatorWin ( false ) , mpParent ( pParentWin ) @@ -601,11 +601,11 @@ void SdPageObjsTLB::AddShapeList ( bool bMarked=false; if(bisInSdNavigatorWin) { - Window* pWindow=NULL; + vcl::Window* pWindow=NULL; SdNavigatorWin* pSdNavigatorWin=NULL; sd::DrawDocShell* pSdDrawDocShell = NULL; if(pEntry) - pWindow=(Window*)GetParent(pEntry); + pWindow=(vcl::Window*)GetParent(pEntry); if(pWindow) pSdNavigatorWin = (SdNavigatorWin*)pWindow; if( pSdNavigatorWin ) @@ -644,11 +644,11 @@ void SdPageObjsTLB::AddShapeList ( if(bisInSdNavigatorWin) { - Window* pWindow=NULL; + vcl::Window* pWindow=NULL; SdNavigatorWin* pSdNavigatorWin=NULL; sd::DrawDocShell* pSdDrawDocShell = NULL; if(pNewEntry) - pWindow=(Window*)GetParent(pNewEntry); + pWindow=(vcl::Window*)GetParent(pNewEntry); if(pWindow) pSdNavigatorWin = (SdNavigatorWin*)pWindow; if( pSdNavigatorWin ) @@ -678,11 +678,11 @@ void SdPageObjsTLB::AddShapeList ( if(bisInSdNavigatorWin) { - Window* pWindow=NULL; + vcl::Window* pWindow=NULL; SdNavigatorWin* pSdNavigatorWin=NULL; sd::DrawDocShell* pSdDrawDocShell = NULL; if(pNewEntry) - pWindow=(Window*)GetParent(pNewEntry); + pWindow=(vcl::Window*)GetParent(pNewEntry); if(pWindow) pSdNavigatorWin = (SdNavigatorWin*)pWindow; if( pSdNavigatorWin ) @@ -727,11 +727,11 @@ void SdPageObjsTLB::AddShapeList ( if(bisInSdNavigatorWin) { - Window* pWindow=NULL; + vcl::Window* pWindow=NULL; SdNavigatorWin* pSdNavigatorWin=NULL; sd::DrawDocShell* pSdDrawDocShell = NULL; if(pNewEntry) - pWindow=(Window*)GetParent(pNewEntry); + pWindow=(vcl::Window*)GetParent(pNewEntry); if(pWindow) pSdNavigatorWin = (SdNavigatorWin*)pWindow; if( pSdNavigatorWin ) diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index f8b5c2ea57da..4d633580d476 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -45,7 +45,7 @@ /** * Constructor of the Tab dialog: appends pages to the dialog */ -SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent, +SdTabTemplateDlg::SdTabTemplateDlg( vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 38ebfe206e44..be80813b5957 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -76,7 +76,7 @@ using namespace com::sun::star::lang; * Constructor of the Tab dialog: appends the pages to the dialog */ SdActionDlg::SdActionDlg ( - ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) + vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) : SfxSingleTabDialog(pParent, *pAttr, "InteractionDialog", "modules/simpress/ui/interactiondialog.ui") , rOutAttrs(*pAttr) @@ -95,7 +95,7 @@ SdActionDlg::SdActionDlg ( /** * Action-TabPage */ -SdTPAction::SdTPAction(Window* pWindow, const SfxItemSet& rInAttrs) +SdTPAction::SdTPAction(vcl::Window* pWindow, const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, "InteractionPage", "modules/simpress/ui/interactionpage.ui", &rInAttrs) , rOutAttrs(rInAttrs) @@ -358,7 +358,7 @@ int SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) return( LEAVE_PAGE ); } -SfxTabPage* SdTPAction::Create( Window* pWindow, +SfxTabPage* SdTPAction::Create( vcl::Window* pWindow, const SfxItemSet& rAttrs ) { return( new SdTPAction( pWindow, rAttrs ) ); @@ -410,7 +410,7 @@ void SdTPAction::OpenFileDialog() } else if (bMacro) { - Window* pOldWin = Application::GetDefDialogParent(); + vcl::Window* pOldWin = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); // choose macro dialog diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index d80266fcef0b..82a12dc8f6c0 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -SdTpOptionsSnap::SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs ) : +SdTpOptionsSnap::SdTpOptionsSnap( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SvxGridTabPage(pParent, rInAttrs) { pSnapFrames->Show(); @@ -99,7 +99,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs ) pCbxRotate->GetClickHdl().Call(0); } -SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow, +SfxTabPage* SdTpOptionsSnap::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SdTpOptionsSnap( pWindow, *rAttrs ) ); @@ -111,7 +111,7 @@ SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow, |* \************************************************************************/ -SdTpOptionsContents::SdTpOptionsContents( Window* pParent, const SfxItemSet& rInAttrs ) : +SdTpOptionsContents::SdTpOptionsContents( vcl::Window* pParent, const SfxItemSet& rInAttrs ) : SfxTabPage ( pParent, "SdViewPage", "modules/simpress/ui/sdviewpage.ui", &rInAttrs ) { get( m_pCbxRuler, "ruler"); @@ -165,7 +165,7 @@ void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs ) m_pCbxHandlesBezier->SaveValue(); } -SfxTabPage* SdTpOptionsContents::Create( Window* pWindow, +SfxTabPage* SdTpOptionsContents::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SdTpOptionsContents( pWindow, *rAttrs ) ); @@ -179,7 +179,7 @@ SfxTabPage* SdTpOptionsContents::Create( Window* pWindow, #define TABLE_COUNT 12 #define TOKEN ':' -SdTpOptionsMisc::SdTpOptionsMisc(Window* pParent, const SfxItemSet& rInAttrs) +SdTpOptionsMisc::SdTpOptionsMisc(vcl::Window* pParent, const SfxItemSet& rInAttrs) : SfxTabPage(pParent, "OptSavePage", "modules/simpress/ui/optimpressgeneralpage.ui", &rInAttrs) , nWidth(0) , nHeight(0) @@ -488,7 +488,7 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) UpdateCompatibilityControls (); } -SfxTabPage* SdTpOptionsMisc::Create( Window* pWindow, +SfxTabPage* SdTpOptionsMisc::Create( vcl::Window* pWindow, const SfxItemSet* rAttrs ) { return( new SdTpOptionsMisc( pWindow, *rAttrs ) ); diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 21f1a9eb114a..edd9a7f565ff 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -32,7 +32,7 @@ #define VECTORIZE_MAX_EXTENT 512 -SdVectorizeDlg::SdVectorizeDlg(Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell) +SdVectorizeDlg::SdVectorizeDlg(vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell) : ModalDialog(pParent, "VectorizeDialog", "modules/sdraw/ui/vectorize.ui") , mpDocSh(pDocShell) , aBmp(rBmp) diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index f0e1518ca7d9..d4882e594b0f 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -144,7 +144,7 @@ Rectangle DrawDocShell::GetVisArea(sal_uInt16 nAspect) const if (aVisArea.IsEmpty() && mpViewShell) { - Window* pWin = mpViewShell->GetActiveWindow(); + vcl::Window* pWin = mpViewShell->GetActiveWindow(); if (pWin) { @@ -282,7 +282,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixe * name. * @return sal_False if the user cancels the action. */ -bool DrawDocShell::CheckPageName (::Window* pWin, OUString& rName ) +bool DrawDocShell::CheckPageName (vcl::Window* pWin, OUString& rName ) { const OUString aStrForDlg( rName ); bool bIsNameValid = IsNewPageNameValid( rName, true ); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 7190485673ec..1108721603da 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -344,7 +344,7 @@ bool DrawDocShell::LoadFrom( SfxMedium& rMedium ) WaitObject* pWait = NULL; if( mpViewShell ) - pWait = new WaitObject( (Window*) mpViewShell->GetActiveWindow() ); + pWait = new WaitObject( (vcl::Window*) mpViewShell->GetActiveWindow() ); mpDoc->NewOrLoadCompleted( NEW_DOC ); mpDoc->CreateFirstPages(); @@ -516,10 +516,10 @@ bool DrawDocShell::SaveAs( SfxMedium& rMedium ) SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this ); if (pFrame1) { - ::Window* pWindow = &pFrame1->GetWindow(); + vcl::Window* pWindow = &pFrame1->GetWindow(); if ( pWindow ) { - ::Window* pSysWin = pWindow->GetSystemWindow(); + vcl::Window* pSysWin = pWindow->GetSystemWindow(); if ( pSysWin ) { pSysWin->SetAccessibleName(OUString()); @@ -1168,7 +1168,7 @@ void DrawDocShell::OpenBookmark( const OUString& rBookmarkURL ) ( mpViewShell ? mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->GetBindings().Execute( SID_OPENHYPERLINK, ppArgs ); } -SfxDocumentInfoDialog* DrawDocShell::CreateDocumentInfoDialog( ::Window *pParent, const SfxItemSet &rSet ) +SfxDocumentInfoDialog* DrawDocShell::CreateDocumentInfoDialog( vcl::Window *pParent, const SfxItemSet &rSet ) { SfxDocumentInfoDialog* pDlg = new SfxDocumentInfoDialog( pParent, rSet ); DrawDocShell* pDocSh = PTR_CAST(DrawDocShell,SfxObjectShell::Current()); diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx index 575d3b21f297..768ec5d94a72 100644 --- a/sd/source/ui/docshell/sdclient.cxx +++ b/sd/source/ui/docshell/sdclient.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star; namespace sd { -Client::Client(SdrOle2Obj* pObj, ViewShell* pViewShell, ::Window* pWindow) : +Client::Client(SdrOle2Obj* pObj, ViewShell* pViewShell, vcl::Window* pWindow) : SfxInPlaceClient(pViewShell->GetViewShell(), pWindow, pObj->GetAspect() ), mpViewShell(pViewShell), pSdrOle2Obj(pObj), diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 9bc89f120e1e..2558510e6817 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -170,7 +170,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( } // Get Window pointer for XWindow of the pane. - ::Window* pWindow = NULL; + vcl::Window* pWindow = NULL; if (xPane.is()) pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); @@ -299,7 +299,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) ::boost::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView ( const Reference<XResourceId>& rxViewId, SfxViewFrame& rFrame, - ::Window& rWindow, + vcl::Window& rWindow, const Reference<XPane>& rxPane, FrameView* pFrameView, const bool bIsCenterPane) @@ -344,7 +344,7 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) ::boost::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell ( const Reference<XResourceId>& rxViewId, SfxViewFrame& rFrame, - ::Window& rWindow, + vcl::Window& rWindow, FrameView* pFrameView, const bool bIsCenterPane) { diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index 77a40a5f5461..fa62d325b17d 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -41,7 +41,7 @@ class ViewShellBase; class FrameView; } class SfxViewFrame; -class Window; +namespace vcl { class Window; } namespace { @@ -104,7 +104,7 @@ private: FrameView* mpFrameView; class ViewCache; - ::boost::shared_ptr<Window> mpWindow; + ::boost::shared_ptr<vcl::Window> mpWindow; ::boost::shared_ptr<ViewCache> mpViewCache; css::uno::Reference<css::drawing::framework::XPane> mxLocalPane; @@ -112,7 +112,7 @@ private: ::boost::shared_ptr<ViewDescriptor> CreateView ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, SfxViewFrame& rFrame, - ::Window& rWindow, + vcl::Window& rWindow, const css::uno::Reference<css::drawing::framework::XPane>& rxPane, FrameView* pFrameView, const bool bIsCenterView); @@ -120,7 +120,7 @@ private: ::boost::shared_ptr<ViewShell> CreateViewShell ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, SfxViewFrame& rFrame, - ::Window& rWindow, + vcl::Window& rWindow, FrameView* pFrameView, const bool bIsCenterView); diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 304574f3ea53..c08c590db1ee 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -38,7 +38,7 @@ ChildWindowPane::ChildWindowPane ( sal_uInt16 nChildWindowId, ViewShellBase& rViewShellBase, ::std::auto_ptr<SfxShell> pShell) - : ChildWindowPaneInterfaceBase(rxPaneId,(::Window*)NULL), + : ChildWindowPaneInterfaceBase(rxPaneId,(vcl::Window*)NULL), mnChildWindowId(nChildWindowId), mrViewShellBase(rViewShellBase), mpShell(pShell), @@ -118,7 +118,7 @@ void SAL_CALL ChildWindowPane::disposing (void) Pane::disposing(); } -::Window* ChildWindowPane::GetWindow (void) +::vcl::Window* ChildWindowPane::GetWindow (void) { do { diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index f244f61fcecc..72d42a51562d 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -72,7 +72,7 @@ public: Note that GetWindow() may return different Window pointers when Hide() is called in between. */ - virtual ::Window* GetWindow (void) SAL_OVERRIDE; + virtual vcl::Window* GetWindow (void) SAL_OVERRIDE; /** The local getWindow() first calls GetWindow() to provide a valid window pointer before forwarding the call to the base class. diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx index dec2d0ee4ed2..82af2666733b 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.cxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx @@ -27,7 +27,7 @@ namespace sd { namespace framework { FrameWindowPane::FrameWindowPane ( const Reference<XResourceId>& rxPaneId, - ::Window* pWindow) + vcl::Window* pWindow) : Pane(rxPaneId,pWindow) { } diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index 7276ecc53c1b..836c2f77929f 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -36,7 +36,7 @@ public: FrameWindowPane ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId>& rxPaneId, - ::Window* pWindow); + vcl::Window* pWindow); virtual ~FrameWindowPane (void) throw(); /** A frame window typically can (and should) exists on its own without diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 105d557680d6..13a9af05759d 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -40,12 +40,12 @@ namespace sd { namespace framework { FullScreenPane::FullScreenPane ( const Reference<XComponentContext>& rxComponentContext, const Reference<XResourceId>& rxPaneId, - const ::Window* pViewShellWindow) + const vcl::Window* pViewShellWindow) : FrameWindowPane(rxPaneId,NULL), mxComponentContext(rxComponentContext), mpWorkWindow(NULL) { - ::Window* pParent = NULL; + vcl::Window* pParent = NULL; mpWorkWindow.reset(new WorkWindow( pParent, 0)); // For debugging (non-fullscreen) use WB_BORDER | WB_MOVEABLE | WB_SIZEABLE)); @@ -86,7 +86,7 @@ FullScreenPane::FullScreenPane ( // For some reason the VCL canvas can not paint into a WorkWindow. // Therefore a child window is created that covers the WorkWindow // completely. - mpWindow = new ::Window(mpWorkWindow.get()); + mpWindow = new vcl::Window(mpWorkWindow.get()); mpWindow->SetPosSizePixel(Point(0,0), mpWorkWindow->GetSizePixel()); mpWindow->SetBackground(Wallpaper()); mxWindow = VCLUnoHelper::GetInterface(mpWindow); @@ -165,7 +165,7 @@ void SAL_CALL FullScreenPane::setAccessible ( Reference<lang::XInitialization> xInitializable (rxAccessible, UNO_QUERY); if (xInitializable.is()) { - ::Window* pParentWindow = mpWindow->GetParent(); + vcl::Window* pParentWindow = mpWindow->GetParent(); Reference<css::accessibility::XAccessible> xAccessibleParent; if (pParentWindow != NULL) xAccessibleParent = pParentWindow->GetAccessible(); @@ -198,7 +198,7 @@ IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent*, pEvent) Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void) throw (RuntimeException) { - ::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); if (pWindow != NULL) { Sequence<Any> aArg (5); diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index af9a47f03ce1..1d7c3481ea98 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -51,7 +51,7 @@ public: FullScreenPane ( const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, - const ::Window* pViewShellWindow); + const vcl::Window* pViewShellWindow); virtual ~FullScreenPane (void) throw(); virtual void SAL_CALL disposing (void) SAL_OVERRIDE; diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 5fea572a81ad..978cb870f8ec 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -34,7 +34,7 @@ namespace sd { namespace framework { Pane::Pane ( const Reference<XResourceId>& rxPaneId, - ::Window* pWindow) + vcl::Window* pWindow) throw () : PaneInterfaceBase(MutexOwner::maMutex), mxPaneId(rxPaneId), @@ -53,7 +53,7 @@ void Pane::disposing (void) mpWindow = NULL; } -::Window* Pane::GetWindow (void) +::vcl::Window* Pane::GetWindow (void) { if (mxWindow.is()) return mpWindow; @@ -90,7 +90,7 @@ sal_Bool SAL_CALL Pane::isVisible (void) { ThrowIfDisposed(); - const ::Window* pWindow = GetWindow(); + const vcl::Window* pWindow = GetWindow(); if (pWindow != NULL) return pWindow->IsVisible(); else @@ -102,7 +102,7 @@ void SAL_CALL Pane::setVisible (sal_Bool bIsVisible) { ThrowIfDisposed(); - ::Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if (pWindow != NULL) pWindow->Show(bIsVisible); } @@ -111,7 +111,7 @@ Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible (void) throw (RuntimeException, std::exception) { ThrowIfDisposed(); - ::Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if (pWindow != NULL) return pWindow->GetAccessible(false); else @@ -123,7 +123,7 @@ void SAL_CALL Pane::setAccessible ( throw (RuntimeException, std::exception) { ThrowIfDisposed(); - ::Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if (pWindow != NULL) pWindow->SetAccessible(rxAccessible); } diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 867737c021f0..656bbcc703b9 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -207,7 +207,7 @@ sal_Bool SAL_CALL ViewShellWrapper::relocateToAnchor ( if (mpViewShell.get() != NULL) { - ::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); + ::vcl::Window* pWindow = VCLUnoHelper::GetWindow(xPane->getWindow()); if (pWindow != NULL && mpViewShell->RelocateToParentWindow(pWindow)) { bResult = true; diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index a54e49722033..681096330b45 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -310,7 +310,7 @@ bool FuConstruct3dObject::MouseButtonDown(const MouseEvent& rMEvt) E3dCompoundObject* p3DObj = NULL; - WaitObject aWait( (Window*)mpViewShell->GetActiveWindow() ); + WaitObject aWait( (vcl::Window*)mpViewShell->GetActiveWindow() ); p3DObj = ImpCreateBasic3DShape(); E3dScene* pScene = mpView->SetCurrent3DObj(p3DObj); diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 39228ef29f6e..99e63b280847 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -398,7 +398,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt) pIPClient->SetSdrGrafObj(NULL); // wait-mousepointer while deleting object - WaitObject aWait( (Window*)mpViewShell->GetActiveWindow() ); + WaitObject aWait( (vcl::Window*)mpViewShell->GetActiveWindow() ); // delete object mpView->DeleteMarked(); } @@ -966,9 +966,9 @@ bool FuDraw::SetHelpText(SdrObject* pObj, const Point& rPosPixel, const SdrViewE mpWindow->OutputToScreenPixel(aLogicPix.BottomRight())); if (Help::IsBalloonHelpEnabled()) - Help::ShowBalloon( (Window*)mpWindow, rPosPixel, aScreenRect, aHelpText); + Help::ShowBalloon( (vcl::Window*)mpWindow, rPosPixel, aScreenRect, aHelpText); else if (Help::IsQuickHelpEnabled()) - Help::ShowQuickHelp( (Window*)mpWindow, aScreenRect, aHelpText); + Help::ShowQuickHelp( (vcl::Window*)mpWindow, aScreenRect, aHelpText); } return bSet; diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 7f81db01be69..a608fd74a926 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -325,7 +325,7 @@ bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium) /* Maybe a QueryBox is opened ("update links?"), therefore the dialog becomes the current DefModalDialogParent */ - ::Window* pDefParent = Application::GetDefDialogParent(); + vcl::Window* pDefParent = Application::GetDefDialogParent(); Application::SetDefDialogParent(pDlg->GetWindow()); sal_uInt16 nRet = pDlg->Execute(); diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index c113f38bb7ed..f608fd117323 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -95,7 +95,7 @@ void FuMorph::DoExecute( SfxRequest& ) SdrObject* pPolyObj1 = pCloneObj1->ConvertToPolyObj(false, false); SdrObject* pPolyObj2 = pCloneObj2->ConvertToPolyObj(false, false); SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); - boost::scoped_ptr<AbstractMorphDlg> pDlg(pFact ? pFact->CreateMorphDlg( static_cast< ::Window*>(mpWindow), pObj1, pObj2 ) : 0); + boost::scoped_ptr<AbstractMorphDlg> pDlg(pFact ? pFact->CreateMorphDlg( static_cast< vcl::Window*>(mpWindow), pObj1, pObj2 ) : 0); if(pPolyObj1 && pPolyObj2 && pDlg && (pDlg->Execute() == RET_OK)) { B2DPolyPolygonList_impl aPolyPolyList; diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index fe3e1f145a86..c20e90a51b1d 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -73,7 +73,7 @@ using namespace com::sun::star; namespace sd { -class Window; +namespace vcl { class Window; } // 50 cm 28350 // adapted from writer @@ -164,7 +164,7 @@ void FuPage::Deactivate() { } -const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) +const SfxItemSet* FuPage::ExecuteDialog( ::vcl::Window* pParent ) { if (!mpDrawViewShell) return NULL; diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 8f518dedae9b..669cead02abb 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -1187,11 +1187,11 @@ bool FuText::RequestHelp(const HelpEvent& rHEvt) if (Help::IsBalloonHelpEnabled()) { - bReturn = Help::ShowBalloon( (Window*)mpWindow, rHEvt.GetMousePosPixel(), aScreenRect, aHelpText); + bReturn = Help::ShowBalloon( (vcl::Window*)mpWindow, rHEvt.GetMousePosPixel(), aScreenRect, aHelpText); } else if (Help::IsQuickHelpEnabled()) { - bReturn = Help::ShowQuickHelp( (Window*)mpWindow, aScreenRect, aHelpText); + bReturn = Help::ShowQuickHelp( (vcl::Window*)mpWindow, aScreenRect, aHelpText); } } } diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index e07d7412e599..4f46a73309f1 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -31,7 +31,7 @@ class OutlinerView; class SdrOutliner; class SdrView; -class Window; +namespace vcl { class Window; } namespace accessibility { @@ -52,7 +52,7 @@ namespace accessibility SdrOutliner& rOutliner, SdrView& rView, OutlinerView& rOutlView, - const ::Window& rViewWindow ); + const vcl::Window& rViewWindow ); virtual ~AccessibleOutlineEditSource(); /// This method is disabled and always returns NULL @@ -81,7 +81,7 @@ namespace accessibility DECL_LINK( NotifyHdl, EENotify* ); SdrView& mrView; - const ::Window& mrWindow; + const vcl::Window& mrWindow; SdrOutliner* mpOutliner; OutlinerView* mpOutlinerView; diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index 2c32bb123130..f18101e1bc73 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -25,7 +25,7 @@ namespace sd { class OutlineViewShell; -class Window; +namespace vcl { class Window; } } namespace accessibility { diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index e8289060eff4..89f606efbe9d 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -34,7 +34,7 @@ #include <memory> -class Window; +namespace vcl { class Window; } namespace sd { namespace slidesorter { class SlideSorter; @@ -65,7 +65,7 @@ public: AccessibleSlideSorterView( ::sd::slidesorter::SlideSorter& rSlideSorter, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> & rxParent, - ::Window* pParentWindow); + vcl::Window* pParentWindow); void Init(); @@ -297,7 +297,7 @@ private: sal_uInt32 mnClientId; - ::Window* mpContentWindow; + vcl::Window* mpContentWindow; /** Check whether or not the object has been disposed (or is in the state of being disposed). If that is the case then diff --git a/sd/source/ui/inc/AnimationChildWindow.hxx b/sd/source/ui/inc/AnimationChildWindow.hxx index 0d215fdc1a2f..1c114b82e378 100644 --- a/sd/source/ui/inc/AnimationChildWindow.hxx +++ b/sd/source/ui/inc/AnimationChildWindow.hxx @@ -23,7 +23,7 @@ #include <sfx2/childwin.hxx> #include <sal/types.h> -class Window; +namespace vcl { class Window; } class SfxBindings; namespace sd { @@ -33,7 +33,7 @@ class AnimationChildWindow { public: AnimationChildWindow( - ::Window*, + vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index 0669795e78d5..66110e08a9c3 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -46,7 +46,7 @@ class BreakDlg { public: BreakDlg ( - ::Window* pWindow, + vcl::Window* pWindow, DrawView* pDrView, DrawDocShell* pShell, sal_uLong nSumActionCount, diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 24f09783c46c..5f2fd28422bc 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -42,7 +42,7 @@ class Client : public SfxInPlaceClient virtual void MakeVisible() SAL_OVERRIDE; public: - Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, ::Window* pWindow); + Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, vcl::Window* pWindow); virtual ~Client (void); SdrOle2Obj* GetSdrOle2Obj() const { return pSdrOle2Obj; } diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index 2599bdf904aa..4c3320fedc0f 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -43,8 +43,8 @@ public: /* if the view should not do a Invalidate() on the windows, you have to overload the following two methods and do something different */ - virtual void InvalidateOneWin(::Window& rWin) SAL_OVERRIDE; - virtual void InvalidateOneWin(::Window& rWin, const Rectangle& rRect) SAL_OVERRIDE; + virtual void InvalidateOneWin(::vcl::Window& rWin) SAL_OVERRIDE; + virtual void InvalidateOneWin(::vcl::Window& rWin, const Rectangle& rRect) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 4583ada7f556..5cfbda93dec8 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -101,7 +101,7 @@ public: virtual Size GetFirstPageSize() SAL_OVERRIDE; virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE; virtual void SetModified( bool = true ) SAL_OVERRIDE; - virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::Window *pParent, + virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::vcl::Window *pParent, const SfxItemSet &rSet ) SAL_OVERRIDE; using SotObject::GetInterface; @@ -154,7 +154,7 @@ public: a default name of a not-yet-existing slide (e.g. 'Slide 17'), sal_True is returned, but rName is set to an empty string. */ - bool CheckPageName(::Window* pWin, OUString& rName ); + bool CheckPageName(vcl::Window* pWin, OUString& rName ); void SetSlotFilter(bool bEnable = false, sal_uInt16 nCount = 0, const sal_uInt16* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } void ApplySlotFilter() const; diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 15add1df9891..967c7e3ce1e5 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -87,7 +87,7 @@ public: DrawViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, PageKind ePageKind = PK_STANDARD, FrameView* pFrameView = NULL); @@ -261,7 +261,7 @@ public: //false. void FreshNavigatrEntry(); void FreshNavigatrTree(); - void MakeVisible(const Rectangle& rRect, ::Window& rWin); + void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin); virtual void ReadFrameViewData(FrameView* pView) SAL_OVERRIDE; virtual void WriteFrameViewData() SAL_OVERRIDE; @@ -373,7 +373,7 @@ public: /** Relocation to a new parent window is not supported for DrawViewShell objects so this method always returns <FALSE/>. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE; OUString GetSidebarContextName (void) const; diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index db095b8abfc1..0168800353ca 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -89,7 +89,7 @@ private: bool mbIsMainViewChangePending; - ::Window* mpMainViewShellWindow; + vcl::Window* mpMainViewShellWindow; /** Register at window of center pane and at the form shell that represents the form tool bar. The former informs this manager about diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index 3f35b7843297..fc127e908534 100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -22,7 +22,7 @@ #include "DrawViewShell.hxx" -class Window; +namespace vcl { class Window; } namespace sd { @@ -59,7 +59,7 @@ public: GraphicViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~GraphicViewShell (void); diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx index 8c7f19e801b8..061c2a78258c 100644 --- a/sd/source/ui/inc/LayerTabBar.hxx +++ b/sd/source/ui/inc/LayerTabBar.hxx @@ -37,7 +37,7 @@ class LayerTabBar public: LayerTabBar ( DrawViewShell* pDrViewSh, - ::Window* pParent); + vcl::Window* pParent); virtual ~LayerTabBar (void); /** Inform all listeners of this control that the current layer has been diff --git a/sd/source/ui/inc/NavigatorChildWindow.hxx b/sd/source/ui/inc/NavigatorChildWindow.hxx index dbf4d079ff5b..648f8ae60834 100644 --- a/sd/source/ui/inc/NavigatorChildWindow.hxx +++ b/sd/source/ui/inc/NavigatorChildWindow.hxx @@ -22,7 +22,7 @@ #include <sfx2/childwin.hxx> -class Window; +namespace vcl { class Window; } class SfxBindings; namespace sd { @@ -35,7 +35,7 @@ class NavigatorChildWindow { public: NavigatorChildWindow ( - ::Window*, + vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx index b2fe9c50bc6e..19ae1f8cad0e 100644 --- a/sd/source/ui/inc/OutlineBulletDlg.hxx +++ b/sd/source/ui/inc/OutlineBulletDlg.hxx @@ -34,7 +34,7 @@ class OutlineBulletDlg { public: OutlineBulletDlg ( - ::Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ); virtual ~OutlineBulletDlg (); diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 837d1b788e4f..fb80a355f9b2 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -57,7 +57,7 @@ class OutlineView friend class OutlineViewModelChangeGuard; public: OutlineView (DrawDocShell& rDocSh, - ::Window* pWindow, + ::vcl::Window* pWindow, OutlineViewShell& rOutlineViewSh); virtual ~OutlineView (void); @@ -80,7 +80,7 @@ public: virtual void AddWindowToPaintView(OutputDevice* pWin) SAL_OVERRIDE; virtual void DeleteWindowFromPaintView(OutputDevice* pWin) SAL_OVERRIDE; - OutlinerView* GetViewByWindow(::Window* pWin) const; + OutlinerView* GetViewByWindow(::vcl::Window* pWin) const; SdrOutliner& GetOutliner() { return mrOutliner; } Paragraph* GetPrevTitle(const Paragraph* pPara); @@ -211,8 +211,8 @@ private: /** holds a model guard during drag and drop between BeginMovingHdl and EndMovingHdl */ std::auto_ptr< OutlineViewModelChangeGuard > maDragAndDropModelGuard; - vcl::Font maPageNumberFont; - vcl::Font maBulletFont; + ::vcl::Font maPageNumberFont; + ::vcl::Font maBulletFont; SvxLRSpaceItem maLRSpaceItem; Image maSlideImage; diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 7aebf2279374..ebb795c2f73d 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -56,7 +56,7 @@ public: OutlineViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~OutlineViewShell (void); diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 70d0feff13d5..8b76b9e2ad99 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -30,7 +30,7 @@ class PaneChildWindow { public: PaneChildWindow ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, @@ -44,7 +44,7 @@ class LeftPaneImpressChildWindow : public PaneChildWindow { public: - LeftPaneImpressChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); + LeftPaneImpressChildWindow (vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW_WITHID(LeftPaneImpressChildWindow); }; @@ -53,7 +53,7 @@ class LeftPaneDrawChildWindow : public PaneChildWindow { public: - LeftPaneDrawChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); + LeftPaneDrawChildWindow (vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW_WITHID(LeftPaneDrawChildWindow); }; diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 3e93c1bc2296..adba60aaf9af 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -50,7 +50,7 @@ public: PaneDockingWindow ( SfxBindings *pBindings, SfxChildWindow *pChildWindow, - ::Window* pParent, + vcl::Window* pParent, const ResId& rResId, const OUString& rsTitle); diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 8fa4fcfedf3c..53bbde6cba4b 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -40,7 +40,7 @@ private: static void InitInterface_Impl(); public: - PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView = NULL); + PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~PresentationViewShell (void); /** This method is used by a simple class that passes some diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 69b30a5d6065..956585e3a35e 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -35,7 +35,7 @@ class Ruler public: Ruler ( DrawViewShell& rViewSh, - ::Window* pParent, + ::vcl::Window* pParent, ::sd::Window* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, diff --git a/sd/source/ui/inc/ShellFactory.hxx b/sd/source/ui/inc/ShellFactory.hxx index 664a1e17dc73..5cfde74b3c8e 100644 --- a/sd/source/ui/inc/ShellFactory.hxx +++ b/sd/source/ui/inc/ShellFactory.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -class Window; +namespace vcl { class Window; } namespace sd { @@ -49,7 +49,7 @@ public: */ virtual ShellType* CreateShell ( ShellId nId, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView = NULL) = 0; /** Tell the factory that a shell is no longer in use. It may destroy diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index a26a49be234f..1af5619f968d 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -32,7 +32,7 @@ class ScrollBar; class ScrollBarBox; -class Window; +namespace vcl { class Window; } namespace sd { class ViewShell; @@ -116,7 +116,7 @@ public: static ::boost::shared_ptr<SlideSorter> CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::Window& rParentWindow); + ::vcl::Window& rParentWindow); /** Return the control of the vertical scroll bar. */ @@ -170,7 +170,7 @@ public: const Size& rSize); SvBorder GetBorder (void); - bool RelocateToWindow (::Window* pWindow); + bool RelocateToWindow (::vcl::Window* pWindow); /** Set the current function at the view shell or, when it is not present, set it at the content window. This method supports the use @@ -248,7 +248,7 @@ private: SlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::Window& rParentWindow); + ::vcl::Window& rParentWindow); void Init (void); /** Create the controls for the slide sorter. This are the tab bar @@ -257,7 +257,7 @@ private: This method is usually called exactly one time from the constructor. */ - void SetupControls (::Window* pParentWindow); + void SetupControls (::vcl::Window* pParentWindow); /** This method is usually called exactly one time from the constructor. diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 238e1a5005fd..e35b1eb1e36e 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -52,7 +52,7 @@ public: static ::boost::shared_ptr<SlideSorterViewShell> Create( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameView, const bool bIsCenterPane); @@ -121,7 +121,7 @@ public: virtual void StartDrag ( const Point& rDragPt, - ::Window* pWindow ); + ::vcl::Window* pWindow ); virtual void DragFinished ( sal_Int8 nDropAction); virtual sal_Int8 AcceptDrop ( @@ -182,7 +182,7 @@ public: /** Try to relocate all toplevel window elements to the given parent window. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE; protected: @@ -200,7 +200,7 @@ private: SlideSorterViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView); void Initialize (void); diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index da48fb09917c..313a2560b880 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -35,7 +35,7 @@ class SpellDialogChildWindow { public: SpellDialogChildWindow ( - ::Window* pParent, + vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index 1700921dfee5..ece600143a64 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -39,7 +39,7 @@ class TabControl //declare bIsMarked variable sal_uInt16 RrePageID; public: - TabControl (DrawViewShell* pDrViewSh, ::Window* pParent); + TabControl (DrawViewShell* pDrViewSh, vcl::Window* pParent); virtual ~TabControl (void); /** Inform all listeners of this control that the current page has been diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 4decd690db24..63493f143865 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -99,12 +99,12 @@ public: virtual void MarkListHasChanged() SAL_OVERRIDE; virtual void ModelHasChanged() SAL_OVERRIDE; virtual void SelectAll(); - virtual void DoCut(::Window* pWindow=NULL); - virtual void DoCopy(::Window* pWindow=NULL); - virtual void DoPaste(::Window* pWindow=NULL); + virtual void DoCut(vcl::Window* pWindow=NULL); + virtual void DoCopy(vcl::Window* pWindow=NULL); + virtual void DoPaste(vcl::Window* pWindow=NULL); virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE; virtual bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false); - virtual void StartDrag( const Point& rStartPos, ::Window* pWindow ); + virtual void StartDrag( const Point& rStartPos, vcl::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, @@ -121,14 +121,14 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> - CreateClipboardDataObject (::sd::View*, ::Window& rWindow); + CreateClipboardDataObject (::sd::View*, vcl::Window& rWindow); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> - CreateDragDataObject (::sd::View*, ::Window& rWindow, + CreateDragDataObject (::sd::View*, vcl::Window& rWindow, const Point& rDragPos); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> - CreateSelectionDataObject (::sd::View*, ::Window& rWindow); + CreateSelectionDataObject (::sd::View*, vcl::Window& rWindow); void UpdateSelectionClipboard( bool bForceDeselect ); @@ -136,7 +136,7 @@ public: inline SdDrawDocument& GetDoc(void) const; inline ViewShell* GetViewShell(void) const { return mpViewSh; } - virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, bool bIsNewObj = false, + virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::vcl::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index c3ef058c1c69..7404aa653051 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -115,7 +115,7 @@ public: ViewShell ( SfxViewFrame *pFrame, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter = true); virtual ~ViewShell (void); @@ -145,7 +145,7 @@ public: /** Return the window that is the parent of all controls of this view shell. This may or may not be the window of the frame. */ - inline ::Window* GetParentWindow (void) const { return mpParentWindow; } + inline ::vcl::Window* GetParentWindow (void) const { return mpParentWindow; } inline ::sd::View* GetView (void) const { return mpView; } inline SdrView* GetDrawView (void) const; @@ -421,7 +421,7 @@ public: all views, so the return value tells the caller if the relocation was successful. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow); + virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow); /** Depending on the given request create a new page or duplicate an existing one. A new page is created behind the given slide. @@ -568,7 +568,7 @@ protected: void doShow(); private: - ::Window* mpParentWindow; + ::vcl::Window* mpParentWindow; /** This window updater is used to keep all relevant windows up to date with reference to the digit langugage used to display digits in text shapes. diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index e2c7514137cd..af33977a8e33 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -224,7 +224,7 @@ public: view and other UI elements, like scroll bars and rulers. Ownership of that window remains with the called ViewShellBase object. */ - ::Window* GetViewWindow (void); + vcl::Window* GetViewWindow (void); /** returns the ui descriptive name for the given uno slot. The result is taken from the configuration and not cached, so do not use it excessive (f.e. in status updates) */ diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 31dab6f791e4..b259f3ffcdff 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -172,7 +172,7 @@ private: static because it must not access any of the, not yet initialized members. */ - static ::Window* GetAnchorWindow( + static vcl::Window* GetAnchorWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId>& rxViewTabBarId, const ::com::sun::star::uno::Reference< diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index a35f4fe1be5b..0a33a937b44b 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -40,11 +40,11 @@ class ViewShell; be an integer percent value. */ class Window - : public ::Window, + : public ::vcl::Window, public ::DropTargetHelper { public: - Window (::Window* pParent); + Window (vcl::Window* pParent); virtual ~Window (void); void SetViewShell (ViewShell* pViewSh); diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index aa6c95a48e7d..d768be7fb92e 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -26,7 +26,7 @@ #include <vector> -class Window; +namespace vcl { class Window; } class OutputDevice; class SdDrawDocument; @@ -62,7 +62,7 @@ public: This device is added to the device list if it is not <null/> and when it is not already a member of that list. */ - void RegisterWindow (::Window* pWindow); + void RegisterWindow (vcl::Window* pWindow); /** Remove the given device from the list of devices which will be updated when one of the monitored values changes. @@ -70,7 +70,7 @@ public: This device is removed from the device list when it is a member of that list. */ - void UnregisterWindow (::Window* pWindow); + void UnregisterWindow (vcl::Window* pWindow); /** Set the view shell whose output devices shall be kept up to date. It is used to clear the master page cache so that a redraw affects @@ -122,7 +122,7 @@ private: /** Type and data member for a list of devices that have to be kept up-to-date. */ - typedef ::std::vector< ::Window*> tWindowList; + typedef ::std::vector< vcl::Window*> tWindowList; tWindowList maWindowList; /** The central method of this class. Update the given output device. diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 9be3815bdbf9..09d94562604e 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -64,7 +64,7 @@ private: Fraction aScale; public: - SdDisplay( ::Window* pWin, SdResId Id ); + SdDisplay( vcl::Window* pWin, SdResId Id ); virtual ~SdDisplay(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -82,7 +82,7 @@ class AnimationWindow : public SfxDockingWindow public: AnimationWindow( SfxBindings* pBindings, SfxChildWindow *pCW, - ::Window* pParent, const SdResId& rSdResId ); + vcl::Window* pParent, const SdResId& rSdResId ); virtual ~AnimationWindow(); void AddObj( ::sd::View& rView ); @@ -122,7 +122,7 @@ private: HelpButton aBtnHelp; - ::Window* pWin; + vcl::Window* pWin; ::std::vector< ::std::pair<BitmapEx*, Time*> > m_FrameList; static const size_t EMPTY_FRAMELIST = ULONG_MAX; size_t m_nCurrentFrame; diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx index 805e07409657..3e95415d7a9d 100644 --- a/sd/source/ui/inc/assclass.hxx +++ b/sd/source/ui/inc/assclass.hxx @@ -27,13 +27,13 @@ #define MAX_PAGES 10 -class Window; +namespace vcl { class Window; } class SD_DLLPUBLIC Assistent { /** contains for every page the controls, which have to be connected? correctly */ - std::vector<Window*> maPages[MAX_PAGES]; + std::vector<vcl::Window*> maPages[MAX_PAGES]; /// number of pages int mnPages; @@ -51,7 +51,7 @@ public: void DisablePage( int nPage ); /// adds a control to the specified page - bool InsertControl(int nDestPage,Window* pUsedControl); + bool InsertControl(int nDestPage, vcl::Window* pUsedControl); bool NextPage(); diff --git a/sd/source/ui/inc/celltempl.hxx b/sd/source/ui/inc/celltempl.hxx index 97a648d7e1ef..612f2f4c80e2 100644 --- a/sd/source/ui/inc/celltempl.hxx +++ b/sd/source/ui/inc/celltempl.hxx @@ -37,7 +37,7 @@ private: virtual const SfxItemSet* GetRefreshedSet(); public: - SdPresCellTemplateDlg( SdrModel* pModel, Window* pParent, SfxStyleSheetBase& rStyleBase ); + SdPresCellTemplateDlg( SdrModel* pModel, vcl::Window* pParent, SfxStyleSheetBase& rStyleBase ); ~SdPresCellTemplateDlg(); const SfxItemSet* GetOutputItemSet() const; diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index fb9d5fe61783..7994e0c1c08b 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -38,7 +38,7 @@ class CopyDlg : public SfxModalDialog { public: - CopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, + CopyDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const XColorListRef &pColList, ::sd::View* pView ); virtual ~CopyDlg(); diff --git a/sd/source/ui/inc/createcustomanimationpanel.hxx b/sd/source/ui/inc/createcustomanimationpanel.hxx index a9f1a63dddd3..12c98d7337ca 100644 --- a/sd/source/ui/inc/createcustomanimationpanel.hxx +++ b/sd/source/ui/inc/createcustomanimationpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); +::vcl::Window * createCustomAnimationPanel (vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); } diff --git a/sd/source/ui/inc/createslidetransitionpanel.hxx b/sd/source/ui/inc/createslidetransitionpanel.hxx index b74a3fadd98e..6c159f9a5a38 100644 --- a/sd/source/ui/inc/createslidetransitionpanel.hxx +++ b/sd/source/ui/inc/createslidetransitionpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::Window* createSlideTransitionPanel (::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); +::vcl::Window* createSlideTransitionPanel (::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); } diff --git a/sd/source/ui/inc/createtabledesignpanel.hxx b/sd/source/ui/inc/createtabledesignpanel.hxx index ceaa882cfda6..2d8f1c36f504 100644 --- a/sd/source/ui/inc/createtabledesignpanel.hxx +++ b/sd/source/ui/inc/createtabledesignpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::Window * createTableDesignPanel (::Window* pParent, ViewShellBase& rBase); +::vcl::Window * createTableDesignPanel (::vcl::Window* pParent, ViewShellBase& rBase); } diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 1aff1d703939..7a16bf6150ff 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -55,7 +55,7 @@ private: DECL_LINK( StartShowHdl, void* ); public: - SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ); + SdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ); virtual ~SdCustomShowDlg(); bool IsModified() const { return( bModified ); } @@ -87,7 +87,7 @@ private: public: - SdDefineCustomShowDlg( Window* pWindow, + SdDefineCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ); virtual ~SdDefineCustomShowDlg(); diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 3b31d627b0ab..fdb61e8dca23 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -40,7 +40,7 @@ protected: virtual void Modify() SAL_OVERRIDE; public: - SdPagesField( Window* pParent, + SdPagesField( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); virtual ~SdPagesField(); @@ -55,7 +55,7 @@ class SdTbxCtlDiaPages : public SfxToolBoxControl public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx index 2bb72ae9d734..3a416de52f4c 100644 --- a/sd/source/ui/inc/dlg_char.hxx +++ b/sd/source/ui/inc/dlg_char.hxx @@ -41,7 +41,7 @@ private: public: - SdCharDlg( Window* pParent, const SfxItemSet* pAttr, + SdCharDlg( vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ); virtual ~SdCharDlg() {}; }; diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index 028d2c9d566b..4ee19ec4abe2 100644 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -41,7 +41,7 @@ private: AssistentDlgImpl* mpImpl; public: - AssistentDlg(Window* pParent, bool bAutoPilot); + AssistentDlg(vcl::Window* pParent, bool bAutoPilot); virtual ~AssistentDlg(); DECL_LINK( FinishHdl, void * ); diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index 2d73fd52ee66..093b550431b7 100644 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -35,7 +35,7 @@ struct FadeEffectLBImpl; class SD_DLLPUBLIC FadeEffectLB : public ListBox { public: - FadeEffectLB(Window* pParent, WinBits nStyle); + FadeEffectLB(vcl::Window* pParent, WinBits nStyle); virtual ~FadeEffectLB(); virtual void Fill(); diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx index 909370fc5ffd..b458b8df84b9 100644 --- a/sd/source/ui/inc/dlgfield.hxx +++ b/sd/source/ui/inc/dlgfield.hxx @@ -48,7 +48,7 @@ private: DECL_LINK( LanguageChangeHdl, void * ); public: - SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); + SdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); virtual ~SdModifyFieldDlg() {} SvxFieldData* GetField(); diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index 6fd241b34894..2cdf0c4f9bbb 100644 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -43,7 +43,7 @@ private: public: - SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, bool bAreaPage = true ); + SdPageDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage = true ); virtual ~SdPageDlg() {}; virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index f16156fb4498..ab431c856be3 100644 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -58,7 +58,7 @@ private: DECL_LINK( ClickHdl, Button * ); public: - SdSnapLineDlg(Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); + SdSnapLineDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); void GetAttr(SfxItemSet& rOutAttrs); diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 3155bd992aca..b4d3b28a8c73 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -63,7 +63,7 @@ protected: void updateViewSettings(); public: - SdDocPreviewWin( Window* pParent, const WinBits nStyle ); + SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle ); virtual ~SdDocPreviewWin(); void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 ); virtual void Resize() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 4da87a1d97be..d3865bee27a7 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -53,7 +53,7 @@ public: bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false) SAL_OVERRIDE; virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const SAL_OVERRIDE; - virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin) SAL_OVERRIDE; + virtual void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin) SAL_OVERRIDE; virtual void HideSdrPage() SAL_OVERRIDE; // SdrPageView* pPV); void PresPaint(const Region& rRegion); diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index 7f0f3393fb69..51992e82cf87 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -30,7 +30,7 @@ #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> -class Window; +namespace vcl { class Window; } namespace { @@ -74,7 +74,7 @@ public: Pane ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId>& rxPaneId, - ::Window* pWindow) + vcl::Window* pWindow) throw (); virtual ~Pane (void); @@ -85,7 +85,7 @@ public: /** This method is typically used together with the XUnoTunnel to obtain a Window pointer from an XPane object. */ - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); //----- XPane ------------------------------------------------------------- @@ -135,7 +135,7 @@ public: protected: ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> mxPaneId; - ::Window* mpWindow; + vcl::Window* mpWindow; ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow> mxWindow; ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> mxCanvas; diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 449c25ff8bdf..149fef5b48f8 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -27,7 +27,7 @@ class SdDrawDocument; namespace sd { -class Window; +namespace vcl { class Window; } class FuConstructBezierPolygon : public FuConstruct diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx index 0a600cd7284d..3c952c167fc1 100644 --- a/sd/source/ui/inc/fuolbull.hxx +++ b/sd/source/ui/inc/fuolbull.hxx @@ -31,7 +31,7 @@ namespace sd { class View; class ViewShell; -class Window; +namespace vcl { class Window; } /** * bullet functions in outline mode diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index 9579423acc65..1f99701901d0 100644 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -29,7 +29,7 @@ namespace sd { class View; class ViewShell; -class Window; +namespace vcl { class Window; } /** * text functions in outline mode diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index d53b4d2079f3..7d1339919adb 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -31,7 +31,7 @@ class OutlineView; class OutlineViewShell; class View; class ViewShell; -class Window; +namespace vcl { class Window; } /** * Base class of functions of outline mode diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx index ac2b947e7b6d..81b12eba87e4 100644 --- a/sd/source/ui/inc/fupage.hxx +++ b/sd/source/ui/inc/fupage.hxx @@ -41,7 +41,7 @@ class FuPage virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; - const SfxItemSet* ExecuteDialog( Window* pParent ); + const SfxItemSet* ExecuteDialog( vcl::Window* pParent ); protected: virtual ~FuPage (void); diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx index 2990385600ed..a7debedadbb7 100644 --- a/sd/source/ui/inc/fuprlout.hxx +++ b/sd/source/ui/inc/fuprlout.hxx @@ -29,7 +29,7 @@ namespace sd { class View; class ViewShell; -class Window; +namespace vcl { class Window; } class FuPresentationLayout : public FuPoor diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx index 8cecd9e5377d..905542f8151c 100644 --- a/sd/source/ui/inc/fuprobjs.hxx +++ b/sd/source/ui/inc/fuprobjs.hxx @@ -29,7 +29,7 @@ namespace sd { class View; class ViewShell; -class Window; +namespace vcl { class Window; } class FuPresentationObjects : public FuPoor diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index fefe754006cf..d3b2e0a8055b 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -31,7 +31,7 @@ class GlueEscDirLB : public ListBox private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; public: - GlueEscDirLB( Window* pParent, + GlueEscDirLB( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); virtual ~GlueEscDirLB(); @@ -51,7 +51,7 @@ private: public: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index 4c2bb8979902..6f19a555b962 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -67,7 +67,7 @@ private: void change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings ); public: - HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); + HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); virtual ~HeaderFooterDialog(); void ApplyToAll(); diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx index 87f6054233ad..0cd396f4c31a 100644 --- a/sd/source/ui/inc/ins_paste.hxx +++ b/sd/source/ui/inc/ins_paste.hxx @@ -35,7 +35,7 @@ private: RadioButton* m_pRbAfter; public: - SdInsertPasteDlg( Window* pWindow ); + SdInsertPasteDlg( vcl::Window* pWindow ); bool IsInsertBefore() const; }; diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index 639ec621b35b..f7a0e12ae859 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -41,7 +41,7 @@ private: DECL_LINK( SelectObjectHdl, void * ); public: - SdInsertPagesObjsDlg( Window* pParent, + SdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ); diff --git a/sd/source/ui/inc/layeroptionsdlg.hxx b/sd/source/ui/inc/layeroptionsdlg.hxx index c7d9f92b3012..e3ad80873223 100644 --- a/sd/source/ui/inc/layeroptionsdlg.hxx +++ b/sd/source/ui/inc/layeroptionsdlg.hxx @@ -46,7 +46,7 @@ private: public: - SdInsertLayerDlg( Window* pWindow, const SfxItemSet& rInAttrs, + SdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& rStr ); void GetAttr( SfxItemSet& rOutAttrs ); }; diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx index 4c68d66178a1..b6c216944d8b 100644 --- a/sd/source/ui/inc/masterlayoutdlg.hxx +++ b/sd/source/ui/inc/masterlayoutdlg.hxx @@ -53,7 +53,7 @@ private: void create( PresObjKind eKind ); public: - MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); + MasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); virtual short Execute() SAL_OVERRIDE; }; diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx index 3e057207136d..f23d69207d98 100644 --- a/sd/source/ui/inc/morphdlg.hxx +++ b/sd/source/ui/inc/morphdlg.hxx @@ -35,7 +35,7 @@ class MorphDlg { public: MorphDlg ( - ::Window* pParent, + vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2); virtual ~MorphDlg (void); diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 6aec09ace31b..fa388da27ea7 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -79,7 +79,7 @@ private: }; class SdNavigatorWin - : public Window + : public vcl::Window { public: typedef ::boost::function<void(void)> UpdateRequestFunctor; @@ -92,7 +92,7 @@ public: rely on others to trigger updates. */ SdNavigatorWin( - ::Window* pParent, + vcl::Window* pParent, ::sd::NavigatorChildWindow* pChildWinContext, const SdResId& rSdResId, SfxBindings* pBindings, diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx index 6ceffa3b0844..fbf9a38e86e8 100644 --- a/sd/source/ui/inc/paragr.hxx +++ b/sd/source/ui/inc/paragr.hxx @@ -33,7 +33,7 @@ private: virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: - SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr ); + SdParagraphDlg( vcl::Window* pParent, const SfxItemSet* pAttr ); virtual ~SdParagraphDlg() {}; }; diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index de4bd53d2093..ea2fcde3e25d 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -84,7 +84,7 @@ private: OUString GetDisplayName( sal_Int32 nDisplay, DisplayType eType ); public: - SdStartPresentationDlg( Window* pWindow, + SdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ); diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index e903969e8584..71c6c3f9b8ef 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -84,7 +84,7 @@ private: using SfxTabDialog::GetOutputItemSet; public: - SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); + SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); virtual ~SdPresLayoutTemplateDlg(); const SfxItemSet* GetOutputItemSet() const; diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 62c2922c5579..9ae6631f435e 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -61,10 +61,10 @@ private: using OutputDevice::SetDrawMode; public: - SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs); + SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs); virtual ~SdPrintOptions(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 91ff008cfd38..bbb4f264d8ee 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -195,7 +195,7 @@ private: public: - SdPublishingDlg(Window* pWindow, DocumentType eDocType); + SdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType); virtual ~SdPublishingDlg(); void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ); diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index 8c94f8f5c434..ea68e8de3214 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -39,7 +39,7 @@ class SdPresLayoutDlg public: SdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, - ::Window* pWindow, + vcl::Window* pWindow, const SfxItemSet& rInAttrs); virtual ~SdPresLayoutDlg (void); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 8a40c6037f45..35ff0763d4e8 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -121,7 +121,7 @@ public: protected: - Window* mpParent; + vcl::Window* mpParent; const SdDrawDocument* mpDoc; SdDrawDocument* mpBookmarkDoc; SfxMedium* mpMedium; @@ -184,8 +184,8 @@ protected: public: - SdPageObjsTLB( Window* pParent, const SdResId& rSdResId ); - SdPageObjsTLB( Window* pParent, WinBits nStyle ); + SdPageObjsTLB( vcl::Window* pParent, const SdResId& rSdResId ); + SdPageObjsTLB( vcl::Window* pParent, WinBits nStyle ); virtual ~SdPageObjsTLB(); // helper function for GetEntryAltText and GetEntryLongDescription diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 425740bb3612..fda3d8a2da9b 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -48,7 +48,7 @@ class SdDrawDocument; class KeyEvent; class Size; class Rectangle; -class Window; +namespace vcl { class Window; } class SfxRequest; class WorkWindow; struct ImplSVEvent; @@ -94,7 +94,7 @@ public: static bool StartPreview( ViewShellBase& rBase, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, - ::Window* pParent = 0 ); + ::vcl::Window* pParent = 0 ); static void Stop( ViewShellBase& rBase ); @@ -110,7 +110,7 @@ public: bool startPreview( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, - ::Window* pParent = 0 ); + ::vcl::Window* pParent = 0 ); // uno api @@ -194,7 +194,7 @@ private: void ThrowIfDisposed() const throw (css::uno::RuntimeException); - void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Window* pParentWindow ); + void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::vcl::Window* pParentWindow ); WorkWindow *GetWorkWindow(); // default: disabled copy/assignment diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index ce2fb8e8e860..ed57b580b0b1 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -69,7 +69,7 @@ private: virtual const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; public: - SdTabTemplateDlg(Window* pParent, + SdTabTemplateDlg(vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, diff --git a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx index 1155dfd454e1..31d40c573bd2 100644 --- a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx +++ b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx @@ -23,7 +23,7 @@ #include <tools/gen.hxx> #include <sal/types.h> -class Window; +namespace vcl { class Window; } namespace sd { namespace toolpanel { @@ -80,7 +80,7 @@ public: Returns the window which is layouted or NULL to indicate that the object is in an invalid state. */ - virtual ::Window* GetWindow (void) = 0; + virtual vcl::Window* GetWindow (void) = 0; /** Return the minimal width of the window. */ diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index afd9c2071a9b..a57cdfb851ea 100644 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx @@ -51,7 +51,7 @@ public: /** Create a new scroll panel which itself is the root of a TreeNode hierarchy parent. This will usually be a child window. */ - ScrollPanel (::Window& i_rParentWindow); + ScrollPanel (vcl::Window& i_rParentWindow); virtual ~ScrollPanel (void); /** Add a control to the sub panel. An title bar is added above the @@ -86,7 +86,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual sal_Int32 GetMinimumWidth (void); virtual void ExpandControl ( @@ -98,7 +98,7 @@ public: ScrollBar& GetVerticalScrollBar (void); ScrollBar& GetHorizontalScrollBar (void); - // ::Window + // vcl::Window virtual long Notify( NotifyEvent& rNEvt ); virtual ::com::sun::star::uno::Reference< @@ -117,14 +117,14 @@ public: */ void MakeRectangleVisible ( Rectangle& aRectangle, - ::Window* pWindow); + vcl::Window* pWindow); private: ::Control maScrollWindow; ScrollBar maVerticalScrollBar; ScrollBar maHorizontalScrollBar; - ::Window maScrollBarFiller; - ::Window maScrollWindowFiller; + vcl::Window maScrollBarFiller; + vcl::Window maScrollWindowFiller; Point maScrollOffset; bool mbIsRearrangePending; bool mbIsLayoutPending; diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx index f72234577ef5..e6ae9d24572b 100644 --- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx +++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx @@ -36,7 +36,7 @@ #include <map> #include <vector> -class Window; +namespace vcl { class Window; } #include "svx/svdpage.hxx" #include "drawdoc.hxx" @@ -54,7 +54,7 @@ public: SlideSorterCacheDisplay (const SdDrawDocument* pDocument); virtual ~SlideSorterCacheDisplay (void); - void SetParentWindow (::Window* pParentWindow); + void SetParentWindow (vcl::Window* pParentWindow); virtual void Paint (const Rectangle& rBoundingBox); virtual void Resize (void); @@ -76,7 +76,7 @@ public: virtual Size GetPreferredSize (void); virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual bool IsResizable (void); virtual bool IsExpandable (void) const; virtual bool IsExpanded (void) const; @@ -86,7 +86,7 @@ private: static void AddInstance (const SdDrawDocument* pDocument, SlideSorterCacheDisplay* pControl); static void RemoveInstance (SlideSorterCacheDisplay* pControl); - ::Window* mpWindow; + vcl::Window* mpWindow; sal_Int32 mnPageCount; sal_Int32 mnColumnCount; sal_Int32 mnRowCount; diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx index 90fc3044b612..2970bc2d0d1f 100644 --- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx @@ -26,7 +26,7 @@ #include <vcl/scrbar.hxx> #include <vector> -class Window; +namespace vcl { class Window; } namespace sd { namespace toolpanel { @@ -54,7 +54,7 @@ public: /** Create a new sub tool panel with the given window as its parent. This will usually be a child window. */ - SubToolPanel (Window& i_rParentWindow); + SubToolPanel (vcl::Window& i_rParentWindow); virtual ~SubToolPanel (void); virtual void Paint (const Rectangle& rRect); @@ -69,7 +69,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual sal_Int32 GetMinimumWidth (void); virtual void ExpandControl ( @@ -83,7 +83,7 @@ public: using Window::GetWindow; private: - ::Window maWindowFiller; + vcl::Window maWindowFiller; bool mbIsRearrangePending; bool mbIsLayoutPending; sal_uInt32 mnChildrenWidth; diff --git a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx index 5ab6bc63f8ed..d80f5c49683e 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx @@ -47,10 +47,10 @@ public: Derived classes should overload InternalCreateControl. */ - ::std::auto_ptr<TreeNode> CreateControl( ::Window& i_rParent ); + ::std::auto_ptr<TreeNode> CreateControl( vcl::Window& i_rParent ); protected: - virtual TreeNode* InternalCreateControl( ::Window& i_rParent ) = 0; + virtual TreeNode* InternalCreateControl( vcl::Window& i_rParent ) = 0; }; /** A simple helper class that realizes a ControlFactory that is able to create root controls, providing @@ -66,7 +66,7 @@ public: {} protected: - virtual TreeNode* InternalCreateControl( ::Window& i_rParent ) + virtual TreeNode* InternalCreateControl( vcl::Window& i_rParent ) { return new ControlType( i_rParent, mrArgument ); } diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index deae2e1899b3..96121085cd98 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -61,11 +61,11 @@ public: /** Return the Window pointer of a tree node. */ - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); /** Return a const pointer to the window of a tree node. */ - virtual const ::Window* GetConstWindow (void) const; + virtual const vcl::Window* GetConstWindow (void) const; /** Return the joined minimum width of all children, i.e. the largest of the minimum widths. diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index fae55b0777fa..d6910acfbebc 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -39,7 +39,7 @@ namespace sd { namespace toolpanel { control. 2) Keyboard focus is indicated by a dotted rectangle. */ class TitleBar - : public ::Window, + : public vcl::Window, public TreeNode { public: @@ -51,7 +51,7 @@ public: will be formatted according to the given type. */ TitleBar ( - ::Window* pParent, + vcl::Window* pParent, const OUString& rsTitle, TitleBarType eType, bool bIsExpandable); @@ -61,7 +61,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual sal_Int32 GetMinimumWidth (void); virtual void Paint (const Rectangle& rBoundingBox); diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index 57f6c6998a12..6282a549a6a7 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -29,7 +29,7 @@ #include <memory> #include <boost/function.hpp> -class Window; +namespace vcl { class Window; } namespace sd { namespace toolpanel { @@ -39,7 +39,7 @@ class ControlContainer; control are child windows. */ class TitledControl - : public ::Window, + : public vcl::Window, public TreeNode { public: @@ -74,7 +74,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual void Resize (void); virtual void GetFocus (void); diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 329219eba972..894f5d5bad50 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -66,7 +66,7 @@ public: ToolPanelViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView); virtual ~ToolPanelViewShell (void); @@ -107,10 +107,10 @@ public: /** Relocate all toplevel controls to the given parent window. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) SAL_OVERRIDE; /// returns <TRUE/> if and only if the given window is the panel anchor window of our ToolPanelDeck - bool IsPanelAnchorWindow( const ::Window& i_rWindow ) const; + bool IsPanelAnchorWindow( const vcl::Window& i_rWindow ) const; /** creates an XUIElement for the given standard panel */ diff --git a/sd/source/ui/inc/tools/IdleDetection.hxx b/sd/source/ui/inc/tools/IdleDetection.hxx index 305a6895354e..7bdb8401e924 100644 --- a/sd/source/ui/inc/tools/IdleDetection.hxx +++ b/sd/source/ui/inc/tools/IdleDetection.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -class Window; +namespace vcl { class Window; } namespace sd { namespace tools { @@ -64,7 +64,7 @@ public: IdleStates values or-ed together that describe what the system is currently doing so that the caller can decide what to do. */ - static sal_Int32 GetIdleState (const ::Window* pWindow = NULL); + static sal_Int32 GetIdleState (const vcl::Window* pWindow = NULL); private: /** Check whether there are input events pending. @@ -75,7 +75,7 @@ private: */ static sal_Int32 CheckSlideShowRunning (void); - static sal_Int32 CheckWindowPainting (const ::Window& rWindow); + static sal_Int32 CheckWindowPainting (const vcl::Window& rWindow); }; } } // end of namespace ::sd::tools diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 9b2f241b4970..bb5d33b0e57a 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -44,7 +44,7 @@ class SdActionDlg : public SfxSingleTabDialog private: const SfxItemSet& rOutAttrs; public: - SdActionDlg(Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView); + SdActionDlg(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView); }; /** @@ -95,10 +95,10 @@ private: sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); public: - SdTPAction( Window* pParent, const SfxItemSet& rInAttrs ); + SdTPAction( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTPAction(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 632c0c9bf312..353b06eee46f 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -35,10 +35,10 @@ class SdTpOptionsSnap : public SvxGridTabPage { public: - SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs ); + SdTpOptionsSnap( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsSnap(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -56,10 +56,10 @@ private: CheckBox* m_pCbxMoveOutline; public: - SdTpOptionsContents( Window* pParent, const SfxItemSet& rInAttrs ); + SdTpOptionsContents( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsContents(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; }; @@ -129,10 +129,10 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; public: - SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ); + SdTpOptionsMisc( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsMisc(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index 24e4872d8653..153343dae933 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -80,7 +80,7 @@ class SdVectorizeDlg : public ModalDialog public: - SdVectorizeDlg( Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); + SdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); virtual ~SdVectorizeDlg(); const GDIMetaFile& GetGDIMetaFile() const { return aMtf; } diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 8aec53b0b9b9..7b33475eb6ab 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -724,8 +724,8 @@ awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWind mbOffsetUpdatePending = false; if (mxWindow.is() && rxBaseWindow.is()) { - ::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); - ::Window* pSharedWindow = VCLUnoHelper::GetWindow(rxBaseWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); + vcl::Window* pSharedWindow = VCLUnoHelper::GetWindow(rxBaseWindow); if (pWindow!=NULL && pSharedWindow!=NULL) { Rectangle aBox = pWindow->GetWindowExtentsRelative(pSharedWindow); @@ -745,11 +745,11 @@ awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWind { ::basegfx::B2DRectangle aClipRectangle; - ::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); if (pWindow == NULL) return ::basegfx::B2DRectangle(); - ::Window* pSharedWindow = VCLUnoHelper::GetWindow(mxSharedWindow); + vcl::Window* pSharedWindow = VCLUnoHelper::GetWindow(mxSharedWindow); if (pSharedWindow == NULL) return ::basegfx::B2DRectangle(); diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index bef771fa2847..7083b69207ae 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -94,17 +94,17 @@ Reference<awt::XWindow> SAL_CALL PresenterHelper::createWindow ( sal_Bool bEnableParentClip) throw (css::uno::RuntimeException, std::exception) { - ::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow); // Create a new window. - ::Window* pWindow = NULL; + vcl::Window* pWindow = NULL; if (bCreateSystemChildWindow) { pWindow = new WorkWindow(pParentWindow, WB_SYSTEMCHILDWINDOW); } else { - pWindow = new ::Window(pParentWindow); + pWindow = new vcl::Window(pParentWindow); } Reference<awt::XWindow> xWindow (pWindow->GetComponentInterface(), UNO_QUERY); @@ -170,7 +170,7 @@ Reference<rendering::XCanvas> SAL_CALL PresenterHelper::createCanvas ( // No shared window is given or an explicit canvas service name is // specified. Create a new canvas. - ::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); if (pWindow != NULL) { Sequence<Any> aArg (5); @@ -200,7 +200,7 @@ void SAL_CALL PresenterHelper::toTop ( const Reference<awt::XWindow>& rxWindow) throw (css::uno::RuntimeException, std::exception) { - ::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); if (pWindow != NULL) { pWindow->ToTop(); @@ -443,7 +443,7 @@ void SAL_CALL PresenterHelper::captureMouse ( ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); // Capture the mouse (if not already done.) - ::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); if (pWindow != NULL && ! pWindow->IsMouseCaptured()) { pWindow->CaptureMouse(); @@ -456,7 +456,7 @@ void SAL_CALL PresenterHelper::releaseMouse (const Reference<awt::XWindow>& rxWi ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); // Release the mouse (if not already done.) - ::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(rxWindow); if (pWindow != NULL && pWindow->IsMouseCaptured()) { pWindow->ReleaseMouse(); @@ -468,8 +468,8 @@ awt::Rectangle PresenterHelper::getWindowExtentsRelative ( const Reference<awt::XWindow>& rxParentWindow) throw (RuntimeException, std::exception) { - ::Window* pChildWindow = VCLUnoHelper::GetWindow(rxChildWindow); - ::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow); + vcl::Window* pChildWindow = VCLUnoHelper::GetWindow(rxChildWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow); if (pChildWindow!=NULL && pParentWindow!=NULL) { Rectangle aBox (pChildWindow->GetWindowExtentsRelative(pParentWindow)); diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx index 08c9dda54c65..b0ff1af75dcd 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx @@ -78,7 +78,7 @@ public: }; MasterPagesSelector* AllMasterPagesSelector::Create ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { @@ -102,7 +102,7 @@ MasterPagesSelector* AllMasterPagesSelector::Create ( } AllMasterPagesSelector::AllMasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx index eebc8691fa8a..0ce98e24ada6 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx @@ -38,7 +38,7 @@ class AllMasterPagesSelector { public: static MasterPagesSelector* Create ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); @@ -59,7 +59,7 @@ private: ::std::auto_ptr<SortedMasterPageDescriptorList> mpSortedMasterPages; AllMasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 4525bc8c16cb..00d0f8d5eea6 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; namespace sd { namespace sidebar { MasterPagesSelector* CurrentMasterPagesSelector::Create ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { @@ -67,7 +67,7 @@ MasterPagesSelector* CurrentMasterPagesSelector::Create ( } CurrentMasterPagesSelector::CurrentMasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index 2a11328a88e6..e5c2932b90be 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -36,7 +36,7 @@ class CurrentMasterPagesSelector { public: static MasterPagesSelector* Create ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); @@ -62,7 +62,7 @@ private: css::uno::Reference<css::lang::XComponent> mxListener; CurrentMasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx index d0bd23a5fcbe..804b6c143aa7 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx @@ -25,7 +25,7 @@ namespace sd { namespace sidebar { CustomAnimationPanel::CustomAnimationPanel ( - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) @@ -43,8 +43,8 @@ CustomAnimationPanel::~CustomAnimationPanel (void) { } -::Window* CustomAnimationPanel::CreateWrappedControl ( - ::Window* pParentWindow, +::vcl::Window* CustomAnimationPanel::CreateWrappedControl ( + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) { return createCustomAnimationPanel(pParentWindow, rViewShellBase, mxFrame); diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.hxx b/sd/source/ui/sidebar/CustomAnimationPanel.hxx index cb391919564c..f9a9d708c8e3 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.hxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.hxx @@ -29,7 +29,7 @@ class CustomAnimationPanel { public: CustomAnimationPanel ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); virtual ~CustomAnimationPanel (void); @@ -38,8 +38,8 @@ public: virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; protected: - virtual ::Window* CreateWrappedControl ( - ::Window* pParentWindow, + virtual vcl::Window* CreateWrappedControl ( + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) SAL_OVERRIDE; private: diff --git a/sd/source/ui/sidebar/IDisposable.hxx b/sd/source/ui/sidebar/IDisposable.hxx index ef68ac282788..41dc811e0f57 100644 --- a/sd/source/ui/sidebar/IDisposable.hxx +++ b/sd/source/ui/sidebar/IDisposable.hxx @@ -22,7 +22,7 @@ #include <tools/gen.hxx> #include <sal/types.h> -class Window; +namespace vcl { class Window; } namespace sd { namespace sidebar { diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index ebf319ce6ce9..4e15c5c56abd 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -121,7 +121,7 @@ static const snewfoil_value_info standard[] = }; LayoutMenu::LayoutMenu ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) : ValueSet (pParent, WB_ITEMBORDER), diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 2e65d19f938e..45fce7f55c08 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -69,7 +69,7 @@ public: the view shell of the task pane. */ LayoutMenu ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); virtual ~LayoutMenu (void); @@ -84,7 +84,7 @@ public: // From ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; - // From ::Window + // From vcl::Window virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; virtual void Resize (void) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index a9602906c702..e198b0f681c9 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star::text; namespace sd { namespace sidebar { MasterPagesSelector::MasterPagesSelector ( - ::Window* pParent, + ::vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, @@ -500,7 +500,7 @@ bool MasterPagesSelector::IsResizable (void) return false; } -::Window* MasterPagesSelector::GetWindow (void) +::vcl::Window* MasterPagesSelector::GetWindow (void) { return this; } diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index e299b12eae8c..1d9097f9d4c3 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -57,7 +57,7 @@ class MasterPagesSelector { public: MasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, @@ -83,7 +83,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual sal_Int32 GetMinimumWidth (void); /** Update the selection of previews according to whatever diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx index 3df03cc05f88..3197ffcb7daa 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.cxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx @@ -28,7 +28,7 @@ namespace sd { namespace sidebar { NavigatorWrapper::NavigatorWrapper ( - ::Window* pParent, + vcl::Window* pParent, sd::ViewShellBase& rViewShellBase, SfxBindings* pBindings) : Control(pParent, 0), diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx b/sd/source/ui/sidebar/NavigatorWrapper.hxx index 61445b1b984a..edc258ffae64 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.hxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx @@ -41,7 +41,7 @@ class NavigatorWrapper { public: NavigatorWrapper ( - ::Window* pParent, + vcl::Window* pParent, sd::ViewShellBase& rViewShellBase, SfxBindings* pBindings); diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index 270705054c93..a159d80e86ee 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -22,7 +22,7 @@ namespace sd { namespace sidebar { PanelBase::PanelBase ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) : Control(pParentWindow), mpWrappedControl(NULL), diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index f2e54b0f1aae..797308f83187 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -42,7 +42,7 @@ class PanelBase { public: PanelBase ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase); virtual ~PanelBase (void); @@ -63,9 +63,9 @@ public: ::com::sun::star::accessibility::XAccessible>& rxParent); protected: - ::boost::scoped_ptr< ::Window> mpWrappedControl; - virtual ::Window* CreateWrappedControl ( - ::Window* pParentWindow, + ::boost::scoped_ptr< vcl::Window> mpWrappedControl; + virtual vcl::Window* CreateWrappedControl ( + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) = 0; private: diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index a64b986ffbba..3bff21b0b05a 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -114,7 +114,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( Reference<ui::XSidebar> xSidebar (aArguments.getOrDefault("Sidebar", Reference<ui::XSidebar>())); // Throw exceptions when the arguments are not as expected. - ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if ( ! xParentWindow.is() || pParentWindow==NULL) throw RuntimeException( "PanelFactory::createUIElement called without ParentWindow"); @@ -140,7 +140,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue); // Create a framework view. - ::Window* pControl = NULL; + vcl::Window* pControl = NULL; css::ui::LayoutSize aLayoutSize (-1,-1,-1); #define EndsWith(s,t) s.endsWithAsciiL(t,strlen(t)) diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx index e532d7ace50f..59242ddbae8d 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.cxx +++ b/sd/source/ui/sidebar/PreviewValueSet.cxx @@ -22,7 +22,7 @@ namespace sd { namespace sidebar { -PreviewValueSet::PreviewValueSet (::Window* pParent) +PreviewValueSet::PreviewValueSet (vcl::Window* pParent) : ValueSet (pParent, WB_TABSTOP), maPreviewSize(10,10), mnBorderWidth(3), diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx index 9bd390f7c18f..8ed413de2351 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.hxx +++ b/sd/source/ui/sidebar/PreviewValueSet.hxx @@ -30,7 +30,7 @@ class PreviewValueSet : public ValueSet { public: - PreviewValueSet (::Window* pParent); + PreviewValueSet (vcl::Window* pParent); virtual ~PreviewValueSet (void); void SetRightMouseClickHandler (const Link& rLink); diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index 2705e2b31392..002f088746bf 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -33,7 +33,7 @@ namespace sd { namespace sidebar { MasterPagesSelector* RecentMasterPagesSelector::Create ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) { @@ -57,7 +57,7 @@ MasterPagesSelector* RecentMasterPagesSelector::Create ( } RecentMasterPagesSelector::RecentMasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx index f5bacc780c53..0c1c53f67ccd 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx @@ -31,7 +31,7 @@ class RecentMasterPagesSelector { public: static MasterPagesSelector* Create ( - ::Window* pParent, + vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); @@ -59,7 +59,7 @@ protected: private: RecentMasterPagesSelector ( - ::Window* pParent, + vcl::Window* pParent, SdDrawDocument& rDocument, ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, diff --git a/sd/source/ui/sidebar/SidebarFocusManager.hxx b/sd/source/ui/sidebar/SidebarFocusManager.hxx index 2904dd56767c..6fde5d417695 100644 --- a/sd/source/ui/sidebar/SidebarFocusManager.hxx +++ b/sd/source/ui/sidebar/SidebarFocusManager.hxx @@ -26,7 +26,7 @@ #include <memory> class VclSimpleEvent; -class Window; +namespace vcl { class Window; } namespace sd { namespace toolpanel { @@ -54,8 +54,8 @@ public: window to the target window. */ void RegisterLink ( - ::Window* pSource, - ::Window* pTarget, + vcl::Window* pSource, + vcl::Window* pTarget, const vcl::KeyCode& rKey); /** Register a link that will move the focus from the source window to @@ -66,7 +66,7 @@ public: @param pTarget The window to which the focus will be transferred. */ - void RegisterUpLink (::Window* pSource, ::Window* pTarget); + void RegisterUpLink (vcl::Window* pSource, vcl::Window* pTarget); /** Register a link that will move the focus from the source window to the target window when the source window is focused and KEY_RETURN @@ -76,15 +76,15 @@ public: @param pTarget The window to which the focus will be transferred. */ - void RegisterDownLink (::Window* pSource, ::Window* pTarget); + void RegisterDownLink (vcl::Window* pSource, vcl::Window* pTarget); /** Remove all links from the source window to the target window. When there are links from the target window to the source window then these are not touced. */ void RemoveLinks ( - ::Window* pSource, - ::Window* pTarget); + vcl::Window* pSource, + vcl::Window* pTarget); /** Let the focus manager transfer the focus from the specified source window to a target window that is determined according the the @@ -92,7 +92,7 @@ public: When there is no rule for this combination of source window and key code then the focus stays where it is. */ - bool TransferFocus (::Window* pSource, const vcl::KeyCode& rCode); + bool TransferFocus (vcl::Window* pSource, const vcl::KeyCode& rCode); private: friend struct FocusManagerCreator; @@ -110,12 +110,12 @@ private: /** Remove all links from or to the given window. */ - void RemoveLinks (::Window* pWindow); + void RemoveLinks (vcl::Window* pWindow); /** Unregister as event listener from the given window when there are no links from this window anymore. */ - void RemoveUnusedEventListener (::Window* pWindow); + void RemoveUnusedEventListener (vcl::Window* pWindow); /** Listen for key events and on KEY_RETURN go down and on KEY_ESCAPE go up. diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx index cc9a5776cafc..7051d3a957db 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx @@ -25,7 +25,7 @@ namespace sd { namespace sidebar { SlideTransitionPanel::SlideTransitionPanel ( - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) @@ -41,8 +41,8 @@ SlideTransitionPanel::~SlideTransitionPanel (void) { } -::Window* SlideTransitionPanel::CreateWrappedControl ( - ::Window* pParentWindow, +::vcl::Window* SlideTransitionPanel::CreateWrappedControl ( + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) { return createSlideTransitionPanel(pParentWindow, rViewShellBase, mxFrame); @@ -50,7 +50,7 @@ SlideTransitionPanel::~SlideTransitionPanel (void) css::ui::LayoutSize SlideTransitionPanel::GetHeightForWidth (const sal_Int32 /*nWidth*/) { - Window *pControl = mpWrappedControl.get(); + vcl::Window *pControl = mpWrappedControl.get(); sal_Int32 nMinimumHeight = pControl ? pControl->get_preferred_size().Height() : 0; return css::ui::LayoutSize(nMinimumHeight,-1, nMinimumHeight); } diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx index 74ef56a4d9a9..ab36313cbea6 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx @@ -29,7 +29,7 @@ class SlideTransitionPanel { public: SlideTransitionPanel ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ); virtual ~SlideTransitionPanel (void); @@ -38,8 +38,8 @@ public: virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; protected: - virtual ::Window* CreateWrappedControl ( - ::Window* pParentWindow, + virtual vcl::Window* CreateWrappedControl ( + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) SAL_OVERRIDE; private: diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx index 61212dd7db17..f0008cd28a88 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.cxx +++ b/sd/source/ui/sidebar/TableDesignPanel.cxx @@ -25,7 +25,7 @@ namespace sd { namespace sidebar { TableDesignPanel::TableDesignPanel ( - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) : PanelBase(pParentWindow, rViewShellBase) { @@ -38,8 +38,8 @@ TableDesignPanel::~TableDesignPanel (void) { } -::Window* TableDesignPanel::CreateWrappedControl ( - ::Window* pParentWindow, +::vcl::Window* TableDesignPanel::CreateWrappedControl ( + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) { return createTableDesignPanel(pParentWindow, rViewShellBase); diff --git a/sd/source/ui/sidebar/TableDesignPanel.hxx b/sd/source/ui/sidebar/TableDesignPanel.hxx index 25d125dc510a..9d9c5d188c4b 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.hxx +++ b/sd/source/ui/sidebar/TableDesignPanel.hxx @@ -28,7 +28,7 @@ class TableDesignPanel { public: TableDesignPanel ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase); virtual ~TableDesignPanel (void); @@ -36,8 +36,8 @@ public: virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; protected: - virtual ::Window* CreateWrappedControl ( - ::Window* pParentWindow, + virtual vcl::Window* CreateWrappedControl ( + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase) SAL_OVERRIDE; }; diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 29038e6cf8db..019d2bb0d0c6 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -41,7 +41,7 @@ namespace sd { static const sal_uLong HIDE_MOUSE_TIMEOUT = 10000; static const sal_uLong SHOW_MOUSE_TIMEOUT = 1000; -ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, ::Window* pParent ) +ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, vcl::Window* pParent ) : ::sd::Window( pParent ) , mnPauseTimeout( SLIDE_NO_TIMEOUT ) , mnRestartPageIndex( PAGE_NO_END ) @@ -642,7 +642,7 @@ void ShowWindow::AddWindowToPaintView() else { OSL_TRACE ("::sd::Window::CreateAccessible: no view shell"); - return ::Window::CreateAccessible (); + return vcl::Window::CreateAccessible (); } } } // end of namespace sd diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index db3dc2c51ab9..3fbbcef0dd79 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -49,7 +49,7 @@ class ShowWindow { public: - ShowWindow ( const ::rtl::Reference< ::sd::SlideshowImpl >& xController, ::Window* pParent ); + ShowWindow ( const ::rtl::Reference< ::sd::SlideshowImpl >& xController, vcl::Window* pParent ); virtual ~ShowWindow (void); bool SetEndMode(); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index eaf5b737c4fe..85ac816c667b 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -185,7 +185,7 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase ) bool SlideShow::StartPreview( ViewShellBase& rBase, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, - ::Window* pParent /* = 0 */ ) + vcl::Window* pParent /* = 0 */ ) { rtl::Reference< SlideShow > xSlideShow( GetSlideShow( rBase ) ); if( xSlideShow.is() ) @@ -213,7 +213,7 @@ bool SlideShow::IsRunning( ViewShell& rViewShell ) return xSlideShow.is() && xSlideShow->isRunning() && (xSlideShow->mxController->getViewShell() == &rViewShell); } -void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Window* pParentWindow ) +void SlideShow::CreateController( ViewShell* pViewSh, ::sd::View* pView, vcl::Window* pParentWindow ) { DBG_ASSERT( !mxController.is(), "sd::SlideShow::CreateController(), clean up old controller first!" ); @@ -900,7 +900,7 @@ void SAL_CALL SlideShow::disposing (void) mpDoc = 0; } -bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode, ::Window* pParent ) +bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode, vcl::Window* pParent ) { Sequence< PropertyValue > aArguments(4); @@ -1108,7 +1108,7 @@ void SlideShow::StartInPlacePresentation() } else { - ::Window* pParentWindow = mxCurrentSettings->mpParentWindow; + vcl::Window* pParentWindow = mxCurrentSettings->mpParentWindow; if( pParentWindow == 0 ) pParentWindow = mpCurrentViewShellBase->GetViewWindow(); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 1414e0904854..a6ccac9a5f22 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -487,7 +487,7 @@ void AnimationSlideController::displayCurrentSlide( const Reference< XSlideShow } } -SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, ::Window* pParentWindow ) +SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, vcl::Window* pParentWindow ) : SlideshowImplBase( m_aMutex ) , mxModel(pDoc->getUnoModel(),UNO_QUERY_THROW) , mpView(pView) @@ -756,7 +756,7 @@ void SAL_CALL SlideshowImpl::disposing() bool SlideshowImpl::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode, - ::Window* pParent ) + vcl::Window* pParent ) { bool bRet = false; diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index da7c56e6665b..901f09e45529 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -91,7 +91,7 @@ struct PresentationSettingsEx : public PresentationSettings { bool mbRehearseTimings; bool mbPreview; - ::Window* mpParentWindow; + vcl::Window* mpParentWindow; css::uno::Reference< css::drawing::XDrawPage > mxStartPage; css::uno::Reference< css::animations::XAnimationNode > mxAnimationNode; @@ -164,7 +164,7 @@ friend class SlideShow; friend class SlideShowView; public: - explicit SlideshowImpl( const css::uno::Reference< css::presentation::XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, ::Window* pParentWindow); + explicit SlideshowImpl( const css::uno::Reference< css::presentation::XPresentation2 >& xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc, vcl::Window* pParentWindow); // css::presentation::XSlideShowController: virtual sal_Bool SAL_CALL getAlwaysOnTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -250,7 +250,7 @@ private: bool startPreview( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Reference< css::animations::XAnimationNode >& xAnimationNode, - ::Window* pParent ); + vcl::Window* pParent ); ShowWindow* getShowWindow() const { return mpShowWindow; } @@ -337,7 +337,7 @@ private: SdDrawDocument* mpDoc; SfxItemSet* mpNewAttr; - ::Window* mpParentWindow; + vcl::Window* mpParentWindow; ShowWindow* mpShowWindow; PushButton* mpTimeButton; diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index b3f920a4692a..20d627eaedad 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -123,7 +123,7 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) if (pWindow) { // The whole background is painted by the view and controls. - ::Window* pParentWindow = pWindow->GetParent(); + ::vcl::Window* pParentWindow = pWindow->GetParent(); OSL_ASSERT(pParentWindow!=NULL); pParentWindow->SetBackground (Wallpaper()); @@ -267,7 +267,7 @@ ScrollBarManager& SlideSorterController::GetScrollBarManager (void) void SlideSorterController::Paint ( const Rectangle& rBBox, - ::Window* pWindow) + ::vcl::Window* pWindow) { if (mnPaintEntranceCount == 0) { @@ -542,7 +542,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent*, pEvent) { if (pEvent != NULL) { - ::Window* pWindow = pEvent->GetWindow(); + ::vcl::Window* pWindow = pEvent->GetWindow(); SharedSdWindow pActiveWindow (mrSlideSorter.GetContentWindow()); switch (pEvent->GetId()) { diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index fee1e6c96446..f633a4fe8ae5 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -217,7 +217,7 @@ void Clipboard::HandleSlotCall (SfxRequest& rRequest) } } -void Clipboard::DoCut (::Window* pWindow) +void Clipboard::DoCut (::vcl::Window* pWindow) { if (mrSlideSorter.GetModel().GetPageCount() > 1) { @@ -226,7 +226,7 @@ void Clipboard::DoCut (::Window* pWindow) } } -void Clipboard::DoDelete (::Window* ) +void Clipboard::DoDelete (::vcl::Window* ) { if (mrSlideSorter.GetModel().GetPageCount() > 1) { @@ -234,12 +234,12 @@ void Clipboard::DoDelete (::Window* ) } } -void Clipboard::DoCopy (::Window* pWindow ) +void Clipboard::DoCopy (::vcl::Window* pWindow ) { CreateSlideTransferable( pWindow, false ); } -void Clipboard::DoPaste (::Window* pWindow) +void Clipboard::DoPaste (::vcl::Window* pWindow) { SdTransferable* pClipTransferable = SD_MOD()->pTransferClip; @@ -259,7 +259,7 @@ void Clipboard::DoPaste (::Window* pWindow) } } -sal_Int32 Clipboard::GetInsertionPosition (::Window* pWindow) +sal_Int32 Clipboard::GetInsertionPosition (::vcl::Window* pWindow) { sal_Int32 nInsertPosition = -1; @@ -377,7 +377,7 @@ void Clipboard::SelectPageRange (sal_Int32 nFirstIndex, sal_Int32 nPageCount) } void Clipboard::CreateSlideTransferable ( - ::Window* pWindow, + ::vcl::Window* pWindow, bool bDrag) { std::vector<OUString> aBookmarkList; @@ -442,7 +442,7 @@ void Clipboard::CreateSlideTransferable ( aObjDesc.maDisplayName = pDocument->GetDocSh() ->GetMedium()->GetURLObject().GetURLNoPass(); - ::Window* pActionWindow = pWindow; + ::vcl::Window* pActionWindow = pWindow; if (pActionWindow == NULL) { ViewShell* pViewShell = mrSlideSorter.GetViewShell(); @@ -556,7 +556,7 @@ void Clipboard::CreateSlideTransferable ( void Clipboard::StartDrag ( const Point& rPosition, - ::Window* pWindow) + ::vcl::Window* pWindow) { maPagesToRemove.clear(); maPagesToSelect.clear(); diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 0da6c42d5874..6f66ccd60261 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -290,12 +290,12 @@ public: #else SelectionFunction& rSelectionFunction, const Point& rMousePosition, - ::Window* pWindow); + ::vcl::Window* pWindow); #endif virtual ~DragAndDropModeHandler (void); #ifndef MACOSX - void Initialize(const Point& rMousePosition, ::Window* pWindow); + void Initialize(const Point& rMousePosition, ::vcl::Window* pWindow); #endif virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; @@ -390,7 +390,7 @@ bool SelectionFunction::KeyInput (const KeyEvent& rEvent) FocusManager& rFocusManager (mrController.GetFocusManager()); bool bResult = false; - const vcl::KeyCode& rCode (rEvent.GetKeyCode()); + const ::vcl::KeyCode& rCode (rEvent.GetKeyCode()); switch (rCode.GetCode()) { case KEY_RETURN: @@ -1508,14 +1508,14 @@ DragAndDropModeHandler::DragAndDropModeHandler ( #else SelectionFunction& rSelectionFunction, const Point& rMousePosition, - ::Window* pWindow) + ::vcl::Window* pWindow) #endif : ModeHandler(rSlideSorter, rSelectionFunction, false) { #ifndef MACOSX } -void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::Window* pWindow) +void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::vcl::Window* pWindow) { #endif SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag; diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index a86b5fa4f809..993a0b568638 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -122,7 +122,7 @@ public: /** This method forwards the call to the SlideSorterView and executes pending operations like moving selected pages into the visible area. */ - void Paint (const Rectangle& rRect, ::Window* pWin); + void Paint (const Rectangle& rRect, vcl::Window* pWin); void FuTemporary (SfxRequest& rRequest); void FuPermanent (SfxRequest& rRequest); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index e868070879aa..1099a2b1d8ec 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -31,15 +31,13 @@ #include <set> class SfxRequest; -class Window; - struct AcceptDropEvent; class DropTargetHelper; struct ExecuteDropEvent; struct ImplSVEvent; class Point; class SdPage; -class Window; +namespace vcl { class Window; } namespace sd { class Window; @@ -72,14 +70,14 @@ public: void HandleSlotCall (SfxRequest& rRequest); - void DoCut (::Window* pWindow = 0); - void DoCopy (::Window* pWindow = 0); - void DoPaste (::Window* pWindow = 0); - void DoDelete (::Window* pWindow = 0); + void DoCut (::vcl::Window* pWindow = 0); + void DoCopy (::vcl::Window* pWindow = 0); + void DoPaste (::vcl::Window* pWindow = 0); + void DoDelete (::vcl::Window* pWindow = 0); void StartDrag ( const Point& rDragPt, - ::Window* pWindow ); + ::vcl::Window* pWindow ); void DragFinished ( sal_Int8 nDropAction); @@ -141,7 +139,7 @@ private: ImplSVEvent * mnDragFinishedUserEventId; void CreateSlideTransferable ( - ::Window* pWindow, + ::vcl::Window* pWindow, bool bDrag); /** Determine the position of where to insert the pages in the current @@ -153,7 +151,7 @@ private: The index in the range [0,n] (both inclusive) with n the number of pages is returned. */ - sal_Int32 GetInsertionPosition (::Window* pWindow); + sal_Int32 GetInsertionPosition (::vcl::Window* pWindow); /** Paste the pages of the transferable of the sd module at the given position. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 66d24d22a0eb..8a7fe7c93d57 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -30,10 +30,10 @@ class ScrollBar; class ScrollBarBox; -class Window; +namespace vcl { class Window; } namespace sd { -class Window; +namespace vcl { class Window; } } namespace sd { namespace slidesorter { diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index 479602b72d43..b0543248a089 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -36,7 +36,7 @@ class FontProvider : public SdGlobalResource { public: - typedef ::boost::shared_ptr<vcl::Font> SharedFontPointer; + typedef ::boost::shared_ptr<::vcl::Font> SharedFontPointer; /** Return the single instance of this class. Throws a RuntimeException when no instance can be created. diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx index 25d9192716d2..7391e4585d65 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx @@ -133,7 +133,7 @@ private: Rectangle maCustomAnimationEffectBoundingBox; const Image maTransitionEffectIcon; const Image maCustomAnimationEffectIcon; - const ::boost::shared_ptr<vcl::Font> mpPageNumberFont; + const ::boost::shared_ptr<::vcl::Font> mpPageNumberFont; Size GetPageNumberAreaSize (const int nPageCount); Rectangle CalculatePreviewBoundingBox ( diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx index 6cbaa06b29a9..32b91b98ca64 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx @@ -73,7 +73,7 @@ private: ::boost::shared_ptr<cache::PageCache> mpCache; ::boost::shared_ptr<controller::Properties> mpProperties; ::boost::shared_ptr<view::Theme> mpTheme; - ::boost::shared_ptr<vcl::Font> mpPageNumberFont; + ::boost::shared_ptr<::vcl::Font> mpPageNumberFont; ::boost::scoped_ptr<FramePainter> mpShadowPainter; ::boost::scoped_ptr<FramePainter> mpFocusBorderPainter; Bitmap maNormalBackground; diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx index 814bf1a3561c..33b6bee1078b 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx @@ -58,7 +58,7 @@ public: Font_PageNumber, Font_PageCount }; - static ::boost::shared_ptr<vcl::Font> GetFont ( + static ::boost::shared_ptr<::vcl::Font> GetFont ( const FontType eType, const OutputDevice& rDevice); diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 50ac309006cc..04a1de11f9fa 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -50,7 +50,7 @@ namespace { class ContentWindow : public ::sd::Window { public: - ContentWindow(::Window& rParent, SlideSorter& rSlideSorter); + ContentWindow(::vcl::Window& rParent, SlideSorter& rSlideSorter); virtual ~ContentWindow (void); void SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction); virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; @@ -90,7 +90,7 @@ private: ::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::Window& rParentWindow) + ::vcl::Window& rParentWindow) { ::boost::shared_ptr<SlideSorter> pSlideSorter( new SlideSorter( @@ -128,7 +128,7 @@ SlideSorter::SlideSorter ( SlideSorter::SlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::Window& rParentWindow) + ::vcl::Window& rParentWindow) : mbIsValid(false), mpSlideSorterController(), mpSlideSorterModel(), @@ -173,7 +173,7 @@ void SlideSorter::Init (void) SharedSdWindow pContentWindow (GetContentWindow()); if (pContentWindow) { - ::Window* pParentWindow = pContentWindow->GetParent(); + ::vcl::Window* pParentWindow = pContentWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->SetBackground(Wallpaper()); pContentWindow->SetBackground(Wallpaper()); @@ -256,7 +256,7 @@ void SlideSorter::Paint (const Rectangle& rRepaintArea) GetContentWindow().get()); } -void SlideSorter::SetupControls (::Window* ) +void SlideSorter::SetupControls (::vcl::Window* ) { GetVerticalScrollBar()->Show(); mpSlideSorterController->GetScrollBarManager().LateInitialization(); @@ -267,7 +267,7 @@ void SlideSorter::SetupListeners (void) SharedSdWindow pWindow (GetContentWindow()); if (pWindow) { - ::Window* pParentWindow = pWindow->GetParent(); + ::vcl::Window* pParentWindow = pWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->AddEventListener( LINK( @@ -301,7 +301,7 @@ void SlideSorter::ReleaseListeners (void) controller::SlideSorterController, WindowEventHandler)); - ::Window* pParentWindow = pWindow->GetParent(); + ::vcl::Window* pParentWindow = pWindow->GetParent(); if (pParentWindow != NULL) pParentWindow->RemoveEventListener( LINK(mpSlideSorterController.get(), @@ -400,14 +400,14 @@ SvBorder SlideSorter::GetBorder (void) return aBorder; } -bool SlideSorter::RelocateToWindow (::Window* pParentWindow) +bool SlideSorter::RelocateToWindow (::vcl::Window* pParentWindow) { // Stop all animations for they have been started for the old window. mpSlideSorterController->GetAnimator()->RemoveAllAnimations(); ReleaseListeners(); - ::Window *pNewWindow = NULL; + ::vcl::Window *pNewWindow = NULL; if (mpViewShell) { mpViewShell->ViewShell::RelocateToParentWindow(pParentWindow); @@ -465,7 +465,7 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) namespace { ContentWindow::ContentWindow( - ::Window& rParent, + ::vcl::Window& rParent, SlideSorter& rSlideSorter) : ::sd::Window(&rParent), mrSlideSorter(rSlideSorter), diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 1d15c0935cc1..d167e1a3f533 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -123,7 +123,7 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) // Get the parent window. mxParentWindow = Reference<awt::XWindow>(rArguments[2], UNO_QUERY_THROW); - ::Window* pParentWindow = VCLUnoHelper::GetWindow(mxParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(mxParentWindow); mxParentWindow->addWindowListener(this); diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 1185a64a9e51..708bbb82a256 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -93,7 +93,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell); ::boost::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameViewArgument, const bool bIsCenterPane) { @@ -118,7 +118,7 @@ TYPEINIT1(SlideSorterViewShell, ViewShell); SlideSorterViewShell::SlideSorterViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameViewArgument) : ViewShell (pFrame, pParentWindow, rViewShellBase), mpSlideSorter(), @@ -292,7 +292,7 @@ SlideSorter& SlideSorterViewShell::GetSlideSorter (void) const return *mpSlideSorter; } -bool SlideSorterViewShell::RelocateToParentWindow (::Window* pParentWindow) +bool SlideSorterViewShell::RelocateToParentWindow (::vcl::Window* pParentWindow) { OSL_ASSERT(mpSlideSorter); if ( ! mpSlideSorter) @@ -658,7 +658,7 @@ void SlideSorterViewShell::UpdateScrollBars (void) void SlideSorterViewShell::StartDrag ( const Point& rDragPt, - ::Window* pWindow ) + ::vcl::Window* pWindow ) { OSL_ASSERT(mpSlideSorter.get()!=NULL); mpSlideSorter->GetController().GetClipboard().StartDrag ( diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index e29c86e6ca50..8f89c56397cd 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -348,7 +348,7 @@ void SlideSorterView::UpdateOrientation (void) else { // Get access to the docking window. - ::Window* pWindow = mrSlideSorter.GetContentWindow().get(); + vcl::Window* pWindow = mrSlideSorter.GetContentWindow().get(); PaneDockingWindow* pDockingWindow = NULL; while (pWindow!=NULL && pDockingWindow==NULL) { diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 4e5629b2a825..020e29ab91d2 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -124,7 +124,7 @@ void ToolTip::DoShow (void) if (aBox.Bottom() >= pWindow->GetSizePixel().Height()) return; - ::Window* pParent (pWindow.get()); + vcl::Window* pParent (pWindow.get()); while (pParent!=NULL && pParent->GetParent()!=NULL) pParent = pParent->GetParent(); const Point aOffset (pWindow->GetWindowExtentsRelative(pParent).TopLeft()); diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index ef06796497a2..4776edf2aa6d 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -365,7 +365,7 @@ void TableValueSet::updateSettings() } } -extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makeTableValueSet(::Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT ::vcl::Window* SAL_CALL makeTableValueSet(::vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -807,12 +807,12 @@ short TableDesignDialog::Execute() return RET_CANCEL; } -::Window * createTableDesignPanel( ::Window* pParent, ViewShellBase& rBase ) +::vcl::Window * createTableDesignPanel( ::vcl::Window* pParent, ViewShellBase& rBase ) { return new TableDesignPane( pParent, rBase ); } -void showTableDesignDialog( ::Window* pParent, ViewShellBase& rBase ) +void showTableDesignDialog( ::vcl::Window* pParent, ViewShellBase& rBase ) { boost::scoped_ptr< TableDesignDialog > xDialog( new TableDesignDialog( pParent, rBase ) ); xDialog->Execute(); diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx index 34b7482d8fb5..7175a7bcf857 100644 --- a/sd/source/ui/table/TableDesignPane.hxx +++ b/sd/source/ui/table/TableDesignPane.hxx @@ -56,7 +56,7 @@ class TableValueSet : public ValueSet private: bool m_bModal; public: - TableValueSet(Window *pParent, WinBits nStyle); + TableValueSet(vcl::Window *pParent, WinBits nStyle); virtual void Resize() SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void updateSettings(); @@ -111,7 +111,7 @@ class TableDesignPane : public PanelLayout private: TableDesignWidget aImpl; public: - TableDesignPane( ::Window* pParent, ViewShellBase& rBase ) + TableDesignPane( vcl::Window* pParent, ViewShellBase& rBase ) : PanelLayout(pParent, "TableDesignPanel", "modules/simpress/ui/tabledesignpanel.ui", com::sun::star::uno::Reference<css::frame::XFrame>()) , aImpl(this, rBase, false) @@ -124,7 +124,7 @@ class TableDesignDialog : public ModalDialog private: TableDesignWidget aImpl; public: - TableDesignDialog( ::Window* pParent, ViewShellBase& rBase ) + TableDesignDialog( vcl::Window* pParent, ViewShellBase& rBase ) : ModalDialog(pParent, "TableDesignDialog", "modules/sdraw/ui/tabledesigndialog.ui") , aImpl(this, rBase, true) @@ -133,7 +133,7 @@ public: virtual short Execute() SAL_OVERRIDE; }; -void showTableDesignDialog( ::Window*, ViewShellBase& ); +void showTableDesignDialog( vcl::Window*, ViewShellBase& ); } diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx index e7bafc546bc3..eae76b92d062 100644 --- a/sd/source/ui/tools/IdleDetection.cxx +++ b/sd/source/ui/tools/IdleDetection.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star; namespace sd { namespace tools { -sal_Int32 IdleDetection::GetIdleState (const ::Window* pWindow) +sal_Int32 IdleDetection::GetIdleState (const vcl::Window* pWindow) { sal_Int32 nResult (CheckInputPending() | CheckSlideShowRunning()); if (pWindow != NULL) @@ -93,7 +93,7 @@ sal_Int32 IdleDetection::CheckSlideShowRunning (void) return eResult; } -sal_Int32 IdleDetection::CheckWindowPainting (const ::Window& rWindow) +sal_Int32 IdleDetection::CheckWindowPainting (const vcl::Window& rWindow) { if (rWindow.IsInPaint()) return IDET_WINDOW_PAINTING; diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index 3d2cb47c0a3b..5a72e6691027 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -37,7 +37,7 @@ class FormShellManagerFactory { public: FormShellManagerFactory (ViewShell& rViewShell, FormShellManager& rManager); - virtual FmFormShell* CreateShell (ShellId nId, ::Window* pParentWindow, FrameView* pFrameView) SAL_OVERRIDE; + virtual FmFormShell* CreateShell (ShellId nId, vcl::Window* pParentWindow, FrameView* pFrameView) SAL_OVERRIDE; virtual void ReleaseShell (SfxShell* pShell) SAL_OVERRIDE; private: @@ -302,7 +302,7 @@ FormShellManagerFactory::FormShellManagerFactory ( FmFormShell* FormShellManagerFactory::CreateShell ( ::sd::ShellId nId, - ::Window*, + vcl::Window*, ::sd::FrameView*) { FmFormShell* pShell = NULL; diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 8b9676634119..ccca4876a8f2 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -104,7 +104,7 @@ public: void ProvideOutlinerView ( Outliner& rOutliner, const ::boost::shared_ptr<ViewShell>& rpViewShell, - ::Window* pWindow); + vcl::Window* pWindow); /** This method is called when the OutlinerView is no longer used. */ @@ -1582,7 +1582,7 @@ sal_uInt16 Outliner::ShowModalMessageBox (Dialog& rMessageBox) // while the message box is being shown. We also have to take into // account that we are called during a spell check and the search dialog // is not available. - ::Window* pSearchDialog = NULL; + vcl::Window* pSearchDialog = NULL; SfxChildWindow* pChildWindow = NULL; switch (meMode) { @@ -1643,7 +1643,7 @@ Outliner::Implementation::~Implementation (void) void Outliner::Implementation::ProvideOutlinerView ( Outliner& rOutliner, const ::boost::shared_ptr<ViewShell>& rpViewShell, - ::Window* pWindow) + vcl::Window* pWindow) { if (rpViewShell.get() != NULL) { diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index ae6832b33c6a..723a6d814ed7 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -139,7 +139,7 @@ public: the content window. It does not include the ViewTabBar. */ - ::boost::scoped_ptr< ::Window> mpViewWindow; + ::boost::scoped_ptr< vcl::Window> mpViewWindow; ::boost::shared_ptr<ToolBarManager> mpToolBarManager; ::boost::shared_ptr<ViewShellManager> mpViewShellManager; ::boost::shared_ptr<tools::EventMultiplexer> mpEventMultiplexer; @@ -199,10 +199,10 @@ namespace { window of the main view shell. With the key press it forwards the focus so that it is not called very often. */ -class FocusForwardingWindow : public ::Window +class FocusForwardingWindow : public vcl::Window { public: - FocusForwardingWindow (::Window& rParentWindow, ViewShellBase& rBase); + FocusForwardingWindow (vcl::Window& rParentWindow, ViewShellBase& rBase); virtual ~FocusForwardingWindow (void); virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE; virtual void Command (const CommandEvent& rEvent) SAL_OVERRIDE; @@ -955,7 +955,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB mpImpl->mpViewTabBar = rViewTabBar; } -::Window* ViewShellBase::GetViewWindow (void) +::vcl::Window* ViewShellBase::GetViewWindow (void) { OSL_ASSERT(mpImpl.get()!=NULL); @@ -1375,9 +1375,9 @@ void CurrentPageSetter::operator() (bool) namespace sd { namespace { FocusForwardingWindow::FocusForwardingWindow ( - ::Window& rParentWindow, + vcl::Window& rParentWindow, ViewShellBase& rBase) - : ::Window(&rParentWindow, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), + : vcl::Window(&rParentWindow, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), mrBase(rBase) { OSL_TRACE("created FocusForwardingWindow at %x", this); @@ -1393,7 +1393,7 @@ void FocusForwardingWindow::KeyInput (const KeyEvent& rKEvt) ::boost::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell(); if (pViewShell.get() != NULL) { - ::Window* pWindow = pViewShell->GetActiveWindow(); + vcl::Window* pWindow = pViewShell->GetActiveWindow(); if (pWindow != NULL) { // Forward the focus so that the window is called directly the @@ -1410,7 +1410,7 @@ void FocusForwardingWindow::Command (const CommandEvent& rEvent) ::boost::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell(); if (pViewShell.get() != NULL) { - ::Window* pWindow = pViewShell->GetActiveWindow(); + vcl::Window* pWindow = pViewShell->GetActiveWindow(); if (pWindow != NULL) { pWindow->Command(rEvent); diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index f52e89bb5776..d2508afe311b 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -59,7 +59,7 @@ public: ShellDescriptor (const ShellDescriptor& rDescriptor); ShellDescriptor& operator= (const ShellDescriptor& rDescriptor); bool IsMainViewShell (void) const; - ::Window* GetWindow (void) const; + ::vcl::Window* GetWindow (void) const; }; /** This functor can be used to search for a shell in an STL container when the @@ -218,7 +218,7 @@ private: ShellDescriptor CreateSubShell ( SfxShell* pShell, ShellId nShellId, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameView); void DestroyViewShell (ShellDescriptor& rDescriptor); void DestroySubShell ( @@ -417,7 +417,7 @@ void ViewShellManager::Implementation::ActivateViewShell (ViewShell* pViewShell) // window can be moved to the top of the shell stack. if (aResult.mpShell != NULL) { - ::Window* pWindow = aResult.GetWindow(); + ::vcl::Window* pWindow = aResult.GetWindow(); if (pWindow != NULL) { pWindow->AddEventListener( @@ -966,7 +966,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, { if (pEvent != NULL) { - ::Window* pEventWindow + ::vcl::Window* pEventWindow = static_cast<VclWindowEvent*>(pEvent)->GetWindow(); switch (pEvent->GetId()) @@ -977,7 +977,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, aI!=maActiveViewShells.end(); aI++) { - if (pEventWindow == static_cast< ::Window*>(aI->GetWindow())) + if (pEventWindow == static_cast< ::vcl::Window*>(aI->GetWindow())) { MoveToTop(*aI->mpShell); break; @@ -1013,7 +1013,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( SfxShell* pParentShell, ShellId nShellId, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameView) { ::osl::MutexGuard aGuard (maMutex); @@ -1050,7 +1050,7 @@ void ViewShellManager::Implementation::DestroyViewShell ( if (rDescriptor.mbIsListenerAddedToWindow) { rDescriptor.mbIsListenerAddedToWindow = false; - ::Window* pWindow = rDescriptor.GetWindow(); + ::vcl::Window* pWindow = rDescriptor.GetWindow(); if (pWindow != NULL) { pWindow->RemoveEventListener( @@ -1237,7 +1237,7 @@ bool ShellDescriptor::IsMainViewShell (void) const return false; } -::Window* ShellDescriptor::GetWindow (void) const +vcl::Window* ShellDescriptor::GetWindow (void) const { ViewShell* pViewShell = dynamic_cast<ViewShell*>(mpShell); if (pViewShell != NULL) diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 01058ddcb4ec..1cc8abaecd88 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -68,7 +68,7 @@ class TabBarControl : public ::TabControl { public: TabBarControl ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, const ::rtl::Reference<ViewTabBar>& rpViewTabBar); virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; virtual void ActivatePage (void) SAL_OVERRIDE; @@ -174,11 +174,11 @@ void ViewTabBar::disposing (void) mxController = NULL; } -::Window* ViewTabBar::GetAnchorWindow( +vcl::Window* ViewTabBar::GetAnchorWindow( const Reference<XResourceId>& rxViewTabBarId, const Reference<frame::XController>& rxController) { - ::Window* pWindow = NULL; + vcl::Window* pWindow = NULL; ViewShellBase* pBase = NULL; // Tunnel through the controller and use the ViewShellBase to obtain the @@ -559,7 +559,7 @@ void ViewTabBar::UpdateTabBarButtons (void) //===== TabBarControl ========================================================= TabBarControl::TabBarControl ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, const ::rtl::Reference<ViewTabBar>& rpViewTabBar) : ::TabControl(pParentWindow), mpViewTabBar(rpViewTabBar) diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx index 391e1c33be36..1c308f21652d 100644 --- a/sd/source/ui/view/WindowUpdater.cxx +++ b/sd/source/ui/view/WindowUpdater.cxx @@ -44,7 +44,7 @@ WindowUpdater::~WindowUpdater (void) throw () maCTLOptions.RemoveListener(this); } -void WindowUpdater::RegisterWindow (::Window* pWindow) +void WindowUpdater::RegisterWindow (vcl::Window* pWindow) { if (pWindow != NULL) { @@ -60,7 +60,7 @@ void WindowUpdater::RegisterWindow (::Window* pWindow) } } -void WindowUpdater::UnregisterWindow (::Window* pWindow) +void WindowUpdater::UnregisterWindow (vcl::Window* pWindow) { tWindowList::iterator aWindowIterator ( ::std::find ( diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx index cf0b5b1f0462..f8900caba5eb 100644 --- a/sd/source/ui/view/clview.cxx +++ b/sd/source/ui/view/clview.cxx @@ -50,7 +50,7 @@ ClientView::~ClientView() * to be overloaded and properly handled. */ -void ClientView::InvalidateOneWin(::Window& rWin) +void ClientView::InvalidateOneWin(vcl::Window& rWin) { Region aRegion; CompleteRedraw(&rWin, aRegion); @@ -61,7 +61,7 @@ void ClientView::InvalidateOneWin(::Window& rWin) * to be overloaded and properly handled. */ -void ClientView::InvalidateOneWin(::Window& rWin, const Rectangle& rRect) +void ClientView::InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect) { CompleteRedraw(&rWin, Region(rRect)); } diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 69dcb5d9b0a5..043abbbcddff 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -515,7 +515,7 @@ bool DrawView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const * Make passed region visible (scrolling if necessary) */ -void DrawView::MakeVisible(const Rectangle& rRect, ::Window& rWin) +void DrawView::MakeVisible(const Rectangle& rRect, vcl::Window& rWin) { if (!rRect.IsEmpty() && mpDrawViewShell) { diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index d754afecf0fc..ad8233ac5cc2 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -290,7 +290,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) if( pNewObj->IsLinkedGraphic() ) { - MessageDialog aQueryBox( (Window*) GetActiveWindow(),"QueryUnlinkImageDialog","modules/sdraw/ui/queryunlinkimagedialog.ui"); + MessageDialog aQueryBox( (vcl::Window*) GetActiveWindow(),"QueryUnlinkImageDialog","modules/sdraw/ui/queryunlinkimagedialog.ui"); if (RET_YES == aQueryBox.Execute()) pNewObj->ReleaseGraphicLink(); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index d183d947e817..53c73ed65f6e 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -107,7 +107,7 @@ void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventOb mpParent->ScannerEvent( rEventObject ); } -DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, PageKind ePageKind, FrameView* pFrameViewArgument ) +DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, PageKind ePageKind, FrameView* pFrameViewArgument ) : ViewShell (pFrame, pParentWindow, rViewShellBase) , maTabControl(this, pParentWindow) , mbIsLayerModeActive(false) @@ -415,7 +415,7 @@ css::uno::Reference<css::drawing::XDrawSubController> DrawViewShell::CreateSubCo return xSubController; } -bool DrawViewShell::RelocateToParentWindow (::Window* pParentWindow) +bool DrawViewShell::RelocateToParentWindow (vcl::Window* pParentWindow) { // DrawViewShells can not be relocated to a new parent window at the // moment, so return <FALSE/> except when the given parent window is the diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 373a2bcde9a3..f7999e8e0c92 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -125,7 +125,7 @@ void ImpAddPrintableCharactersToTextEdit(SfxRequest& rReq, ::sd::View* pView) for(sal_Int32 a(0); a < aInputString.getLength(); a++) { sal_Char aChar = (sal_Char)aInputString[a]; - vcl::KeyCode aKeyCode; + ::vcl::KeyCode aKeyCode; KeyEvent aKeyEvent(aChar, aKeyCode); // add actual character @@ -866,7 +866,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if (pOLV) { - vcl::KeyCode aKCode(KEY_DELETE); + ::vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode); pOLV->PostKeyEvent(aKEvt); } @@ -878,7 +878,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) } else { - vcl::KeyCode aKCode(KEY_DELETE); + ::vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode); bool bConsumed = mpDrawView && mpDrawView->getSmartTags().KeyInput( aKEvt ); diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index 70f5bccf379a..8c043e3c0ae7 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -59,7 +59,7 @@ bool DrawViewShell::GotoBookmark(const OUString& rBookmark) |* \************************************************************************/ -void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin) +void DrawViewShell::MakeVisible(const Rectangle& rRect, vcl::Window& rWin) { // In older versions, if in X or Y the size of the object was // smaller than the visible area, the user-defined zoom was diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index fcdc1da0522a..1f94f01bd8a8 100644 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx @@ -32,7 +32,7 @@ namespace sd { GraphicViewShell::GraphicViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView) : DrawViewShell ( pFrame, diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 802cadb880e7..0ad65d417d69 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -190,7 +190,7 @@ Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController (vo OutlineViewShell::OutlineViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameViewArgument) : ViewShell(pFrame, pParentWindow, rViewShellBase), pOlView(NULL), @@ -541,7 +541,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) { OutlineViewPageChangesGuard aGuard2(pOlView); - vcl::KeyCode aKCode(KEY_DELETE); + ::vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode ); pOutlView->PostKeyEvent(aKEvt); @@ -1445,7 +1445,7 @@ bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) Invalidate(SID_STYLE_FAMILY5); // check and distinguish cursor movements- or input-keys - vcl::KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() ); + ::vcl::KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() ); if( (aKeyGroup != KEYGROUP_CURSOR && aKeyGroup != KEYGROUP_FKEYS) || (GetActualPage() != pLastPage) ) { diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index d9855be75126..7b0384ea9524 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -86,7 +86,7 @@ struct SdParaAndPos TYPEINIT1( OutlineView, ::sd::View ); -OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewShell& rOutlineViewShell) +OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineViewShell& rOutlineViewShell) : ::sd::View(*rDocSh.GetDoc(), pWindow, &rOutlineViewShell) , mrOutlineViewShell(rOutlineViewShell) , mrOutliner(*mrDoc.GetOutliner(true)) @@ -279,7 +279,7 @@ void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) { bool bRemoved = false; sal_uInt16 nView = 0; - ::Window* pWindow; + vcl::Window* pWindow; while (nView < MAX_OUTLINERVIEWS && !bRemoved) { @@ -305,7 +305,7 @@ void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) /** * Return a pointer to the OutlinerView corresponding to the window */ -OutlinerView* OutlineView::GetViewByWindow (::Window* pWin) const +OutlinerView* OutlineView::GetViewByWindow (vcl::Window* pWin) const { OutlinerView* pOlView = NULL; for (sal_uInt16 nView = 0; nView < MAX_OUTLINERVIEWS; nView++) @@ -1444,7 +1444,7 @@ void OutlineView::onUpdateStyleSettings( bool bForceUpdate /* = false */ ) { mpOutlinerView[nView]->SetBackgroundColor( aDocColor ); - ::Window* pWindow = mpOutlinerView[nView]->GetWindow(); + vcl::Window* pWindow = mpOutlinerView[nView]->GetWindow(); if( pWindow ) pWindow->SetBackground( Wallpaper( aDocColor ) ); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 6454b1436115..7ac22abfa48c 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -76,7 +76,7 @@ void PresentationViewShell::InitInterface_Impl() TYPEINIT1( PresentationViewShell, DrawViewShell ); -PresentationViewShell::PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView) +PresentationViewShell::PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView) : DrawViewShell( pFrame, rViewShellBase, pParentWindow, PK_STANDARD, pFrameView) { if( GetDocSh() && GetDocSh()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 2e4006a6aaaf..2df86286e921 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -68,7 +68,7 @@ void RulerCtrlItem::StateChanged( sal_uInt16 nSId, SfxItemState, const SfxPoolIt } } -Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) +Ruler::Ruler( DrawViewShell& rViewSh, vcl::Window* pParent, ::sd::Window* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle) , pSdView(NULL) , pSdWin(pWin) diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index effd7c2f582b..2871b5baa1da 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -660,7 +660,7 @@ void OutlinerMasterViewFilter::End() } bool View::SdrBeginTextEdit( - SdrObject* pObj, SdrPageView* pPV, ::Window* pWin, + SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin, bool bIsNewObj, SdrOutliner* pOutl, OutlinerView* pGivenOutlinerView, bool bDontDeleteOutliner, bool bOnlyOneView, bool bGrabFocus ) @@ -1319,7 +1319,7 @@ void View::ChangeMarkedObjectsBulletsNumbering( const bool bSwitchOff ) { SdrModel* pSdrModel = GetModel(); - Window* pWindow = dynamic_cast< Window* >(GetFirstOutputDevice()); + vcl::Window* pWindow = dynamic_cast< vcl::Window* >(GetFirstOutputDevice()); if (!pSdrModel || !pWindow) return; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 9d754052d58a..cb986360164e 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -94,7 +94,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent {} }; -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, ::Window& ) +::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, vcl::Window& ) { // since SdTransferable::CopyToClipboard is called, this // dynamically created object ist destroyed automatically @@ -157,7 +157,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, ::Window& rWindow, const Point& rDragPos ) +::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, vcl::Window& rWindow, const Point& rDragPos ) { SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, false ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); @@ -206,7 +206,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, ::Window& rWindow ) +::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, vcl::Window& rWindow ) { SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, true ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); @@ -245,7 +245,7 @@ void View::UpdateSelectionClipboard( bool bForceDeselect ) } } -void View::DoCut(::Window* ) +void View::DoCut(vcl::Window* ) { const OutlinerView* pOLV = GetTextEditOutlinerView(); @@ -262,7 +262,7 @@ void View::DoCut(::Window* ) } } -void View::DoCopy (::Window* pWindow) +void View::DoCopy (vcl::Window* pWindow) { const OutlinerView* pOLV = GetTextEditOutlinerView(); @@ -275,7 +275,7 @@ void View::DoCopy (::Window* pWindow) } } -void View::DoPaste (::Window* pWindow) +void View::DoPaste (vcl::Window* pWindow) { TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( mpViewSh->GetActiveWindow() ) ); if( !aDataHelper.GetTransferable().is() ) @@ -354,7 +354,7 @@ void View::DoPaste (::Window* pWindow) } } -void View::StartDrag( const Point& rStartPos, ::Window* pWindow ) +void View::StartDrag( const Point& rStartPos, vcl::Window* pWindow ) { if( AreObjectsMarked() && IsAction() && mpViewSh && pWindow && !mpDragSrcMarkList ) { diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 6e26ba91747e..b9af542b4354 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -50,8 +50,8 @@ namespace sd { #define MIN_ZOOM 5 ///< minimal zoom factor #define MAX_ZOOM 3000 ///< maximal zoom factor -Window::Window(::Window* pParent) - : ::Window(pParent, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), +Window::Window(vcl::Window* pParent) + : vcl::Window(pParent, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), DropTargetHelper( this ), mpShareWin(NULL), maWinPos(0, 0), // precautionary; but the values should be set @@ -74,7 +74,7 @@ Window::Window(::Window* pParent) aMap.SetMapUnit(MAP_100TH_MM); SetMapMode(aMap); - // whit it, the ::WindowColor is used in the slide mode + // whit it, the vcl::WindowColor is used in the slide mode SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetWindowColor() ) ); // adjust contrast mode initially @@ -192,7 +192,7 @@ long Window::GetZoom (void) const void Window::Resize() { - ::Window::Resize(); + vcl::Window::Resize(); CalcMinZoom(); if( mpViewShell && mpViewShell->GetViewFrame() ) @@ -221,7 +221,7 @@ void Window::KeyInput(const KeyEvent& rKEvt) } else { - ::Window::KeyInput(rKEvt); + vcl::Window::KeyInput(rKEvt); } } } @@ -260,7 +260,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) nResult = mpViewShell->Notify(rNEvt, this); } if( !nResult ) - nResult = ::Window::Notify( rNEvt ); + nResult = vcl::Window::Notify( rNEvt ); return nResult; } @@ -270,10 +270,10 @@ void Window::RequestHelp(const HelpEvent& rEvt) if ( mpViewShell ) { if( !mpViewShell->RequestHelp( rEvt, this) ) - ::Window::RequestHelp( rEvt ); + vcl::Window::RequestHelp( rEvt ); } else - ::Window::RequestHelp( rEvt ); + vcl::Window::RequestHelp( rEvt ); } /** @@ -699,7 +699,7 @@ double Window::GetScrlPageHeight() void Window::LoseFocus() { mnTicks = 0; - ::Window::LoseFocus (); + vcl::Window::LoseFocus (); } /** @@ -708,12 +708,12 @@ void Window::LoseFocus() void Window::GrabFocus() { mnTicks = 0; - ::Window::GrabFocus (); + vcl::Window::GrabFocus (); } void Window::DataChanged( const DataChangedEvent& rDCEvt ) { - ::Window::DataChanged( rDCEvt ); + vcl::Window::DataChanged( rDCEvt ); /* Omit PRINTER by all documents which are not using a printer. Omit FONTS and FONTSUBSTITUTION if no text output is available or if the @@ -930,7 +930,7 @@ void Window::DropScroll(const Point& rMousePos) // If current viewshell is PresentationViewShell, just return empty because the correct ShowWin will be created later. if (mpViewShell && mpViewShell->ISA(PresentationViewShell)) { - return ::Window::CreateAccessible (); + return vcl::Window::CreateAccessible (); } ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(false); if (xAcc.get()) @@ -946,7 +946,7 @@ void Window::DropScroll(const Point& rMousePos) else { OSL_TRACE ("::sd::Window::CreateAccessible: no view shell"); - return ::Window::CreateAccessible (); + return vcl::Window::CreateAccessible (); } } diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 92896b965821..45e395d76552 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -63,7 +63,7 @@ void TabControl::TabControlTransferable::DragFinished( sal_Int8 nDropAction ) mrParent.DragFinished( nDropAction ); } -TabControl::TabControl(DrawViewShell* pViewSh, Window* pParent) : +TabControl::TabControl(DrawViewShell* pViewSh, vcl::Window* pParent) : TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_SIZEABLE | WB_DRAG) ), DragSourceHelper( this ), DropTargetHelper( this ), diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index ec952a8e0cfe..3cd27c9f5eab 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -201,7 +201,7 @@ void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) OUString aHelpText( aResId ); Rectangle aScreenRect( pDev->LogicToPixel( GetPos() ), maImageSize ); - mnTip = Help::ShowTip( static_cast< ::Window* >( pHdlList->GetView()->GetFirstOutputDevice() ), aScreenRect, aHelpText, 0 ) ; + mnTip = Help::ShowTip( static_cast< vcl::Window* >( pHdlList->GetView()->GetFirstOutputDevice() ), aScreenRect, aHelpText, 0 ) ; } Touch(); } diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 9cc670bb992e..258bc88f9415 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -95,7 +95,7 @@ public: virtual ~ViewShellObjectBarFactory (void); virtual SfxShell* CreateShell ( ::sd::ShellId nId, - ::Window* pParentWindow, + vcl::Window* pParentWindow, ::sd::FrameView* pFrameView) SAL_OVERRIDE; virtual void ReleaseShell (SfxShell* pShell) SAL_OVERRIDE; private: @@ -133,7 +133,7 @@ SfxViewFrame* ViewShell::GetViewFrame (void) const /// declare SFX-Slotmap and standard interface TYPEINIT1(ViewShell, SfxShell); -ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter) +ViewShell::ViewShell( SfxViewFrame*, vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter) : SfxShell(&rViewShellBase) , mbCenterAllowed(bAllowCenter) , mpParentWindow(pParentWindow) @@ -237,7 +237,7 @@ void ViewShell::construct(void) void ViewShell::doShow(void) { mpContentWindow->Show(); - static_cast< ::Window*>(mpContentWindow.get())->Resize(); + static_cast< vcl::Window*>(mpContentWindow.get())->Resize(); OSL_TRACE("content window has size %d %d", mpContentWindow->GetSizePixel().Width(), mpContentWindow->GetSizePixel().Height()); @@ -1400,7 +1400,7 @@ void ViewShell::ShowUIControls (bool bVisible) mpContentWindow->Show( bVisible ); } -bool ViewShell::RelocateToParentWindow (::Window* pParentWindow) +bool ViewShell::RelocateToParentWindow (vcl::Window* pParentWindow) { mpParentWindow = pParentWindow; @@ -1472,7 +1472,7 @@ ViewShellObjectBarFactory::~ViewShellObjectBarFactory (void) SfxShell* ViewShellObjectBarFactory::CreateShell ( ::sd::ShellId nId, - ::Window*, + vcl::Window*, ::sd::FrameView* ) { SfxShell* pShell = NULL; diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx index 60c575405f45..0c2aa9048746 100644 --- a/sfx2/inc/guisaveas.hxx +++ b/sfx2/inc/guisaveas.hxx @@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star { } } } } -class Window; +namespace vcl { class Window; } class ModelData_Impl; class SfxStoringHelper @@ -82,7 +82,7 @@ public: const OUString& aDefUIName, bool bCanProceedFurther ); - static Window* GetModelWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); + static vcl::Window* GetModelWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); }; diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index a0447b480be4..9bcfe6aeed57 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -53,7 +53,7 @@ public: SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); virtual ~SfxURLToolBoxControl_Impl(); - virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; }; diff --git a/sfx2/inc/sidebar/PopupContainer.hxx b/sfx2/inc/sidebar/PopupContainer.hxx index 92eafe9a3256..764b9af1cea7 100644 --- a/sfx2/inc/sidebar/PopupContainer.hxx +++ b/sfx2/inc/sidebar/PopupContainer.hxx @@ -27,7 +27,7 @@ namespace sfx2 { namespace sidebar { class SFX2_DLLPUBLIC PopupContainer : public FloatingWindow { public: - PopupContainer (Window* pParent); + PopupContainer (vcl::Window* pParent); virtual ~PopupContainer (void); virtual long Notify (NotifyEvent& rNEvt); diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index 40b18f84017a..f846a5267dbf 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -58,7 +58,7 @@ private: DECL_LINK(FindHdl, void *); public: - SearchDialog( Window* pWindow, const OUString& rConfigName ); + SearchDialog( vcl::Window* pWindow, const OUString& rConfigName ); virtual ~SearchDialog(); void SetFindHdl( const Link& rLink ) { m_aFindHdl = rLink; } diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 72e2a0f6e48b..0516b0bc9d2d 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -419,7 +419,7 @@ void SfxApplication::ReleaseIndex(sal_uInt16 i) -Window* SfxApplication::GetTopWindow() const +vcl::Window* SfxApplication::GetTopWindow() const { SfxWorkWindow* pWork = GetWorkWindow_Impl( SfxViewFrame::Current() ); return pWork ? pWork->GetWindow() : NULL; diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 862c76ba3d0e..1d92c5e71e0d 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -153,7 +153,7 @@ Sequence< OUString > SAL_CALL SfxTerminateListener_Impl::getSupportedServiceName -typedef bool ( *PFunc_getSpecialCharsForEdit)( Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString ); +typedef bool ( *PFunc_getSpecialCharsForEdit)( vcl::Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString ); // Lazy binding of the GetSpecialCharsForEdit function as it resides in @@ -166,11 +166,11 @@ extern "C" { static void SAL_CALL thisModule() {} } #else -extern "C" bool GetSpecialCharsForEdit( Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString ); +extern "C" bool GetSpecialCharsForEdit( vcl::Window* i_pParent, const vcl::Font& i_rFont, OUString& o_rOutString ); #endif -OUString GetSpecialCharsForEdit(Window* pParent, const vcl::Font& rFont) +OUString GetSpecialCharsForEdit(vcl::Window* pParent, const vcl::Font& rFont) { static bool bDetermineFunction = false; static PFunc_getSpecialCharsForEdit pfunc_getSpecialCharsForEdit = 0; diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 7bc992a85ca9..22908faf7a7f 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -220,7 +220,7 @@ sal_uInt32 CheckPasswd_Impl if ( bIsEncrypted ) { - Window* pWin = pDoc ? pDoc->GetDialogParent( pFile ) : NULL; + vcl::Window* pWin = pDoc ? pDoc->GetDialogParent( pFile ) : NULL; if ( pWin ) pWin->Show(); @@ -461,7 +461,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) if ( !pTemplNameItem && !pTemplFileNameItem ) { bool bNewWin = false; - Window* pTopWin = GetTopWindow(); + vcl::Window* pTopWin = GetTopWindow(); SfxTemplateManagerDlg aTemplDlg; int nRet = aTemplDlg.Execute(); @@ -830,7 +830,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) if ( eMode == SvtExtendedSecurityOptions::OPEN_NEVER && aINetProtocol != INET_PROT_VND_SUN_STAR_HELP ) { SolarMutexGuard aGuard; - Window *pWindow = SfxGetpApp()->GetTopWindow(); + vcl::Window *pWindow = SfxGetpApp()->GetTopWindow(); MessageDialog aSecurityWarningBox(pWindow, SfxResId(STR_SECURITY_WARNING_NO_HYPERLINKS), diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 7fcb63c9c470..7798695bbbfc 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -237,10 +237,10 @@ namespace private: DECL_LINK(ShowHdl, void *); public: - LicenseDialog(Window *pParent=NULL); + LicenseDialog(vcl::Window *pParent=NULL); }; - LicenseDialog::LicenseDialog(Window *pParent) + LicenseDialog::LicenseDialog(vcl::Window *pParent) : ModalDialog(pParent, "LicenseDialog", "sfx/ui/licensedialog.ui") { get<PushButton>("show")->SetClickHdl(LINK(this, LicenseDialog, ShowHdl)); @@ -885,7 +885,7 @@ ResMgr* SfxApplication::GetOffResManager_Impl() namespace { #ifndef DISABLE_SCRIPTING - Window* lcl_getDialogParent( const Reference< XFrame >& _rxFrame, Window* _pFallback ) + vcl::Window* lcl_getDialogParent( const Reference< XFrame >& _rxFrame, vcl::Window* _pFallback ) { if ( !_rxFrame.is() ) return _pFallback; @@ -893,7 +893,7 @@ namespace try { Reference< awt::XWindow > xContainerWindow( _rxFrame->getContainerWindow(), UNO_SET_THROW ); - Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xContainerWindow ); OSL_ENSURE( pWindow, "lcl_getDialogParent: cool, somebody implemented a VCL-less toolkit!" ); if ( pWindow ) @@ -1208,7 +1208,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) OUString aLang( aLanguage ); OSL_TRACE("SfxApplication::OfaExec_Impl: about to create dialog for: %s", OUStringToOString( aLang , RTL_TEXTENCODING_ASCII_US ).pData->buffer); - // not sure about the Window* + // not sure about the vcl::Window* VclAbstractDialog* pDlg = pFact->CreateSvxScriptOrgDialog( GetTopWindow(), aLanguage ); if( pDlg ) { diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index cc56952b40a4..65d887456b0c 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -142,7 +142,7 @@ bool GetSplitSizeFromString( const OUString& rStr, Size& rSize ) } -SfxChildWindow::SfxChildWindow(Window *pParentWindow, sal_uInt16 nId) +SfxChildWindow::SfxChildWindow(vcl::Window *pParentWindow, sal_uInt16 nId) : pParent(pParentWindow) , nType(nId) , eChildAlignment(SFX_ALIGN_NOALIGNMENT) @@ -191,7 +191,7 @@ SfxChildWindow::~SfxChildWindow() SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId, - Window *pParent, SfxBindings* pBindings, SfxChildWinInfo& rInfo) + vcl::Window *pParent, SfxBindings* pBindings, SfxChildWinInfo& rInfo) { SfxChildWindow *pChild=0; SfxChildWinFactory* pFact=0; @@ -510,7 +510,7 @@ SfxChildWindowContext::~SfxChildWindowContext() FloatingWindow* SfxChildWindowContext::GetFloatingWindow() const { - Window *pParent = pWindow->GetParent(); + vcl::Window *pParent = pWindow->GetParent(); if (pParent->GetType() == WINDOW_DOCKINGWINDOW || pParent->GetType() == WINDOW_TOOLBOX) { return ((DockingWindow*)pParent)->GetFloatingWindow(); @@ -673,7 +673,7 @@ void SfxChildWindow::Show( sal_uInt16 nFlags ) } } -Window* SfxChildWindow::GetContextWindow( SfxModule *pModule ) const +vcl::Window* SfxChildWindow::GetContextWindow( SfxModule *pModule ) const { return pModule == pImp->pContextModule && pContext ? pContext->GetWindow(): 0; } diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index e123285cbd03..88761455b147 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -388,7 +388,7 @@ OUString impl_getFilter( const OUString& _rURL ) return sFilter; } -void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& rEndEditHdl ) +void SvFileObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pLink, const Link& rEndEditHdl ) { aEndEditLink = rEndEditHdl; OUString sFile, sRange, sTmpFilter; diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index d43e1ebe52e3..78aa1fb4cef4 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -33,7 +33,7 @@ class SvFileObject : public sfx2::SvLinkSource OUString sReferer; Link aEndEditLink; SfxMediumRef xMed; - Window* pOldParent; + vcl::Window* pOldParent; sal_uInt8 nType; @@ -67,7 +67,7 @@ public: bool bSynchron = false ) SAL_OVERRIDE; virtual bool Connect( sfx2::SvBaseLink* ) SAL_OVERRIDE; - virtual void Edit( Window *, sfx2::SvBaseLink *, const Link& rEndEditHdl ) SAL_OVERRIDE; + virtual void Edit( vcl::Window *, sfx2::SvBaseLink *, const Link& rEndEditHdl ) SAL_OVERRIDE; // Ask whether you can access data directly or whether it has to be triggered virtual bool IsPending() const SAL_OVERRIDE; diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index cf34acc42348..8da693405450 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -64,11 +64,11 @@ class SvDDELinkEditDialog : public ModalDialog DECL_STATIC_LINK( SvDDELinkEditDialog, EditHdl_Impl, Edit* ); public: - SvDDELinkEditDialog( Window* pParent, SvBaseLink* ); + SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* ); OUString GetCmd() const; }; -SvDDELinkEditDialog::SvDDELinkEditDialog( Window* pParent, SvBaseLink* pLink ) +SvDDELinkEditDialog::SvDDELinkEditDialog( vcl::Window* pParent, SvBaseLink* pLink ) : ModalDialog( pParent, "LinkEditDialog", "sfx/ui/linkeditdialog.ui" ) { get(m_pOKButton, "ok"); @@ -253,7 +253,7 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink ) return true; } -void SvDDEObject::Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) +void SvDDEObject::Edit( vcl::Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) { SvDDELinkEditDialog aDlg( pParent, pBaseLink ); if ( RET_OK == aDlg.Execute() && rEndEditHdl.IsSet() ) diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx index 53810ab97c0f..00952d391b55 100644 --- a/sfx2/source/appl/impldde.hxx +++ b/sfx2/source/appl/impldde.hxx @@ -59,7 +59,7 @@ public: bool bSynchron = false ) SAL_OVERRIDE; virtual bool Connect( SvBaseLink * ) SAL_OVERRIDE; - virtual void Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) SAL_OVERRIDE; + virtual void Edit( vcl::Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) SAL_OVERRIDE; virtual bool IsPending() const SAL_OVERRIDE; virtual bool IsDataComplete() const SAL_OVERRIDE; diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index c5e38888f4cc..43673a0c5746 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -288,7 +288,7 @@ void LinkManager::UpdateAllLinks( bool bAskUpdate, bool /*bCallErrHdl*/, bool bUpdateGrfLinks, - Window* pParentWin ) + vcl::Window* pParentWin ) { // First make a copy of the array in order to update links // links in ... no contact between them! diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx index b5b6548ee843..8b8ee278fa3e 100644 --- a/sfx2/source/appl/linksrc.cxx +++ b/sfx2/source/appl/linksrc.cxx @@ -423,7 +423,7 @@ bool SvLinkSource::GetData( ::com::sun::star::uno::Any &, const OUString &, bool return false; } -void SvLinkSource::Edit( Window *, SvBaseLink *, const Link& ) +void SvLinkSource::Edit( vcl::Window *, SvBaseLink *, const Link& ) { } diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 81f960b6040d..cc1cdfcbd478 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -48,7 +48,7 @@ struct BaseLink_Impl { Link m_aEndEditLink; LinkManager* m_pLinkMgr; - Window* m_pParentWin; + vcl::Window* m_pParentWin; FileDialogHelper* m_pFileDlg; bool m_bIsConnect; @@ -435,7 +435,7 @@ SvBaseLink::UpdateResult SvBaseLink::DataChanged( const OUString &, const ::com: return SUCCESS; } -void SvBaseLink::Edit( Window* pParent, const Link& rEndEditHdl ) +void SvBaseLink::Edit( vcl::Window* pParent, const Link& rEndEditHdl ) { pImpl->m_pParentWin = pParent; pImpl->m_aEndEditLink = rEndEditHdl; diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 3c783fe5cbf3..e1c4382e4eac 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -299,7 +299,7 @@ ImageList* SfxModule::GetImageList_Impl( bool bBig ) return pImpl->GetImageList( pResMgr, bBig ); } -SfxTabPage* SfxModule::CreateTabPage( sal_uInt16, Window*, const SfxItemSet& ) +SfxTabPage* SfxModule::CreateTabPage( sal_uInt16, vcl::Window*, const SfxItemSet& ) { return NULL; } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 8210a3a82bbb..7df7d962b770 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -175,9 +175,9 @@ namespace sfx2 { - void HandleTaskPaneList( Window* pWindow, bool bAddToList ) + void HandleTaskPaneList( vcl::Window* pWindow, bool bAddToList ) { - Window* pParent = pWindow->GetParent(); + vcl::Window* pParent = pWindow->GetParent(); DBG_ASSERT( pParent, "HandleTaskPaneList(): every window here should have a parent" ); SystemWindow* pSysWin = pParent->GetSystemWindow(); @@ -271,7 +271,7 @@ struct ContentEntry_Impl // ContentListBox_Impl --------------------------------------------------- -ContentListBox_Impl::ContentListBox_Impl(Window* pParent, WinBits nStyle) +ContentListBox_Impl::ContentListBox_Impl(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) , aOpenBookImage(SfxResId(IMG_HELP_CONTENT_BOOK_OPEN)) , aClosedBookImage(SfxResId(IMG_HELP_CONTENT_BOOK_CLOSED)) @@ -291,7 +291,7 @@ ContentListBox_Impl::ContentListBox_Impl(Window* pParent, WinBits nStyle) InitRoot(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeContentListBox(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeContentListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; @@ -419,7 +419,7 @@ OUString ContentListBox_Impl::GetSelectEntry() const } // class HelpTabPage_Impl ------------------------------------------------ -HelpTabPage_Impl::HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, +HelpTabPage_Impl::HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, const OString& rID, const OUString& rUIXMLDescription) : TabPage( pParent, rID, rUIXMLDescription) , m_pIdxWin( _pIdxWin ) @@ -427,7 +427,7 @@ HelpTabPage_Impl::HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pI } // class ContentTabPage_Impl --------------------------------------------- -ContentTabPage_Impl::ContentTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) +ContentTabPage_Impl::ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) : HelpTabPage_Impl(pParent, _pIdxWin, "HelpContentPage", "sfx/ui/helpcontentpage.ui") { @@ -450,14 +450,14 @@ Control* ContentTabPage_Impl::GetLastFocusControl() // class IndexBox_Impl --------------------------------------------------- -IndexBox_Impl::IndexBox_Impl(Window* pParent, WinBits nStyle) +IndexBox_Impl::IndexBox_Impl(vcl::Window* pParent, WinBits nStyle) : ComboBox(pParent, nStyle) { EnableAutocomplete(true); EnableUserDraw(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeIndexBox(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeIndexBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; @@ -525,7 +525,7 @@ void IndexBox_Impl::SelectExecutableEntry() // class IndexTabPage_Impl ----------------------------------------------- -IndexTabPage_Impl::IndexTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) +IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) : HelpTabPage_Impl(pParent, _pIdxWin, "HelpIndexPage", "sfx/ui/helpindexpage.ui") , bIsActivated(false) @@ -836,7 +836,7 @@ void IndexTabPage_Impl::OpenKeyword() // class SearchBox_Impl -------------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSearchBox(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSearchBox(vcl::Window *pParent, VclBuilder::stringmap &) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_DROPDOWN; @@ -869,7 +869,7 @@ void SearchBox_Impl::Select() // class SearchResultsBox_Impl ------------------------------------------- -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSearchResultsBox(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSearchResultsBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; @@ -896,7 +896,7 @@ bool SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt ) // class SearchTabPage_Impl ---------------------------------------------- -SearchTabPage_Impl::SearchTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) +SearchTabPage_Impl::SearchTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) : HelpTabPage_Impl(pParent, _pIdxWin, "HelpSearchPage", "sfx/ui/helpsearchpage.ui") , xBreakIterator(vcl::unohelper::CreateBreakIterator()) @@ -1119,12 +1119,12 @@ void GetBookmarkEntry_Impl } } -BookmarksBox_Impl::BookmarksBox_Impl(Window* pParent, WinBits nStyle) +BookmarksBox_Impl::BookmarksBox_Impl(vcl::Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBookmarksBox(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBookmarksBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; @@ -1241,7 +1241,7 @@ bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) // class BookmarksTabPage_Impl ------------------------------------------- -BookmarksTabPage_Impl::BookmarksTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) +BookmarksTabPage_Impl::BookmarksTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin) : HelpTabPage_Impl(pParent, _pIdxWin, "HelpBookmarkPage", "sfx/ui/helpbookmarkpage.ui") { @@ -1573,7 +1573,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl) void SfxHelpIndexWindow_Impl::Resize() { - Window *pChild = GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); if (!pChild) return; VclContainer::setLayoutAllocation(*pChild, Point(0,0), GetSizePixel()); @@ -1581,7 +1581,7 @@ void SfxHelpIndexWindow_Impl::Resize() Size SfxHelpIndexWindow_Impl::GetOptimalSize() const { - const Window *pChild = GetWindow(WINDOW_FIRSTCHILD); + const vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); if (!pChild) return Window::GetOptimalSize(); return VclContainer::getLayoutRequisition(*pChild); @@ -1798,7 +1798,7 @@ void SfxHelpIndexWindow_Impl::SelectExecutableEntry() // class TextWin_Impl ---------------------------------------------------- -TextWin_Impl::TextWin_Impl( Window* p ) : DockingWindow( p, 0 ) +TextWin_Impl::TextWin_Impl( vcl::Window* p ) : DockingWindow( p, 0 ) { } @@ -2320,7 +2320,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) if ( EVENT_COMMAND == nType && rNEvt.GetCommandEvent() ) { const CommandEvent* pCmdEvt = rNEvt.GetCommandEvent(); - Window* pCmdWin = rNEvt.GetWindow(); + vcl::Window* pCmdWin = rNEvt.GetWindow(); if ( pCmdEvt->GetCommand() == COMMAND_CONTEXTMENU && pCmdWin != this && pCmdWin != &aToolBox ) { @@ -2660,7 +2660,7 @@ void SfxHelpWindow_Impl::MakeLayout() { if ( nHeight > 0 && xWindow.is() ) { - Window* pScreenWin = VCLUnoHelper::GetWindow(xWindow); + vcl::Window* pScreenWin = VCLUnoHelper::GetWindow(xWindow); /* #i55528# Hide() / Show() will produce strange effects. @@ -2787,7 +2787,7 @@ void SfxHelpWindow_Impl::SaveConfig() aUserData += ";"; aUserData += OUString::number( nH ); - Window* pScreenWin = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pScreenWin = VCLUnoHelper::GetWindow( xWindow ); aWinPos = pScreenWin->GetWindowExtentsRelative( NULL ).TopLeft(); aUserData += ";"; aUserData += OUString::number( aWinPos.X() ); @@ -2948,7 +2948,7 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL , SfxHelpWindow_Impl::SfxHelpWindow_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame, - Window* pParent, WinBits ) : + vcl::Window* pParent, WinBits ) : SplitWindow( pParent, WB_3DLOOK | WB_NOSPLITDRAW ), @@ -2991,7 +2991,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl( SfxHelpWindow_Impl::~SfxHelpWindow_Impl() { SaveConfig(); - Window* pDel = pIndexWin; + vcl::Window* pDel = pIndexWin; pIndexWin = NULL; delete pDel; @@ -3195,7 +3195,7 @@ bool SfxHelpWindow_Impl::HasHistorySuccessor() const // class SfxAddHelpBookmarkDialog_Impl ----------------------------------- -SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(Window* pParent, bool bRename) +SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(vcl::Window* pParent, bool bRename) : ModalDialog( pParent, "BookmarkDialog", "sfx/ui/bookmarkdialog.ui") { get(m_pTitleED, "entry"); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 01dfbb8922b1..46016d9eab1c 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -57,7 +57,7 @@ private: void ClearChildren( SvTreeListEntry* pParent ); public: - ContentListBox_Impl(Window* pParent, WinBits nStyle); + ContentListBox_Impl(vcl::Window* pParent, WinBits nStyle); virtual ~ContentListBox_Impl(); @@ -78,7 +78,7 @@ protected: SfxHelpIndexWindow_Impl* m_pIdxWin; public: - HelpTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, + HelpTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin, const OString& rID, const OUString& rUIXMLDescription); virtual Control* GetLastFocusControl() = 0; @@ -92,7 +92,7 @@ private: ContentListBox_Impl* m_pContentBox; public: - ContentTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin); + ContentTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin); virtual void ActivatePage() SAL_OVERRIDE; virtual Control* GetLastFocusControl() SAL_OVERRIDE; @@ -107,7 +107,7 @@ public: class IndexBox_Impl : public ComboBox { public: - IndexBox_Impl(Window* pParent, WinBits nStyle); + IndexBox_Impl(vcl::Window* pParent, WinBits nStyle); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -137,7 +137,7 @@ private: DECL_LINK( TimeoutHdl, Timer* ); public: - IndexTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); + IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); virtual ~IndexTabPage_Impl(); virtual void ActivatePage() SAL_OVERRIDE; @@ -167,7 +167,7 @@ private: Link aSearchLink; public: - SearchBox_Impl(Window* pParent, WinBits nStyle) + SearchBox_Impl(vcl::Window* pParent, WinBits nStyle) : ComboBox(pParent, nStyle) { SetDropDownLineCount(5); @@ -182,7 +182,7 @@ public: class SearchResultsBox_Impl : public ListBox { public: - SearchResultsBox_Impl(Window* pParent, WinBits nStyle) + SearchResultsBox_Impl(vcl::Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) { } @@ -213,7 +213,7 @@ private: DECL_LINK(ModifyHdl, void *); public: - SearchTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); + SearchTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); virtual ~SearchTabPage_Impl(); virtual void ActivatePage() SAL_OVERRIDE; @@ -238,7 +238,7 @@ private: void DoAction( sal_uInt16 nAction ); public: - BookmarksBox_Impl(Window* pParent, WinBits nStyle); + BookmarksBox_Impl(vcl::Window* pParent, WinBits nStyle); virtual ~BookmarksBox_Impl(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -253,7 +253,7 @@ private: DECL_LINK(OpenHdl, void *); public: - BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); + BookmarksTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); virtual void ActivatePage() SAL_OVERRIDE; virtual Control* GetLastFocusControl() SAL_OVERRIDE; @@ -268,7 +268,7 @@ public: class SfxHelpWindow_Impl; -class SfxHelpIndexWindow_Impl : public Window, public VclBuilderContainer +class SfxHelpIndexWindow_Impl : public vcl::Window, public VclBuilderContainer { private: ListBox* m_pActiveLB; @@ -389,7 +389,7 @@ bool SfxHelpIndexWindow_Impl::WasCursorLeftOrRight() class TextWin_Impl : public DockingWindow { public: - TextWin_Impl( Window* pParent ); + TextWin_Impl( vcl::Window* pParent ); virtual ~TextWin_Impl(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -400,7 +400,7 @@ public: class SvtMiscOptions; class SfxHelpWindow_Impl; -class SfxHelpTextWindow_Impl : public Window +class SfxHelpTextWindow_Impl : public vcl::Window { private: ToolBox aToolBox; @@ -415,7 +415,7 @@ private: OUString sCurrentFactory; SfxHelpWindow_Impl* pHelpWin; - Window* pTextWin; + vcl::Window* pTextWin; sfx2::SearchDialog* pSrchDlg; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > xFrame; @@ -516,7 +516,7 @@ friend class SfxHelpIndexWindow_Impl; public: SfxHelpWindow_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame, - Window* pParent, WinBits nBits ); + vcl::Window* pParent, WinBits nBits ); virtual ~SfxHelpWindow_Impl(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -557,7 +557,7 @@ class SfxAddHelpBookmarkDialog_Impl : public ModalDialog private: Edit* m_pTitleED; public: - SfxAddHelpBookmarkDialog_Impl( Window* pParent, bool bRename = true ); + SfxAddHelpBookmarkDialog_Impl( vcl::Window* pParent, bool bRename = true ); void SetTitle( const OUString& rTitle ); OUString GetTitle() const { return m_pTitleED->GetText(); } diff --git a/sfx2/source/appl/panelist.hxx b/sfx2/source/appl/panelist.hxx index 5e1ed0e97c69..a10360336635 100644 --- a/sfx2/source/appl/panelist.hxx +++ b/sfx2/source/appl/panelist.hxx @@ -26,15 +26,15 @@ namespace sfx2 { // source in newhelp.cxx - void HandleTaskPaneList( Window* pWindow, bool bAddToList ); + void HandleTaskPaneList( vcl::Window* pWindow, bool bAddToList ); // pWindow: just a system window or something which is child of a system window - inline void AddToTaskPaneList( Window* pWindowToBeHandled ) + inline void AddToTaskPaneList( vcl::Window* pWindowToBeHandled ) { HandleTaskPaneList( pWindowToBeHandled, true ); } - inline void RemoveFromTaskPaneList( Window* pWindowToBeHandled ) + inline void RemoveFromTaskPaneList( vcl::Window* pWindowToBeHandled ) { HandleTaskPaneList( pWindowToBeHandled, false ); } diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 94ed20d45e3b..fa14e7dd5f1f 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -79,12 +79,12 @@ using namespace ::com::sun::star::system; class NoHelpErrorBox : public MessageDialog { public: - NoHelpErrorBox( Window* _pParent ); + NoHelpErrorBox( vcl::Window* _pParent ); virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; }; -NoHelpErrorBox::NoHelpErrorBox( Window* _pParent ) +NoHelpErrorBox::NoHelpErrorBox( vcl::Window* _pParent ) : MessageDialog(_pParent, SfxResId(RID_STR_HLPFILENOTEXIST)) { // Error message: "No help available" @@ -403,7 +403,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask , // create all internal windows and sub frames ... Reference< ::com::sun::star::awt::XWindow > xParentWindow = xHelpTask->getContainerWindow(); - Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); SfxHelpWindow_Impl* pHelpWindow = new SfxHelpWindow_Impl( xHelpTask, pParentWindow, WB_DOCKBORDER ); Reference< ::com::sun::star::awt::XWindow > xHelpWindow = VCLUnoHelper::GetInterface( pHelpWindow ); @@ -441,7 +441,7 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >& rHelpTask , return pHelpWindow; } -OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const Window* pWindow ) +OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const vcl::Window* pWindow ) { OUString sModuleName = GetHelpModuleName_Impl(); OUString sHelpText = SfxHelp_Impl::GetHelpText( aCommandURL, sModuleName ); @@ -451,7 +451,7 @@ OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const Window* pWindo if (pWindow && sHelpText.isEmpty()) { // no help text found -> try with parent help id. - Window* pParent = pWindow->GetParent(); + vcl::Window* pParent = pWindow->GetParent(); while ( pParent ) { aNewHelpId = pParent->GetHelpId(); @@ -498,7 +498,7 @@ bool SfxHelp::SearchKeyword( const OUString& rKeyword ) return Start_Impl( OUString(), NULL, rKeyword ); } -bool SfxHelp::Start( const OUString& rURL, const Window* pWindow ) +bool SfxHelp::Start( const OUString& rURL, const vcl::Window* pWindow ) { return Start_Impl( rURL, pWindow, OUString() ); } @@ -527,7 +527,7 @@ static bool impl_showOnlineHelp( const OUString& rURL ) return false; } -bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUString& rKeyword) +bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const OUString& rKeyword) { OUStringBuffer aHelpRootURL("vnd.sun.star.help://"); AppendConfigToken(aHelpRootURL, true); @@ -563,7 +563,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUSt if ( impl_hasHelpInstalled() && pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) { // no help found -> try with parent help id. - Window* pParent = pWindow->GetParent(); + vcl::Window* pParent = pWindow->GetParent(); bool bTriedTabPage = false; while ( pParent ) { @@ -590,7 +590,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUSt Dialog *pDialog = ((Dialog*)pParent); TabControl *pCtrl = pDialog->hasBuilder() ? pDialog->get<TabControl>("tabcontrol") : NULL; TabPage* pTabPage = pCtrl ? pCtrl->GetTabPage(pCtrl->GetCurPageId()) : NULL; - Window *pTabChild = pTabPage ? pTabPage->GetWindow(WINDOW_FIRSTCHILD) : NULL; + vcl::Window *pTabChild = pTabPage ? pTabPage->GetWindow(WINDOW_FIRSTCHILD) : NULL; if (pTabChild) pParent = pTabChild; } @@ -606,7 +606,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUSt if ( impl_showOnlineHelp( aHelpURL ) ) return true; - NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) ); + NoHelpErrorBox aErrBox( const_cast< vcl::Window* >( pWindow ) ); aErrBox.Execute(); return false; } diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index b1f73b57d731..332c32b7c3bd 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -541,7 +541,7 @@ void SfxWorkWindow::Sort_Impl() // constructor for workwin of a Frame -SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFrame* pMaster ) +SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( vcl::Window *pWin, SfxFrame *pFrm, SfxFrame* pMaster ) : SfxWorkWindow( pWin, pFrm->GetCurrentViewFrame()->GetBindings(), @@ -579,7 +579,7 @@ SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFra // Constructor of the base class -SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pParentWorkwin ) : +SfxWorkWindow::SfxWorkWindow( vcl::Window *pWin, SfxBindings& rB, SfxWorkWindow* pParentWorkwin ) : pParent( pParentWorkwin ), pBindings(&rB), pWorkWin (pWin), @@ -964,7 +964,7 @@ bool SfxWorkWindow::PrepareClose_Impl() -SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow, +SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( vcl::Window& rWindow, SfxChildAlignment eAlign, bool bCanGetFocus ) { DBG_ASSERT( aChildren.size() < 255, "too many children" ); @@ -987,7 +987,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow, -void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow ) +void SfxWorkWindow::ReleaseChild_Impl( vcl::Window& rWindow ) { SfxChild_Impl *pChild = 0; @@ -1013,7 +1013,7 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow ) -SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const +SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const vcl::Window& rWindow ) const { SfxChild_Impl *pChild = 0; @@ -1671,7 +1671,7 @@ void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId ) SfxChildWindow *pCW = aChildWins[n]->pWin; if (pCW && pCW->GetAlignment() == SFX_ALIGN_NOALIGNMENT && pCW->GetType() != nId) { - Window *pWin = pCW->GetWindow(); + vcl::Window *pWin = pCW->GetWindow(); SfxChild_Impl *pChild = FindChild_Impl(*pWin); if (bHide) { @@ -1698,7 +1698,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild, { SfxDockingWindow* pDockWin=0; sal_uInt16 nPos = USHRT_MAX; - Window *pWin=0; + vcl::Window *pWin=0; SfxChildWin_Impl *pCW = 0; if ( eChild == SFX_CHILDWIN_OBJECTBAR ) @@ -2586,8 +2586,8 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin ) // size is just being calculated before it is displayed. SfxSplitWindow* pSplitWin = pSplit[n]; bool bDummyWindow = !pSplitWin->IsFadeIn(); - Window *pDummy = pSplitWin->GetSplitWindow(); - Window *pWin = bDummyWindow ? pDummy : pSplitWin; + vcl::Window *pDummy = pSplitWin->GetSplitWindow(); + vcl::Window *pWin = bDummyWindow ? pDummy : pSplitWin; if ( (pSplitWin->IsPinned() && !bDummyWindow) || (!pWin->IsVisible() && pActSplitWin != pSplitWin) ) continue; @@ -2731,7 +2731,7 @@ Rectangle SfxWorkWindow::GetFreeArea( bool bAutoHide ) const return aClientArea; } -void SfxWorkWindow::SetActiveChild_Impl( Window *pChild ) +void SfxWorkWindow::SetActiveChild_Impl( vcl::Window *pChild ) { pActiveChild = pChild; } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index bbd0d20698e1..f7da5d24b08b 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -1915,7 +1915,7 @@ bool SfxDispatcher::_FillState(const SfxSlotServer& rSvr, SfxItemSet& rState, return false; } -SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId,Window *pWin, const Point *pPos ) +SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId, vcl::Window *pWin, const Point *pPos ) { SfxDispatcher &rDisp = *SfxGetpApp()->GetDispatcher_Impl(); sal_uInt16 nShLevel = 0; @@ -1927,7 +1927,7 @@ SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId,Window *pWin, co nShLevel = rDisp.pImp->aStack.size(); } - Window *pWindow = pWin ? pWin : rDisp.pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); + vcl::Window *pWindow = pWin ? pWin : rDisp.pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); for ( pSh = rDisp.GetShell(nShLevel); pSh; ++nShLevel, pSh = rDisp.GetShell(nShLevel) ) { const ResId& rResId = pSh->GetInterface()->GetPopupMenuResId(); @@ -1939,7 +1939,7 @@ SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId,Window *pWin, co return 0; } -void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Point *pPos ) +void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, vcl::Window *pWin, const Point *pPos ) { SfxDispatcher &rDisp = *SfxGetpApp()->GetDispatcher_Impl(); sal_uInt16 nShLevel = 0; @@ -1951,7 +1951,7 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Poin nShLevel = rDisp.pImp->aStack.size(); } - Window *pWindow = pWin ? pWin : rDisp.pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); + vcl::Window *pWindow = pWin ? pWin : rDisp.pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); for ( pSh = rDisp.GetShell(nShLevel); pSh; ++nShLevel, pSh = rDisp.GetShell(nShLevel) ) { const ResId& rResId = pSh->GetInterface()->GetPopupMenuResId(); @@ -1963,9 +1963,9 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Poin } } -void SfxDispatcher::ExecutePopup( const ResId &rId, Window *pWin, const Point *pPos ) +void SfxDispatcher::ExecutePopup( const ResId &rId, vcl::Window *pWin, const Point *pPos ) { - Window *pWindow = pWin ? pWin : pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); + vcl::Window *pWindow = pWin ? pWin : pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow(); SfxPopupMenuManager::ExecutePopup( rId, GetFrame(), pPos ? *pPos : pWindow->GetPointerPosPixel(), pWindow ); } diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 05bb985b3298..dc5f254005f6 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -38,7 +38,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::frame; using namespace com::sun::star::beans; -RecentDocsView::RecentDocsView( Window* pParent ) +RecentDocsView::RecentDocsView( vcl::Window* pParent ) : ThumbnailView(pParent) , mnFileTypes(TYPE_NONE) , mnTextHeight(30) @@ -57,7 +57,7 @@ RecentDocsView::RecentDocsView( Window* pParent ) setItemDimensions( mnItemMaxSize, mnItemMaxSize, mnTextHeight, mnItemPadding ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRecentDocsView(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRecentDocsView(vcl::Window *pParent, VclBuilder::stringmap &) { return new RecentDocsView(pParent); } diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index 87be587f1506..d7858a47b50a 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -125,7 +125,7 @@ bool ViewFilter_Keyword::operator ()(const ThumbnailViewItem *pItem) return pItem->maTitle.matchIgnoreAsciiCase(maKeyword); } -TemplateAbstractView::TemplateAbstractView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren) +TemplateAbstractView::TemplateAbstractView (vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren) : ThumbnailView(pParent,nWinStyle,bDisableTransientChildren), mnCurRegionId(0), maAllButton(this, SfxResId(BTN_ALL_TEMPLATES)), @@ -137,7 +137,7 @@ TemplateAbstractView::TemplateAbstractView (Window *pParent, WinBits nWinStyle, maFTName.Hide(); } -TemplateAbstractView::TemplateAbstractView(Window *pParent) +TemplateAbstractView::TemplateAbstractView(vcl::Window *pParent) : ThumbnailView(pParent), mnCurRegionId(0), maAllButton(this, SfxResId(BTN_ALL_TEMPLATES)), diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 9b92a381e117..28e9be991a25 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -32,13 +32,13 @@ using namespace ::com::sun::star::frame; static void lcl_updateThumbnails (TemplateContainerItem *pItem); -TemplateLocalView::TemplateLocalView ( Window* pParent) +TemplateLocalView::TemplateLocalView ( vcl::Window* pParent) : TemplateAbstractView(pParent), mpDocTemplates(new SfxDocumentTemplates) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTemplateLocalView(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateLocalView(vcl::Window *pParent, VclBuilder::stringmap &) { return new TemplateLocalView(pParent); } diff --git a/sfx2/source/control/templateremoteview.cxx b/sfx2/source/control/templateremoteview.cxx index 75b63ce78b69..0729a6bdf53c 100644 --- a/sfx2/source/control/templateremoteview.cxx +++ b/sfx2/source/control/templateremoteview.cxx @@ -44,7 +44,7 @@ enum ROW_IS_REMOVABLE }; -TemplateRemoteView::TemplateRemoteView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren) +TemplateRemoteView::TemplateRemoteView (vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren) : TemplateAbstractView(pParent,nWinStyle,bDisableTransientChildren) { Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); @@ -54,7 +54,7 @@ TemplateRemoteView::TemplateRemoteView (Window *pParent, WinBits nWinStyle, bool m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTemplateRemoteView(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateRemoteView(vcl::Window *pParent, VclBuilder::stringmap &) { return new TemplateRemoteView(pParent, WB_VSCROLL, false); } diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx index 887dbf23b17b..fb21ac654812 100644 --- a/sfx2/source/control/templatesearchview.cxx +++ b/sfx2/source/control/templatesearchview.cxx @@ -12,12 +12,12 @@ #include <vcl/builder.hxx> -TemplateSearchView::TemplateSearchView (Window *pParent, WinBits nWinStyle) +TemplateSearchView::TemplateSearchView (vcl::Window *pParent, WinBits nWinStyle) : ThumbnailView(pParent,nWinStyle) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTemplateSearchView(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeTemplateSearchView(vcl::Window *pParent, VclBuilder::stringmap &) { return new TemplateSearchView(pParent); } diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 8c0bbee9bc33..9bf3df12864f 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -56,7 +56,7 @@ enum SCROLL_OFFSET = 4 }; -ThumbnailView::ThumbnailView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren) +ThumbnailView::ThumbnailView (vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren) : Control( pParent, nWinStyle ) { ImplInit(); diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 60581cbc8888..28de61f3e989 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -156,7 +156,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - Window* pParent = mpParent->GetParent(); + vcl::Window* pParent = mpParent->GetParent(); uno::Reference< accessibility::XAccessible > xRet; if( pParent ) @@ -170,7 +170,7 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleIndexInParent() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - Window* pParent = mpParent->GetParent(); + vcl::Window* pParent = mpParent->GetParent(); sal_Int32 nRet = 0; if( pParent ) @@ -221,7 +221,7 @@ OUString SAL_CALL ThumbnailViewAcc::getAccessibleName() aRet = mpParent->GetAccessibleName(); if (aRet.isEmpty()) { - Window* pLabel = mpParent->GetAccessibleRelationLabeledBy(); + vcl::Window* pLabel = mpParent->GetAccessibleRelationLabeledBy(); if (pLabel && pLabel != mpParent) aRet = OutputDevice::GetNonMnemonicString( pLabel->GetText() ); } diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index b2e44621a527..ae4fea2dba1e 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -52,7 +52,7 @@ class ResizableMultiLineEdit : public VclMultiLineEdit bool mbIsInGrabFocus; public: - ResizableMultiLineEdit (Window* pParent, ThumbnailViewItem* pItem); + ResizableMultiLineEdit (vcl::Window* pParent, ThumbnailViewItem* pItem); virtual ~ResizableMultiLineEdit (); void SetInGrabFocus(bool bInGrabFocus) { mbIsInGrabFocus = bInGrabFocus; } @@ -61,7 +61,7 @@ class ResizableMultiLineEdit : public VclMultiLineEdit virtual void Modify() SAL_OVERRIDE; }; -ResizableMultiLineEdit::ResizableMultiLineEdit (Window* pParent, ThumbnailViewItem* pItem) : +ResizableMultiLineEdit::ResizableMultiLineEdit (vcl::Window* pParent, ThumbnailViewItem* pItem) : VclMultiLineEdit (pParent, WB_CENTER | WB_BORDER), mpItem(pItem), mbIsInGrabFocus(false) diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index ab6a923a13cd..d1dc6ea1c136 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -25,7 +25,7 @@ #include <vcl/msgbox.hxx> #include "alienwarn.hxx" -SfxAlienWarningDialog::SfxAlienWarningDialog(Window* pParent, const OUString& _rFormatName) +SfxAlienWarningDialog::SfxAlienWarningDialog(vcl::Window* pParent, const OUString& _rFormatName) : MessageDialog(pParent, "AlienWarnDialog", "sfx/ui/alienwarndialog.ui") { get(m_pWarningOnBox, "ask"); diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 4a3d45ff90c0..8f5f7d712c7c 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -403,7 +403,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f // initialize the component and its parent window css::uno::Reference< css::awt::XWindow > xParentWindow = xFrame->getContainerWindow(); WorkWindow* pParent = (WorkWindow*)VCLUnoHelper::GetWindow(xParentWindow); - Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); // disable full screen mode of the frame! if (pParent && pParent->IsFullScreenMode()) @@ -438,7 +438,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f if( pParent && pBack ) { long nMenuHeight = 0; - Window* pMenu = pParent->GetWindow(WINDOW_NEXT); + vcl::Window* pMenu = pParent->GetWindow(WINDOW_NEXT); if( pMenu ) nMenuHeight = pMenu->GetSizePixel().Height(); @@ -717,8 +717,8 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno } // create the component window - Window* pParent = VCLUnoHelper::GetWindow(xParentWindow); - Window* pWindow = new BackingWindow(pParent); + vcl::Window* pParent = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pWindow = new BackingWindow(pParent); m_xWindow = VCLUnoHelper::GetInterface(pWindow); if (!m_xWindow.is()) @@ -791,7 +791,7 @@ void SAL_CALL BackingComp::dispatch( const css::util::URL& aURL, const css::uno: // vnd.org.libreoffice.recentdocs:ClearRecentFileList - clear recent files if ( aURL.Path == "ClearRecentFileList" ) { - Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow); BackingWindow* pBack = dynamic_cast<BackingWindow*>(pWindow ); if( pBack ) { diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 584b1b387ea2..39061f5bc384 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -87,7 +87,7 @@ static bool cmpSelectionItems (const ThumbnailViewItem *pItem1, const ThumbnailV } -BackingWindow::BackingWindow( Window* i_pParent ) : +BackingWindow::BackingWindow( vcl::Window* i_pParent ) : Window( i_pParent ), mxDesktop( Desktop::create(comphelper::getProcessComponentContext()) ), mbInitControls( false ), @@ -193,10 +193,10 @@ BackingWindow::~BackingWindow() // deregister drag&drop helper if (mxDropTargetListener.is()) { - for (std::vector<Window*>::iterator aI = maDndWindows.begin(), + for (std::vector<vcl::Window*>::iterator aI = maDndWindows.begin(), aEnd = maDndWindows.end(); aI != aEnd; ++aI) { - Window *pDndWin = *aI; + vcl::Window *pDndWin = *aI; css::uno::Reference< css::datatransfer::dnd::XDropTarget > xDropTarget = pDndWin->GetDropTarget(); if (xDropTarget.is()) @@ -453,10 +453,10 @@ void BackingWindow::setOwningFrame( const com::sun::star::uno::Reference< com::s // establish drag&drop mode mxDropTargetListener.set(new OpenFileDropTargetListener(mxContext, mxFrame)); - for (std::vector<Window*>::iterator aI = maDndWindows.begin(), + for (std::vector<vcl::Window*>::iterator aI = maDndWindows.begin(), aEnd = maDndWindows.end(); aI != aEnd; ++aI) { - Window *pDndWin = *aI; + vcl::Window *pDndWin = *aI; css::uno::Reference< css::datatransfer::dnd::XDropTarget > xDropTarget = pDndWin->GetDropTarget(); if (xDropTarget.is()) diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index e4f7a39479b6..15df736c9fb9 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -49,7 +49,7 @@ class ToolBox; class BackingWindow - : public Window + : public vcl::Window , public VclBuilderContainer { typedef bool (*selection_cmp_fn)(const ThumbnailViewItem*,const ThumbnailViewItem*); @@ -88,7 +88,7 @@ class BackingWindow TemplateLocalView* mpLocalView; TemplateAbstractView* mpCurrentView; - std::vector<Window*> maDndWindows; + std::vector<vcl::Window*> maDndWindows; Rectangle maStartCentButtons; @@ -120,7 +120,7 @@ class BackingWindow void initControls(); public: - BackingWindow( Window* pParent ); + BackingWindow( vcl::Window* pParent ); virtual ~BackingWindow(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 9bb8497cb81d..f3d4a3d5a86e 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -153,7 +153,7 @@ void SfxModalDialog::init() GetDialogData_Impl(); } -SfxModalDialog::SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) +SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) : ModalDialog(pParent, rID, rUIXMLDescription), nUniqId(0), //todo: remove this member when the ResId using ctor is removed pInputSet(0), @@ -303,7 +303,7 @@ IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl) } SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx, - SfxChildWindow *pCW, Window *pParent, const OString& rID, + SfxChildWindow *pCW, vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription) : ModelessDialog(pParent, rID, rUIXMLDescription) { @@ -447,7 +447,7 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt ) SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, WinBits nWinBits) : + vcl::Window* pParent, WinBits nWinBits) : FloatingWindow (pParent, nWinBits), pBindings(pBindinx), pImp( new SfxFloatingWindow_Impl ) @@ -464,7 +464,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) : FloatingWindow(pParent, rID, rUIXMLDescription, rFrame), pBindings(pBindinx), @@ -674,7 +674,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl) -SfxSingleTabDialog::SfxSingleTabDialog(Window *pParent, const SfxItemSet& rSet, +SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rSet, const OString& rID, const OUString& rUIXMLDescription) : SfxModalDialog(pParent, rID, rUIXMLDescription) , fnGetRanges(NULL) @@ -687,7 +687,7 @@ SfxSingleTabDialog::SfxSingleTabDialog(Window *pParent, const SfxItemSet& rSet, SetInputSet( &rSet ); } -SfxSingleTabDialog::SfxSingleTabDialog(Window* pParent, const SfxItemSet* pInSet, +SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window* pParent, const SfxItemSet* pInSet, const OString& rID, const OUString& rUIXMLDescription) : SfxModalDialog(pParent, rID, rUIXMLDescription) , fnGetRanges(NULL) diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx index cbe1c620eaec..61d963ef8a5e 100644 --- a/sfx2/source/dialog/checkin.cxx +++ b/sfx2/source/dialog/checkin.cxx @@ -10,7 +10,7 @@ #include <sfx2/checkin.hxx> #include <vcl/msgbox.hxx> -SfxCheckinDialog::SfxCheckinDialog( Window* pParent ) : +SfxCheckinDialog::SfxCheckinDialog( vcl::Window* pParent ) : ModalDialog( pParent, "CheckinDialog", "sfx/ui/checkin.ui" ) { get( m_pCommentED, "VersionComment" ); diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx index 3ee59daac68e..8221d3af3866 100644 --- a/sfx2/source/dialog/dialoghelper.cxx +++ b/sfx2/source/dialog/dialoghelper.cxx @@ -18,23 +18,23 @@ //right, get both of their non-preview areas to request the same size //so that the preview appears in the same place in each one so //flipping between tabs isn't distracting as it jumps around -void setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage) +void setPreviewsToSamePlace(vcl::Window *pParent, VclBuilderContainer *pPage) { - Window *pOurGrid = pPage->get<Window>("maingrid"); + vcl::Window *pOurGrid = pPage->get<vcl::Window>("maingrid"); if (!pOurGrid) return; - std::vector<Window*> aGrids; + std::vector<vcl::Window*> aGrids; aGrids.push_back(pOurGrid); - for (Window* pChild = pParent->GetWindow(WINDOW_FIRSTCHILD); pChild; + for (vcl::Window* pChild = pParent->GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { VclBuilderContainer *pPeer = dynamic_cast<VclBuilderContainer*>(pChild); if (!pPeer || pPeer == pPage || !pPeer->hasBuilder()) continue; - Window *pOtherGrid = pPeer->get<Window>("maingrid"); + vcl::Window *pOtherGrid = pPeer->get<vcl::Window>("maingrid"); if (!pOtherGrid) continue; @@ -44,36 +44,36 @@ void setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage) if (aGrids.size() > 1) { boost::shared_ptr< VclSizeGroup > xGroup(new VclSizeGroup); - for (std::vector<Window*>::iterator aI = aGrids.begin(); aI != aGrids.end(); ++aI) + for (std::vector<vcl::Window*>::iterator aI = aGrids.begin(); aI != aGrids.end(); ++aI) { - Window *pWindow = *aI; + vcl::Window *pWindow = *aI; pWindow->remove_from_all_size_groups(); pWindow->add_to_size_group(xGroup); } } } -Size getParagraphPreviewOptimalSize(const Window *pReference) +Size getParagraphPreviewOptimalSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(68 , 112), MAP_APPFONT); } -Size getDrawPreviewOptimalSize(const Window *pReference) +Size getDrawPreviewOptimalSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(88, 42), MAP_APPFONT); } -Size getDrawListBoxOptimalSize(const Window *pReference) +Size getDrawListBoxOptimalSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(88, 110), MAP_APPFONT); } -Size SFX2_DLLPUBLIC getPreviewStripSize(const Window *pReference) +Size SFX2_DLLPUBLIC getPreviewStripSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(70 , 40), MapMode(MAP_APPFONT)); } -Size SFX2_DLLPUBLIC getPreviewOptionsSize(const Window *pReference) +Size SFX2_DLLPUBLIC getPreviewOptionsSize(const vcl::Window *pReference) { return pReference->LogicToPixel(Size(70 , 27), MapMode(MAP_APPFONT)); } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 561f5ce1bd0c..c1d220eb7a4b 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -615,7 +615,7 @@ bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId ) return bRet; } -SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rItemSet ) +SfxDocumentDescPage::SfxDocumentDescPage( vcl::Window * pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "DescriptionInfoPage", "sfx/ui/descriptioninfopage.ui", &rItemSet) , m_pInfoItem ( NULL ) @@ -628,7 +628,7 @@ SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rI m_pCommentEd->set_height_request(m_pCommentEd->GetTextHeight() * 16); } -SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet *rItemSet) +SfxTabPage *SfxDocumentDescPage::Create(vcl::Window *pParent, const SfxItemSet *rItemSet) { return new SfxDocumentDescPage(pParent, *rItemSet); } @@ -746,7 +746,7 @@ namespace } } -SfxDocumentPage::SfxDocumentPage(Window* pParent, const SfxItemSet& rItemSet) +SfxDocumentPage::SfxDocumentPage(vcl::Window* pParent, const SfxItemSet& rItemSet) : SfxTabPage(pParent, "DocumentInfoPage", "sfx/ui/documentinfopage.ui", &rItemSet) , bEnableUseUserData( false ) , bHandleDelete( false ) @@ -909,7 +909,7 @@ void SfxDocumentPage::ImplCheckPasswordState() -SfxTabPage* SfxDocumentPage::Create( Window* pParent, const SfxItemSet* rItemSet ) +SfxTabPage* SfxDocumentPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet ) { return new SfxDocumentPage( pParent, *rItemSet ); } @@ -1156,7 +1156,7 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet ) } -SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent, +SfxDocumentInfoDialog::SfxDocumentInfoDialog( vcl::Window* pParent, const SfxItemSet& rItemSet ) : SfxTabDialog(0, pParent, "DocumentPropertiesDialog", "sfx/ui/documentpropertiesdialog.ui", &rItemSet) @@ -1224,7 +1224,7 @@ void SfxDocumentInfoDialog::AddFontTabPage() // class CustomPropertiesYesNoButton ------------------------------------- -CustomPropertiesYesNoButton::CustomPropertiesYesNoButton( Window* pParent, const ResId& rResId ) : +CustomPropertiesYesNoButton::CustomPropertiesYesNoButton( vcl::Window* pParent, const ResId& rResId ) : Control( pParent, rResId ), m_aYesButton( this, ResId( RB_PROPERTY_YES, *rResId.GetResMgr() ) ), m_aNoButton ( this, ResId( RB_PROPERTY_NO, *rResId.GetResMgr() ) ) @@ -1251,12 +1251,12 @@ class DurationDialog_Impl : public ModalDialog public: - DurationDialog_Impl( Window* pParent, const util::Duration& rDuration ); + DurationDialog_Impl( vcl::Window* pParent, const util::Duration& rDuration ); util::Duration GetDuration() const; }; -DurationDialog_Impl::DurationDialog_Impl(Window* pParent, +DurationDialog_Impl::DurationDialog_Impl(vcl::Window* pParent, const util::Duration& rDuration) : ModalDialog(pParent, "EditDurationDialog", "sfx/ui/editdurationdialog.ui") @@ -1294,7 +1294,7 @@ util::Duration DurationDialog_Impl::GetDuration() const return aRet; } -CustomPropertiesDurationField::CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : +CustomPropertiesDurationField::CustomPropertiesDurationField( vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : Edit( pParent, rResId ), m_pLine( pLine ) { @@ -1333,7 +1333,7 @@ void CustomPropertiesDurationField::SetDuration( const util::Duration& rDuration SetText( sText ); } -CustomPropertiesEditButton::CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : +CustomPropertiesEditButton::CustomPropertiesEditButton( vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : PushButton( pParent, rResId ), m_pLine( pLine ) { SetClickHdl( LINK( this, CustomPropertiesEditButton, ClickHdl )); @@ -1366,7 +1366,7 @@ void CustomPropertiesYesNoButton::Resize() } // struct CustomPropertyLine --------------------------------------------- -CustomPropertyLine::CustomPropertyLine( Window* pParent ) : +CustomPropertyLine::CustomPropertyLine( vcl::Window* pParent ) : m_aNameBox ( pParent, SfxResId( SFX_CB_PROPERTY_NAME ) ), m_aTypeBox ( pParent, SfxResId( SFX_LB_PROPERTY_TYPE ), this ), m_aValueEdit ( pParent, SfxResId( SFX_ED_PROPERTY_VALUE ), this ), @@ -1403,7 +1403,7 @@ void CustomPropertyLine::SetRemoved() m_aRemoveButton.Hide(); } -CustomPropertiesWindow::CustomPropertiesWindow(Window* pParent, +CustomPropertiesWindow::CustomPropertiesWindow(vcl::Window* pParent, FixedText *pHeaderAccName, FixedText *pHeaderAccType, FixedText *pHeaderAccValue) : @@ -1504,11 +1504,11 @@ IMPL_LINK( CustomPropertiesWindow, RemoveHdl, CustomPropertiesRemoveButton*, pBu if ( pLine->m_bIsRemoved ) continue; - Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, + vcl::Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, &pLine->m_aDateField, &pLine->m_aTimeField, &pLine->m_aDurationField, &pLine->m_aEditButton, &pLine->m_aYesNoButton, &pLine->m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; + vcl::Window** pCurrent = pWindows; while ( *pCurrent ) { Point aPos = (*pCurrent)->GetPosPixel(); @@ -1600,7 +1600,7 @@ void CustomPropertiesWindow::ValidateLine( CustomPropertyLine* pLine, bool bIsFr { if ( bIsFromTypeBox ) // LoseFocus of TypeBox pLine->m_bTypeLostFocus = true; - Window* pParent = GetParent()->GetParent(); + vcl::Window* pParent = GetParent()->GetParent(); if (MessageDialog(pParent, SfxResId(STR_SFX_QUERY_WRONG_TYPE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_OK_CANCEL).Execute() == RET_OK) pLine->m_aTypeBox.SelectEntryPos( m_aTypeBox.GetEntryPos( (void*)CUSTOM_TYPE_TEXT ) ); else @@ -1626,8 +1626,8 @@ bool CustomPropertiesWindow::InitControls( HeaderBar* pHeaderBar, const ScrollBa pHeaderBar->SetItemSize( HI_VALUE, nItemWidth ); pHeaderBar->SetItemSize( HI_ACTION, nButtonWidth ); - Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; + vcl::Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aRemoveButton, NULL }; + vcl::Window** pCurrent = pWindows; sal_uInt16 nPos = 0; while ( *pCurrent ) { @@ -1688,7 +1688,7 @@ sal_uInt16 CustomPropertiesWindow::GetVisibleLineCount() const void CustomPropertiesWindow::updateLineWidth() { - Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, + vcl::Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aDateField, &m_aTimeField, &m_aDurationField, &m_aEditButton, &m_aYesNoButton, &m_aRemoveButton, NULL }; @@ -1699,14 +1699,14 @@ void CustomPropertiesWindow::updateLineWidth() { CustomPropertyLine* pNewLine = *aI; - Window* pNewWindows[] = + vcl::Window* pNewWindows[] = { &pNewLine->m_aNameBox, &pNewLine->m_aTypeBox, &pNewLine->m_aValueEdit, &pNewLine->m_aDateField, &pNewLine->m_aTimeField, &pNewLine->m_aDurationField, &pNewLine->m_aEditButton, &pNewLine->m_aYesNoButton, &pNewLine->m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; - Window** pNewCurrent = pNewWindows; + vcl::Window** pCurrent = pWindows; + vcl::Window** pNewCurrent = pNewWindows; while ( *pCurrent ) { Size aSize = (*pCurrent)->GetSizePixel(); @@ -1742,17 +1742,17 @@ void CustomPropertiesWindow::AddLine( const OUString& sName, Any& rAny ) sal_Int32 nPos = GetVisibleLineCount() * GetLineHeight(); m_aCustomPropertiesLines.push_back( pNewLine ); - Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, + vcl::Window* pWindows[] = { &m_aNameBox, &m_aTypeBox, &m_aValueEdit, &m_aDateField, &m_aTimeField, &m_aDurationField, &m_aEditButton, &m_aYesNoButton, &m_aRemoveButton, NULL }; - Window* pNewWindows[] = + vcl::Window* pNewWindows[] = { &pNewLine->m_aNameBox, &pNewLine->m_aTypeBox, &pNewLine->m_aValueEdit, &pNewLine->m_aDateField, &pNewLine->m_aTimeField, &pNewLine->m_aDurationField, &pNewLine->m_aEditButton, &pNewLine->m_aYesNoButton, &pNewLine->m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; - Window** pNewCurrent = pNewWindows; + vcl::Window** pCurrent = pWindows; + vcl::Window** pNewCurrent = pNewWindows; while ( *pCurrent ) { Size aSize = (*pCurrent)->GetSizePixel(); @@ -1890,9 +1890,9 @@ void CustomPropertiesWindow::DoScroll( sal_Int32 nNewPos ) if ( pLine->m_bIsRemoved ) continue; - Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, &pLine->m_aDateField, &pLine->m_aTimeField, + vcl::Window* pWindows[] = { &pLine->m_aNameBox, &pLine->m_aTypeBox, &pLine->m_aValueEdit, &pLine->m_aDateField, &pLine->m_aTimeField, &pLine->m_aDurationField, &pLine->m_aEditButton, &pLine->m_aYesNoButton, &pLine->m_aRemoveButton, NULL }; - Window** pCurrent = pWindows; + vcl::Window** pCurrent = pWindows; while ( *pCurrent ) { Point aPos = (*pCurrent)->GetPosPixel(); @@ -1984,7 +1984,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c return aPropertiesSeq; } -CustomPropertiesControl::CustomPropertiesControl(Window* pParent) +CustomPropertiesControl::CustomPropertiesControl(vcl::Window* pParent) : VclVBox(pParent) , m_pHeaderBar(NULL) , m_pBody(NULL) @@ -2063,7 +2063,7 @@ void CustomPropertiesControl::setAllocation(const Size &rAllocation) } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCustomPropertiesControl(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCustomPropertiesControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new CustomPropertiesControl(pParent); @@ -2105,7 +2105,7 @@ void CustomPropertiesControl::AddLine( const OUString& sName, Any& rAny, bool bI } // class SfxCustomPropertiesPage ----------------------------------------- -SfxCustomPropertiesPage::SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& rItemSet ) +SfxCustomPropertiesPage::SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "CustomInfoPage", "sfx/ui/custominfopage.ui", &rItemSet) { get(m_pPropertiesCtrl, "properties"); @@ -2190,12 +2190,12 @@ int SfxCustomPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return nRet; } -SfxTabPage* SfxCustomPropertiesPage::Create( Window* pParent, const SfxItemSet* rItemSet ) +SfxTabPage* SfxCustomPropertiesPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet ) { return new SfxCustomPropertiesPage( pParent, *rItemSet ); } -CmisValue::CmisValue( Window* pParent, const OUString& aStr ) +CmisValue::CmisValue( vcl::Window* pParent, const OUString& aStr ) { m_pUIBuilder = new VclBuilder( pParent, getUIRootDir(), "sfx/ui/cmisline.ui"); get( m_aValueEdit, "value"); @@ -2203,7 +2203,7 @@ CmisValue::CmisValue( Window* pParent, const OUString& aStr ) m_aValueEdit->SetText( aStr ); } -CmisDateTime::CmisDateTime( Window* pParent, const util::DateTime& aDateTime ) +CmisDateTime::CmisDateTime( vcl::Window* pParent, const util::DateTime& aDateTime ) { m_pUIBuilder = new VclBuilder( pParent, getUIRootDir(), "sfx/ui/cmisline.ui"); get( m_aDateField, "date"); @@ -2215,7 +2215,7 @@ CmisDateTime::CmisDateTime( Window* pParent, const util::DateTime& aDateTime ) aDateTime.Seconds, aDateTime.NanoSeconds ) ); } -CmisYesNo::CmisYesNo( Window* pParent, bool bValue ) +CmisYesNo::CmisYesNo( vcl::Window* pParent, bool bValue ) { m_pUIBuilder = new VclBuilder( pParent, getUIRootDir(), "sfx/ui/cmisline.ui"); get( m_aYesButton, "yes"); @@ -2229,7 +2229,7 @@ CmisYesNo::CmisYesNo( Window* pParent, bool bValue ) } // struct CmisPropertyLine --------------------------------------------- -CmisPropertyLine::CmisPropertyLine(Window* pParent) +CmisPropertyLine::CmisPropertyLine(vcl::Window* pParent) : m_sType(CMIS_TYPE_STRING) , m_bUpdatable(false) , m_bRequired(false) @@ -2587,7 +2587,7 @@ void CmisPropertiesControl::AddLine( const OUString& sId, const OUString& sName, } // class SfxCmisPropertiesPage ----------------------------------------- -SfxCmisPropertiesPage::SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& rItemSet ) +SfxCmisPropertiesPage::SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "CmisInfoPage", "sfx/ui/cmisinfopage.ui", &rItemSet) , m_pPropertiesCtrl( this ) { @@ -2687,7 +2687,7 @@ int SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return LEAVE_PAGE; } -SfxTabPage* SfxCmisPropertiesPage::Create( Window* pParent, const SfxItemSet* rItemSet ) +SfxTabPage* SfxCmisPropertiesPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet ) { return new SfxCmisPropertiesPage( pParent, *rItemSet ); } diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 529096832518..f4a1293164a2 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -61,18 +61,18 @@ static const int NUM_OF_DOCKINGWINDOWS = 10; class SfxTitleDockingWindow : public SfxDockingWindow { - Window* m_pWrappedWindow; + vcl::Window* m_pWrappedWindow; public: SfxTitleDockingWindow( SfxBindings* pBindings , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits); virtual ~SfxTitleDockingWindow(); - Window* GetWrappedWindow() const { return m_pWrappedWindow; } - void SetWrappedWindow(Window* const pWindow); + vcl::Window* GetWrappedWindow() const { return m_pWrappedWindow; } + void SetWrappedWindow(vcl::Window* const pWindow); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -119,7 +119,7 @@ static bool lcl_getWindowState( const uno::Reference< container::XNameAccess >& return bResult; } -SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , +SfxDockingWrapper::SfxDockingWrapper( vcl::Window* pParentWnd , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ) @@ -199,7 +199,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , { } - Window* pContentWindow = VCLUnoHelper::GetWindow(xWindow); + vcl::Window* pContentWindow = VCLUnoHelper::GetWindow(xWindow); if ( pContentWindow ) pContentWindow->SetStyle( pContentWindow->GetStyle() | WB_DIALOGCONTROL | WB_CHILDDLGCTRL ); pTitleDockWindow->SetWrappedWindow(pContentWindow); @@ -211,7 +211,7 @@ SfxDockingWrapper::SfxDockingWrapper( Window* pParentWnd , } SfxChildWindow* SfxDockingWrapper::CreateImpl( -Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) +vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) { SfxChildWindow *pWin = new SfxDockingWrapper(pParent, nId, pBindings, pInfo); return pWin; @@ -239,7 +239,7 @@ SfxChildWinInfo SfxDockingWrapper::GetInfo() const SfxTitleDockingWindow::SfxTitleDockingWindow( SfxBindings* pBind , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits ) : SfxDockingWindow( pBind , pChildWin , @@ -254,7 +254,7 @@ SfxTitleDockingWindow::~SfxTitleDockingWindow() delete m_pWrappedWindow; } -void SfxTitleDockingWindow::SetWrappedWindow( Window* const pWindow ) +void SfxTitleDockingWindow::SetWrappedWindow( vcl::Window* const pWindow ) { m_pWrappedWindow = pWindow; if (m_pWrappedWindow) @@ -274,7 +274,7 @@ void SfxTitleDockingWindow::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_INITSHOW ) { - Window* pWindow = GetWrappedWindow(); + vcl::Window* pWindow = GetWrappedWindow(); if ( pWindow ) { pWindow->SetSizePixel( GetOutputSizePixel() ); @@ -844,7 +844,7 @@ void SfxDockingWindow::Resizing( Size& /*rSize*/ ) SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, WinBits nWinBits) : + vcl::Window* pParent, WinBits nWinBits) : DockingWindow (pParent, nWinBits), pBindings(pBindinx), pMgr(pCW), @@ -895,7 +895,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, const ResId& rResId) : + vcl::Window* pParent, const ResId& rResId) : DockingWindow(pParent, rResId), pBindings(pBindinx), pMgr(pCW), @@ -1147,7 +1147,7 @@ void SfxDockingWindow::Initialize_Impl() if ( !bSet) { SfxViewFrame *pFrame = pBindings->GetDispatcher_Impl()->GetFrame(); - Window* pEditWin = pFrame->GetViewShell()->GetWindow(); + vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow(); Point aPos = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() ); aPos = GetParent()->ScreenToOutputPixel( aPos ); SetFloatingPos( aPos ); diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx index 69b4fd4d9ec6..c942fd25c059 100644 --- a/sfx2/source/dialog/documentfontsdialog.cxx +++ b/sfx2/source/dialog/documentfontsdialog.cxx @@ -23,12 +23,12 @@ using namespace ::com::sun::star; -SfxTabPage* SfxDocumentFontsPage::Create( Window* parent, const SfxItemSet* set ) +SfxTabPage* SfxDocumentFontsPage::Create( vcl::Window* parent, const SfxItemSet* set ) { return new SfxDocumentFontsPage( parent, *set ); } -SfxDocumentFontsPage::SfxDocumentFontsPage( Window* parent, const SfxItemSet& set ) +SfxDocumentFontsPage::SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSet& set ) : SfxTabPage( parent, "DocumentFontsPage", "sfx/ui/documentfontspage.ui", &set ) { get( embedFontsCheckbox, "embedFonts" ); diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 4051b1527228..f3793a1f5322 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -853,7 +853,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl( sal_Int16 nDialogType, sal_Int64 nFlags, sal_Int16 nDialog, - Window* _pPreferredParentWindow, + vcl::Window* _pPreferredParentWindow, const OUString& sStandardDir, const ::com::sun::star::uno::Sequence< OUString >& rBlackList ) @@ -2246,7 +2246,7 @@ FileDialogHelper::FileDialogHelper( FileDialogHelper::FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, - Window* _pPreferredParent ) + vcl::Window* _pPreferredParent ) : m_nError(0) { mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags, SFX2_IMPL_DIALOG_CONFIG, _pPreferredParent ); @@ -2260,7 +2260,7 @@ FileDialogHelper::FileDialogHelper( const OUString& aExtName, const OUString& rStandardDir, const ::com::sun::star::uno::Sequence< OUString >& rBlackList, - Window* _pPreferredParent ) + vcl::Window* _pPreferredParent ) : m_nError(0) { mpImp = new FileDialogHelper_Impl( this, nDialogType, nFlags, SFX2_IMPL_DIALOG_CONFIG, _pPreferredParent,rStandardDir, rBlackList ); diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 21e3a30912f9..4d663d2e15d2 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -54,7 +54,7 @@ namespace sfx2 SfxFilterMatcher* mpMatcher; GraphicFilter* mpGraphicFilter; FileDialogHelper* mpAntiImpl; - Window* mpPreferredParentWindow; + vcl::Window* mpPreferredParentWindow; ::comphelper::SequenceAsVector< OUString > mlLastURLs; @@ -180,7 +180,7 @@ namespace sfx2 const short nDialogType, sal_Int64 nFlags, sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG, - Window* _pPreferredParentWindow = NULL, + vcl::Window* _pPreferredParentWindow = NULL, const OUString& sStandardDir = OUString(), const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >() ); diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index 928ee164dcd0..b6baf00e0452 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -28,7 +28,7 @@ namespace class SfxCloseButton : public PushButton { public: - SfxCloseButton( Window* pParent ) : PushButton( pParent, 0 ) + SfxCloseButton( vcl::Window* pParent ) : PushButton( pParent, 0 ) { } @@ -95,7 +95,7 @@ namespace } } -SfxInfoBarWindow::SfxInfoBarWindow( Window* pParent, const OUString& sId, +SfxInfoBarWindow::SfxInfoBarWindow( vcl::Window* pParent, const OUString& sId, const OUString& sMessage, vector< PushButton* > aButtons ) : Window( pParent, 0 ), m_sId( sId ), @@ -317,7 +317,7 @@ void SfxInfoBarContainerWindow::Resize( ) SFX_IMPL_POS_CHILDWINDOW_WITHID( SfxInfoBarContainerChild, SID_INFOBARCONTAINER, SFX_OBJECTBAR_OBJECT ); -SfxInfoBarContainerChild::SfxInfoBarContainerChild( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* ) : +SfxInfoBarContainerChild::SfxInfoBarContainerChild( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* ) : SfxChildWindow( _pParent, nId ), m_pBindings( pBindings ) { diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx index d46c9ae5265b..6f1ab9288205 100644 --- a/sfx2/source/dialog/inputdlg.cxx +++ b/sfx2/source/dialog/inputdlg.cxx @@ -14,7 +14,7 @@ #include <vcl/edit.hxx> #include <vcl/fixed.hxx> -InputDialog::InputDialog(const OUString &rLabelText, Window *pParent) +InputDialog::InputDialog(const OUString &rLabelText, vcl::Window *pParent) : ModalDialog(pParent, "InputDialog", "sfx/ui/inputdialog.ui") { get(m_pEntry, "entry"); diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx index de97fa5246dc..595e1b481277 100644 --- a/sfx2/source/dialog/itemconnect.cxx +++ b/sfx2/source/dialog/itemconnect.cxx @@ -82,7 +82,7 @@ ControlWrapperBase::~ControlWrapperBase() // Single control wrappers -DummyWindowWrapper::DummyWindowWrapper( Window& rWindow ) : +DummyWindowWrapper::DummyWindowWrapper( vcl::Window& rWindow ) : SingleControlWrapperType( rWindow ) { } @@ -258,7 +258,7 @@ TriState ItemConnectionBase::GetShowState( bool bKnown ) const // Standard connections -DummyItemConnection::DummyItemConnection( sal_uInt16 nSlot, Window& rWindow, ItemConnFlags nFlags ) : +DummyItemConnection::DummyItemConnection( sal_uInt16 nSlot, vcl::Window& rWindow, ItemConnFlags nFlags ) : ItemConnectionBase( nFlags ), DummyWindowWrapper( rWindow ), mnSlot( nSlot ) diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index ea30e59c557e..6a4b9397d0f5 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -858,7 +858,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css: css::uno::Reference< css::awt::XWindow > xParentWindow = xFrame->getContainerWindow(); SolarMutexGuard aGuard; - Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); MessageDialog aBox(pParentWindow, "ErrorFindEmailDialog", "sfx/ui/errorfindemaildialog.ui"); aBox.Execute(); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index a563b553e769..d09b7cd3227b 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -43,7 +43,7 @@ * * initializes the list box with the templates */ -SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* pParent, const SfxItemSet& rAttrSet) +SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "ManageStylePage", "sfx/ui/managestylepage.ui", &rAttrSet) , pStyle(&((SfxStyleDialog*)GetParentDialog())->GetStyleSheet()) , pItem(0) @@ -463,7 +463,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ ) -SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent, +SfxTabPage* SfxManageStyleSheetPage::Create( vcl::Window* pParent, const SfxItemSet *rAttrSet ) /* [Description] diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 4c3f972bb15c..334e7771a786 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -28,7 +28,7 @@ SFX_IMPL_DOCKINGWINDOW( SfxNavigatorWrapper , SID_NAVIGATOR ); -SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd , +SfxNavigatorWrapper::SfxNavigatorWrapper( vcl::Window* pParentWnd , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ) @@ -47,7 +47,7 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd , SfxNavigator::SfxNavigator( SfxBindings* pBind , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits ) : SfxDockingWindow( pBind , pChildWin , diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 56ae0e9c1aca..a2f43fb10ab3 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -57,7 +57,7 @@ IMPL_LINK_INLINE_START( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox ) } IMPL_LINK_INLINE_END( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox ) -SfxNewStyleDlg::SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& rInPool ) +SfxNewStyleDlg::SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& rInPool ) : ModalDialog(pParent, "CreateStyleDialog", "sfx/ui/newstyle.ui") , aQueryOverwriteBox(this, SfxResId(STR_QUERY_OVERWRITE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO) diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index 9dd7b9ca5a33..8e34b5cb4919 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -51,7 +51,7 @@ SFX_IMPL_DOCKINGWINDOW( SfxPartChildWnd_Impl, SID_BROWSER ); SfxPartChildWnd_Impl::SfxPartChildWnd_Impl ( - Window* pParentWnd, + vcl::Window* pParentWnd, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo @@ -101,7 +101,7 @@ SfxPartDockWnd_Impl::SfxPartDockWnd_Impl ( SfxBindings* pBind, SfxChildWindow* pChildWin, - Window* pParent, + vcl::Window* pParent, WinBits nBits ) : SfxDockingWindow( pBind, pChildWin, pParent, nBits ) diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 1b746fb44872..ca6764967282 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -83,7 +83,7 @@ IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl) // CTOR / DTOR ----------------------------------------------------------- -SfxPasswordDialog::SfxPasswordDialog(Window* pParent, const OUString* pGroupText) +SfxPasswordDialog::SfxPasswordDialog(vcl::Window* pParent, const OUString* pGroupText) : ModalDialog(pParent, "PasswordDialog", "sfx/ui/password.ui") , maMinLenPwdStr(SFX2_RESSTR(STR_PASSWD_MIN_LEN)) , maMinLenPwdStr1(SFX2_RESSTR(STR_PASSWD_MIN_LEN1)) diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index f13d70d0601f..86eb2c65e6c4 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -36,7 +36,7 @@ static bool bOutputForPrinter = true; #define DPI_COUNT (sizeof(aDPIArray)/sizeof(aDPIArray[0 ])) -SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) +SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptPrintPage", "sfx/ui/optprintpage.ui", &rSet) { get(m_pPrinterOutputRB, "printer"); @@ -89,26 +89,26 @@ SfxCommonPrintOptionsTabPage::~SfxCommonPrintOptionsTabPage() { } -SfxTabPage* SfxCommonPrintOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SfxCommonPrintOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return( new SfxCommonPrintOptionsTabPage( pParent, *rAttrSet ) ); } -Window* SfxCommonPrintOptionsTabPage::GetParentLabeledBy( const Window* pWindow ) const +vcl::Window* SfxCommonPrintOptionsTabPage::GetParentLabeledBy( const vcl::Window* pWindow ) const { - if ( pWindow == (Window *)m_pReduceGradientsStepCountNF ) + if ( pWindow == (vcl::Window *)m_pReduceGradientsStepCountNF ) return m_pReduceGradientsStripesRB; - else if ( pWindow == (Window *)m_pReduceBitmapsResolutionLB ) + else if ( pWindow == (vcl::Window *)m_pReduceBitmapsResolutionLB ) return m_pReduceBitmapsResolutionRB; else return SfxTabPage::GetParentLabeledBy( pWindow ); } -Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const Window* pWindow ) const +vcl::Window* SfxCommonPrintOptionsTabPage::GetParentLabelFor( const vcl::Window* pWindow ) const { - if ( pWindow == (Window *)m_pReduceGradientsStripesRB ) + if ( pWindow == (vcl::Window *)m_pReduceGradientsStripesRB ) return m_pReduceGradientsStepCountNF; - else if ( pWindow == (Window *)m_pReduceBitmapsResolutionRB ) + else if ( pWindow == (vcl::Window *)m_pReduceBitmapsResolutionRB ) return m_pReduceBitmapsResolutionLB; else return SfxTabPage::GetParentLabelFor( pWindow ); diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index 2b0b42944553..12f3540ad0a1 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -124,7 +124,7 @@ static OUString GetLabelFromCommandURL( const OUString& rCommandURL, const uno:: SFX_IMPL_FLOATINGWINDOW( SfxRecordingFloatWrapper_Impl, SID_RECORDING_FLOATWINDOW ); -SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( Window* pParentWnd , +SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( vcl::Window* pParentWnd , sal_uInt16 nId , SfxBindings* pBind , SfxChildWinInfo* pInfo ) @@ -163,7 +163,7 @@ bool SfxRecordingFloatWrapper_Impl::QueryClose() SfxRecordingFloat_Impl::SfxRecordingFloat_Impl( SfxBindings* pBind , SfxChildWindow* pChildWin , - Window* pParent ) + vcl::Window* pParent ) : SfxFloatingWindow( pBind, pChildWin, pParent, @@ -230,7 +230,7 @@ void SfxRecordingFloat_Impl::StateChanged( StateChangedType nStateChange ) if ( nStateChange == STATE_CHANGE_INITSHOW ) { SfxViewFrame *pFrame = GetBindings().GetDispatcher_Impl()->GetFrame(); - Window* pEditWin = pFrame->GetViewShell()->GetWindow(); + vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow(); Point aPoint = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() ); aPoint = GetParent()->ScreenToOutputPixel( aPoint ); diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index c8bce8afa3d2..1cedc62247a8 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -94,7 +94,7 @@ namespace static bool lcl_GetPassword( - Window *pParent, + vcl::Window *pParent, bool bProtect, /*out*/OUString &rPassword ) { @@ -421,13 +421,13 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl) } -SfxTabPage* SfxSecurityPage::Create( Window * pParent, const SfxItemSet * rItemSet ) +SfxTabPage* SfxSecurityPage::Create( vcl::Window * pParent, const SfxItemSet * rItemSet ) { return new SfxSecurityPage( pParent, *rItemSet ); } -SfxSecurityPage::SfxSecurityPage( Window* pParent, const SfxItemSet& rItemSet ) +SfxSecurityPage::SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& rItemSet ) : SfxTabPage(pParent, "SecurityInfoPage", "sfx/ui/securityinfopage.ui", &rItemSet) { m_pImpl.reset(new SfxSecurityPage_Impl( *this, rItemSet )); diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index e3b7046d4fbb..664cf0fa2f5d 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -205,7 +205,7 @@ void SfxEmptySplitWin_Impl::MouseMove( const MouseEvent& rMEvt ) -SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, +SfxSplitWindow::SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, SfxWorkWindow *pW, bool bWithButtons, WinBits nBits ) /* [Description] @@ -1086,7 +1086,7 @@ bool SfxSplitWindow::CursorIsOverRect( bool bForceAdding ) const aRect = aRect.GetUnion( aVisRect ); } - if ( aRect.IsInside( OutputToScreenPixel( ((Window*)this)->GetPointerPosPixel() ) ) ) + if ( aRect.IsInside( OutputToScreenPixel( ((vcl::Window*)this)->GetPointerPosPixel() ) ) ) return true; return false; } diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index f88bdd69104a..6e08e6f02c9f 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -39,7 +39,7 @@ namespace sfx2 { // SearchDialog -SearchDialog::SearchDialog(Window* pWindow, const OUString& rConfigName) +SearchDialog::SearchDialog(vcl::Window* pWindow, const OUString& rConfigName) : ModelessDialog(pWindow, "SearchDialog", "sfx/ui/searchdialog.ui") , m_sConfigName(rConfigName) , m_bIsConstructed(false) diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index 52669b69e170..1854b4176302 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -32,7 +32,7 @@ SfxStyleDialog::SfxStyleDialog ( - Window* pParent, // Parent + vcl::Window* pParent, // Parent const OString& rID, const OUString& rUIXMLDescription, SfxStyleSheetBase& rStyle // stylesheet to be processed ) diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index d71879ef83cb..c5b964e64cdd 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -163,7 +163,7 @@ void SfxTabPage::SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::st return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >(); } -SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet) +SfxTabPage::SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet) : TabPage(pParent, rID, rUIXMLDescription) , pSet ( rAttrSet ) , bHasExchangeSupport ( false ) @@ -311,7 +311,7 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const SfxTabDialog::SfxTabDialog ( SfxViewFrame* pViewFrame, // Frame, to which the Dialog belongs - Window* pParent, // Parent Window + vcl::Window* pParent, // Parent Window const OString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path const SfxItemSet* pItemSet, // Itemset with the data; // can be NULL, when Pages are onDemand @@ -340,7 +340,7 @@ SfxTabDialog::SfxTabDialog */ ( - Window* pParent, // Parent Window + vcl::Window* pParent, // Parent Window const OString& rID, const OUString& rUIXMLDescription, //Dialog Name, Dialog .ui path const SfxItemSet* pItemSet, // Itemset with the data; // can be NULL, when Pages are onDemand diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 7107fc052f82..1032a68c2db9 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -200,7 +200,7 @@ namespace sfx2 //= TaskPaneDockingWindow - TaskPaneDockingWindow::TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, Window* i_pParent, WinBits i_nBits ) + TaskPaneDockingWindow::TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, vcl::Window* i_pParent, WinBits i_nBits ) :TitledDockingWindow( i_pBindings, &i_rWrapper, i_pParent, i_nBits ) ,m_aTaskPane( GetContentWindow(), lcl_getFrame( i_pBindings ) ) ,m_aPaneController( m_aTaskPane, *this ) @@ -235,7 +235,7 @@ namespace sfx2 SFX_IMPL_DOCKINGWINDOW( TaskPaneWrapper, SID_TASKPANE ); - TaskPaneWrapper::TaskPaneWrapper( Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo ) + TaskPaneWrapper::TaskPaneWrapper( vcl::Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo ) :SfxChildWindow( i_pParent, i_nId ) { pWindow = new TaskPaneDockingWindow( i_pBindings, *this, i_pParent, @@ -302,7 +302,7 @@ namespace sfx2 virtual OUString GetDisplayName() const SAL_OVERRIDE; virtual Image GetImage() const SAL_OVERRIDE; virtual OString GetHelpID() const SAL_OVERRIDE; - virtual void Activate( Window& i_rParentWindow ) SAL_OVERRIDE; + virtual void Activate( vcl::Window& i_rParentWindow ) SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; virtual void SetSizePixel( const Size& i_rPanelWindowSize ) SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; @@ -317,7 +317,7 @@ namespace sfx2 virtual ~CustomToolPanel(); private: - bool impl_ensureToolPanelWindow( Window& i_rPanelParentWindow ); + bool impl_ensureToolPanelWindow( vcl::Window& i_rPanelParentWindow ); void impl_updatePanelConfig( const bool i_bVisible ) const; private: @@ -350,7 +350,7 @@ namespace sfx2 } - bool CustomToolPanel::impl_ensureToolPanelWindow( Window& i_rPanelParentWindow ) + bool CustomToolPanel::impl_ensureToolPanelWindow( vcl::Window& i_rPanelParentWindow ) { if ( m_bAttemptedCreation ) return m_aCustomPanel.is(); @@ -414,7 +414,7 @@ namespace sfx2 } - void CustomToolPanel::Activate( Window& i_rParentWindow ) + void CustomToolPanel::Activate( vcl::Window& i_rParentWindow ) { ENSURE_OR_RETURN_VOID( impl_ensureToolPanelWindow( i_rParentWindow ), "no panel to activate!" ); @@ -722,7 +722,7 @@ namespace sfx2 //= ModuleTaskPane - ModuleTaskPane::ModuleTaskPane( Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame ) + ModuleTaskPane::ModuleTaskPane( vcl::Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame ) :Window( &i_rParentWindow, WB_DIALOGCONTROL ) ,m_pImpl( new ModuleTaskPane_Impl( *this, i_rDocumentFrame, NULL ) ) { diff --git a/sfx2/source/dialog/templateinfodlg.cxx b/sfx2/source/dialog/templateinfodlg.cxx index 45dcd7837a74..a2514ea23a11 100644 --- a/sfx2/source/dialog/templateinfodlg.cxx +++ b/sfx2/source/dialog/templateinfodlg.cxx @@ -32,13 +32,13 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::task; using namespace ::com::sun::star::util; -SfxTemplateInfoDlg::SfxTemplateInfoDlg (Window *pParent) +SfxTemplateInfoDlg::SfxTemplateInfoDlg (vcl::Window *pParent) : ModalDialog(pParent, "TemplateInfo", "sfx/ui/templateinfodialog.ui") { get(mpBtnClose, "close"); get(mpBox, "box"); get(mpInfoView, "infoDrawingArea"); - mpPreviewView = new Window(mpBox); + mpPreviewView = new vcl::Window(mpBox); Size aSize(LogicToPixel(Size(250, 160), MAP_APPFONT)); mpBox->set_width_request(aSize.Width()); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index bf134ec4e543..7aac28c40446 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -136,7 +136,7 @@ SfxTemplateDialog::SfxTemplateDialog ( SfxBindings *pBind, SfxChildWindow *pCW, - Window *pParent + vcl::Window *pParent ) /* [Description] @@ -349,7 +349,7 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void ) -SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(Window *pParentWnd, +SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(vcl::Window *pParentWnd, sal_uInt16 nId, SfxBindings *p, SfxChildWinInfo *pInfo) : SfxChildWindow(pParentWnd, nId) { @@ -364,7 +364,7 @@ SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(Window *pParentWnd, //===== SfxTemplatePanelControl =============================================== SfxTemplatePanelControl::SfxTemplatePanelControl ( SfxBindings* pBindings, - Window* pParentWindow) + vcl::Window* pParentWindow) : DockingWindow(pParentWindow, SfxResId(DLG_STYLE_DESIGNER) ), pImpl(new SfxTemplateDialog_Impl(pBindings, this)), mpBindings(pBindings) @@ -455,7 +455,7 @@ void SfxTemplatePanelControl::StateChanged( StateChangedType nStateChange ) if ( nStateChange == STATE_CHANGE_INITSHOW ) { SfxViewFrame *pFrame = mpBindings->GetDispatcher_Impl()->GetFrame(); - Window* pEditWin = pFrame->GetViewShell()->GetWindow(); + vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow(); Size aSize = pEditWin->GetSizePixel(); Point aPoint = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() ); @@ -750,7 +750,7 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox *pBox, // Constructor -SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window* pW, bool ) : +SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window* pW, bool ) : mbIgnoreSelect( false ), pBindings ( pB ), pWindow ( pW ), @@ -1984,7 +1984,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *) OUString aEmpty; if ( nActFamily != 0xffff && (pTreeBox || aFmtLb.GetSelectionCount() <= 1)) { - Window* pTmp; + vcl::Window* pTmp; pTmp = Application::GetDefDialogParent(); if ( ISA(SfxTemplateDialog_Impl) ) Application::SetDefDialogParent( pWindow->GetParent() ); @@ -2024,7 +2024,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *) sal_uInt16 nFilter = nActFilter; OUString aTemplName(GetSelectedEntry()); GetSelectedStyle(); // -Wall required?? - Window* pTmp; + vcl::Window* pTmp; //DefModalDialogParent set for modality of the following dialogs pTmp = Application::GetDefDialogParent(); if ( ISA(SfxTemplateDialog_Impl) ) @@ -2193,7 +2193,7 @@ void SfxCommonTemplateDialog_Impl::ResetFocus() { SfxViewFrame *pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame(); SfxViewShell *pVu = pViewFrame->GetViewShell(); - Window *pAppWin = pVu ? pVu->GetWindow(): 0; + vcl::Window *pAppWin = pVu ? pVu->GetWindow(): 0; if(pAppWin) pAppWin->GrabFocus(); } @@ -2293,7 +2293,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu ) -void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, Window* pWin ) +void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, vcl::Window* pWin ) { // Bug# 94152: This part should never be called, because before this happens, the TreeListBox should captured this! OSL_FAIL( "+SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl(): How could this happen? Please infirm developer ASAP!" ); @@ -2811,7 +2811,7 @@ void SfxTemplateDialog::StateChanged( StateChangedType nStateChange ) if ( nStateChange == STATE_CHANGE_INITSHOW ) { SfxViewFrame *pFrame = GetBindings().GetDispatcher_Impl()->GetFrame(); - Window* pEditWin = pFrame->GetViewShell()->GetWindow(); + vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow(); Size aSize = pEditWin->GetSizePixel(); Point aPoint = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() ); @@ -2825,7 +2825,7 @@ void SfxTemplateDialog::StateChanged( StateChangedType nStateChange ) SfxDockingWindow::StateChanged( nStateChange ); } -DropToolBox_Impl::DropToolBox_Impl(Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog) : +DropToolBox_Impl::DropToolBox_Impl(vcl::Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog) : ToolBox(pParent), DropTargetHelper(this), rParent(*pTemplateDialog) diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 71eee2c27545..65882136b12b 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -36,7 +36,7 @@ namespace sfx2 //= TitledDockingWindow - TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent, + TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, vcl::Window* i_pParent, WinBits i_nStyle ) :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_nStyle ) ,m_sTitle() @@ -50,7 +50,7 @@ namespace sfx2 } - TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent, + TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, vcl::Window* i_pParent, const ResId& i_rResId ) :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_rResId ) ,m_sTitle() diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index eceacca0e6bf..16788ee79baf 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -462,7 +462,7 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton ) return 0L; } -SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(Window *pParent, SfxVersionInfo& rInfo, bool bEdit) +SfxViewVersionDialog_Impl::SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVersionInfo& rInfo, bool bEdit) : SfxModalDialog(pParent, "VersionCommentDialog", "sfx/ui/versioncommentdialog.ui") , m_rInfo(rInfo) { diff --git a/sfx2/source/doc/QuerySaveDocument.cxx b/sfx2/source/doc/QuerySaveDocument.cxx index 9c073d07c279..63d458f1c955 100644 --- a/sfx2/source/doc/QuerySaveDocument.cxx +++ b/sfx2/source/doc/QuerySaveDocument.cxx @@ -21,7 +21,7 @@ #include <vcl/layout.hxx> #include <vcl/svapp.hxx> -short ExecuteQuerySaveDocument(Window* _pParent, const OUString& _rTitle) +short ExecuteQuerySaveDocument(vcl::Window* _pParent, const OUString& _rTitle) { if (Application::IsHeadlessModeEnabled()) { diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 1922cad4c5b7..6ee6c0f18b47 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -665,7 +665,7 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus ) && GetMediaDescr().find( aVersionCommentString ) == GetMediaDescr().end() ) { // notify the user that SaveAs is going to be done - Window* pWin = SfxStoringHelper::GetModelWindow( m_xModel ); + vcl::Window* pWin = SfxStoringHelper::GetModelWindow( m_xModel ); MessageDialog aMessageBox(pWin, SfxResId(STR_NEW_FILENAME_SAVE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_OK_CANCEL); if ( aMessageBox.Execute() == RET_OK ) @@ -1855,15 +1855,15 @@ bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame::XMod if ( !SvtSaveOptions().IsWarnAlienFormat() ) return true; - Window* pWin = SfxStoringHelper::GetModelWindow( xModel ); + vcl::Window* pWin = SfxStoringHelper::GetModelWindow( xModel ); SfxAlienWarningDialog aDlg( pWin, aOldUIName ); return aDlg.Execute() == RET_OK; } -Window* SfxStoringHelper::GetModelWindow( const uno::Reference< frame::XModel >& xModel ) +vcl::Window* SfxStoringHelper::GetModelWindow( const uno::Reference< frame::XModel >& xModel ) { - Window* pWin = 0; + vcl::Window* pWin = 0; try { if ( xModel.is() ) { diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index bfa748502772..f2650dcd9096 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -105,17 +105,17 @@ public: virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class IFrameWindow_Impl : public Window +class IFrameWindow_Impl : public vcl::Window { uno::Reference < frame::XFrame2 > mxFrame; public: - IFrameWindow_Impl( Window *pParent, + IFrameWindow_Impl( vcl::Window *pParent, bool bHasBorder, WinBits nWinBits = 0 ); }; -IFrameWindow_Impl::IFrameWindow_Impl( Window *pParent, bool bHasBorder, WinBits nWinBits ) +IFrameWindow_Impl::IFrameWindow_Impl( vcl::Window *pParent, bool bHasBorder, WinBits nWinBits ) : Window( pParent, nWinBits | WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_DOCKBORDER ) { if ( !bHasBorder ) @@ -173,7 +173,7 @@ throw( uno::RuntimeException, std::exception ) if ( SvtMiscOptions().IsPluginsEnabled() ) { DBG_ASSERT( !mxFrame.is(), "Frame already existing!" ); - Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); IFrameWindow_Impl* pWin = new IFrameWindow_Impl( pParent, maFrmDescr.IsFrameBorderOn() ); pWin->SetSizePixel( pParent->GetOutputSizePixel() ); pWin->SetBackground(); diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 9997782dc649..65dfc7e2237e 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -49,7 +49,7 @@ void SfxPreviewBase_Impl::SetObjectShell( SfxObjectShell* pObj ) } SfxPreviewBase_Impl::SfxPreviewBase_Impl( - Window* pParent, WinBits nStyle) + vcl::Window* pParent, WinBits nStyle) : Window(pParent, nStyle) , pMetaFile() { @@ -66,7 +66,7 @@ Size SfxPreviewBase_Impl::GetOptimalSize() const } void SfxPreviewWin_Impl::ImpPaint( - const Rectangle&, GDIMetaFile* pFile, Window* pWindow ) + const Rectangle&, GDIMetaFile* pFile, vcl::Window* pWindow ) { pWindow->SetLineColor(); Color aLightGrayCol( COL_LIGHTGRAY ); @@ -115,7 +115,7 @@ void SfxPreviewWin_Impl::Paint( const Rectangle& rRect ) ImpPaint( rRect, pMetaFile.get(), this ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSfxPreviewWin(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSfxPreviewWin(vcl::Window *pParent, VclBuilder::stringmap &) { return new SfxPreviewWin_Impl(pParent, 0); } @@ -216,7 +216,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update) if ( !xDocShell.Is() ) { - Window *pParent = Application::GetDefDialogParent(); + vcl::Window *pParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pAntiImpl ); SfxErrorContext eEC(ERRCTX_SFX_LOADTEMPLATE,pAntiImpl); SfxApplication *pSfxApp = SfxGetpApp(); @@ -444,7 +444,7 @@ SfxNewFileDialog_Impl::~SfxNewFileDialog_Impl() rExtra = m_pMoreBt->get_expanded() ? OUString("Y") : OUString("N"); } -SfxNewFileDialog::SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags) +SfxNewFileDialog::SfxNewFileDialog(vcl::Window *pParent, sal_uInt16 nFlags) : SfxModalDialog(pParent, "LoadTemplateDialog", "sfx/ui/loadtemplatedialog.ui") { diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index e1cb06382263..330f6b9e1384 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -289,7 +289,7 @@ void SfxObjectShell::UpdateTime_Impl( SfxDocumentInfoDialog* SfxObjectShell::CreateDocumentInfoDialog ( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rSet ) { diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 7939e4246a86..4b99eee87211 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1752,9 +1752,9 @@ bool SfxObjectShell::AdjustMacroMode( const OUString& /*rScriptType*/, bool bSup return pImp->aMacroMode.adjustMacroMode( xInteraction ); } -Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium ) +vcl::Window* SfxObjectShell::GetDialogParent( SfxMedium* pLoadingMedium ) { - Window* pWindow = 0; + vcl::Window* pWindow = 0; SfxItemSet* pSet = pLoadingMedium ? pLoadingMedium->GetItemSet() : GetMedium()->GetItemSet(); SFX_ITEMSET_ARG( pSet, pUnoItem, SfxUnoFrameItem, SID_FILLFRAME, false ); if ( pUnoItem ) diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 41f05b33117c..c75880a250eb 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2950,7 +2950,7 @@ sal_uInt16 SfxObjectShell::GetHiddenInformationState( sal_uInt16 nStates ) return nState; } -sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, Window* pParent ) +sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent ) { sal_Int16 nRet = RET_YES; sal_uInt16 nResId = sal_uInt16(); diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx index 51ce5b185bea..b68a09d0086b 100644 --- a/sfx2/source/doc/plugin.cxx +++ b/sfx2/source/doc/plugin.cxx @@ -45,11 +45,11 @@ using namespace ::com::sun::star; namespace { -class PluginWindow_Impl : public Window +class PluginWindow_Impl : public vcl::Window { public: uno::Reference < awt::XWindow > xWindow; - PluginWindow_Impl( Window* pParent ) + PluginWindow_Impl( vcl::Window* pParent ) : Window( pParent, WB_CLIPCHILDREN ) {} @@ -151,7 +151,7 @@ throw( uno::RuntimeException, std::exception ) if ( SvtMiscOptions().IsPluginsEnabled() ) { - Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); PluginWindow_Impl* pWin = new PluginWindow_Impl( pParent ); pWin->SetSizePixel( pParent->GetOutputSizePixel() ); pWin->SetBackground(); diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx index 94f8658056d1..3718e57922af 100644 --- a/sfx2/source/doc/querytemplate.cxx +++ b/sfx2/source/doc/querytemplate.cxx @@ -27,7 +27,7 @@ namespace sfx2 { -QueryTemplateBox::QueryTemplateBox( Window* pParent, const OUString& rMessage ) : +QueryTemplateBox::QueryTemplateBox( vcl::Window* pParent, const OUString& rMessage ) : MessBox ( pParent, 0, Application::GetDisplayName(), rMessage ) { SetImage( QueryBox::GetStandardImage() ); diff --git a/sfx2/source/doc/querytemplate.hxx b/sfx2/source/doc/querytemplate.hxx index e2d229b791f5..8c7411d5db39 100644 --- a/sfx2/source/doc/querytemplate.hxx +++ b/sfx2/source/doc/querytemplate.hxx @@ -27,7 +27,7 @@ namespace sfx2 class QueryTemplateBox : public MessBox { public: - QueryTemplateBox( Window* pParent, const OUString& rMessage ); + QueryTemplateBox( vcl::Window* pParent, const OUString& rMessage ); }; } // end of namespace sfx2 diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 8defb3e522f1..9975213bcd08 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -348,7 +348,7 @@ class SfxOwnFramesLocker { Sequence< Reference< frame::XFrame > > m_aLockedFrames; - Window* GetVCLWindow( const Reference< frame::XFrame >& xFrame ); + vcl::Window* GetVCLWindow( const Reference< frame::XFrame >& xFrame ); public: SfxOwnFramesLocker( SfxObjectShell* ObjechShell ); ~SfxOwnFramesLocker(); @@ -370,7 +370,7 @@ SfxOwnFramesLocker::SfxOwnFramesLocker( SfxObjectShell* pObjectShell ) { // get vcl window related to the frame and lock it if it is still not locked Reference< frame::XFrame > xFrame = rSfxFrame.GetFrameInterface(); - Window* pWindow = GetVCLWindow( xFrame ); + vcl::Window* pWindow = GetVCLWindow( xFrame ); if ( !pWindow ) throw RuntimeException(); @@ -403,9 +403,9 @@ SfxOwnFramesLocker::~SfxOwnFramesLocker() UnlockFrames(); } -Window* SfxOwnFramesLocker::GetVCLWindow( const Reference< frame::XFrame >& xFrame ) +vcl::Window* SfxOwnFramesLocker::GetVCLWindow( const Reference< frame::XFrame >& xFrame ) { - Window* pWindow = NULL; + vcl::Window* pWindow = NULL; if ( xFrame.is() ) { @@ -426,7 +426,7 @@ void SfxOwnFramesLocker::UnlockFrames() if ( m_aLockedFrames[nInd].is() ) { // get vcl window related to the frame and unlock it - Window* pWindow = GetVCLWindow( m_aLockedFrames[nInd] ); + vcl::Window* pWindow = GetVCLWindow( m_aLockedFrames[nInd] ); if ( !pWindow ) throw RuntimeException(); @@ -3651,7 +3651,7 @@ void SAL_CALL SfxBaseModel::setVisualAreaSize( sal_Int64 nAspect, const awt::Siz SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst( m_pData->m_pObjectShell, false ); if ( pViewFrm && m_pData->m_pObjectShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED && !pViewFrm->GetFrame().IsInPlace() ) { - Window* pWindow = VCLUnoHelper::GetWindow( pViewFrm->GetFrame().GetFrameInterface()->getContainerWindow() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( pViewFrm->GetFrame().GetFrameInterface()->getContainerWindow() ); Size aWinSize = pWindow->GetSizePixel(); awt::Size aCurrent = getVisualAreaSize( nAspect ); Size aDiff( aSize.Width-aCurrent.Width, aSize.Height-aCurrent.Height ); diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 2f9f9b5d1886..ba10d497e736 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -174,7 +174,7 @@ static bool cmpSelectionItems (const ThumbnailViewItem *pItem1, const ThumbnailV return pItem1->mnId > pItem2->mnId; } -SfxTemplateManagerDlg::SfxTemplateManagerDlg(Window *parent) +SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent) : ModelessDialog(parent, "TemplateDialog", "sfx/ui/templatedlg.ui"), maSelTemplates(cmpSelectionItems), maSelFolders(cmpSelectionItems), diff --git a/sfx2/source/inc/alienwarn.hxx b/sfx2/source/inc/alienwarn.hxx index 4ad97689d959..8609f68ce861 100644 --- a/sfx2/source/inc/alienwarn.hxx +++ b/sfx2/source/inc/alienwarn.hxx @@ -29,7 +29,7 @@ private: CheckBox* m_pWarningOnBox; public: - SfxAlienWarningDialog(Window* pParent, const OUString& _rFormatName); + SfxAlienWarningDialog(vcl::Window* pParent, const OUString& _rFormatName); virtual ~SfxAlienWarningDialog(); }; diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx index 39f2d80adea2..360f88713010 100644 --- a/sfx2/source/inc/documentfontsdialog.hxx +++ b/sfx2/source/inc/documentfontsdialog.hxx @@ -30,8 +30,8 @@ class SfxDocumentFontsPage: public SfxTabPage { public: - SfxDocumentFontsPage( Window* parent, const SfxItemSet& set ); - static SfxTabPage* Create( Window* parent, const SfxItemSet* set ); + SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSet& set ); + static SfxTabPage* Create( vcl::Window* parent, const SfxItemSet* set ); protected: virtual bool FillItemSet( SfxItemSet* set ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* set ) SAL_OVERRIDE; diff --git a/sfx2/source/inc/inputdlg.hxx b/sfx2/source/inc/inputdlg.hxx index c91b36cfe735..29b5c45b9453 100644 --- a/sfx2/source/inc/inputdlg.hxx +++ b/sfx2/source/inc/inputdlg.hxx @@ -19,7 +19,7 @@ class PushButton; class InputDialog : public ModalDialog { public: - InputDialog (const OUString &labelText, Window *pParent = NULL); + InputDialog (const OUString &labelText, vcl::Window *pParent = NULL); OUString getEntryText () const; private: diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx index b3a5c946f772..a065593d168d 100644 --- a/sfx2/source/inc/partwnd.hxx +++ b/sfx2/source/inc/partwnd.hxx @@ -45,7 +45,7 @@ namespace com class SfxPartChildWnd_Impl : public SfxChildWindow { public: - SfxPartChildWnd_Impl( Window* pParent, sal_uInt16 nId, + SfxPartChildWnd_Impl( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); @@ -66,7 +66,7 @@ protected: public: SfxPartDockWnd_Impl( SfxBindings* pBindings, SfxChildWindow* pChildWin, - Window* pParent, + vcl::Window* pParent, WinBits nBits ); virtual ~SfxPartDockWnd_Impl(); diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx index adc5de27dcc3..cbd4da7478a9 100644 --- a/sfx2/source/inc/preview.hxx +++ b/sfx2/source/inc/preview.hxx @@ -26,12 +26,12 @@ class SfxObjectShell; class GDIMetaFile; -class SfxPreviewBase_Impl : public Window +class SfxPreviewBase_Impl : public vcl::Window { protected: ::boost::shared_ptr<GDIMetaFile> pMetaFile; public: - SfxPreviewBase_Impl(Window* pParent, WinBits nStyle); + SfxPreviewBase_Impl(vcl::Window* pParent, WinBits nStyle); void SetObjectShell( SfxObjectShell* pObj ); virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -42,12 +42,12 @@ class SfxPreviewWin_Impl: public SfxPreviewBase_Impl protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - SfxPreviewWin_Impl(Window* pParent, WinBits nStyle) + SfxPreviewWin_Impl(vcl::Window* pParent, WinBits nStyle) : SfxPreviewBase_Impl(pParent, nStyle) { } static void ImpPaint( - const Rectangle& rRect, GDIMetaFile* pFile, Window* pWindow ); + const Rectangle& rRect, GDIMetaFile* pFile, vcl::Window* pWindow ); }; #endif diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx index 23c9b362ccc3..06fc314a2795 100644 --- a/sfx2/source/inc/recfloat.hxx +++ b/sfx2/source/inc/recfloat.hxx @@ -27,7 +27,7 @@ class SfxRecordingFloatWrapper_Impl : public SfxChildWindow { SfxBindings* pBindings; public: - SfxRecordingFloatWrapper_Impl( Window* pParent , + SfxRecordingFloatWrapper_Impl( vcl::Window* pParent , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); @@ -44,7 +44,7 @@ class SfxRecordingFloat_Impl : public SfxFloatingWindow public: SfxRecordingFloat_Impl( SfxBindings* pBindings , SfxChildWindow* pChildWin , - Window* pParent ); + vcl::Window* pParent ); virtual ~SfxRecordingFloat_Impl(); virtual bool Close() SAL_OVERRIDE; virtual void FillInfo( SfxChildWinInfo& rInfo ) const SAL_OVERRIDE; diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index e01b44e88f8e..76b690f332a4 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -63,7 +63,7 @@ protected: virtual void MouseButtonDown ( const MouseEvent& ) SAL_OVERRIDE; public: - SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, + SfxSplitWindow( vcl::Window* pParent, SfxChildAlignment eAl, SfxWorkWindow *pW, bool bWithButtons, WinBits nBits = WB_BORDER | WB_SIZEABLE | WB_3DLOOK ); diff --git a/sfx2/source/inc/templatesearchview.hxx b/sfx2/source/inc/templatesearchview.hxx index 94a9977053ac..2845c409fcb6 100644 --- a/sfx2/source/inc/templatesearchview.hxx +++ b/sfx2/source/inc/templatesearchview.hxx @@ -16,7 +16,7 @@ class TemplateSearchView : public ThumbnailView { public: - TemplateSearchView ( Window* pParent, WinBits nWinStyle = WB_TABSTOP | WB_VSCROLL); + TemplateSearchView ( vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP | WB_VSCROLL); virtual ~TemplateSearchView(); diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 2cbe1b7ec544..9da6c9772900 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -61,12 +61,12 @@ protected: sal_uInt16 nModifier; public: - DropListBox_Impl( Window* pParent, const ResId& rId, SfxCommonTemplateDialog_Impl* pD ) + DropListBox_Impl( vcl::Window* pParent, const ResId& rId, SfxCommonTemplateDialog_Impl* pD ) : SvTreeListBox(pParent, rId) , pDialog(pD) , nModifier(0) {} - DropListBox_Impl( Window* pParent, WinBits nWinBits, SfxCommonTemplateDialog_Impl* pD ) + DropListBox_Impl( vcl::Window* pParent, WinBits nWinBits, SfxCommonTemplateDialog_Impl* pD ) : SvTreeListBox(pParent, nWinBits) , pDialog(pD) , nModifier(0) @@ -159,7 +159,7 @@ protected: SfxBindings* pBindings; SfxTemplateControllerItem* pBoundItems[COUNT_BOUND_FUNC]; - Window* pWindow; + vcl::Window* pWindow; SfxModule* pModule; Timer* pTimer; @@ -263,7 +263,7 @@ protected: public: TYPEINFO_OVERRIDE(); - SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window*, bool ); + SfxCommonTemplateDialog_Impl( SfxBindings* pB, vcl::Window*, bool ); virtual ~SfxCommonTemplateDialog_Impl(); DECL_LINK( MenuSelectHdl, Menu * ); @@ -274,10 +274,10 @@ public: virtual void EnableHide( bool b = true ) { bCanHide = b; } virtual void EnableShow( bool b = true ) { bCanShow = b; } - Window* GetWindow() { return pWindow; } + vcl::Window* GetWindow() { return pWindow; } void EnableTreeDrag( bool b = true ); - void ExecuteContextMenu_Impl( const Point& rPos, Window* pWin ); + void ExecuteContextMenu_Impl( const Point& rPos, vcl::Window* pWin ); void EnableExample_Impl( sal_uInt16 nId, bool bEnable ); SfxStyleFamily GetActualFamily() const; OUString GetSelectedEntry() const; @@ -302,7 +302,7 @@ protected: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; public: - DropToolBox_Impl(Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog); + DropToolBox_Impl(vcl::Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog); virtual ~DropToolBox_Impl(); }; // class SfxTemplateDialog_Impl ------------------------------------------ @@ -315,7 +315,7 @@ private: friend class DropToolBox_Impl; friend class SfxTemplatePanelControl; - Window* m_pFloat; + vcl::Window* m_pFloat; bool m_bZoomIn; DropToolBox_Impl m_aActionTbL; ToolBox m_aActionTbR; diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index bba4b4f781bc..3204e2d479bf 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -82,7 +82,7 @@ class SfxViewVersionDialog_Impl : public SfxModalDialog DECL_LINK(ButtonHdl, Button*); public: - SfxViewVersionDialog_Impl(Window *pParent, SfxVersionInfo& rInfo, bool bEdit); + SfxViewVersionDialog_Impl(vcl::Window *pParent, SfxVersionInfo& rInfo, bool bEdit); }; class SfxCmisVersionsDialog : public SfxModalDialog diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 8671f43c06f3..970bbd7593ff 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -90,7 +90,7 @@ struct SfxStatBar_Impl struct SfxChild_Impl { - Window* pWin; + vcl::Window* pWin; Size aSize; SfxChildAlignment eAlign; sal_uInt16 nVisible; @@ -98,7 +98,7 @@ struct SfxChild_Impl bool bCanGetFocus; bool bSetFocus; - SfxChild_Impl( Window& rChild, const Size& rSize, + SfxChild_Impl( vcl::Window& rChild, const Size& rSize, SfxChildAlignment eAlignment, bool bIsVisible ): pWin(&rChild), aSize(rSize), eAlign(eAlignment), bResize(false), bCanGetFocus( false ), bSetFocus( false ) @@ -221,9 +221,9 @@ protected: SfxChildList_Impl aChildren; SfxChildWindows_Impl aChildWins; SfxBindings* pBindings; - Window* pWorkWin; + vcl::Window* pWorkWin; SfxShell* pConfigShell; - Window* pActiveChild; + vcl::Window* pActiveChild; sal_uInt16 nUpdateMode; sal_uInt16 nChildren; sal_uInt16 nOrigMode; @@ -244,7 +244,7 @@ protected: void CreateChildWin_Impl(SfxChildWin_Impl*,bool); void RemoveChildWin_Impl(SfxChildWin_Impl*); void Sort_Impl(); - SfxChild_Impl* FindChild_Impl( const Window& rWindow ) const; + SfxChild_Impl* FindChild_Impl( const vcl::Window& rWindow ) const; virtual bool RequestTopToolSpacePixel_Impl( SvBorder aBorder ); virtual Rectangle GetTopRect_Impl(); SvBorder Arrange_Impl(); @@ -252,11 +252,11 @@ protected: static bool IsPluginMode( SfxObjectShell* pObjShell ); public: - SfxWorkWindow( Window *pWin, SfxBindings& rBindings, SfxWorkWindow* pParent = NULL); + SfxWorkWindow( vcl::Window *pWin, SfxBindings& rBindings, SfxWorkWindow* pParent = NULL); virtual ~SfxWorkWindow(); SfxBindings& GetBindings() { return *pBindings; } - Window* GetWindow() const + vcl::Window* GetWindow() const { return pWorkWin; } Rectangle GetFreeArea( bool bAutoHide ) const; void SetDockingAllowed(bool bSet) @@ -272,8 +272,8 @@ public: // Methods for all Child windows void DataChanged_Impl( const DataChangedEvent& rDCEvt ); - void ReleaseChild_Impl( Window& rWindow ); - SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, bool bCanGetFocus=false ); + void ReleaseChild_Impl( vcl::Window& rWindow ); + SfxChild_Impl* RegisterChild_Impl( vcl::Window& rWindow, SfxChildAlignment eAlign, bool bCanGetFocus=false ); void ShowChildren_Impl(); void HideChildren_Impl(); bool PrepareClose_Impl(); @@ -316,7 +316,7 @@ public: bool IsVisible_Impl( sal_uInt16 nMode ) const; bool IsFloating( sal_uInt16 nId ); - void SetActiveChild_Impl( Window *pChild ); + void SetActiveChild_Impl( vcl::Window *pChild ); virtual bool ActivateNextChild_Impl( bool bForward = true ); bool AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const; @@ -333,7 +333,7 @@ class SfxFrameWorkWin_Impl : public SfxWorkWindow SfxFrame* pMasterFrame; SfxFrame* pFrame; public: - SfxFrameWorkWin_Impl( Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster ); + SfxFrameWorkWin_Impl( vcl::Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster ); virtual void ArrangeChildren_Impl( bool bForce = true ) SAL_OVERRIDE; virtual void UpdateObjectBars_Impl() SAL_OVERRIDE; virtual Rectangle GetTopRect_Impl() SAL_OVERRIDE; diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index cf58c3c6557d..9c22a053a5ce 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -152,7 +152,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, Execute } -Window* SfxURLToolBoxControl_Impl::CreateItemWindow( Window* pParent ) +vcl::Window* SfxURLToolBoxControl_Impl::CreateItemWindow( vcl::Window* pParent ) { SvtURLBox* pURLBox = new SvtURLBox( pParent ); pURLBox->SetOpenHdl( LINK( this, SfxURLToolBoxControl_Impl, OpenHdl ) ); @@ -181,7 +181,7 @@ IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, OpenHdl) Reference< XFrame > xFrame( xDesktop->getActiveFrame(), UNO_QUERY ); if ( xFrame.is() ) { - Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); if ( pWin ) { pWin->GrabFocus(); diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 6f2f5db14952..55eb9884c7b3 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -252,7 +252,7 @@ void SfxPopupMenuManager::RemoveDisabledEntries() -sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow ) +sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, vcl::Window* pWindow ) { sal_uInt16 nVal = ( (PopupMenu*) GetMenu()->GetSVMenu() )->Execute( pWindow, rPos ); delete pStaticThesSubMenu; pStaticThesSubMenu = NULL; @@ -279,7 +279,7 @@ SfxPopupMenuManager::SfxPopupMenuManager( PopupMenu* pMenuArg, SfxBindings& rBin { } -SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow ) +SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, vcl::Window* pWindow ) { PopupMenu *pSVMenu = new PopupMenu( rResId ); sal_uInt16 n, nCount = pSVMenu->GetItemCount(); @@ -331,7 +331,7 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra } -void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFrame, const Point& rPoint, Window* pWindow ) +void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFrame, const Point& rPoint, vcl::Window* pWindow ) { PopupMenu *pSVMenu = new PopupMenu( rResId ); sal_uInt16 n, nCount = pSVMenu->GetItemCount(); diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 59f0fbebc763..4c46417c7338 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -834,7 +834,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) 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() ); @@ -953,7 +953,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu ) Reference< XFrame > xFrame; if (( aItem >>= xFrame ) && xFrame.is() && nTaskId == nSlotId ) { - Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); + vcl::Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); pWin->GrabFocus(); pWin->ToTop( TOTOP_RESTOREWHENMIN ); break; diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx index ff24c9df16c4..4071d981746e 100644 --- a/sfx2/source/sidebar/ControlFactory.cxx +++ b/sfx2/source/sidebar/ControlFactory.cxx @@ -27,12 +27,12 @@ namespace sfx2 { namespace sidebar { -CheckBox* ControlFactory::CreateMenuButton (Window* pParentWindow) +CheckBox* ControlFactory::CreateMenuButton (vcl::Window* pParentWindow) { return new MenuButton(pParentWindow); } -ImageRadioButton* ControlFactory::CreateTabItem (Window* pParentWindow) +ImageRadioButton* ControlFactory::CreateTabItem (vcl::Window* pParentWindow) { return new TabItem(pParentWindow); } diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index 8a2b86470d26..16d4acaa4391 100644 --- a/sfx2/source/sidebar/ControllerFactory.cxx +++ b/sfx2/source/sidebar/ControllerFactory.cxx @@ -105,7 +105,7 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( if (rxParentWindow.is()) { Reference<awt::XWindow> xItemWindow (xController->createItemWindow(rxParentWindow)); - Window* pItemWindow = VCLUnoHelper::GetWindow(xItemWindow); + vcl::Window* pItemWindow = VCLUnoHelper::GetWindow(xItemWindow); if (pItemWindow != NULL) { WindowType nType = pItemWindow->GetType(); diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 20fdb19e7bc7..e5baf1c9d9bd 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -42,7 +42,7 @@ namespace sfx2 { namespace sidebar { Deck::Deck ( const DeckDescriptor& rDeckDescriptor, - Window* pParentWindow, + vcl::Window* pParentWindow, const ::boost::function<void(void)>& rCloserAction) : Window(pParentWindow, 0), msId(rDeckDescriptor.msId), @@ -52,9 +52,9 @@ Deck::Deck ( mnMinimalWidth(0), maPanels(), mpTitleBar(new DeckTitleBar(rDeckDescriptor.msTitle, this, rCloserAction)), - mpScrollClipWindow(new Window(this)), + mpScrollClipWindow(new vcl::Window(this)), mpScrollContainer(new ScrollContainerWindow(mpScrollClipWindow.get())), - mpFiller(new Window(this)), + mpFiller(new vcl::Window(this)), mpVerticalScrollBar(new ScrollBar(this)) { SetBackground(Wallpaper()); @@ -254,7 +254,7 @@ void Deck::RequestLayout (void) *mpVerticalScrollBar); } -::Window* Deck::GetPanelParentWindow (void) +vcl::Window* Deck::GetPanelParentWindow (void) { return mpScrollContainer.get(); } @@ -291,7 +291,7 @@ void Deck::ShowPanel (const Panel& rPanel) -const OUString GetWindowClassification (const Window* pWindow) +const OUString GetWindowClassification (const vcl::Window* pWindow) { const OUString& rsName (pWindow->GetText()); if (!rsName.isEmpty()) @@ -305,7 +305,7 @@ const OUString GetWindowClassification (const Window* pWindow) } -void Deck::PrintWindowSubTree (Window* pRoot, int nIndentation) +void Deck::PrintWindowSubTree (vcl::Window* pRoot, int nIndentation) { static const char* sIndentation = " "; const Point aLocation (pRoot->GetPosPixel()); @@ -345,7 +345,7 @@ IMPL_LINK(Deck, HandleVerticalScrollBarChange,void*, EMPTYARG) //----- Deck::ScrollContainerWindow ------------------------------------------- -Deck::ScrollContainerWindow::ScrollContainerWindow (Window* pParentWindow) +Deck::ScrollContainerWindow::ScrollContainerWindow (vcl::Window* pParentWindow) : Window(pParentWindow), maSeparators() { diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx index a88e2589738f..c071f1d3a5d2 100644 --- a/sfx2/source/sidebar/Deck.hxx +++ b/sfx2/source/sidebar/Deck.hxx @@ -40,12 +40,12 @@ class DeckTitleBar; It displays the deck title. */ class Deck - : public Window + : public vcl::Window { public: Deck ( const DeckDescriptor& rDeckDescriptor, - Window* pParentWindow, + vcl::Window* pParentWindow, const ::boost::function<void(void)>& rCloserAction); virtual ~Deck (void); @@ -57,7 +57,7 @@ public: void SetPanels (const SharedPanelContainer& rPanels); const SharedPanelContainer& GetPanels (void) const { return maPanels;} void RequestLayout (void); - ::Window* GetPanelParentWindow (void); + vcl::Window* GetPanelParentWindow (void); /** Try to make the panel completely visible. When the whole panel does not fit then make its top visible @@ -70,14 +70,14 @@ public: virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; void PrintWindowTree(); - static void PrintWindowSubTree (Window* pRoot, int nIndentation); + static void PrintWindowSubTree (vcl::Window* pRoot, int nIndentation); sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; } - class ScrollContainerWindow : public Window + class ScrollContainerWindow : public vcl::Window { public: - ScrollContainerWindow (Window* pParentWindow); + ScrollContainerWindow (vcl::Window* pParentWindow); virtual ~ScrollContainerWindow (void); virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; void SetSeparators (const ::std::vector<sal_Int32>& rSeparators); @@ -94,9 +94,9 @@ private: sal_Int32 mnMinimalWidth; SharedPanelContainer maPanels; ::boost::scoped_ptr<DeckTitleBar> mpTitleBar; - ::boost::scoped_ptr<Window> mpScrollClipWindow; + ::boost::scoped_ptr<vcl::Window> mpScrollClipWindow; ::boost::scoped_ptr<ScrollContainerWindow> mpScrollContainer; - ::boost::scoped_ptr<Window> mpFiller; + ::boost::scoped_ptr<vcl::Window> mpFiller; ::boost::scoped_ptr<ScrollBar> mpVerticalScrollBar; DECL_LINK(HandleVerticalScrollBarChange,void*); diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index c4a425945cf0..a7639fbd6aac 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -50,10 +50,10 @@ void DeckLayouter::LayoutDeck ( const Rectangle aContentArea, sal_Int32& rMinimalWidth, SharedPanelContainer& rPanels, - Window& rDeckTitleBar, - Window& rScrollClipWindow, - Window& rScrollContainer, - Window& rFiller, + vcl::Window& rDeckTitleBar, + vcl::Window& rScrollClipWindow, + vcl::Window& rScrollContainer, + vcl::Window& rFiller, ScrollBar& rVerticalScrollBar) { if (aContentArea.GetWidth()<=0 || aContentArea.GetHeight()<=0) @@ -89,8 +89,8 @@ Rectangle DeckLayouter::LayoutPanels ( const Rectangle aContentArea, sal_Int32& rMinimalWidth, ::std::vector<LayoutItem>& rLayoutItems, - Window& rScrollClipWindow, - Window& rScrollContainer, + vcl::Window& rScrollClipWindow, + vcl::Window& rScrollContainer, ScrollBar& rVerticalScrollBar, const bool bShowVerticalScrollBar) { @@ -197,7 +197,7 @@ sal_Int32 DeckLayouter::PlacePanels ( ::std::vector<LayoutItem>& rLayoutItems, const sal_Int32 nWidth, const LayoutMode eMode, - Window& rScrollContainer) + vcl::Window& rScrollContainer) { ::std::vector<sal_Int32> aSeparators; const sal_Int32 nDeckSeparatorHeight (Theme::GetInteger(Theme::Int_DeckSeparatorHeight)); @@ -429,7 +429,7 @@ void DeckLayouter::DistributeHeights ( Rectangle DeckLayouter::PlaceDeckTitle ( - Window& rDeckTitleBar, + vcl::Window& rDeckTitleBar, const Rectangle& rAvailableSpace) { if (static_cast<DockingWindow*>(rDeckTitleBar.GetParent()->GetParent())->IsFloatingMode()) @@ -504,7 +504,7 @@ void DeckLayouter::SetupVerticalScrollBar( void DeckLayouter::UpdateFiller ( - Window& rFiller, + vcl::Window& rFiller, const Rectangle& rBox) { if (rBox.GetHeight() > 0) diff --git a/sfx2/source/sidebar/DeckLayouter.hxx b/sfx2/source/sidebar/DeckLayouter.hxx index 10a90e676528..fa2b5ea8bcda 100644 --- a/sfx2/source/sidebar/DeckLayouter.hxx +++ b/sfx2/source/sidebar/DeckLayouter.hxx @@ -28,7 +28,7 @@ #include <vector> class ScrollBar; -class Window; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { @@ -45,10 +45,10 @@ public: const Rectangle aContentArea, sal_Int32& rMinimalWidth, SharedPanelContainer& rPanels, - Window& pDeckTitleBar, - Window& pScrollClipWindow, - Window& pScrollContainer, - Window& pFiller, + vcl::Window& pDeckTitleBar, + vcl::Window& pScrollClipWindow, + vcl::Window& pScrollContainer, + vcl::Window& pFiller, ScrollBar& pVerticalScrollBar); private: @@ -80,8 +80,8 @@ private: const Rectangle aContentArea, sal_Int32& rMinimalWidth, ::std::vector<LayoutItem>& rLayoutItems, - Window& rScrollClipWindow, - Window& rScrollContainer, + vcl::Window& rScrollClipWindow, + vcl::Window& rScrollContainer, ScrollBar& pVerticalScrollBar, const bool bShowVerticalScrollBar); static void GetRequestedSizes ( @@ -98,9 +98,9 @@ private: ::std::vector<LayoutItem>& rLayoutItems, const sal_Int32 nWidth, const LayoutMode eMode, - Window& rScrollContainer); + vcl::Window& rScrollContainer); static Rectangle PlaceDeckTitle ( - Window& rTittleBar, + vcl::Window& rTittleBar, const Rectangle& rAvailableSpace); static Rectangle PlaceVerticalScrollBar ( ScrollBar& rVerticalScrollBar, @@ -111,7 +111,7 @@ private: const sal_Int32 nContentHeight, const sal_Int32 nVisibleHeight); static void UpdateFiller ( - Window& rFiller, + vcl::Window& rFiller, const Rectangle& rBox); }; diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index fb1a6a0b7848..9a476f804b4f 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -37,7 +37,7 @@ static const sal_Int32 gaRightGripPadding (3); DeckTitleBar::DeckTitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, const ::boost::function<void(void)>& rCloserAction) : TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()), mnCloserItemIndex(1), diff --git a/sfx2/source/sidebar/DeckTitleBar.hxx b/sfx2/source/sidebar/DeckTitleBar.hxx index dae392f16616..6717ca28caa4 100644 --- a/sfx2/source/sidebar/DeckTitleBar.hxx +++ b/sfx2/source/sidebar/DeckTitleBar.hxx @@ -32,7 +32,7 @@ class DeckTitleBar public: DeckTitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, const ::boost::function<void(void)>& rCloserAction); virtual ~DeckTitleBar (void); diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index 244fc9413412..f7bf4f0492c2 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -174,7 +174,7 @@ void FocusManager::SetButtons (const ::std::vector<Button*>& rButtons) -void FocusManager::RegisterWindow (Window& rWindow) +void FocusManager::RegisterWindow (vcl::Window& rWindow) { rWindow.AddEventListener(LINK(this, FocusManager, WindowEventListener)); } @@ -182,7 +182,7 @@ void FocusManager::RegisterWindow (Window& rWindow) -void FocusManager::UnregisterWindow (Window& rWindow) +void FocusManager::UnregisterWindow (vcl::Window& rWindow) { rWindow.RemoveEventListener(LINK(this, FocusManager, WindowEventListener)); } @@ -190,7 +190,7 @@ void FocusManager::UnregisterWindow (Window& rWindow) -FocusManager::FocusLocation FocusManager::GetFocusLocation (const Window& rWindow) const +FocusManager::FocusLocation FocusManager::GetFocusLocation (const vcl::Window& rWindow) const { // Check the deck title. if (mpDeckTitleBar != NULL) @@ -309,7 +309,7 @@ void FocusManager::FocusPanel ( void FocusManager::FocusPanelContent (const sal_Int32 nPanelIndex) { - Window* pWindow = VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow()); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow()); if (pWindow != NULL) { mbObservingContentControlFocus = true; @@ -342,7 +342,7 @@ void FocusManager::ClickButton (const sal_Int32 nButtonIndex) -void FocusManager::RemoveWindow (Window& rWindow) +void FocusManager::RemoveWindow (vcl::Window& rWindow) { ::std::vector<Panel*>::iterator iPanel (::std::find(maPanels.begin(), maPanels.end(), &rWindow)); if (iPanel != maPanels.end()) @@ -435,7 +435,7 @@ bool FocusManager::MoveFocusInsideDeckTitle ( void FocusManager::HandleKeyEvent ( const vcl::KeyCode& rKeyCode, - const Window& rWindow) + const vcl::Window& rWindow) { const FocusLocation aLocation (GetFocusLocation(rWindow)); mpLastFocusedWindow = NULL; @@ -594,7 +594,7 @@ IMPL_LINK(FocusManager, WindowEventListener, VclSimpleEvent*, pEvent) return 0; VclWindowEvent* pWindowEvent = static_cast<VclWindowEvent*>(pEvent); - Window* pSource = pWindowEvent->GetWindow(); + vcl::Window* pSource = pWindowEvent->GetWindow(); if (pSource == NULL) return 0; @@ -635,7 +635,7 @@ IMPL_LINK(FocusManager, ChildEventListener, VclSimpleEvent*, pEvent) return 0; VclWindowEvent* pWindowEvent = static_cast<VclWindowEvent*>(pEvent); - Window* pSource = pWindowEvent->GetWindow(); + vcl::Window* pSource = pWindowEvent->GetWindow(); if (pSource == NULL) return 0; @@ -647,7 +647,7 @@ IMPL_LINK(FocusManager, ChildEventListener, VclSimpleEvent*, pEvent) // Go up the window hierarchy to find out whether the // parent of the event source is known to us. - Window* pWindow = pSource; + vcl::Window* pWindow = pSource; FocusLocation aLocation (PC_None, -1); while (true) { diff --git a/sfx2/source/sidebar/FocusManager.hxx b/sfx2/source/sidebar/FocusManager.hxx index d0d9c2c2a5b2..f8dba00ebcf4 100644 --- a/sfx2/source/sidebar/FocusManager.hxx +++ b/sfx2/source/sidebar/FocusManager.hxx @@ -73,8 +73,8 @@ private: ::std::vector<Button*> maButtons; const ::boost::function<void(const Panel&)> maShowPanelFunctor; bool mbObservingContentControlFocus; - Window* mpFirstFocusedContentControl; - Window* mpLastFocusedWindow; + vcl::Window* mpFirstFocusedContentControl; + vcl::Window* mpLastFocusedWindow; enum PanelComponent { @@ -105,12 +105,12 @@ private: /** Let the focus manager listen for window events for the given window. */ - void RegisterWindow (Window& rWindow); - void UnregisterWindow (Window& rWindow); + void RegisterWindow (vcl::Window& rWindow); + void UnregisterWindow (vcl::Window& rWindow); /** Remove the window from the panel or the button container. */ - void RemoveWindow (Window& rWindow); + void RemoveWindow (vcl::Window& rWindow); void FocusDeckTitle (void); bool IsDeckTitleVisible (void) const; @@ -141,9 +141,9 @@ private: void HandleKeyEvent ( const vcl::KeyCode& rKeyCode, - const Window& rWindow); + const vcl::Window& rWindow); - FocusLocation GetFocusLocation (const Window& rWindow) const; + FocusLocation GetFocusLocation (const vcl::Window& rWindow) const; }; diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx index f2e9a438fabf..7bccc4f87b26 100644 --- a/sfx2/source/sidebar/MenuButton.cxx +++ b/sfx2/source/sidebar/MenuButton.cxx @@ -31,7 +31,7 @@ using namespace css::uno; namespace sfx2 { namespace sidebar { -MenuButton::MenuButton (Window* pParentWindow) +MenuButton::MenuButton (vcl::Window* pParentWindow) : CheckBox(pParentWindow), mbIsLeftButtonDown(false), mePaintType(PT_Theme) diff --git a/sfx2/source/sidebar/MenuButton.hxx b/sfx2/source/sidebar/MenuButton.hxx index 268eff9a3da6..0077c2417dbe 100644 --- a/sfx2/source/sidebar/MenuButton.hxx +++ b/sfx2/source/sidebar/MenuButton.hxx @@ -28,7 +28,7 @@ class MenuButton : public CheckBox { public: - MenuButton (Window* pParentWindow); + MenuButton (vcl::Window* pParentWindow); virtual ~MenuButton (void); virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index b96b439c0167..bc89d9b45a9f 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -47,7 +47,7 @@ namespace sfx2 { namespace sidebar { Panel::Panel ( const PanelDescriptor& rPanelDescriptor, - Window* pParentWindow, + vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const ::boost::function<void(void)>& rDeckLayoutTrigger, const ::boost::function<Context(void)>& rContextAccess) diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx index 7196a77dd3e5..2fea00bcfd56 100644 --- a/sfx2/source/sidebar/Panel.hxx +++ b/sfx2/source/sidebar/Panel.hxx @@ -39,12 +39,12 @@ class PanelTitleBar; class Panel - : public Window + : public vcl::Window { public: Panel ( const PanelDescriptor& rPanelDescriptor, - Window* pParentWindow, + vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const ::boost::function<void(void)>& rDeckLayoutTrigger, const ::boost::function<Context(void)>& rContextAccess); diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 5f722cb700bb..983b25de38ab 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -43,7 +43,7 @@ static const sal_Int32 gaRightIconPadding (5); PanelTitleBar::PanelTitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, Panel* pPanel) : TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()), mbIsLeftButtonDown(false), diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx b/sfx2/source/sidebar/PanelTitleBar.hxx index 2e2adbb9510c..57f9469dfa64 100644 --- a/sfx2/source/sidebar/PanelTitleBar.hxx +++ b/sfx2/source/sidebar/PanelTitleBar.hxx @@ -35,7 +35,7 @@ class PanelTitleBar public: PanelTitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, Panel* pPanel ); virtual ~PanelTitleBar (void); diff --git a/sfx2/source/sidebar/PopupContainer.cxx b/sfx2/source/sidebar/PopupContainer.cxx index 9167dd61d965..97566fba0a7a 100644 --- a/sfx2/source/sidebar/PopupContainer.cxx +++ b/sfx2/source/sidebar/PopupContainer.cxx @@ -22,7 +22,7 @@ namespace sfx2 { namespace sidebar { -PopupContainer::PopupContainer (Window* pParent) +PopupContainer::PopupContainer (vcl::Window* pParent) : FloatingWindow(pParent, WB_SYSTEMWINDOW | WB_3DLOOK) { } diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx index fc78ac712c82..f6aa2fdf5222 100644 --- a/sfx2/source/sidebar/SidebarChildWindow.cxx +++ b/sfx2/source/sidebar/SidebarChildWindow.cxx @@ -34,7 +34,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow, SID_SIDEBAR); SidebarChildWindow::SidebarChildWindow ( - Window* pParentWindow, + vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) @@ -61,7 +61,7 @@ SidebarChildWindow::SidebarChildWindow ( -sal_Int32 SidebarChildWindow::GetDefaultWidth (Window* pWindow) +sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window* pWindow) { if (pWindow != NULL) { diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index ed8861764a63..540de5b49d85 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -330,7 +330,7 @@ void SidebarController::NotifyResize (void) return; } - Window* pParentWindow = mpTabBar->GetParent(); + vcl::Window* pParentWindow = mpTabBar->GetParent(); sal_Int32 nTabBarDefaultWidth = TabBar::GetDefaultWidth() * mpTabBar->GetDPIScaleFactor(); const sal_Int32 nWidth (pParentWindow->GetSizePixel().Width()); @@ -720,7 +720,7 @@ void SidebarController::SwitchToDeck ( SharedPanel SidebarController::CreatePanel ( const OUString& rsPanelId, - ::Window* pParentWindow, + vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const Context& rContext) { @@ -1096,7 +1096,7 @@ sal_Int32 SidebarController::SetChildWindowWidth (const sal_Int32 nNewWidth) pSplitWindow->GetWindowPos(mpParentWindow, nColumn, nRow); const long nColumnWidth (pSplitWindow->GetLineSize(nColumn)); - Window* pWindow = mpParentWindow; + vcl::Window* pWindow = mpParentWindow; const Size aWindowSize (pWindow->GetSizePixel()); pSplitWindow->MoveWindow( diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx index 31306b2300ce..33cfea65e15a 100644 --- a/sfx2/source/sidebar/SidebarController.hxx +++ b/sfx2/source/sidebar/SidebarController.hxx @@ -184,7 +184,7 @@ private: to indicate that when the current mouse drag operation ends, the sidebar will only show the tab bar. */ - ::boost::scoped_ptr<Window> mpCloseIndicator; + ::boost::scoped_ptr<vcl::Window> mpCloseIndicator; DECL_LINK(WindowEventHandler, VclWindowEvent*); /** Make maRequestedContext the current context. @@ -198,7 +198,7 @@ private: const Context& rContext); SharedPanel CreatePanel ( const ::rtl::OUString& rsPanelId, - ::Window* pParentWindow, + vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const Context& rContext); void SwitchToDeck ( diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index d6c91db1ce50..1a39746f810d 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -34,7 +34,7 @@ namespace sfx2 { namespace sidebar { SidebarDockingWindow::SidebarDockingWindow( SfxBindings* pSfxBindings, SidebarChildWindow& rChildWindow, - Window* pParentWindow, + vcl::Window* pParentWindow, WinBits nBits) : SfxDockingWindow(pSfxBindings, &rChildWindow, pParentWindow, nBits), mpSidebarController() diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx b/sfx2/source/sidebar/SidebarDockingWindow.hxx index 0fde50e6e8b0..2c46e41cc31e 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.hxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx @@ -36,7 +36,7 @@ public: SidebarDockingWindow( SfxBindings* pBindings, SidebarChildWindow& rChildWindow, - Window* pParent, + vcl::Window* pParent, WinBits nBits); virtual ~SidebarDockingWindow (void); diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx index 8e4c9b0f3d12..74f3c0e9d859 100644 --- a/sfx2/source/sidebar/SidebarPanelBase.cxx +++ b/sfx2/source/sidebar/SidebarPanelBase.cxx @@ -37,7 +37,7 @@ namespace sfx2 { namespace sidebar { Reference<ui::XUIElement> SidebarPanelBase::Create ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pWindow, + vcl::Window* pWindow, const css::ui::LayoutSize& rLayoutSize) { Reference<ui::XUIElement> xUIElement ( @@ -55,7 +55,7 @@ Reference<ui::XUIElement> SidebarPanelBase::Create ( SidebarPanelBase::SidebarPanelBase ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pWindow, + vcl::Window* pWindow, const css::ui::LayoutSize& rLayoutSize) : SidebarPanelBaseInterfaceBase(m_aMutex), mxFrame(rxFrame), diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index f6f1e5c0c5cf..0f038a13c79b 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -38,7 +38,7 @@ using ::rtl::OUString; namespace sfx2 { namespace sidebar { -SidebarToolBox::SidebarToolBox (Window* pParentWindow) +SidebarToolBox::SidebarToolBox (vcl::Window* pParentWindow) : ToolBox(pParentWindow, 0), maItemSeparator(Theme::GetImage(Theme::Image_ToolBoxItemSeparator)), maControllers(), @@ -53,7 +53,7 @@ SidebarToolBox::SidebarToolBox (Window* pParentWindow) #endif } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarToolBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSidebarToolBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new SidebarToolBox(pParent); } diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index c64f0eaeeed8..563b5feb12c8 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -44,7 +44,7 @@ using namespace css::uno; namespace sfx2 { namespace sidebar { TabBar::TabBar ( - Window* pParentWindow, + vcl::Window* pParentWindow, const Reference<frame::XFrame>& rxFrame, const ::boost::function<void(const ::rtl::OUString&)>& rDeckActivationFunctor, const PopupMenuProvider& rPopupMenuProvider) diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx index ffef7729759a..b9cdc556f9a5 100644 --- a/sfx2/source/sidebar/TabBar.hxx +++ b/sfx2/source/sidebar/TabBar.hxx @@ -45,7 +45,7 @@ class TabItem; /** The tab bar is the container for the individual tabs. */ class TabBar - : public Window + : public vcl::Window { public: /** DeckMenuData has entries for display name, deck id, and a flag: @@ -65,7 +65,7 @@ public: const Rectangle&, const ::std::vector<DeckMenuData>& rMenuData)> PopupMenuProvider; TabBar ( - Window* pParentWindow, + vcl::Window* pParentWindow, const css::uno::Reference<css::frame::XFrame>& rxFrame, const ::boost::function<void(const ::rtl::OUString&rsDeckId)>& rDeckActivationFunctor, const PopupMenuProvider& rPopupMenuProvider); diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx index 1d5bc994e34e..a7037da0f73a 100644 --- a/sfx2/source/sidebar/TabItem.cxx +++ b/sfx2/source/sidebar/TabItem.cxx @@ -32,7 +32,7 @@ using namespace css::uno; namespace sfx2 { namespace sidebar { -TabItem::TabItem (Window* pParentWindow) +TabItem::TabItem (vcl::Window* pParentWindow) : ImageRadioButton(pParentWindow), mbIsLeftButtonDown(false), mePaintType(PT_Theme) diff --git a/sfx2/source/sidebar/TabItem.hxx b/sfx2/source/sidebar/TabItem.hxx index 32ee7d5394cb..9872d379ee5d 100644 --- a/sfx2/source/sidebar/TabItem.hxx +++ b/sfx2/source/sidebar/TabItem.hxx @@ -23,7 +23,7 @@ #include "DeckDescriptor.hxx" -class Window; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { @@ -33,7 +33,7 @@ class TabItem : public ImageRadioButton { public: - TabItem (Window* pParentWindow); + TabItem (vcl::Window* pParentWindow); virtual ~TabItem (void); virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index 3295859d3066..ca59c4b1c3df 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -39,7 +39,7 @@ namespace sfx2 { namespace sidebar { TitleBar::TitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, const sidebar::Paint& rInitialBackgroundPaint) : Window(pParentWindow), maToolBox(this), diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx index a499bca14563..a6bdedf0ff79 100644 --- a/sfx2/source/sidebar/TitleBar.hxx +++ b/sfx2/source/sidebar/TitleBar.hxx @@ -28,12 +28,12 @@ namespace sfx2 { namespace sidebar { class TitleBar - : public Window + : public vcl::Window { public: TitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, const sidebar::Paint& rInitialBackgroundPaint); virtual ~TitleBar (void); diff --git a/sfx2/source/sidebar/ToolBox.hxx b/sfx2/source/sidebar/ToolBox.hxx index 72e5850b3583..94e91f7dd505 100644 --- a/sfx2/source/sidebar/ToolBox.hxx +++ b/sfx2/source/sidebar/ToolBox.hxx @@ -28,7 +28,7 @@ class ToolBox : public ::ToolBox { public: - MenuButton (Window* pParentWindow); + MenuButton (vcl::Window* pParentWindow); virtual ~MenuButton (void); virtual void Paint (const Rectangle& rUpdateArea); diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index dcd74baf447d..a6c3be44cd3c 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -107,7 +107,7 @@ using namespace ::com::sun::star::ui; SFX_IMPL_TOOLBOX_CONTROL_ARG(SfxToolBoxControl, SfxStringItem, true); SFX_IMPL_TOOLBOX_CONTROL(SfxRecentFilesToolBoxControl, SfxStringItem); -static Window* GetTopMostParentSystemWindow( Window* pWindow ) +static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) { OSL_ASSERT( pWindow ); if ( pWindow ) @@ -204,7 +204,7 @@ IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEvent (( pEvent->GetId() == VCLEVENT_WINDOW_MOVE ) || ( pEvent->GetId() == VCLEVENT_WINDOW_ACTIVATE ))) { - Window* pWindow( ((VclWindowEvent*)pEvent)->GetWindow() ); + vcl::Window* pWindow( ((VclWindowEvent*)pEvent)->GetWindow() ); if (( pWindow == mpFloatingWindow ) && ( mpPopupWindow != 0 )) { @@ -274,7 +274,7 @@ void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::Runtime // Remove and destroy our item window at our toolbox SolarMutexGuard aGuard; - Window* pWindow = pImpl->pBox->GetItemWindow( pImpl->nTbxId ); + vcl::Window* pWindow = pImpl->pBox->GetItemWindow( pImpl->nTbxId ); pImpl->pBox->SetItemWindow( pImpl->nTbxId, 0 ); delete pWindow; @@ -625,7 +625,7 @@ void SAL_CALL SfxToolBoxControl::doubleClick() throw (::com::sun::star::uno::Run Reference< ::com::sun::star::awt::XWindow > SAL_CALL SfxToolBoxControl::createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window* pWindow = CreatePopupWindow(); + vcl::Window* pWindow = CreatePopupWindow(); if ( pWindow ) return VCLUnoHelper::GetInterface( pWindow ); else @@ -720,7 +720,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception) OUString aPersistentString( "Persistent" ); try { - Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); + vcl::Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); if ( pTbxWindow && pTbxWindow->GetType() == WINDOW_TOOLBOX ) { Any a; @@ -823,14 +823,14 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBar } pImpl->mxUIElement = xUIElement; - Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); + vcl::Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); ToolBox* pToolBar( 0 ); if ( pTbxWindow && pTbxWindow->GetType() == WINDOW_TOOLBOX ) pToolBar = (ToolBox *)pTbxWindow; if ( pToolBar ) { - Window* pParentTbxWindow( pImpl->pBox ); + vcl::Window* pParentTbxWindow( pImpl->pBox ); pToolBar->SetParent( pParentTbxWindow ); ::Size aSize = getPersistentFloatingSize( xFrame, rSubToolBarResName ); if ( aSize.Width() == 0 || aSize.Height() == 0 ) @@ -841,7 +841,7 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBar pToolBar->SetSizePixel( aSize ); // open subtoolbox in popup mode - Window::GetDockingManager()->StartPopupMode( pImpl->pBox, pToolBar ); + vcl::Window::GetDockingManager()->StartPopupMode( pImpl->pBox, pToolBar ); } } } @@ -992,7 +992,7 @@ SfxPopupWindow* SfxToolBoxControl::CreatePopupWindowCascading() -Window* SfxToolBoxControl::CreateItemWindow( Window * ) +vcl::Window* SfxToolBoxControl::CreateItemWindow( vcl::Window * ) { return 0; } @@ -1148,7 +1148,7 @@ SfxPopupWindow::SfxPopupWindow( , m_xFrame( rFrame ) , m_pStatusListener( 0 ) { - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } @@ -1162,7 +1162,7 @@ SfxPopupWindow::SfxPopupWindow(sal_uInt16 nId, const OString& rID, const OUStrin , m_xFrame( rFrame ) , m_pStatusListener( 0 ) { - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } @@ -1170,7 +1170,7 @@ SfxPopupWindow::SfxPopupWindow(sal_uInt16 nId, const OString& rID, const OUStrin SfxPopupWindow::SfxPopupWindow( sal_uInt16 nId, const Reference< XFrame >& rFrame, - Window* pParentWindow, + vcl::Window* pParentWindow, WinBits nBits ) : FloatingWindow( pParentWindow, nBits ) , m_bFloating( false ) @@ -1179,14 +1179,14 @@ SfxPopupWindow::SfxPopupWindow( , m_xFrame( rFrame ) , m_pStatusListener( 0 ) { - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } SfxPopupWindow::SfxPopupWindow( sal_uInt16 nId, - Window* pParentWindow, + vcl::Window* pParentWindow, const OString& rID, const OUString& rUIXMLDescription, const Reference< XFrame >& rFrame ) : FloatingWindow( pParentWindow, rID, rUIXMLDescription, rFrame) @@ -1196,7 +1196,7 @@ SfxPopupWindow::SfxPopupWindow( , m_xFrame( rFrame ) , m_pStatusListener( 0 ) { - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } @@ -1209,7 +1209,7 @@ SfxPopupWindow::~SfxPopupWindow() m_xStatusListener.clear(); } - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->RemoveWindow( this ); } @@ -1309,7 +1309,7 @@ void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt ) ::Point aPos = rMEvt.GetPosPixel(); ::Point aScrPos = OutputToScreenPixel( aPos ); sal_uInt16 i = 0; - Window* pWindow = GetChild( i ); + vcl::Window* pWindow = GetChild( i ); while ( pWindow ) { ::MouseEvent aMEvt( pWindow->ScreenToOutputPixel( aScrPos ), diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 98402fc29acc..9ea3800f7c11 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -858,7 +858,7 @@ void SfxFrame::GrabFocusOnComponent_Impl() return; } - Window* pFocusWindow = &GetWindow(); + vcl::Window* pFocusWindow = &GetWindow(); if ( GetCurrentViewFrame() && GetCurrentViewFrame()->GetViewShell() && GetCurrentViewFrame()->GetViewShell()->GetWindow() ) pFocusWindow = GetCurrentViewFrame()->GetViewShell()->GetWindow(); diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 80442e295543..4a9cb220a4f1 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -62,12 +62,12 @@ using ::com::sun::star::frame::XComponentLoader; -class SfxFrameWindow_Impl : public Window +class SfxFrameWindow_Impl : public vcl::Window { public: SfxFrame* pFrame; - SfxFrameWindow_Impl( SfxFrame* pF, Window& i_rContainerWindow ); + SfxFrameWindow_Impl( SfxFrame* pF, vcl::Window& i_rContainerWindow ); virtual ~SfxFrameWindow_Impl( ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -79,7 +79,7 @@ public: void DoResize(); }; -SfxFrameWindow_Impl::SfxFrameWindow_Impl( SfxFrame* pF, Window& i_rContainerWindow ) +SfxFrameWindow_Impl::SfxFrameWindow_Impl( SfxFrame* pF, vcl::Window& i_rContainerWindow ) : Window( &i_rContainerWindow, WB_BORDER | WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_3DLOOK ) , pFrame( pF ) { @@ -150,7 +150,7 @@ bool SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt ) } else if ( nType == EVENT_MOUSEBUTTONUP || nType == EVENT_MOUSEBUTTONDOWN ) { - Window* pWindow = rNEvt.GetWindow(); + vcl::Window* pWindow = rNEvt.GetWindow(); SfxViewFrame* pView = pFrame->GetCurrentViewFrame(); SfxViewShell* pShell = pView ? pView->GetViewShell() : NULL; if ( pShell ) @@ -161,7 +161,7 @@ bool SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt ) if ( nType == EVENT_MOUSEBUTTONDOWN ) { - Window* pWindow = rNEvt.GetWindow(); + vcl::Window* pWindow = rNEvt.GetWindow(); const MouseEvent* pMEvent = rNEvt.GetMouseEvent(); Point aPos = pWindow->OutputToScreenPixel( pMEvent->GetPosPixel() ); SfxWorkWindow *pWorkWin = pFrame->GetWorkWindow_Impl(); @@ -225,7 +225,7 @@ Reference < XFrame > SfxFrame::CreateBlankFrame() return xFrame; } -SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden ) +SfxFrame* SfxFrame::Create( SfxObjectShell& rDoc, vcl::Window& rWindow, sal_uInt16 nViewId, bool bHidden ) { SfxFrame* pFrame = NULL; try @@ -287,7 +287,7 @@ SfxFrame* SfxFrame::Create( const Reference < XFrame >& i_rFrame ) { // create a new TopFrame to an external XFrame object ( wrap controller ) ENSURE_OR_THROW( i_rFrame.is(), "NULL frame not allowed" ); - Window* pWindow = VCLUnoHelper::GetWindow( i_rFrame->getContainerWindow() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( i_rFrame->getContainerWindow() ); ENSURE_OR_THROW( pWindow, "frame without container window not allowed" ); SfxFrame* pFrame = new SfxFrame( *pWindow, false ); @@ -295,7 +295,7 @@ SfxFrame* SfxFrame::Create( const Reference < XFrame >& i_rFrame ) return pFrame; } -SfxFrame::SfxFrame( Window& i_rContainerWindow, bool i_bHidden ) +SfxFrame::SfxFrame( vcl::Window& i_rContainerWindow, bool i_bHidden ) :SvCompatWeakBase<SfxFrame>( this ) ,pParentFrame( NULL ) ,pChildArr( NULL ) diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx index e66e59fcf5d3..5f1aaae8e4fc 100644 --- a/sfx2/source/view/impframe.hxx +++ b/sfx2/source/view/impframe.hxx @@ -51,7 +51,7 @@ public: SfxWorkWindow* pWorkWin; SvBorder aBorder; // formerly SfxTopFrame - Window* pExternalContainerWindow; + vcl::Window* pExternalContainerWindow; bool bHidden; bool bLockResize; bool bMenuBarOn; diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx index d91a3a39725e..a1debee4f458 100644 --- a/sfx2/source/view/impviewframe.hxx +++ b/sfx2/source/view/impviewframe.hxx @@ -35,9 +35,9 @@ struct SfxViewFrame_Impl OUString aActualURL; SfxFrame& rFrame; svtools::AsynchronLink* pReloader; - Window* pWindow; + vcl::Window* pWindow; SfxViewFrame* pActiveChild; - Window* pFocusWin; + vcl::Window* pFocusWin; sal_uInt16 nDocViewNo; sal_uInt16 nCurViewId; bool bResizeInToOut:1; @@ -79,12 +79,12 @@ struct SfxViewFrame_Impl } }; -class SfxFrameViewWindow_Impl : public Window +class SfxFrameViewWindow_Impl : public vcl::Window { SfxViewFrame* pFrame; public: - SfxFrameViewWindow_Impl( SfxViewFrame* p, Window& rParent, WinBits nBits=0 ) : + SfxFrameViewWindow_Impl( SfxViewFrame* p, vcl::Window& rParent, WinBits nBits=0 ) : Window( &rParent, nBits | WB_CLIPCHILDREN ), pFrame( p ) { diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 6700ec907e01..ef03157900e2 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -607,7 +607,7 @@ IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl) // SfxInPlaceClient -SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, Window *pDraw, sal_Int64 nAspect ) : +SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window *pDraw, sal_Int64 nAspect ) : m_pImp( new SfxInPlaceClient_Impl ), m_pViewSh( pViewShell ), m_pEditWin( pDraw ) @@ -1041,7 +1041,7 @@ void SfxInPlaceClient::DeactivateObject() uno::Reference< frame::XController > xController = xModel->getCurrentController(); if ( xController.is() ) { - Window* pWindow = VCLUnoHelper::GetWindow( xController->getFrame()->getContainerWindow() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xController->getFrame()->getContainerWindow() ); bHasFocus = pWindow->HasChildPathFocus( true ); } } diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index 94bb8c49705c..7ade26dc6c68 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -202,7 +202,7 @@ void SfxPrinter::SetOptions( const SfxItemSet &rNewOptions ) -SfxPrintOptionsDialog::SfxPrintOptionsDialog(Window *pParent, +SfxPrintOptionsDialog::SfxPrintOptionsDialog(vcl::Window *pParent, SfxViewShell *pViewShell, const SfxItemSet *pSet) diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 953950afbad5..f62610a79ee0 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1276,14 +1276,14 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) pViewFrame->GetDispatcher()->Flush(); } - Window* pEditWin = m_pData->m_pViewShell->GetWindow(); + vcl::Window* pEditWin = m_pData->m_pViewShell->GetWindow(); if ( pEditWin && m_pData->m_pViewShell->IsShowView_Impl() ) pEditWin->Show(); if ( SfxViewFrame::Current() == pViewFrame ) pViewFrame->GetDispatcher()->Update_Impl( true ); - Window* pFrameWin = &pViewFrame->GetWindow(); + vcl::Window* pFrameWin = &pViewFrame->GetWindow(); if ( pFrameWin != &pViewFrame->GetFrame().GetWindow() ) pFrameWin->Show(); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index e7ebd7686800..e4e44d166bde 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1222,7 +1222,7 @@ bool SfxViewFrame::SetBorderPixelImpl Size aOldSize = GetWindow().GetOutputSizePixel(); GetWindow().SetOutputSizePixel( aSize ); - Window* pParent = &GetWindow(); + vcl::Window* pParent = &GetWindow(); while ( pParent->GetParent() ) pParent = pParent->GetParent(); Size aOuterSize = pParent->GetOutputSizePixel(); @@ -1709,7 +1709,7 @@ void SfxViewFrame::Enable( bool bEnable ) } else { - Window *pWindow = &GetFrame().GetTopFrame().GetWindow(); + vcl::Window *pWindow = &GetFrame().GetTopFrame().GetWindow(); if ( !bEnable ) pImp->bWindowWasEnabled = pWindow->IsInputEnabled(); if ( !bEnable || pImp->bWindowWasEnabled ) @@ -1817,7 +1817,7 @@ void SfxViewFrame::MakeActive_Impl( bool bGrabFocus ) xSupp->setActiveFrame( uno::Reference < frame::XFrame >() ); css::uno::Reference< css::awt::XWindow > xContainerWindow = xFrame->getContainerWindow(); - Window* pWindow = VCLUnoHelper::GetWindow(xContainerWindow); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(xContainerWindow); if (pWindow && pWindow->HasChildPathFocus() && bGrabFocus) { SfxInPlaceClient *pCli = GetViewShell()->GetUIActiveClient(); @@ -2485,7 +2485,7 @@ SfxViewFrame* SfxViewFrame::GetTopViewFrame() const return GetFrame().GetTopFrame().GetCurrentViewFrame(); } -Window& SfxViewFrame::GetWindow() const +vcl::Window& SfxViewFrame::GetWindow() const { return pImp->pWindow ? *pImp->pWindow : GetFrame().GetWindow(); } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 1463248fc425..9ae83cda38a0 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -453,7 +453,7 @@ IMPL_LINK_NOARG(SfxDialogExecutor_Impl, Execute) return 0; // Create Dialog - boost::scoped_ptr<SfxPrintOptionsDialog> pDlg(new SfxPrintOptionsDialog( static_cast<Window*>(_pSetupParent), + boost::scoped_ptr<SfxPrintOptionsDialog> pDlg(new SfxPrintOptionsDialog( static_cast<vcl::Window*>(_pSetupParent), _pViewSh, _pOptions )); if ( _bHelpDisabled ) pDlg->DisableHelp(); @@ -885,7 +885,7 @@ sal_uInt16 SfxViewShell::SetPrinter( SfxPrinter* /*pNewPrinter*/, sal_uInt16 /*n SfxTabPage* SfxViewShell::CreatePrintOptionsPage ( - Window* /*pParent*/, + vcl::Window* /*pParent*/, const SfxItemSet& /*rOptions*/ ) { diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index fc87a0a9f74b..27cc1dfc28e8 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -475,7 +475,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) if(xElement.is()) { uno::Reference< awt::XWindow > xWin( xElement->getRealInterface(), uno::UNO_QUERY_THROW ); - Window* pWin = VCLUnoHelper::GetWindow( xWin ); + vcl::Window* pWin = VCLUnoHelper::GetWindow( xWin ); ToolBox* pTextToolbox = dynamic_cast< ToolBox* >( pWin ); if( pTextToolbox ) { @@ -486,7 +486,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) const OUString& rCommand = pTextToolbox->GetItemCommand( nItemId ); if (rCommand == ".uno:StyleApply") { - Window* pItemWin = pTextToolbox->GetItemWindow( nItemId ); + vcl::Window* pItemWin = pTextToolbox->GetItemWindow( nItemId ); if( pItemWin ) pItemWin->GrabFocus(); break; @@ -930,7 +930,7 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ ) SfxInPlaceClient* SfxViewShell::FindIPClient ( const uno::Reference < embed::XEmbeddedObject >& xObj, - Window* pObjParentWin + vcl::Window* pObjParentWin ) const { SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); @@ -1185,7 +1185,7 @@ const SvBorder& SfxViewShell::GetBorderPixel() const void SfxViewShell::SetWindow ( - Window* pViewPort // For example Null pointer in the Destructor. + vcl::Window* pViewPort // For example Null pointer in the Destructor. ) /* [Description] diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index b28c0f19090f..2d5d062a568e 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -371,7 +371,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta mpContext = boost::make_shared<OpenGLContext>(); mpContext->requestLegacyContext(); - if( !mpContext->init( reinterpret_cast< Window* >( aVal ) ) ) + if( !mpContext->init( reinterpret_cast< vcl::Window* >( aVal ) ) ) return false; SAL_INFO("slideshow", "created the context"); diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index fd3c507365b3..83cb7b74828e 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -449,7 +449,7 @@ namespace slideshow rVCLDeviceParams[ 1 ] >>= aVal; - Window* pWindow = reinterpret_cast< Window* >( aVal ); + vcl::Window* pWindow = reinterpret_cast< vcl::Window* >( aVal ); if( pWindow ) { @@ -472,7 +472,7 @@ namespace slideshow #else if( avmedia::IsModel(rMimeType) ) { - mpEventHandlerParent.reset(new Window(pWindow, WB_NOBORDER|WB_NODIALOGCONTROL)); + mpEventHandlerParent.reset(new vcl::Window(pWindow, WB_NOBORDER|WB_NODIALOGCONTROL)); mpEventHandlerParent->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ), Size( aAWTRect.Width, aAWTRect.Height ) ); mpEventHandlerParent->EnablePaint(false); diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index dc726f65e726..6d06a14f6d60 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -30,7 +30,7 @@ #include "viewlayer.hxx" class SystemChildWindow; -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace drawing { class XShape; @@ -148,7 +148,7 @@ namespace slideshow const OUString& rMimeType ); ViewLayerSharedPtr mpViewLayer; ::std::auto_ptr< SystemChildWindow > mpMediaWindow; - boost::scoped_ptr< Window > mpEventHandlerParent; + boost::scoped_ptr< ::vcl::Window > mpEventHandlerParent; mutable ::com::sun::star::awt::Point maWindowOffset; mutable ::basegfx::B2DRectangle maBounds; diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx index 7674970d107a..e3409e59e226 100644 --- a/slideshow/test/demoshow.cxx +++ b/slideshow/test/demoshow.cxx @@ -305,10 +305,10 @@ public: virtual sal_uInt16 Exception( sal_uInt16 nError ); }; -class ChildWindow : public Window +class ChildWindow : public vcl::Window { public: - ChildWindow( Window* pParent ); + ChildWindow( vcl::Window* pParent ); virtual ~ChildWindow(); virtual void Paint( const Rectangle& rRect ); virtual void Resize(); @@ -322,7 +322,7 @@ private: uno::Reference< presentation::XSlideShow > mxShow; }; -ChildWindow::ChildWindow( Window* pParent ) : +ChildWindow::ChildWindow( vcl::Window* pParent ) : Window(pParent, WB_CLIPCHILDREN | WB_BORDER| WB_3DLOOK ), mpView(), mxShow() @@ -402,7 +402,7 @@ private: }; DemoWindow::DemoWindow() : - Dialog((Window*)NULL), + Dialog((vcl::Window*)NULL), maLeftChild( this ), maRightTopChild( this ), maRightBottomChild( this ), diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index e2ab95c9ab0f..73534ef15cff 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -108,7 +108,7 @@ class SmElementsControl : public Control void build(); public: - SmElementsControl(Window *pParent, const ResId& rResId); + SmElementsControl(vcl::Window *pParent, const ResId& rResId); virtual ~SmElementsControl(); void setElementSetId(sal_uInt16 aSetId); @@ -138,7 +138,7 @@ public: SmElementsDockingWindow( SfxBindings* pBindings, SfxChildWindow* pChildWindow, - Window* pParent ); + vcl::Window* pParent ); virtual ~SmElementsDockingWindow(); virtual void EndDocking( const Rectangle& rReactangle, bool bFloatMode) SAL_OVERRIDE; @@ -150,7 +150,7 @@ class SmElementsDockingWindowWrapper : public SfxChildWindow SFX_DECL_CHILDWINDOW_WITHID(SmElementsDockingWindowWrapper); protected: - SmElementsDockingWindowWrapper( Window* pParentWindow, + SmElementsDockingWindowWrapper( vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 3f4b317a8b9f..9e12d97dd320 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -67,19 +67,19 @@ class SmPrintOptionsTabPage : public SfxTabPage virtual void Reset(const SfxItemSet* rSet) SAL_OVERRIDE; public: - static SfxTabPage* Create(Window *pWindow, const SfxItemSet &rSet); + static SfxTabPage* Create(vcl::Window *pWindow, const SfxItemSet &rSet); - SmPrintOptionsTabPage(Window *pParent, const SfxItemSet &rOptions); + SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItemSet &rOptions); }; /**************************************************************************/ -class SmShowFont : public Window +class SmShowFont : public vcl::Window { virtual void Paint(const Rectangle&) SAL_OVERRIDE; public: - SmShowFont(Window *pParent, WinBits nStyle) + SmShowFont(vcl::Window *pParent, WinBits nStyle) : Window(pParent, nStyle) { } @@ -106,7 +106,7 @@ class SmFontDialog : public ModalDialog virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes); + SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes); const vcl::Font& GetFont() const { return Face; } void SetFont(const vcl::Font &rFont); @@ -127,7 +127,7 @@ class SmFontSizeDialog : public ModalDialog DECL_LINK(DefaultButtonClickHdl, Button *); public: - SmFontSizeDialog(Window *pParent); + SmFontSizeDialog(vcl::Window *pParent); void ReadFrom(const SmFormat &rFormat); void WriteTo (SmFormat &rFormat) const; @@ -154,7 +154,7 @@ class SmFontTypeDialog : public ModalDialog DECL_LINK(HelpButtonClickHdl, Button *); public: - SmFontTypeDialog(Window *pParent, OutputDevice *pFntListDevice); + SmFontTypeDialog(vcl::Window *pParent, OutputDevice *pFntListDevice); void ReadFrom(const SmFormat &rFormat); void WriteTo (SmFormat &rFormat) const; @@ -221,7 +221,7 @@ class SmDistanceDialog : public ModalDialog void SetCategory(sal_uInt16 Category); public: - SmDistanceDialog(Window *pParent); + SmDistanceDialog(vcl::Window *pParent); virtual ~SmDistanceDialog(); void ReadFrom(const SmFormat &rFormat); @@ -245,7 +245,7 @@ class SmAlignDialog : public ModalDialog DECL_LINK(DefaultButtonClickHdl, Button *); public: - SmAlignDialog(Window *pParent); + SmAlignDialog(vcl::Window *pParent); void ReadFrom(const SmFormat &rFormat); void WriteTo (SmFormat &rFormat) const; @@ -275,7 +275,7 @@ class SmShowSymbolSetWindow : public Control DECL_LINK( ScrollHdl, ScrollBar* ); public: - SmShowSymbolSetWindow(Window *pParent, WinBits nStyle); + SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyle); void setScrollbar(ScrollBar *pVScrollBar); void calccols(); void SelectSymbol(sal_uInt16 nSymbol); @@ -292,7 +292,7 @@ class SmShowSymbolSet : public VclHBox Size aOutputSize; public: - SmShowSymbolSet(Window *pParent); + SmShowSymbolSet(vcl::Window *pParent); void SetSymbolSet(const SymbolPtrVec_t& rSymbolSet) { aSymbolWindow.SetSymbolSet(rSymbolSet); } @@ -316,7 +316,7 @@ class SmShowSymbol : public Control void setFontSize(vcl::Font &rFont) const; public: - SmShowSymbol(Window *pParent, WinBits nStyle) + SmShowSymbol(vcl::Window *pParent, WinBits nStyle) : Control(pParent, nStyle) { } @@ -360,7 +360,7 @@ class SmSymbolDialog : public ModalDialog virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SmSymbolDialog(Window * pParent, OutputDevice *pFntListDevice, + SmSymbolDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, SmSymbolManager &rSymbolMgr, SmViewShell &rViewShell); bool SelectSymbolSet(const OUString &rSymbolSetName); @@ -376,7 +376,7 @@ class SmShowChar : public Control virtual void Resize() SAL_OVERRIDE; public: - SmShowChar(Window *pParent, WinBits nStyle) + SmShowChar(vcl::Window *pParent, WinBits nStyle) : Control(pParent, nStyle) { } @@ -453,7 +453,7 @@ class SmSymDefineDialog : public ModalDialog virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SmSymDefineDialog(Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr); + SmSymDefineDialog(vcl::Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr); virtual ~SmSymDefineDialog(); using OutputDevice::SetFont; diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 8f7a665bc036..7c66fa6fafb2 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -45,7 +45,7 @@ class CommandEvent; /**************************************************************************/ -class SmEditWindow : public Window, public DropTargetHelper +class SmEditWindow : public vcl::Window, public DropTargetHelper { ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccessible; diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index b3af03d781e0..a49d8cad0f89 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -137,7 +137,7 @@ public: //virtual methods for options dialog virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; }; #define SM_MOD() ( *(SmModule**) GetAppData(SHL_SM) ) diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx index 8f50a055bb1f..472fe602c1a2 100644 --- a/starmath/inc/toolbox.hxx +++ b/starmath/inc/toolbox.hxx @@ -81,7 +81,7 @@ class SmToolBoxWrapper : public SfxChildWindow SFX_DECL_CHILDWINDOW_WITHID(SmToolBoxWrapper); protected: - SmToolBoxWrapper(Window *pParentWindow, + SmToolBoxWrapper(vcl::Window *pParentWindow, sal_uInt16, SfxBindings*, SfxChildWinInfo*); }; diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index f4a48e5d8d55..304c10c7e841 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -157,7 +157,7 @@ protected: DECL_LINK(SelectHdl, ListBox *); public: - SmFontPickListBox(Window* pParent, WinBits nBits); + SmFontPickListBox(vcl::Window* pParent, WinBits nBits); SmFontPickListBox& operator = (const SmFontPickList& rList); diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 38ad81456c4c..6b7939e99076 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -196,8 +196,8 @@ class SmCmdBoxWrapper : public SfxChildWindow SFX_DECL_CHILDWINDOW_WITHID(SmCmdBoxWrapper); protected: - SmCmdBoxWrapper(Window *pParentWindow, - sal_uInt16 nId, + SmCmdBoxWrapper(::vcl::Window *pParentWindow, + sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); @@ -264,7 +264,7 @@ protected: void InsertFrom(SfxMedium &rMedium); virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - virtual SfxTabPage *CreatePrintOptionsPage(Window *pParent, + virtual SfxTabPage *CreatePrintOptionsPage(::vcl::Window *pParent, const SfxItemSet &rOptions) SAL_OVERRIDE; virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE; virtual void Activate(bool IsMDIActivate) SAL_OVERRIDE; diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 6c99406f8cd5..4668e93a5905 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -212,7 +212,7 @@ const sal_uInt16 SmElementsControl::aOthers[][2] = {RID_DOTSUP, RID_DOTSUP_HELP}, {RID_DOTSDOWN, RID_DOTSDOWN_HELP} }; -SmElementsControl::SmElementsControl(Window *pParent, const ResId& rResId) +SmElementsControl::SmElementsControl(vcl::Window *pParent, const ResId& rResId) : Control(pParent, rResId) , mpDocShell(new SmDocShell(SFXOBJECTSHELL_STD_NORMAL)) , maCurrentSetId(0) @@ -615,7 +615,7 @@ const sal_uInt16 SmElementsDockingWindow::aCategories[] = { RID_CATEGORY_EXAMPLES }; -SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, SfxChildWindow* pChildWindow, Window* pParent) : +SmElementsDockingWindow::SmElementsDockingWindow(SfxBindings* pInputBindings, SfxChildWindow* pChildWindow, vcl::Window* pParent) : SfxDockingWindow(pInputBindings, pChildWindow, pParent, SmResId(RID_ELEMENTSDOCKINGWINDOW)), maElementsControl (this, SmResId(1)), maElementListBox (this, SmResId(1)) @@ -722,7 +722,7 @@ void SmElementsDockingWindow::Resize() SFX_IMPL_DOCKINGWINDOW_WITHID(SmElementsDockingWindowWrapper, SID_ELEMENTSDOCKINGWINDOW); SmElementsDockingWindowWrapper::SmElementsDockingWindowWrapper( - Window *pParentWindow, sal_uInt16 nId, + vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo) : SfxChildWindow(pParentWindow, nId) { diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index f7e3d0d3a1a0..6388cc604dd1 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -62,7 +62,7 @@ using namespace com::sun::star::accessibility; -static awt::Rectangle lcl_GetBounds( Window *pWin ) +static awt::Rectangle lcl_GetBounds( vcl::Window *pWin ) { // !! see VCLXAccessibleComponent::implGetBounds() @@ -77,7 +77,7 @@ static awt::Rectangle lcl_GetBounds( Window *pWin ) aBounds.Y = aRect.Top(); aBounds.Width = aRect.GetWidth(); aBounds.Height = aRect.GetHeight(); - Window* pParent = pWin->GetAccessibleParentWindow(); + vcl::Window* pParent = pWin->GetAccessibleParentWindow(); if (pParent) { Rectangle aParentRect = pParent->GetWindowExtentsRelative( NULL ); @@ -89,7 +89,7 @@ static awt::Rectangle lcl_GetBounds( Window *pWin ) return aBounds; } -static awt::Point lcl_GetLocationOnScreen( Window *pWin ) +static awt::Point lcl_GetLocationOnScreen( vcl::Window *pWin ) { // !! see VCLXAccessibleComponent::getLocationOnScreen() @@ -314,7 +314,7 @@ Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleParent() if (!pWin) throw RuntimeException(); - Window *pAccParent = pWin->GetAccessibleParentWindow(); + vcl::Window *pAccParent = pWin->GetAccessibleParentWindow(); OSL_ENSURE( pAccParent, "accessible parent missing" ); return pAccParent ? pAccParent->GetAccessible() : Reference< XAccessible >(); } @@ -324,7 +324,7 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleIndexInParent() { SolarMutexGuard aGuard; sal_Int32 nIdx = -1; - Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; + vcl::Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; if (pAccParent) { sal_uInt16 nCnt = pAccParent->GetAccessibleChildWindowCount(); @@ -1822,7 +1822,7 @@ uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleParent( ) if (!pWin) throw RuntimeException(); - Window *pAccParent = pWin->GetAccessibleParentWindow(); + vcl::Window *pAccParent = pWin->GetAccessibleParentWindow(); OSL_ENSURE( pAccParent, "accessible parent missing" ); return pAccParent ? pAccParent->GetAccessible() : Reference< XAccessible >(); } @@ -1832,7 +1832,7 @@ sal_Int32 SAL_CALL SmEditAccessible::getAccessibleIndexInParent( ) { SolarMutexGuard aGuard; sal_Int32 nIdx = -1; - Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; + vcl::Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; if (pAccParent) { sal_uInt16 nCnt = pAccParent->GetAccessibleChildWindowCount(); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 218248562c31..e731fb6bc6d0 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -157,7 +157,7 @@ IMPL_LINK_INLINE_START( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, EMP IMPL_LINK_INLINE_END( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, pButton ) -SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet &rOptions) +SmPrintOptionsTabPage::SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItemSet &rOptions) : SfxTabPage(pParent, "SmathSettings", "modules/smath/ui/smathsettings.ui", &rOptions) { get( m_pTitle, "title"); @@ -220,7 +220,7 @@ void SmPrintOptionsTabPage::Reset(const SfxItemSet* rSet) } -SfxTabPage* SmPrintOptionsTabPage::Create(Window* pWindow, const SfxItemSet& rSet) +SfxTabPage* SmPrintOptionsTabPage::Create(vcl::Window* pWindow, const SfxItemSet& rSet) { return (new SmPrintOptionsTabPage(pWindow, rSet)); } @@ -239,7 +239,7 @@ void SmShowFont::Paint(const Rectangle& rRect ) (GetOutputSize().Height() - TextSize.Height()) / 2), Text); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSmShowFont(Window* pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowFont(vcl::Window* pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; @@ -318,7 +318,7 @@ void SmFontDialog::SetFont(const vcl::Font &rFont) m_pShowFont->SetFont(Face); } -SmFontDialog::SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes) +SmFontDialog::SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes) : ModalDialog(pParent, "FontDialog", "modules/smath/ui/fontdialog.ui") { get(m_pFontBox, "font"); @@ -368,7 +368,7 @@ SmFontDialog::SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool namespace { - void getColors(Window &rRef, ColorData &rBgCol, ColorData &rTxtCol) + void getColors(vcl::Window &rRef, ColorData &rBgCol, ColorData &rTxtCol) { const StyleSettings &rS = rRef.GetSettings().GetStyleSettings(); if (rS.GetHighContrastMode()) @@ -408,7 +408,7 @@ void SmFontDialog::DataChanged( const DataChangedEvent& rDCEvt ) class SaveDefaultsQuery : public MessageDialog { public: - SaveDefaultsQuery(Window *pParent) + SaveDefaultsQuery(vcl::Window *pParent) : MessageDialog(pParent, "SaveDefaultsDialog", "modules/smath/ui/savedefaultsdialog.ui") { @@ -427,7 +427,7 @@ IMPL_LINK( SmFontSizeDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton return 0; } -SmFontSizeDialog::SmFontSizeDialog(Window * pParent) +SmFontSizeDialog::SmFontSizeDialog(vcl::Window * pParent) : ModalDialog(pParent, "FontSizeDialog", "modules/smath/ui/fontsizedialog.ui") { get(m_pTextSize, "spinB_text"); @@ -520,7 +520,7 @@ IMPL_LINK_INLINE_START( SmFontTypeDialog, DefaultButtonClickHdl, Button *, EMPTY } IMPL_LINK_INLINE_END( SmFontTypeDialog, DefaultButtonClickHdl, Button *, pButton ) -SmFontTypeDialog::SmFontTypeDialog(Window * pParent, OutputDevice *pFntListDevice) +SmFontTypeDialog::SmFontTypeDialog(vcl::Window * pParent, OutputDevice *pFntListDevice) : ModalDialog(pParent, "FontsDialog", "modules/smath/ui/fonttypedialog.ui"), pFontListDev (pFntListDevice) { @@ -758,7 +758,7 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) }; // array to help iterate over the controls - Window * const aWin[4][2] = + vcl::Window * const aWin[4][2] = { { m_pFixedText1, m_pMetricField1 }, { m_pFixedText2, m_pMetricField2 }, @@ -852,7 +852,7 @@ void SmDistanceDialog::SetCategory(sal_uInt16 nCategory) } -SmDistanceDialog::SmDistanceDialog(Window *pParent) +SmDistanceDialog::SmDistanceDialog(vcl::Window *pParent) : ModalDialog(pParent, "SpacingDialog", "modules/smath/ui/spacingdialog.ui") { @@ -985,7 +985,7 @@ IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button *, EMPTYARG /*pButton*/ return 0; } -SmAlignDialog::SmAlignDialog(Window * pParent) +SmAlignDialog::SmAlignDialog(vcl::Window * pParent) : ModalDialog(pParent, "AlignmentDialog", "modules/smath/ui/alignmentdialog.ui") { @@ -1035,7 +1035,7 @@ void SmAlignDialog::WriteTo(SmFormat &rFormat) const } -SmShowSymbolSetWindow::SmShowSymbolSetWindow(Window *pParent, WinBits nStyle) +SmShowSymbolSetWindow::SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyle) : Control(pParent, nStyle) , m_pVScrollBar(0) , nLen(0) @@ -1180,7 +1180,7 @@ void SmShowSymbolSetWindow::setScrollbar(ScrollBar *pVScrollBar) m_pVScrollBar->SetScrollHdl(LINK(this, SmShowSymbolSetWindow, ScrollHdl)); } -SmShowSymbolSet::SmShowSymbolSet(Window *pParent) +SmShowSymbolSet::SmShowSymbolSet(vcl::Window *pParent) : VclHBox(pParent, false, 6) , aSymbolWindow(this, WB_TABSTOP) , aVScrollBar(this, WinBits(WB_VSCROLL)) @@ -1192,7 +1192,7 @@ SmShowSymbolSet::SmShowSymbolSet(Window *pParent) aSymbolWindow.Show(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSmShowSymbolSet(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowSymbolSet(vcl::Window *pParent, VclBuilder::stringmap &) { return new SmShowSymbolSet(pParent); } @@ -1219,7 +1219,7 @@ void SmShowSymbolSetWindow::calccols() Size SmShowSymbolSetWindow::GetOptimalSize() const { - Window *pParent = GetParent(); + vcl::Window *pParent = GetParent(); return Size(pParent->approximate_char_width() * 24, pParent->GetTextHeight() * 8); } @@ -1281,7 +1281,7 @@ IMPL_LINK( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, EMPTYARG /*pScrollBar*/ return 0; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSmShowSymbol(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowSymbol(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; @@ -1447,7 +1447,7 @@ IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl ) } -SmSymbolDialog::SmSymbolDialog(Window *pParent, OutputDevice *pFntListDevice, +SmSymbolDialog::SmSymbolDialog(vcl::Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr, SmViewShell &rViewShell) : ModalDialog(pParent, "CatalogDialog", "modules/smath/ui/catalogdialog.ui") @@ -1562,7 +1562,7 @@ const SmSym * SmSymbolDialog::GetSymbol() const -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSmShowChar(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmShowChar(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; @@ -1970,7 +1970,7 @@ void SmSymDefineDialog::UpdateButtons() pDeleteBtn->Enable(bDelete); } -SmSymDefineDialog::SmSymDefineDialog(Window * pParent, +SmSymDefineDialog::SmSymDefineDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr) : ModalDialog (pParent, "EditSymbols", "modules/smath/ui/symdefinedialog.ui"), rSymbolMgr (rMgr), diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index f16a821f4fe6..fbc9a1b27cfa 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -431,7 +431,7 @@ void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, bool bDrawSel sal_uLong nOldDrawMode = DRAWMODE_DEFAULT; bool bRestoreDrawMode = false; if (OUTDEV_WINDOW == rDev.GetOutDevType() && - ((Window &) rDev).GetSettings().GetStyleSettings().GetHighContrastMode()) + ((vcl::Window &) rDev).GetSettings().GetStyleSettings().GetHighContrastMode()) { nOldDrawMode = rDev.GetDrawMode(); rDev.SetDrawMode( DRAWMODE_DEFAULT ); diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 7a746f44e738..a214af390cb3 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -293,7 +293,7 @@ void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) GetConfig()->ItemSetToConfig(rSet); } } -SfxTabPage* SmModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SmModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) { SfxTabPage* pRet = 0; if(nId == SID_SM_TP_PRINTOPTIONS) diff --git a/starmath/source/tmpdevice.cxx b/starmath/source/tmpdevice.cxx index c867e33475ea..2a6c3babce57 100644 --- a/starmath/source/tmpdevice.cxx +++ b/starmath/source/tmpdevice.cxx @@ -54,7 +54,7 @@ Color SmTmpDevice::Impl_GetColor( const Color& rColor ) { Color aBgCol( rOutDev.GetBackground().GetColor() ); if (OUTDEV_WINDOW == rOutDev.GetOutDevType()) - aBgCol = ((Window &) rOutDev).GetDisplayBackground().GetColor(); + aBgCol = ((vcl::Window &) rOutDev).GetDisplayBackground().GetColor(); nNewCol = SM_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor; diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index f9357c0ad225..455441f4ab61 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -99,7 +99,7 @@ static sal_uInt16 GetCategoryRID( sal_uInt16 nResId ) SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings, SfxChildWindow *pChildWindow, - Window *pParent) + vcl::Window *pParent) : SfxFloatingWindow(pTmpBindings, pChildWindow, pParent, "FloatingElements", "modules/smath/ui/floatingelements.ui") { @@ -127,7 +127,7 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings, sal_uInt16 i; for (i = 0; i < NUM_TBX_CATEGORIES; ++i) { - ToolBox *pBox = new ToolBox(get<Window>("box"), SmResId( TOOLBOX_CAT_A + i )); + ToolBox *pBox = new ToolBox(get<vcl::Window>("box"), SmResId( TOOLBOX_CAT_A + i )); vToolBoxCategories[i] = pBox; pBox->SetSelectHdl(LINK(this, SmToolBoxWindow, CmdSelectHdl)); } @@ -344,7 +344,7 @@ IMPL_LINK( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox) SFX_IMPL_FLOATINGWINDOW_WITHID(SmToolBoxWrapper, SID_TOOLBOXWINDOW); -SmToolBoxWrapper::SmToolBoxWrapper(Window *pParentWindow, +SmToolBoxWrapper::SmToolBoxWrapper(vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo *pInfo) : SfxChildWindow(pParentWindow, nId) diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index 5c15ffa89b9b..47fad4ebb097 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -147,12 +147,12 @@ void SmFontPickList::WriteTo(SmFontDialog& rDialog) const /**************************************************************************/ -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSmFontPickListBox(Window* pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSmFontPickListBox(vcl::Window* pParent, VclBuilder::stringmap &) { return new SmFontPickListBox(pParent, WB_DROPDOWN); } -SmFontPickListBox::SmFontPickListBox (Window* pParent, WinBits nBits) : +SmFontPickListBox::SmFontPickListBox (vcl::Window* pParent, WinBits nBits) : SmFontPickList(4), ListBox(pParent, nBits) { diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index f59f9bc24f44..33ae98f870d4 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -706,7 +706,7 @@ void SmEditController::StateChanged(sal_uInt16 nSID, SfxItemState eState, const /**************************************************************************/ SmCmdBoxWindow::SmCmdBoxWindow(SfxBindings *pBindings_, SfxChildWindow *pChildWindow, - Window *pParent) : + vcl::Window *pParent) : SfxDockingWindow(pBindings_, pChildWindow, pParent, SmResId(RID_CMDBOXWINDOW)), aEdit (*this), aController (aEdit, SID_TEXT, *pBindings_), @@ -887,7 +887,7 @@ void SmCmdBoxWindow::GetFocus() SFX_IMPL_DOCKINGWINDOW_WITHID(SmCmdBoxWrapper, SID_CMDBOXWINDOW); -SmCmdBoxWrapper::SmCmdBoxWrapper(Window *pParentWindow, sal_uInt16 nId, +SmCmdBoxWrapper::SmCmdBoxWrapper(vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo) : SfxChildWindow(pParentWindow, nId) @@ -1360,7 +1360,7 @@ bool SmViewShell::HasPrintOptionsPage() const return true; } -SfxTabPage* SmViewShell::CreatePrintOptionsPage(Window *pParent, +SfxTabPage* SmViewShell::CreatePrintOptionsPage(vcl::Window *pParent, const SfxItemSet &rOptions) { return SmPrintOptionsTabPage::Create(pParent, rOptions); diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx index a42c6a0e2d42..c1f8e4689dbe 100644 --- a/svtools/inc/roadmap.hxx +++ b/svtools/inc/roadmap.hxx @@ -56,7 +56,7 @@ namespace svt void implInit(); public: - ORoadmap( Window* _pParent, WinBits _nWinStyle = 0 ); + ORoadmap( vcl::Window* _pParent, WinBits _nWinStyle = 0 ); virtual ~ORoadmap( ); void SetRoadmapBitmap( const BitmapEx& maBitmap, bool _bInvalidate = true ); @@ -109,7 +109,7 @@ namespace svt void DeselectOldRoadmapItems(); ItemId GetNextAvailableItemId( ItemIndex _NewIndex ); ItemId GetPreviousAvailableItemId( ItemIndex _NewIndex ); - RoadmapItem* GetByPointer(Window* pWindow); + RoadmapItem* GetByPointer(vcl::Window* pWindow); RoadmapItem* InsertHyperLabel( ItemIndex _Index, const OUString& _aStr, ItemId _RMID, bool _bEnabled = true ); void UpdatefollowingHyperLabels( ItemIndex _Index ); }; diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx index 9bd98251cff4..4df38f8eeaf5 100644 --- a/svtools/inc/table/gridtablerenderer.hxx +++ b/svtools/inc/table/gridtablerenderer.hxx @@ -83,8 +83,8 @@ namespace svt { namespace table bool i_hasControlFocus, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle ) SAL_OVERRIDE; - virtual void ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; - virtual void HideCellCursor( Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; + virtual void ShowCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; + virtual void HideCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; virtual bool FitsIntoCell( ::com::sun::star::uno::Any const & i_cellContent, ColPos const i_colPos, RowPos const i_rowPos, diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index 4cf5b4c0f5fe..7b0e01bf0b8d 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -65,7 +65,7 @@ namespace svt { namespace table public: - TableControl( Window* _pParent, WinBits _nStyle ); + TableControl( vcl::Window* _pParent, WinBits _nStyle ); virtual ~TableControl(); /// sets a new table model @@ -141,7 +141,7 @@ namespace svt { namespace table if the row, which should be removed, is selected, it will be erased from the vector */ SelectionEngine* getSelEngine(); - Window& getDataWindow(); + vcl::Window& getDataWindow(); // Window overridables virtual void GetFocus() SAL_OVERRIDE; @@ -166,11 +166,11 @@ namespace svt { namespace table // IAccessibleTable - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const SAL_OVERRIDE; + virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; - virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE; - virtual Window* GetWindowInstance() SAL_OVERRIDE; + virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE; virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) SAL_OVERRIDE; virtual long GetRowCount() const SAL_OVERRIDE; diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx index 31abcd6fd865..f283821e3b2a 100644 --- a/svtools/inc/vclxaccessibleheaderbar.hxx +++ b/svtools/inc/vclxaccessibleheaderbar.hxx @@ -67,7 +67,7 @@ private: class VCLXHeaderBar : public VCLXWindow { public: - VCLXHeaderBar(Window* pHeaderBar); + VCLXHeaderBar(vcl::Window* pHeaderBar); virtual ~VCLXHeaderBar(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index e2427b012e91..4416b2347537 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -113,7 +113,7 @@ void BrowseBox::ConstructImpl( BrowserMode nMode ) -BrowseBox::BrowseBox( Window* pParent, WinBits nBits, BrowserMode nMode ) +BrowseBox::BrowseBox( vcl::Window* pParent, WinBits nBits, BrowserMode nMode ) :Control( pParent, nBits | WB_3DLOOK ) ,DragSourceHelper( this ) ,DropTargetHelper( this ) @@ -124,7 +124,7 @@ BrowseBox::BrowseBox( Window* pParent, WinBits nBits, BrowserMode nMode ) -BrowseBox::BrowseBox( Window* pParent, const ResId& rId, BrowserMode nMode ) +BrowseBox::BrowseBox( vcl::Window* pParent, const ResId& rId, BrowserMode nMode ) :Control( pParent, rId ) ,DragSourceHelper( this ) ,DropTargetHelper( this ) diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 7f0b0a85d0f8..74561dab7749 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1101,7 +1101,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool -void BrowseBox::PaintData( Window& rWin, const Rectangle& rRect ) +void BrowseBox::PaintData( vcl::Window& rWin, const Rectangle& rRect ) { if ( !bBootstrapped && IsReallyVisible() ) BrowseBox::StateChanged( STATE_CHANGE_INITSHOW ); @@ -2028,7 +2028,7 @@ void BrowseBox::SetCursorColor(const Color& _rCol) Rectangle BrowseBox::calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if ( !_bOnScreen ) pParent = GetAccessibleParentWindow(); @@ -2052,7 +2052,7 @@ Rectangle BrowseBox::calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen) Rectangle BrowseBox::calcTableRect(bool _bOnScreen) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if ( !_bOnScreen ) pParent = GetAccessibleParentWindow(); @@ -2068,7 +2068,7 @@ Rectangle BrowseBox::calcTableRect(bool _bOnScreen) Rectangle BrowseBox::GetFieldRectPixelAbs( sal_Int32 _nRowId, sal_uInt16 _nColId, bool /*_bIsHeader*/, bool _bOnScreen ) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if ( !_bOnScreen ) pParent = GetAccessibleParentWindow(); diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 76f932098db9..d2a44ffe8464 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -87,7 +87,7 @@ namespace svt Reference< XAccessible > BrowseBox::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); DBG_ASSERT( pParent, "BrowseBox::CreateAccessible - parent not found" ); if( pParent && !m_pImpl->m_pAccessible) @@ -542,7 +542,7 @@ bool BrowseBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector ); } -Rectangle BrowseBox::GetWindowExtentsRelative( Window *pRelativeWindow ) const +Rectangle BrowseBox::GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const { return Control::GetWindowExtentsRelative( pRelativeWindow ); } @@ -557,12 +557,12 @@ Reference< XAccessible > BrowseBox::GetAccessible( bool bCreate ) return Control::GetAccessible( bCreate ); } -Window* BrowseBox::GetAccessibleParentWindow() const +vcl::Window* BrowseBox::GetAccessibleParentWindow() const { return Control::GetAccessibleParentWindow(); } -Window* BrowseBox::GetWindowInstance() +vcl::Window* BrowseBox::GetWindowInstance() { return this; } diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 396b40ce4d48..0803feb4a6ce 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -45,7 +45,7 @@ void ButtonFrame::Draw( OutputDevice& rDev ) if( rDev.GetOutDevType() == OUTDEV_WINDOW ) { - Window *pWin = (Window*) &rDev; + vcl::Window *pWin = (vcl::Window*) &rDev; if( bPressed ) pWin->DrawSelectionBackground( aRect, 0, true, false, false ); } @@ -242,7 +242,7 @@ void BrowserDataWin::LeaveUpdateLock() } -void InitSettings_Impl( Window *pWin, +void InitSettings_Impl( vcl::Window *pWin, bool bFont, bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = @@ -619,7 +619,7 @@ void BrowserDataWin::RequestHelp( const HelpEvent& rHEvt ) -BrowseEvent::BrowseEvent( Window* pWindow, +BrowseEvent::BrowseEvent( vcl::Window* pWindow, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ): pWin(pWindow), @@ -640,7 +640,7 @@ BrowserMouseEvent::BrowserMouseEvent( BrowserDataWin *pWindow, -BrowserMouseEvent::BrowserMouseEvent( Window *pWindow, const MouseEvent& rEvt, +BrowserMouseEvent::BrowserMouseEvent( vcl::Window *pWindow, const MouseEvent& rEvt, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ): MouseEvent(rEvt), diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index be291cf42191..27cc8e1c44a8 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -104,7 +104,7 @@ class BrowserDataWin { public: BrowserHeader* pHeaderBar; // only for BROWSER_HEADERBAR_NEW - Window* pEventWin; // Window of forwarded events + vcl::Window* pEventWin; // Window of forwarded events ScrollBarBox* pCornerWin; // Window in the corner btw the ScrollBars bool bInDtor; AutoTimer aMouseTimer; // recalls MouseMove on dragging out @@ -199,14 +199,14 @@ class BrowserScrollBar: public ScrollBar BrowserDataWin* _pDataWin; public: - BrowserScrollBar( Window* pParent, WinBits nStyle, + BrowserScrollBar( vcl::Window* pParent, WinBits nStyle, BrowserDataWin *pDataWin ) : ScrollBar( pParent, nStyle ), _nTip( 0 ), _nLastPos( ULONG_MAX ), _pDataWin( pDataWin ) {} - //ScrollBar( Window* pParent, const ResId& rResId ); + //ScrollBar( vcl::Window* pParent, const ResId& rResId ); virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; virtual void EndScroll() SAL_OVERRIDE; @@ -214,7 +214,7 @@ public: -void InitSettings_Impl( Window *pWin, +void InitSettings_Impl( vcl::Window *pWin, bool bFont = true, bool bForeground = true, bool bBackground = true ); diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index da54a710f408..26807c03cdb3 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -41,7 +41,7 @@ namespace svt //= ComboBoxControl - ComboBoxControl::ComboBoxControl(Window* pParent, WinBits nWinStyle) + ComboBoxControl::ComboBoxControl(vcl::Window* pParent, WinBits nWinStyle) :ComboBox(pParent, nWinStyle|WB_DROPDOWN|WB_NOBORDER) { EnableAutoSize(false); @@ -149,7 +149,7 @@ namespace svt //= ListBoxControl - ListBoxControl::ListBoxControl(Window* pParent, WinBits nWinStyle) + ListBoxControl::ListBoxControl(vcl::Window* pParent, WinBits nWinStyle) :ListBox(pParent, nWinStyle|WB_DROPDOWN|WB_NOBORDER) { EnableAutoSize(false); @@ -246,7 +246,7 @@ namespace svt //= CheckBoxControl - CheckBoxControl::CheckBoxControl(Window* pParent, WinBits nWinStyle) + CheckBoxControl::CheckBoxControl(vcl::Window* pParent, WinBits nWinStyle) :Control(pParent, nWinStyle) { const Wallpaper& rParentBackground = pParent->GetBackground(); diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 59e33c69f9b8..4e7d6efc9ee2 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -47,7 +47,7 @@ namespace svt namespace { - sal_uInt16 getRealGetFocusFlags( Window* _pWindow ) + sal_uInt16 getRealGetFocusFlags( vcl::Window* _pWindow ) { sal_uInt16 nFlags = 0; while ( _pWindow && !nFlags ) @@ -133,7 +133,7 @@ namespace svt } - EditBrowseBox::EditBrowseBox(Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags, BrowserMode _nMode ) + EditBrowseBox::EditBrowseBox(vcl::Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags, BrowserMode _nMode ) :BrowseBox( pParent, rId, _nMode ) ,nStartEvent(0) ,nEndEvent(0) @@ -154,7 +154,7 @@ namespace svt } - EditBrowseBox::EditBrowseBox( Window* pParent, sal_Int32 nBrowserFlags, WinBits nBits, BrowserMode _nMode ) + EditBrowseBox::EditBrowseBox( vcl::Window* pParent, sal_Int32 nBrowserFlags, WinBits nBits, BrowserMode _nMode ) :BrowseBox( pParent, nBits, _nMode ) ,nStartEvent(0) ,nEndEvent(0) @@ -554,7 +554,7 @@ namespace svt // the position of the event relative to the controller's window Point aPos = _rEvt.GetPosPixel() - _rEvt.GetRect().TopLeft(); // the (child) window which should really get the event - Window* pRealHandler = aController->GetWindow().FindWindow(aPos); + vcl::Window* pRealHandler = aController->GetWindow().FindWindow(aPos); if (pRealHandler) // the coords relative to this real handler aPos -= pRealHandler->GetPosPixel(); @@ -570,7 +570,7 @@ namespace svt if (_bUp) pRealHandler->MouseButtonUp(aEvent); - Window *pWin = &aController->GetWindow(); + vcl::Window *pWin = &aController->GetWindow(); if (!pWin->IsTracking()) { for (pWin = pWin->GetWindow(WINDOW_FIRSTCHILD); @@ -916,7 +916,7 @@ namespace svt if (nNewRow != nEditRow) { - Window& rWindow = GetDataWindow(); + vcl::Window& rWindow = GetDataWindow(); if ((nEditRow >= 0) && (GetBrowserFlags() & EBBF_NO_HANDLE_COLUMN_CONTENT) == 0) { Rectangle aRect = GetFieldRectPixel(nEditRow, 0, false ); diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index b55404b65c90..79d554f00dd2 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -136,7 +136,7 @@ void EditBrowseBox::GrabTableFocus() void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags ) { bool bFocus = false; - for (Window* pWindow = Application::GetFocusWindow(); + for (vcl::Window* pWindow = Application::GetFocusWindow(); pWindow && !bFocus; pWindow = pWindow->GetParent()) bFocus = pWindow == this; diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index 793a7f39b84d..c8f25e7b047e 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -43,7 +43,7 @@ namespace svtools { -ODocumentInfoPreview::ODocumentInfoPreview(Window * pParent, WinBits nBits): +ODocumentInfoPreview::ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits): Window(pParent, WB_DIALOGCONTROL), m_pEditWin(this, nBits), m_pInfoTable(new SvtDocInfoTable_Impl), m_aLanguageTag(SvtPathOptions().GetLanguageTag()) // detect application language @@ -55,7 +55,7 @@ ODocumentInfoPreview::ODocumentInfoPreview(Window * pParent, WinBits nBits): ODocumentInfoPreview::~ODocumentInfoPreview() {} -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeODocumentInfoPreview(Window *pParent, VclBuilder::stringmap&) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeODocumentInfoPreview(vcl::Window *pParent, VclBuilder::stringmap&) { return new ODocumentInfoPreview(pParent, WB_BORDER | WB_READONLY); } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 6dbe87f6e392..1d2e63d33734 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -191,7 +191,7 @@ protected: virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const SAL_OVERRIDE; public: - ViewTabListBox_Impl( Window* pParentWin, SvtFileView_Impl* pParent, sal_Int16 nFlags ); + ViewTabListBox_Impl( vcl::Window* pParentWin, SvtFileView_Impl* pParent, sal_Int16 nFlags ); virtual ~ViewTabListBox_Impl(); virtual void Resize() SAL_OVERRIDE; @@ -563,7 +563,7 @@ OUString CreateExactSizeText( sal_Int64 nSize ) // class ViewTabListBox_Impl --------------------------------------------- -ViewTabListBox_Impl::ViewTabListBox_Impl( Window* pParentWin, +ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin, SvtFileView_Impl* pParent, sal_Int16 nFlags ) : @@ -1062,7 +1062,7 @@ bool ViewTabListBox_Impl::Kill( const OUString& rContent ) } // class SvtFileView ----------------------------------------------------- -SvtFileView::SvtFileView( Window* pParent, WinBits nBits, +SvtFileView::SvtFileView( vcl::Window* pParent, WinBits nBits, bool bOnlyFolder, bool bMultiSelection ) : Control( pParent, nBits ) @@ -1095,7 +1095,7 @@ SvtFileView::~SvtFileView() delete pTemp; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtFileView(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvtFileView(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; @@ -2312,7 +2312,7 @@ void SvtFileView_Impl::SetActualFolder( const INetURLObject& rActualFolder ) namespace svtools { -QueryDeleteDlg_Impl::QueryDeleteDlg_Impl(Window* pParent, const OUString& rName) +QueryDeleteDlg_Impl::QueryDeleteDlg_Impl(vcl::Window* pParent, const OUString& rName) : MessageDialog(pParent, "QueryDeleteDialog", "svt/ui/querydeletedialog.ui") { get(m_pAllButton, "all"); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 44eadff34deb..0c39c577f24b 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -3664,7 +3664,7 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt ) sHelpText = sQuickHelpText; else sHelpText = aEntryText; - Help::ShowQuickHelp( (Window*)pView, aOptTextRect, sHelpText, QUICKHELP_LEFT | QUICKHELP_VCENTER ); + Help::ShowQuickHelp( (vcl::Window*)pView, aOptTextRect, sHelpText, QUICKHELP_LEFT | QUICKHELP_VCENTER ); } return true; diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 0689d688b0f8..da44f6e5ef64 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -70,7 +70,7 @@ SvxIconChoiceCtrlColumnInfo::SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtr | \*****************************************************************************/ -SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle ) : +SvtIconChoiceCtrl::SvtIconChoiceCtrl( vcl::Window* pParent, WinBits nWinStyle ) : // WB_CLIPCHILDREN on, as ScrollBars lie on the window! Control( pParent, nWinStyle | WB_CLIPCHILDREN ), @@ -493,7 +493,7 @@ void SvtIconChoiceCtrl::CallImplEventListeners(sal_uLong nEvent, void* pData) } ::com::sun::star::uno::Reference< XAccessible > SvtIconChoiceCtrl::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); DBG_ASSERT( pParent, "SvTreeListBox::CreateAccessible - accessible parent not found" ); ::com::sun::star::uno::Reference< XAccessible > xAccessible; diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 05a155612f4d..3de35c3f8e9d 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -26,13 +26,13 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -SvSimpleTableContainer::SvSimpleTableContainer(Window* pParent, WinBits nBits) +SvSimpleTableContainer::SvSimpleTableContainer(vcl::Window* pParent, WinBits nBits) : Control(pParent, nBits) , m_pTable(NULL) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvSimpleTableContainer(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvSimpleTableContainer(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvSimpleTableContainer(pParent, WB_TABSTOP | WB_DIALOGCONTROL | WB_BORDER); diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index b11ec76af6f3..82d59421e57e 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -396,7 +396,7 @@ void SvLBoxButton::Clone( SvLBoxItem* pSource ) pData = ((SvLBoxButton*)pSource)->pData; } -void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Window* i_pParent ) +void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, vcl::Window* i_pParent ) { if ( i_pParent->IsNativeControlSupported( i_eType, PART_ENTIRE_CONTROL) ) { diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 558be20a0650..b71fca5b646d 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -89,7 +89,7 @@ void SvTabListBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, } -SvTabListBox::SvTabListBox( Window* pParent, WinBits nBits ) +SvTabListBox::SvTabListBox( vcl::Window* pParent, WinBits nBits ) : SvTreeListBox( pParent, nBits ) { pTabList = 0; @@ -98,7 +98,7 @@ SvTabListBox::SvTabListBox( Window* pParent, WinBits nBits ) SetHighlightRange(); // select full width } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvTabListBox(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvTabListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; @@ -506,7 +506,7 @@ namespace svt // class SvHeaderTabListBox ---------------------------------------------- -SvHeaderTabListBox::SvHeaderTabListBox( Window* pParent, WinBits nWinStyle ) : +SvHeaderTabListBox::SvHeaderTabListBox( vcl::Window* pParent, WinBits nWinStyle ) : SvTabListBox( pParent, nWinStyle ), @@ -641,7 +641,7 @@ IMPL_LINK_NOARG(SvHeaderTabListBox, ScrollHdl_Impl) IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl) { - Window* pParent = m_pImpl->m_pHeaderBar->GetAccessibleParentWindow(); + vcl::Window* pParent = m_pImpl->m_pHeaderBar->GetAccessibleParentWindow(); DBG_ASSERT( pParent, "SvHeaderTabListBox..CreateAccessibleHdl_Impl - accessible parent not found" ); if ( pParent ) { @@ -839,7 +839,7 @@ Rectangle SvHeaderTabListBox::calcHeaderRect( bool _bIsColumnBar, bool _bOnScree Rectangle aRect; if ( _bIsColumnBar ) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if ( !_bOnScreen ) pParent = m_pImpl->m_pHeaderBar->GetAccessibleParentWindow(); @@ -850,7 +850,7 @@ Rectangle SvHeaderTabListBox::calcHeaderRect( bool _bIsColumnBar, bool _bOnScree Rectangle SvHeaderTabListBox::calcTableRect( bool _bOnScreen ) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if ( !_bOnScreen ) pParent = GetAccessibleParentWindow(); @@ -872,7 +872,7 @@ Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 aTopLeft.X() = aItemRect.Left(); Size aSize = aItemRect.GetSize(); aRect = Rectangle( aTopLeft, aSize ); - Window* pParent = NULL; + vcl::Window* pParent = NULL; if ( !_bOnScreen ) pParent = GetAccessibleParentWindow(); aTopLeft = aRect.TopLeft(); @@ -1153,7 +1153,7 @@ bool SvHeaderTabListBox::GetGlyphBoundRects( const Point& rOrigin, const OUStrin return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector ); } -Rectangle SvHeaderTabListBox::GetWindowExtentsRelative( Window *pRelativeWindow ) const +Rectangle SvHeaderTabListBox::GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const { return Control::GetWindowExtentsRelative( pRelativeWindow ); } @@ -1168,19 +1168,19 @@ Reference< XAccessible > SvHeaderTabListBox::GetAccessible( bool bCreate ) return Control::GetAccessible( bCreate ); } -Window* SvHeaderTabListBox::GetAccessibleParentWindow() const +vcl::Window* SvHeaderTabListBox::GetAccessibleParentWindow() const { return Control::GetAccessibleParentWindow(); } -Window* SvHeaderTabListBox::GetWindowInstance() +vcl::Window* SvHeaderTabListBox::GetWindowInstance() { return this; } Reference< XAccessible > SvHeaderTabListBox::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); DBG_ASSERT( pParent, "SvHeaderTabListBox::::CreateAccessible - accessible parent not found" ); Reference< XAccessible > xAccessible; diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 2e19444c95bd..a1e51b4a1768 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -61,7 +61,7 @@ class MyEdit_Impl : public Edit { SvInplaceEdit2* pOwner; public: - MyEdit_Impl( Window* pParent, SvInplaceEdit2* pOwner ); + MyEdit_Impl( vcl::Window* pParent, SvInplaceEdit2* pOwner ); virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; }; @@ -70,12 +70,12 @@ class MyMultiEdit_Impl : public MultiLineEdit { SvInplaceEdit2* pOwner; public: - MyMultiEdit_Impl( Window* pParent, SvInplaceEdit2* pOwner ); + MyMultiEdit_Impl( vcl::Window* pParent, SvInplaceEdit2* pOwner ); virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; }; -MyEdit_Impl::MyEdit_Impl( Window* pParent, SvInplaceEdit2* _pOwner ) : +MyEdit_Impl::MyEdit_Impl( vcl::Window* pParent, SvInplaceEdit2* _pOwner ) : Edit( pParent, WB_LEFT ), @@ -95,7 +95,7 @@ void MyEdit_Impl::LoseFocus() pOwner->LoseFocus(); } -MyMultiEdit_Impl::MyMultiEdit_Impl( Window* pParent, SvInplaceEdit2* _pOwner ) +MyMultiEdit_Impl::MyMultiEdit_Impl( vcl::Window* pParent, SvInplaceEdit2* _pOwner ) : MultiLineEdit( pParent, WB_CENTER ), pOwner(_pOwner) @@ -116,7 +116,7 @@ void MyMultiEdit_Impl::LoseFocus() SvInplaceEdit2::SvInplaceEdit2 ( - Window* pParent, const Point& rPos, + vcl::Window* pParent, const Point& rPos, const Size& rSize, const OUString& rData, const Link& rNotifyEditEnd, @@ -374,7 +374,7 @@ struct SvTreeListBoxImpl }; -SvTreeListBox::SvTreeListBox(Window* pParent, WinBits nWinStyle) : +SvTreeListBox::SvTreeListBox(vcl::Window* pParent, WinBits nWinStyle) : Control(pParent, nWinStyle | WB_CLIPCHILDREN), DropTargetHelper(this), DragSourceHelper(this), @@ -403,7 +403,7 @@ SvTreeListBox::SvTreeListBox(Window* pParent, WinBits nWinStyle) : SetSublistOpenWithLeftRight(); } -SvTreeListBox::SvTreeListBox(Window* pParent, const ResId& rResId) : +SvTreeListBox::SvTreeListBox(vcl::Window* pParent, const ResId& rResId) : Control(pParent, rResId), DropTargetHelper(this), DragSourceHelper(this), @@ -431,7 +431,7 @@ SvTreeListBox::SvTreeListBox(Window* pParent, const ResId& rResId) : SetSublistOpenWithLeftRight(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvTreeListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -3826,7 +3826,7 @@ void SvTreeListBox::EnableList( bool _bEnable ) ::com::sun::star::uno::Reference< XAccessible > SvTreeListBox::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); DBG_ASSERT( pParent, "SvTreeListBox::CreateAccessible - accessible parent not found" ); ::com::sun::star::uno::Reference< XAccessible > xAccessible; diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 920a3ccfa85a..ff3a748a4475 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -238,7 +238,7 @@ void Calendar::ImplInitSettings() -Calendar::Calendar( Window* pParent, WinBits nWinStyle ) : +Calendar::Calendar( vcl::Window* pParent, WinBits nWinStyle ) : Control( pParent, nWinStyle & (WB_TABSTOP | WB_GROUP | WB_BORDER | WB_3DLOOK | WB_RANGESELECT | WB_MULTISELECT) ), maCalendarWrapper( Application::GetAppLocaleDataWrapper().getComponentContext() ), maOldFormatFirstDate( 0, 0, 1900 ), @@ -2192,7 +2192,7 @@ private: FixedLine* mpFixedLine; public: - ImplCFieldFloatWin( Window* pParent ); + ImplCFieldFloatWin( vcl::Window* pParent ); virtual ~ImplCFieldFloatWin(); void SetCalendar( Calendar* pCalendar ) @@ -2207,7 +2207,7 @@ public: -ImplCFieldFloatWin::ImplCFieldFloatWin( Window* pParent ) : +ImplCFieldFloatWin::ImplCFieldFloatWin( vcl::Window* pParent ) : FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW ) { mpCalendar = NULL; @@ -2369,7 +2369,7 @@ bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt ) return FloatingWindow::Notify( rNEvt ); } -CalendarField::CalendarField(Window* pParent, WinBits nWinStyle) +CalendarField::CalendarField(vcl::Window* pParent, WinBits nWinStyle) : DateField(pParent, nWinStyle) , mpFloatWin(NULL) , mpCalendar(NULL) @@ -2513,7 +2513,7 @@ bool CalendarField::ShowDropDown( bool bShow ) -Calendar* CalendarField::CreateCalendar( Window* pParent ) +Calendar* CalendarField::CreateCalendar( vcl::Window* pParent ) { return new Calendar( pParent, mnCalendarStyle | WB_TABSTOP ); } diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index f3359c82d56d..a51de50c1963 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -90,21 +90,21 @@ void ColorListBox::ImplDestroyColorEntries() pColorList->clear(); } -ColorListBox::ColorListBox( Window* pParent, WinBits nWinStyle ) : +ColorListBox::ColorListBox( vcl::Window* pParent, WinBits nWinStyle ) : ListBox( pParent, nWinStyle ) { ImplInit(); SetEdgeBlending(true); } -ColorListBox::ColorListBox( Window* pParent, const ResId& rResId ) : +ColorListBox::ColorListBox( vcl::Window* pParent, const ResId& rResId ) : ListBox( pParent, rResId ) { ImplInit(); SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -715,7 +715,7 @@ void LineListBox::ImplInit() UpdatePaintLineColor(); } -LineListBox::LineListBox( Window* pParent, WinBits nWinStyle ) : +LineListBox::LineListBox( vcl::Window* pParent, WinBits nWinStyle ) : ListBox( pParent, nWinStyle ), m_nWidth( 5 ), m_sNone( ), @@ -725,7 +725,7 @@ LineListBox::LineListBox( Window* pParent, WinBits nWinStyle ) : ImplInit(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLineListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -953,7 +953,7 @@ void LineListBox::DataChanged( const DataChangedEvent& rDCEvt ) UpdateEntries( m_nWidth ); } -FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) : +FontNameBox::FontNameBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { mpFontList = NULL; @@ -961,7 +961,7 @@ FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) : InitFontMRUEntriesFile(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontNameBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -1315,7 +1315,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt ) } } -FontStyleBox::FontStyleBox(Window* pParent, WinBits nBits) +FontStyleBox::FontStyleBox(vcl::Window* pParent, WinBits nBits) : ComboBox(pParent, nBits) { //Use the standard texts to get an optimal size and stick to that size. @@ -1339,7 +1339,7 @@ Size FontStyleBox::GetOptimalSize() const return ComboBox::GetOptimalSize(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontStyleBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontStyleBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -1533,13 +1533,13 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList ) } } -FontSizeBox::FontSizeBox( Window* pParent, WinBits nWinSize ) : +FontSizeBox::FontSizeBox( vcl::Window* pParent, WinBits nWinSize ) : MetricBox( pParent, nWinSize ) { ImplInit(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontSizeBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontSizeBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index c26a13c7ec7f..f6df0e4fac02 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::ui; -FileControl::FileControl( Window* pParent, WinBits nStyle, FileControlMode nFlags ) : +FileControl::FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode nFlags ) : Window( pParent, nStyle|WB_DIALOGCONTROL ), maEdit( this, (nStyle&(~WB_BORDER))|WB_NOTABSTOP ), maButton( this, (nStyle&(~WB_BORDER))|WB_NOLIGHTBORDER|WB_NOPOINTERFOCUS|WB_NOTABSTOP ), diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx index 13f96f01a3ff..5ed40d77eaac 100644 --- a/svtools/source/control/fileurlbox.cxx +++ b/svtools/source/control/fileurlbox.cxx @@ -30,7 +30,7 @@ namespace svt //= FileURLBox - FileURLBox::FileURLBox( Window* _pParent, WinBits _nStyle ) + FileURLBox::FileURLBox( vcl::Window* _pParent, WinBits _nStyle ) :SvtURLBox( _pParent, _nStyle, INET_PROT_FILE ) { DisableHistory(); diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index df5f6656cdde..edb8ad31aac5 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -297,7 +297,7 @@ FormattedField::StaticFormatter::~StaticFormatter() } -FormattedField::FormattedField(Window* pParent, WinBits nStyle, SvNumberFormatter* pInitialFormatter, sal_Int32 nFormatKey) +FormattedField::FormattedField(vcl::Window* pParent, WinBits nStyle, SvNumberFormatter* pInitialFormatter, sal_Int32 nFormatKey) :SpinField(pParent, nStyle) ,m_aLastSelection(0,0) ,m_dMinValue(0) @@ -328,7 +328,7 @@ FormattedField::FormattedField(Window* pParent, WinBits nStyle, SvNumberFormatte } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFormattedField(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFormattedField(vcl::Window *pParent, VclBuilder::stringmap &) { WinBits nWinBits = WB_BORDER | WB_SPIN; return new FormattedField(pParent, nWinBits); @@ -1067,7 +1067,7 @@ void DoubleNumericField::ResetConformanceTester() m_pNumberValidator = new validation::NumberValidator( cSeparatorThousand, cSeparatorDecimal ); } -DoubleCurrencyField::DoubleCurrencyField(Window* pParent, WinBits nStyle) +DoubleCurrencyField::DoubleCurrencyField(vcl::Window* pParent, WinBits nStyle) :FormattedField(pParent, nStyle) ,m_bChangingFormat(false) { diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index def0e6ad1997..5f513e6e0220 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -103,7 +103,7 @@ void HeaderBar::ImplInit( WinBits nWinStyle ) -HeaderBar::HeaderBar( Window* pParent, WinBits nWinStyle ) : +HeaderBar::HeaderBar( vcl::Window* pParent, WinBits nWinStyle ) : Window( pParent, nWinStyle & WB_3DLOOK ) { ImplInit( nWinStyle ); @@ -303,7 +303,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, const Rectangle* pRect, sal_uLong ) { - Window *const pWin = (pDev->GetOutDevType()==OUTDEV_WINDOW) ? (Window*) pDev : NULL; + vcl::Window *const pWin = (pDev->GetOutDevType()==OUTDEV_WINDOW) ? (vcl::Window*) pDev : NULL; ImplControlValue aControlValue(0); Rectangle aCtrlRegion; ControlState nState(0); diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index e6aab88342e4..5c724842f7d1 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -48,7 +48,7 @@ namespace svt { } - HyperLabel::HyperLabel( Window* _pParent, WinBits _nWinStyle ) + HyperLabel::HyperLabel( vcl::Window* _pParent, WinBits _nWinStyle ) :FixedText( _pParent, _nWinStyle ) ,m_pImpl( new HyperLabelImpl ) { diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index a5850531c182..21a40a6fd250 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -832,7 +832,7 @@ void SvtURLBox::TryAutoComplete() } -SvtURLBox::SvtURLBox( Window* pParent, INetProtocol eSmart, bool bSetDefaultHelpID ) +SvtURLBox::SvtURLBox( vcl::Window* pParent, INetProtocol eSmart, bool bSetDefaultHelpID ) : ComboBox( pParent , WB_DROPDOWN | WB_AUTOSIZE | WB_AUTOHSCROLL ), eSmartProtocol( eSmart ), bAutoCompleteMode( false ), @@ -851,7 +851,7 @@ SvtURLBox::SvtURLBox( Window* pParent, INetProtocol eSmart, bool bSetDefaultHelp } -SvtURLBox::SvtURLBox( Window* pParent, WinBits _nStyle, INetProtocol eSmart, +SvtURLBox::SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart, bool bSetDefaultHelpID ) : ComboBox( pParent, _nStyle ), eSmartProtocol( eSmart ), @@ -865,7 +865,7 @@ SvtURLBox::SvtURLBox( Window* pParent, WinBits _nStyle, INetProtocol eSmart, Init(bSetDefaultHelpID); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtURLBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvtURLBox(vcl::Window *pParent, VclBuilder::stringmap &) { WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP| WB_DROPDOWN|WB_AUTOSIZE|WB_AUTOHSCROLL; @@ -875,7 +875,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtURLBox(Window *pParent, } -SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart, +SvtURLBox::SvtURLBox( vcl::Window* pParent, const ResId& _rResId, INetProtocol eSmart, bool bSetDefaultHelpID ) : ComboBox( pParent , _rResId ), eSmartProtocol( eSmart ), diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index cc90d4344ed4..58f3d06ba0e8 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -45,7 +45,7 @@ namespace svt class IDLabel : public FixedText { public: - IDLabel( Window* _pParent, WinBits _nWinStyle = 0 ); + IDLabel( vcl::Window* _pParent, WinBits _nWinStyle = 0 ); virtual ~IDLabel( ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; @@ -79,7 +79,7 @@ namespace svt bool IsEnabled() const; void GrabFocus(); - bool Contains( const Window* _pWindow ) const; + bool Contains( const vcl::Window* _pWindow ) const; HyperLabel* GetDescriptionHyperLabel() const { return mpDescription; } @@ -162,7 +162,7 @@ namespace svt //= Roadmap - ORoadmap::ORoadmap( Window* _pParent, WinBits _nWinStyle ) + ORoadmap::ORoadmap( vcl::Window* _pParent, WinBits _nWinStyle ) :Control( _pParent, _nWinStyle ) ,m_pImpl( new RoadmapImpl( *this ) ) @@ -598,7 +598,7 @@ namespace svt } - RoadmapItem* ORoadmap::GetByPointer(Window* pWindow) + RoadmapItem* ORoadmap::GetByPointer(vcl::Window* pWindow) { const HL_Vector& rItems = m_pImpl->getHyperLabels(); for ( HL_Vector::const_iterator i = rItems.begin(); @@ -618,7 +618,7 @@ namespace svt // capture KeyEvents for taskpane cycling if ( _rNEvt.GetType() == EVENT_KEYINPUT ) { - Window* pWindow = _rNEvt.GetWindow(); + vcl::Window* pWindow = _rNEvt.GetWindow(); RoadmapItem* pItem = GetByPointer( pWindow ); if ( pItem != NULL ) { @@ -693,7 +693,7 @@ namespace svt } - bool RoadmapItem::Contains( const Window* _pWindow ) const + bool RoadmapItem::Contains( const vcl::Window* _pWindow ) const { return ( mpID == _pWindow ) || ( mpDescription == _pWindow ); } @@ -851,7 +851,7 @@ namespace svt } - IDLabel::IDLabel( Window* _pParent, WinBits _nWinStyle ) + IDLabel::IDLabel( vcl::Window* _pParent, WinBits _nWinStyle ) :FixedText( _pParent, _nWinStyle ) { diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 0a0170f2cc49..6dfce365f415 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -283,7 +283,7 @@ void Ruler::ImplInit( WinBits nWinBits ) pAccContext = NULL; } -Ruler::Ruler( Window* pParent, WinBits nWinStyle ) : +Ruler::Ruler( vcl::Window* pParent, WinBits nWinStyle ) : Window( pParent, nWinStyle & WB_3DLOOK ), maVirDev( *this ), maMapMode( MAP_100TH_MM ), @@ -2802,7 +2802,7 @@ void Ruler::DrawTicks() uno::Reference< XAccessible > Ruler::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); OSL_ENSURE( pParent, "-SvxRuler::CreateAccessible(): No Parent!" ); uno::Reference< XAccessible > xAccParent = pParent->GetAccessible(); if( xAccParent.is() ) diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 68feada7de87..e948e2c76144 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -40,7 +40,7 @@ void ScrollableWindow::ImpInitialize( ScrollableWindowFlags nFlags ) -ScrollableWindow::ScrollableWindow( Window* pParent, WinBits nBits, +ScrollableWindow::ScrollableWindow( vcl::Window* pParent, WinBits nBits, ScrollableWindowFlags nFlags ) : Window( pParent, WinBits(nBits|WB_CLIPCHILDREN) ), aVScroll( this, WinBits(WB_VSCROLL | WB_DRAG) ), diff --git a/svtools/source/control/stdctrl.cxx b/svtools/source/control/stdctrl.cxx index bc117dcc848c..4e3b03c8c5ce 100644 --- a/svtools/source/control/stdctrl.cxx +++ b/svtools/source/control/stdctrl.cxx @@ -19,7 +19,7 @@ #include <svtools/stdctrl.hxx> -FixedInfo::FixedInfo( Window* pParent, const ResId& rResId ) : +FixedInfo::FixedInfo( vcl::Window* pParent, const ResId& rResId ) : FixedText( pParent, rResId ) { SetStyle( GetStyle() | WB_INFO ); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 81afa0a95f81..7dd15b0d55e1 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -142,7 +142,7 @@ bool ImplTabButton::PreNotify( NotifyEvent& rNEvt ) // - ImplTabSizer - -class ImplTabSizer : public Window +class ImplTabSizer : public vcl::Window { public: ImplTabSizer( TabBar* pParent, WinBits nWinStyle = 0 ); @@ -434,7 +434,7 @@ void TabBar::ImplInit( WinBits nWinStyle ) -TabBar::TabBar( Window* pParent, WinBits nWinStyle ) : +TabBar::TabBar( vcl::Window* pParent, WinBits nWinStyle ) : Window( pParent, (nWinStyle & WB_3DLOOK) | WB_CLIPCHILDREN ) { ImplInit( nWinStyle ); diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 2be0e430d8bb..fb03917624d5 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -41,7 +41,7 @@ namespace svtools { -static Window* GetTopMostParentSystemWindow( Window* pWindow ) +static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) { OSL_ASSERT( pWindow ); if ( pWindow ) @@ -437,7 +437,7 @@ IMPL_LINK( ToolbarMenu, HighlightHdl, Control *, pControl ) -ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWindow, WinBits nBits ) +ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, vcl::Window* pParentWindow, WinBits nBits ) : DockingWindow(pParentWindow, nBits) { implInit(rFrame); @@ -445,7 +445,7 @@ ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWind -ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWindow, const ResId& rResId ) +ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, vcl::Window* pParentWindow, const ResId& rResId ) : DockingWindow(pParentWindow, rResId) { implInit(rFrame); @@ -462,7 +462,7 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame) initWindow(); - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } @@ -471,7 +471,7 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame) ToolbarMenu::~ToolbarMenu() { - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->RemoveWindow( this ); @@ -584,7 +584,7 @@ void ToolbarMenu::initWindow() -static long ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) +static long ImplGetNativeCheckAndRadioSize( vcl::Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) { rMaxWidth = rCheckHeight = rRadioHeight = 0; @@ -1283,7 +1283,7 @@ void ToolbarMenu::KeyInput( const KeyEvent& rKEvent ) } -static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRect, bool i_bHighlight ) +static void ImplPaintCheckBackground( vcl::Window* i_pWindow, const Rectangle& i_rRect, bool i_bHighlight ) { bool bNativeOk = false; if( i_pWindow->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) ) diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index a8bae45688eb..2464694faa0c 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -182,7 +182,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (R Reference< XAccessible > xRet; - Window* pParent = mpParent->mrMenu.GetParent(); + vcl::Window* pParent = mpParent->mrMenu.GetParent(); if( pParent ) xRet = pParent->GetAccessible(); @@ -196,7 +196,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeEx const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); - Window* pParent = mpParent->mrMenu.GetParent(); + vcl::Window* pParent = mpParent->mrMenu.GetParent(); if( pParent ) { for( sal_uInt16 i = 0, nCount = pParent->GetChildCount(); i < nCount ; i++ ) @@ -238,7 +238,7 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException, s if( aRet.isEmpty() ) { - Window* pLabel = mpParent->mrMenu.GetAccessibleRelationLabeledBy(); + vcl::Window* pLabel = mpParent->mrMenu.GetAccessibleRelationLabeledBy(); if( pLabel && pLabel != &mpParent->mrMenu ) aRet = OutputDevice::GetNonMnemonicString( pLabel->GetText() ); } diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx index 771bd144f426..e22b6b351c26 100644 --- a/svtools/source/control/urlcontrol.cxx +++ b/svtools/source/control/urlcontrol.cxx @@ -26,13 +26,13 @@ namespace svt { //= OFileURLControl - OFileURLControl::OFileURLControl(Window* _pParent, WinBits nStyle) + OFileURLControl::OFileURLControl(vcl::Window* _pParent, WinBits nStyle) : SvtURLBox(_pParent, nStyle, INET_PROT_FILE) { DisableHistory(); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOFileURLControl(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOFileURLControl(vcl::Window *pParent, VclBuilder::stringmap &) { WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP| WB_DROPDOWN|WB_AUTOSIZE|WB_AUTOHSCROLL; diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 585908b4a0e8..56f515c3877a 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -216,7 +216,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - Window* pParent = mpParent->GetParent(); + vcl::Window* pParent = mpParent->GetParent(); uno::Reference< accessibility::XAccessible > xRet; if( pParent ) @@ -232,7 +232,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - Window* pParent = mpParent->GetParent(); + vcl::Window* pParent = mpParent->GetParent(); sal_Int32 nRet = 0; if( pParent ) @@ -292,7 +292,7 @@ OUString SAL_CALL ValueSetAcc::getAccessibleName() if ( aRet.isEmpty() ) { - Window* pLabel = mpParent->GetAccessibleRelationLabeledBy(); + vcl::Window* pLabel = mpParent->GetAccessibleRelationLabeledBy(); if ( pLabel && pLabel != mpParent ) aRet = OutputDevice::GetNonMnemonicString( pLabel->GetText() ); @@ -312,13 +312,13 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::ge ThrowIfDisposed(); SolarMutexGuard g; uno::Reference< accessibility::XAccessibleRelationSet > xRelSet; - Window* pWindow = (Window*)mpParent; + vcl::Window* pWindow = (vcl::Window*)mpParent; if ( pWindow ) { utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper; xRelSet = pRelationSet; - Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); + vcl::Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); if ( pLabeledBy && pLabeledBy != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); @@ -326,7 +326,7 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::ge pRelationSet->AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABELED_BY, aSequence ) ); } - Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf(); + vcl::Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf(); if ( pMemberOf && pMemberOf != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 3792f2ef1262..f7d0fa936015 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -94,7 +94,7 @@ void ValueSet::ImplInit() ImplInitSettings( true, true, true ); } -ValueSet::ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren ) : +ValueSet::ValueSet( vcl::Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren ) : Control( pParent, nWinStyle ), maVirDev( *this ), maColor( COL_TRANSPARENT ) @@ -103,7 +103,7 @@ ValueSet::ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientCh mbIsTransientChildrenDisabled = bDisableTransientChildren; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeValueSet(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeValueSet(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -114,7 +114,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeValueSet(Window *pParent, V return new ValueSet(pParent, nWinBits); } -ValueSet::ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransientChildren ) : +ValueSet::ValueSet( vcl::Window* pParent, const ResId& rResId, bool bDisableTransientChildren ) : Control( pParent, rResId ), maVirDev( *this ), maColor( COL_TRANSPARENT ) diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx index 9ec4012b9526..94415b4f1420 100644 --- a/svtools/source/control/vclxaccessibleheaderbar.cxx +++ b/svtools/source/control/vclxaccessibleheaderbar.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -VCLXHeaderBar::VCLXHeaderBar(Window* pHeaderBar) +VCLXHeaderBar::VCLXHeaderBar(vcl::Window* pHeaderBar) { SetWindow(pHeaderBar); } diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index ec4328fb006b..e63ce8700237 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -16,7 +16,7 @@ using namespace boost; -PlaceEditDialog::PlaceEditDialog( Window* pParent ) : +PlaceEditDialog::PlaceEditDialog( vcl::Window* pParent ) : ModalDialog( pParent, "PlaceEditDialog", "svt/ui/placeedit.ui" ), m_pCurrentDetails( ) { @@ -42,7 +42,7 @@ PlaceEditDialog::PlaceEditDialog( Window* pParent ) : InitDetails( ); } -PlaceEditDialog::PlaceEditDialog( Window* pParent, const boost::shared_ptr<Place>& pPlace ) : +PlaceEditDialog::PlaceEditDialog( vcl::Window* pParent, const boost::shared_ptr<Place>& pPlace ) : ModalDialog( pParent, "PlaceEditDialog", "svt/ui/placeedit.ui" ), m_pCurrentDetails( ) { diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 809b222e5d01..a35fe0f9e7d9 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -510,7 +510,7 @@ void AssignmentPersistentData::Commit() - AddressBookSourceDialog::AddressBookSourceDialog(Window* _pParent, + AddressBookSourceDialog::AddressBookSourceDialog(vcl::Window* _pParent, const Reference< XComponentContext >& _rxORB ) : ModalDialog(_pParent, "AddressTemplateDialog", "svt/ui/addresstemplatedialog.ui") , m_sNoFieldSelection(SVT_RESSTR(STR_NO_FIELD_SELECTION)) @@ -521,7 +521,7 @@ void AssignmentPersistentData::Commit() } - AddressBookSourceDialog::AddressBookSourceDialog( Window* _pParent, const Reference< XComponentContext >& _rxORB, + AddressBookSourceDialog::AddressBookSourceDialog( vcl::Window* _pParent, const Reference< XComponentContext >& _rxORB, const Reference< XDataSource >& _rxTransientDS, const OUString& _rDataSourceName, const OUString& _rTable, const Sequence< AliasProgrammaticPair >& _rMapping ) : ModalDialog(_pParent, "AddressTemplateDialog", "svt/ui/addresstemplatedialog.ui") diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 76c5300c5595..232aaf42e9b8 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::ui::dialogs; // - ColorDialog - -SvColorDialog::SvColorDialog( Window* pWindow ) +SvColorDialog::SvColorDialog( vcl::Window* pWindow ) : mpParent( pWindow ) , meMode( svtools::ColorPickerMode_SELECT ) { diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 90b047783b65..d5fe5fa9b394 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -216,7 +216,7 @@ OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) -PrinterSetupDialog::PrinterSetupDialog(Window* pParent) +PrinterSetupDialog::PrinterSetupDialog(vcl::Window* pParent) : ModalDialog(pParent, "PrinterSetupDialog", "svt/ui/printersetupdialog.ui") { diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index fefdf3f5ab3d..d116d9b1bfc2 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -25,7 +25,7 @@ namespace { class RestartDialog: public ModalDialog { public: - RestartDialog(Window * parent, svtools::RestartReason reason): + RestartDialog(vcl::Window * parent, svtools::RestartReason reason): ModalDialog(parent, "RestartDialog", "svt/ui/restartdialog.ui") { get(btnYes_, "yes"); @@ -52,7 +52,7 @@ private: DECL_LINK(hdlYes, void *); DECL_LINK(hdlNo, void *); - Window * reason_; + vcl::Window * reason_; PushButton * btnYes_; PushButton * btnNo_; }; @@ -71,7 +71,7 @@ IMPL_LINK_NOARG(RestartDialog, hdlNo) { void svtools::executeRestartDialog( css::uno::Reference< css::uno::XComponentContext > const & context, - Window * parent, RestartReason reason) + vcl::Window * parent, RestartReason reason) { if (RestartDialog(parent, reason).Execute()) { css::task::OfficeRestartManager::get(context)->requestRestart( diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index bb2881445435..649f970c92d9 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -118,14 +118,14 @@ namespace svt } //= RoadmapWizard - RoadmapWizard::RoadmapWizard( Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) + RoadmapWizard::RoadmapWizard( vcl::Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) :OWizardMachine( _pParent, i_nStyle, _nButtonFlags ) ,m_pImpl( new RoadmapWizardImpl ) { impl_construct(); } - RoadmapWizard::RoadmapWizard( Window* _pParent, sal_uInt32 _nButtonFlags ) + RoadmapWizard::RoadmapWizard( vcl::Window* _pParent, sal_uInt32 _nButtonFlags ) :OWizardMachine( _pParent, _nButtonFlags ) ,m_pImpl( new RoadmapWizardImpl ) { diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 88f61450c741..4c7ee7a81ef4 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -40,7 +40,7 @@ namespace svt } }; - OWizardPage::OWizardPage(Window *pParent, const OString& rID, + OWizardPage::OWizardPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription) : TabPage(pParent, rID, rUIXMLDescription) , m_pImpl(new WizardPageImplData) @@ -100,7 +100,7 @@ namespace svt } }; - OWizardMachine::OWizardMachine(Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) + OWizardMachine::OWizardMachine(vcl::Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) :WizardDialog( _pParent, i_nStyle ) ,m_pFinish(NULL) ,m_pCancel(NULL) @@ -112,7 +112,7 @@ namespace svt implConstruct( _nButtonFlags ); } - OWizardMachine::OWizardMachine(Window* _pParent, sal_uInt32 _nButtonFlags ) + OWizardMachine::OWizardMachine(vcl::Window* _pParent, sal_uInt32 _nButtonFlags ) :WizardDialog( _pParent, "WizardDialog", "svt/ui/wizarddialog.ui" ) ,m_pFinish(NULL) ,m_pCancel(NULL) @@ -301,9 +301,9 @@ namespace svt } - void OWizardMachine::implResetDefault(Window* _pWindow) + void OWizardMachine::implResetDefault(vcl::Window* _pWindow) { - Window* pChildLoop = _pWindow->GetWindow(WINDOW_FIRSTCHILD); + vcl::Window* pChildLoop = _pWindow->GetWindow(WINDOW_FIRSTCHILD); while (pChildLoop) { // does the window participate in the tabbing order? diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index eba9962d71f1..54febf2b8797 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -347,7 +347,7 @@ TabPage* WizardDialog::ImplGetPage( sal_uInt16 nLevel ) const return NULL; } -WizardDialog::WizardDialog( Window* pParent, WinBits nStyle ) : +WizardDialog::WizardDialog( vcl::Window* pParent, WinBits nStyle ) : ModalDialog( pParent, nStyle ) { ImplInitData(); @@ -355,7 +355,7 @@ WizardDialog::WizardDialog( Window* pParent, WinBits nStyle ) : -WizardDialog::WizardDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : +WizardDialog::WizardDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : ModalDialog( pParent, rID, rUIXMLDescription ) { ImplInitData(); diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index 0042d8e50d8d..1410921320f7 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -25,13 +25,13 @@ #include <vcl/txtattr.hxx> -MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle, +MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( vcl::Window* pParent, WinBits nWinStyle, HighlighterLanguage aLanguage): MultiLineEdit(pParent,nWinStyle), mbDoBracketHilight(true), aHighlighter(aLanguage) { EnableUpdateData(300); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeMultiLineEditSyntaxHighlight(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeMultiLineEditSyntaxHighlight(vcl::Window *pParent, VclBuilder::stringmap &) { return new MultiLineEditSyntaxHighlight(pParent); } diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index c1319e57cf2a..3f645d556932 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -21,7 +21,7 @@ #include "unoiface.hxx" -MultiLineEdit::MultiLineEdit( Window* pParent, WinBits nWinStyle ) +MultiLineEdit::MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ) : VclMultiLineEdit( pParent,nWinStyle ) { } diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx index a50a4a62871b..9bb4c5f85478 100644 --- a/svtools/source/edit/svmedit2.cxx +++ b/svtools/source/edit/svmedit2.cxx @@ -21,7 +21,7 @@ #include <svtools/svmedit2.hxx> #include <vcl/xtextedt.hxx> -ExtMultiLineEdit::ExtMultiLineEdit( Window* pParent, WinBits nWinStyle ) : +ExtMultiLineEdit::ExtMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ) : MultiLineEdit( pParent, nWinStyle ) diff --git a/svtools/source/filter/GraphicExportOptionsDialog.cxx b/svtools/source/filter/GraphicExportOptionsDialog.cxx index 260b22aa5918..20e2ed7fc28d 100644 --- a/svtools/source/filter/GraphicExportOptionsDialog.cxx +++ b/svtools/source/filter/GraphicExportOptionsDialog.cxx @@ -23,7 +23,7 @@ using namespace css::beans; using namespace css::lang; using namespace css::uno; -GraphicExportOptionsDialog::GraphicExportOptionsDialog(Window* pWindow, const Reference<XComponent>& rxSourceDocument) : +GraphicExportOptionsDialog::GraphicExportOptionsDialog(vcl::Window* pWindow, const Reference<XComponent>& rxSourceDocument) : ModalDialog(pWindow, "GraphicExporter", "svt/ui/GraphicExportOptionsDialog.ui"), mResolution(96.0), mRenderer(rxSourceDocument) diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 4ef43e98d75b..be2a12e09dfc 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -945,7 +945,7 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice, if( pOutputDevice->GetOutDevType() == OUTDEV_WINDOW ) { - const Region aPaintRgn( ( (Window*) pOutputDevice )->GetPaintRegion() ); + const Region aPaintRgn( ( (vcl::Window*) pOutputDevice )->GetPaintRegion() ); if( !aPaintRgn.IsNull() ) aOutRect.Intersection( pOutputDevice->LogicToPixel( aPaintRgn.GetBoundRect() ) ); } diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index 9e64a3dec7f1..08716455213a 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -119,7 +119,7 @@ IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserReq xWinPeer->setProperty( OUString( "PluginParent" ), uno::makeAny( (sal_Int64) 0 ) ); - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) Dialog::EndAllDialogs( pWindow ); } diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx index eee3307916d7..595fb071a24f 100644 --- a/svtools/source/hatchwindow/hatchwindow.cxx +++ b/svtools/source/hatchwindow/hatchwindow.cxx @@ -44,7 +44,7 @@ void VCLXHatchWindow::initializeWindow( const uno::Reference< awt::XWindowPeer > { SolarMutexGuard aGuard; - Window* pParent = NULL; + vcl::Window* pParent = NULL; VCLXWindow* pParentComponent = VCLXWindow::GetImplementation( xParent ); if ( pParentComponent ) diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx index 4f68835d38bb..5ddfba33b8a6 100644 --- a/svtools/source/hatchwindow/ipwin.cxx +++ b/svtools/source/hatchwindow/ipwin.cxx @@ -138,7 +138,7 @@ void SvResizeHelper::Draw( OutputDevice * pDev ) |* |* Description *************************************************************************/ -void SvResizeHelper::InvalidateBorder( Window * pWin ) +void SvResizeHelper::InvalidateBorder( vcl::Window * pWin ) { Rectangle aMoveRects[ 4 ]; FillMoveRectsPixel( aMoveRects ); @@ -151,7 +151,7 @@ void SvResizeHelper::InvalidateBorder( Window * pWin ) |* |* Description *************************************************************************/ -bool SvResizeHelper::SelectBegin( Window * pWin, const Point & rPos ) +bool SvResizeHelper::SelectBegin( vcl::Window * pWin, const Point & rPos ) { if( -1 == nGrab ) { @@ -171,7 +171,7 @@ bool SvResizeHelper::SelectBegin( Window * pWin, const Point & rPos ) |* |* Description *************************************************************************/ -short SvResizeHelper::SelectMove( Window * pWin, const Point & rPos ) +short SvResizeHelper::SelectMove( vcl::Window * pWin, const Point & rPos ) { if( -1 == nGrab ) { @@ -421,7 +421,7 @@ void SvResizeHelper::ValidateRect( Rectangle & rValidate ) const |* |* Description *************************************************************************/ -bool SvResizeHelper::SelectRelease( Window * pWin, const Point & rPos, +bool SvResizeHelper::SelectRelease( vcl::Window * pWin, const Point & rPos, Rectangle & rOutPosSize ) { if( -1 != nGrab ) @@ -441,7 +441,7 @@ bool SvResizeHelper::SelectRelease( Window * pWin, const Point & rPos, |* |* Description *************************************************************************/ -void SvResizeHelper::Release( Window * pWin ) +void SvResizeHelper::Release( vcl::Window * pWin ) { if( nGrab != -1 ) { @@ -458,7 +458,7 @@ void SvResizeHelper::Release( Window * pWin ) *************************************************************************/ SvResizeWindow::SvResizeWindow ( - Window * pParent, + vcl::Window * pParent, VCLXHatchWindow* pWrapper ) : Window( pParent, WB_CLIPCHILDREN ) diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx index f3e9dde7137c..534f0d4a6ac6 100644 --- a/svtools/source/hatchwindow/ipwin.hxx +++ b/svtools/source/hatchwindow/ipwin.hxx @@ -58,20 +58,20 @@ public: void FillHandleRectsPixel( Rectangle aRects[ 8 ] ) const; void FillMoveRectsPixel( Rectangle aRects[ 4 ] ) const; void Draw( OutputDevice * ); - void InvalidateBorder( Window * ); - bool SelectBegin( Window *, const Point & rPos ); - short SelectMove( Window * pWin, const Point & rPos ); + void InvalidateBorder( vcl::Window * ); + bool SelectBegin( vcl::Window *, const Point & rPos ); + short SelectMove( vcl::Window * pWin, const Point & rPos ); Point GetTrackPosPixel( const Rectangle & rRect ) const; Rectangle GetTrackRectPixel( const Point & rTrackPos ) const; void ValidateRect( Rectangle & rValidate ) const; - bool SelectRelease( Window *, const Point & rPos, Rectangle & rOutPosSize ); - void Release( Window * pWin ); + bool SelectRelease( vcl::Window *, const Point & rPos, Rectangle & rOutPosSize ); + void Release( vcl::Window * pWin ); }; /********************** SvResizeWindow *********************************** *************************************************************************/ class VCLXHatchWindow; -class SvResizeWindow : public Window +class SvResizeWindow : public vcl::Window { Pointer m_aOldPointer; short m_nMoveGrab; // last pointer type @@ -80,7 +80,7 @@ class SvResizeWindow : public Window VCLXHatchWindow* m_pWrapper; public: - SvResizeWindow( Window* pParent, VCLXHatchWindow* pWrapper ); + SvResizeWindow( vcl::Window* pParent, VCLXHatchWindow* pWrapper ); void SetHatchBorderPixel( const Size & rSize ); diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index af95a045a405..36588b1b65c0 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -124,7 +124,7 @@ public: VCLXFileControl(); virtual ~VCLXFileControl(); - void SetWindow( Window* pWindow ) SAL_OVERRIDE; + void SetWindow( vcl::Window* pWindow ) SAL_OVERRIDE; // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -210,7 +210,7 @@ protected: void NotifyTextListeners(); ::com::sun::star::uno::Any convertEffectiveValue(const ::com::sun::star::uno::Any& rValue); - virtual void SetWindow(Window* _pWindow) SAL_OVERRIDE; + virtual void SetWindow(vcl::Window* _pWindow) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index 4102cd3482c5..a3b6fff35375 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -58,7 +58,7 @@ void SAL_CALL TransferableClipboardListener::changedContents( } } -void TransferableClipboardListener::AddRemoveListener( Window* pWin, bool bAdd ) +void TransferableClipboardListener::AddRemoveListener( vcl::Window* pWin, bool bAdd ) { try { diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index 516b3afc7c35..987e841d01ce 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -49,12 +49,12 @@ namespace svt struct DialogController_Data { - Window& rInstigator; - ::std::vector< Window* > aConcernedWindows; + vcl::Window& rInstigator; + ::std::vector< vcl::Window* > aConcernedWindows; PWindowEventFilter pEventFilter; PWindowOperator pOperator; - DialogController_Data( Window& _rInstigator, const PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator ) + DialogController_Data( vcl::Window& _rInstigator, const PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator ) :rInstigator( _rInstigator ) ,pEventFilter( _pEventFilter ) ,pOperator( _pOperator ) @@ -66,7 +66,7 @@ namespace svt //= DialogController - DialogController::DialogController( Window& _rInstigator, const PWindowEventFilter& _pEventFilter, + DialogController::DialogController( vcl::Window& _rInstigator, const PWindowEventFilter& _pEventFilter, const PWindowOperator& _pOperator ) :m_pImpl( new DialogController_Data( _rInstigator, _pEventFilter, _pOperator ) ) { @@ -92,7 +92,7 @@ namespace svt } - void DialogController::addDependentWindow( Window& _rWindow ) + void DialogController::addDependentWindow( vcl::Window& _rWindow ) { m_pImpl->aConcernedWindows.push_back( &_rWindow ); @@ -111,7 +111,7 @@ namespace svt void DialogController::impl_updateAll( const VclWindowEvent& _rTriggerEvent ) { - for ( ::std::vector< Window* >::iterator loop = m_pImpl->aConcernedWindows.begin(); + for ( ::std::vector< vcl::Window* >::iterator loop = m_pImpl->aConcernedWindows.begin(); loop != m_pImpl->aConcernedWindows.end(); ++loop ) @@ -119,7 +119,7 @@ namespace svt } - void DialogController::impl_update( const VclWindowEvent& _rTriggerEvent, Window& _rWindow ) + void DialogController::impl_update( const VclWindowEvent& _rTriggerEvent, vcl::Window& _rWindow ) { m_pImpl->pOperator->operateOn( _rTriggerEvent, _rWindow ); } @@ -173,7 +173,7 @@ namespace svt } - void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow ) + void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow ) { PDialogController pController( new RadioDependentEnabler( _rRadio ) ); pController->addDependentWindow( _rDependentWindow ); @@ -181,7 +181,7 @@ namespace svt } - void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2 ) + void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2 ) { PDialogController pController( new RadioDependentEnabler( _rRadio ) ); pController->addDependentWindow( _rDependentWindow1 ); @@ -190,7 +190,7 @@ namespace svt } - void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 ) + void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3 ) { PDialogController pController( new RadioDependentEnabler( _rRadio ) ); pController->addDependentWindow( _rDependentWindow1 ); @@ -200,7 +200,7 @@ namespace svt } - void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 ) + void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3, vcl::Window& _rDependentWindow4, vcl::Window& _rDependentWindow5 ) { PDialogController pController( new RadioDependentEnabler( _rRadio ) ); pController->addDependentWindow( _rDependentWindow1 ); @@ -212,7 +212,7 @@ namespace svt } - void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow ) + void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow ) { PDialogController pController( new RadioDependentEnabler( _rBox ) ); pController->addDependentWindow( _rDependentWindow ); @@ -220,7 +220,7 @@ namespace svt } - void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2 ) + void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2 ) { PDialogController pController( new RadioDependentEnabler( _rBox ) ); pController->addDependentWindow( _rDependentWindow1 ); @@ -229,7 +229,7 @@ namespace svt } - void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 ) + void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3, vcl::Window& _rDependentWindow4 ) { PDialogController pController( new RadioDependentEnabler( _rBox ) ); pController->addDependentWindow( _rDependentWindow1 ); diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 924ead10b3eb..4a6afd53e55e 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -32,7 +32,7 @@ static sal_uInt16 aWndFunc( - Window *pWin, // Parent of the dialog + vcl::Window *pWin, // Parent of the dialog sal_uInt16 nFlags, const OUString &rErr, // error text const OUString &rAction) // action text @@ -370,7 +370,7 @@ bool SfxErrorHandler::GetErrorString( SfxErrorContext::SfxErrorContext( - sal_uInt16 nCtxIdP, Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) + sal_uInt16 nCtxIdP, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) : ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP) { if( nResId==USHRT_MAX ) @@ -380,7 +380,7 @@ SfxErrorContext::SfxErrorContext( SfxErrorContext::SfxErrorContext( - sal_uInt16 nCtxIdP, const OUString &aArg1P, Window *pWindow, + sal_uInt16 nCtxIdP, const OUString &aArg1P, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) : ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP), aArg1(aArg1P) diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx index f6f614e8095b..0c8637f46c14 100644 --- a/svtools/source/misc/stringtransfer.cxx +++ b/svtools/source/misc/stringtransfer.cxx @@ -57,7 +57,7 @@ namespace svt //= OStringTransfer - void OStringTransfer::CopyString( const OUString& _rContent, Window* _pWindow ) + void OStringTransfer::CopyString( const OUString& _rContent, vcl::Window* _pWindow ) { OStringTransferable* pTransferable = new OStringTransferable( _rContent ); Reference< XTransferable > xTransfer = pTransferable; @@ -65,7 +65,7 @@ namespace svt } - bool OStringTransfer::PasteString( OUString& _rContent, Window* _pWindow ) + bool OStringTransfer::PasteString( OUString& _rContent, vcl::Window* _pWindow ) { TransferableDataHelper aClipboardData = TransferableDataHelper::CreateFromSystemClipboard( _pWindow ); @@ -89,7 +89,7 @@ namespace svt } - void OStringTransfer::StartStringDrag( const OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ) + void OStringTransfer::StartStringDrag( const OUString& _rContent, vcl::Window* _pWindow, sal_Int8 _nDragSourceActions ) { OStringTransferable* pTransferable = new OStringTransferable( _rContent ); Reference< XTransferable > xTransfer = pTransferable; diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 9cc21e72acbd..15914496e28f 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1007,7 +1007,7 @@ void TransferableHelper::PrepareOLE( const TransferableObjectDescriptor& rObjDes -void TransferableHelper::CopyToClipboard( Window *pWindow ) const +void TransferableHelper::CopyToClipboard( vcl::Window *pWindow ) const { DBG_ASSERT( pWindow, "Window pointer is NULL" ); Reference< XClipboard > xClipboard; @@ -1040,7 +1040,7 @@ void TransferableHelper::CopyToClipboard( Window *pWindow ) const -void TransferableHelper::CopyToSelection( Window *pWindow ) const +void TransferableHelper::CopyToSelection( vcl::Window *pWindow ) const { DBG_ASSERT( pWindow, "Window pointer is NULL" ); Reference< XClipboard > xSelection; @@ -1070,7 +1070,7 @@ void TransferableHelper::CopyToSelection( Window *pWindow ) const -void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions, +void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceActions, sal_Int32 nDnDPointer, sal_Int32 nDnDImage ) { @@ -1119,7 +1119,7 @@ void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions, -void TransferableHelper::ClearSelection( Window *pWindow ) +void TransferableHelper::ClearSelection( vcl::Window *pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); Reference< XClipboard > xSelection( pWindow->GetPrimarySelection() ); @@ -1132,7 +1132,7 @@ void TransferableHelper::ClearSelection( Window *pWindow ) Reference< XClipboard> TransferableHelper::GetSystemClipboard() { - Window *pFocusWindow = Application::GetFocusWindow(); + vcl::Window *pFocusWindow = Application::GetFocusWindow(); if( pFocusWindow ) return pFocusWindow->GetClipboard(); @@ -2238,7 +2238,7 @@ void TransferableDataHelper::StopClipboardListening( ) -TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window * pWindow ) +TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( vcl::Window * pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -2272,7 +2272,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window -TransferableDataHelper TransferableDataHelper::CreateFromSelection( Window* pWindow ) +TransferableDataHelper TransferableDataHelper::CreateFromSelection( vcl::Window* pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index c79ddbf8bfc9..a5e80c4ca878 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -79,7 +79,7 @@ void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( cons // - DragSourceHelper - -DragSourceHelper::DragSourceHelper( Window* pWindow ) : +DragSourceHelper::DragSourceHelper( vcl::Window* pWindow ) : mxDragGestureRecognizer( pWindow->GetDragGestureRecognizer() ) { if( mxDragGestureRecognizer.is() ) @@ -253,7 +253,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dropActionChanged( const Dro // - DropTargetHelper - -DropTargetHelper::DropTargetHelper( Window* pWindow ) : +DropTargetHelper::DropTargetHelper( vcl::Window* pWindow ) : mxDropTarget( pWindow->GetDropTarget() ), mpFormats( new DataFlavorExVector ) { @@ -596,7 +596,7 @@ bool TransferDataContainer::HasAnyData() const void TransferDataContainer::StartDrag( - Window* pWindow, sal_Int8 nDragSourceActions, + vcl::Window* pWindow, sal_Int8 nDragSourceActions, const Link& rLnk, sal_Int32 nDragPointer, sal_Int32 nDragImage ) { pImpl->aFinshedLnk = rLnk; diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx index 3a106bd52f31..a6d7c613540e 100644 --- a/svtools/source/table/gridtablerenderer.cxx +++ b/svtools/source/table/gridtablerenderer.cxx @@ -558,13 +558,13 @@ namespace svt { namespace table } - void GridTableRenderer::ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect) + void GridTableRenderer::ShowCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) { _rView.ShowFocus( _rCursorRect ); } - void GridTableRenderer::HideCellCursor( Window& _rView, const Rectangle& _rCursorRect) + void GridTableRenderer::HideCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) { (void)_rCursorRect; _rView.HideFocus(); diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index b18d48ac436a..9afa63df04cc 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -46,7 +46,7 @@ namespace svt { namespace table //= TableControl - TableControl::TableControl( Window* _pParent, WinBits _nStyle ) + TableControl::TableControl( vcl::Window* _pParent, WinBits _nStyle ) :Control( _pParent, _nStyle ) ,m_pImpl( new TableControl_Impl( *this ) ) { @@ -266,7 +266,7 @@ namespace svt { namespace table } - Window& TableControl::getDataWindow() + vcl::Window& TableControl::getDataWindow() { return m_pImpl->getDataWindow(); } @@ -274,7 +274,7 @@ namespace svt { namespace table Reference< XAccessible > TableControl::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); ENSURE_OR_RETURN( pParent, "TableControl::CreateAccessible - parent not found", NULL ); return m_pImpl->getAccessible( *pParent ); @@ -500,7 +500,7 @@ namespace svt { namespace table } - Rectangle TableControl::GetWindowExtentsRelative( Window *pRelativeWindow ) const + Rectangle TableControl::GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const { return Control::GetWindowExtentsRelative( pRelativeWindow ); } @@ -518,13 +518,13 @@ namespace svt { namespace table } - Window* TableControl::GetAccessibleParentWindow() const + vcl::Window* TableControl::GetAccessibleParentWindow() const { return Control::GetAccessibleParentWindow(); } - Window* TableControl::GetWindowInstance() + vcl::Window* TableControl::GetWindowInstance() { return this; } diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 8975e2f3902c..fc52b5441e68 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -624,7 +624,7 @@ namespace svt { namespace table } - void lcl_setButtonRepeat( Window& _rWindow, sal_uLong _nDelay ) + void lcl_setButtonRepeat( vcl::Window& _rWindow, sal_uLong _nDelay ) { AllSettings aSettings = _rWindow.GetSettings(); MouseSettings aMouseSettings = aSettings.GetMouseSettings(); @@ -636,7 +636,7 @@ namespace svt { namespace table } - bool lcl_updateScrollbar( Window& _rParent, ScrollBar*& _rpBar, + bool lcl_updateScrollbar( vcl::Window& _rParent, ScrollBar*& _rpBar, bool const i_needBar, long _nVisibleUnits, long _nPosition, long _nLineSize, long _nRange, bool _bHorizontal, const Link& _rScrollHandler ) @@ -2439,7 +2439,7 @@ namespace svt { namespace table } - Reference< XAccessible > TableControl_Impl::getAccessible( Window& i_parentWindow ) + Reference< XAccessible > TableControl_Impl::getAccessible( vcl::Window& i_parentWindow ) { DBG_TESTSOLARMUTEX(); if ( m_pAccessibleTable == NULL ) diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index dc624c4c06ea..5143d082426d 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -297,7 +297,7 @@ namespace svt { namespace table // A11Y ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - getAccessible( Window& i_parentWindow ); + getAccessible( vcl::Window& i_parentWindow ); void disposeAccessible(); inline bool isAccessibleAlive() const { return impl_isAccessibleAlive(); } diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx index 53dfb141bd74..c606d6a4b205 100644 --- a/svtools/source/table/tabledatawindow.hxx +++ b/svtools/source/table/tabledatawindow.hxx @@ -38,7 +38,7 @@ namespace svt { namespace table /** the window containing the content area (including headers) of a table control */ - class TableDataWindow : public Window + class TableDataWindow : public vcl::Window { friend class TableFunctionSet; private: diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx index d8abf3395315..b2e692c1bd55 100644 --- a/svtools/source/toolpanel/drawerlayouter.cxx +++ b/svtools/source/toolpanel/drawerlayouter.cxx @@ -38,7 +38,7 @@ namespace svt //= DrawerDeckLayouter - DrawerDeckLayouter::DrawerDeckLayouter( ::Window& i_rParentWindow, IToolPanelDeck& i_rPanels ) + DrawerDeckLayouter::DrawerDeckLayouter( vcl::Window& i_rParentWindow, IToolPanelDeck& i_rPanels ) :m_rParentWindow( i_rParentWindow ) ,m_rPanelDeck( i_rPanels ) ,m_aDrawers() @@ -211,7 +211,7 @@ namespace svt } - size_t DrawerDeckLayouter::impl_getPanelPositionFromWindow( const Window* i_pDrawerWindow ) const + size_t DrawerDeckLayouter::impl_getPanelPositionFromWindow( const vcl::Window* i_pDrawerWindow ) const { for ( ::std::vector< PToolPanelDrawer >::const_iterator drawerPos = m_aDrawers.begin(); drawerPos != m_aDrawers.end(); diff --git a/svtools/source/toolpanel/dummypanel.cxx b/svtools/source/toolpanel/dummypanel.cxx index 95dffda0f0a2..7ba14f893572 100644 --- a/svtools/source/toolpanel/dummypanel.cxx +++ b/svtools/source/toolpanel/dummypanel.cxx @@ -42,7 +42,7 @@ namespace svt } - void DummyPanel::Activate( Window& ) + void DummyPanel::Activate( vcl::Window& ) { } diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx index f4a884aaad27..ad038ede55f3 100644 --- a/svtools/source/toolpanel/dummypanel.hxx +++ b/svtools/source/toolpanel/dummypanel.hxx @@ -42,7 +42,7 @@ namespace svt virtual OUString GetDisplayName() const SAL_OVERRIDE; virtual Image GetImage() const SAL_OVERRIDE; virtual OString GetHelpID() const SAL_OVERRIDE; - virtual void Activate( Window& i_rParentWindow ) SAL_OVERRIDE; + virtual void Activate( vcl::Window& i_rParentWindow ) SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; virtual void SetSizePixel( const Size& i_rPanelWindowSize ) SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 1af8a6669861..5a2548a9d1e4 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -86,7 +86,7 @@ namespace svt virtual void renderBackground() const = 0; virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const = 0; virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const = 0; - virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const = 0; + virtual void postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const = 0; // TODO: postRenderItem takes the "real" window, i.e. effectively the tab bar. This is because // DrawSelectionBackground needs to be applied after everything else is painted, and is available at the Window @@ -115,7 +115,7 @@ namespace svt virtual void renderBackground() const SAL_OVERRIDE; virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; - virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; + virtual void postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; protected: OutputDevice& getTargetDevice() const { return m_rTargetDevice; } @@ -149,7 +149,7 @@ namespace svt } - void VCLItemRenderer::postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const + void VCLItemRenderer::postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const { const bool bActive = ( ( i_nItemFlags & ITEM_STATE_ACTIVE ) != 0 ); const bool bHovered = ( ( i_nItemFlags & ITEM_STATE_HOVERED ) != 0 ); @@ -190,7 +190,7 @@ namespace svt virtual void renderBackground() const SAL_OVERRIDE; virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; - virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; + virtual void postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; protected: OutputDevice& getTargetDevice() const { return m_rTargetDevice; } @@ -243,7 +243,7 @@ namespace svt } - void NWFToolboxItemRenderer::postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const + void NWFToolboxItemRenderer::postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const { (void)i_rActualWindow; (void)i_rItemRect; @@ -268,7 +268,7 @@ namespace svt virtual void renderBackground() const SAL_OVERRIDE; virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; - virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; + virtual void postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; protected: OutputDevice& getTargetDevice() const { return m_rTargetDevice; } @@ -330,7 +330,7 @@ namespace svt } - void NWFTabItemRenderer::postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const + void NWFTabItemRenderer::postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const { (void)i_rActualWindow; (void)i_rItemRect; @@ -989,7 +989,7 @@ namespace svt //= PanelTabBar - PanelTabBar::PanelTabBar( Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ) + PanelTabBar::PanelTabBar( vcl::Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ) :Control( &i_rParentWindow, 0 ) ,m_pImpl( new PanelTabBar_Impl( *this, i_rPanelDeck, i_eAlignment, i_eItemContent ) ) { diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx index 3ca23007ba02..3a0c473732b1 100644 --- a/svtools/source/toolpanel/paneltabbarpeer.cxx +++ b/svtools/source/toolpanel/paneltabbarpeer.cxx @@ -69,7 +69,7 @@ namespace svt - Window* pAccessibleParent( m_pTabBar->GetAccessibleParentWindow() ); + vcl::Window* pAccessibleParent( m_pTabBar->GetAccessibleParentWindow() ); ENSURE_OR_RETURN( pAccessibleParent != NULL, "no accessible parent => no accessible context", NULL ); Reference< XAccessible > xAccessibleParent( pAccessibleParent->GetAccessible(), UNO_SET_THROW ); return m_aAccessibleFactory.getFactory().createAccessibleToolPanelTabBar( xAccessibleParent, m_pTabBar->GetPanelDeck(), *m_pTabBar ); diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx index 0f82dd40b0a4..68a09a37b655 100644 --- a/svtools/source/toolpanel/tablayouter.cxx +++ b/svtools/source/toolpanel/tablayouter.cxx @@ -44,7 +44,7 @@ namespace svt ::std::auto_ptr< PanelTabBar > pTabBar; AccessibleFactoryAccess aAccessibleFactory; - TabDeckLayouter_Data( Window& i_rParent, IToolPanelDeck& i_rPanels, + TabDeckLayouter_Data( vcl::Window& i_rParent, IToolPanelDeck& i_rPanels, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ) :eAlignment( i_eAlignment ) ,rPanels( i_rPanels ) @@ -80,7 +80,7 @@ namespace svt //= TabDeckLayouter - TabDeckLayouter::TabDeckLayouter( Window& i_rParent, IToolPanelDeck& i_rPanels, + TabDeckLayouter::TabDeckLayouter( vcl::Window& i_rParent, IToolPanelDeck& i_rPanels, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ) :m_pData( new TabDeckLayouter_Data( i_rParent, i_rPanels, i_eAlignment, i_eItemContent ) ) { diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx index 19c0a22febb4..27dfa5146c0f 100644 --- a/svtools/source/toolpanel/toolpaneldeck.cxx +++ b/svtools/source/toolpanel/toolpaneldeck.cxx @@ -87,7 +87,7 @@ namespace svt PDeckLayouter GetLayouter() const { return m_pLayouter; } void SetLayouter( const PDeckLayouter& i_pNewLayouter ); - Window& GetPanelWindowAnchor() { return m_aPanelAnchor; } + vcl::Window& GetPanelWindowAnchor() { return m_aPanelAnchor; } bool IsDead() const { return m_bInDtor; } @@ -130,7 +130,7 @@ namespace svt private: ToolPanelDeck& m_rDeck; - Window m_aPanelAnchor; + vcl::Window m_aPanelAnchor; ToolPanelCollection m_aPanels; PToolPanel m_pDummyPanel; PanelDeckListeners m_aListeners; @@ -341,7 +341,7 @@ namespace svt //= ToolPanelDeck - ToolPanelDeck::ToolPanelDeck( Window& i_rParent, const WinBits i_nStyle ) + ToolPanelDeck::ToolPanelDeck( vcl::Window& i_rParent, const WinBits i_nStyle ) :Control( &i_rParent, i_nStyle ) ,m_pImpl( new ToolPanelDeck_Impl( *this ) ) { @@ -425,13 +425,13 @@ namespace svt } - Window& ToolPanelDeck::GetPanelWindowAnchor() + vcl::Window& ToolPanelDeck::GetPanelWindowAnchor() { return m_pImpl->GetPanelWindowAnchor(); } - const Window& ToolPanelDeck::GetPanelWindowAnchor() const + const vcl::Window& ToolPanelDeck::GetPanelWindowAnchor() const { return m_pImpl->GetPanelWindowAnchor(); } diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx index 4979872af744..333fa43c10d0 100644 --- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx @@ -67,7 +67,7 @@ namespace svt if ( m_pDeck == NULL ) throw DisposedException( OUString(), *this ); - Window* pAccessibleParent( m_pDeck->GetAccessibleParentWindow() ); + vcl::Window* pAccessibleParent( m_pDeck->GetAccessibleParentWindow() ); ENSURE_OR_RETURN( pAccessibleParent != NULL, "no accessible parent => no accessible context", NULL ); Reference< XAccessible > xAccessibleParent( pAccessibleParent->GetAccessible(), UNO_SET_THROW ); return m_aAccessibleFactory.getFactory().createAccessibleToolPanelDeck( xAccessibleParent, *m_pDeck ); diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx index a5e5c12232b3..8fce1ad89f1c 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -71,7 +71,7 @@ namespace svt //= ToolPanelDrawer - ToolPanelDrawer::ToolPanelDrawer( Window& i_rParent, const OUString& i_rTitle ) + ToolPanelDrawer::ToolPanelDrawer( vcl::Window& i_rParent, const OUString& i_rTitle ) :Window( &i_rParent, WB_TABSTOP ) ,m_pPaintDevice( new VirtualDevice( *this ) ) ,m_aVisualization( *this ) diff --git a/svtools/source/toolpanel/toolpaneldrawer.hxx b/svtools/source/toolpanel/toolpaneldrawer.hxx index 92898ba202ab..3186ca1f6cfc 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.hxx +++ b/svtools/source/toolpanel/toolpaneldrawer.hxx @@ -41,7 +41,7 @@ namespace svt (We could also inject the A11Y component on the A11Y level only, but this would mean additional code. With this approach here, VCL/toolkit will take care of creating and maintaining the A11Y component for us.) */ - class DrawerVisualization : public Window + class DrawerVisualization : public vcl::Window { public: DrawerVisualization( ToolPanelDrawer& i_rParent ); @@ -59,10 +59,10 @@ namespace svt //= ToolPanelDrawer - class ToolPanelDrawer : public Window + class ToolPanelDrawer : public vcl::Window { public: - ToolPanelDrawer( Window& i_rParent, const OUString& i_rTitle ); + ToolPanelDrawer( vcl::Window& i_rParent, const OUString& i_rTitle ); virtual ~ToolPanelDrawer(); long GetPreferredHeightPixel() const; diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index e8f86818dbac..3c9772945e02 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -71,7 +71,7 @@ namespace { protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; @@ -212,7 +212,7 @@ namespace { } - Dialog* OAddressBookSourceDialogUno::createDialog(Window* _pParent) + Dialog* OAddressBookSourceDialogUno::createDialog(vcl::Window* _pParent) { if ( m_xDataSource.is() && !m_sTable.isEmpty() ) return new AddressBookSourceDialog(_pParent, m_aContext, m_xDataSource, m_sDataSourceName, m_sTable, m_aAliases ); diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index dce6708f98ee..b751f5a8a45e 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -313,7 +313,7 @@ ContextMenuHelper::executePopupMenu( uno::Reference< awt::XWindow > xWindow( xFrame->getContainerWindow() ); if ( xWindow.is() ) { - Window* pParent = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xWindow ); sal_uInt16 nResult = pMenu->Execute( pParent, rPos ); if ( nResult > 0 ) diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 0ce8959edbac..e2e154ff2ecb 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -169,7 +169,7 @@ bool OGenericUnoDialog::impl_ensureDialog_lck() // get the parameters for the dialog from the current settings // the parent window - Window* pParent = NULL; + vcl::Window* pParent = NULL; VCLXWindow* pImplementation = VCLXWindow::GetImplementation(m_xParent); if (pImplementation) pParent = pImplementation->GetWindow(); diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 9ecd48e31cfc..f77f16aae914 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -40,13 +40,13 @@ public: PopupWindowControllerImpl(); ~PopupWindowControllerImpl(); - void SetPopupWindow( ::Window* pPopupWindow, ToolBox* pToolBox ); + void SetPopupWindow( vcl::Window* pPopupWindow, ToolBox* pToolBox ); DECL_LINK( WindowEventListener, VclSimpleEvent* ); - DECL_STATIC_LINK( PopupWindowControllerImpl, AsyncDeleteWindowHdl, Window* ); + DECL_STATIC_LINK( PopupWindowControllerImpl, AsyncDeleteWindowHdl, vcl::Window* ); private: - ::Window* mpPopupWindow; + vcl::Window* mpPopupWindow; ToolBox* mpToolBox; }; @@ -62,7 +62,7 @@ PopupWindowControllerImpl::~PopupWindowControllerImpl() SetPopupWindow(0,0); } -void PopupWindowControllerImpl::SetPopupWindow( ::Window* pPopupWindow, ToolBox* pToolBox ) +void PopupWindowControllerImpl::SetPopupWindow( vcl::Window* pPopupWindow, ToolBox* pToolBox ) { if( mpPopupWindow ) { @@ -122,7 +122,7 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclSimpleEvent*, pEve -IMPL_STATIC_LINK( PopupWindowControllerImpl, AsyncDeleteWindowHdl, Window*, pWindow ) +IMPL_STATIC_LINK( PopupWindowControllerImpl, AsyncDeleteWindowHdl, vcl::Window*, pWindow ) { (void)*pThis; delete pWindow; @@ -218,13 +218,13 @@ Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow() th ToolBox* pToolBox = dynamic_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) ); if( pToolBox ) { - ::Window* pItemWindow = pToolBox->GetItemWindow( pToolBox->GetDownItemId() ); - ::Window* pWin = createPopupWindow( pItemWindow ? pItemWindow : pToolBox ); + vcl::Window* pItemWindow = pToolBox->GetItemWindow( pToolBox->GetDownItemId() ); + vcl::Window* pWin = createPopupWindow( pItemWindow ? pItemWindow : pToolBox ); if( pWin ) { pWin->EnableDocking(true); mpImpl->SetPopupWindow(pWin,pToolBox); - ::Window::GetDockingManager()->StartPopupMode( pToolBox, pWin, + vcl::Window::GetDockingManager()->StartPopupMode( pToolBox, pWin, FLOATWIN_POPUPMODE_GRABFOCUS | FLOATWIN_POPUPMODE_NOFOCUSCLOSE | FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE | diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index a0fb056e090c..b9ef5a4f0d85 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -285,7 +285,7 @@ throw ( RuntimeException, std::exception ) if ( m_bDisposed ) return; - Window* pWindow = VCLUnoHelper::GetWindow( m_xParentWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( m_xParentWindow ); if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR && m_nID != 0 ) { OUString aStrValue; diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index dda1e9492687..df7c51b5297d 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -89,7 +89,7 @@ SVTXGridControl::~SVTXGridControl() } -void SVTXGridControl::SetWindow( Window* pWindow ) +void SVTXGridControl::SetWindow( vcl::Window* pWindow ) { SVTXGridControl_Base::SetWindow( pWindow ); impl_checkTableModelInit(); @@ -858,7 +858,7 @@ void SVTXGridControl::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno: SolarMutexGuard aGuard; m_pTableModel->setEnabled( bEnable ); - Window * pWindow = GetWindow(); + vcl::Window * pWindow = GetWindow(); if ( pWindow ) { pWindow->Enable( bEnable, true ); diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx index 5b9f585d6bfd..2deaddeb72e0 100644 --- a/svtools/source/uno/svtxgridcontrol.hxx +++ b/svtools/source/uno/svtxgridcontrol.hxx @@ -106,7 +106,7 @@ public: protected: // VCLXWindow - virtual void SetWindow( Window* pWindow ) SAL_OVERRIDE; + virtual void SetWindow( vcl::Window* pWindow ) SAL_OVERRIDE; private: void impl_updateColumnsFromModel_nothrow(); diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 90f0c7d4aeb3..39ca76b9f9a9 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -84,7 +84,7 @@ public: class UnoTreeListBoxImpl : public SvTreeListBox { public: - UnoTreeListBoxImpl( TreeControlPeer* pPeer, Window* pParent, WinBits nWinStyle ); + UnoTreeListBoxImpl( TreeControlPeer* pPeer, vcl::Window* pParent, WinBits nWinStyle ); virtual ~UnoTreeListBoxImpl(); sal_uInt32 insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos=TREELIST_APPEND ); @@ -204,7 +204,7 @@ UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode -Window* TreeControlPeer::createVclControl( Window* pParent, sal_Int64 nWinStyle ) +vcl::Window* TreeControlPeer::createVclControl( vcl::Window* pParent, sal_Int64 nWinStyle ) { mpTreeImpl = new UnoTreeListBoxImpl( this, pParent, nWinStyle ); return mpTreeImpl; @@ -222,7 +222,7 @@ void TreeControlPeer::disposeControl() -void TreeControlPeer::SetWindow( Window* pWindow ) +void TreeControlPeer::SetWindow( vcl::Window* pWindow ) { VCLXWindow::SetWindow( pWindow ); } @@ -1475,7 +1475,7 @@ bool TreeControlPeer::loadImage( const OUString& rURL, Image& rImage ) // class UnoTreeListBoxImpl -UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, Window* pParent, WinBits nWinStyle ) +UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, vcl::Window* pParent, WinBits nWinStyle ) : SvTreeListBox( pParent, nWinStyle ) , mxPeer( pPeer ) { diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx index 617be2d205d7..613d255732c4 100644 --- a/svtools/source/uno/treecontrolpeer.hxx +++ b/svtools/source/uno/treecontrolpeer.hxx @@ -55,10 +55,10 @@ public: TreeControlPeer(); virtual ~TreeControlPeer(); - Window* createVclControl( Window* pParent, sal_Int64 nWinStyle ); + vcl::Window* createVclControl( vcl::Window* pParent, sal_Int64 nWinStyle ); // VCLXWindow - virtual void SetWindow( Window* pWindow ) SAL_OVERRIDE; + virtual void SetWindow( vcl::Window* pWindow ) SAL_OVERRIDE; // ::com::sun::star::view::XSelectionSupplier virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& xSelection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 2c3ea4d05891..b0ac7e01313a 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -42,7 +42,7 @@ namespace { - static void lcl_setWinBits( Window* _pWindow, WinBits _nBits, bool _bSet ) + static void lcl_setWinBits( vcl::Window* _pWindow, WinBits _nBits, bool _bSet ) { WinBits nStyle = _pWindow->GetStyle(); if ( _bSet ) @@ -59,9 +59,9 @@ namespace extern "C" { -SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, Window* pParent, WinBits nWinBits ) +SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, vcl::Window* pParent, WinBits nWinBits ) { - Window* pWindow = NULL; + vcl::Window* pWindow = NULL; OUString aServiceName( pDescriptor->WindowServiceName ); if ( aServiceName.equalsIgnoreAsciiCase( "MultiLineEdit" ) ) { @@ -589,7 +589,7 @@ void SAL_CALL VCLXFileControl::setProperty( const OUString& PropertyName, const } } -void VCLXFileControl::SetWindow( Window* pWindow ) +void VCLXFileControl::SetWindow( vcl::Window* pWindow ) { FileControl* pPrevFileControl = dynamic_cast<FileControl*>( GetWindow() ); if ( pPrevFileControl ) @@ -616,7 +616,7 @@ void VCLXFileControl::setText( const OUString& aText ) throw(::com::sun::star::u { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { pWindow->SetText( aText ); @@ -644,7 +644,7 @@ OUString VCLXFileControl::getText() throw(::com::sun::star::uno::RuntimeExceptio SolarMutexGuard aGuard; OUString aText; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) aText = pWindow->GetText(); return aText; @@ -823,7 +823,7 @@ SVTXFormattedField::~SVTXFormattedField() } -void SVTXFormattedField::SetWindow( Window* _pWindow ) +void SVTXFormattedField::SetWindow( vcl::Window* _pWindow ) { VCLXSpinField::SetWindow(_pWindow); if (GetFormattedField()) @@ -2138,7 +2138,7 @@ void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::s { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { Color aColor( nColor ); @@ -2150,7 +2150,7 @@ void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::s { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { Color aColor( nColor ); @@ -2226,7 +2226,7 @@ void VCLXProgressBar::setProperty( const OUString& PropertyName, const ::com::su break; case BASEPROPERTY_FILLCOLOR: { - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index c3f20273c686..c36ccbc33cf3 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -136,7 +136,7 @@ namespace { virtual ~Wizard(); protected: - virtual Dialog* createDialog( Window* _pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE; virtual void destroyDialog() SAL_OVERRIDE; private: @@ -268,7 +268,7 @@ namespace { } - Dialog* Wizard::createDialog( Window* i_pParent ) + Dialog* Wizard::createDialog( vcl::Window* i_pParent ) { WizardShell* pDialog( new WizardShell( i_pParent, m_xController, m_aWizardSteps ) ); pDialog->SetHelpId( lcl_getHelpId( m_sHelpURL ) ); diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx index 4d86bd4d17d5..a28cfd219d33 100644 --- a/svtools/source/uno/wizard/wizardpagecontroller.cxx +++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx @@ -102,7 +102,7 @@ namespace svt { namespace uno try { Reference< XWindow > xPageWindow( m_xWizardPage->getWindow(), UNO_SET_THROW ); - Window* pPageWindow = VCLUnoHelper::GetWindow( xPageWindow ); + vcl::Window* pPageWindow = VCLUnoHelper::GetWindow( xPageWindow ); if ( pPageWindow == NULL ) { // windows created via the XContainerWindowProvider might be controls, not real windows, so resolve diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index 9b3022c93918..d10db321ee60 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -62,7 +62,7 @@ namespace svt { namespace uno //= WizardShell - WizardShell::WizardShell( Window* i_pParent, const Reference< XWizardController >& i_rController, + WizardShell::WizardShell( vcl::Window* i_pParent, const Reference< XWizardController >& i_rController, const Sequence< Sequence< sal_Int16 > >& i_rPaths ) :WizardShell_Base( i_pParent, WB_MOVEABLE | WB_CLOSEABLE ) ,m_xController( i_rController ) diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx index 9d2bc6b85212..4d2e3e8f0315 100644 --- a/svtools/source/uno/wizard/wizardshell.hxx +++ b/svtools/source/uno/wizard/wizardshell.hxx @@ -44,7 +44,7 @@ namespace svt { namespace uno { public: WizardShell( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >& i_rController, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int16 > >& i_rPaths ); diff --git a/svx/inc/AccessibleSvxFindReplaceDialog.hxx b/svx/inc/AccessibleSvxFindReplaceDialog.hxx index 20dc1d50bdd8..0e066db27ab3 100644 --- a/svx/inc/AccessibleSvxFindReplaceDialog.hxx +++ b/svx/inc/AccessibleSvxFindReplaceDialog.hxx @@ -40,7 +40,7 @@ public: class VCLXSvxFindReplaceDialog : public VCLXDialog { public: - VCLXSvxFindReplaceDialog(Window* pSplDlg) + VCLXSvxFindReplaceDialog(vcl::Window* pSplDlg) { SetWindow(pSplDlg); } diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx index 795471878ad9..8b58d7639ac5 100644 --- a/svx/inc/GalleryControl.hxx +++ b/svx/inc/GalleryControl.hxx @@ -37,15 +37,15 @@ class FmFormModel; namespace svx { namespace sidebar { -class SVX_DLLPUBLIC GalleryControl : public Window +class SVX_DLLPUBLIC GalleryControl : public vcl::Window { public: GalleryControl ( SfxBindings* pBindings, - Window* pParentWindow); + vcl::Window* pParentWindow); virtual ~GalleryControl (void); - bool GalleryKeyInput( const KeyEvent& rKEvt, Window* pWindow); + bool GalleryKeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow); private: Gallery* mpGallery; diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx index 43bafe56c7ef..46362d7ff4c5 100644 --- a/svx/inc/extrusiondepthdialog.hxx +++ b/svx/inc/extrusiondepthdialog.hxx @@ -34,7 +34,7 @@ class ExtrusionDepthDialog : public ModalDialog MetricField* m_pMtrDepth; public: - ExtrusionDepthDialog( Window* pParent, double fDepth, FieldUnit eDefaultUnit ); + ExtrusionDepthDialog( vcl::Window* pParent, double fDepth, FieldUnit eDefaultUnit ); double getDepth() const; }; diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 38cb724c6618..e431fd211de5 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -152,7 +152,7 @@ public: public: - GalleryBrowser2( Window* pParent, const ResId& rResId, Gallery* pGallery ); + GalleryBrowser2( vcl::Window* pParent, const ResId& rResId, Gallery* pGallery ); virtual ~GalleryBrowser2(); void SelectTheme( const OUString& rThemeName ); @@ -160,7 +160,7 @@ public: GalleryBrowserMode GetMode() const { return meMode; } void SetMode( GalleryBrowserMode eMode ); - Window* GetViewWindow() const; + vcl::Window* GetViewWindow() const; void Travel( GalleryBrowserTravel eTravel ); @@ -170,10 +170,10 @@ public: sal_Int8 AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& rEvt ); sal_Int8 ExecuteDrop( DropTargetHelper& rTarget, const ExecuteDropEvent& rEvt ); - void StartDrag( Window* pWindow, const Point* pDragPoint = NULL ); - void TogglePreview( Window* pWindow, const Point* pPreviewPoint = NULL ); - void ShowContextMenu( Window* pWindow, const Point* pContextPoint = NULL ); - bool KeyInput( const KeyEvent& rEvt, Window* pWindow ); + void StartDrag( vcl::Window* pWindow, const Point* pDragPoint = NULL ); + void TogglePreview( vcl::Window* pWindow, const Point* pPreviewPoint = NULL ); + void ShowContextMenu( vcl::Window* pWindow, const Point* pContextPoint = NULL ); + bool KeyInput( const KeyEvent& rEvt, vcl::Window* pWindow ); com::sun::star::uno::Reference< com::sun::star::frame::XFrame > GetFrame() const; com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > GetUNOContext() const { return m_xContext; } diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx index b88d9f7207f3..b9e11ddd9792 100644 --- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx @@ -27,7 +27,7 @@ #include <memory> class OutputDevice; -class Window; +namespace vcl { class Window; } class SdrUnoObj; namespace com { namespace sun { namespace star { namespace awt { @@ -67,7 +67,7 @@ namespace sdr { namespace contact { @seealso SdrUnoObj::GetTemporaryControlForWindow */ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > - getTemporaryControlForWindow( const Window& _rWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const; + getTemporaryControlForWindow( const vcl::Window& _rWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const; protected: virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) SAL_OVERRIDE; diff --git a/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx index 6f5c8ba838c1..5e3827812845 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofopenglobj.hxx @@ -13,7 +13,7 @@ #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx> #include <vcl/opengl/OpenGLContext.hxx> -class Window; +namespace vcl { class Window; } namespace sdr { namespace contact { @@ -25,7 +25,7 @@ public: virtual ~ViewObjectContactOfOpenGLObj(); private: - Window* getWindow() const; + vcl::Window* getWindow() const; }; } // namespace sdr diff --git a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx index 9a3bfbeb1082..d5a3d7472d0a 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofsdrmediaobj.hxx @@ -25,7 +25,7 @@ #include <tools/gen.hxx> namespace avmedia { class MediaItem; } -class Window; +namespace vcl { class Window; } namespace sdr { @@ -44,7 +44,7 @@ namespace sdr public: - Window* getWindow() const; + vcl::Window* getWindow() const; Size getPreferredSize() const; diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx index bfcea286b1f7..50140badca56 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -27,7 +27,7 @@ #include <svx/svxdllapi.h> class OutputDevice; -class Window; +namespace vcl { class Window; } class SdrUnoObj; namespace com { namespace sun { namespace star { namespace awt { @@ -63,7 +63,7 @@ namespace sdr { namespace contact { */ static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > getTemporaryControlForWindow( - const Window& _rWindow, + const vcl::Window& _rWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer, const SdrUnoObj& _rUnoObject ); diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 364e1130e3a2..52965b1149a9 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -66,7 +66,7 @@ protected: virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) SAL_OVERRIDE; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) SAL_OVERRIDE; public: - _SdrItemBrowserControl(Window* pParent, WinBits nBits=WB_3DLOOK|WB_BORDER|WB_TABSTOP); + _SdrItemBrowserControl(vcl::Window* pParent, WinBits nBits=WB_3DLOOK|WB_BORDER|WB_TABSTOP); virtual ~_SdrItemBrowserControl(); void Clear(); void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); @@ -100,7 +100,7 @@ public: class _SdrItemBrowserWindow: public FloatingWindow { _SdrItemBrowserControl aBrowse; public: - _SdrItemBrowserWindow(Window* pParent, WinBits nBits=WB_STDSIZEABLEDOCKWIN); + _SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits=WB_STDSIZEABLEDOCKWIN); virtual ~_SdrItemBrowserWindow(); virtual void Resize() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; @@ -118,7 +118,7 @@ class SdrItemBrowser: public _SdrItemBrowserWindow { SdrView* pView; bool bDirty; private: - static Window* ImpGetViewWin(SdrView& rView); + static vcl::Window* ImpGetViewWin(SdrView& rView); DECL_LINK(IdleHdl, void *); DECL_LINK(ChangedHdl,_SdrItemBrowserControl*); DECL_LINK(SetDirtyHdl, void *); diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index a418ff2935e8..25b3f8135d50 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -45,7 +45,7 @@ namespace { class FindTextFieldControl : public ComboBox { public: - FindTextFieldControl( Window* pParent, WinBits nStyle, + FindTextFieldControl( vcl::Window* pParent, WinBits nStyle, css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~FindTextFieldControl(); diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index efc6e794a318..06042560a02f 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -149,7 +149,7 @@ SdrObject* AccessibleControlShape::getSdrObject() const } namespace { - Reference< XContainer > lcl_getControlContainer( const Window* _pWin, const SdrView* _pView ) + Reference< XContainer > lcl_getControlContainer( const vcl::Window* _pWin, const SdrView* _pView ) { Reference< XContainer > xReturn; DBG_ASSERT( _pView, "lcl_getControlContainer: invalid view!" ); @@ -192,7 +192,7 @@ void AccessibleControlShape::Init() // I'm aware of at the moment ..... // get the control which belongs to our model (relative to our view) - const Window* pViewWindow = maShapeTreeInfo.GetWindow(); + const vcl::Window* pViewWindow = maShapeTreeInfo.GetWindow(); SdrUnoObj* pUnoObjectImpl = PTR_CAST( SdrUnoObj, getSdrObject() ); SdrView* pView = maShapeTreeInfo.GetSdrView(); OSL_ENSURE( pView && pViewWindow && pUnoObjectImpl, "AccessibleControlShape::Init: no view, or no view window, no SdrUnoObj!" ); diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 2f3f8629c5ca..123e0b2f07e1 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -56,7 +56,7 @@ namespace accessibility */ AccessibleProxyEditSource_Impl( SdrObject& rObj, SdrView& rView, - const Window& rViewWindow ); + const vcl::Window& rViewWindow ); virtual ~AccessibleProxyEditSource_Impl(); // from the SvxEditSource interface @@ -175,7 +175,7 @@ namespace accessibility AccessibleProxyEditSource_Impl::AccessibleProxyEditSource_Impl( SdrObject& rObj, SdrView& rView, - const Window& rViewWindow ) : + const vcl::Window& rViewWindow ) : maEditSource( rObj, 0, rView, rViewWindow ) { } @@ -221,7 +221,7 @@ namespace accessibility AccessibleEmptyEditSource::AccessibleEmptyEditSource( SdrObject& rObj, SdrView& rView, - const Window& rViewWindow ) : + const vcl::Window& rViewWindow ) : mpEditSource( new AccessibleEmptyEditSource_Impl() ), mrObj(rObj), mrView(rView), diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx index 9f71fd0bd44c..e0f5b01252d0 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx @@ -28,7 +28,7 @@ class SdrObject; class SdrView; -class Window; +namespace vcl { class Window; } namespace accessibility { @@ -49,7 +49,7 @@ namespace accessibility Make sure you only create such an object if the shape _really_ does not contain text. */ - AccessibleEmptyEditSource( SdrObject& rObj, SdrView& rView, const Window& rViewWindow ); + AccessibleEmptyEditSource( SdrObject& rObj, SdrView& rView, const vcl::Window& rViewWindow ); virtual ~AccessibleEmptyEditSource(); // from the SvxEditSource interface @@ -83,7 +83,7 @@ namespace accessibility SdrObject& mrObj; SdrView& mrView; - const Window& mrViewWindow; + const vcl::Window& mrViewWindow; bool mbEditSourceEmpty; }; diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 78ef214bb8c9..5695268aa13d 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -164,7 +164,7 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent( ) sal_Int32 nIdx = 0; if( meBorder == FRAMEBORDER_NONE ) { - Window* pTabPage = mpFrameSel->GetParent(); + vcl::Window* pTabPage = mpFrameSel->GetParent(); sal_Int32 nChildren = pTabPage->GetChildCount(); for( nIdx = 0; nIdx < nChildren; ++nIdx ) if( pTabPage->GetChild( static_cast< sal_uInt16 >( nIdx ) ) == mpFrameSel ) @@ -217,7 +217,7 @@ Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( if(meBorder == FRAMEBORDER_NONE) { //add the label relation - Window *pLabeledBy = mpFrameSel->GetAccessibleRelationLabeledBy(); + vcl::Window *pLabeledBy = mpFrameSel->GetAccessibleRelationLabeledBy(); if ( pLabeledBy && pLabeledBy != mpFrameSel ) { AccessibleRelation aLabelRelation; @@ -226,7 +226,7 @@ Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( aLabelRelation.TargetSet.getArray()[0] = pLabeledBy->GetAccessible(); pHelper->AddRelation(aLabelRelation); } - Window* pMemberOf = mpFrameSel->GetAccessibleRelationMemberOf(); + vcl::Window* pMemberOf = mpFrameSel->GetAccessibleRelationMemberOf(); if ( pMemberOf && pMemberOf != mpFrameSel ) { AccessibleRelation aMemberOfRelation; @@ -479,7 +479,7 @@ Any AccFrameSelector::getAccessibleKeyBinding( ) throw (RuntimeException) Reference< XAccessibleRelationSet > xRet = new utl::AccessibleRelationSetHelper; if(meBorder == FRAMEBORDER_NONE) { - Window* pPrev = mpFrameSel->GetWindow( WINDOW_PREV ); + vcl::Window* pPrev = mpFrameSel->GetWindow( WINDOW_PREV ); if(pPrev && WINDOW_FIXEDTEXT == pPrev->GetType()) { OUString sText = pPrev->GetText(); @@ -635,7 +635,7 @@ IMPL_LINK( AccFrameSelector, WindowEventListener, VclSimpleEvent*, pEvent ) DBG_ASSERT( pWinEvent, "AccFrameSelector::WindowEventListener - unknown window event" ); if ( pWinEvent ) { - Window* pWindow = pWinEvent->GetWindow(); + vcl::Window* pWindow = pWinEvent->GetWindow(); DBG_ASSERT( pWindow, "AccFrameSelector::WindowEventListener: no window!" ); if ( !pWindow->IsAccessibilityEventsSuppressed() || ( pWinEvent->GetId() == VCLEVENT_OBJECT_DYING ) ) { diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index f97949ec0882..ad4104295e72 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -147,7 +147,7 @@ void AccessibleShape::Init (void) if (xText.is()) { SdrView* pView = maShapeTreeInfo.GetSdrView (); - const Window* pWindow = maShapeTreeInfo.GetWindow (); + const vcl::Window* pWindow = maShapeTreeInfo.GetWindow (); if (pView != NULL && pWindow != NULL && mxShape.is()) { // #107948# Determine whether shape text is empty diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index 4c2c31f40872..3be00eee0bf4 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -141,7 +141,7 @@ void AccessibleShapeTreeInfo::SetController ( -void AccessibleShapeTreeInfo::SetWindow (Window* pWindow) +void AccessibleShapeTreeInfo::SetWindow (vcl::Window* pWindow) { mpWindow = pWindow; } diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx index 9beb6709cfa8..454ddaf16b20 100644 --- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx +++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx @@ -39,11 +39,11 @@ VCLXAccessibleSvxFindReplaceDialog::~VCLXAccessibleSvxFindReplaceDialog() void VCLXAccessibleSvxFindReplaceDialog::FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) { VCLXAccessibleComponent::FillAccessibleRelationSet( rRelationSet ); - Window* pDlg = GetWindow(); + vcl::Window* pDlg = GetWindow(); if ( pDlg ) { SvxSearchDialog* pSrchDlg = static_cast<SvxSearchDialog*>( pDlg ); - Window* pDocWin = pSrchDlg->GetDocWin(); + vcl::Window* pDocWin = pSrchDlg->GetDocWin(); if ( !pDocWin ) { return; diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index c156252efc8e..6ce00e7f88a9 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -975,12 +975,12 @@ void ChildrenManagerImpl::UpdateSelection (void) } } - Window *pParentWindow = maShapeTreeInfo.GetWindow(); + vcl::Window *pParentWindow = maShapeTreeInfo.GetWindow(); bool bShapeActive= false; // For table cell, the table's parent must be checked to make sure it has focus. if (pParentWindow) { - Window *pPWindow = pParentWindow->GetParent(); + vcl::Window *pPWindow = pParentWindow->GetParent(); if (pParentWindow->HasFocus() || (pPWindow && pPWindow->HasFocus())) bShapeActive =true; } diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 0838e3138ffa..5ee2f88d14c3 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -797,11 +797,11 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeEx Rectangle aBounds ( 0, 0, 0, 0 ); - Window* pWindow = mpControl; + vcl::Window* pWindow = mpControl; if (pWindow != NULL) { aBounds = pWindow->GetWindowExtentsRelative (NULL); - Window* pParent = pWindow->GetAccessibleParentWindow(); + vcl::Window* pParent = pWindow->GetAccessibleParentWindow(); if (pParent != NULL) { Rectangle aParentRect = pParent->GetWindowExtentsRelative (NULL); diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 6045211372b7..ed94dac21a7c 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -147,7 +147,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( { OExternalLockGuard aGuard( this ); ensureAlive(); - Window* pParent = mpParent->GetParent(); + vcl::Window* pParent = mpParent->GetParent(); uno::Reference< css::accessibility::XAccessible > xRet; if ( pParent ) @@ -159,12 +159,12 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( ::com::sun::star::awt::Rectangle SvxShowCharSetVirtualAcc::implGetBounds( ) throw (RuntimeException) { ::com::sun::star::awt::Rectangle aBounds ( 0, 0, 0, 0 ); - Window* pWindow = mpParent; + vcl::Window* pWindow = mpParent; if ( pWindow ) { Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL ); aBounds = AWTRectangle( aRect ); - Window* pParent = pWindow->GetAccessibleParentWindow(); + vcl::Window* pParent = pWindow->GetAccessibleParentWindow(); if ( pParent ) { Rectangle aParentRect = pParent->GetWindowExtentsRelative( NULL ); diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index c80ad4d227ff..f7f49f043ed4 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -95,7 +95,7 @@ uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleParent( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); - Window *pTabPage = getNonLayoutParent(&mrPixelCtl); + vcl::Window *pTabPage = getNonLayoutParent(&mrPixelCtl); assert(pTabPage && WINDOW_TABPAGE == pTabPage->GetType()); return pTabPage->GetAccessible( true ); } @@ -105,7 +105,7 @@ sal_Int32 SvxPixelCtlAccessible::getAccessibleIndexInParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); sal_uInt16 nIdx = 0; - Window *pTabPage = getNonLayoutParent(&mrPixelCtl); + vcl::Window *pTabPage = getNonLayoutParent(&mrPixelCtl); assert(pTabPage && WINDOW_TABPAGE == pTabPage->GetType()); sal_uInt16 nChildren = pTabPage->GetChildCount(); for(nIdx = 0; nIdx < nChildren; nIdx++) @@ -140,7 +140,7 @@ uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRel ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleRelationSetHelper* rRelationSet = new utl::AccessibleRelationSetHelper; uno::Reference< css::accessibility::XAccessibleRelationSet > rSet = rRelationSet; - Window *pLabeledBy = mrPixelCtl.GetAccessibleRelationLabeledBy(); + vcl::Window *pLabeledBy = mrPixelCtl.GetAccessibleRelationLabeledBy(); if ( pLabeledBy && pLabeledBy != &mrPixelCtl ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); @@ -148,7 +148,7 @@ uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRel rRelationSet->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::LABELED_BY, aSequence ) ); } - Window* pMemberOf = mrPixelCtl.GetAccessibleRelationMemberOf(); + vcl::Window* pMemberOf = mrPixelCtl.GetAccessibleRelationMemberOf(); if ( pMemberOf && pMemberOf != &mrPixelCtl ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index eb7038253661..79507b68230c 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -357,18 +357,18 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAcc //return Reference< XAccessibleRelationSet >(); utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; uno::Reference< css::accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper; - Window* pWindow = mpRepr; + vcl::Window* pWindow = mpRepr; if ( pWindow ) { - // Window *pLabeledBy = pWindow->GetAccRelationLabeledBy(); - Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); + // vcl::Window *pLabeledBy = pWindow->GetAccRelationLabeledBy(); + vcl::Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); if ( pLabeledBy && pLabeledBy != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); aSequence[0] = pLabeledBy->GetAccessible(); pRelationSetHelper->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::LABELED_BY, aSequence ) ); } - Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf(); + vcl::Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf(); if ( pMemberOf && pMemberOf != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); @@ -764,7 +764,7 @@ void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive( void ) throw( lang:: SvxRectCtlChildAccessibleContext::SvxRectCtlChildAccessibleContext( const Reference<XAccessible>& rxParent, - const Window& rParentWindow, + const vcl::Window& rParentWindow, const OUString& rName, const OUString& rDescription, const Rectangle& rBoundingBox, diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index d05e5007b5ba..72106d4a52d5 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -25,7 +25,7 @@ namespace svx { SpellDialogChildWindow::SpellDialogChildWindow ( - Window* _pParent, + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* /*pInfo*/) diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 962234304aa4..855938ba4de8 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -68,7 +68,7 @@ class ColorWindow : public Control public: - ColorWindow( Window* pParent, const ResId& rId ) : + ColorWindow( vcl::Window* pParent, const ResId& rId ) : Control( pParent, rId ), aColor( COL_WHITE ) {}; @@ -366,7 +366,7 @@ void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState* -SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, sal_uInt16 nId, +SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( vcl::Window* pParent_, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( pParent_, nId ) @@ -384,7 +384,7 @@ SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, sal_uInt16 nId, SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const ResId& rResId ) : SfxDockingWindow ( pBindinx, pCW, pParent, rResId ), aTbxPipette ( this, BMP_RESID( TBX_PIPETTE ) ), diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index f61f60cde809..c47922d47629 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -63,7 +63,7 @@ void SvxContourDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, } } -SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, sal_uInt16 nId, +SvxContourDlgChildWindow::SvxContourDlgChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) { @@ -79,7 +79,7 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, sal_uInt16 } SvxContourDlg::SvxContourDlg(SfxBindings* _pBindings, SfxChildWindow* pCW, - Window* _pParent) + vcl::Window* _pParent) : SfxFloatingWindow(_pBindings, pCW, _pParent , "FloatingContour", "svx/ui/floatingcontour.ui") , pSuperClass(NULL) @@ -199,7 +199,7 @@ void SvxContourDlg::Update( const Graphic& rGraphic, bool bGraphicLinked, } SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, - Window* _pParent) : + vcl::Window* _pParent) : SvxContourDlg ( _pBindings, pCW, _pParent ), pUpdateEditingObject( NULL ), pCheckObj ( NULL ), @@ -211,7 +211,7 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow * { get(m_pTbx1, "toolbar"); get(m_pMtfTolerance, "spinbutton"); - m_pContourWnd = new ContourWindow(get<Window>("container"), WB_BORDER); + m_pContourWnd = new ContourWindow(get<vcl::Window>("container"), WB_BORDER); m_pContourWnd->set_hexpand(true); m_pContourWnd->set_vexpand(true); m_pContourWnd->Show(); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index b62da41ebb8e..62418f043dd2 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -53,7 +53,7 @@ sal_uInt32& SvxShowCharSet::getSelectedChar() return cSelectedChar; } -SvxShowCharSet::SvxShowCharSet(Window* pParent) +SvxShowCharSet::SvxShowCharSet(vcl::Window* pParent) : Control(pParent, WB_TABSTOP | WB_BORDER) , m_pAccessible(NULL) , aVscrollSB( this, WB_VERT) @@ -82,7 +82,7 @@ void SvxShowCharSet::Resize() SetFont(GetFont()); //force recalculation of correct fontsize } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxShowCharSet(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxShowCharSet(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxShowCharSet(pParent); } diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index a3738c97ae13..7d852b379b6e 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -26,7 +26,7 @@ #include <vcl/builder.hxx> -SvxCheckListBox::SvxCheckListBox( Window* pParent, WinBits nWinStyle ) : +SvxCheckListBox::SvxCheckListBox( vcl::Window* pParent, WinBits nWinStyle ) : SvTreeListBox( pParent, nWinStyle ) @@ -34,7 +34,7 @@ SvxCheckListBox::SvxCheckListBox( Window* pParent, WinBits nWinStyle ) : Init_Impl(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxCheckListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxCheckListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 7b22043a9b42..8175a0baee83 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -39,7 +39,7 @@ using namespace com::sun::star::beans; #include <stdio.h> -CompressGraphicsDialog::CompressGraphicsDialog( Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings ) : +CompressGraphicsDialog::CompressGraphicsDialog( vcl::Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings ) : ModalDialog ( pParent, "CompressGraphicDialog", "svx/ui/compressgraphicdialog.ui" ), m_pGraphicObj ( pGraphicObj ), m_aGraphic ( pGraphicObj->GetGraphicObject().GetGraphic() ), @@ -53,7 +53,7 @@ CompressGraphicsDialog::CompressGraphicsDialog( Window* pParent, SdrGrafObj* pGr Initialize(); } -CompressGraphicsDialog::CompressGraphicsDialog( Window* pParent, Graphic& rGraphic, Size rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings ) : +CompressGraphicsDialog::CompressGraphicsDialog( vcl::Window* pParent, Graphic& rGraphic, Size rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings ) : ModalDialog ( pParent, "CompressGraphicDialog", "svx/ui/compressgraphicdialog.ui" ), m_pGraphicObj ( NULL ), m_aGraphic ( rGraphic ), diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 3e7c0ab7866a..a2c56212eec2 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -36,7 +36,7 @@ #include <vcl/settings.hxx> #include <boost/scoped_ptr.hpp> -SvxXConnectionPreview::SvxXConnectionPreview( Window* pParent, WinBits nStyle) +SvxXConnectionPreview::SvxXConnectionPreview( vcl::Window* pParent, WinBits nStyle) : Control(pParent, nStyle) , pEdgeObj(NULL) , pObjList(NULL) @@ -46,7 +46,7 @@ SvxXConnectionPreview::SvxXConnectionPreview( Window* pParent, WinBits nStyle) SetStyles(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXConnectionPreview(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXConnectionPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index e7cc1dac7d87..96a99d3a534b 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -81,7 +81,7 @@ class SvxSuperContourDlg : public SvxContourDlg public: SvxSuperContourDlg(SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent); + vcl::Window* pParent); virtual ~SvxSuperContourDlg(); void SetExecState( bool bEnable ); diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 6289f3db1e75..28db0b862969 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star; #define TRANSCOL Color( COL_WHITE ) -ContourWindow::ContourWindow( Window* pParent, WinBits nBits ) : +ContourWindow::ContourWindow( vcl::Window* pParent, WinBits nBits ) : GraphCtrl ( pParent, nBits ), aWorkRect ( 0, 0, 0, 0 ), bPipetteMode ( false ), diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx index e92f45bd93e9..63d68ff82543 100644 --- a/svx/source/dialog/contwnd.hxx +++ b/svx/source/dialog/contwnd.hxx @@ -49,7 +49,7 @@ protected: public: - ContourWindow(Window* pParent, WinBits nBits); + ContourWindow(vcl::Window* pParent, WinBits nBits); virtual ~ContourWindow(); void SetPolyPolygon( const PolyPolygon& rPolyPoly ); diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 1e5078a57587..6125f0f3870a 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -374,7 +374,7 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, } } -SvxTPView::SvxTPView(Window * pParent) +SvxTPView::SvxTPView(vcl::Window * pParent) : TabPage(pParent, "RedlineViewPage", "svx/ui/redlineviewpage.ui") , bEnableAccept(true) , bEnableAcceptAll(true) @@ -524,7 +524,7 @@ IMPL_LINK( SvxTPView, PbClickHdl, PushButton*, pPushB ) return 0; } -SvxTPFilter::SvxTPFilter( Window * pParent) +SvxTPFilter::SvxTPFilter( vcl::Window * pParent) : TabPage(pParent, "RedlineFilterPage", "svx/ui/redlinefilterpage.ui") , pRedlinTable(NULL) , bModified(false) @@ -1056,7 +1056,7 @@ IMPL_LINK( SvxTPFilter, RefHandle, PushButton*, pRef ) return 0; } -SvxAcceptChgCtr::SvxAcceptChgCtr(Window* pParent) +SvxAcceptChgCtr::SvxAcceptChgCtr(vcl::Window* pParent) : TabControl(pParent, WB_TABSTOP | WB_DIALOGCONTROL) { m_pUIBuilder = new VclBuilder(this, getUIRootDir(), "svx/ui/redlinecontrol.ui", "RedlineControl"); diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index 5016c12d5eb5..089faad66941 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -29,7 +29,7 @@ namespace svx { - sal_uInt16 administrateDatabaseRegistration( Window* _parentWindow ) + sal_uInt16 administrateDatabaseRegistration( vcl::Window* _parentWindow ) { sal_uInt16 nResult = RET_CANCEL; diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index ddf6bc8799cd..c14125ddb0e6 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -38,7 +38,7 @@ const long DIAL_OUTER_WIDTH = 8; -DialControlBmp::DialControlBmp( Window& rParent ) : +DialControlBmp::DialControlBmp( vcl::Window& rParent ) : VirtualDevice( rParent, 0, 0 ), mbEnabled( true ), mrParent( rParent ), @@ -223,7 +223,7 @@ void DialControlBmp::DrawBackground() -DialControl::DialControl_Impl::DialControl_Impl ( Window& rParent ) : +DialControl::DialControl_Impl::DialControl_Impl ( vcl::Window& rParent ) : mpBmpEnabled(new DialControlBmp(rParent)), mpBmpDisabled(new DialControlBmp(rParent)), mpBmpBuffered(new DialControlBmp(rParent)), @@ -264,7 +264,7 @@ void DialControl::DialControl_Impl::SetSize( const Size& rWinSize ) -DialControl::DialControl( Window* pParent, WinBits nBits ) : +DialControl::DialControl( vcl::Window* pParent, WinBits nBits ) : Control( pParent, nBits ), mpImpl( new DialControl_Impl( *this ) ) { @@ -275,7 +275,7 @@ DialControl::~DialControl() { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDialControl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDialControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new DialControl(pParent, WB_TABSTOP); } diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index ca9526734cd3..5845b50daece 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -41,7 +41,7 @@ using namespace com::sun::star; -Svx3DPreviewControl::Svx3DPreviewControl(Window* pParent, const ResId& rResId) +Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, const ResId& rResId) : Control(pParent, rResId), mpModel(0), mpFmPage(0), @@ -57,7 +57,7 @@ Svx3DPreviewControl::Svx3DPreviewControl(Window* pParent, const ResId& rResId) SetBackground(); } -Svx3DPreviewControl::Svx3DPreviewControl(Window* pParent, WinBits nStyle) +Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle) : Control(pParent, nStyle), mpModel(0), mpFmPage(0), @@ -253,7 +253,7 @@ void Svx3DPreviewControl::Set3DAttributes( const SfxItemSet& rAttr ) #define NO_LIGHT_SELECTED (0xffffffff) #define MAX_NUMBER_LIGHTS (8) -Svx3DLightControl::Svx3DLightControl(Window* pParent, WinBits nStyle) +Svx3DLightControl::Svx3DLightControl(vcl::Window* pParent, WinBits nStyle) : Svx3DPreviewControl(pParent, nStyle), maUserInteractiveChangeCallback(), maUserSelectionChangeCallback(), @@ -954,7 +954,7 @@ basegfx::B3DVector Svx3DLightControl::GetLightDirection(sal_uInt32 nNum) const -SvxLightCtl3D::SvxLightCtl3D( Window* pParent, const ResId& rResId) +SvxLightCtl3D::SvxLightCtl3D( vcl::Window* pParent, const ResId& rResId) : Control(pParent, rResId), maLightControl(this, 0), maHorScroller(this, WB_HORZ | WB_DRAG), @@ -965,7 +965,7 @@ SvxLightCtl3D::SvxLightCtl3D( Window* pParent, const ResId& rResId) Init(); } -SvxLightCtl3D::SvxLightCtl3D( Window* pParent) +SvxLightCtl3D::SvxLightCtl3D( vcl::Window* pParent) : Control(pParent, WB_BORDER | WB_TABSTOP), maLightControl(this, 0), maHorScroller(this, WB_HORZ | WB_DRAG), @@ -981,7 +981,7 @@ Size SvxLightCtl3D::GetOptimalSize() const return LogicToPixel(Size(80, 100), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLightCtl3D(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxLightCtl3D(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxLightCtl3D(pParent); } diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index b8b677c12e6b..10b7f40f0679 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -66,7 +66,7 @@ Bitmap& SvxRectCtl::GetRectBitmap( void ) return *pBitmap; } -SvxRectCtl::SvxRectCtl(Window* pParent, RECT_POINT eRpt, +SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RECT_POINT eRpt, sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle) : Control(pParent, WB_BORDER | WB_TABSTOP) , pAccContext(NULL) @@ -96,7 +96,7 @@ Size SvxRectCtl::GetOptimalSize() const return LogicToPixel(Size(78, 39), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxRectCtl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxRectCtl(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxRectCtl(pParent); } @@ -263,7 +263,7 @@ void SvxRectCtl::MouseButtonDown( const MouseEvent& rMEvt ) SetActualRP( eRP ); - Window *pTabPage = getNonLayoutParent(this); + vcl::Window *pTabPage = getNonLayoutParent(this); if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType()) ( (SvxTabPage*)pTabPage)->PointChanged( this, eRP ); } @@ -348,7 +348,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) { SetActualRP( eNewRP ); - Window *pTabPage = getNonLayoutParent(this); + vcl::Window *pTabPage = getNonLayoutParent(this); if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType()) ((SvxTabPage*) pTabPage)->PointChanged(this, eRP); @@ -669,7 +669,7 @@ void SvxRectCtl::SetState( CTL_STATE nState ) eRP = GetRPFromPoint( _aPtNew ); Invalidate(); - Window *pTabPage = getNonLayoutParent(this); + vcl::Window *pTabPage = getNonLayoutParent(this); if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType()) ((SvxTabPage*)pTabPage)->PointChanged(this, eRP); } @@ -707,7 +707,7 @@ Rectangle SvxRectCtl::CalculateFocusRectangle( RECT_POINT eRectPoint ) const Reference< XAccessible > SvxRectCtl::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); DBG_ASSERT( pParent, "-SvxRectCtl::CreateAccessible(): No Parent!" ); @@ -796,7 +796,7 @@ long SvxPixelCtl::ShowPosition( const Point &pt) aFocusPosition.setY(nY); Invalidate(Rectangle(Point(0,0),aRectSize)); - Window *pTabPage = getNonLayoutParent(this); + vcl::Window *pTabPage = getNonLayoutParent(this); if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType()) ( (SvxTabPage*)pTabPage)->PointChanged( this, RP_MM ); // RectPoint ist dummy @@ -804,7 +804,7 @@ long SvxPixelCtl::ShowPosition( const Point &pt) } -SvxPixelCtl::SvxPixelCtl(Window* pParent, sal_uInt16 nNumber) +SvxPixelCtl::SvxPixelCtl(vcl::Window* pParent, sal_uInt16 nNumber) : Control(pParent, WB_BORDER) , nLines(nNumber) , bPaintable(true) @@ -832,7 +832,7 @@ Size SvxPixelCtl::GetOptimalSize() const return LogicToPixel(Size(72, 72), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPixelCtl(Window *pParent, VclBuilder::stringmap&) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPixelCtl(vcl::Window *pParent, VclBuilder::stringmap&) { return new SvxPixelCtl(pParent, 8); } @@ -1108,7 +1108,7 @@ void SvxPixelCtl::Reset() // Constructor: BitmapCtl for SvxPixelCtl -SvxBitmapCtl::SvxBitmapCtl( Window* /*pParent*/, const Size& rSize ) +SvxBitmapCtl::SvxBitmapCtl( vcl::Window* /*pParent*/, const Size& rSize ) : aSize(rSize) , nLines(0) , pBmpArray(NULL) @@ -1128,7 +1128,7 @@ BitmapEx SvxBitmapCtl::GetBitmapEx() return BitmapEx(aRetval); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorLB(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorLB(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP; @@ -1195,14 +1195,14 @@ void FillAttrLB::Fill( const XColorListRef &pColorTab ) // Fills the listbox (provisional) with strings -HatchingLB::HatchingLB( Window* pParent, WinBits nWinStyle) +HatchingLB::HatchingLB( vcl::Window* pParent, WinBits nWinStyle) : ListBox( pParent, nWinStyle ), mpList ( NULL ) { SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeHatchingLB(Window *pParent, VclBuilder::stringmap& rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeHatchingLB(vcl::Window *pParent, VclBuilder::stringmap& rMap) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1290,14 +1290,14 @@ void FillAttrLB::Fill( const XHatchListRef &pList ) // Fills the listbox (provisional) with strings -GradientLB::GradientLB( Window* pParent, WinBits aWB) +GradientLB::GradientLB( vcl::Window* pParent, WinBits aWB) : ListBox( pParent, aWB ), mpList(NULL) { SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGradientLB(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGradientLB(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1407,7 +1407,7 @@ void FillAttrLB::Fill( const XGradientListRef &pList ) // BitmapLB Constructor -BitmapLB::BitmapLB( Window* pParent, WinBits aWB) +BitmapLB::BitmapLB( vcl::Window* pParent, WinBits aWB) : ListBox( pParent, aWB ), maBitmapEx(), mpList(NULL) @@ -1415,7 +1415,7 @@ BitmapLB::BitmapLB( Window* pParent, WinBits aWB) SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBitmapLB(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBitmapLB(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1538,7 +1538,7 @@ void BitmapLB::Modify(const Size& rSize, const XBitmapEntry& rEntry, sal_Int32 n } } -FillAttrLB::FillAttrLB(Window* pParent, WinBits aWB) +FillAttrLB::FillAttrLB(vcl::Window* pParent, WinBits aWB) : ColorListBox(pParent, aWB) { } @@ -1578,14 +1578,14 @@ void FillTypeLB::Fill() SetUpdateMode( true ); } -LineLB::LineLB(Window* pParent, WinBits aWB) +LineLB::LineLB(vcl::Window* pParent, WinBits aWB) : ListBox(pParent, aWB), mbAddStandardFields(true) { // No EdgeBlending for LineStyle/Dash SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLineLB(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineLB(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP; @@ -1682,13 +1682,13 @@ void LineLB::Modify( const XDashEntry& rEntry, sal_Int32 nPos, const Bitmap& rBi // Fills the listbox (provisional) with strings -LineEndLB::LineEndLB( Window* pParent, WinBits aWB ) +LineEndLB::LineEndLB( vcl::Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) { // No EdgeBlending for LineEnds SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLineEndLB(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineEndLB(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP; @@ -1824,7 +1824,7 @@ void SvxPreviewBase::InitSettings(bool bForeground, bool bBackground) Invalidate(); } -SvxPreviewBase::SvxPreviewBase(Window* pParent) +SvxPreviewBase::SvxPreviewBase(vcl::Window* pParent) : Control(pParent, WB_BORDER) , mpModel(new SdrModel()) , mpBufferDevice(new VirtualDevice(*this)) @@ -1963,7 +1963,7 @@ void SvxXLinePreview::Resize() mpLineObjC->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonC)); } -SvxXLinePreview::SvxXLinePreview(Window* pParent) +SvxXLinePreview::SvxXLinePreview(vcl::Window* pParent) : SvxPreviewBase(pParent) , mpLineObjA(NULL) , mpLineObjB(NULL) @@ -1983,7 +1983,7 @@ SvxXLinePreview::SvxXLinePreview(Window* pParent) mpLineObjC->SetModel(&getModel()); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXLinePreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXLinePreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxXLinePreview(pParent); } @@ -2068,7 +2068,7 @@ void SvxXLinePreview::Paint( const Rectangle& ) LocalPostPaint(); } -SvxXRectPreview::SvxXRectPreview(Window* pParent) +SvxXRectPreview::SvxXRectPreview(vcl::Window* pParent) : SvxPreviewBase(pParent) , mpRectangleObject(0) { @@ -2094,7 +2094,7 @@ void SvxXRectPreview::Resize() SvxPreviewBase::Resize(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXRectPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXRectPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxXRectPreview(pParent); } @@ -2126,7 +2126,7 @@ void SvxXRectPreview::Paint( const Rectangle& ) LocalPostPaint(); } -SvxXShadowPreview::SvxXShadowPreview( Window* pParent ) +SvxXShadowPreview::SvxXShadowPreview( vcl::Window* pParent ) : SvxPreviewBase(pParent) , mpRectangleObject(0) , mpRectangleShadow(0) @@ -2149,7 +2149,7 @@ SvxXShadowPreview::SvxXShadowPreview( Window* pParent ) mpRectangleShadow->SetModel(&getModel()); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXShadowPreview (Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXShadowPreview (vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxXShadowPreview(pParent); } diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index c119619880d5..bb3f1bf6f71d 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -527,7 +527,7 @@ css::util::URL RecoveryCore::impl_getParsedURL(const OUString& sURL) return aURL; } -PluginProgressWindow::PluginProgressWindow( Window* pParent , +PluginProgressWindow::PluginProgressWindow( vcl::Window* pParent , const css::uno::Reference< css::lang::XComponent >& xProgress) : Window (pParent ) , m_xProgress(xProgress) @@ -545,7 +545,7 @@ PluginProgressWindow::~PluginProgressWindow() } -PluginProgress::PluginProgress( Window* pParent, +PluginProgress::PluginProgress( vcl::Window* pParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) { m_pPlugProgressWindow = new PluginProgressWindow(pParent, static_cast< css::lang::XComponent* >(this)); @@ -623,7 +623,7 @@ void SAL_CALL PluginProgress::reset() } -SaveDialog::SaveDialog(Window* pParent, RecoveryCore* pCore) +SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* pCore) : Dialog(pParent, "DocRecoverySaveDialog", "svx/ui/docrecoverysavedialog.ui") , m_pCore(pCore) @@ -677,7 +677,7 @@ IMPL_LINK_NOARG(SaveDialog, OKButtonHdl) return 0; } -SaveProgressDialog::SaveProgressDialog(Window* pParent, RecoveryCore* pCore) +SaveProgressDialog::SaveProgressDialog(vcl::Window* pParent, RecoveryCore* pCore) : ModalDialog(pParent, "DocRecoveryProgressDialog", "svx/ui/docrecoveryprogressdialog.ui") , m_pCore(pCore) @@ -828,7 +828,7 @@ void RecovDocList::InitEntry(SvTreeListEntry* pEntry, } -short impl_askUserForWizardCancel(Window* pParent, sal_Int16 nRes) +short impl_askUserForWizardCancel(vcl::Window* pParent, sal_Int16 nRes) { MessageDialog aQuery(pParent, SVX_RES(nRes), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); if (aQuery.Execute() == RET_YES) @@ -837,7 +837,7 @@ short impl_askUserForWizardCancel(Window* pParent, sal_Int16 nRes) return DLG_RET_CANCEL; } -RecoveryDialog::RecoveryDialog(Window* pParent, RecoveryCore* pCore) +RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore) : Dialog(pParent, "DocRecoveryRecoverDialog", "svx/ui/docrecoveryrecoverdialog.ui") , m_aTitleRecoveryInProgress(SVX_RESSTR(RID_SVXSTR_RECOVERY_INPROGRESS)) @@ -1205,7 +1205,7 @@ OUString RecoveryDialog::impl_getStatusString( const TURLInfo& rInfo ) const return sStatus; } -BrokenRecoveryDialog::BrokenRecoveryDialog(Window* pParent , +BrokenRecoveryDialog::BrokenRecoveryDialog(vcl::Window* pParent , RecoveryCore* pCore , bool bBeforeRecovery) : ModalDialog ( pParent, "DocRecoveryBrokenDialog", "svx/ui/docrecoverybrokendialog.ui" ) diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 02f346a3ee9e..5e20a83fad8f 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -478,19 +478,19 @@ void SvxFontPrevWindow::Init() SetBorderStyle( WINDOW_BORDER_MONO ); } -SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) : +SvxFontPrevWindow::SvxFontPrevWindow( vcl::Window* pParent, const ResId& rId ) : Window( pParent, rId ) { Init(); } -SvxFontPrevWindow::SvxFontPrevWindow(Window* pParent, WinBits nStyle) +SvxFontPrevWindow::SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle) : Window(pParent, nStyle) { Init(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontPrevWindow(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFontPrevWindow(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index a951fe8fc6eb..dd4d1d6dfe3f 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -83,7 +83,7 @@ void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEnt -SvxFontListBox::SvxFontListBox(Window* pParent, WinBits nStyle) +SvxFontListBox::SvxFontListBox(vcl::Window* pParent, WinBits nStyle) : SvTabListBox(pParent, nStyle) , maStdFont(GetFont()) , mpEntryColor(NULL) @@ -93,7 +93,7 @@ SvxFontListBox::SvxFontListBox(Window* pParent, WinBits nStyle) maEntryFont = maStdFont; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFontListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 0a8a647a43ed..17d0d55d3d76 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -156,7 +156,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState SvxFontWorkChildWindow::SvxFontWorkChildWindow ( - Window* _pParent, + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo @@ -178,7 +178,7 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* _pParent, + vcl::Window* _pParent, const ResId& rResId ) : SfxDockingWindow( pBindinx, pCW, _pParent, rResId ), diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index f4b9dc52efbb..de7ff69ddd1f 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -38,7 +38,7 @@ inline SvxFrameDirection lclVoidToEnum( void* pDirection ) } // namespace -FrameDirectionListBox::FrameDirectionListBox( Window* pParent, WinBits nBits ) +FrameDirectionListBox::FrameDirectionListBox( vcl::Window* pParent, WinBits nBits ) : ListBox(pParent, nBits) , meSaveValue(FRMDIR_HORI_LEFT_TOP) { @@ -48,7 +48,7 @@ FrameDirectionListBox::~FrameDirectionListBox() { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFrameDirectionListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFrameDirectionListBox(vcl::Window *pParent, VclBuilder::stringmap &) { FrameDirectionListBox* pListBox = new FrameDirectionListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP); pListBox->EnableAutoSize(true); diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index e72575baa366..0fc0d0f1a21c 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -781,7 +781,7 @@ bool FrameSelectorImpl::SelectedBordersEqual() const return bEqual; } -FrameSelector::FrameSelector(Window* pParent) +FrameSelector::FrameSelector(vcl::Window* pParent) : Control(pParent, WB_BORDER|WB_TABSTOP) { // not in c'tor init list (avoid warning about usage of *this) @@ -789,7 +789,7 @@ FrameSelector::FrameSelector(Window* pParent) EnableRTL( false ); // #107808# don't mirror the mouse handling } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFrameSelector(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFrameSelector(vcl::Window *pParent, VclBuilder::stringmap &) { return new FrameSelector(pParent); } diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 03ba7aebb062..c39f9d55e452 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -53,7 +53,7 @@ void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, c } } -GraphCtrl::GraphCtrl( Window* pParent, WinBits nStyle ) : +GraphCtrl::GraphCtrl( vcl::Window* pParent, WinBits nStyle ) : Control ( pParent, nStyle ), aMap100 ( MAP_100TH_MM ), nWinStyle ( 0 ), @@ -73,7 +73,7 @@ GraphCtrl::GraphCtrl( Window* pParent, WinBits nStyle ) : EnableRTL( false ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGraphCtrl(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGraphCtrl(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -748,7 +748,7 @@ IMPL_LINK( GraphCtrl, UpdateHdl, Timer*, pTimer ) { if( mpAccContext == NULL ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); DBG_ASSERT( pParent, "-GraphCtrl::CreateAccessible(): No Parent!" ); diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 0deaeb51f97c..2842ae87286a 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -42,7 +42,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj { SfxViewFrame* pViewFrame = SfxViewFrame::Current(); SfxObjectShell* pShell = pViewFrame ? pViewFrame->GetObjectShell() : NULL; - Window* pWindow = ( pViewFrame && pViewFrame->GetViewShell() ) ? pViewFrame->GetViewShell()->GetWindow() : NULL; + vcl::Window* pWindow = ( pViewFrame && pViewFrame->GetViewShell() ) ? pViewFrame->GetViewShell()->GetWindow() : NULL; Graphic aGraphic; switch( rReq.GetSlot() ) diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 3051c57ab536..108a77a3c7bb 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -88,7 +88,7 @@ static const sal_uInt16 pRanges[] = namespace svx { - bool ShowBorderBackgroundDlg( Window* pParent, SfxItemSet* pBBSet, + bool ShowBorderBackgroundDlg( vcl::Window* pParent, SfxItemSet* pBBSet, bool bEnableBackgroundSelector ) { bool bRes = false; @@ -125,7 +125,7 @@ const sal_uInt16* SvxHeaderPage::GetRanges() -SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxHeaderPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxHeaderPage( pParent, *rSet ); } @@ -139,14 +139,14 @@ const sal_uInt16* SvxFooterPage::GetRanges() -SfxTabPage* SvxFooterPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxFooterPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxFooterPage( pParent, *rSet ); } -SvxHeaderPage::SvxHeaderPage( Window* pParent, const SfxItemSet& rAttr ) : +SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_HEADERSET ) @@ -155,7 +155,7 @@ SvxHeaderPage::SvxHeaderPage( Window* pParent, const SfxItemSet& rAttr ) : -SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) : +SvxFooterPage::SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_FOOTERSET ) @@ -163,7 +163,7 @@ SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) : } -SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) : +SvxHFPage::SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) : SfxTabPage(pParent, "HFFormatPage", "svx/ui/headfootformatpage.ui", &rSet), nId(nSetId), pBBSet(NULL), @@ -1133,7 +1133,7 @@ IMPL_LINK_NOARG(SvxHFPage, RangeHdl) return 0; } -static void lcl_Move(Window& rWin, sal_Int32 nDiff) +static void lcl_Move(vcl::Window& rWin, sal_Int32 nDiff) { Point aPos(rWin.GetPosPixel()); aPos.Y() -= nDiff; @@ -1144,7 +1144,7 @@ void SvxHFPage::EnableDynamicSpacing() { m_pDynSpacingCB->Show(); //move all following controls - Window* aMoveWindows[] = + vcl::Window* aMoveWindows[] = { m_pHeightFT, m_pHeightEdit, diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index f1e227d6a18d..9aeefe8e85a0 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -45,7 +45,7 @@ struct MyStruct SfxWorkWindow* pWorkWin; }; -SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId, +SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ), @@ -60,7 +60,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId, pWindow = mpDlg->GetWindow(); ((MyStruct*)pImp)->bVisible = false; - Window* pTopWindow = 0; + vcl::Window* pTopWindow = 0; if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 && (0 != (pTopWindow = SfxGetpApp()->GetTopWindow()))) { diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 5deb794ed74c..a40c91ec71e6 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -93,7 +93,7 @@ void SvxIMapDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, } } -SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, sal_uInt16 nId, +SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -117,12 +117,12 @@ void SvxIMapDlgChildWindow::UpdateIMapDlg( const Graphic& rGraphic, const ImageM SVXIMAPDLG()->UpdateLink( rGraphic, pImageMap, pTargetList, pEditingObj ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeStatusBar(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeStatusBar(vcl::Window *pParent, VclBuilder::stringmap &) { return new StatusBar(pParent); } -SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, Window* _pParent) +SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window* _pParent) : SfxModelessDialog(_pBindings, pCW, _pParent, "ImapDialog", "svx/ui/imapdialog.ui") , pCheckObj(NULL) , aIMapItem(SID_IMAP_EXEC, *this, *_pBindings) diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 36af678166ff..a1f8358bc8a8 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -56,7 +56,7 @@ using ::com::sun::star::uno::Reference; #define TRANSCOL Color( COL_WHITE ) -IMapWindow::IMapWindow( Window* pParent, WinBits nBits, const Reference< XFrame >& rxDocumentFrame ) : +IMapWindow::IMapWindow( vcl::Window* pParent, WinBits nBits, const Reference< XFrame >& rxDocumentFrame ) : GraphCtrl( pParent, nBits ), DropTargetHelper( this ), mxDocumentFrame( rxDocumentFrame ) diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index f62a832c7758..3d889247857e 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -132,7 +132,7 @@ protected: public: - IMapWindow( Window* pParent, WinBits nBits, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame ); + IMapWindow( vcl::Window* pParent, WinBits nBits, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame ); virtual ~IMapWindow(); bool ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ); diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 8d3f6f98ca38..eec98dee33a4 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -107,7 +107,7 @@ static bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nL } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLanguageBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxLanguageBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; bool bDropdown = VclBuilder::extractDropdown(rMap); @@ -120,7 +120,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLanguageBox(Window *pPar return pLanguageBox; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLanguageComboBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxLanguageComboBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; bool bDropdown = VclBuilder::extractDropdown(rMap); @@ -492,7 +492,7 @@ sal_Int32 SvxLanguageBoxBase::GetSavedValueLBB() const } -SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nBits, bool bCheck ) +SvxLanguageBox::SvxLanguageBox( vcl::Window* pParent, WinBits nBits, bool bCheck ) : ListBox( pParent, nBits ) , SvxLanguageBoxBase( bCheck ) { @@ -507,7 +507,7 @@ SvxLanguageBox::~SvxLanguageBox() } -SvxLanguageComboBox::SvxLanguageComboBox( Window* pParent, WinBits nBits, bool bCheck ) +SvxLanguageComboBox::SvxLanguageComboBox( vcl::Window* pParent, WinBits nBits, bool bCheck ) : ComboBox( pParent, nBits ) , SvxLanguageBoxBase( bCheck ) , mnSavedValuePos( COMBOBOX_ENTRY_NOTFOUND ) diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx index 1f223ce251e1..6ecced415026 100644 --- a/svx/source/dialog/linkwarn.cxx +++ b/svx/source/dialog/linkwarn.cxx @@ -20,7 +20,7 @@ #include <svx/linkwarn.hxx> #include <svtools/miscopt.hxx> -SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const OUString& _rFileName ) +SvxLinkWarningDialog::SvxLinkWarningDialog( vcl::Window* pParent, const OUString& _rFileName ) : MessageDialog(pParent, "LinkWarnDialog" , "svx/ui/linkwarndialog.ui") { get(m_pWarningOnBox, "ask"); diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index 29b2c4bf9879..8810a874ba91 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -27,7 +27,7 @@ #include <vcl/settings.hxx> #include <boost/scoped_ptr.hpp> -SvxXMeasurePreview::SvxXMeasurePreview( Window* pParent, WinBits nStyle) +SvxXMeasurePreview::SvxXMeasurePreview( vcl::Window* pParent, WinBits nStyle) : Control(pParent, nStyle) { SetMapMode( MAP_100TH_MM ); @@ -62,7 +62,7 @@ void SvxXMeasurePreview::Resize() pMeasureObj->SetPoint(aPt2, 1); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXMeasurePreview(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXMeasurePreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 81b4d502e720..bd178f8a82f7 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -115,7 +115,7 @@ bool SvxGridItem::GetPresentation } // TabPage Screen Settings -SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : +SvxGridTabPage::SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage( pParent, "OptGridPage" , "svx/ui/optgridpage.ui", &rCoreSet ), bAttrModified( false ) @@ -173,7 +173,7 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : -SfxTabPage* SvxGridTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxGridTabPage::Create( vcl::Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxGridTabPage( pParent, rAttrSet ) ); } diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index 99c3bb76b22d..b1b61e9ed1a0 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -31,7 +31,7 @@ namespace svx { struct OrientationHelper_Impl { - typedef std::pair< Window*, TriState > WindowPair; + typedef std::pair< vcl::Window*, TriState > WindowPair; typedef std::vector< WindowPair > WindowVec; DialControl& mrCtrlDial; @@ -42,10 +42,10 @@ struct OrientationHelper_Impl explicit OrientationHelper_Impl( DialControl& rCtrlDial, CheckBox& rCbStacked ); - void AddDependentWindow( Window& rWindow, TriState eDisableIfStacked ); + void AddDependentWindow( vcl::Window& rWindow, TriState eDisableIfStacked ); void EnableDependentWindows(); - void EnableWindow( Window& rWindow, TriState eDisableIfStacked ); + void EnableWindow( vcl::Window& rWindow, TriState eDisableIfStacked ); void ShowDependentWindows(); @@ -65,7 +65,7 @@ OrientationHelper_Impl::OrientationHelper_Impl( DialControl& rCtrlDial, CheckBox mrCbStacked.SetClickHdl( LINK( this, OrientationHelper_Impl, ClickHdl ) ); } -void OrientationHelper_Impl::AddDependentWindow( Window& rWindow, TriState eDisableIfStacked ) +void OrientationHelper_Impl::AddDependentWindow( vcl::Window& rWindow, TriState eDisableIfStacked ) { maWinVec.push_back( std::make_pair( &rWindow, eDisableIfStacked ) ); EnableWindow( rWindow, eDisableIfStacked ); @@ -77,7 +77,7 @@ void OrientationHelper_Impl::EnableDependentWindows() EnableWindow( *aIt->first, aIt->second ); } -void OrientationHelper_Impl::EnableWindow( Window& rWindow, TriState eDisableIfStacked ) +void OrientationHelper_Impl::EnableWindow( vcl::Window& rWindow, TriState eDisableIfStacked ) { bool bDisableOnStacked = false; switch( eDisableIfStacked ) @@ -117,7 +117,7 @@ OrientationHelper::~OrientationHelper() { } -void OrientationHelper::AddDependentWindow( Window& rWindow, TriState eDisableIfStacked ) +void OrientationHelper::AddDependentWindow( vcl::Window& rWindow, TriState eDisableIfStacked ) { mpImpl->AddDependentWindow( rWindow, eDisableIfStacked ); } diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 8dea4db44760..fa7b9befa814 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -34,7 +34,7 @@ #define CELL_WIDTH 1600L #define CELL_HEIGHT 800L -SvxPageWindow::SvxPageWindow(Window* pParent) +SvxPageWindow::SvxPageWindow(vcl::Window* pParent) : Window(pParent), aWinSize(), aSize(), @@ -93,7 +93,7 @@ SvxPageWindow::~SvxPageWindow() delete pFtBorder; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPageWindow(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPageWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxPageWindow(pParent); } diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index ac4c7f341052..c8b1624075b9 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -22,7 +22,7 @@ #include <vcl/builder.hxx> #include <vcl/settings.hxx> -SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, WinBits nBits) : +SvxParaPrevWindow::SvxParaPrevWindow( vcl::Window* pParent, WinBits nBits) : Window( pParent, nBits), @@ -45,7 +45,7 @@ SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, WinBits nBits) : SetBorderStyle( WINDOW_BORDER_MONO ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxParaPrevWindow(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxParaPrevWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxParaPrevWindow(pParent, WB_BORDER); } diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index af770701c26f..c794ebb309b5 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -71,7 +71,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl) -SvxPasswordDialog::SvxPasswordDialog(Window* pParent, bool bAllowEmptyPasswords, bool bDisableOldPassword) +SvxPasswordDialog::SvxPasswordDialog(vcl::Window* pParent, bool bAllowEmptyPasswords, bool bDisableOldPassword) : SfxModalDialog(pParent, "PasswordDialog", "svx/ui/passwd.ui") , aOldPasswdErrStr(SVX_RESSTR(RID_SVXSTR_ERR_OLD_PASSWD)) , aRepeatPasswdErrStr(SVX_RESSTR(RID_SVXSTR_ERR_REPEAT_PASSWD )) diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index 62f3db4bfbe7..f7cc2d0cee7f 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -49,7 +49,7 @@ OUString SvxPluginFileDlg::GetPath() const return maFileDlg.GetPath(); } -SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind ) +SvxPluginFileDlg::SvxPluginFileDlg (vcl::Window *, sal_uInt16 nKind ) : maFileDlg(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, SFXWB_INSERT) { // set title of the dialogwindow diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx index c2aa1125b3b0..14a2c9a8d0d5 100644 --- a/svx/source/dialog/prtqry.cxx +++ b/svx/source/dialog/prtqry.cxx @@ -22,7 +22,7 @@ #include <svx/prtqry.hxx> #include <svx/dialmgr.hxx> -SvxPrtQryBox::SvxPrtQryBox(Window* pParent) : +SvxPrtQryBox::SvxPrtQryBox(vcl::Window* pParent) : MessBox(pParent, 0, SVX_RESSTR(RID_SVXSTR_QRY_PRINT_TITLE), SVX_RESSTR(RID_SVXSTR_QRY_PRINT_MSG)) diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index b4db0011d6c2..6e177aa02cb2 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -23,7 +23,7 @@ SvxRelativeField::SvxRelativeField( - Window *const pParent, WinBits const nBits, FieldUnit const eUnit) + vcl::Window *const pParent, WinBits const nBits, FieldUnit const eUnit) : MetricField( pParent, nBits) , nRelMin(0) , nRelMax(0) @@ -39,8 +39,8 @@ SvxRelativeField::SvxRelativeField( SetMax( 9999 ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL -makeSvxRelativeField(Window *const pParent, VclBuilder::stringmap & rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL +makeSvxRelativeField(vcl::Window *const pParent, VclBuilder::stringmap & rMap) { OString const custom(VclBuilder::extractCustomProperty(rMap)); FieldUnit const eUnit(VclBuilder::detectUnit(custom)); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 3dab36e07d46..83a6e5e28749 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -60,7 +60,7 @@ static const sal_Char cDisplayName[] = "DisplayName"; static const sal_Char cRubyCharStyleName[] = "RubyCharStyleName"; static const sal_Char cRubies[] = "Rubies"; -SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, sal_uInt16 nId, +SvxRubyChildWindow::SvxRubyChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : SfxChildWindow(_pParent, nId) { @@ -191,7 +191,7 @@ void SvxRubyData_Impl::AssertOneEntry() } SvxRubyDialog::SvxRubyDialog(SfxBindings *pBind, SfxChildWindow *pCW, - Window* _pParent) + vcl::Window* _pParent) : SfxModelessDialog(pBind, pCW, _pParent, "AsianPhoneticGuideDialog", "svx/ui/asianphoneticguidedialog.ui") , nLastPos(0) @@ -752,7 +752,7 @@ void SvxRubyDialog::EnableControls(bool bEnable) m_pApplyPB->Enable(bEnable); } -RubyPreview::RubyPreview(Window *pParent) +RubyPreview::RubyPreview(vcl::Window *pParent) : Window(pParent, WB_BORDER) , m_pParentDlg(NULL) { @@ -760,7 +760,7 @@ RubyPreview::RubyPreview(Window *pParent) SetBorderStyle( WINDOW_BORDER_MONO ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRubyPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRubyPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new RubyPreview(pParent); } @@ -913,7 +913,7 @@ bool RubyEdit::PreNotify( NotifyEvent& rNEvt ) return nHandled; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRubyEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRubyEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new RubyEdit(pParent); } diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index a78060580bcb..aaad310bfb98 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -245,7 +245,7 @@ void SearchAttrItemList::Remove(size_t nPos, size_t nLen) SrchAttrItemList::erase( begin() + nPos, begin() + nPos + nLen ); } -SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ) +SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ) : SfxModelessDialog(&rBind, pChildWin, pParent, "FindReplaceDialog", "svx/ui/findreplacedialog.ui") , mpDocWin(NULL) @@ -2213,7 +2213,7 @@ SFX_IMPL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper, SID_SEARCH_DLG); -SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, sal_uInt16 nId, +SvxSearchDialogWrapper::SvxSearchDialogWrapper( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -2245,7 +2245,7 @@ SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const } -static Window* lcl_GetSearchLabelWindow() +static vcl::Window* lcl_GetSearchLabelWindow() { css::uno::Reference< css::beans::XPropertySet > xPropSet( SfxViewFrame::Current()->GetFrame().GetFrameInterface(), css::uno::UNO_QUERY_THROW); @@ -2274,7 +2274,7 @@ void SvxSearchDialogWrapper::SetSearchLabel(const SearchLabel& rSL) else if (rSL == SL_NotFound) sStr = SVX_RESSTR(RID_SVXSTR_SEARCH_NOT_FOUND); - if (Window *pSearchLabel = lcl_GetSearchLabelWindow()) + if (vcl::Window *pSearchLabel = lcl_GetSearchLabelWindow()) { if (sStr.isEmpty()) pSearchLabel->Hide(); diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx index 6579f2d47c7f..c1ba57d229ac 100644 --- a/svx/source/dialog/stddlg.cxx +++ b/svx/source/dialog/stddlg.cxx @@ -30,7 +30,7 @@ short SvxStandardDialog::Execute() return nRet; } -SvxStandardDialog::SvxStandardDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) +SvxStandardDialog::SvxStandardDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) : SfxModalDialog(pParent, rID, rUIXMLDescription) { } diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 9a474e15bd98..f0e961aaebf9 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -389,7 +389,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) pDev->SetLineColor(aOldColor); } -SvxNumValueSet::SvxNumValueSet(Window* pParent, WinBits nWinBits) +SvxNumValueSet::SvxNumValueSet(vcl::Window* pParent, WinBits nWinBits) : ValueSet(pParent, nWinBits) , nPageType(0) , bHTMLMode(false) @@ -397,7 +397,7 @@ SvxNumValueSet::SvxNumValueSet(Window* pParent, WinBits nWinBits) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNumValueSet(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumValueSet(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxNumValueSet(pParent, WB_TABSTOP); } @@ -463,13 +463,13 @@ void SvxNumValueSet::SetOutlineNumberingSettings( } } -SvxBmpNumValueSet::SvxBmpNumValueSet(Window* pParent, WinBits nWinBits) +SvxBmpNumValueSet::SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits) : SvxNumValueSet(pParent, nWinBits) { init(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxBmpNumValueSet(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxBmpNumValueSet(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxBmpNumValueSet(pParent, WB_TABSTOP); } diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 60ace556fe04..7c5a71308679 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -55,11 +55,11 @@ #ifdef DEBUG_RULER #include <vcl/lstbox.hxx> -class RulerDebugWindow : public Window +class RulerDebugWindow : public vcl::Window { ListBox aBox; public: - RulerDebugWindow(Window* pParent) : + RulerDebugWindow(vcl::Window* pParent) : Window(pParent, WB_BORDER|WB_SIZEMOVE|WB_DIALOGCONTROL|WB_CLIPCHILDREN|WB_SYSTEMWINDOW), aBox(this, WB_BORDER) { @@ -89,7 +89,7 @@ void RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const OUSt { if(!pDebugWindow) { - Window* pParent = Application::GetFocusWindow(); + vcl::Window* pParent = Application::GetFocusWindow(); while(pParent->GetParent()) pParent = pParent->GetParent(); pDebugWindow = new RulerDebugWindow(pParent); @@ -196,8 +196,8 @@ void SvxRuler_Impl::SetPercSize(sal_uInt16 nSize) // Ruler: SetBorders SvxRuler::SvxRuler( - Window* pParent, // StarView Parent - Window* pWin, // Output window: is used for conversion + vcl::Window* pParent, // StarView Parent + vcl::Window* pWin, // Output window: is used for conversion // logical units <-> pixels sal_uInt16 flags, // Display flags, see ruler.hxx SfxBindings &rBindings, // associated Bindings diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 6eb6e1b3f190..bea9c10078b6 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::text; #define FLYINFLY_BORDER 3 #define DEMOTEXT "Ij" -SvxSwFrameExample::SvxSwFrameExample( Window *pParent, WinBits nStyle ) : +SvxSwFrameExample::SvxSwFrameExample( vcl::Window *pParent, WinBits nStyle ) : Window(pParent, nStyle), @@ -52,7 +52,7 @@ SvxSwFrameExample::SvxSwFrameExample( Window *pParent, WinBits nStyle ) : SetMapMode(MAP_PIXEL); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxSwFrameExample(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxSwFrameExample(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxSwFrameExample(pParent, 0); } diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 86afcac86d1c..cfa119d50aa1 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -33,13 +33,13 @@ #include <rtl/strbuf.hxx> #include <osl/nlsupport.h> -SvxTextEncodingBox::SvxTextEncodingBox( Window* pParent, WinBits nBits ) +SvxTextEncodingBox::SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits ) : ListBox( pParent, nBits ) { m_pEncTable = new SvxTextEncodingTable; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxTextEncodingBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxTextEncodingBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; bool bDropdown = VclBuilder::extractDropdown(rMap); diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx index 887c7230795b..c33ca311563f 100644 --- a/svx/source/dialog/wrapfield.cxx +++ b/svx/source/dialog/wrapfield.cxx @@ -22,12 +22,12 @@ namespace svx { -WrapField::WrapField( Window* pParent, WinBits nBits ) : +WrapField::WrapField( vcl::Window* pParent, WinBits nBits ) : NumericField( pParent, nBits ) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeWrapField(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeWrapField(vcl::Window *pParent, VclBuilder::stringmap &) { return new WrapField(pParent, WB_SPIN|WB_REPEAT|WB_BORDER|WB_TABSTOP); } diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index d28b3cded20b..d418277476cb 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -84,7 +84,7 @@ namespace { } Svx3DWin::Svx3DWin( SfxBindings* pInBindings, - SfxChildWindow *pCW, Window* pParent ) : + SfxChildWindow *pCW, vcl::Window* pParent ) : SfxDockingWindow ( pInBindings, pCW, pParent, SVX_RES( RID_SVXFLOAT_3D ) ), aBtnGeo ( this, SVX_RES( BTN_GEO ) ), @@ -3231,7 +3231,7 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn ) // Derivation from SfxChildWindow as "containers" for effects -Svx3DChildWindow::Svx3DChildWindow( Window* _pParent, +Svx3DChildWindow::Svx3DChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 56d5a8320822..5db0927a4008 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1000,7 +1000,7 @@ void FmGridHeader::Command(const CommandEvent& rEvt) FmGridControl::FmGridControl( const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - Window* pParent, + vcl::Window* pParent, FmXGridPeer* _pPeer, WinBits nBits) :DbGridControl(_rxContext, pParent, nBits) diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index d452b5ce9f45..24a3312bf0cc 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -432,7 +432,7 @@ sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< ::com::sun::star::aw } -FmXGridPeer* FmXGridControl::imp_CreatePeer(Window* pParent) +FmXGridPeer* FmXGridControl::imp_CreatePeer(vcl::Window* pParent) { FmXGridPeer* pReturn = new FmXGridPeer(m_xContext); @@ -477,7 +477,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt: // mbCreatingPeer is virtually the same as m_nPeerCreationLevel, but it's the base class' method // to prevent recursion. - Window* pParentWin = NULL; + vcl::Window* pParentWin = NULL; if (rParentPeer.is()) { VCLXWindow* pParent = VCLXWindow::GetImplementation(rParentPeer); @@ -1078,13 +1078,13 @@ FmXGridPeer::FmXGridPeer(const Reference< XComponentContext >& _rxContext) } -FmGridControl* FmXGridPeer::imp_CreateControl(Window* pParent, WinBits nStyle) +FmGridControl* FmXGridPeer::imp_CreateControl(vcl::Window* pParent, WinBits nStyle) { return new FmGridControl(m_xContext, pParent, this, nStyle); } -void FmXGridPeer::Create(Window* pParent, WinBits nStyle) +void FmXGridPeer::Create(vcl::Window* pParent, WinBits nStyle) { FmGridControl* pWin = imp_CreateControl(pParent, nStyle); DBG_ASSERT(pWin != NULL, "FmXGridPeer::Create : imp_CreateControl didn't return a control !"); @@ -1711,7 +1711,7 @@ void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( RuntimeException, std::exce { if (bOn != isDesignMode()) { - Window* pWin = GetWindow(); + vcl::Window* pWin = GetWindow(); if (pWin) ((FmGridControl*) pWin)->SetDesignMode(bOn); } @@ -1725,7 +1725,7 @@ void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( RuntimeException, std::exce sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException, std::exception ) { - Window* pWin = GetWindow(); + vcl::Window* pWin = GetWindow(); if (pWin) return ((FmGridControl*) pWin)->IsDesignMode(); else @@ -2027,7 +2027,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext() Reference< XAccessibleContext > xContext; // use the AccessibleContext provided by the VCL window - Window* pGrid = GetWindow(); + vcl::Window* pGrid = GetWindow(); if ( pGrid ) { Reference< XAccessible > xAcc( pGrid->GetAccessible( true ) ); @@ -2057,7 +2057,7 @@ Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeExc if (GetWindow()) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); - Window* pDataWindow = &pGrid->GetDataWindow(); + vcl::Window* pDataWindow = &pGrid->GetDataWindow(); if ( _rPropertyName == FM_PROP_NAME ) { diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index fdc23002211f..9feb232991e4 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -456,7 +456,7 @@ void DbGridColumn::Paint(OutputDevice& rDev, const Reference< XNumberFormatter >& xFormatter) { bool bEnabled = ( rDev.GetOutDevType() != OUTDEV_WINDOW ) - || ( static_cast< Window& >( rDev ).IsEnabled() ); + || ( static_cast< vcl::Window& >( rDev ).IsEnabled() ); FmXDataCell* pDataCell = PTR_CAST(FmXDataCell, m_pCell); if (pDataCell) @@ -517,7 +517,7 @@ void DbGridColumn::Paint(OutputDevice& rDev, } -void DbGridColumn::ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat ) +void DbGridColumn::ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ) { if ( m_pCell ) m_pCell->ImplInitWindow( rParent, _eInitWhat ); @@ -722,9 +722,9 @@ bool DbCellControl::Commit() } -void DbCellControl::ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat ) +void DbCellControl::ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ) { - Window* pWindows[] = { m_pPainter, m_pWindow }; + vcl::Window* pWindows[] = { m_pPainter, m_pWindow }; if ( ( _eInitWhat & InitWritingMode ) != 0 ) { @@ -861,7 +861,7 @@ void DbCellControl::implAdjustEnabled( const Reference< XPropertySet >& _rxModel } -void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor ) +void DbCellControl::Init( vcl::Window& rParent, const Reference< XRowSet >& _rxCursor ) { ImplInitWindow( rParent, InitAll ); @@ -937,7 +937,7 @@ void DbCellControl::SetTextLineColor(const Color& _rColor) namespace { - static void lcl_implAlign( Window* _pWindow, WinBits _nAlignmentBit ) + static void lcl_implAlign( vcl::Window* _pWindow, WinBits _nAlignmentBit ) { WinBits nStyle = _pWindow->GetStyle(); nStyle &= ~(WB_LEFT | WB_RIGHT | WB_CENTER); @@ -1083,7 +1083,7 @@ DbTextField::~DbTextField( ) } -void DbTextField::Init( Window& rParent, const Reference< XRowSet >& xCursor) +void DbTextField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor) { sal_Int16 nAlignment = m_rColumn.SetAlignmentFromModel(-1); @@ -1243,7 +1243,7 @@ DbFormattedField::~DbFormattedField() } -void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCursor) +void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor) { sal_Int16 nAlignment = m_rColumn.SetAlignmentFromModel(-1); @@ -1614,7 +1614,7 @@ DbCheckBox::DbCheckBox( DbGridColumn& _rColumn ) namespace { - void setCheckBoxStyle( Window* _pWindow, bool bMono ) + void setCheckBoxStyle( vcl::Window* _pWindow, bool bMono ) { AllSettings aSettings = _pWindow->GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); @@ -1628,7 +1628,7 @@ namespace } -void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor ) +void DbCheckBox::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor ) { setTransparent( true ); @@ -1762,7 +1762,7 @@ void DbPatternField::implAdjustGenericFieldSetting( const Reference< XPropertySe } -void DbPatternField::Init( Window& rParent, const Reference< XRowSet >& xCursor) +void DbPatternField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor) { m_rColumn.SetAlignmentFromModel(-1); @@ -1849,7 +1849,7 @@ DbSpinField::DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign ) } -void DbSpinField::Init( Window& _rParent, const Reference< XRowSet >& _rxCursor ) +void DbSpinField::Init( vcl::Window& _rParent, const Reference< XRowSet >& _rxCursor ) { m_rColumn.SetAlignmentFromModel( m_nStandardAlign ); @@ -1943,7 +1943,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe } -SpinField* DbNumericField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) +SpinField* DbNumericField::createField( vcl::Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) { return new DoubleNumericField( _pParent, _nFieldStyle ); } @@ -2071,7 +2071,7 @@ void DbCurrencyField::implAdjustGenericFieldSetting( const Reference< XPropertyS } -SpinField* DbCurrencyField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) +SpinField* DbCurrencyField::createField( vcl::Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) { return new LongCurrencyField( _pParent, _nFieldStyle ); } @@ -2177,7 +2177,7 @@ DbDateField::DbDateField( DbGridColumn& _rColumn ) } -SpinField* DbDateField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& _rxModel ) +SpinField* DbDateField::createField( vcl::Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& _rxModel ) { // check if there is a DropDown property set to TRUE bool bDropDown = !hasProperty( FM_PROP_DROPDOWN, _rxModel ) @@ -2305,7 +2305,7 @@ DbTimeField::DbTimeField( DbGridColumn& _rColumn ) } -SpinField* DbTimeField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) +SpinField* DbTimeField::createField( vcl::Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) { return new TimeField( _pParent, _nFieldStyle ); } @@ -2458,7 +2458,7 @@ void DbComboBox::implAdjustGenericFieldSetting( const Reference< XPropertySet >& } -void DbComboBox::Init( Window& rParent, const Reference< XRowSet >& xCursor ) +void DbComboBox::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor ) { m_rColumn.SetAlignmentFromModel(::com::sun::star::awt::TextAlign::LEFT); @@ -2583,7 +2583,7 @@ void DbListBox::SetList(const Any& rItems) } -void DbListBox::Init( Window& rParent, const Reference< XRowSet >& xCursor) +void DbListBox::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor) { m_rColumn.SetAlignment(::com::sun::star::awt::TextAlign::LEFT); @@ -2751,7 +2751,7 @@ void DbFilterField::SetList(const Any& rItems, bool bComboBox) } -void DbFilterField::CreateControl(Window* pParent, const Reference< ::com::sun::star::beans::XPropertySet >& xModel) +void DbFilterField::CreateControl(vcl::Window* pParent, const Reference< ::com::sun::star::beans::XPropertySet >& xModel) { switch (m_nControlClass) { @@ -2808,7 +2808,7 @@ void DbFilterField::CreateControl(Window* pParent, const Reference< ::com::sun:: } -void DbFilterField::Init( Window& rParent, const Reference< XRowSet >& xCursor ) +void DbFilterField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor ) { Reference< ::com::sun::star::beans::XPropertySet > xModel(m_rColumn.getModel()); m_rColumn.SetAlignment(::com::sun::star::awt::TextAlign::LEFT); @@ -3168,13 +3168,13 @@ FmXGridCell::FmXGridCell( DbGridColumn* pColumn, DbCellControl* _pControl ) void FmXGridCell::init() { - Window* pEventWindow( getEventWindow() ); + vcl::Window* pEventWindow( getEventWindow() ); if ( pEventWindow ) pEventWindow->AddEventListener( LINK( this, FmXGridCell, OnWindowEvent ) ); } -Window* FmXGridCell::getEventWindow() const +vcl::Window* FmXGridCell::getEventWindow() const { if ( m_pCellControl ) return &m_pCellControl->GetWindow(); @@ -3425,7 +3425,7 @@ void FmXGridCell::onFocusLost( const awt::FocusEvent& _rEvent ) } -void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) { @@ -3550,7 +3550,7 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev, } sal_uInt16 nStyle = TEXT_DRAW_CLIP | TEXT_DRAW_VCENTER; - if ( ( rDev.GetOutDevType() == OUTDEV_WINDOW ) && !static_cast< Window& >( rDev ).IsEnabled() ) + if ( ( rDev.GetOutDevType() == OUTDEV_WINDOW ) && !static_cast< vcl::Window& >( rDev ).IsEnabled() ) nStyle |= TEXT_DRAW_DISABLE; switch (m_pColumn->GetAlignment()) @@ -3825,7 +3825,7 @@ void FmXEditCell::onFocusLost( const awt::FocusEvent& _rEvent ) } -void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) { @@ -3972,13 +3972,13 @@ void SAL_CALL FmXCheckBoxCell::setActionCommand( const OUString& _Command ) thro } -Window* FmXCheckBoxCell::getEventWindow() const +vcl::Window* FmXCheckBoxCell::getEventWindow() const { return m_pBox; } -void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) { @@ -4309,7 +4309,7 @@ void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeExcept } -void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { if ( ( &_rWindow == m_pBox ) && ( _nEventId == VCLEVENT_LISTBOX_SELECT ) @@ -4512,7 +4512,7 @@ void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Run } -void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 5939b8823094..7a8cbabd554c 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -275,7 +275,7 @@ void FmXGridSourcePropListener::_propertyChanged(const PropertyChangeEvent& evt) m_pParent->DataSourcePropertyChanged(evt); } -DbGridControl::NavigationBar::AbsolutePos::AbsolutePos(Window* pParent, WinBits nStyle) +DbGridControl::NavigationBar::AbsolutePos::AbsolutePos(vcl::Window* pParent, WinBits nStyle) :NumericField(pParent, nStyle) { SetMin(1); @@ -326,7 +326,7 @@ void DbGridControl::NavigationBar::PositionDataSource(sal_Int32 nRecord) m_bPositioning = false; } -DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) +DbGridControl::NavigationBar::NavigationBar(vcl::Window* pParent, WinBits nStyle) :Control(pParent, nStyle) ,m_aRecordText(this, WB_VCENTER) ,m_aAbsolute(this, WB_CENTER | WB_VCENTER) @@ -598,7 +598,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich) { bool bAvailable = GetState(nWhich); DbGridControl* pParent = (DbGridControl*)GetParent(); - Window* pWnd = NULL; + vcl::Window* pWnd = NULL; switch (nWhich) { case NavigationBar::RECORD_FIRST: @@ -709,7 +709,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); - Window* pWindows[] = { &m_aRecordText, + vcl::Window* pWindows[] = { &m_aRecordText, &m_aAbsolute, &m_aRecordOf, &m_aRecordCount, @@ -859,7 +859,7 @@ void DbGridRow::SetState(CursorWrapper* pCur, bool bPaintCursor) DbGridControl::DbGridControl( Reference< XComponentContext > _rxContext, - Window* pParent, + vcl::Window* pParent, WinBits nBits) :DbGridControl_Base(pParent, EBBF_NONE, nBits, DEFAULT_BROWSE_MODE ) ,m_xContext(_rxContext) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index bfc357101e1f..92b3552a0e21 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -124,7 +124,7 @@ namespace svxform m_xPropSet( _rxSet ) {} }; - DataTreeListBox::DataTreeListBox(Window* pParent, WinBits nBits) + DataTreeListBox::DataTreeListBox(vcl::Window* pParent, WinBits nBits) : SvTreeListBox(pParent, nBits) , m_pXFormsPage(NULL) , m_eGroup(DGTUnknown) @@ -291,12 +291,12 @@ namespace svxform // class XFormsPage - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDataTreeListBox(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDataTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new DataTreeListBox((XFormsPage*)pParent, WB_BORDER); } - XFormsPage::XFormsPage( Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ) : + XFormsPage::XFormsPage( vcl::Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ) : TabPage( pParent, "XFormsPage", "svx/ui/xformspage.ui" ), m_pNaviWin ( _pNaviWin ), @@ -1343,7 +1343,7 @@ namespace svxform } } - DataNavigatorWindow::DataNavigatorWindow(Window* pParent, SfxBindings* pBindings) + DataNavigatorWindow::DataNavigatorWindow(vcl::Window* pParent, SfxBindings* pBindings) : Window(pParent) , m_pInstPage(NULL) , m_pSubmissionPage(NULL) @@ -2045,7 +2045,7 @@ namespace svxform void DataNavigatorWindow::Resize() { - Window *pChild = GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); if (!pChild) return; VclContainer::setLayoutAllocation(*pChild, Point(0,0), GetSizePixel()); @@ -2053,7 +2053,7 @@ namespace svxform Size DataNavigatorWindow::GetOptimalSize() const { - const Window *pChild = GetWindow(WINDOW_FIRSTCHILD); + const vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); if (!pChild) return Window::GetOptimalSize(); return VclContainer::getLayoutRequisition(*pChild); @@ -2128,7 +2128,7 @@ namespace svxform } } - DataNavigator::DataNavigator( SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent ) : + DataNavigator::DataNavigator( SfxBindings* _pBindings, SfxChildWindow* _pMgr, vcl::Window* _pParent ) : SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ), @@ -2234,7 +2234,7 @@ namespace svxform DataNavigatorManager::DataNavigatorManager( - Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo ) : + vcl::Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo ) : SfxChildWindow( _pParent, _nId ) @@ -2245,7 +2245,7 @@ namespace svxform ( (SfxDockingWindow*)pWindow )->Initialize( _pInfo ); } - AddDataItemDialog::AddDataItemDialog(Window* pParent, ItemNode* _pNode, + AddDataItemDialog::AddDataItemDialog(vcl::Window* pParent, ItemNode* _pNode, const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper) : ModalDialog(pParent, "AddDataItemDialog" , "svx/ui/adddataitemdialog.ui") , m_xUIHelper(_rUIHelper) @@ -2722,7 +2722,7 @@ namespace svxform m_pItemFrame->set_label(sText); } - AddConditionDialog::AddConditionDialog(Window* pParent, + AddConditionDialog::AddConditionDialog(vcl::Window* pParent, const OUString& _rPropertyName, const Reference< XPropertySet >& _rPropSet) : ModalDialog(pParent, "AddConditionDialog", "svx/ui/addconditiondialog.ui") @@ -3017,7 +3017,7 @@ namespace svxform } } - ManageNamespaceDialog::ManageNamespaceDialog(Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit) + ManageNamespaceDialog::ManageNamespaceDialog(vcl::Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit) : ModalDialog(pParent, "AddNamespaceDialog", "svx/ui/addnamespacedialog.ui") , m_pConditionDlg ( _pCondDlg ) { @@ -3057,7 +3057,7 @@ namespace svxform } AddSubmissionDialog::AddSubmissionDialog( - Window* pParent, ItemNode* _pNode, + vcl::Window* pParent, ItemNode* _pNode, const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper) : ModalDialog(pParent, "AddSubmissionDialog", "svx/ui/addsubmissiondialog.ui") @@ -3274,7 +3274,7 @@ namespace svxform m_pRefBtn->Enable( m_xTempBinding.is() ); } - AddModelDialog::AddModelDialog(Window* pParent, bool bIsEdit) + AddModelDialog::AddModelDialog(vcl::Window* pParent, bool bIsEdit) : ModalDialog(pParent, "AddModelDialog", "svx/ui/addmodeldialog.ui") { get(m_pNameED, "name"); @@ -3284,7 +3284,7 @@ namespace svxform SetText(get<FixedText>("alttitle")->GetText()); } - AddInstanceDialog::AddInstanceDialog(Window* pParent, bool _bEdit) + AddInstanceDialog::AddInstanceDialog(vcl::Window* pParent, bool _bEdit) : ModalDialog(pParent, "AddInstanceDialog" , "svx/ui/addinstancedialog.ui") { get(m_pNameED, "name"); @@ -3322,7 +3322,7 @@ namespace svxform return 0; } - LinkedInstanceWarningBox::LinkedInstanceWarningBox( Window* pParent ) + LinkedInstanceWarningBox::LinkedInstanceWarningBox( vcl::Window* pParent ) : MessageDialog(pParent, "FormLinkWarnDialog", "svx/ui/formlinkwarndialog.ui") { } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index c3117a96c2a1..42930b756cf0 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1118,7 +1118,7 @@ void FmFilterString::Paint( rDev.DrawText( aPos, GetText() ); } -FmFilterNavigator::FmFilterNavigator( Window* pParent ) +FmFilterNavigator::FmFilterNavigator( vcl::Window* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HASBUTTONSATROOT ) ,m_pModel( NULL ) ,m_pEditingCurrently( NULL ) @@ -1859,7 +1859,7 @@ void FmFilterNavigator::DeleteSelection() } FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWindow* _pMgr, - Window* _pParent ) + vcl::Window* _pParent ) :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ) ,SfxControllerItem( SID_FM_FILTER_NAVIGATOR_CONTROL, *_pBindings ) { @@ -1991,7 +1991,7 @@ void FmFilterNavigatorWin::GetFocus() SFX_IMPL_DOCKINGWINDOW( FmFilterNavigatorWinMgr, SID_FM_FILTER_NAVIGATOR ) -FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr( Window *_pParent, sal_uInt16 _nId, +FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr( vcl::Window *_pParent, sal_uInt16 _nId, SfxBindings *_pBindings, SfxChildWinInfo* _pInfo ) :SfxChildWindow( _pParent, _nId ) { diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 6eefc8108c18..19685b5accfc 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -79,7 +79,7 @@ using ::com::sun::star::awt::XWindow; SFX_IMPL_FLOATINGWINDOW(FmPropBrwMgr, SID_FM_SHOW_PROPERTIES) -FmPropBrwMgr::FmPropBrwMgr( Window* _pParent, sal_uInt16 _nId, +FmPropBrwMgr::FmPropBrwMgr( vcl::Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo) :SfxChildWindow(_pParent, _nId) { @@ -184,7 +184,7 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) } FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* _pBindings, - SfxChildWindow* _pMgr, Window* _pParent, const SfxChildWinInfo* _pInfo ) + SfxChildWindow* _pMgr, vcl::Window* _pParent, const SfxChildWinInfo* _pInfo ) :SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE) ) ,SfxControllerItem(SID_FM_PROPERTY_CONTROL, *_pBindings) ,m_bInitialStateChange(true) @@ -207,7 +207,7 @@ FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* // responsibility for this window (as soon as we initialize a frame with a window, the frame // is responsible for its life time, but |this| is controlled by the belonging SfxChildWindow) // #i34249# - Window* pContainerWindow = new Window( this ); + vcl::Window* pContainerWindow = new vcl::Window( this ); pContainerWindow->Show(); m_xFrameContainerWindow = VCLUnoHelper::GetInterface ( pContainerWindow ); diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 40e4fe05246e..7ad362e500af 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -43,7 +43,7 @@ namespace svxform } - void OLocalExchange::copyToClipboard( Window* _pWindow, const GrantAccess& ) + void OLocalExchange::copyToClipboard( vcl::Window* _pWindow, const GrantAccess& ) { if ( m_bClipboardOwner ) { // simulate a lostOwnership to notify parties interested in @@ -85,7 +85,7 @@ namespace svxform } - void OLocalExchange::startDrag( Window* _pWindow, sal_Int8 _nDragSourceActions, const GrantAccess& ) + void OLocalExchange::startDrag( vcl::Window* _pWindow, sal_Int8 _nDragSourceActions, const GrantAccess& ) { m_bDragging = true; StartDrag( _pWindow, _nDragSourceActions ); @@ -360,7 +360,7 @@ namespace svxform return new OControlExchange; } - OLocalExchangeHelper::OLocalExchangeHelper(Window* _pDragSource) + OLocalExchangeHelper::OLocalExchangeHelper(vcl::Window* _pDragSource) :m_pDragSource(_pDragSource) ,m_pTransferable(NULL) { diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index e49e4dab2de8..7bb5193e4ab4 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -499,7 +499,7 @@ namespace svxform { NavigatorFrame::NavigatorFrame( SfxBindings* _pBindings, SfxChildWindow* _pMgr, - Window* _pParent ) + vcl::Window* _pParent ) :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ) ,SfxControllerItem( SID_FM_FMEXPLORER_CONTROL, *_pBindings ) { @@ -603,7 +603,7 @@ namespace svxform SFX_IMPL_DOCKINGWINDOW( NavigatorFrameManager, SID_FM_SHOW_FMEXPLORER ) - NavigatorFrameManager::NavigatorFrameManager( Window* _pParent, sal_uInt16 _nId, + NavigatorFrameManager::NavigatorFrameManager( vcl::Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo ) :SfxChildWindow( _pParent, _nId ) { diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 3a8e1369d2ef..fdb4176b148a 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -139,7 +139,7 @@ const Reference< css::form::XForms > & FmFormPage::GetForms( bool _bForceCreate } -bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView, +bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView* pView, const HelpEvent& rEvt ) { if( pView->IsAction() ) diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 69d232a590ae..31ce9bcac9f8 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -495,7 +495,7 @@ void FmFormShell::Execute(SfxRequest &rReq) if ( pGrabFocusItem && pGrabFocusItem->GetValue() ) { // see below SfxViewShell* pShell = GetViewShell(); - Window* pShellWnd = pShell ? pShell->GetWindow() : NULL; + vcl::Window* pShellWnd = pShell ? pShell->GetWindow() : NULL; if ( pShellWnd ) pShellWnd->GrabFocus(); break; @@ -555,7 +555,7 @@ void FmFormShell::Execute(SfxRequest &rReq) if ( bHasControlFocus ) { const OutputDevice* pDevice = GetCurrentViewDevice(); - Window* pWindow = dynamic_cast< Window* >( const_cast< OutputDevice* >( pDevice ) ); + vcl::Window* pWindow = dynamic_cast< vcl::Window* >( const_cast< OutputDevice* >( pDevice ) ); if ( pWindow ) pWindow->GrabFocus(); } @@ -1327,7 +1327,7 @@ void FmFormShell::ToggleControlFocus( const SdrUnoObj& i_rUnoObject, const SdrVi if ( bHasControlFocus ) { - Window* pWindow( dynamic_cast< Window* >( &i_rDevice ) ); + vcl::Window* pWindow( dynamic_cast< vcl::Window* >( &i_rDevice ) ); OSL_ENSURE( pWindow, "FmFormShell::ToggleControlFocus: I need a Window, really!" ); if ( pWindow ) pWindow->GrabFocus(); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 379188c3f769..c07e66a27fbb 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2886,7 +2886,7 @@ Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlMod { // fallabck (some controls might not have been created, yet, since they were never visible so far) Reference< XControl > xContainerControl( xControlContainer, UNO_QUERY_THROW ); - const Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerControl->getPeer() ); + const vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerControl->getPeer() ); ENSURE_OR_THROW( pContainerWindow, "unexpected control container implementation" ); const SdrView* pSdrView = m_pShell ? m_pShell->GetFormView() : NULL; diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index 7c743d910459..9126dd8a90d5 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -33,7 +33,7 @@ namespace svx { - TextControlCharAttribDialog::TextControlCharAttribDialog( Window* pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList ) + TextControlCharAttribDialog::TextControlCharAttribDialog( vcl::Window* pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList ) : SfxTabDialog( pParent, "TextControlCharacterPropertiesDialog", "svx/ui/textcontrolchardialog.ui", &_rCoreSet ) , m_aFontList(_rFontList) @@ -67,7 +67,7 @@ namespace svx } } - TextControlParaAttribDialog::TextControlParaAttribDialog(Window* _pParent, + TextControlParaAttribDialog::TextControlParaAttribDialog(vcl::Window* _pParent, const SfxItemSet& _rCoreSet) : SfxTabDialog( _pParent, "TextControlParagraphPropertiesDialog", "svx/ui/textcontrolparadialog.ui", &_rCoreSet ) diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index a1c5702c858b..080f5cbd07fb 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -482,9 +482,9 @@ namespace svx } - static Window* lcl_getWindow( const Reference< XControl >& _rxControl ) + static vcl::Window* lcl_getWindow( const Reference< XControl >& _rxControl ) { - Window* pWindow = NULL; + vcl::Window* pWindow = NULL; try { Reference< XWindowPeer > xControlPeer; @@ -967,7 +967,7 @@ namespace svx case SID_PASTE: { - Window* pActiveControlVCLWindow = lcl_getWindow( m_xActiveControl ); + vcl::Window* pActiveControlVCLWindow = lcl_getWindow( m_xActiveControl ); if ( pActiveControlVCLWindow ) { TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pActiveControlVCLWindow) ); diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 9e51d7295fd8..93b6f2f13646 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -122,7 +122,7 @@ namespace } -void displayException(const Any& _rExcept, Window* _pParent) +void displayException(const Any& _rExcept, vcl::Window* _pParent) { // check whether we need to display it if ( !lcl_shouldDisplayError( _rExcept ) ) @@ -131,7 +131,7 @@ void displayException(const Any& _rExcept, Window* _pParent) try { // the parent window - Window* pParentWindow = _pParent ? _pParent : Application::GetDefDialogParent(); + vcl::Window* pParentWindow = _pParent ? _pParent : Application::GetDefDialogParent(); Reference< XWindow > xParentWindow = VCLUnoHelper::GetInterface(pParentWindow); Reference< XExecutableDialog > xErrorDialog = ErrorMessageDialog::create(::comphelper::getProcessComponentContext(), "", xParentWindow, _rExcept); @@ -144,25 +144,25 @@ void displayException(const Any& _rExcept, Window* _pParent) } -void displayException(const ::com::sun::star::sdbc::SQLException& _rExcept, Window* _pParent) +void displayException(const ::com::sun::star::sdbc::SQLException& _rExcept, vcl::Window* _pParent) { displayException(makeAny(_rExcept), _pParent); } -void displayException(const ::com::sun::star::sdbc::SQLWarning& _rExcept, Window* _pParent) +void displayException(const ::com::sun::star::sdbc::SQLWarning& _rExcept, vcl::Window* _pParent) { displayException(makeAny(_rExcept), _pParent); } -void displayException(const ::com::sun::star::sdb::SQLContext& _rExcept, Window* _pParent) +void displayException(const ::com::sun::star::sdb::SQLContext& _rExcept, vcl::Window* _pParent) { displayException(makeAny(_rExcept), _pParent); } -void displayException(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent, Window* _pParent) +void displayException(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent, vcl::Window* _pParent) { displayException(_rEvent.Reason, _pParent); } diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index b5da823bbc3a..b62e8eb4ceef 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -276,8 +276,8 @@ void FmFormView::ChangeDesignMode(bool bDesign) { if ( GetActualOutDev() && GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW ) { - const Window* pWindow = static_cast< const Window* >( GetActualOutDev() ); - const_cast< Window* >( pWindow )->GrabFocus(); + const vcl::Window* pWindow = static_cast< const vcl::Window* >( GetActualOutDev() ); + const_cast< vcl::Window* >( pWindow )->GrabFocus(); } // redraw UNO objects @@ -480,7 +480,7 @@ void FmFormView::EndCompleteRedraw( SdrPaintWindow& rPaintWindow, bool bPaintFor } -bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin) +bool FmFormView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) { bool bDone = false; const vcl::KeyCode& rKeyCode = rKEvt.GetKeyCode(); @@ -541,7 +541,7 @@ bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource) } -bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ) +bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, vcl::Window* _pWin ) { bool bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin ); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index c9b1b60e7cb6..ba83abac5989 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -167,7 +167,7 @@ FormViewPageWindowAdapter::FormViewPageWindowAdapter( const css::uno::Reference< : m_xControlContainer( _rWindow.GetControlContainer() ), m_xContext( _rContext ), m_pViewImpl( _pViewImpl ), - m_pWindow( dynamic_cast< Window* >( &_rWindow.GetPaintWindow().GetOutputDevice() ) ) + m_pWindow( dynamic_cast< vcl::Window* >( &_rWindow.GetPaintWindow().GetOutputDevice() ) ) { // create an XFormController for every form @@ -684,7 +684,7 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/) // setting the controller to activate if (m_pView->GetFormShell() && m_pView->GetActualOutDev() && m_pView->GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW) { - Window* pWindow = const_cast<Window*>(static_cast<const Window*>(m_pView->GetActualOutDev())); + vcl::Window* pWindow = const_cast<vcl::Window*>(static_cast<const vcl::Window*>(m_pView->GetActualOutDev())); PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0]; for ( PageWindowAdapterList::const_iterator i = m_aPageWindowAdapters.begin(); i != m_aPageWindowAdapters.end(); @@ -851,7 +851,7 @@ static Reference< XControl > lcl_firstFocussableControl( const Sequence< Referen namespace { - void lcl_ensureControlsOfFormExist_nothrow( const SdrPage& _rPage, const SdrView& _rView, const Window& _rWindow, const Reference< XForm >& _rxForm ) + void lcl_ensureControlsOfFormExist_nothrow( const SdrPage& _rPage, const SdrView& _rView, const vcl::Window& _rWindow, const Reference< XForm >& _rxForm ) { try { @@ -926,7 +926,7 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/) Reference< XIndexAccess > xForms( pPage ? Reference< XIndexAccess >( pPage->GetForms(), UNO_QUERY ) : Reference< XIndexAccess >() ); const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0]; - const Window* pWindow = pAdapter.get() ? pAdapter->getWindow() : NULL; + const vcl::Window* pWindow = pAdapter.get() ? pAdapter->getWindow() : NULL; ENSURE_OR_RETURN( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!", 0L ); @@ -965,12 +965,12 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/) // ensure that the control is visible // 80210 - 12/07/00 - FS - const Window* pCurrentWindow = m_pView ? dynamic_cast<const Window*>(m_pView->GetActualOutDev()) : NULL; + const vcl::Window* pCurrentWindow = m_pView ? dynamic_cast<const vcl::Window*>(m_pView->GetActualOutDev()) : NULL; if ( pCurrentWindow ) { awt::Rectangle aRect = xControlWindow->getPosSize(); ::Rectangle aNonUnoRect( aRect.X, aRect.Y, aRect.X + aRect.Width, aRect.Y + aRect.Height ); - m_pView->MakeVisible( pCurrentWindow->PixelToLogic( aNonUnoRect ), *const_cast< Window* >( pCurrentWindow ) ); + m_pView->MakeVisible( pCurrentWindow->PixelToLogic( aNonUnoRect ), *const_cast< vcl::Window* >( pCurrentWindow ) ); } } catch (const Exception&) diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 0d950c53e9e7..41391c4222d3 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3525,10 +3525,10 @@ sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( Runt } -Window* FormController::getDialogParentWindow() +vcl::Window* FormController::getDialogParentWindow() { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); - Window* pParentWindow = NULL; + vcl::Window* pParentWindow = NULL; try { Reference< XControl > xContainerControl( getContainer(), UNO_QUERY_THROW ); @@ -3613,7 +3613,7 @@ Reference< XControl > FormController::locateControl( const Reference< XControlMo namespace { - void displayErrorSetFocus( const OUString& _rMessage, const Reference< XControl >& _rxFocusControl, Window* _pDialogParent ) + void displayErrorSetFocus( const OUString& _rMessage, const Reference< XControl >& _rxFocusControl, vcl::Window* _pDialogParent ) { SQLContext aError; aError.Message = SVX_RESSTR(RID_STR_WRITEERROR); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 262d00afa15d..b88efa16cabd 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -112,7 +112,7 @@ namespace svxform } } - NavigatorTree::NavigatorTree( Window* pParent ) + NavigatorTree::NavigatorTree( vcl::Window* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL ) // #100258# OJ WB_HSCROLL added ,m_aControlExchange(this) ,m_pNavModel( NULL ) @@ -2102,7 +2102,7 @@ namespace svxform OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); if ( ( OUTDEV_WINDOW == rOutDev.GetOutDevType() ) && !aMarkRect.IsEmpty() ) { - pFormView->MakeVisible( aMarkRect, (Window&)rOutDev ); + pFormView->MakeVisible( aMarkRect, (vcl::Window&)rOutDev ); } } // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i ) } @@ -2175,7 +2175,7 @@ namespace svxform OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); if ( OUTDEV_WINDOW == rOutDev.GetOutDevType() ) { - pFormView->MakeVisible( aMarkRect, (Window&)rOutDev ); + pFormView->MakeVisible( aMarkRect, (vcl::Window&)rOutDev ); } } // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i ) } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 6de6ee7ab443..8f0d11bf6124 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -175,7 +175,7 @@ FmFieldWinData::~FmFieldWinData() { } -FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent) +FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, vcl::Window* _pParent) :SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE)) ,SfxControllerItem(SID_FM_FIELDS_CONTROL, *_pBindings) ,::comphelper::OPropertyChangeListener(m_aMutex) @@ -411,7 +411,7 @@ void FmFieldWin::FillInfo( SfxChildWinInfo& rInfo ) const SFX_IMPL_FLOATINGWINDOW(FmFieldWinMgr, SID_FM_ADD_FIELD) -FmFieldWinMgr::FmFieldWinMgr(Window* _pParent, sal_uInt16 _nId, +FmFieldWinMgr::FmFieldWinMgr(vcl::Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo) :SfxChildWindow(_pParent, _nId) { diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 6e202f7e9fc0..6c7714e4083d 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; using ::com::sun::star::beans::XPropertySet; -SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pController ) +SvxFmAbsRecWin::SvxFmAbsRecWin( vcl::Window* _pParent, SfxToolBoxControl* _pController ) :NumericField( _pParent, WB_BORDER ) ,m_pController(_pController) { @@ -275,7 +275,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons } -Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent ) +vcl::Window* SvxFmTbxCtlAbsRec::CreateItemWindow( vcl::Window* pParent ) { SvxFmAbsRecWin* pWin = new SvxFmAbsRecWin( pParent, this ); pWin->SetUniqueId( UID_ABSOLUTE_RECORD_WINDOW ); @@ -295,7 +295,7 @@ SvxFmTbxCtlRecText::~SvxFmTbxCtlRecText() } -Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent ) +vcl::Window* SvxFmTbxCtlRecText::CreateItemWindow( vcl::Window* pParent ) { OUString aText(SVX_RESSTR(RID_STR_REC_TEXT)); FixedText* pFixedText = new FixedText( pParent ); @@ -321,7 +321,7 @@ SvxFmTbxCtlRecFromText::~SvxFmTbxCtlRecFromText() } -Window* SvxFmTbxCtlRecFromText::CreateItemWindow( Window* pParent ) +vcl::Window* SvxFmTbxCtlRecFromText::CreateItemWindow( vcl::Window* pParent ) { OUString aText(SVX_RESSTR(RID_STR_REC_FROM_TEXT)); FixedText* pFixedText = new FixedText( pParent, WB_CENTER ); @@ -348,7 +348,7 @@ SvxFmTbxCtlRecTotal::~SvxFmTbxCtlRecTotal() } -Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent ) +vcl::Window* SvxFmTbxCtlRecTotal::CreateItemWindow( vcl::Window* pParent ) { pFixedText = new FixedText( pParent ); OUString aSample("123456"); diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 26049284e9fd..d00bc97b7c0c 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -145,7 +145,7 @@ namespace svxform } - Dialog* OAddConditionDialog::createDialog(Window* _pParent) + Dialog* OAddConditionDialog::createDialog(vcl::Window* _pParent) { if ( !m_xBinding.is() || m_sFacetName.isEmpty() ) throw RuntimeException( OUString(), *this ); diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index bf83c0d4e3a2..1498a7952b1b 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -37,7 +37,7 @@ static const sal_Int32 gnInitialVerticalSplitPosition (150); GalleryControl::GalleryControl ( SfxBindings* /*pBindings*/, - Window* pParentWindow) + vcl::Window* pParentWindow) : Window(pParentWindow, GAL_RES(RID_SVXDLG_GALLERYBROWSER)), mpGallery (Gallery::GetGalleryInstance()), mpSplitter(new GallerySplitter( @@ -171,7 +171,7 @@ void GalleryControl::Resize (void) maLastSize = aNewSize; } -bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, Window* ) +bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, vcl::Window* ) { const sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); bool bRet = ( !rKEvt.GetKeyCode().IsMod1() && diff --git a/svx/source/gallery2/GallerySplitter.cxx b/svx/source/gallery2/GallerySplitter.cxx index d504692b662a..44b3c5e59cef 100644 --- a/svx/source/gallery2/GallerySplitter.cxx +++ b/svx/source/gallery2/GallerySplitter.cxx @@ -22,7 +22,7 @@ GallerySplitter::GallerySplitter( - Window* pParent, + vcl::Window* pParent, const ResId& rResId, const ::boost::function<void(void)>& rDataChangeFunctor) : Splitter( pParent, rResId ), diff --git a/svx/source/gallery2/GallerySplitter.hxx b/svx/source/gallery2/GallerySplitter.hxx index 9ffe4c88bef6..1097b3b64a5d 100644 --- a/svx/source/gallery2/GallerySplitter.hxx +++ b/svx/source/gallery2/GallerySplitter.hxx @@ -26,7 +26,7 @@ class GallerySplitter : public Splitter { public: GallerySplitter ( - Window* pParent, + vcl::Window* pParent, const ResId& rResId, const ::boost::function<void(void)>& rDataChangeFunctor); virtual ~GallerySplitter (void); diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 414ef427cbae..ba2aa7220803 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -114,7 +114,7 @@ bool GalleryThemeListBox::PreNotify( NotifyEvent& rNEvt ) // - GalleryBrowser1 - GalleryBrowser1::GalleryBrowser1( - Window* pParent, + vcl::Window* pParent, const ResId& rResId, Gallery* pGallery, const ::boost::function<sal_Bool(const KeyEvent&,Window*)>& rKeyInputHandler, @@ -516,7 +516,7 @@ void GalleryBrowser1::ShowContextMenu() Application::PostUserEvent( LINK( this, GalleryBrowser1, ShowContextMenuHdl ), this ); } -bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) +bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) { bool bRet = false; if (maKeyInputHandler) diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index 23fbb678f40a..94a8d3e3a371 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -122,7 +122,7 @@ private: public: GalleryBrowser1( - Window* pParent, + vcl::Window* pParent, const ResId& rResId, Gallery* pGallery, const ::boost::function<sal_Bool(const KeyEvent&,Window*)>& rKeyInputHandler, @@ -134,7 +134,7 @@ public: OUString GetSelectedTheme() { return mpThemes->GetEntryCount() ? mpThemes->GetEntry( mpThemes->GetSelectEntryPos() ) : OUString(); } void ShowContextMenu(); - bool KeyInput( const KeyEvent& rKEvt, Window* pWindow ); + bool KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ); }; #endif // INCLUDED_SVX_SOURCE_GALLERY2_GALBRWS1_HXX diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index bf2da8b6bb2a..0e305bb12479 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -130,7 +130,7 @@ public: GalleryBrowser2* pBrowser ); virtual ~GalleryThemePopup(); - void ExecutePopup( Window *pParent, const ::Point &aPos ); + void ExecutePopup( vcl::Window *pParent, const ::Point &aPos ); virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent &rEvent) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL disposing( const css::lang::EventObject &rSource) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -231,7 +231,7 @@ void GalleryThemePopup::Execute( } } -void GalleryThemePopup::ExecutePopup( Window *pWindow, const ::Point &aPos ) +void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos ) { css::uno::Reference< css::frame::XStatusListener > xThis( this ); @@ -414,7 +414,7 @@ void GalleryToolBox::KeyInput( const KeyEvent& rKEvt ) } -GalleryBrowser2::GalleryBrowser2( Window* pParent, const ResId& rResId, Gallery* pGallery ) : +GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, const ResId& rResId, Gallery* pGallery ) : Control ( pParent, rResId ), mpGallery ( pGallery ), mpCurTheme ( NULL ), @@ -610,7 +610,7 @@ sal_Int8 GalleryBrowser2::ExecuteDrop( DropTargetHelper&, const ExecuteDropEvent return nRet; } -void GalleryBrowser2::StartDrag( Window*, const Point* pDragPoint ) +void GalleryBrowser2::StartDrag( vcl::Window*, const Point* pDragPoint ) { if( mpCurTheme ) { @@ -622,13 +622,13 @@ void GalleryBrowser2::StartDrag( Window*, const Point* pDragPoint ) } } -void GalleryBrowser2::TogglePreview( Window*, const Point* ) +void GalleryBrowser2::TogglePreview( vcl::Window*, const Point* ) { SetMode( ( GALLERYBROWSERMODE_PREVIEW != GetMode() ) ? GALLERYBROWSERMODE_PREVIEW : meLastMode ); GetViewWindow()->GrabFocus(); } -void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint ) +void GalleryBrowser2::ShowContextMenu( vcl::Window*, const Point* pContextPoint ) { Point aSelPos; const sal_uIntPtr nItemId = ImplGetSelectedItemId( pContextPoint, aSelPos ); @@ -652,7 +652,7 @@ void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint ) } } -bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) +bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) { Point aSelPos; const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos ); @@ -855,9 +855,9 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) } } -Window* GalleryBrowser2::GetViewWindow() const +vcl::Window* GalleryBrowser2::GetViewWindow() const { - Window* pRet; + vcl::Window* pRet; switch( GetMode() ) { @@ -1199,13 +1199,13 @@ void GalleryBrowser2::Execute( sal_uInt16 nId ) case( MN_COPYCLIPBOARD ): { - Window* pWindow; + vcl::Window* pWindow; switch( GetMode() ) { - case( GALLERYBROWSERMODE_ICON ): pWindow = (Window*) mpIconView; break; - case( GALLERYBROWSERMODE_LIST ): pWindow = (Window*) mpListView; break; - case( GALLERYBROWSERMODE_PREVIEW ): pWindow = (Window*) mpPreview; break; + case( GALLERYBROWSERMODE_ICON ): pWindow = (vcl::Window*) mpIconView; break; + case( GALLERYBROWSERMODE_LIST ): pWindow = (vcl::Window*) mpListView; break; + case( GALLERYBROWSERMODE_PREVIEW ): pWindow = (vcl::Window*) mpPreview; break; default: pWindow = NULL; diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 31a21008f17c..af04a9d0947a 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -37,7 +37,7 @@ #define GALLERY_BRWBOX_TITLE 1 -GalleryPreview::GalleryPreview(Window* pParent, WinBits nStyle, GalleryTheme* pTheme) +GalleryPreview::GalleryPreview(vcl::Window* pParent, WinBits nStyle, GalleryTheme* pTheme) : Window(pParent, nStyle) , DropTargetHelper(this) , DragSourceHelper(this) @@ -47,7 +47,7 @@ GalleryPreview::GalleryPreview(Window* pParent, WinBits nStyle, GalleryTheme* pT InitSettings(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGalleryPreview(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGalleryPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 9ec75fe04a86..bad9fefaeb8b 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -562,7 +562,7 @@ void GalleryTransferable::DragFinished( sal_Int8 nDropAction ) mpTheme->SetDragPos( 0 ); if ( nDropAction ) { - Window *pFocusWindow = Application::GetFocusWindow(); + vcl::Window *pFocusWindow = Application::GetFocusWindow(); if ( pFocusWindow ) pFocusWindow->GrabFocusToDocument(); } @@ -576,12 +576,12 @@ void GalleryTransferable::ObjectReleased() delete mpURL, mpURL = NULL; } -void GalleryTransferable::CopyToClipboard( Window* pWindow ) +void GalleryTransferable::CopyToClipboard( vcl::Window* pWindow ) { TransferableHelper::CopyToClipboard( pWindow ); } -void GalleryTransferable::StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, +void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer, sal_Int32 nDragImage ) { INetURLObject aURL; diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 17204a0a05a6..df2630420657 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1278,13 +1278,13 @@ bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran return bRet; } -void GalleryTheme::CopyToClipboard( Window* pWindow, sal_uIntPtr nPos ) +void GalleryTheme::CopyToClipboard( vcl::Window* pWindow, sal_uIntPtr nPos ) { GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, false ); pTransferable->CopyToClipboard( pWindow ); } -void GalleryTheme::StartDrag( Window* pWindow, sal_uIntPtr nPos ) +void GalleryTheme::StartDrag( vcl::Window* pWindow, sal_uIntPtr nPos ) { GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, true ); pTransferable->StartDrag( pWindow, DND_ACTION_COPY | DND_ACTION_LINK ); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 8c79cbafc27c..c7a75a9f4598 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -126,7 +126,7 @@ namespace svxform using SvTreeListBox::ExecuteDrop; public: - DataTreeListBox( Window* pParent, WinBits nBits ); + DataTreeListBox( vcl::Window* pParent, WinBits nBits ); virtual ~DataTreeListBox(); virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; @@ -286,7 +286,7 @@ namespace svxform virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - XFormsPage( Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ); + XFormsPage( vcl::Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ); virtual ~XFormsPage(); virtual void Resize() SAL_OVERRIDE; @@ -321,7 +321,7 @@ namespace svxform typedef std::vector< XFormsPage* > PageList; typedef ::rtl::Reference < DataListener > DataListener_ref; - class DataNavigatorWindow : public Window, public VclBuilderContainer + class DataNavigatorWindow : public vcl::Window, public VclBuilderContainer { private: ListBox* m_pModelsBox; @@ -369,7 +369,7 @@ namespace svxform virtual Size GetOptimalSize() const SAL_OVERRIDE; public: - DataNavigatorWindow( Window* pParent, SfxBindings* pBindings ); + DataNavigatorWindow( vcl::Window* pParent, SfxBindings* pBindings ); virtual ~DataNavigatorWindow(); void SetDocModified(); @@ -397,7 +397,7 @@ namespace svxform virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ) SAL_OVERRIDE; public: - DataNavigator( SfxBindings* pBindings, SfxChildWindow* pMgr, Window* pParent ); + DataNavigator( SfxBindings* pBindings, SfxChildWindow* pMgr, vcl::Window* pParent ); virtual ~DataNavigator(); using Window::Update; @@ -412,7 +412,7 @@ namespace svxform class SVX_DLLPUBLIC DataNavigatorManager : public SfxChildWindow { public: - SVX_DLLPRIVATE DataNavigatorManager( Window* pParent, sal_uInt16 nId, + SVX_DLLPRIVATE DataNavigatorManager( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW( DataNavigatorManager ); }; @@ -468,7 +468,7 @@ namespace svxform public: AddDataItemDialog( - Window* pParent, ItemNode* _pNode, const XFormsUIHelper1_ref& _rUIHelper ); + vcl::Window* pParent, ItemNode* _pNode, const XFormsUIHelper1_ref& _rUIHelper ); virtual ~AddDataItemDialog(); void InitText( DataItemType _eType ); @@ -495,7 +495,7 @@ namespace svxform DECL_LINK(OKHdl, void *); public: - AddConditionDialog(Window* pParent, + AddConditionDialog(vcl::Window* pParent, const OUString& _rPropertyName, const XPropertySet_ref& _rBinding); XFormsUIHelper1_ref GetUIHelper() const { return m_xUIHelper; } @@ -548,7 +548,7 @@ namespace svxform DECL_LINK(OKHdl, void *); public: - ManageNamespaceDialog(Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit); + ManageNamespaceDialog(vcl::Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit); void SetNamespace(const OUString& _rPrefix, const OUString& _rURL) { @@ -590,7 +590,7 @@ namespace svxform void FillAllBoxes(); public: - AddSubmissionDialog( Window* pParent, ItemNode* _pNode, + AddSubmissionDialog( vcl::Window* pParent, ItemNode* _pNode, const XFormsUIHelper1_ref& _rUIHelper ); virtual ~AddSubmissionDialog(); @@ -605,7 +605,7 @@ namespace svxform CheckBox* m_pModifyCB; public: - AddModelDialog( Window* pParent, bool _bEdit ); + AddModelDialog( vcl::Window* pParent, bool _bEdit ); OUString GetName() const { return m_pNameED->GetText(); } void SetName( const OUString& _rName ) { m_pNameED->SetText( _rName );} @@ -629,7 +629,7 @@ namespace svxform DECL_LINK(FilePickerHdl, void *); public: - AddInstanceDialog( Window* pParent, bool _bEdit ); + AddInstanceDialog( vcl::Window* pParent, bool _bEdit ); void SetRenameMode() { @@ -650,7 +650,7 @@ namespace svxform class LinkedInstanceWarningBox : public MessageDialog { public: - LinkedInstanceWarningBox( Window* pParent ); + LinkedInstanceWarningBox( vcl::Window* pParent ); }; diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 7c0a7c5e859a..bd5dbac2b6e9 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -299,12 +299,12 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener }; -class PluginProgressWindow : public Window +class PluginProgressWindow : public vcl::Window { private: css::uno::Reference< css::lang::XComponent > m_xProgress; public: - PluginProgressWindow( Window* pParent , + PluginProgressWindow( vcl::Window* pParent , const css::uno::Reference< css::lang::XComponent >& xProgress); virtual ~PluginProgressWindow(); }; @@ -325,7 +325,7 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat // native interface public: /** @short TODO */ - PluginProgress( Window* pParent, + PluginProgress( vcl::Window* pParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ); @@ -392,7 +392,7 @@ class SaveDialog : public Dialog and the current list of open documents, which should be shown inside this dialog. */ - SaveDialog(Window* pParent, RecoveryCore* pCore); + SaveDialog(vcl::Window* pParent, RecoveryCore* pCore); DECL_LINK(OKButtonHdl, void*); }; @@ -403,7 +403,7 @@ class SaveProgressDialog : public ModalDialog // member private: OUString m_aProgrBaseTxt; - Window* m_pProgrParent; + vcl::Window* m_pProgrParent; // @short TODO RecoveryCore* m_pCore; @@ -425,7 +425,7 @@ class SaveProgressDialog : public ModalDialog @param pCore used to start emegrency save. */ - SaveProgressDialog(Window* pParent, + SaveProgressDialog(vcl::Window* pParent, RecoveryCore* pCore ); /** @short start the emergency save operation. */ @@ -500,7 +500,7 @@ class RecoveryDialog : public Dialog private: FixedText* m_pTitleFT; FixedText* m_pDescrFT; - Window* m_pProgrParent; + vcl::Window* m_pProgrParent; RecovDocList* m_pFileListLB; PushButton* m_pNextBtn; CancelButton* m_pCancelBtn; @@ -528,7 +528,7 @@ class RecoveryDialog : public Dialog // member public: /** @short TODO */ - RecoveryDialog(Window* pParent, + RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore ); virtual ~RecoveryDialog(); @@ -575,7 +575,7 @@ class BrokenRecoveryDialog : public ModalDialog /** @short TODO */ - BrokenRecoveryDialog(Window* pParent , + BrokenRecoveryDialog(vcl::Window* pParent , RecoveryCore* pCore , bool bBeforeRecovery); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 96d9e209f2a7..13dde0681aaa 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -228,7 +228,7 @@ inline bool OFilterItemExchange::hasFormat( const DataFlavorExVector& _rFormats class OFilterExchangeHelper : public OLocalExchangeHelper { public: - OFilterExchangeHelper(Window* _pDragSource) : OLocalExchangeHelper(_pDragSource) { } + OFilterExchangeHelper(vcl::Window* _pDragSource) : OLocalExchangeHelper(_pDragSource) { } OFilterItemExchange* operator->() const { return static_cast<OFilterItemExchange*>(m_pTransferable); } @@ -252,7 +252,7 @@ class FmFilterNavigator : public SvTreeListBox, public SfxListener DROP_ACTION m_aDropActionType; public: - FmFilterNavigator( Window* pParent ); + FmFilterNavigator( vcl::Window* pParent ); virtual ~FmFilterNavigator(); void UpdateContent( @@ -325,7 +325,7 @@ protected: public: FmFilterNavigatorWin( SfxBindings *pBindings, SfxChildWindow *pMgr, - Window* pParent ); + vcl::Window* pParent ); virtual ~FmFilterNavigatorWin(); void UpdateContent( FmFormShell* pFormShell ); @@ -341,7 +341,7 @@ public: class FmFilterNavigatorWinMgr : public SfxChildWindow { public: - FmFilterNavigatorWinMgr( Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, + FmFilterNavigatorWinMgr( vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo ); SFX_DECL_CHILDWINDOW( FmFilterNavigatorWinMgr ); }; diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index bdd5cad691ce..a092468415e0 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -33,7 +33,7 @@ class FmPropBrwMgr : public SfxChildWindow { public: - FmPropBrwMgr(Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); + FmPropBrwMgr(vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); SFX_DECL_CHILDWINDOW(FmPropBrwMgr); }; @@ -79,7 +79,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xORB, SfxBindings* pBindings, SfxChildWindow* pMgr, - Window* pParent, + vcl::Window* pParent, const SfxChildWinInfo* _pInfo ); virtual ~FmPropBrw(); diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 6ad001dd84de..ea6d34a5b3c7 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -67,8 +67,8 @@ namespace svxform bool isDragging() const { return m_bDragging; } bool isClipboardOwner() const { return m_bClipboardOwner; } - void startDrag( Window* pWindow, sal_Int8 nDragSourceActions, const GrantAccess& ); - void copyToClipboard( Window* _pWindow, const GrantAccess& ); + void startDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, const GrantAccess& ); + void copyToClipboard( vcl::Window* _pWindow, const GrantAccess& ); void setClipboardListener( const Link& _rListener ) { m_aClipboardListener = _rListener; } @@ -85,7 +85,7 @@ namespace svxform virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; private: - void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ) + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ) { // don't allow this base class method to be called from outside TransferableHelper::StartDrag(pWindow, nDragSourceActions, nDragPointer, nDragImage); } @@ -98,11 +98,11 @@ namespace svxform class SVX_DLLPUBLIC OLocalExchangeHelper { protected: - Window* m_pDragSource; + vcl::Window* m_pDragSource; OLocalExchange* m_pTransferable; public: - OLocalExchangeHelper( Window* _pDragSource ); + OLocalExchangeHelper( vcl::Window* _pDragSource ); virtual ~OLocalExchangeHelper(); void prepareDrag( ); @@ -226,7 +226,7 @@ namespace svxform class OControlExchangeHelper : public OLocalExchangeHelper { public: - OControlExchangeHelper(Window* _pDragSource) : OLocalExchangeHelper(_pDragSource) { } + OControlExchangeHelper(vcl::Window* _pDragSource) : OLocalExchangeHelper(_pDragSource) { } OControlExchange* operator->() const { return static_cast< OControlExchange* >( m_pTransferable ); } OControlExchange& operator*() const { return *static_cast< OControlExchange* >( m_pTransferable ); } diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index edec6ffffa10..4c527052d62c 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -499,7 +499,7 @@ namespace svxform virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; public: - NavigatorTree(Window* pParent ); + NavigatorTree(vcl::Window* pParent ); virtual ~NavigatorTree(); void Clear(); @@ -568,7 +568,7 @@ namespace svxform public: NavigatorFrame( SfxBindings *pBindings, SfxChildWindow *pMgr, - Window* pParent ); + vcl::Window* pParent ); virtual ~NavigatorFrame(); void UpdateContent( FmFormShell* pFormShell ); @@ -580,7 +580,7 @@ namespace svxform class SVX_DLLPUBLIC NavigatorFrameManager : public SfxChildWindow { public: - SVX_DLLPRIVATE NavigatorFrameManager( Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, + SVX_DLLPRIVATE NavigatorFrameManager( vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo ); SFX_DECL_CHILDWINDOW( NavigatorFrameManager ); }; diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx index d13860193a80..f8012557d624 100644 --- a/svx/source/inc/fmtextcontroldialogs.hxx +++ b/svx/source/inc/fmtextcontroldialogs.hxx @@ -37,7 +37,7 @@ namespace svx sal_uInt16 m_nCharPositionPageId; public: - TextControlCharAttribDialog( Window* pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList ); + TextControlCharAttribDialog( vcl::Window* pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList ); protected: virtual void PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage ) SAL_OVERRIDE; @@ -46,7 +46,7 @@ namespace svx class TextControlParaAttribDialog : public SfxTabDialog { public: - TextControlParaAttribDialog(Window* _pParent, const SfxItemSet& _rCoreSet); + TextControlParaAttribDialog(vcl::Window* _pParent, const SfxItemSet& _rCoreSet); }; } // namespace svx diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 2d54fe8a69b1..ee224cdd232e 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -53,7 +53,7 @@ class FmFormObj; class FmFormModel; class FmFormView; class FmFormShell; -class Window; +namespace vcl { class Window; } class OutputDevice; class SdrUnoObj; struct ImplSVEvent; @@ -93,7 +93,7 @@ class FormViewPageWindowAdapter : public FormViewPageWindowAdapter_Base ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xControlContainer; css::uno::Reference<css::uno::XComponentContext> m_xContext; FmXFormView* m_pViewImpl; - Window* m_pWindow; + vcl::Window* m_pWindow; protected: virtual ~FormViewPageWindowAdapter(); @@ -127,7 +127,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getControlContainer() const { return m_xControlContainer; } void updateTabOrder( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm ); void dispose(); - Window* getWindow() const {return m_pWindow;} + vcl::Window* getWindow() const {return m_pWindow;} }; typedef ::rtl::Reference< FormViewPageWindowAdapter > PFormViewPageWindowAdapter; diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 3b1a23aaea3b..8d794458b869 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -94,7 +94,7 @@ typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTe typedef ::std::vector< FmFilterRow > FmFilterRows; typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > > FmFormControllers; -class Window; +namespace vcl { class Window; } namespace svxform { @@ -522,7 +522,7 @@ namespace svxform bool isLocked() const {return m_bLocked;} bool determineLockState() const; - Window* getDialogParentWindow(); + vcl::Window* getDialogParentWindow(); // returns the window which should be used as parent window for dialogs ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor> createInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>& _xInterception); diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 2fc71c15ad46..2746fa602858 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -171,7 +171,7 @@ public: void SetReadOnly(bool bRead){m_bReadOnly = bRead;} void SetObject(sal_Int16 nPos) {m_bObject = m_bReadOnly = true; m_nFieldPos = nPos;} - void ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat ); + void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ); // Properties, die auf den ::com::sun::star::frame::Controller durchschlagen koennen sal_Int16 SetAlignment(sal_Int16 _nAlign); @@ -217,8 +217,8 @@ private: protected: DbGridColumn& m_rColumn; - Window* m_pPainter; - Window* m_pWindow; + vcl::Window* m_pPainter; + vcl::Window* m_pWindow; protected: // attribute access @@ -270,7 +270,7 @@ public: virtual ~DbCellControl(); - Window& GetWindow() const + vcl::Window& GetWindow() const { ENSURE_OR_THROW( m_pWindow, "no window" ); return *m_pWindow; @@ -284,7 +284,7 @@ public: void SetTextLineColor(const Color& _rColor); // Initialisieren bevor ein Control angezeigt wird - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); virtual ::svt::CellControllerRef CreateController() const = 0; // Schreiben des Wertes in das Model @@ -301,7 +301,7 @@ public: virtual void PaintFieldToCell( OutputDevice& rDev, const Rectangle& rRect, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); virtual void PaintCell( OutputDevice& _rDev, const Rectangle& _rRect ); - void ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat ); + void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ); double GetValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const; @@ -402,7 +402,7 @@ public: ::svt::IEditImplementation* GetEditImplementation() { return m_pEdit; } bool IsSimpleEdit() const { return m_bIsSimpleEdit; } - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) SAL_OVERRIDE; virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; @@ -432,7 +432,7 @@ public: virtual ~DbFormattedField(); - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) SAL_OVERRIDE; virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; @@ -453,7 +453,7 @@ public: TYPEINFO_OVERRIDE(); DbCheckBox(DbGridColumn& _rColumn); - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; virtual void PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, @@ -476,7 +476,7 @@ public: TYPEINFO_OVERRIDE(); DbComboBox(DbGridColumn& _rColumn); - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) SAL_OVERRIDE; virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; @@ -504,7 +504,7 @@ public: TYPEINFO_OVERRIDE(); DbListBox(DbGridColumn& _rColumn); - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) SAL_OVERRIDE; virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; @@ -528,7 +528,7 @@ class DbPatternField : public DbCellControl public: TYPEINFO_OVERRIDE(); DbPatternField( DbGridColumn& _rColumn, const css::uno::Reference<css::uno::XComponentContext>& _rContext ); - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) SAL_OVERRIDE; virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; @@ -564,12 +564,12 @@ protected: DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign = com::sun::star::awt::TextAlign::RIGHT ); public: - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxCursor ) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; protected: virtual SpinField* createField( - Window* _pParent, + vcl::Window* _pParent, WinBits _nFieldStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) = 0; @@ -591,7 +591,7 @@ protected: // DbSpinField virtual SpinField* createField( - Window* _pParent, + vcl::Window* _pParent, WinBits _nFieldStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE; @@ -616,7 +616,7 @@ protected: // DbSpinField virtual SpinField* createField( - Window* _pParent, + vcl::Window* _pParent, WinBits _nFieldStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE; @@ -645,7 +645,7 @@ protected: // DbSpinField virtual SpinField* createField( - Window* _pParent, + vcl::Window* _pParent, WinBits _nFieldStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE; @@ -670,7 +670,7 @@ protected: // DbSpinField virtual SpinField* createField( - Window* _pParent, + vcl::Window* _pParent, WinBits _nFieldStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE; @@ -697,7 +697,7 @@ public: DbFilterField(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, DbGridColumn& _rColumn); virtual ~DbFilterField(); - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect) SAL_OVERRIDE; virtual void Update() SAL_OVERRIDE; @@ -718,7 +718,7 @@ protected: protected: void SetList(const ::com::sun::star::uno::Any& rItems, bool bComboBox); - void CreateControl(Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xModel); + void CreateControl(vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xModel); DECL_LINK( OnClick, void* ); }; @@ -809,7 +809,7 @@ public: virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; bool Commit() {return m_pCellControl->Commit();} - void ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat ) + void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ) { m_pCellControl->ImplInitWindow( rParent, _eInitWhat ); } bool isAlignedController() const { return m_pCellControl->isAlignedController(); } @@ -817,8 +817,8 @@ public: { m_pCellControl->AlignControl(nAlignment);} protected: - virtual Window* getEventWindow() const; - virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); + virtual vcl::Window* getEventWindow() const; + virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ); // default implementations call our focus listeners, don't forget to call them if you override this virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ); @@ -934,7 +934,7 @@ public: virtual void SAL_CALL removeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; + virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ) SAL_OVERRIDE; virtual void onFocusLost( const ::com::sun::star::awt::FocusEvent& _rEvent ) SAL_OVERRIDE; @@ -985,8 +985,8 @@ public: virtual void SAL_CALL setActionCommand( const OUString& Command ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual Window* getEventWindow() const SAL_OVERRIDE; - virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; + virtual vcl::Window* getEventWindow() const SAL_OVERRIDE; + virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; }; @@ -1038,7 +1038,7 @@ public: virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; + virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; DECL_LINK( OnDoubleClick, void* ); }; @@ -1083,7 +1083,7 @@ public: virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 _Lines ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; + virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; }; diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx index 6ddbbc56fb4e..4824352dc16b 100644 --- a/svx/source/inc/recoveryui.hxx +++ b/svx/source/inc/recoveryui.hxx @@ -58,7 +58,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo css::uno::Reference< css::uno::XComponentContext > m_xContext; /** @short TODO */ - Window* m_pParentWindow; + vcl::Window* m_pParentWindow; /** @short TODO */ RecoveryUI::EJob m_eJob; diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index b8d76d1b7930..0ade59b50584 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -57,7 +57,7 @@ namespace com { namespace sun { namespace star { namespace awt { class Rectangle; class SvxRectCtl; class SvxRectCtlChildAccessibleContext; -class Window; +namespace vcl { class Window; } typedef ::cppu::WeakAggComponentImplHelper6< @@ -324,7 +324,7 @@ class SvxRectCtlChildAccessibleContext : public SvxRectCtlChildAccessibleContext public: SvxRectCtlChildAccessibleContext( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - const Window& rParentWindow, + const vcl::Window& rParentWindow, const OUString& rName, const OUString& rDescription, const Rectangle& rBoundingBox, long nIndexInParent ); @@ -504,7 +504,7 @@ private: Rectangle* mpBoundingBox; /// window of parent - const Window& mrParentWindow; + const vcl::Window& mrParentWindow; /// client id in the AccessibleEventNotifier queue sal_uInt32 mnClientId; diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 3e49fee12807..368da9823251 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -85,7 +85,7 @@ class FmFieldWin :public SfxFloatingWindow public: FmFieldWin(SfxBindings *pBindings, - SfxChildWindow *pMgr, Window* pParent); + SfxChildWindow *pMgr, vcl::Window* pParent); virtual ~FmFieldWin(); virtual void Resize() SAL_OVERRIDE; @@ -123,7 +123,7 @@ protected: class FmFieldWinMgr : public SfxChildWindow { public: - FmFieldWinMgr(Window *pParent, sal_uInt16 nId, + FmFieldWinMgr(vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); SFX_DECL_CHILDWINDOW(FmFieldWinMgr); }; diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index adb279fa5c9a..e1d79e5a7559 100644 --- a/svx/source/inc/tbxform.hxx +++ b/svx/source/inc/tbxform.hxx @@ -31,7 +31,7 @@ class SvxFmAbsRecWin : public NumericField SfxToolBoxControl* m_pController; // for invalidating our content whe losing the focus public: - SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pController ); + SvxFmAbsRecWin( vcl::Window* _pParent, SfxToolBoxControl* _pController ); virtual ~SvxFmAbsRecWin(); virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; @@ -72,7 +72,7 @@ public: SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxFmTbxCtlAbsRec(); - virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -87,7 +87,7 @@ public: SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxFmTbxCtlRecText(); - virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; }; @@ -99,7 +99,7 @@ public: SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxFmTbxCtlRecFromText(); - virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; }; @@ -113,7 +113,7 @@ public: SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxFmTbxCtlRecTotal(); - virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; }; diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index e5b59df68e29..61e86bb54ef7 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -66,7 +66,7 @@ namespace svxform protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE; }; diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx index 57ae8d38b8fb..3313eedf53a2 100644 --- a/svx/source/sdr/contact/sdrmediawindow.cxx +++ b/svx/source/sdr/contact/sdrmediawindow.cxx @@ -30,7 +30,7 @@ namespace sdr { namespace contact { // - SdrMediaWindow - -SdrMediaWindow::SdrMediaWindow( Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ) : +SdrMediaWindow::SdrMediaWindow( vcl::Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ) : ::avmedia::MediaWindow( pParent, false ), mrViewObjectContactOfSdrMediaObj( rViewObjContact ) { @@ -46,7 +46,7 @@ SdrMediaWindow::~SdrMediaWindow() void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow && getWindow() ) { @@ -62,7 +62,7 @@ void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt ) void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow && getWindow() ) { @@ -77,7 +77,7 @@ void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt ) void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow && getWindow() ) { @@ -92,7 +92,7 @@ void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt ) void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow ) pWindow->KeyInput( rKEvt ); @@ -102,7 +102,7 @@ void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt ) void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow ) pWindow->KeyUp( rKEvt ); @@ -112,7 +112,7 @@ void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt ) void SdrMediaWindow::Command( const CommandEvent& rCEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow && getWindow() ) { @@ -127,7 +127,7 @@ void SdrMediaWindow::Command( const CommandEvent& rCEvt ) sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); sal_Int8 nRet = DND_ACTION_NONE; if( pWindow ) @@ -147,7 +147,7 @@ sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt ) sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); sal_Int8 nRet = DND_ACTION_NONE; if( pWindow ) @@ -167,7 +167,7 @@ sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) void SdrMediaWindow::StartDrag( sal_Int8 nAction, const Point& rPosPixel ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow ) { diff --git a/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx index 6416bad6cb8c..3bf306413884 100644 --- a/svx/source/sdr/contact/sdrmediawindow.hxx +++ b/svx/source/sdr/contact/sdrmediawindow.hxx @@ -34,7 +34,7 @@ class SdrMediaWindow : public ::avmedia::MediaWindow { public: - SdrMediaWindow( Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ); + SdrMediaWindow( vcl::Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ); virtual ~SdrMediaWindow(); virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index 537a34a76478..4f68e3bd29d8 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -83,7 +83,7 @@ namespace sdr { namespace contact { Reference< XControl > ViewContactOfUnoControl::getTemporaryControlForWindow( - const Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer ) const + const vcl::Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer ) const { SdrUnoObj* pUnoObject = dynamic_cast< SdrUnoObj* >( TryToGetSdrObject() ); OSL_ENSURE( pUnoObject, "ViewContactOfUnoControl::getTemporaryControlForDevice: no SdrUnoObj!" ); diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx index ff71c14bde19..68d7ba130b2f 100644 --- a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx @@ -34,16 +34,16 @@ ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj() { } -Window* ViewObjectContactOfOpenGLObj::getWindow() const +vcl::Window* ViewObjectContactOfOpenGLObj::getWindow() const { - Window* pRetval = 0; + vcl::Window* pRetval = 0; boost::optional<const OutputDevice&> oPageOutputDev = getPageViewOutputDevice(); if( oPageOutputDev ) { if(OUTDEV_WINDOW == oPageOutputDev->GetOutDevType()) { - pRetval = static_cast< Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get())); + pRetval = static_cast< vcl::Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get())); } } diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index 79873095ca46..961821e5b595 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -39,7 +39,7 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r mpMediaWindow( NULL ) { #if HAVE_FEATURE_AVMEDIA - Window* pWindow = getWindow(); + vcl::Window* pWindow = getWindow(); if( pWindow ) { @@ -60,16 +60,16 @@ ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj() -Window* ViewObjectContactOfSdrMediaObj::getWindow() const +vcl::Window* ViewObjectContactOfSdrMediaObj::getWindow() const { - Window* pRetval = 0; + vcl::Window* pRetval = 0; boost::optional<const OutputDevice&> oPageOutputDev = getPageViewOutputDevice(); if( oPageOutputDev ) { if(OUTDEV_WINDOW == oPageOutputDev->GetOutDevType()) { - pRetval = static_cast< Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get())); + pRetval = static_cast< vcl::Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get())); } } diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index bc22a54aefd2..096da89be126 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -260,7 +260,7 @@ namespace sdr { namespace contact { Reference< XWindowPeer > xPeer( m_xControl->getPeer() ); if ( xPeer.is() ) { - Window* pWindow = VCLUnoHelper::GetWindow( xPeer ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xPeer ); OSL_ENSURE( pWindow, "ControlHolder::invalidate: no implementation access!" ); if ( pWindow ) pWindow->Invalidate(); @@ -273,7 +273,7 @@ namespace sdr { namespace contact { // no check whether we're valid, this is the responsibility of the caller // Argh. Why does XView have a setZoom only, but not a getZoom? - Window* pWindow = VCLUnoHelper::GetWindow( m_xControl->getPeer() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( m_xControl->getPeer() ); OSL_ENSURE( pWindow, "ControlHolder::getZoom: no implementation access!" ); ::basegfx::B2DVector aZoom( 1, 1 ); @@ -434,10 +434,10 @@ namespace sdr { namespace contact { { if ( !m_rControlContainer.is() ) { - const Window* pWindow = dynamic_cast< const Window* >( &_rDevice ); + const vcl::Window* pWindow = dynamic_cast< const vcl::Window* >( &_rDevice ); OSL_ENSURE( pWindow, "InvisibleControlViewAccess::getControlContainer: expected to be called for a window only!" ); if ( pWindow ) - m_rControlContainer = VCLUnoHelper::CreateControlContainer( const_cast< Window* >( pWindow ) ); + m_rControlContainer = VCLUnoHelper::CreateControlContainer( const_cast< vcl::Window* >( pWindow ) ); } return m_rControlContainer; } @@ -1067,7 +1067,7 @@ namespace sdr { namespace contact { m_xContainer.set(_rPageView.getControlContainer( _rDevice ), css::uno::UNO_QUERY); DBG_ASSERT( ( m_xContainer.is() // either have a XControlContainer || ( ( !_rPageView.getControlContainer( _rDevice ).is() ) // or don't have any container, - && ( dynamic_cast< const Window* >( &_rDevice ) == NULL ) // which is allowed for non-Window instances only + && ( dynamic_cast< const vcl::Window* >( &_rDevice ) == NULL ) // which is allowed for non-Window instances only ) ), "ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow: no XContainer at the ControlContainer!" ); @@ -1628,7 +1628,7 @@ namespace sdr { namespace contact { Reference< XControl > ViewObjectContactOfUnoControl::getTemporaryControlForWindow( - const Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer, const SdrUnoObj& _rUnoObject ) + const vcl::Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer, const SdrUnoObj& _rUnoObject ) { ControlHolder aControl; diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index f843d5ae3a7d..80758a01578c 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -315,7 +315,7 @@ namespace sdr (sal_Int32)ceil(rRange.getMaxY() + fDiscreteOne)); // simply invalidate - ((Window&)getOutputDevice()).Invalidate(aInvalidateRectangle, INVALIDATE_NOERASE); + ((vcl::Window&)getOutputDevice()).Invalidate(aInvalidateRectangle, INVALIDATE_NOERASE); } else { @@ -326,7 +326,7 @@ namespace sdr (sal_Int32)ceil(rRange.getMaxX()), (sal_Int32)ceil(rRange.getMaxY())); // simply invalidate - ((Window&)getOutputDevice()).Invalidate(aInvalidateRectangle, INVALIDATE_NOERASE); + ((vcl::Window&)getOutputDevice()).Invalidate(aInvalidateRectangle, INVALIDATE_NOERASE); } } } diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index c510207a8a63..7cc57642da12 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -193,7 +193,7 @@ namespace sdr // but always the exact redraw area if(OUTDEV_WINDOW == rSource.GetOutDevType()) { - Window& rWindow = (Window&)rSource; + vcl::Window& rWindow = (vcl::Window&)rSource; Region aPaintRegionPixel = rWindow.LogicToPixel(rWindow.GetPaintRegion()); aRegion.Intersect(aPaintRegionPixel); @@ -274,7 +274,7 @@ namespace sdr // #i80730# switch off VCL cursor during overlay refresh if(bTargetIsWindow) { - Window& rWindow = static_cast< Window& >(rmOutputDevice); + vcl::Window& rWindow = static_cast< vcl::Window& >(rmOutputDevice); vcl::Cursor* pCursor = rWindow.GetCursor(); if(pCursor && pCursor->IsVisible()) @@ -391,7 +391,7 @@ namespace sdr // To get the update, the windows in question are updated manulally here. if(bTargetIsWindow) { - Window& rWindow = static_cast< Window& >(rmOutputDevice); + vcl::Window& rWindow = static_cast< vcl::Window& >(rmOutputDevice); const Rectangle aRegionRectanglePixel( maBufferRememberedRangePixel.getMinX(), @@ -404,7 +404,7 @@ namespace sdr // #i80730# restore visibility of VCL cursor if(bCursorWasEnabled) { - Window& rWindow = static_cast< Window& >(rmOutputDevice); + vcl::Window& rWindow = static_cast< vcl::Window& >(rmOutputDevice); vcl::Cursor* pCursor = rWindow.GetCursor(); if(pCursor) diff --git a/svx/source/sidebar/ColorPanel.cxx b/svx/source/sidebar/ColorPanel.cxx index ee55024d4455..d6c81113e2ba 100644 --- a/svx/source/sidebar/ColorPanel.cxx +++ b/svx/source/sidebar/ColorPanel.cxx @@ -25,7 +25,7 @@ namespace svx { namespace sidebar { -ColorPanel::ColorPanel (::Window* pParent) +ColorPanel::ColorPanel (vcl::Window* pParent) : ValueSet(pParent), mnPreferredColumnCount(2) { @@ -53,7 +53,7 @@ ColorPanel::~ColorPanel (void) void ColorPanel::Resize (void) { - ::Window::Resize(); + vcl::Window::Resize(); Size aWindowSize = GetOutputSizePixel(); SetPosSizePixel(Point(0,0), aWindowSize); if (IsVisible() && aWindowSize.Width() > 0) diff --git a/svx/source/sidebar/ColorPanel.hxx b/svx/source/sidebar/ColorPanel.hxx index 8a26d821f1e4..d4dc6980c71f 100644 --- a/svx/source/sidebar/ColorPanel.hxx +++ b/svx/source/sidebar/ColorPanel.hxx @@ -33,10 +33,10 @@ class ColorPanel : public ValueSet { public: - ColorPanel (::Window* pParent); + ColorPanel (vcl::Window* pParent); virtual ~ColorPanel (void); - // From ::Window + // From vcl::Window virtual void Resize (void); virtual void DataChanged (const DataChangedEvent& rEvent); diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx index d730350a75c7..2d28f8a99ba2 100644 --- a/svx/source/sidebar/EmptyPanel.cxx +++ b/svx/source/sidebar/EmptyPanel.cxx @@ -26,7 +26,7 @@ namespace svx { namespace sidebar { -EmptyPanel::EmptyPanel (::Window* pParent) +EmptyPanel::EmptyPanel (vcl::Window* pParent) : Control(pParent, SVX_RES(RID_SIDEBAR_EMPTY_PANEL)), maMessageControl(this, SVX_RES(FT_MESSAGE)) { diff --git a/svx/source/sidebar/EmptyPanel.hxx b/svx/source/sidebar/EmptyPanel.hxx index 2fa9a65aa7ec..de166cf80953 100644 --- a/svx/source/sidebar/EmptyPanel.hxx +++ b/svx/source/sidebar/EmptyPanel.hxx @@ -34,7 +34,7 @@ class EmptyPanel : public Control { public: - EmptyPanel (::Window* pParent); + EmptyPanel (vcl::Window* pParent); virtual ~EmptyPanel (void); virtual void Resize (void) SAL_OVERRIDE; diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index cf45ff59f777..e6f265a1de46 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -112,7 +112,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( aArguments.getOrDefault("ApplicationName", OUString()), aArguments.getOrDefault("ContextName", OUString())); - ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if ( ! xParentWindow.is() || pParentWindow==NULL) throw RuntimeException( "PanelFactory::createUIElement called without ParentWindow", @@ -126,7 +126,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( "PanelFactory::createUIElement called without SfxBindings", NULL); - Window* pControl = NULL; + vcl::Window* pControl = NULL; ui::LayoutSize aLayoutSize (-1,-1,-1); #define DoesResourceEndWith(s) rsResourceURL.endsWithAsciiL(s,strlen(s)) diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx index 04a62186f912..08256d180236 100644 --- a/svx/source/sidebar/PanelLayout.cxx +++ b/svx/source/sidebar/PanelLayout.cxx @@ -14,7 +14,7 @@ #include <svx/sidebar/PanelLayout.hxx> #include <vcl/layout.hxx> -PanelLayout::PanelLayout(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> &rFrame) +PanelLayout::PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> &rFrame) : Control(pParent) , m_bInClose(false) { @@ -56,7 +56,7 @@ void PanelLayout::queue_resize(StateChangedType /*eReason*/) IMPL_LINK( PanelLayout, ImplHandlePanelLayoutTimerHdl, void*, EMPTYARG ) { - Window *pChild = GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); assert(pChild); VclContainer::setLayoutAllocation(*pChild, Point(0, 0), GetSizePixel()); return 0; @@ -68,7 +68,7 @@ void PanelLayout::setPosSizePixel(long nX, long nY, long nWidth, long nHeight, s bool bCanHandleSmallerHeight = false; bool bIsLayoutEnabled = isLayoutEnabled(this); - Window *pChild = GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); if (bIsLayoutEnabled && pChild->GetType() == WINDOW_SCROLLWINDOW) { diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index ee9eca71f4b2..2081fcad61b8 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -60,7 +60,7 @@ const sal_Int32 AreaPropertyPanel::DEFAULT_BORDER = 0; AreaPropertyPanel::AreaPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "AreaPropertyPanel", "svx/ui/sidebararea.ui", rxFrame), @@ -578,7 +578,7 @@ void AreaPropertyPanel::SetupIcons(void) AreaPropertyPanel* AreaPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index e1b34c402ddd..b0c2b0ea1deb 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -57,7 +57,7 @@ class AreaPropertyPanel { public: static AreaPropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); @@ -167,7 +167,7 @@ private: // constructor/destuctor AreaPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~AreaPropertyPanel(void); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx index 9b5a94648b61..6d6690c77d84 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx @@ -53,7 +53,7 @@ namespace svx { namespace sidebar { AreaTransparencyGradientControl::AreaTransparencyGradientControl ( - Window* pParent, + vcl::Window* pParent, AreaPropertyPanel& rPanel) : PopupControl( pParent,SVX_RES(RID_POPUPPANEL_AREAPAGE_TRGR)), maFtTrgrCenterX(this, SVX_RES(FT_TRGR_CENTER_X)), diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx index 628e13825a1f..1a8d31b16573 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx @@ -38,7 +38,7 @@ class AreaTransparencyGradientControl : public PopupControl { public: AreaTransparencyGradientControl ( - Window* pParent, + vcl::Window* pParent, AreaPropertyPanel& rPanel); virtual ~AreaTransparencyGradientControl (void); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index e6998756fedc..f2d1390580a2 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -23,7 +23,7 @@ namespace svx { namespace sidebar { AreaTransparencyGradientPopup::AreaTransparencyGradientPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx index 01fd47671520..5d6ac9e8ec7c 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx @@ -34,7 +34,7 @@ class AreaTransparencyGradientPopup { public : AreaTransparencyGradientPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~AreaTransparencyGradientPopup (void); diff --git a/svx/source/sidebar/debug/ColorPanel.cxx b/svx/source/sidebar/debug/ColorPanel.cxx index 3138531ad44a..11ac13553b49 100644 --- a/svx/source/sidebar/debug/ColorPanel.cxx +++ b/svx/source/sidebar/debug/ColorPanel.cxx @@ -25,7 +25,7 @@ namespace svx { namespace sidebar { -ColorPanel::ColorPanel (::Window* pParent) +ColorPanel::ColorPanel (vcl::Window* pParent) : ValueSet(pParent, WB_ITEMBORDER) { WinBits aStyle = @@ -52,7 +52,7 @@ ColorPanel::~ColorPanel (void) void ColorPanel::Resize (void) { - ::Window::Resize(); + vcl::Window::Resize(); Size aWindowSize = GetOutputSizePixel(); SetPosSizePixel(Point(0,0), aWindowSize); if (IsVisible() && aWindowSize.Width() > 0) diff --git a/svx/source/sidebar/debug/ColorPanel.hxx b/svx/source/sidebar/debug/ColorPanel.hxx index c297c5bf7acd..bac417d4ea69 100644 --- a/svx/source/sidebar/debug/ColorPanel.hxx +++ b/svx/source/sidebar/debug/ColorPanel.hxx @@ -33,10 +33,10 @@ class ColorPanel : public ValueSet { public: - ColorPanel (::Window* pParent); + ColorPanel (vcl::Window* pParent); virtual ~ColorPanel (void); - // From ::Window + // From vcl::Window virtual void Resize (void) SAL_OVERRIDE; virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; diff --git a/svx/source/sidebar/debug/ContextPanel.cxx b/svx/source/sidebar/debug/ContextPanel.cxx index 9a68627f8909..ca87b672e269 100644 --- a/svx/source/sidebar/debug/ContextPanel.cxx +++ b/svx/source/sidebar/debug/ContextPanel.cxx @@ -21,7 +21,7 @@ namespace svx { namespace sidebar { -ContextPanel::ContextPanel (::Window* pParent) +ContextPanel::ContextPanel (vcl::Window* pParent) : Window(pParent, 0), maApplicationName(this, 0), maContextName(this, 0) diff --git a/svx/source/sidebar/debug/ContextPanel.hxx b/svx/source/sidebar/debug/ContextPanel.hxx index 0a83b6687bf0..e55026c3836c 100644 --- a/svx/source/sidebar/debug/ContextPanel.hxx +++ b/svx/source/sidebar/debug/ContextPanel.hxx @@ -30,11 +30,11 @@ namespace svx { namespace sidebar { /** Display the current context. */ class ContextPanel - : public Window, + : public vcl::Window, public sfx2::sidebar::IContextChangeReceiver { public: - ContextPanel (::Window* pParent); + ContextPanel (vcl::Window* pParent); virtual ~ContextPanel (void); // From IContextChangeReceiverInterface diff --git a/svx/source/sidebar/debug/NotYetImplementedPanel.cxx b/svx/source/sidebar/debug/NotYetImplementedPanel.cxx index d51d493e2700..e91d1933773b 100644 --- a/svx/source/sidebar/debug/NotYetImplementedPanel.cxx +++ b/svx/source/sidebar/debug/NotYetImplementedPanel.cxx @@ -21,7 +21,7 @@ namespace svx { namespace sidebar { -NotYetImplementedPanel::NotYetImplementedPanel (::Window* pParent) +NotYetImplementedPanel::NotYetImplementedPanel (vcl::Window* pParent) : Window(pParent, 0), maMessageControl(this, 0) { diff --git a/svx/source/sidebar/debug/NotYetImplementedPanel.hxx b/svx/source/sidebar/debug/NotYetImplementedPanel.hxx index 43e6ed3f0535..11abe3aafb88 100644 --- a/svx/source/sidebar/debug/NotYetImplementedPanel.hxx +++ b/svx/source/sidebar/debug/NotYetImplementedPanel.hxx @@ -29,10 +29,10 @@ namespace svx { namespace sidebar { /** Display a panel as placeholder for a not-yet-implemented panel. */ class NotYetImplementedPanel - : public Window + : public vcl::Window { public: - NotYetImplementedPanel (::Window* pParent); + NotYetImplementedPanel (vcl::Window* pParent); virtual ~NotYetImplementedPanel (void); private: diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 235f622bab26..720062e5224a 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -40,7 +40,7 @@ namespace svx { namespace sidebar { GraphicPropertyPanel::GraphicPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "GraphicPropertyPanel", "svx/ui/sidebargraphic.ui", rxFrame), @@ -222,7 +222,7 @@ void GraphicPropertyPanel::SetupIcons(void) GraphicPropertyPanel* GraphicPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index e60d52d7acb6..8f3babcd40e8 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -40,7 +40,7 @@ class GraphicPropertyPanel { public: static GraphicPropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); @@ -95,7 +95,7 @@ private: // constructor/destuctor GraphicPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~GraphicPropertyPanel(); diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx index b7ae54d43874..7f4925b22e51 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx @@ -46,7 +46,7 @@ namespace svx { namespace sidebar { InsertPropertyPanel::InsertPropertyPanel ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame) : PanelLayout(pParent, "InsertPropertyPanel", "svx/ui/sidebarinsert.ui", rxFrame), mxFrame(rxFrame) @@ -66,7 +66,7 @@ InsertPropertyPanel::InsertPropertyPanel ( // general ;-) // In other words, we should find the underlying problem, and remove the // WindowEventListener for good. - Window* pTopWindow = pParent; + vcl::Window* pTopWindow = pParent; while (pTopWindow->GetParent() != NULL) pTopWindow = pTopWindow->GetParent(); pTopWindow->AddChildEventListener(LINK(this, InsertPropertyPanel, WindowEventListener)); @@ -78,7 +78,7 @@ InsertPropertyPanel::InsertPropertyPanel ( InsertPropertyPanel::~InsertPropertyPanel (void) { // Remove window child listener. - Window* pTopWindow = this; + vcl::Window* pTopWindow = this; while (pTopWindow->GetParent() != NULL) pTopWindow = pTopWindow->GetParent(); pTopWindow->RemoveChildEventListener(LINK(this, InsertPropertyPanel, WindowEventListener)); @@ -100,7 +100,7 @@ IMPL_LINK(InsertPropertyPanel, WindowEventListener, VclSimpleEvent*, pEvent) return 1; VclWindowEvent* pWindowEvent = dynamic_cast<VclWindowEvent*>(pEvent); - Window* pWindow = pWindowEvent ? pWindowEvent->GetWindow() : NULL; + vcl::Window* pWindow = pWindowEvent ? pWindowEvent->GetWindow() : NULL; ToolBox* pToolBox = dynamic_cast<ToolBox*>(pWindow); if (pToolBox == NULL) return 1; diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hxx b/svx/source/sidebar/insert/InsertPropertyPanel.hxx index e694e8207c95..b0a5426b84d5 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.hxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.hxx @@ -39,7 +39,7 @@ class InsertPropertyPanel { public: InsertPropertyPanel ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame); virtual ~InsertPropertyPanel (void); diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index ff171deb07ee..f948c4455ec8 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -154,7 +154,7 @@ namespace { namespace svx { namespace sidebar { LinePropertyPanel::LinePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "LinePropertyPanel", "svx/ui/sidebarline.ui", rxFrame), @@ -300,7 +300,7 @@ void LinePropertyPanel::SetupIcons(void) LinePropertyPanel* LinePropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 0cdf79d4e9c7..ec5b90e2b01f 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -61,7 +61,7 @@ class LinePropertyPanel { public: static LinePropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); @@ -162,7 +162,7 @@ private: // constructor/destuctor LinePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~LinePropertyPanel(void); diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 3483d3a794f7..bbbd1df9b47e 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -36,7 +36,7 @@ namespace svx { namespace sidebar { LineWidthControl::LineWidthControl ( - Window* pParent, + vcl::Window* pParent, LinePropertyPanel& rPanel) : svx::sidebar::PopupControl(pParent,SVX_RES(RID_POPUPPANEL_LINEPAGE_WIDTH)), mrLinePropertyPanel(rPanel), diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx index 7e06a6b58beb..c2904381647a 100644 --- a/svx/source/sidebar/line/LineWidthControl.hxx +++ b/svx/source/sidebar/line/LineWidthControl.hxx @@ -36,7 +36,7 @@ class LineWidthControl : public svx::sidebar::PopupControl { public: - LineWidthControl (Window* pParent, LinePropertyPanel& rPanel); + LineWidthControl (vcl::Window* pParent, LinePropertyPanel& rPanel); virtual ~LineWidthControl (void); virtual void GetFocus() SAL_OVERRIDE; diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 248d17aa4a6d..fe464a415700 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -28,7 +28,7 @@ namespace svx { namespace sidebar { LineWidthPopup::LineWidthPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/line/LineWidthPopup.hxx b/svx/source/sidebar/line/LineWidthPopup.hxx index e48069725ac8..8cbe0e5ee960 100644 --- a/svx/source/sidebar/line/LineWidthPopup.hxx +++ b/svx/source/sidebar/line/LineWidthPopup.hxx @@ -33,7 +33,7 @@ class LineWidthPopup { public : LineWidthPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~LineWidthPopup (void); diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index eb9ee9300f12..d9af174bc253 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -25,7 +25,7 @@ namespace svx { namespace sidebar { LineWidthValueSet::LineWidthValueSet ( - Window* pParent, const ResId& rResId) + vcl::Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ), pVDev(NULL), nSelItem(0), diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx index a3bb77382c8f..75c2b69286a1 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.hxx +++ b/svx/source/sidebar/line/LineWidthValueSet.hxx @@ -28,7 +28,7 @@ class LineWidthValueSet : public ValueSet { public: - LineWidthValueSet (Window* pParent, const ResId& rResId); + LineWidthValueSet (vcl::Window* pParent, const ResId& rResId); virtual ~LineWidthValueSet (void); void SetUnit(OUString* str); diff --git a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx index a35c4d478411..268728a4a76e 100644 --- a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx +++ b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx @@ -34,7 +34,7 @@ namespace svx { namespace sidebar { ParaBulletsControl::ParaBulletsControl( - Window* pParent, + vcl::Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel ) : PopupControl( pParent,SVX_RES(RID_POPUPPANEL_PARAPAGE_BULLETS) ) , maBulletsVS( this,SVX_RES(VS_VALUES) ) diff --git a/svx/source/sidebar/paragraph/ParaBulletsControl.hxx b/svx/source/sidebar/paragraph/ParaBulletsControl.hxx index 6578328d4cd5..d54f98765c31 100644 --- a/svx/source/sidebar/paragraph/ParaBulletsControl.hxx +++ b/svx/source/sidebar/paragraph/ParaBulletsControl.hxx @@ -46,7 +46,7 @@ private: DECL_LINK(MoreButtonClickHdl_Impl, void*); public: - ParaBulletsControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel); + ParaBulletsControl(vcl::Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel); virtual ~ParaBulletsControl(); void UpdateValueSet(); }; diff --git a/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx b/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx index 2e68ea73ff3c..5c769737fb81 100644 --- a/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx @@ -24,7 +24,7 @@ namespace svx { namespace sidebar { ParaBulletsPopup::ParaBulletsPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx b/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx index 3d37df749fa9..2b80cb015014 100644 --- a/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx +++ b/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx @@ -33,7 +33,7 @@ class ParaBulletsPopup { public : ParaBulletsPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~ParaBulletsPopup (void); diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 08892b9828c8..2b64dd949919 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -50,7 +50,7 @@ namespace svx { namespace sidebar { -ParaLineSpacingControl::ParaLineSpacingControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel) +ParaLineSpacingControl::ParaLineSpacingControl(vcl::Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel) : PopupControl( pParent,SVX_RES(RID_POPUPPANEL_PARAPAGE_LINESPACING)) , mbUseLineSPCustom (false) , mbLineSPDisable (false) diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index 6130bd09b63c..5f86353a2179 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -39,7 +39,7 @@ namespace svx { namespace sidebar { class ParaLineSpacingControl:public svx::sidebar::PopupControl { public: - ParaLineSpacingControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel); + ParaLineSpacingControl(vcl::Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel); virtual ~ParaLineSpacingControl(); void Rearrange(SfxItemState currSPState,FieldUnit currMetricUnit,SvxLineSpacingItem* currSPItem,const ::sfx2::sidebar::EnumContext currentContext); //virtual void Paint(const Rectangle& rect); diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx index 8f50dd867fe2..6a989484d502 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx @@ -24,7 +24,7 @@ namespace svx { namespace sidebar { ParaLineSpacingPopup::ParaLineSpacingPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx index 3a7929a9a56c..060181d0abb9 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx @@ -34,7 +34,7 @@ class ParaLineSpacingPopup { public : ParaLineSpacingPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~ParaLineSpacingPopup (void); diff --git a/svx/source/sidebar/paragraph/ParaNumberingControl.cxx b/svx/source/sidebar/paragraph/ParaNumberingControl.cxx index 6a5975918382..7125ef9b443a 100644 --- a/svx/source/sidebar/paragraph/ParaNumberingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaNumberingControl.cxx @@ -51,7 +51,7 @@ Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider() } ParaNumberingControl::ParaNumberingControl( - Window* pParent, + vcl::Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel ) : PopupControl( pParent,SVX_RES(RID_POPUPPANEL_PARAPAGE_NUMBERING) ) , maNumberVS( this,SVX_RES(VS_NUMBERING) ) diff --git a/svx/source/sidebar/paragraph/ParaNumberingControl.hxx b/svx/source/sidebar/paragraph/ParaNumberingControl.hxx index fd4234bed91c..3bbeae8d476f 100644 --- a/svx/source/sidebar/paragraph/ParaNumberingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaNumberingControl.hxx @@ -48,7 +48,7 @@ private: DECL_LINK(MoreButtonClickHdl_Impl, void*); public: - ParaNumberingControl( Window* pParent, + ParaNumberingControl( vcl::Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel); virtual ~ParaNumberingControl(); void UpdateValueSet(); diff --git a/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx b/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx index 45a7a1f84885..287141ea3c16 100644 --- a/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx @@ -24,7 +24,7 @@ namespace svx { namespace sidebar { ParaNumberingPopup::ParaNumberingPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx b/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx index ec62640009b0..862b584fe0f1 100644 --- a/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx +++ b/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx @@ -33,7 +33,7 @@ class ParaNumberingPopup { public : ParaNumberingPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~ParaNumberingPopup (void); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 52b1100fbcf2..a390fed35fc7 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -79,7 +79,7 @@ namespace svx {namespace sidebar { #define NEGA_MAXVALUE -10000000 ParaPropertyPanel* ParaPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) @@ -1090,7 +1090,7 @@ PopupControl* ParaPropertyPanel::CreateBGColorPopupControl (PopupContainer* pPar } -ParaPropertyPanel::ParaPropertyPanel(Window* pParent, +ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 6b06910fd5f3..db00d8f0f372 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -61,7 +61,7 @@ class ParaPropertyPanel { public: static ParaPropertyPanel* Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); @@ -157,7 +157,7 @@ private: ParaPropertyPanel ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index f4e4acb29933..4cf7cfa99286 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -52,7 +52,7 @@ namespace svx { namespace sidebar { PosSizePropertyPanel::PosSizePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) @@ -228,7 +228,7 @@ void PosSizePropertyPanel::SetupIcons(void) PosSizePropertyPanel* PosSizePropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 7b0bbd63901f..8983c23deac6 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -49,7 +49,7 @@ class PosSizePropertyPanel { public: static PosSizePropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); @@ -165,7 +165,7 @@ private: // constructor/destuctor PosSizePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx b/svx/source/sidebar/possize/SidebarDialControl.cxx index e48fa55dee44..b4d0bee4703c 100644 --- a/svx/source/sidebar/possize/SidebarDialControl.cxx +++ b/svx/source/sidebar/possize/SidebarDialControl.cxx @@ -24,13 +24,13 @@ namespace svx { namespace sidebar { -SidebarDialControl::SidebarDialControl (Window* pParent, WinBits nBits) +SidebarDialControl::SidebarDialControl (vcl::Window* pParent, WinBits nBits) : svx::DialControl(pParent, nBits) { Init(GetOutputSizePixel()); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarDialControl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSidebarDialControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new SidebarDialControl(pParent, WB_TABSTOP); } diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index d81a63ef36f2..0d45f75f027d 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -30,7 +30,7 @@ namespace svx { namespace sidebar { TextCharacterSpacingControl::TextCharacterSpacingControl ( - Window* pParent, + vcl::Window* pParent, svx::sidebar::TextPropertyPanel& rPanel, SfxBindings* pBindings) : PopupControl( pParent,SVX_RES(RID_POPUPPANEL_TEXTPAGE_SPACING)) diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index 957a58a79668..b96dd8945d1a 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -41,7 +41,7 @@ class TextCharacterSpacingControl:public svx::sidebar::PopupControl { public: TextCharacterSpacingControl ( - Window* pParent, + vcl::Window* pParent, svx::sidebar::TextPropertyPanel& rPanel, SfxBindings* pBindings); virtual ~TextCharacterSpacingControl(); diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index c50cdeed1191..7a4fe17f94db 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -24,7 +24,7 @@ namespace svx { namespace sidebar { TextCharacterSpacingPopup::TextCharacterSpacingPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx index 8f53a065da85..17ad29cfd09f 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx @@ -30,7 +30,7 @@ class TextCharacterSpacingPopup { public : TextCharacterSpacingPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~TextCharacterSpacingPopup (void); diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 68d65c0a53ca..318c64d8743b 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -63,7 +63,7 @@ long TextPropertyPanel::GetSelFontSize() } TextPropertyPanel* TextPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& rContext) @@ -83,7 +83,7 @@ TextPropertyPanel* TextPropertyPanel::Create ( } -TextPropertyPanel::TextPropertyPanel ( Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& /*rContext*/ ) +TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& /*rContext*/ ) : PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui", rxFrame), maFontSizeControl (SID_ATTR_CHAR_FONTHEIGHT, *pBindings, *this, OUString("FontHeight"), rxFrame), maUnderlineControl (SID_ATTR_CHAR_UNDERLINE, *pBindings, *this, OUString("Underline"), rxFrame), diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index 414789dcb0de..9385dcc17d61 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -47,7 +47,7 @@ class TextPropertyPanel { public: static TextPropertyPanel* Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& rContext); @@ -98,7 +98,7 @@ private: SfxBindings* mpBindings; TextPropertyPanel ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& rContext); diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index 240b3513637e..0d393e968735 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -29,7 +29,7 @@ namespace svx { namespace sidebar { TextUnderlineControl::TextUnderlineControl ( - Window* pParent, + vcl::Window* pParent, svx::sidebar::TextPropertyPanel& rPanel, SfxBindings* pBindings) : svx::sidebar::PopupControl( pParent,SVX_RES(RID_POPUPPANEL_TEXTPAGE_UNDERLINE)) diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index 4ff4366e3140..5e32256c3364 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -33,7 +33,7 @@ class TextUnderlineControl:public svx::sidebar::PopupControl { public: TextUnderlineControl ( - Window* pParent, + vcl::Window* pParent, svx::sidebar::TextPropertyPanel& rPanel, SfxBindings* pBindings); void Rearrange(FontUnderline eLine); diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index 1a58d951e80c..b71e33b4303c 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -23,7 +23,7 @@ namespace svx { namespace sidebar { TextUnderlinePopup::TextUnderlinePopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/text/TextUnderlinePopup.hxx b/svx/source/sidebar/text/TextUnderlinePopup.hxx index 54a827975160..ce4caa0b28f9 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.hxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.hxx @@ -30,7 +30,7 @@ class TextUnderlinePopup { public : TextUnderlinePopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~TextUnderlinePopup (void); diff --git a/svx/source/sidebar/tools/ColorControl.cxx b/svx/source/sidebar/tools/ColorControl.cxx index bece0cf8ab5c..affabdac5387 100644 --- a/svx/source/sidebar/tools/ColorControl.cxx +++ b/svx/source/sidebar/tools/ColorControl.cxx @@ -82,7 +82,7 @@ namespace { ColorControl::ColorControl ( - Window* pParent, + vcl::Window* pParent, SfxBindings* /* pBindings */, const ResId& rControlResId, const ResId& rValueSetResId, diff --git a/svx/source/sidebar/tools/ColorPopup.cxx b/svx/source/sidebar/tools/ColorPopup.cxx index c8dc10438ad3..cd778304a508 100644 --- a/svx/source/sidebar/tools/ColorPopup.cxx +++ b/svx/source/sidebar/tools/ColorPopup.cxx @@ -23,7 +23,7 @@ namespace svx { namespace sidebar { ColorPopup::ColorPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx index 544c611dd53b..49b421fb473d 100644 --- a/svx/source/sidebar/tools/Popup.cxx +++ b/svx/source/sidebar/tools/Popup.cxx @@ -26,7 +26,7 @@ namespace svx { namespace sidebar { Popup::Popup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator, const ::rtl::OUString& rsAccessibleName) : mpControl(), diff --git a/svx/source/sidebar/tools/PopupContainer.cxx b/svx/source/sidebar/tools/PopupContainer.cxx index 0bd666192fb4..dc29c558f986 100644 --- a/svx/source/sidebar/tools/PopupContainer.cxx +++ b/svx/source/sidebar/tools/PopupContainer.cxx @@ -22,7 +22,7 @@ namespace svx { namespace sidebar { -PopupContainer::PopupContainer (Window* pParent) +PopupContainer::PopupContainer (vcl::Window* pParent) : FloatingWindow(pParent, WB_SYSTEMWINDOW | WB_3DLOOK) // | WB_POPUP_FOCUSWIN) { } diff --git a/svx/source/sidebar/tools/PopupControl.cxx b/svx/source/sidebar/tools/PopupControl.cxx index d20afbe91aaa..d8c686546e29 100644 --- a/svx/source/sidebar/tools/PopupControl.cxx +++ b/svx/source/sidebar/tools/PopupControl.cxx @@ -25,7 +25,7 @@ using ::sfx2::sidebar::Theme; namespace svx { namespace sidebar { PopupControl::PopupControl ( - Window* pParent, + vcl::Window* pParent, const ResId& rResId) : Control( pParent,rResId) { diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index 793fc4fd0ba1..7712e625c55f 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -70,7 +70,7 @@ static vcl::Font& lcl_GetDefaultBulletFont() ValueSetWithTextControl::ValueSetWithTextControl( const tControlType eControlType, - Window* pParent, + vcl::Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ) , meControlType( eControlType ) @@ -270,7 +270,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt ) pDev->Pop(); } -SvxNumValueSet2::SvxNumValueSet2( Window* pParent, const ResId& rResId) : +SvxNumValueSet2::SvxNumValueSet2( vcl::Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ), aLineColor ( COL_LIGHTGRAY ), pVDev ( NULL ) @@ -424,7 +424,7 @@ void SvxNumValueSet2::UserDraw( const UserDrawEvent& rUDEvt ) -SvxNumValueSet3::SvxNumValueSet3( Window* pParent, const ResId& rResId) : +SvxNumValueSet3::SvxNumValueSet3( vcl::Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ) { SetColCount( 3 ); diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 0fd7532b745d..01d5f5cb9b0e 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star; const SdrPaintWindow& rPaintWindow( GetOriginalPaintWindow() ? *GetOriginalPaintWindow() : GetPaintWindow() ); if ( rPaintWindow.OutputToWindow() && !rView.IsPrintPreview() ) { - Window& rWindow = dynamic_cast< Window& >( rPaintWindow.GetOutputDevice() ); + vcl::Window& rWindow = dynamic_cast< vcl::Window& >( rPaintWindow.GetOutputDevice() ); const_cast< SdrPageWindow* >( this )->mxControlContainer = VCLUnoHelper::CreateControlContainer( &rWindow ); // #100394# xC->setVisible triggers window->Show() and this has @@ -375,7 +375,7 @@ void SdrPageWindow::InvalidatePageWindow(const basegfx::B2DRange& rRange) if(GetPageView().IsVisible() && GetPaintWindow().OutputToWindow()) { const SvtOptionsDrawinglayer aDrawinglayerOpt; - Window& rWindow(static_cast< Window& >(GetPaintWindow().GetOutputDevice())); + vcl::Window& rWindow(static_cast< vcl::Window& >(GetPaintWindow().GetOutputDevice())); basegfx::B2DRange aDiscreteRange(rRange); aDiscreteRange.transform(rWindow.GetViewTransformation()); diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 98d700d463dd..4b6b47d01e25 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -32,11 +32,11 @@ //sibling after that is going to fail hard class CandidateMgr { - std::vector<Window*> m_aCandidates; - std::set<Window*> m_aDeletedCandidates; + std::vector<vcl::Window*> m_aCandidates; + std::set<vcl::Window*> m_aDeletedCandidates; DECL_LINK(WindowEventListener, VclSimpleEvent*); public: - void PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect); + void PaintTransparentChildren(vcl::Window & rWindow, Rectangle const& rPixelRect); ~CandidateMgr(); }; @@ -45,7 +45,7 @@ IMPL_LINK(CandidateMgr, WindowEventListener, VclSimpleEvent*, pEvent) VclWindowEvent* pWinEvent = dynamic_cast< VclWindowEvent* >( pEvent ); if (pWinEvent) { - Window* pWindow = pWinEvent->GetWindow(); + vcl::Window* pWindow = pWinEvent->GetWindow(); if (pWinEvent->GetId() == VCLEVENT_OBJECT_DYING) { m_aDeletedCandidates.insert(pWindow); @@ -57,17 +57,17 @@ IMPL_LINK(CandidateMgr, WindowEventListener, VclSimpleEvent*, pEvent) CandidateMgr::~CandidateMgr() { - for (std::vector<Window*>::iterator aI = m_aCandidates.begin(); + for (std::vector<vcl::Window*>::iterator aI = m_aCandidates.begin(); aI != m_aCandidates.end(); ++aI) { - Window* pCandidate = *aI; + vcl::Window* pCandidate = *aI; if (m_aDeletedCandidates.find(pCandidate) != m_aDeletedCandidates.end()) continue; pCandidate->RemoveEventListener(LINK(this, CandidateMgr, WindowEventListener)); } } -void PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect) +void PaintTransparentChildren(vcl::Window & rWindow, Rectangle const& rPixelRect) { if (!rWindow.IsChildTransparentModeEnabled()) return; @@ -76,9 +76,9 @@ void PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect) aManager.PaintTransparentChildren(rWindow, rPixelRect); } -void CandidateMgr::PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect) +void CandidateMgr::PaintTransparentChildren(vcl::Window & rWindow, Rectangle const& rPixelRect) { - Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD ); while (pCandidate) { if (pCandidate->IsPaintTransparent()) @@ -96,7 +96,7 @@ void CandidateMgr::PaintTransparentChildren(Window & rWindow, Rectangle const& r pCandidate = pCandidate->GetWindow( WINDOW_NEXT ); } - for (std::vector<Window*>::iterator aI = m_aCandidates.begin(); + for (std::vector<vcl::Window*>::iterator aI = m_aCandidates.begin(); aI != m_aCandidates.end(); ++aI) { pCandidate = *aI; @@ -247,7 +247,7 @@ void SdrPaintWindow::impCreateOverlayManager() // Request a repaint so that the buffered overlay manager fills // its buffer properly. This is a workaround for missing buffer // updates. - Window* pWindow = dynamic_cast<Window*>(&GetOutputDevice()); + vcl::Window* pWindow = dynamic_cast<vcl::Window*>(&GetOutputDevice()); if (pWindow != NULL) pWindow->Invalidate(); diff --git a/svx/source/svdraw/selectioncontroller.cxx b/svx/source/svdraw/selectioncontroller.cxx index a1b7896cacc3..a64f80cba7ea 100644 --- a/svx/source/svdraw/selectioncontroller.cxx +++ b/svx/source/svdraw/selectioncontroller.cxx @@ -23,22 +23,22 @@ namespace sdr { -bool SelectionController::onKeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/) +bool SelectionController::onKeyInput(const KeyEvent& /*rKEvt*/, vcl::Window* /*pWin*/) { return false; } -bool SelectionController::onMouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) +bool SelectionController::onMouseButtonDown(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; } -bool SelectionController::onMouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) +bool SelectionController::onMouseButtonUp(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; } -bool SelectionController::onMouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) +bool SelectionController::onMouseMove(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; } diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index a84c3ff67564..3102b6bc6018 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -319,7 +319,7 @@ void SdrCreateView::HideConnectMarker() ImpClearConnectMarker(); } -bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) { if(CheckEdgeMode() && pWin) { @@ -701,7 +701,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) SdrTextObj* pText=PTR_CAST(SdrTextObj,pObjMerk); if (pText!=NULL && pText->IsTextFrame()) { - SdrBeginTextEdit(pText, pPVMerk, (Window*)0L, true, (SdrOutliner*)0L, (OutlinerView*)0L); + SdrBeginTextEdit(pText, pPVMerk, (vcl::Window*)0L, true, (SdrOutliner*)0L, (OutlinerView*)0L); } } } diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index ebef27daece7..5b7cd4e30a8d 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -259,7 +259,7 @@ void SdrObjEditView::ModelHasChanged() { OutlinerView* pOLV=pTextEditOutliner->GetView(nOV); { // invalidate old OutlinerView area - Window* pWin=pOLV->GetWindow(); + vcl::Window* pWin=pOLV->GetWindow(); Rectangle aTmpRect(aOldArea); sal_uInt16 nPixSiz=pOLV->GetInvalidateMore()+1; Size aMore(pWin->PixelToLogic(Size(nPixSiz,nPixSiz))); @@ -375,7 +375,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const { - Window* pWin = rOutlView.GetWindow(); + vcl::Window* pWin = rOutlView.GetWindow(); if(pWin) { @@ -422,7 +422,7 @@ void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const } } -OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, bool /*bNoPaint*/, OutlinerView* pGivenView) const +OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoPaint*/, OutlinerView* pGivenView) const { // background Color aBackground(GetTextEditBackgroundColor(*this)); @@ -519,7 +519,7 @@ SdrUndoManager* SdrObjEditView::getSdrUndoManagerForEnhancedTextEdit() const } bool SdrObjEditView::SdrBeginTextEdit( - SdrObject* pObj, SdrPageView* pPV, Window* pWin, + SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin, bool bIsNewObj, SdrOutliner* pGivenOutliner, OutlinerView* pGivenOutlinerView, bool bDontDeleteOutliner, bool bOnlyOneView, @@ -557,7 +557,7 @@ bool SdrObjEditView::SdrBeginTextEdit( if(OUTDEV_WINDOW == pPaintWindow->GetOutputDevice().GetOutDevType()) { - pWin = (Window*)(&pPaintWindow->GetOutputDevice()); + pWin = (vcl::Window*)(&pPaintWindow->GetOutputDevice()); } } @@ -703,7 +703,7 @@ bool SdrObjEditView::SdrBeginTextEdit( if(&rOutDev != pWin && OUTDEV_WINDOW == rOutDev.GetOutDevType()) { - OutlinerView* pOutlView = ImpMakeOutlinerView((Window*)(&rOutDev), !bEmpty, 0L); + OutlinerView* pOutlView = ImpMakeOutlinerView((vcl::Window*)(&rOutDev), !bEmpty, 0L); pTextEditOutliner->InsertView(pOutlView, (sal_uInt16)i); } } @@ -806,7 +806,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) { SdrEndTextEditKind eRet=SDRENDTEXTEDIT_UNCHANGED; SdrTextObj* pTEObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() ); - Window* pTEWin =pTextEditWin; + vcl::Window* pTEWin =pTextEditWin; SdrOutliner* pTEOutliner =pTextEditOutliner; OutlinerView* pTEOutlinerView=pTextEditOutlinerView; vcl::Cursor* pTECursorMerker=pTextEditCursorMerker; @@ -993,7 +993,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) i--; OutlinerView* pOLV=pTEOutliner->GetView(i); sal_uInt16 nMorePix=pOLV->GetInvalidateMore() + 10; - Window* pWin=pOLV->GetWindow(); + vcl::Window* pWin=pOLV->GetWindow(); Rectangle aRect(pOLV->GetOutputArea()); pTEOutliner->RemoveView(i); if (!bTextEditDontDelete || i!=0) @@ -1080,7 +1080,7 @@ SdrPageView* SdrObjEditView::GetTextEditPageView() const -OutlinerView* SdrObjEditView::ImpFindOutlinerView(Window* pWin) const +OutlinerView* SdrObjEditView::ImpFindOutlinerView(vcl::Window* pWin) const { if (pWin==NULL) return NULL; if (pTextEditOutliner==NULL) return NULL; @@ -1093,7 +1093,7 @@ OutlinerView* SdrObjEditView::ImpFindOutlinerView(Window* pWin) const return pNewView; } -void SdrObjEditView::SetTextEditWin(Window* pWin) +void SdrObjEditView::SetTextEditWin(vcl::Window* pWin) { if(mxTextEditObj.is() && pWin!=NULL && pWin!=pTextEditWin) { @@ -1157,7 +1157,7 @@ bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const OutlinerView* pOLV=pTextEditOutliner->GetView(0); if( pOLV ) { - Window* pWin=pOLV->GetWindow(); + vcl::Window* pWin=pOLV->GetWindow(); if (pText!=NULL && pText->IsTextFrame() && pOLV!=NULL && pWin!=NULL) { sal_uInt16 nPixSiz=pOLV->GetInvalidateMore(); Rectangle aEditArea(aMinTextEditArea); @@ -1178,7 +1178,7 @@ bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const -bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) +bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) { if(pTextEditOutlinerView) { @@ -1201,7 +1201,7 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) return SdrGlueEditView::KeyInput(rKEvt,pWin); } -bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) +bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) { if (pTextEditOutlinerView!=NULL) { bool bPostIt=pTextEditOutliner->IsInSelectionMode(); @@ -1236,7 +1236,7 @@ bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) return SdrGlueEditView::MouseButtonDown(rMEvt,pWin); } -bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) +bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) { if (pTextEditOutlinerView!=NULL) { bool bPostIt=pTextEditOutliner->IsInSelectionMode(); @@ -1267,7 +1267,7 @@ bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) return SdrGlueEditView::MouseButtonUp(rMEvt,pWin); } -bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) { if (pTextEditOutlinerView!=NULL) { bool bSelMode=pTextEditOutliner->IsInSelectionMode(); @@ -1305,7 +1305,7 @@ bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin) return SdrGlueEditView::MouseMove(rMEvt,pWin); } -bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin) +bool SdrObjEditView::Command(const CommandEvent& rCEvt, vcl::Window* pWin) { // as long as OutlinerView returns a sal_Bool, it only gets COMMAND_STARTDRAG if (pTextEditOutlinerView!=NULL) @@ -1667,7 +1667,7 @@ void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin) if(mxTextEditObj.is() && !bTextEditOnlyOneView && pNewWin->GetOutDevType()==OUTDEV_WINDOW) { - OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,false,NULL); + OutlinerView* pOutlView=ImpMakeOutlinerView((vcl::Window*)pNewWin,false,NULL); pTextEditOutliner->InsertView(pOutlView); } } @@ -1681,7 +1681,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin) for (sal_uIntPtr i=pTextEditOutliner->GetViewCount(); i>0;) { i--; OutlinerView* pOLV=pTextEditOutliner->GetView(i); - if (pOLV && pOLV->GetWindow()==(Window*)pOldWin) { + if (pOLV && pOLV->GetWindow()==(vcl::Window*)pOldWin) { delete pTextEditOutliner->RemoveView(i); } } @@ -1697,7 +1697,7 @@ bool SdrObjEditView::IsTextEditInSelectionMode() const // MacroMode -bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin) +bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin) { BrkMacroObj(); if (pObj!=NULL && pPV!=NULL && pWin!=NULL && pObj->HasMacro()) { diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 41b37ae0e885..44734489febe 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -235,7 +235,7 @@ void SdrGluePoint::Shear(const Point& rRef, long /*nWink*/, double tn, bool bVSh if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt); } -void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const +void SdrGluePoint::Invalidate(vcl::Window& rWin, const SdrObject* pObj) const { bool bMapMerk=rWin.IsMapModeEnabled(); Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); @@ -315,7 +315,7 @@ sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP) return nInsPos; } -void SdrGluePointList::Invalidate(Window& rWin, const SdrObject* pObj) const +void SdrGluePointList::Invalidate(vcl::Window& rWin, const SdrObject* pObj) const { sal_uInt16 nAnz=GetCount(); for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index bb0041645e9c..390bb851adcc 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -165,7 +165,7 @@ class ImpItemEdit: public Edit _SdrItemBrowserControl* pBrowse; public: - ImpItemEdit(Window* pParent, _SdrItemBrowserControl* pBrowse_, WinBits nBits=0) + ImpItemEdit(vcl::Window* pParent, _SdrItemBrowserControl* pBrowse_, WinBits nBits=0) : Edit(pParent, nBits), pBrowse(pBrowse_) {} @@ -208,7 +208,7 @@ void ImpItemEdit::KeyInput(const KeyEvent& rKEvt) #define MYBROWSEMODE (BROWSER_THUMBDRAGGING|BROWSER_KEEPHIGHLIGHT|BROWSER_NO_HSCROLL|BROWSER_HIDECURSOR) -_SdrItemBrowserControl::_SdrItemBrowserControl(Window* pParent, WinBits nBits): +_SdrItemBrowserControl::_SdrItemBrowserControl(vcl::Window* pParent, WinBits nBits): BrowseBox(pParent,nBits,MYBROWSEMODE), aList() { @@ -506,7 +506,7 @@ bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) pEditControl->Show(); pEditControl->GrabFocus(); pEditControl->SetSelection(Selection(SELECTION_MIN,SELECTION_MAX)); - Window* pParent=GetParent(); + vcl::Window* pParent=GetParent(); aWNamMerk=pParent->GetText(); OUString aNeuNam(aWNamMerk); aNeuNam += " "; @@ -534,7 +534,7 @@ bool _SdrItemBrowserControl::EndChangeEntry() pEditControl=NULL; delete pAktChangeEntry; pAktChangeEntry=NULL; - Window* pParent=GetParent(); + vcl::Window* pParent=GetParent(); pParent->SetText(aWNamMerk); SetMode(MYBROWSEMODE); bRet = true; @@ -549,7 +549,7 @@ void _SdrItemBrowserControl::BrkChangeEntry() pEditControl=NULL; delete pAktChangeEntry; pAktChangeEntry=NULL; - Window* pParent=GetParent(); + vcl::Window* pParent=GetParent(); pParent->SetText(aWNamMerk); SetMode(MYBROWSEMODE); } @@ -1044,7 +1044,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem // - _SdrItemBrowserWindow - -_SdrItemBrowserWindow::_SdrItemBrowserWindow(Window* pParent, WinBits nBits): +_SdrItemBrowserWindow::_SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits): FloatingWindow(pParent,nBits), aBrowse(this) { @@ -1080,7 +1080,7 @@ SdrItemBrowser::SdrItemBrowser(SdrView& rView): SetDirty(); } -Window* SdrItemBrowser::ImpGetViewWin(SdrView& rView) +vcl::Window* SdrItemBrowser::ImpGetViewWin(SdrView& rView) { const sal_uInt32 nWinCount(rView.PaintWindowCount()); @@ -1090,7 +1090,7 @@ Window* SdrItemBrowser::ImpGetViewWin(SdrView& rView) if(OUTDEV_WINDOW == pCandidate->GetOutputDevice().GetOutDevType()) { - return (Window*)(&pCandidate->GetOutputDevice()); + return (vcl::Window*)(&pCandidate->GetOutputDevice()); } } @@ -1099,7 +1099,7 @@ Window* SdrItemBrowser::ImpGetViewWin(SdrView& rView) void SdrItemBrowser::ForceParent() { - Window* pWin=ImpGetViewWin(*pView); + vcl::Window* pWin=ImpGetViewWin(*pView); if (pWin!=NULL) SetParent(pWin); } diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 890a418f6817..3a41d0b7fd5b 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1035,7 +1035,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) } /** handle mouse over effects for handles */ -bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) { if(aHdl.GetHdlCount()) { diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index edee086f559b..3c5f21ede3c0 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -555,7 +555,7 @@ uno::Reference< awt::XControl > SdrUnoObj::GetUnoControl(const SdrView& _rView, uno::Reference< awt::XControl > SdrUnoObj::GetTemporaryControlForWindow( - const Window& _rWindow, uno::Reference< awt::XControlContainer >& _inout_ControlContainer ) const + const vcl::Window& _rWindow, uno::Reference< awt::XControlContainer >& _inout_ControlContainer ) const { uno::Reference< awt::XControl > xControl; diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index c4cc0849544f..c03339346cef 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -733,7 +733,7 @@ void SdrPageView::ImpInvalidateHelpLineArea(sal_uInt16 nNum) const aR.Right() += aSiz.Width(); aR.Top() -= aSiz.Height(); aR.Bottom() += aSiz.Height(); - ((SdrView&)GetView()).InvalidateOneWin((Window&)rOutDev, aR); + ((SdrView&)GetView()).InvalidateOneWin((vcl::Window&)rOutDev, aR); } } } diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 8c2070d120f1..edd234dd7a6f 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -597,7 +597,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::c if(pOut && OUTDEV_WINDOW == pOut->GetOutDevType()) { - Window* pWindow = (Window*)pOut; + vcl::Window* pWindow = (vcl::Window*)pOut; if(pWindow->IsInPaint()) { @@ -836,7 +836,7 @@ Region SdrPaintView::OptimizeDrawLayersRegion(OutputDevice* pOut, const Region& // would be set. if(pOut && OUTDEV_WINDOW == pOut->GetOutDevType() && !bDisableIntersect) { - Window* pWindow = (Window*)pOut; + vcl::Window* pWindow = (vcl::Window*)pOut; if(pWindow->IsInPaint()) { @@ -874,7 +874,7 @@ void SdrPaintView::ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const -bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/) +bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, vcl::Window* /*pWin*/) { return false; } @@ -899,7 +899,7 @@ void SdrPaintView::GlueInvalidate() const const SdrObject* pObj=pOL->GetObj(nObjNum); const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=NULL && pGPL->GetCount()!=0) { - pGPL->Invalidate((Window&)rOutDev, pObj); + pGPL->Invalidate((vcl::Window&)rOutDev, pObj); } } } @@ -917,7 +917,7 @@ void SdrPaintView::InvalidateAllWin() if(pPaintWindow->OutputToWindow()) { - InvalidateOneWin((Window&)pPaintWindow->GetOutputDevice()); + InvalidateOneWin((vcl::Window&)pPaintWindow->GetOutputDevice()); } } } @@ -951,19 +951,19 @@ void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, bool bPlus1Pix) if (aRect.IsOver(aOutRect)) { - InvalidateOneWin((Window&)rOutDev, aRect); + InvalidateOneWin((vcl::Window&)rOutDev, aRect); } } } } -void SdrPaintView::InvalidateOneWin(Window& rWin) +void SdrPaintView::InvalidateOneWin(vcl::Window& rWin) { // do not erase background, that causes flicker (!) rWin.Invalidate(INVALIDATE_NOERASE); } -void SdrPaintView::InvalidateOneWin(Window& rWin, const Rectangle& rRect) +void SdrPaintView::InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect) { // do not erase background, that causes flicker (!) rWin.Invalidate(rRect, INVALIDATE_NOERASE); @@ -1134,7 +1134,7 @@ void SdrPaintView::ShowItemBrowser(bool bShow) } #endif -void SdrPaintView::MakeVisible(const Rectangle& rRect, Window& rWin) +void SdrPaintView::MakeVisible(const Rectangle& rRect, vcl::Window& rWin) { MapMode aMap(rWin.GetMapMode()); Size aActualSize(rWin.GetOutputSize()); diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index b981adfc882d..981659fb2bc4 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -175,7 +175,7 @@ SdrView::~SdrView() maAccessibilityOptions.RemoveListener(this); } -bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) +bool SdrView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) { SetActualWin(pWin); bool bRet = SdrCreateView::KeyInput(rKEvt,pWin); @@ -218,7 +218,7 @@ bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) return bRet; } -bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) +bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) { SetActualWin(pWin); if (rMEvt.IsLeft()) aDragStat.SetMouseDown(true); @@ -231,7 +231,7 @@ bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) return bRet; } -bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) +bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) { SetActualWin(pWin); if (rMEvt.IsLeft()) aDragStat.SetMouseDown(false); @@ -245,7 +245,7 @@ bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) return bRet; } -bool SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +bool SdrView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) { SetActualWin(pWin); aDragStat.SetMouseDown(rMEvt.IsLeft()); @@ -259,7 +259,7 @@ bool SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin) return bRet; } -bool SdrView::Command(const CommandEvent& rCEvt, Window* pWin) +bool SdrView::Command(const CommandEvent& rCEvt, vcl::Window* pWin) { SetActualWin(pWin); bool bRet = SdrCreateView::Command(rCEvt,pWin); @@ -488,7 +488,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co // we currently don't account for ticker text if(pActualOutDev && pActualOutDev->GetOutDevType() == OUTDEV_WINDOW) { - OutlinerView aOLV(pOutliner, (Window*)pActualOutDev); + OutlinerView aOLV(pOutliner, (vcl::Window*)pActualOutDev); const EditView& aEV=aOLV.GetEditView(); const SvxFieldItem* pItem=aEV.GetField(aTemporaryTextRelativePosition); if (pItem!=NULL) { @@ -822,7 +822,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) if (eHit==SDRHIT_TEXTEDIT) { bool bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() && - SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, false, (SdrOutliner*)0L)); + SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (vcl::Window*)pActualOutDev, false, (SdrOutliner*)0L)); if(bRet2) { @@ -905,7 +905,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) bRet=BegCreateCaptionObj(aLogicPos,Size(5*nHgt,2*nHgt)); } else bRet=BegCreateObj(aLogicPos); } break; - case SDREVENT_BEGMACROOBJ: bRet=BegMacroObj(aLogicPos,nHitTolLog,rVEvt.pObj,rVEvt.pPV,(Window*)pActualOutDev); break; + case SDREVENT_BEGMACROOBJ: bRet=BegMacroObj(aLogicPos,nHitTolLog,rVEvt.pObj,rVEvt.pPV,(vcl::Window*)pActualOutDev); break; case SDREVENT_BEGTEXTEDIT: { if (!IsObjMarked(rVEvt.pObj)) { UnmarkAllObj(); @@ -913,7 +913,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } bRet = pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType()&& - SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, false, (SdrOutliner*)0L); + SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (vcl::Window*)pActualOutDev, false, (SdrOutliner*)0L); if(bRet) { @@ -926,7 +926,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) default: break; } // switch if (bRet && pActualOutDev!=NULL && pActualOutDev->GetOutDevType()==OUTDEV_WINDOW) { - Window* pWin=(Window*)pActualOutDev; + vcl::Window* pWin=(vcl::Window*)pActualOutDev; // left mouse button pressed? bool bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown; // left mouse button released? diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 535f4fc3259c..fc4e732e4851 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -797,7 +797,7 @@ bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) -bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/) +bool SdrExchangeView::Paste(vcl::Window* /*pWin*/, sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Paste: Not supported any more." ); return false; diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 166f2c3efab8..b223f23ef7f0 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -65,7 +65,7 @@ AccessibleCell::~AccessibleCell (void) void AccessibleCell::Init (void) { SdrView* pView = maShapeTreeInfo.GetSdrView(); - const Window* pWindow = maShapeTreeInfo.GetWindow (); + const vcl::Window* pWindow = maShapeTreeInfo.GetWindow (); if( (pView != NULL) && (pWindow != NULL) && mxCell.is()) { OutlinerParaObject* pOutlinerParaObject = mxCell->GetEditOutlinerParaObject(); // Get the OutlinerParaObject if text edit is active diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index f51cd66db7d8..4d6b368045a7 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -206,7 +206,7 @@ const sal_uInt16 ACTION_START_SELECTION = 14; const sal_uInt16 ACTION_HANDLED_BY_VIEW = 15; const sal_uInt16 ACTION_TAB = 18; -bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, Window* pWindow ) +bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWindow ) { if( !checkTableObject() ) return false; @@ -245,7 +245,7 @@ bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, Window* pWindow ) // ::com::sun::star::awt::XMouseClickHandler: -bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, Window* pWindow ) +bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWindow ) { if( !pWindow || !checkTableObject() ) return false; @@ -298,7 +298,7 @@ bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin -bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, Window* /*pWin*/) +bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* /*pWin*/) { if( !checkTableObject() ) return false; @@ -313,7 +313,7 @@ bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, Window* /*pWin -bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, Window* pWindow ) +bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWindow ) { if( !checkTableObject() ) return false; @@ -1372,7 +1372,7 @@ bool SvxTableController::checkTableObject() -sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, Window* /*pWindow*/ ) +sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, vcl::Window* /*pWindow*/ ) { const bool bMod1 = rKEvt.GetKeyCode().IsMod1(); // ctrl const bool bMod2 = rKEvt.GetKeyCode().IsMod2(); // Alt @@ -1559,7 +1559,7 @@ sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, Window* return nAction; } -bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, Window* pWindow ) +bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::Window* pWindow ) { ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); if( !pTableObj ) @@ -1671,7 +1671,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, Window -void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, Window* pWindow, sal_uInt16 nAction ) +void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, vcl::Window* pWindow, sal_uInt16 nAction ) { if( mxTableObj.is() && static_cast<SdrTableObj*>(mxTableObj.get())->IsTextEditActive() ) mpView->SdrEndTextEdit(true); @@ -1789,7 +1789,7 @@ void SvxTableController::findMergeOrigin( CellPos& rPos ) -void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const awt::MouseEvent* pMouseEvent /*= 0*/, sal_uInt16 nAction /*= ACTION_NONE */ ) +void SvxTableController::EditCell( const CellPos& rPos, vcl::Window* pWindow, const awt::MouseEvent* pMouseEvent /*= 0*/, sal_uInt16 nAction /*= ACTION_NONE */ ) { SdrPageView* pPV = mpView->GetSdrPageView(); diff --git a/svx/source/tbxctrls/SvxColorChildWindow.cxx b/svx/source/tbxctrls/SvxColorChildWindow.cxx index a896c0df448e..c390fb0d0ee4 100644 --- a/svx/source/tbxctrls/SvxColorChildWindow.cxx +++ b/svx/source/tbxctrls/SvxColorChildWindow.cxx @@ -27,7 +27,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID( SvxColorChildWindow, SID_COLOR_CONTROL ) // Ableitung vom SfxChildWindow als "Behaelter" fuer Animator -SvxColorChildWindow::SvxColorChildWindow( Window* _pParent, +SvxColorChildWindow::SvxColorChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx index 2faeb6fde7cf..cd98b5afdae1 100644 --- a/svx/source/tbxctrls/SvxColorValueSet.cxx +++ b/svx/source/tbxctrls/SvxColorValueSet.cxx @@ -23,13 +23,13 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -SvxColorValueSet::SvxColorValueSet(Window* _pParent, WinBits nWinStyle) +SvxColorValueSet::SvxColorValueSet(vcl::Window* _pParent, WinBits nWinStyle) : ValueSet(_pParent, nWinStyle) { SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxColorValueSet(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxColorValueSet(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -40,7 +40,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxColorValueSet(Window *pP return new SvxColorValueSet(pParent, nWinBits); } -SvxColorValueSet::SvxColorValueSet(Window* _pParent, const ResId& rResId) +SvxColorValueSet::SvxColorValueSet(vcl::Window* _pParent, const ResId& rResId) : ValueSet(_pParent, rResId) { SetEdgeBlending(true); @@ -136,7 +136,7 @@ Size SvxColorValueSet::layoutAllVisible(sal_uInt32 nEntryCount) void SvxColorValueSet::Resize() { - Window *pParent = GetParent(); + vcl::Window *pParent = GetParent(); //don't do this for the drop down color palettes if (pParent && pParent->GetType() != WINDOW_FLOATINGWINDOW) layoutToGivenHeight(GetOutputSizePixel().Height(), GetItemCount()); diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index 2d25c7e06da4..0dc41ee09292 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -65,7 +65,7 @@ public: sal_uInt16 nSlotId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rWndTitle, - Window* pParentWindow); + vcl::Window* pParentWindow); virtual ~SvxColorWindow_Impl(); void StartSelection(); diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index e5ff211eef23..9ceb3d8fb738 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -89,7 +89,7 @@ bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*, sal_ return( rxOStm->GetError() == ERRCODE_NONE ); } -SvxColorValueSet_docking::SvxColorValueSet_docking( Window* _pParent, const ResId& rResId ) : +SvxColorValueSet_docking::SvxColorValueSet_docking( vcl::Window* _pParent, const ResId& rResId ) : SvxColorValueSet( _pParent, rResId ), DragSourceHelper( this ), mbLeftButton(true) @@ -182,7 +182,7 @@ SvxColorDockingWindow::SvxColorDockingWindow ( SfxBindings* _pBindings, SfxChildWindow* pCW, - Window* _pParent, + vcl::Window* _pParent, const ResId& rResId ) : diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 8a03c6b64ae6..ce53af14846d 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -63,7 +63,7 @@ static const sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow + vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DIRECTION )) , mrController( rController ) , @@ -238,7 +238,7 @@ ExtrusionDirectionControl::ExtrusionDirectionControl( -::Window* ExtrusionDirectionControl::createPopupWindow( ::Window* pParent ) +vcl::Window* ExtrusionDirectionControl::createPopupWindow( vcl::Window* pParent ) { return new ExtrusionDirectionWindow( *this, m_xFrame, pParent ); } @@ -284,7 +284,7 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl::getSupportedServiceName return ExtrusionDirectionControl_getSupportedServiceNames(); } -ExtrusionDepthDialog::ExtrusionDepthDialog( Window* pParent, double fDepth, FieldUnit eDefaultUnit ) +ExtrusionDepthDialog::ExtrusionDepthDialog( vcl::Window* pParent, double fDepth, FieldUnit eDefaultUnit ) : ModalDialog( pParent, "ExtrustionDepthDialog", "svx/ui/extrustiondepthdialog.ui" ) { get(m_pMtrDepth, "depth"); @@ -303,7 +303,7 @@ double aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 }; ExtrusionDepthWindow::ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow + vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH )) , mrController( rController ) , maImgDepth0( SVX_RES( IMG_DEPTH_0 ) ) @@ -488,7 +488,7 @@ ExtrusionDepthController::ExtrusionDepthController( -::Window* ExtrusionDepthController::createPopupWindow( ::Window* pParent ) +vcl::Window* ExtrusionDepthController::createPopupWindow( vcl::Window* pParent ) { return new ExtrusionDepthWindow( *this, m_xFrame, pParent ); } @@ -533,7 +533,7 @@ Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames return ExtrusionDepthController_getSupportedServiceNames(); } -ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) +ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_LIGHTING )) , mrController( rController ) , maImgBright( SVX_RES( IMG_LIGHTING_BRIGHT ) ) @@ -745,7 +745,7 @@ ExtrusionLightingControl::ExtrusionLightingControl( -::Window* ExtrusionLightingControl::createPopupWindow( ::Window* pParent ) +vcl::Window* ExtrusionLightingControl::createPopupWindow( vcl::Window* pParent ) { return new ExtrusionLightingWindow( *this, m_xFrame, pParent ); } @@ -794,7 +794,7 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow + vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE ) ) , mrController( rController ) , maImgSurface1( SVX_RES( IMG_WIRE_FRAME ) ) @@ -888,7 +888,7 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl( -::Window* ExtrusionSurfaceControl::createPopupWindow( ::Window* pParent ) +vcl::Window* ExtrusionSurfaceControl::createPopupWindow( vcl::Window* pParent ) { return new ExtrusionSurfaceWindow( *this, m_xFrame, pParent ); } diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index dd559f1bf586..6559985e7f0d 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -40,7 +40,7 @@ namespace svx class ExtrusionDirectionWindow : public svtools::ToolbarMenu { public: - ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ); + ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -71,7 +71,7 @@ class ExtrusionDirectionControl : public svt::PopupWindowController public: ExtrusionDirectionControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -106,7 +106,7 @@ private: void implSetDepth( double fDepth ); public: - ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ); + ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -119,7 +119,7 @@ class ExtrusionDepthController : public svt::PopupWindowController public: ExtrusionDepthController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -157,7 +157,7 @@ private: DECL_LINK( SelectHdl, void * ); public: - ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ); + ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -170,7 +170,7 @@ class ExtrusionLightingControl : public svt::PopupWindowController public: ExtrusionLightingControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -198,7 +198,7 @@ private: void implSetSurface( int nSurface, bool bEnabled ); public: - ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ); + ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; }; @@ -210,7 +210,7 @@ class ExtrusionSurfaceControl : public svt::PopupWindowController public: ExtrusionSurfaceControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 2a5b26a0e3a2..5b4aa1aaf5d5 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -502,7 +502,7 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) } } -Window* SvxFillToolBoxControl::CreateItemWindow(Window *pParent) +vcl::Window* SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent) { if(GetSlotId() == SID_ATTR_FILL_STYLE) { @@ -533,7 +533,7 @@ Window* SvxFillToolBoxControl::CreateItemWindow(Window *pParent) return NULL; } -FillControl::FillControl(Window* pParent,WinBits nStyle) +FillControl::FillControl(vcl::Window* pParent,WinBits nStyle) : Window(pParent,nStyle | WB_DIALOGCONTROL), mpLbFillType(new SvxFillTypeBox(this)), mpLbFillAttr(new SvxFillAttrBox(this)), diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index e1fd6143bdfc..043982559b94 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -70,7 +70,7 @@ namespace svx const int nColCount = 4; const int nLineCount = 4; -FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, Window* pParent, sal_uInt16 /*nSID*/ ) : +FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, vcl::Window* pParent, sal_uInt16 /*nSID*/ ) : ModalDialog(pParent, "FontworkGalleryDialog", "svx/ui/fontworkgallerydialog.ui" ), mnThemeId ( 0xffff ), mpSdrView ( pSdrView ), @@ -298,7 +298,7 @@ void FontWorkShapeTypeControl::Select(sal_uInt16 /*nSelectModifier*/) class FontworkAlignmentWindow : public ToolbarMenu { public: - FontworkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ); + FontworkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ); virtual void statusChanged( const frame::FeatureStateEvent& Event ) throw ( RuntimeException ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -319,7 +319,7 @@ private: void implSetAlignment( int nAlignmentMode, bool bEnabled ); }; -FontworkAlignmentWindow::FontworkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ) +FontworkAlignmentWindow::FontworkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_ALIGNMENT )) , mrController( rController ) , maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16 ) ) @@ -419,7 +419,7 @@ class FontworkAlignmentControl : public svt::PopupWindowController public: FontworkAlignmentControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -438,7 +438,7 @@ FontworkAlignmentControl::FontworkAlignmentControl( const Reference< XComponentC -::Window* FontworkAlignmentControl::createPopupWindow( ::Window* pParent ) +vcl::Window* FontworkAlignmentControl::createPopupWindow( vcl::Window* pParent ) { return new FontworkAlignmentWindow( *this, m_xFrame, pParent ); } @@ -485,7 +485,7 @@ Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames class FontworkCharacterSpacingWindow : public ToolbarMenu { public: - FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ); + FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ); virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; private: @@ -503,7 +503,7 @@ private: -FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ) +FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING )) , mrController( rController ) , msFontworkCharacterSpacing( ".uno:FontworkCharacterSpacing" ) @@ -650,7 +650,7 @@ class FontworkCharacterSpacingControl : public svt::PopupWindowController public: FontworkCharacterSpacingControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -667,7 +667,7 @@ FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Referenc -::Window* FontworkCharacterSpacingControl::createPopupWindow( ::Window* pParent ) +vcl::Window* FontworkCharacterSpacingControl::createPopupWindow( vcl::Window* pParent ) { return new FontworkCharacterSpacingWindow( *this, m_xFrame, pParent ); } @@ -711,7 +711,7 @@ Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl::getSupportedServi return FontworkCharacterSpacingControl_getSupportedServiceNames(); } -FontworkCharacterSpacingDialog::FontworkCharacterSpacingDialog( Window* pParent, sal_Int32 nScale ) +FontworkCharacterSpacingDialog::FontworkCharacterSpacingDialog( vcl::Window* pParent, sal_Int32 nScale ) : ModalDialog( pParent, "FontworkSpacingDialog" , "svx/ui/fontworkspacingdialog.ui" ) { get(m_pMtrScale, "entry"); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 2fff9959d316..55e51bd3d974 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -98,13 +98,13 @@ protected: public: - ImplGrafMetricField( Window* pParent, const OUString& aCmd, const Reference< XFrame >& rFrame ); + ImplGrafMetricField( vcl::Window* pParent, const OUString& aCmd, const Reference< XFrame >& rFrame ); virtual ~ImplGrafMetricField(); void Update( const SfxPoolItem* pItem ); }; -ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ) : +ImplGrafMetricField::ImplGrafMetricField( vcl::Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ) : MetricField( pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_3DLOOK ), maCommand( rCmd ), mxFrame( rFrame ) @@ -251,7 +251,7 @@ protected: public: - ImplGrafControl( Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ); + ImplGrafControl( vcl::Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ); virtual ~ImplGrafControl(); void Update( const SfxPoolItem* pItem ) { maField.Update( pItem ); } @@ -259,7 +259,7 @@ public: }; ImplGrafControl::ImplGrafControl( - Window* pParent, + vcl::Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ) : Control( pParent, WB_TABSTOP ) @@ -321,13 +321,13 @@ private: public: - ImplGrafModeControl( Window* pParent, const Reference< XFrame >& rFrame ); + ImplGrafModeControl( vcl::Window* pParent, const Reference< XFrame >& rFrame ); virtual ~ImplGrafModeControl(); void Update( const SfxPoolItem* pItem ); }; -ImplGrafModeControl::ImplGrafModeControl( Window* pParent, const Reference< XFrame >& rFrame ) : +ImplGrafModeControl::ImplGrafModeControl( vcl::Window* pParent, const Reference< XFrame >& rFrame ) : ListBox( pParent, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ), mnCurPos( 0 ), mxFrame( rFrame ) @@ -410,7 +410,7 @@ void ImplGrafModeControl::ImplReleaseFocus() { if( SfxViewShell::Current() ) { - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + vcl::Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if( pShellWnd ) pShellWnd->GrabFocus(); @@ -489,7 +489,7 @@ void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const } } -Window* SvxGrafToolBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* SvxGrafToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return( new ImplGrafControl( pParent, m_aCommandURL, m_xFrame ) ); } @@ -576,7 +576,7 @@ void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, c } } -Window* SvxGrafModeToolBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* SvxGrafModeToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return( new ImplGrafModeControl( pParent, m_xFrame ) ); } diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index f40bf9a53aa5..f6541949abb8 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star::beans; #define LOGICAL_EDIT_HEIGHT 12 -SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) : +SvxLineBox::SvxLineBox( vcl::Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) : LineLB( pParent, nBits ), nCurPos ( 0 ), aLogicalSize(40,140), @@ -220,7 +220,7 @@ void SvxLineBox::ReleaseFocus_Impl() if( SfxViewShell::Current() ) { - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + vcl::Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); @@ -255,7 +255,7 @@ void SvxLineBox::FillControl() } SvxMetricField::SvxMetricField( - Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) + vcl::Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) : MetricField(pParent, nBits) , aCurTxt() , ePoolUnit(SFX_MAPUNIT_CM) @@ -321,7 +321,7 @@ void SvxMetricField::ReleaseFocus_Impl() { if( SfxViewShell::Current() ) { - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + vcl::Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); } @@ -415,7 +415,7 @@ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt ) MetricField::DataChanged( rDCEvt ); } -SvxFillTypeBox::SvxFillTypeBox( Window* pParent, WinBits nBits ) : +SvxFillTypeBox::SvxFillTypeBox( vcl::Window* pParent, WinBits nBits ) : FillTypeLB( pParent, nBits | WB_TABSTOP ), nCurPos ( 0 ), bSelect ( false ), @@ -427,7 +427,7 @@ SvxFillTypeBox::SvxFillTypeBox( Window* pParent, WinBits nBits ) : Show(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFillTypeBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFillTypeBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxFillTypeBox(pParent); } @@ -496,14 +496,14 @@ void SvxFillTypeBox::ReleaseFocus_Impl() { if( SfxViewShell::Current() ) { - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + vcl::Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); } } -SvxFillAttrBox::SvxFillAttrBox( Window* pParent, WinBits nBits ) : +SvxFillAttrBox::SvxFillAttrBox( vcl::Window* pParent, WinBits nBits ) : FillAttrLB( pParent, nBits | WB_TABSTOP ), nCurPos( 0 ), bRelease( true ) @@ -514,7 +514,7 @@ SvxFillAttrBox::SvxFillAttrBox( Window* pParent, WinBits nBits ) : Show(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFillAttrBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFillAttrBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxFillAttrBox(pParent); } @@ -581,7 +581,7 @@ void SvxFillAttrBox::ReleaseFocus_Impl() { if( SfxViewShell::Current() ) { - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + vcl::Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 5dea6904fca6..c2b2b553cbb4 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -73,7 +73,7 @@ public: bool IsUserSelected() const { return bUserSel; } void SetUserSelected( bool bVal ) { bUserSel = bVal; } - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; }; SvxPopupWindowListBox::SvxPopupWindowListBox(sal_uInt16 nSlotId, const OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx) @@ -109,7 +109,7 @@ void SvxPopupWindowListBox::PopupModeEnd() if( SfxViewShell::Current() ) { - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + vcl::Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if (pShellWnd) pShellWnd->GrabFocus(); } @@ -123,7 +123,7 @@ void SvxPopupWindowListBox::StateChanged( SfxPopupWindow::StateChanged( nSID, eState, pState ); } -Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow() +vcl::Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow() { // allows forwarding key events in the correct window // without setting the focus diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 07eb01230c05..0e7b5f5672cf 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -182,7 +182,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) -Window* SvxLineStyleToolBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* SvxLineStyleToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return new SvxLineBox( pParent, m_xFrame ); } @@ -243,7 +243,7 @@ void SvxLineWidthToolBoxControl::StateChanged( -Window* SvxLineWidthToolBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* SvxLineWidthToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return( new SvxMetricField( pParent, m_xFrame ) ); } @@ -270,7 +270,7 @@ SvxLineEndWindow::SvxLineEndWindow( SvxLineEndWindow::SvxLineEndWindow( sal_uInt16 nSlotId, const Reference< XFrame >& rFrame, - Window* pParentWindow, + vcl::Window* pParentWindow, const OUString& rWndTitle ) : SfxPopupWindow( nSlotId, rFrame, diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 9562072ec6f5..764aafa5ad4e 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -96,7 +96,7 @@ // don't make more than 15 entries visible at once #define MAX_STYLES_ENTRIES static_cast< sal_uInt16 >( 15 ) -static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize ); +static void lcl_CalcSizeValueSet( vcl::Window &rWin, ValueSet &rValueSet, const Size &aItemSize ); // namespaces using namespace ::editeng; @@ -116,7 +116,7 @@ class SvxStyleBox_Impl : public ComboBox { using Window::IsVisible; public: - SvxStyleBox_Impl( Window* pParent, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, + SvxStyleBox_Impl( vcl::Window* pParent, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, const Reference< XFrame >& _xFrame,const OUString& rClearFormatKey, const OUString& rMoreKey, bool bInSpecialMode ); virtual ~SvxStyleBox_Impl(); @@ -189,7 +189,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SvxFontNameBox_Impl( Window* pParent, const Reference< XDispatchProvider >& rDispatchProvider,const Reference< XFrame >& _xFrame + SvxFontNameBox_Impl( vcl::Window* pParent, const Reference< XDispatchProvider >& rDispatchProvider,const Reference< XFrame >& _xFrame , WinBits nStyle = WB_SORT ); virtual ~SvxFontNameBox_Impl(); @@ -216,7 +216,7 @@ class SvxFrmValueSet_Impl : public ValueSet sal_uInt16 nModifier; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: - SvxFrmValueSet_Impl(Window* pParent, WinBits nWinStyle) + SvxFrmValueSet_Impl(vcl::Window* pParent, WinBits nWinStyle) : ValueSet(pParent, nWinStyle), nModifier(0) {} sal_uInt16 GetModifier() const {return nModifier;} @@ -242,11 +242,11 @@ private: protected: virtual void Resize() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; public: - SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ); + SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ); virtual ~SvxFrameWindow_Impl(); void StartSelection(); @@ -267,11 +267,11 @@ private: protected: virtual void Resize() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ); + SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ); virtual SfxPopupWindow* Clone() const SAL_OVERRIDE; }; @@ -293,7 +293,7 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener SvxStyleToolBoxControl& rControl; }; -SvxStyleBox_Impl::SvxStyleBox_Impl(Window* pParent, +SvxStyleBox_Impl::SvxStyleBox_Impl(vcl::Window* pParent, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, @@ -727,7 +727,7 @@ static bool lcl_GetDocFontList( const FontList** ppFontList, SvxFontNameBox_Impl return bChanged; } -SvxFontNameBox_Impl::SvxFontNameBox_Impl( Window* pParent, const Reference< XDispatchProvider >& rDispatchProvider,const Reference< XFrame >& _xFrame, WinBits nStyle ) : +SvxFontNameBox_Impl::SvxFontNameBox_Impl( vcl::Window* pParent, const Reference< XDispatchProvider >& rDispatchProvider,const Reference< XFrame >& _xFrame, WinBits nStyle ) : FontNameBox ( pParent, nStyle | WinBits( WB_DROPDOWN | WB_AUTOHSCROLL ) ), pFontList ( NULL ), @@ -850,7 +850,7 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) } else if ( EVENT_LOSEFOCUS == rNEvt.GetType() ) { - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); if ( !HasFocus() && GetSubEdit() != pFocusWin ) SetText( GetSavedValue() ); // send EndPreview @@ -1003,7 +1003,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, sal_uInt16 nSlotId, const Reference< XFrame >& rFrame, const OUString& rWndTitle, - Window* pParentWindow ): + vcl::Window* pParentWindow ): SfxPopupWindow( nSlotId, pParentWindow, "palette_popup_window", "svx/ui/colorwindow.ui", @@ -1225,7 +1225,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co } } -SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : +SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ) : SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ), aFrameSet ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), bParagraphMode(false) @@ -1286,7 +1286,7 @@ SfxPopupWindow* SvxFrameWindow_Impl::Clone() const return new SvxFrameWindow_Impl( GetId(), GetFrame(), GetParent() ); } -Window* SvxFrameWindow_Impl::GetPreferredKeyInputWindow() +vcl::Window* SvxFrameWindow_Impl::GetPreferredKeyInputWindow() { return &aFrameSet; } @@ -1495,7 +1495,7 @@ static Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) return SvxBorderLine::threeDMediumColor( aMain ); } -SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : +SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ) : SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION | WB_AUTOSIZE ) ), m_aLineStyleLb( this ) @@ -1596,7 +1596,7 @@ bool SvxLineWindow_Impl::Close() return SfxPopupWindow::Close(); } -Window* SvxLineWindow_Impl::GetPreferredKeyInputWindow() +vcl::Window* SvxLineWindow_Impl::GetPreferredKeyInputWindow() { return &m_aLineStyleLb; } @@ -2122,7 +2122,7 @@ void SvxStyleToolBoxControl::StateChanged( Update(); } -Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* SvxStyleToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { SvxStyleBox_Impl* pBox = new SvxStyleBox_Impl( pParent, OUString( ".uno:StyleApply" ), @@ -2182,7 +2182,7 @@ void SvxFontNameToolBoxControl::StateChanged( rTbx.EnableItem( nId, SfxItemState::DISABLED != eState ); } -Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* SvxFontNameToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { SvxFontNameBox_Impl* pBox = new SvxFontNameBox_Impl( pParent, Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY ), @@ -2493,7 +2493,7 @@ void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, -static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize ) +static void lcl_CalcSizeValueSet( vcl::Window &rWin, ValueSet &rValueSet, const Size &aItemSize ) { Size aSize = rValueSet.CalcWindowSizePixel( aItemSize ); aSize.Width() += 4; diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 981db9a86a00..8960b3b5e6f3 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -86,7 +86,7 @@ class FontHeightToolBoxControl : public svt::ToolboxController, class SvxFontSizeBox_Impl : public FontSizeBox { public: - SvxFontSizeBox_Impl( Window* pParent, + SvxFontSizeBox_Impl( vcl::Window* pParent, const uno::Reference< frame::XDispatchProvider >& rDispatchProvider, const uno::Reference< frame::XFrame >& _xFrame, FontHeightToolBoxControl& rCtrl ); @@ -114,7 +114,7 @@ private: }; SvxFontSizeBox_Impl::SvxFontSizeBox_Impl( - Window* _pParent, + vcl::Window* _pParent, const uno::Reference< frame::XDispatchProvider >& _rDispatchProvider, const uno::Reference< frame::XFrame >& _xFrame, FontHeightToolBoxControl& _rCtrl ) : @@ -249,7 +249,7 @@ bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) } else if( EVENT_LOSEFOCUS == rNEvt.GetType() ) { - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); if(!HasFocus() && GetSubEdit() != pFocusWin) SetText(GetSavedValue()); } @@ -405,7 +405,7 @@ uno::Reference< awt::XWindow > SAL_CALL FontHeightToolBoxControl::createItemWind uno::Reference< awt::XWindow > xItemWindow; uno::Reference< awt::XWindow > xParent( Parent ); - Window* pParent = VCLUnoHelper::GetWindow( xParent ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent ); if ( pParent ) { SolarMutexGuard aSolarMutexGuard; diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 6bb512c0aedd..c23a2cb03706 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -86,7 +86,7 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand == COMMAND_FINDTEXT ) { - Window* pItemWin = pToolBox->GetItemWindow(i); + vcl::Window* pItemWin = pToolBox->GetItemWindow(i); if (pItemWin) sFindText = pItemWin->GetText(); } else if ( sItemCommand == COMMAND_MATCHCASE ) @@ -127,7 +127,7 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext } } -FindTextFieldControl::FindTextFieldControl( Window* pParent, WinBits nStyle, +FindTextFieldControl::FindTextFieldControl( vcl::Window* pParent, WinBits nStyle, css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::uno::XComponentContext >& xContext) : ComboBox( pParent, nStyle ), @@ -227,7 +227,7 @@ bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) { Remember_Impl(GetText()); - Window* pWindow = GetParent(); + vcl::Window* pWindow = GetParent(); ToolBox* pToolBox = (ToolBox*)pWindow; impl_executeSearch( m_xContext, m_xFrame, pToolBox, bShift); @@ -416,7 +416,7 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< : { svt::ToolboxController::initialize(aArguments); - Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); ToolBox* pToolBox = (ToolBox*)pWindow; if ( pToolBox ) { @@ -445,7 +445,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::cre css::uno::Reference< css::awt::XWindow > xItemWindow; css::uno::Reference< css::awt::XWindow > xParent( Parent ); - Window* pParent = VCLUnoHelper::GetWindow( xParent ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent ); if ( pParent ) { ToolBox* pToolbar = ( ToolBox* )pParent; @@ -478,7 +478,7 @@ void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::Featur IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl) { // enable or disable item DownSearch/UpSearch of findbar - Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); ToolBox* pToolBox = (ToolBox*)pWindow; if ( pToolBox && m_pFindTextFieldControl ) { @@ -576,7 +576,7 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ if ( m_bDisposed ) throw css::lang::DisposedException(); - Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); ToolBox* pToolBox = (ToolBox*)pWindow; impl_executeSearch(m_xContext, m_xFrame, pToolBox, meType == UP ); @@ -669,7 +669,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL MatchCaseToolboxController::cr css::uno::Reference< css::awt::XWindow > xItemWindow; css::uno::Reference< css::awt::XWindow > xParent( Parent ); - Window* pParent = VCLUnoHelper::GetWindow( xParent ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent ); if ( pParent ) { ToolBox* pToolbar = (ToolBox* )pParent; @@ -761,7 +761,7 @@ void SAL_CALL FindAllToolboxController::execute( sal_Int16 /*KeyModifier*/ ) thr if ( m_bDisposed ) throw css::lang::DisposedException(); - Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); ToolBox* pToolBox = (ToolBox*)pWindow; impl_executeSearch(m_xContext, m_xFrame, pToolBox, false, true); @@ -842,7 +842,7 @@ void SAL_CALL ExitSearchToolboxController::initialize( const css::uno::Sequence< // XToolbarController void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) throw ( css::uno::RuntimeException, std::exception ) { - Window *pFocusWindow = Application::GetFocusWindow(); + vcl::Window *pFocusWindow = Application::GetFocusWindow(); if ( pFocusWindow ) pFocusWindow->GrabFocusToDocument(); @@ -941,7 +941,7 @@ void SAL_CALL SearchLabelToolboxController::statusChanged( const css::frame::Fea css::uno::Reference< css::awt::XWindow > SAL_CALL SearchLabelToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) { - Window *pSL= new FixedText(VCLUnoHelper::GetWindow( Parent )); + vcl::Window *pSL= new FixedText(VCLUnoHelper::GetWindow( Parent )); pSL->SetSizePixel(Size(250, 25)); return VCLUnoHelper::GetInterface(pSL); } @@ -1057,7 +1057,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css } css::uno::Reference< css::awt::XWindow > xWindow(xUIElement->getRealInterface(), css::uno::UNO_QUERY); - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); ToolBox* pToolBox = (ToolBox*)pWindow; if ( pToolBox ) { @@ -1067,7 +1067,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand == COMMAND_FINDTEXT ) { - Window* pItemWin = pToolBox->GetItemWindow( i ); + vcl::Window* pItemWin = pToolBox->GetItemWindow( i ); if ( pItemWin ) { FindTextFieldControl* pFindTextFieldControl = dynamic_cast<FindTextFieldControl*>(pItemWin); diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index c5d1102b2c10..36a5e930dab4 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -82,7 +82,7 @@ void SvxVertCTLTextTbxCtrl::StateChanged( if(bCalc) { ToolBox& rTbx = GetToolBox(); - Window* pParent = rTbx.GetParent(); + vcl::Window* pParent = rTbx.GetParent(); WindowType nWinType = pParent->GetType(); if(WINDOW_FLOATINGWINDOW == nWinType) { diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 68777790e1ea..135dca78325f 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -197,7 +197,7 @@ FontworkBar::~FontworkBar() SetRepeatTarget(NULL); } -static Window* ImpGetViewWin(SdrView* pView) +static vcl::Window* ImpGetViewWin(SdrView* pView) { if( pView ) { @@ -208,7 +208,7 @@ static Window* ImpGetViewWin(SdrView* pView) if(OUTDEV_WINDOW == pOut->GetOutDevType()) { - return (Window*)pOut; + return (vcl::Window*)pOut; } } } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 87aa9c4b0689..689709125aee 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -379,8 +379,8 @@ void DictionaryList::Resize() } void DictionaryList::init(const Reference< linguistic2::XConversionDictionary>& xDictionary, - Window *pED_Term, Window *pED_Mapping, ListBox *pLB_Property, - Window *pFT_Term, Window *pFT_Mapping, Window *pFT_Property) + vcl::Window *pED_Term, vcl::Window *pED_Mapping, ListBox *pLB_Property, + vcl::Window *pFT_Term, vcl::Window *pFT_Mapping, vcl::Window *pFT_Property) { SetStyle( WB_VSCROLL | WB_TABSTOP ); SetSelectionMode( SINGLE_SELECTION ); @@ -428,7 +428,7 @@ void ChineseDictionaryDialog::initDictionaryControl(DictionaryList *pList, m_pFT_Term, m_pFT_Mapping, m_pFT_Property); } -ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) +ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent ) : ModalDialog(pParent, "ChineseDictionaryDialog", "svx/ui/chinesedictionary.ui") , m_nTextConversionOptions(i18n::TextConversionOption::NONE) diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index b088bb07196d..97cef0a2ff33 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -63,8 +63,8 @@ public: DictionaryList(SvSimpleTableContainer& rParent, WinBits nBits); void init(const css::uno::Reference< css::linguistic2::XConversionDictionary>& xDictionary, - Window *pED_Term, Window *pED_Mapping, ListBox *pLB_Property, - Window *pFT_Term, Window *pFT_Mapping, Window *pFT_Property); + vcl::Window *pED_Term, vcl::Window *pED_Mapping, ListBox *pLB_Property, + vcl::Window *pFT_Term, vcl::Window *pFT_Mapping, vcl::Window *pFT_Property); void deleteAll(); void refillFromDictionary( sal_Int32 nTextConversionOptions /*i18n::TextConversionOption*/ ); @@ -99,8 +99,8 @@ public: css::uno::Reference<css::linguistic2::XConversionDictionary> m_xDictionary; private: - Window* m_pED_Term; - Window* m_pED_Mapping; + vcl::Window* m_pED_Term; + vcl::Window* m_pED_Mapping; ListBox* m_pLB_Property; std::vector< DictionaryEntry* > m_aToBeDeleted; @@ -111,7 +111,7 @@ private: class ChineseDictionaryDialog : public ModalDialog { public: - ChineseDictionaryDialog( Window* pParent ); + ChineseDictionaryDialog( vcl::Window* pParent ); virtual ~ChineseDictionaryDialog(); //this method should be called once before calling execute diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index 16baa1947b72..1b8645595bd4 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -129,7 +129,7 @@ sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeExc if( !m_pDialog ) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if( m_xParentWindow.is() ) { VCLXWindow* pImplementation = VCLXWindow::GetImplementation(m_xParentWindow); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index adf98f688268..8dec51d66809 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -34,7 +34,7 @@ namespace textconversiondlgs using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) +ChineseTranslationDialog::ChineseTranslationDialog( vcl::Window* pParent ) : ModalDialog(pParent, "ChineseConversionDialog", "svx/ui/chineseconversiondialog.ui") , m_pDictionaryDialog(0) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index 03342a604aaa..5e1f0909d9f2 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx @@ -37,7 +37,7 @@ class ChineseDictionaryDialog; class ChineseTranslationDialog : public ModalDialog { public: - ChineseTranslationDialog( Window* pParent ); + ChineseTranslationDialog( vcl::Window* pParent ); virtual ~ChineseTranslationDialog(); void getSettings( bool& rbDirectionToSimplified diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 6ca0b5849cc4..425e9719f95d 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -67,7 +67,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo css::uno::Reference< css::uno::XComponentContext > m_xContext; /** @short TODO */ - Window* m_pParentWindow; + vcl::Window* m_pParentWindow; /** @short TODO */ RecoveryUI::EJob m_eJob; diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index c893adb96c6c..b5f957f82655 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -86,7 +86,7 @@ private: SdrObject* mpObject; SdrText* mpText; SdrView* mpView; - const Window* mpWindow; + const vcl::Window* mpWindow; SdrModel* mpModel; SdrOutliner* mpOutliner; SvxOutlinerForwarder* mpTextForwarder; @@ -121,7 +121,7 @@ private: public: SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText ); - SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const Window& rWindow ); + SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const vcl::Window& rWindow ); virtual ~SvxTextEditSourceImpl(); void SAL_CALL acquire(); @@ -194,7 +194,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText -SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const Window& rWindow ) +SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const vcl::Window& rWindow ) : maRefCount ( 0 ), mpObject ( &rObject ), mpText ( pText ), @@ -1036,7 +1036,7 @@ SvxTextEditSource::SvxTextEditSource( SdrObject* pObject, SdrText* pText ) } -SvxTextEditSource::SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const Window& rWindow ) +SvxTextEditSource::SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const vcl::Window& rWindow ) { mpImpl = new SvxTextEditSourceImpl( rObj, pText, rView, rWindow ); mpImpl->acquire(); diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index 302a07ec7ac7..9a05f388a0e0 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -509,7 +509,7 @@ public: class AtomContainerTreeListBox : public SvTreeListBox { public: - AtomContainerTreeListBox( Window* pParent ); + AtomContainerTreeListBox( vcl::Window* pParent ); ~AtomContainerTreeListBox(); void SetRootAtom( const Atom* pAtom ); @@ -544,7 +544,7 @@ private: typedef std::pair< AtomContainerTreeListBox*, SvTreeListEntry* > AtomContainerEntryPair; -AtomContainerTreeListBox::AtomContainerTreeListBox( Window* pParent ) +AtomContainerTreeListBox::AtomContainerTreeListBox( vcl::Window* pParent ) : SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_HASBUTTONSATROOT|WB_3DLOOK|WB_BORDER ), mpRootAtom( 0 ), mbRecursiveGuard( false ) { diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx index 1ef6da03bf1f..37e106e380d9 100644 --- a/svx/workben/pixelctl.cxx +++ b/svx/workben/pixelctl.cxx @@ -69,7 +69,7 @@ class MyWin : public WorkWindow SvxPixelCtl maPixelCtl; public: - MyWin( Window* pParent, WinBits nWinStyle ); + MyWin( vcl::Window* pParent, WinBits nWinStyle ); void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -91,7 +91,7 @@ void Main() Application::Execute(); } -MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : +MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ), maPixelCtl( this ) { diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 3d3cda92c1ff..b7c7f052a9a9 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -57,7 +57,7 @@ namespace sw { namespace sidebarwindows { }} class SwSidebarItem; class SwFrm; -class Window; +namespace vcl { class Window; } struct ImplSVEvent; #define SORT_POS 1 @@ -282,10 +282,10 @@ class SwPostItMgr: public SfxListener void DisconnectSidebarWinFromFrm( const SwFrm& rFrm, sw::sidebarwindows::SwSidebarWin& rSidebarWin ); bool HasFrmConnectedSidebarWins( const SwFrm& rFrm ); - Window* GetSidebarWinForFrmByIndex( const SwFrm& rFrm, + vcl::Window* GetSidebarWinForFrmByIndex( const SwFrm& rFrm, const sal_Int32 nIndex ); void GetAllSidebarWinForFrm( const SwFrm& rFrm, - std::vector< Window* >* pChildren ); + std::vector< vcl::Window* >* pChildren ); void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage); }; diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 541772d888dd..3944f1b75654 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -57,7 +57,7 @@ typedef sal_Int64 SwPostItBits; #define PB_Preview ((SwPostItBits)0x00000001) -class SwSidebarWin : public Window +class SwSidebarWin : public vcl::Window { public: SwSidebarWin( SwEditWin& rEditWin, diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 6e349b439c41..29dab399a691 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -55,7 +55,7 @@ class SwRect; class MapMode; class SwAccPreviewData; struct PreviewPage; -class Window; +namespace vcl { class Window; } // real states for events #define ACC_STATE_EDITABLE 0x01 @@ -193,12 +193,12 @@ public: // Dispose frame and its children if bRecursive is set void Dispose( const SwFrm* pFrm, const SdrObject* pObj, - Window* pWindow, + vcl::Window* pWindow, bool bRecursive = false ); void InvalidatePosOrSize( const SwFrm* pFrm, const SdrObject* pObj, - Window* pWindow, + vcl::Window* pWindow, const SwRect& rOldFrm ); void InvalidateContent( const SwFrm *pFrm ); @@ -245,7 +245,7 @@ public: void InvalidateTextSelectionOfAllParas(); sal_Int32 GetChildIndex( const SwFrm& rParentFrm, - Window& rChild ) const; + vcl::Window& rChild ) const; // update preview data (and fire events if necessary) void UpdatePreview( const std::vector<PreviewPage*>& _rPreviewPages, diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx index 4069ebc20a57..448e07efaca6 100644 --- a/sw/inc/colwd.hxx +++ b/sw/inc/colwd.hxx @@ -37,7 +37,7 @@ protected: DECL_LINK(LoseFocusHdl, void * = 0); public: - SwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc ); + SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc ); }; #endif diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 2fd984172ba1..58c6e35f1e14 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -305,9 +305,9 @@ protected: public: TYPEINFO_OVERRIDE(); - SwCrsrShell( SwDoc& rDoc, Window *pWin, const SwViewOption *pOpt = 0 ); + SwCrsrShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = 0 ); // disguised copy constructor - SwCrsrShell( SwCrsrShell& rShell, Window *pWin ); + SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pWin ); virtual ~SwCrsrShell(); // create new cursor and append the old one diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 37c995ee4ddc..53a801c2090f 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -103,7 +103,7 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener /// Make DocInfo known to the Doc. SAL_DLLPRIVATE virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( - Window *pParent, const SfxItemSet &) SAL_OVERRIDE; + vcl::Window *pParent, const SfxItemSet &) SAL_OVERRIDE; /// OLE-stuff SAL_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16) SAL_OVERRIDE; diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index 5de97850654b..54aa789f18e0 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -43,7 +43,7 @@ public: virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV, const Rectangle *pRect) const SAL_OVERRIDE; - bool RequestHelp( Window* pWindow, SdrView* pView, const HelpEvent& rEvt ); + bool RequestHelp( vcl::Window* pWindow, SdrView* pView, const HelpEvent& rEvt ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() SAL_OVERRIDE; }; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 9aaea8ca7ad6..86ea10ff7464 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -929,10 +929,10 @@ public: sal_uInt16 GetScalingOfSelectedText() const; /// Ctor/Dtor. - SwEditShell( SwDoc&, Window*, const SwViewOption *pOpt = 0 ); + SwEditShell( SwDoc&, vcl::Window*, const SwViewOption *pOpt = 0 ); /// Copy-Constructor in disguise. - SwEditShell( SwEditShell&, Window* ); + SwEditShell( SwEditShell&, vcl::Window* ); virtual ~SwEditShell(); private: diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 9c2e89d1d9c7..2a10307ea7c7 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -213,8 +213,8 @@ public: using SwEditShell::Insert; TYPEINFO_OVERRIDE(); - SwFEShell( SwDoc& rDoc, Window *pWin, const SwViewOption *pOpt = 0 ); - SwFEShell( SwEditShell& rShell, Window *pWin ); + SwFEShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = 0 ); + SwFEShell( SwEditShell& rShell, vcl::Window *pWin ); virtual ~SwFEShell(); /// Copy and Paste methods for internal clipboard. diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index d90d2fe7f7ed..138c72c25427 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -22,7 +22,7 @@ #include <editeng/hangulhanja.hxx> class SwView; -class Window; +namespace vcl { class Window; } class SwWrtShell; struct SwConversionArgs; class SwPaM; @@ -30,7 +30,7 @@ class SwPaM; class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion { SwView * m_pView; - Window* m_pWin; + vcl::Window* m_pWin; SwWrtShell &m_rWrtShell; SwConversionArgs *m_pConvArgs; /**< object for arguments (and results) needed diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 237aa54def10..daf8ad6246b5 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -41,7 +41,7 @@ class SfxViewFrame; class SfxBindings; class SfxItemSet; class ResId; -class Window; +namespace vcl { class Window; } class SfxItemPool; class SfxStyleSheetBase; class SwGlossaryHdl; @@ -188,7 +188,7 @@ class AbstractSwWordCountFloatDlg : public VclAbstractDialog public: virtual void UpdateCounts() = 0; virtual void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat) = 0; - virtual Window * GetWindow() = 0; //this method is added for return a Window type pointer + virtual vcl::Window * GetWindow() = 0; //this method is added for return a Window type pointer }; class AbstractSwInsertAbstractDlg : public VclAbstractDialog @@ -274,7 +274,7 @@ public: virtual void ReInitDlg() = 0; virtual void ActivateDatabasePage() = 0; virtual void ShowReferencePage() = 0; - virtual Window * GetWindow() = 0; //this method is added for return a Window type pointer + virtual vcl::Window * GetWindow() = 0; //this method is added for return a Window type pointer }; class AbstractSwRenameXNamedDlg : public VclAbstractDialog @@ -296,7 +296,7 @@ class AbstractMarkFloatDlg : public VclAbstractDialog { public: virtual void ReInitDlg(SwWrtShell& rWrtShell) = 0; - virtual Window * GetWindow() = 0; //this method is added for return a Window type pointer + virtual vcl::Window * GetWindow() = 0; //this method is added for return a Window type pointer }; #define RET_LOAD_DOC 100 @@ -323,42 +323,42 @@ class SwAbstractDialogFactory public: static SwAbstractDialogFactory* Create(); - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, sal_uInt32 nResId ) = 0; virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings, - SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo) = 0; + SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo) = 0; - virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent) = 0; - virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh, + virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(vcl::Window* pParent) = 0; + virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( vcl::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ) = 0; - virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0; + virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0; - virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) = 0; + virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) = 0; virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) = 0; - virtual SfxAbstractTabDialog * CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, + virtual SfxAbstractTabDialog * CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) = 0; virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0; - virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) = 0; + virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) = 0; virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp, const SwDBData& rData) = 0; - virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) = 0; + virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) = 0; - virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(Window *pParent, SwWrtShell &rSh, + virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0; - virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) = 0; + virtual SfxAbstractTabDialog* CreateSwEnvDlg ( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) = 0; - virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, + virtual AbstractSwLabDlg* CreateSwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel) = 0; virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0; - virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent, + virtual SfxAbstractTabDialog* CreateSwParaDlg ( vcl::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, @@ -366,31 +366,31 @@ public: bool bDraw = false, const OString& sDefPage = OString() ) = 0; - virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName) = 0; + virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) = 0; - virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) = 0; - virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) = 0; + virtual VclAbstractDialog * CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) = 0; + virtual AbstractSplitTableDialog * CreateSplitTblDialog ( vcl::Window * pParent, SwWrtShell &rSh ) = 0; - virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, + virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell, bool bSetAutoFmt = true, const SwTableAutoFmt* pSelFmt = 0 ) = 0; - virtual SfxAbstractDialog * CreateSwBorderDlg ( Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) = 0; - virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) = 0; + virtual SfxAbstractDialog * CreateSwBorderDlg ( vcl::Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) = 0; + virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) = 0; - virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) = 0; - virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool, + virtual VclAbstractDialog * CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) = 0; + virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0; - virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) = 0; + virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) = 0; virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0; - virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent, + virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) = 0; - virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) = 0; + virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) = 0; - virtual VclAbstractDialog* CreateTblMergeDialog( Window* pParent, bool& rWithPrev ) = 0; + virtual VclAbstractDialog* CreateTblMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0; virtual SfxAbstractTabDialog* CreateFrmTabDialog(const OString &rDialogType, - SfxViewFrame *pFrame, Window *pParent, + SfxViewFrame *pFrame, vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrm = true, bool bFmt = false, @@ -400,7 +400,7 @@ public: /// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered. /// Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane virtual SfxAbstractApplyTabDialog* CreateTemplateDialog( - Window* pParent, + vcl::Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage = OString(), @@ -409,51 +409,51 @@ public: virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) = 0; - virtual AbstractFldInputDlg* CreateFldInputDlg(Window *pParent, + virtual AbstractFldInputDlg* CreateFldInputDlg(vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0; - virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(Window * pParent, + virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false) = 0; - virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent ) = 0; + virtual VclAbstractDialog* CreateTitlePageDlg ( vcl::Window * pParent ) = 0; virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView) = 0; virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) = 0; - virtual AbstractJavaEditDialog* CreateJavaEditDialog(Window* pParent, + virtual AbstractJavaEditDialog* CreateJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) = 0; virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId, - Window* pParent, SwWrtShell& rSh, + vcl::Window* pParent, SwWrtShell& rSh, const OUString& rSourceName, const OUString& rTblName, sal_Int32 nCommandType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) = 0; - virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(Window* pParent) = 0; - virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent) = 0; - virtual VclAbstractDialog* CreateMultiTOXMarkDlg(Window* pParent, SwTOXMgr &rTOXMgr) = 0; + virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(vcl::Window* pParent) = 0; + virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) = 0; + virtual VclAbstractDialog* CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) = 0; virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &) = 0; virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( - Window* pParent, const SfxItemSet& rSet, + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, bool bGlobal = false) = 0; - virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) = 0; + virtual AbstractEditRegionDlg* CreateEditRegionDlg(vcl::Window* pParent, SwWrtShell& rWrtSh) = 0; virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( - Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) = 0; + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) = 0; virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew=true) = 0; virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew=true) = 0; virtual VclAbstractDialog * CreateIndexMarkModalDlg( - Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) = 0; + vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) = 0; virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) = 0; diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index ad7f677f115a..0750261574ac 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -219,7 +219,7 @@ public: // Virtual methods for options dialog. virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; // Pool is created here and set at SfxShell. void InitAttrPool(); diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 98e875e72eda..2833f1104266 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -31,7 +31,7 @@ #include "authratr.hxx" class SwRect; -class Window; +namespace vcl { class Window; } class OutputDevice; class SwViewShell; class SwDocShell; @@ -182,7 +182,7 @@ public: SwViewOption(const SwViewOption&); ~SwViewOption(); - void Init( Window *pWin ); // Initializing of static data. + void Init( vcl::Window *pWin ); // Initializing of static data. sal_uInt16 GetPixelTwips() const { return nPixelTwips; } diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index f839b359ede1..33dec73e14ea 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -59,7 +59,7 @@ class SwViewOption; class SwViewImp; class SwPrintData; class SwPagePreviewPrtData; -class Window; +namespace vcl { class Window; } class OutputDevice; class SwLayIdle; struct ShellResource; @@ -98,7 +98,7 @@ class SW_DLLPUBLIC SwViewShell : public Ring { friend void SetOutDev( SwViewShell *pSh, OutputDevice *pOut ); friend void SetOutDevAndWin( SwViewShell *pSh, OutputDevice *pOut, - Window *pWin, sal_uInt16 nZoom ); + vcl::Window *pWin, sal_uInt16 nZoom ); friend class SwViewImp; friend class SwLayIdle; @@ -125,7 +125,7 @@ class SW_DLLPUBLIC SwViewShell : public Ring SwViewImp *mpImp; // Core-internals of SwViewShell. // The pointer is never 0. - Window *mpWin; ///< = 0 during printing or pdf export + ::vcl::Window *mpWin; ///< = 0 during printing or pdf export OutputDevice *mpOut; ///< Window, Printer, VirtDev, ... OutputDevice* mpTmpRef; // Temporariy reference device. Is used // during (printer depending) prospect @@ -184,7 +184,7 @@ class SW_DLLPUBLIC SwViewShell : public Ring protected: static ShellResource* mpShellRes; ///< Resources for the Shell. - static Window* mpCareWindow; ///< Avoid this window. + static vcl::Window* mpCareWindow; ///< Avoid this window. SwRect maVisArea; ///< The modern version of VisArea. SwDoc *mpDoc; ///< The document; never 0. @@ -344,10 +344,10 @@ public: // 2. GetWin: Available if we not printing // 3. GetOut: Printer, Window or Virtual device OutputDevice& GetRefDev() const; - inline Window* GetWin() const { return mpWin; } + inline vcl::Window* GetWin() const { return mpWin; } inline OutputDevice* GetOut() const { return mpOut; } - void SetWin(Window* win) { mpWin = win; } + void SetWin(vcl::Window* win) { mpWin = win; } static inline bool IsLstEndAction() { return SwViewShell::mbLstAct; } // Change of all page descriptors. @@ -433,10 +433,10 @@ public: static void SetShellRes( ShellResource* pRes ) { mpShellRes = pRes; } static ShellResource* GetShellRes(); - static void SetCareWin( Window* pNew ); - static Window* GetCareWin(SwViewShell& rVSh) + static void SetCareWin( vcl::Window* pNew ); + static vcl::Window* GetCareWin(SwViewShell& rVSh) { return mpCareWindow ? mpCareWindow : CareChildWin(rVSh); } - static Window* CareChildWin(SwViewShell& rVSh); + static vcl::Window* CareChildWin(SwViewShell& rVSh); inline SfxViewShell *GetSfxViewShell() { return mpSfxViewShell; } inline void SetSfxViewShell(SfxViewShell *pNew) { mpSfxViewShell = pNew; } @@ -547,9 +547,9 @@ public: SwAccessibleMap* GetAccessibleMap(); - SwViewShell( SwViewShell&, Window *pWin = 0, OutputDevice *pOut = 0, + SwViewShell( SwViewShell&, vcl::Window *pWin = 0, OutputDevice *pOut = 0, long nFlags = 0 ); - SwViewShell( SwDoc& rDoc, Window *pWin, + SwViewShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = 0, OutputDevice *pOut = 0, long nFlags = 0 ); virtual ~SwViewShell(); diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index f00218c71d70..d9bc3e3b953a 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -79,9 +79,9 @@ uno::Reference< XAccessible > SwAccessibleContext::GetWeakParent() const return xParent; } -Window *SwAccessibleContext::GetWindow() +vcl::Window *SwAccessibleContext::GetWindow() { - Window *pWin = 0; + vcl::Window *pWin = 0; if( GetMap() ) { @@ -321,7 +321,7 @@ void SwAccessibleContext::ScrolledIn() if( HasCursor() ) { - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); if( pWin && pWin->HasFocus() ) { FireStateChangedEvent( AccessibleStateType::FOCUSED, true ); @@ -793,7 +793,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint uno::Reference< XAccessible > xAcc; - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin ) Point aPixPoint( aPoint.X, aPoint.Y ); // px rel to parent @@ -849,7 +849,7 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(bool bRelative) const SwFrm *pParent = GetParent(); OSL_ENSURE( pParent, "no Parent found" ); - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin && pParent ) @@ -906,7 +906,7 @@ awt::Point SAL_CALL SwAccessibleContext::getLocationOnScreen() Point aPixPos(aRect.X, aRect.Y); - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin ) aPixPos = pWin->OutputToAbsoluteScreenPixel(aPixPos); @@ -1037,7 +1037,7 @@ void SwAccessibleContext::ScrolledInShape( const SdrObject* , if( pAccImpl->GetState( AccessibleStateType::FOCUSED ) ) { - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); if( pWin && pWin->HasFocus() ) { AccessibleEventObject aStateChangedEvent; @@ -1261,7 +1261,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize( } else if ( rChildFrmOrObj.GetWindow() ) { - OSL_FAIL( "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - not expected to handle dispose of child of type <Window>." ); + OSL_FAIL( "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - not expected to handle dispose of child of type <vcl::Window>." ); } } } @@ -1468,9 +1468,9 @@ bool SwAccessibleContext::HasAdditionalAccessibleChildren() } /** #i88070# - get additional accessible child by index */ -Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32 nIndex ) +vcl::Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32 nIndex ) { - Window* pAdditionalAccessibleChild( 0 ); + vcl::Window* pAdditionalAccessibleChild( 0 ); if ( GetFrm()->IsTxtFrm() ) { @@ -1486,7 +1486,7 @@ Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32 nInde } /** #i88070# - get all additional accessible children */ -void SwAccessibleContext::GetAdditionalAccessibleChildren( std::vector< Window* >* pChildren ) +void SwAccessibleContext::GetAdditionalAccessibleChildren( std::vector< vcl::Window* >* pChildren ) { if ( GetFrm()->IsTxtFrm() ) { diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 0a597e34869b..49789295e820 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -29,7 +29,7 @@ #include <cppuhelper/implbase5.hxx> #include <cppuhelper/interfacecontainer.hxx> -class Window; +namespace vcl { class Window; } class SwAccessibleMap; class SwCrsrShell; class SdrObject; @@ -107,7 +107,7 @@ protected: bool IsDisposing() const { return bDisposing; } - Window *GetWindow(); + vcl::Window *GetWindow(); SwAccessibleMap *GetMap() { return pMap; } const SwAccessibleMap *GetMap() const { return pMap; } @@ -359,10 +359,10 @@ public: bool HasAdditionalAccessibleChildren(); // #i88070# - get additional child by index - Window* GetAdditionalAccessibleChild( const sal_Int32 nIndex ); + vcl::Window* GetAdditionalAccessibleChild( const sal_Int32 nIndex ); // #i88070# - get all additional accessible children - void GetAdditionalAccessibleChildren( std::vector< Window* >* pChildren ); + void GetAdditionalAccessibleChildren( std::vector< vcl::Window* >* pChildren ); const OUString& GetName() const { return sName; } diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 9da98dab8780..fae791cb0b79 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -99,7 +99,7 @@ void SwAccessibleDocumentBase::SetVisArea() } } -void SwAccessibleDocumentBase::AddChild( Window *pWin, bool bFireEvent ) +void SwAccessibleDocumentBase::AddChild( vcl::Window *pWin, bool bFireEvent ) { SolarMutexGuard aGuard; @@ -118,7 +118,7 @@ void SwAccessibleDocumentBase::AddChild( Window *pWin, bool bFireEvent ) } } -void SwAccessibleDocumentBase::RemoveChild( Window *pWin ) +void SwAccessibleDocumentBase::RemoveChild( vcl::Window *pWin ) { SolarMutexGuard aGuard; @@ -243,7 +243,7 @@ awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds() { SolarMutexGuard aGuard; - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin ) @@ -264,7 +264,7 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation() { SolarMutexGuard aGuard; - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin ) @@ -279,7 +279,7 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation() { SolarMutexGuard aGuard; - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin ) @@ -294,7 +294,7 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation() { SolarMutexGuard aGuard; - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin ) @@ -310,7 +310,7 @@ sal_Bool SAL_CALL SwAccessibleDocumentBase::containsPoint( { SolarMutexGuard aGuard; - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin ) @@ -331,7 +331,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleDocumentBase::getAccessibleAt { CHECK_FOR_DEFUNC( XAccessibleComponent ) - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin ) Point aPixPoint( aPoint.X, aPoint.Y ); // px rel to window @@ -359,14 +359,14 @@ SwAccessibleDocument::SwAccessibleDocument ( SwAccessibleMap* pInitMap ) : maSelectionHelper( *this ) { SetName( GetResource( STR_ACCESS_DOC_NAME ) ); - Window *pWin = pInitMap->GetShell()->GetWin(); + vcl::Window *pWin = pInitMap->GetShell()->GetWin(); if( pWin ) { pWin->AddChildEventListener( LINK( this, SwAccessibleDocument, WindowChildEventListener )); sal_uInt16 nCount = pWin->GetChildCount(); for( sal_uInt16 i=0; i < nCount; i++ ) { - Window* pChildWin = pWin->GetChild( i ); + vcl::Window* pChildWin = pWin->GetChild( i ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) AddChild( pChildWin, false ); @@ -376,7 +376,7 @@ SwAccessibleDocument::SwAccessibleDocument ( SwAccessibleMap* pInitMap ) : SwAccessibleDocument::~SwAccessibleDocument() { - Window *pWin = GetMap() ? GetMap()->GetShell()->GetWin() : 0; + vcl::Window *pWin = GetMap() ? GetMap()->GetShell()->GetWin() : 0; if( pWin ) pWin->RemoveChildEventListener( LINK( this, SwAccessibleDocument, WindowChildEventListener )); } @@ -385,7 +385,7 @@ void SwAccessibleDocument::Dispose( bool bRecursive ) { OSL_ENSURE( GetFrm() && GetMap(), "already disposed" ); - Window *pWin = GetMap() ? GetMap()->GetShell()->GetWin() : 0; + vcl::Window *pWin = GetMap() ? GetMap()->GetShell()->GetWin() : 0; if( pWin ) pWin->RemoveChildEventListener( LINK( this, SwAccessibleDocument, WindowChildEventListener )); SwAccessibleContext::Dispose( bRecursive ); @@ -402,7 +402,7 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEve { case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children { - Window* pChildWin = static_cast< Window* >( pVclEvent->GetData() ); + vcl::Window* pChildWin = static_cast< vcl::Window* >( pVclEvent->GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) { AddChild( pChildWin ); @@ -411,7 +411,7 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEve break; case VCLEVENT_WINDOW_HIDE: // send destroy on hide for direct accessible children { - Window* pChildWin = static_cast< Window* >( pVclEvent->GetData() ); + vcl::Window* pChildWin = static_cast< vcl::Window* >( pVclEvent->GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) { RemoveChild( pChildWin ); @@ -420,7 +420,7 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEve break; case VCLEVENT_OBJECT_DYING: // send destroy on hide for direct accessible children { - Window* pChildWin = pVclEvent->GetWindow(); + vcl::Window* pChildWin = pVclEvent->GetWindow(); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) { RemoveChild( pChildWin ); diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 15e7c8aacdbe..8333c559be3d 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -36,7 +36,7 @@ class SwAccessibleDocumentBase : public SwAccessibleContext ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> mxParent; - Window* mpChildWin; // protected by solar mutext + vcl::Window* mpChildWin; // protected by solar mutext using SwAccessibleFrame::SetVisArea; @@ -48,8 +48,8 @@ public: void SetVisArea(); - virtual void AddChild( Window *pWin, bool bFireEvent = true ); - virtual void RemoveChild( Window *pWin ); + virtual void AddChild( vcl::Window *pWin, bool bFireEvent = true ); + virtual void RemoveChild( vcl::Window *pWin ); // XAccessibleContext diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx index 9d8baf741fb1..77df3da3a029 100644 --- a/sw/source/core/access/accframebase.cxx +++ b/sw/source/core/access/accframebase.cxx @@ -86,7 +86,7 @@ void SwAccessibleFrameBase::GetStates( ::rtl::Reference < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); if( pWin && pWin->HasFocus() ) rStateSet.AddState( AccessibleStateType::FOCUSED ); } @@ -161,7 +161,7 @@ void SwAccessibleFrameBase::_InvalidateCursorPos() if( bOldSelected != bNewSelected ) { - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); if( pWin && pWin->HasFocus() && bNewSelected ) FireStateChangedEvent( AccessibleStateType::FOCUSED, bNewSelected ); if( pWin && pWin->HasFocus() && !bNewSelected ) @@ -186,7 +186,7 @@ void SwAccessibleFrameBase::_InvalidateCursorPos() void SwAccessibleFrameBase::_InvalidateFocus() { - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); if( pWin ) { bool bSelected; diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx index 868a7bec26c8..0953d7f9b04d 100644 --- a/sw/source/core/access/accfrmobj.cxx +++ b/sw/source/core/access/accfrmobj.cxx @@ -61,7 +61,7 @@ SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm ) Init( pFrm ); } -SwAccessibleChild::SwAccessibleChild( Window* pWindow ) +SwAccessibleChild::SwAccessibleChild( vcl::Window* pWindow ) : mpFrm( 0 ) , mpDrawObj( 0 ) , mpWindow( 0 ) @@ -71,7 +71,7 @@ SwAccessibleChild::SwAccessibleChild( Window* pWindow ) SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm, const SdrObject* pDrawObj, - Window* pWindow ) + vcl::Window* pWindow ) : mpFrm( 0 ) , mpDrawObj( 0 ) , mpWindow( 0 ) @@ -113,7 +113,7 @@ void SwAccessibleChild::Init( const SwFrm* pFrm ) mpWindow = 0; } -void SwAccessibleChild::Init( Window* pWindow ) +void SwAccessibleChild::Init( vcl::Window* pWindow ) { mpWindow = pWindow; mpFrm = 0; @@ -196,7 +196,7 @@ SwAccessibleChild& SwAccessibleChild::operator=( const SwFrm* pFrm ) return *this; } -SwAccessibleChild& SwAccessibleChild::operator=( Window* pWindow ) +SwAccessibleChild& SwAccessibleChild::operator=( vcl::Window* pWindow ) { Init( pWindow ); return *this; diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx index ba7f983b1007..c53a6346f090 100644 --- a/sw/source/core/access/accfrmobj.hxx +++ b/sw/source/core/access/accfrmobj.hxx @@ -25,7 +25,7 @@ class SwAccessibleMap; class SwFrm; class SdrObject; -class Window; +namespace vcl { class Window; } class SwRect; namespace sw { namespace access { @@ -36,17 +36,17 @@ class SwAccessibleChild SwAccessibleChild(); explicit SwAccessibleChild( const SdrObject* pDrawObj ); explicit SwAccessibleChild( const SwFrm* pFrm ); - explicit SwAccessibleChild( Window* pWindow ); + explicit SwAccessibleChild( vcl::Window* pWindow ); SwAccessibleChild( const SwFrm* pFrm, const SdrObject* pDrawObj, - Window* pWindow ); + vcl::Window* pWindow ); SwAccessibleChild( const SwAccessibleChild& r ); SwAccessibleChild& operator=( const SwAccessibleChild& r ); SwAccessibleChild& operator=( const SdrObject* pDrawObj ); SwAccessibleChild& operator=( const SwFrm* pFrm ); - SwAccessibleChild& operator=( Window* pWindow ); + SwAccessibleChild& operator=( vcl::Window* pWindow ); bool operator==( const SwAccessibleChild& r ) const; @@ -54,7 +54,7 @@ class SwAccessibleChild const SwFrm* GetSwFrm() const { return mpFrm; } const SdrObject* GetDrawObject() const { return mpDrawObj; } - Window* GetWindow() const { return mpWindow; } + vcl::Window* GetWindow() const { return mpWindow; } const SwFrm* GetParent( const bool bInPagePreview ) const; @@ -72,11 +72,11 @@ class SwAccessibleChild private: const SwFrm* mpFrm; const SdrObject* mpDrawObj; - Window* mpWindow; + vcl::Window* mpWindow; void Init( const SdrObject* pDrawObj ); void Init( const SwFrm* pFrm ); - void Init( Window* pWindow ); + void Init( vcl::Window* pWindow ); }; } } // eof of namespace sw::access diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx index 2f387eb61d73..e0eb248cd25c 100644 --- a/sw/source/core/access/accfrmobjmap.cxx +++ b/sw/source/core/access/accfrmobjmap.cxx @@ -103,12 +103,12 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea, if ( pAccImpl && pAccImpl->HasAdditionalAccessibleChildren() ) { - std::vector< Window* >* pAdditionalChildren = - new std::vector< Window* >(); + std::vector< vcl::Window* >* pAdditionalChildren = + new std::vector< vcl::Window* >(); pAccImpl->GetAdditionalAccessibleChildren( pAdditionalChildren ); sal_Int32 nCounter( 0 ); - for ( std::vector< Window* >::iterator aIter = pAdditionalChildren->begin(); + for ( std::vector< vcl::Window* >::iterator aIter = pAdditionalChildren->begin(); aIter != pAdditionalChildren->end(); ++aIter ) { diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 0ad03a881067..64a70c94a67e 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -1411,7 +1411,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=sa VEC_SHAPE vecxShapeRemove; int nCountSelectedShape=0; - Window *pWin = GetShell()->GetWin(); + vcl::Window *pWin = GetShell()->GetWin(); bool bFocused = pWin && pWin->HasFocus(); SwAccessibleObjShape_Impl *pShape = pShapes; int nShapeCount = nShapes; @@ -1575,7 +1575,7 @@ void SwAccessibleMap::DoInvalidateShapeFocus() if( pShapes ) { - Window *pWin = GetShell()->GetWin(); + vcl::Window *pWin = GetShell()->GetWin(); bool bFocused = pWin && pWin->HasFocus(); SwAccessibleObjShape_Impl *pShape = pShapes; while( nShapes ) @@ -2201,7 +2201,7 @@ void SwAccessibleMap::RemoveContext( const SdrObject *pObj ) void SwAccessibleMap::Dispose( const SwFrm *pFrm, const SdrObject *pObj, - Window* pWindow, + vcl::Window* pWindow, bool bRecursive ) { SwAccessibleChild aFrmOrObj( pFrm, pObj, pWindow ); @@ -2328,7 +2328,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm, void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm, const SdrObject *pObj, - Window* pWindow, + vcl::Window* pWindow, const SwRect& rOldBox ) { SwAccessibleChild aFrmOrObj( pFrm, pObj, pWindow ); @@ -2928,7 +2928,7 @@ void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm ) } sal_Int32 SwAccessibleMap::GetChildIndex( const SwFrm& rParentFrm, - Window& rChild ) const + vcl::Window& rChild ) const { sal_Int32 nIndex( -1 ); @@ -3089,7 +3089,7 @@ Point SwAccessibleMap::LogicToPixel( const Point& rPoint ) const Point aPoint = rPoint; aPoint = OutputDevice::LogicToLogic( aPoint, aSrc, aDest ); - Window *pWin = GetShell()->GetWin(); + vcl::Window *pWin = GetShell()->GetWin(); if( pWin ) { MapMode aMapMode; @@ -3119,7 +3119,7 @@ Size SwAccessibleMap::LogicToPixel( const Size& rSize ) const Point SwAccessibleMap::PixelToLogic( const Point& rPoint ) const { Point aPoint; - Window *pWin = GetShell()->GetWin(); + vcl::Window *pWin = GetShell()->GetWin(); if( pWin ) { aPoint = pWin->ScreenToOutputPixel( rPoint ); diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index 75b63c90b303..3fc1420b58fe 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -59,7 +59,7 @@ void SwAccessiblePage::GetStates( ::rtl::Reference < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); if( pWin && pWin->HasFocus() ) rStateSet.AddState( AccessibleStateType::FOCUSED ); } @@ -86,7 +86,7 @@ void SwAccessiblePage::_InvalidateCursorPos() if( bOldSelected != bNewSelected ) { - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); if( pWin && pWin->HasFocus() ) FireStateChangedEvent( AccessibleStateType::FOCUSED, bNewSelected ); } @@ -94,7 +94,7 @@ void SwAccessiblePage::_InvalidateCursorPos() void SwAccessiblePage::_InvalidateFocus() { - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); if( pWin ) { bool bSelected; diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 8041a6356657..3d650b111979 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -378,7 +378,7 @@ void SwAccessibleParagraph::GetStates( pTxtNd->GetIndex() == pCaret->GetPoint()->nNode.GetIndex() && nOldCaretPos != -1) { - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); if( pWin && pWin->HasFocus() ) rStateSet.AddState( AccessibleStateType::FOCUSED ); ::rtl::Reference < SwAccessibleContext > xThis( this ); @@ -486,7 +486,7 @@ void SwAccessibleParagraph::_InvalidateCursorPos() GetMap()->SetCursorContext( xThis ); } - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); if( nOld != nNew ) { // The cursor's node position is simulated by the focus! @@ -519,7 +519,7 @@ void SwAccessibleParagraph::_InvalidateCursorPos() void SwAccessibleParagraph::_InvalidateFocus() { - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); if( pWin ) { sal_Int32 nPos; @@ -1026,7 +1026,7 @@ void SAL_CALL SwAccessibleParagraph::grabFocus() } // ->#i13955# - Window * pWindow = GetWindow(); + vcl::Window * pWindow = GetWindow(); if (pWindow != NULL) pWindow->GrabFocus(); @@ -1413,7 +1413,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa if( tabs.hasElements() ) { // translate core coordinates into accessibility coordinates - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin ); SwRect aTmpRect(0, 0, tabs[0].Position, 0); @@ -2451,7 +2451,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds( GetFrm()->GetCharRect( aCoreRect, aPosition, &aMoveState ); // translate core coordinates into accessibility coordinates - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin ); Rectangle aScreenRect( GetMap()->CoreToPixel( aCoreRect.SVRect() )); @@ -2489,7 +2489,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint ) SwPosition aPos( *pNode, aIndex ); // construct Point (translate into layout coordinates) - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin ); Point aPoint( rPoint.X, rPoint.Y ); SwRect aLogBounds( GetBounds( *(GetMap()), GetFrm() ) ); // twip rel to doc root @@ -3669,7 +3669,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getNumberOfLineWithCaret() const SwRect& aCursorCoreRect = pCrsrShell->GetCharRect(); // translate core coordinates into accessibility coordinates - Window *pWin = GetWindow(); + vcl::Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin ); Rectangle aScreenRect( GetMap()->CoreToPixel( aCursorCoreRect.SVRect() )); diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 608aff0291f0..8077fd4726dd 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2586,7 +2586,7 @@ void SwCrsrShell::ParkCrsr( const SwNodeIndex &rIdx ) Copy cursor position and add it to the ring. All views of a document are in the ring of the shell. */ -SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pInitWin ) +SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pInitWin ) : SwViewShell( rShell, pInitWin ) , SwModify( 0 ) , m_pCrsrStk( 0 ) @@ -2627,7 +2627,7 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pInitWin ) } /// default constructor -SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pInitWin, +SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin, const SwViewOption *pInitOpt ) : SwViewShell( rDoc, pInitWin, pInitOpt ) , SwModify( 0 ) diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index f53ac0b27d4d..c102401493a3 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -585,7 +585,7 @@ SwCursor* SwShellCrsr::Create( SwPaM* pRing ) const short SwShellCrsr::MaxReplaceArived() { short nRet = RET_YES; - Window* pDlg = (Window*) SwView::GetSearchDialog(); + vcl::Window* pDlg = (vcl::Window*) SwView::GetSearchDialog(); if( pDlg ) { // Terminate old actions. The table-frames get constructed and diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx index 076a60f14b0d..19e1a5f172bc 100644 --- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx +++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx @@ -228,7 +228,7 @@ void DocumentLinksAdministrationManager::UpdateLinks( bool bUI ) { SfxMedium* pMedium = m_rSwdoc.GetDocShell()->GetMedium(); SfxFrame* pFrm = pMedium ? pMedium->GetLoadTargetFrame() : 0; - Window* pDlgParent = pFrm ? &pFrm->GetWindow() : 0; + vcl::Window* pDlgParent = pFrm ? &pFrm->GetWindow() : 0; GetLinkManager().UpdateAllLinks( bAskUpdate, true, false, pDlgParent ); } diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx index 7ae86b35630b..5f44298f5a88 100644 --- a/sw/source/core/doc/DocumentRedlineManager.cxx +++ b/sw/source/core/doc/DocumentRedlineManager.cxx @@ -2649,7 +2649,7 @@ void DocumentRedlineManager::checkRedlining(RedlineMode_t& _rReadlineMode) { const SwRedlineTbl& rRedlineTbl = GetRedlineTbl(); SwEditShell* pEditShell = m_rSwdoc.GetEditShell(); - Window* pParent = pEditShell ? pEditShell->GetWin() : NULL; + vcl::Window* pParent = pEditShell ? pEditShell->GetWin() : NULL; if ( pParent && !mbReadlineChecked && rRedlineTbl.size() > MAX_REDLINE_COUNT && !((_rReadlineMode & nsRedlineMode_t::REDLINE_SHOW_DELETE) == nsRedlineMode_t::REDLINE_SHOW_DELETE) ) { diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 1033a3189a8c..78d3366cc7fb 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -119,7 +119,7 @@ const SdrPageGridFrameList* SwDPage::GetGridFrameList( return pGridLst; } -bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, +bool SwDPage::RequestHelp( vcl::Window* pWindow, SdrView* pView, const HelpEvent& rEvt ) { bool bContinue = true; diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 8e6ef06a6556..dcdfe6ee8111 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -797,7 +797,7 @@ void SwDrawView::ModelHasChanged() } } -void SwDrawView::MakeVisible( const Rectangle &rRect, Window & ) +void SwDrawView::MakeVisible( const Rectangle &rRect, vcl::Window & ) { OSL_ENSURE( rImp.GetShell()->GetWin(), "MakeVisible, unknown Window"); rImp.GetShell()->MakeVisible( SwRect( rRect ) ); diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx index 443eb6995034..97ee731d8782 100644 --- a/sw/source/core/edit/edws.cxx +++ b/sw/source/core/edit/edws.cxx @@ -32,12 +32,12 @@ #include <SwRewriter.hxx> // masqueraded copy constructor -SwEditShell::SwEditShell( SwEditShell& rEdSH, Window *pWindow ) +SwEditShell::SwEditShell( SwEditShell& rEdSH, vcl::Window *pWindow ) : SwCrsrShell( rEdSH, pWindow ) { } -SwEditShell::SwEditShell( SwDoc& rDoc, Window *pWindow, const SwViewOption *pOptions ) +SwEditShell::SwEditShell( SwDoc& rDoc, vcl::Window *pWindow, const SwViewOption *pOptions ) : SwCrsrShell( rDoc, pWindow, pOptions ) { GetDoc()->GetIDocumentUndoRedo().DoUndo(true); diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 416e05e62c5c..cddae56cac54 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -1564,7 +1564,7 @@ static const SwCellFrm *lcl_FindFrm( const SwLayoutFrm *pLay, const Point &rPt, const SwFrm* SwFEShell::GetBox( const Point &rPt, bool* pbRow, bool* pbCol ) const { const SwPageFrm *pPage = (SwPageFrm*)GetLayout()->Lower(); - Window* pOutWin = GetWin(); + vcl::Window* pOutWin = GetWin(); SwTwips nFuzzy = COLFUZZY; if( pOutWin ) { diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 45547311a881..761453ea3ae3 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -607,13 +607,13 @@ sal_uInt16 SwFEShell::GetCurOutColNum( SwGetCurColNumPara* pPara ) const return nRet; } -SwFEShell::SwFEShell( SwDoc& rDoc, Window *pWindow, const SwViewOption *pOptions ) +SwFEShell::SwFEShell( SwDoc& rDoc, vcl::Window *pWindow, const SwViewOption *pOptions ) : SwEditShell( rDoc, pWindow, pOptions ), pChainFrom( 0 ), pChainTo( 0 ), bCheckForOLEInCaption( false ) { } -SwFEShell::SwFEShell( SwEditShell& rShell, Window *pWindow ) +SwFEShell::SwFEShell( SwEditShell& rShell, vcl::Window *pWindow ) : SwEditShell( rShell, pWindow ), pChainFrom( 0 ), pChainTo( 0 ), bCheckForOLEInCaption( false ) { diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx index 5f785fd931fd..f556a8bca5dc 100644 --- a/sw/source/core/inc/dview.hxx +++ b/sw/source/core/inc/dview.hxx @@ -93,7 +93,7 @@ public: virtual void ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos, sal_uLong nNewPos ) SAL_OVERRIDE; virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const SAL_OVERRIDE; - virtual void MakeVisible( const Rectangle&, Window &rWin ) SAL_OVERRIDE; + virtual void MakeVisible( const Rectangle&, vcl::Window &rWin ) SAL_OVERRIDE; virtual void CheckPossibilities() SAL_OVERRIDE; const SwViewImp &Imp() const { return rImp; } diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 4ffe2146189c..e0c1b020a661 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2110,7 +2110,7 @@ void SwLayIdle::ShowIdle( ColorData eColorData ) if ( !m_bIndicator ) { m_bIndicator = true; - Window *pWin = pImp->GetShell()->GetWin(); + vcl::Window *pWin = pImp->GetShell()->GetWin(); if ( pWin ) { Rectangle aRect( 0, 0, 5, 5 ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index ec6189ba5560..a1a0d8d11b86 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -7537,7 +7537,7 @@ bool SwFrm::GetBackgroundBrush( } void SetOutDevAndWin( SwViewShell *pSh, OutputDevice *pO, - Window *pW, sal_uInt16 nZoom ) + vcl::Window *pW, sal_uInt16 nZoom ) { pSh->mpOut = pO; pSh->mpWin = pW; @@ -7600,7 +7600,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) const Region aRepaintRegion(aOut.SVRect()); pSh->DLPrePaint2(aRepaintRegion); - Window *pWin = pSh->GetWin(); + vcl::Window *pWin = pSh->GetWin(); sal_uInt16 nZoom = pSh->GetViewOptions()->GetZoom(); ::SetOutDevAndWin( pSh, &aDev, 0, 100 ); bFlyMetafile = true; diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx index 45acc4c1c3bd..ed381b74d6a9 100644 --- a/sw/source/core/view/viewimp.cxx +++ b/sw/source/core/view/viewimp.cxx @@ -276,7 +276,7 @@ void SwViewImp::UpdateAccessible() { // We require a layout and an XModel to be accessible. IDocumentLayoutAccess* pIDLA = GetShell()->getIDocumentLayoutAccess(); - Window *pWin = GetShell()->GetWin(); + vcl::Window *pWin = GetShell()->GetWin(); OSL_ENSURE( GetShell()->GetLayout(), "no layout, no access" ); OSL_ENSURE( pWin, "no window, no access" ); diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index a1169dbb883a..57e66a4b8719 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -87,7 +87,7 @@ bool SwViewShell::mbLstAct = false; ShellResource *SwViewShell::mpShellRes = 0; -Window *SwViewShell::mpCareWindow = 0; +vcl::Window *SwViewShell::mpCareWindow = 0; BitmapEx* SwViewShell::mpErrorBmp = NULL; BitmapEx* SwViewShell::mpReplaceBmp = NULL; @@ -124,7 +124,7 @@ lcl_PaintTransparentFormControls(SwViewShell & rShell, SwRect const& rRect) // windows has been painted, so need to paint the child windows now. if (rShell.GetWin()) { - Window& rWindow = *(rShell.GetWin()); + vcl::Window& rWindow = *(rShell.GetWin()); const Rectangle aRectanglePixel(rWindow.LogicToPixel(rRect.SVRect())); PaintTransparentChildren(rWindow, aRectanglePixel); } @@ -560,7 +560,7 @@ void SwViewShell::MakeVisible( const SwRect &rRect ) } } -Window* SwViewShell::CareChildWin(SwViewShell& rVSh) +vcl::Window* SwViewShell::CareChildWin(SwViewShell& rVSh) { if(rVSh.mpSfxViewShell) { @@ -568,7 +568,7 @@ Window* SwViewShell::CareChildWin(SwViewShell& rVSh) const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId(); SfxViewFrame* pVFrame = rVSh.mpSfxViewShell->GetViewFrame(); const SfxChildWindow* pChWin = pVFrame->GetChildWindow( nId ); - Window *pWin = pChWin ? pChWin->GetWindow() : NULL; + vcl::Window *pWin = pChWin ? pChWin->GetWindow() : NULL; if ( pWin && pWin->IsVisible() ) return pWin; #endif @@ -1241,7 +1241,7 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect // clear mpWin during DLPrePaint2 to get paint preparation for mpOut, but set it again // immediately afterwards. There are many decisions in SW which imply that Printing // is used when mpWin == 0 (wrong but widely used). - Window* pOldWin = mpWin; + vcl::Window* pOldWin = mpWin; mpWin = 0; DLPrePaint2(Region(aRect.SVRect())); mpWin = pOldWin; @@ -2088,7 +2088,7 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) if (*mpOpt == rOpt) return; - Window *pMyWin = GetWin(); + vcl::Window *pMyWin = GetWin(); if( !pMyWin ) { OSL_ENSURE( pMyWin, "SwViewShell::ApplyViewOptions: no window" ); @@ -2211,7 +2211,7 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) bool bOnlineSpl = rOpt.IsOnlineSpell(); while( pSh != this ) { pSh->mpOpt->SetOnlineSpell( bOnlineSpl ); - Window *pTmpWin = pSh->GetWin(); + vcl::Window *pTmpWin = pSh->GetWin(); if( pTmpWin ) pTmpWin->Invalidate(); pSh = (SwViewShell*)pSh->GetNext(); @@ -2421,7 +2421,7 @@ ShellResource* SwViewShell::GetShellRes() return mpShellRes; } -void SwViewShell::SetCareWin( Window* pNew ) +void SwViewShell::SetCareWin( vcl::Window* pNew ) { mpCareWindow = pNew; } diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index d25b501246dc..231abcdcb7ec 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -145,7 +145,7 @@ void SwViewShell::Init( const SwViewOption *pNewOpt ) } /// CTor for the first Shell. -SwViewShell::SwViewShell( SwDoc& rDocument, Window *pWindow, +SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window *pWindow, const SwViewOption *pNewOpt, OutputDevice *pOutput, long nFlags ) : @@ -222,7 +222,7 @@ SwViewShell::SwViewShell( SwDoc& rDocument, Window *pWindow, } /// CTor for further Shells on a document. -SwViewShell::SwViewShell( SwViewShell& rShell, Window *pWindow, +SwViewShell::SwViewShell( SwViewShell& rShell, vcl::Window *pWindow, OutputDevice *pOutput, long nFlags ) : Ring( &rShell ), maBrowseBorder( rShell.maBrowseBorder ), diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 8f3caa04904f..e0d9c542c71b 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -124,7 +124,7 @@ IMPL_LINK_NOARG(SwBreakDlg, OkHdl) return 0; } -SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) +SwBreakDlg::SwBreakDlg( vcl::Window *pParent, SwWrtShell &rS ) : SvxStandardDialog(pParent, "BreakDialog", "modules/swriter/ui/insertbreak.ui") , rSh(rS) , nKind(0) diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 44ea050e3b31..1df4d1bd0bae 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::sfx2; -SwCharDlg::SwCharDlg(Window* pParent, SwView& rVw, const SfxItemSet& rCoreSet, +SwCharDlg::SwCharDlg(vcl::Window* pParent, SwView& rVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pStr) : SfxTabDialog(0, pParent, "CharacterPropertiesDialog", "modules/swriter/ui/characterproperties.ui", &rCoreSet, pStr != 0) @@ -133,7 +133,7 @@ void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } } -SwCharURLPage::SwCharURLPage(Window* pParent, const SfxItemSet& rCoreSet) +SwCharURLPage::SwCharURLPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "CharURLPage", "modules/swriter/ui/charurlpage.ui", &rCoreSet) , pINetItem(0) , bModified(false) @@ -278,7 +278,7 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet) return bModified; } -SfxTabPage* SwCharURLPage::Create( Window* pParent, +SfxTabPage* SwCharURLPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwCharURLPage( pParent, *rAttrSet ) ); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 8a6b14a84a26..f8ad84f64c01 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -101,7 +101,7 @@ class SwDropCapsPict : public Control public: - SwDropCapsPict(Window *pParent, WinBits nBits) + SwDropCapsPict(vcl::Window *pParent, WinBits nBits) : Control(pParent, nBits) , mpPage(NULL) , mnLines(0) @@ -130,7 +130,7 @@ public: void DrawPrev( const Point& rPt ); }; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwDropCapsPict(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwDropCapsPict(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwDropCapsPict(pParent, WB_BORDER); } @@ -506,7 +506,7 @@ void SwDropCapsPict::_InitPrinter() } } -SwDropCapsDlg::SwDropCapsDlg(Window *pParent, const SfxItemSet &rSet ) +SwDropCapsDlg::SwDropCapsDlg(vcl::Window *pParent, const SfxItemSet &rSet ) : SfxSingleTabDialog(pParent, rSet) { SwDropCapsPage* pNewPage = (SwDropCapsPage*) SwDropCapsPage::Create(get_content_area(), &rSet); @@ -514,7 +514,7 @@ SwDropCapsDlg::SwDropCapsDlg(Window *pParent, const SfxItemSet &rSet ) SetTabPage(pNewPage); } -SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) +SwDropCapsPage::SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "DropCapPage","modules/swriter/ui/dropcapspage.ui", &rSet) , bModified(false) , bFormat(true) @@ -575,7 +575,7 @@ int SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet) return LEAVE_PAGE; } -SfxTabPage* SwDropCapsPage::Create(Window *pParent, +SfxTabPage* SwDropCapsPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwDropCapsPage(pParent, *rSet); diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 251d905e9f29..b9ee893ab9e9 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -38,7 +38,7 @@ static const sal_uInt16 aPageRg[] = { 0 }; -SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent, const SfxItemSet& rAttr ) : +SwParagraphNumTabPage::SwParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rAttr ) : SfxTabPage(pParent, "NumParaPage", "modules/swriter/ui/numparapage.ui", &rAttr), msOutlineNumbering( SW_RES( STR_OUTLINE_NUMBERING ) ), @@ -90,7 +90,7 @@ SwParagraphNumTabPage::~SwParagraphNumTabPage() { } -SfxTabPage* SwParagraphNumTabPage::Create( Window* pParent, +SfxTabPage* SwParagraphNumTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SwParagraphNumTabPage(pParent, *rSet); diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 76106d3adeb3..58b4a43187b9 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -44,7 +44,7 @@ #include <svx/dialogs.hrc> #include <svx/flagsdef.hxx> -SwParaDlg::SwParaDlg(Window *pParent, +SwParaDlg::SwParaDlg(vcl::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index fba43369a1a4..8891aff311fd 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -50,7 +50,7 @@ static long nTabs[] = 0, 100 }; -SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) +SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "ConditionPage", "modules/swriter/ui/conditionpage.ui", &rSet) , @@ -137,7 +137,7 @@ int SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) return LEAVE_PAGE; } -SfxTabPage* SwCondCollPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwCondCollPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwCondCollPage(pParent, *rSet); } diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx index de6538e72c4b..77031502a2ce 100644 --- a/sw/source/ui/chrdlg/tblnumfm.cxx +++ b/sw/source/ui/chrdlg/tblnumfm.cxx @@ -29,7 +29,7 @@ #include <svl/itemset.hxx> #include <sfx2/tabdlg.hxx> -SwNumFmtDlg::SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet) +SwNumFmtDlg::SwNumFmtDlg(vcl::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "FormatNumberDialog", "cui/ui/formatnumberdialog.ui") { diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 448eca502d41..66206a22dd5c 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -112,7 +112,7 @@ public: virtual ~SwAuthenticationSettingsDialog(); }; -SwMailConfigPage::SwMailConfigPage( Window* pParent, const SfxItemSet& rSet ) : +SwMailConfigPage::SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "MailConfigPage" , "modules/swriter/ui/mailconfigpage.ui", &rSet), m_pConfigItem( new SwMailMergeConfigItem ) @@ -138,7 +138,7 @@ SwMailConfigPage::~SwMailConfigPage() delete m_pConfigItem; } -SfxTabPage* SwMailConfigPage::Create( Window* pParent, const SfxItemSet* rAttrSet) +SfxTabPage* SwMailConfigPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwMailConfigPage(pParent, *rAttrSet); } @@ -351,7 +351,7 @@ void SwTestAccountSettingsDialog::Test() } } -SwMailConfigDlg::SwMailConfigDlg(Window* pParent, SfxItemSet& rSet) +SwMailConfigDlg::SwMailConfigDlg(vcl::Window* pParent, SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet) { // create TabPage diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 93b740343b65..29d8a8bbc6b4 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -91,7 +91,7 @@ struct SwCompatibilityOptPage_Impl SwCompatibilityItemList m_aList; }; -SwCompatibilityOptPage::SwCompatibilityOptPage(Window* pParent, const SfxItemSet& rSet) +SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptCompatPage", "modules/swriter/ui/optcompatpage.ui", &rSet) , m_pWrtShell(NULL) @@ -400,7 +400,7 @@ void SwCompatibilityOptPage::WriteOptions() pItem->m_bExpandWordSpace ); } -SfxTabPage* SwCompatibilityOptPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SwCompatibilityOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwCompatibilityOptPage( pParent, *rAttrSet ); } diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 564ed0aeab88..b8fbe5713467 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -62,7 +62,7 @@ using namespace ::com::sun::star; #include <svl/eitem.hxx> -SwLoadOptPage::SwLoadOptPage(Window* pParent, const SfxItemSet& rSet) +SwLoadOptPage::SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptGeneralPage", "modules/swriter/ui/optgeneralpage.ui", &rSet) , m_pWrtShell(NULL) @@ -125,7 +125,7 @@ SwLoadOptPage::SwLoadOptPage(Window* pParent, const SfxItemSet& rSet) m_pShowStandardizedPageCount->SetClickHdl(aLink); } -SfxTabPage* SwLoadOptPage::Create( Window* pParent, +SfxTabPage* SwLoadOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwLoadOptPage(pParent, *rAttrSet ); @@ -350,7 +350,7 @@ IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl) return 0; } -SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet) +SwCaptionOptDlg::SwCaptionOptDlg(vcl::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet, "CaptionDialog", "modules/swriter/ui/captiondialog.ui") { @@ -358,13 +358,13 @@ SwCaptionOptDlg::SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet) SetTabPage(SwCaptionOptPage::Create(get_content_area(), &rSet)); } -SwCaptionPreview::SwCaptionPreview( Window* pParent, WinBits nStyle ) +SwCaptionPreview::SwCaptionPreview( vcl::Window* pParent, WinBits nStyle ) : Window( pParent, nStyle ) { Init(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwCaptionPreview(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwCaptionPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -409,7 +409,7 @@ void SwCaptionPreview::Paint( const Rectangle& rRect ) DrawText( Point( 4, 6 ), maText ); } -SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) +SwCaptionOptPage::SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptCaptionPage", "modules/swriter/ui/optcaptionpage.ui", &rSet) , m_sSWTable(SW_RESSTR(STR_CAPTION_TABLE)) , m_sSWFrame(SW_RESSTR(STR_CAPTION_FRAME)) @@ -522,7 +522,7 @@ SwCaptionOptPage::~SwCaptionOptPage() delete pMgr; } -SfxTabPage* SwCaptionOptPage::Create( Window* pParent, +SfxTabPage* SwCaptionOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwCaptionOptPage(pParent, *rAttrSet ); @@ -888,7 +888,7 @@ void CaptionComboBox::KeyInput(const KeyEvent& rEvt) SwComboBox::KeyInput(rEvt); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCaptionComboBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCaptionComboBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; bool bDropdown = VclBuilder::extractDropdown(rMap); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 5507ebf11137..9d7a6f408e65 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -71,7 +71,7 @@ using namespace ::com::sun::star; // Tools->Options->Writer->View // Tools->Options->Writer/Web->View -SwContentOptPage::SwContentOptPage( Window* pParent, +SwContentOptPage::SwContentOptPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SfxTabPage(pParent, "ViewOptionsPage", "modules/swriter/ui/viewoptionspage.ui", &rCoreSet) @@ -158,7 +158,7 @@ SwContentOptPage::~SwContentOptPage() { } -SfxTabPage* SwContentOptPage::Create( Window* pParent, +SfxTabPage* SwContentOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwContentOptPage(pParent, *rAttrSet); @@ -284,7 +284,7 @@ IMPL_LINK( SwContentOptPage, AnyRulerHdl, CheckBox*, pBox) } // TabPage Printer additional settings -SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent, +SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage(pParent, "PrintOptionsPage", "modules/swriter/ui/printoptionspage.ui", &rCoreSet) @@ -361,7 +361,7 @@ void SwAddPrinterTabPage::SetPreview(bool bPrev) m_pPagesFrame->Enable(!bPreview); } -SfxTabPage* SwAddPrinterTabPage::Create( Window* pParent, +SfxTabPage* SwAddPrinterTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwAddPrinterTabPage( pParent, *rAttrSet ) ); @@ -506,7 +506,7 @@ void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet) } // Tabpage Standardfonts -SwStdFontTabPage::SwStdFontTabPage( Window* pParent, +SwStdFontTabPage::SwStdFontTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "OptFontTabPage" , "modules/swriter/ui/optfonttabpage.ui" , &rSet), pPrt(0), @@ -587,7 +587,7 @@ SwStdFontTabPage::~SwStdFontTabPage() } } -SfxTabPage* SwStdFontTabPage::Create( Window* pParent, +SfxTabPage* SwStdFontTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwStdFontTabPage(pParent, *rAttrSet); @@ -1061,7 +1061,7 @@ void SwStdFontTabPage::PageCreated( const SfxAllItemSet& aSet) SetFontMode(sal::static_int_cast< sal_uInt8, sal_uInt16>( pFlagItem->GetValue())); } -SwTableOptionsTabPage::SwTableOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) : +SwTableOptionsTabPage::SwTableOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptTablePage", "modules/swriter/ui/opttablepage.ui", &rSet), pWrtShell(0), bHTMLMode(false) @@ -1091,7 +1091,7 @@ SwTableOptionsTabPage::~SwTableOptionsTabPage() { } -SfxTabPage* SwTableOptionsTabPage::Create( Window* pParent, +SfxTabPage* SwTableOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwTableOptionsTabPage(pParent, *rAttrSet ); @@ -1259,7 +1259,7 @@ void SwTableOptionsTabPage::PageCreated( const SfxAllItemSet& aSet) SetWrtShell(pWrtSh->GetValue()); } -SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent, +SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptFormatAidsPage", "modules/swriter/ui/optformataidspage.ui", &rSet), @@ -1325,7 +1325,7 @@ SwShdwCrsrOptionsTabPage::~SwShdwCrsrOptionsTabPage() { } -SfxTabPage* SwShdwCrsrOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SwShdwCrsrOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SwShdwCrsrOptionsTabPage( pParent, *rSet ); } @@ -1477,7 +1477,7 @@ static sal_uInt16 aDeletedAttrMap[] = { 0, 1, 2, 5, 6, 7, 8, 9, 10 }; static sal_uInt16 aChangedAttrMap[] = { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10 }; // Preview of selection -SwMarkPreview::SwMarkPreview( Window *pParent, WinBits nWinBits ) : +SwMarkPreview::SwMarkPreview( vcl::Window *pParent, WinBits nWinBits ) : Window(pParent, nWinBits), m_aTransCol( COL_TRANSPARENT ), @@ -1490,7 +1490,7 @@ SwMarkPreview::SwMarkPreview( Window *pParent, WinBits nWinBits ) : SetMapMode(MAP_PIXEL); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwMarkPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwMarkPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwMarkPreview(pParent, 0); } @@ -1653,7 +1653,7 @@ namespace } } -SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent, +SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, "OptRedLinePage", "modules/swriter/ui/optredlinepage.ui" , &rSet) @@ -1687,7 +1687,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent, pChangedPreviewWN->set_width_request(aPreviewSize.Width()); pMarkPreviewWN->set_width_request(aPreviewSize.Width()); - sAuthor = get<Window>("byauthor")->GetText(); + sAuthor = get<vcl::Window>("byauthor")->GetText(); for (sal_Int32 i = 0; i < pInsertLB->GetEntryCount(); ++i) { @@ -1728,7 +1728,7 @@ SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage() { } -SfxTabPage* SwRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwRedlineOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) { return new SwRedlineOptionsTabPage( pParent, *rSet ); } @@ -2205,7 +2205,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin) rExampleWin.Invalidate(); } -SwCompareOptionsTabPage::SwCompareOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) +SwCompareOptionsTabPage::SwCompareOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent,"OptComparison","modules/swriter/ui/optcomparison.ui", &rSet ) { get(m_pAutoRB,"auto"); @@ -2228,7 +2228,7 @@ SwCompareOptionsTabPage::~SwCompareOptionsTabPage() { } -SfxTabPage* SwCompareOptionsTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* SwCompareOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwCompareOptionsTabPage( pParent, *rAttrSet ); } @@ -2333,7 +2333,7 @@ IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl) #ifdef DBG_UTIL -SwTestTabPage::SwTestTabPage(Window* pParent, const SfxItemSet& rCoreSet) +SwTestTabPage::SwTestTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage( pParent, "OptTestPage", "modules/swriter/ui/opttestpage.ui", &rCoreSet) , bAttrModified( false ) { @@ -2352,7 +2352,7 @@ SwTestTabPage::SwTestTabPage(Window* pParent, const SfxItemSet& rCoreSet) } -SfxTabPage* SwTestTabPage::Create( Window* pParent, +SfxTabPage* SwTestTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new SwTestTabPage(pParent, *rAttrSet); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 8580b271034e..9b72fd4ef8d1 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -72,7 +72,7 @@ class SwAddressControl_Impl : public Control using Window::SetData; public: - SwAddressControl_Impl(Window* pParent , WinBits nBits ); + SwAddressControl_Impl(vcl::Window* pParent , WinBits nBits ); virtual ~SwAddressControl_Impl(); void SetData(SwCSVData& rDBData); @@ -83,10 +83,10 @@ public: virtual void Resize() SAL_OVERRIDE; }; -SwAddressControl_Impl::SwAddressControl_Impl(Window* pParent, WinBits nBits ) : +SwAddressControl_Impl::SwAddressControl_Impl(vcl::Window* pParent, WinBits nBits ) : Control(pParent, nBits), m_pScrollBar(new ScrollBar(this)), - m_pWindow(new Window(this, WB_DIALOGCONTROL)), + m_pWindow(new vcl::Window(this, WB_DIALOGCONTROL)), m_pData(0), m_nLineHeight(0), m_nCurrentDataSet(0), @@ -106,7 +106,7 @@ SwAddressControl_Impl::SwAddressControl_Impl(Window* pParent, WinBits nBits ) : m_pScrollBar->EnableDrag(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwAddressControlImpl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwAddressControlImpl(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwAddressControl_Impl(pParent, WB_BORDER | WB_DIALOGCONTROL); } @@ -390,7 +390,7 @@ void SwAddressControl_Impl::Resize() } SwCreateAddressListDialog::SwCreateAddressListDialog( - Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig) : + vcl::Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig) : SfxModalDialog(pParent, "CreateAddressList", "modules/swriter/ui/createaddresslist.ui"), m_sAddressListFilterName( SW_RES( ST_FILTERNAME)), m_sURL(rURL), diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index f14461078e7c..393c5a79b71e 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -74,7 +74,7 @@ class SwCreateAddressListDialog : public SfxModalDialog public: SwCreateAddressListDialog( - Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig); + vcl::Window* pParent, const OUString& rURL, SwMailMergeConfigItem& rConfig); virtual ~SwCreateAddressListDialog(); const OUString& GetURL() const { return m_sURL; } diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index 7d3c7af83f3b..3a83b7ab97dd 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -27,7 +27,7 @@ #include <boost/scoped_ptr.hpp> SwCustomizeAddressListDialog::SwCustomizeAddressListDialog( - Window* pParent, const SwCSVData& rOldData) + vcl::Window* pParent, const SwCSVData& rOldData) : SfxModalDialog(pParent, "CustomizeAddrListDialog", "modules/swriter/ui/customizeaddrlistdialog.ui") , m_pNewData( new SwCSVData(rOldData)) @@ -173,7 +173,7 @@ void SwCustomizeAddressListDialog::UpdateButtons() SwAddRenameEntryDialog::SwAddRenameEntryDialog( - Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const std::vector< OUString >& rCSVHeader) : SfxModalDialog(pParent, rID, rUIXMLDescription) , m_rCSVHeader(rCSVHeader) diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx index b11931d153a3..176debe9a26d 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx @@ -47,7 +47,7 @@ class SwCustomizeAddressListDialog : public SfxModalDialog void UpdateButtons(); public: - SwCustomizeAddressListDialog(Window* pParent, const SwCSVData& rOldData); + SwCustomizeAddressListDialog(vcl::Window* pParent, const SwCSVData& rOldData); virtual ~SwCustomizeAddressListDialog(); SwCSVData* GetNewData() { return m_pNewData;} @@ -61,7 +61,7 @@ class SwAddRenameEntryDialog : public SfxModalDialog DECL_LINK(ModifyHdl_Impl, Edit*); protected: - SwAddRenameEntryDialog(Window* pParent, const OString& rID, + SwAddRenameEntryDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const std::vector< OUString >& rCSVHeader); public: void SetFieldName(const OUString& rName) {m_pFieldNameED->SetText(rName);} @@ -72,7 +72,7 @@ public: class SwAddEntryDialog : public SwAddRenameEntryDialog { public: - SwAddEntryDialog(Window* pParent, const std::vector< OUString >& rCSVHeader) + SwAddEntryDialog(vcl::Window* pParent, const std::vector< OUString >& rCSVHeader) : SwAddRenameEntryDialog(pParent, "AddEntryDialog", "modules/swriter/ui/addentrydialog.ui", rCSVHeader) { @@ -82,7 +82,7 @@ public: class SwRenameEntryDialog : public SwAddRenameEntryDialog { public: - SwRenameEntryDialog(Window* pParent, const std::vector< OUString >& rCSVHeader) + SwRenameEntryDialog(vcl::Window* pParent, const std::vector< OUString >& rCSVHeader) : SwAddRenameEntryDialog(pParent, "RenameEntryDialog", "modules/swriter/ui/renameentrydialog.ui", rCSVHeader) { diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx index e71ccc78fc22..060d1ceecbe3 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::util; using namespace ::rtl; -SwDBTablePreviewDialog::SwDBTablePreviewDialog(Window* pParent, uno::Sequence< beans::PropertyValue>& rValues ) : +SwDBTablePreviewDialog::SwDBTablePreviewDialog(vcl::Window* pParent, uno::Sequence< beans::PropertyValue>& rValues ) : SfxModalDialog(pParent, "TablePreviewDialog", "modules/swriter/ui/tablepreviewdialog.ui") { get(m_pDescriptionFI, "description"); diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx index e32b1ef3808a..e99b7f457525 100644 --- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx +++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx @@ -32,11 +32,11 @@ namespace com{ namespace sun{ namespace star{ class SwDBTablePreviewDialog : public SfxModalDialog { FixedText* m_pDescriptionFI; - Window* m_pBeamerWIN; + vcl::Window* m_pBeamerWIN; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > m_xFrame; public: - SwDBTablePreviewDialog(Window* pParent, + SwDBTablePreviewDialog(vcl::Window* pParent, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rValues ); virtual ~SwDBTablePreviewDialog(); diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 6ad8133c4b84..0da4e9694aa9 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -297,7 +297,7 @@ IMPL_LINK(SwMailMergeAddressBlockPage, InsertDataHdl_Impl, ImageButton*, pButton } SwSelectAddressBlockDialog::SwSelectAddressBlockDialog( - Window* pParent, SwMailMergeConfigItem& rConfig) + vcl::Window* pParent, SwMailMergeConfigItem& rConfig) : SfxModalDialog(pParent, "SelectBlockDialog", "modules/swriter/ui/selectblockdialog.ui") , m_rConfig(rConfig) @@ -452,7 +452,7 @@ IMPL_LINK(SwSelectAddressBlockDialog, IncludeHdl_Impl, RadioButton*, pButton) #define USER_DATA_NONE -4 SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( - Window* pParent, SwMailMergeConfigItem& rConfig, DialogType eType) + vcl::Window* pParent, SwMailMergeConfigItem& rConfig, DialogType eType) : SfxModalDialog(pParent, "AddressBlockDialog", "modules/swriter/ui/addressblockdialog.ui") , m_aTextFilter("<>") @@ -771,7 +771,7 @@ class SwAssignFieldsControl : public Control void MakeVisible( sal_Int32 nIndex ); public: - SwAssignFieldsControl(Window* pParent, WinBits nBits); + SwAssignFieldsControl(vcl::Window* pParent, WinBits nBits); virtual ~SwAssignFieldsControl(); void Init(SwMailMergeConfigItem& rConfigItem); @@ -784,12 +784,12 @@ public: virtual Size GetOptimalSize() const SAL_OVERRIDE; }; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwAssignFieldsControl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwAssignFieldsControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwAssignFieldsControl(pParent, WB_BORDER); } -SwAssignFieldsControl::SwAssignFieldsControl(Window* pParent, WinBits nBits) : +SwAssignFieldsControl::SwAssignFieldsControl(vcl::Window* pParent, WinBits nBits) : Control(pParent, nBits | WB_DIALOGCONTROL | WB_TABSTOP | WB_DIALOGCONTROL), m_aVScroll(this), m_aHeaderHB(this, WB_BUTTONSTYLE | WB_BOTTOMBORDER), @@ -1104,7 +1104,7 @@ IMPL_LINK(SwAssignFieldsControl, GotFocusHdl_Impl, ListBox*, pBox) } SwAssignFieldsDialog::SwAssignFieldsDialog( - Window* pParent, SwMailMergeConfigItem& rConfigItem, + vcl::Window* pParent, SwMailMergeConfigItem& rConfigItem, const OUString& rPreview, bool bIsAddressBlock) : SfxModalDialog(pParent, "AssignFieldsDialog", "modules/swriter/ui/assignfieldsdialog.ui"), @@ -1187,7 +1187,7 @@ IMPL_LINK_NOARG(SwAssignFieldsDialog, AssignmentModifyHdl_Impl) return 0; } -DDListBox::DDListBox(Window* pParent, WinBits nStyle) +DDListBox::DDListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) , m_pParentDialog(NULL) { @@ -1202,7 +1202,7 @@ DDListBox::DDListBox(Window* pParent, WinBits nStyle) } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDDListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDDListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1237,7 +1237,7 @@ void DDListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ ) } } -AddressMultiLineEdit::AddressMultiLineEdit(Window* pParent, WinBits nBits) +AddressMultiLineEdit::AddressMultiLineEdit(vcl::Window* pParent, WinBits nBits) : VclMultiLineEdit(pParent, nBits) , m_pParentDialog(NULL) { @@ -1251,7 +1251,7 @@ Size AddressMultiLineEdit::GetOptimalSize() const return LogicToPixel(Size(160, 60), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAddressMultiLineEdit(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAddressMultiLineEdit(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_LEFT|WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index c3d0d5698c84..6824bed6f897 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -104,7 +104,7 @@ class SwSelectAddressBlockDialog : public SfxModalDialog using Window::SetSettings; public: - SwSelectAddressBlockDialog(Window* pParent, SwMailMergeConfigItem& rConfig); + SwSelectAddressBlockDialog(vcl::Window* pParent, SwMailMergeConfigItem& rConfig); virtual ~SwSelectAddressBlockDialog(); void SetAddressBlocks(const com::sun::star::uno::Sequence< OUString>& rBlocks, @@ -121,7 +121,7 @@ class DDListBox : public SvTreeListBox { SwCustomizeAddressBlockDialog* m_pParentDialog; public: - DDListBox(Window* pParent, const WinBits nStyle); + DDListBox(vcl::Window* pParent, const WinBits nStyle); void SetAddressDialog(SwCustomizeAddressBlockDialog *pParent); @@ -145,7 +145,7 @@ class AddressMultiLineEdit : public VclMultiLineEdit, public SfxListener protected: bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - AddressMultiLineEdit(Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER); + AddressMultiLineEdit(vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER); virtual ~AddressMultiLineEdit(); void SetAddressDialog(SwCustomizeAddressBlockDialog *pParent); @@ -226,7 +226,7 @@ private: void UpdateImageButtons_Impl(); public: - SwCustomizeAddressBlockDialog(Window* pParent, SwMailMergeConfigItem& rConfig, DialogType); + SwCustomizeAddressBlockDialog(vcl::Window* pParent, SwMailMergeConfigItem& rConfig, DialogType); virtual ~SwCustomizeAddressBlockDialog(); void SetAddress(const OUString& rAddress); @@ -255,7 +255,7 @@ class SwAssignFieldsDialog : public SfxModalDialog DECL_LINK(AssignmentModifyHdl_Impl, void*); public: - SwAssignFieldsDialog(Window* pParent, + SwAssignFieldsDialog(vcl::Window* pParent, SwMailMergeConfigItem& rConfigItem, const OUString& rPreview, bool bIsAddressBlock); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 1a552481bafd..8fa98e1a8938 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -397,7 +397,7 @@ IMPL_LINK(SwMailMergeGreetingsPage, InsertDataHdl_Impl, ImageButton*, pButton) return 0; } -SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard) : +SwMailBodyDialog::SwMailBodyDialog(vcl::Window* pParent, SwMailMergeWizard* _pWizard) : SfxModalDialog(pParent, "MailBodyDialog", "modules/swriter/ui/mmmailbody.ui") { m_pWizard = _pWizard; diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index fa94bc1e0a07..d74b54224df9 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -103,7 +103,7 @@ class SwMailBodyDialog : public SfxModalDialog, public SwGreetingsHandler DECL_LINK(ContainsHdl_Impl, CheckBox*); DECL_LINK(OKHdl, void *); public: - SwMailBodyDialog(Window* pParent, SwMailMergeWizard* pWizard); + SwMailBodyDialog(vcl::Window* pParent, SwMailMergeWizard* pWizard); virtual ~SwMailBodyDialog(); void SetBody(const OUString& rBody ) {m_pBodyMLE->SetText(rBody);} diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 9a66780a39e8..c770705dccc5 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -49,7 +49,7 @@ class SwMailMergeLayoutPage : public svt::OWizardPage PushButton* m_pUpPB; PushButton* m_pDownPB; - Window* m_pExampleContainerWIN; + vcl::Window* m_pExampleContainerWIN; ListBox* m_pZoomLB; diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 581ed8d7cfd4..f1ced0275ccb 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -120,7 +120,7 @@ class SwSaveWarningBox_Impl : public SwMessageAndEditDialog { DECL_LINK( ModifyHdl, Edit*); public: - SwSaveWarningBox_Impl(Window* pParent, const OUString& rFileName); + SwSaveWarningBox_Impl(vcl::Window* pParent, const OUString& rFileName); OUString GetFileName() const { @@ -133,7 +133,7 @@ class SwSendQueryBox_Impl : public SwMessageAndEditDialog bool bIsEmptyAllowed; DECL_LINK( ModifyHdl, Edit*); public: - SwSendQueryBox_Impl(Window* pParent, const OString& rID, + SwSendQueryBox_Impl(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); void SetValue(const OUString& rSet) @@ -154,7 +154,7 @@ public: } }; -SwSaveWarningBox_Impl::SwSaveWarningBox_Impl(Window* pParent, const OUString& rFileName) +SwSaveWarningBox_Impl::SwSaveWarningBox_Impl(vcl::Window* pParent, const OUString& rFileName) : SwMessageAndEditDialog(pParent, "AlreadyExistsDialog", "modules/swriter/ui/alreadyexistsdialog.ui") { @@ -174,7 +174,7 @@ IMPL_LINK( SwSaveWarningBox_Impl, ModifyHdl, Edit*, pEdit) return 0; } -SwSendQueryBox_Impl::SwSendQueryBox_Impl(Window* pParent, const OString& rID, +SwSendQueryBox_Impl::SwSendQueryBox_Impl(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : SwMessageAndEditDialog(pParent, rID, rUIXMLDescription) , bIsEmptyAllowed(true) @@ -196,7 +196,7 @@ class SwCopyToDialog : public SfxModalDialog Edit* m_pBCCED; public: - SwCopyToDialog(Window* pParent) + SwCopyToDialog(vcl::Window* pParent) : SfxModalDialog(pParent, "CCDialog", "modules/swriter/ui/ccdialog.ui") { @@ -348,7 +348,7 @@ bool SwMailMergeOutputPage::canAdvance() const IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) { - Window* aControls[] = + vcl::Window* aControls[] = { m_pSaveStartDocPB, m_pSaveAsOneRB, m_pSaveIndividualRB, @@ -364,7 +364,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) 0 }; SetUpdateMode(true); - Window** pControl = aControls; + vcl::Window** pControl = aControls; do { (*pControl)->Show(false); @@ -420,7 +420,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) } else { - Window* aMailControls[] = + vcl::Window* aMailControls[] = { m_pFromRB, m_pFromNF, m_pToFT, m_pToNF, m_pMailToFT, m_pMailToLB, m_pCopyToPB, @@ -429,7 +429,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) m_pAttachmentGroup, m_pSendAllRB, m_pSendDocumentsPB, 0 }; - Window** pMailControl = aMailControls; + vcl::Window** pMailControl = aMailControls; do { (*pMailControl)->Show(true); diff --git a/sw/source/ui/dbui/mmoutputpage.hxx b/sw/source/ui/dbui/mmoutputpage.hxx index df8030ec5ca4..42256f407f22 100644 --- a/sw/source/ui/dbui/mmoutputpage.hxx +++ b/sw/source/ui/dbui/mmoutputpage.hxx @@ -188,7 +188,7 @@ class SwSendMailDialog : public ModelessDialog //SfxModalDialog virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; public: - SwSendMailDialog( Window* pParent, SwMailMergeConfigItem& ); + SwSendMailDialog( vcl::Window* pParent, SwMailMergeConfigItem& ); virtual ~SwSendMailDialog(); void AddDocument( SwMailDescriptor& rDesc ); diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index ca442c0b786f..a587b1c9f21e 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -209,10 +209,10 @@ class SwSendWarningBox_Impl : public MessageDialog { VclMultiLineEdit *m_pDetailED; public: - SwSendWarningBox_Impl(Window* pParent, const OUString& rDetails); + SwSendWarningBox_Impl(vcl::Window* pParent, const OUString& rDetails); }; -SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const OUString& rDetails) +SwSendWarningBox_Impl::SwSendWarningBox_Impl(vcl::Window* pParent, const OUString& rDetails) : MessageDialog(pParent, "WarnEmailDialog", "modules/swriter/ui/warnemaildialog.ui") { get(m_pDetailED, "errors"); @@ -225,7 +225,7 @@ SwSendWarningBox_Impl::SwSendWarningBox_Impl(Window* pParent, const OUString& rD #define ITEMID_TASK 1 #define ITEMID_STATUS 2 -SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConfigItem) : +SwSendMailDialog::SwSendMailDialog(vcl::Window *pParent, SwMailMergeConfigItem& rConfigItem) : ModelessDialog /*SfxModalDialog*/(pParent, "SendMailsDialog", "modules/swriter/ui/mmsendmails.ui"), m_pTransferStatus(get<FixedText>("transferstatus")), m_pPaused(get<FixedText>("paused")), diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 2724e3556cda..949368c267d0 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -90,7 +90,7 @@ void SwAddressTable::setColSizes() SvSimpleTable::SetTabs(&nTabs_Impl[0], MAP_PIXEL); } -SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent, +SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent, const uno::Reference< sdbc::XConnection>& rConnection) : SfxModalDialog(pParent, "SelectTableDialog", "modules/swriter/ui/selecttabledialog.ui") , m_sName(SW_RES(ST_NAME)) diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx index 1668e81f48b3..729675e831b9 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.hxx +++ b/sw/source/ui/dbui/selectdbtabledialog.hxx @@ -47,7 +47,7 @@ class SwSelectDBTableDialog : public SfxModalDialog DECL_LINK(PreviewHdl, PushButton*); public: - SwSelectDBTableDialog(Window* pParent, + SwSelectDBTableDialog(vcl::Window* pParent, const css::uno::Reference<css::sdbc::XConnection>& xConnection); virtual ~SwSelectDBTableDialog(); diff --git a/sw/source/ui/dialog/abstract.cxx b/sw/source/ui/dialog/abstract.cxx index 8b18722fb888..f33577268b82 100644 --- a/sw/source/ui/dialog/abstract.cxx +++ b/sw/source/ui/dialog/abstract.cxx @@ -23,7 +23,7 @@ #include "dialog.hrc" #include "abstract.hxx" -SwInsertAbstractDlg::SwInsertAbstractDlg(Window* pParent) +SwInsertAbstractDlg::SwInsertAbstractDlg(vcl::Window* pParent) : SfxModalDialog(pParent, "AbstractDialog", "modules/swriter/ui/abstractdialog.ui") { diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx index b6e12153cc53..2370e35a6c4d 100644 --- a/sw/source/ui/dialog/addrdlg.cxx +++ b/sw/source/ui/dialog/addrdlg.cxx @@ -21,7 +21,7 @@ #include <svx/svxdlg.hxx> #include <sfx2/sfx.hrc> -SwAddrDlg::SwAddrDlg(Window* pParent, const SfxItemSet& rSet) +SwAddrDlg::SwAddrDlg(vcl::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 5c498d4f1b3f..d8e8f93a1517 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -54,7 +54,7 @@ const sal_Int32 nDialogExtraDataLen = 11; // 12345678901 } -SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, +SwAsciiFilterDlg::SwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ) : SfxModalDialog(pParent, "AsciiFilterDialog", "modules/swriter/ui/asciifilterdialog.ui") , m_bSaveLineStatus(true) diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 66a2362d46a5..d9760b6eb0ab 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -36,12 +36,12 @@ #include <unotools/localedatawrapper.hxx> #include <vcl/settings.hxx> -SfxTabPage * SwDocStatPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage * SwDocStatPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwDocStatPage(pParent, *rSet); } -SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) +SwDocStatPage::SwDocStatPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "StatisticsInfoPage", "modules/swriter/ui/statisticsinfopage.ui", &rSet) diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index 2938f272f2b9..97b445e1a3c2 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -106,7 +106,7 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) return aItem; } -bool SwMacroAssignDlg::INetFmtDlg( Window* pParent, SwWrtShell& rSh, +bool SwMacroAssignDlg::INetFmtDlg( vcl::Window* pParent, SwWrtShell& rSh, SvxMacroItem*& rpINetItem ) { bool bRet = false; diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 70f3f93f7e1a..b62e4223ccda 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -368,9 +368,9 @@ void AbstractSwFldDlg_Impl::ActivateDatabasePage() pDlg->ActivateDatabasePage(); } -Window* AbstractSwFldDlg_Impl::GetWindow() +vcl::Window* AbstractSwFldDlg_Impl::GetWindow() { - return (Window*)pDlg; + return (vcl::Window*)pDlg; } void AbstractSwFldDlg_Impl::ShowReferencePage() @@ -563,9 +563,9 @@ void AbstractIndexMarkFloatDlg_Impl::ReInitDlg(SwWrtShell& rWrtShell) pDlg->ReInitDlg( rWrtShell); } -Window* AbstractIndexMarkFloatDlg_Impl::GetWindow() +vcl::Window* AbstractIndexMarkFloatDlg_Impl::GetWindow() { - return (Window*)pDlg; + return (vcl::Window*)pDlg; } void AbstractAuthMarkFloatDlg_Impl::ReInitDlg(SwWrtShell& rWrtShell) @@ -573,14 +573,14 @@ void AbstractAuthMarkFloatDlg_Impl::ReInitDlg(SwWrtShell& rWrtShell) pDlg->ReInitDlg( rWrtShell); } -Window* AbstractAuthMarkFloatDlg_Impl::GetWindow() +vcl::Window* AbstractAuthMarkFloatDlg_Impl::GetWindow() { - return (Window*)pDlg; + return (vcl::Window*)pDlg; } -Window* AbstractSwWordCountFloatDlg_Impl::GetWindow() +vcl::Window* AbstractSwWordCountFloatDlg_Impl::GetWindow() { - return (Window*)pDlg; + return (vcl::Window*)pDlg; } void AbstractSwWordCountFloatDlg_Impl::UpdateCounts() @@ -641,13 +641,13 @@ sal_uInt16 AbstractMailMergeWizard_Impl::GetRestartPage() const return pDlg->GetRestartPage(); } -AbstractSwInsertAbstractDlg * SwAbstractDialogFactory_Impl::CreateSwInsertAbstractDlg(Window* pParent) +AbstractSwInsertAbstractDlg * SwAbstractDialogFactory_Impl::CreateSwInsertAbstractDlg(vcl::Window* pParent) { SwInsertAbstractDlg* pDlg = new SwInsertAbstractDlg( pParent); return new AbstractSwInsertAbstractDlg_Impl(pDlg); } -SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent, +SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rSet, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&, sal_uInt32 nResId @@ -677,7 +677,7 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSfxDialog( Window* pParen return 0; } -AbstractSwAsciiFilterDlg* SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg( Window* pParent, +AbstractSwAsciiFilterDlg* SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ) { @@ -685,7 +685,7 @@ AbstractSwAsciiFilterDlg* SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg( return new AbstractSwAsciiFilterDlg_Impl( pDlg ); } -VclAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg( Window *pParent, +VclAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) @@ -706,7 +706,7 @@ VclAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg( Wind return 0; } -AbstractSwBreakDlg * SwAbstractDialogFactory_Impl::CreateSwBreakDlg(Window *pParent, +AbstractSwBreakDlg * SwAbstractDialogFactory_Impl::CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) { SwBreakDlg* pDlg = new SwBreakDlg(pParent, rSh); @@ -719,7 +719,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg(SwView& return new VclAbstractDialog_Impl(pDlg); } -SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwCharDlg(Window* pParent, SwView& pVw, +SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pFmtStr) { @@ -733,7 +733,7 @@ AbstractSwConvertTableDlg* SwAbstractDialogFactory_Impl::CreateSwConvertTableDlg return new AbstractSwConvertTableDlg_Impl(pDlg); } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) { Dialog* pDlg=NULL; switch ( nResId ) @@ -760,20 +760,20 @@ AbstractSwInsertDBColAutoPilot* SwAbstractDialogFactory_Impl::CreateSwInsertDBCo return new AbstractSwInsertDBColAutoPilot_Impl( pDlg ); } -SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) +SfxAbstractTabDialog * SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) { SfxTabDialog* pDlg = new SwFootNoteOptionDlg( pParent, rSh ); return new AbstractTabDialog_Impl( pDlg ); } -AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog(Window *pParent, +AbstractDropDownFieldDialog * SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog(vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton) { sw::DropDownFieldDialog* pDlg = new sw::DropDownFieldDialog(pParent, rSh, pField, bNextButton); return new AbstractDropDownFieldDialog_Impl( pDlg ); } -SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, +SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) { @@ -781,7 +781,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pPa return new AbstractTabDialog_Impl( pDlg ); } -AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, +AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel) { SwLabDlg* pDlg = new SwLabDlg(pParent, rSet, pDBManager, bLabel); @@ -793,7 +793,7 @@ SwLabDlgMethod SwAbstractDialogFactory_Impl::GetSwLabDlgStaticMethod () return SwLabDlg::UpdateFieldInformation; } -SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( Window *pParent, SwView& rVw, +SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( vcl::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet , sal_uInt8 nDialogMode, const OUString *pCollName, @@ -804,7 +804,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwParaDlg ( Window *pP return new AbstractTabDialog_Impl( pDlg ); } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclAbstractDialog ( Window *pParent, SwWrtShell &rSh, int nResId ) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclAbstractDialog ( vcl::Window *pParent, SwWrtShell &rSh, int nResId ) { Dialog* pDlg=NULL; switch ( nResId ) @@ -830,25 +830,25 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclAbstractDialog ( Wind return 0; } -AbstractSplitTableDialog * SwAbstractDialogFactory_Impl::CreateSplitTblDialog ( Window *pParent, SwWrtShell &rSh ) +AbstractSplitTableDialog * SwAbstractDialogFactory_Impl::CreateSplitTblDialog ( vcl::Window *pParent, SwWrtShell &rSh ) { return new AbstractSplitTableDialog_Impl( new SwSplitTblDlg( pParent, rSh) ); } -AbstractSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName) +AbstractSwSelGlossaryDlg * SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) { SwSelGlossaryDlg* pDlg = new SwSelGlossaryDlg(pParent, rShortName); return new AbstractSwSelGlossaryDlg_Impl(pDlg); } -AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg(Window* pParent, +AbstractSwAutoFormatDlg * SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg(vcl::Window* pParent, SwWrtShell* pShell, bool bSetAutoFmt, const SwTableAutoFmt* pSelFmt) { SwAutoFormatDlg* pDlg = new SwAutoFormatDlg(pParent, pShell, bSetAutoFmt, pSelFmt); return new AbstractSwAutoFormatDlg_Impl(pDlg); } -SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) +SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) { SfxModalDialog* pDlg=NULL; switch ( nResId ) @@ -865,7 +865,7 @@ SfxAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwBorderDlg(Window* pPar return 0; } -SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) +SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) { SfxModalDialog* pDlg=NULL; switch ( nResId ) @@ -882,20 +882,20 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( Window* pPare return 0; } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) { Dialog* pDlg = new SwTableWidthDlg(pParent, rFnc); return new VclAbstractDialog_Impl( pDlg ); } -SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool, +SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh) { SfxTabDialog* pDlg = new SwTableTabDlg(pParent, Pool, pItemSet, pSh); return new AbstractTabDialog_Impl(pDlg); } -AbstractSwFldDlg * SwAbstractDialogFactory_Impl::CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) +AbstractSwFldDlg * SwAbstractDialogFactory_Impl::CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) { SwFldDlg* pDlg = new SwFldDlg(pB, pCW, pParent); return new AbstractSwFldDlg_Impl(pDlg); @@ -918,7 +918,7 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& return 0; } -AbstractSwRenameXNamedDlg * SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg(Window* pParent, +AbstractSwRenameXNamedDlg * SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg(vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) { @@ -926,20 +926,20 @@ AbstractSwRenameXNamedDlg * SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDl return new AbstractSwRenameXNamedDlg_Impl( pDlg ); } -AbstractSwModalRedlineAcceptDlg * SwAbstractDialogFactory_Impl::CreateSwModalRedlineAcceptDlg(Window *pParent) +AbstractSwModalRedlineAcceptDlg * SwAbstractDialogFactory_Impl::CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) { SwModalRedlineAcceptDlg* pDlg = new SwModalRedlineAcceptDlg( pParent ); return new AbstractSwModalRedlineAcceptDlg_Impl( pDlg ); } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTblMergeDialog(Window* pParent, bool& rWithPrev) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTblMergeDialog(vcl::Window* pParent, bool& rWithPrev) { Dialog* pDlg = new SwMergeTblDlg( pParent, rWithPrev ); return new VclAbstractDialog_Impl( pDlg ); } SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog(const OString &rDialogType, - SfxViewFrame *pFrame, Window *pParent, + SfxViewFrame *pFrame, vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrm, bool bFmt, @@ -951,7 +951,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog(const OSt } SfxAbstractApplyTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog( - Window* pParent, + vcl::Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage, @@ -970,7 +970,7 @@ AbstractGlossaryDlg* SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFram return new AbstractGlossaryDlg_Impl( pDlg ); } -AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg(Window *pParent, +AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg(vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton) { SwFldInputDlg* pDlg = new SwFldInputDlg( pParent, rSh, pField, bNextButton ); @@ -978,13 +978,13 @@ AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg(Window *pPa } AbstractInsFootNoteDlg* SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg( - Window * pParent, SwWrtShell &rSh, bool bEd ) + vcl::Window * pParent, SwWrtShell &rSh, bool bEd ) { SwInsFootNoteDlg* pDlg = new SwInsFootNoteDlg(pParent, rSh, bEd); return new AbstractInsFootNoteDlg_Impl( pDlg ); } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTitlePageDlg ( Window *pParent ) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTitlePageDlg ( vcl::Window *pParent ) { Dialog* pDlg = new SwTitlePageDlg( pParent ); if ( pDlg ) @@ -1005,14 +1005,14 @@ AbstractInsTableDlg * SwAbstractDialogFactory_Impl::CreateInsTableDlg(SwView& rV } AbstractJavaEditDialog * SwAbstractDialogFactory_Impl::CreateJavaEditDialog( - Window* pParent, SwWrtShell* pWrtSh) + vcl::Window* pParent, SwWrtShell* pWrtSh) { SwJavaEditDialog* pDlg = new SwJavaEditDialog(pParent, pWrtSh); return new AbstractJavaEditDialog_Impl( pDlg ); } AbstractMailMergeDlg * SwAbstractDialogFactory_Impl::CreateMailMergeDlg( int nResId, - Window* pParent, SwWrtShell& rSh, + vcl::Window* pParent, SwWrtShell& rSh, const OUString& rSourceName, const OUString& rTblName, sal_Int32 nCommandType, @@ -1033,26 +1033,26 @@ AbstractMailMergeDlg * SwAbstractDialogFactory_Impl::CreateMailMergeDlg( int nRe return 0; } -AbstractMailMergeCreateFromDlg * SwAbstractDialogFactory_Impl::CreateMailMergeCreateFromDlg(Window* pParent) +AbstractMailMergeCreateFromDlg * SwAbstractDialogFactory_Impl::CreateMailMergeCreateFromDlg(vcl::Window* pParent) { SwMailMergeCreateFromDlg* pDlg = new SwMailMergeCreateFromDlg(pParent); return new AbstractMailMergeCreateFromDlg_Impl(pDlg); } -AbstractMailMergeFieldConnectionsDlg * SwAbstractDialogFactory_Impl::CreateMailMergeFieldConnectionsDlg(Window* pParent) +AbstractMailMergeFieldConnectionsDlg * SwAbstractDialogFactory_Impl::CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) { SwMailMergeFieldConnectionsDlg* pDlg = new SwMailMergeFieldConnectionsDlg( pParent ); return new AbstractMailMergeFieldConnectionsDlg_Impl( pDlg ); } -VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg(Window* pParent, SwTOXMgr &rTOXMgr) +VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) { Dialog* pDlg = new SwMultiTOXMarkDlg(pParent, rTOXMgr); return new VclAbstractDialog_Impl(pDlg); } SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTabDialog( int nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell & rWrtSh ) { @@ -1075,7 +1075,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTabDialog( int nResI } AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog( - Window* pParent, const SfxItemSet& rSet, + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType, bool bGlobal) @@ -1084,14 +1084,14 @@ AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialo return new AbstractMultiTOXTabDialog_Impl( pDlg ); } -AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) +AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg(vcl::Window* pParent, SwWrtShell& rWrtSh) { SwEditRegionDlg* pDlg = new SwEditRegionDlg( pParent, rWrtSh ); return new AbstractEditRegionDlg_Impl( pDlg ); } AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSectionTabDialog( - Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) { SwInsertSectionTabDialog* pDlg = new SwInsertSectionTabDialog(pParent, rSet, rSh); return new AbstractInsertSectionTabDialog_Impl(pDlg); @@ -1100,7 +1100,7 @@ AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSecti AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew ) { @@ -1111,7 +1111,7 @@ AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg( AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew) { @@ -1122,7 +1122,7 @@ AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg( AbstractSwWordCountFloatDlg * SwAbstractDialogFactory_Impl::CreateSwWordCountDialog( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo) { SwWordCountFloatDlg* pDlg = new SwWordCountFloatDlg( pBindings, pChild, pParent, pInfo ); @@ -1130,7 +1130,7 @@ AbstractSwWordCountFloatDlg * SwAbstractDialogFactory_Impl::CreateSwWordCountDia } VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateIndexMarkModalDlg( - Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) + vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) { Dialog* pDlg = new SwIndexMarkModalDlg( pParent, rSh, pCurTOXMark ); return new VclAbstractDialog_Impl( pDlg ); diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 634ea37220d5..1a037f71f160 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -72,7 +72,7 @@ class AbstractSwWordCountFloatDlg_Impl : public AbstractSwWordCountFloatDlg DECL_ABSTDLG_BASE(AbstractSwWordCountFloatDlg_Impl,SwWordCountFloatDlg) virtual void UpdateCounts() SAL_OVERRIDE; virtual void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat) SAL_OVERRIDE; - virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer + virtual vcl::Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg @@ -210,7 +210,7 @@ class AbstractSwFldDlg_Impl : public AbstractSwFldDlg virtual void Initialize(SfxChildWinInfo *pInfo) SAL_OVERRIDE; virtual void ReInitDlg() SAL_OVERRIDE; virtual void ActivateDatabasePage() SAL_OVERRIDE; - virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer + virtual vcl::Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg @@ -336,7 +336,7 @@ class AbstractIndexMarkFloatDlg_Impl : public AbstractMarkFloatDlg { DECL_ABSTDLG_BASE(AbstractIndexMarkFloatDlg_Impl,SwIndexMarkFloatDlg) virtual void ReInitDlg(SwWrtShell& rWrtShell) SAL_OVERRIDE; - virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer + virtual vcl::Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class SwAuthMarkFloatDlg; @@ -344,7 +344,7 @@ class AbstractAuthMarkFloatDlg_Impl : public AbstractMarkFloatDlg { DECL_ABSTDLG_BASE(AbstractAuthMarkFloatDlg_Impl,SwAuthMarkFloatDlg) virtual void ReInitDlg(SwWrtShell& rWrtShell) SAL_OVERRIDE; - virtual Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer + virtual vcl::Window * GetWindow() SAL_OVERRIDE; //this method is added for return a Window type pointer }; class SwMailMergeWizard; @@ -375,38 +375,38 @@ class SwAbstractDialogFactory_Impl : public SwAbstractDialogFactory public: virtual ~SwAbstractDialogFactory_Impl() {} - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, sal_uInt32 nResId ) SAL_OVERRIDE; virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings, - SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo) SAL_OVERRIDE; - virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent) SAL_OVERRIDE; - virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh, + SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo) SAL_OVERRIDE; + virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(vcl::Window* pParent) SAL_OVERRIDE; + virtual AbstractSwAsciiFilterDlg* CreateSwAsciiFilterDlg ( vcl::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) SAL_OVERRIDE; - virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) SAL_OVERRIDE; + virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, + virtual SfxAbstractTabDialog * CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) SAL_OVERRIDE; virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) SAL_OVERRIDE; virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource, com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp, const SwDBData& rData) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; + virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh) SAL_OVERRIDE; - virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (Window *pParent, SwWrtShell &rSh, + virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) SAL_OVERRIDE; - virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, + virtual SfxAbstractTabDialog* CreateSwEnvDlg ( vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert ) SAL_OVERRIDE; + virtual AbstractSwLabDlg* CreateSwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel) SAL_OVERRIDE; virtual SwLabDlgMethod GetSwLabDlgStaticMethod () SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent, + virtual SfxAbstractTabDialog* CreateSwParaDlg ( vcl::Window *pParent, SwView& rVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, @@ -414,36 +414,36 @@ public: bool bDraw = false, const OString& sDefPage = OString() ) SAL_OVERRIDE; - virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const OUString &rShortName) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) SAL_OVERRIDE; - virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) SAL_OVERRIDE; + virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) SAL_OVERRIDE; + virtual AbstractSplitTableDialog * CreateSplitTblDialog ( vcl::Window * pParent, SwWrtShell &rSh ) SAL_OVERRIDE; - virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, + virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell, bool bSetAutoFmt = true, const SwTableAutoFmt* pSelFmt = 0 ) SAL_OVERRIDE; - virtual SfxAbstractDialog * CreateSwBorderDlg (Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) SAL_OVERRIDE; + virtual SfxAbstractDialog * CreateSwBorderDlg (vcl::Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) SAL_OVERRIDE; - virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) SAL_OVERRIDE; - virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool, + virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateSwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc) SAL_OVERRIDE; + virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh) SAL_OVERRIDE; - virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) SAL_OVERRIDE; + virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) SAL_OVERRIDE; virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) SAL_OVERRIDE; - virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent, + virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) SAL_OVERRIDE; - virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) SAL_OVERRIDE; + virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateTblMergeDialog(Window* pParent, bool& rWithPrev) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateTblMergeDialog(vcl::Window* pParent, bool& rWithPrev) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateFrmTabDialog( const OString &rDialogType, - SfxViewFrame *pFrame, Window *pParent, + SfxViewFrame *pFrame, vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrm = true, bool bFmt = false, const OString& sDefPage = OString(), const OUString* pFmtStr = 0) SAL_OVERRIDE; virtual SfxAbstractApplyTabDialog* CreateTemplateDialog( - Window* pParent, + vcl::Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage = OString(), @@ -452,51 +452,51 @@ public: virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) SAL_OVERRIDE; - virtual AbstractFldInputDlg* CreateFldInputDlg(Window *pParent, + virtual AbstractFldInputDlg* CreateFldInputDlg(vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false) SAL_OVERRIDE; virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( - Window * pParent, SwWrtShell &rSh, bool bEd = false) SAL_OVERRIDE; - virtual VclAbstractDialog * CreateTitlePageDlg ( Window * pParent ) SAL_OVERRIDE; + vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false) SAL_OVERRIDE; + virtual VclAbstractDialog * CreateTitlePageDlg ( vcl::Window * pParent ) SAL_OVERRIDE; virtual VclAbstractDialog * CreateVclSwViewDialog(SwView& rView) SAL_OVERRIDE; virtual AbstractInsTableDlg* CreateInsTableDlg(SwView& rView) SAL_OVERRIDE; - virtual AbstractJavaEditDialog* CreateJavaEditDialog(Window* pParent, + virtual AbstractJavaEditDialog* CreateJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) SAL_OVERRIDE; virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId, - Window* pParent, SwWrtShell& rSh, + vcl::Window* pParent, SwWrtShell& rSh, const OUString& rSourceName, const OUString& rTblName, sal_Int32 nCommandType, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) SAL_OVERRIDE; - virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(Window* pParent) SAL_OVERRIDE; - virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateMultiTOXMarkDlg(Window* pParent, SwTOXMgr &rTOXMgr) SAL_OVERRIDE; + virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(vcl::Window* pParent) SAL_OVERRIDE; + virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateSwTabDialog( int nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &) SAL_OVERRIDE; virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( - Window* pParent, const SfxItemSet& rSet, + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, bool bGlobal = false) SAL_OVERRIDE; - virtual AbstractEditRegionDlg* CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) SAL_OVERRIDE; + virtual AbstractEditRegionDlg* CreateEditRegionDlg(vcl::Window* pParent, SwWrtShell& rWrtSh) SAL_OVERRIDE; virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( - Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) SAL_OVERRIDE; + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) SAL_OVERRIDE; virtual AbstractMarkFloatDlg* CreateIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew=true) SAL_OVERRIDE; virtual AbstractMarkFloatDlg* CreateAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew=true) SAL_OVERRIDE; virtual VclAbstractDialog * CreateIndexMarkModalDlg( - Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) SAL_OVERRIDE; + vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) SAL_OVERRIDE; virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) SAL_OVERRIDE; diff --git a/sw/source/ui/dialog/swmessdialog.cxx b/sw/source/ui/dialog/swmessdialog.cxx index 78ae502eb84f..00d277b135da 100644 --- a/sw/source/ui/dialog/swmessdialog.cxx +++ b/sw/source/ui/dialog/swmessdialog.cxx @@ -15,7 +15,7 @@ #include <vcl/msgbox.hxx> #include <vcl/vclmedit.hxx> -SwMessageAndEditDialog::SwMessageAndEditDialog(Window* pParent, const OString& rID, +SwMessageAndEditDialog::SwMessageAndEditDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : ModalDialog(pParent, rID, rUIXMLDescription) { diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 22fbf2220657..e5581ad0fa83 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -304,7 +304,7 @@ OUString SectRepr::GetSubRegion() const } // dialog edit regions -SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ) +SwEditRegionDlg::SwEditRegionDlg( vcl::Window* pParent, SwWrtShell& rWrtSh ) : SfxModalDialog(pParent, "EditSectionDialog", "modules/swriter/ui/editsectiondialog.ui") , m_bSubRegionsFilled(false) @@ -1390,7 +1390,7 @@ static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox ) } SwInsertSectionTabDialog::SwInsertSectionTabDialog( - Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) : SfxTabDialog(pParent, "InsertSectionDialog", "modules/swriter/ui/insertsectiondialog.ui", &rSet) , rWrtSh(rSh) @@ -1490,7 +1490,7 @@ short SwInsertSectionTabDialog::Ok() } SwInsertSectionTabPage::SwInsertSectionTabPage( - Window *pParent, const SfxItemSet &rAttrSet) + vcl::Window *pParent, const SfxItemSet &rAttrSet) : SfxTabPage(pParent, "SectionPage", "modules/swriter/ui/sectionpage.ui", &rAttrSet) , m_pWrtSh(0) @@ -1636,7 +1636,7 @@ void SwInsertSectionTabPage::Reset( const SfxItemSet* ) { } -SfxTabPage* SwInsertSectionTabPage::Create( Window* pParent, +SfxTabPage* SwInsertSectionTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwInsertSectionTabPage(pParent, *rAttrSet); @@ -1794,7 +1794,7 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil return 0; } -SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( Window *pParent, +SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet) : SfxTabPage( pParent, "FootnotesEndnotesTabPage", "modules/swriter/ui/footnotesendnotestabpage.ui", &rAttrSet ) @@ -1976,7 +1976,7 @@ void SwSectionFtnEndTabPage::Reset( const SfxItemSet* rSet ) RES_END_AT_TXTEND, false )); } -SfxTabPage* SwSectionFtnEndTabPage::Create( Window* pParent, +SfxTabPage* SwSectionFtnEndTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwSectionFtnEndTabPage(pParent, *rAttrSet); @@ -2039,7 +2039,7 @@ IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox ) } SwSectionPropertyTabDialog::SwSectionPropertyTabDialog( - Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) + vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) : SfxTabDialog(pParent, "FormatSectionDialog", "modules/swriter/ui/formatsectiondialog.ui", &rSet) , rWrtSh(rSh) @@ -2084,7 +2084,7 @@ void SwSectionPropertyTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ((SwSectionIndentTabPage&)rPage).SetWrtShell(rWrtSh); } -SwSectionIndentTabPage::SwSectionIndentTabPage(Window *pParent, const SfxItemSet &rAttrSet) +SwSectionIndentTabPage::SwSectionIndentTabPage(vcl::Window *pParent, const SfxItemSet &rAttrSet) : SfxTabPage(pParent, "IndentPage", "modules/swriter/ui/indentpage.ui", &rAttrSet) { get(m_pBeforeMF, "before"); @@ -2138,7 +2138,7 @@ void SwSectionIndentTabPage::Reset( const SfxItemSet* rSet) IndentModifyHdl(0); } -SfxTabPage* SwSectionIndentTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet) +SfxTabPage* SwSectionIndentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwSectionIndentTabPage(pParent, *rAttrSet); } diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index 2ff4f41fcd73..2a7392eee793 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -109,7 +109,7 @@ void SwWordCountFloatDlg::showStandardizedPages(bool bShowStandardizedPages) SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings* _pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo) : SfxModelessDialog(_pBindings, pChild, pParent, "WordCountDialog", "modules/swriter/ui/wordcount.ui") { diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx index 484787deba8b..5cdc698f750d 100644 --- a/sw/source/ui/dochdl/selglos.cxx +++ b/sw/source/ui/dochdl/selglos.cxx @@ -24,7 +24,7 @@ #include "dochdl.hrc" #include <vcl/layout.hxx> -SwSelGlossaryDlg::SwSelGlossaryDlg(Window * pParent, const OUString &rShortName) +SwSelGlossaryDlg::SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) : ModalDialog(pParent, "InsertAutoTextDialog", "modules/swriter/ui/insertautotextdialog.ui") { diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 3250894abcd8..1c56f3ad5166 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -116,7 +116,7 @@ namespace { static long lUserW = 5669; // 10 cm static long lUserH = 5669; // 10 cm -SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) +SwEnvFmtPage::SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "EnvFormatPage", "modules/swriter/ui/envformatpage.ui", &rSet) { @@ -438,7 +438,7 @@ void SwEnvFmtPage::SetMinMax() m_pSizeHeightField->Reformat(); } -SfxTabPage* SwEnvFmtPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwEnvFmtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwEnvFmtPage(pParent, *rSet); } diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 39cb85d94609..1348c5bd31ce 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -43,7 +43,7 @@ class SwEnvFmtPage : public SfxTabPage std::vector<sal_uInt16> aIDs; - SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet); + SwEnvFmtPage(vcl::Window* pParent, const SfxItemSet& rSet); DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( EditHdl, MenuButton * ); @@ -60,7 +60,7 @@ class SwEnvFmtPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 395953508d8e..934f8bd63644 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::rtl; -SwEnvPreview::SwEnvPreview(Window* pParent, WinBits nStyle) +SwEnvPreview::SwEnvPreview(vcl::Window* pParent, WinBits nStyle) : Window(pParent, nStyle) { SetMapMode(MapMode(MAP_PIXEL)); @@ -58,7 +58,7 @@ Size SwEnvPreview::GetOptimalSize() const return LogicToPixel(Size(84 , 63), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwEnvPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwEnvPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwEnvPreview(pParent, 0); } @@ -131,7 +131,7 @@ void SwEnvPreview::Paint(const Rectangle &) DrawRect(Rectangle(Point(nStmpX, nStmpY), Size(nStmpW, nStmpH))); } -SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet, +SwEnvDlg::SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert) : SfxTabDialog(pParent, "EnvDialog", "modules/swriter/ui/envdialog.ui", &rSet) @@ -187,7 +187,7 @@ short SwEnvDlg::Ok() return nRet; } -SwEnvPage::SwEnvPage(Window* pParent, const SfxItemSet& rSet) +SwEnvPage::SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "EnvAddressPage", "modules/swriter/ui/envaddresspage.ui", &rSet) { @@ -304,7 +304,7 @@ void SwEnvPage::InitDatabaseBox() } } -SfxTabPage* SwEnvPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwEnvPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwEnvPage(pParent, *rSet); } diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 02b65703f3b3..b4976e7a6d14 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -29,7 +29,7 @@ #include "envprt.hrc" #include <boost/scoped_ptr.hpp> -SwEnvPrtPage::SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet) +SwEnvPrtPage::SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "EnvPrinterPage", "modules/swriter/ui/envprinterpage.ui", &rSet) , pPrt(NULL) @@ -127,7 +127,7 @@ IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl) return 0; } -SfxTabPage* SwEnvPrtPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwEnvPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwEnvPrtPage(pParent, *rSet); } diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index fdd5f1384b60..e6f427caa95d 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -46,7 +46,7 @@ class SwEnvPrtPage : public SfxTabPage Printer* pPrt; - SwEnvPrtPage(Window* pParent, const SfxItemSet& rSet); + SwEnvPrtPage(vcl::Window* pParent, const SfxItemSet& rSet); DECL_LINK(ClickHdl, void *); DECL_LINK(AlignHdl, void *); @@ -59,7 +59,7 @@ class SwEnvPrtPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index e09c0141a40e..e9fdf5211dfa 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -89,7 +89,7 @@ void SwLabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) pPrtPage = (SwLabPrtPage*)&rPage; } -SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet, +SwLabDlg::SwLabDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwDBManager* pDBManager_, bool bLabel) : SfxTabDialog(pParent, "LabelDialog", "modules/swriter/ui/labeldialog.ui", &rSet) @@ -225,7 +225,7 @@ Printer *SwLabDlg::GetPrt() return (NULL); } -SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) +SwLabPage::SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "CardMediumPage", "modules/swriter/ui/cardmediumpage.ui", &rSet) , pDBManager(NULL) @@ -458,7 +458,7 @@ void SwLabPage::InitDatabaseBox() } } -SfxTabPage* SwLabPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwLabPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwLabPage(pParent, *rSet); } @@ -561,7 +561,7 @@ void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt, } } -SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet) +SwVisitingCardPage::SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "CardFormatPage", "modules/swriter/ui/cardformatpage.ui", &rSet) , pExampleFrame(0) @@ -594,7 +594,7 @@ SwVisitingCardPage::~SwVisitingCardPage() delete pExampleFrame; } -SfxTabPage* SwVisitingCardPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwVisitingCardPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwVisitingCardPage(pParent, *rSet); } @@ -702,7 +702,7 @@ void SwVisitingCardPage::Reset(const SfxItemSet* rSet) } } -SwPrivateDataPage::SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet) +SwPrivateDataPage::SwPrivateDataPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "PrivateUserPage", "modules/swriter/ui/privateuserpage.ui", &rSet) { @@ -728,7 +728,7 @@ SwPrivateDataPage::SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet) SetExchangeSupport(); } -SfxTabPage* SwPrivateDataPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwPrivateDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwPrivateDataPage(pParent, *rSet); } @@ -795,7 +795,7 @@ void SwPrivateDataPage::Reset(const SfxItemSet* rSet) m_pMailED->SetText(aItem.aPrivMail); } -SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet) +SwBusinessDataPage::SwBusinessDataPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "BusinessDataPage", "modules/swriter/ui/businessdatapage.ui", &rSet) { @@ -816,7 +816,7 @@ SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet) SetExchangeSupport(); } -SfxTabPage* SwBusinessDataPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwBusinessDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwBusinessDataPage(pParent, *rSet); } diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 94d61202645a..19fb1c086771 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::beans; #define ROUND(x) static_cast<long>((x) + .5) -SwLabPreview::SwLabPreview(Window* pParent) +SwLabPreview::SwLabPreview(vcl::Window* pParent) : Window(pParent, 0) , aGrayColor(COL_LIGHTGRAY) , aHDistStr(SW_RESSTR(STR_HDIST)) @@ -84,7 +84,7 @@ Size SwLabPreview::GetOptimalSize() const return LogicToPixel(Size(146 , 161), MapMode(MAP_APPFONT)); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwLabPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwLabPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwLabPreview(pParent); } @@ -286,7 +286,7 @@ void SwLabPreview::UpdateItem(const SwLabItem& rItem) Invalidate(); } -SwLabFmtPage::SwLabFmtPage(Window* pParent, const SfxItemSet& rSet) +SwLabFmtPage::SwLabFmtPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "LabelFormatPage", "modules/swriter/ui/labelformatpage.ui", &rSet) , bModified(false) @@ -464,7 +464,7 @@ void SwLabFmtPage::ChangeMinMax() m_pPHeightField->Reformat(); } -SfxTabPage* SwLabFmtPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwLabFmtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwLabFmtPage(pParent, *rSet); } diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 0616008ecae8..b4b760621e82 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -24,7 +24,7 @@ #include <vcl/msgbox.hxx> class SwLabFmtPage; -class SwLabPreview : public Window +class SwLabPreview : public vcl::Window { Color aGrayColor; @@ -61,7 +61,7 @@ class SwLabPreview : public Window public: - SwLabPreview(Window* pParent); + SwLabPreview(vcl::Window* pParent); void UpdateItem(const SwLabItem& rItem); }; @@ -88,7 +88,7 @@ class SwLabFmtPage : public SfxTabPage SwLabItem aItem; - SwLabFmtPage(Window* pParent, const SfxItemSet& rSet); + SwLabFmtPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwLabFmtPage(); DECL_LINK(ModifyHdl, void *); @@ -103,7 +103,7 @@ class SwLabFmtPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 76d8e4a941a6..469085fb968a 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -28,7 +28,7 @@ #include <cmdid.h> #include <boost/scoped_ptr.hpp> -SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) +SwLabPrtPage::SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "LabelOptionsPage", "modules/swriter/ui/labeloptionspage.ui", &rSet) , pPrinter(0) @@ -93,7 +93,7 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton ) return 0; } -SfxTabPage* SwLabPrtPage::Create(Window* pParent, const SfxItemSet* rSet) +SfxTabPage* SwLabPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) { return new SwLabPrtPage( pParent, *rSet ); } diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 9a979586b2bf..109e30bc8544 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -44,7 +44,7 @@ class SwLabPrtPage : public SfxTabPage FixedText* m_pPrinterInfo; PushButton* m_pPrtSetup; - SwLabPrtPage(Window* pParent, const SfxItemSet& rSet); + SwLabPrtPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwLabPrtPage(); DECL_LINK( CountHdl, Button * ); @@ -56,7 +56,7 @@ class SwLabPrtPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 4ab290b2ebc1..b452f4e3cf74 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -127,7 +127,7 @@ void SwXSelChgLstnr_Impl::disposing( const EventObject& ) throw (RuntimeExcepti OSL_FAIL("disposing"); } -SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, +SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, const OUString& rSourceName, const OUString& rTblName, sal_Int32 nCommandType, @@ -627,14 +627,14 @@ uno::Reference<XResultSet> SwMailMergeDlg::GetResultSet() const return xResSetClone; } -SwMailMergeCreateFromDlg::SwMailMergeCreateFromDlg(Window* pParent) +SwMailMergeCreateFromDlg::SwMailMergeCreateFromDlg(vcl::Window* pParent) : ModalDialog(pParent, "MailMergeDialog", "modules/swriter/ui/mailmergedialog.ui") { get(m_pThisDocRB, "document"); } -SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(Window* pParent) +SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(vcl::Window* pParent) : ModalDialog(pParent, "MergeConnectDialog", "modules/swriter/ui/mergeconnectdialog.ui") { diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 38d5a79d1ae7..30cd7a34db76 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -47,7 +47,7 @@ class SwLabPage : public SfxTabPage bool m_bLabel; - SwLabPage(Window* pParent, const SfxItemSet& rSet); + SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet); DECL_LINK(AddrHdl, void *); DECL_LINK( DatabaseHdl, ListBox *pListBox ); @@ -64,7 +64,7 @@ class SwLabPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; @@ -86,7 +86,7 @@ class SwVisitingCardPage : public SfxTabPage { SvTreeListBox* m_pAutoTextLB; ListBox* m_pAutoTextGroupLB; - Window* m_pExampleWIN; + vcl::Window* m_pExampleWIN; OUString sTempURL; @@ -108,7 +108,7 @@ class SwVisitingCardPage : public SfxTabPage const OUString* pNames, const OUString* pValues ); - SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet); + SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwVisitingCardPage(); using TabPage::ActivatePage; @@ -116,7 +116,7 @@ class SwVisitingCardPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; @@ -147,14 +147,14 @@ class SwPrivateDataPage : public SfxTabPage Edit* m_pHomePageED; Edit* m_pMailED; - SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet); + SwPrivateDataPage(vcl::Window* pParent, const SfxItemSet& rSet); using TabPage::ActivatePage; using TabPage::DeactivatePage; public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; @@ -183,14 +183,14 @@ class SwBusinessDataPage : public SfxTabPage Edit* m_pHomePageED; Edit* m_pMailED; - SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet); + SwBusinessDataPage(vcl::Window* pParent, const SfxItemSet& rSet); using TabPage::ActivatePage; using TabPage::DeactivatePage; public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 08cdc8817235..854d67dbe42f 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star; // edit insert-field -sw::DropDownFieldDialog::DropDownFieldDialog(Window *pParent, SwWrtShell &rS, +sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &rS, SwField* pField, bool bNextButton) : SvxStandardDialog(pParent, "DropdownFieldDialog", "modules/swriter/ui/dropdownfielddialog.ui") diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index aa4021b2614f..2a0d93f2ec73 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -23,12 +23,12 @@ #include <vcl/builder.hxx> #include <vcl/help.hxx> -SwFldRefTreeListBox::SwFldRefTreeListBox(Window* pParent, WinBits nStyle) +SwFldRefTreeListBox::SwFldRefTreeListBox(vcl::Window* pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwFldRefTreeListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwFldRefTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx index 4d92ac11fa05..216d32ae7392 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.hxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx @@ -27,7 +27,7 @@ protected: virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: - SwFldRefTreeListBox(Window* pParent, WinBits nStyle); + SwFldRefTreeListBox(vcl::Window* pParent, WinBits nStyle); }; #endif diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 2cbde87a6fc6..556b69ada489 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -33,7 +33,7 @@ #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -SwFldDBPage::SwFldDBPage(Window* pParent, const SfxItemSet& rCoreSet) +SwFldDBPage::SwFldDBPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SwFldPage(pParent, "FldDbPage", "modules/swriter/ui/flddbpage.ui", rCoreSet) , m_nOldFormat(0) @@ -246,7 +246,7 @@ bool SwFldDBPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldDBPage::Create( Window* pParent, +SfxTabPage* SwFldDBPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwFldDBPage( pParent, *rAttrSet ) ); diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 08a7b0b464e3..6163cb9566d3 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -68,11 +68,11 @@ protected: virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: - SwFldDBPage(Window* pParent, const SfxItemSet& rSet); + SwFldDBPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwFldDBPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 3d6aad2d700a..04d551ffda27 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -47,7 +47,7 @@ using namespace nsSwDocInfoSubType; using namespace com::sun::star; -SwFldDokInfPage::SwFldDokInfPage(Window* pParent, const SfxItemSet& rCoreSet) +SwFldDokInfPage::SwFldDokInfPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SwFldPage(pParent, "FldDocInfoPage", "modules/swriter/ui/flddocinfopage.ui", rCoreSet) , pSelEntry(0) @@ -450,7 +450,7 @@ bool SwFldDokInfPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldDokInfPage::Create( Window* pParent, +SfxTabPage* SwFldDokInfPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwFldDokInfPage( pParent, *rAttrSet ) ); diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index c80e25492904..596d3bc2d3b7 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -59,11 +59,11 @@ protected: virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: - SwFldDokInfPage(Window* pWindow, const SfxItemSet& rSet); + SwFldDokInfPage(vcl::Window* pWindow, const SfxItemSet& rSet); virtual ~SwFldDokInfPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index d19672b9ef17..f88813a687c0 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -34,7 +34,7 @@ #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -SwFldDokPage::SwFldDokPage(Window* pParent, const SfxItemSet& rCoreSet ) +SwFldDokPage::SwFldDokPage(vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage(pParent, "FldDocumentPage", "modules/swriter/ui/flddocumentpage.ui", rCoreSet) , nOldSel(0) @@ -632,7 +632,7 @@ bool SwFldDokPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldDokPage::Create( Window* pParent, +SfxTabPage* SwFldDokPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwFldDokPage( pParent, *rAttrSet ) ); diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 702ebdc5b09c..4e8abc27e2b0 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -61,11 +61,11 @@ protected: virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: - SwFldDokPage(Window* pWindow, const SfxItemSet& rSet); + SwFldDokPage(vcl::Window* pWindow, const SfxItemSet& rSet); virtual ~SwFldDokPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index a663eba68771..b96eb21b582a 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; -SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet) +SwFldFuncPage::SwFldFuncPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) : SwFldPage(pParent, "FldFuncPage", "modules/swriter/ui/fldfuncpage.ui", rCoreSet) , nOldFormat(0) @@ -499,7 +499,7 @@ void SwFldFuncPage::UpdateSubType() // call MacroBrowser, fill Listbox with Macros IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn ) { - Window* pDefModalDlgParent = Application::GetDefDialogParent(); + vcl::Window* pDefModalDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pBtn ); const OUString sMacro(TurnMacroString(m_pNameED->GetText()).replaceAll(".", ";")); if (GetFldMgr().ChooseMacro(sMacro)) @@ -597,7 +597,7 @@ OUString SwFldFuncPage::TurnMacroString(const OUString &rMacro) return rMacro; } -SfxTabPage* SwFldFuncPage::Create( Window* pParent, +SfxTabPage* SwFldFuncPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwFldFuncPage( pParent, *rAttrSet ) ); diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 06140a23f7e5..fb8cfa906969 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -83,11 +83,11 @@ protected: virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: - SwFldFuncPage(Window* pParent, const SfxItemSet& rSet); + SwFldFuncPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwFldFuncPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index cd21a1275f2e..c5b2d204a083 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star; -SwFldPage::SwFldPage(Window *pParent, const OString& rID, +SwFldPage::SwFldPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) : SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet) , m_pCurFld(0) diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index dedbae5fcf2f..3416e97361ac 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -77,7 +77,7 @@ protected: using SfxTabPage::ActivatePage; public: - SwFldPage(Window *pParent, const OString& rID, + SwFldPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet); virtual ~SwFldPage(); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index f9f3fb479a62..704899267032 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -47,7 +47,7 @@ static sal_uInt16 nFldDlgFmtSel = 0; #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) +SwFldRefPage::SwFldRefPage(vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage(pParent, "FldRefPage", "modules/swriter/ui/fldrefpage.ui", rCoreSet) , maOutlineNodes() @@ -937,7 +937,7 @@ bool SwFldRefPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldRefPage::Create( Window* pParent, +SfxTabPage* SwFldRefPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwFldRefPage( pParent, *rAttrSet ) ); diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 93f8c75beb0d..27e5ab4fb22e 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -74,11 +74,11 @@ protected: virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: - SwFldRefPage(Window* pParent, const SfxItemSet& rSet); + SwFldRefPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwFldRefPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 536f0fee99bb..11b528b4f1f5 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> // carrier of the dialog -SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) +SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) : SfxTabDialog(pParent, "FieldDialog", "modules/swriter/ui/fielddialog.ui") , m_pChildWin(pCW) , m_pBindings(pB) diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 7205cc6ab317..3581bc3d8b80 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -38,7 +38,7 @@ #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -SwFldVarPage::SwFldVarPage(Window* pParent, const SfxItemSet& rCoreSet ) +SwFldVarPage::SwFldVarPage(vcl::Window* pParent, const SfxItemSet& rCoreSet ) : SwFldPage(pParent, "FldVarPage", "modules/swriter/ui/fldvarpage.ui", rCoreSet) , nOldFormat(0) @@ -1225,7 +1225,7 @@ bool SwFldVarPage::FillItemSet(SfxItemSet* ) return false; } -SfxTabPage* SwFldVarPage::Create( Window* pParent, +SfxTabPage* SwFldVarPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new SwFldVarPage( pParent, *rAttrSet ) ); @@ -1236,13 +1236,13 @@ sal_uInt16 SwFldVarPage::GetGroup() return GRP_VAR; } -SelectionListBox::SelectionListBox(Window* pParent, WinBits nStyle) +SelectionListBox::SelectionListBox(vcl::Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) , bCallAddSelection(false) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSelectionListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSelectionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK; diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 98ebece0702e..9d1a37f0a5a9 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -40,7 +40,7 @@ class SelectionListBox : public ListBox virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SelectionListBox(Window* pParent, WinBits nStyle); + SelectionListBox(vcl::Window* pParent, WinBits nStyle); // detect selection via Ctrl or Alt and evaluate with SelectHdl bool IsCallAddSelection() const {return bCallAddSelection;} @@ -90,11 +90,11 @@ protected: virtual sal_uInt16 GetGroup() SAL_OVERRIDE; public: - SwFldVarPage(Window* pParent, const SfxItemSet& rSet); + SwFldVarPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwFldVarPage(); - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index df9f54a66968..40d04832896b 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -31,7 +31,7 @@ #include <fldui.hrc> // edit field-insert -SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, +SwFldInputDlg::SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rS, SwField* pField, bool bNextButton ) : SvxStandardDialog( pParent, "InputFieldDialog", "modules/swriter/ui/inputfielddialog.ui") diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 5a2c8891a7fb..b3c1bae39a4d 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; -SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) : +SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) : SvxStandardDialog(pParent, "InsertScriptDialog", "modules/swriter/ui/insertscript.ui"), bNew(true), diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 5c1fb3ded31c..c13d8810777d 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -67,7 +67,7 @@ #include <svx/flagsdef.hxx> // the dialog's carrier -SwTemplateDlg::SwTemplateDlg(Window* pParent, +SwTemplateDlg::SwTemplateDlg(vcl::Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage, diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index d7f5ad88759c..647536aef16b 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -83,7 +83,7 @@ inline bool IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect ) return bRet; } -SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) +SwColumnDlg::SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh) : SfxModalDialog(pParent, "ColumnDialog", "modules/swriter/ui/columndialog.ui") , rWrtShell(rSh) , pPageSet(0) @@ -162,7 +162,7 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) // create TabPage pTabPage = (SwColumnPage*) SwColumnPage::Create(get_content_area(), pColPgSet); - pTabPage->get<Window>("applytoft")->Show(); + pTabPage->get<vcl::Window>("applytoft")->Show(); pTabPage->get(m_pApplyToLB, "applytolb"); m_pApplyToLB->Show(); @@ -393,7 +393,7 @@ void SwColumnPage::ResetColWidth() } // Now as TabPage -SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet) +SwColumnPage::SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "ColumnPage", "modules/swriter/ui/columnpage.ui", &rSet) , pColMgr(0) , nFirstVis(0) @@ -622,7 +622,7 @@ void SwColumnPage::Reset(const SfxItemSet *rSet) } // create TabPage -SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwColumnPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwColumnPage(pParent, *rSet); } @@ -1364,7 +1364,7 @@ void ColumnValueSet::DataChanged( const DataChangedEvent& rDCEvt ) ValueSet::DataChanged( rDCEvt ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColumnValueSet(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColumnValueSet(vcl::Window *pParent, VclBuilder::stringmap &) { return new ColumnValueSet(pParent); } diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index ec81b01e9f71..3c57f1d0b839 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -64,7 +64,7 @@ class SwSequenceOptionDialog : public SvxStandardDialog OUString aFldTypeName; public: - SwSequenceOptionDialog( Window *pParent, SwView &rV, + SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV, const OUString& rSeqFldType ); virtual ~SwSequenceOptionDialog(); virtual void Apply() SAL_OVERRIDE; @@ -91,7 +91,7 @@ OUString TextFilterAutoConvert::filter(const OUString &rText) return rText; } -SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) : +SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) : SvxStandardDialog( pParent, "InsertCaptionDialog", "modules/swriter/ui/insertcaption.ui" ), m_sNone( SW_RESSTR(SW_STR_NONE) ), rView( rV ), @@ -413,7 +413,7 @@ SwCaptionDialog::~SwCaptionDialog() delete pMgr; } -SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV, +SwSequenceOptionDialog::SwSequenceOptionDialog( vcl::Window *pParent, SwView &rV, const OUString& rSeqFldType ) : SvxStandardDialog( pParent, "CaptionOptionsDialog", "modules/swriter/ui/captionoptions.ui" ), rView( rV ), diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 3589b91c28f4..cd623185758a 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -45,7 +45,7 @@ // the dialog's carrier SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bNewFrm, const OString& sResType, diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 3ad6d4a6f1ee..cc148dc046a9 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -596,7 +596,7 @@ namespace } } -SwFrmPage::SwFrmPage(Window *pParent, const SfxItemSet &rSet) +SwFrmPage::SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "FrmTypePage", "modules/swriter/ui/frmtypepage.ui", &rSet) , @@ -821,7 +821,7 @@ SwFrmPage::~SwFrmPage() { } -SfxTabPage* SwFrmPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwFrmPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwFrmPage( pParent, *rSet ); } @@ -2348,7 +2348,7 @@ void SwFrmPage::EnableVerticalPositioning( bool bEnable ) m_pVertRelationLB->Enable( bEnable ); } -SwGrfExtPage::SwGrfExtPage(Window *pParent, const SfxItemSet &rSet) +SwGrfExtPage::SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "PicturePage", "modules/swriter/ui/picturepage.ui", &rSet) , pGrfDlg(0) @@ -2376,7 +2376,7 @@ SwGrfExtPage::~SwGrfExtPage() delete pGrfDlg; } -SfxTabPage* SwGrfExtPage::Create( Window *pParent, const SfxItemSet *rSet ) +SfxTabPage* SwGrfExtPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) { return new SwGrfExtPage( pParent, *rSet ); } @@ -2599,7 +2599,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl) } // example window -BmpWindow::BmpWindow(Window* pPar, WinBits nStyle) +BmpWindow::BmpWindow(vcl::Window* pPar, WinBits nStyle) : Window(pPar, nStyle) , bHorz(false) , bVert(false) @@ -2619,7 +2619,7 @@ Size BmpWindow::GetOptimalSize() const return LogicToPixel(Size(127 , 66), MapMode(MAP_APPFONT)); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBmpWindow(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBmpWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new BmpWindow(pParent, 0); } @@ -2698,7 +2698,7 @@ void BmpWindow::SetBitmapEx(const BitmapEx& rBmp) } // set URL and ImageMap at frames -SwFrmURLPage::SwFrmURLPage( Window *pParent, const SfxItemSet &rSet ) : +SwFrmURLPage::SwFrmURLPage( vcl::Window *pParent, const SfxItemSet &rSet ) : SfxTabPage(pParent, "FrmURLPage" , "modules/swriter/ui/frmurlpage.ui", &rSet) { get(pURLED,"url"); @@ -2794,7 +2794,7 @@ bool SwFrmURLPage::FillItemSet(SfxItemSet *rSet) return bModified; } -SfxTabPage* SwFrmURLPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwFrmURLPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwFrmURLPage( pParent, *rSet ); } @@ -2822,7 +2822,7 @@ IMPL_LINK_NOARG(SwFrmURLPage, InsertFileHdl) return 0; } -SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet) +SwFrmAddPage::SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "FrmAddPage" , "modules/swriter/ui/frmaddpage.ui", &rSet) , pWrtSh(0) , bHtmlMode(false) @@ -2859,7 +2859,7 @@ SwFrmAddPage::~SwFrmAddPage() { } -SfxTabPage* SwFrmAddPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwFrmAddPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwFrmAddPage(pParent, *rSet); } diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index 7b57568c25e8..17a363d88911 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -23,7 +23,7 @@ #include "pattern.hxx" #include "frmui.hrc" -SwBackgroundDlg::SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet) +SwBackgroundDlg::SwBackgroundDlg(vcl::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet) { diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx index bc7348b8dd3d..b5201b62a553 100644 --- a/sw/source/ui/frmdlg/uiborder.cxx +++ b/sw/source/ui/frmdlg/uiborder.cxx @@ -29,7 +29,7 @@ #include "uiborder.hxx" #include "frmui.hrc" -SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType) : +SwBorderDlg::SwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, sal_uInt16 nType) : SfxSingleTabDialog(pParent, rSet) { diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 746d0fed4bd0..9d0b32a2efe3 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -50,7 +50,7 @@ static const sal_uInt16 aWrapPageRg[] = { 0 }; -SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode) +SwWrapDlg::SwWrapDlg(vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode) : SfxSingleTabDialog(pParent, rSet, "WrapDialog", "modules/swriter/ui/wrapdialog.ui") , pWrtShell(pSh) @@ -62,7 +62,7 @@ SwWrapDlg::SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bD SetTabPage(pNewPage); } -SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) +SwWrapTabPage::SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "WrapPage" , "modules/swriter/ui/wrappage.ui", &rSet) , nOldLeftMargin(0) , nOldRightMargin(0) @@ -134,7 +134,7 @@ SwWrapTabPage::~SwWrapTabPage() { } -SfxTabPage* SwWrapTabPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwWrapTabPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwWrapTabPage(pParent, *rSet); } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index e5c0eeb507a1..860c8983fce0 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -173,7 +173,7 @@ protected: std::vector<long> GetOptimalColWidths() const; public: - SwEntryBrowseBox(Window* pParent, VclBuilderContainer* pBuilder); + SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pBuilder); void ReadEntries(SvStream& rInStr); void WriteEntries(SvStream& rOutStr); @@ -197,7 +197,7 @@ class SwAutoMarkDlg_Impl : public ModalDialog DECL_LINK(OkHdl, void *); public: - SwAutoMarkDlg_Impl(Window* pParent, const OUString& rAutoMarkURL, + SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAutoMarkURL, const OUString& rAutoMarkType, bool bCreate); virtual ~SwAutoMarkDlg_Impl(); @@ -211,7 +211,7 @@ sal_uInt16 CurTOXType::GetFlatIndex() const #define EDIT_MINWIDTH 15 -SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet, +SwMultiTOXTabDialog::SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType, bool bGlobal) @@ -631,11 +631,11 @@ class SwAddStylesDlg_Impl : public SfxModalDialog DECL_LINK(HeaderDragHdl, void *); public: - SwAddStylesDlg_Impl(Window* pParent, SwWrtShell& rWrtSh, OUString rStringArr[]); + SwAddStylesDlg_Impl(vcl::Window* pParent, SwWrtShell& rWrtSh, OUString rStringArr[]); virtual ~SwAddStylesDlg_Impl(); }; -SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent, +SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(vcl::Window* pParent, SwWrtShell& rWrtSh, OUString rStringArr[]) : SfxModalDialog(pParent, "AssignStylesDialog", "modules/swriter/ui/assignstylesdialog.ui") @@ -766,7 +766,7 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn) return 0; } -SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet) +SwTOXSelectTabPage::SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "TocIndexPage", "modules/swriter/ui/tocindexpage.ui", &rAttrSet) , aFromNames(SW_RES(RES_SRCTYPES)) @@ -787,7 +787,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS get(m_pCreateFrame, "createframe"); get(m_pFromHeadingsCB, "fromheadings"); get(m_pAddStylesCB, "addstylescb"); - sAddStyleUser = get<Window>("stylescb")->GetText(); + sAddStyleUser = get<vcl::Window>("stylescb")->GetText(); get(m_pAddStylesPB, "styles"); get(m_pFromTablesCB, "fromtables"); get(m_pFromFramesCB, "fromframes"); @@ -1247,7 +1247,7 @@ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) return LEAVE_PAGE; } -SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet) +SfxTabPage* SwTOXSelectTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwTOXSelectTabPage(pParent, *rAttrSet); } @@ -1462,7 +1462,7 @@ class SwTOXEdit : public Edit bool bNextControl; SwTokenWindow* m_pParent; public: - SwTOXEdit( Window* pParent, SwTokenWindow* pTokenWin, + SwTOXEdit( vcl::Window* pParent, SwTokenWindow* pTokenWin, const SwFormToken& aToken) : Edit( pParent, WB_BORDER|WB_TABSTOP|WB_CENTER), aFormToken(aToken), @@ -1547,7 +1547,7 @@ class SwTOXButton : public PushButton bool bNextControl; SwTokenWindow* m_pParent; public: - SwTOXButton( Window* pParent, SwTokenWindow* pTokenWin, + SwTOXButton( vcl::Window* pParent, SwTokenWindow* pTokenWin, const SwFormToken& rToken) : PushButton(pParent, WB_BORDER|WB_TABSTOP), aFormToken(rToken), @@ -1669,13 +1669,13 @@ void SwTOXButton::RequestHelp( const HelpEvent& rHEvt ) Button::RequestHelp(rHEvt); } -SwIdxTreeListBox::SwIdxTreeListBox(Window* pPar, WinBits nStyle) +SwIdxTreeListBox::SwIdxTreeListBox(vcl::Window* pPar, WinBits nStyle) : SvTreeListBox(pPar, nStyle) , pParent(NULL) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwIdxTreeListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwIdxTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1722,7 +1722,7 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) SvTreeListBox::RequestHelp(rHEvt); } -SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet) +SwTOXEntryTabPage::SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet) : SfxTabPage(pParent, "TocEntriesPage", "modules/swriter/ui/tocentriespage.ui", &rAttrSet) , sDelimStr(SW_RESSTR(STR_DELIM)) @@ -2077,7 +2077,7 @@ int SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/) return LEAVE_PAGE; } -SfxTabPage* SwTOXEntryTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet) +SfxTabPage* SwTOXEntryTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwTOXEntryTabPage(pParent, *rAttrSet); } @@ -2088,7 +2088,7 @@ IMPL_LINK(SwTOXEntryTabPage, EditStyleHdl, PushButton*, pBtn) { SfxStringItem aStyle(SID_STYLE_EDIT, m_pCharStyleLB->GetSelectEntry()); SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_CHAR); - Window* pDefDlgParent = Application::GetDefDialogParent(); + vcl::Window* pDefDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pBtn ); ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell(). GetView().GetViewFrame()->GetDispatcher()->Execute( @@ -2564,7 +2564,7 @@ OUString SwTOXEntryTabPage::GetLevelHelp(sal_uInt16 nLevel) const return sRet; } -SwTokenWindow::SwTokenWindow(Window* pParent) +SwTokenWindow::SwTokenWindow(vcl::Window* pParent) : VclHBox(pParent) , pForm(0) , nLevel(0) @@ -2603,7 +2603,7 @@ SwTokenWindow::SwTokenWindow(Window* pParent) m_pRightScrollWin->SetClickHdl(aLink); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwTokenWindow(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwTokenWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwTokenWindow(pParent); } @@ -3482,7 +3482,7 @@ sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType) const return nIndex; } -SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet ) +SwTOXStylesTabPage::SwTOXStylesTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet ) : SfxTabPage(pParent, "TocStylesPage", "modules/swriter/ui/tocstylespage.ui", &rAttrSet) , m_pCurrentForm(0) @@ -3592,7 +3592,7 @@ int SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return LEAVE_PAGE; } -SfxTabPage* SwTOXStylesTabPage::Create( Window* pParent, +SfxTabPage* SwTOXStylesTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwTOXStylesTabPage(pParent, *rAttrSet); @@ -3604,7 +3604,7 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn ) { SfxStringItem aStyle(SID_STYLE_EDIT, m_pParaLayLB->GetSelectEntry()); SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_PARA); - Window* pDefDlgParent = Application::GetDefDialogParent(); + vcl::Window* pDefDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( pBtn ); SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell(); rSh.GetView().GetViewFrame()->GetDispatcher()->Execute( @@ -3697,7 +3697,7 @@ void SwTOXStylesTabPage::Modify() #define ITEM_CASE 6 #define ITEM_WORDONLY 7 -SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, VclBuilderContainer* pBuilder) +SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pBuilder) : SwEntryBrowseBox_Base( pParent, EBBF_NONE, WB_TABSTOP | WB_BORDER, BROWSER_KEEPSELECTION | BROWSER_COLUMNSELECTION | @@ -3712,15 +3712,15 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, VclBuilderContainer* pBuilde , nCurrentRow(0) , bModified(false) { - sSearch = pBuilder->get<Window>("searchterm")->GetText(); - sAlternative = pBuilder->get<Window>("alternative")->GetText(); - sPrimKey = pBuilder->get<Window>("key1")->GetText(); - sSecKey = pBuilder->get<Window>("key2")->GetText(); - sComment = pBuilder->get<Window>("comment")->GetText(); - sCaseSensitive = pBuilder->get<Window>("casesensitive")->GetText(); - sWordOnly = pBuilder->get<Window>("wordonly")->GetText(); - sYes = pBuilder->get<Window>("yes")->GetText(); - sNo = pBuilder->get<Window>("no")->GetText(); + sSearch = pBuilder->get<vcl::Window>("searchterm")->GetText(); + sAlternative = pBuilder->get<vcl::Window>("alternative")->GetText(); + sPrimKey = pBuilder->get<vcl::Window>("key1")->GetText(); + sSecKey = pBuilder->get<vcl::Window>("key2")->GetText(); + sComment = pBuilder->get<vcl::Window>("comment")->GetText(); + sCaseSensitive = pBuilder->get<vcl::Window>("casesensitive")->GetText(); + sWordOnly = pBuilder->get<vcl::Window>("wordonly")->GetText(); + sYes = pBuilder->get<vcl::Window>("yes")->GetText(); + sNo = pBuilder->get<vcl::Window>("no")->GetText(); aCellCheckBox.GetBox().EnableTriState(false); xController = new ::svt::EditCellController(&aCellEdit); @@ -4012,7 +4012,7 @@ bool SwEntryBrowseBox::IsModified()const return pController->IsModified(); } -SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(Window* pParent, const OUString& rAutoMarkURL, +SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(vcl::Window* pParent, const OUString& rAutoMarkURL, const OUString& rAutoMarkType, bool bCreate) : ModalDialog(pParent, "CreateAutomarkDialog", "modules/swriter/ui/createautomarkdialog.ui") diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index e125eeeb25c8..7fe0e656888e 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -24,7 +24,7 @@ #include "index.hrc" -SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(Window* pParent, SwTOXMgr& rTOXMgr) +SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr& rTOXMgr) : SvxStandardDialog(pParent, "SelectIndexDialog", "modules/swriter/ui/selectindexdialog.ui") , rMgr(rTOXMgr) diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index eed951a970da..8cf9a0fef693 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -952,7 +952,7 @@ void SwIndexMarkPane::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark } SwIndexMarkFloatDlg::SwIndexMarkFloatDlg(SfxBindings* _pBindings, - SfxChildWindow* pChild, Window *pParent, + SfxChildWindow* pChild, vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew) : SfxModelessDialog(_pBindings, pChild, pParent, "IndexEntryDialog", "modules/swriter/ui/indexentry.ui") , m_aContent(*this, bNew, *::GetActiveWrtShell()) @@ -972,7 +972,7 @@ void SwIndexMarkFloatDlg::ReInitDlg(SwWrtShell& rWrtShell) m_aContent.ReInitDlg( rWrtShell ); } -SwIndexMarkModalDlg::SwIndexMarkModalDlg(Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) +SwIndexMarkModalDlg::SwIndexMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) : SvxStandardDialog(pParent, "IndexEntryDialog", "modules/swriter/ui/indexentry.ui") , m_aContent(*this, false, rSh) { @@ -1005,7 +1005,7 @@ class SwCreateAuthEntryDlg_Impl : public ModalDialog DECL_LINK(EnableHdl, ListBox* pBox); public: - SwCreateAuthEntryDlg_Impl(Window* pParent, + SwCreateAuthEntryDlg_Impl(vcl::Window* pParent, const OUString pFields[], SwWrtShell& rSh, bool bNewEntry, @@ -1416,7 +1416,7 @@ void SwAuthorMarkPane::Activate() m_pActionBT->Enable(!pSh->HasReadonlySel()); } -SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, +SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(vcl::Window* pParent, const OUString pFields[], SwWrtShell& rSh, bool bNewEntry, @@ -1604,7 +1604,7 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, ListBox*, pBox) SwAuthMarkFloatDlg::SwAuthMarkFloatDlg(SfxBindings* _pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew) : SfxModelessDialog(_pBindings, pChild, pParent, @@ -1628,7 +1628,7 @@ void SwAuthMarkFloatDlg::ReInitDlg(SwWrtShell& rWrtShell) m_aContent.ReInitDlg( rWrtShell ); } -SwAuthMarkModalDlg::SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh) +SwAuthMarkModalDlg::SwAuthMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh) : SvxStandardDialog(pParent, "BibliographyEntryDialog", "modules/swriter/ui/bibliographyentry.ui") , m_aContent(*this, false) diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 9add4dc7ae31..b1b33a0cdcbf 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -113,7 +113,7 @@ void SwInsertBookmarkDlg::Apply() } -SwInsertBookmarkDlg::SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rS, SfxRequest& rRequest ) : +SwInsertBookmarkDlg::SwInsertBookmarkDlg( vcl::Window *pParent, SwWrtShell &rS, SfxRequest& rRequest ) : SvxStandardDialog(pParent, "InsertBookmarkDialog", "modules/swriter/ui/insertbookmark.ui"), rSh( rS ), rReq( rRequest ) @@ -149,7 +149,7 @@ SwInsertBookmarkDlg::~SwInsertBookmarkDlg() { } -BookmarkCombo::BookmarkCombo(Window* pWin, WinBits nStyle) +BookmarkCombo::BookmarkCombo(vcl::Window* pWin, WinBits nStyle) : SwComboBox(pWin, nStyle) { } @@ -229,7 +229,7 @@ bool BookmarkCombo::PreNotify( NotifyEvent& rNEvt ) return nHandled; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBookmarkCombo(Window* pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBookmarkCombo(vcl::Window* pParent, VclBuilder::stringmap &) { return new BookmarkCombo(pParent, 0); } diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index f1cc191491ff..74188d14fa7f 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -38,7 +38,7 @@ #include <SwStyleNameMapper.hxx> #include <boost/scoped_ptr.hpp> -SwFootNoteOptionDlg::SwFootNoteOptionDlg(Window *pParent, SwWrtShell &rS) +SwFootNoteOptionDlg::SwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rS) : SfxTabDialog(pParent, "FootEndnoteDialog", "modules/swriter/ui/footendnotedialog.ui") , rSh( rS ) { @@ -69,7 +69,7 @@ IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn ) return 0; } -SwEndNoteOptionPage::SwEndNoteOptionPage(Window *pParent, bool bEN, +SwEndNoteOptionPage::SwEndNoteOptionPage(vcl::Window *pParent, bool bEN, const SfxItemSet &rSet) : SfxTabPage(pParent, bEN ? OString("EndnotePage") : OString("FootnotePage"), @@ -223,7 +223,7 @@ SwEndNoteOptionPage::~SwEndNoteOptionPage() { } -SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet *rSet ) +SfxTabPage *SwEndNoteOptionPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) { return new SwEndNoteOptionPage( pParent, true, *rSet ); } @@ -390,7 +390,7 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * ) return true; } -SwFootNoteOptionPage::SwFootNoteOptionPage( Window *pParent, const SfxItemSet &rSet ) : +SwFootNoteOptionPage::SwFootNoteOptionPage( vcl::Window *pParent, const SfxItemSet &rSet ) : SwEndNoteOptionPage( pParent, false, rSet ) { } @@ -399,7 +399,7 @@ SwFootNoteOptionPage::~SwFootNoteOptionPage() { } -SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet *rSet ) +SfxTabPage *SwFootNoteOptionPage::Create(vcl::Window *pParent, const SfxItemSet *rSet ) { return new SwFootNoteOptionPage( pParent, *rSet ); } diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 0fcc14f81e31..d65abfe36a8a 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -41,7 +41,7 @@ #define RENAME_TOKEN_DELIM (sal_Unicode)1 -SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent, +SwGlossaryGroupDlg::SwGlossaryGroupDlg(vcl::Window * pParent, std::vector<OUString> const& rPathArr, SwGlossaryHdl *pHdl) : SvxStandardDialog(pParent, "EditCategoriesDialog", "modules/swriter/ui/editcategories.ui") @@ -395,7 +395,7 @@ void FEdit::KeyInput( const KeyEvent& rKEvent ) Edit::KeyInput( rKEvent ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new FEdit(pParent); } @@ -429,7 +429,7 @@ void SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt ) } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwGlossaryGroupTLB(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwGlossaryGroupTLB(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwGlossaryGroupTLB(pParent); } diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 58659f1a623f..e20090f4080f 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -127,7 +127,7 @@ protected: DECL_LINK(Rename, void *); public: - SwNewGlosNameDlg( Window* pParent, + SwNewGlosNameDlg( vcl::Window* pParent, const OUString& rOldName, const OUString& rOldShort ); @@ -135,7 +135,7 @@ public: OUString GetNewShort() const { return m_pNewShort->GetText(); } }; -SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent, +SwNewGlosNameDlg::SwNewGlosNameDlg(vcl::Window* pParent, const OUString& rOldName, const OUString& rOldShort ) : ModalDialog(pParent, "RenameAutoTextDialog", @@ -808,7 +808,7 @@ IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, CheckBox *, pBox ) } // TreeListBox for groups and blocks -SwGlTreeListBox::SwGlTreeListBox(Window* pParent, WinBits nBits) +SwGlTreeListBox::SwGlTreeListBox(vcl::Window* pParent, WinBits nBits) : SvTreeListBox(pParent, nBits) , sReadonly(SW_RESSTR(SW_STR_READONLY)), pDragEntry(0) @@ -821,7 +821,7 @@ Size SwGlTreeListBox::GetOptimalSize() const return LogicToPixel(Size(212, 84), MapMode(MAP_APPFONT)); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwGlTreeListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwGlTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwGlTreeListBox(pParent, WB_BORDER | WB_TABSTOP); } diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 63d227dc41be..f9808c4dc040 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -67,11 +67,11 @@ class SwEndNoteOptionPage : public SfxTabPage DECL_LINK(NumCountHdl, void *); public: - SwEndNoteOptionPage( Window *pParent, bool bEndNote, + SwEndNoteOptionPage( vcl::Window *pParent, bool bEndNote, const SfxItemSet &rSet ); virtual ~SwEndNoteOptionPage(); - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; @@ -80,11 +80,11 @@ public: class SwFootNoteOptionPage : public SwEndNoteOptionPage { - SwFootNoteOptionPage( Window *pParent, const SfxItemSet &rSet ); + SwFootNoteOptionPage( vcl::Window *pParent, const SfxItemSet &rSet ); virtual ~SwFootNoteOptionPage(); public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); }; #endif diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 9e9dd470d5b2..50d720f3cd9e 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -163,7 +163,7 @@ IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn ) return 0; } -SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, bool bEd) +SwInsFootNoteDlg::SwInsFootNoteDlg(vcl::Window *pParent, SwWrtShell &rShell, bool bEd) : SvxStandardDialog(pParent, "InsertFootnoteDialog", "modules/swriter/ui/insertfootnote.ui") , rSh(rShell) , eCharSet(RTL_TEXTENCODING_DONTKNOW) diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 3fdff721ad21..48e6732fed88 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -60,8 +60,8 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw) sIntervalName += ")"; m_pDivIntervalNF->SetAccessibleName(sIntervalName); - Window *pNumIntervalFT = get<Window>("interval"); - Window *pNumRowsFT = get<Window>("intervallines"); + vcl::Window *pNumIntervalFT = get<vcl::Window>("interval"); + vcl::Window *pNumRowsFT = get<vcl::Window>("intervallines"); sIntervalName = pNumIntervalFT->GetAccessibleName(); sIntervalName += "("; sIntervalName += pNumRowsFT->GetAccessibleName(); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 08362914a24e..cd2ed1473548 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -60,7 +60,7 @@ static bool bLastRelative = false; //dialog to this one, except with a different preview window impl. //TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be //merged -SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent, +SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OutlinePositionPage", "modules/swriter/ui/outlinepositionpage.ui", &rSet) @@ -512,7 +512,7 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive ); } -SfxTabPage* SwNumPositionTabPage::Create( Window* pParent, +SfxTabPage* SwNumPositionTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwNumPositionTabPage(pParent, *rAttrSet); @@ -913,7 +913,7 @@ void SwNumPositionTabPage::SetModified(bool bRepaint) } #endif -SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent, +SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell & rSh) : SfxTabDialog(pParent, "BulletsAndNumberingDialog", "modules/swriter/ui/bulletsandnumbering.ui", diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 042e0c8ea1a0..c3eae29e8ff7 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -69,7 +69,7 @@ class SwNumNamesDlg : public ModalDialog DECL_LINK(DoubleClickHdl, void *); public: - SwNumNamesDlg(Window *pParent); + SwNumNamesDlg(vcl::Window *pParent); void SetUserNames(const OUString *pList[]); OUString GetName() const { return m_pFormEdit->GetText(); } sal_Int32 GetCurEntryPos() const { return m_pFormBox->GetSelectEntryPos(); } @@ -121,7 +121,7 @@ IMPL_LINK_NOARG_INLINE_START(SwNumNamesDlg, DoubleClickHdl) } IMPL_LINK_NOARG_INLINE_END(SwNumNamesDlg, DoubleClickHdl) -SwNumNamesDlg::SwNumNamesDlg(Window *pParent) +SwNumNamesDlg::SwNumNamesDlg(vcl::Window *pParent) : ModalDialog(pParent, "NumberingNameDialog", "modules/swriter/ui/numberingnamedialog.ui") { @@ -145,7 +145,7 @@ static sal_uInt16 lcl_BitToLevel(sal_uInt16 nActLevel) } sal_uInt16 SwOutlineTabDialog::nNumLevel = 1; -SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent, const SfxItemSet* pSwItemSet, +SwOutlineTabDialog::SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &rSh) : SfxTabDialog(pParent, "OutlineNumberingDialog", "modules/swriter/ui/outlinenumbering.ui", pSwItemSet) @@ -401,7 +401,7 @@ short SwOutlineTabDialog::Ok() return RET_OK; } -SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, +SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OutlineNumberingPage", "modules/swriter/ui/outlinenumberingpage.ui", &rSet) @@ -826,7 +826,7 @@ void SwOutlineSettingsTabPage::Reset( const SfxItemSet* rSet ) ActivatePage(*rSet); } -SfxTabPage* SwOutlineSettingsTabPage::Create( Window* pParent, +SfxTabPage* SwOutlineSettingsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwOutlineSettingsTabPage(pParent, *rAttrSet); @@ -882,7 +882,7 @@ static long lcl_DrawGraphic(VirtualDevice* pVDev, const SwNumFmt &rFmt, long nXS return nRet; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeNumberingPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeNumberingPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new NumberingPreview(pParent); } diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index ee077af26f8e..e81e2c34d6f4 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -106,7 +106,7 @@ IMPL_LINK_NOARG(SwFootNotePage, LineColorSelected_Impl) return 0; } -SwFootNotePage::SwFootNotePage(Window *pParent, const SfxItemSet &rSet) +SwFootNotePage::SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "FootnoteAreaPage", "modules/swriter/ui/footnoteareapage.ui", &rSet) , lMaxHeight(0) @@ -137,7 +137,7 @@ SwFootNotePage::~SwFootNotePage() { } -SfxTabPage* SwFootNotePage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage* SwFootNotePage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwFootNotePage(pParent, *rSet); } diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index f3cc570b0c23..0076090ded22 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -40,7 +40,7 @@ #include "swmodule.hxx" #include "view.hxx" -SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) : +SwTextGridPage::SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "TextGridPage", "modules/swriter/ui/textgridpage.ui", &rSet), m_nRubyUserValue(0), m_bRubyUserValue(false), @@ -153,7 +153,7 @@ SwTextGridPage::~SwTextGridPage() { } -SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet *rSet) +SfxTabPage *SwTextGridPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) { return new SwTextGridPage(pParent, *rSet); } diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 063ffb2e1512..9e511f3ea7ea 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -104,7 +104,7 @@ static bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY ) } // init list -SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) +SwSortDlg::SwSortDlg(vcl::Window* pParent, SwWrtShell &rShell) : SvxStandardDialog(pParent, "SortDialog", "modules/swriter/ui/sortdialog.ui") , aColTxt(SW_RES(STR_COL)) , aRowTxt(SW_RES(STR_ROW)) diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index f8c5f7f192be..11475e7af8cf 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -42,7 +42,7 @@ #include <unomid.h> -SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(Window *pParent) +SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(vcl::Window *pParent) : SfxModalDialog(pParent, "AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui") { diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 232c9e25672b..1ddc306861d2 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -150,7 +150,7 @@ sal_uInt16 SwTitlePageDlg::GetInsertPosition() const return nPage; } -SwTitlePageDlg::SwTitlePageDlg( Window *pParent ) : +SwTitlePageDlg::SwTitlePageDlg( vcl::Window *pParent ) : SfxModalDialog( pParent, "DLG_TITLEPAGE", "modules/swriter/ui/titlepage.ui"), mpPageFmtDesc(0) { diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index 434872fca3c0..751b5a4c029d 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -41,7 +41,7 @@ IMPL_LINK_NOARG_INLINE_START(SwTableWidthDlg, LoseFocusHdl) } IMPL_LINK_NOARG_INLINE_END(SwTableWidthDlg, LoseFocusHdl) -SwTableWidthDlg::SwTableWidthDlg(Window *pParent, SwTableFUNC &rTableFnc ) +SwTableWidthDlg::SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rTableFnc ) : SvxStandardDialog( pParent, "ColumnWidthDialog", "modules/swriter/ui/columnwidth.ui" ) , rFnc(rTableFnc) { diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx index 851244f3e85e..6c1dd9449336 100644 --- a/sw/source/ui/table/mergetbl.cxx +++ b/sw/source/ui/table/mergetbl.cxx @@ -20,7 +20,7 @@ #include <swtypes.hxx> #include <mergetbl.hxx> -SwMergeTblDlg::SwMergeTblDlg( Window *pParent, bool& rWithPrev ) +SwMergeTblDlg::SwMergeTblDlg( vcl::Window *pParent, bool& rWithPrev ) : SvxStandardDialog(pParent, "MergeTableDialog", "modules/swriter/ui/mergetabledialog.ui") , m_rMergePrev(rWithPrev) { diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index 348c5e8045af..f745f3f9356d 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -49,7 +49,7 @@ void SwTableHeightDlg::Apply() rSh.SetRowHeight( aSz ); } -SwTableHeightDlg::SwTableHeightDlg(Window *pParent, SwWrtShell &rS) +SwTableHeightDlg::SwTableHeightDlg(vcl::Window *pParent, SwWrtShell &rS) : SvxStandardDialog(pParent, "RowHeightDialog", "modules/swriter/ui/rowheight.ui") , rSh( rS ) { diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index d85bb957b4f7..d6d7b62ca16b 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -22,7 +22,7 @@ #include <table.hrc> #include <tblenum.hxx> -SwSplitTblDlg::SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ) +SwSplitTblDlg::SwSplitTblDlg( vcl::Window *pParent, SwWrtShell &rSh ) : SvxStandardDialog( pParent, "SplitTableDialog", "modules/swriter/ui/splittable.ui" ) , rShell(rSh) , m_nSplit(HEADLINE_CNTNTCOPY) diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 2252272406e0..221211fd3446 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star; -SwFormatTablePage::SwFormatTablePage(Window* pParent, const SfxItemSet& rSet) +SwFormatTablePage::SwFormatTablePage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "FormatTablePage", "modules/swriter/ui/formattablepage.ui", &rSet) , m_aTextFilter(" .<>") , pTblData(0) @@ -370,7 +370,7 @@ void SwFormatTablePage::ModifyHdl(const Edit * pEdit) bModified = true; } -SfxTabPage* SwFormatTablePage::Create( Window* pParent, +SfxTabPage* SwFormatTablePage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwFormatTablePage( pParent, *rAttrSet ); @@ -709,7 +709,7 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) } //Description: Page column configuration -SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet) +SwTableColumnPage::SwTableColumnPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "TableColumnPage", "modules/swriter/ui/tablecolumnpage.ui", &rSet) , pTblData(0) @@ -754,7 +754,7 @@ SwTableColumnPage::SwTableColumnPage(Window* pParent, const SfxItemSet& rSet) { } -SfxTabPage* SwTableColumnPage::Create( Window* pParent, +SfxTabPage* SwTableColumnPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwTableColumnPage( pParent, *rAttrSet ); @@ -1201,7 +1201,7 @@ void SwTableColumnPage::SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth) } -SwTableTabDlg::SwTableTabDlg(Window* pParent, SfxItemPool&, +SwTableTabDlg::SwTableTabDlg(vcl::Window* pParent, SfxItemPool&, const SfxItemSet* pItemSet, SwWrtShell* pSh) : SfxTabDialog(0, pParent, "TablePropertiesDialog", "modules/swriter/ui/tableproperties.ui", pItemSet) @@ -1243,7 +1243,7 @@ void SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) } } -SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet) +SwTextFlowPage::SwTextFlowPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "TableTextFlowPage", "modules/swriter/ui/tabletextflowpage.ui", &rSet) , pShell(0) @@ -1315,7 +1315,7 @@ SwTextFlowPage::SwTextFlowPage(Window* pParent, const SfxItemSet& rSet) { } -SfxTabPage* SwTextFlowPage::Create( Window* pParent, +SfxTabPage* SwTextFlowPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) { return new SwTextFlowPage(pParent, *rAttrSet); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 981cc7ddbfdf..7cff47ead65c 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -44,10 +44,10 @@ using namespace com::sun::star; #define FRAME_OFFSET 4 -class AutoFmtPreview : public Window +class AutoFmtPreview : public vcl::Window { public: - AutoFmtPreview(Window* pParent); + AutoFmtPreview(vcl::Window* pParent); virtual ~AutoFmtPreview(); void NotifyChange( const SwTableAutoFmt& rNewData ); @@ -100,7 +100,7 @@ private: class SwStringInputDlg : public ModalDialog { public: - SwStringInputDlg( Window* pParent, + SwStringInputDlg( vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault ); @@ -112,7 +112,7 @@ private: Edit* m_pEdInput; // Edit obtains the focus. }; -SwStringInputDlg::SwStringInputDlg(Window* pParent, const OUString& rTitle, +SwStringInputDlg::SwStringInputDlg(vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault) : ModalDialog(pParent, "StringInputDialog", "modules/swriter/ui/stringinput.ui") { @@ -134,7 +134,7 @@ SwStringInputDlg::~SwStringInputDlg() // AutoFormat-Dialogue: -SwAutoFormatDlg::SwAutoFormatDlg( Window* pParent, SwWrtShell* pWrtShell, +SwAutoFormatDlg::SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pWrtShell, bool bSetAutoFormat, const SwTableAutoFmt* pSelFmt ) : SfxModalDialog(pParent, "AutoFormatTableDialog", "modules/swriter/ui/autoformattable.ui") , aStrTitle(SW_RES(STR_ADD_AUTOFORMAT_TITLE)) @@ -486,7 +486,7 @@ IMPL_LINK_NOARG_INLINE_START(SwAutoFormatDlg, OkHdl) } IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl) -AutoFmtPreview::AutoFmtPreview(Window* pParent) : +AutoFmtPreview::AutoFmtPreview(vcl::Window* pParent) : Window ( pParent ), aCurData ( OUString() ), aVD ( *this ), @@ -508,7 +508,7 @@ AutoFmtPreview::AutoFmtPreview(Window* pParent) : Init(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeAutoFmtPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeAutoFmtPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new AutoFmtPreview(pParent); } diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx index d32fd6eb3a65..15902b8a076a 100644 --- a/sw/source/ui/utlui/swrenamexnameddlg.cxx +++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx @@ -51,7 +51,7 @@ using namespace ::com::sun::star; -SwRenameXNamedDlg::SwRenameXNamedDlg( Window* pWin, +SwRenameXNamedDlg::SwRenameXNamedDlg( vcl::Window* pWin, uno::Reference< container::XNamed > & xN, uno::Reference< container::XNameAccess > & xNA ) : ModalDialog(pWin, "RenameObjectDialog", diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index e7ed851b5225..8564a2d727f9 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -204,7 +204,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) } - Window *pParent = pOldSh ? pOldSh->GetWin() : 0; + vcl::Window *pParent = pOldSh ? pOldSh->GetWin() : 0; boost::scoped_ptr<SfxAbstractTabDialog> pDlg; short nMode = ENV_INSERT; diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index cbf9093b5f03..cb6a1652a23c 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -413,7 +413,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) ApplyUsrPref( aViewOpt, pAppView, bTextDialog? VIEWOPT_DEST_TEXT : VIEWOPT_DEST_WEB); } -SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) { SfxTabPage* pRet = NULL; SfxAllItemSet aSet(*(rSet.GetPool())); diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 2a1f7e2d7ecd..deeb9d74aa06 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -251,10 +251,10 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium ) SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this ); if (pFrame1) { - Window* pWindow = &pFrame1->GetWindow(); + vcl::Window* pWindow = &pFrame1->GetWindow(); if ( pWindow ) { - Window* pSysWin = pWindow->GetSystemWindow(); + vcl::Window* pSysWin = pWindow->GetSystemWindow(); if ( pSysWin ) { pSysWin->SetAccessibleName(OUString()); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 4da0bb889835..f4a4e9fb87c0 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -130,7 +130,7 @@ using namespace ::sfx2; // create DocInfo (virtual) SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog( - Window *pParent, const SfxItemSet &rSet) + vcl::Window *pParent, const SfxItemSet &rSet) { SfxDocumentInfoDialog* pDlg = new SfxDocumentInfoDialog(pParent, rSet); //only with statistics, when this document is being shown, not @@ -812,7 +812,7 @@ void SwDocShell::Execute(SfxRequest& rReq) pClipCntnr->CopyAnyData( FORMAT_RTF, (sal_Char*) pStrm->GetData(), pStrm->GetEndOfData() ); pClipCntnr->CopyToClipboard( - GetView()? (Window*)&GetView()->GetEditWin() : 0 ); + GetView()? (vcl::Window*)&GetView()->GetEditWin() : 0 ); delete pStrm; } } @@ -1480,7 +1480,7 @@ SfxInPlaceClient* SwDocShell::GetIPClient( const ::svt::EmbeddedObjectRef& xObjR SwWrtShell* pShell = GetWrtShell(); if ( pShell ) { - pResult = pShell->GetView().FindIPClient( xObjRef.GetObject(), (Window*)&pShell->GetView().GetEditWin() ); + pResult = pShell->GetView().FindIPClient( xObjRef.GetObject(), (vcl::Window*)&pShell->GetView().GetEditWin() ); if ( !pResult ) pResult = new SwOleClient( &pShell->GetView(), &pShell->GetView().GetEditWin(), xObjRef ); } diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx index 05cda9e485be..5d7d156900aa 100644 --- a/sw/source/uibase/cctrl/actctrl.cxx +++ b/sw/source/uibase/cctrl/actctrl.cxx @@ -62,7 +62,7 @@ void ReturnActionEdit::KeyInput( const KeyEvent& rEvt) Edit::KeyInput(rEvt); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeReturnActionEdit(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeReturnActionEdit(vcl::Window *pParent, VclBuilder::stringmap &rMap) { VclBuilder::ensureDefaultWidthChars(rMap); return new ReturnActionEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); diff --git a/sw/source/uibase/cctrl/swlbox.cxx b/sw/source/uibase/cctrl/swlbox.cxx index bdd3f15869ad..b17e28a6314f 100644 --- a/sw/source/uibase/cctrl/swlbox.cxx +++ b/sw/source/uibase/cctrl/swlbox.cxx @@ -46,7 +46,7 @@ SwBoxEntry::SwBoxEntry(const SwBoxEntry& rOld) : { } -SwComboBox::SwComboBox(Window* pParent, WinBits nStyle) +SwComboBox::SwComboBox(vcl::Window* pParent, WinBits nStyle) : ComboBox(pParent, nStyle) { Init(); diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index ea9ab8f3b286..011e0300f67d 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -295,7 +295,7 @@ SwViewOption::~SwViewOption() { } -void SwViewOption::Init( Window *pWin ) +void SwViewOption::Init( vcl::Window *pWin ) { if( !nPixelTwips && pWin ) { diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index 35cd95883a58..e3461d7f8375 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -169,7 +169,7 @@ Reference<XConnection> SwDBTreeList_Impl::GetConnection(const OUString& rSource return xRet; } -SwDBTreeList::SwDBTreeList(Window *pParent, WinBits nStyle) +SwDBTreeList::SwDBTreeList(vcl::Window *pParent, WinBits nStyle) : SvTreeListBox(pParent, nStyle) , aImageList(SW_RES(ILIST_DB_DLG)) , bInitialized(false) @@ -180,7 +180,7 @@ SwDBTreeList::SwDBTreeList(Window *pParent, WinBits nStyle) InitTreeList(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwDBTreeList(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwDBTreeList(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx index c242d39f60cd..677bf8836e6f 100644 --- a/sw/source/uibase/dbui/dbui.cxx +++ b/sw/source/uibase/dbui/dbui.cxx @@ -22,7 +22,7 @@ #include "dbui.hrc" #include "dbui.hxx" -PrintMonitor::PrintMonitor(Window *pParent, PrintMonitorType eType ) +PrintMonitor::PrintMonitor(vcl::Window *pParent, PrintMonitorType eType ) : CancelableModelessDialog(pParent, "PrintMonitorDialog", "modules/swriter/ui/printmonitordialog.ui") { @@ -42,7 +42,7 @@ PrintMonitor::PrintMonitor(Window *pParent, PrintMonitorType eType ) m_pPrinting->Show(); } -CancelableModelessDialog::CancelableModelessDialog( Window *pParent, +CancelableModelessDialog::CancelableModelessDialog( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) : ModelessDialog( pParent , rID, rUIXMLDescription ) { diff --git a/sw/source/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx index f52bf6298d21..caaec215a799 100644 --- a/sw/source/uibase/dbui/mailmergechildwindow.cxx +++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; SFX_IMPL_FLOATINGWINDOW( SwMailMergeChildWindow, FN_MAILMERGE_CHILDWINDOW ) -SwMailMergeChildWindow::SwMailMergeChildWindow( Window* _pParent, +SwMailMergeChildWindow::SwMailMergeChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -64,7 +64,7 @@ SwMailMergeChildWindow::SwMailMergeChildWindow( Window* _pParent, } SwMailMergeChildWin::SwMailMergeChildWin(SfxBindings* _pBindings, - SfxChildWindow* pChild, Window *pParent) + SfxChildWindow* pChild, vcl::Window *pParent) : SfxFloatingWindow(_pBindings, pChild, pParent, "FloatingMMChild", "modules/swriter/ui/floatingmmchild.ui") { diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 6f769d4d3233..076a04b6830c 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -91,7 +91,7 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer( uno::Reference< mail::XMailService >& rxInMailService, const OUString& rInMailServerPassword, const OUString& rOutMailServerPassword, - Window* pDialogParentWindow ) + vcl::Window* pDialogParentWindow ) { uno::Reference< mail::XSmtpService > xSmtpServer; uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); @@ -185,7 +185,7 @@ struct SwAddressPreview_Impl } }; -SwAddressPreview::SwAddressPreview(Window* pParent, WinBits nStyle) +SwAddressPreview::SwAddressPreview(vcl::Window* pParent, WinBits nStyle) : Window( pParent, nStyle ) , aVScrollBar(this, WB_VSCROLL) , pImpl(new SwAddressPreview_Impl()) @@ -195,7 +195,7 @@ SwAddressPreview::SwAddressPreview(Window* pParent, WinBits nStyle) Show(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwAddressPreview(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwAddressPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_DIALOGCONTROL; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index ddf8ac56a4b8..89f25f74206e 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -149,7 +149,7 @@ static void lcl_LeaveDrawText(SwWrtShell& rSh) } SwSpellDialogChildWindow::SwSpellDialogChildWindow ( - Window* _pParent, + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) @@ -420,7 +420,7 @@ The code below would only be part of the solution. LockFocusNotification( true ); OUString sInfo(SW_RES(STR_SPELLING_COMPLETED)); // #i84610# - Window* pTemp = GetWindow(); // temporary needed for g++ 3.3.5 + vcl::Window* pTemp = GetWindow(); // temporary needed for g++ 3.3.5 MessageDialog(pTemp, sInfo, VCL_MESSAGE_INFO).Execute(); LockFocusNotification( false ); // take care that the now valid selection is stored diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx index 72aa8c63c840..db1d54f84217 100644 --- a/sw/source/uibase/dialog/regionsw.cxx +++ b/sw/source/uibase/dialog/regionsw.cxx @@ -215,7 +215,7 @@ void SwBaseShell::EditRegionDialog(SfxRequest& rReq) { case FN_EDIT_REGION: { - Window* pParentWin = &GetView().GetViewFrame()->GetWindow(); + vcl::Window* pParentWin = &GetView().GetViewFrame()->GetWindow(); { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialog creation failed!"); diff --git a/sw/source/uibase/dialog/wordcountwrapper.cxx b/sw/source/uibase/dialog/wordcountwrapper.cxx index ea45d52169c1..0155958fde77 100644 --- a/sw/source/uibase/dialog/wordcountwrapper.cxx +++ b/sw/source/uibase/dialog/wordcountwrapper.cxx @@ -15,7 +15,7 @@ SFX_IMPL_CHILDWINDOW_WITHID(SwWordCountWrapper, FN_WORDCOUNT_DIALOG) -SwWordCountWrapper::SwWordCountWrapper( Window *pParentWindow, +SwWordCountWrapper::SwWordCountWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 0d537acbde8c..5e72c8c877ca 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -353,10 +353,10 @@ const Graphic* SwTransferable::FindOLEReplacementGraphic() const return NULL; } -void SwTransferable::RemoveDDELinkFormat( const Window& rWin ) +void SwTransferable::RemoveDDELinkFormat( const vcl::Window& rWin ) { RemoveFormat( SOT_FORMATSTR_ID_LINK ); - CopyToClipboard( (Window*)&rWin ); + CopyToClipboard( (vcl::Window*)&rWin ); } namespace @@ -3143,7 +3143,7 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos ) } } -void SwTransferable::StartDrag( Window* pWin, const Point& rPos ) +void SwTransferable::StartDrag( vcl::Window* pWin, const Point& rPos ) { if(!pWrtShell) return; diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx index 06731b6cdb39..603dbb62c26b 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.hxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.hxx @@ -37,7 +37,7 @@ class AnnotationMenuButton : public MenuButton // overloaded <MenuButton> methods virtual void Select() SAL_OVERRIDE; - // overloaded <Window> methods + // overloaded <vcl::Window> methods virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; diff --git a/sw/source/uibase/docvw/DashedLine.cxx b/sw/source/uibase/docvw/DashedLine.cxx index 824e7c32c2b7..f7104cbccb46 100644 --- a/sw/source/uibase/docvw/DashedLine.cxx +++ b/sw/source/uibase/docvw/DashedLine.cxx @@ -19,7 +19,7 @@ #include <vcl/settings.hxx> #include <boost/scoped_ptr.hpp> -SwDashedLine::SwDashedLine( Window* pParent, Color& ( *pColorFn )() ) : +SwDashedLine::SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ) : FixedLine( pParent, WB_DIALOGCONTROL | WB_HORZ ), m_pColorFn( pColorFn ) { diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 5a1666b3a26f..8f472f48add1 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -59,7 +59,7 @@ namespace SwPageBreakWin* m_pWin; public: - SwBreakDashedLine( Window* pParent, Color& ( *pColorFn )(), SwPageBreakWin* pWin ) : + SwBreakDashedLine( vcl::Window* pParent, Color& ( *pColorFn )(), SwPageBreakWin* pWin ) : SwDashedLine( pParent, pColorFn ), m_pWin( pWin ) {}; diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index b1ce47bb70b3..a2ed8dbfa248 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -2004,10 +2004,10 @@ bool SwPostItMgr::HasFrmConnectedSidebarWins( const SwFrm& rFrm ) return bRet; } -Window* SwPostItMgr::GetSidebarWinForFrmByIndex( const SwFrm& rFrm, +vcl::Window* SwPostItMgr::GetSidebarWinForFrmByIndex( const SwFrm& rFrm, const sal_Int32 nIndex ) { - Window* pSidebarWin( 0 ); + vcl::Window* pSidebarWin( 0 ); if ( mpFrmSidebarWinContainer != 0 ) { @@ -2018,7 +2018,7 @@ Window* SwPostItMgr::GetSidebarWinForFrmByIndex( const SwFrm& rFrm, } void SwPostItMgr::GetAllSidebarWinForFrm( const SwFrm& rFrm, - std::vector< Window* >* pChildren ) + std::vector< vcl::Window* >* pChildren ) { if ( mpFrmSidebarWinContainer != 0 ) { diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 21fb6c8be67a..a5abefd20856 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -4930,7 +4930,7 @@ void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl) /** * Ctor */ -SwEditWin::SwEditWin(Window *pParent, SwView &rMyView): +SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView): Window(pParent, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), DropTargetHelper( this ), DragSourceHelper( this ), @@ -5484,7 +5484,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) { ++nSize; } - Window& rWin = rSh.GetView().GetEditWin(); + vcl::Window& rWin = rSh.GetView().GetEditWin(); if ( nSize == 0 ) { // When the composition does not exist, use Caret rect instead. @@ -5852,7 +5852,7 @@ void QuickHelpData::Start( SwWrtShell& rSh, sal_uInt16 nWrdLen ) } m_bIsDisplayed = true; - Window& rWin = rSh.GetView().GetEditWin(); + vcl::Window& rWin = rSh.GetView().GetEditWin(); if( m_bIsTip ) { Point aPt( rWin.OutputToScreenPixel( rWin.LogicToPixel( diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx index 14c96d5da3a9..75ab9e95312b 100644 --- a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx +++ b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx @@ -181,7 +181,7 @@ SwSidebarWin* SwFrmSidebarWinContainer::get( const SwFrm& rFrm, } void SwFrmSidebarWinContainer::getAll( const SwFrm& rFrm, - std::vector< Window* >* pSidebarWins ) + std::vector< vcl::Window* >* pSidebarWins ) { pSidebarWins->clear(); diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx index f0fa3faf8abf..fc7834c7e932 100644 --- a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx +++ b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx @@ -24,7 +24,7 @@ class SwFrm; class SwFmtFld; -class Window; +namespace vcl { class Window; } namespace sw { namespace sidebarwindows { @@ -50,7 +50,7 @@ class SwFrmSidebarWinContainer const sal_Int32 nIndex ); void getAll( const SwFrm& rFrm, - std::vector< Window* >* pSidebarWins ); + std::vector< vcl::Window* >* pSidebarWins ); private: FrmSidebarWinContainer* mpFrmSidebarWinContainer; diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index bd9470517eaa..310a5a9054f4 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -228,7 +228,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) : RemoveDisabledEntries( true, true ); } -void SwReadOnlyPopup::Execute( Window* pWin, const Point &rPixPos ) +void SwReadOnlyPopup::Execute( vcl::Window* pWin, const Point &rPixPos ) { sal_uInt16 nId = PopupMenu::Execute( pWin, @@ -237,7 +237,7 @@ void SwReadOnlyPopup::Execute( Window* pWin, const Point &rPixPos ) } // execute the resulting ID only - necessary to support XContextMenuInterception -void SwReadOnlyPopup::Execute( Window* pWin, sal_uInt16 nId ) +void SwReadOnlyPopup::Execute( vcl::Window* pWin, sal_uInt16 nId ) { SwWrtShell &rSh = rView.GetWrtShell(); SfxDispatcher &rDis = *rView.GetViewFrame()->GetDispatcher(); diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx index 87aa22174964..a595f6392417 100644 --- a/sw/source/uibase/docvw/romenu.hxx +++ b/sw/source/uibase/docvw/romenu.hxx @@ -53,8 +53,8 @@ public: SwReadOnlyPopup( const Point &rDPos, SwView &rV ); virtual ~SwReadOnlyPopup(); - void Execute( Window* pWin, const Point &rPPos ); - void Execute( Window* pWin, sal_uInt16 nId ); + void Execute( vcl::Window* pWin, const Point &rPPos ); + void Execute( vcl::Window* pWin, sal_uInt16 nId ); }; void GetPreferredExtension( OUString &rExt, const Graphic &rGrf ); diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index f8c3fc33e418..b2363d593415 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -232,7 +232,7 @@ private: SwSrcEditWindow & editor_; }; -SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) : +SwSrcEditWindow::SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView ) : Window( pParent, WB_BORDER|WB_CLIPCHILDREN ), pTextEngine(0), diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx index 16e07645ba86..81a59be3ec6f 100644 --- a/sw/source/uibase/envelp/syncbtn.cxx +++ b/sw/source/uibase/envelp/syncbtn.cxx @@ -31,7 +31,7 @@ SFX_IMPL_FLOATINGWINDOW( SwSyncChildWin, FN_SYNC_LABELS ) -SwSyncChildWin::SwSyncChildWin( Window* _pParent, +SwSyncChildWin::SwSyncChildWin( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -60,7 +60,7 @@ SwSyncChildWin::SwSyncChildWin( Window* _pParent, SwSyncBtnDlg::SwSyncBtnDlg( SfxBindings* _pBindings, SfxChildWindow* pChild, - Window *pParent) + vcl::Window *pParent) : SfxFloatingWindow(_pBindings, pChild, pParent, "FloatingSync", "modules/swriter/ui/floatingsync.ui") { get(m_pSyncBtn, "sync"); diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx index 36c29ac1b46f..2acec8581b41 100644 --- a/sw/source/uibase/fldui/fldwrap.cxx +++ b/sw/source/uibase/fldui/fldwrap.cxx @@ -37,7 +37,7 @@ SFX_IMPL_CHILDWINDOW_WITHID(SwFldDlgWrapper, FN_INSERT_FIELD) -SwChildWinWrapper::SwChildWinWrapper(Window *pParentWindow, sal_uInt16 nId) : +SwChildWinWrapper::SwChildWinWrapper(vcl::Window *pParentWindow, sal_uInt16 nId) : SfxChildWindow(pParentWindow, nId), m_pDocSh(0) { @@ -76,7 +76,7 @@ SfxChildWinInfo SwFldDlgWrapper::GetInfo() const return aInfo; } -SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, sal_uInt16 nId, +SwFldDlgWrapper::SwFldDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pB, SfxChildWinInfo* ) : SwChildWinWrapper( _pParent, nId ) @@ -120,7 +120,7 @@ SfxChildWinInfo SwFldDataOnlyDlgWrapper::GetInfo() const return aInfo; } -SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, sal_uInt16 nId, +SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pB, SfxChildWinInfo* pInfo ) : SwChildWinWrapper( _pParent, nId ) diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index 7e68f4cb45ce..d11992e6ff82 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -314,12 +314,12 @@ void SwColExample::DrawPage( const Point& rOrg, } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwColExample(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwColExample(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwColExample(pParent); } -SwColumnOnlyExample::SwColumnOnlyExample(Window* pParent) +SwColumnOnlyExample::SwColumnOnlyExample(vcl::Window* pParent) : Window(pParent) , m_aFrmSize(1,1) { @@ -343,7 +343,7 @@ SwColumnOnlyExample::SwColumnOnlyExample(Window* pParent) SetMapMode( aMapMode ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwColumnOnlyExample(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwColumnOnlyExample(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwColumnOnlyExample(pParent); } @@ -607,7 +607,7 @@ void SwPageGridExample::UpdateExample( const SfxItemSet& rSet ) SwPageExample::UpdateExample(rSet); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwPageGridExample(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwPageGridExample(vcl::Window *pParent, VclBuilder::stringmap &) { return new SwPageGridExample(pParent); } diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx index a16899b8698f..4ab2efaa91fa 100644 --- a/sw/source/uibase/inc/DashedLine.hxx +++ b/sw/source/uibase/inc/DashedLine.hxx @@ -19,7 +19,7 @@ class SwDashedLine : public FixedLine Color& (*m_pColorFn)(); public: - SwDashedLine( Window* pParent, Color& ( *pColorFn )() ); + SwDashedLine( vcl::Window* pParent, Color& ( *pColorFn )() ); virtual ~SwDashedLine( ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/DropDownFieldDialog.hxx b/sw/source/uibase/inc/DropDownFieldDialog.hxx index 1787726af8b1..19c42cf7dbfc 100644 --- a/sw/source/uibase/inc/DropDownFieldDialog.hxx +++ b/sw/source/uibase/inc/DropDownFieldDialog.hxx @@ -46,7 +46,7 @@ class DropDownFieldDialog : public SvxStandardDialog DECL_LINK(ButtonHdl, PushButton*); virtual void Apply() SAL_OVERRIDE; public: - DropDownFieldDialog( Window *pParent, SwWrtShell &rSh, + DropDownFieldDialog( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false ); }; } //namespace sw diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index efe7d13a83d9..6f151fd8ec69 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -23,7 +23,7 @@ class SwHeaderFooterWin : public MenuButton, public SwFrameControl OUString m_sLabel; bool m_bIsHeader; PopupMenu* m_pPopupMenu; - Window* m_pLine; + vcl::Window* m_pLine; bool m_bIsAppearing; int m_nFadeRate; Timer m_aFadeTimer; diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index 321cb17c6fd3..ff28df16ca3f 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -23,7 +23,7 @@ class SwPageFrm; class SwPageBreakWin : public MenuButton, public SwFrameControl { PopupMenu* m_pPopupMenu; - Window* m_pLine; + vcl::Window* m_pLine; bool m_bIsAppearing; int m_nFadeRate; int m_nDelayAppearing; ///< Before we show the control, let it transparent for a few timer ticks to avoid appearing with every mouse over. diff --git a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx index b82d9d4c5d4d..b2b80c24a821 100644 --- a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx @@ -50,7 +50,7 @@ protected: public: SwSpellDialogChildWindow ( - Window*pParent, + vcl::Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); diff --git a/sw/source/uibase/inc/abstract.hxx b/sw/source/uibase/inc/abstract.hxx index 1a40fd8a0e03..92443efa9d9d 100644 --- a/sw/source/uibase/inc/abstract.hxx +++ b/sw/source/uibase/inc/abstract.hxx @@ -31,7 +31,7 @@ class SwInsertAbstractDlg : public SfxModalDialog protected: public: - SwInsertAbstractDlg( Window* pParent ); + SwInsertAbstractDlg( vcl::Window* pParent ); sal_uInt8 GetLevel() const; sal_uInt8 GetPara() const; diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx index 919a8dd16f6a..790bc0009768 100644 --- a/sw/source/uibase/inc/actctrl.hxx +++ b/sw/source/uibase/inc/actctrl.hxx @@ -31,7 +31,7 @@ protected: virtual void Action(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - NumEditAction( Window* pParent, const ResId& rResId ) : + NumEditAction( vcl::Window* pParent, const ResId& rResId ) : NumericField(pParent, rResId) {} void SetActionHdl( const Link& rLink ) { aActionLink = rLink;} @@ -43,7 +43,7 @@ class SW_DLLPUBLIC ReturnActionEdit : public Edit { Link aReturnActionLink; public: - ReturnActionEdit(Window* pParent, WinBits nStyle) + ReturnActionEdit(vcl::Window* pParent, WinBits nStyle) : Edit(pParent, nStyle) { } diff --git a/sw/source/uibase/inc/addrdlg.hxx b/sw/source/uibase/inc/addrdlg.hxx index 43e02f54dfda..4142ddadd530 100644 --- a/sw/source/uibase/inc/addrdlg.hxx +++ b/sw/source/uibase/inc/addrdlg.hxx @@ -24,7 +24,7 @@ class SwAddrDlg : public SfxSingleTabDialog { public: - SwAddrDlg(Window* pParent, const SfxItemSet& rSet); + SwAddrDlg(vcl::Window* pParent, const SfxItemSet& rSet); }; #endif diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index b4a5d62d83a5..827d5032bcbc 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -50,7 +50,7 @@ class SwAsciiFilterDlg : public SfxModalDialog public: // CTOR: for import - pStream is the inputstream // for export - pStream must be 0 - SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, + SwAsciiFilterDlg( vcl::Window* pParent, SwDocShell& rDocSh, SvStream* pStream ); virtual ~SwAsciiFilterDlg(); diff --git a/sw/source/uibase/inc/autoedit.hxx b/sw/source/uibase/inc/autoedit.hxx index 53ba3123d8a6..421236967b74 100644 --- a/sw/source/uibase/inc/autoedit.hxx +++ b/sw/source/uibase/inc/autoedit.hxx @@ -24,7 +24,7 @@ class AutoEdit : public Edit { public: - AutoEdit( Window* pParent, ResId aResId ) : Edit( pParent, aResId ){} + AutoEdit( vcl::Window* pParent, ResId aResId ) : Edit( pParent, aResId ){} protected: virtual void KeyInput( const KeyEvent& rEvent ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx index 070656faf52b..e18d636052e6 100644 --- a/sw/source/uibase/inc/bmpwin.hxx +++ b/sw/source/uibase/inc/bmpwin.hxx @@ -25,7 +25,7 @@ #include <vcl/window.hxx> // extended page for graphics -class BmpWindow : public Window +class BmpWindow : public vcl::Window { private: Graphic aGraphic; @@ -41,7 +41,7 @@ private: virtual Size GetOptimalSize() const SAL_OVERRIDE; public: - BmpWindow(Window* pPar, WinBits nStyle); + BmpWindow(vcl::Window* pPar, WinBits nStyle); virtual ~BmpWindow(); void MirrorVert(bool bMirror) { bVert = bMirror; Invalidate(); } void MirrorHorz(bool bMirror) { bHorz = bMirror; Invalidate(); } diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx index 3130310eb318..d64a08e69a8f 100644 --- a/sw/source/uibase/inc/bookmark.hxx +++ b/sw/source/uibase/inc/bookmark.hxx @@ -37,7 +37,7 @@ class BookmarkCombo : public SwComboBox virtual bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; public: - BookmarkCombo(Window* pWin, WinBits nStyle); + BookmarkCombo(vcl::Window* pWin, WinBits nStyle); sal_Int32 GetSelectEntryCount() const; sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const; @@ -61,7 +61,7 @@ class SwInsertBookmarkDlg: public SvxStandardDialog virtual void Apply() SAL_OVERRIDE; public: - SwInsertBookmarkDlg(Window *pParent, SwWrtShell &rSh, SfxRequest& rReq); + SwInsertBookmarkDlg(vcl::Window *pParent, SwWrtShell &rSh, SfxRequest& rReq); virtual ~SwInsertBookmarkDlg(); }; diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 5d939e6efdae..55610b7dbe8c 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -62,7 +62,7 @@ protected: virtual void Apply() SAL_OVERRIDE; public: - SwBreakDlg( Window *pParent, SwWrtShell &rSh ); + SwBreakDlg( vcl::Window *pParent, SwWrtShell &rSh ); virtual ~SwBreakDlg(); OUString GetTemplateName() { return aTemplate; } diff --git a/sw/source/uibase/inc/chartins.hxx b/sw/source/uibase/inc/chartins.hxx index f520fe08de2d..b610bbece966 100644 --- a/sw/source/uibase/inc/chartins.hxx +++ b/sw/source/uibase/inc/chartins.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX -Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ); -void SwInsertChart( Window *pParent, SfxBindings *pBindings ); +Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ); +void SwInsertChart( vcl::Window *pParent, SfxBindings *pBindings ); #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX diff --git a/sw/source/uibase/inc/chldwrap.hxx b/sw/source/uibase/inc/chldwrap.hxx index 142b68982bb6..d9b6574b099c 100644 --- a/sw/source/uibase/inc/chldwrap.hxx +++ b/sw/source/uibase/inc/chldwrap.hxx @@ -33,7 +33,7 @@ class SwChildWinWrapper : public SfxChildWindow // Implementation in fldtdlg.cxx protected: - SwChildWinWrapper(Window *pParentWindow, sal_uInt16 nId); + SwChildWinWrapper(vcl::Window *pParentWindow, sal_uInt16 nId); public: virtual bool ReInitDlg(SwDocShell *pDocSh); diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 5f4fbe7c7230..7c0520ade242 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -49,7 +49,7 @@ class SwCharDlg: public SfxTabDialog sal_uInt16 m_nCharBrdId; public: - SwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, + SwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pFmtStr = 0); virtual ~SwCharDlg(); @@ -78,11 +78,11 @@ class SwCharURLPage : public SfxTabPage DECL_LINK(EventHdl, void *); public: - SwCharURLPage( Window* pParent, + SwCharURLPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCharURLPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx index 1bc29f9b39c2..ce03ddce93b2 100644 --- a/sw/source/uibase/inc/colex.hxx +++ b/sw/source/uibase/inc/colex.hxx @@ -31,7 +31,7 @@ class SfxItemSet; class SW_DLLPUBLIC SwPageExample : public SvxPageWindow { public: - SwPageExample(Window* pPar) + SwPageExample(vcl::Window* pPar) : SvxPageWindow(pPar) { SetSize(SvxPaperInfo::GetPaperSize(PAPER_A4)); @@ -51,7 +51,7 @@ protected: const bool bSecond, const bool bEnabled ) SAL_OVERRIDE; public: - SwPageGridExample(Window* pPar) : + SwPageGridExample(vcl::Window* pPar) : SwPageExample(pPar), pGridItem(0), m_bVertical(false){} @@ -72,7 +72,7 @@ protected: const bool bEnabled ) SAL_OVERRIDE; public: - SwColExample(Window* pPar) + SwColExample(vcl::Window* pPar) : SwPageExample(pPar) , pColMgr(0) { @@ -85,7 +85,7 @@ public: } }; -class SW_DLLPUBLIC SwColumnOnlyExample : public Window +class SW_DLLPUBLIC SwColumnOnlyExample : public vcl::Window { private: Size m_aWinSize; @@ -97,7 +97,7 @@ protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - SwColumnOnlyExample(Window*); + SwColumnOnlyExample(vcl::Window*); void SetColumns(const SwFmtCol& rCol); diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 4f7ca8094b99..d9b2397eb2cf 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -64,7 +64,7 @@ class SwColumnDlg : public SfxModalDialog DECL_LINK(OkHdl, void *); public: - SwColumnDlg(Window* pParent, SwWrtShell& rSh); + SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh); virtual ~SwColumnDlg(); SwWrtShell& GetWrtShell() { return rWrtShell; } @@ -73,11 +73,11 @@ public: class ColumnValueSet : public ValueSet { public: - ColumnValueSet(Window* pParent, const ResId& rResId) + ColumnValueSet(vcl::Window* pParent, const ResId& rResId) : ValueSet(pParent, rResId) { } - ColumnValueSet(Window* pParent) + ColumnValueSet(vcl::Window* pParent) : ValueSet(pParent, WB_TABSTOP | WB_ITEMBORDER | WB_DOUBLEBORDER) { } @@ -163,7 +163,7 @@ class SwColumnPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; - SwColumnPage(Window *pParent, const SfxItemSet &rSet); + SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet); void connectPercentField(PercentField &rWrap, const OString &rName); @@ -172,7 +172,7 @@ class SwColumnPage : public SfxTabPage public: virtual ~SwColumnPage(); - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx index d8c0a41af9c2..a188f1256856 100644 --- a/sw/source/uibase/inc/condedit.hxx +++ b/sw/source/uibase/inc/condedit.hxx @@ -31,7 +31,7 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper SAL_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; public: - ConditionEdit(Window* pParent, WinBits nStyle); + ConditionEdit(vcl::Window* pParent, WinBits nStyle); void ShowBrackets(bool bShow) { diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index c5ed17189d32..e4aa7d9f7a21 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -139,7 +139,7 @@ protected: virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; public: - SwContentTree(Window* pParent, const ResId& rResId); + SwContentTree(vcl::Window* pParent, const ResId& rResId); virtual ~SwContentTree(); OUString GetEntryAltText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; @@ -230,7 +230,7 @@ private: SvTreeListEntry* pDDSource; // source for Drag'n Drop SwGlblDocContents* pSwGlblDocContents; // array with sorted content - Window* pDefParentWin; + vcl::Window* pDefParentWin; SwGlblDocContent* pDocContent; sfx2::DocumentInserter* pDocInserter; @@ -306,7 +306,7 @@ protected: virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; public: - SwGlobalTree(Window* pParent, const ResId& rResId); + SwGlobalTree(vcl::Window* pParent, const ResId& rResId); virtual ~SwGlobalTree(); void TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox); diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 0cceb155f7c4..08f31a4f2649 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -103,7 +103,7 @@ class SwCaptionDialog : public SvxStandardDialog static OUString our_aSepTextSave; // Save caption separator text public: - SwCaptionDialog( Window *pParent, SwView &rV ); + SwCaptionDialog( vcl::Window *pParent, SwView &rV ); virtual ~SwCaptionDialog(); }; diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx index e4ea1325aecb..e41d911bf141 100644 --- a/sw/source/uibase/inc/dbtree.hxx +++ b/sw/source/uibase/inc/dbtree.hxx @@ -52,7 +52,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox using SvTreeListBox::Select; public: - SwDBTreeList(Window* pParent, WinBits nStyle); + SwDBTreeList(vcl::Window* pParent, WinBits nStyle); virtual ~SwDBTreeList(); virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx index 3877ac21153b..ed1e65b3bc47 100644 --- a/sw/source/uibase/inc/dbui.hxx +++ b/sw/source/uibase/inc/dbui.hxx @@ -28,7 +28,7 @@ class SW_DLLPUBLIC CancelableModelessDialog : public ModelessDialog { protected: CancelButton* m_pCancelButton; - CancelableModelessDialog( Window *pParent, const OString& rID, + CancelableModelessDialog( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); public: @@ -50,7 +50,7 @@ public: FixedText* m_pPrinter; FixedText* m_pPrintInfo; - PrintMonitor( Window *pParent, PrintMonitorType eType ); + PrintMonitor( vcl::Window *pParent, PrintMonitorType eType ); }; #endif diff --git a/sw/source/uibase/inc/docfnote.hxx b/sw/source/uibase/inc/docfnote.hxx index 6878450ec754..0649254bf2cf 100644 --- a/sw/source/uibase/inc/docfnote.hxx +++ b/sw/source/uibase/inc/docfnote.hxx @@ -36,7 +36,7 @@ class SwFootNoteOptionDlg :public SfxTabDialog DECL_LINK( OkHdl, Button * ); public: - SwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh ); + SwFootNoteOptionDlg(vcl::Window *pParent, SwWrtShell &rSh ); }; #endif diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index d19edb2ed7a2..e02a80ea0369 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -30,10 +30,10 @@ class SwDocStatPage: public SfxTabPage { public: - SwDocStatPage(Window *pParent, const SfxItemSet &rSet); + SwDocStatPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwDocStatPage(); - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); protected: virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index 966346957c80..556626d744c6 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -37,7 +37,7 @@ class SwWrtShell; class SwDropCapsDlg : public SfxSingleTabDialog { public: - SwDropCapsDlg(Window *pParent, const SfxItemSet &rSet ); + SwDropCapsDlg(vcl::Window *pParent, const SfxItemSet &rSet ); }; class SwDropCapsPict; @@ -66,7 +66,7 @@ friend class SwDropCapsPict; SwWrtShell &rSh; - SwDropCapsPage(Window *pParent, const SfxItemSet &rSet); + SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwDropCapsPage(); virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; @@ -82,7 +82,7 @@ friend class SwDropCapsPict; public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index ae65ed70a857..9871a5cf9ca0 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -52,7 +52,7 @@ class SdrDropMarkerOverlay; To translate the pixel positions from the buffer OutputDevice to the real pixel positions, use the PixelToLogic methods of this class. */ -class SwEditWin: public Window, +class SwEditWin: public vcl::Window, public DropTargetHelper, public DragSourceHelper { friend void ScrollMDI(SwViewShell* pVwSh, const SwRect&, @@ -288,7 +288,7 @@ public: SwFrameControlsManager& GetFrameControlsManager() { return m_aFrameControlsManager; } - SwEditWin(Window *pParent, SwView &); + SwEditWin(vcl::Window *pParent, SwView &); virtual ~SwEditWin(); virtual void SwitchView(); }; diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 7c438dd942c9..6ae6b7fb2b1e 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -40,13 +40,13 @@ class SwEnvFmtPage; class SwWrtShell; class Printer; -class SwEnvPreview : public Window +class SwEnvPreview : public vcl::Window { void Paint(const Rectangle&) SAL_OVERRIDE; public: - SwEnvPreview(Window * pParent, WinBits nStyle); + SwEnvPreview(vcl::Window * pParent, WinBits nStyle); protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -71,7 +71,7 @@ friend class SwEnvPreview; virtual short Ok() SAL_OVERRIDE; public: - SwEnvDlg(Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert); + SwEnvDlg(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert); virtual ~SwEnvDlg(); }; @@ -89,7 +89,7 @@ class SwEnvPage : public SfxTabPage SwWrtShell* pSh; OUString sActDBName; - SwEnvPage(Window* pParent, const SfxItemSet& rSet); + SwEnvPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwEnvPage(); DECL_LINK( DatabaseHdl, ListBox * ); @@ -105,7 +105,7 @@ class SwEnvPage : public SfxTabPage public: - static SfxTabPage* Create(Window* pParent, const SfxItemSet* rSet); + static SfxTabPage* Create(vcl::Window* pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 46b04379d3e6..e24f19d89303 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -41,7 +41,7 @@ class SwPaM; class SbModule; class SvxMacroItem; class SvNumberFormatter; -class Window; +namespace vcl { class Window; } // the groups of fields enum SwFldGroups @@ -75,7 +75,7 @@ struct SwInsertFld_Data ::com::sun::star::uno::Any aDBDataSource; ::com::sun::star::uno::Any aDBConnection; ::com::sun::star::uno::Any aDBColumn; - Window* pParent; // parent dialog used for SwWrtShell::StartInputFldDlg() + vcl::Window* pParent; // parent dialog used for SwWrtShell::StartInputFldDlg() SwInsertFld_Data(sal_uInt16 nType, sal_uInt16 nSub, const OUString& rPar1, const OUString& rPar2, sal_uLong nFmtId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', bool bIsAutoLanguage = true) : diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx index da57ade2e098..71883a0f7119 100644 --- a/sw/source/uibase/inc/fldtdlg.hxx +++ b/sw/source/uibase/inc/fldtdlg.hxx @@ -47,7 +47,7 @@ class SwFldDlg: public SfxTabDialog bool bOnlyActivate = false ); public: - SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent); + SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent); virtual ~SwFldDlg(); DECL_LINK(OKHdl, void *); diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx index ecc67a06ff61..db4cdee3a440 100644 --- a/sw/source/uibase/inc/fldwrap.hxx +++ b/sw/source/uibase/inc/fldwrap.hxx @@ -26,7 +26,7 @@ class SwFldDlgWrapper : public SwChildWinWrapper { public: AbstractSwFldDlg * pDlgInterface; - SwFldDlgWrapper( Window* pParent, sal_uInt16 nId, + SwFldDlgWrapper( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW_WITHID(SwFldDlgWrapper); @@ -40,7 +40,7 @@ class SwFldDataOnlyDlgWrapper : public SwChildWinWrapper { public: AbstractSwFldDlg * pDlgInterface; - SwFldDataOnlyDlgWrapper( Window* pParent, sal_uInt16 nId, + SwFldDataOnlyDlgWrapper( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW(SwFldDataOnlyDlgWrapper); diff --git a/sw/source/uibase/inc/formedt.hxx b/sw/source/uibase/inc/formedt.hxx index 7489506e7e8e..118869e93e74 100644 --- a/sw/source/uibase/inc/formedt.hxx +++ b/sw/source/uibase/inc/formedt.hxx @@ -74,7 +74,7 @@ class SwIdxFormDlg : public SvxStandardDialog bool bLastLinkIsEnd; public: - SwIdxFormDlg( Window* pParent, SwWrtShell &rShell, const SwForm& rForm ); + SwIdxFormDlg( vcl::Window* pParent, SwWrtShell &rShell, const SwForm& rForm ); virtual ~SwIdxFormDlg(); const SwForm& GetTOXForm(); diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx index 8a1066dac7e7..3e0f2b9356cb 100644 --- a/sw/source/uibase/inc/frmdlg.hxx +++ b/sw/source/uibase/inc/frmdlg.hxx @@ -50,7 +50,7 @@ class SwFrmDlg : public SfxTabDialog virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: - SwFrmDlg( SfxViewFrame *pFrame, Window *pParent, + SwFrmDlg( SfxViewFrame *pFrame, vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bNewFrm = false, const OString& sResType = OString("FrameDialog"), diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index d7d27ebb2178..2d609bd46bbe 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -175,7 +175,7 @@ class SwFrmPage: public SfxTabPage void EnableGraficMode( void ); // hides auto check boxes and re-org controls for "Real Size" button - SwFrmPage(Window *pParent, const SfxItemSet &rSet); + SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFrmPage(); SwWrtShell *getFrmDlgParentShell(); @@ -185,7 +185,7 @@ class SwFrmPage: public SfxTabPage public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; @@ -224,7 +224,7 @@ class SwGrfExtPage: public SfxTabPage DECL_LINK(BrowseHdl, void *); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; - SwGrfExtPage(Window *pParent, const SfxItemSet &rSet); + SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwGrfExtPage(); using SfxTabPage::ActivatePage; @@ -232,7 +232,7 @@ class SwGrfExtPage: public SfxTabPage public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; @@ -253,7 +253,7 @@ class SwFrmURLPage : public SfxTabPage DECL_LINK(InsertFileHdl, void *); - SwFrmURLPage(Window *pParent, const SfxItemSet &rSet); + SwFrmURLPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFrmURLPage(); using SfxTabPage::ActivatePage; @@ -261,7 +261,7 @@ class SwFrmURLPage : public SfxTabPage public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; @@ -303,12 +303,12 @@ class SwFrmAddPage : public SfxTabPage DECL_LINK(EditModifyHdl, void *); DECL_LINK(ChainModifyHdl, ListBox*); - SwFrmAddPage(Window *pParent, const SfxItemSet &rSet); + SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFrmAddPage(); public: - static SfxTabPage* Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage* Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index fc339c174718..622b3cb20692 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -37,12 +37,12 @@ class SwGlossaryHdl; class FEdit : public Edit { public: - FEdit(Window* pParent, const ResId& rResId) + FEdit(vcl::Window* pParent, const ResId& rResId) : Edit(pParent, rResId) { } - FEdit(Window* pParent) + FEdit(vcl::Window* pParent) : Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK) { } @@ -60,7 +60,7 @@ struct GlosBibUserData class SwGlossaryGroupTLB : public SvTabListBox { public: - SwGlossaryGroupTLB(Window* pParent) + SwGlossaryGroupTLB(vcl::Window* pParent) : SvTabListBox(pParent, WB_BORDER|WB_HSCROLL|WB_CLIPCHILDREN|WB_SORT) { } @@ -98,7 +98,7 @@ protected: DECL_LINK(RenameHdl, void *); public: - SwGlossaryGroupDlg(Window * pParent, + SwGlossaryGroupDlg(vcl::Window * pParent, std::vector<OUString> const& rPathArr, SwGlossaryHdl *pGlosHdl); virtual ~SwGlossaryGroupDlg(); diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index b565b71fb7ad..7fad065d8bb9 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -75,7 +75,7 @@ class SwGlTreeListBox : public SvTreeListBox SvTreeListEntry* pEntry, bool bIsMove); public: - SwGlTreeListBox(Window* pParent, WinBits nBits); + SwGlTreeListBox(vcl::Window* pParent, WinBits nBits); virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -96,7 +96,7 @@ class SwGlossaryDlg : public SvxStandardDialog SwGlTreeListBox* m_pCategoryBox; CheckBox* m_pFileRelCB; CheckBox* m_pNetRelCB; - Window* m_pExampleWIN; + vcl::Window* m_pExampleWIN; PushButton* m_pInsertBtn; MenuButton* m_pEditBtn; PushButton* m_pBibBtn; diff --git a/sw/source/uibase/inc/idxmrk.hxx b/sw/source/uibase/inc/idxmrk.hxx index 0115e77a8fe1..99e5cbf8a32b 100644 --- a/sw/source/uibase/inc/idxmrk.hxx +++ b/sw/source/uibase/inc/idxmrk.hxx @@ -29,7 +29,7 @@ class SwInsertIdxMarkWrapper : public SfxChildWindow { AbstractMarkFloatDlg* pAbstDlg; protected: - SwInsertIdxMarkWrapper( Window *pParentWindow, + SwInsertIdxMarkWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); @@ -44,7 +44,7 @@ class SwInsertAuthMarkWrapper : public SfxChildWindow { AbstractMarkFloatDlg* pAbstDlg; protected: - SwInsertAuthMarkWrapper( Window *pParentWindow, + SwInsertAuthMarkWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx index 510e28c202b9..bf42fa788cf6 100644 --- a/sw/source/uibase/inc/inpdlg.hxx +++ b/sw/source/uibase/inc/inpdlg.hxx @@ -51,7 +51,7 @@ class SwFldInputDlg: public SvxStandardDialog DECL_LINK(NextHdl, void *); public: - SwFldInputDlg( Window *pParent, SwWrtShell &rSh, + SwFldInputDlg( vcl::Window *pParent, SwWrtShell &rSh, SwField* pField, bool bNextButton = false ); }; diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index 3db10af8b6e0..291868ef5012 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -33,7 +33,7 @@ class SfxDispatcher; class InputEdit : public Edit { public: - InputEdit(Window* pParent, WinBits nStyle) : + InputEdit(vcl::Window* pParent, WinBits nStyle) : Edit(pParent , nStyle){} void UpdateRange(const OUString& aSel, @@ -80,7 +80,7 @@ protected: void CancelFormula(); public: - SwInputWindow( Window* pParent, SfxBindings* pBindings ); + SwInputWindow( vcl::Window* pParent, SfxBindings* pBindings ); virtual ~SwInputWindow(); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -101,7 +101,7 @@ class SwInputChild : public SfxChildWindow { SfxDispatcher* pDispatch; public: - SwInputChild( Window* , + SwInputChild( vcl::Window* , sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index 86cb31312244..39747588a997 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -65,7 +65,7 @@ class SwInsFootNoteDlg: public SvxStandardDialog void Init(); public: - SwInsFootNoteDlg(Window * pParent, SwWrtShell &rSh, bool bEd = false); + SwInsFootNoteDlg(vcl::Window * pParent, SwWrtShell &rSh, bool bEd = false); virtual ~SwInsFootNoteDlg(); rtl_TextEncoding GetCharSet() { return eCharSet; } diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx index 506b6cfdd84a..5649e5ea1e42 100644 --- a/sw/source/uibase/inc/javaedit.hxx +++ b/sw/source/uibase/inc/javaedit.hxx @@ -54,7 +54,7 @@ private: SwFldMgr* pMgr; SwWrtShell* pSh; sfx2::FileDialogHelper* pFileDlg; - Window* pOldDefDlgParent; + vcl::Window* pOldDefDlgParent; DECL_LINK(OKHdl, void *); DECL_LINK(PrevHdl, void *); @@ -69,7 +69,7 @@ private: void SetFld(); public: - SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh); + SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh); virtual ~SwJavaEditDialog(); OUString GetScriptText() const { return aText; } diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx index a2f22a3ba867..838c1016c45e 100644 --- a/sw/source/uibase/inc/label.hxx +++ b/sw/source/uibase/inc/label.hxx @@ -55,7 +55,7 @@ class SwLabDlg : public SfxTabDialog virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: - SwLabDlg( Window* pParent, const SfxItemSet& rSet, + SwLabDlg( vcl::Window* pParent, const SfxItemSet& rSet, SwDBManager* pDBManager, bool bLabel); virtual ~SwLabDlg(); diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index c9809c908b7a..0e7db9c87528 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -25,7 +25,7 @@ #include <vcl/lstbox.hxx> #include <numberingtypelistbox.hxx> -class Window; +namespace vcl { class Window; } class SwView; class SwWrtShell; @@ -34,9 +34,9 @@ class SwLineNumberingDlg : public SfxModalDialog private: SwWrtShell* pSh; VclContainer* m_pBodyContent; - Window* m_pDivIntervalFT; + vcl::Window* m_pDivIntervalFT; NumericField* m_pDivIntervalNF; - Window* m_pDivRowsFT; + vcl::Window* m_pDivRowsFT; NumericField* m_pNumIntervalNF; ListBox* m_pCharStyleLB; SwNumberingTypeListBox* m_pFormatLB; diff --git a/sw/source/uibase/inc/macassgn.hxx b/sw/source/uibase/inc/macassgn.hxx index 828203340ed9..df51ea5a046c 100644 --- a/sw/source/uibase/inc/macassgn.hxx +++ b/sw/source/uibase/inc/macassgn.hxx @@ -38,7 +38,7 @@ class SwMacroAssignDlg { public: static SfxEventNamesItem AddEvents( DlgEventType eType ); - static bool INetFmtDlg( Window* pParent, SwWrtShell& rSh, + static bool INetFmtDlg( vcl::Window* pParent, SwWrtShell& rSh, SvxMacroItem*& rpINetItem ); }; diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index 7ba52f24c7f9..a343c30bf5eb 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -55,10 +55,10 @@ class SwMailConfigPage : public SfxTabPage DECL_LINK(TestHdl, void *); public: - SwMailConfigPage( Window* pParent, const SfxItemSet& rSet ); + SwMailConfigPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwMailConfigPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -69,7 +69,7 @@ public: class SwMailConfigDlg : public SfxSingleTabDialog { public: - SwMailConfigDlg(Window* pParent, SfxItemSet& rSet); + SwMailConfigDlg(vcl::Window* pParent, SfxItemSet& rSet); }; #endif diff --git a/sw/source/uibase/inc/mailmergechildwindow.hxx b/sw/source/uibase/inc/mailmergechildwindow.hxx index 8ee4aa9fea1c..35a76131c26f 100644 --- a/sw/source/uibase/inc/mailmergechildwindow.hxx +++ b/sw/source/uibase/inc/mailmergechildwindow.hxx @@ -29,7 +29,7 @@ class SwMailMergeChildWin : public SfxFloatingWindow DECL_LINK( BackHdl, void* ); public: - SwMailMergeChildWin(SfxBindings*, SfxChildWindow*, Window *pParent); + SwMailMergeChildWin(SfxBindings*, SfxChildWindow*, vcl::Window *pParent); virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; }; @@ -37,7 +37,7 @@ public: class SwMailMergeChildWindow : public SfxChildWindow { public: - SwMailMergeChildWindow( Window* , + SwMailMergeChildWindow( vcl::Window* , sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index f31ebb269181..b542f9694620 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -51,14 +51,14 @@ namespace SwMailMergeHelper com::sun::star::uno::Reference< com::sun::star::mail::XMailService >& xInMailService, const OUString& rInMailServerPassword, const OUString& rOutMailServerPassword, - Window* pDialogParentWindow = 0 ); + vcl::Window* pDialogParentWindow = 0 ); } struct SwAddressPreview_Impl; // Preview window used to show the possible selection of address blocks // and also the resulting address filled with database data -class SW_DLLPUBLIC SwAddressPreview : public Window +class SW_DLLPUBLIC SwAddressPreview : public vcl::Window { ScrollBar aVScrollBar; SwAddressPreview_Impl* pImpl; @@ -76,7 +76,7 @@ class SW_DLLPUBLIC SwAddressPreview : public Window DECL_LINK(ScrollHdl, void*); public: - SwAddressPreview(Window* pParent, WinBits nStyle=WB_BORDER); + SwAddressPreview(vcl::Window* pParent, WinBits nStyle=WB_BORDER); void positionScrollBar(); @@ -140,10 +140,10 @@ class SW_DLLPUBLIC SwAuthenticator : { OUString m_aUserName; OUString m_aPassword; - Window* m_pParentWindow; + vcl::Window* m_pParentWindow; public: SwAuthenticator() : m_pParentWindow(0) {} - SwAuthenticator(const OUString& username, const OUString& password, Window* pParent) : + SwAuthenticator(const OUString& username, const OUString& password, vcl::Window* pParent) : m_aUserName(username), m_aPassword(password), m_pParentWindow( pParent ) diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 3b2fa0011d2a..143e06b08cef 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -51,7 +51,7 @@ class SwMailMergeDlg : public SvxStandardDialog { friend class SwXSelChgLstnr_Impl; - Window* m_pBeamerWin; + vcl::Window* m_pBeamerWin; RadioButton* m_pAllRB; RadioButton* m_pMarkedRB; @@ -115,7 +115,7 @@ class SwMailMergeDlg : public SvxStandardDialog bool ExecQryShell(); public: - SwMailMergeDlg(Window* pParent, SwWrtShell& rSh, + SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rSh, const OUString& rSourceName, const OUString& rTblName, sal_Int32 nCommandType, @@ -140,7 +140,7 @@ class SwMailMergeCreateFromDlg : public ModalDialog { RadioButton* m_pThisDocRB; public: - SwMailMergeCreateFromDlg(Window* pParent); + SwMailMergeCreateFromDlg(vcl::Window* pParent); bool IsThisDocument() const { return m_pThisDocRB->IsChecked(); @@ -151,7 +151,7 @@ class SwMailMergeFieldConnectionsDlg : public ModalDialog { RadioButton* m_pUseExistingRB; public: - SwMailMergeFieldConnectionsDlg(Window* pParent); + SwMailMergeFieldConnectionsDlg(vcl::Window* pParent); bool IsUseExistingConnections() const { return m_pUseExistingRB->IsChecked(); diff --git a/sw/source/uibase/inc/mergetbl.hxx b/sw/source/uibase/inc/mergetbl.hxx index 588efaf45e75..fe9882a1429b 100644 --- a/sw/source/uibase/inc/mergetbl.hxx +++ b/sw/source/uibase/inc/mergetbl.hxx @@ -33,7 +33,7 @@ protected: virtual void Apply() SAL_OVERRIDE; public: - SwMergeTblDlg( Window *pParent, bool& rWithPrev ); + SwMergeTblDlg( vcl::Window *pParent, bool& rWithPrev ); }; #endif diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx index b163c5591827..62ab97399cd8 100644 --- a/sw/source/uibase/inc/multmrk.hxx +++ b/sw/source/uibase/inc/multmrk.hxx @@ -40,7 +40,7 @@ class SwMultiTOXMarkDlg : public SvxStandardDialog void Apply() SAL_OVERRIDE; public: - SwMultiTOXMarkDlg( Window* pParent, SwTOXMgr &rTOXMgr ); + SwMultiTOXMarkDlg( vcl::Window* pParent, SwTOXMgr &rTOXMgr ); virtual ~SwMultiTOXMarkDlg(); }; diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 02496e26c878..ff36a629e765 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -47,7 +47,7 @@ class SwNavHelpToolBox : public SwHelpToolBox SwNavHelpToolBox(SwNavigationPI* pParent, const ResId &rResId); }; -class SwNavigationPI : public Window, +class SwNavigationPI : public vcl::Window, public SfxControllerItem, public SfxListener { friend class SwNavigationChild; @@ -137,7 +137,7 @@ protected: public: - SwNavigationPI(SfxBindings*, SfxChildWindowContext*, Window*); + SwNavigationPI(SfxBindings*, SfxChildWindowContext*, vcl::Window*); virtual ~SwNavigationPI(); void GotoPage(); // jump to page; bindable function @@ -162,13 +162,13 @@ public: bool IsGlobalMode() const {return bGlobalMode;} SwView* GetCreateView() const; - void CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, Window *pParent); + void CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, vcl::Window *pParent); }; class SwNavigationChild : public SfxChildWindowContext { public: - SwNavigationChild( Window* , + SwNavigationChild( vcl::Window* , sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 6b5b251a4068..09875a9a01c6 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -115,7 +115,7 @@ class SwNumPositionTabPage : public SfxTabPage public: - SwNumPositionTabPage(Window* pParent, + SwNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwNumPositionTabPage(); @@ -124,7 +124,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} @@ -156,7 +156,7 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) SAL_OVERRIDE; DECL_LINK(RemoveNumberingHdl, void *); public: - SwSvxNumBulletTabDialog(Window* pParent, + SwSvxNumBulletTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &); virtual ~SwSvxNumBulletTabDialog(); diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx index 20e85b819696..bedbc7225f69 100644 --- a/sw/source/uibase/inc/numberingtypelistbox.hxx +++ b/sw/source/uibase/inc/numberingtypelistbox.hxx @@ -35,7 +35,7 @@ class SW_DLLPUBLIC SwNumberingTypeListBox : public ListBox SwNumberingTypeListBox_Impl* pImpl; public: - SwNumberingTypeListBox( Window* pWin, WinBits nStyle = WB_BORDER ); + SwNumberingTypeListBox( vcl::Window* pWin, WinBits nStyle = WB_BORDER ); virtual ~SwNumberingTypeListBox(); virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 4af285eaed1e..8dd0394575a1 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -45,7 +45,7 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox SAL_DLLPRIVATE SwView* GetView(); public: - NumFormatListBox(Window* pWin, WinBits nStyle); + NumFormatListBox(vcl::Window* pWin, WinBits nStyle); virtual ~NumFormatListBox(); diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 3b3c69c6e275..7c88f1d3718d 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -57,13 +57,13 @@ class SwParagraphNumTabPage : public SfxTabPage DECL_LINK(LineCountHdl_Impl, void *); protected: - SwParagraphNumTabPage(Window* pParent, const SfxItemSet& rSet ); + SwParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rSet ); void aCountParaFL(); public: virtual ~SwParagraphNumTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx index cf1ef8d1e5a6..bec5210fa7ce 100644 --- a/sw/source/uibase/inc/numprevw.hxx +++ b/sw/source/uibase/inc/numprevw.hxx @@ -25,7 +25,7 @@ class SwNumRule; namespace rtl { class OUString; } -class NumberingPreview : public Window +class NumberingPreview : public vcl::Window { const SwNumRule* pActNum; vcl::Font aStdFont; @@ -38,14 +38,14 @@ class NumberingPreview : public Window virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - NumberingPreview(Window* pParent, const ResId& rResId) + NumberingPreview(vcl::Window* pParent, const ResId& rResId) : Window(pParent, rResId), pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(false), nActLevel(USHRT_MAX) { } - NumberingPreview(Window* pParent) + NumberingPreview(vcl::Window* pParent) : Window(pParent) , pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(false), nActLevel(USHRT_MAX) diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx index 5e13ee660c96..cec3199f3beb 100644 --- a/sw/source/uibase/inc/olmenu.hxx +++ b/sw/source/uibase/inc/olmenu.hxx @@ -81,7 +81,7 @@ public: const ::com::sun::star::uno::Sequence< OUString > &rSuggestions, const OUString & rParaText ); - sal_uInt16 Execute( const Rectangle& rPopupPos, Window* pWin ); + sal_uInt16 Execute( const Rectangle& rPopupPos, vcl::Window* pWin ); void Execute( sal_uInt16 nId ); }; diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index 935f53dc2d8d..8a1675176575 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -60,10 +60,10 @@ private: void WriteOptions(); public: - SwCompatibilityOptPage( Window* pParent, const SfxItemSet& rSet ); + SwCompatibilityOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCompatibilityOptPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 20a8fd110cf5..451b30c6b9b5 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -63,9 +63,9 @@ private: DECL_LINK(StandardizedPageCountCheckHdl, void *); public: - SwLoadOptPage(Window* pParent, const SfxItemSet& rSet); + SwLoadOptPage(vcl::Window* pParent, const SfxItemSet& rSet); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -75,7 +75,7 @@ public: class SwCaptionOptDlg : public SfxSingleTabDialog { public: - SwCaptionOptDlg(Window* pParent, const SfxItemSet& rSet); + SwCaptionOptDlg(vcl::Window* pParent, const SfxItemSet& rSet); }; class CaptionComboBox : public SwComboBox @@ -84,18 +84,18 @@ protected: virtual void KeyInput( const KeyEvent& ) SAL_OVERRIDE; public: - CaptionComboBox(Window* pParent, WinBits nStyle) + CaptionComboBox(vcl::Window* pParent, WinBits nStyle) : SwComboBox(pParent, nStyle) {} }; -class SwCaptionPreview : public Window +class SwCaptionPreview : public vcl::Window { private: OUString maText; Point maDrawPos; public: - SwCaptionPreview( Window* pParent, WinBits nStyle ); + SwCaptionPreview( vcl::Window* pParent, WinBits nStyle ); void Init(); void SetPreviewText( const OUString& rText ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -162,11 +162,11 @@ private: void DrawSample(); public: - SwCaptionOptPage( Window* pParent, + SwCaptionOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCaptionOptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 5329ac4cf3ec..d623923f7c92 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -67,11 +67,11 @@ class SwContentOptPage : public SfxTabPage DECL_LINK(VertRulerHdl, CheckBox*); DECL_LINK(AnyRulerHdl, CheckBox*); public: - SwContentOptPage( Window* pParent, + SwContentOptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwContentOptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -115,11 +115,11 @@ class SwAddPrinterTabPage : public SfxTabPage DECL_LINK(AutoClickHdl, void *); DECL_LINK(SelectHdl, void *); - SwAddPrinterTabPage( Window* pParent, + SwAddPrinterTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -186,12 +186,12 @@ class SwStdFontTabPage : public SfxTabPage DECL_LINK( ModifyHeightHdl, FontSizeBox * ); DECL_LINK( LoseFocusHdl, ComboBox * ); - SwStdFontTabPage( Window* pParent, + SwStdFontTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwStdFontTabPage(); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -227,13 +227,13 @@ class SwTableOptionsTabPage : public SfxTabPage DECL_LINK(CheckBoxHdl, void *); - SwTableOptionsTabPage( Window* pParent, + SwTableOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwTableOptionsTabPage(); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -273,12 +273,12 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage SwWrtShell * m_pWrtShell; - SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + SwShdwCrsrOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwShdwCrsrOptionsTabPage(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -288,7 +288,7 @@ public: }; // mark preview -class SwMarkPreview : public Window +class SwMarkPreview : public vcl::Window { Size m_aInitialSize; @@ -317,7 +317,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SwMarkPreview(Window* pParent, WinBits nWinBits); + SwMarkPreview(vcl::Window* pParent, WinBits nWinBits); virtual ~SwMarkPreview(); inline void SetColor(const Color& rCol) { m_aMarkCol = rCol; } @@ -347,7 +347,7 @@ class SwRedlineOptionsTabPage : public SfxTabPage OUString sAuthor; OUString sNone; - SwRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + SwRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwRedlineOptionsTabPage(); DECL_LINK( AttribHdl, ListBox *pLB ); @@ -358,7 +358,7 @@ class SwRedlineOptionsTabPage : public SfxTabPage public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -371,10 +371,10 @@ public: class SwTestTabPage : public SfxTabPage { public: - SwTestTabPage( Window* pParent, + SwTestTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -410,7 +410,7 @@ class SwCompareOptionsTabPage : public SfxTabPage CheckBox* m_pIgnoreCB; NumericField* m_pLenNF; - SwCompareOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + SwCompareOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwCompareOptionsTabPage(); DECL_LINK(ComparisonHdl, void *); @@ -418,7 +418,7 @@ class SwCompareOptionsTabPage : public SfxTabPage public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index bd1f661a4a25..1581918966bf 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -67,7 +67,7 @@ class SwOutlineTabDialog : public SfxTabDialog virtual short Ok() SAL_OVERRIDE; public: - SwOutlineTabDialog(Window* pParent, + SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &); virtual ~SwOutlineTabDialog(); @@ -119,7 +119,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage using SfxTabPage::DeactivatePage; public: - SwOutlineSettingsTabPage(Window* pParent, const SfxItemSet& rSet); + SwOutlineSettingsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SwOutlineSettingsTabPage(); void SetWrtShell(SwWrtShell* pShell); @@ -129,7 +129,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; diff --git a/sw/source/uibase/inc/pattern.hxx b/sw/source/uibase/inc/pattern.hxx index 67ee99024648..68a673dff751 100644 --- a/sw/source/uibase/inc/pattern.hxx +++ b/sw/source/uibase/inc/pattern.hxx @@ -22,13 +22,13 @@ #include <sfx2/basedlgs.hxx> -class Window; +namespace vcl { class Window; } class SfxItemSet; class SwBackgroundDlg : public SfxSingleTabDialog { public: - SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet); + SwBackgroundDlg(vcl::Window* pParent, const SfxItemSet& rSet); }; #endif diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index 193c09ca2b1c..251a799de656 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -32,14 +32,14 @@ class SwFootNotePage: public SfxTabPage { public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; private: - SwFootNotePage(Window *pParent, const SfxItemSet &rSet); + SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwFootNotePage(); RadioButton* m_pMaxHeightPageBtn; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 3bf49e588877..92a5d333c55a 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -67,7 +67,7 @@ class SwTextGridPage: public SfxTabPage bool m_bHRulerChanged; bool m_bVRulerChanged; - SwTextGridPage(Window *pParent, const SfxItemSet &rSet); + SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwTextGridPage(); void UpdatePageSize(const SfxItemSet& rSet); @@ -84,7 +84,7 @@ class SwTextGridPage: public SfxTabPage using SfxTabPage::DeactivatePage; public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index b5f1d1e8f682..162ef375eb3a 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -42,7 +42,7 @@ class SvtAccessibilityOptions; class SwPagePreviewLayout; // Delete member <mnVirtPage> and its accessor -class SwPagePreviewWin : public Window +class SwPagePreviewWin : public vcl::Window { SwViewShell* mpViewShell; sal_uInt16 mnSttPage; @@ -59,7 +59,7 @@ class SwPagePreviewWin : public Window using Window::Scroll; public: - SwPagePreviewWin( Window* pParent, SwPagePreview& rView ); + SwPagePreviewWin( vcl::Window* pParent, SwPagePreview& rView ); virtual ~SwPagePreviewWin(); // calls SwViewShell::Paint @@ -170,9 +170,9 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell ImageButton *pPageUpBtn, *pPageDownBtn; // dummy window for filling the lower right edge when both scrollbars are active - Window *pScrollFill; + ::vcl::Window *pScrollFill; - sal_uInt16 mnPageCount; + sal_uInt16 mnPageCount; bool bNormalPrint; // New members to reset design mode at draw view for form shell on switching @@ -192,7 +192,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, + SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill, bool bInner ); @@ -225,7 +225,7 @@ private: static void InitInterface_Impl(); public: - inline Window& GetFrameWindow() const { return GetViewFrame()->GetWindow(); } + inline vcl::Window& GetFrameWindow() const { return GetViewFrame()->GetWindow(); } inline SwViewShell* GetViewShell() const { return pViewWin->GetViewShell(); } inline const Rectangle& GetVisArea() const { return aVisArea; } inline void GrabFocusViewWin() { pViewWin->GrabFocus(); } diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 1a84a2a895fb..b949299b14d2 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -136,7 +136,7 @@ class SwModelessRedlineAcceptDlg : public SfxModelessDialog SwChildWinWrapper* pChildWin; public: - SwModelessRedlineAcceptDlg(SfxBindings*, SwChildWinWrapper*, Window *pParent); + SwModelessRedlineAcceptDlg(SfxBindings*, SwChildWinWrapper*, vcl::Window *pParent); virtual ~SwModelessRedlineAcceptDlg(); virtual void Activate() SAL_OVERRIDE; @@ -147,7 +147,7 @@ public: class SwRedlineAcceptChild : public SwChildWinWrapper { public: - SwRedlineAcceptChild( Window* , + SwRedlineAcceptChild( vcl::Window* , sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 1a6ad67c5509..37d3794b118e 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -95,7 +95,7 @@ class SwEditRegionDlg : public SfxModalDialog SectReprArr aSectReprArr; const SwSection* pCurrSect; sfx2::DocumentInserter* m_pDocInserter; - Window* m_pOldDefDlgParent; + vcl::Window* m_pOldDefDlgParent; bool bDontCheckPasswd :1; bool bWeb :1; @@ -129,7 +129,7 @@ class SwEditRegionDlg : public SfxModalDialog bool CheckPasswd(CheckBox* pBox = 0); public: - SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ); + SwEditRegionDlg( vcl::Window* pParent, SwWrtShell& rWrtSh ); virtual ~SwEditRegionDlg(); void SelectSection(const OUString& rSectionName); @@ -168,7 +168,7 @@ class SwInsertSectionTabPage : public SfxTabPage ::com::sun::star::uno::Sequence <sal_Int8 > m_aNewPasswd; SwWrtShell* m_pWrtSh; sfx2::DocumentInserter* m_pDocInserter; - Window* m_pOldDefDlgParent; + vcl::Window* m_pOldDefDlgParent; DECL_LINK( ChangeHideHdl, CheckBox * ); // #114856# edit in readonly sections @@ -182,7 +182,7 @@ class SwInsertSectionTabPage : public SfxTabPage DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper* ); public: - SwInsertSectionTabPage(Window *pParent, const SfxItemSet &rAttrSet); + SwInsertSectionTabPage(vcl::Window *pParent, const SfxItemSet &rAttrSet); virtual ~SwInsertSectionTabPage(); void SetWrtShell(SwWrtShell& rSh); @@ -190,7 +190,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; @@ -226,13 +226,13 @@ class SwSectionFtnEndTabPage : public SfxTabPage void ResetState( bool bFtn, const SwFmtFtnEndAtTxtEnd& ); public: - SwSectionFtnEndTabPage( Window *pParent, const SfxItemSet &rAttrSet ); + SwSectionFtnEndTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionFtnEndTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; @@ -244,13 +244,13 @@ class SwSectionIndentTabPage : public SfxTabPage DECL_LINK(IndentModifyHdl, void *); public: - SwSectionIndentTabPage( Window *pParent, const SfxItemSet &rAttrSet ); + SwSectionIndentTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SwSectionIndentTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); @@ -271,7 +271,7 @@ protected: virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; virtual short Ok() SAL_OVERRIDE; public: - SwInsertSectionTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); + SwInsertSectionTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwInsertSectionTabDialog(); void SetSectionData(SwSectionData const& rSect); @@ -290,7 +290,7 @@ class SwSectionPropertyTabDialog : public SfxTabDialog protected: virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: - SwSectionPropertyTabDialog(Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); + SwSectionPropertyTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); virtual ~SwSectionPropertyTabDialog(); }; diff --git a/sw/source/uibase/inc/rowht.hxx b/sw/source/uibase/inc/rowht.hxx index e8fd8adfb57b..25d9e7c918f3 100644 --- a/sw/source/uibase/inc/rowht.hxx +++ b/sw/source/uibase/inc/rowht.hxx @@ -36,7 +36,7 @@ protected: virtual void Apply() SAL_OVERRIDE; public: - SwTableHeightDlg( Window *pParent, SwWrtShell &rS ); + SwTableHeightDlg( vcl::Window *pParent, SwWrtShell &rS ); }; #endif diff --git a/sw/source/uibase/inc/scroll.hxx b/sw/source/uibase/inc/scroll.hxx index 424f920aba8a..cbaacccb45a1 100644 --- a/sw/source/uibase/inc/scroll.hxx +++ b/sw/source/uibase/inc/scroll.hxx @@ -50,7 +50,7 @@ public: void SetAuto(bool bSet); bool IsAuto() { return bAuto;} - SwScrollbar(Window *pParent, bool bHori = true ); + SwScrollbar(vcl::Window *pParent, bool bHori = true ); virtual ~SwScrollbar(); }; diff --git a/sw/source/uibase/inc/selglos.hxx b/sw/source/uibase/inc/selglos.hxx index f18288179edd..501af9a28200 100644 --- a/sw/source/uibase/inc/selglos.hxx +++ b/sw/source/uibase/inc/selglos.hxx @@ -33,7 +33,7 @@ protected: DECL_LINK(DoubleClickHdl, ListBox*); public: - SwSelGlossaryDlg(Window * pParent, const OUString &rShortName); + SwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName); void InsertGlos(const OUString &rRegion, const OUString &rGlosName) { const OUString aTmp = rRegion + ":" + rGlosName; diff --git a/sw/source/uibase/inc/shdwcrsr.hxx b/sw/source/uibase/inc/shdwcrsr.hxx index e5c6478f9215..631fde3d7f5b 100644 --- a/sw/source/uibase/inc/shdwcrsr.hxx +++ b/sw/source/uibase/inc/shdwcrsr.hxx @@ -23,11 +23,11 @@ #include <tools/color.hxx> #include <limits.h> -class Window; +namespace vcl { class Window; } class SwShadowCursor { - Window* pWin; + vcl::Window* pWin; Color aCol; Point aOldPt; long nOldHeight; @@ -37,7 +37,7 @@ class SwShadowCursor void DrawCrsr( const Point& rPt, long nHeight, sal_uInt16 nMode ); public: - SwShadowCursor( Window& rWin, const Color& rCol ) + SwShadowCursor( vcl::Window& rWin, const Color& rCol ) : pWin( &rWin ), aCol( rCol ), nOldHeight(0), nOldMode( USHRT_MAX ) {} ~SwShadowCursor(); diff --git a/sw/source/uibase/inc/splittbl.hxx b/sw/source/uibase/inc/splittbl.hxx index 00b099e0747f..3bcce8bb03bc 100644 --- a/sw/source/uibase/inc/splittbl.hxx +++ b/sw/source/uibase/inc/splittbl.hxx @@ -39,7 +39,7 @@ protected: virtual void Apply() SAL_OVERRIDE; public: - SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ); + SwSplitTblDlg( vcl::Window *pParent, SwWrtShell &rSh ); sal_uInt16 GetSplitMode() const { return m_nSplit; } }; diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index 2bb3c368b5db..8cb2ea611bdd 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -37,7 +37,7 @@ class TextEngine; class ExtTextView; class DataChangedEvent; -class TextViewOutWin : public Window +class TextViewOutWin : public vcl::Window { ExtTextView* pTextView; @@ -51,7 +51,7 @@ protected: virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; public: - TextViewOutWin(Window* pParent, WinBits nBits) : + TextViewOutWin(vcl::Window* pParent, WinBits nBits) : Window(pParent, nBits), pTextView(0){} void SetTextView( ExtTextView* pView ) {pTextView = pView;} @@ -60,7 +60,7 @@ public: typedef std::set<sal_uInt16> SyntaxLineSet; -class SwSrcEditWindow : public Window, public SfxListener +class SwSrcEditWindow : public vcl::Window, public SfxListener { private: class ChangesListener; @@ -115,7 +115,7 @@ protected: DECL_LINK(ScrollHdl, ScrollBar*); public: - SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ); + SwSrcEditWindow( vcl::Window* pParent, SwSrcView* pParentView ); virtual ~SwSrcEditWindow(); void SetScrollBarRanges(); diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index 70522f871322..c42a4cc6f809 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -83,7 +83,7 @@ class SwSortDlg : public SvxStandardDialog DECL_LINK(DelimCharHdl, void *); public: - SwSortDlg(Window * pParent, SwWrtShell &rSh); + SwSortDlg(vcl::Window * pParent, SwWrtShell &rSh); virtual ~SwSortDlg(); }; diff --git a/sw/source/uibase/inc/stmenu.hxx b/sw/source/uibase/inc/stmenu.hxx index c369d12eaeaa..ec2fa7ceaf0b 100644 --- a/sw/source/uibase/inc/stmenu.hxx +++ b/sw/source/uibase/inc/stmenu.hxx @@ -64,7 +64,7 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, ::com::sun::star::uno::Reference< com::sun::star::text::XTextRange > xTextRange ); - sal_uInt16 Execute( const Rectangle& rPopupPos, Window* pWin ); + sal_uInt16 Execute( const Rectangle& rPopupPos, vcl::Window* pWin ); }; #endif diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index de20e748dca0..d5cb2acc806b 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -165,7 +165,7 @@ public: int CopyGlossary( SwTextBlocks& rGlossary, const OUString& rStr ); // remove the DDE-Link format promise - void RemoveDDELinkFormat( const Window& rWin ); + void RemoveDDELinkFormat( const vcl::Window& rWin ); // paste - methods and helper methods for the paste static bool IsPaste( const SwWrtShell&, const TransferableDataHelper& ); @@ -189,7 +189,7 @@ public: SvxClipboardFmtItem & rToFill ); // Interfaces for Drag & Drop - void StartDrag( Window* pWin, const Point& rPos ); + void StartDrag( vcl::Window* pWin, const Point& rPos ); SwWrtShell* GetShell() { return pWrtShell; } void SetCleanUp( bool bFlag ) { bCleanUp = bFlag; } diff --git a/sw/source/uibase/inc/swlbox.hxx b/sw/source/uibase/inc/swlbox.hxx index 174f21206b71..f571e08e57fb 100644 --- a/sw/source/uibase/inc/swlbox.hxx +++ b/sw/source/uibase/inc/swlbox.hxx @@ -25,7 +25,7 @@ #include <boost/ptr_container/ptr_vector.hpp> class SwBoxEntry; -class Window; +namespace vcl { class Window; } typedef boost::ptr_vector<SwBoxEntry> SwEntryLst; @@ -60,7 +60,7 @@ class SW_DLLPUBLIC SwComboBox : public ComboBox public: - SwComboBox(Window* pParent, WinBits nStyle); + SwComboBox(vcl::Window* pParent, WinBits nStyle); virtual ~SwComboBox(); void InsertSwEntry(const SwBoxEntry&); diff --git a/sw/source/uibase/inc/swmessdialog.hxx b/sw/source/uibase/inc/swmessdialog.hxx index 674d347d87ec..4382f574431e 100644 --- a/sw/source/uibase/inc/swmessdialog.hxx +++ b/sw/source/uibase/inc/swmessdialog.hxx @@ -26,7 +26,7 @@ protected: VclMultiLineEdit* m_pSecondaryMessage; Edit* m_pEdit; public: - SwMessageAndEditDialog(Window* pParent, const OString& rID, + SwMessageAndEditDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); }; diff --git a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx index 7f772c41cf8f..06ccac71cff0 100644 --- a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx +++ b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx @@ -28,7 +28,7 @@ class SwModalRedlineAcceptDlg : public SfxModalDialog SwRedlineAcceptDlg* pImplDlg; public: - SwModalRedlineAcceptDlg(Window *pParent); + SwModalRedlineAcceptDlg(vcl::Window *pParent); virtual ~SwModalRedlineAcceptDlg(); void AcceptAll( bool bAccept ); diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx index 81d314449172..aefb1efe0e91 100644 --- a/sw/source/uibase/inc/swrenamexnameddlg.hxx +++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx @@ -45,7 +45,7 @@ class SwRenameXNamedDlg : public ModalDialog DECL_LINK(ModifyHdl, Edit*); public: - SwRenameXNamedDlg( Window* pParent, + SwRenameXNamedDlg( vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess ); diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx index 9cbaac7f9896..19b877f8253f 100644 --- a/sw/source/uibase/inc/swruler.hxx +++ b/sw/source/uibase/inc/swruler.hxx @@ -14,7 +14,7 @@ class SwViewShell; class View; -class Window; +namespace vcl { class Window; } class SwEditWin; /** @@ -28,7 +28,7 @@ class SwCommentRuler public: SwCommentRuler ( SwViewShell* pViewSh, - Window* pParent, + vcl::Window* pParent, SwEditWin* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 77eff527ac48..2095dadd4abd 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -47,7 +47,7 @@ class SwCondCollPage : public SfxTabPage bool bNewTemplate; - SwCondCollPage(Window *pParent, const SfxItemSet &rSet); + SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwCondCollPage(); virtual int DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE; @@ -61,7 +61,7 @@ class SwCondCollPage : public SfxTabPage public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index cee9a5384c76..12bb2111a2ce 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -61,7 +61,7 @@ struct SwIndexSections_Impl; class SwMultiTOXTabDialog : public SfxTabDialog { - Window* m_pExampleContainerWIN; + vcl::Window* m_pExampleContainerWIN; CheckBox* m_pShowExampleCB; SwTOXMgr* pMgr; SwWrtShell& rSh; @@ -97,7 +97,7 @@ class SwMultiTOXTabDialog : public SfxTabDialog DECL_LINK(ShowPreviewHdl, void*); public: - SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet, + SwMultiTOXTabDialog(vcl::Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, bool bGlobal = false); @@ -219,7 +219,7 @@ class SwTOXSelectTabPage : public SfxTabPage using SfxTabPage::DeactivatePage; public: - SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet); + SwTOXSelectTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXSelectTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -228,7 +228,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc @@ -247,7 +247,7 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer typedef std::vector<Control*>::const_reverse_iterator ctrl_const_reverse_iterator; Button* m_pLeftScrollWin; - Window* m_pCtrlParentWin; + vcl::Window* m_pCtrlParentWin; Button* m_pRightScrollWin; std::vector<Control*> aControlList; SwForm* pForm; @@ -281,7 +281,7 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer void MoveControls(long nOffset); public: - SwTokenWindow(Window* pParent); + SwTokenWindow(vcl::Window* pParent); virtual ~SwTokenWindow(); void SetTabPage(SwTOXEntryTabPage *pParent) { m_pParent = pParent; } @@ -329,7 +329,7 @@ class SwIdxTreeListBox : public SvTreeListBox virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: - SwIdxTreeListBox(Window* pPar, WinBits nStyle); + SwIdxTreeListBox(vcl::Window* pPar, WinBits nStyle); void SetTabPage(SwTOXEntryTabPage* pPar) { pParent = pPar; } }; @@ -432,7 +432,7 @@ class SwTOXEntryTabPage : public SfxTabPage using SfxTabPage::DeactivatePage; public: - SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet); + SwTOXEntryTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXEntryTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -440,7 +440,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); @@ -478,7 +478,7 @@ class SwTOXStylesTabPage : public SfxTabPage using SfxTabPage::DeactivatePage; public: - SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet); + SwTOXStylesTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet); virtual ~SwTOXStylesTabPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -487,7 +487,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); }; diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index ac85a0a52286..0f559a63eb85 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -155,7 +155,7 @@ class SwIndexMarkFloatDlg : public SfxModelessDialog public: SwIndexMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew=true); void ReInitDlg(SwWrtShell& rWrtShell); @@ -165,7 +165,7 @@ class SwIndexMarkModalDlg : public SvxStandardDialog { SwIndexMarkPane m_aContent; public: - SwIndexMarkModalDlg(Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark); + SwIndexMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark); virtual void Apply() SAL_OVERRIDE; void ReInitDlg(SwWrtShell& rWrtShell); @@ -231,7 +231,7 @@ class SwAuthMarkFloatDlg : public SfxModelessDialog public: SwAuthMarkFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo, bool bNew=true); void ReInitDlg(SwWrtShell& rWrtShell); @@ -241,7 +241,7 @@ class SwAuthMarkModalDlg : public SvxStandardDialog { SwAuthorMarkPane m_aContent; public: - SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh); + SwAuthMarkModalDlg(vcl::Window *pParent, SwWrtShell& rSh); virtual void Apply() SAL_OVERRIDE; void ReInitDlg(SwWrtShell& rWrtShell); diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx index cf59afd6a9dd..6a9c8a6ea6af 100644 --- a/sw/source/uibase/inc/swuipardlg.hxx +++ b/sw/source/uibase/inc/swuipardlg.hxx @@ -40,7 +40,7 @@ class SwParaDlg: public SfxTabDialog void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; public: - SwParaDlg( Window *pParent, + SwParaDlg( vcl::Window *pParent, SwView& rVw, const SfxItemSet&, sal_uInt8 nDialogMode, diff --git a/sw/source/uibase/inc/swvset.hxx b/sw/source/uibase/inc/swvset.hxx index 7b9ecccf98e6..f27ecdd09f9a 100644 --- a/sw/source/uibase/inc/swvset.hxx +++ b/sw/source/uibase/inc/swvset.hxx @@ -23,7 +23,7 @@ class SwRulerValueSet : public SvxBmpNumValueSet { public: - SwRulerValueSet(Window* pParent, WinBits nWinStyle); + SwRulerValueSet(vcl::Window* pParent, WinBits nWinStyle); virtual ~SwRulerValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; }; diff --git a/sw/source/uibase/inc/syncbtn.hxx b/sw/source/uibase/inc/syncbtn.hxx index ed0a4e9774f9..76f8be74749a 100644 --- a/sw/source/uibase/inc/syncbtn.hxx +++ b/sw/source/uibase/inc/syncbtn.hxx @@ -30,13 +30,13 @@ class SwSyncBtnDlg : public SfxFloatingWindow DECL_LINK( BtnHdl, void* ); public: - SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, Window *pParent); + SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, vcl::Window *pParent); }; class SwSyncChildWin : public SfxChildWindow { public: - SwSyncChildWin( Window* , + SwSyncChildWin( vcl::Window* , sal_uInt16 nId, SfxBindings*, SfxChildWinInfo* ); diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx index 9abf088e34f5..d9b9988e26b7 100644 --- a/sw/source/uibase/inc/tabledlg.hxx +++ b/sw/source/uibase/inc/tabledlg.hxx @@ -38,7 +38,7 @@ class SwTableTabDlg : public SfxTabDialog virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; public: - SwTableTabDlg( Window* pParent, SfxItemPool& Pool, + SwTableTabDlg( vcl::Window* pParent, SfxItemPool& Pool, const SfxItemSet* pItemSet, SwWrtShell* pSh ); }; diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx index 98ae3b1c2f17..2276631dc818 100644 --- a/sw/source/uibase/inc/tablemgr.hxx +++ b/sw/source/uibase/inc/tablemgr.hxx @@ -25,7 +25,7 @@ class SwFrmFmt; class SwWrtShell; -class Window; +namespace vcl { class Window; } class SwFlyFrmFmt; namespace com { namespace sun { namespace star { @@ -55,7 +55,7 @@ public: ~SwTableFUNC(); void InitTabCols(); - void ColWidthDlg(Window *pParent ); + void ColWidthDlg(vcl::Window *pParent ); SwTwips GetColWidth(sal_uInt16 nNum) const; SwTwips GetMaxColWidth(sal_uInt16 nNum) const; void SetColWidth(sal_uInt16 nNum, SwTwips nWidth ); diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index b55356c669b0..603301b94ba4 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -78,7 +78,7 @@ class SwAutoFormatDlg : public SfxModalDialog DECL_LINK( SelFmtHdl, void * ); public: - SwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, + SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell, bool bSetAutoFmt = true, const SwTableAutoFmt* pSelFmt = 0 ); virtual ~SwAutoFormatDlg(); diff --git a/sw/source/uibase/inc/tblnumfm.hxx b/sw/source/uibase/inc/tblnumfm.hxx index 8fad4ff6d948..713084bea011 100644 --- a/sw/source/uibase/inc/tblnumfm.hxx +++ b/sw/source/uibase/inc/tblnumfm.hxx @@ -21,13 +21,13 @@ #include <sfx2/basedlgs.hxx> -class Window; +namespace vcl { class Window; } class SfxItemSet; class SwNumFmtDlg : public SfxSingleTabDialog { public: - SwNumFmtDlg(Window* pParent, const SfxItemSet& rSet); + SwNumFmtDlg(vcl::Window* pParent, const SfxItemSet& rSet); }; #endif diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index efc39bd2e36c..598b5821d173 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -17,7 +17,7 @@ #include <vcl/lstbox.hxx> #include <numberingtypelistbox.hxx> -class Window; +namespace vcl { class Window; } class SwWrtShell; class SwPageDesc; @@ -61,7 +61,7 @@ private: DECL_LINK(DownHdl, void *); DECL_LINK(StartPageHdl, void *); public: - SwTitlePageDlg( Window *pParent ); + SwTitlePageDlg( vcl::Window *pParent ); virtual ~SwTitlePageDlg(); }; diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx index 57abdf38e763..75cab4201d6a 100644 --- a/sw/source/uibase/inc/tmpdlg.hxx +++ b/sw/source/uibase/inc/tmpdlg.hxx @@ -71,7 +71,7 @@ class SwTemplateDlg: public SfxStyleDialog public: /// @param sPage /// Identifies name of page to open at by default - SwTemplateDlg( Window* pParent, + SwTemplateDlg( vcl::Window* pParent, SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage = OString(), diff --git a/sw/source/uibase/inc/uiborder.hxx b/sw/source/uibase/inc/uiborder.hxx index a4600d6436a0..4dc694736840 100644 --- a/sw/source/uibase/inc/uiborder.hxx +++ b/sw/source/uibase/inc/uiborder.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_UIBORDER_HXX #include <sfx2/basedlgs.hxx> -class Window; +namespace vcl { class Window; } class SfxItemSet; class SwBorderDlg : public SfxSingleTabDialog @@ -32,7 +32,7 @@ public: // SW_BORDER_MODE_TABLE // SW_BORDER_MODE_FRAME - SwBorderDlg(Window* pParent, SfxItemSet& rSet, sal_uInt16 nType); + SwBorderDlg(vcl::Window* pParent, SfxItemSet& rSet, sal_uInt16 nType); virtual ~SwBorderDlg(); }; diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index b01c859d4f13..2fd2b4384280 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -39,7 +39,7 @@ class SwFrmCtrlWindow : public VclEventBox { SwOneExampleFrame* pExampleFrame; public: - SwFrmCtrlWindow(Window* pParent, SwOneExampleFrame* pFrame); + SwFrmCtrlWindow(vcl::Window* pParent, SwOneExampleFrame* pFrame); virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwOneExampleFrame SAL_DLLPRIVATE void DisposeControl(); public: - SwOneExampleFrame(Window& rWin, + SwOneExampleFrame(vcl::Window& rWin, sal_uInt32 nStyleFlags = EX_SHOW_ONLINE_LAYOUT, const Link* pInitalizedLink = 0, const OUString* pURL = 0); @@ -113,7 +113,7 @@ public: void CreatePopup(const Point& rPt); - static void CreateErrorMessage(Window* pParent); + static void CreateErrorMessage(vcl::Window* pParent); }; #endif diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx index efbbc74b606c..e624560e071f 100644 --- a/sw/source/uibase/inc/view.hxx +++ b/sw/source/uibase/inc/view.hxx @@ -199,7 +199,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell bool m_bHScrollbarEnabled; bool m_bVScrollbarEnabled; - Window *m_pScrollFill; // dummy window for filling the lower right edge + ::vcl::Window *m_pScrollFill; // dummy window for filling the lower right edge // when both scrollbars are active SvxRuler *m_pHRuler, @@ -333,7 +333,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // methods for printing SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window* pParent, + SAL_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet) SAL_OVERRIDE; // for readonly switching SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; @@ -510,11 +510,11 @@ public: int CreateTab(); int KillTab(); - bool StatVRuler() const { return ((Window*)m_pVRuler)->IsVisible(); } + bool StatVRuler() const { return ((vcl::Window*)m_pVRuler)->IsVisible(); } void ChangeVRulerMetric(FieldUnit eUnit); void GetVRulerMetric(FieldUnit& rToFill) const; - bool StatTab() const { return ((Window*)m_pHRuler)->IsVisible(); } + bool StatTab() const { return ((vcl::Window*)m_pHRuler)->IsVisible(); } SvxRuler& GetHRuler() { return *m_pHRuler; } SvxRuler& GetVRuler() { return *m_pVRuler; } void InvalidateRulerPos(); @@ -564,7 +564,7 @@ public: bool HasDrwObj(SdrObject *pSdrObj) const; bool HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const; bool BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=NULL, - Window* pWin=NULL, bool bIsNewObj=false, bool bSetSelectionToStart=false ); + vcl::Window* pWin=NULL, bool bIsNewObj=false, bool bSetSelectionToStart=false ); void StateTabWin(SfxItemSet&); @@ -676,7 +676,7 @@ inline const SwDocShell *SwView::GetDocShell() const return ((SwView*)this)->GetDocShell(); } -SfxTabPage* CreatePrintOptionsPage( Window *pParent, +SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions, bool bPreview); diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx index 50bbef849500..6048a83d86be 100644 --- a/sw/source/uibase/inc/wordcountdialog.hxx +++ b/sw/source/uibase/inc/wordcountdialog.hxx @@ -54,7 +54,7 @@ class SwWordCountFloatDlg : public SfxModelessDialog public: SwWordCountFloatDlg( SfxBindings* pBindings, SfxChildWindow* pChild, - Window *pParent, + vcl::Window *pParent, SfxChildWinInfo* pInfo); virtual ~SwWordCountFloatDlg(); void UpdateCounts(); @@ -66,7 +66,7 @@ class SwWordCountWrapper : public SfxChildWindow { AbstractSwWordCountFloatDlg* pAbstDlg; protected: - SwWordCountWrapper( Window *pParentWindow, + SwWordCountWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx index b76334db52f7..5a56dd459d48 100644 --- a/sw/source/uibase/inc/workctrl.hxx +++ b/sw/source/uibase/inc/workctrl.hxx @@ -121,7 +121,7 @@ class SwScrollNaviToolBox : public ToolBox virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; public: - SwScrollNaviToolBox(Window* pParent, WinBits nWinStyle ) : + SwScrollNaviToolBox(vcl::Window* pParent, WinBits nWinStyle ) : ToolBox(pParent, nWinStyle ) {} }; @@ -142,7 +142,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window *pParent ); + SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window *pParent ); virtual ~SwScrollNaviPopup(); static OUString GetQuickHelpText(bool bNext); @@ -157,7 +157,7 @@ class SwHlpImageButton : public ImageButton { bool bUp; public: - SwHlpImageButton(Window* pParent, const ResId& rResId, bool bUpBtn) : + SwHlpImageButton(vcl::Window* pParent, const ResId& rResId, bool bUpBtn) : ImageButton(pParent, rResId), bUp(bUpBtn){} virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; @@ -176,7 +176,7 @@ public: SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; #endif diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index c6f4403a851a..2127ca0e0e97 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -25,7 +25,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -class Window; +namespace vcl { class Window; } class SfxItemSet; class SwWrtShell; @@ -34,7 +34,7 @@ class SwWrapDlg : public SfxSingleTabDialog SwWrtShell* pWrtShell; public: - SwWrapDlg(Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode); + SwWrapDlg(vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode); SwWrtShell* GetWrtShell() { return pWrtShell; } }; @@ -79,7 +79,7 @@ class SwWrapTabPage: public SfxTabPage bool bDrawMode; bool bContourImage; - SwWrapTabPage(Window *pParent, const SfxItemSet &rSet); + SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwWrapTabPage(); void ApplyImageList(); @@ -97,7 +97,7 @@ class SwWrapTabPage: public SfxTabPage public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); + static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 2ba573a4c0ca..4c03c9164cd9 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -28,7 +28,7 @@ #include "navmgr.hxx" #include <boost/optional.hpp> -class Window; +namespace vcl { class Window; } class SbxArray; class SwDoc; class SwViewOption; @@ -389,7 +389,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); void MoveCrsr( bool bWithSelect = false ); // update input fields - bool StartInputFldDlg(SwField*, bool bNextButton, Window* pParentWin = 0, OString* pWindowState = 0); + bool StartInputFldDlg(SwField*, bool bNextButton, vcl::Window* pParentWin = 0, OString* pWindowState = 0); // update DropDown fields bool StartDropDownFldDlg(SwField*, bool bNextButton, OString* pWindowState = 0); @@ -446,8 +446,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); DECL_STATIC_LINK( SwWrtShell, InsertRegionDialog, SwSectionData* ); // ctor, the first one is a kind of a controlled copy ctor for more views of a document - SwWrtShell( SwWrtShell&, Window *pWin, SwView &rShell); - SwWrtShell( SwDoc& rDoc, Window *pWin, SwView &rShell, + SwWrtShell( SwWrtShell&, vcl::Window *pWin, SwView &rShell); + SwWrtShell( SwDoc& rDoc, vcl::Window *pWin, SwView &rShell, const SwViewOption *pViewOpt = 0); virtual ~SwWrtShell(); diff --git a/sw/source/uibase/index/idxmrk.cxx b/sw/source/uibase/index/idxmrk.cxx index 3c2361593473..43dabb06bbdf 100644 --- a/sw/source/uibase/index/idxmrk.cxx +++ b/sw/source/uibase/index/idxmrk.cxx @@ -54,7 +54,7 @@ SFX_IMPL_CHILDWINDOW_WITHID(SwInsertIdxMarkWrapper, FN_INSERT_IDX_ENTRY_DLG) -SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( Window *pParentWindow, +SwInsertIdxMarkWrapper::SwInsertIdxMarkWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -84,7 +84,7 @@ void SwInsertIdxMarkWrapper::ReInitDlg(SwWrtShell& rWrtShell) SFX_IMPL_CHILDWINDOW_WITHID(SwInsertAuthMarkWrapper, FN_INSERT_AUTH_ENTRY_DLG) -SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper( Window *pParentWindow, +SwInsertAuthMarkWrapper::SwInsertAuthMarkWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index e67752dec51b..b041797d4e81 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -629,7 +629,7 @@ void SwSpellPopup::checkRedline() } } -sal_uInt16 SwSpellPopup::Execute( const Rectangle& rWordPos, Window* pWin ) +sal_uInt16 SwSpellPopup::Execute( const Rectangle& rWordPos, vcl::Window* pWin ) { sal_uInt16 nRet = PopupMenu::Execute(pWin, pWin->LogicToPixel(rWordPos)); Execute( nRet ); diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index ab21d35764a4..725198198fe3 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -35,7 +35,7 @@ struct SwNumberingTypeListBox_Impl uno::Reference<text::XNumberingTypeInfo> xInfo; }; -SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, WinBits nStyle ) : +SwNumberingTypeListBox::SwNumberingTypeListBox( vcl::Window* pWin, WinBits nStyle ) : ListBox(pWin, nStyle), pImpl(new SwNumberingTypeListBox_Impl) { @@ -54,7 +54,7 @@ bool SwNumberingTypeListBox::set_property(const OString &rKey, const OString &rV return true; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwNumberingTypeListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSwNumberingTypeListBox(vcl::Window *pParent, VclBuilder::stringmap &) { SwNumberingTypeListBox *pListBox = new SwNumberingTypeListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP); pListBox->EnableAutoSize(true); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 10dbe3c9377f..bb55453f770b 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -61,7 +61,7 @@ SFX_IMPL_MODELESSDIALOG_WITHID( SwRedlineAcceptChild, FN_REDLINE_ACCEPT ) static sal_uInt16 nSortMode = 0xffff; static bool bSortDir = true; -SwRedlineAcceptChild::SwRedlineAcceptChild( Window* _pParent, +SwRedlineAcceptChild::SwRedlineAcceptChild( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -84,7 +84,7 @@ bool SwRedlineAcceptChild::ReInitDlg(SwDocShell *pDocSh) } SwModelessRedlineAcceptDlg::SwModelessRedlineAcceptDlg( - SfxBindings* _pBindings, SwChildWinWrapper* pChild, Window *_pParent) + SfxBindings* _pBindings, SwChildWinWrapper* pChild, vcl::Window *_pParent) : SfxModelessDialog(_pBindings, pChild, _pParent, "AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui") , pChildWin (pChild) diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 1ba770fd6a42..172a0b39c483 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -35,7 +35,7 @@ #define CONTROL_TRIANGLE_PAD 3 // Constructor -SwCommentRuler::SwCommentRuler( SwViewShell* pViewSh, Window* pParent, SwEditWin* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) +SwCommentRuler::SwCommentRuler( SwViewShell* pViewSh, vcl::Window* pParent, SwEditWin* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle | WB_HSCROLL) , mpViewShell(pViewSh) , mpSwWin(pWin) diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index f3e4035fd629..015e0d7231c8 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -56,7 +56,7 @@ SFX_IMPL_POS_CHILDWINDOW_WITHID( SwInputChild, FN_EDIT_FORMULA, SFX_OBJECTBAR_OBJECT ) -SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind ) +SwInputWindow::SwInputWindow( vcl::Window* pParent, SfxBindings* pBind ) : ToolBox( pParent , SW_RES( RID_TBX_FORMULA )), aPos( this, SW_RES(ED_POS)), aEdit( this, WB_3DLOOK|WB_TABSTOP|WB_BORDER|WB_NOHIDESELECTION), @@ -609,7 +609,7 @@ void InputEdit::UpdateRange(const OUString& rBoxes, } -SwInputChild::SwInputChild(Window* _pParent, +SwInputChild::SwInputChild(vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* ) : diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index aed90d456adf..ff70be3516b6 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -450,12 +450,12 @@ static const char* aNavigationHelpIds[ NAVI_ENTRIES ] = HID_NID_NEXT }; -SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& rFrame, Window *pParent) +SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window *pParent) : SfxPopupWindow(nId, pParent, "FloatingNavigation", "modules/swriter/ui/floatingnavigation.ui", rFrame), aIList(SW_RES(IL_VALUES)) { - m_pToolBox = new SwScrollNaviToolBox(get<Window>("box"), 0); + m_pToolBox = new SwScrollNaviToolBox(get<vcl::Window>("box"), 0); get(m_pInfoField, "label"); sal_uInt16 i; @@ -600,7 +600,7 @@ class SwZoomBox_Impl : public ComboBox public: SwZoomBox_Impl( - Window* pParent, + vcl::Window* pParent, sal_uInt16 nSlot, const Reference< XDispatchProvider >& rDispatchProvider ); virtual ~SwZoomBox_Impl(); @@ -614,7 +614,7 @@ protected: }; SwZoomBox_Impl::SwZoomBox_Impl( - Window* pParent, + vcl::Window* pParent, sal_uInt16 nSlot, const Reference< XDispatchProvider >& rDispatchProvider ): ComboBox( pParent, SW_RES(RID_PVIEW_ZOOM_LB)), @@ -694,7 +694,7 @@ bool SwZoomBox_Impl::Notify( NotifyEvent& rNEvt ) } else if ( EVENT_LOSEFOCUS == rNEvt.GetType() ) { - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); if ( !HasFocus() && GetSubEdit() != pFocusWin ) SetText( GetSavedValue() ); } @@ -713,7 +713,7 @@ void SwZoomBox_Impl::ReleaseFocus() if ( pCurSh ) { - Window* pShellWnd = pCurSh->GetWindow(); + vcl::Window* pShellWnd = pCurSh->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); @@ -750,7 +750,7 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16 /*nSID*/, } } -Window* SwPreviewZoomControl::CreateItemWindow( Window *pParent ) +vcl::Window* SwPreviewZoomControl::CreateItemWindow( vcl::Window *pParent ) { SwZoomBox_Impl* pRet = new SwZoomBox_Impl( pParent, GetSlotId(), Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY )); return pRet; diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 91d9c7e9ec88..b6d0b1bfdfcb 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -2333,7 +2333,7 @@ void SwBaseShell::GetBorderState(SfxItemSet &rSet) void SwBaseShell::ExecDlg(SfxRequest &rReq) { SwWrtShell &rSh = GetShell(); - Window *pMDI = &GetView().GetViewFrame()->GetWindow(); + vcl::Window *pMDI = &GetView().GetViewFrame()->GetWindow(); // So that from the basic no dialogues for the background views are called: bool bBackground = (&GetView() != GetActiveView()); const SfxPoolItem* pItem = 0; diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx index 0cbca7a24a99..db0694e9a12a 100644 --- a/sw/source/uibase/shells/grfshex.cxx +++ b/sw/source/uibase/shells/grfshex.cxx @@ -65,7 +65,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest& rReq ) { OUString aURL; const SfxItemSet* pReqArgs = rReq.GetArgs(); - Window* pWindow = &GetView().GetViewFrame()->GetWindow(); + vcl::Window* pWindow = &GetView().GetViewFrame()->GetWindow(); bool bAPI = false, bRet = false; if( pReqArgs ) diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx index 52276bb85888..5b15c36bd3d8 100644 --- a/sw/source/uibase/shells/langhelper.cxx +++ b/sw/source/uibase/shells/langhelper.cxx @@ -73,7 +73,7 @@ namespace SwLangHelper OUString aKeyboardLang; LanguageType nLang = LANGUAGE_DONTKNOW; - Window* pWin = rEditView.GetWindow(); + vcl::Window* pWin = rEditView.GetWindow(); if(pWin) nLang = pWin->GetInputLanguage(); if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM) diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 291f21696e66..4bc5c14e18d0 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -115,7 +115,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) if(pArgs) pArgs->GetItemState(GetPool().GetWhich(nSlot), false, &pItem); - Window *pMDI = &GetView().GetViewFrame()->GetWindow(); + vcl::Window *pMDI = &GetView().GetViewFrame()->GetWindow(); bool bMore = false; bool bIsText = true; sal_uInt16 nInsertType = 0; diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx index 49c806a8819f..601883ed072b 100644 --- a/sw/source/uibase/shells/textidx.cxx +++ b/sw/source/uibase/shells/textidx.cxx @@ -50,7 +50,7 @@ void SwTextShell::ExecIdx(SfxRequest &rReq) pArgs->GetItemState(nSlot, false, &pItem ); SfxViewFrame* pVFrame = GetView().GetViewFrame(); - Window *pMDI = &pVFrame->GetWindow(); + vcl::Window *pMDI = &pVFrame->GetWindow(); switch( nSlot ) { diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 97f9053f01eb..e9edc6c91898 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -257,7 +257,7 @@ void sw_CharDialog( SwWrtShell &rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const } } -static short lcl_AskRedlineMode(Window *pWin) +static short lcl_AskRedlineMode(vcl::Window *pWin) { MessBox aQBox( pWin, 0, OUString( SW_RES( STR_REDLINE_TITLE ) ), diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx index 6b9fb2fb69b9..991033f1a3c8 100644 --- a/sw/source/uibase/shells/txtcrsr.cxx +++ b/sw/source/uibase/shells/txtcrsr.cxx @@ -319,7 +319,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq) const SwView* pView = pDocShell ? pDocShell->GetView() : NULL; const FmFormShell* pFormShell = pView ? pView->GetFormShell() : NULL; SdrView* pDrawView = pView ? pView->GetDrawView() : NULL; - Window* pWindow = pView ? pView->GetWrtShell().GetWin() : NULL; + vcl::Window* pWindow = pView ? pView->GetWrtShell().GetWin() : NULL; OSL_ENSURE( pFormShell && pDrawView && pWindow, "SwXTextView::ExecMoveMisc: no chance!" ); if ( !pFormShell || !pDrawView || !pWindow ) diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index f2a5f3857bee..2748f65f45de 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -32,7 +32,7 @@ namespace sw { namespace sidebar { PageColumnControl::PageColumnControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const sal_uInt16 nColumnType, const bool bLandscape ) diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index c53fdf95974c..a5ddcda8ed1b 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -39,7 +39,7 @@ class PageColumnControl { public: PageColumnControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const sal_uInt16 nColumnType, const bool bLandscape ); diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index 52a16a24d146..e44215dbf1d9 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -39,7 +39,7 @@ namespace sw { namespace sidebar { PageMarginControl::PageMarginControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const SvxLongLRSpaceItem& aPageLRMargin, const SvxLongULSpaceItem& aPageULMargin, diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index 041e884aa70c..253a56b18278 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -51,7 +51,7 @@ class PageMarginControl { public: PageMarginControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const SvxLongLRSpaceItem& aPageLRMargin, const SvxLongULSpaceItem& aPageULMargin, diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx index 53236610a167..1d7e5a225cc8 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.cxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx @@ -29,7 +29,7 @@ namespace sw { namespace sidebar { PageOrientationControl::PageOrientationControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const bool bLandscape ) : ::svx::sidebar::PopupControl( pParent, SW_RES(RID_POPUP_SWPAGE_ORIENTATION) ) diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index 6e8d44f65d48..b829cc47e61d 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -34,7 +34,7 @@ class PageOrientationControl { public: PageOrientationControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const bool bLandscape ); virtual ~PageOrientationControl(void); diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx index 39f13a54f445..6b4f2743b01f 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx @@ -84,7 +84,7 @@ namespace { namespace sw { namespace sidebar { PagePropertyPanel* PagePropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame, SfxBindings* pBindings) { @@ -102,7 +102,7 @@ PagePropertyPanel* PagePropertyPanel::Create ( } PagePropertyPanel::PagePropertyPanel( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "PagePropertyPanel", "modules/swriter/ui/sidebarpage.ui", rxFrame) diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx index 876f13e344e3..76a9a0f7cb2c 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx @@ -56,7 +56,7 @@ namespace sw { namespace sidebar { { public: static PagePropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame, SfxBindings* pBindings ); @@ -99,7 +99,7 @@ namespace sw { namespace sidebar { private: PagePropertyPanel( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame, SfxBindings* pBindings ); virtual ~PagePropertyPanel(void); diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 5e5cd9ddd825..31d6eaba3bb0 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -36,7 +36,7 @@ namespace sw { namespace sidebar { PageSizeControl::PageSizeControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const Paper ePaper, const bool bLandscape, diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index a15550c160b6..2fba0461ae7b 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -42,7 +42,7 @@ class PageSizeControl { public: PageSizeControl( - Window* pParent, + vcl::Window* pParent, PagePropertyPanel& rPanel, const Paper ePaper, const bool bLandscape, diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index ea2491fff572..f2c085ecbf30 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -88,7 +88,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings", sal_uInt64(0))); SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue); - ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if ( ! xParentWindow.is() || pParentWindow==NULL) throw RuntimeException( "PanelFactory::createUIElement called without ParentWindow", @@ -123,7 +123,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( } else if (DoesResourceEndWith("/NavigatorPanel")) { - Window* pPanel = new SwNavigationPI(pBindings, NULL, pParentWindow); + vcl::Window* pPanel = new SwNavigationPI(pBindings, NULL, pParentWindow); xElement = sfx2::sidebar::SidebarPanelBase::Create( rsResourceURL, xFrame, diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx index afac9912ae1e..76b9a79dd38b 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx @@ -43,7 +43,7 @@ const char UNO_WRAPIDEAL[] = ".uno:WrapIdeal"; namespace sw { namespace sidebar { WrapPropertyPanel* WrapPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, SfxBindings* pBindings) { @@ -61,7 +61,7 @@ WrapPropertyPanel* WrapPropertyPanel::Create ( } WrapPropertyPanel::WrapPropertyPanel( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, SfxBindings* pBindings ) : PanelLayout(pParent, "WrapPropertyPanel", "modules/swriter/ui/sidebarwrap.ui", rxFrame) diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx index 27bff8143680..d1c53394021f 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx @@ -36,7 +36,7 @@ namespace sw { namespace sidebar { { public: static WrapPropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>& rxFrame, SfxBindings* pBindings ); @@ -49,7 +49,7 @@ namespace sw { namespace sidebar { private: WrapPropertyPanel( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxFrame, SfxBindings* pBindings ); diff --git a/sw/source/uibase/smartmenu/stmenu.cxx b/sw/source/uibase/smartmenu/stmenu.cxx index 064ff2488020..1e059856e891 100644 --- a/sw/source/uibase/smartmenu/stmenu.cxx +++ b/sw/source/uibase/smartmenu/stmenu.cxx @@ -127,7 +127,7 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView, smarttag library. */ -sal_uInt16 SwSmartTagPopup::Execute( const Rectangle& rWordPos, Window* pWin ) +sal_uInt16 SwSmartTagPopup::Execute( const Rectangle& rWordPos, vcl::Window* pWin ) { sal_uInt16 nId = PopupMenu::Execute(pWin, pWin->LogicToPixel(rWordPos)); diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx index 7116378d4092..6370f6085490 100644 --- a/sw/source/uibase/table/chartins.cxx +++ b/sw/source/uibase/table/chartins.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ) +Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart ) { // positioning code according to spepc; similar to Calc fuins2.cxx Point aRet; @@ -132,7 +132,7 @@ Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, co return aRet; } -void SwInsertChart(Window* pParent, SfxBindings* pBindings ) +void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings ) { (void) pParent; (void) pBindings; diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index e0eda8c281df..c20ea83d4a4a 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star; // Adjust line height (dialogue) -void SwTableFUNC::ColWidthDlg( Window *pParent ) +void SwTableFUNC::ColWidthDlg( vcl::Window *pParent ) { InitTabCols(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 47d5b67660d3..bd49752dc2ab 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -80,9 +80,9 @@ class SwFormatTablePage : public SfxTabPage using TabPage::DeactivatePage; public: - SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ); + SwFormatTablePage( vcl::Window* pParent, const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -129,10 +129,10 @@ class SwTableColumnPage : public SfxTabPage using TabPage::DeactivatePage; public: - SwTableColumnPage( Window* pParent, const SfxItemSet& rSet ); + SwTableColumnPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwTableColumnPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -177,11 +177,11 @@ class SwTextFlowPage : public SfxTabPage DECL_LINK( SplitRowHdl_Impl, TriStateBox* ); DECL_LINK( HeadLineCBClickHdl, void* p = 0 ); - SwTextFlowPage( Window* pParent, const SfxItemSet& rSet ); + SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwTextFlowPage(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index d54d82944d0c..a3980162cfbb 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -172,7 +172,7 @@ void SwPreviewZoomDlg::Apply() } // all for SwPagePreviewWin -SwPagePreviewWin::SwPagePreviewWin( Window *pParent, SwPagePreview& rPView ) +SwPagePreviewWin::SwPagePreviewWin( vcl::Window *pParent, SwPagePreview& rPView ) : Window(pParent, WinBits(WB_CLIPCHILDREN)) , mpViewShell(0) , mrView(rPView) @@ -1237,7 +1237,7 @@ SwDocShell* SwPagePreview::GetDocShell() int SwPagePreview::_CreateScrollbar( bool bHori ) { - Window *pMDI = &GetViewFrame()->GetWindow(); + vcl::Window *pMDI = &GetViewFrame()->GetWindow(); SwScrollbar** ppScrollbar = bHori ? &pHScrollbar : &pVScrollbar; assert(!*ppScrollbar); //check beforehand! @@ -1695,7 +1695,7 @@ bool SwPagePreview::HasPrintOptionsPage() const return true; } -SfxTabPage* SwPagePreview::CreatePrintOptionsPage( Window *pParent, +SfxTabPage* SwPagePreview::CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) { return ::CreatePrintOptionsPage( pParent, rOptions, !bNormalPrint ); diff --git a/sw/source/uibase/uiview/scroll.cxx b/sw/source/uibase/uiview/scroll.cxx index c40fbffd58ec..59812dcead71 100644 --- a/sw/source/uibase/uiview/scroll.cxx +++ b/sw/source/uibase/uiview/scroll.cxx @@ -23,7 +23,7 @@ #define SCROLL_LINE_SIZE 250 -SwScrollbar::SwScrollbar( Window *pWin, bool bHoriz ) : +SwScrollbar::SwScrollbar( vcl::Window *pWin, bool bHoriz ) : ScrollBar( pWin, WinBits( WB_3DLOOK | WB_HIDE | ( bHoriz ? WB_HSCROLL : WB_VSCROLL) ) ), bHori( bHoriz ), diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 0743753b7440..0a218517202a 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -829,7 +829,7 @@ void SwSrcView::Load(SwDocShell* pDocShell) } else { - Window *pTmpWindow = &GetViewFrame()->GetWindow(); + vcl::Window *pTmpWindow = &GetViewFrame()->GetWindow(); MessageDialog(pTmpWindow, SW_RES(STR_ERR_SRCSTREAM), VCL_MESSAGE_INFO).Execute(); } } diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 7ae27519f5af..f2f68a9eedf8 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -581,7 +581,7 @@ void SwView::Execute(SfxRequest &rReq) { OSL_ENSURE( !((const SfxBoolItem*)pItem)->GetValue(), "SwView::Execute(): password set an redlining off doesn't match!" ); // xmlsec05: new password dialog - Window* pParent; + vcl::Window* pParent; const SfxPoolItem* pParentItem; if( SfxItemState::SET == pArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr(); @@ -619,7 +619,7 @@ void SwView::Execute(SfxRequest &rReq) // xmlsec05: new password dialog // message box for wrong password - Window* pParent; + vcl::Window* pParent; const SfxPoolItem* pParentItem; if( pArgs && SfxItemState::SET == pArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr(); @@ -2277,7 +2277,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, SfxMedium* pMedium, sal_Int16 nVe if (!bCompare && !nFound) { - Window* pWin = &GetEditWin(); + vcl::Window* pWin = &GetEditWin(); MessageDialog(pWin, SW_RES(STR_NO_MERGE_ENTRY), VCL_MESSAGE_INFO).Execute(); } if( nRet==2 && xDocSh.Is() ) @@ -2432,7 +2432,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument) { // call documents and template dialog SfxApplication* pSfxApp = SfxGetpApp(); - Window* pTopWin = pSfxApp->GetTopWindow(); + vcl::Window* pTopWin = pSfxApp->GetTopWindow(); SfxTemplateManagerDlg aDocTemplDlg; int nRet = aDocTemplDlg.Execute(); diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx index 248c82f0da8b..2af636f2e682 100644 --- a/sw/source/uibase/uiview/viewdlg2.cxx +++ b/sw/source/uibase/uiview/viewdlg2.cxx @@ -45,7 +45,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq) { - Window *pMDI = &GetViewFrame()->GetWindow(); + vcl::Window *pMDI = &GetViewFrame()->GetWindow(); switch ( rReq.GetSlot() ) { diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 73d0106b3a5d..3169d2dc5c5a 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -165,7 +165,7 @@ void SwView::ExecDraw(SfxRequest& rReq) } else if ( nSlotId == SID_FONTWORK_GALLERY_FLOATER ) { - Window* pWin = &( m_pWrtShell->GetView().GetViewFrame()->GetWindow() ); + vcl::Window* pWin = &( m_pWrtShell->GetView().GetViewFrame()->GetWindow() ); if ( pWin ) pWin->EnterWait(); @@ -506,7 +506,7 @@ bool SwView::EnterDrawTextMode(const Point& aDocPos) // Enable DrawTextEditMode -bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin, +bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin, bool bIsNewObj, bool bSetSelectionToStart) { SwWrtShell *pSh = &GetWrtShell(); diff --git a/sw/source/uibase/uiview/viewfunc.hxx b/sw/source/uibase/uiview/viewfunc.hxx index 5c9808ade2e6..4102270a1999 100644 --- a/sw/source/uibase/uiview/viewfunc.hxx +++ b/sw/source/uibase/uiview/viewfunc.hxx @@ -29,21 +29,21 @@ class Size; class SvxRuler; class SwScrollbar; class SwViewShell; -class Window; +namespace vcl { class Window; } // The following functions are available in viewprt.cxx void SetPrinter( IDocumentDeviceAccess*, SfxPrinter*, bool bWeb ); -SfxTabPage* CreatePrintOptionsPage( Window*, const SfxItemSet& ); +SfxTabPage* CreatePrintOptionsPage( vcl::Window*, const SfxItemSet& ); void SetAppPrintOptions( SwViewShell* pSh, bool bWeb ); // The following functions are available in viewport.cxx -void ViewResizePixel( const Window &rRef, +void ViewResizePixel( const vcl::Window &rRef, const Point &rOfst, const Size &rSize, const Size &rEditSz, SwScrollbar& rVScrollbar, SwScrollbar& rHScrollbar, - Window& rScrollBarBox, + vcl::Window& rScrollBarBox, SvxRuler* pVRuler = 0, SvxRuler* pHRuler = 0, bool bVRulerRight = false ); diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index e18f89331639..bd16c2680e54 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -265,7 +265,7 @@ IMPL_LINK( SwView, WindowChildEventListener, VclSimpleEvent*, pEvent ) { VclWindowEvent *pVclEvent = static_cast< VclWindowEvent * >( pEvent ); OSL_ENSURE( pVclEvent->GetWindow(), "Window???" ); - Window* pChildWin = static_cast< Window* >( pVclEvent->GetData() ); + vcl::Window* pChildWin = static_cast< vcl::Window* >( pVclEvent->GetData() ); switch ( pVclEvent->GetId() ) { @@ -289,7 +289,7 @@ IMPL_LINK( SwView, WindowChildEventListener, VclSimpleEvent*, pEvent ) int SwView::_CreateScrollbar( bool bHori ) { - Window *pMDI = &GetViewFrame()->GetWindow(); + vcl::Window *pMDI = &GetViewFrame()->GetWindow(); SwScrollbar** ppScrollbar = bHori ? &m_pHScrollbar : &m_pVScrollbar; assert(!*ppScrollbar); //check beforehand! diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index f00be536190a..742afb0b1172 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -411,7 +411,7 @@ void SwView::Scroll( const Rectangle &rRect, sal_uInt16 nRangeX, sal_uInt16 nRan Rectangle aOldVisArea( m_aVisArea ); long nDiffY = 0; - Window* pCareWn = SwViewShell::GetCareWin(GetWrtShell()); + vcl::Window* pCareWn = SwViewShell::GetCareWin(GetWrtShell()); if ( pCareWn ) { Rectangle aDlgRect( GetEditWin().PixelToLogic( @@ -832,13 +832,13 @@ void SwView::CalcAndSetBorderPixel( SvBorder &rToFill, bool /*bInner*/ ) SetBorderPixel( rToFill ); } -void ViewResizePixel( const Window &rRef, +void ViewResizePixel( const vcl::Window &rRef, const Point &rOfst, const Size &rSize, const Size &rEditSz, SwScrollbar& rVScrollbar, SwScrollbar& rHScrollbar, - Window& rScrollBarBox, + vcl::Window& rScrollBarBox, SvxRuler* pVRuler, SvxRuler* pHRuler, bool bVRulerRight ) diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index d5e83bc2d173..4f576a0ecf14 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -147,7 +147,7 @@ bool SwView::HasPrintOptionsPage() const // TabPage for application-specific print options -SfxTabPage* SwView::CreatePrintOptionsPage(Window* pParent, +SfxTabPage* SwView::CreatePrintOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet) { return ::CreatePrintOptionsPage( pParent, rSet, false ); @@ -245,7 +245,7 @@ void SwView::ExecutePrint(SfxRequest& rReq) // Create page printer/additions for SwView and SwPagePreview -SfxTabPage* CreatePrintOptionsPage( Window *pParent, +SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions, bool bPreview ) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index d2ecd16bb983..9e0eca819b2c 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -78,7 +78,7 @@ struct SwSearchOptions SwSearchOptions( SwWrtShell* pSh, bool bBackward ); }; -static Window* GetParentWindow( SvxSearchDialog* pSrchDlg ) +static vcl::Window* GetParentWindow( SvxSearchDialog* pSrchDlg ) { return pSrchDlg && pSrchDlg->IsVisible() ? pSrchDlg : 0; } @@ -198,7 +198,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage) if ( pDlgWrp ) { m_pSrchDlg = (SvxSearchDialog*)(pDlgWrp->GetWindow()); - m_pSrchDlg->SetDocWin( (Window*)m_pEditWin); + m_pSrchDlg->SetDocWin( (vcl::Window*)m_pEditWin); m_pSrchDlg->SetSrchFlag(); } } @@ -225,7 +225,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage) if ( pDlgWrp ) { m_pSrchDlg = (SvxSearchDialog*)(pDlgWrp->GetWindow()); - m_pSrchDlg->SetDocWin( (Window*)m_pEditWin); + m_pSrchDlg->SetDocWin( (vcl::Window*)m_pEditWin); m_pSrchDlg->SetSrchFlag(); } } @@ -286,7 +286,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage) if ( pDlgWrp ) { m_pSrchDlg = (SvxSearchDialog*)(pDlgWrp->GetWindow()); - m_pSrchDlg->SetDocWin( (Window*)m_pEditWin); + m_pSrchDlg->SetDocWin( (vcl::Window*)m_pEditWin); m_pSrchDlg->SetSrchFlag(); } } @@ -344,7 +344,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage) { OUString aText( SW_RES( STR_NB_REPLACED ) ); aText = aText.replaceFirst("XX", OUString::number( nFound )); - Window* pParentWindow = GetParentWindow( m_pSrchDlg ); + vcl::Window* pParentWindow = GetParentWindow( m_pSrchDlg ); InfoBox( pParentWindow, aText ).Execute(); } } @@ -355,7 +355,7 @@ void SwView::ExecSearch(SfxRequest& rReq, bool bNoMessage) if ( pDlgWrp ) { m_pSrchDlg = (SvxSearchDialog*)(pDlgWrp->GetWindow()); - m_pSrchDlg->SetDocWin( (Window*)m_pEditWin); + m_pSrchDlg->SetDocWin( (vcl::Window*)m_pEditWin); m_pSrchDlg->SetSrchFlag(); } #endif diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index e04d4f7eda9c..ec9e9402deaf 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -443,7 +443,7 @@ SdrObject* SwXTextView::GetControl( SwView* pView2 = GetView(); FmFormShell* pFormShell = pView2 ? pView2->GetFormShell() : NULL; SdrView* pDrawView = pView2 ? pView2->GetDrawView() : NULL; - Window* pWindow = pView2 ? pView2->GetWrtShell().GetWin() : NULL; + vcl::Window* pWindow = pView2 ? pView2->GetWrtShell().GetWin() : NULL; OSL_ENSURE( pFormShell && pDrawView && pWindow, "SwXTextView::GetControl: how could I?" ); @@ -469,7 +469,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormCo SwView* pView2 = GetView(); FmFormShell* pFormShell = pView2 ? pView2->GetFormShell() : NULL; SdrView* pDrawView = pView2 ? pView2->GetDrawView() : NULL; - Window* pWindow = pView2 ? pView2->GetWrtShell().GetWin() : NULL; + vcl::Window* pWindow = pView2 ? pView2->GetWrtShell().GetWin() : NULL; OSL_ENSURE( pFormShell && pDrawView && pWindow, "SwXTextView::getFormController: how could I?" ); uno::Reference< form::runtime::XFormController > xController; diff --git a/sw/source/uibase/utlui/condedit.cxx b/sw/source/uibase/utlui/condedit.cxx index 5aa7ff1abb0b..b15694b02b00 100644 --- a/sw/source/uibase/utlui/condedit.cxx +++ b/sw/source/uibase/utlui/condedit.cxx @@ -26,7 +26,7 @@ using namespace ::svx; using namespace ::com::sun::star::uno; -ConditionEdit::ConditionEdit(Window* pParent, WinBits nStyle) +ConditionEdit::ConditionEdit(vcl::Window* pParent, WinBits nStyle) : Edit(pParent, nStyle) , DropTargetHelper(this) , bBrackets(true) @@ -34,7 +34,7 @@ ConditionEdit::ConditionEdit(Window* pParent, WinBits nStyle) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeConditionEdit(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeConditionEdit(vcl::Window *pParent, VclBuilder::stringmap &rMap) { VclBuilder::ensureDefaultWidthChars(rMap); return new ConditionEdit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index d67ddda9907b..80953c478715 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -784,7 +784,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged) // TreeListBox for content indicator -SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) : +SwContentTree::SwContentTree(vcl::Window* pParent, const ResId& rResId) : SvTreeListBox( pParent, rResId ), sSpace(OUString(" ")), @@ -2730,7 +2730,7 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) pActiveShell->GetView().GetEditWin(); vcl::KeyCode tempKeycode( KEY_ESCAPE ); KeyEvent rKEvt( 0 , tempKeycode ); - ((Window*)&pEditWindow)->KeyInput( rKEvt ); + ((vcl::Window*)&pEditWindow)->KeyInput( rKEvt ); //rView.GetEditWin().GrabFocus(); } } diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index ba20939edcb3..39ad2e55e56f 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -144,7 +144,7 @@ void SwGlobalFrameListener_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& bValid = false; } -SwGlobalTree::SwGlobalTree(Window* pParent, const ResId& rResId) : +SwGlobalTree::SwGlobalTree(vcl::Window* pParent, const ResId& rResId) : SvTreeListBox(pParent, rResId), diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index d2af8c14b06e..00005e08aaa2 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -58,11 +58,11 @@ class SwGlossDecideDlg : public ModalDialog DECL_LINK(SelectHdl, void*); public: - SwGlossDecideDlg(Window* pParent); + SwGlossDecideDlg(vcl::Window* pParent); ListBox& GetListBox() {return *m_pListLB;} }; -SwGlossDecideDlg::SwGlossDecideDlg(Window* pParent) +SwGlossDecideDlg::SwGlossDecideDlg(vcl::Window* pParent) : ModalDialog(pParent, "SelectAutoTextDialog", "modules/swriter/ui/selectautotextdialog.ui") { diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index a28a3646b3b4..47f9dcc9bfc0 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -429,7 +429,7 @@ void SwNavHelpToolBox::MouseButtonDown(const MouseEvent &rEvt) SwHelpToolBox::MouseButtonDown(rEvt); } -void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, Window *pParent) +void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, bool bSetFocus, vcl::Window *pParent) { Reference< XFrame > xFrame = GetCreateView()->GetViewFrame()->GetFrame().GetFrameInterface(); SwScrollNaviPopup* pPopup = new @@ -602,7 +602,7 @@ void SwNavigationPI::_ZoomIn() void SwNavigationPI::Resize() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if( !_IsZoomedIn() ) { Size aNewSize (pParent->GetOutputSizePixel()); @@ -653,7 +653,7 @@ void SwNavigationPI::Resize() SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, SfxChildWindowContext* pCw, - Window* pParent) : + vcl::Window* pParent) : Window( pParent, SW_RES(DLG_NAVIGATION_PI)), SfxControllerItem( SID_DOCFULLNAME, *_pBindings ), @@ -1318,7 +1318,7 @@ SwView* SwNavigationPI::GetCreateView() const return pCreateView; } -SwNavigationChild::SwNavigationChild( Window* pParent, +SwNavigationChild::SwNavigationChild( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* ) diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index abbc71a6c7aa..89630e93894c 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::lang; * nDefFmt: Select this format and possibly insert it */ -NumFormatListBox::NumFormatListBox(Window* pWin, WinBits nStyle) : +NumFormatListBox::NumFormatListBox(vcl::Window* pWin, WinBits nStyle) : ListBox ( pWin, nStyle ), nCurrFormatType (-1), nStdEntry (0), @@ -68,7 +68,7 @@ NumFormatListBox::NumFormatListBox(Window* pWin, WinBits nStyle) : Init(NUMBERFORMAT_NUMBER, true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeNumFormatListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeNumFormatListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK; diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 8875d35b73a3..6d3c4baf89a0 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -62,7 +62,7 @@ const sal_Char cFactory[] = "private:factory/swriter"; bool SwOneExampleFrame::bShowServiceNotAvailableMessage = true; -SwOneExampleFrame::SwOneExampleFrame( Window& rWin, +SwOneExampleFrame::SwOneExampleFrame( vcl::Window& rWin, sal_uInt32 nFlags, const Link* pInitializedLink, const OUString* pURL ) : @@ -90,7 +90,7 @@ SwOneExampleFrame::SwOneExampleFrame( Window& rWin, aTopWindow.Show(); } -void SwOneExampleFrame::CreateErrorMessage(Window* pParent) +void SwOneExampleFrame::CreateErrorMessage(vcl::Window* pParent) { if(SwOneExampleFrame::bShowServiceNotAvailableMessage) { @@ -517,7 +517,7 @@ IMPL_LINK(SwOneExampleFrame, PopupHdl, Menu*, pMenu ) return 0; }; -SwFrmCtrlWindow::SwFrmCtrlWindow(Window* pParent, SwOneExampleFrame* pFrame) +SwFrmCtrlWindow::SwFrmCtrlWindow(vcl::Window* pParent, SwOneExampleFrame* pFrame) : VclEventBox(pParent) , pExampleFrame(pFrame) { diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 905733694300..e7f78d121334 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1593,7 +1593,7 @@ void SwWrtShell::AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar ) // Some kind of controlled copy ctor -SwWrtShell::SwWrtShell( SwWrtShell& rSh, Window *_pWin, SwView &rShell ) +SwWrtShell::SwWrtShell( SwWrtShell& rSh, vcl::Window *_pWin, SwView &rShell ) : SwFEShell( rSh, _pWin ), COMMON_INI_LIST { @@ -1610,7 +1610,7 @@ SwWrtShell::SwWrtShell( SwWrtShell& rSh, Window *_pWin, SwView &rShell ) } } -SwWrtShell::SwWrtShell( SwDoc& rDoc, Window *_pWin, SwView &rShell, +SwWrtShell::SwWrtShell( SwDoc& rDoc, vcl::Window *_pWin, SwView &rShell, const SwViewOption *pViewOpt ) : SwFEShell( rDoc, _pWin, pViewOpt), COMMON_INI_LIST @@ -1752,7 +1752,7 @@ void SwWrtShell::ChangeHeaderOrFooter( //Actions have to be closed while the dialog is showing EndAllAction(); - Window* pParent = &GetView().GetViewFrame()->GetWindow(); + vcl::Window* pParent = &GetView().GetViewFrame()->GetWindow(); short nResult; if (bHeader) nResult = DeleteHeaderDialog(pParent).Execute(); diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx index e6f000c8bf75..cf394fb00d32 100644 --- a/sw/source/uibase/wrtsh/wrtsh2.cxx +++ b/sw/source/uibase/wrtsh/wrtsh2.cxx @@ -198,7 +198,7 @@ class FieldDeletionModify : public SwModify // Start input dialog for a specific field bool SwWrtShell::StartInputFldDlg( SwField* pFld, bool bNextButton, - Window* pParentWin, OString* pWindowState ) + vcl::Window* pParentWin, OString* pWindowState ) { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); diff --git a/toolkit/inc/helper/unowrapper.hxx b/toolkit/inc/helper/unowrapper.hxx index 8e131ccddd44..15eab553a095 100644 --- a/toolkit/inc/helper/unowrapper.hxx +++ b/toolkit/inc/helper/unowrapper.hxx @@ -52,26 +52,26 @@ public: virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) SAL_OVERRIDE; // Window - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, bool bCreate ) SAL_OVERRIDE; - virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ) SAL_OVERRIDE; - - void WindowDestroyed( Window* pWindow ) SAL_OVERRIDE; - void WindowEvent_Move( Window* pWindow ); - void WindowEvent_Resize( Window* pWindow ); - void WindowEvent_Show( Window* pWindow, bool bShow ); - void WindowEvent_Close( Window* pWindow ); - void WindowEvent_Minimize( Window* pWindow ); - void WindowEvent_Normalize( Window* pWindow ); - void WindowEvent_Activate( Window* pWindow, bool bActivated ); - void WindowEvent_MouseButtonUp( Window* pWindow, const MouseEvent& rEvt ); - void WindowEvent_MouseButtonDown( Window* pWindow, const MouseEvent& rEvt ); - void WindowEvent_MouseMove( Window* pWindow, const MouseEvent& rEvt ); - void WindowEvent_Command( Window* pWindow, const CommandEvent& rCEvt ); - void WindowEvent_KeyInput( Window* pWindow, const KeyEvent& rEvt ); - void WindowEvent_KeyUp( Window* pWindow, const KeyEvent& rEvt ); - void WindowEvent_GetFocus( Window* pWindow ); - void WindowEvent_LoseFocus( Window* pWindow ); - void WindowEvent_Paint( Window* pWindow, const Rectangle& rRect ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow, bool bCreate ) SAL_OVERRIDE; + virtual void SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ) SAL_OVERRIDE; + + void WindowDestroyed( vcl::Window* pWindow ) SAL_OVERRIDE; + void WindowEvent_Move( vcl::Window* pWindow ); + void WindowEvent_Resize( vcl::Window* pWindow ); + void WindowEvent_Show( vcl::Window* pWindow, bool bShow ); + void WindowEvent_Close( vcl::Window* pWindow ); + void WindowEvent_Minimize( vcl::Window* pWindow ); + void WindowEvent_Normalize( vcl::Window* pWindow ); + void WindowEvent_Activate( vcl::Window* pWindow, bool bActivated ); + void WindowEvent_MouseButtonUp( vcl::Window* pWindow, const MouseEvent& rEvt ); + void WindowEvent_MouseButtonDown( vcl::Window* pWindow, const MouseEvent& rEvt ); + void WindowEvent_MouseMove( vcl::Window* pWindow, const MouseEvent& rEvt ); + void WindowEvent_Command( vcl::Window* pWindow, const CommandEvent& rCEvt ); + void WindowEvent_KeyInput( vcl::Window* pWindow, const KeyEvent& rEvt ); + void WindowEvent_KeyUp( vcl::Window* pWindow, const KeyEvent& rEvt ); + void WindowEvent_GetFocus( vcl::Window* pWindow ); + void WindowEvent_LoseFocus( vcl::Window* pWindow ); + void WindowEvent_Paint( vcl::Window* pWindow, const Rectangle& rRect ); // Accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx index f776bdc8ed37..2d98a0c2574f 100644 --- a/toolkit/source/awt/scrollabledialog.cxx +++ b/toolkit/source/awt/scrollabledialog.cxx @@ -31,7 +31,7 @@ namespace toolkit // in the same bitmap :-( WB_VSCROLL & WB_HSCROLL apparently are only for // child classes ( whole thing is a mess if you ask me ) template< class T> -ScrollableWrapper<T>::ScrollableWrapper( Window* pParent, WinBits nStyle ) : T( pParent, nStyle & ~( WB_AUTOHSCROLL | WB_AUTOVSCROLL ) ), maHScrollBar( this, WB_HSCROLL | WB_DRAG), maVScrollBar( this, WB_VSCROLL | WB_DRAG ), mbHasHoriBar( false ), mbHasVertBar( false ), maScrollVis( None ) +ScrollableWrapper<T>::ScrollableWrapper( vcl::Window* pParent, WinBits nStyle ) : T( pParent, nStyle & ~( WB_AUTOHSCROLL | WB_AUTOVSCROLL ) ), maHScrollBar( this, WB_HSCROLL | WB_DRAG), maVScrollBar( this, WB_VSCROLL | WB_DRAG ), mbHasHoriBar( false ), mbHasVertBar( false ), maScrollVis( None ) { Link aLink( LINK( this, ScrollableWrapper, ScrollBarHdl ) ); maVScrollBar.SetScrollHdl( aLink ); @@ -90,7 +90,7 @@ void ScrollableWrapper<T>::lcl_Scroll( long nX, long nY ) // Manually scroll all children ( except the scrollbars ) for ( int index = 0; index < T::GetChildCount(); ++index ) { - Window* pChild = T::GetChild( index ); + vcl::Window* pChild = T::GetChild( index ); if ( pChild && pChild != &maVScrollBar && pChild != &maHScrollBar ) { Point aPos = pChild->GetPosPixel(); diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx index 81519531e104..5250952e1abb 100644 --- a/toolkit/source/awt/stylesettings.cxx +++ b/toolkit/source/awt/stylesettings.cxx @@ -111,7 +111,7 @@ namespace toolkit WindowStyleSettings::WindowStyleSettings(::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow ) :m_pData( new WindowStyleSettings_Data(i_rListenerMutex, i_rOwningWindow ) ) { - Window* pWindow = i_rOwningWindow.GetWindow(); + vcl::Window* pWindow = i_rOwningWindow.GetWindow(); if ( !pWindow ) throw RuntimeException(); pWindow->AddEventListener( LINK( m_pData.get(), WindowStyleSettings_Data, OnWindowEvent ) ); @@ -127,7 +127,7 @@ namespace toolkit { StyleMethodGuard aGuard( *m_pData ); - Window* pWindow = m_pData->pOwningWindow->GetWindow(); + vcl::Window* pWindow = m_pData->pOwningWindow->GetWindow(); OSL_ENSURE( pWindow, "WindowStyleSettings::dispose: window has been reset before we could revoke the listener!" ); if ( pWindow ) pWindow->RemoveEventListener( LINK( m_pData.get(), WindowStyleSettings_Data, OnWindowEvent ) ); @@ -143,7 +143,7 @@ namespace toolkit { sal_Int32 lcl_getStyleColor( WindowStyleSettings_Data& i_rData, Color const & (StyleSettings::*i_pGetter)() const ) { - const Window* pWindow = i_rData.pOwningWindow->GetWindow(); + const vcl::Window* pWindow = i_rData.pOwningWindow->GetWindow(); const AllSettings aAllSettings = pWindow->GetSettings(); const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); return (aStyleSettings.*i_pGetter)().GetColor(); @@ -151,7 +151,7 @@ namespace toolkit void lcl_setStyleColor( WindowStyleSettings_Data& i_rData, void (StyleSettings::*i_pSetter)( Color const & ), const sal_Int32 i_nColor ) { - Window* pWindow = i_rData.pOwningWindow->GetWindow(); + vcl::Window* pWindow = i_rData.pOwningWindow->GetWindow(); AllSettings aAllSettings = pWindow->GetSettings(); StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); (aStyleSettings.*i_pSetter)( Color( i_nColor ) ); @@ -161,7 +161,7 @@ namespace toolkit FontDescriptor lcl_getStyleFont( WindowStyleSettings_Data& i_rData, vcl::Font const & (StyleSettings::*i_pGetter)() const ) { - const Window* pWindow = i_rData.pOwningWindow->GetWindow(); + const vcl::Window* pWindow = i_rData.pOwningWindow->GetWindow(); const AllSettings aAllSettings = pWindow->GetSettings(); const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); return VCLUnoHelper::CreateFontDescriptor( (aStyleSettings.*i_pGetter)() ); @@ -170,7 +170,7 @@ namespace toolkit void lcl_setStyleFont( WindowStyleSettings_Data& i_rData, void (StyleSettings::*i_pSetter)( vcl::Font const &), vcl::Font const & (StyleSettings::*i_pGetter)() const, const FontDescriptor& i_rFont ) { - Window* pWindow = i_rData.pOwningWindow->GetWindow(); + vcl::Window* pWindow = i_rData.pOwningWindow->GetWindow(); AllSettings aAllSettings = pWindow->GetSettings(); StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); const vcl::Font aNewFont = VCLUnoHelper::CreateFont( i_rFont, (aStyleSettings.*i_pGetter)() ); @@ -394,7 +394,7 @@ namespace toolkit ::sal_Int32 SAL_CALL WindowStyleSettings::getFaceGradientColor() throw (RuntimeException, std::exception) { StyleMethodGuard aGuard( *m_pData ); - const Window* pWindow = m_pData->pOwningWindow->GetWindow(); + const vcl::Window* pWindow = m_pData->pOwningWindow->GetWindow(); const AllSettings aAllSettings = pWindow->GetSettings(); const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); return aStyleSettings.GetFaceGradientColor().GetColor(); @@ -698,7 +698,7 @@ namespace toolkit ::sal_Int32 SAL_CALL WindowStyleSettings::getSeparatorColor() throw (RuntimeException, std::exception) { StyleMethodGuard aGuard( *m_pData ); - const Window* pWindow = m_pData->pOwningWindow->GetWindow(); + const vcl::Window* pWindow = m_pData->pOwningWindow->GetWindow(); const AllSettings aAllSettings = pWindow->GetSettings(); const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); return aStyleSettings.GetSeparatorColor().GetColor(); @@ -764,7 +764,7 @@ namespace toolkit sal_Bool SAL_CALL WindowStyleSettings::getHighContrastMode() throw (RuntimeException, std::exception) { StyleMethodGuard aGuard( *m_pData ); - const Window* pWindow = m_pData->pOwningWindow->GetWindow(); + const vcl::Window* pWindow = m_pData->pOwningWindow->GetWindow(); const AllSettings aAllSettings = pWindow->GetSettings(); const StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); return aStyleSettings.GetHighContrastMode(); @@ -774,7 +774,7 @@ namespace toolkit void SAL_CALL WindowStyleSettings::setHighContrastMode( sal_Bool _highcontrastmode ) throw (RuntimeException, std::exception) { StyleMethodGuard aGuard( *m_pData ); - Window* pWindow = m_pData->pOwningWindow->GetWindow(); + vcl::Window* pWindow = m_pData->pOwningWindow->GetWindow(); AllSettings aAllSettings = pWindow->GetSettings(); StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); aStyleSettings.SetHighContrastMode( _highcontrastmode ); diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 85d33dabe800..37ab3886d49b 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -143,8 +143,8 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::GetChildAc // checks if the data in the window event is our direct child // and returns its accessible - // MT: Change this later, normally a show/hide event shouldn't have the Window* in pData. - Window* pChildWindow = (Window *) rVclWindowEvent.GetData(); + // MT: Change this later, normally a show/hide event shouldn't have the vcl::Window* in pData. + vcl::Window* pChildWindow = (vcl::Window *) rVclWindowEvent.GetData(); if( pChildWindow && GetWindow() == pChildWindow->GetAccessibleParentWindow() ) return pChildWindow->GetAccessible( rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW ); else @@ -185,7 +185,7 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind { uno::Any aOldValue, aNewValue; - Window* pAccWindow = rVclWindowEvent.GetWindow(); + vcl::Window* pAccWindow = rVclWindowEvent.GetWindow(); assert(pAccWindow && "VCLXAccessibleComponent::ProcessWindowEvent - Window?"); switch ( rVclWindowEvent.GetId() ) @@ -200,7 +200,7 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind break; case VCLEVENT_WINDOW_CHILDDESTROYED: { - Window* pWindow = (Window*) rVclWindowEvent.GetData(); + vcl::Window* pWindow = (vcl::Window*) rVclWindowEvent.GetData(); DBG_ASSERT( pWindow, "VCLEVENT_WINDOW_CHILDDESTROYED - Window=?" ); if ( pWindow->GetAccessible( false ).is() ) { @@ -356,17 +356,17 @@ void VCLXAccessibleComponent::disposing() mpVCLXindow = NULL; } -Window* VCLXAccessibleComponent::GetWindow() const +vcl::Window* VCLXAccessibleComponent::GetWindow() const { return GetVCLXWindow() ? GetVCLXWindow()->GetWindow() : NULL; } void VCLXAccessibleComponent::FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) { - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { - Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); + vcl::Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); if ( pLabeledBy && pLabeledBy != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); @@ -374,7 +374,7 @@ void VCLXAccessibleComponent::FillAccessibleRelationSet( utl::AccessibleRelation rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABELED_BY, aSequence ) ); } - Window* pLabelFor = pWindow->GetAccessibleRelationLabelFor(); + vcl::Window* pLabelFor = pWindow->GetAccessibleRelationLabelFor(); if ( pLabelFor && pLabelFor != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); @@ -382,7 +382,7 @@ void VCLXAccessibleComponent::FillAccessibleRelationSet( utl::AccessibleRelation rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABEL_FOR, aSequence ) ); } - Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf(); + vcl::Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf(); if ( pMemberOf && pMemberOf != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); @@ -394,7 +394,7 @@ void VCLXAccessibleComponent::FillAccessibleRelationSet( utl::AccessibleRelation void VCLXAccessibleComponent::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { if ( pWindow->IsVisible() ) @@ -446,11 +446,11 @@ void VCLXAccessibleComponent::FillAccessibleStateSet( utl::AccessibleStateSetHel rStateSet.AddState( accessibility::AccessibleStateType::EDITABLE ); } - Window* pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window* pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD ); while( pWindow && pChild ) { - Window* pWinTemp = pChild->GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window* pWinTemp = pChild->GetWindow( WINDOW_FIRSTCHILD ); if( pWinTemp && pWinTemp->GetType() == WINDOW_EDIT ) { if( !( pWinTemp->GetStyle() & WB_READONLY) || @@ -520,7 +520,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi uno::Reference< accessibility::XAccessible > xAcc; if ( GetWindow() ) { - Window* pChild = GetWindow()->GetAccessibleChildWindow( (sal_uInt16)i ); + vcl::Window* pChild = GetWindow()->GetAccessibleChildWindow( (sal_uInt16)i ); if ( pChild ) xAcc = pChild->GetAccessible(); } @@ -533,7 +533,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getVclPare uno::Reference< accessibility::XAccessible > xAcc; if ( GetWindow() ) { - Window* pParent = GetWindow()->GetAccessibleParentWindow(); + vcl::Window* pParent = GetWindow()->GetAccessibleParentWindow(); if ( pParent ) xAcc = pParent->GetAccessible(); } @@ -568,7 +568,7 @@ sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent( ) throw (uno::Ru { if ( GetWindow() ) { - Window* pParent = GetWindow()->GetAccessibleParentWindow(); + vcl::Window* pParent = GetWindow()->GetAccessibleParentWindow(); if ( pParent ) { // Iterate over all the parent's children and search for this object. @@ -701,12 +701,12 @@ awt::Rectangle VCLXAccessibleComponent::implGetBounds() throw (uno::RuntimeExcep { awt::Rectangle aBounds ( 0, 0, 0, 0 ); - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL ); aBounds = AWTRectangle( aRect ); - Window* pParent = pWindow->GetAccessibleParentWindow(); + vcl::Window* pParent = pWindow->GetAccessibleParentWindow(); if ( pParent ) { Rectangle aParentRect = pParent->GetWindowExtentsRelative( NULL ); @@ -778,7 +778,7 @@ sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground( ) throw (uno::Runtim OExternalLockGuard aGuard( this ); sal_Int32 nColor = 0; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { if ( pWindow->IsControlForeground() ) @@ -805,7 +805,7 @@ sal_Int32 SAL_CALL VCLXAccessibleComponent::getBackground( ) throw (uno::Runtim OExternalLockGuard aGuard( this ); sal_Int32 nColor = 0; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { if ( pWindow->IsControlBackground() ) @@ -824,7 +824,7 @@ uno::Reference< awt::XFont > SAL_CALL VCLXAccessibleComponent::getFont( ) throw OExternalLockGuard aGuard( this ); uno::Reference< awt::XFont > xFont; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { uno::Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), uno::UNO_QUERY ); diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index 04292434b9e6..2b78ada73fcd 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -84,7 +84,7 @@ void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Ref // Request container interface from all children ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > > aSeq; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { sal_uInt16 nChildren = pWindow->GetChildCount(); @@ -94,7 +94,7 @@ void VCLXContainer::removeVclContainerListener( const ::com::sun::star::uno::Ref ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pChildRefs = aSeq.getArray(); for ( sal_uInt16 n = 0; n < nChildren; n++ ) { - Window* pChild = pWindow->GetChild( n ); + vcl::Window* pChild = pWindow->GetChild( n ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xWP = pChild->GetComponentInterface( true ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xW( xWP, ::com::sun::star::uno::UNO_QUERY ); pChildRefs[n] = xW; @@ -110,7 +110,7 @@ void VCLXContainer::enableDialogControl( sal_Bool bEnable ) throw(::com::sun::st { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { WinBits nStyle = pWindow->GetStyle(); @@ -131,11 +131,11 @@ void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::s const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pComps = Components.getConstArray(); const ::com::sun::star::uno::Any* pTabs = Tabs.getConstArray(); - Window* pPrevWin = NULL; + vcl::Window* pPrevWin = NULL; for ( sal_uInt32 n = 0; n < nCount; n++ ) { // ::com::sun::star::style::TabStop - Window* pWin = VCLUnoHelper::GetWindow( pComps[n] ); + vcl::Window* pWin = VCLUnoHelper::GetWindow( pComps[n] ); // May be NULL if a ::com::sun::star::uno::Sequence is originated from TabController and is missing a peer! if ( pWin ) { @@ -174,14 +174,14 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun: sal_uInt32 nCount = Components.getLength(); const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > * pComps = Components.getConstArray(); - Window* pPrevWin = NULL; - Window* pPrevRadio = NULL; + vcl::Window* pPrevWin = NULL; + vcl::Window* pPrevRadio = NULL; for ( sal_uInt32 n = 0; n < nCount; n++ ) { - Window* pWin = VCLUnoHelper::GetWindow( pComps[n] ); + vcl::Window* pWin = VCLUnoHelper::GetWindow( pComps[n] ); if ( pWin ) { - Window* pSortBehind = pPrevWin; + vcl::Window* pSortBehind = pPrevWin; // #57096# Sort all radios consecutively bool bNewPrevWin = true; if ( pWin->GetType() == WINDOW_RADIOBUTTON ) @@ -209,7 +209,7 @@ void VCLXContainer::setGroup( const ::com::sun::star::uno::Sequence< ::com::sun: // Add WB_GROUP after the last group if ( n == ( nCount - 1 ) ) { - Window* pBehindLast = pWin->GetWindow( WINDOW_NEXT ); + vcl::Window* pBehindLast = pWin->GetWindow( WINDOW_NEXT ); if ( pBehindLast ) { WinBits nLastStyle = pBehindLast->GetStyle(); @@ -242,7 +242,7 @@ throw(::com::sun::star::uno::RuntimeException, std::exception) sal_Int32 nVal =0; Value >>= nVal; Size aSize( nVal, nVal ); - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); MapMode aMode( MAP_APPFONT ); toolkit::ScrollableInterface* pScrollable = dynamic_cast< toolkit::ScrollableInterface* >( pWindow ); if ( pWindow && pScrollable ) diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index ce0e3de429ca..2a48f73288bb 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -128,8 +128,8 @@ IMPL_XTYPEPROVIDER_END OutDevType eDevType = mpOutputDevice->GetOutDevType(); if ( eDevType == OUTDEV_WINDOW ) { - aDevSz = ((Window*)mpOutputDevice)->GetSizePixel(); - ((Window*)mpOutputDevice)->GetBorder( aInfo.LeftInset, aInfo.TopInset, aInfo.RightInset, aInfo.BottomInset ); + aDevSz = ((vcl::Window*)mpOutputDevice)->GetSizePixel(); + ((vcl::Window*)mpOutputDevice)->GetBorder( aInfo.LeftInset, aInfo.TopInset, aInfo.RightInset, aInfo.BottomInset ); } else if ( eDevType == OUTDEV_PRINTER ) { diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx index ca65735eb814..b3ab308edd92 100644 --- a/toolkit/source/awt/vclxspinbutton.cxx +++ b/toolkit/source/awt/vclxspinbutton.cxx @@ -37,7 +37,7 @@ namespace toolkit namespace { - void lcl_modifyStyle( Window* _pWindow, WinBits _nStyleBits, bool _bShouldBePresent ) + void lcl_modifyStyle( vcl::Window* _pWindow, WinBits _nStyleBits, bool _bShouldBePresent ) { WinBits nStyle = _pWindow->GetStyle(); if ( _bShouldBePresent ) @@ -98,7 +98,7 @@ namespace toolkit typedef long (SpinButton::*GetSpinButtonValue) (void) const; - void lcl_setSpinButtonValue(Window* _pWindow, SetSpinButtonValue _pSetter, sal_Int32 _nValue ) + void lcl_setSpinButtonValue(vcl::Window* _pWindow, SetSpinButtonValue _pSetter, sal_Int32 _nValue ) { SolarMutexGuard aGuard; SpinButton* pSpinButton = static_cast< SpinButton* >( _pWindow ); @@ -107,7 +107,7 @@ namespace toolkit } - sal_Int32 lcl_getSpinButtonValue(const Window* _pWindow, GetSpinButtonValue _pGetter ) + sal_Int32 lcl_getSpinButtonValue(const vcl::Window* _pWindow, GetSpinButtonValue _pGetter ) { SolarMutexGuard aGuard; diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 17b1877f73ff..e76a8be7d42e 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -68,7 +68,7 @@ IMPL_XTYPEPROVIDER_END // TODO, check the process id ::com::sun::star::uno::Any aRet; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { const SystemEnvData* pSysData = ((SystemChildWindow *)pWindow)->GetSystemData(); diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index a876693fa31b..90d62a14b11c 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -180,7 +180,7 @@ void SAL_CALL VCLXTabPageContainer::elementInserted( const ::com::sun::star::con Reference< awt::tab::XTabPageModel > xP( xControl->getModel(), UNO_QUERY ); sal_Int16 nPageID = xP->getTabPageID(); - Window* pWindow = VCLUnoHelper::GetWindow(xControl->getPeer()); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(xControl->getPeer()); TabPage* pPage = (TabPage*)pWindow; pTabCtrl->InsertPage(nPageID,pPage->GetText()); diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index a6b4a1041027..4e57b33418ae 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -137,10 +137,10 @@ using org::libreoffice::touch::ByteBufferWrapper; namespace { -extern "C" typedef Window* (SAL_CALL *FN_SvtCreateWindow)( +extern "C" typedef vcl::Window* (SAL_CALL *FN_SvtCreateWindow)( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor* pDescriptor, - Window* pParent, + vcl::Window* pParent, WinBits nWinBits ); class VCLXToolkit_Impl @@ -186,7 +186,7 @@ protected: virtual void SAL_CALL disposing() SAL_OVERRIDE; - Window* ImplCreateWindow( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor& rDescriptor, Window* pParent, WinBits nWinBits ); + vcl::Window* ImplCreateWindow( VCLXWindow** ppNewComp, const css::awt::WindowDescriptor& rDescriptor, vcl::Window* pParent, WinBits nWinBits ); css::uno::Reference< css::awt::XWindowPeer > ImplCreateWindow( const css::awt::WindowDescriptor& Descriptor, WinBits nWinBits ); public: @@ -765,14 +765,14 @@ void SAL_CALL VCLXToolkit::disposing() return xRef; } -Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, +vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor& rDescriptor, - Window* pParent, WinBits nWinBits ) + vcl::Window* pParent, WinBits nWinBits ) { OUString aServiceName( rDescriptor.WindowServiceName ); aServiceName = aServiceName.toAsciiLowerCase(); - Window* pNewWindow = NULL; + vcl::Window* pNewWindow = NULL; sal_uInt16 nType = ImplGetComponentType( aServiceName ); bool bFrameControl = false; if ( aServiceName == "frame" ) @@ -1142,7 +1142,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, if (nType == WINDOW_DOCKINGWINDOW ) pNewWindow = new DockingWindow( pParent, nWinBits ); else - pNewWindow = new Window( pParent, nWinBits ); + pNewWindow = new vcl::Window( pParent, nWinBits ); *ppNewComp = new VCLXContainer; } else @@ -1150,7 +1150,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, if (nType == WINDOW_DOCKINGWINDOW ) pNewWindow = new DockingWindow( pParent, nWinBits ); else - pNewWindow = new Window( pParent, nWinBits ); + pNewWindow = new vcl::Window( pParent, nWinBits ); *ppNewComp = new VCLXWindow; } break; @@ -1182,7 +1182,7 @@ extern "C" { static void SAL_CALL thisModule() {} } #else -extern "C" Window* SAL_CALL CreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, Window* pParent, WinBits nWinBits ); +extern "C" vcl::Window* SAL_CALL CreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, vcl::Window* pParent, WinBits nWinBits ); #endif @@ -1196,7 +1196,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xRef; - Window* pParent = NULL; + vcl::Window* pParent = NULL; if ( rDescriptor.Parent.is() ) { VCLXWindow* pParentComponent = VCLXWindow::GetImplementation( rDescriptor.Parent ); @@ -1213,7 +1213,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( VCLXWindow* pNewComp = NULL; - Window* pNewWindow = NULL; + vcl::Window* pNewWindow = NULL; // Try to create the window with SvTools // (do this _before_ creating it on our own: The old mechanism (extended toolkit in SvTools) did it this way, // and we need to stay compatible) @@ -1311,7 +1311,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( // ::com::sun::star::awt::XSystemChildFactory ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > VCLXToolkit::createSystemChild( const ::com::sun::star::uno::Any& Parent, const ::com::sun::star::uno::Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 nSystemType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { - Window* pChildWindow = NULL; + vcl::Window* pChildWindow = NULL; if ( nSystemType == SYSTEM_DEPENDENT_TYPE ) { // use sal_Int64 here to accommodate all int types @@ -1446,7 +1446,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( css::uno::Reference< css::awt::XWindow > xWindow( xMsgBox, css::uno::UNO_QUERY ); if ( xMsgBox.is() && xWindow.is() ) { - Window * pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window * pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) { SolarMutexGuard aGuard; @@ -1460,7 +1460,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > SAL_CALL VCLXToolkit::getDragGestureRecognizer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& window ) throw(::com::sun::star::uno::RuntimeException, std::exception) { - Window * pWindow = VCLUnoHelper::GetWindow( window ); + vcl::Window * pWindow = VCLUnoHelper::GetWindow( window ); if( pWindow ) return pWindow->GetDragGestureRecognizer(); @@ -1472,7 +1472,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( { SolarMutexGuard g; - Window * pWindow = VCLUnoHelper::GetWindow( window ); + vcl::Window * pWindow = VCLUnoHelper::GetWindow( window ); if( pWindow ) return pWindow->GetDragSource(); @@ -1484,7 +1484,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( { SolarMutexGuard g; - Window * pWindow = VCLUnoHelper::GetWindow( window ); + vcl::Window * pWindow = VCLUnoHelper::GetWindow( window ); if( pWindow ) return pWindow->GetDropTarget(); @@ -1546,7 +1546,7 @@ css::uno::Reference< css::awt::XTopWindow > SAL_CALL VCLXToolkit::getTopWindow(::sal_Int32 nIndex) throw (css::uno::RuntimeException, std::exception) { - ::Window * p = ::Application::GetTopWindow(static_cast< long >(nIndex)); + vcl::Window * p = ::Application::GetTopWindow(static_cast< long >(nIndex)); // XXX numeric overflow return css::uno::Reference< css::awt::XTopWindow >( p == 0 ? 0 : static_cast< css::awt::XWindow * >(p->GetWindowPeer()), @@ -1557,7 +1557,7 @@ VCLXToolkit::getTopWindow(::sal_Int32 nIndex) css::uno::Reference< css::awt::XTopWindow > SAL_CALL VCLXToolkit::getActiveTopWindow() throw (css::uno::RuntimeException, std::exception) { - ::Window * p = ::Application::GetActiveTopWindow(); + vcl::Window * p = ::Application::GetActiveTopWindow(); return css::uno::Reference< css::awt::XTopWindow >( p == 0 ? 0 : static_cast< css::awt::XWindow * >(p->GetWindowPeer()), css::uno::UNO_QUERY); @@ -1748,7 +1748,7 @@ void VCLXToolkit::callTopWindowListeners( void (SAL_CALL css::awt::XTopWindowListener::* pFn)( css::lang::EventObject const &)) { - ::Window * pWindow + vcl::Window * pWindow = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow(); if (pWindow->IsTopWindow()) { @@ -1786,7 +1786,7 @@ long VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent, if (aHandlers.hasElements()) { - ::Window * pWindow = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow(); + vcl::Window * pWindow = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow(); // See implementation in vclxwindow.cxx for mapping between VCL and UNO AWT event ::KeyEvent * pKeyEvent = static_cast< ::KeyEvent * >( @@ -1829,7 +1829,7 @@ long VCLXToolkit::callKeyHandlers(::VclSimpleEvent const * pEvent, void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent, bool bGained) { - ::Window * pWindow + vcl::Window * pWindow = static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow(); if (pWindow->IsTopWindow()) { @@ -1841,8 +1841,8 @@ void VCLXToolkit::callFocusListeners(::VclSimpleEvent const * pEvent, // window that gets the focus next (see implementation in // vclxwindow.cxx for mapping between VCL and UNO AWT event): css::uno::Reference< css::uno::XInterface > xNext; - ::Window * pFocus = ::Application::GetFocusWindow(); - for (::Window * p = pFocus; p != 0; p = p->GetParent()) + vcl::Window * pFocus = ::Application::GetFocusWindow(); + for (vcl::Window * p = pFocus; p != 0; p = p->GetParent()) if (!p->IsCompoundControl()) { pFocus = p; diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index c7dccda58fda..e3d0dd6acfc0 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -80,7 +80,7 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException, std::exc // TODO, check the process id ::com::sun::star::uno::Any aRet; - Window* pWindow = GetWindowImpl(); + vcl::Window* pWindow = GetWindowImpl(); if ( pWindow ) { const SystemEnvData* pSysData = ((SystemWindow *)pWindow)->GetSystemData(); @@ -134,7 +134,7 @@ void VCLXTopWindow_Base::toFront( ) throw(::com::sun::star::uno::RuntimeExcepti { SolarMutexGuard aGuard; - Window* pWindow = GetWindowImpl(); + vcl::Window* pWindow = GetWindowImpl(); if ( pWindow ) ((WorkWindow*)pWindow)->ToTop( TOTOP_RESTOREWHENMIN ); } @@ -254,7 +254,7 @@ VCLXTopWindow::~VCLXTopWindow() { } -Window* VCLXTopWindow::GetWindowImpl() +vcl::Window* VCLXTopWindow::GetWindowImpl() { return VCLXContainer::GetWindow(); } diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index a527f418f4e7..e80cc2233e94 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -321,7 +321,7 @@ Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings() // Uses an out-parameter instead of return value, due to the object reference -void ImplInitWindowEvent( ::com::sun::star::awt::WindowEvent& rEvent, Window* pWindow ) +void ImplInitWindowEvent( ::com::sun::star::awt::WindowEvent& rEvent, vcl::Window* pWindow ) { Point aPos = pWindow->GetPosPixel(); Size aSz = pWindow->GetSizePixel(); @@ -365,7 +365,7 @@ void VCLXWindow::ImplExecuteAsyncWithoutSolarLock( const Callback& i_callback ) return mpImpl->getAccessibleFactory().getFactory(); } -void VCLXWindow::SetWindow( Window* pWindow ) +void VCLXWindow::SetWindow( vcl::Window* pWindow ) { if ( GetWindow() ) { @@ -394,7 +394,7 @@ void VCLXWindow::resumeVclEventListening( ) --mpImpl->mnListenerLockLevel; } -void VCLXWindow::notifyWindowRemoved( Window& _rWindow ) +void VCLXWindow::notifyWindowRemoved( vcl::Window& _rWindow ) { if ( mpImpl->getContainerListeners().getLength() ) { @@ -607,11 +607,11 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) aEvent.FocusFlags = rVclWindowEvent.GetWindow()->GetGetFocusFlags(); aEvent.Temporary = sal_False; - Window* pNext = Application::GetFocusWindow(); + vcl::Window* pNext = Application::GetFocusWindow(); if ( pNext ) { // Don't care about internals if this control is compound - Window* pNextC = pNext; + vcl::Window* pNextC = pNext; while ( pNextC && !pNextC->IsCompoundControl() ) pNextC = pNextC->GetParent(); if ( pNextC ) @@ -891,7 +891,7 @@ Size VCLXWindow::ImplCalcWindowSize( const Size& rOutSz ) const { Size aSz = rOutSz; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { sal_Int32 nLeft, nTop, nRight, nBottom; @@ -968,8 +968,8 @@ void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3 if ( GetWindow() ) { - if( Window::GetDockingManager()->IsDockable( GetWindow() ) ) - Window::GetDockingManager()->SetPosSizePixel( GetWindow() , X, Y, Width, Height, Flags ); + if( vcl::Window::GetDockingManager()->IsDockable( GetWindow() ) ) + vcl::Window::GetDockingManager()->SetPosSizePixel( GetWindow() , X, Y, Width, Height, Flags ); else GetWindow()->setPosSizePixel( X, Y, Width, Height, Flags ); } @@ -982,8 +982,8 @@ void VCLXWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int3 ::com::sun::star::awt::Rectangle aBounds; if ( GetWindow() ) { - if( Window::GetDockingManager()->IsDockable( GetWindow() ) ) - aBounds = AWTRectangle( Window::GetDockingManager()->GetPosSizePixel( GetWindow() ) ); + if( vcl::Window::GetDockingManager()->IsDockable( GetWindow() ) ) + aBounds = AWTRectangle( vcl::Window::GetDockingManager()->GetPosSizePixel( GetWindow() ) ); else aBounds = AWTRectangle( Rectangle( GetWindow()->GetPosPixel(), GetWindow()->GetSizePixel() ) ); } @@ -995,7 +995,7 @@ void VCLXWindow::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::Ru { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { mpImpl->setDirectVisible( bVisible ); @@ -1007,7 +1007,7 @@ void VCLXWindow::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::Runt { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { pWindow->Enable( bEnable, false ); // #95824# without children! @@ -1173,10 +1173,10 @@ sal_Bool VCLXWindow::isChild( const ::com::sun::star::uno::Reference< ::com::sun SolarMutexGuard aGuard; bool bIsChild = false; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { - Window* pPeerWindow = VCLUnoHelper::GetWindow( rxPeer ); + vcl::Window* pPeerWindow = VCLUnoHelper::GetWindow( rxPeer ); bIsChild = pPeerWindow && pWindow->IsChild( pPeerWindow ); } @@ -1255,7 +1255,7 @@ void VCLXWindow::getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescript namespace toolkit { - static void setColorSettings( Window* _pWindow, const ::com::sun::star::uno::Any& _rValue, + static void setColorSettings( vcl::Window* _pWindow, const ::com::sun::star::uno::Any& _rValue, void (StyleSettings::*pSetter)( const Color& ), const Color& (StyleSettings::*pGetter)( ) const ) { sal_Int32 nColor = 0; @@ -1342,7 +1342,7 @@ void VCLXWindow::GetPropertyIds( std::list< sal_uInt16 >& _out_rIds ) namespace { - void lcl_updateWritingMode( Window& _rWindow, const sal_Int16 _nWritingMode, const sal_Int16 _nContextWritingMode ) + void lcl_updateWritingMode( vcl::Window& _rWindow, const sal_Int16 _nWritingMode, const sal_Int16 _nContextWritingMode ) { bool bEnableRTL = false; switch ( _nWritingMode ) @@ -1360,7 +1360,7 @@ namespace case WritingMode2::RL_TB: bEnableRTL = true; break; case WritingMode2::CONTEXT: { - const Window* pParent = _rWindow.GetParent(); + const vcl::Window* pParent = _rWindow.GetParent(); OSL_ENSURE( pParent, "lcl_updateWritingMode: cannot determine context's writing mode!" ); if ( pParent ) bEnableRTL = pParent->IsRTLEnabled(); @@ -1383,7 +1383,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( !pWindow ) return; @@ -2229,7 +2229,7 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno: { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( !pWindow ) return; @@ -2396,7 +2396,7 @@ void SAL_CALL VCLXWindow::enableDocking( sal_Bool bEnable ) throw (::com::sun::s { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) pWindow->EnableDocking( bEnable ); } @@ -2405,9 +2405,9 @@ sal_Bool SAL_CALL VCLXWindow::isFloating( ) throw (::com::sun::star::uno::Runti { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if( pWindow ) - return Window::GetDockingManager()->IsFloating( pWindow ); + return vcl::Window::GetDockingManager()->IsFloating( pWindow ); else return sal_False; } @@ -2416,18 +2416,18 @@ void SAL_CALL VCLXWindow::setFloatingMode( sal_Bool bFloating ) throw (::com::su { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if( pWindow ) - Window::GetDockingManager()->SetFloatingMode( pWindow, bFloating ); + vcl::Window::GetDockingManager()->SetFloatingMode( pWindow, bFloating ); } sal_Bool SAL_CALL VCLXWindow::isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if( pWindow ) - return Window::GetDockingManager()->IsLocked( pWindow ); + return vcl::Window::GetDockingManager()->IsLocked( pWindow ); else return sal_False; } @@ -2436,18 +2436,18 @@ void SAL_CALL VCLXWindow::lock( ) throw (::com::sun::star::uno::RuntimeExceptio { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); - if( pWindow && !Window::GetDockingManager()->IsFloating( pWindow ) ) - Window::GetDockingManager()->Lock( pWindow ); + vcl::Window* pWindow = GetWindow(); + if( pWindow && !vcl::Window::GetDockingManager()->IsFloating( pWindow ) ) + vcl::Window::GetDockingManager()->Lock( pWindow ); } void SAL_CALL VCLXWindow::unlock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); - if( pWindow && !Window::GetDockingManager()->IsFloating( pWindow ) ) - Window::GetDockingManager()->Unlock( pWindow ); + vcl::Window* pWindow = GetWindow(); + if( pWindow && !vcl::Window::GetDockingManager()->IsFloating( pWindow ) ) + vcl::Window::GetDockingManager()->Unlock( pWindow ); } void SAL_CALL VCLXWindow::startPopupMode( const ::com::sun::star::awt::Rectangle& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -2469,7 +2469,7 @@ sal_Bool SAL_CALL VCLXWindow::isInPopupMode( ) throw (::com::sun::star::uno::Ru void SAL_CALL VCLXWindow::setOutputSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window *pWindow; + vcl::Window *pWindow; if( (pWindow = GetWindow()) != NULL ) { DockingWindow *pDockingWindow = dynamic_cast< DockingWindow* >(pWindow); @@ -2483,7 +2483,7 @@ void SAL_CALL VCLXWindow::setOutputSize( const ::com::sun::star::awt::Size& aSiz ::com::sun::star::awt::Size SAL_CALL VCLXWindow::getOutputSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window *pWindow; + vcl::Window *pWindow; if( (pWindow = GetWindow()) != NULL ) { DockingWindow *pDockingWindow = dynamic_cast< DockingWindow* >(pWindow); diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index 4bb9da294539..b4d0f72eb291 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -37,7 +37,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) { // does only work for WorkWindows - Window *pWindow = GetWindow(); + vcl::Window *pWindow = GetWindow(); if ( pWindow->GetType() != WINDOW_WORKWINDOW ) { com::sun::star::uno::RuntimeException aException; diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 01fbbe0a132c..6161e73273fb 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -97,7 +97,7 @@ namespace toolkit { /** sets the "face color" for button like controls (scroll bar, spin button) */ - void setButtonLikeFaceColor( Window* _pWindow, const ::com::sun::star::uno::Any& _rColorValue ) + void setButtonLikeFaceColor( vcl::Window* _pWindow, const ::com::sun::star::uno::Any& _rColorValue ) { AllSettings aSettings = _pWindow->GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); @@ -151,13 +151,13 @@ namespace toolkit _pWindow->SetSettings( aSettings, true ); } - Any getButtonLikeFaceColor( const Window* _pWindow ) + Any getButtonLikeFaceColor( const vcl::Window* _pWindow ) { sal_Int32 nBackgroundColor = _pWindow->GetSettings().GetStyleSettings().GetFaceColor().GetColor(); return makeAny( nBackgroundColor ); } - static void adjustBooleanWindowStyle( const Any& _rValue, Window* _pWindow, WinBits _nBits, bool _bInverseSemantics ) + static void adjustBooleanWindowStyle( const Any& _rValue, vcl::Window* _pWindow, WinBits _nBits, bool _bInverseSemantics ) { WinBits nStyle = _pWindow->GetStyle(); bool bValue( false ); @@ -169,7 +169,7 @@ namespace toolkit _pWindow->SetStyle( nStyle ); } - static void setVisualEffect( const Any& _rValue, Window* _pWindow ) + static void setVisualEffect( const Any& _rValue, vcl::Window* _pWindow ) { AllSettings aSettings = _pWindow->GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); @@ -189,7 +189,7 @@ namespace toolkit _pWindow->SetSettings( aSettings ); } - static Any getVisualEffect( Window* _pWindow ) + static Any getVisualEffect( vcl::Window* _pWindow ) { Any aEffect; @@ -423,7 +423,7 @@ void VCLXButton::setLabel( const OUString& rLabel ) throw(::com::sun::star::uno: { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) pWindow->SetText( rLabel ); } @@ -850,7 +850,7 @@ void VCLXCheckBox::setLabel( const OUString& rLabel ) throw(::com::sun::star::un { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) pWindow->SetText( rLabel ); } @@ -1216,7 +1216,7 @@ void VCLXRadioButton::setLabel( const OUString& rLabel ) throw(::com::sun::star: { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) pWindow->SetText( rLabel ); } @@ -1413,7 +1413,7 @@ void VCLXSpinField::enableRepeat( sal_Bool bRepeat ) throw(::com::sun::star::uno { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { WinBits nStyle = pWindow->GetStyle(); @@ -2210,7 +2210,7 @@ void VCLXMessageBox::setCaptionText( const OUString& rText ) throw(::com::sun::s { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) pWindow->SetText( rText ); } @@ -2220,7 +2220,7 @@ OUString VCLXMessageBox::getCaptionText() throw(::com::sun::star::uno::RuntimeEx SolarMutexGuard aGuard; OUString aText; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) aText = pWindow->GetText(); return aText; @@ -2307,7 +2307,7 @@ void SAL_CALL VCLXDialog::setHelpId( const OUString& rId ) throw (RuntimeExcepti { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) pWindow->SetHelpId( OUStringToOString( rId, RTL_TEXTENCODING_UTF8 ) ); } @@ -2316,7 +2316,7 @@ void VCLXDialog::setTitle( const OUString& Title ) throw(::com::sun::star::uno:: { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) pWindow->SetText( Title ); } @@ -2326,7 +2326,7 @@ OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException, s SolarMutexGuard aGuard; OUString aTitle; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) aTitle = pWindow->GetText(); return aTitle; @@ -2340,13 +2340,13 @@ sal_Int16 VCLXDialog::execute() throw(::com::sun::star::uno::RuntimeException, s if ( GetWindow() ) { Dialog* pDlg = (Dialog*) GetWindow(); - Window* pParent = pDlg->GetWindow( WINDOW_PARENTOVERLAP ); - Window* pOldParent = NULL; - Window* pSetParent = NULL; + vcl::Window* pParent = pDlg->GetWindow( WINDOW_PARENTOVERLAP ); + vcl::Window* pOldParent = NULL; + vcl::Window* pSetParent = NULL; if ( pParent && !pParent->IsReallyVisible() ) { pOldParent = pDlg->GetParent(); - Window* pFrame = pDlg->GetWindow( WINDOW_FRAME ); + vcl::Window* pFrame = pDlg->GetWindow( WINDOW_FRAME ); if( pFrame != pDlg ) { pDlg->SetParent( pFrame ); @@ -2372,7 +2372,7 @@ void VCLXDialog::endExecute() throw(::com::sun::star::uno::RuntimeException, std void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { @@ -2506,7 +2506,7 @@ void SAL_CALL VCLXMultiPage::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { @@ -2780,7 +2780,7 @@ void SAL_CALL VCLXTabPage::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { @@ -2966,7 +2966,7 @@ OUString VCLXFixedHyperlink::getText() throw(::com::sun::star::uno::RuntimeExcep SolarMutexGuard aGuard; OUString aText; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) aText = pWindow->GetText(); return aText; @@ -2996,7 +2996,7 @@ void VCLXFixedHyperlink::setAlignment( short nAlign ) throw(::com::sun::star::un { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { WinBits nNewBits = 0; @@ -3018,7 +3018,7 @@ short VCLXFixedHyperlink::getAlignment() throw(::com::sun::star::uno::RuntimeExc SolarMutexGuard aGuard; short nAlign = 0; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { WinBits nStyle = pWindow->GetStyle(); @@ -3218,7 +3218,7 @@ void VCLXFixedText::setText( const OUString& Text ) throw(::com::sun::star::uno: { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) pWindow->SetText( Text ); } @@ -3228,7 +3228,7 @@ OUString VCLXFixedText::getText() throw(::com::sun::star::uno::RuntimeException, SolarMutexGuard aGuard; OUString aText; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) aText = pWindow->GetText(); return aText; @@ -3238,7 +3238,7 @@ void VCLXFixedText::setAlignment( short nAlign ) throw(::com::sun::star::uno::Ru { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { WinBits nNewBits = 0; @@ -3260,7 +3260,7 @@ short VCLXFixedText::getAlignment() throw(::com::sun::star::uno::RuntimeExceptio SolarMutexGuard aGuard; short nAlign = 0; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { WinBits nStyle = pWindow->GetStyle(); @@ -3499,7 +3499,7 @@ void VCLXScrollBar::setOrientation( sal_Int32 n ) throw(::com::sun::star::uno::R { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { WinBits nStyle = pWindow->GetStyle(); @@ -3519,7 +3519,7 @@ sal_Int32 VCLXScrollBar::getOrientation() throw(::com::sun::star::uno::RuntimeEx SolarMutexGuard aGuard; sal_Int32 n = 0; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { WinBits nStyle = pWindow->GetStyle(); @@ -3765,7 +3765,7 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } -::com::sun::star::awt::Size SAL_CALL VCLXScrollBar::implGetMinimumSize( Window* p ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::awt::Size SAL_CALL VCLXScrollBar::implGetMinimumSize( vcl::Window* p ) throw(::com::sun::star::uno::RuntimeException) { long n = p->GetSettings().GetStyleSettings().GetScrollBarSize(); return ::com::sun::star::awt::Size( n, n ); @@ -3906,7 +3906,7 @@ OUString VCLXEdit::getText() throw(::com::sun::star::uno::RuntimeException, std: SolarMutexGuard aGuard; OUString aText; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) aText = pWindow->GetText(); return aText; @@ -4809,7 +4809,7 @@ VCLXDateField::~VCLXDateField() //change the window type here to match the role ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXDateField::CreateAccessibleContext() { - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { pWindow->SetType( WINDOW_DATEFIELD ); @@ -5157,7 +5157,7 @@ VCLXTimeField::~VCLXTimeField() //change the window type here to match the role ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXTimeField::CreateAccessibleContext() { - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { pWindow->SetType( WINDOW_TIMEFIELD ); @@ -6601,7 +6601,7 @@ void SAL_CALL VCLXFrame::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { diff --git a/toolkit/source/awt/vclxwindows_internal.hxx b/toolkit/source/awt/vclxwindows_internal.hxx index 6140f2050e51..a6506b18ab8e 100644 --- a/toolkit/source/awt/vclxwindows_internal.hxx +++ b/toolkit/source/awt/vclxwindows_internal.hxx @@ -22,8 +22,8 @@ namespace toolkit { - void setButtonLikeFaceColor( Window* _pWindow, const ::com::sun::star::uno::Any& _rColorValue ); - ::com::sun::star::uno::Any getButtonLikeFaceColor( const Window* _pWindow ); + void setButtonLikeFaceColor( vcl::Window* _pWindow, const ::com::sun::star::uno::Any& _rColorValue ); + ::com::sun::star::uno::Any getButtonLikeFaceColor( const vcl::Window* _pWindow ); } #endif // INCLUDED_TOOLKIT_SOURCE_AWT_VCLXWINDOWS_INTERNAL_HXX diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index ac6c9e2dd866..b384af37139c 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -225,14 +225,14 @@ namespace toolkit } - Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const + vcl::Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const { Reference< awt::XControl > xControl( getAccessibleCreator(), UNO_QUERY ); Reference< awt::XWindow > xWindow; if ( xControl.is() ) xWindow.set(xControl->getPeer(), css::uno::UNO_QUERY); - Window* pWindow = xWindow.is() ? VCLUnoHelper::GetWindow( xWindow ) : NULL; + vcl::Window* pWindow = xWindow.is() ? VCLUnoHelper::GetWindow( xWindow ) : NULL; if ( _pxUNOWindow ) *_pxUNOWindow = xWindow; @@ -259,7 +259,7 @@ namespace toolkit // our control Reference< awt::XWindow > xWindow; - Window* pVCLWindow = implGetWindow( &xWindow ); + vcl::Window* pVCLWindow = implGetWindow( &xWindow ); awt::Rectangle aBounds( 0, 0, 0, 0 ); if ( xWindow.is() ) @@ -267,7 +267,7 @@ namespace toolkit // ugly, but .... though the XWindow has a getPosSize, it is impossible to determine the // parent which this position/size is relative to. This means we must tunnel UNO and ask the // implementation - Window* pVCLParent = pVCLWindow ? pVCLWindow->GetParent() : NULL; + vcl::Window* pVCLParent = pVCLWindow ? pVCLWindow->GetParent() : NULL; // the relative location of the window ::Point aWindowRelativePos( 0, 0); @@ -326,7 +326,7 @@ namespace toolkit // want to do some VCL stuff here ... OContextEntryGuard aGuard( this ); - Window* pWindow = implGetWindow( ); + vcl::Window* pWindow = implGetWindow( ); sal_Int32 nColor = 0; if ( pWindow ) { @@ -352,7 +352,7 @@ namespace toolkit // want to do some VCL stuff here ... OContextEntryGuard aGuard( this ); - Window* pWindow = implGetWindow( ); + vcl::Window* pWindow = implGetWindow( ); sal_Int32 nColor = 0; if ( pWindow ) { diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 8e7378a96f5f..46bbe3d3a5c2 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -181,10 +181,10 @@ Reference< XWindowPeer > UnoControl::ImplGetCompatiblePeer( bool bAcceptExist Reference< XControl > xMe; OWeakAggObject::queryInterface( ::getCppuType( &xMe ) ) >>= xMe; - Window* pParentWindow( NULL ); + vcl::Window* pParentWindow( NULL ); { SolarMutexGuard aGuard; - pParentWindow = dynamic_cast< Window* >( Application::GetDefaultDevice() ); + pParentWindow = dynamic_cast< vcl::Window* >( Application::GetDefaultDevice() ); ENSURE_OR_THROW( pParentWindow != NULL, "could obtain a default parent window!" ); } try @@ -640,7 +640,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent // Since the implementations for the listeners changed a lot towards 1.1, this // would not be the case anymore, if we would not do this listener-lock below // #i14703# - Window* pVclPeer = VCLUnoHelper::GetWindow( getPeer() ); + vcl::Window* pVclPeer = VCLUnoHelper::GetWindow( getPeer() ); VCLXWindow* pPeer = pVclPeer ? pVclPeer->GetWindowPeer() : NULL; VclListenerLock aNoVclEventMultiplexing( pPeer ); diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index b9934c1b3f61..1a1b22435a16 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star; -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > CreateXWindow( Window* pWindow ) +::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > CreateXWindow( vcl::Window* pWindow ) { switch ( pWindow->GetType() ) { @@ -152,7 +152,7 @@ UnoWrapper::~UnoWrapper() return mxToolkit.get(); } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> UnoWrapper::GetWindowInterface( Window* pWindow, bool bCreate ) +::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> UnoWrapper::GetWindowInterface( vcl::Window* pWindow, bool bCreate ) { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xPeer = pWindow->GetWindowPeer(); if ( !xPeer.is() && bCreate ) @@ -163,7 +163,7 @@ UnoWrapper::~UnoWrapper() return xPeer; } -void UnoWrapper::SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ) +void UnoWrapper::SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace ) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( xIFace ); @@ -206,25 +206,25 @@ void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev ) } -static bool lcl_ImplIsParent( Window* pParentWindow, Window* pPossibleChild ) +static bool lcl_ImplIsParent( vcl::Window* pParentWindow, vcl::Window* pPossibleChild ) { - Window* pWindow = ( pPossibleChild != pParentWindow ) ? pPossibleChild : NULL; + vcl::Window* pWindow = ( pPossibleChild != pParentWindow ) ? pPossibleChild : NULL; while ( pWindow && ( pWindow != pParentWindow ) ) pWindow = pWindow->GetParent(); return pWindow ? sal_True : sal_False; } -void UnoWrapper::WindowDestroyed( Window* pWindow ) +void UnoWrapper::WindowDestroyed( vcl::Window* pWindow ) { // their still might be some children created with ::com::sun::star::loader::Java // that would otherwise not be destroyed until the garbage collector cleans up - Window* pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window* pChild = pWindow->GetWindow( WINDOW_FIRSTCHILD ); while ( pChild ) { - Window* pNextChild = pChild->GetWindow( WINDOW_NEXT ); + vcl::Window* pNextChild = pChild->GetWindow( WINDOW_NEXT ); - Window* pClient = pChild->GetWindow( WINDOW_CLIENT ); + vcl::Window* pClient = pChild->GetWindow( WINDOW_CLIENT ); if ( pClient->GetWindowPeer() ) { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComp( pClient->GetComponentInterface( false ), ::com::sun::star::uno::UNO_QUERY ); @@ -235,14 +235,14 @@ void UnoWrapper::WindowDestroyed( Window* pWindow ) } // System-Windows suchen... - Window* pOverlap = pWindow->GetWindow( WINDOW_OVERLAP ); + vcl::Window* pOverlap = pWindow->GetWindow( WINDOW_OVERLAP ); if ( pOverlap ) { pOverlap = pOverlap->GetWindow( WINDOW_FIRSTOVERLAP ); while ( pOverlap ) { - Window* pNextOverlap = pOverlap->GetWindow( WINDOW_NEXT ); - Window* pClient = pOverlap->GetWindow( WINDOW_CLIENT ); + vcl::Window* pNextOverlap = pOverlap->GetWindow( WINDOW_NEXT ); + vcl::Window* pClient = pOverlap->GetWindow( WINDOW_CLIENT ); if ( pClient->GetWindowPeer() && lcl_ImplIsParent( pWindow, pClient ) ) { @@ -254,7 +254,7 @@ void UnoWrapper::WindowDestroyed( Window* pWindow ) } } - Window* pParent = pWindow->GetParent(); + vcl::Window* pParent = pWindow->GetParent(); if ( pParent && pParent->GetWindowPeer() ) pParent->GetWindowPeer()->notifyWindowRemoved( *pWindow ); @@ -276,13 +276,13 @@ void UnoWrapper::WindowDestroyed( Window* pWindow ) // #i42462#/#116855# no, don't loop: Instead, just ensure that all our top-window-children // are disposed, too (which should also be a valid fix for #102132#, but doesn't have the extreme // performance penalties) - Window* pTopWindowChild = pWindow->GetWindow( WINDOW_FIRSTTOPWINDOWCHILD ); + vcl::Window* pTopWindowChild = pWindow->GetWindow( WINDOW_FIRSTTOPWINDOWCHILD ); while ( pTopWindowChild ) { OSL_ENSURE( pTopWindowChild->GetParent() == pWindow, "UnoWrapper::WindowDestroyed: inconsistency in the SystemWindow relationship!" ); - Window* pNextTopChild = pTopWindowChild->GetWindow( WINDOW_NEXTTOPWINDOWSIBLING ); + vcl::Window* pNextTopChild = pTopWindowChild->GetWindow( WINDOW_NEXTTOPWINDOWSIBLING ); //the window still could be on the stack, so we have to // use lazy delete ( it will automatically diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 1b598ca1c98f..8e4b75a6f194 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -108,19 +108,19 @@ BitmapEx VCLUnoHelper::GetBitmap( const ::com::sun::star::uno::Reference< ::com: return xBmp; } -Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ) +vcl::Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( rxWindow ); return pVCLXWindow ? pVCLXWindow->GetWindow() : NULL; } -Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow ) +vcl::Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow ) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( rxWindow ); return pVCLXWindow ? pVCLXWindow->GetWindow() : NULL; } -Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindow ) +vcl::Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindow ) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( rxWindow ); return pVCLXWindow ? pVCLXWindow->GetWindow() : NULL; @@ -142,7 +142,7 @@ Region VCLUnoHelper::GetRegion( const ::com::sun::star::uno::Reference< ::com::s return aRegion; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> VCLUnoHelper::GetInterface( Window* pWindow ) +::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> VCLUnoHelper::GetInterface( vcl::Window* pWindow ) { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWin; if ( pWindow ) @@ -187,7 +187,7 @@ Polygon VCLUnoHelper::CreatePolygon( const ::com::sun::star::uno::Sequence< sal_ return aPoly; } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> VCLUnoHelper::CreateControlContainer( Window* pWindow ) +::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> VCLUnoHelper::CreateControlContainer( vcl::Window* pWindow ) { UnoControlContainer* pContainer = new UnoControlContainer( pWindow->GetComponentInterface( true ) ); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > x = pContainer; diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx index 3a9dfd9d7305..e61253d2e221 100644 --- a/tools/source/ref/errinf.cxx +++ b/tools/source/ref/errinf.cxx @@ -184,7 +184,7 @@ static void aDspFunc(const OUString &rErr, const OUString &rAction) OSL_FAIL(aErr.getStr()); } -ErrorContext::ErrorContext(Window *pWinP) +ErrorContext::ErrorContext(vcl::Window *pWinP) { EDcrData *pData=EDcrData::GetData(); ErrorContext *&pHdl=pData->pFirstCtx; @@ -272,7 +272,7 @@ sal_uInt16 ErrorHandler::HandleError_Impl( ErrorContext *pCtx=ErrorContext::GetContext(); if(pCtx) pCtx->GetString(pInfo->GetErrorCode(), aAction); - Window *pParent=0; + vcl::Window *pParent=0; // Remove parent from context for(;pCtx;pCtx=pCtx->pNext) if(pCtx->GetParent()) diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index 953a9d00f8a1..d8b38bac5fbc 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -86,7 +86,7 @@ using namespace com::sun::star; class MyOutWindow : public ListBox { public: - MyOutWindow( Window *pParent, WinBits nWinStyle ) + MyOutWindow( vcl::Window *pParent, WinBits nWinStyle ) : ListBox ( pParent, nWinStyle | WB_AUTOHSCROLL ) {} ~MyOutWindow() {} @@ -1668,7 +1668,7 @@ private: bool m_bSort; public: - MyWin( Window *pParent, WinBits nWinStyle, + MyWin( vcl::Window *pParent, WinBits nWinStyle, uno::Reference< lang::XMultiServiceFactory >& rxFactory, OUString const & rConfigurationKey1, OUString const & rConfigurationKey2 ); @@ -1682,7 +1682,7 @@ public: }; -MyWin::MyWin( Window *pParent, WinBits nWinStyle, +MyWin::MyWin( vcl::Window *pParent, WinBits nWinStyle, uno::Reference< lang::XMultiServiceFactory >& rxFactory, OUString const & rConfigurationKey1, OUString const & rConfigurationKey2 ) diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx index 5012508d03ed..e53a9b3759ea 100644 --- a/uui/source/alreadyopen.cxx +++ b/uui/source/alreadyopen.cxx @@ -20,7 +20,7 @@ #include "ids.hrc" #include "alreadyopen.hxx" -AlreadyOpenQueryBox::AlreadyOpenQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage, bool bIsStoring ) : +AlreadyOpenQueryBox::AlreadyOpenQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage, bool bIsStoring ) : MessBox(pParent, 0, ResId(STR_ALREADYOPEN_TITLE, *pResMgr).toString(), aMessage ) diff --git a/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx index 2e7890ec9d6d..7f03ba8f5d7c 100644 --- a/uui/source/alreadyopen.hxx +++ b/uui/source/alreadyopen.hxx @@ -24,7 +24,7 @@ class AlreadyOpenQueryBox : public MessBox { public: - AlreadyOpenQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage, bool bIsStoring ); + AlreadyOpenQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage, bool bIsStoring ); virtual ~AlreadyOpenQueryBox(); }; diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx index 2e143efdf0ed..0a4bd33c582e 100644 --- a/uui/source/filechanged.cxx +++ b/uui/source/filechanged.cxx @@ -20,7 +20,7 @@ #include "ids.hrc" #include "filechanged.hxx" -FileChangedQueryBox::FileChangedQueryBox( Window* pParent, ResMgr* pResMgr ) : +FileChangedQueryBox::FileChangedQueryBox( vcl::Window* pParent, ResMgr* pResMgr ) : MessBox(pParent, 0, ResId(STR_FILECHANGED_TITLE, *pResMgr).toString(), OUString() ) diff --git a/uui/source/filechanged.hxx b/uui/source/filechanged.hxx index de29a2ff4258..aa84c57430a8 100644 --- a/uui/source/filechanged.hxx +++ b/uui/source/filechanged.hxx @@ -24,7 +24,7 @@ class FileChangedQueryBox : public MessBox { public: - FileChangedQueryBox( Window* pParent, ResMgr* pResMgr ); + FileChangedQueryBox( vcl::Window* pParent, ResMgr* pResMgr ); virtual ~FileChangedQueryBox(); }; diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index 1d045fa40717..f2d895bff952 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -45,7 +45,7 @@ namespace uui @param "pParentWindow" , parent window for dialog @threadsafe no *//*-*************************************************************************************************************/ -FilterDialog::FilterDialog( Window* pParentWindow ) +FilterDialog::FilterDialog( vcl::Window* pParentWindow ) : ModalDialog (pParentWindow, "FilterSelectDialog", "uui/ui/filterselect.ui" ) , m_pFilterNames(NULL) { diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx index 26ceb81b3cd5..6c245445ab97 100644 --- a/uui/source/fltdlg.hxx +++ b/uui/source/fltdlg.hxx @@ -46,7 +46,7 @@ class FilterDialog : public ModalDialog { // public interface public: - FilterDialog ( Window* pParentWindow ); + FilterDialog ( vcl::Window* pParentWindow ); void SetURL ( const OUString& sURL ); void ChangeFilters( const FilterNameList* pFilterNames ); bool AskForFilter ( FilterNameListPtr& pSelectedItem ); diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index fbb1dba24c3d..81cd93a936da 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -58,7 +58,7 @@ namespace { void executeLoginDialog( - Window * pParent, + vcl::Window * pParent, LoginErrorInfo & rInfo, OUString const & rRealm) { @@ -182,7 +182,7 @@ void getRememberModes( void handleAuthenticationRequest_( - Window * pParent, + vcl::Window * pParent, uno::Reference< task::XInteractionHandler2 > const & xIH, uno::Reference< uno::XComponentContext > const & xContext, ucb::AuthenticationRequest const & rRequest, @@ -403,7 +403,7 @@ handleAuthenticationRequest_( void executeMasterPasswordDialog( - Window * pParent, + vcl::Window * pParent, LoginErrorInfo & rInfo, task::PasswordRequestMode nMode) { @@ -458,7 +458,7 @@ executeMasterPasswordDialog( void handleMasterPasswordRequest_( - Window * pParent, + vcl::Window * pParent, task::PasswordRequestMode nMode, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations) @@ -498,7 +498,7 @@ handleMasterPasswordRequest_( void executePasswordDialog( - Window * pParent, + vcl::Window * pParent, LoginErrorInfo & rInfo, task::PasswordRequestMode nMode, const OUString& aDocName, @@ -558,7 +558,7 @@ executePasswordDialog( void handlePasswordRequest_( - Window * pParent, + vcl::Window * pParent, task::PasswordRequestMode nMode, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations, @@ -666,7 +666,7 @@ UUIInteractionHelper::handlePasswordRequest( uno::Reference< task::XInteractionRequest > const & rRequest) { // parameters to be filled for the call to handlePasswordRequest_ - Window * pParent = getParentProperty(); + vcl::Window * pParent = getParentProperty(); task::PasswordRequestMode nMode = task::PasswordRequestMode_PASSWORD_ENTER; uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations = rRequest->getContinuations(); OUString aDocumentName; diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index b70ae0ec2bf9..68b09382baed 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -41,7 +41,7 @@ namespace { sal_uInt16 executeErrorDialog( - Window * pParent, + vcl::Window * pParent, task::InteractionClassification eClassification, OUString const & rContext, OUString const & rMessage, diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx index dc244161fc76..bfdb312855e9 100644 --- a/uui/source/iahndl-filter.cxx +++ b/uui/source/iahndl-filter.cxx @@ -46,7 +46,7 @@ namespace { void executeFilterDialog( - Window * pParent , + vcl::Window * pParent , OUString const & rURL , uui::FilterNameList const & rFilters, OUString & rFilter ) @@ -75,7 +75,7 @@ executeFilterDialog( void handleNoSuchFilterRequest_( - Window * pParent, + vcl::Window * pParent, uno::Reference< uno::XComponentContext > const & xContext, document::NoSuchFilterRequest const & rRequest, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx index a6b32b5459df..e7e911bb8aef 100644 --- a/uui/source/iahndl-locking.cxx +++ b/uui/source/iahndl-locking.cxx @@ -56,7 +56,7 @@ namespace { void handleLockedDocumentRequest_( - Window * pParent, + vcl::Window * pParent, const OUString& aDocumentURL, const OUString& aInfo, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & @@ -145,7 +145,7 @@ handleLockedDocumentRequest_( void handleChangedByOthersRequest_( - Window * pParent, + vcl::Window * pParent, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations ) { @@ -180,7 +180,7 @@ handleChangedByOthersRequest_( void handleLockFileIgnoreRequest_( - Window * pParent, + vcl::Window * pParent, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations ) { diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index e415091e1e4a..4925d34064dc 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -137,7 +137,7 @@ getLocalizedDatTimeStr( bool executeUnknownAuthDialog( - Window * pParent, + vcl::Window * pParent, uno::Reference< uno::XComponentContext > const & xContext, const uno::Reference< security::XCertificate >& rXCert) { @@ -177,7 +177,7 @@ executeUnknownAuthDialog( bool executeSSLWarnDialog( - Window * pParent, + vcl::Window * pParent, uno::Reference< uno::XComponentContext > const & xContext, const uno::Reference< security::XCertificate >& rXCert, sal_Int32 const & failure, @@ -246,7 +246,7 @@ executeSSLWarnDialog( void handleCertificateValidationRequest_( - Window * pParent, + vcl::Window * pParent, uno::Reference< uno::XComponentContext > const & xContext, ucb::CertificateValidationRequest const & rRequest, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index ffe9bc85a9cc..ac56d73352f0 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -976,7 +976,7 @@ UUIInteractionHelper::getInteractionHandlerList( } } -Window * +vcl::Window * UUIInteractionHelper::getParentProperty() { uno::Reference< awt::XWindow > xWindow = getParentXWindow(); @@ -1010,7 +1010,7 @@ namespace { sal_uInt16 executeMessageBox( - Window * pParent, + vcl::Window * pParent, OUString const & rTitle, OUString const & rMessage, WinBits nButtonMask ) @@ -1042,7 +1042,7 @@ executeMessageBox( return aResult; } -NameClashResolveDialogResult executeSimpleNameClashResolveDialog( Window *pParent, +NameClashResolveDialogResult executeSimpleNameClashResolveDialog( vcl::Window *pParent, OUString const & rTargetFolderURL, OUString const & rClashingName, OUString & rProposedNewName, diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index 688a35854777..68e6b638bbe8 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -61,7 +61,7 @@ namespace com { namespace sun { namespace star { #include <boost/unordered_map.hpp> -class Window; +namespace vcl { class Window; } struct InteractionHandlerData { @@ -143,7 +143,7 @@ private: static long getstringfromrequest(void* pHandleData, void* pInteractionHandler); - Window * + vcl::Window * getParentProperty(); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx index 3fa467434e65..48c4f23a935d 100644 --- a/uui/source/lockfailed.cxx +++ b/uui/source/lockfailed.cxx @@ -22,7 +22,7 @@ #include <vcl/button.hxx> -LockFailedQueryBox::LockFailedQueryBox( Window* pParent, ResMgr* pResMgr ) : +LockFailedQueryBox::LockFailedQueryBox( vcl::Window* pParent, ResMgr* pResMgr ) : MessBox(pParent, 0, ResId(STR_LOCKFAILED_TITLE, *pResMgr).toString(), OUString() ) diff --git a/uui/source/lockfailed.hxx b/uui/source/lockfailed.hxx index da16c1b56af5..7b7bc59503e7 100644 --- a/uui/source/lockfailed.hxx +++ b/uui/source/lockfailed.hxx @@ -24,7 +24,7 @@ class LockFailedQueryBox : public MessBox { public: - LockFailedQueryBox( Window* pParent, ResMgr* pResMgr ); + LockFailedQueryBox( vcl::Window* pParent, ResMgr* pResMgr ); virtual ~LockFailedQueryBox(); }; diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index 4122d5309dbe..c28e17098a51 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -142,7 +142,7 @@ IMPL_LINK_NOARG(LoginDialog, UseSysCredsHdl_Impl) return 1; } -LoginDialog::LoginDialog(Window* pParent, sal_uInt16 nFlags, +LoginDialog::LoginDialog(vcl::Window* pParent, sal_uInt16 nFlags, const OUString& rServer, const OUString& rRealm) : ModalDialog(pParent, "LoginDialog", "uui/ui/logindialog.ui") { diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index 07943b3446da..4fe319effecc 100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -67,7 +67,7 @@ class LoginDialog : public ModalDialog DECL_LINK(UseSysCredsHdl_Impl, void *); public: - LoginDialog(Window* pParent, sal_uInt16 nFlags, + LoginDialog(vcl::Window* pParent, sal_uInt16 nFlags, const OUString& rServer, const OUString &rRealm); OUString GetPath() const { return m_pPathED->GetText(); } diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx index 1ec8c852db62..a7acc0189a26 100644 --- a/uui/source/masterpasscrtdlg.cxx +++ b/uui/source/masterpasscrtdlg.cxx @@ -50,7 +50,7 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl) return 1; } -MasterPasswordCreateDialog::MasterPasswordCreateDialog(Window* pParent, ResMgr* pResMgr) +MasterPasswordCreateDialog::MasterPasswordCreateDialog(vcl::Window* pParent, ResMgr* pResMgr) : ModalDialog(pParent, "SetMasterPasswordDialog", "uui/ui/setmasterpassworddlg.ui") , pResourceMgr(pResMgr) , nMinLen(1) diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx index 44fdcf07e76f..31e9eb60ab87 100644 --- a/uui/source/masterpasscrtdlg.hxx +++ b/uui/source/masterpasscrtdlg.hxx @@ -41,7 +41,7 @@ private: DECL_LINK(EditHdl_Impl, void *); public: - MasterPasswordCreateDialog( Window* pParent, ResMgr * pResMgr ); + MasterPasswordCreateDialog( vcl::Window* pParent, ResMgr * pResMgr ); OUString GetMasterPassword() const { return m_pEDMasterPasswordCrt->GetText(); } diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index ed297a860e69..3b6a071968a3 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -36,7 +36,7 @@ IMPL_LINK_NOARG(MasterPasswordDialog, OKHdl_Impl) MasterPasswordDialog::MasterPasswordDialog ( - Window* pParent, + vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode aDialogMode, ResMgr* pResMgr ) diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx index 3bd9a9508366..4b834d4fa5ed 100644 --- a/uui/source/masterpassworddlg.hxx +++ b/uui/source/masterpassworddlg.hxx @@ -36,7 +36,7 @@ class MasterPasswordDialog : public ModalDialog DECL_LINK(OKHdl_Impl, void *); public: - MasterPasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); + MasterPasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); OUString GetMasterPassword() const { return m_pEDMasterPassword->GetText(); } diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx index bfa3994aa926..63ad0926dc02 100644 --- a/uui/source/nameclashdlg.cxx +++ b/uui/source/nameclashdlg.cxx @@ -49,7 +49,7 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn ) } -NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr, +NameClashDialog::NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr, OUString const & rTargetFolderURL, OUString const & rClashingName, OUString const & rProposedNewName, diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx index a6369a672f42..6185e996305c 100644 --- a/uui/source/nameclashdlg.hxx +++ b/uui/source/nameclashdlg.hxx @@ -43,7 +43,7 @@ class NameClashDialog : public ModalDialog DECL_LINK( ButtonHdl_Impl, PushButton * ); public: - NameClashDialog( Window* pParent, ResMgr* pResMgr, + NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr, OUString const & rTargetFolderURL, OUString const & rClashingName, OUString const & rProposedNewName, diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx index 20904a5a2e5b..b4f7ee594f12 100644 --- a/uui/source/openlocked.cxx +++ b/uui/source/openlocked.cxx @@ -20,7 +20,7 @@ #include "ids.hrc" #include "openlocked.hxx" -OpenLockedQueryBox::OpenLockedQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage ) : +OpenLockedQueryBox::OpenLockedQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage ) : MessBox(pParent, 0, ResId(STR_OPENLOCKED_TITLE, *pResMgr).toString(), aMessage ) diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx index 8662d7bfc601..72878db38951 100644 --- a/uui/source/openlocked.hxx +++ b/uui/source/openlocked.hxx @@ -24,7 +24,7 @@ class OpenLockedQueryBox : public MessBox { public: - OpenLockedQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage ); + OpenLockedQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage ); virtual ~OpenLockedQueryBox(); }; diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index 3d4326eb10ff..2e5ed497b599 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star; -PasswordDialog::PasswordDialog(Window* _pParent, +PasswordDialog::PasswordDialog(vcl::Window* _pParent, task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL, bool bOpenToModify, bool bIsSimplePasswordRequest) : ModalDialog(_pParent, "PasswordDialog", "uui/ui/password.ui") diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index b58ce1fab43f..3cec5ca190d3 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -44,7 +44,7 @@ class PasswordDialog : public ModalDialog DECL_LINK(OKHdl_Impl, void *); public: - PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL, + PasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL, bool bOpenToModify = false, bool bIsSimplePasswordRequest = false ); void SetMinLen( sal_uInt16 nMin ) { nMinLen = nMin; } diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 32713a5a174f..935ecf66ecf4 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -63,7 +63,7 @@ namespace } -MacroWarning::MacroWarning( Window* _pParent, bool _bWithSignatures, ResMgr& ) +MacroWarning::MacroWarning( vcl::Window* _pParent, bool _bWithSignatures, ResMgr& ) :ModalDialog ( _pParent, "MacroWarnMedium", "uui/ui/macrowarnmedium.ui" ) ,mpInfos ( NULL ) ,mbSignedMode ( true ) diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index da05fa576654..84daaad9ee3a 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -66,7 +66,7 @@ private: void InitControls(); public: - MacroWarning( Window* pParent, bool _bShowSignatures, ResMgr& rResMgr ); + MacroWarning( vcl::Window* pParent, bool _bShowSignatures, ResMgr& rResMgr ); virtual ~MacroWarning(); void SetDocumentURL( const OUString& rDocURL ); diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx index 11e183f2a7af..1e3a55edda88 100644 --- a/uui/source/sslwarndlg.cxx +++ b/uui/source/sslwarndlg.cxx @@ -38,7 +38,7 @@ void SSLWarnDialog::ViewCert() -SSLWarnDialog::SSLWarnDialog(Window* pParent, +SSLWarnDialog::SSLWarnDialog(vcl::Window* pParent, const css::uno::Reference< css::security::XCertificate >& rXCert, const css::uno::Reference< css::uno::XComponentContext >& xContext) : MessageDialog(pParent, "SSLWarnDialog", "uui/ui/sslwarndialog.ui") diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx index 30146e128e0e..73b25c2c4c0d 100644 --- a/uui/source/sslwarndlg.hxx +++ b/uui/source/sslwarndlg.hxx @@ -38,7 +38,7 @@ private: void ViewCert(); public: - SSLWarnDialog( Window* pParent, + SSLWarnDialog( vcl::Window* pParent, const css::uno::Reference< css::security::XCertificate >& rXCert, const css::uno::Reference< css::uno::XComponentContext >& xContext ); diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx index 93170a1a3fa3..8c1c5705b2d4 100644 --- a/uui/source/trylater.cxx +++ b/uui/source/trylater.cxx @@ -20,7 +20,7 @@ #include "ids.hrc" #include "trylater.hxx" -TryLaterQueryBox::TryLaterQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage ) : +TryLaterQueryBox::TryLaterQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage ) : MessBox(pParent, 0, ResId(STR_TRYLATER_TITLE, *pResMgr).toString(), aMessage ) diff --git a/uui/source/trylater.hxx b/uui/source/trylater.hxx index f7e3ceb74063..18f3680a1f47 100644 --- a/uui/source/trylater.hxx +++ b/uui/source/trylater.hxx @@ -24,7 +24,7 @@ class TryLaterQueryBox : public MessBox { public: - TryLaterQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage ); + TryLaterQueryBox( vcl::Window* pParent, ResMgr* pResMgr, const OUString& aMessage ); virtual ~TryLaterQueryBox(); }; diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 44e4bdd28f8d..34f706fec139 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -58,7 +58,7 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl) -UnknownAuthDialog::UnknownAuthDialog(Window* pParent, +UnknownAuthDialog::UnknownAuthDialog(vcl::Window* pParent, const css::uno::Reference< css::security::XCertificate >& rXCert, const css::uno::Reference< css::uno::XComponentContext >& xContext) : MessageDialog(pParent, "UnknownAuthDialog", diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index f78b91aab604..0b8d1e64ab2b 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -43,7 +43,7 @@ private: DECL_LINK(ViewCertHdl_Impl, void *); public: - UnknownAuthDialog(Window* pParent, + UnknownAuthDialog(vcl::Window* pParent, const css::uno::Reference< css::security::XCertificate >& rXCert, const css::uno::Reference< css::uno::XComponentContext >& xContext); 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() ) diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 05581c55792d..72ed0e23c3d7 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -883,7 +883,7 @@ namespace #if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) guint get_xid_for_dbus() { - const Window *pTopWindow = Application::IsHeadlessModeEnabled() ? NULL : Application::GetActiveTopWindow(); + const vcl::Window *pTopWindow = Application::IsHeadlessModeEnabled() ? NULL : Application::GetActiveTopWindow(); const SystemEnvData* pEnvData = pTopWindow ? pTopWindow->GetSystemData() : NULL; return pEnvData ? pEnvData->aWindow : 0; } diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index 9304ac757d7a..d0dfb28b1e19 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -99,13 +99,13 @@ namespace public: // parent window, Query text, initial value - QueryString(Window*, OUString &, OUString &); + QueryString(vcl::Window*, OUString &, OUString &); }; /* * QueryString */ - QueryString::QueryString(Window* pParent, OUString& rQuery, OUString& rRet) + QueryString::QueryString(vcl::Window* pParent, OUString& rQuery, OUString& rRet) : ModalDialog(pParent, "QueryDialog", "vcl/ui/querydialog.ui" ) , m_rReturnValue( rRet ) diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx index ea93c2df1abf..a6ea399b308c 100644 --- a/vcl/generic/print/prtsetup.cxx +++ b/vcl/generic/print/prtsetup.cxx @@ -71,7 +71,7 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con * RTSDialog */ -RTSDialog::RTSDialog(const PrinterInfo& rJobData, const OUString& rPrinter, Window* pParent) +RTSDialog::RTSDialog(const PrinterInfo& rJobData, const OUString& rPrinter, vcl::Window* pParent) : TabDialog(pParent, "PrinterPropertiesDialog", "vcl/ui/printerpropertiesdialog.ui") , m_aJobData(rJobData) , m_aPrinter(rPrinter) diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx index dfa124911c15..8f3d43d3a199 100644 --- a/vcl/generic/print/prtsetup.hxx +++ b/vcl/generic/print/prtsetup.hxx @@ -63,7 +63,7 @@ class RTSDialog : public TabDialog // helper functions void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* ); public: - RTSDialog(const ::psp::PrinterInfo& rJobData, const OUString& rPrinter, Window* pParent = NULL); + RTSDialog(const ::psp::PrinterInfo& rJobData, const OUString& rPrinter, vcl::Window* pParent = NULL); virtual ~RTSDialog(); const ::psp::PrinterInfo& getSetup() const { return m_aJobData; } diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx index 8f1d5f3dd02e..f3d0c0f9bc31 100644 --- a/vcl/inc/brdwin.hxx +++ b/vcl/inc/brdwin.hxx @@ -74,16 +74,16 @@ class ImplBorderWindowView; #define BORDERWINDOW_TITLE_POPUP ((sal_uInt16)0x0008) #define BORDERWINDOW_TITLE_NONE ((sal_uInt16)0x0010) -class ImplBorderWindow : public Window +class ImplBorderWindow : public vcl::Window { - friend class Window; + friend class vcl::Window; friend class ImplBorderWindowView; friend class ImplSmallBorderWindowView; friend class ImplStdBorderWindowView; private: ImplBorderWindowView* mpBorderView; - Window* mpMenuBarWindow; + vcl::Window* mpMenuBarWindow; long mnMinWidth; long mnMinHeight; long mnMaxWidth; @@ -104,10 +104,10 @@ private: bool mbDisplayActive; using Window::ImplInit; - void ImplInit( Window* pParent, + void ImplInit( vcl::Window* pParent, WinBits nStyle, sal_uInt16 nTypeStyle, SystemParentData* pParentData ); - void ImplInit( Window* pParent, + void ImplInit( vcl::Window* pParent, WinBits nStyle, sal_uInt16 nTypeStyle, const ::com::sun::star::uno::Any& ); @@ -116,11 +116,11 @@ private: ImplBorderWindow& operator= (const ImplBorderWindow &); public: - ImplBorderWindow( Window* pParent, + ImplBorderWindow( vcl::Window* pParent, SystemParentData* pParentData, WinBits nStyle = 0, sal_uInt16 nTypeStyle = 0 ); - ImplBorderWindow( Window* pParent, WinBits nStyle = 0, + ImplBorderWindow( vcl::Window* pParent, WinBits nStyle = 0, sal_uInt16 nTypeStyle = 0 ); virtual ~ImplBorderWindow(); @@ -155,7 +155,7 @@ public: void SetMenuButton( bool bMenuButton ); void UpdateMenuHeight(); - void SetMenuBarWindow( Window* pWindow ); + void SetMenuBarWindow( vcl::Window* pWindow ); void SetMenuBarMode( bool bHide ); void SetMinOutputSize( long nWidth, long nHeight ) diff --git a/vcl/inc/dbggui.hxx b/vcl/inc/dbggui.hxx index b538d3a1d908..f0a29012ca21 100644 --- a/vcl/inc/dbggui.hxx +++ b/vcl/inc/dbggui.hxx @@ -22,12 +22,12 @@ #ifdef DBG_UTIL -class Window; +namespace vcl { class Window; } void DbgGUIInitSolarMutexCheck(); void DbgGUIDeInitSolarMutexCheck(); void DbgGUIStart(); -void DbgDialogTest( Window* pWindow ); +void DbgDialogTest( vcl::Window* pWindow ); #define DBGGUI_INIT_SOLARMUTEXCHECK() DbgGUIInitSolarMutexCheck() #define DBGGUI_DEINIT_SOLARMUTEXCHECK() DbgGUIDeInitSolarMutexCheck() diff --git a/vcl/inc/dndevdis.hxx b/vcl/inc/dndevdis.hxx index a62abbd90360..5a1c0797dd7f 100644 --- a/vcl/inc/dndevdis.hxx +++ b/vcl/inc/dndevdis.hxx @@ -32,39 +32,39 @@ class DNDEventDispatcher: public ::cppu::WeakImplHelper3< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext, ::com::sun::star::datatransfer::dnd::XDragGestureListener > { - Window * m_pTopWindow; - Window * m_pCurrentWindow; + vcl::Window * m_pTopWindow; + vcl::Window * m_pCurrentWindow; ::osl::Mutex m_aMutex; ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_aDataFlavorList; - Window* findTopLevelWindow(Point location); + vcl::Window* findTopLevelWindow(Point location); /* * fire the events on the dnd listener container of the specified window */ - sal_Int32 fireDragEnterEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, + sal_Int32 fireDragEnterEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction, const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& aFlavorList ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 fireDragOverEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, + sal_Int32 fireDragOverEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 fireDragExitEvent( Window *pWindow ) throw(::com::sun::star::uno::RuntimeException); + sal_Int32 fireDragExitEvent( vcl::Window *pWindow ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 fireDropActionChangedEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, + sal_Int32 fireDropActionChangedEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 fireDropEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& xContext, + sal_Int32 fireDropEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 fireDragGestureEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xSource, + sal_Int32 fireDragGestureEvent( vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xSource, const ::com::sun::star::uno::Any event, const Point& rOrigin, const sal_Int8 nDragAction )throw(::com::sun::star::uno::RuntimeException); public: - DNDEventDispatcher( Window * pTopWindow ); + DNDEventDispatcher( vcl::Window * pTopWindow ); virtual ~DNDEventDispatcher(); /* diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index 49fa496fa0eb..223d2536791a 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -50,7 +50,7 @@ protected: void ImplShow(); public: - HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ); + HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ); virtual ~HelpTextWindow(); const OUString& GetHelpText() const { return maHelpText; } @@ -70,11 +70,11 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; }; -void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, +void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, const OUString& rHelpText, const OUString& rStatusText, const Point& rScreenPos, const Rectangle* pHelpArea = NULL ); void ImplDestroyHelpWindow( bool bUpdateHideTime ); -void ImplSetHelpWindowPos( Window* pHelpWindow, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, +void ImplSetHelpWindowPos( vcl::Window* pHelpWindow, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, const Point& rPos, const Rectangle* pHelpArea ); #endif // INCLUDED_VCL_INC_HELPWIN_HXX diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 2b049357ab7c..0f142a5e524e 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -87,7 +87,7 @@ struct ImplEntryType class ImplEntryList { private: - Window* mpWindow; ///< For getting the current locale when matching strings + vcl::Window* mpWindow; ///< For getting the current locale when matching strings sal_Int32 mnLastSelected; sal_Int32 mnSelectionAnchor; sal_Int32 mnImages; @@ -107,7 +107,7 @@ private: } public: - ImplEntryList( Window* pWindow ); + ImplEntryList( vcl::Window* pWindow ); ~ImplEntryList(); sal_Int32 InsertEntry( sal_Int32 nPos, ImplEntryType* pNewEntry, bool bSort ); @@ -265,7 +265,7 @@ protected: public: virtual void FillLayoutData() const SAL_OVERRIDE; - ImplListBoxWindow( Window* pParent, WinBits nWinStyle ); + ImplListBoxWindow( vcl::Window* pParent, WinBits nWinStyle ); virtual ~ImplListBoxWindow(); ImplEntryList* GetEntryList() const { return mpEntryList; } @@ -410,7 +410,7 @@ protected: DECL_LINK( MRUChanged, void* ); public: - ImplListBox( Window* pParent, WinBits nWinStyle ); + ImplListBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~ImplListBox(); const ImplEntryList* GetEntryList() const { return maLBWindow.GetEntryList(); } @@ -418,7 +418,7 @@ public: virtual void Resize() SAL_OVERRIDE; virtual const Wallpaper& GetDisplayBackground() const SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; sal_Int32 InsertEntry( sal_Int32 nPos, const OUString& rStr ); sal_Int32 InsertEntry( sal_Int32 nPos, const OUString& rStr, const Image& rImage ); @@ -517,7 +517,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - ImplListBoxFloatingWindow( Window* pParent ); + ImplListBoxFloatingWindow( vcl::Window* pParent ); void SetImplListBox( ImplListBox* pLB ) { mpImplLB = pLB; } @@ -564,7 +564,7 @@ protected: virtual void FillLayoutData() const SAL_OVERRIDE; public: - ImplWin( Window* pParent, WinBits nWinStyle = 0 ); + ImplWin( vcl::Window* pParent, WinBits nWinStyle = 0 ); virtual ~ImplWin() {}; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -606,7 +606,7 @@ private: bool mbDown; public: - ImplBtn( Window* pParent, WinBits nWinStyle = 0 ); + ImplBtn( vcl::Window* pParent, WinBits nWinStyle = 0 ); virtual ~ImplBtn() {}; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -615,7 +615,7 @@ public: boost::signals2::signal< void ( ImplBtn* ) > buttonDownSignal; }; -void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBackground ); +void ImplInitFieldSettings( vcl::Window* pWin, bool bFont, bool bForeground, bool bBackground ); void ImplInitDropDownButton( PushButton* pButton ); #endif // INCLUDED_VCL_INC_ILSTBOX_HXX diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx index d4b4886f9ccc..9cd9e6fbd5e0 100644 --- a/vcl/inc/osx/a11yfocustracker.hxx +++ b/vcl/inc/osx/a11yfocustracker.hxx @@ -30,7 +30,7 @@ #include <vcl/vclevent.hxx> #include <set> -class Window; +namespace vcl { class Window; } class ToolBox; class DocumentFocusListener; @@ -53,16 +53,16 @@ public: protected: // received a WINDOW_GETFOCUS event for this window - void window_got_focus(Window *pWindow); + void window_got_focus(vcl::Window *pWindow); // received a TOOLBOX_HIGHLIGHT event for this window - void toolbox_highlight_on(Window *pWindow); + void toolbox_highlight_on(vcl::Window *pWindow); // received a TOOLBOX_HIGHLIGHTOFF event for this window - void toolbox_highlight_off(Window *pWindow); + void toolbox_highlight_off(vcl::Window *pWindow); // received a TABPAGE_ACTIVATE event for this window - void tabpage_activated(Window *pWindow); + void tabpage_activated(vcl::Window *pWindow); // received a MENU_HIGHLIGHT event for this window void menu_highlighted(const ::VclMenuEvent *pEvent); @@ -71,7 +71,7 @@ protected: void notify_toolbox_item_focus(ToolBox *pToolBox); // toolbox item opened a floating window (e.g. color chooser) - void toolbox_open_floater(Window *pWindow); + void toolbox_open_floater(vcl::Window *pWindow); // callback function for Application::addEventListener static long WindowEventHandler(AquaA11yFocusTracker *pFocusTracker, ::VclSimpleEvent const *pEvent); @@ -84,7 +84,7 @@ private: rtl::Reference< KeyboardFocusListener > m_aFocusListener; // the list of Windows that need deeper (focus) investigation - std::set< Window *> m_aDocumentWindowList; + std::set< vcl::Window *> m_aDocumentWindowList; // the link object needed for Application::addEventListener Link m_aWindowEventLink; diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index f0883d03e6dd..49c97e3467a1 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -44,7 +44,7 @@ namespace vcl class PrintDialog : public ModalDialog { public: - class PrintPreviewWindow : public Window + class PrintPreviewWindow : public vcl::Window { static const sal_Int32 PREVIEW_BITMAP_WIDTH; @@ -62,7 +62,7 @@ namespace vcl void preparePreviewBitmap(); public: - PrintPreviewWindow( Window* pParent ); + PrintPreviewWindow( vcl::Window* pParent ); virtual ~PrintPreviewWindow(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -78,14 +78,14 @@ namespace vcl ); }; - class ShowNupOrderWindow : public Window + class ShowNupOrderWindow : public vcl::Window { int mnOrderMode; int mnRows; int mnColumns; void ImplInitSettings(); public: - ShowNupOrderWindow( Window* pParent ); + ShowNupOrderWindow( vcl::Window* pParent ); virtual ~ShowNupOrderWindow(); virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -207,10 +207,10 @@ namespace vcl sal_Int32 mnCurPage; sal_Int32 mnCachedPages; - std::map< Window*, OUString > maControlToPropertyMap; - std::map< OUString, std::vector< Window* > > + std::map< vcl::Window*, OUString > maControlToPropertyMap; + std::map< OUString, std::vector< vcl::Window* > > maPropertyToWindowMap; - std::map< Window*, sal_Int32 > maControlToNumValMap; + std::map< vcl::Window*, sal_Int32 > maControlToNumValMap; std::set< OUString > maReverseDependencySet; Size maNupPortraitSize; @@ -236,12 +236,12 @@ namespace vcl void updatePrinterText(); void checkControlDependencies(); void checkOptionalControlDependencies(); - void makeEnabled( Window* ); + void makeEnabled( vcl::Window* ); void updateWindowFromProperty( const OUString& ); void setupOptionalUI(); void readFromSettings(); void storeToSettings(); - com::sun::star::beans::PropertyValue* getValueForWindow( Window* ) const; + com::sun::star::beans::PropertyValue* getValueForWindow( vcl::Window* ) const; virtual void Resize() SAL_OVERRIDE; virtual void Command( const CommandEvent& ) SAL_OVERRIDE; @@ -258,7 +258,7 @@ namespace vcl DECL_LINK( UIOption_ModifyHdl, Edit* ); public: - PrintDialog( Window*, const boost::shared_ptr< PrinterController >& ); + PrintDialog( vcl::Window*, const boost::shared_ptr< PrinterController >& ); virtual ~PrintDialog(); bool isPrintToFile(); @@ -283,7 +283,7 @@ namespace vcl DECL_LINK( ClickHdl, Button* ); public: - PrintProgressDialog(Window* i_pParent, int i_nMax); + PrintProgressDialog(vcl::Window* i_pParent, int i_nMax); bool isCanceled() const { return mbCanceled; } void setProgress( int i_nCurrent, int i_nMax = -1 ); diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx index 1d9eed738cfb..f594977e11c2 100644 --- a/vcl/inc/salframe.hxx +++ b/vcl/inc/salframe.hxx @@ -38,7 +38,7 @@ class AllSettings; class SalGraphics; class SalBitmap; class SalMenu; -class Window; +namespace vcl { class Window; } struct SalFrameState; struct SalInputContext; @@ -99,7 +99,7 @@ struct SystemParentData; class VCL_PLUGIN_PUBLIC SalFrame : public vcl::DeletionNotifier { // the VCL window corresponding to this frame - Window* m_pWindow; + vcl::Window* m_pWindow; SALFRAMEPROC m_pProc; public: @@ -229,11 +229,11 @@ public: // Callbacks (indepent part in vcl/source/window/winproc.cxx) // for default message handling return 0 - void SetCallback( Window* pWindow, SALFRAMEPROC pProc ) + void SetCallback( vcl::Window* pWindow, SALFRAMEPROC pProc ) { m_pWindow = pWindow; m_pProc = pProc; } // returns the instance set - Window* GetWindow() const { return m_pWindow; } + vcl::Window* GetWindow() const { return m_pWindow; } // Call the callback set; this sometimes necessary for implementation classes // that should not know more than necessary about the SalFrame implementation diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index 36eab51da2fd..805581316504 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -27,7 +27,7 @@ class SalGraphics; class SalFrame; class SalObject; -class Window; +namespace vcl { class Window; } class FontSelectPattern; @@ -234,7 +234,7 @@ struct SalQueryCharPositionEvent // - SalFrame-Types - -typedef bool (*SALFRAMEPROC)( Window* pInst, SalFrame* pFrame, +typedef bool (*SALFRAMEPROC)( vcl::Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, const void* pEvent ); // - SalObject-Events - diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index 44b229bf2727..c1d9eed2c45d 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -71,7 +71,7 @@ class Image; class PopupMenu; class Application; class OutputDevice; -class Window; +namespace vcl { class Window; } class SystemWindow; class WorkWindow; class Dialog; @@ -177,20 +177,20 @@ struct ImplSVGDIData struct ImplSVWinData { - Window* mpFirstFrame; // First FrameWindow - Window* mpDefDialogParent; // Default Dialog Parent + vcl::Window* mpFirstFrame; // First FrameWindow + vcl::Window* mpDefDialogParent; // Default Dialog Parent WorkWindow* mpAppWin; // Application-Window - Window* mpFocusWin; // window, that has the focus - Window* mpActiveApplicationFrame; // the last active application frame, can be used as DefModalDialogParent if no focuswin set - Window* mpCaptureWin; // window, that has the mouse capture - Window* mpLastDeacWin; // Window, that need a deactivate (FloatingWindow-Handling) + vcl::Window* mpFocusWin; // window, that has the focus + vcl::Window* mpActiveApplicationFrame; // the last active application frame, can be used as DefModalDialogParent if no focuswin set + vcl::Window* mpCaptureWin; // window, that has the mouse capture + vcl::Window* mpLastDeacWin; // Window, that need a deactivate (FloatingWindow-Handling) FloatingWindow* mpFirstFloat; // First FloatingWindow in PopupMode Dialog* mpLastExecuteDlg; // First Dialog that is in Execute - Window* mpExtTextInputWin; // Window, which is in ExtTextInput - Window* mpTrackWin; // window, that is in tracking mode + vcl::Window* mpExtTextInputWin; // Window, which is in ExtTextInput + vcl::Window* mpTrackWin; // window, that is in tracking mode AutoTimer* mpTrackTimer; // tracking timer ImageList* mpMsgBoxImgList; // ImageList for MessageBox - Window* mpAutoScrollWin; // window, that is in AutoScrollMode mode + vcl::Window* mpAutoScrollWin; // window, that is in AutoScrollMode mode sal_uInt16 mnTrackFlags; // tracking flags sal_uInt16 mnAutoScrollFlags; // auto scroll flags bool mbNoDeactivate; // true: do not execute Deactivate @@ -323,7 +323,7 @@ struct ImplSVData ImplSVHelpData maHelpData; // indepen data for Help classes ImplSVNWFData maNWFData; UnoWrapperBase* mpUnoWrapper; - Window* mpIntroWindow; // the splash screen + vcl::Window* mpIntroWindow; // the splash screen DockingManager* mpDockingManager; BlendFrameCache* mpBlendFrameCache; bool mbIsTestTool; @@ -342,15 +342,14 @@ struct ImplSVData void ImplInitSVData(); void ImplDeInitSVData(); void ImplDestroySVData(); -Window* ImplGetDefaultWindow(); +vcl::Window* ImplGetDefaultWindow(); VCL_PLUGIN_PUBLIC ResMgr* ImplGetResMgr(); VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if no res mgr DockingManager* ImplGetDockingManager(); BlendFrameCache* ImplGetBlendFrameCache(); -void ImplWindowAutoMnemonic( Window* pWindow ); +void ImplWindowAutoMnemonic( vcl::Window* pWindow ); void ImplUpdateSystemProcessWindow(); -Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); bool ImplCallHotKey( const vcl::KeyCode& rKeyCode ); void ImplFreeHotKeyData(); @@ -374,10 +373,10 @@ FieldUnitStringList* ImplGetCleanedFieldUnits(); struct ImplDelData { ImplDelData* mpNext; - const Window* mpWindow; + const vcl::Window* mpWindow; bool mbDel; - ImplDelData( const Window* pWindow = NULL ) + ImplDelData( const vcl::Window* pWindow = NULL ) : mpNext( NULL ), mpWindow( NULL ), mbDel( false ) { if( pWindow ) AttachToWindow( pWindow ); } @@ -390,19 +389,19 @@ struct ImplDelData } private: - void AttachToWindow( const Window* ); + void AttachToWindow( const vcl::Window* ); }; struct ImplFocusDelData : public ImplDelData { - Window* mpFocusWin; + vcl::Window* mpFocusWin; }; struct ImplSVEvent { void* mpData; Link* mpLink; - Window* mpWindow; + vcl::Window* mpWindow; ImplDelData maDelData; bool mbCall; }; diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h index 9056ec55e043..767c7c36f6af 100644 --- a/vcl/inc/toolbox.h +++ b/vcl/inc/toolbox.h @@ -34,11 +34,11 @@ #define TB_MENUBUTTON_SIZE 12 #define TB_MENUBUTTON_OFFSET 2 -class Window; +namespace vcl { class Window; } struct ImplToolItem { - Window* mpWindow; + vcl::Window* mpWindow; void* mpUserData; Image maImage; Image maHighImage; diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index b8396c4c11be..e7a8dbac0ed8 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -48,7 +48,7 @@ inline GdkWindow * widget_get_window(GtkWidget *widget) #endif } -inline XLIB_Window widget_get_xid(GtkWidget *widget) +inline ::Window widget_get_xid(GtkWidget *widget) { #if GTK_CHECK_VERSION(3,0,0) return GDK_WINDOW_XID(gtk_widget_get_window(widget)); diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index d1bd4fbbf756..93a7f1dccb1c 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -48,7 +48,7 @@ class GtkSalGraphics; class GtkSalDisplay; #if GTK_CHECK_VERSION(3,0,0) -typedef XLIB_Window GdkNativeWindow; +typedef ::Window GdkNativeWindow; #define GDK_WINDOW_XWINDOW(o) GDK_WINDOW_XID(o) #define gdk_set_sm_client_id(i) gdk_x11_set_sm_client_id(i) #define gdk_window_foreign_new_for_display(a,b) gdk_x11_window_foreign_new_for_display(a,b) @@ -295,7 +295,7 @@ class GtkSalFrame : public SalFrame Size calcDefaultSize(); void setMinMaxSize(); - void createNewWindow( XLIB_Window aParent, bool bXEmbed, SalX11Screen nXScreen ); + void createNewWindow( ::Window aParent, bool bXEmbed, SalX11Screen nXScreen ); void askForXEmbedFocus( sal_Int32 nTimecode ); void AllocateFrame(); diff --git a/vcl/inc/unx/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx index 1cf47fae20f6..517f1bbe7244 100644 --- a/vcl/inc/unx/i18n_ic.hxx +++ b/vcl/inc/unx/i18n_ic.hxx @@ -59,7 +59,7 @@ public: bool IsPreeditMode() { return maClientData.eState == ePreeditStatusActive; } XIC GetContext() { return maContext; } - void ExtendEventMask( XLIB_Window aFocusWindow ); + void ExtendEventMask( ::Window aFocusWindow ); void SetICFocus( SalFrame* pFocusFrame ); void UnsetICFocus( SalFrame* pFrame ); void HandleDestroyIM(); diff --git a/vcl/inc/unx/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx index d1741eedebb8..8e3a2ae31eec 100644 --- a/vcl/inc/unx/i18n_im.hxx +++ b/vcl/inc/unx/i18n_im.hxx @@ -43,7 +43,7 @@ public: bool CreateMethod( Display *pDisplay ); XIMStyles *GetSupportedStyles() { return mpStyles; } bool SetLocale( const char* pLocale = "" ); - bool FilterEvent( XEvent *pEvent, XLIB_Window window ); + bool FilterEvent( XEvent *pEvent, ::Window window ); SalI18N_InputMethod(); ~SalI18N_InputMethod(); diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 2d77328d1e40..075cf79503fe 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -209,8 +209,8 @@ public: { bool m_bInit; - XLIB_Window m_aRoot; - XLIB_Window m_aRefWindow; + ::Window m_aRoot; + ::Window m_aRefWindow; Size m_aSize; SalVisual m_aVisual; SalColormap m_aColormap; @@ -280,7 +280,7 @@ protected: virtual bool Dispatch( XEvent *pEvent ) = 0; void InitXinerama(); - void InitRandR( XLIB_Window aRoot ) const; + void InitRandR( ::Window aRoot ) const; void DeInitRandR(); int processRandREvent( XEvent* ); @@ -332,7 +332,7 @@ public: return m_aScreens[nXScreen.getXScreen()]; } - XLIB_Window GetDrawable( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aRefWindow; } + ::Window GetDrawable( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aRefWindow; } Display *GetDisplay() const { return pDisp_; } SalX11Screen GetDefaultXScreen() const { return m_nXDefaultScreen; } const Size& GetScreenSize( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aSize; } @@ -367,7 +367,7 @@ public: ::vcl_sal::WMAdaptor* getWMAdaptor() const { return m_pWMAdaptor; } bool IsXinerama() const { return m_bXinerama; } const std::vector< Rectangle >& GetXineramaScreens() const { return m_aXineramaScreens; } - XLIB_Window GetRootWindow( SalX11Screen nXScreen ) const + ::Window GetRootWindow( SalX11Screen nXScreen ) const { return getDataForScreen( nXScreen ).m_aRoot; } const std::vector< ScreenData >& GetScreenData() { return m_aScreens; } unsigned int GetXScreenCount() const { return m_aScreens.size(); } diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index bd37f9143c75..d85363a7aad8 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -61,11 +61,11 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame SalDisplay *pDisplay_; SalX11Screen m_nXScreen; - XLIB_Window mhWindow; - XLIB_Window mhShellWindow; - XLIB_Window mhForeignParent; + ::Window mhWindow; + ::Window mhShellWindow; + ::Window mhForeignParent; // window to fall back to when no longer in fullscreen mode - XLIB_Window mhStackingWindow; + ::Window mhStackingWindow; // window to listen for CirculateNotify events Pixmap mhBackgroundPixmap; @@ -138,7 +138,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame void Maximize(); void Restore(); - void RestackChildren( XLIB_Window* pTopLevelWindows, int nTopLevelWindows ); + void RestackChildren( ::Window* pTopLevelWindows, int nTopLevelWindows ); void RestackChildren(); long HandleKeyEvent ( XKeyEvent *pEvent ); @@ -154,7 +154,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame DECL_LINK( HandleAlwaysOnTopRaise, void* ); - void createNewWindow( XLIB_Window aParent, SalX11Screen nXScreen = SalX11Screen( -1 ) ); + void createNewWindow( ::Window aParent, SalX11Screen nXScreen = SalX11Screen( -1 ) ); void updateScreenNumber(); void setXEmbedInfo(); @@ -177,15 +177,15 @@ public: { return pDisplay_->GetDisplay(); } - XLIB_Window GetDrawable() const + ::Window GetDrawable() const { return GetWindow(); } SalX11Screen GetScreenNumber() const { return m_nXScreen; } - XLIB_Window GetWindow() const { return mhWindow; } - XLIB_Window GetShellWindow() const { return mhShellWindow; } - XLIB_Window GetForeignParent() const { return mhForeignParent; } - XLIB_Window GetStackingWindow() const { return mhStackingWindow; } + ::Window GetWindow() const { return mhWindow; } + ::Window GetShellWindow() const { return mhShellWindow; } + ::Window GetForeignParent() const { return mhForeignParent; } + ::Window GetStackingWindow() const { return mhStackingWindow; } long ShutDown() const { return CallCallback( SALEVENT_SHUTDOWN, 0 ); } long Close() const { return CallCallback( SALEVENT_CLOSE, 0 ); } sal_uIntPtr GetStyle() const { return nStyle_; } diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index 7cc73958f9eb..83dc856f5113 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -59,8 +59,8 @@ class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject public: SystemEnvData maSystemChildData; SalFrame* mpParent; - XLIB_Window maPrimary; - XLIB_Window maSecondary; + ::Window maPrimary; + ::Window maSecondary; Colormap maColormap; SalClipRegion maClipRegion; bool mbVisible; diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx index e2ae8ce08432..d5fcb32cc558 100644 --- a/vcl/inc/unx/wmadaptor.hxx +++ b/vcl/inc/unx/wmadaptor.hxx @@ -198,7 +198,7 @@ public: /* * gets the workarea the specified window is on (or -1) */ - int getWindowWorkArea( XLIB_Window aWindow ) const; + int getWindowWorkArea( ::Window aWindow ) const; /* * gets the specified workarea */ diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 5ab5cc1b57bf..983c3613cc66 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -41,7 +41,7 @@ struct ImplDelData; struct ImplAccessibleInfos; class FixedText; -class Window; +namespace vcl { class Window; } class VclSizeGroup; class VirtualDevice; class PhysicalFontCollection; @@ -91,7 +91,7 @@ namespace vcl { struct ControlLayoutData; } -bool ImplWindowFrameProc( Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, const void* pEvent ); +bool ImplWindowFrameProc( vcl::Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, const void* pEvent ); #define WINDOW_HITTEST_INSIDE ((sal_uInt16)0x0001) #define WINDOW_HITTEST_TRANSPARENT ((sal_uInt16)0x0002) @@ -111,7 +111,7 @@ struct ImplWinData sal_uInt16 mnIsTopWindow; bool mbMouseOver; //< tracks mouse over for native widget paint effect bool mbEnableNativeWidget; //< toggle native widget rendering - ::std::list< Window* > + ::std::list< vcl::Window* > maTopWindowChildren; }; @@ -119,7 +119,7 @@ struct ImplOverlapData { VirtualDevice* mpSaveBackDev; //< saved background bitmap Region* mpSaveBackRgn; //< saved region, which must be invalidated - Window* mpNextBackWin; //< next window with saved background + vcl::Window* mpNextBackWin; //< next window with saved background sal_uIntPtr mnSaveBackSize; //< bitmap size of saved background bool mbSaveBack; //< true: save background sal_uInt8 mnTopLevel; //< Level for Overlap-Window @@ -130,13 +130,13 @@ struct ImplFrameData Timer maPaintTimer; //< paint timer Timer maResizeTimer; //< resize timer InputContext maOldInputContext; //< last set Input Context - Window* mpNextFrame; //< next frame window - Window* mpFirstOverlap; //< first overlap window - Window* mpFocusWin; //< focus window (is also set, when frame doesn't have the focous) - Window* mpMouseMoveWin; //< last window, where MouseMove() called - Window* mpMouseDownWin; //< last window, where MouseButtonDown() called - Window* mpFirstBackWin; //< first overlap-window with saved background - ::std::vector<Window *> maOwnerDrawList; //< List of system windows with owner draw decoration + vcl::Window* mpNextFrame; //< next frame window + vcl::Window* mpFirstOverlap; //< first overlap vcl::Window + vcl::Window* mpFocusWin; //< focus window (is also set, when frame doesn't have the focous) + vcl::Window* mpMouseMoveWin; //< last window, where MouseMove() called + vcl::Window* mpMouseDownWin; //< last window, where MouseButtonDown() called + vcl::Window* mpFirstBackWin; //< first overlap-window with saved background + ::std::vector<vcl::Window *> maOwnerDrawList; //< List of system windows with owner draw decoration PhysicalFontCollection* mpFontCollection; //< Font-List for this frame ImplFontCache* mpFontCache; //< Font-Cache for this frame sal_Int32 mnDPIX; //< Original Screen Resolution @@ -185,9 +185,9 @@ struct ImplAccessibleInfos sal_uInt16 nAccessibleRole; OUString* pAccessibleName; OUString* pAccessibleDescription; - Window* pLabeledByWindow; - Window* pLabelForWindow; - Window* pMemberOfWindow; + vcl::Window* pLabeledByWindow; + vcl::Window* pLabelForWindow; + vcl::Window* pMemberOfWindow; ImplAccessibleInfos(); ~ImplAccessibleInfos(); @@ -206,21 +206,21 @@ public: ImplFrameData* mpFrameData; SalFrame* mpFrame; SalObject* mpSysObj; - Window* mpFrameWindow; - Window* mpOverlapWindow; - Window* mpBorderWindow; - Window* mpClientWindow; - Window* mpParent; - Window* mpRealParent; - Window* mpFirstChild; - Window* mpLastChild; - Window* mpFirstOverlap; - Window* mpLastOverlap; - Window* mpPrev; - Window* mpNext; - Window* mpNextOverlap; - Window* mpLastFocusWindow; - Window* mpDlgCtrlDownWindow; + vcl::Window* mpFrameWindow; + vcl::Window* mpOverlapWindow; + vcl::Window* mpBorderWindow; + vcl::Window* mpClientWindow; + vcl::Window* mpParent; + vcl::Window* mpRealParent; + vcl::Window* mpFirstChild; + vcl::Window* mpLastChild; + vcl::Window* mpFirstOverlap; + vcl::Window* mpLastOverlap; + vcl::Window* mpPrev; + vcl::Window* mpNext; + vcl::Window* mpNextOverlap; + vcl::Window* mpLastFocusWindow; + vcl::Window* mpDlgCtrlDownWindow; VclEventListeners maEventListeners; VclEventListeners maChildEventListeners; @@ -375,10 +375,10 @@ public: // helper methods -bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeave, +bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeave, long nX, long nY, sal_uIntPtr nMsgTime, sal_uInt16 nCode, sal_uInt16 nMode ); -void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ); +void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight ); #endif // INCLUDED_VCL_INC_WINDOW_H diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx index 1ce09a61a89b..877d2a7060e4 100644 --- a/vcl/osx/a11yfocustracker.cxx +++ b/vcl/osx/a11yfocustracker.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; -static inline Window * +static inline vcl::Window * getWindow(const ::VclSimpleEvent *pEvent) { return static_cast< const ::VclWindowEvent *> (pEvent)->GetWindow(); @@ -124,11 +124,11 @@ void AquaA11yFocusTracker::notify_toolbox_item_focus(ToolBox *pToolBox) } } -void AquaA11yFocusTracker::toolbox_open_floater(Window *pWindow) +void AquaA11yFocusTracker::toolbox_open_floater(vcl::Window *pWindow) { bool bToolboxFound = false; bool bFloatingWindowFound = false; - Window * pFloatingWindow = NULL; + vcl::Window * pFloatingWindow = NULL; while ( pWindow != NULL ) { if ( pWindow->GetType() == WINDOW_TOOLBOX ) { bToolboxFound = true; @@ -157,7 +157,7 @@ void AquaA11yFocusTracker::toolbox_open_floater(Window *pWindow) } } -void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow) +void AquaA11yFocusTracker::toolbox_highlight_on(vcl::Window *pWindow) { // Make sure either the toolbox or its parent toolbox has the focus if ( ! pWindow->HasFocus() ) @@ -170,7 +170,7 @@ void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow) notify_toolbox_item_focus(static_cast <ToolBox *> (pWindow)); } -void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow) +void AquaA11yFocusTracker::toolbox_highlight_off(vcl::Window *pWindow) { ToolBox* pToolBoxParent = dynamic_cast< ToolBox * >( pWindow->GetParent() ); @@ -179,7 +179,7 @@ void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow) notify_toolbox_item_focus( pToolBoxParent ); } -void AquaA11yFocusTracker::tabpage_activated(Window *pWindow) +void AquaA11yFocusTracker::tabpage_activated(vcl::Window *pWindow) { Reference< XAccessible > xAccessible( pWindow->GetAccessible() ); @@ -205,7 +205,7 @@ void AquaA11yFocusTracker::menu_highlighted(const VclMenuEvent *pEvent) } } -void AquaA11yFocusTracker::window_got_focus(Window *pWindow) +void AquaA11yFocusTracker::window_got_focus(vcl::Window *pWindow) { // The menu bar is handled through VCLEVENT_MENU_HIGHLIGHTED if( ! pWindow || !pWindow->IsReallyVisible() || pWindow->GetType() == WINDOW_MENUBARWINDOW ) diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 93d1e1a53e19..d8adf03893e2 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -515,7 +515,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) break; } AquaSalFrame* pFrame = pSalData->maFrames.front(); - Window* pWindow = pFrame ? pFrame->GetWindow() : NULL; + vcl::Window* pWindow = pFrame ? pFrame->GetWindow() : NULL; if( pWindow ) { diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index ed5cb45ccc33..10f0a40d8f13 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -43,7 +43,7 @@ void VclComplexTextTest::testArabic() OUString aOneTwoThree( (sal_Char *)pOneTwoThreeUTF8, SAL_N_ELEMENTS( pOneTwoThreeUTF8 ) - 1, RTL_TEXTENCODING_UTF8 ); - Window* pWin = new WorkWindow( (Window *)NULL ); + vcl::Window* pWin = new WorkWindow( (vcl::Window *)NULL ); CPPUNIT_ASSERT( pWin != NULL ); OutputDevice *pOutDev = static_cast< OutputDevice * >( pWin ); diff --git a/vcl/qa/cppunit/dndtest.cxx b/vcl/qa/cppunit/dndtest.cxx index c789f8cf71ba..f3aadab1cea6 100644 --- a/vcl/qa/cppunit/dndtest.cxx +++ b/vcl/qa/cppunit/dndtest.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::datatransfer::dnd; class MyWin : public WorkWindow { public: - MyWin( Window* pParent, WinBits nWinStyle ); + MyWin( vcl::Window* pParent, WinBits nWinStyle ); void MouseMove( const MouseEvent& rMEvt ); void MouseButtonDown( const MouseEvent& rMEvt ); @@ -62,11 +62,11 @@ public: class MyDragAndDropListener: public ::cppu::WeakImplHelper3 < XDropTargetListener, XDragGestureListener, XDragSourceListener > { - Window * m_pWindow; + vcl::Window * m_pWindow; public: - MyDragAndDropListener( Window * pWindow ) : m_pWindow( pWindow ) {}; + MyDragAndDropListener( vcl::Window * pWindow ) : m_pWindow( pWindow ) {}; virtual void SAL_CALL dragGestureRecognized( const DragGestureEvent& dge ) throw(RuntimeException); virtual void SAL_CALL drop( const DropTargetDropEvent& dtde ) throw(RuntimeException); @@ -87,7 +87,7 @@ class MyInfoBox : public InfoBox public: - MyInfoBox( Window* pParent ); + MyInfoBox( vcl::Window* pParent ); }; class MyListBox : public ListBox @@ -95,7 +95,7 @@ class MyListBox : public ListBox public: - MyListBox( Window* pParent ); + MyListBox( vcl::Window* pParent ); }; class StringTransferable : public ::cppu::WeakImplHelper1< XTransferable > @@ -152,7 +152,7 @@ void VclDnDTest::testDnD() aListBox.Show(); } -MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : +MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ) { Reference< XDropTargetListener > xListener = new MyDragAndDropListener( this ); @@ -258,7 +258,7 @@ void SAL_CALL MyDragAndDropListener::disposing( const EventObject& ) throw(Runti { } -MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent, +MyInfoBox::MyInfoBox( vcl::Window* pParent ) : InfoBox( pParent, OUString("dragging over this box should result in another window id in the drag log.") ) { Reference< XDropTargetListener > xListener = new MyDragAndDropListener( this ); @@ -275,7 +275,7 @@ MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent, xRecognizer->addDragGestureListener( Reference< XDragGestureListener > ( xListener, UNO_QUERY ) ); }; -MyListBox::MyListBox( Window* pParent ) : ListBox( pParent ) +MyListBox::MyListBox( vcl::Window* pParent ) : ListBox( pParent ) { Reference< XDropTargetListener > xListener = new MyDragAndDropListener( this ); diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 7b99b224ed6c..a35d62dead31 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -213,7 +213,7 @@ private: bool mbHelpText; public: - DbgInfoDialog( Window* pParent, bool bHelpText = false ); + DbgInfoDialog( vcl::Window* pParent, bool bHelpText = false ); void SetInfoText( const OUString& rStr ); }; @@ -378,7 +378,7 @@ void DbgDialog::RequestHelp( const HelpEvent& rHEvt ) } } -DbgInfoDialog::DbgInfoDialog( Window* pParent, bool bHelpText ) : +DbgInfoDialog::DbgInfoDialog( vcl::Window* pParent, bool bHelpText ) : ModalDialog( pParent, WB_STDMODAL ), maListBox( this, WB_BORDER | WB_AUTOHSCROLL ), maOKButton( this, WB_DEFBUTTON ) @@ -449,12 +449,12 @@ void DbgInfoDialog::SetInfoText( const OUString& rStr ) maListBox.SetUpdateMode( true ); } -void DbgDialogTest( Window* pWindow ) +void DbgDialogTest( vcl::Window* pWindow ) { bool aAccelBuf[65536] = {false}; sal_uInt16 nChildCount = pWindow->GetChildCount(); - Window* pGetChild = pWindow->GetWindow( WINDOW_FIRSTCHILD ); - Window* pChild; + vcl::Window* pGetChild = pWindow->GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window* pChild; Point aTabPos; if ( !pGetChild ) @@ -613,7 +613,7 @@ void DbgDialogTest( Window* pWindow ) if ( (i+1 < nChildCount) && !aText.isEmpty() ) { - Window* pTempChild = pGetChild->GetWindow( WINDOW_NEXT )->ImplGetWindow(); + vcl::Window* pTempChild = pGetChild->GetWindow( WINDOW_NEXT )->ImplGetWindow(); if ( (pTempChild->GetType() == WINDOW_EDIT) || (pTempChild->GetType() == WINDOW_MULTILINEEDIT) || (pTempChild->GetType() == WINDOW_SPINFIELD) || diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 3180bee56f9a..5a475e77213e 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -53,7 +53,7 @@ Help::~Help() { } -bool Help::Start( const OUString&, const Window* ) +bool Help::Start( const OUString&, const vcl::Window* ) { return false; } @@ -63,7 +63,7 @@ bool Help::SearchKeyword( const OUString& ) return false; } -OUString Help::GetHelpText( const OUString&, const Window* ) +OUString Help::GetHelpText( const OUString&, const vcl::Window* ) { return OUString(); } @@ -146,7 +146,7 @@ bool Help::IsBalloonHelpEnabled() return ImplGetSVData()->maHelpData.mbBalloonHelp; } -bool Help::ShowBalloon( Window* pParent, +bool Help::ShowBalloon( vcl::Window* pParent, const Point& rScreenPos, const OUString& rHelpText ) { @@ -156,7 +156,7 @@ bool Help::ShowBalloon( Window* pParent, return true; } -bool Help::ShowBalloon( Window* pParent, +bool Help::ShowBalloon( vcl::Window* pParent, const Point& rScreenPos, const Rectangle& rRect, const OUString& rHelpText ) { @@ -181,7 +181,7 @@ bool Help::IsQuickHelpEnabled() return ImplGetSVData()->maHelpData.mbQuickHelp; } -bool Help::ShowQuickHelp( Window* pParent, +bool Help::ShowQuickHelp( vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rHelpText, const OUString& rLongHelpText, @@ -200,7 +200,7 @@ void Help::HideBalloonAndQuickHelp() ImplDestroyHelpWindow( bIsVisible ); } -sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rScreenRect, +sal_uIntPtr Help::ShowTip( vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rText, sal_uInt16 nStyle ) { sal_uInt16 nHelpWinStyle = ( ( nStyle & QUICKHELP_TIP_STYLE_BALLOON ) != 0 ) ? HELPWINSTYLE_BALLOON : HELPWINSTYLE_QUICK; @@ -213,7 +213,7 @@ sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rScreenRect, return nId; } -void Help::UpdateTip( sal_uIntPtr nId, Window* pParent, const Rectangle& rScreenRect, const OUString& rText ) +void Help::UpdateTip( sal_uIntPtr nId, vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rText ) { HelpTextWindow* pHelpWin = reinterpret_cast< HelpTextWindow* >( nId ); ENSURE_OR_RETURN_VOID( pHelpWin != NULL, "Help::UpdateTip: invalid ID!" ); @@ -230,7 +230,7 @@ void Help::UpdateTip( sal_uIntPtr nId, Window* pParent, const Rectangle& rScreen void Help::HideTip( sal_uLong nId ) { HelpTextWindow* pHelpWin = (HelpTextWindow*)nId; - Window* pFrameWindow = pHelpWin->ImplGetFrameWindow(); + vcl::Window* pFrameWindow = pHelpWin->ImplGetFrameWindow(); pHelpWin->Hide(); // trigger update, so that a Paint is instantly triggered since we do not save the background pFrameWindow->ImplUpdateAll(); @@ -238,7 +238,7 @@ void Help::HideTip( sal_uLong nId ) ImplGetSVData()->maHelpData.mnLastHelpHideTime = Time::GetSystemTicks(); } -HelpTextWindow::HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ) : +HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ) : FloatingWindow( pParent, WB_SYSTEMWINDOW|WB_TOOLTIPWIN ), // #105827# if we change the parent, mirroring will not work correctly when positioning this window maHelpText( rText ) { @@ -464,7 +464,7 @@ OUString HelpTextWindow::GetText() const return FloatingWindow::CreateAccessible(); } -void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, +void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, const OUString& rHelpText, const OUString& rStatusText, const Point& rScreenPos, const Rectangle* pHelpArea ) { @@ -501,7 +501,7 @@ void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 n bool const bTextChanged = rHelpText != pHelpWin->GetHelpText(); if ( bTextChanged || ( ( nStyle & QUICKHELP_FORCE_REPOSITION ) != 0 ) ) { - Window * pWindow = pHelpWin->GetParent()->ImplGetFrameWindow(); + vcl::Window * pWindow = pHelpWin->GetParent()->ImplGetFrameWindow(); Rectangle aInvRect( pHelpWin->GetWindowExtentsRelative( pWindow ) ); if( pHelpWin->IsVisible() ) pWindow->Invalidate( aInvRect ); @@ -547,7 +547,7 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime ) HelpTextWindow* pHelpWin = pSVData->maHelpData.mpHelpWin; if ( pHelpWin ) { - Window * pWindow = pHelpWin->GetParent()->ImplGetFrameWindow(); + vcl::Window * pWindow = pHelpWin->GetParent()->ImplGetFrameWindow(); // find out screen area covered by system help window Rectangle aInvRect( pHelpWin->GetWindowExtentsRelative( pWindow ) ); if( pHelpWin->IsVisible() ) @@ -561,7 +561,7 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime ) } } -void ImplSetHelpWindowPos( Window* pHelpWin, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, +void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, const Point& rPos, const Rectangle* pHelpArea ) { Point aPos = rPos; @@ -665,7 +665,7 @@ void ImplSetHelpWindowPos( Window* pHelpWin, sal_uInt16 nHelpWinStyle, sal_uInt1 } } - Window* pWindow = pHelpWin->GetParent()->ImplGetFrameWindow(); + vcl::Window* pWindow = pHelpWin->GetParent()->ImplGetFrameWindow(); aPos = pWindow->AbsoluteScreenToOutputPixel( aPos ); pHelpWin->SetPosPixel( aPos ); } diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx index 226d09fb345c..7c5e9939c97a 100644 --- a/vcl/source/app/sound.cxx +++ b/vcl/source/app/sound.cxx @@ -24,7 +24,7 @@ #include <salframe.hxx> #include <svdata.hxx> -void Sound::Beep( Window* pWindow ) +void Sound::Beep( vcl::Window* pWindow ) { // #i91990# if ( Application::IsHeadlessModeEnabled() ) diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx index 2327639aa6fe..8093a6fe6900 100644 --- a/vcl/source/app/stdtext.cxx +++ b/vcl/source/app/stdtext.cxx @@ -34,7 +34,7 @@ OUString GetStandardText( sal_uInt16 nStdText ) return OUString(); } -void ShowServiceNotAvailableError(Window* pParent, +void ShowServiceNotAvailableError(vcl::Window* pParent, const OUString& rServiceName, bool bError) { OUString aText = GetStandardText(STANDARD_TEXT_SERVICE_NOT_AVAILABLE). diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index e2dc111ae65c..e5640c7a7f94 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -156,28 +156,28 @@ struct ImplEventHook struct ImplPostEventData { sal_uLong mnEvent; - const Window* mpWin; + const vcl::Window* mpWin; ImplSVEvent * mnEventId; KeyEvent maKeyEvent; MouseEvent maMouseEvent; ZoomEvent maZoomEvent; ScrollEvent maScrollEvent; - ImplPostEventData( sal_uLong nEvent, const Window* pWin, const KeyEvent& rKeyEvent ) : + ImplPostEventData( sal_uLong nEvent, const vcl::Window* pWin, const KeyEvent& rKeyEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maKeyEvent( rKeyEvent ) {} - ImplPostEventData( sal_uLong nEvent, const Window* pWin, const MouseEvent& rMouseEvent ) : + ImplPostEventData( sal_uLong nEvent, const vcl::Window* pWin, const MouseEvent& rMouseEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maMouseEvent( rMouseEvent ) {} #if !HAVE_FEATURE_DESKTOP - ImplPostEventData( sal_uLong nEvent, const Window* pWin, const ZoomEvent& rZoomEvent ) : + ImplPostEventData( sal_uLong nEvent, const vcl::Window* pWin, const ZoomEvent& rZoomEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maZoomEvent( rZoomEvent ) {} - ImplPostEventData( sal_uLong nEvent, const Window* pWin, const ScrollEvent& rScrollEvent ) : + ImplPostEventData( sal_uLong nEvent, const vcl::Window* pWin, const ScrollEvent& rScrollEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maScrollEvent( rScrollEvent ) {} #endif ~ImplPostEventData() {} }; -typedef ::std::pair< Window*, ImplPostEventData* > ImplPostEventPair; +typedef ::std::pair< vcl::Window*, ImplPostEventData* > ImplPostEventPair; static ::std::list< ImplPostEventPair > aPostedEventList; @@ -478,7 +478,7 @@ void Application::OverrideSystemSettings( AllSettings& /*rSettings*/ ) void Application::MergeSystemSettings( AllSettings& rSettings ) { - Window* pWindow = ImplGetSVData()->maWinData.mpFirstFrame; + vcl::Window* pWindow = ImplGetSVData()->maWinData.mpFirstFrame; if( ! pWindow ) pWindow = ImplGetDefaultWindow(); if( pWindow ) @@ -497,7 +497,7 @@ void Application::MergeSystemSettings( AllSettings& rSettings ) bool Application::ValidateSystemFont() { - Window* pWindow = ImplGetSVData()->maWinData.mpFirstFrame; + vcl::Window* pWindow = ImplGetSVData()->maWinData.mpFirstFrame; if( ! pWindow ) pWindow = ImplGetDefaultWindow(); @@ -542,7 +542,7 @@ void Application::SetSettings( const AllSettings& rSettings ) ImplCallEventListeners( VCLEVENT_APPLICATION_DATACHANGED, NULL, &aDCEvt); // Update all windows - Window* pFirstFrame = pSVData->maWinData.mpFirstFrame; + vcl::Window* pFirstFrame = pSVData->maWinData.mpFirstFrame; // Reset data that needs to be re-calculated long nOldDPIX = 0; long nOldDPIY = 0; @@ -550,21 +550,21 @@ void Application::SetSettings( const AllSettings& rSettings ) { nOldDPIX = pFirstFrame->mnDPIX; nOldDPIY = pFirstFrame->mnDPIY; - Window::ImplInitAppFontData(pFirstFrame); + vcl::Window::ImplInitAppFontData(pFirstFrame); } - Window* pFrame = pFirstFrame; + vcl::Window* pFrame = pFirstFrame; while ( pFrame ) { // restore AppFont cache data pFrame->mpWindowImpl->mpFrameData->meMapUnit = MAP_PIXEL; // call UpdateSettings from ClientWindow in order to prevent updating data twice - Window* pClientWin = pFrame; + vcl::Window* pClientWin = pFrame; while ( pClientWin->ImplGetClientWindow() ) pClientWin = pClientWin->ImplGetClientWindow(); pClientWin->UpdateSettings( rSettings, true ); - Window* pTempWin = pFrame->mpWindowImpl->mpFrameData->mpFirstOverlap; + vcl::Window* pTempWin = pFrame->mpWindowImpl->mpFrameData->mpFirstOverlap; while ( pTempWin ) { // call UpdateSettings from ClientWindow in order to prevent updating data twice @@ -636,12 +636,12 @@ void Application::InitSettings() void Application::NotifyAllWindows( DataChangedEvent& rDCEvt ) { ImplSVData* pSVData = ImplGetSVData(); - Window* pFrame = pSVData->maWinData.mpFirstFrame; + vcl::Window* pFrame = pSVData->maWinData.mpFirstFrame; while ( pFrame ) { pFrame->NotifyAllChildren( rDCEvt ); - Window* pSysWin = pFrame->mpWindowImpl->mpFrameData->mpFirstOverlap; + vcl::Window* pSysWin = pFrame->mpWindowImpl->mpFrameData->mpFirstOverlap; while ( pSysWin ) { pSysWin->NotifyAllChildren( rDCEvt ); @@ -652,7 +652,7 @@ void Application::NotifyAllWindows( DataChangedEvent& rDCEvt ) } } -void Application::ImplCallEventListeners( sal_uLong nEvent, Window *pWin, void* pData ) +void Application::ImplCallEventListeners( sal_uLong nEvent, vcl::Window *pWin, void* pData ) { ImplSVData* pSVData = ImplGetSVData(); VclWindowEvent aEvent( pWin, nEvent, pData ); @@ -699,7 +699,7 @@ void Application::RemoveKeyListener( const Link& rKeyListener ) pSVData->maAppData.mpKeyListeners->removeListener( rKeyListener ); } -bool Application::HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ) +bool Application::HandleKey( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ) { // let listeners process the key event VclWindowEvent aEvent( pWin, nEvent, (void *) pKeyEvent ); @@ -713,7 +713,7 @@ bool Application::HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent return bProcessed; } -ImplSVEvent * Application::PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ) +ImplSVEvent * Application::PostKeyEvent( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ) { const SolarMutexGuard aGuard; ImplSVEvent * nEventId = 0; @@ -738,7 +738,7 @@ ImplSVEvent * Application::PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEven return nEventId; } -ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent ) +ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, MouseEvent* pMouseEvent ) { const SolarMutexGuard aGuard; ImplSVEvent * nEventId = 0; @@ -773,7 +773,7 @@ ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, Window *pWin, Mouse #if !HAVE_FEATURE_DESKTOP -ImplSVEvent * Application::PostZoomEvent( sal_uLong nEvent, Window *pWin, ZoomEvent* pZoomEvent ) +ImplSVEvent * Application::PostZoomEvent( sal_uLong nEvent, vcl::Window *pWin, ZoomEvent* pZoomEvent ) { const SolarMutexGuard aGuard; ImplSVEvent * nEventId = 0; @@ -805,7 +805,7 @@ ImplSVEvent * Application::PostZoomEvent( sal_uLong nEvent, Window *pWin, ZoomEv return nEventId; } -ImplSVEvent * Application::PostScrollEvent( sal_uLong nEvent, Window *pWin, ScrollEvent* pScrollEvent ) +ImplSVEvent * Application::PostScrollEvent( sal_uLong nEvent, vcl::Window *pWin, ScrollEvent* pScrollEvent ) { const SolarMutexGuard aGuard; ImplSVEvent * nEventId = 0; @@ -903,7 +903,7 @@ IMPL_STATIC_LINK_NOINSTANCE( Application, PostEventHandler, void*, pCallData ) return 0; } -void Application::RemoveMouseAndKeyEvents( Window* pWin ) +void Application::RemoveMouseAndKeyEvents( vcl::Window* pWin ) { const SolarMutexGuard aGuard; @@ -932,7 +932,7 @@ ImplSVEvent * Application::PostUserEvent( const Link& rLink, void* pCaller ) pSVEvent->mpLink = new Link( rLink ); pSVEvent->mpWindow = NULL; pSVEvent->mbCall = true; - Window* pDefWindow = ImplGetDefaultWindow(); + vcl::Window* pDefWindow = ImplGetDefaultWindow(); if ( pDefWindow == 0 || !pDefWindow->ImplGetFrame()->PostEvent( pSVEvent ) ) { delete pSVEvent->mpLink; @@ -1013,7 +1013,7 @@ WorkWindow* Application::GetAppWindow() return ImplGetSVData()->maWinData.mpAppWin; } -Window* Application::GetFocusWindow() +vcl::Window* Application::GetFocusWindow() { return ImplGetSVData()->maWinData.mpFocusWin; } @@ -1023,13 +1023,13 @@ OutputDevice* Application::GetDefaultDevice() return ImplGetDefaultWindow(); } -Window* Application::GetFirstTopLevelWindow() +vcl::Window* Application::GetFirstTopLevelWindow() { ImplSVData* pSVData = ImplGetSVData(); return pSVData->maWinData.mpFirstFrame; } -Window* Application::GetNextTopLevelWindow( Window* pWindow ) +vcl::Window* Application::GetNextTopLevelWindow( vcl::Window* pWindow ) { return pWindow->mpWindowImpl->mpFrameData->mpNextFrame; } @@ -1038,7 +1038,7 @@ long Application::GetTopWindowCount() { long nRet = 0; ImplSVData* pSVData = ImplGetSVData(); - Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame : NULL; + vcl::Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame : NULL; while( pWin ) { if( pWin->ImplGetWindow()->IsTopWindow() ) @@ -1048,11 +1048,11 @@ long Application::GetTopWindowCount() return nRet; } -Window* Application::GetTopWindow( long nIndex ) +vcl::Window* Application::GetTopWindow( long nIndex ) { long nIdx = 0; ImplSVData* pSVData = ImplGetSVData(); - Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame : NULL; + vcl::Window *pWin = pSVData ? pSVData->maWinData.mpFirstFrame : NULL; while( pWin ) { if( pWin->ImplGetWindow()->IsTopWindow() ) @@ -1067,9 +1067,9 @@ Window* Application::GetTopWindow( long nIndex ) return NULL; } -Window* Application::GetActiveTopWindow() +vcl::Window* Application::GetActiveTopWindow() { - Window *pWin = ImplGetSVData()->maWinData.mpFocusWin; + vcl::Window *pWin = ImplGetSVData()->maWinData.mpFocusWin; while( pWin ) { if( pWin->IsTopWindow() ) @@ -1285,12 +1285,12 @@ void Application::SetDialogScaleX( short nScale ) pSVData->maGDIData.mnAppFontX += (pSVData->maGDIData.mnAppFontX*nScale)/100; } -void Application::SetDefDialogParent( Window* pWindow ) +void Application::SetDefDialogParent( vcl::Window* pWindow ) { ImplGetSVData()->maWinData.mpDefDialogParent = pWindow; } -Window* Application::GetDefDialogParent() +vcl::Window* Application::GetDefDialogParent() { ImplSVData* pSVData = ImplGetSVData(); // #103442# find some useful dialog parent if there @@ -1305,7 +1305,7 @@ Window* Application::GetDefDialogParent() // as DefDialogParent // current focus frame - Window *pWin = NULL; + vcl::Window *pWin = NULL; if( (pWin = pSVData->maWinData.mpFocusWin) != NULL ) { while( pWin->mpWindowImpl && pWin->mpWindowImpl->mpParent ) @@ -1670,10 +1670,10 @@ void Application::setDeInitHook(Link const & hook) { } // helper method to allow inline constructor even for pWindow!=NULL case -void ImplDelData::AttachToWindow( const Window* pWindow ) +void ImplDelData::AttachToWindow( const vcl::Window* pWindow ) { if( pWindow ) - const_cast<Window*>(pWindow)->ImplAddDel( this ); + const_cast<vcl::Window*>(pWindow)->ImplAddDel( this ); } // define dtor for ImplDelData @@ -1684,7 +1684,7 @@ ImplDelData::~ImplDelData() if( !mbDel && mpWindow ) { // the window still exists but we were not removed - const_cast<Window*>(mpWindow)->ImplRemoveDel( this ); + const_cast<vcl::Window*>(mpWindow)->ImplRemoveDel( this ); mpWindow = NULL; } } diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 6054d6968f18..0aaff4a14e05 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -109,7 +109,7 @@ void ImplDestroySVData() pImplSVData = NULL; } -Window* ImplGetDefaultWindow() +vcl::Window* ImplGetDefaultWindow() { ImplSVData* pSVData = ImplGetSVData(); if ( pSVData->maWinData.mpAppWin ) @@ -272,15 +272,15 @@ bool ImplInitAccessBridge() return true; } -Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos ) +vcl::Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos ) { ImplSVData* pSVData = ImplGetSVData(); - Window* pFrameWindow = pSVData->maWinData.mpFirstFrame; + vcl::Window* pFrameWindow = pSVData->maWinData.mpFirstFrame; while ( pFrameWindow ) { if ( pFrameWindow->ImplGetFrame() == pFrame ) { - Window* pWindow = pFrameWindow->ImplFindWindow( rSalFramePos ); + vcl::Window* pWindow = pFrameWindow->ImplFindWindow( rSalFramePos ); if ( !pWindow ) pWindow = pFrameWindow->ImplGetWindow(); rSalFramePos = pWindow->ImplFrameToOutput( rSalFramePos ); diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 6c287551da4f..bd3544bc125a 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -362,7 +362,7 @@ void DeInitVCL() long nBadTopWindows = nTopWindowCount; for( long i = 0; i < nTopWindowCount; i++ ) { - Window* pWin = Application::GetTopWindow( i ); + vcl::Window* pWin = Application::GetTopWindow( i ); // default window will be destroyed further down // but may still be useful during deinit up to that point if( pWin == pSVData->mpDefaultWin ) diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index bfc7fd26976a..cef9d0dce18d 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -597,13 +597,13 @@ void PushButton::ImplInitPushButtonData() namespace { - Window* getPreviousSibling(Window *pParent) + vcl::Window* getPreviousSibling(vcl::Window *pParent) { return pParent ? pParent->GetWindow(WINDOW_LASTCHILD) : NULL; } } -void PushButton::ImplInit( Window* pParent, WinBits nStyle ) +void PushButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle(getPreviousSibling(pParent), nStyle); Button::ImplInit( pParent, nStyle, NULL ); @@ -614,7 +614,7 @@ void PushButton::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } -WinBits PushButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ) +WinBits PushButton::ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ) { if ( !(nStyle & WB_NOTABSTOP) ) nStyle |= WB_TABSTOP; @@ -675,7 +675,7 @@ void PushButton::ImplInitSettings( bool bFont, } } -void PushButton::ImplDrawPushButtonFrame( Window* pDev, +void PushButton::ImplDrawPushButtonFrame( vcl::Window* pDev, Rectangle& rRect, sal_uInt16 nStyle ) { if ( !(pDev->GetStyle() & (WB_RECTSTYLE | WB_SMALLSTYLE)) ) @@ -701,7 +701,7 @@ void PushButton::ImplDrawPushButtonFrame( Window* pDev, rRect = aDecoView.DrawButton( rRect, nStyle ); } -bool PushButton::ImplHitTestPushButton( Window* pDev, +bool PushButton::ImplHitTestPushButton( vcl::Window* pDev, const Point& rPos ) { Point aTempPoint; @@ -1139,14 +1139,14 @@ PushButton::PushButton( WindowType nType ) : ImplInitPushButtonData(); } -PushButton::PushButton( Window* pParent, WinBits nStyle ) : +PushButton::PushButton( vcl::Window* pParent, WinBits nStyle ) : Button( WINDOW_PUSHBUTTON ) { ImplInitPushButtonData(); ImplInit( pParent, nStyle ); } -PushButton::PushButton( Window* pParent, const ResId& rResId ) : +PushButton::PushButton( vcl::Window* pParent, const ResId& rResId ) : Button( WINDOW_PUSHBUTTON ) { rResId.SetRT( RSC_PUSHBUTTON ); @@ -1480,7 +1480,7 @@ bool PushButton::PreNotify( NotifyEvent& rNEvt ) if( bDropDown && GetParent()->IsNativeControlSupported( aCtrlType, PART_ENTIRE_CONTROL) && !GetParent()->IsNativeControlSupported( aCtrlType, PART_BUTTON_DOWN) ) { - Window *pBorder = GetParent()->GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetParent()->GetWindow( WINDOW_BORDER ); if(aCtrlType == CTRL_COMBOBOX) { // only paint the button part to avoid flickering of the combobox text @@ -1634,14 +1634,14 @@ bool PushButton::set_property(const OString &rKey, const OString &rValue) return true; } -void OKButton::ImplInit( Window* pParent, WinBits nStyle ) +void OKButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { PushButton::ImplInit( pParent, nStyle ); SetText( Button::GetStandardText( BUTTON_OK ) ); } -OKButton::OKButton( Window* pParent, WinBits nStyle ) : +OKButton::OKButton( vcl::Window* pParent, WinBits nStyle ) : PushButton( WINDOW_OKBUTTON ) { ImplInit( pParent, nStyle ); @@ -1652,7 +1652,7 @@ void OKButton::Click() // close parent if no link set if ( !GetClickHdl() ) { - Window* pParent = getNonLayoutParent(this); + vcl::Window* pParent = getNonLayoutParent(this); if ( pParent->IsSystemWindow() ) { if ( pParent->IsDialog() ) @@ -1679,14 +1679,14 @@ void OKButton::Click() } } -void CancelButton::ImplInit( Window* pParent, WinBits nStyle ) +void CancelButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { PushButton::ImplInit( pParent, nStyle ); SetText( Button::GetStandardText( BUTTON_CANCEL ) ); } -CancelButton::CancelButton( Window* pParent, WinBits nStyle ) : +CancelButton::CancelButton( vcl::Window* pParent, WinBits nStyle ) : PushButton( WINDOW_CANCELBUTTON ) { ImplInit( pParent, nStyle ); @@ -1697,7 +1697,7 @@ void CancelButton::Click() // close parent if link not set if ( !GetClickHdl() ) { - Window* pParent = getNonLayoutParent(this); + vcl::Window* pParent = getNonLayoutParent(this); if ( pParent->IsSystemWindow() ) { if ( pParent->IsDialog() ) @@ -1724,26 +1724,26 @@ void CancelButton::Click() } } -CloseButton::CloseButton( Window* pParent, WinBits nStyle ) +CloseButton::CloseButton( vcl::Window* pParent, WinBits nStyle ) : CancelButton(pParent, nStyle) { SetText( Button::GetStandardText( BUTTON_CLOSE ) ); } -void HelpButton::ImplInit( Window* pParent, WinBits nStyle ) +void HelpButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { PushButton::ImplInit( pParent, nStyle | WB_NOPOINTERFOCUS ); SetText( Button::GetStandardText( BUTTON_HELP ) ); } -HelpButton::HelpButton( Window* pParent, WinBits nStyle ) : +HelpButton::HelpButton( vcl::Window* pParent, WinBits nStyle ) : PushButton( WINDOW_HELPBUTTON ) { ImplInit( pParent, nStyle ); } -HelpButton::HelpButton( Window* pParent, const ResId& rResId ) : +HelpButton::HelpButton( vcl::Window* pParent, const ResId& rResId ) : PushButton( WINDOW_HELPBUTTON ) { rResId.SetRT( RSC_HELPBUTTON ); @@ -1760,7 +1760,7 @@ void HelpButton::Click() // trigger help if no link set if ( !GetClickHdl() ) { - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); if ( !pFocusWin ) pFocusWin = this; @@ -1778,7 +1778,7 @@ void RadioButton::ImplInitRadioButtonData() mbStateChanged = false; } -void RadioButton::ImplInit( Window* pParent, WinBits nStyle ) +void RadioButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle(getPreviousSibling(pParent), nStyle); Button::ImplInit( pParent, nStyle, NULL ); @@ -1786,7 +1786,7 @@ void RadioButton::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } -WinBits RadioButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ) +WinBits RadioButton::ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ) { if ( !(nStyle & WB_NOGROUP) && (!pPrevWindow || (pPrevWindow->GetType() != WINDOW_RADIOBUTTON)) ) @@ -1818,7 +1818,7 @@ void RadioButton::ImplInitSettings( bool bFont, if ( bBackground ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( !IsControlBackground() && (pParent->IsChildTransparentModeEnabled() || IsNativeControlSupported( CTRL_RADIOBUTTON, PART_ENTIRE_CONTROL ) ) ) { @@ -2197,10 +2197,10 @@ std::vector< RadioButton* > RadioButton::GetRadioButtonGroup(bool bIncludeThis) SAL_WARN("vcl.control", "No new-style group set on radiobutton <" << GetHelpId() << "> using old-style digging around"); // go back to first in group; - Window* pFirst = const_cast<RadioButton*>(this); + vcl::Window* pFirst = const_cast<RadioButton*>(this); while( ( pFirst->GetStyle() & WB_GROUP ) == 0 ) { - Window* pWindow = pFirst->GetWindow( WINDOW_PREV ); + vcl::Window* pWindow = pFirst->GetWindow( WINDOW_PREV ); if( pWindow ) pFirst = pWindow; else @@ -2272,14 +2272,14 @@ void RadioButton::ImplCallClick( bool bGrabFocus, sal_uInt16 nFocusFlags ) mbStateChanged = false; } -RadioButton::RadioButton( Window* pParent, WinBits nStyle ) : +RadioButton::RadioButton( vcl::Window* pParent, WinBits nStyle ) : Button( WINDOW_RADIOBUTTON ), mbLegacyNoTextAlign( false ) { ImplInitRadioButtonData(); ImplInit( pParent, nStyle ); } -RadioButton::RadioButton( Window* pParent, const ResId& rResId ) : +RadioButton::RadioButton( vcl::Window* pParent, const ResId& rResId ) : Button( WINDOW_RADIOBUTTON ), mbLegacyNoTextAlign( false ) { rResId.SetRT( RSC_RADIOBUTTON ); @@ -2896,7 +2896,7 @@ void CheckBox::ImplInitCheckBoxData() mbTriState = false; } -void CheckBox::ImplInit( Window* pParent, WinBits nStyle ) +void CheckBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle(getPreviousSibling(pParent), nStyle); Button::ImplInit( pParent, nStyle, NULL ); @@ -2904,7 +2904,7 @@ void CheckBox::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings( true, true, true ); } -WinBits CheckBox::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ) +WinBits CheckBox::ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ) { if ( !(nStyle & WB_NOTABSTOP) ) nStyle |= WB_TABSTOP; @@ -2931,7 +2931,7 @@ void CheckBox::ImplInitSettings( bool bFont, if ( bBackground ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( !IsControlBackground() && (pParent->IsChildTransparentModeEnabled() || IsNativeControlSupported( CTRL_CHECKBOX, PART_ENTIRE_CONTROL ) ) ) { @@ -3173,14 +3173,14 @@ void CheckBox::ImplCheck() Click(); } -CheckBox::CheckBox( Window* pParent, WinBits nStyle ) : +CheckBox::CheckBox( vcl::Window* pParent, WinBits nStyle ) : Button( WINDOW_CHECKBOX ), mbLegacyNoTextAlign( false ) { ImplInitCheckBoxData(); ImplInit( pParent, nStyle ); } -CheckBox::CheckBox( Window* pParent, const ResId& rResId ) : +CheckBox::CheckBox( vcl::Window* pParent, const ResId& rResId ) : Button( WINDOW_CHECKBOX ), mbLegacyNoTextAlign( false ) { rResId.SetRT( RSC_CHECKBOX ); @@ -3726,13 +3726,13 @@ Size CheckBox::GetOptimalSize() const return CalcMinimumSize(); } -ImageButton::ImageButton( Window* pParent, WinBits nStyle ) : +ImageButton::ImageButton( vcl::Window* pParent, WinBits nStyle ) : PushButton( pParent, nStyle ) { ImplInitStyle(); } -ImageButton::ImageButton( Window* pParent, const ResId& rResId ) : +ImageButton::ImageButton( vcl::Window* pParent, const ResId& rResId ) : PushButton( pParent, rResId.SetRT( RSC_IMAGEBUTTON ) ) { sal_uLong nObjMask = ReadLongRes(); @@ -3769,7 +3769,7 @@ void ImageButton::ImplInitStyle() SetStyle( nStyle ); } -ImageRadioButton::ImageRadioButton( Window* pParent, WinBits nStyle ) : +ImageRadioButton::ImageRadioButton( vcl::Window* pParent, WinBits nStyle ) : RadioButton( pParent, nStyle ) { } @@ -3778,7 +3778,7 @@ ImageRadioButton::~ImageRadioButton() { } -TriStateBox::TriStateBox( Window* pParent, WinBits nStyle ) : +TriStateBox::TriStateBox( vcl::Window* pParent, WinBits nStyle ) : CheckBox( pParent, nStyle ) { EnableTriState( true ); @@ -3788,7 +3788,7 @@ TriStateBox::~TriStateBox() { } -DisclosureButton::DisclosureButton( Window* pParent, WinBits nStyle ) : +DisclosureButton::DisclosureButton( vcl::Window* pParent, WinBits nStyle ) : CheckBox( pParent, nStyle ) { } diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index be4c071c5ea6..cb39c0a5b7c5 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -44,7 +44,7 @@ static void lcl_GetSelectedEntries( ::std::set< sal_Int32 >& rSelectedPos, const } } -ComboBox::ComboBox( Window* pParent, WinBits nStyle ) : +ComboBox::ComboBox( vcl::Window* pParent, WinBits nStyle ) : Edit( WINDOW_COMBOBOX ) { ImplInitComboBoxData(); @@ -52,7 +52,7 @@ ComboBox::ComboBox( Window* pParent, WinBits nStyle ) : SetWidthInChars(-1); } -ComboBox::ComboBox( Window* pParent, const ResId& rResId ) : +ComboBox::ComboBox( vcl::Window* pParent, const ResId& rResId ) : Edit( WINDOW_COMBOBOX ) { ImplInitComboBoxData(); @@ -118,7 +118,7 @@ void ComboBox::ImplCalcEditHeight() } } -void ComboBox::ImplInit( Window* pParent, WinBits nStyle ) +void ComboBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) { ImplInitStyle( nStyle ); @@ -172,7 +172,7 @@ void ComboBox::ImplInit( Window* pParent, WinBits nStyle ) EnableAutocomplete( true ); mpSubEdit->Show(); - Window* pLBParent = this; + vcl::Window* pLBParent = this; if ( mpFloatWin ) pLBParent = mpFloatWin; mpImplLB = new ImplListBox( pLBParent, nListStyle|WB_SIMPLEMODE|WB_AUTOHSCROLL ); @@ -981,7 +981,7 @@ long ComboBox::getMaxWidthScrollBarAndDownButton() const { long nButtonDownWidth = 0; - Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); ImplControlValue aControlValue; Point aPoint; Rectangle aContent, aBound; @@ -1041,7 +1041,7 @@ Size ComboBox::CalcAdjustedSize( const Size& rPrefSize ) const { Size aSz = rPrefSize; sal_Int32 nLeft, nTop, nRight, nBottom; - ((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); + ((vcl::Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); aSz.Height() -= nTop+nBottom; if ( !IsDropDownBox() ) { @@ -1357,7 +1357,7 @@ void ComboBox::SetNoSelection() Rectangle ComboBox::GetBoundingRectangle( sal_Int32 nItem ) const { Rectangle aRect = mpImplLB->GetMainWindow().GetBoundingRectangle( nItem ); - Rectangle aOffset = mpImplLB->GetMainWindow().GetWindowExtentsRelative( (Window*)this ); + Rectangle aOffset = mpImplLB->GetMainWindow().GetWindowExtentsRelative( (vcl::Window*)this ); aRect.Move( aOffset.TopLeft().X(), aOffset.TopLeft().Y() ); return aRect; } @@ -1414,7 +1414,7 @@ ComboBox::ComboBoxBounds ComboBox::calcComboBoxDropDownComponentBounds(const Siz long nTop = 0; long nBottom = rOutSz.Height(); - Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); ImplControlValue aControlValue; Point aPoint; Rectangle aContent, aBound; diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 83a977d00fb6..4282453df27d 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -45,14 +45,14 @@ Control::Control( WindowType nType ) : ImplInitControlData(); } -Control::Control( Window* pParent, WinBits nStyle ) : +Control::Control( vcl::Window* pParent, WinBits nStyle ) : Window( WINDOW_CONTROL ) { ImplInitControlData(); ImplInit( pParent, nStyle, NULL ); } -Control::Control( Window* pParent, const ResId& rResId ) : +Control::Control( vcl::Window* pParent, const ResId& rResId ) : Window( WINDOW_CONTROL ) { ImplInitControlData(); @@ -258,7 +258,7 @@ bool Control::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_LOSEFOCUS ) { - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); if ( !pFocusWin || !ImplIsWindowOrChild( pFocusWin ) ) { mbHasControlFocus = false; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 8be4dc8be560..f33cbcbe09ea 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -161,14 +161,14 @@ Edit::Edit( WindowType nType ) : ImplInitEditData(); } -Edit::Edit( Window* pParent, WinBits nStyle ) : +Edit::Edit( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_EDIT ) { ImplInitEditData(); ImplInit( pParent, nStyle ); } -Edit::Edit( Window* pParent, const ResId& rResId ) : +Edit::Edit( vcl::Window* pParent, const ResId& rResId ) : Control( WINDOW_EDIT ) { rResId.SetRT( RSC_EDIT ); @@ -308,7 +308,7 @@ bool Edit::ImplUseNativeBorder( WinBits nStyle ) && ((nStyle&WB_BORDER) && !(nStyle&WB_NOBORDER)); if( ! bRet && mbIsSubEdit ) { - Window* pWindow = GetParent(); + vcl::Window* pWindow = GetParent(); nStyle = pWindow->GetStyle(); bRet = pWindow->IsNativeControlSupported(ImplGetNativeControlType(), HAS_BACKGROUND_TEXTURE) && ((nStyle&WB_BORDER) && !(nStyle&WB_NOBORDER)); @@ -316,7 +316,7 @@ bool Edit::ImplUseNativeBorder( WinBits nStyle ) return bRet; } -void Edit::ImplInit( Window* pParent, WinBits nStyle ) +void Edit::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); if ( !(nStyle & (WB_CENTER | WB_RIGHT)) ) @@ -786,7 +786,7 @@ uno::Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenc return mxISC; } -void Edit::ShowTruncationWarning( Window* pParent ) +void Edit::ShowTruncationWarning( vcl::Window* pParent ) { ResMgr* pResMgr = ImplGetResMgr(); if( pResMgr ) @@ -944,7 +944,7 @@ void Edit::ImplSetText( const OUString& rText, const Selection* pNewSelection ) int Edit::ImplGetNativeControlType() const { int nCtrl = 0; - const Window *pControl = mbIsSubEdit ? GetParent() : this; + const vcl::Window *pControl = mbIsSubEdit ? GetParent() : this; switch( pControl->GetType() ) { @@ -1016,11 +1016,11 @@ void Edit::ImplPaintBorder( long nXStart, long nXEnd ) if( ImplUseNativeBorder( GetStyle() ) || IsPaintTransparent() ) { // draw the inner part by painting the whole control using its border window - Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); if( pBorder == this ) { // we have no border, use parent - Window *pControl = mbIsSubEdit ? GetParent() : this; + vcl::Window *pControl = mbIsSubEdit ? GetParent() : this; pBorder = pControl->GetWindow( WINDOW_BORDER ); if( pBorder == this ) pBorder = GetParent(); @@ -1856,10 +1856,10 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_u } } -void Edit::ImplInvalidateOutermostBorder( Window* pWin ) +void Edit::ImplInvalidateOutermostBorder( vcl::Window* pWin ) { // allow control to show focused state - Window *pInvalWin = pWin, *pBorder = pWin; + vcl::Window *pInvalWin = pWin, *pBorder = pWin; while( ( pBorder = pInvalWin->GetWindow( WINDOW_BORDER ) ) != pInvalWin && pBorder && pInvalWin->ImplGetFrame() == pBorder->ImplGetFrame() ) { @@ -1922,7 +1922,7 @@ void Edit::GetFocus() Control::GetFocus(); } -Window* Edit::GetPreferredKeyInputWindow() +vcl::Window* Edit::GetPreferredKeyInputWindow() { if ( mpSubEdit ) return mpSubEdit->GetPreferredKeyInputWindow(); @@ -2768,7 +2768,7 @@ Size Edit::CalcMinimumSize() const Size Edit::GetMinimumEditSize() { - Window* pDefWin = ImplGetDefaultWindow(); + vcl::Window* pDefWin = ImplGetDefaultWindow(); Edit aEdit( pDefWin, WB_BORDER ); Size aSize( aEdit.CalcMinimumSize() ); return aSize; @@ -2792,7 +2792,7 @@ Size Edit::CalcSize(sal_Int32 nChars) const sal_Int32 Edit::GetMaxVisChars() const { - const Window* pW = mpSubEdit ? mpSubEdit : this; + const vcl::Window* pW = mpSubEdit ? mpSubEdit : this; sal_Int32 nOutWidth = pW->GetOutputSizePixel().Width(); sal_Int32 nCharWidth = GetTextWidth( OUString('x') ); return nCharWidth ? nOutWidth/nCharWidth : 0; diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 4b209e2887d5..e57c7f6533e5 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -720,14 +720,14 @@ void NumericFormatter::ImplNewFieldValue( sal_Int64 nNewValue ) } } -NumericField::NumericField( Window* pParent, WinBits nWinStyle ) : +NumericField::NumericField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ) { SetField( this ); Reformat(); } -NumericField::NumericField( Window* pParent, const ResId& rResId ) : +NumericField::NumericField( vcl::Window* pParent, const ResId& rResId ) : SpinField( WINDOW_NUMERICFIELD ) { rResId.SetRT( RSC_NUMERICFIELD ); @@ -883,7 +883,7 @@ Size NumericField::CalcMinimumSize() const return calcMinimumSize(*this, *this); } -NumericBox::NumericBox( Window* pParent, WinBits nWinStyle ) : +NumericBox::NumericBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); @@ -1546,14 +1546,14 @@ sal_Int64 MetricFormatter::GetCorrectedValue( FieldUnit eOutUnit ) const meUnit, eOutUnit ); } -MetricField::MetricField( Window* pParent, WinBits nWinStyle ) : +MetricField::MetricField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ) { SetField( this ); Reformat(); } -MetricField::MetricField( Window* pParent, const ResId& rResId ) : +MetricField::MetricField( vcl::Window* pParent, const ResId& rResId ) : SpinField( WINDOW_METRICFIELD ) { rResId.SetRT( RSC_METRICFIELD ); @@ -1727,7 +1727,7 @@ void MetricField::CustomConvert() maCustomConvertLink.Call( this ); } -MetricBox::MetricBox( Window* pParent, WinBits nWinStyle ) : +MetricBox::MetricBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); @@ -1975,7 +1975,7 @@ void CurrencyFormatter::Reformat() SetValue( mnLastValue ); } -CurrencyField::CurrencyField( Window* pParent, WinBits nWinStyle ) : +CurrencyField::CurrencyField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ) { SetField( this ); @@ -2057,7 +2057,7 @@ void CurrencyField::Last() SpinField::Last(); } -CurrencyBox::CurrencyBox( Window* pParent, WinBits nWinStyle ) : +CurrencyBox::CurrencyBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 9800030d3b99..4dd7e8568336 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -813,7 +813,7 @@ void PatternFormatter::Reformat() } } -PatternField::PatternField( Window* pParent, WinBits nWinStyle ) : +PatternField::PatternField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ) { SetField( this ); @@ -863,7 +863,7 @@ void PatternField::Modify() SpinField::Modify(); } -PatternBox::PatternBox( Window* pParent, WinBits nWinStyle ) : +PatternBox::PatternBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); @@ -1762,7 +1762,7 @@ void DateFormatter::ExpandCentury( Date& rDate, sal_uInt16 nTwoDigitYearStart ) } } -DateField::DateField( Window* pParent, WinBits nWinStyle ) : +DateField::DateField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ), maFirst( GetMin() ), maLast( GetMax() ) @@ -1773,7 +1773,7 @@ DateField::DateField( Window* pParent, WinBits nWinStyle ) : ResetLastDate(); } -DateField::DateField( Window* pParent, const ResId& rResId ) : +DateField::DateField( vcl::Window* pParent, const ResId& rResId ) : SpinField( WINDOW_DATEFIELD ), maFirst( GetMin() ), maLast( GetMax() ) @@ -1911,7 +1911,7 @@ void DateField::Last() SpinField::Last(); } -DateBox::DateBox( Window* pParent, WinBits nWinStyle ) : +DateBox::DateBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); @@ -2642,7 +2642,7 @@ void TimeFormatter::Reformat() SetTime( maLastTime ); } -TimeField::TimeField( Window* pParent, WinBits nWinStyle ) : +TimeField::TimeField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ), maFirst( GetMin() ), maLast( GetMax() ) @@ -2652,7 +2652,7 @@ TimeField::TimeField( Window* pParent, WinBits nWinStyle ) : Reformat(); } -TimeField::TimeField( Window* pParent, const ResId& rResId ) : +TimeField::TimeField( vcl::Window* pParent, const ResId& rResId ) : SpinField( WINDOW_TIMEFIELD ), maFirst( GetMin() ), maLast( GetMax() ) @@ -2826,7 +2826,7 @@ void TimeField::SetExtFormat( ExtTimeFieldFormat eFormat ) ReformatAll(); } -TimeBox::TimeBox( Window* pParent, WinBits nWinStyle ) : +TimeBox::TimeBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 8d6cb0f8c9a6..beaa5b835aa7 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -80,7 +80,7 @@ static Point ImplCalcPos( WinBits nStyle, const Point& rPos, return aPos; } -void FixedText::ImplInit( Window* pParent, WinBits nStyle ) +void FixedText::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); Control::ImplInit( pParent, nStyle, NULL ); @@ -111,7 +111,7 @@ void FixedText::ImplInitSettings( bool bFont, if ( bBackground ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); @@ -133,7 +133,7 @@ void FixedText::ImplInitSettings( bool bFont, } } -FixedText::FixedText( Window* pParent, WinBits nStyle ) +FixedText::FixedText( vcl::Window* pParent, WinBits nStyle ) : Control(WINDOW_FIXEDTEXT) , m_nMaxWidthChars(-1) , m_nMinWidthChars(-1) @@ -142,7 +142,7 @@ FixedText::FixedText( Window* pParent, WinBits nStyle ) ImplInit( pParent, nStyle ); } -FixedText::FixedText( Window* pParent, const ResId& rResId ) +FixedText::FixedText( vcl::Window* pParent, const ResId& rResId ) : Control(WINDOW_FIXEDTEXT) , m_nMaxWidthChars(-1) , m_nMinWidthChars(-1) @@ -435,21 +435,21 @@ bool FixedText::set_property(const OString &rKey, const OString &rValue) return true; } -Window* FixedText::getAccessibleRelationLabelFor() const +vcl::Window* FixedText::getAccessibleRelationLabelFor() const { - Window *pWindow = Control::getAccessibleRelationLabelFor(); + vcl::Window *pWindow = Control::getAccessibleRelationLabelFor(); if (pWindow) return pWindow; return get_mnemonic_widget(); } -void FixedText::set_mnemonic_widget(Window *pWindow) +void FixedText::set_mnemonic_widget(vcl::Window *pWindow) { if (pWindow == m_pMnemonicWindow) return; if (m_pMnemonicWindow) { - Window *pTempReEntryGuard = m_pMnemonicWindow; + vcl::Window *pTempReEntryGuard = m_pMnemonicWindow; m_pMnemonicWindow = NULL; pTempReEntryGuard->remove_mnemonic_label(this); } @@ -463,7 +463,7 @@ FixedText::~FixedText() set_mnemonic_widget(NULL); } -SelectableFixedText::SelectableFixedText(Window* pParent, WinBits nStyle) +SelectableFixedText::SelectableFixedText(vcl::Window* pParent, WinBits nStyle) : Edit(pParent, nStyle) { // no border @@ -483,7 +483,7 @@ void SelectableFixedText::LoseFocus() Invalidate(); } -void FixedLine::ImplInit( Window* pParent, WinBits nStyle ) +void FixedLine::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); Control::ImplInit( pParent, nStyle, NULL ); @@ -514,7 +514,7 @@ void FixedLine::ImplInitSettings( bool bFont, if ( bBackground ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); @@ -609,14 +609,14 @@ void FixedLine::ImplDraw( bool bLayout ) } } -FixedLine::FixedLine( Window* pParent, WinBits nStyle ) : +FixedLine::FixedLine( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_FIXEDLINE ) { ImplInit( pParent, nStyle ); SetSizePixel( Size( 2, 2 ) ); } -FixedLine::FixedLine( Window* pParent, const ResId& rResId ) : +FixedLine::FixedLine( vcl::Window* pParent, const ResId& rResId ) : Control( WINDOW_FIXEDLINE ) { rResId.SetRT( RSC_FIXEDLINE ); @@ -705,7 +705,7 @@ Size FixedLine::GetOptimalSize() const return CalcWindowSize( FixedText::CalcMinimumTextSize ( this, 0x7fffffff ) ); } -void FixedBitmap::ImplInit( Window* pParent, WinBits nStyle ) +void FixedBitmap::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); Control::ImplInit( pParent, nStyle, NULL ); @@ -721,7 +721,7 @@ WinBits FixedBitmap::ImplInitStyle( WinBits nStyle ) void FixedBitmap::ImplInitSettings() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); @@ -742,7 +742,7 @@ void FixedBitmap::ImplInitSettings() } } -FixedBitmap::FixedBitmap( Window* pParent, WinBits nStyle ) : +FixedBitmap::FixedBitmap( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_FIXEDBITMAP ) { ImplInit( pParent, nStyle ); @@ -846,7 +846,7 @@ void FixedBitmap::SetBitmap( const Bitmap& rBitmap ) queue_resize(); } -void FixedImage::ImplInit( Window* pParent, WinBits nStyle ) +void FixedImage::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); mbInUserDraw = false; @@ -863,7 +863,7 @@ WinBits FixedImage::ImplInitStyle( WinBits nStyle ) void FixedImage::ImplInitSettings() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent && pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); @@ -897,13 +897,13 @@ void FixedImage::ImplLoadRes( const ResId& rResId ) } } -FixedImage::FixedImage( Window* pParent, WinBits nStyle ) : +FixedImage::FixedImage( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_FIXEDIMAGE ) { ImplInit( pParent, nStyle ); } -FixedImage::FixedImage( Window* pParent, const ResId& rResId ) : +FixedImage::FixedImage( vcl::Window* pParent, const ResId& rResId ) : Control( WINDOW_FIXEDIMAGE ) { rResId.SetRT( RSC_FIXEDIMAGE ); diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx index f30a8ba9303f..6926a0c843c6 100644 --- a/vcl/source/control/fixedhyper.cxx +++ b/vcl/source/control/fixedhyper.cxx @@ -19,7 +19,7 @@ #include <vcl/fixedhyper.hxx> -FixedHyperlink::FixedHyperlink(Window* pParent, WinBits nWinStyle) +FixedHyperlink::FixedHyperlink(vcl::Window* pParent, WinBits nWinStyle) : FixedText(pParent, nWinStyle) , m_nTextLen(0) { diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 47f97a55a28b..795bb3b43797 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -30,7 +30,7 @@ #define GROUP_VIEW_STYLE (WB_3DLOOK | WB_NOLABEL) -void GroupBox::ImplInit( Window* pParent, WinBits nStyle ) +void GroupBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); Control::ImplInit( pParent, nStyle, NULL ); @@ -62,7 +62,7 @@ void GroupBox::ImplInitSettings( bool bFont, if ( bBackground ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( (pParent->IsChildTransparentModeEnabled() || !(pParent->GetStyle() & WB_CLIPCHILDREN) ) && !IsControlBackground() ) @@ -86,7 +86,7 @@ void GroupBox::ImplInitSettings( bool bFont, } } -GroupBox::GroupBox( Window* pParent, WinBits nStyle ) : +GroupBox::GroupBox( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_GROUPBOX ) { ImplInit( pParent, nStyle ); diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 187b6469e046..8bcdf11202eb 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star; -void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBackground ) +void ImplInitFieldSettings( vcl::Window* pWin, bool bFont, bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = pWin->GetSettings().GetStyleSettings(); @@ -87,7 +87,7 @@ void ImplInitDropDownButton( PushButton* pButton ) pButton->SetBackground(); } -ImplEntryList::ImplEntryList( Window* pWindow ) +ImplEntryList::ImplEntryList( vcl::Window* pWindow ) { mpWindow = pWindow; mnLastSelected = LISTBOX_ENTRY_NOTFOUND; @@ -488,7 +488,7 @@ sal_Int32 ImplEntryList::FindFirstSelectable( sal_Int32 nPos, bool bForward /* = return LISTBOX_ENTRY_NOTFOUND; } -ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) : +ImplListBoxWindow::ImplListBoxWindow( vcl::Window* pParent, WinBits nWinStyle ) : Control( pParent, 0 ), maQuickSelectionEngine( *this ) { @@ -2128,7 +2128,7 @@ sal_uInt16 ImplListBoxWindow::ImplGetTextStyle() const return nTextStyle; } -ImplListBox::ImplListBox( Window* pParent, WinBits nWinStyle ) : +ImplListBox::ImplListBox( vcl::Window* pParent, WinBits nWinStyle ) : Control( pParent, nWinStyle ), maLBWindow( this, nWinStyle&(~WB_BORDER) ) { @@ -2228,7 +2228,7 @@ void ImplListBox::GetFocus() maLBWindow.GrabFocus(); } -Window* ImplListBox::GetPreferredKeyInputWindow() +vcl::Window* ImplListBox::GetPreferredKeyInputWindow() { return &maLBWindow; } @@ -2583,7 +2583,7 @@ void ImplListBox::SetEdgeBlending(bool bNew) } } -ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) : +ImplWin::ImplWin( vcl::Window* pParent, WinBits nWinStyle ) : Control ( pParent, nWinStyle ) { if ( IsNativeControlSupported(CTRL_LISTBOX, PART_ENTIRE_CONTROL) @@ -2654,7 +2654,7 @@ void ImplWin::ImplDraw( bool bLayout ) // Repaint the (focused) area similarly to // ImplSmallBorderWindowView::DrawWindow() in // vcl/source/window/brdwin.cxx - Window *pWin = GetParent(); + vcl::Window *pWin = GetParent(); ImplControlValue aControlValue; if ( !pWin->IsEnabled() ) @@ -2673,7 +2673,7 @@ void ImplWin::ImplDraw( bool bLayout ) bool bMouseOver = false; if( GetParent() ) { - Window *pChild = GetParent()->GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window *pChild = GetParent()->GetWindow( WINDOW_FIRSTCHILD ); while( pChild && !(bMouseOver = pChild->IsMouseOver()) ) pChild = pChild->GetWindow( WINDOW_NEXT ); } @@ -2840,7 +2840,7 @@ void ImplWin::GetFocus() IsNativeWidgetEnabled() && IsNativeControlSupported( CTRL_LISTBOX, PART_ENTIRE_CONTROL ) ) { - Window* pWin = GetParent()->GetWindow( WINDOW_BORDER ); + vcl::Window* pWin = GetParent()->GetWindow( WINDOW_BORDER ); if( ! pWin ) pWin = GetParent(); pWin->Invalidate(); @@ -2857,7 +2857,7 @@ void ImplWin::LoseFocus() IsNativeWidgetEnabled() && IsNativeControlSupported( CTRL_LISTBOX, PART_ENTIRE_CONTROL ) ) { - Window* pWin = GetParent()->GetWindow( WINDOW_BORDER ); + vcl::Window* pWin = GetParent()->GetWindow( WINDOW_BORDER ); if( ! pWin ) pWin = GetParent(); pWin->Invalidate(); @@ -2867,7 +2867,7 @@ void ImplWin::LoseFocus() Control::LoseFocus(); } -ImplBtn::ImplBtn( Window* pParent, WinBits nWinStyle ) : +ImplBtn::ImplBtn( vcl::Window* pParent, WinBits nWinStyle ) : PushButton( pParent, nWinStyle ), mbDown ( false ) { @@ -2889,7 +2889,7 @@ void ImplBtn::MouseButtonDown( const MouseEvent& ) } } -ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) : +ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( vcl::Window* pParent ) : FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW ) // no drop shadow for list boxes { mpImplLB = NULL; @@ -2900,7 +2900,7 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) : EnableSaveBackground(); - Window * pBorderWindow = ImplGetBorderWindow(); + vcl::Window * pBorderWindow = ImplGetBorderWindow(); if( pBorderWindow ) { SetAccessibleRole(accessibility::AccessibleRole::PANEL); @@ -2953,8 +2953,8 @@ void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth, // The number also cannot be calculated by List/Combobox, as for // this the presence of the vertical Scrollbar has to be known. mpImplLB->SetSizePixel( GetOutputSizePixel() ); - ((Window*)mpImplLB)->Resize(); - ((Window&)mpImplLB->GetMainWindow()).Resize(); + ((vcl::Window*)mpImplLB)->Resize(); + ((vcl::Window&)mpImplLB->GetMainWindow()).Resize(); } } @@ -3067,7 +3067,7 @@ void ImplListBoxFloatingWindow::StartFloat( bool bStartTracking ) // check if the control's parent is un-mirrored which is the case for form controls in a mirrored UI // where the document is unmirrored // because StartPopupMode() expects a rectangle in mirrored coordinates we have to re-mirror - Window *pGrandparent = GetParent()->GetParent(); + vcl::Window *pGrandparent = GetParent()->GetParent(); const OutputDevice *pGrandparentOutDev = pGrandparent->GetOutDev(); if( pGrandparent->ImplIsAntiparallel() ) diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 54b97f43cd97..6a8082fb5de2 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -25,7 +25,7 @@ namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode; -ImageControl::ImageControl( Window* pParent, WinBits nStyle ) +ImageControl::ImageControl( vcl::Window* pParent, WinBits nStyle ) :FixedImage( pParent, nStyle ) ,mnScaleMode( ImageScaleMode::ANISOTROPIC ) { @@ -137,7 +137,7 @@ void ImageControl::Paint( const Rectangle& /*rRect*/ ) if( HasFocus() ) { - Window *pWin = GetWindow( WINDOW_BORDER ); + vcl::Window *pWin = GetWindow( WINDOW_BORDER ); bool bFlat = (GetBorderStyle() == 2); Rectangle aRect( Point(0,0), pWin->GetOutputSizePixel() ); diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 36afacd82698..3b6bd4570a79 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -455,7 +455,7 @@ void ImplNewLongCurrencyFieldValue( LongCurrencyField* pField, BigInt nNewValue pField->Modify(); } -LongCurrencyField::LongCurrencyField( Window* pParent, WinBits nWinStyle ) : +LongCurrencyField::LongCurrencyField( vcl::Window* pParent, WinBits nWinStyle ) : SpinField( pParent, nWinStyle ) { SetField( this ); @@ -537,7 +537,7 @@ void LongCurrencyField::Last() SpinField::Last(); } -LongCurrencyBox::LongCurrencyBox( Window* pParent, WinBits nWinStyle ) : +LongCurrencyBox::LongCurrencyBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index ec4d4bc65abe..504f11252479 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -49,13 +49,13 @@ ListBox::ListBox(WindowType nType) ImplInitListBoxData(); } -ListBox::ListBox( Window* pParent, WinBits nStyle ) : Control( WINDOW_LISTBOX ) +ListBox::ListBox( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_LISTBOX ) { ImplInitListBoxData(); ImplInit( pParent, nStyle ); } -ListBox::ListBox( Window* pParent, const ResId& rResId ) : +ListBox::ListBox( vcl::Window* pParent, const ResId& rResId ) : Control( WINDOW_LISTBOX ) { rResId.SetRT( RSC_LISTBOX ); @@ -96,7 +96,7 @@ void ListBox::ImplInitListBoxData() mbEdgeBlending = false; } -void ListBox::ImplInit( Window* pParent, WinBits nStyle ) +void ListBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) { nStyle = ImplInitStyle( nStyle ); if ( !(nStyle & WB_NOBORDER) && ( nStyle & WB_DROPDOWN ) ) @@ -149,7 +149,7 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle ) mpBtn->GetDropTarget()->addDropTargetListener(xDrop); } - Window* pLBParent = this; + vcl::Window* pLBParent = this; if ( mpFloatWin ) pLBParent = mpFloatWin; mpImplLB = new ImplListBox( pLBParent, nStyle&(~WB_BORDER) ); @@ -503,7 +503,7 @@ void ListBox::GetFocus() Control::GetFocus(); } -Window* ListBox::GetPreferredKeyInputWindow() +vcl::Window* ListBox::GetPreferredKeyInputWindow() { if ( mpImplLB ) { @@ -625,7 +625,7 @@ void ListBox::Resize() long nBottom = aOutSz.Height(); // Note: in case of no border, pBorder will actually be this - Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); ImplControlValue aControlValue; Point aPoint; Rectangle aContent, aBound; @@ -1158,7 +1158,7 @@ bool ListBox::IsInDropDown() const Rectangle ListBox::GetBoundingRectangle( sal_Int32 nItem ) const { Rectangle aRect = mpImplLB->GetMainWindow().GetBoundingRectangle( nItem ); - Rectangle aOffset = mpImplLB->GetMainWindow().GetWindowExtentsRelative( (Window*)this ); + Rectangle aOffset = mpImplLB->GetMainWindow().GetWindowExtentsRelative( (vcl::Window*)this ); aRect.Move( aOffset.TopLeft().X(), aOffset.TopLeft().Y() ); return aRect; } @@ -1283,7 +1283,7 @@ Size ListBox::CalcAdjustedSize( const Size& rPrefSize ) const { Size aSz = rPrefSize; sal_Int32 nLeft, nTop, nRight, nBottom; - ((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); + ((vcl::Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); aSz.Height() -= nTop+nBottom; if ( !IsDropDownBox() ) { @@ -1486,7 +1486,7 @@ void ListBox::SetEdgeBlending(bool bNew) } } -MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) : +MultiListBox::MultiListBox( vcl::Window* pParent, WinBits nStyle ) : ListBox( WINDOW_MULTILISTBOX ) { ImplInit( pParent, nStyle ); diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index d543c291ac95..288b7abeb018 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -37,7 +37,7 @@ void MenuButton::ImplInitMenuButtonData() mnMenuMode = 0; } -void MenuButton::ImplInit( Window* pParent, WinBits nStyle ) +void MenuButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { if ( !(nStyle & WB_NOTABSTOP) ) nStyle |= WB_TABSTOP; @@ -73,7 +73,7 @@ OString MenuButton::GetCurItemIdent() const mpMenu->GetItemIdent(mnCurItemId) : OString(); } -MenuButton::MenuButton( Window* pParent, WinBits nWinBits ) +MenuButton::MenuButton( vcl::Window* pParent, WinBits nWinBits ) : PushButton( WINDOW_MENUBUTTON ) { ImplInitMenuButtonData(); diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx index 0146cefce4ff..f84e0a891287 100644 --- a/vcl/source/control/morebtn.cxx +++ b/vcl/source/control/morebtn.cxx @@ -22,7 +22,7 @@ #include <tools/rc.h> #include <vector> -typedef ::std::vector< Window* > ImplMoreWindowList; +typedef ::std::vector< vcl::Window* > ImplMoreWindowList; struct ImplMoreButtonData { @@ -31,7 +31,7 @@ struct ImplMoreButtonData OUString maLessText; }; -void MoreButton::ImplInit( Window* pParent, WinBits nStyle ) +void MoreButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mpMBData = new ImplMoreButtonData; mnDelta = 0; @@ -72,7 +72,7 @@ void MoreButton::ShowState() } } -MoreButton::MoreButton( Window* pParent, WinBits nStyle ) : +MoreButton::MoreButton( vcl::Window* pParent, WinBits nStyle ) : PushButton( WINDOW_MOREBUTTON ) { ImplInit( pParent, nStyle ); @@ -86,7 +86,7 @@ MoreButton::~MoreButton() void MoreButton::Click() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); Size aSize( pParent->GetSizePixel() ); long nDeltaPixel = LogicToPixel( Size( 0, mnDelta ), meUnit ).Height(); diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 4634300a68b5..d1b7bf9d6d69 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -33,7 +33,7 @@ void ProgressBar::ImplInit() ImplInitSettings( true, true, true ); } -static WinBits clearProgressBarBorder( Window* pParent, WinBits nOrgStyle ) +static WinBits clearProgressBarBorder( vcl::Window* pParent, WinBits nOrgStyle ) { WinBits nOutStyle = nOrgStyle; if( pParent && (nOrgStyle & WB_BORDER) != 0 ) @@ -49,7 +49,7 @@ Size ProgressBar::GetOptimalSize() const return Size(150, 20); } -ProgressBar::ProgressBar( Window* pParent, WinBits nWinStyle ) : +ProgressBar::ProgressBar( vcl::Window* pParent, WinBits nWinStyle ) : Window( pParent, clearProgressBarBorder( pParent, nWinStyle ) ) { SetOutputSizePixel( GetOptimalSize() ); diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 4351d6ff9e21..8d144ce9a516 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -74,7 +74,7 @@ struct ImplScrollBarData Rectangle maTrackRect; // TODO: move to ScrollBar class when binary incompatibility of ScrollBar class is no longer problematic }; -void ScrollBar::ImplInit( Window* pParent, WinBits nStyle ) +void ScrollBar::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mpData = NULL; mnThumbPixRange = 0; @@ -117,7 +117,7 @@ void ScrollBar::ImplInitStyle( WinBits nStyle ) mbFullDrag = (GetSettings().GetStyleSettings().GetDragFullOptions() & DRAGFULL_OPTION_SCROLL) != 0; } -ScrollBar::ScrollBar( Window* pParent, WinBits nStyle ) : +ScrollBar::ScrollBar( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_SCROLLBAR ) { ImplInit( pParent, nStyle ); @@ -622,9 +622,9 @@ void ScrollBar::ImplDraw( sal_uInt16 nDrawFlags, OutputDevice* pOutDev ) if ( mbCalcSize ) ImplCalc( false ); - Window *pWin = NULL; + vcl::Window *pWin = NULL; if( pOutDev->GetOutDevType() == OUTDEV_WINDOW ) - pWin = (Window*) pOutDev; + pWin = (vcl::Window*) pOutDev; // Draw the entire control if the native theme engine needs it if ( nDrawFlags && pWin && pWin->IsNativeControlSupported(CTRL_SCROLLBAR, PART_DRAW_BACKGROUND_HORZ) ) @@ -1428,7 +1428,7 @@ Size ScrollBar::getCurrentCalcSize() const return aCtrlRegion.GetSize(); } -void ScrollBarBox::ImplInit( Window* pParent, WinBits nStyle ) +void ScrollBarBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) { Window::ImplInit( pParent, nStyle, NULL ); @@ -1438,7 +1438,7 @@ void ScrollBarBox::ImplInit( Window* pParent, WinBits nStyle ) ImplInitSettings(); } -ScrollBarBox::ScrollBarBox( Window* pParent, WinBits nStyle ) : +ScrollBarBox::ScrollBarBox( vcl::Window* pParent, WinBits nStyle ) : Window( WINDOW_SCROLLBARBOX ) { ImplInit( pParent, nStyle ); diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index f398d02a38e3..00cf7108c981 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -45,7 +45,7 @@ #define SLIDER_VIEW_STYLE (WB_3DLOOK | WB_HORZ | WB_VERT) -void Slider::ImplInit( Window* pParent, WinBits nStyle ) +void Slider::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mnThumbPixOffset = 0; mnThumbPixRange = 0; @@ -73,7 +73,7 @@ void Slider::ImplInit( Window* pParent, WinBits nStyle ) SetSizePixel( CalcWindowSizePixel() ); } -Slider::Slider( Window* pParent, WinBits nStyle ) : +Slider::Slider( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_SLIDER ) { ImplInit( pParent, nStyle ); @@ -81,7 +81,7 @@ Slider::Slider( Window* pParent, WinBits nStyle ) : void Slider::ImplInitSettings() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index d920737c3c01..f760aaf669e5 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -23,7 +23,7 @@ #include <vcl/spin.hxx> #include <vcl/settings.hxx> -void SpinButton::ImplInit( Window* pParent, WinBits nStyle ) +void SpinButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mbUpperIn = false; mbLowerIn = false; @@ -48,7 +48,7 @@ void SpinButton::ImplInit( Window* pParent, WinBits nStyle ) Control::ImplInit( pParent, nStyle, NULL ); } -SpinButton::SpinButton( Window* pParent, WinBits nStyle ) +SpinButton::SpinButton( vcl::Window* pParent, WinBits nStyle ) :Control( WINDOW_SPINBUTTON ) ,mbUpperIsFocused( false ) { diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 325e770e1060..c027cbbccbf5 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -30,7 +30,7 @@ namespace { -void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect, +void ImplGetSpinbuttonValue( vcl::Window *pWin, const Rectangle& rUpperRect, const Rectangle& rLowerRect, bool bUpperIn, bool bLowerIn, bool bUpperEnabled, bool bLowerEnabled, bool bHorz, @@ -71,7 +71,7 @@ void ImplGetSpinbuttonValue( Window *pWin, const Rectangle& rUpperRect, rValue.mnLowerPart = bHorz ? PART_BUTTON_RIGHT : PART_BUTTON_DOWN; } -bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) +bool ImplDrawNativeSpinfield( vcl::Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) { bool bNativeOK = false; @@ -89,7 +89,7 @@ bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonVa else { // paint the spinbox as a whole, use borderwindow to have proper clipping - Window *pBorder = pWin->GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = pWin->GetWindow( WINDOW_BORDER ); // to not overwrite everything, set the button region as clipregion to the border window Rectangle aClipRect( rSpinbuttonValue.maLowerRect ); @@ -122,7 +122,7 @@ bool ImplDrawNativeSpinfield( Window *pWin, const SpinbuttonValue& rSpinbuttonVa return bNativeOK; } -bool ImplDrawNativeSpinbuttons( Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) +bool ImplDrawNativeSpinbuttons( vcl::Window *pWin, const SpinbuttonValue& rSpinbuttonValue ) { bool bNativeOK = false; @@ -189,7 +189,7 @@ void ImplDrawSpinButton( OutputDevice* pOutDev, if( pOutDev->GetOutDevType() == OUTDEV_WINDOW ) { - Window *pWin = (Window*) pOutDev; + vcl::Window *pWin = (vcl::Window*) pOutDev; // are we drawing standalone spin buttons or members of a spinfield ? ControlType aControl = CTRL_SPINBUTTONS; @@ -297,7 +297,7 @@ void SpinField::ImplInitSpinFieldData() mbInDropDown = false; } -void SpinField::ImplInit( Window* pParent, WinBits nWinStyle ) +void SpinField::ImplInit( vcl::Window* pParent, WinBits nWinStyle ) { Edit::ImplInit( pParent, nWinStyle ); @@ -337,14 +337,14 @@ SpinField::SpinField( WindowType nTyp ) : ImplInitSpinFieldData(); } -SpinField::SpinField( Window* pParent, WinBits nWinStyle ) : +SpinField::SpinField( vcl::Window* pParent, WinBits nWinStyle ) : Edit( WINDOW_SPINFIELD ) { ImplInitSpinFieldData(); ImplInit( pParent, nWinStyle ); } -SpinField::SpinField( Window* pParent, const ResId& rResId ) : +SpinField::SpinField( vcl::Window* pParent, const ResId& rResId ) : Edit( WINDOW_SPINFIELD ) { ImplInitSpinFieldData(); @@ -663,8 +663,8 @@ void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rec ! (GetStyle() & WB_DROPDOWN) && IsNativeControlSupported(CTRL_SPINBOX, PART_ENTIRE_CONTROL) ) { - Window *pWin = (Window*) pDev; - Window *pBorder = pWin->GetWindow( WINDOW_BORDER ); + vcl::Window *pWin = (vcl::Window*) pDev; + vcl::Window *pBorder = pWin->GetWindow( WINDOW_BORDER ); // get the system's spin button size ImplControlValue aControlValue; @@ -726,7 +726,7 @@ void SpinField::Resize() Rectangle aContent, aBound; // use the full extent of the control - Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); Rectangle aArea( aPoint, pBorder->GetOutputSizePixel() ); // adjust position and size of the edit field diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 0187b4e51b68..67cdbbe82934 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -82,7 +82,7 @@ struct ImplTabCtrlData // for the Tab positions #define TAB_PAGERECT 0xFFFF -void TabControl::ImplInit( Window* pParent, WinBits nStyle ) +void TabControl::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mbLayoutDirty = true; @@ -144,7 +144,7 @@ void TabControl::ImplInitSettings( bool bFont, if ( bBackground ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( !IsControlBackground() && (pParent->IsChildTransparentModeEnabled() || IsNativeControlSupported(CTRL_TAB_PANE, PART_ENTIRE_CONTROL) @@ -183,7 +183,7 @@ void TabControl::ImplFreeLayoutData() } } -TabControl::TabControl( Window* pParent, WinBits nStyle ) : +TabControl::TabControl( vcl::Window* pParent, WinBits nStyle ) : Control( WINDOW_TABCONTROL ) { ImplInit( pParent, nStyle ); @@ -575,7 +575,7 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ) ImplTabItem* pItem = ImplGetItem( nId ); TabPage* pOldPage = (pOldItem) ? pOldItem->mpTabPage : NULL; TabPage* pPage = (pItem) ? pItem->mpTabPage : NULL; - Window* pCtrlParent = GetParent(); + vcl::Window* pCtrlParent = GetParent(); if ( IsReallyVisible() && IsUpdateMode() ) { @@ -646,7 +646,7 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ) if ( pOldPage && pOldPage->HasChildPathFocus() ) { sal_uInt16 n = 0; - Window* pFirstChild = pPage->ImplGetDlgWindow( n, DLGWINDOW_FIRST ); + vcl::Window* pFirstChild = pPage->ImplGetDlgWindow( n, DLGWINDOW_FIRST ); if ( pFirstChild ) pFirstChild->ImplControlFocus( GETFOCUS_INIT ); else diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index c8b585bcb0d1..347f24a32e31 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -42,7 +42,7 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Exception; namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode; -Throbber::Throbber( Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet ) +Throbber::Throbber( vcl::Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet ) :ImageControl( i_parentWindow, i_style ) ,mbRepeat( true ) ,mnStepTime( 100 ) diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index b70cd2be405f..0cc3f90f6066 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -1944,7 +1944,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan if ( !IsFormatted() ) FormatDoc(); - Window* pOutWin = dynamic_cast<Window*>(pOutDev); + vcl::Window* pOutWin = dynamic_cast<vcl::Window*>(pOutDev); bool bTransparent = (pOutWin && pOutWin->IsPaintTransparent()); long nY = rStartPos.Y(); diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx index d63620d40016..c2b7fadb2771 100644 --- a/vcl/source/edit/textview.cxx +++ b/vcl/source/edit/textview.cxx @@ -146,7 +146,7 @@ struct ImpTextView { TextEngine* mpTextEngine; - Window* mpWindow; + vcl::Window* mpWindow; TextSelection maSelection; Point maStartDocPos; // TextPaM maMBDownPaM; @@ -176,7 +176,7 @@ struct ImpTextView bool mbCursorAtEndOfLine; }; -TextView::TextView( TextEngine* pEng, Window* pWindow ) : +TextView::TextView( TextEngine* pEng, vcl::Window* pWindow ) : mpImpl(new ImpTextView) { pWindow->EnableRTL( false ); @@ -2309,7 +2309,7 @@ void TextSelFunctionSet::DestroyAnchor() } TextEngine* TextView::GetTextEngine() const { return mpImpl->mpTextEngine; } -Window* TextView::GetWindow() const +vcl::Window* TextView::GetWindow() const { return mpImpl->mpWindow; } void TextView::EnableCursor( bool bEnable ) { mpImpl->mbCursorEnabled = bEnable; } diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 68c375a6a200..ff7cd6c8ae25 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -33,7 +33,7 @@ #include <vcl/settings.hxx> #include <boost/scoped_ptr.hpp> -class TextWindow : public Window +class TextWindow : public vcl::Window { private: ExtTextEngine* mpExtTextEngine; @@ -47,7 +47,7 @@ private: bool mbTextSelectable; public: - TextWindow( Window* pParent ); + TextWindow( vcl::Window* pParent ); virtual ~TextWindow(); ExtTextEngine* GetTextEngine() const { return mpExtTextEngine; } @@ -703,7 +703,7 @@ bool ImpVclMEdit::HandleCommand( const CommandEvent& rCEvt ) return bDone; } -TextWindow::TextWindow( Window* pParent ) : Window( pParent ) +TextWindow::TextWindow( vcl::Window* pParent ) : Window( pParent ) { mbInMBDown = false; mbFocusSelectionHide = false; @@ -926,7 +926,7 @@ void TextWindow::LoseFocus() mpExtTextView->SetPaintSelection( false ); } -VclMultiLineEdit::VclMultiLineEdit( Window* pParent, WinBits nWinStyle ) +VclMultiLineEdit::VclMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ) : Edit( pParent, nWinStyle ) { SetType( WINDOW_MULTILINEEDIT ); @@ -1189,7 +1189,7 @@ Size VclMultiLineEdit::CalcMinimumSize() const Size aSz = pImpVclMEdit->CalcMinimumSize(); sal_Int32 nLeft, nTop, nRight, nBottom; - ((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); + ((vcl::Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); aSz.Width() += nLeft+nRight; aSz.Height() += nTop+nBottom; @@ -1200,7 +1200,7 @@ Size VclMultiLineEdit::CalcAdjustedSize( const Size& rPrefSize ) const { Size aSz = rPrefSize; sal_Int32 nLeft, nTop, nRight, nBottom; - ((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); + ((vcl::Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); // center vertically for whole lines @@ -1221,7 +1221,7 @@ Size VclMultiLineEdit::CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) c Size aSz = pImpVclMEdit->CalcBlockSize( nColumns, nLines ); sal_Int32 nLeft, nTop, nRight, nBottom; - ((Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); + ((vcl::Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom ); aSz.Width() += nLeft+nRight; aSz.Height() += nTop+nBottom; return aSz; diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx index 6eff3dd2f22d..4fd5f27e498d 100644 --- a/vcl/source/edit/xtextedt.cxx +++ b/vcl/source/edit/xtextedt.cxx @@ -222,7 +222,7 @@ bool ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& rSea // class ExtTextView -ExtTextView::ExtTextView( ExtTextEngine* pEng, Window* pWindow ) +ExtTextView::ExtTextView( ExtTextEngine* pEng, vcl::Window* pWindow ) : TextView( pEng, pWindow ) { } diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 3b0d9d007fcb..c8b842d93b6a 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -374,7 +374,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos ) // flush output from time to time if( i++ > nSyncCount ) - ( (Window*) pOut )->Flush(), i = 0; + ( (vcl::Window*) pOut )->Flush(), i = 0; } pAction = NextAction(); @@ -391,7 +391,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S Size rDestSize( pOut->LogicToPixel( rLogicDestSize ) ); - const Window* win = dynamic_cast <Window*> ( pOut ); + const vcl::Window* win = dynamic_cast <vcl::Window*> ( pOut ); if (!win) win = Application::GetActiveTopWindow(); diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index bf870819c408..096e67fa48ae 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -78,7 +78,7 @@ ImplAnimView::ImplAnimView( Animation* pParent, OutputDevice* pOut, MapMode aTempMap( mpOut->GetMapMode() ); aTempMap.SetOrigin( Point() ); mpBackground->SetMapMode( aTempMap ); - ( (Window*) mpOut )->SaveBackground( maDispPt, maDispSz, Point(), *mpBackground ); + ( (vcl::Window*) mpOut )->SaveBackground( maDispPt, maDispSz, Point(), *mpBackground ); mpBackground->SetMapMode( MapMode() ); } else @@ -282,7 +282,7 @@ void ImplAnimView::ImplDraw( sal_uLong nPos, VirtualDevice* pVDev ) delete pDev; if( mpOut->GetOutDevType() == OUTDEV_WINDOW ) - ( (Window*) mpOut )->Sync(); + ( (vcl::Window*) mpOut )->Sync(); } } } @@ -296,7 +296,7 @@ void ImplAnimView::ImplRepaint() MapMode aTempMap( mpOut->GetMapMode() ); aTempMap.SetOrigin( Point() ); mpBackground->SetMapMode( aTempMap ); - ( (Window*) mpOut )->SaveBackground( maDispPt, maDispSz, Point(), *mpBackground ); + ( (vcl::Window*) mpOut )->SaveBackground( maDispPt, maDispSz, Point(), *mpBackground ); mpBackground->SetMapMode( MapMode() ); } else diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 6c8bdc449264..a901a312564b 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -783,7 +783,7 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo ) mpGraphics->GetDevFontList( mpFontCollection ); } -void Printer::ImplInitDisplay( const Window* pWindow ) +void Printer::ImplInitDisplay( const vcl::Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1121,7 +1121,7 @@ bool Printer::SetJobSetup( const JobSetup& rSetup ) return false; } -bool Printer::Setup( Window* pWindow ) +bool Printer::Setup( vcl::Window* pWindow ) { if ( IsDisplayPrinter() ) return false; diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index ad7a8ba68048..b87425f2934c 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -789,7 +789,7 @@ void PrinterController::resetPrinterOptions( bool i_bFileOutput ) mpImplData->mpPrinter->SetPrinterOptions( aOpt ); } -bool PrinterController::setupPrinter( Window* i_pParent ) +bool PrinterController::setupPrinter( vcl::Window* i_pParent ) { bool bRet = false; if( mpImplData->mpPrinter.get() ) diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx index abf06ff0d4a9..7ce8d1a56c11 100644 --- a/vcl/source/helper/lazydelete.cxx +++ b/vcl/source/helper/lazydelete.cxx @@ -33,7 +33,7 @@ LazyDeletorBase::~LazyDeletorBase() } // instantiate instance pointers for LazyDeletor<Window,Menu> -template<> LazyDeletor<Window>* LazyDeletor<Window>::s_pOneInstance = NULL; +template<> LazyDeletor<vcl::Window>* LazyDeletor<vcl::Window>::s_pOneInstance = NULL; template<> LazyDeletor<Menu>* LazyDeletor<Menu>::s_pOneInstance = NULL; // a list for all LazyeDeletor<T> singletons @@ -55,7 +55,7 @@ void LazyDelete::flush() } // specialized is_less function for Window -template<> bool LazyDeletor<Window>::is_less( Window* left, Window* right ) +template<> bool LazyDeletor<vcl::Window>::is_less( vcl::Window* left, vcl::Window* right ) { return left != right && right->IsChild( left, true ); } diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index d00f3e69116f..79430ba5a78e 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -376,7 +376,7 @@ GLXFBConfig* getFBConfig(const SystemEnvData* sysData, int& nBestFBC) if( dpy == 0 || !glXQueryExtension( dpy, NULL, NULL ) ) return NULL; - XLIB_Window win = sysData->aWindow; + Window win = sysData->aWindow; SAL_INFO("vcl.opengl", "parent window: " << win); @@ -436,12 +436,12 @@ GLXFBConfig* getFBConfig(const SystemEnvData* sysData, int& nBestFBC) #endif -bool OpenGLContext::init( Window* pParent ) +bool OpenGLContext::init( vcl::Window* pParent ) { if(mbInitialized) return true; - m_pWindow.reset(pParent ? NULL : new Window(0, WB_NOBORDER|WB_NODIALOGCONTROL)); + m_pWindow.reset(pParent ? NULL : new vcl::Window(0, WB_NOBORDER|WB_NODIALOGCONTROL)); mpWindow = pParent ? pParent : m_pWindow.get(); m_pChildWindow = 0; initWindow(); @@ -814,7 +814,7 @@ bool OpenGLContext::initWindow() #if defined( WNT ) || defined( MACOSX ) || defined( IOS ) || defined( ANDROID ) -SystemWindowData OpenGLContext::generateWinData(Window* /*pParent*/, bool bRequestLegacyContext) +SystemWindowData OpenGLContext::generateWinData(vcl::Window* /*pParent*/, bool bRequestLegacyContext) { (void) bRequestLegacyContext; SystemWindowData aWinData; @@ -842,7 +842,7 @@ void initOpenGLFunctionPointers() } -SystemWindowData OpenGLContext::generateWinData(Window* pParent, bool) +SystemWindowData OpenGLContext::generateWinData(vcl::Window* pParent, bool) { SystemWindowData aWinData; aWinData.nSize = sizeof(aWinData); diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 116a2752d6ba..7d5330b5a6e4 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -517,7 +517,7 @@ void OutputDevice::ImplClearFontData( const bool bNewFontLists ) // also update child windows if needed if ( GetOutDevType() == OUTDEV_WINDOW ) { - Window* pChild = ((Window*)this)->mpWindowImpl->mpFirstChild; + vcl::Window* pChild = ((vcl::Window*)this)->mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->ImplClearFontData( true ); @@ -553,7 +553,7 @@ void OutputDevice::ImplRefreshFontData( const bool bNewFontLists ) // also update child windows if needed if ( GetOutDevType() == OUTDEV_WINDOW ) { - Window* pChild = ((Window*)this)->mpWindowImpl->mpFirstChild; + vcl::Window* pChild = ((vcl::Window*)this)->mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->ImplRefreshFontData( true ); @@ -579,7 +579,7 @@ void OutputDevice::ImplUpdateAllFontData( bool bNewFontLists ) if ( bNewFontLists ) { pSVData->maGDIData.mpScreenFontList->Clear(); - Window * pFrame = pSVData->maWinData.mpFirstFrame; + vcl::Window * pFrame = pSVData->maWinData.mpFirstFrame; if ( pFrame ) { if ( pFrame->AcquireGraphics() ) @@ -600,12 +600,12 @@ void OutputDevice::ImplUpdateFontDataForAllFrames( const FontUpdateHandler_t pHd ImplSVData* const pSVData = ImplGetSVData(); // update all windows - Window* pFrame = pSVData->maWinData.mpFirstFrame; + vcl::Window* pFrame = pSVData->maWinData.mpFirstFrame; while ( pFrame ) { ( pFrame->*pHdl )( bNewFontLists ); - Window* pSysWin = pFrame->mpWindowImpl->mpFrameData->mpFirstOverlap; + vcl::Window* pSysWin = pFrame->mpWindowImpl->mpFrameData->mpFirstOverlap; while ( pSysWin ) { ( pSysWin->*pHdl )( bNewFontLists ); diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index 396a2c471014..ff9140783c78 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -228,11 +228,11 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, if ( !pSVData->maGDIData.mnAppFontX ) { if( pSVData->maWinData.mpFirstFrame ) - Window::ImplInitAppFontData( pSVData->maWinData.mpFirstFrame ); + vcl::Window::ImplInitAppFontData( pSVData->maWinData.mpFirstFrame ); else { WorkWindow* pWin = new WorkWindow( NULL, 0 ); - Window::ImplInitAppFontData( pWin ); + vcl::Window::ImplInitAppFontData( pWin ); delete pWin; } } @@ -682,8 +682,8 @@ void OutputDevice::SetMapMode() mbInitFont = true; if ( GetOutDevType() == OUTDEV_WINDOW ) { - if ( ((Window*)this)->mpWindowImpl->mpCursor ) - ((Window*)this)->mpWindowImpl->mpCursor->ImplNew(); + if ( ((vcl::Window*)this)->mpWindowImpl->mpCursor ) + ((vcl::Window*)this)->mpWindowImpl->mpCursor->ImplNew(); } // #106426# Adapt logical offset when changing mapmode @@ -786,8 +786,8 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) mbInitFont = true; if ( GetOutDevType() == OUTDEV_WINDOW ) { - if ( ((Window*)this)->mpWindowImpl->mpCursor ) - ((Window*)this)->mpWindowImpl->mpCursor->ImplNew(); + if ( ((vcl::Window*)this)->mpWindowImpl->mpCursor ) + ((vcl::Window*)this)->mpWindowImpl->mpCursor->ImplNew(); } // #106426# Adapt logical offset when changing mapmode @@ -2092,6 +2092,8 @@ void OutputDevice::SetPixelOffset( const Size& rOffset ) } +namespace vcl { + long Window::ImplLogicUnitToPixelX( long nX, MapUnit eUnit ) { if ( eUnit != MAP_PIXEL ) @@ -2142,6 +2144,7 @@ long Window::ImplLogicUnitToPixelY( long nY, MapUnit eUnit ) return nY; } +} /* namespace vcl */ DeviceCoordinate OutputDevice::LogicWidthToDeviceCoordinate( long nWidth ) const { diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx index 325320cf7e4e..b7edeb11ab05 100644 --- a/vcl/source/outdev/nativecontrols.cxx +++ b/vcl/source/outdev/nativecontrols.cxx @@ -33,7 +33,7 @@ static bool EnableNativeWidget( const OutputDevice& i_rDevice ) case OUTDEV_WINDOW: { - const Window* pWindow = dynamic_cast< const Window* >( &i_rDevice ); + const vcl::Window* pWindow = dynamic_cast< const vcl::Window* >( &i_rDevice ); if (pWindow) { return pWindow->IsNativeWidgetEnabled(); diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 8717246d495c..9c96710127e5 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -726,7 +726,7 @@ void OutputDevice::ImplDrawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect } else { - if ( ((Window*)this)->mpWindowImpl->mpFrameWindow == ((Window*)pSrcDev)->mpWindowImpl->mpFrameWindow ) + if ( ((vcl::Window*)this)->mpWindowImpl->mpFrameWindow == ((vcl::Window*)pSrcDev)->mpWindowImpl->mpFrameWindow ) pGraphics2 = NULL; else { diff --git a/vcl/source/uipreviewer/previewer.cxx b/vcl/source/uipreviewer/previewer.cxx index 1e318ff20a38..24f4dbed31c1 100644 --- a/vcl/source/uipreviewer/previewer.cxx +++ b/vcl/source/uipreviewer/previewer.cxx @@ -72,7 +72,7 @@ int UIPreviewApp::Main() { VclBuilder aBuilder(pDialog, OUString(), uifiles[0]); - Window *pRoot = aBuilder.get_widget_root(); + vcl::Window *pRoot = aBuilder.get_widget_root(); Dialog *pRealDialog = dynamic_cast<Dialog*>(pRoot); if (!pRealDialog) diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index 3b64a2fbd819..b02ebd84e365 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -123,6 +123,8 @@ ImplAccessibleInfos::~ImplAccessibleInfos() delete pAccessibleDescription; } +namespace vcl { + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::GetAccessible( bool bCreate ) { // do not optimize hierarchy for the top level border win (ie, when there is no parent) @@ -130,7 +132,7 @@ ImplAccessibleInfos::~ImplAccessibleInfos() if ( GetParent() && ( GetType() == WINDOW_BORDERWINDOW ) && ( GetChildCount() == 1 ) ) //if( !ImplIsAccessibleCandidate() ) { - Window* pChild = GetAccessibleChildWindow( 0 ); + vcl::Window* pChild = GetAccessibleChildWindow( 0 ); if ( pChild ) return pChild->GetAccessible(); } @@ -180,7 +182,7 @@ bool Window::ImplIsAccessibleNativeFrame() const sal_uInt16 Window::ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirstWindowType ) const { sal_uInt16 nChildren = 0; - Window* pChild = GetWindow( nFirstWindowType ); + vcl::Window* pChild = GetWindow( nFirstWindowType ); while ( pChild ) { if( pChild->ImplIsAccessibleCandidate() ) @@ -192,16 +194,16 @@ sal_uInt16 Window::ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirst return nChildren; } -Window* Window::ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, bool bTopLevel ) const +vcl::Window* Window::ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, bool bTopLevel ) const { if( bTopLevel ) rChildCount = 0; - Window* pChild = GetWindow( nFirstWindowType ); + vcl::Window* pChild = GetWindow( nFirstWindowType ); while ( pChild ) { - Window *pTmpChild = pChild; + vcl::Window *pTmpChild = pChild; if( !pChild->ImplIsAccessibleCandidate() ) pTmpChild = pChild->ImplGetAccessibleCandidateChild( nChild, rChildCount, WINDOW_FIRSTCHILD, false ); @@ -215,16 +217,16 @@ Window* Window::ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& return NULL; } -Window* Window::GetAccessibleParentWindow() const +vcl::Window* Window::GetAccessibleParentWindow() const { if ( ImplIsAccessibleNativeFrame() ) return NULL; - Window* pParent = mpWindowImpl->mpParent; + vcl::Window* pParent = mpWindowImpl->mpParent; if( GetType() == WINDOW_MENUBARWINDOW ) { // report the menubar as a child of THE workwindow - Window *pWorkWin = GetParent()->mpWindowImpl->mpFirstChild; + vcl::Window *pWorkWin = GetParent()->mpWindowImpl->mpFirstChild; while( pWorkWin && (pWorkWin == this) ) pWorkWin = pWorkWin->mpWindowImpl->mpNext; pParent = pWorkWin; @@ -251,7 +253,7 @@ Window* Window::GetAccessibleParentWindow() const sal_uInt16 Window::GetAccessibleChildWindowCount() { sal_uInt16 nChildren = 0; - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while( pChild ) { if( pChild->IsVisible() ) @@ -265,7 +267,7 @@ sal_uInt16 Window::GetAccessibleChildWindowCount() /* if( ImplIsOverlapWindow() ) { - Window* pOverlap = GetWindow( WINDOW_FIRSTOVERLAP ); + vcl::Window* pOverlap = GetWindow( WINDOW_FIRSTOVERLAP ); while ( pOverlap ) { if( pOverlap->IsVisible() ) @@ -295,7 +297,7 @@ sal_uInt16 Window::GetAccessibleChildWindowCount() return nChildren; } -Window* Window::GetAccessibleChildWindow( sal_uInt16 n ) +vcl::Window* Window::GetAccessibleChildWindow( sal_uInt16 n ) { // report the menubarwindow as a the first child of THE workwindow if( GetType() == WINDOW_WORKWINDOW && ((WorkWindow *) this)->GetMenuBar() ) @@ -312,7 +314,7 @@ Window* Window::GetAccessibleChildWindow( sal_uInt16 n ) // transform n to child number including invisible children sal_uInt16 nChildren = n; - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while( pChild ) { if( pChild->IsVisible() ) @@ -335,7 +337,7 @@ Window* Window::GetAccessibleChildWindow( sal_uInt16 n ) /* if( ImplIsOverlapWindow() ) { - Window* pOverlap = GetWindow( WINDOW_FIRSTOVERLAP ); + vcl::Window* pOverlap = GetWindow( WINDOW_FIRSTOVERLAP ); while ( !pChild && pOverlap ) { if ( !nChildren && pOverlap->IsVisible() ) @@ -486,7 +488,7 @@ sal_uInt16 Window::getDefaultAccessibleRole() const nRole = accessibility::AccessibleRole::FRAME; else if( IsScrollable() ) nRole = accessibility::AccessibleRole::SCROLL_PANE; - else if( ((Window*)this)->ImplGetWindow()->IsMenuFloatingWindow() ) + else if( ((vcl::Window*)this)->ImplGetWindow()->IsMenuFloatingWindow() ) nRole = accessibility::AccessibleRole::WINDOW; // #106002#, contextmenus are windows (i.e. toplevel) else // #104051# WINDOW seems to be a bad default role, use LAYEREDPANE instead @@ -555,7 +557,7 @@ OUString Window::getDefaultAccessibleName() const case WINDOW_TREELISTBOX: case WINDOW_METRICBOX: { - Window *pLabel = GetAccessibleRelationLabeledBy(); + vcl::Window *pLabel = GetAccessibleRelationLabeledBy(); if ( pLabel && pLabel != this ) aAccessibleName = pLabel->GetText(); if (aAccessibleName.isEmpty()) @@ -613,7 +615,7 @@ OUString Window::GetAccessibleDescription() const { // Special code for help text windows. ZT asks the border window for the // description so we have to forward this request to our inner window. - const Window* pWin = ((Window *)this)->ImplGetWindow(); + const vcl::Window* pWin = ((vcl::Window *)this)->ImplGetWindow(); if ( pWin->GetType() == WINDOW_HELPTEXTWINDOW ) aAccessibleDescription = pWin->GetHelpText(); else @@ -623,28 +625,28 @@ OUString Window::GetAccessibleDescription() const return aAccessibleDescription; } -void Window::SetAccessibleRelationLabeledBy( Window* pLabeledBy ) +void Window::SetAccessibleRelationLabeledBy( vcl::Window* pLabeledBy ) { if ( !mpWindowImpl->mpAccessibleInfos ) mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos; mpWindowImpl->mpAccessibleInfos->pLabeledByWindow = pLabeledBy; } -void Window::SetAccessibleRelationLabelFor( Window* pLabelFor ) +void Window::SetAccessibleRelationLabelFor( vcl::Window* pLabelFor ) { if ( !mpWindowImpl->mpAccessibleInfos ) mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos; mpWindowImpl->mpAccessibleInfos->pLabelForWindow = pLabelFor; } -void Window::SetAccessibleRelationMemberOf( Window* pMemberOfWin ) +void Window::SetAccessibleRelationMemberOf( vcl::Window* pMemberOfWin ) { if ( !mpWindowImpl->mpAccessibleInfos ) mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos; mpWindowImpl->mpAccessibleInfos->pMemberOfWindow = pMemberOfWin; } -Window* Window::GetAccessibleRelationMemberOf() const +vcl::Window* Window::GetAccessibleRelationMemberOf() const { if (mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pMemberOfWindow) return mpWindowImpl->mpAccessibleInfos->pMemberOfWindow; @@ -655,7 +657,7 @@ Window* Window::GetAccessibleRelationMemberOf() const return NULL; } -Window* Window::getAccessibleRelationLabelFor() const +vcl::Window* Window::getAccessibleRelationLabelFor() const { if (mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pLabelForWindow) return mpWindowImpl->mpAccessibleInfos->pLabelForWindow; @@ -663,9 +665,9 @@ Window* Window::getAccessibleRelationLabelFor() const return NULL; } -Window* Window::GetAccessibleRelationLabelFor() const +vcl::Window* Window::GetAccessibleRelationLabelFor() const { - Window* pWindow = getAccessibleRelationLabelFor(); + vcl::Window* pWindow = getAccessibleRelationLabelFor(); if (pWindow) return pWindow; @@ -676,7 +678,7 @@ Window* Window::GetAccessibleRelationLabelFor() const return NULL; } -Window* Window::GetAccessibleRelationLabeledBy() const +vcl::Window* Window::GetAccessibleRelationLabeledBy() const { if (mpWindowImpl->mpAccessibleInfos && mpWindowImpl->mpAccessibleInfos->pLabeledByWindow) return mpWindowImpl->mpAccessibleInfos->pLabeledByWindow; @@ -688,7 +690,7 @@ Window* Window::GetAccessibleRelationLabeledBy() const for (std::vector<FixedText*>::iterator aI = aMnemonicLabels.begin(), aEnd = aMnemonicLabels.end(); aI != aEnd; ++aI) { - Window *pCandidate = *aI; + vcl::Window *pCandidate = *aI; if (pCandidate->IsVisible()) return pCandidate; } @@ -707,7 +709,7 @@ bool Window::IsAccessibilityEventsSuppressed( bool bTraverseParentPath ) return mpWindowImpl->mbSuppressAccessibilityEvents; else { - Window *pParent = this; + vcl::Window *pParent = this; while ( pParent && pParent->mpWindowImpl) { if( pParent->mpWindowImpl->mbSuppressAccessibilityEvents ) @@ -724,4 +726,6 @@ void Window::SetAccessibilityEventsSuppressed(bool bSuppressed) mpWindowImpl->mbSuppressAccessibilityEvents = bSuppressed; } +} /* namespace vcl */ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index b1edf9493422..afc0be1ba9cc 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -77,6 +77,8 @@ static void ImplGetPinImage( sal_uInt16 nStyle, bool bPinIn, Image& rImage ) rImage = pSVData->maCtrlData.mpPinImgList->GetImage( nId ); } +namespace vcl { + void Window::ImplCalcSymbolRect( Rectangle& rRect ) { // Add border, not shown in the non-default representation, @@ -95,13 +97,15 @@ void Window::ImplCalcSymbolRect( Rectangle& rRect ) rRect.Bottom() -= nExtraHeight; } +} /* namespace vcl */ + static void ImplDrawBrdWinSymbol( OutputDevice* pDev, const Rectangle& rRect, SymbolType eSymbol ) { // we leave 5% room between the symbol and the button border DecorationView aDecoView( pDev ); Rectangle aTempRect = rRect; - Window::ImplCalcSymbolRect( aTempRect ); + vcl::Window::ImplCalcSymbolRect( aTempRect ); aDecoView.DrawSymbol( aTempRect, eSymbol, pDev->GetSettings().GetStyleSettings().GetButtonTextColor(), 0 ); } @@ -114,7 +118,7 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev, nState &= ~BUTTON_DRAW_HIGHLIGHT; Rectangle aTempRect; - Window *pWin = dynamic_cast< Window* >(pDev); + vcl::Window *pWin = dynamic_cast< vcl::Window* >(pDev); if( pWin ) { if( bMouseOver ) @@ -461,7 +465,7 @@ bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track { // dispatch to correct window type (why is Close() not virtual ??? ) // TODO: make Close() virtual - Window *pWin = pBorderWindow->ImplGetClientWindow()->ImplGetWindow(); + vcl::Window *pWin = pBorderWindow->ImplGetClientWindow()->ImplGetWindow(); SystemWindow *pSysWin = dynamic_cast<SystemWindow* >(pWin); DockingWindow *pDockWin = dynamic_cast<DockingWindow*>(pWin); if ( pSysWin ) @@ -1007,9 +1011,9 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei mnHeight = nHeight; mbNWFBorder = false; - Window *pWin = NULL, *pCtrl = NULL; + vcl::Window *pWin = NULL, *pCtrl = NULL; if (mpOutDev->GetOutDevType() == OUTDEV_WINDOW) - pWin = (Window*) mpOutDev; + pWin = (vcl::Window*) mpOutDev; if (pWin) pCtrl = mpBorderWindow->GetWindow(WINDOW_CLIENT); @@ -1096,7 +1100,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei mpBorderWindow->SetBackground(); pCtrl->SetPaintTransparent( true ); - Window* pCompoundParent = NULL; + vcl::Window* pCompoundParent = NULL; if( pWin->GetParent() && pWin->GetParent()->IsCompoundControl() ) pCompoundParent = pWin->GetParent(); @@ -1182,9 +1186,9 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* bool bNativeOK = false; // for native widget drawing we must find out what // control this border belongs to - Window *pWin = NULL, *pCtrl = NULL; + vcl::Window *pWin = NULL, *pCtrl = NULL; if( mpOutDev->GetOutDevType() == OUTDEV_WINDOW ) - pWin = (Window*) mpOutDev; + pWin = (vcl::Window*) mpOutDev; ControlType aCtrlType = 0; ControlPart aCtrlPart = PART_ENTIRE_CONTROL; @@ -1272,7 +1276,7 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* } bool bMouseOver = false; - Window *pCtrlChild = pCtrl->GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window *pCtrlChild = pCtrl->GetWindow( WINDOW_FIRSTCHILD ); while( pCtrlChild && !(bMouseOver = pCtrlChild->IsMouseOver()) ) pCtrlChild = pCtrlChild->GetWindow( WINDOW_NEXT ); @@ -1740,14 +1744,14 @@ void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* p } } -void ImplBorderWindow::ImplInit( Window* pParent, +void ImplBorderWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, sal_uInt16 nTypeStyle, const ::com::sun::star::uno::Any& ) { ImplInit( pParent, nStyle, nTypeStyle, NULL ); } -void ImplBorderWindow::ImplInit( Window* pParent, +void ImplBorderWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, sal_uInt16 nTypeStyle, SystemParentData* pSystemParentData ) @@ -1825,7 +1829,7 @@ void ImplBorderWindow::ImplInit( Window* pParent, InitView(); } -ImplBorderWindow::ImplBorderWindow( Window* pParent, +ImplBorderWindow::ImplBorderWindow( vcl::Window* pParent, SystemParentData* pSystemParentData, WinBits nStyle, sal_uInt16 nTypeStyle ) : Window( WINDOW_BORDERWINDOW ) @@ -1833,7 +1837,7 @@ ImplBorderWindow::ImplBorderWindow( Window* pParent, ImplInit( pParent, nStyle, nTypeStyle, pSystemParentData ); } -ImplBorderWindow::ImplBorderWindow( Window* pParent, WinBits nStyle , +ImplBorderWindow::ImplBorderWindow( vcl::Window* pParent, WinBits nStyle , sal_uInt16 nTypeStyle ) : Window( WINDOW_BORDERWINDOW ) { @@ -1915,7 +1919,7 @@ void ImplBorderWindow::Resize() if ( !mbRollUp ) { - Window* pClientWindow = ImplGetClientWindow(); + vcl::Window* pClientWindow = ImplGetClientWindow(); if ( mpMenuBarWindow ) { @@ -2035,7 +2039,7 @@ void ImplBorderWindow::UpdateView( bool bNewView, const Size& rNewOutSize ) mpBorderView->Init( this, aSize.Width(), aSize.Height() ); } - Window* pClientWindow = ImplGetClientWindow(); + vcl::Window* pClientWindow = ImplGetClientWindow(); if ( pClientWindow ) { GetBorder( pClientWindow->mpWindowImpl->mnLeftBorder, pClientWindow->mpWindowImpl->mnTopBorder, @@ -2159,7 +2163,7 @@ void ImplBorderWindow::UpdateMenuHeight() Resize(); } -void ImplBorderWindow::SetMenuBarWindow( Window* pWindow ) +void ImplBorderWindow::SetMenuBarWindow( vcl::Window* pWindow ) { mpMenuBarWindow = pWindow; UpdateMenuHeight(); @@ -2193,7 +2197,7 @@ Rectangle ImplBorderWindow::GetMenuRect() const Size ImplBorderWindow::GetOptimalSize() const { - const Window* pClientWindow = ImplGetClientWindow(); + const vcl::Window* pClientWindow = ImplGetClientWindow(); if (pClientWindow) return pClientWindow->GetOptimalSize(); return Size(mnMinWidth, mnMinHeight); diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index 21e909f8765b..b5871954b713 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -50,7 +50,7 @@ ButtonDialog::ButtonDialog( WindowType nType ) : ImplInitButtonDialogData(); } -ButtonDialog::ButtonDialog( Window* pParent, WinBits nStyle ) : +ButtonDialog::ButtonDialog( vcl::Window* pParent, WinBits nStyle ) : Dialog( WINDOW_BUTTONDIALOG ) { ImplInitButtonDialogData(); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 824fd177b1b1..e0c71e923530 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -176,7 +176,7 @@ namespace } #endif -VclBuilder::VclBuilder(Window *pParent, const OUString& sUIDir, const OUString& sUIFile, const OString& sID, const uno::Reference<frame::XFrame>& rFrame) +VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUString& sUIFile, const OString& sID, const uno::Reference<frame::XFrame>& rFrame) : m_sID(sID) , m_sHelpRoot(OUStringToOString(sUIFile, RTL_TEXTENCODING_UTF8)) , m_pStringReplace(ResMgr::GetReadStringHook()) @@ -217,7 +217,7 @@ VclBuilder::VclBuilder(Window *pParent, const OUString& sUIDir, const OUString& aEnd = m_pParserState->m_aMnemonicWidgetMaps.end(); aI != aEnd; ++aI) { FixedText *pOne = get<FixedText>(aI->m_sID); - Window *pOther = get<Window>(aI->m_sValue); + vcl::Window *pOther = get<vcl::Window>(aI->m_sValue); SAL_WARN_IF(!pOne || !pOther, "vcl", "missing either source " << aI->m_sID << " or target " << aI->m_sValue << " member of Mnemonic Widget Mapping"); if (pOne && pOther) pOne->set_mnemonic_widget(pOther); @@ -227,14 +227,14 @@ VclBuilder::VclBuilder(Window *pParent, const OUString& sUIDir, const OUString& for (AtkMap::iterator aI = m_pParserState->m_aAtkInfo.begin(), aEnd = m_pParserState->m_aAtkInfo.end(); aI != aEnd; ++aI) { - Window *pSource = aI->first; + vcl::Window *pSource = aI->first; const stringmap &rMap = aI->second; for (stringmap::const_iterator aP = rMap.begin(), aEndP = rMap.end(); aP != aEndP; ++aP) { const OString &rTarget = aP->second; - Window *pTarget = get<Window>(rTarget); + vcl::Window *pTarget = get<vcl::Window>(rTarget); SAL_WARN_IF(!pTarget, "vcl", "missing member of a11y relation: " << rTarget.getStr()); if (!pTarget) @@ -290,7 +290,7 @@ VclBuilder::VclBuilder(Window *pParent, const OUString& sUIDir, const OUString& for (std::vector<WidgetAdjustmentMap>::iterator aI = m_pParserState->m_aNumericFormatterAdjustmentMaps.begin(), aEnd = m_pParserState->m_aNumericFormatterAdjustmentMaps.end(); aI != aEnd; ++aI) { - NumericFormatter *pTarget = dynamic_cast<NumericFormatter*>(get<Window>(aI->m_sID)); + NumericFormatter *pTarget = dynamic_cast<NumericFormatter*>(get<vcl::Window>(aI->m_sID)); const Adjustment *pAdjustment = get_adjustment_by_name(aI->m_sValue); SAL_WARN_IF(!pTarget || !pAdjustment, "vcl", "missing elements of spinbutton/adjustment"); if (pTarget && pAdjustment) @@ -300,7 +300,7 @@ VclBuilder::VclBuilder(Window *pParent, const OUString& sUIDir, const OUString& for (std::vector<WidgetAdjustmentMap>::iterator aI = m_pParserState->m_aTimeFormatterAdjustmentMaps.begin(), aEnd = m_pParserState->m_aTimeFormatterAdjustmentMaps.end(); aI != aEnd; ++aI) { - TimeField *pTarget = dynamic_cast<TimeField*>(get<Window>(aI->m_sID)); + TimeField *pTarget = dynamic_cast<TimeField*>(get<vcl::Window>(aI->m_sID)); const Adjustment *pAdjustment = get_adjustment_by_name(aI->m_sValue); SAL_WARN_IF(!pTarget || !pAdjustment, "vcl", "missing elements of spinbutton/adjustment"); if (pTarget && pAdjustment) @@ -310,7 +310,7 @@ VclBuilder::VclBuilder(Window *pParent, const OUString& sUIDir, const OUString& for (std::vector<WidgetAdjustmentMap>::iterator aI = m_pParserState->m_aDateFormatterAdjustmentMaps.begin(), aEnd = m_pParserState->m_aDateFormatterAdjustmentMaps.end(); aI != aEnd; ++aI) { - DateField *pTarget = dynamic_cast<DateField*>(get<Window>(aI->m_sID)); + DateField *pTarget = dynamic_cast<DateField*>(get<vcl::Window>(aI->m_sID)); const Adjustment *pAdjustment = get_adjustment_by_name(aI->m_sValue); SAL_WARN_IF(!pTarget || !pAdjustment, "vcl", "missing elements of spinbutton/adjustment"); if (pTarget && pAdjustment) @@ -345,7 +345,7 @@ VclBuilder::VclBuilder(Window *pParent, const OUString& sUIDir, const OUString& for (std::vector<OString>::iterator aW = aI->m_aWidgets.begin(), aEndW = aI->m_aWidgets.end(); aW != aEndW; ++aW) { - Window* pWindow = get<Window>(aW->getStr()); + vcl::Window* pWindow = get<vcl::Window>(aW->getStr()); pWindow->add_to_size_group(xGroup); } } @@ -450,7 +450,7 @@ VclBuilder::VclBuilder(Window *pParent, const OUString& sUIDir, const OUString& //Remove ScrollWindow parent widgets whose children in vcl implement scrolling //internally. - for (std::map<Window*, Window*>::iterator aI = m_pParserState->m_aRedundantParentWidgets.begin(), + for (std::map<vcl::Window*, vcl::Window*>::iterator aI = m_pParserState->m_aRedundantParentWidgets.begin(), aEnd = m_pParserState->m_aRedundantParentWidgets.end(); aI != aEnd; ++aI) { delete_by_window(aI->first); @@ -462,8 +462,8 @@ VclBuilder::VclBuilder(Window *pParent, const OUString& sUIDir, const OUString& { VclExpander *pOne = *aI; - Window *pChild = pOne->get_child(); - Window* pLabel = pOne->GetWindow(WINDOW_LASTCHILD); + vcl::Window *pChild = pOne->get_child(); + vcl::Window* pLabel = pOne->GetWindow(WINDOW_LASTCHILD); if (pLabel && pLabel != pChild && pLabel->GetType() == WINDOW_FIXEDTEXT) { FixedText *pLabelWidget = static_cast<FixedText*>(pLabel); @@ -835,7 +835,7 @@ namespace pButton->SetModeImage(aImage); } - Button* extractStockAndBuildPushButton(Window *pParent, VclBuilder::stringmap &rMap) + Button* extractStockAndBuildPushButton(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER; @@ -868,7 +868,7 @@ namespace return pWindow; } - Button * extractStockAndBuildMenuButton(Window *pParent, VclBuilder::stringmap &rMap) + Button * extractStockAndBuildMenuButton(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER|WB_3DLOOK; @@ -1165,7 +1165,7 @@ void VclBuilder::extractMnemonicWidget(const OString &rLabelID, stringmap &rMap) } } -Window* VclBuilder::prepareWidgetOwnScrolling(Window *pParent, WinBits &rWinStyle) +vcl::Window* VclBuilder::prepareWidgetOwnScrolling(vcl::Window *pParent, WinBits &rWinStyle) { //For Widgets that manage their own scrolling, if one appears as a child of //a scrolling window shoehorn that scrolling settings to this widget and @@ -1181,7 +1181,7 @@ Window* VclBuilder::prepareWidgetOwnScrolling(Window *pParent, WinBits &rWinStyl return pParent; } -void VclBuilder::cleanupWidgetOwnScrolling(Window *pScrollParent, Window *pWindow, stringmap &rMap) +void VclBuilder::cleanupWidgetOwnScrolling(vcl::Window *pScrollParent, vcl::Window *pWindow, stringmap &rMap) { //remove the redundant scrolling parent sal_Int32 nWidthReq = pScrollParent->get_width_request(); @@ -1196,7 +1196,7 @@ void VclBuilder::cleanupWidgetOwnScrolling(Window *pScrollParent, Window *pWindo extern "C" { static void SAL_CALL thisModule() {} } #endif -Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OString &id, +vcl::Window *VclBuilder::makeObject(vcl::Window *pParent, const OString &name, const OString &id, stringmap &rMap, const std::vector<OString> &rItems) { bool bIsPlaceHolder = name.isEmpty(); @@ -1242,7 +1242,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri extractButtonImage(id, rMap, name == "GtkRadioButton"); - Window *pWindow = NULL; + vcl::Window *pWindow = NULL; if (name == "GtkDialog") { WinBits nBits = WB_CLIPCHILDREN|WB_MOVEABLE|WB_3DLOOK|WB_CLOSEABLE; @@ -1492,7 +1492,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; //ListBox manages its own scrolling, - Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle); + vcl::Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle); pWindow = new ListBox(pRealParent, nWinStyle); if (pRealParent != pParent) cleanupWidgetOwnScrolling(pParent, pWindow, rMap); @@ -1570,7 +1570,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri else if (name == "GtkDrawingArea") { OString sBorder = extractCustomProperty(rMap); - pWindow = new Window(pParent, sBorder.isEmpty() ? 0 : WB_BORDER); + pWindow = new vcl::Window(pParent, sBorder.isEmpty() ? 0 : WB_BORDER); } else if (name == "GtkTextView") { @@ -1581,7 +1581,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; //VclMultiLineEdit manages its own scrolling, - Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle); + vcl::Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle); pWindow = new VclMultiLineEdit(pRealParent, nWinStyle); if (pRealParent != pParent) cleanupWidgetOwnScrolling(pParent, pWindow, rMap); @@ -1702,7 +1702,7 @@ namespace { //return true for window types which exist in vcl but are not themselves //represented in the .ui format, i.e. only their children exist. - bool isConsideredGtkPseudo(Window *pWindow) + bool isConsideredGtkPseudo(vcl::Window *pWindow) { return pWindow->GetType() == WINDOW_TABPAGE; } @@ -1720,7 +1720,7 @@ void VclBuilder::setDeferredProperties() set_properties(m_pParent, aDeferredProperties); } -void VclBuilder::set_properties(Window *pWindow, const stringmap &rProps) +void VclBuilder::set_properties(vcl::Window *pWindow, const stringmap &rProps) { for (stringmap::const_iterator aI = rProps.begin(), aEnd = rProps.end(); aI != aEnd; ++aI) { @@ -1730,12 +1730,12 @@ void VclBuilder::set_properties(Window *pWindow, const stringmap &rProps) } } -Window *VclBuilder::insertObject(Window *pParent, const OString &rClass, +vcl::Window *VclBuilder::insertObject(vcl::Window *pParent, const OString &rClass, const OString &rID, stringmap &rProps, stringmap &rPango, stringmap &rAtk, std::vector<OString> &rItems) { - Window *pCurrentChild = NULL; + vcl::Window *pCurrentChild = NULL; if (m_pParent && !isConsideredGtkPseudo(m_pParent) && !m_sID.isEmpty() && rID.equals(m_sID)) { @@ -1797,7 +1797,7 @@ Window *VclBuilder::insertObject(Window *pParent, const OString &rClass, return pCurrentChild; } -void VclBuilder::reorderWithinParent(Window &rWindow, sal_uInt16 nNewPosition) +void VclBuilder::reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition) { if (rWindow.mpWindowImpl->mpParent != rWindow.mpWindowImpl->mpRealParent) { @@ -1811,7 +1811,7 @@ void VclBuilder::reorderWithinParent(Window &rWindow, sal_uInt16 nNewPosition) rWindow.reorderWithinParent(nNewPosition); } -void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader) +void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &reader) { OString sID; @@ -1878,7 +1878,7 @@ void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader) //so that tabbing between controls goes in a visually sensible sequence //we sort these into a best-tab-order sequence -bool VclBuilder::sortIntoBestTabTraversalOrder::operator()(const Window *pA, const Window *pB) const +bool VclBuilder::sortIntoBestTabTraversalOrder::operator()(const vcl::Window *pA, const vcl::Window *pB) const { //sort child order within parent list by grid position sal_Int32 nTopA = pA->get_grid_top_attach(); @@ -1934,7 +1934,7 @@ bool VclBuilder::sortIntoBestTabTraversalOrder::operator()(const Window *pA, con const VclFrame *pFrameParent = dynamic_cast<const VclFrame*>(pA->GetParent()); if (pFrameParent) { - const Window *pLabel = pFrameParent->get_label_widget(); + const vcl::Window *pLabel = pFrameParent->get_label_widget(); int nFramePosA = (pA == pLabel) ? 0 : 1; int nFramePosB = (pB == pLabel) ? 0 : 1; return nFramePosA < nFramePosB; @@ -1943,9 +1943,9 @@ bool VclBuilder::sortIntoBestTabTraversalOrder::operator()(const Window *pA, con return false; } -void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) +void VclBuilder::handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader) { - Window *pCurrentChild = NULL; + vcl::Window *pCurrentChild = NULL; xmlreader::Span name; int nsId; @@ -2017,7 +2017,7 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) } else if (sInternalChild.startsWith("action_area") || sInternalChild.startsWith("messagedialog-action_area")) { - Window *pContentArea = pCurrentChild->GetParent(); + vcl::Window *pContentArea = pCurrentChild->GetParent(); assert(pContentArea && pContentArea->GetType() == WINDOW_CONTAINER); if (Dialog *pBoxParent = dynamic_cast<Dialog*>(pContentArea ? pContentArea->GetParent() : NULL)) { @@ -2027,8 +2027,8 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) //To-Do make reorder a virtual in Window, move this foo //there and see above - std::vector<Window*> aChilds; - for (Window* pChild = pCurrentChild->GetWindow(WINDOW_FIRSTCHILD); pChild; + std::vector<vcl::Window*> aChilds; + for (vcl::Window* pChild = pCurrentChild->GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { aChilds.push_back(pChild); @@ -2062,7 +2062,7 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) } } -void VclBuilder::reorderWithinParent(std::vector<Window*>& rChilds, bool bIsButtonBox) +void VclBuilder::reorderWithinParent(std::vector<vcl::Window*>& rChilds, bool bIsButtonBox) { for (size_t i = 0; i < rChilds.size(); ++i) { @@ -2336,7 +2336,7 @@ void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OString &rI } } -void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, Window *pWindow) +void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, vcl::Window *pWindow) { assert(pWindow); @@ -2736,7 +2736,7 @@ void VclBuilder::insertMenuObject(PopupMenu *pParent, const OString &rClass, con rProps.clear(); } -Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader) +vcl::Window* VclBuilder::handleObject(vcl::Window *pParent, xmlreader::XmlReader &reader) { OString sClass; OString sID; @@ -2794,7 +2794,7 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader) if (!sCustomProperty.isEmpty()) aProperties[OString("customproperty")] = sCustomProperty; - Window *pCurrentChild = NULL; + vcl::Window *pCurrentChild = NULL; while(true) { xmlreader::XmlReader::Result res = reader.nextItem( @@ -2859,7 +2859,7 @@ Window* VclBuilder::handleObject(Window *pParent, xmlreader::XmlReader &reader) return pCurrentChild; } -void VclBuilder::handlePacking(Window *pCurrent, Window *pParent, xmlreader::XmlReader &reader) +void VclBuilder::handlePacking(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader) { xmlreader::Span name; int nsId; @@ -2891,8 +2891,8 @@ void VclBuilder::handlePacking(Window *pCurrent, Window *pParent, xmlreader::Xml } } -void VclBuilder::applyPackingProperty(Window *pCurrent, - Window *pParent, +void VclBuilder::applyPackingProperty(vcl::Window *pCurrent, + vcl::Window *pParent, xmlreader::XmlReader &reader) { if (!pCurrent) @@ -2909,7 +2909,7 @@ void VclBuilder::applyPackingProperty(Window *pCurrent, if (pCurrent->GetType() == WINDOW_SCROLLWINDOW) { - std::map<Window*, Window*>::iterator aFind = m_pParserState->m_aRedundantParentWidgets.find(pCurrent); + std::map<vcl::Window*, vcl::Window*>::iterator aFind = m_pParserState->m_aRedundantParentWidgets.find(pCurrent); if (aFind != m_pParserState->m_aRedundantParentWidgets.end()) { pCurrent = aFind->second; @@ -3105,12 +3105,12 @@ void VclBuilder::collectAccelerator(xmlreader::XmlReader &reader, stringmap &rMa } } -Window *VclBuilder::get_widget_root() +vcl::Window *VclBuilder::get_widget_root() { return m_aChildren.empty() ? NULL : m_aChildren[0].m_pWindow; } -Window *VclBuilder::get_by_name(const OString& sID) +vcl::Window *VclBuilder::get_by_name(const OString& sID) { for (std::vector<WinAndId>::iterator aI = m_aChildren.begin(), aEnd = m_aChildren.end(); aI != aEnd; ++aI) @@ -3134,7 +3134,7 @@ PopupMenu *VclBuilder::get_menu(const OString& sID) return NULL; } -short VclBuilder::get_response(const Window *pWindow) const +short VclBuilder::get_response(const vcl::Window *pWindow) const { for (std::vector<WinAndId>::const_iterator aI = m_aChildren.begin(), aEnd = m_aChildren.end(); aI != aEnd; ++aI) @@ -3180,13 +3180,13 @@ void VclBuilder::delete_by_name(const OString& sID) } } -void VclBuilder::delete_by_window(const Window *pWindow) +void VclBuilder::delete_by_window(const vcl::Window *pWindow) { drop_ownership(pWindow); delete pWindow; } -void VclBuilder::drop_ownership(const Window *pWindow) +void VclBuilder::drop_ownership(const vcl::Window *pWindow) { for (std::vector<WinAndId>::iterator aI = m_aChildren.begin(), aEnd = m_aChildren.end(); aI != aEnd; ++aI) @@ -3199,7 +3199,7 @@ void VclBuilder::drop_ownership(const Window *pWindow) } } -OString VclBuilder::get_by_window(const Window *pWindow) const +OString VclBuilder::get_by_window(const vcl::Window *pWindow) const { for (std::vector<WinAndId>::const_iterator aI = m_aChildren.begin(), aEnd = m_aChildren.end(); aI != aEnd; ++aI) @@ -3211,13 +3211,13 @@ OString VclBuilder::get_by_window(const Window *pWindow) const return OString(); } -VclBuilder::PackingData VclBuilder::get_window_packing_data(const Window *pWindow) const +VclBuilder::PackingData VclBuilder::get_window_packing_data(const vcl::Window *pWindow) const { //We've stored the return of new Control, some of these get //border windows placed around them which are what you get //from GetChild, so scoot up a level if necessary to get the //window whose position value we have - const Window *pPropHolder = pWindow->mpWindowImpl->mpClientWindow ? + const vcl::Window *pPropHolder = pWindow->mpWindowImpl->mpClientWindow ? pWindow->mpWindowImpl->mpClientWindow : pWindow; for (std::vector<WinAndId>::const_iterator aI = m_aChildren.begin(), @@ -3230,7 +3230,7 @@ VclBuilder::PackingData VclBuilder::get_window_packing_data(const Window *pWindo return PackingData(); } -void VclBuilder::set_window_packing_position(const Window *pWindow, sal_Int32 nPosition) +void VclBuilder::set_window_packing_position(const vcl::Window *pWindow, sal_Int32 nPosition) { for (std::vector<WinAndId>::iterator aI = m_aChildren.begin(), aEnd = m_aChildren.end(); aI != aEnd; ++aI) diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx index 4659ee250e84..b31e4ead8dcb 100644 --- a/vcl/source/window/clipping.cxx +++ b/vcl/source/window/clipping.cxx @@ -28,6 +28,8 @@ #define IMPL_MAXSAVEBACKSIZE (640*480) #define IMPL_MAXALLSAVEBACKSIZE (800*600*2) +namespace vcl { + void Window::InitClipRegion() { DBG_TESTSOLARMUTEX(); @@ -118,12 +120,12 @@ Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const if ( nFlags & WINDOW_GETCLIPREGION_NOCHILDREN ) { if ( mpWindowImpl->mbInitWinClipRegion ) - ((Window*)this)->ImplInitWinClipRegion(); + ((vcl::Window*)this)->ImplInitWinClipRegion(); aWinClipRegion = mpWindowImpl->maWinClipRegion; } else { - Region* pWinChildClipRegion = ((Window*)this)->ImplGetWinChildClipRegion(); + Region* pWinChildClipRegion = ((vcl::Window*)this)->ImplGetWinChildClipRegion(); aWinClipRegion = *pWinChildClipRegion; // --- RTL --- remirror clip region before passing it to somebody if( ImplIsAntiparallel() ) @@ -194,10 +196,10 @@ void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps ) if ( bOverlaps && !rRegion.IsEmpty() ) { // Clip Overlap Siblings - Window* pStartOverlapWindow = this; + vcl::Window* pStartOverlapWindow = this; while ( !pStartOverlapWindow->mpWindowImpl->mbFrame ) { - Window* pOverlapWindow = pStartOverlapWindow->mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpFirstOverlap; + vcl::Window* pOverlapWindow = pStartOverlapWindow->mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpFirstOverlap; while ( pOverlapWindow && (pOverlapWindow != pStartOverlapWindow) ) { pOverlapWindow->ImplExcludeOverlapWindows2( rRegion ); @@ -217,7 +219,7 @@ void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps ) bool Window::ImplClipChildren( Region& rRegion ) { bool bOtherClip = false; - Window* pWindow = mpWindowImpl->mpFirstChild; + vcl::Window* pWindow = mpWindowImpl->mpFirstChild; while ( pWindow ) { if ( pWindow->mpWindowImpl->mbReallyVisible ) @@ -239,7 +241,7 @@ bool Window::ImplClipChildren( Region& rRegion ) void Window::ImplClipAllChildren( Region& rRegion ) { - Window* pWindow = mpWindowImpl->mpFirstChild; + vcl::Window* pWindow = mpWindowImpl->mpFirstChild; while ( pWindow ) { if ( pWindow->mpWindowImpl->mbReallyVisible ) @@ -250,7 +252,7 @@ void Window::ImplClipAllChildren( Region& rRegion ) void Window::ImplClipSiblings( Region& rRegion ) { - Window* pWindow = ImplGetParent()->mpWindowImpl->mpFirstChild; + vcl::Window* pWindow = ImplGetParent()->mpWindowImpl->mpFirstChild; while ( pWindow ) { if ( pWindow == this ) @@ -395,7 +397,7 @@ void Window::ImplUpdateSysObjChildrenClip() if ( mpWindowImpl->mpSysObj && mpWindowImpl->mbInitWinClipRegion ) ImplSysObjClip( NULL ); - Window* pWindow = mpWindowImpl->mpFirstChild; + vcl::Window* pWindow = mpWindowImpl->mpFirstChild; while ( pWindow ) { pWindow->ImplUpdateSysObjChildrenClip(); @@ -407,7 +409,7 @@ void Window::ImplUpdateSysObjOverlapsClip() { ImplUpdateSysObjChildrenClip(); - Window* pWindow = mpWindowImpl->mpFirstOverlap; + vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; while ( pWindow ) { pWindow->ImplUpdateSysObjOverlapsClip(); @@ -424,7 +426,7 @@ void Window::ImplUpdateSysObjClip() // siblings should recalculate their clip region if ( mpWindowImpl->mbClipSiblings ) { - Window* pWindow = mpWindowImpl->mpNext; + vcl::Window* pWindow = mpWindowImpl->mpNext; while ( pWindow ) { pWindow->ImplUpdateSysObjChildrenClip(); @@ -448,7 +450,7 @@ bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller ) mbInitClipRegion = true; mpWindowImpl->mbInitWinClipRegion = true; - Window* pWindow = mpWindowImpl->mpFirstChild; + vcl::Window* pWindow = mpWindowImpl->mpFirstChild; while ( pWindow ) { if ( !pWindow->ImplSetClipFlagChildren( bSysObjOnlySmaller ) ) @@ -470,7 +472,7 @@ bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller ) mbInitClipRegion = true; mpWindowImpl->mbInitWinClipRegion = true; - Window* pWindow = mpWindowImpl->mpFirstChild; + vcl::Window* pWindow = mpWindowImpl->mpFirstChild; while ( pWindow ) { if ( !pWindow->ImplSetClipFlagChildren( bSysObjOnlySmaller ) ) @@ -485,7 +487,7 @@ bool Window::ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller ) { bool bUpdate = ImplSetClipFlagChildren( bSysObjOnlySmaller ); - Window* pWindow = mpWindowImpl->mpFirstOverlap; + vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; while ( pWindow ) { if ( !pWindow->ImplSetClipFlagOverlapWindows( bSysObjOnlySmaller ) ) @@ -502,7 +504,7 @@ bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller ) { bool bUpdate = ImplSetClipFlagChildren( bSysObjOnlySmaller ); - Window* pParent = ImplGetParent(); + vcl::Window* pParent = ImplGetParent(); if ( pParent && ((pParent->GetStyle() & WB_CLIPCHILDREN) || (mpWindowImpl->mnParentClipMode & PARENTCLIPMODE_CLIP)) ) { @@ -513,7 +515,7 @@ bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller ) // siblings should recalculate their clip region if ( mpWindowImpl->mbClipSiblings ) { - Window* pWindow = mpWindowImpl->mpNext; + vcl::Window* pWindow = mpWindowImpl->mpNext; while ( pWindow ) { if ( !pWindow->ImplSetClipFlagChildren( bSysObjOnlySmaller ) ) @@ -564,7 +566,7 @@ void Window::ImplExcludeWindowRegion( Region& rRegion ) void Window::ImplExcludeOverlapWindows( Region& rRegion ) { - Window* pWindow = mpWindowImpl->mpFirstOverlap; + vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; while ( pWindow ) { if ( pWindow->mpWindowImpl->mbReallyVisible ) @@ -587,7 +589,7 @@ void Window::ImplExcludeOverlapWindows2( Region& rRegion ) void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Region& rRegion ) { - Window* pWindow = mpWindowImpl->mpFirstOverlap; + vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; while ( pWindow ) { if ( pWindow->mpWindowImpl->mbReallyVisible ) @@ -617,14 +619,14 @@ void Window::ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, R void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& rRegion ) { // Clip Overlap Siblings - Window* pStartOverlapWindow; + vcl::Window* pStartOverlapWindow; if ( !ImplIsOverlapWindow() ) pStartOverlapWindow = mpWindowImpl->mpOverlapWindow; else pStartOverlapWindow = this; while ( !pStartOverlapWindow->mpWindowImpl->mbFrame ) { - Window* pOverlapWindow = pStartOverlapWindow->mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpFirstOverlap; + vcl::Window* pOverlapWindow = pStartOverlapWindow->mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpFirstOverlap; while ( pOverlapWindow && (pOverlapWindow != pStartOverlapWindow) ) { pOverlapWindow->ImplIntersectAndUnionOverlapWindows2( rInterRegion, rRegion ); @@ -647,7 +649,7 @@ void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegio if ( mpWindowImpl->mbWinRegion ) rRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) ); Region aTempRegion; - Window* pWindow; + vcl::Window* pWindow; ImplCalcOverlapRegionOverlaps( aRegion, rRegion ); @@ -710,12 +712,12 @@ void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegio } } -bool Window::ImplIsWindowInFront( const Window* pTestWindow ) const +bool Window::ImplIsWindowInFront( const vcl::Window* pTestWindow ) const { // check for overlapping window pTestWindow = pTestWindow->ImplGetFirstOverlapWindow(); - const Window* pTempWindow = pTestWindow; - const Window* pThisWindow = ImplGetFirstOverlapWindow(); + const vcl::Window* pTempWindow = pTestWindow; + const vcl::Window* pThisWindow = ImplGetFirstOverlapWindow(); if ( pTempWindow == pThisWindow ) return false; do @@ -926,7 +928,7 @@ void Window::ImplDeleteOverlapBackground() mpWindowImpl->mpFrameData->mpFirstBackWin = mpWindowImpl->mpOverlapData->mpNextBackWin; else { - Window* pTemp = mpWindowImpl->mpFrameData->mpFirstBackWin; + vcl::Window* pTemp = mpWindowImpl->mpFrameData->mpFirstBackWin; while ( pTemp->mpWindowImpl->mpOverlapData->mpNextBackWin != this ) pTemp = pTemp->mpWindowImpl->mpOverlapData->mpNextBackWin; pTemp->mpWindowImpl->mpOverlapData->mpNextBackWin = mpWindowImpl->mpOverlapData->mpNextBackWin; @@ -937,12 +939,12 @@ void Window::ImplDeleteOverlapBackground() void Window::ImplInvalidateAllOverlapBackgrounds() { - Window* pWindow = mpWindowImpl->mpFrameData->mpFirstBackWin; + vcl::Window* pWindow = mpWindowImpl->mpFrameData->mpFirstBackWin; while ( pWindow ) { // remember next window here already, as this window could // be removed within the next if clause from the list - Window* pNext = pWindow->mpWindowImpl->mpOverlapData->mpNextBackWin; + vcl::Window* pNext = pWindow->mpWindowImpl->mpOverlapData->mpNextBackWin; if ( ImplIsWindowInFront( pWindow ) ) { @@ -966,5 +968,6 @@ void Window::ImplInvalidateAllOverlapBackgrounds() } } +} /* namespace vcl */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index a64c37a6a5f2..d0c9a7327e5d 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -38,12 +38,12 @@ struct ImplCursorData unsigned char mnDirection; // indicates writing direction sal_uInt16 mnStyle; // Cursor-Style bool mbCurVisible; // Ist Cursor aktuell sichtbar - Window* mpWindow; // Zugeordnetes Windows + vcl::Window* mpWindow; // Zugeordnetes Windows }; static void ImplCursorInvert( ImplCursorData* pData ) { - Window* pWindow = pData->mpWindow; + vcl::Window* pWindow = pData->mpWindow; bool bMapMode = pWindow->IsMapModeEnabled(); pWindow->EnableMapMode( false ); sal_uInt16 nInvertStyle; @@ -119,7 +119,7 @@ void vcl::Cursor::ImplDraw() { if ( mpData && mpData->mpWindow && !mpData->mbCurVisible ) { - Window* pWindow = mpData->mpWindow; + vcl::Window* pWindow = mpData->mpWindow; mpData->maPixPos = pWindow->LogicToPixel( maPos ); mpData->maPixSize = pWindow->LogicToPixel( maSize ); mpData->mnPixSlant = pWindow->LogicToPixel( Size( mnSlant, 0 ) ).Width(); @@ -152,7 +152,7 @@ void vcl::Cursor::ImplDoShow( bool bDrawDirect, bool bRestore ) { if ( mbVisible ) { - Window* pWindow; + vcl::Window* pWindow; if ( mpWindow ) pWindow = mpWindow; else @@ -317,7 +317,7 @@ void vcl::Cursor::Hide() } } -void vcl::Cursor::SetWindow( Window* pWindow ) +void vcl::Cursor::SetWindow( vcl::Window* pWindow ) { if ( mpWindow != pWindow ) { diff --git a/vcl/source/window/debug.cxx b/vcl/source/window/debug.cxx index 4aa875a658d9..70e50ef5d5f9 100644 --- a/vcl/source/window/debug.cxx +++ b/vcl/source/window/debug.cxx @@ -27,13 +27,13 @@ const char* ImplDbgCheckWindow( const void* pObj ) { DBG_TESTSOLARMUTEX(); - const Window* pWindow = (Window*)pObj; + const vcl::Window* pWindow = (vcl::Window*)pObj; if ( (pWindow->GetType() < WINDOW_FIRST) || (pWindow->GetType() > WINDOW_LAST) ) return "Window data overwrite"; // check window-chain - Window* pChild = pWindow->mpWindowImpl->mpFirstChild; + vcl::Window* pChild = pWindow->mpWindowImpl->mpFirstChild; while ( pChild ) { if ( pChild->mpWindowImpl->mpParent != pWindow ) diff --git a/vcl/source/window/debugevent.cxx b/vcl/source/window/debugevent.cxx index 9d622a91f989..b6e1cf88dc80 100644 --- a/vcl/source/window/debugevent.cxx +++ b/vcl/source/window/debugevent.cxx @@ -32,9 +32,9 @@ static double getRandom() return (double)rand() / RAND_MAX; } -Window *DebugEventInjector::ChooseWindow() +vcl::Window *DebugEventInjector::ChooseWindow() { - Window *pWindow, *pParent; + vcl::Window *pWindow, *pParent; if (getRandom() < 0.80 && (pWindow = Application::GetFocusWindow())) @@ -46,11 +46,11 @@ Window *DebugEventInjector::ChooseWindow() // select a top window at random long nIdx = Application::GetTopWindowCount() * getRandom(); if (!(pParent = Application::GetTopWindow( nIdx ))) - pParent = static_cast<Window *>(Application::GetAppWindow()); + pParent = static_cast<vcl::Window *>(Application::GetAppWindow()); } assert (pParent != NULL); - std::vector< Window *> aChildren; + std::vector< vcl::Window *> aChildren; pParent->CollectChildren( aChildren ); return aChildren[ aChildren.size() * getRandom() ]; @@ -77,7 +77,7 @@ static void CollectMenuItemIds( Menu *pMenu, MenuItemIds &rIds ) void DebugEventInjector::InjectMenuEvent() { - Window *pFocus = Application::GetFocusWindow(); + vcl::Window *pFocus = Application::GetFocusWindow(); if (!pFocus) return; @@ -133,7 +133,7 @@ static void InitKeyEvent( SalKeyEvent &rKeyEvent ) void DebugEventInjector::InjectTextEvent() { SalKeyEvent aKeyEvent; - Window *pWindow = ChooseWindow(); + vcl::Window *pWindow = ChooseWindow(); InitKeyEvent( aKeyEvent ); @@ -198,7 +198,7 @@ void DebugEventInjector::InjectEvent() void DebugEventInjector::InjectKeyNavEdit() { - Window *pWindow = ChooseWindow(); + vcl::Window *pWindow = ChooseWindow(); struct { double mnProb; diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx index ad68d451137e..8fdf1dbd5351 100644 --- a/vcl/source/window/decoview.cxx +++ b/vcl/source/window/decoview.cxx @@ -618,7 +618,7 @@ void ImplDrawButton( OutputDevice *const pDev, Rectangle aFillRect, void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect, const StyleSettings& rStyleSettings, sal_uInt16 nStyle ) { - Window *const pWin = (pDev->GetOutDevType()==OUTDEV_WINDOW) ? (Window*) pDev : NULL; + vcl::Window *const pWin = (pDev->GetOutDevType()==OUTDEV_WINDOW) ? (vcl::Window*) pDev : NULL; const bool bMenuStyle = nStyle & FRAME_DRAW_MENU; @@ -1041,7 +1041,7 @@ void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, boo { Point aStart( rStart ), aStop( rStop ); const StyleSettings& rStyleSettings = mpOutDev->GetSettings().GetStyleSettings(); - Window *const pWin = (mpOutDev->GetOutDevType()==OUTDEV_WINDOW) ? (Window*) mpOutDev: NULL; + vcl::Window *const pWin = (mpOutDev->GetOutDevType()==OUTDEV_WINDOW) ? (vcl::Window*) mpOutDev: NULL; if(pWin) { ControlPart nPart = ( bVertical ? PART_SEPARATOR_VERT : PART_SEPARATOR_HORZ ); diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 918247f9bb05..1d35780ba0f6 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -70,7 +70,7 @@ static OString ImplGetDialogText( Dialog* pDialog ) return aErrorStr.makeStringAndClear(); } -static bool ImplIsMnemonicCtrl( Window* pWindow ) +static bool ImplIsMnemonicCtrl( vcl::Window* pWindow ) { if( ! pWindow->GetSettings().GetStyleSettings().GetAutoMnemonic() ) return false; @@ -90,7 +90,7 @@ static bool ImplIsMnemonicCtrl( Window* pWindow ) //until we can be sure we can remove it if ( pWindow->GetStyle() & (WB_INFO | WB_NOLABEL) ) return false; - Window* pNextWindow = pWindow->GetWindow( WINDOW_NEXT ); + vcl::Window* pNextWindow = pWindow->GetWindow( WINDOW_NEXT ); if ( !pNextWindow ) return false; pNextWindow = pNextWindow->GetWindow( WINDOW_CLIENT ); @@ -119,9 +119,9 @@ void ImplHideSplash() //Get next window after pChild of a pTopLevel window as //if any intermediate layout widgets didn't exist -Window * nextLogicalChildOfParent(Window *pTopLevel, Window *pChild) +vcl::Window * nextLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChild) { - Window *pLastChild = pChild; + vcl::Window *pLastChild = pChild; if (isContainerWindow(*pChild)) pChild = pChild->GetWindow(WINDOW_FIRSTCHILD); @@ -130,7 +130,7 @@ Window * nextLogicalChildOfParent(Window *pTopLevel, Window *pChild) while (!pChild) { - Window *pParent = pLastChild->GetParent(); + vcl::Window *pParent = pLastChild->GetParent(); if (!pParent) return NULL; if (pParent == pTopLevel) @@ -145,9 +145,9 @@ Window * nextLogicalChildOfParent(Window *pTopLevel, Window *pChild) return pChild; } -Window * prevLogicalChildOfParent(Window *pTopLevel, Window *pChild) +vcl::Window * prevLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChild) { - Window *pLastChild = pChild; + vcl::Window *pLastChild = pChild; if (isContainerWindow(*pChild)) pChild = pChild->GetWindow(WINDOW_LASTCHILD); @@ -156,7 +156,7 @@ Window * prevLogicalChildOfParent(Window *pTopLevel, Window *pChild) while (!pChild) { - Window *pParent = pLastChild->GetParent(); + vcl::Window *pParent = pLastChild->GetParent(); if (!pParent) return NULL; if (pParent == pTopLevel) @@ -173,19 +173,19 @@ Window * prevLogicalChildOfParent(Window *pTopLevel, Window *pChild) //Get first window of a pTopLevel window as //if any intermediate layout widgets didn't exist -Window * firstLogicalChildOfParent(Window *pTopLevel) +vcl::Window * firstLogicalChildOfParent(vcl::Window *pTopLevel) { - Window *pChild = pTopLevel->GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pChild = pTopLevel->GetWindow(WINDOW_FIRSTCHILD); if (pChild && isContainerWindow(*pChild)) pChild = nextLogicalChildOfParent(pTopLevel, pChild); return pChild; } -void ImplWindowAutoMnemonic( Window* pWindow ) +void ImplWindowAutoMnemonic( vcl::Window* pWindow ) { MnemonicGenerator aMnemonicGenerator; - Window* pGetChild; - Window* pChild; + vcl::Window* pGetChild; + vcl::Window* pChild; // register the assigned mnemonics pGetChild = pWindow->GetWindow( WINDOW_FIRSTCHILD ); @@ -199,7 +199,7 @@ void ImplWindowAutoMnemonic( Window* pWindow ) // take the Controls of the dialog into account for TabPages if ( pWindow->GetType() == WINDOW_TABPAGE ) { - Window* pParent = pWindow->GetParent(); + vcl::Window* pParent = pWindow->GetParent(); if ( pParent->GetType() == WINDOW_TABCONTROL ) pParent = pParent->GetParent(); @@ -237,8 +237,8 @@ static VclButtonBox* getActionArea(Dialog *pDialog) VclButtonBox *pButtonBox = NULL; if (pDialog->isLayoutEnabled()) { - Window *pBox = pDialog->GetWindow(WINDOW_FIRSTCHILD); - Window *pChild = pBox->GetWindow(WINDOW_LASTCHILD); + vcl::Window *pBox = pDialog->GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pChild = pBox->GetWindow(WINDOW_LASTCHILD); while (pChild) { pButtonBox = dynamic_cast<VclButtonBox*>(pChild); @@ -250,7 +250,7 @@ static VclButtonBox* getActionArea(Dialog *pDialog) return pButtonBox; } -static Window* getActionAreaButtonList(Dialog *pDialog) +static vcl::Window* getActionAreaButtonList(Dialog *pDialog) { VclButtonBox* pButtonBox = getActionArea(pDialog); if (pButtonBox) @@ -260,7 +260,7 @@ static Window* getActionAreaButtonList(Dialog *pDialog) static PushButton* ImplGetDefaultButton( Dialog* pDialog ) { - Window* pChild = getActionAreaButtonList(pDialog); + vcl::Window* pChild = getActionAreaButtonList(pDialog); while ( pChild ) { if ( pChild->ImplIsPushButton() ) @@ -278,7 +278,7 @@ static PushButton* ImplGetDefaultButton( Dialog* pDialog ) static PushButton* ImplGetOKButton( Dialog* pDialog ) { - Window* pChild = getActionAreaButtonList(pDialog); + vcl::Window* pChild = getActionAreaButtonList(pDialog); while ( pChild ) { if ( pChild->GetType() == WINDOW_OKBUTTON ) @@ -292,7 +292,7 @@ static PushButton* ImplGetOKButton( Dialog* pDialog ) static PushButton* ImplGetCancelButton( Dialog* pDialog ) { - Window* pChild = getActionAreaButtonList(pDialog); + vcl::Window* pChild = getActionAreaButtonList(pDialog); while ( pChild ) { @@ -315,7 +315,7 @@ static void ImplMouseAutoPos( Dialog* pDialog ) } else if ( nMouseOptions & MOUSE_OPTION_AUTODEFBTNPOS ) { - Window* pWindow = ImplGetDefaultButton( pDialog ); + vcl::Window* pWindow = ImplGetDefaultButton( pDialog ); if ( !pWindow ) pWindow = ImplGetOKButton( pDialog ); if ( !pWindow ) @@ -350,7 +350,7 @@ void Dialog::ImplInitDialogData() mpDialogImpl = new DialogImpl; } -void Dialog::ImplInit( Window* pParent, WinBits nStyle ) +void Dialog::ImplInit( vcl::Window* pParent, WinBits nStyle ) { sal_uInt16 nSysWinMode = Application::GetSystemWindowMode(); @@ -479,27 +479,27 @@ OUString VclBuilderContainer::getUIRootDir() //do the init. Find the real parent stashed in mpDialogParent. void Dialog::doDeferredInit(WinBits nBits) { - Window *pParent = mpDialogParent; + vcl::Window *pParent = mpDialogParent; mpDialogParent = NULL; ImplInit(pParent, nBits); mbIsDefferedInit = false; } -Dialog::Dialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) +Dialog::Dialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : SystemWindow(WINDOW_DIALOG) { ImplInitDialogData(); loadUI(pParent, rID, rUIXMLDescription); } -Dialog::Dialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType) +Dialog::Dialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType) : SystemWindow(nType) { ImplInitDialogData(); loadUI(pParent, rID, rUIXMLDescription); } -Dialog::Dialog(Window* pParent, WinBits nStyle) +Dialog::Dialog(vcl::Window* pParent, WinBits nStyle) : SystemWindow(WINDOW_DIALOG) { ImplInitDialogData(); @@ -734,7 +734,7 @@ bool Dialog::ImplStartExecuteModal() } #ifdef DBG_UTIL - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent ) { pParent = pParent->ImplGetFirstOverlapWindow(); @@ -800,7 +800,7 @@ short Dialog::Execute() #ifdef DBG_UTIL ImplDelData aParentDelData; - Window* pDialogParent = mpDialogParent; + vcl::Window* pDialogParent = mpDialogParent; if( pDialogParent ) pDialogParent->ImplAddDel( &aParentDelData ); #endif @@ -917,8 +917,8 @@ void Dialog::EndDialog( long nResult ) // the same frame parent (or NULL) if( mpPrevExecuteDlg ) { - Window* pFrameParent = ImplGetFrameWindow()->ImplGetParent(); - Window* pPrevFrameParent = mpPrevExecuteDlg->ImplGetFrameWindow()->ImplGetParent(); + vcl::Window* pFrameParent = ImplGetFrameWindow()->ImplGetParent(); + vcl::Window* pPrevFrameParent = mpPrevExecuteDlg->ImplGetFrameWindow()->ImplGetParent(); if( ( !pFrameParent && !pPrevFrameParent ) || ( pFrameParent && pPrevFrameParent && pFrameParent->ImplGetFrame() == pPrevFrameParent->ImplGetFrame() ) ) @@ -956,7 +956,7 @@ long Dialog::GetResult() const return mpDialogImpl->mnResult; } -void Dialog::EndAllDialogs( Window* pParent ) +void Dialog::EndAllDialogs( vcl::Window* pParent ) { ImplSVData* pSVData = ImplGetSVData(); Dialog* pTempModDialog; @@ -991,7 +991,7 @@ void Dialog::SetModalInputMode( bool bModal ) mpPrevExecuteDlg->EnableInput( false, true, true, this ); // determine next overlap dialog parent - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent ) { // #103716# dialogs should always be modal to the whole frame window @@ -1042,7 +1042,7 @@ void Dialog::SetModalInputMode( bool bModal, bool bSubModalDialogs ) { if ( bSubModalDialogs ) { - Window* pOverlap = ImplGetFirstOverlapWindow(); + vcl::Window* pOverlap = ImplGetFirstOverlapWindow(); pOverlap = pOverlap->mpWindowImpl->mpFirstOverlap; while ( pOverlap ) { @@ -1057,7 +1057,7 @@ void Dialog::SetModalInputMode( bool bModal, bool bSubModalDialogs ) void Dialog::GrabFocusToFirstControl() { - Window* pFocusControl; + vcl::Window* pFocusControl; // find focus control, even if the dialog has focus if ( HasFocus() ) @@ -1087,7 +1087,7 @@ void Dialog::GrabFocusToFirstControl() void Dialog::GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const { - ImplBorderWindow aImplWin( (Window*)this, WB_BORDER|WB_STDWORK, BORDERWINDOW_STYLE_OVERLAP ); + ImplBorderWindow aImplWin( (vcl::Window*)this, WB_BORDER|WB_STDWORK, BORDERWINDOW_STYLE_OVERLAP ); aImplWin.GetBorder( rLeftBorder, rTopBorder, rRightBorder, rBottomBorder ); } @@ -1152,18 +1152,18 @@ VclBuilderContainer::~VclBuilderContainer() delete m_pUIBuilder; } -ModelessDialog::ModelessDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) +ModelessDialog::ModelessDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODELESSDIALOG) { } -ModalDialog::ModalDialog( Window* pParent, WinBits nStyle ) : +ModalDialog::ModalDialog( vcl::Window* pParent, WinBits nStyle ) : Dialog( WINDOW_MODALDIALOG ) { ImplInit( pParent, nStyle ); } -ModalDialog::ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : +ModalDialog::ModalDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODALDIALOG) { } diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index a11888854bca..a43247d71313 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -37,27 +37,27 @@ using namespace ::com::sun::star; -static bool ImplHasIndirectTabParent( Window* pWindow ) +static bool ImplHasIndirectTabParent( vcl::Window* pWindow ) { // The window has inderect tab parent if it is included in tab hierarchy // of the indirect parent window - Window* pNonLayoutParent = getNonLayoutParent(pWindow); + vcl::Window* pNonLayoutParent = getNonLayoutParent(pWindow); return ( pNonLayoutParent && ( pNonLayoutParent->ImplGetWindow()->GetStyle() & WB_CHILDDLGCTRL ) ); } -static Window* ImplGetTopParentOfTabHierarchy( Window* pParent ) +static vcl::Window* ImplGetTopParentOfTabHierarchy( vcl::Window* pParent ) { // The method allows to find the most close parent containing all the // window from the current tab-hierarchy // The direct parent should be provided as a parameter here - Window* pResult = pParent; + vcl::Window* pResult = pParent; if ( pResult ) { - Window* pNonLayoutParent = getNonLayoutParent(pResult); + vcl::Window* pNonLayoutParent = getNonLayoutParent(pResult); while ( pNonLayoutParent && ( pResult->ImplGetWindow()->GetStyle() & WB_CHILDDLGCTRL ) ) { pResult = pNonLayoutParent; @@ -68,13 +68,13 @@ static Window* ImplGetTopParentOfTabHierarchy( Window* pParent ) return pResult; } -static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex ) +static vcl::Window* ImplGetSubChildWindow( vcl::Window* pParent, sal_uInt16 n, sal_uInt16& nIndex ) { - Window* pTabPage = NULL; - Window* pFoundWindow = NULL; + vcl::Window* pTabPage = NULL; + vcl::Window* pFoundWindow = NULL; - Window* pWindow = firstLogicalChildOfParent(pParent); - Window* pNextWindow = pWindow; + vcl::Window* pWindow = firstLogicalChildOfParent(pParent); + vcl::Window* pNextWindow = pWindow; while ( pWindow ) { pWindow = pWindow->ImplGetWindow(); @@ -102,7 +102,7 @@ static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& TabPage* pTempTabPage = pTabControl->GetTabPage( pTabControl->GetCurPageId() ); if ( pTempTabPage ) { - Window* pTempWindow = pTabControl->GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window* pTempWindow = pTabControl->GetWindow( WINDOW_FIRSTCHILD ); while ( pTempWindow ) { if ( pTempWindow->ImplGetWindow() == pTempTabPage ) @@ -137,12 +137,12 @@ static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& return pFoundWindow; } -Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ) +vcl::Window* ImplGetChildWindow( vcl::Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ) { pParent = ImplGetTopParentOfTabHierarchy( pParent ); nIndex = 0; - Window* pWindow = ImplGetSubChildWindow( pParent, n, nIndex ); + vcl::Window* pWindow = ImplGetSubChildWindow( pParent, n, nIndex ); if ( bTestEnable ) { sal_uInt16 n2 = nIndex; @@ -169,9 +169,9 @@ Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, b return pWindow; } -static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ) +static vcl::Window* ImplGetNextWindow( vcl::Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ) { - Window* pWindow = ImplGetChildWindow( pParent, n+1, nIndex, bTestEnable ); + vcl::Window* pWindow = ImplGetChildWindow( pParent, n+1, nIndex, bTestEnable ); if ( n == nIndex ) { n = 0; @@ -180,14 +180,16 @@ static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIn return pWindow; } -Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType, +namespace vcl { + +vcl::Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType, sal_uInt16 nFormStart, sal_uInt16 nFormEnd, sal_uInt16* pIndex ) { DBG_ASSERT( (nIndex >= nFormStart) && (nIndex <= nFormEnd), "Window::ImplGetDlgWindow() - nIndex not in Form" ); - Window* pWindow = NULL; + vcl::Window* pWindow = NULL; sal_uInt16 i; sal_uInt16 nTemp; sal_uInt16 nStartIndex; @@ -264,7 +266,7 @@ Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType, { if ( pWindow->GetType() == WINDOW_TABCONTROL ) { - Window* pNextWindow = ImplGetDlgWindow( i, DLGWINDOW_NEXT ); + vcl::Window* pNextWindow = ImplGetDlgWindow( i, DLGWINDOW_NEXT ); if ( pNextWindow ) { if ( pWindow->IsChild( pNextWindow ) ) @@ -284,12 +286,14 @@ Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType, return pWindow; } -Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt16& rIndex, +} /* namespace vcl */ + +vcl::Window* ImplFindDlgCtrlWindow( vcl::Window* pParent, vcl::Window* pWindow, sal_uInt16& rIndex, sal_uInt16& rFormStart, sal_uInt16& rFormEnd ) { - Window* pSWindow; - Window* pSecondWindow = NULL; - Window* pTempWindow = NULL; + vcl::Window* pSWindow; + vcl::Window* pSecondWindow = NULL; + vcl::Window* pTempWindow = NULL; sal_uInt16 i; sal_uInt16 nSecond_i = 0; sal_uInt16 nFormStart = 0; @@ -297,7 +301,7 @@ Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt16& rIn sal_uInt16 nFormEnd; // find focus window in the child list - Window* pFirstChildWindow = pSWindow = ImplGetChildWindow( pParent, 0, i, false ); + vcl::Window* pFirstChildWindow = pSWindow = ImplGetChildWindow( pParent, 0, i, false ); if( pWindow == NULL ) pWindow = pSWindow; @@ -378,7 +382,7 @@ Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt16& rIn return pSWindow; } -Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode, +vcl::Window* ImplFindAccelWindow( vcl::Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode, sal_uInt16 nFormStart, sal_uInt16 nFormEnd, bool bCheckEnable ) { DBG_ASSERT( (rIndex >= nFormStart) && (rIndex <= nFormEnd), @@ -387,7 +391,7 @@ Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cC sal_Unicode cCompareChar; sal_uInt16 nStart = rIndex; sal_uInt16 i = rIndex; - Window* pWindow; + vcl::Window* pWindow; // MT: Where can we keep the CharClass?! static uno::Reference< i18n::XCharacterClassification > xCharClass; @@ -414,7 +418,7 @@ Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cC if (pWindow->GetType() == WINDOW_FIXEDTEXT) { FixedText *pFixedText = static_cast<FixedText*>(pWindow); - Window *pMnemonicWidget = pFixedText->get_mnemonic_widget(); + vcl::Window *pMnemonicWidget = pFixedText->get_mnemonic_widget(); SAL_WARN_IF(isContainerWindow(pFixedText->GetParent()) && !pMnemonicWidget, "vcl.a11y", "label missing mnemonic_widget?"); if (pMnemonicWidget) @@ -445,7 +449,7 @@ Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cC // get form start and end ::ImplFindDlgCtrlWindow( pWindow, NULL, nChildIndex, nChildFormStart, nChildFormEnd ); - Window* pAccelWin = ImplFindAccelWindow( pWindow, nChildIndex, cCharCode, + vcl::Window* pAccelWin = ImplFindAccelWindow( pWindow, nChildIndex, cCharCode, nChildFormStart, nChildFormEnd, bCheckEnable ); if( pAccelWin ) @@ -468,6 +472,8 @@ Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cC return NULL; } +namespace vcl { + void Window::ImplControlFocus( sal_uInt16 nFlags ) { if ( nFlags & GETFOCUS_MNEMONIC ) @@ -509,9 +515,11 @@ void Window::ImplControlFocus( sal_uInt16 nFlags ) } } +} /* namespace vcl */ + namespace { - bool isSuitableDestination(Window *pWindow) + bool isSuitableDestination(vcl::Window *pWindow) { return (pWindow && isVisibleInLayout(pWindow) && isEnabledInLayout(pWindow) && pWindow->IsInputEnabled() && @@ -531,7 +539,7 @@ namespace for (; aI != rGroup.end(); ++aI) { - Window *pWindow = *aI; + vcl::Window *pWindow = *aI; if (isSuitableDestination(pWindow)) { @@ -542,7 +550,7 @@ namespace for (aI = rGroup.begin(); aI != aStart; ++aI) { - Window *pWindow = *aI; + vcl::Window *pWindow = *aI; if (isSuitableDestination(pWindow)) { @@ -572,13 +580,15 @@ namespace } } +namespace vcl { + bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) { vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); sal_uInt16 nKeyCode = aKeyCode.GetCode(); - Window* pSWindow; - Window* pTempWindow; - Window* pButtonWindow; + vcl::Window* pSWindow; + vcl::Window* pTempWindow; + vcl::Window* pButtonWindow; sal_uInt16 i; sal_uInt16 iButton; sal_uInt16 iButtonStart; @@ -589,7 +599,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) sal_uInt16 nDlgCtrlFlags; // we cannot take over control without Focus-window - Window* pFocusWindow = Application::GetFocusWindow(); + vcl::Window* pFocusWindow = Application::GetFocusWindow(); if ( !pFocusWindow || !ImplIsWindowOrChild( pFocusWindow ) ) return false; @@ -730,11 +740,11 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) if ( aKeyCode.IsMod1() ) { // search group - Window* pFormularFirstWindow = NULL; - Window* pLastFormularFirstWindow = NULL; + vcl::Window* pFormularFirstWindow = NULL; + vcl::Window* pLastFormularFirstWindow = NULL; pTempWindow = ImplGetChildWindow( this, 0, iTemp, false ); - Window* pPrevFirstFormularFirstWindow = NULL; - Window* pFirstFormularFirstWindow = pTempWindow; + vcl::Window* pPrevFirstFormularFirstWindow = NULL; + vcl::Window* pFirstFormularFirstWindow = pTempWindow; while ( pTempWindow ) { if ( pTempWindow->ImplGetWindow()->IsDialogControlStart() ) @@ -804,7 +814,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) nType = DLGWINDOW_NEXT; nGetFocusFlags |= GETFOCUS_FORWARD; } - Window* pWindow = ImplGetDlgWindow( i, nType, nFormStart, nFormEnd, &nNewIndex ); + vcl::Window* pWindow = ImplGetDlgWindow( i, nType, nFormStart, nFormEnd, &nNewIndex ); // if this is the same window, simulate a Get/LoseFocus, // in case AROUND is being processed if ( pWindow == pSWindow ) @@ -848,7 +858,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) WinBits nStyle = pSWindow->GetStyle(); if ( !(nStyle & WB_GROUP) ) { - Window* pWindow = prevLogicalChildOfParent(this, pSWindow); + vcl::Window* pWindow = prevLogicalChildOfParent(this, pSWindow); while ( pWindow ) { pWindow = pWindow->ImplGetWindow(); @@ -876,7 +886,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) return nextInGroup(static_cast<RadioButton*>(pSWindow), false); else { - Window* pWindow = nextLogicalChildOfParent(this, pSWindow); + vcl::Window* pWindow = nextLogicalChildOfParent(this, pSWindow); while ( pWindow ) { pWindow = pWindow->ImplGetWindow(); @@ -943,7 +953,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) // checks if this window has dialog control bool Window::ImplHasDlgCtrl() { - Window* pDlgCtrlParent; + vcl::Window* pDlgCtrlParent; // lookup window for dialog control pDlgCtrlParent = ImplGetParent(); @@ -960,9 +970,9 @@ bool Window::ImplHasDlgCtrl() void Window::ImplDlgCtrlNextWindow() { - Window* pDlgCtrlParent; - Window* pDlgCtrl; - Window* pSWindow; + vcl::Window* pDlgCtrlParent; + vcl::Window* pDlgCtrl; + vcl::Window* pSWindow; sal_uInt16 nIndex; sal_uInt16 nFormStart; sal_uInt16 nFormEnd; @@ -984,17 +994,17 @@ if ( !pDlgCtrlParent || (GetStyle() & WB_NODIALOGCONTROL) || ((pDlgCtrlParent->G if ( !pSWindow ) return; - Window* pWindow = pDlgCtrlParent->ImplGetDlgWindow( nIndex, DLGWINDOW_NEXT, nFormStart, nFormEnd ); + vcl::Window* pWindow = pDlgCtrlParent->ImplGetDlgWindow( nIndex, DLGWINDOW_NEXT, nFormStart, nFormEnd ); if ( pWindow && (pWindow != pSWindow) ) pWindow->ImplControlFocus(); } -static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow, +static void ImplDlgCtrlUpdateDefButton( vcl::Window* pParent, vcl::Window* pFocusWindow, bool bGetFocus ) { PushButton* pOldDefButton = NULL; PushButton* pNewDefButton = NULL; - Window* pSWindow; + vcl::Window* pSWindow; sal_uInt16 i; sal_uInt16 nFormStart; sal_uInt16 nFormEnd; @@ -1029,7 +1039,7 @@ static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow, if ( !bGetFocus ) { sal_uInt16 nDummy; - Window* pNewFocusWindow = Application::GetFocusWindow(); + vcl::Window* pNewFocusWindow = Application::GetFocusWindow(); if ( !pNewFocusWindow || !pParent->ImplIsWindowOrChild( pNewFocusWindow ) ) pNewDefButton = NULL; else if ( !::ImplFindDlgCtrlWindow( pParent, pNewFocusWindow, i, nDummy, nDummy ) || @@ -1046,7 +1056,7 @@ static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow, } } -void Window::ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus ) +void Window::ImplDlgCtrlFocusChanged( vcl::Window* pWindow, bool bGetFocus ) { if ( mpWindowImpl->mpDlgCtrlDownWindow && !bGetFocus ) { @@ -1057,7 +1067,7 @@ void Window::ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus ) ImplDlgCtrlUpdateDefButton( this, pWindow, bGetFocus ); } -Window* Window::ImplFindDlgCtrlWindow( Window* pWindow ) +vcl::Window* Window::ImplFindDlgCtrlWindow( vcl::Window* pWindow ) { sal_uInt16 nIndex; sal_uInt16 nFormStart; @@ -1067,31 +1077,16 @@ Window* Window::ImplFindDlgCtrlWindow( Window* pWindow ) return ::ImplFindDlgCtrlWindow( this, pWindow, nIndex, nFormStart, nFormEnd ); } -Window* Window::GetParentLabelFor( const Window* ) const +vcl::Window* Window::GetParentLabelFor( const vcl::Window* ) const { return NULL; } -Window* Window::GetParentLabeledBy( const Window* ) const +vcl::Window* Window::GetParentLabeledBy( const vcl::Window* ) const { return NULL; } -sal_Unicode getAccel( const OUString& rStr ) -{ - sal_Unicode nChar = 0; - sal_Int32 nPos = 0; - do - { - nPos = rStr.indexOf( '~', nPos ); - if( nPos != -1 && nPos < rStr.getLength() ) - nChar = rStr[ ++nPos ]; - else - nChar = 0; - } while( nChar == '~' ); - return nChar; -} - KeyEvent Window::GetActivationKey() const { KeyEvent aKeyEvent; @@ -1099,7 +1094,7 @@ KeyEvent Window::GetActivationKey() const sal_Unicode nAccel = getAccel( GetText() ); if( ! nAccel ) { - Window* pWindow = GetAccessibleRelationLabeledBy(); + vcl::Window* pWindow = GetAccessibleRelationLabeledBy(); if( pWindow ) nAccel = getAccel( pWindow->GetText() ); } @@ -1122,4 +1117,21 @@ KeyEvent Window::GetActivationKey() const return aKeyEvent; } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +} /* namespace vcl */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */sal_Unicode getAccel( const OUString& rStr ) +{ + sal_Unicode nChar = 0; + sal_Int32 nPos = 0; + do + { + nPos = rStr.indexOf( '~', nPos ); + if( nPos != -1 && nPos < rStr.getLength() ) + nChar = rStr[ ++nPos ]; + else + nChar = 0; + } while( nChar == '~' ); + return nChar; +} + + diff --git a/vcl/source/window/dlgctrl.hxx b/vcl/source/window/dlgctrl.hxx index 06c16b3b8076..c4ecb0ce47b2 100644 --- a/vcl/source/window/dlgctrl.hxx +++ b/vcl/source/window/dlgctrl.hxx @@ -22,12 +22,12 @@ #include <window.h> -Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ); +vcl::Window* ImplGetChildWindow( vcl::Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable ); -Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt16& rIndex, +vcl::Window* ImplFindDlgCtrlWindow( vcl::Window* pParent, vcl::Window* pWindow, sal_uInt16& rIndex, sal_uInt16& rFormStart, sal_uInt16& rFormEnd ); -Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode, +vcl::Window* ImplFindAccelWindow( vcl::Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode, sal_uInt16 nFormStart, sal_uInt16 nFormEnd, bool bCheckEnable = true ); sal_Unicode getAccel( const OUString& rStr ); diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx index 449af42c0bc3..e7c3732c56f6 100644 --- a/vcl/source/window/dndevdis.cxx +++ b/vcl/source/window/dndevdis.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::datatransfer::dnd; // DNDEventDispatcher::DNDEventDispatcher -DNDEventDispatcher::DNDEventDispatcher( Window * pTopWindow ): +DNDEventDispatcher::DNDEventDispatcher( vcl::Window * pTopWindow ): m_pTopWindow( pTopWindow ), m_pCurrentWindow( NULL ) { @@ -46,7 +46,7 @@ DNDEventDispatcher::~DNDEventDispatcher() { } -Window* DNDEventDispatcher::findTopLevelWindow(Point location) +vcl::Window* DNDEventDispatcher::findTopLevelWindow(Point location) { SolarMutexGuard aSolarGuard; @@ -54,7 +54,7 @@ Window* DNDEventDispatcher::findTopLevelWindow(Point location) // because those coordinates come from outside, they must be mirrored if RTL layout is active if( Application::GetSettings().GetLayoutRTL() ) m_pTopWindow->ImplMirrorFramePos( location ); - Window * pChildWindow = m_pTopWindow->ImplFindWindow( location ); + vcl::Window * pChildWindow = m_pTopWindow->ImplFindWindow( location ); if( NULL == pChildWindow ) pChildWindow = m_pTopWindow; @@ -80,7 +80,7 @@ void SAL_CALL DNDEventDispatcher::drop( const DropTargetDropEvent& dtde ) Point location( dtde.LocationX, dtde.LocationY ); - Window* pChildWindow = findTopLevelWindow(location); + vcl::Window* pChildWindow = findTopLevelWindow(location); // handle the case that drop is in an other vcl window than the last dragOver if( pChildWindow != m_pCurrentWindow ) @@ -117,7 +117,7 @@ void SAL_CALL DNDEventDispatcher::dragEnter( const DropTargetDragEnterEvent& dtd osl::MutexGuard aImplGuard( m_aMutex ); Point location( dtdee.LocationX, dtdee.LocationY ); - Window * pChildWindow = findTopLevelWindow(location); + vcl::Window * pChildWindow = findTopLevelWindow(location); // assume pointer write operation to be atomic m_pCurrentWindow = pChildWindow; @@ -159,7 +159,7 @@ void SAL_CALL DNDEventDispatcher::dragOver( const DropTargetDragEvent& dtde ) Point location( dtde.LocationX, dtde.LocationY ); sal_Int32 nListeners; - Window * pChildWindow = findTopLevelWindow(location); + vcl::Window * pChildWindow = findTopLevelWindow(location); if( pChildWindow != m_pCurrentWindow ) { @@ -198,7 +198,7 @@ void SAL_CALL DNDEventDispatcher::dropActionChanged( const DropTargetDragEvent& Point location( dtde.LocationX, dtde.LocationY ); sal_Int32 nListeners; - Window* pChildWindow = findTopLevelWindow(location); + vcl::Window* pChildWindow = findTopLevelWindow(location); if( pChildWindow != m_pCurrentWindow ) { @@ -236,7 +236,7 @@ void SAL_CALL DNDEventDispatcher::dragGestureRecognized( const DragGestureEvent& Point origin( dge.DragOriginX, dge.DragOriginY ); - Window* pChildWindow = findTopLevelWindow(origin); + vcl::Window* pChildWindow = findTopLevelWindow(origin); fireDragGestureEvent( pChildWindow, dge.DragSource, dge.Event, origin, dge.DragAction ); } @@ -262,7 +262,7 @@ void SAL_CALL DNDEventDispatcher::rejectDrag() throw(RuntimeException, std::exce // DNDEventDispatcher::fireDragEnterEvent -sal_Int32 DNDEventDispatcher::fireDragEnterEvent( Window *pWindow, +sal_Int32 DNDEventDispatcher::fireDragEnterEvent( vcl::Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions, const Sequence< DataFlavor >& aFlavorList ) @@ -296,7 +296,7 @@ sal_Int32 DNDEventDispatcher::fireDragEnterEvent( Window *pWindow, // DNDEventDispatcher::fireDragOverEvent -sal_Int32 DNDEventDispatcher::fireDragOverEvent( Window *pWindow, +sal_Int32 DNDEventDispatcher::fireDragOverEvent( vcl::Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions ) @@ -327,7 +327,7 @@ sal_Int32 DNDEventDispatcher::fireDragOverEvent( Window *pWindow, // DNDEventDispatcher::fireDragExitEvent -sal_Int32 DNDEventDispatcher::fireDragExitEvent( Window *pWindow ) throw(RuntimeException) +sal_Int32 DNDEventDispatcher::fireDragExitEvent( vcl::Window *pWindow ) throw(RuntimeException) { sal_Int32 n = 0; @@ -352,7 +352,7 @@ sal_Int32 DNDEventDispatcher::fireDragExitEvent( Window *pWindow ) throw(Runtime // DNDEventDispatcher::fireDropActionChangedEvent -sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( Window *pWindow, +sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( vcl::Window *pWindow, const Reference< XDropTargetDragContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions ) @@ -383,7 +383,7 @@ sal_Int32 DNDEventDispatcher::fireDropActionChangedEvent( Window *pWindow, // DNDEventDispatcher::fireDropEvent -sal_Int32 DNDEventDispatcher::fireDropEvent( Window *pWindow, +sal_Int32 DNDEventDispatcher::fireDropEvent( vcl::Window *pWindow, const Reference< XDropTargetDropContext >& xContext, const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceActions, const Reference< XTransferable >& xTransferable ) @@ -426,7 +426,7 @@ sal_Int32 DNDEventDispatcher::fireDropEvent( Window *pWindow, // DNDEventDispatcher::fireDragGestureRecognized -sal_Int32 DNDEventDispatcher::fireDragGestureEvent( Window *pWindow, +sal_Int32 DNDEventDispatcher::fireDragGestureEvent( vcl::Window *pWindow, const Reference< XDragSource >& xSource, const Any event, const Point& rOrigin, const sal_Int8 nDragAction ) diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx index 6cdc73e08f9c..bda794bc1631 100644 --- a/vcl/source/window/dockingarea.cxx +++ b/vcl/source/window/dockingarea.cxx @@ -59,7 +59,7 @@ static void ImplInitBackground( DockingAreaWindow* pThis ) SystemWindow *pSysWin = pThis->GetSystemWindow(); if ( pSysWin && pSysWin->GetMenuBar() ) { - Window *pMenubarWin = pSysWin->GetMenuBar()->GetWindow(); + vcl::Window *pMenubarWin = pSysWin->GetMenuBar()->GetWindow(); if ( pMenubarWin ) nMenubarHeight = pMenubarWin->GetOutputHeightPixel(); } @@ -77,7 +77,7 @@ static void ImplInitBackground( DockingAreaWindow* pThis ) pThis->SetBackground( Wallpaper( pThis->GetSettings().GetStyleSettings().GetFaceColor() ) ); } -DockingAreaWindow::DockingAreaWindow( Window* pParent ) : +DockingAreaWindow::DockingAreaWindow( vcl::Window* pParent ) : Window( WINDOW_DOCKINGAREA ) { ImplInit( pParent, WB_CLIPCHILDREN|WB_3DLOOK, NULL ); @@ -114,7 +114,7 @@ static void ImplInvalidateMenubar( DockingAreaWindow* pThis ) SystemWindow *pSysWin = pThis->GetSystemWindow(); if( pSysWin && pSysWin->GetMenuBar() ) { - Window *pMenubarWin = pSysWin->GetMenuBar()->GetWindow(); + vcl::Window *pMenubarWin = pSysWin->GetMenuBar()->GetWindow(); if( pMenubarWin ) pMenubarWin->Invalidate(); } @@ -181,7 +181,7 @@ void DockingAreaWindow::Paint( const Rectangle& ) sal_uInt16 nChildren = GetChildCount(); for( sal_uInt16 n = 0; n < nChildren; n++ ) { - Window* pChild = GetChild( n ); + vcl::Window* pChild = GetChild( n ); if ( pChild->IsVisible() ) { Point aPos = pChild->GetPosPixel(); @@ -207,7 +207,7 @@ void DockingAreaWindow::Paint( const Rectangle& ) sal_uInt16 nChildren = GetChildCount(); for( sal_uInt16 n = 0; n < nChildren; n++ ) { - Window* pChild = GetChild( n ); + vcl::Window* pChild = GetChild( n ); Point aPos = pChild->GetPosPixel(); Size aSize = pChild->GetSizePixel(); if( IsHorizontal() ) diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 2bd4c53e80a7..fa26164a7ecb 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -53,7 +53,7 @@ private: DECL_LINK(DockTimerHdl, void *); DECL_LINK(EndDockTimerHdl, void *); public: - ImplDockFloatWin2( Window* pParent, WinBits nWinBits, + ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ); virtual ~ImplDockFloatWin2(); @@ -70,7 +70,7 @@ public: sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE; }; -ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent, WinBits nWinBits, +ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits, ImplDockingWindowWrapper* pDockingWin ) : FloatingWindow( pParent, nWinBits ), mpDockWin( pDockingWin ), @@ -155,7 +155,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) // called during move of a floating window mnLastUserEvent = 0; - Window *pDockingArea = mpDockWin->GetWindow()->GetParent(); + vcl::Window *pDockingArea = mpDockWin->GetWindow()->GetParent(); PointerState aState = pDockingArea->GetPointerState(); bool bRealMove = true; @@ -165,7 +165,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl) // we allow docking only when the window was moved // by dragging its caption // and ignore move request due to resizing - Window *pBorder = GetWindow( WINDOW_BORDER ); + vcl::Window *pBorder = GetWindow( WINDOW_BORDER ); if( pBorder != this ) { Point aPt; @@ -313,7 +313,7 @@ DockingManager::~DockingManager() mDockingWindows.clear(); } -ImplDockingWindowWrapper* DockingManager::GetDockingWindowWrapper( const Window *pWindow ) +ImplDockingWindowWrapper* DockingManager::GetDockingWindowWrapper( const vcl::Window *pWindow ) { ::std::vector< ImplDockingWindowWrapper* >::iterator p; p = mDockingWindows.begin(); @@ -327,7 +327,7 @@ ImplDockingWindowWrapper* DockingManager::GetDockingWindowWrapper( const Window return NULL; } -bool DockingManager::IsDockable( const Window *pWindow ) +bool DockingManager::IsDockable( const vcl::Window *pWindow ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); @@ -338,7 +338,7 @@ bool DockingManager::IsDockable( const Window *pWindow ) return (pWrapper != NULL); } -bool DockingManager::IsFloating( const Window *pWindow ) +bool DockingManager::IsFloating( const vcl::Window *pWindow ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); if( pWrapper ) @@ -347,7 +347,7 @@ bool DockingManager::IsFloating( const Window *pWindow ) return false; } -bool DockingManager::IsLocked( const Window *pWindow ) +bool DockingManager::IsLocked( const vcl::Window *pWindow ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); if( pWrapper && pWrapper->IsLocked() ) @@ -356,35 +356,35 @@ bool DockingManager::IsLocked( const Window *pWindow ) return false; } -void DockingManager::Lock( const Window *pWindow ) +void DockingManager::Lock( const vcl::Window *pWindow ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); if( pWrapper ) pWrapper->Lock(); } -void DockingManager::Unlock( const Window *pWindow ) +void DockingManager::Unlock( const vcl::Window *pWindow ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); if( pWrapper ) pWrapper->Unlock(); } -void DockingManager::SetFloatingMode( const Window *pWindow, bool bFloating ) +void DockingManager::SetFloatingMode( const vcl::Window *pWindow, bool bFloating ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); if( pWrapper ) pWrapper->SetFloatingMode( bFloating ); } -void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const Window *pWindow, sal_uLong nFlags ) +void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const vcl::Window *pWindow, sal_uLong nFlags ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); if( pWrapper ) pWrapper->StartPopupMode( pParentToolBox, nFlags ); } -void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const Window *pWindow ) +void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const vcl::Window *pWindow ) { StartPopupMode( pParentToolBox, pWindow, FLOATWIN_POPUPMODE_ALLOWTEAROFF | FLOATWIN_POPUPMODE_NOFOCUSCLOSE | @@ -392,7 +392,7 @@ void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const Window *pWin FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE ); } -bool DockingManager::IsInPopupMode( const Window *pWindow ) +bool DockingManager::IsInPopupMode( const vcl::Window *pWindow ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); if( pWrapper && pWrapper->IsInPopupMode() ) @@ -401,14 +401,14 @@ bool DockingManager::IsInPopupMode( const Window *pWindow ) return false; } -void DockingManager::EndPopupMode( const Window *pWin ) +void DockingManager::EndPopupMode( const vcl::Window *pWin ) { ImplDockingWindowWrapper *pWrapper = GetDockingWindowWrapper( pWin ); if( pWrapper && pWrapper->GetFloatingWindow() && pWrapper->GetFloatingWindow()->IsInPopupMode() ) pWrapper->GetFloatingWindow()->EndPopupMode(); } -void DockingManager::AddWindow( const Window *pWindow ) +void DockingManager::AddWindow( const vcl::Window *pWindow ) { ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); if( pWrapper ) @@ -419,7 +419,7 @@ void DockingManager::AddWindow( const Window *pWindow ) mDockingWindows.push_back( pWrapper ); } -void DockingManager::RemoveWindow( const Window *pWindow ) +void DockingManager::RemoveWindow( const vcl::Window *pWindow ) { ::std::vector< ImplDockingWindowWrapper* >::iterator p; p = mDockingWindows.begin(); @@ -436,7 +436,7 @@ void DockingManager::RemoveWindow( const Window *pWindow ) } } -void DockingManager::SetPosSizePixel( Window *pWindow, long nX, long nY, +void DockingManager::SetPosSizePixel( vcl::Window *pWindow, long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) { @@ -445,7 +445,7 @@ void DockingManager::SetPosSizePixel( Window *pWindow, long nX, long nY, pWrapper->setPosSizePixel( nX, nY, nWidth, nHeight, nFlags ); } -Rectangle DockingManager::GetPosSizePixel( const Window *pWindow ) +Rectangle DockingManager::GetPosSizePixel( const vcl::Window *pWindow ) { Rectangle aRect; ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow ); @@ -487,7 +487,7 @@ private: void ImplSetBorder(); public: - ImplPopupFloatWin( Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ); + ImplPopupFloatWin( vcl::Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ); virtual ~ImplPopupFloatWin(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; @@ -497,7 +497,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; Rectangle GetDragRect() const; Point GetToolboxPosition() const; @@ -508,7 +508,7 @@ public: bool hasGrip() const { return mbHasGrip; } }; -ImplPopupFloatWin::ImplPopupFloatWin( Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ) : +ImplPopupFloatWin::ImplPopupFloatWin( vcl::Window* pParent, ImplDockingWindowWrapper* pDockingWin, bool bHasGrip ) : FloatingWindow( pParent, WB_NOBORDER | WB_SYSTEMWINDOW | WB_NOSHADOW) { mpWindowImpl->mbToolbarFloatingWindow = true; // indicate window type, required for accessibility @@ -539,7 +539,7 @@ ImplPopupFloatWin::~ImplPopupFloatWin() return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >(); } -Window* ImplPopupFloatWin::GetPreferredKeyInputWindow() +vcl::Window* ImplPopupFloatWin::GetPreferredKeyInputWindow() { if( mpWindowImpl->mpClientWindow ) return mpWindowImpl->mpClientWindow; @@ -794,8 +794,8 @@ void ImplPopupFloatWin::Tracking( const TrackingEvent& rTEvt ) } } -ImplDockingWindowWrapper::ImplDockingWindowWrapper( const Window *pWindow ) - : mpDockingWindow(const_cast<Window*>(pWindow)) +ImplDockingWindowWrapper::ImplDockingWindowWrapper( const vcl::Window *pWindow ) + : mpDockingWindow(const_cast<vcl::Window*>(pWindow)) , mpFloatWin(NULL) , mpOldBorderWin(NULL) , mpParent(pWindow->GetParent()) @@ -880,8 +880,8 @@ bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos ) mnTrackHeight += mnDockTop+mnDockBottom; } - Window *pDockingArea = GetWindow()->GetParent(); - Window::PointerState aState = pDockingArea->GetPointerState(); + vcl::Window *pDockingArea = GetWindow()->GetParent(); + vcl::Window::PointerState aState = pDockingArea->GetPointerState(); // mouse pos in screen pixels Point aMousePos = pDockingArea->OutputToScreenPixel( aState.maPos ); @@ -1129,7 +1129,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uLon GetWindow()->Show( false, SHOW_NOFOCUSCHANGE ); // prepare reparenting - Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT ); + vcl::Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT ); mpOldBorderWin = GetWindow()->GetWindow( WINDOW_BORDER ); if( mpOldBorderWin == GetWindow() ) mpOldBorderWin = NULL; // no border window found @@ -1190,7 +1190,7 @@ IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd) EndPopupModeData aData( pPopupFloatWin->GetTearOffPosition(), mpFloatWin->IsPopupModeTearOff() ); // before deleting change parent back, so we can delete the floating window alone - Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT ); + vcl::Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT ); GetWindow()->mpWindowImpl->mpBorderWindow = NULL; if ( mpOldBorderWin ) { @@ -1239,7 +1239,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode ) maDockPos = GetWindow()->GetPosPixel(); - Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT ); + vcl::Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT ); mpOldBorderWin = GetWindow()->GetWindow( WINDOW_BORDER ); if( mpOldBorderWin == mpDockingWindow ) mpOldBorderWin = NULL; // no border window found @@ -1305,7 +1305,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode ) maMinOutSize = mpFloatWin->GetMinOutputSizePixel(); maMaxOutSize = mpFloatWin->GetMaxOutputSizePixel(); - Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT ); //mpWindowImpl->mpRealParent; + vcl::Window* pRealParent = GetWindow()->GetWindow( WINDOW_PARENT ); //mpWindowImpl->mpRealParent; GetWindow()->mpWindowImpl->mpBorderWindow = NULL; if ( mpOldBorderWin ) { diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 3c2a7d443dc6..4679fcc4bbae 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -40,7 +40,7 @@ public: ImplData(); ~ImplData(); - Window* mpParent; + vcl::Window* mpParent; Size maMaxOutSize; }; @@ -68,7 +68,7 @@ private: DECL_LINK(DockingHdl, void *); DECL_LINK(DockTimerHdl, void *); public: - ImplDockFloatWin( Window* pParent, WinBits nWinBits, + ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ); virtual ~ImplDockFloatWin(); @@ -82,7 +82,7 @@ public: virtual bool Close() SAL_OVERRIDE; }; -ImplDockFloatWin::ImplDockFloatWin( Window* pParent, WinBits nWinBits, +ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits, DockingWindow* pDockingWin ) : FloatingWindow( pParent, nWinBits ), mpDockWin( pDockingWin ), @@ -326,7 +326,7 @@ void DockingWindow::ImplInitDockingWindowData() mbHideBtn = false; } -void DockingWindow::ImplInit( Window* pParent, WinBits nStyle ) +void DockingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle ) { if ( !(nStyle & WB_NODIALOGCONTROL) ) nStyle |= WB_DIALOGCONTROL; @@ -406,14 +406,14 @@ DockingWindow::DockingWindow( WindowType nType ) : ImplInitDockingWindowData(); } -DockingWindow::DockingWindow( Window* pParent, WinBits nStyle ) : +DockingWindow::DockingWindow( vcl::Window* pParent, WinBits nStyle ) : Window( WINDOW_DOCKINGWINDOW ) { ImplInitDockingWindowData(); ImplInit( pParent, nStyle ); } -DockingWindow::DockingWindow( Window* pParent, const ResId& rResId ) : +DockingWindow::DockingWindow( vcl::Window* pParent, const ResId& rResId ) : Window( WINDOW_DOCKINGWINDOW ) { ImplInitDockingWindowData(); @@ -579,7 +579,7 @@ bool DockingWindow::Notify( NotifyEvent& rNEvt ) if( ! IsFloatingMode() || ! mpFloatWin->mpWindowImpl->mbFrame ) { Point aPos = pMEvt->GetPosPixel(); - Window* pWindow = rNEvt.GetWindow(); + vcl::Window* pWindow = rNEvt.GetWindow(); if ( pWindow != this ) { aPos = pWindow->OutputToScreenPixel( aPos ); @@ -739,7 +739,7 @@ void DockingWindow::SetFloatingMode( bool bFloatMode ) maDockPos = Window::GetPosPixel(); - Window* pRealParent = mpWindowImpl->mpRealParent; + vcl::Window* pRealParent = mpWindowImpl->mpRealParent; mpOldBorderWin = mpWindowImpl->mpBorderWindow; ImplDockFloatWin* pWin = @@ -800,7 +800,7 @@ void DockingWindow::SetFloatingMode( bool bFloatMode ) maMinOutSize = mpFloatWin->GetMinOutputSizePixel(); mpImplData->maMaxOutSize = mpFloatWin->GetMaxOutputSizePixel(); - Window* pRealParent = mpWindowImpl->mpRealParent; + vcl::Window* pRealParent = mpWindowImpl->mpRealParent; mpWindowImpl->mpBorderWindow = NULL; if ( mpOldBorderWin ) { diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 2333af21fe46..2f900ff97266 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -30,6 +30,8 @@ #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/MouseButton.hpp> +namespace vcl { + void Window::DataChanged( const DataChangedEvent& ) { } @@ -39,7 +41,7 @@ void Window::NotifyAllChildren( DataChangedEvent& rDCEvt ) DataChanged( rDCEvt ); - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->NotifyAllChildren( rDCEvt ); @@ -129,7 +131,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) !pWrapper->IsDocking() && bHit ) { Point aPos = pMEvt->GetPosPixel(); - Window* pWindow = rNEvt.GetWindow(); + vcl::Window* pWindow = rNEvt.GetWindow(); if ( pWindow != this ) { aPos = pWindow->OutputToScreenPixel( aPos ); @@ -179,7 +181,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) !(GetStyle() & WB_TABSTOP) && !(mpWindowImpl->mnDlgCtrlFlags & WINDOW_DLGCTRL_WANTFOCUS) ) { sal_uInt16 n = 0; - Window* pFirstChild = ImplGetDlgWindow( n, DLGWINDOW_FIRST ); + vcl::Window* pFirstChild = ImplGetDlgWindow( n, DLGWINDOW_FIRST ); if ( pFirstChild ) pFirstChild->ImplControlFocus(); } @@ -225,7 +227,7 @@ void Window::CallEventListeners( sal_uLong nEvent, void* pData ) ImplRemoveDel( &aDelData ); - Window* pWindow = this; + vcl::Window* pWindow = this; while ( pWindow ) { pWindow->ImplAddDel( &aDelData ); @@ -301,14 +303,14 @@ void Window::RemoveUserEvent( ImplSVEvent * nUserEvent ) } -MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, Window* pSource, Window* pDest ) +MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, vcl::Window* pSource, vcl::Window* pDest ) { Point aPos = pSource->OutputToScreenPixel( rE.GetPosPixel() ); aPos = pDest->ScreenToOutputPixel( aPos ); return MouseEvent( aPos, rE.GetClicks(), rE.GetMode(), rE.GetButtons(), rE.GetModifier() ); } -CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, Window* pSource, Window* pDest ) +CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, vcl::Window* pSource, vcl::Window* pDest ) { if ( !rCEvt.IsMouseEvent() ) return rCEvt; @@ -405,7 +407,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) ImplRemoveDel( &aDelData ); // #106721# check if we're part of a compound control and notify - Window *pParent = ImplGetParent(); + vcl::Window *pParent = ImplGetParent(); while( pParent ) { if( pParent->IsCompoundControl() ) @@ -424,7 +426,7 @@ void Window::ImplCallInitShow() StateChanged( STATE_CHANGE_INITSHOW ); mpWindowImpl->mbInInitShow = false; - Window* pWindow = mpWindowImpl->mpFirstOverlap; + vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; while ( pWindow ) { if ( pWindow->mpWindowImpl->mbVisible ) @@ -464,7 +466,7 @@ void Window::ImplCallMove() { // update frame position SalFrame *pParentFrame = NULL; - Window *pParent = ImplGetParent(); + vcl::Window *pParent = ImplGetParent(); while( pParent ) { if( pParent->mpWindowImpl->mpFrame != mpWindowImpl->mpFrame ) @@ -485,7 +487,7 @@ void Window::ImplCallMove() // the client window and and all its subclients have the same position as the borderframe // this is important for floating toolbars where the borderwindow is a floating window // which has another borderwindow (ie the system floating window) - Window *pClientWin = mpWindowImpl->mpClientWindow; + vcl::Window *pClientWin = mpWindowImpl->mpClientWindow; while( pClientWin ) { pClientWin->mpWindowImpl->maPos = mpWindowImpl->maPos; @@ -498,12 +500,12 @@ void Window::ImplCallMove() ImplCallEventListeners( VCLEVENT_WINDOW_MOVE ); } -void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow, - Window* pOldOverlapWindow ) +void Window::ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow, + vcl::Window* pOldOverlapWindow ) { ImplSVData* pSVData = ImplGetSVData(); - Window* pNewRealWindow; - Window* pOldRealWindow; + vcl::Window* pNewRealWindow; + vcl::Window* pOldRealWindow; bool bCallActivate = true; bool bCallDeactivate = true; @@ -528,7 +530,7 @@ void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow, bCallActivate = false; else { - Window* pLastRealWindow = pSVData->maWinData.mpLastDeacWin->ImplGetWindow(); + vcl::Window* pLastRealWindow = pSVData->maWinData.mpLastDeacWin->ImplGetWindow(); pSVData->maWinData.mpLastDeacWin->mpWindowImpl->mbActive = false; pSVData->maWinData.mpLastDeacWin->Deactivate(); if ( pLastRealWindow != pSVData->maWinData.mpLastDeacWin ) @@ -575,4 +577,7 @@ void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow, } } +} /* namespace vcl */ + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 718683fc883d..273dd5b2796e 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -56,7 +56,7 @@ Rectangle& FloatingWindow::ImplGetItemEdgeClipRect() return mpImplData->maItemEdgeClipRect; } -void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle ) +void FloatingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mpImplData = new ImplData; @@ -146,13 +146,13 @@ void FloatingWindow::ImplInitSettings() SetBackground( aColor ); } -FloatingWindow::FloatingWindow( Window* pParent, WinBits nStyle ) : +FloatingWindow::FloatingWindow( vcl::Window* pParent, WinBits nStyle ) : SystemWindow( WINDOW_FLOATINGWINDOW ) { ImplInit( pParent, nStyle ); } -FloatingWindow::FloatingWindow(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) +FloatingWindow::FloatingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) : SystemWindow(WINDOW_FLOATINGWINDOW) { loadUI(pParent, rID, rUIXMLDescription, rFrame); @@ -161,7 +161,7 @@ FloatingWindow::FloatingWindow(Window* pParent, const OString& rID, const OUStri //Find the real parent stashed in mpDialogParent. void FloatingWindow::doDeferredInit(WinBits nBits) { - Window *pParent = mpDialogParent; + vcl::Window *pParent = mpDialogParent; mpDialogParent = NULL; ImplInit(pParent, nBits); mbIsDefferedInit = false; @@ -183,12 +183,12 @@ FloatingWindow::~FloatingWindow() delete mpImplData; } -Point FloatingWindow::CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ) +Point FloatingWindow::CalcFloatingPosition( vcl::Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ) { return ImplCalcPos( pWindow, rRect, nFlags, rArrangeIndex ); } -Point FloatingWindow::ImplCalcPos( Window* pWindow, +Point FloatingWindow::ImplCalcPos( vcl::Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ) { @@ -199,7 +199,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow, FloatingWindow *pFloatingWindow = dynamic_cast<FloatingWindow*>( pWindow ); // convert.... - Window* pW = pWindow; + vcl::Window* pW = pWindow; if ( pW->mpWindowImpl->mpRealParent ) pW = pW->mpWindowImpl->mpRealParent; @@ -399,7 +399,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow, return pW->OutputToScreenPixel( aPos ); } -FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Point& rPos, HitTest& rHitTest ) +FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, const Point& rPos, HitTest& rHitTest ) { FloatingWindow* pWin = this; @@ -427,7 +427,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin // compute the floating window's size in absolute screen coordinates // use the border window to have the exact position - Window *pBorderWin = pWin->GetWindow( WINDOW_BORDER ); + vcl::Window *pBorderWin = pWin->GetWindow( WINDOW_BORDER ); Point aPt; // the top-left corner in output coordinates ie (0,0) Rectangle devRect( pBorderWin->ImplOutputToUnmirroredAbsoluteScreenPixel( Rectangle( aPt, pBorderWin->GetSizePixel()) ) ) ; @@ -472,7 +472,7 @@ FloatingWindow* FloatingWindow::ImplFindLastLevelFloat() return pLastFoundWin; } -bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow ) +bool FloatingWindow::ImplIsFloatPopupModeWindow( const vcl::Window* pWindow ) { FloatingWindow* pWin = this; @@ -621,7 +621,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags ) // !!! rRect is expected to be in screen coordinates of the parent frame window !!! maFloatRect = rRect; - Window *pReference = GetParent(); + vcl::Window *pReference = GetParent(); const OutputDevice *pParentWinOutDev = pReference->GetOutDev(); // compare coordinates in absolute screen coordinates @@ -787,7 +787,7 @@ void FloatingWindow::EndPopupMode( sal_uInt16 nFlags ) ImplEndPopupMode( nFlags ); } -void FloatingWindow::AddPopupModeWindow( Window* pWindow ) +void FloatingWindow::AddPopupModeWindow( vcl::Window* pWindow ) { // !!! up-to-now only 1 window and not yet a list mpFirstPopupModeWin = pWindow; diff --git a/vcl/source/window/globalization.cxx b/vcl/source/window/globalization.cxx index 21658970b390..59081a2a48d3 100644 --- a/vcl/source/window/globalization.cxx +++ b/vcl/source/window/globalization.cxx @@ -20,6 +20,8 @@ #include <vcl/window.hxx> #include <vcl/outdev.hxx> +namespace vcl { + void Window::EnableRTL ( bool bEnable ) { StateChanged( STATE_CHANGE_MIRRORING ); @@ -32,4 +34,6 @@ bool Window::HasMirroredGraphics() const return pOutDev->OutputDevice::HasMirroredGraphics(); } +} /* namespace vcl */ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx index dd111f66de35..afe7c0d073e3 100644 --- a/vcl/source/window/keycod.cxx +++ b/vcl/source/window/keycod.cxx @@ -101,7 +101,7 @@ vcl::KeyCode::KeyCode( const ResId& rResId ) } } -OUString vcl::KeyCode::GetName( Window* pWindow ) const +OUString vcl::KeyCode::GetName( vcl::Window* pWindow ) const { if ( !pWindow ) pWindow = ImplGetDefaultWindow(); diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index b5cd7a57dd85..9eb085be783b 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -15,7 +15,7 @@ #include <vcl/settings.hxx> #include "window.h" -VclContainer::VclContainer(Window *pParent, WinBits nStyle) +VclContainer::VclContainer(vcl::Window *pParent, WinBits nStyle) : Window(WINDOW_CONTAINER) , m_bLayoutDirty(true) { @@ -35,7 +35,7 @@ Size VclContainer::GetOptimalSize() const return calculateRequisition(); } -void VclContainer::setLayoutPosSize(Window &rWindow, const Point &rPos, const Size &rSize) +void VclContainer::setLayoutPosSize(vcl::Window &rWindow, const Point &rPos, const Size &rSize) { sal_Int32 nBorderWidth = rWindow.get_border_width(); sal_Int32 nLeft = rWindow.get_margin_left() + nBorderWidth; @@ -47,7 +47,7 @@ void VclContainer::setLayoutPosSize(Window &rWindow, const Point &rPos, const Si rWindow.SetPosSizePixel(aPos, aSize); } -void VclContainer::setLayoutAllocation(Window &rChild, const Point &rAllocPos, const Size &rChildAlloc) +void VclContainer::setLayoutAllocation(vcl::Window &rChild, const Point &rAllocPos, const Size &rChildAlloc) { VclAlign eHalign = rChild.get_halign(); VclAlign eValign = rChild.get_valign(); @@ -108,7 +108,7 @@ void VclContainer::setLayoutAllocation(Window &rChild, const Point &rAllocPos, c setLayoutPosSize(rChild, aChildPos, aChildSize); } -Size VclContainer::getLayoutRequisition(const Window &rWindow) +Size VclContainer::getLayoutRequisition(const vcl::Window &rWindow) { sal_Int32 nBorderWidth = rWindow.get_border_width(); sal_Int32 nLeft = rWindow.get_margin_left() + nBorderWidth; @@ -182,7 +182,7 @@ Size VclBox::calculateRequisition() const sal_uInt16 nVisibleChildren = 0; Size aSize; - for (Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { if (!pChild->IsVisible()) continue; @@ -202,7 +202,7 @@ Size VclBox::calculateRequisition() const void VclBox::setAllocation(const Size &rAllocation) { sal_uInt16 nVisibleChildren = 0, nExpandChildren = 0; - for (Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { if (!pChild->IsVisible()) continue; @@ -230,8 +230,8 @@ void VclBox::setAllocation(const Size &rAllocation) } //Split into those we pack from the start onwards, and those we pack from the end backwards - std::vector<Window*> aWindows[2]; - for (Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) + std::vector<vcl::Window*> aWindows[2]; + for (vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { if (!pChild->IsVisible()) continue; @@ -254,9 +254,9 @@ void VclBox::setAllocation(const Size &rAllocation) setPrimaryCoordinate(aPos, nPrimaryCoordinate + nAllocPrimaryDimension); } - for (std::vector<Window*>::iterator aI = aWindows[ePackType].begin(), aEnd = aWindows[ePackType].end(); aI != aEnd; ++aI) + for (std::vector<vcl::Window*>::iterator aI = aWindows[ePackType].begin(), aEnd = aWindows[ePackType].end(); aI != aEnd; ++aI) { - Window *pChild = *aI; + vcl::Window *pChild = *aI; long nPadding = pChild->get_padding(); @@ -427,7 +427,7 @@ VclButtonBox::Requisition VclButtonBox::calculatePrimarySecondaryRequisitions() std::vector<long> aSubGroupSizes; std::vector<bool> aSubGroupNonHomogeneous; - for (const Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) + for (const vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { if (!pChild->IsVisible()) continue; @@ -621,7 +621,7 @@ void VclButtonBox::setAllocation(const Size &rAllocation) std::vector<long>::const_iterator aPrimaryI = aReq.m_aMainGroupDimensions.begin(); std::vector<long>::const_iterator aSecondaryI = aReq.m_aSubGroupDimensions.begin(); bool bIgnoreSecondaryPacking = (m_eLayoutStyle == VCL_BUTTONBOX_SPREAD || m_eLayoutStyle == VCL_BUTTONBOX_CENTER); - for (Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { if (!pChild->IsVisible()) continue; @@ -690,7 +690,7 @@ static int getButtonPriority(const OString &rType) } class sortButtons - : public std::binary_function<const Window*, const Window*, bool> + : public std::binary_function<const vcl::Window*, const vcl::Window*, bool> { bool m_bVerticalContainer; public: @@ -698,10 +698,10 @@ public: : m_bVerticalContainer(bVerticalContainer) { } - bool operator()(const Window *pA, const Window *pB) const; + bool operator()(const vcl::Window *pA, const vcl::Window *pB) const; }; -bool sortButtons::operator()(const Window *pA, const Window *pB) const +bool sortButtons::operator()(const vcl::Window *pA, const vcl::Window *pB) const { //sort into two groups of pack start and pack end VclPackType ePackA = pA->get_pack_type(); @@ -735,8 +735,8 @@ bool sortButtons::operator()(const Window *pA, const Window *pB) const void VclButtonBox::sort_native_button_order() { - std::vector<Window*> aChilds; - for (Window* pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; + std::vector<vcl::Window*> aChilds; + for (vcl::Window* pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { aChilds.push_back(pChild); @@ -752,7 +752,7 @@ VclGrid::array_type VclGrid::assembleGrid() const { ext_array_type A; - for (Window* pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; + for (vcl::Window* pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { sal_Int32 nLeftAttach = pChild->get_grid_left_attach(); @@ -802,7 +802,7 @@ VclGrid::array_type VclGrid::assembleGrid() const for (sal_Int32 y = 0; y < nMaxY; ++y) { const GridEntry &rEntry = A[x][y]; - const Window *pChild = rEntry.pChild; + const vcl::Window *pChild = rEntry.pChild; if (pChild && pChild->IsVisible()) { aNonEmptyCols[x] = true; @@ -929,7 +929,7 @@ void VclGrid::calcMaxs(const array_type &A, std::vector<Value> &rWidths, std::ve for (sal_Int32 y = 0; y < nMaxY; ++y) { const GridEntry &rEntry = A[x][y]; - const Window *pChild = rEntry.pChild; + const vcl::Window *pChild = rEntry.pChild; if (!pChild || !pChild->IsVisible()) continue; @@ -960,7 +960,7 @@ void VclGrid::calcMaxs(const array_type &A, std::vector<Value> &rWidths, std::ve for (sal_Int32 y = 0; y < nMaxY; ++y) { const GridEntry &rEntry = A[x][y]; - const Window *pChild = rEntry.pChild; + const vcl::Window *pChild = rEntry.pChild; if (!pChild || !pChild->IsVisible()) continue; @@ -1205,7 +1205,7 @@ void VclGrid::setAllocation(const Size& rAllocation) for (sal_Int32 y = 0; y < nMaxY; ++y) { GridEntry &rEntry = A[x][y]; - Window *pChild = rEntry.pChild; + vcl::Window *pChild = rEntry.pChild; if (pChild) { Size aChildAlloc(0, 0); @@ -1251,7 +1251,7 @@ bool VclGrid::set_property(const OString &rKey, const OString &rValue) return true; } -void setGridAttach(Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nWidth, sal_Int32 nHeight) +void setGridAttach(vcl::Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nWidth, sal_Int32 nHeight) { rWidget.set_grid_left_attach(nLeft); rWidget.set_grid_top_attach(nTop); @@ -1259,21 +1259,21 @@ void setGridAttach(Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 n rWidget.set_grid_height(nHeight); } -const Window *VclBin::get_child() const +const vcl::Window *VclBin::get_child() const { const WindowImpl* pWindowImpl = ImplGetWindowImpl(); return pWindowImpl->mpFirstChild; } -Window *VclBin::get_child() +vcl::Window *VclBin::get_child() { - return const_cast<Window*>(const_cast<const VclBin*>(this)->get_child()); + return const_cast<vcl::Window*>(const_cast<const VclBin*>(this)->get_child()); } Size VclBin::calculateRequisition() const { - const Window *pChild = get_child(); + const vcl::Window *pChild = get_child(); if (pChild && pChild->IsVisible()) return getLayoutRequisition(*pChild); return Size(0, 0); @@ -1281,7 +1281,7 @@ Size VclBin::calculateRequisition() const void VclBin::setAllocation(const Size &rAllocation) { - Window *pChild = get_child(); + vcl::Window *pChild = get_child(); if (pChild && pChild->IsVisible()) setLayoutAllocation(*pChild, Point(0, 0), rAllocation); } @@ -1292,8 +1292,8 @@ Size VclFrame::calculateRequisition() const { Size aRet(0, 0); - const Window *pChild = get_child(); - const Window *pLabel = get_label_widget(); + const vcl::Window *pChild = get_child(); + const vcl::Window *pLabel = get_label_widget(); if (pChild && pChild->IsVisible()) aRet = getLayoutRequisition(*pChild); @@ -1323,8 +1323,8 @@ void VclFrame::setAllocation(const Size &rAllocation) rAllocation.Height() - rFrameStyle.top - rFrameStyle.bottom); Point aChildPos(rFrameStyle.left, rFrameStyle.top); - Window *pChild = get_child(); - Window *pLabel = get_label_widget(); + vcl::Window *pChild = get_child(); + vcl::Window *pLabel = get_label_widget(); if (pLabel && pLabel->IsVisible()) { @@ -1340,13 +1340,13 @@ void VclFrame::setAllocation(const Size &rAllocation) setLayoutAllocation(*pChild, aChildPos, aAllocation); } -void VclFrame::designate_label(Window *pWindow) +void VclFrame::designate_label(vcl::Window *pWindow) { assert(pWindow->GetParent() == this); m_pLabel = pWindow; } -const Window *VclFrame::get_label_widget() const +const vcl::Window *VclFrame::get_label_widget() const { assert(GetChildCount() == 2); if (m_pLabel) @@ -1358,12 +1358,12 @@ const Window *VclFrame::get_label_widget() const return pWindowImpl->mpFirstChild; } -Window *VclFrame::get_label_widget() +vcl::Window *VclFrame::get_label_widget() { - return const_cast<Window*>(const_cast<const VclFrame*>(this)->get_label_widget()); + return const_cast<vcl::Window*>(const_cast<const VclFrame*>(this)->get_label_widget()); } -const Window *VclFrame::get_child() const +const vcl::Window *VclFrame::get_child() const { assert(GetChildCount() == 2); //The child widget is the normally the last (of two) children @@ -1375,28 +1375,28 @@ const Window *VclFrame::get_child() const return pWindowImpl->mpLastChild; } -Window *VclFrame::get_child() +vcl::Window *VclFrame::get_child() { - return const_cast<Window*>(const_cast<const VclFrame*>(this)->get_child()); + return const_cast<vcl::Window*>(const_cast<const VclFrame*>(this)->get_child()); } void VclFrame::set_label(const OUString &rLabel) { - Window *pLabel = get_label_widget(); + vcl::Window *pLabel = get_label_widget(); assert(pLabel); pLabel->SetText(rLabel); } OUString VclFrame::get_label() const { - const Window *pLabel = get_label_widget(); + const vcl::Window *pLabel = get_label_widget(); assert(pLabel); return pLabel->GetText(); } OUString VclFrame::getDefaultAccessibleName() const { - const Window *pLabel = get_label_widget(); + const vcl::Window *pLabel = get_label_widget(); if (pLabel) return pLabel->GetAccessibleName(); return VclBin::getDefaultAccessibleName(); @@ -1407,7 +1407,7 @@ Size VclAlignment::calculateRequisition() const Size aRet(m_nLeftPadding + m_nRightPadding, m_nTopPadding + m_nBottomPadding); - const Window *pChild = get_child(); + const vcl::Window *pChild = get_child(); if (pChild && pChild->IsVisible()) { Size aChildSize = getLayoutRequisition(*pChild); @@ -1420,7 +1420,7 @@ Size VclAlignment::calculateRequisition() const void VclAlignment::setAllocation(const Size &rAllocation) { - Window *pChild = get_child(); + vcl::Window *pChild = get_child(); if (!pChild || !pChild->IsVisible()) return; @@ -1456,7 +1456,7 @@ bool VclAlignment::set_property(const OString &rKey, const OString &rValue) return true; } -const Window *VclExpander::get_child() const +const vcl::Window *VclExpander::get_child() const { const WindowImpl* pWindowImpl = ImplGetWindowImpl(); @@ -1465,9 +1465,9 @@ const Window *VclExpander::get_child() const return pWindowImpl->mpFirstChild->GetWindow(WINDOW_NEXT); } -Window *VclExpander::get_child() +vcl::Window *VclExpander::get_child() { - return const_cast<Window*>(const_cast<const VclExpander*>(this)->get_child()); + return const_cast<vcl::Window*>(const_cast<const VclExpander*>(this)->get_child()); } Size VclExpander::calculateRequisition() const @@ -1476,8 +1476,8 @@ Size VclExpander::calculateRequisition() const WindowImpl* pWindowImpl = ImplGetWindowImpl(); - const Window *pChild = get_child(); - const Window *pLabel = pChild != pWindowImpl->mpLastChild ? pWindowImpl->mpLastChild : NULL; + const vcl::Window *pChild = get_child(); + const vcl::Window *pLabel = pChild != pWindowImpl->mpLastChild ? pWindowImpl->mpLastChild : NULL; if (pChild && pChild->IsVisible() && m_aDisclosureButton.IsChecked()) aRet = getLayoutRequisition(*pChild); @@ -1513,8 +1513,8 @@ void VclExpander::setAllocation(const Size &rAllocation) WindowImpl* pWindowImpl = ImplGetWindowImpl(); //The label widget is the last (of two) children - Window *pChild = get_child(); - Window *pLabel = pChild != pWindowImpl->mpLastChild ? pWindowImpl->mpLastChild : NULL; + vcl::Window *pChild = get_child(); + vcl::Window *pLabel = pChild != pWindowImpl->mpLastChild ? pWindowImpl->mpLastChild : NULL; Size aButtonSize = getLayoutRequisition(m_aDisclosureButton); Size aLabelSize; @@ -1575,7 +1575,7 @@ void VclExpander::StateChanged(StateChangedType nType) if (nType == STATE_CHANGE_INITSHOW) { - Window *pChild = get_child(); + vcl::Window *pChild = get_child(); if (pChild) pChild->Show(m_aDisclosureButton.IsChecked()); } @@ -1583,7 +1583,7 @@ void VclExpander::StateChanged(StateChangedType nType) IMPL_LINK( VclExpander, ClickHdl, DisclosureButton*, pBtn ) { - Window *pChild = get_child(); + vcl::Window *pChild = get_child(); if (pChild) { pChild->Show(pBtn->IsChecked()); @@ -1596,7 +1596,7 @@ IMPL_LINK( VclExpander, ClickHdl, DisclosureButton*, pBtn ) return 0; } -VclScrolledWindow::VclScrolledWindow(Window *pParent, WinBits nStyle) +VclScrolledWindow::VclScrolledWindow(vcl::Window *pParent, WinBits nStyle) : VclBin(pParent, nStyle) , m_bUserManagedScrolling(false) , m_aVScroll(this, WB_HIDE | WB_VERT) @@ -1612,7 +1612,7 @@ VclScrolledWindow::VclScrolledWindow(Window *pParent, WinBits nStyle) IMPL_LINK_NOARG(VclScrolledWindow, ScrollBarHdl) { - Window *pChild = get_child(); + vcl::Window *pChild = get_child(); if (!pChild) return 1; @@ -1640,23 +1640,23 @@ IMPL_LINK_NOARG(VclScrolledWindow, ScrollBarHdl) return 1; } -const Window *VclScrolledWindow::get_child() const +const vcl::Window *VclScrolledWindow::get_child() const { assert(GetChildCount() == 4); const WindowImpl* pWindowImpl = ImplGetWindowImpl(); return pWindowImpl->mpLastChild; } -Window *VclScrolledWindow::get_child() +vcl::Window *VclScrolledWindow::get_child() { - return const_cast<Window*>(const_cast<const VclScrolledWindow*>(this)->get_child()); + return const_cast<vcl::Window*>(const_cast<const VclScrolledWindow*>(this)->get_child()); } Size VclScrolledWindow::calculateRequisition() const { Size aRet(0, 0); - const Window *pChild = get_child(); + const vcl::Window *pChild = get_child(); if (pChild && pChild->IsVisible()) aRet = getLayoutRequisition(*pChild); @@ -1671,7 +1671,7 @@ Size VclScrolledWindow::calculateRequisition() const void VclScrolledWindow::InitScrollBars(const Size &rRequest) { - const Window *pChild = get_child(); + const vcl::Window *pChild = get_child(); if (!pChild || !pChild->IsVisible()) return; @@ -1697,7 +1697,7 @@ void VclScrolledWindow::setAllocation(const Size &rAllocation) Size aChildAllocation(rAllocation); Size aChildReq; - Window *pChild = get_child(); + vcl::Window *pChild = get_child(); if (pChild && pChild->IsVisible()) aChildReq = getLayoutRequisition(*pChild); @@ -1810,7 +1810,7 @@ bool VclScrolledWindow::Notify(NotifyEvent& rNEvt) void VclViewport::setAllocation(const Size &rAllocation) { - Window *pChild = get_child(); + vcl::Window *pChild = get_child(); if (pChild && pChild->IsVisible()) { Size aReq(getLayoutRequisition(*pChild)); @@ -1820,7 +1820,7 @@ void VclViewport::setAllocation(const Size &rAllocation) } } -const Window *VclEventBox::get_child() const +const vcl::Window *VclEventBox::get_child() const { const WindowImpl* pWindowImpl = ImplGetWindowImpl(); @@ -1829,15 +1829,15 @@ const Window *VclEventBox::get_child() const return pWindowImpl->mpFirstChild->GetWindow(WINDOW_NEXT); } -Window *VclEventBox::get_child() +vcl::Window *VclEventBox::get_child() { - return const_cast<Window*>(const_cast<const VclEventBox*>(this)->get_child()); + return const_cast<vcl::Window*>(const_cast<const VclEventBox*>(this)->get_child()); } void VclEventBox::setAllocation(const Size& rAllocation) { Point aChildPos(0, 0); - for (Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) + for (vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { if (!pChild->IsVisible()) continue; @@ -1849,7 +1849,7 @@ Size VclEventBox::calculateRequisition() const { Size aRet(0, 0); - for (const Window* pChild = get_child(); pChild; + for (const vcl::Window* pChild = get_child(); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { if (!pChild->IsVisible()) @@ -1872,7 +1872,7 @@ void VclSizeGroup::trigger_queue_resize() //sufficient to trigger one widget to trigger all of them if (!m_aWindows.empty()) { - Window *pWindow = *m_aWindows.begin(); + vcl::Window *pWindow = *m_aWindows.begin(); pWindow->queue_resize(); } } @@ -1936,7 +1936,7 @@ void MessageDialog::create_owned_areas() m_pOwnedActionArea->Show(); } -MessageDialog::MessageDialog(Window* pParent, WinBits nStyle) +MessageDialog::MessageDialog(vcl::Window* pParent, WinBits nStyle) : Dialog(pParent, nStyle) , m_eButtonsType(VCL_BUTTONS_NONE) , m_eMessageType(VCL_MESSAGE_INFO) @@ -1948,7 +1948,7 @@ MessageDialog::MessageDialog(Window* pParent, WinBits nStyle) SetType(WINDOW_MESSBOX); } -MessageDialog::MessageDialog(Window* pParent, +MessageDialog::MessageDialog(vcl::Window* pParent, const OUString &rMessage, VclMessageType eMessageType, VclButtonsType eButtonsType, @@ -1966,7 +1966,7 @@ MessageDialog::MessageDialog(Window* pParent, create_owned_areas(); } -MessageDialog::MessageDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) +MessageDialog::MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : Dialog(pParent, rID, rUIXMLDescription, WINDOW_MESSBOX) , m_eButtonsType(VCL_BUTTONS_NONE) , m_eMessageType(VCL_MESSAGE_INFO) @@ -2002,9 +2002,9 @@ IMPL_LINK(MessageDialog, ButtonHdl, Button *, pButton) return 0; } -short MessageDialog::get_response(const Window *pWindow) const +short MessageDialog::get_response(const vcl::Window *pWindow) const { - std::map<const Window*, short>::const_iterator aFind = m_aResponses.find(pWindow); + std::map<const vcl::Window*, short>::const_iterator aFind = m_aResponses.find(pWindow); if (aFind != m_aResponses.end()) return aFind->second; if (!m_pUIBuilder) @@ -2015,7 +2015,7 @@ short MessageDialog::get_response(const Window *pWindow) const void MessageDialog::setButtonHandlers(VclButtonBox *pButtonBox) { assert(pButtonBox); - for (Window* pChild = pButtonBox->GetWindow(WINDOW_FIRSTCHILD); pChild; + for (vcl::Window* pChild = pButtonBox->GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { switch (pChild->GetType()) @@ -2051,7 +2051,7 @@ void MessageDialog::setButtonHandlers(VclButtonBox *pButtonBox) } } -void MessageDialog::SetMessagesWidths(Window *pParent, +void MessageDialog::SetMessagesWidths(vcl::Window *pParent, VclMultiLineEdit *pPrimaryMessage, VclMultiLineEdit *pSecondaryMessage) { if (pSecondaryMessage) @@ -2273,11 +2273,11 @@ void MessageDialog::set_secondary_text(const OUString &rSecondaryString) } } -Size getLegacyBestSizeForChildren(const Window &rWindow) +Size getLegacyBestSizeForChildren(const vcl::Window &rWindow) { Rectangle aBounds; - for (const Window* pChild = rWindow.GetWindow(WINDOW_FIRSTCHILD); pChild; + for (const vcl::Window* pChild = rWindow.GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { if (!pChild->IsVisible()) @@ -2298,7 +2298,7 @@ Size getLegacyBestSizeForChildren(const Window &rWindow) return aRet; } -Window* getNonLayoutParent(Window *pWindow) +vcl::Window* getNonLayoutParent(vcl::Window *pWindow) { while (pWindow) { @@ -2309,7 +2309,7 @@ Window* getNonLayoutParent(Window *pWindow) return pWindow; } -Window* getNonLayoutRealParent(Window *pWindow) +vcl::Window* getNonLayoutRealParent(vcl::Window *pWindow) { while (pWindow) { @@ -2320,7 +2320,7 @@ Window* getNonLayoutRealParent(Window *pWindow) return pWindow; } -bool isVisibleInLayout(const Window *pWindow) +bool isVisibleInLayout(const vcl::Window *pWindow) { bool bVisible = true; while (bVisible) @@ -2333,7 +2333,7 @@ bool isVisibleInLayout(const Window *pWindow) return bVisible; } -bool isEnabledInLayout(const Window *pWindow) +bool isEnabledInLayout(const vcl::Window *pWindow) { bool bEnabled = true; while (bEnabled) @@ -2346,14 +2346,14 @@ bool isEnabledInLayout(const Window *pWindow) return bEnabled; } -bool isLayoutEnabled(const Window *pWindow) +bool isLayoutEnabled(const vcl::Window *pWindow) { //Child is a container => we're layout enabled - const Window *pChild = pWindow ? pWindow->GetWindow(WINDOW_FIRSTCHILD) : NULL; + const vcl::Window *pChild = pWindow ? pWindow->GetWindow(WINDOW_FIRSTCHILD) : NULL; return pChild && isContainerWindow(*pChild) && !pChild->GetWindow(WINDOW_NEXT); } -bool isInitialLayout(const Window *pWindow) +bool isInitialLayout(const vcl::Window *pWindow) { Dialog *pParentDialog = pWindow ? pWindow->GetParentDialog() : NULL; return pParentDialog && pParentDialog->isCalculatingInitialLayoutSize(); diff --git a/vcl/source/window/legacyaccessibility.cxx b/vcl/source/window/legacyaccessibility.cxx index 5dc37d1846f0..9d01dd56d856 100644 --- a/vcl/source/window/legacyaccessibility.cxx +++ b/vcl/source/window/legacyaccessibility.cxx @@ -38,9 +38,9 @@ using namespace ::com::sun::star; -static Window* ImplGetLabelFor( Window* pFrameWindow, WindowType nMyType, Window* pLabel, sal_Unicode nAccel ) +static vcl::Window* ImplGetLabelFor( vcl::Window* pFrameWindow, WindowType nMyType, vcl::Window* pLabel, sal_Unicode nAccel ) { - Window* pWindow = NULL; + vcl::Window* pWindow = NULL; if( nMyType == WINDOW_FIXEDTEXT || nMyType == WINDOW_FIXEDLINE || @@ -73,7 +73,7 @@ static Window* ImplGetLabelFor( Window* pFrameWindow, WindowType nMyType, Window while( nIndex < nFormEnd ) { nIndex++; - Window* pSWindow = ::ImplGetChildWindow( pFrameWindow, + vcl::Window* pSWindow = ::ImplGetChildWindow( pFrameWindow, nIndex, nIndex, false ); @@ -99,6 +99,8 @@ static Window* ImplGetLabelFor( Window* pFrameWindow, WindowType nMyType, Window return pWindow; } +namespace vcl { + Window* Window::getLegacyNonLayoutAccessibleRelationLabelFor() const { Window* pWindow = NULL; @@ -264,4 +266,6 @@ Window* Window::getLegacyNonLayoutAccessibleRelationMemberOf() const return pWindow; } +} /* namespace vcl */ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 179d9792b687..236929a5d82b 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -387,7 +387,7 @@ void Menu::InsertItem(sal_uInt16 nItemId, const OUString& rStr, MenuItemBits nIt if( ImplGetSalMenu() && pData->pSalMenuItem ) ImplGetSalMenu()->InsertItem( pData->pSalMenuItem, nPos ); - Window* pWin = ImplGetWindow(); + vcl::Window* pWin = ImplGetWindow(); delete mpLayoutData, mpLayoutData = NULL; if ( pWin ) { @@ -556,7 +556,7 @@ void Menu::RemoveItem( sal_uInt16 nPos ) bRemove = true; } - Window* pWin = ImplGetWindow(); + vcl::Window* pWin = ImplGetWindow(); if ( pWin ) { ImplCalcSize( pWin ); @@ -949,7 +949,7 @@ void Menu::EnableItem( sal_uInt16 nItemId, bool bEnable ) { pItemData->bEnabled = bEnable; - Window* pWin = ImplGetWindow(); + vcl::Window* pWin = ImplGetWindow(); if ( pWin && pWin->IsVisible() ) { DBG_ASSERT(IsMenuBar(), "Menu::EnableItem - Popup visible!" ); @@ -993,7 +993,7 @@ void Menu::ShowItem( sal_uInt16 nItemId, bool bVisible ) DBG_ASSERT(!IsMenuBar(), "Menu::ShowItem - ignored for menu bar entries!"); if (!IsMenuBar()&& pData && (pData->bVisible != bVisible)) { - Window* pWin = ImplGetWindow(); + vcl::Window* pWin = ImplGetWindow(); if ( pWin && pWin->IsVisible() ) { DBG_ASSERT( false, "Menu::ShowItem - ignored for visible popups!" ); @@ -1023,7 +1023,7 @@ void Menu::SetItemText( sal_uInt16 nItemId, const OUString& rStr ) if( ImplGetSalMenu() && pData->pSalMenuItem ) ImplGetSalMenu()->SetItemText( nPos, pData->pSalMenuItem, rStr ); - Window* pWin = ImplGetWindow(); + vcl::Window* pWin = ImplGetWindow(); delete mpLayoutData, mpLayoutData = NULL; if (pWin && IsMenuBar()) { @@ -1389,7 +1389,7 @@ void Menu::SetAccessible( const ::com::sun::star::uno::Reference< ::com::sun::st mxAccessible = rxAccessible; } -Size Menu::ImplGetNativeCheckAndRadioSize( const Window* pWin, long& rCheckHeight, long& rRadioHeight ) const +Size Menu::ImplGetNativeCheckAndRadioSize( const vcl::Window* pWin, long& rCheckHeight, long& rRadioHeight ) const { long nCheckWidth = 0, nRadioWidth = 0; rCheckHeight = rRadioHeight = 0; @@ -1437,7 +1437,7 @@ Size Menu::ImplGetNativeCheckAndRadioSize( const Window* pWin, long& rCheckHeigh return Size(std::max(nCheckWidth, nRadioWidth), std::max(rCheckHeight, rRadioHeight)); } -bool Menu::ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long& rArrowSpacing ) const +bool Menu::ImplGetNativeSubmenuArrowSize( vcl::Window* pWin, Size& rArrowSize, long& rArrowSpacing ) const { ImplControlValue aVal; Rectangle aNativeBounds; @@ -1498,7 +1498,7 @@ void Menu::ImplRemoveDel( ImplMenuDelData& rDel ) } } -Size Menu::ImplCalcSize( const Window* pWin ) +Size Menu::ImplCalcSize( const vcl::Window* pWin ) { // | Check/Radio/Image| Text| Accel/Popup| @@ -1703,7 +1703,7 @@ Size Menu::ImplCalcSize( const Window* pWin ) return aSz; } -static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRect, bool i_bHighlight ) +static void ImplPaintCheckBackground( vcl::Window* i_pWindow, const Rectangle& i_rRect, bool i_bHighlight ) { bool bNativeOk = false; if( i_pWindow->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) ) @@ -1727,7 +1727,7 @@ static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRec } } -static OUString getShortenedString( const OUString& i_rLong, Window* i_pWin, long i_nMaxWidth ) +static OUString getShortenedString( const OUString& i_rLong, vcl::Window* i_pWin, long i_nMaxWidth ) { sal_Int32 nPos = -1; OUString aNonMnem( OutputDevice::GetNonMnemonicString( i_rLong, nPos ) ); @@ -1747,7 +1747,7 @@ static OUString getShortenedString( const OUString& i_rLong, Window* i_pWin, lon return aNonMnem; } -void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, long nStartY, MenuItemData* pThisItemOnly, bool bHighlighted, bool bLayout, bool bRollover ) const +void Menu::ImplPaint( vcl::Window* pWin, sal_uInt16 nBorder, long nStartY, MenuItemData* pThisItemOnly, bool bHighlighted, bool bLayout, bool bRollover ) const { // for symbols: nFontHeight x nFontHeight long nFontHeight = pWin->GetTextHeight(); @@ -2470,7 +2470,7 @@ void MenuBar::SetDisplayable( bool bDisplayable ) } } -Window* MenuBar::ImplCreate(Window* pParent, Window* pWindow, MenuBar* pMenu, const css::uno::Reference<css::frame::XFrame> &/*rFrame*/) +vcl::Window* MenuBar::ImplCreate(vcl::Window* pParent, vcl::Window* pWindow, MenuBar* pMenu, const css::uno::Reference<css::frame::XFrame> &/*rFrame*/) { MenuBarWindow *pMenuBarWindow = dynamic_cast<MenuBarWindow*>(pWindow); if (!pMenuBarWindow) @@ -2496,7 +2496,7 @@ Window* MenuBar::ImplCreate(Window* pParent, Window* pWindow, MenuBar* pMenu, co void MenuBar::ImplDestroy( MenuBar* pMenu, bool bDelete ) { - Window *pWindow = pMenu->ImplGetWindow(); + vcl::Window *pWindow = pMenu->ImplGetWindow(); if (pWindow && bDelete) { pMenu->getMenuBarWindow()->KillActivePopup(); @@ -2515,7 +2515,7 @@ bool MenuBar::ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu ) return bDone; // check for enabled, if this method is called from another window... - Window* pWin = ImplGetWindow(); + vcl::Window* pWin = ImplGetWindow(); if ( pWin && pWin->IsEnabled() && pWin->IsInputEnabled() && ! pWin->IsInModalMode() ) bDone = getMenuBarWindow()->HandleKeyEvent( rKEvent, bFromMenu ); return bDone; @@ -2755,12 +2755,12 @@ void PopupMenu::SetSelectedEntry( sal_uInt16 nId ) nSelectedId = nId; } -sal_uInt16 PopupMenu::Execute( Window* pExecWindow, const Point& rPopupPos ) +sal_uInt16 PopupMenu::Execute( vcl::Window* pExecWindow, const Point& rPopupPos ) { return Execute( pExecWindow, Rectangle( rPopupPos, rPopupPos ), POPUPMENU_EXECUTE_DOWN ); } -sal_uInt16 PopupMenu::Execute( Window* pExecWindow, const Rectangle& rRect, sal_uInt16 nFlags ) +sal_uInt16 PopupMenu::Execute( vcl::Window* pExecWindow, const Rectangle& rRect, sal_uInt16 nFlags ) { ENSURE_OR_RETURN( pExecWindow, "PopupMenu::Execute: need a non-NULL window!", 0 ); @@ -2785,7 +2785,7 @@ sal_uInt16 PopupMenu::Execute( Window* pExecWindow, const Rectangle& rRect, sal_ return ImplExecute( pExecWindow, rRect, nPopupModeFlags, 0, false ); } -sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong nPopupModeFlags, Menu* pSFrom, bool bPreSelectFirst ) +sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const Rectangle& rRect, sal_uLong nPopupModeFlags, Menu* pSFrom, bool bPreSelectFirst ) { if ( !pSFrom && ( PopupMenu::IsInExecute() || !GetItemCount() ) ) return 0; @@ -2894,7 +2894,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong Rectangle aDesktopRect(pWin->GetDesktopRectPixel()); if( Application::GetScreenCount() > 1 && Application::IsUnifiedDisplay() ) { - Window* pDeskW = pWindow->GetWindow( WINDOW_REALPARENT ); + vcl::Window* pDeskW = pWindow->GetWindow( WINDOW_REALPARENT ); if( ! pDeskW ) pDeskW = pWindow; Point aDesktopTL( pDeskW->OutputToAbsoluteScreenPixel( aRect.TopLeft() ) ); @@ -2910,7 +2910,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong //above/below and force the menu to scroll if it won't fit if (nPopupModeFlags & FLOATWIN_POPUPMODE_NOHORZPLACEMENT) { - Window* pRef = pWin; + vcl::Window* pRef = pWin; if ( pRef->GetParent() ) pRef = pRef->GetParent(); diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index d5998d803798..2a82c613776d 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -34,7 +34,7 @@ // document closing button #define IID_DOCUMENTCLOSE 1 -DecoToolBox::DecoToolBox( Window* pParent, WinBits nStyle ) : +DecoToolBox::DecoToolBox( vcl::Window* pParent, WinBits nStyle ) : ToolBox( pParent, nStyle ) { ImplInit(); @@ -115,7 +115,7 @@ void DecoToolBox::SetImages( long nMaxHeight, bool bForce ) } } -MenuBarWindow::MenuBarWindow( Window* pParent ) : +MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) : Window( pParent, 0 ), aCloseBtn(this), aFloatBtn( this, WB_NOPOINTERFOCUS | WB_SMALLSTYLE | WB_RECTSTYLE ), @@ -519,18 +519,18 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, bool bSelectEntry, bool b GrabFocus(); } -static int ImplGetTopDockingAreaHeight( Window *pWindow ) +static int ImplGetTopDockingAreaHeight( vcl::Window *pWindow ) { // find docking area that is top aligned and return its height // note: dockingareas are direct children of the SystemWindow if( pWindow->ImplGetFrameWindow() ) { - Window *pWin = pWindow->ImplGetFrameWindow()->GetWindow( WINDOW_FIRSTCHILD ); //mpWindowImpl->mpFirstChild; + vcl::Window *pWin = pWindow->ImplGetFrameWindow()->GetWindow( WINDOW_FIRSTCHILD ); //mpWindowImpl->mpFirstChild; while( pWin ) { if( pWin->IsSystemWindow() ) { - Window *pChildWin = pWin->GetWindow( WINDOW_FIRSTCHILD ); //mpWindowImpl->mpFirstChild; + vcl::Window *pChildWin = pWin->GetWindow( WINDOW_FIRSTCHILD ); //mpWindowImpl->mpFirstChild; while( pChildWin ) { DockingAreaWindow *pDockingArea = NULL; @@ -554,7 +554,7 @@ static int ImplGetTopDockingAreaHeight( Window *pWindow ) return 0; } -static void ImplAddNWFSeparator( Window *pThis, const MenubarValue& rMenubarValue ) +static void ImplAddNWFSeparator( vcl::Window *pThis, const MenubarValue& rMenubarValue ) { // add a separator if // - we have an adjacent docking area diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx index ad3c336280fd..46c79accc0f5 100644 --- a/vcl/source/window/menubarwindow.hxx +++ b/vcl/source/window/menubarwindow.hxx @@ -39,7 +39,7 @@ class DecoToolBox : public ToolBox using Window::ImplInit; public: - DecoToolBox( Window* pParent, WinBits nStyle = 0 ); + DecoToolBox( vcl::Window* pParent, WinBits nStyle = 0 ); void ImplInit(); void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -54,7 +54,7 @@ public: /** Class that implements the actual window of the menu bar. */ -class MenuBarWindow : public Window, public IMenuBarWindow +class MenuBarWindow : public vcl::Window, public IMenuBarWindow { friend class MenuBar; friend class Menu; @@ -106,7 +106,7 @@ private: void GetFocus() SAL_OVERRIDE; public: - MenuBarWindow( Window* pParent ); + MenuBarWindow( vcl::Window* pParent ); virtual ~MenuBarWindow(); virtual void ShowButtons(bool bClose, bool bFloat, bool bHide) SAL_OVERRIDE; diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 26d279df95c3..a1754b0a8d4e 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -25,7 +25,7 @@ #include <vcl/settings.hxx> #include <window.h> -MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, Window* pParent, WinBits nStyle ) : +MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, vcl::Window* pParent, WinBits nStyle ) : FloatingWindow( pParent, nStyle ) { mpWindowImpl->mbMenuFloatingWindow= true; @@ -1141,7 +1141,7 @@ void MenuFloatingWindow::RequestHelp( const HelpEvent& rHEvt ) { sal_uInt16 nId = nHighlightedItem; Menu* pM = pMenu; - Window* pW = this; + vcl::Window* pW = this; // #102618# Get item rect before destroying the window in EndExecute() call Rectangle aHighlightRect( ImplGetItemRect( nHighlightedItem ) ); diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx index f650527f3851..62731efd2ae1 100644 --- a/vcl/source/window/menufloatingwindow.hxx +++ b/vcl/source/window/menufloatingwindow.hxx @@ -79,7 +79,7 @@ protected: Rectangle ImplGetItemRect( sal_uInt16 nPos ); public: - MenuFloatingWindow( Menu* pMenu, Window* pParent, WinBits nStyle ); + MenuFloatingWindow( Menu* pMenu, vcl::Window* pParent, WinBits nStyle ); virtual ~MenuFloatingWindow(); void doShutdown(); diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx index 4fe0a0a23922..6699259e830f 100644 --- a/vcl/source/window/menuitemlist.cxx +++ b/vcl/source/window/menuitemlist.cxx @@ -198,7 +198,7 @@ MenuItemData* MenuItemList::SearchItem( { KeyCode mnKeyCode; sal_Unicode mnUnicode = pData->aText[n+1]; - Window* pDefWindow = ImplGetDefaultWindow(); + vcl::Window* pDefWindow = ImplGetDefaultWindow(); if( ( pDefWindow && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( mnUnicode, Application::GetSettings().GetUILanguageTag().getLanguageType(), mnKeyCode ) @@ -259,7 +259,7 @@ size_t MenuItemList::GetItemCount( KeyCode aKeyCode ) const KeyCode mnKeyCode; // if MapUnicodeToKeyCode fails or is unsupported we try the pure ascii mapping of the keycodes // so we have working shortcuts when ascii mnemonics are used - Window* pDefWindow = ImplGetDefaultWindow(); + vcl::Window* pDefWindow = ImplGetDefaultWindow(); if( ( pDefWindow && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( pData->aText[n+1], Application::GetSettings().GetUILanguageTag().getLanguageType(), mnKeyCode ) diff --git a/vcl/source/window/menuwindow.cxx b/vcl/source/window/menuwindow.cxx index 0f0a8dd52f6a..ddfe6bffbc97 100644 --- a/vcl/source/window/menuwindow.cxx +++ b/vcl/source/window/menuwindow.cxx @@ -26,7 +26,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> -void MenuWindow::ImplInitMenuWindow(Window* pWin, bool bFont, bool bMenuBar) +void MenuWindow::ImplInitMenuWindow(vcl::Window* pWin, bool bFont, bool bMenuBar) { const StyleSettings& rStyleSettings = pWin->GetSettings().GetStyleSettings(); @@ -76,7 +76,7 @@ void MenuWindow::ImplInitMenuWindow(Window* pWin, bool bFont, bool bMenuBar) pWin->SetLineColor(); } -static sal_uLong ImplChangeTipTimeout( sal_uLong nTimeout, Window *pWindow ) +static sal_uLong ImplChangeTipTimeout( sal_uLong nTimeout, vcl::Window *pWindow ) { AllSettings aAllSettings( pWindow->GetSettings() ); HelpSettings aHelpSettings( aAllSettings.GetHelpSettings() ); @@ -87,7 +87,7 @@ static sal_uLong ImplChangeTipTimeout( sal_uLong nTimeout, Window *pWindow ) return nRet; } -bool MenuWindow::ImplHandleHelpEvent(Window* pMenuWindow, Menu* pMenu, sal_uInt16 nHighlightedItem, +bool MenuWindow::ImplHandleHelpEvent(vcl::Window* pMenuWindow, Menu* pMenu, sal_uInt16 nHighlightedItem, const HelpEvent& rHEvt, const Rectangle &rHighlightRect) { if( ! pMenu ) diff --git a/vcl/source/window/menuwindow.hxx b/vcl/source/window/menuwindow.hxx index 880b3f14f7d9..74e36c3fbc9a 100644 --- a/vcl/source/window/menuwindow.hxx +++ b/vcl/source/window/menuwindow.hxx @@ -30,7 +30,7 @@ class Link; class Menu; class MenuBar; class Rectangle; -class Window; +namespace vcl { class Window; } /** Common ancestor for MenuFloatingWindow and MenuBarWindow. @@ -54,10 +54,10 @@ public: virtual ~MenuWindow() {} /// Sets up some visual properties of the underlying window. - void ImplInitMenuWindow(Window* pWin, bool bFont, bool bMenuBar); + void ImplInitMenuWindow(vcl::Window* pWin, bool bFont, bool bMenuBar); /// Show the appropriate help tooltip. - bool ImplHandleHelpEvent(Window* pMenuWindow, Menu* pMenu, sal_uInt16 nHighlightedItem, + bool ImplHandleHelpEvent(vcl::Window* pMenuWindow, Menu* pMenu, sal_uInt16 nHighlightedItem, const HelpEvent& rHEvt, const Rectangle &rHighlightRect); }; diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index b829bbfac6ce..c7d8bb1072f8 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -47,6 +47,8 @@ using namespace ::com::sun::star::uno; +namespace vcl { + sal_uInt16 Window::ImplHitTest( const Point& rFramePos ) { Point aFramePos( rFramePos ); @@ -98,7 +100,7 @@ PointerStyle Window::ImplGetMousePointer() const else ePointerStyle = POINTER_ARROW; - const Window* pWindow = this; + const vcl::Window* pWindow = this; do { // when the pointer is not visible stop the search, as @@ -164,7 +166,7 @@ void Window::ImplGenerateMouseMove() IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl) { mpWindowImpl->mpFrameData->mnMouseMoveId = 0; - Window* pCaptureWin = ImplGetSVData()->maWinData.mpCaptureWin; + vcl::Window* pCaptureWin = ImplGetSVData()->maWinData.mpCaptureWin; if( ! pCaptureWin || (pCaptureWin->mpWindowImpl && pCaptureWin->mpWindowImpl->mpFrame == mpWindowImpl->mpFrame) ) @@ -252,7 +254,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) ImplSVData* pSVData = ImplGetSVData(); bool bAsyncFocusWaiting = false; - Window *pFrame = pSVData->maWinData.mpFirstFrame; + vcl::Window *pFrame = pSVData->maWinData.mpFirstFrame; while( pFrame ) { if( pFrame != mpWindowImpl->mpFrameWindow && pFrame->mpWindowImpl->mpFrameData->mnFocusId ) @@ -268,7 +270,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) bool bMustNotGrabFocus = false; // #100242#, check parent hierarchy if some floater prohibits grab focus - Window *pParent = this; + vcl::Window *pParent = this; while( pParent ) { // #102158#, ignore grabfocus only if the floating parent grabs keyboard focus by itself (GrabsFocus()) @@ -289,7 +291,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) pSVData->maWinData.mpExtTextInputWin->EndExtTextInput( EXTTEXTINPUT_END_COMPLETE ); // mark this windows as the last FocusWindow - Window* pOverlapWindow = ImplGetFirstOverlapWindow(); + vcl::Window* pOverlapWindow = ImplGetFirstOverlapWindow(); pOverlapWindow->mpWindowImpl->mpLastFocusWindow = this; mpWindowImpl->mpFrameData->mpFocusWin = this; @@ -309,7 +311,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) } } - Window* pOldFocusWindow = pSVData->maWinData.mpFocusWin; + vcl::Window* pOldFocusWindow = pSVData->maWinData.mpFocusWin; ImplDelData aOldFocusDel( pOldFocusWindow ); pSVData->maWinData.mpFocusWin = this; @@ -326,15 +328,15 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) if ( pOldFocusWindow ) { // remember Focus - Window* pOldOverlapWindow = pOldFocusWindow->ImplGetFirstOverlapWindow(); - Window* pNewOverlapWindow = ImplGetFirstOverlapWindow(); + vcl::Window* pOldOverlapWindow = pOldFocusWindow->ImplGetFirstOverlapWindow(); + vcl::Window* pNewOverlapWindow = ImplGetFirstOverlapWindow(); if ( pOldOverlapWindow != pNewOverlapWindow ) ImplCallFocusChangeActivate( pNewOverlapWindow, pOldOverlapWindow ); } else { - Window* pNewOverlapWindow = ImplGetFirstOverlapWindow(); - Window* pNewRealWindow = pNewOverlapWindow->ImplGetWindow(); + vcl::Window* pNewOverlapWindow = ImplGetFirstOverlapWindow(); + vcl::Window* pNewRealWindow = pNewOverlapWindow->ImplGetWindow(); pNewOverlapWindow->mpWindowImpl->mbActive = true; pNewOverlapWindow->Activate(); if ( pNewRealWindow != pNewOverlapWindow ) @@ -398,7 +400,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) void Window::ImplGrabFocusToDocument( sal_uInt16 nFlags ) { - Window *pWin = this; + vcl::Window *pWin = this; while( pWin ) { if( !pWin->GetParent() ) @@ -773,4 +775,6 @@ Reference< css::datatransfer::dnd::XDragGestureRecognizer > Window::GetDragGestu return Reference< css::datatransfer::dnd::XDragGestureRecognizer > ( GetDropTarget(), UNO_QUERY ); } +} /* namespace vcl */ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 0eee716d65dc..f6c6399e8db1 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -136,7 +136,7 @@ void MessBox::ImplInitButtons() } } -MessBox::MessBox( Window* pParent, WinBits nStyle, +MessBox::MessBox( vcl::Window* pParent, WinBits nStyle, const OUString& rTitle, const OUString& rMessage ) : ButtonDialog( WINDOW_MESSBOX ), maMessText( rMessage ) @@ -386,13 +386,13 @@ void InfoBox::ImplInitInfoBoxData() SetImage( InfoBox::GetStandardImage() ); } -InfoBox::InfoBox( Window* pParent, const OUString& rMessage ) : +InfoBox::InfoBox( vcl::Window* pParent, const OUString& rMessage ) : MessBox( pParent, WB_OK | WB_DEF_OK, OUString(), rMessage ) { ImplInitInfoBoxData(); } -InfoBox::InfoBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : +InfoBox::InfoBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) { ImplInitInfoBoxData(); @@ -413,7 +413,7 @@ void WarningBox::ImplInitWarningBoxData() SetImage( WarningBox::GetStandardImage() ); } -WarningBox::WarningBox( Window* pParent, WinBits nStyle, +WarningBox::WarningBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) { @@ -442,7 +442,7 @@ void ErrorBox::ImplInitErrorBoxData() SetImage( ErrorBox::GetStandardImage() ); } -ErrorBox::ErrorBox( Window* pParent, WinBits nStyle, +ErrorBox::ErrorBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) { @@ -473,7 +473,7 @@ void QueryBox::ImplInitQueryBoxData() SetImage( QueryBox::GetStandardImage() ); } -QueryBox::QueryBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) : +QueryBox::QueryBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ) : MessBox( pParent, nStyle, OUString(), rMessage ) { ImplInitQueryBoxData(); diff --git a/vcl/source/window/openglwin.cxx b/vcl/source/window/openglwin.cxx index 1151a4da16c2..b205df61d1ef 100644 --- a/vcl/source/window/openglwin.cxx +++ b/vcl/source/window/openglwin.cxx @@ -15,14 +15,14 @@ class OpenGLWindowImpl { public: - OpenGLWindowImpl(Window* pWindow); + OpenGLWindowImpl(vcl::Window* pWindow); OpenGLContext& getContext() { return maContext;} private: OpenGLContext maContext; boost::scoped_ptr<SystemChildWindow> mpChildWindow; }; -OpenGLWindowImpl::OpenGLWindowImpl(Window* pWindow) +OpenGLWindowImpl::OpenGLWindowImpl(vcl::Window* pWindow) { SystemWindowData aData = OpenGLContext::generateWinData(pWindow, false); mpChildWindow.reset(new SystemChildWindow(pWindow, 0, &aData)); @@ -32,7 +32,7 @@ OpenGLWindowImpl::OpenGLWindowImpl(Window* pWindow) } -OpenGLWindow::OpenGLWindow(Window* pParent): +OpenGLWindow::OpenGLWindow(vcl::Window* pParent): Window(pParent, 0), mpImpl(new OpenGLWindowImpl(this)), mpRenderer(NULL) diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 2da3ed9a0d91..07f04e996093 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -43,7 +43,7 @@ class PaintHelper { private: - Window* m_pWindow; + vcl::Window* m_pWindow; Region* m_pChildRegion; Rectangle m_aSelectionRect; Rectangle m_aPaintRect; @@ -52,7 +52,7 @@ private: bool m_bPop; bool m_bRestoreCursor; public: - PaintHelper(Window *pWindow, sal_uInt16 nPaintFlags); + PaintHelper(vcl::Window *pWindow, sal_uInt16 nPaintFlags); void SetPop() { m_bPop = true; @@ -85,7 +85,7 @@ public: ~PaintHelper(); }; -PaintHelper::PaintHelper(Window *pWindow, sal_uInt16 nPaintFlags) +PaintHelper::PaintHelper(vcl::Window *pWindow, sal_uInt16 nPaintFlags) : m_pWindow(pWindow) , m_pChildRegion(NULL) , m_nPaintFlags(nPaintFlags) @@ -125,6 +125,8 @@ void PaintHelper::DoPaint(const Region* pRegion) } } +namespace vcl { + void Window::PushPaintHelper(PaintHelper *pHelper) { pHelper->SetPop(); @@ -184,6 +186,8 @@ void Window::PopPaintHelper(PaintHelper *pHelper) mpWindowImpl->mpCursor->ImplResume(pHelper->GetRestoreCursor()); } +} /* namespace vcl */ + PaintHelper::~PaintHelper() { WindowImpl* pWindowImpl = m_pWindow->ImplGetWindowImpl(); @@ -195,7 +199,7 @@ PaintHelper::~PaintHelper() if ( m_nPaintFlags & (IMPL_PAINT_PAINTALLCHILDREN | IMPL_PAINT_PAINTCHILDREN) ) { // Paint from the bottom child window and frontward. - Window* pTempWindow = pWindowImpl->mpLastChild; + vcl::Window* pTempWindow = pWindowImpl->mpLastChild; while ( pTempWindow ) { if ( pTempWindow->mpWindowImpl->mbVisible ) @@ -217,6 +221,8 @@ PaintHelper::~PaintHelper() delete m_pChildRegion; } +namespace vcl { + void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ) { // call PrePaint. PrePaint may add to the invalidate region as well as @@ -258,7 +264,7 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ) void Window::ImplCallOverlapPaint() { // emit overlapping windows first - Window* pTempWindow = mpWindowImpl->mpFirstOverlap; + vcl::Window* pTempWindow = mpWindowImpl->mpFirstOverlap; while ( pTempWindow ) { if ( pTempWindow->mpWindowImpl->mbReallyVisible ) @@ -323,7 +329,7 @@ void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags // set PAINTCHILDREN for all parent windows till the first OverlapWindow if ( !ImplIsOverlapWindow() ) { - Window* pTempWindow = this; + vcl::Window* pTempWindow = this; sal_uInt16 nTranspPaint = IsPaintTransparent() ? IMPL_PAINT_PAINT : 0; do { @@ -354,7 +360,7 @@ void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags if( ((IsPaintTransparent() && !(nFlags & INVALIDATE_NOTRANSPARENT)) || (nFlags & INVALIDATE_TRANSPARENT) ) && ImplGetParent() ) { - Window *pParent = ImplGetParent(); + vcl::Window *pParent = ImplGetParent(); while( pParent && pParent->IsPaintTransparent() ) pParent = pParent->ImplGetParent(); if( pParent ) @@ -384,7 +390,7 @@ void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion ) ImplInvalidateFrameRegion( &aRegion, INVALIDATE_CHILDREN ); // now we invalidate the overlapping windows - Window* pTempWindow = mpWindowImpl->mpFirstOverlap; + vcl::Window* pTempWindow = mpWindowImpl->mpFirstOverlap; while ( pTempWindow ) { if ( pTempWindow->IsVisible() ) @@ -416,10 +422,10 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) bool bInvalidateAll = !pRegion; // take Transparent-Invalidate into account - Window* pOpaqueWindow = this; + vcl::Window* pOpaqueWindow = this; if ( (mpWindowImpl->mbPaintTransparent && !(nFlags & INVALIDATE_NOTRANSPARENT)) || (nFlags & INVALIDATE_TRANSPARENT) ) { - Window* pTempWindow = pOpaqueWindow->ImplGetParent(); + vcl::Window* pTempWindow = pOpaqueWindow->ImplGetParent(); while ( pTempWindow ) { if ( !pTempWindow->IsPaintTransparent() ) @@ -505,7 +511,7 @@ void Window::ImplMoveInvalidateRegion( const Rectangle& rRect, if ( bChildren && (mpWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTCHILDREN) ) { - Window* pWindow = mpWindowImpl->mpFirstChild; + vcl::Window* pWindow = mpWindowImpl->mpFirstChild; while ( pWindow ) { pWindow->ImplMoveInvalidateRegion( rRect, nHorzScroll, nVertScroll, true ); @@ -524,7 +530,7 @@ void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect, if ( !ImplIsOverlapWindow() ) { Region aPaintAllRegion; - Window* pPaintAllWindow = this; + vcl::Window* pPaintAllWindow = this; do { pPaintAllWindow = pPaintAllWindow->ImplGetParent(); @@ -566,7 +572,7 @@ void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); aChildRegion = aRect; } - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->Invalidate( aChildRegion, INVALIDATE_CHILDREN | INVALIDATE_NOTRANSPARENT ); @@ -584,7 +590,7 @@ void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) if ( nFlags & VALIDATE_CHILDREN ) { - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->ImplValidateFrameRegion( pRegion, nFlags ); @@ -649,7 +655,7 @@ void Window::ImplUpdateAll( bool bOverlapWindows ) // an update changes the OverlapWindow, such that for later paints // not too much has to be drawn, if ALLCHILDREN etc. is set - Window* pWindow = ImplGetFirstOverlapWindow(); + vcl::Window* pWindow = ImplGetFirstOverlapWindow(); if ( bOverlapWindows ) pWindow->ImplCallOverlapPaint(); else @@ -905,7 +911,7 @@ bool Window::HasPaintEvent() const if ( !ImplIsOverlapWindow() ) { - const Window* pTempWindow = this; + const vcl::Window* pTempWindow = this; do { pTempWindow = pTempWindow->ImplGetParent(); @@ -941,8 +947,8 @@ void Window::Update() } // First we should skip all windows which are Paint-Transparent - Window* pUpdateWindow = this; - Window* pWindow = pUpdateWindow; + vcl::Window* pUpdateWindow = this; + vcl::Window* pWindow = pUpdateWindow; while ( !pWindow->ImplIsOverlapWindow() ) { if ( !pWindow->mpWindowImpl->mbPaintTransparent ) @@ -972,7 +978,7 @@ void Window::Update() // trigger an update also for system windows on top of us, // otherwise holes would remain - Window* pUpdateOverlapWindow = ImplGetFirstOverlapWindow()->mpWindowImpl->mpFirstOverlap; + vcl::Window* pUpdateOverlapWindow = ImplGetFirstOverlapWindow()->mpWindowImpl->mpFirstOverlap; while ( pUpdateOverlapWindow ) { pUpdateOverlapWindow->Update(); @@ -1086,7 +1092,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP // get rid of virtual device now so they don't pile up during recursive calls delete pMaskedDevice, pMaskedDevice = NULL; - for( Window* pChild = mpWindowImpl->mpFirstChild; pChild; pChild = pChild->mpWindowImpl->mpNext ) + for( vcl::Window* pChild = mpWindowImpl->mpFirstChild; pChild; pChild = pChild->mpWindowImpl->mpNext ) { if( pChild->mpWindowImpl->mpFrame == mpWindowImpl->mpFrame && pChild->IsVisible() ) { @@ -1119,10 +1125,10 @@ void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& / DBG_ASSERT( ! pDev->HasMirroredGraphics(), "PaintToDevice to mirroring graphics" ); DBG_ASSERT( ! pDev->IsRTLEnabled(), "PaintToDevice to mirroring device" ); - Window* pRealParent = NULL; + vcl::Window* pRealParent = NULL; if( ! mpWindowImpl->mbVisible ) { - Window* pTempParent = ImplGetDefaultWindow(); + vcl::Window* pTempParent = ImplGetDefaultWindow(); if( pTempParent ) pTempParent->EnableChildTransparentMode(); pRealParent = GetParent(); @@ -1341,7 +1347,7 @@ void Window::ImplScroll( const Rectangle& rRect, if ( bScrollChildren ) { - Window* pWindow = mpWindowImpl->mpFirstChild; + vcl::Window* pWindow = mpWindowImpl->mpFirstChild; while ( pWindow ) { Point aPos = pWindow->GetPosPixel(); @@ -1359,5 +1365,7 @@ void Window::ImplScroll( const Rectangle& rRect, mpWindowImpl->mpCursor->ImplResume(); } +} /* namespace vcl */ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/popupmenuwindow.cxx b/vcl/source/window/popupmenuwindow.cxx index 9ce03cea4f0b..1a33ff9037ca 100644 --- a/vcl/source/window/popupmenuwindow.cxx +++ b/vcl/source/window/popupmenuwindow.cxx @@ -38,7 +38,7 @@ PopupMenuFloatingWindow::ImplData::~ImplData() { } -PopupMenuFloatingWindow::PopupMenuFloatingWindow( Window* pParent, WinBits nStyle ) : +PopupMenuFloatingWindow::PopupMenuFloatingWindow( vcl::Window* pParent, WinBits nStyle ) : FloatingWindow(pParent, nStyle), mpImplData(new ImplData) { @@ -64,7 +64,7 @@ bool PopupMenuFloatingWindow::IsPopupMenu() const return mpImplData->mnMenuStackLevel != ::std::numeric_limits<sal_uInt16>::max(); } -bool PopupMenuFloatingWindow::isPopupMenu(const Window *pWindow) +bool PopupMenuFloatingWindow::isPopupMenu(const vcl::Window *pWindow) { const PopupMenuFloatingWindow* pChild = dynamic_cast<const PopupMenuFloatingWindow*>(pWindow); return pChild && pChild->IsPopupMenu(); diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index d9ebf7c1b9b9..715e75e2909d 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -51,17 +51,17 @@ using namespace com::sun::star::lang; using namespace com::sun::star::container; using namespace com::sun::star::beans; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makePrintPreviewWindow(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makePrintPreviewWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new PrintDialog::PrintPreviewWindow(pParent); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeShowNupOrderWindow(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeShowNupOrderWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new PrintDialog::ShowNupOrderWindow(pParent); } -PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent ) +PrintDialog::PrintPreviewWindow::PrintPreviewWindow( vcl::Window* i_pParent ) : Window( i_pParent, 0 ) , maOrigSize( 10, 10 ) , maPageVDev( *this ) @@ -294,7 +294,7 @@ void PrintDialog::PrintPreviewWindow::preparePreviewBitmap() maPageVDev.SetDrawMode( nOldDrawMode ); } -PrintDialog::ShowNupOrderWindow::ShowNupOrderWindow( Window* i_pParent ) +PrintDialog::ShowNupOrderWindow::ShowNupOrderWindow( vcl::Window* i_pParent ) : Window( i_pParent, WB_NOBORDER ) , mnOrderMode( 0 ) , mnRows( 1 ) @@ -568,7 +568,7 @@ void PrintDialog::OutputOptPage::storeToSettings() OUString("false") ); } -PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterController>& i_rController ) +PrintDialog::PrintDialog( vcl::Window* i_pParent, const boost::shared_ptr<PrinterController>& i_rController ) : ModalDialog(i_pParent, "PrintDialog", "vcl/ui/printdialog.ui") , mpCustomOptionsUIBuilder(NULL) , maPController( i_rController ) @@ -795,13 +795,13 @@ bool PrintDialog::isSingleJobs() return maOptionsPage.mpCollateSingleJobsBox->IsChecked(); } -void setHelpId( Window* i_pWindow, const Sequence< OUString >& i_rHelpIds, sal_Int32 i_nIndex ) +void setHelpId( vcl::Window* i_pWindow, const Sequence< OUString >& i_rHelpIds, sal_Int32 i_nIndex ) { if( i_nIndex >= 0 && i_nIndex < i_rHelpIds.getLength() ) i_pWindow->SetHelpId( OUStringToOString( i_rHelpIds.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8 ) ); } -static void setHelpText( Window* i_pWindow, const Sequence< OUString >& i_rHelpTexts, sal_Int32 i_nIndex ) +static void setHelpText( vcl::Window* i_pWindow, const Sequence< OUString >& i_rHelpTexts, sal_Int32 i_nIndex ) { // without a help text set and the correct smartID, // help texts will be retrieved from the online help system @@ -819,11 +819,11 @@ void PrintDialog::setupOptionalUI() OUString sOptionsUIFile; rOptions[i].Value >>= sOptionsUIFile; - Window *pCustom = get<Window>("customcontents"); + vcl::Window *pCustom = get<vcl::Window>("customcontents"); delete mpCustomOptionsUIBuilder; mpCustomOptionsUIBuilder = new VclBuilder(pCustom, getUIRootDir(), sOptionsUIFile); - Window *pWindow = mpCustomOptionsUIBuilder->get_widget_root(); + vcl::Window *pWindow = mpCustomOptionsUIBuilder->get_widget_root(); pWindow->Show(); continue; } @@ -963,9 +963,9 @@ void PrintDialog::setupOptionalUI() } else if (aCtrlType == "Subgroup" && !aID.isEmpty()) { - Window *pFrame = get<Window>(aID); + vcl::Window *pFrame = get<vcl::Window>(aID); if (!pFrame && mpCustomOptionsUIBuilder) - pFrame = mpCustomOptionsUIBuilder->get<Window>(aID); + pFrame = mpCustomOptionsUIBuilder->get<vcl::Window>(aID); if (!pFrame) continue; @@ -1174,7 +1174,7 @@ void PrintDialog::setupOptionalUI() // update enable states checkOptionalControlDependencies(); - Window *pPageRange = get<Window>("pagerange"); + vcl::Window *pPageRange = get<vcl::Window>("pagerange"); // print range not shown (currently math only) -> hide spacer line and reverse order if (!pPageRange || !pPageRange->IsVisible()) @@ -1217,7 +1217,7 @@ void PrintDialog::checkControlDependencies() void PrintDialog::checkOptionalControlDependencies() { - for( std::map< Window*, OUString >::iterator it = maControlToPropertyMap.begin(); + for( std::map< vcl::Window*, OUString >::iterator it = maControlToPropertyMap.begin(); it != maControlToPropertyMap.end(); ++it ) { bool bShouldbeEnabled = maPController->isUIOptionEnabled( it->second ); @@ -1241,7 +1241,7 @@ void PrintDialog::checkOptionalControlDependencies() if( bShouldbeEnabled && dynamic_cast<RadioButton*>(it->first) ) { - std::map< Window*, sal_Int32 >::const_iterator r_it = maControlToNumValMap.find( it->first ); + std::map< vcl::Window*, sal_Int32 >::const_iterator r_it = maControlToNumValMap.find( it->first ); if( r_it != maControlToNumValMap.end() ) { bShouldbeEnabled = maPController->isUIChoiceEnabled( it->second, r_it->second ); @@ -1655,10 +1655,10 @@ IMPL_LINK_NOARG(PrintDialog, UIOptionsChanged) return 0; } -PropertyValue* PrintDialog::getValueForWindow( Window* i_pWindow ) const +PropertyValue* PrintDialog::getValueForWindow( vcl::Window* i_pWindow ) const { PropertyValue* pVal = NULL; - std::map< Window*, OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); + std::map< vcl::Window*, OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); if( it != maControlToPropertyMap.end() ) { pVal = maPController->getValue( it->second ); @@ -1674,10 +1674,10 @@ PropertyValue* PrintDialog::getValueForWindow( Window* i_pWindow ) const void PrintDialog::updateWindowFromProperty( const OUString& i_rProperty ) { beans::PropertyValue* pValue = maPController->getValue( i_rProperty ); - std::map< OUString, std::vector< Window* > >::const_iterator it = maPropertyToWindowMap.find( i_rProperty ); + std::map< OUString, std::vector< vcl::Window* > >::const_iterator it = maPropertyToWindowMap.find( i_rProperty ); if( pValue && it != maPropertyToWindowMap.end() ) { - const std::vector< Window* >& rWindows( it->second ); + const std::vector< vcl::Window* >& rWindows( it->second ); if( ! rWindows.empty() ) { bool bVal = false; @@ -1723,9 +1723,9 @@ void PrintDialog::updateWindowFromProperty( const OUString& i_rProperty ) } } -void PrintDialog::makeEnabled( Window* i_pWindow ) +void PrintDialog::makeEnabled( vcl::Window* i_pWindow ) { - std::map< Window*, OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); + std::map< vcl::Window*, OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow ); if( it != maControlToPropertyMap.end() ) { OUString aDependency( maPController->makeEnabled( it->second ) ); @@ -1760,7 +1760,7 @@ IMPL_LINK( PrintDialog, UIOption_RadioHdl, RadioButton*, i_pBtn ) if( i_pBtn->IsChecked() ) { PropertyValue* pVal = getValueForWindow( i_pBtn ); - std::map< Window*, sal_Int32 >::const_iterator it = maControlToNumValMap.find( i_pBtn ); + std::map< vcl::Window*, sal_Int32 >::const_iterator it = maControlToNumValMap.find( i_pBtn ); if( pVal && it != maControlToNumValMap.end() ) { makeEnabled( i_pBtn ); @@ -1869,7 +1869,7 @@ void PrintDialog::previewBackward() // PrintProgressDialog -PrintProgressDialog::PrintProgressDialog(Window* i_pParent, int i_nMax) +PrintProgressDialog::PrintProgressDialog(vcl::Window* i_pParent, int i_nMax) : ModelessDialog(i_pParent, "PrintProgressDialog", "vcl/ui/printprogressdialog.ui") , mbCanceled(false) diff --git a/vcl/source/window/resource.cxx b/vcl/source/window/resource.cxx index 4bb5a0a84e33..8c13006d5349 100644 --- a/vcl/source/window/resource.cxx +++ b/vcl/source/window/resource.cxx @@ -34,6 +34,7 @@ static OString ImplAutoHelpID( ResMgr* pResMgr ) return aRet; } +namespace vcl { WinBits Window::ImplInitRes( const ResId& rResId ) { @@ -156,3 +157,5 @@ void Window::ImplLoadRes( const ResId& rResId ) } } +} /* namespace vcl */ + diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 6a44ee41777b..49606fb9e2a3 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -36,7 +36,7 @@ #define MIN_TIME 20 #define DEF_TIMEOUT 50 -ImplWheelWindow::ImplWheelWindow( Window* pParent ) : +ImplWheelWindow::ImplWheelWindow( vcl::Window* pParent ) : FloatingWindow ( pParent, 0 ), mnRepaintTime ( 1UL ), mnTimeout ( DEF_TIMEOUT ), @@ -341,7 +341,7 @@ IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl) { if ( mnActDeltaX || mnActDeltaY ) { - Window* pWindow = GetParent(); + vcl::Window* pWindow = GetParent(); const Point aMousePos( pWindow->OutputToScreenPixel( pWindow->GetPointerPosPixel() ) ); Point aCmdMousePos( pWindow->ImplFrameToOutput( aMousePos ) ); CommandScrollData aScrollData( mnActDeltaX, mnActDeltaY ); diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index fe416cb49117..e71ca6d24676 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -69,7 +69,7 @@ protected: public: - ImplWheelWindow( Window* pParent ); + ImplWheelWindow( vcl::Window* pParent ); virtual ~ImplWheelWindow(); void ImplStop(); diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index c1fcbe938ce9..63569289ae33 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -32,7 +32,7 @@ inline bool SelectionEngine::ShouldDeselect( bool bModifierKey1 ) const // TODO: throw out FunctionSet::SelectAtPoint -SelectionEngine::SelectionEngine( Window* pWindow, FunctionSet* pFuncSet, +SelectionEngine::SelectionEngine( vcl::Window* pWindow, FunctionSet* pFuncSet, sal_uLong nAutoRepeatInterval ) : pWin( pWindow ), nUpdateInterval( nAutoRepeatInterval ) @@ -308,7 +308,7 @@ bool SelectionEngine::SelMouseMove( const MouseEvent& rMEvt ) return true; } -void SelectionEngine::SetWindow( Window* pNewWin ) +void SelectionEngine::SetWindow( vcl::Window* pNewWin ) { if( pNewWin != pWin ) { diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx index 2fabec97ccb2..e89f1b6dcf1b 100644 --- a/vcl/source/window/settings.cxx +++ b/vcl/source/window/settings.cxx @@ -37,6 +37,8 @@ #include <window.h> +namespace vcl { + void Window::SetSettings( const AllSettings& rSettings ) { SetSettings( rSettings, false ); @@ -68,7 +70,7 @@ void Window::SetSettings( const AllSettings& rSettings, bool bChild ) if ( bChild || mpWindowImpl->mbChildNotify ) { - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->SetSettings( rSettings, bChild ); @@ -136,7 +138,7 @@ void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) if ( bChild || mpWindowImpl->mbChildNotify ) { - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->UpdateSettings( rSettings, bChild ); @@ -385,4 +387,6 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) GetpApp()->OverrideSystemSettings( rSettings ); } +} /*namespace vcl*/ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 3442e02a30dd..62a6fb15203e 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -86,7 +86,7 @@ void Splitter::ImplInitHorVer(bool bNew) SetPointer( Pointer( ePointerStyle ) ); } -void Splitter::ImplInit( Window* pParent, WinBits nWinStyle ) +void Splitter::ImplInit( vcl::Window* pParent, WinBits nWinStyle ) { Window::ImplInit( pParent, nWinStyle, NULL ); @@ -139,7 +139,7 @@ void Splitter::ImplDrawSplitter() mpRefWin->InvertTracking( mpRefWin->PixelToLogic(aInvRect), SHOWTRACK_SPLIT ); } -Splitter::Splitter( Window* pParent, WinBits nStyle ) : +Splitter::Splitter( vcl::Window* pParent, WinBits nStyle ) : Window( WINDOW_SPLITTER ) { ImplInitSplitterData(); @@ -149,7 +149,7 @@ Splitter::Splitter( Window* pParent, WinBits nStyle ) : SetFillColor(); } -Splitter::Splitter( Window* pParent, const ResId& rResId ) : +Splitter::Splitter( vcl::Window* pParent, const ResId& rResId ) : Window( WINDOW_SPLITTER ) { ImplInitSplitterData(); @@ -187,7 +187,7 @@ void Splitter::SetKeyboardStepSize( long nStepSize ) Splitter* Splitter::ImplFindSibling() { // look for another splitter with the same parent but different orientation - Window *pWin = GetParent()->GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window *pWin = GetParent()->GetWindow( WINDOW_FIRSTCHILD ); Splitter *pSplitter = NULL; while( pWin ) { @@ -463,7 +463,7 @@ void Splitter::Splitting( Point& /* rSplitPos */ ) { } -void Splitter::SetDragRectPixel( const Rectangle& rDragRect, Window* _pRefWin ) +void Splitter::SetDragRectPixel( const Rectangle& rDragRect, vcl::Window* _pRefWin ) { maDragRect = rDragRect; if ( !_pRefWin ) diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 0f2058270316..3d99653d5975 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -53,8 +53,8 @@ struct ImplSplitItem long mnOldWidth; long mnOldHeight; ImplSplitSet* mpSet; - Window* mpWindow; - Window* mpOrgParent; + vcl::Window* mpWindow; + vcl::Window* mpOrgParent; sal_uInt16 mnId; SplitWindowItemBits mnBits; bool mbFixed; @@ -308,7 +308,7 @@ static ImplSplitSet* ImplFindItem( ImplSplitSet* pSet, sal_uInt16 nId, sal_uInt1 return NULL; } -static sal_uInt16 ImplFindItem( ImplSplitSet* pSet, Window* pWindow ) +static sal_uInt16 ImplFindItem( ImplSplitSet* pSet, vcl::Window* pWindow ) { sal_uInt16 i; sal_uInt16 nItems = pSet->mnItems; @@ -1242,7 +1242,7 @@ void SplitWindow::ImplDrawSplitTracking( SplitWindow* pThis, const Point& rPos ) pThis->ShowTracking( aRect, SHOWTRACK_SPLIT ); } -void SplitWindow::ImplInit( Window* pParent, WinBits nStyle ) +void SplitWindow::ImplInit( vcl::Window* pParent, WinBits nStyle ) { ImplSplitSet* pNewSet = new ImplSplitSet; pNewSet->mpItems = NULL; @@ -1340,7 +1340,7 @@ void SplitWindow::ImplInitSettings() } } -SplitWindow::SplitWindow( Window* pParent, WinBits nStyle ) : +SplitWindow::SplitWindow( vcl::Window* pParent, WinBits nStyle ) : DockingWindow( WINDOW_SPLITWINDOW ) { ImplInit( pParent, nStyle ); @@ -2631,7 +2631,7 @@ void SplitWindow::DataChanged( const DataChangedEvent& rDCEvt ) DockingWindow::DataChanged( rDCEvt ); } -void SplitWindow::InsertItem( sal_uInt16 nId, Window* pWindow, long nSize, +void SplitWindow::InsertItem( sal_uInt16 nId, vcl::Window* pWindow, long nSize, sal_uInt16 nPos, sal_uInt16 nSetId, SplitWindowItemBits nBits ) { @@ -2726,8 +2726,8 @@ void SplitWindow::RemoveItem( sal_uInt16 nId, bool bHide ) return; ImplSplitItem* pItem = &(pSet->mpItems[nPos]); - Window* pWindow = pItem->mpWindow; - Window* pOrgParent = pItem->mpOrgParent; + vcl::Window* pWindow = pItem->mpWindow; + vcl::Window* pOrgParent = pItem->mpOrgParent; // delete set if required if ( !pWindow ) @@ -3130,7 +3130,7 @@ bool SplitWindow::IsItemValid( sal_uInt16 nId ) const return false; } -sal_uInt16 SplitWindow::GetItemId( Window* pWindow ) const +sal_uInt16 SplitWindow::GetItemId( vcl::Window* pWindow ) const { return ImplFindItem( mpBaseSet, pWindow ); } diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index 3e0a0598e500..cf6fef338580 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -47,19 +47,21 @@ using ::com::sun::star::awt::XTopWindow; struct ImplCalcToTopData { ImplCalcToTopData* mpNext; - Window* mpWindow; + vcl::Window* mpWindow; Region* mpInvalidateRegion; }; -Window* Window::ImplGetTopmostFrameWindow() +namespace vcl { + +vcl::Window* Window::ImplGetTopmostFrameWindow() { - Window *pTopmostParent = this; + vcl::Window *pTopmostParent = this; while( pTopmostParent->ImplGetParent() ) pTopmostParent = pTopmostParent->ImplGetParent(); return pTopmostParent->mpWindowImpl->mpFrameWindow; } -void Window::ImplInsertWindow( Window* pParent ) +void Window::ImplInsertWindow( vcl::Window* pParent ) { mpWindowImpl->mpParent = pParent; mpWindowImpl->mpRealParent = pParent; @@ -67,7 +69,7 @@ void Window::ImplInsertWindow( Window* pParent ) if ( pParent && !mpWindowImpl->mbFrame ) { // search frame window and set window frame data - Window* pFrameParent = pParent->mpWindowImpl->mpFrameWindow; + vcl::Window* pFrameParent = pParent->mpWindowImpl->mpFrameWindow; mpWindowImpl->mpFrameData = pFrameParent->mpWindowImpl->mpFrameData; mpWindowImpl->mpFrame = pFrameParent->mpWindowImpl->mpFrame; mpWindowImpl->mpFrameWindow = pFrameParent; @@ -76,7 +78,7 @@ void Window::ImplInsertWindow( Window* pParent ) // search overlap window and insert window in list if ( ImplIsOverlapWindow() ) { - Window* pFirstOverlapParent = pParent; + vcl::Window* pFirstOverlapParent = pParent; while ( !pFirstOverlapParent->ImplIsOverlapWindow() ) pFirstOverlapParent = pFirstOverlapParent->ImplGetParent(); mpWindowImpl->mpOverlapWindow = pFirstOverlapParent; @@ -119,7 +121,7 @@ void Window::ImplRemoveWindow( bool bRemoveFrameData ) mpWindowImpl->mpFrameData->mpFirstOverlap = mpWindowImpl->mpNextOverlap; else { - Window* pTempWin = mpWindowImpl->mpFrameData->mpFirstOverlap; + vcl::Window* pTempWin = mpWindowImpl->mpFrameData->mpFirstOverlap; while ( pTempWin->mpWindowImpl->mpNextOverlap != this ) pTempWin = pTempWin->mpWindowImpl->mpNextOverlap; pTempWin->mpWindowImpl->mpNextOverlap = mpWindowImpl->mpNextOverlap; @@ -161,7 +163,7 @@ void Window::ImplRemoveWindow( bool bRemoveFrameData ) void Window::reorderWithinParent(sal_uInt16 nNewPosition) { sal_uInt16 nChildCount = 0; - Window *pSource = mpWindowImpl->mpParent->mpWindowImpl->mpFirstChild; + vcl::Window *pSource = mpWindowImpl->mpParent->mpWindowImpl->mpFirstChild; while (pSource) { if (nChildCount == nNewPosition) @@ -274,7 +276,7 @@ void Window::ImplToTop( sal_uInt16 nFlags ) // take AlwaysOnTop into account bool bOnTop = IsAlwaysOnTopEnabled(); - Window* pNextWin = mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpFirstOverlap; + vcl::Window* pNextWin = mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpFirstOverlap; if ( !bOnTop ) { while ( pNextWin ) @@ -329,14 +331,14 @@ void Window::ImplStartToTop( sal_uInt16 nFlags ) ImplCalcToTopData aStartData; ImplCalcToTopData* pCurData; ImplCalcToTopData* pNextData; - Window* pOverlapWindow; + vcl::Window* pOverlapWindow; if ( ImplIsOverlapWindow() ) pOverlapWindow = this; else pOverlapWindow = mpWindowImpl->mpOverlapWindow; // first calculate paint areas - Window* pTempOverlapWindow = pOverlapWindow; + vcl::Window* pTempOverlapWindow = pOverlapWindow; aStartData.mpNext = NULL; pCurData = &aStartData; do @@ -383,7 +385,7 @@ void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible ) if ( !(nFlags & TOTOP_NOGRABFOCUS) ) { // first window with GrabFocus-Activate gets the focus - Window* pFocusWindow = this; + vcl::Window* pFocusWindow = this; while ( !pFocusWindow->ImplIsOverlapWindow() ) { // if the window has no BorderWindow, we @@ -406,7 +408,7 @@ void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible ) void Window::ImplShowAllOverlaps() { - Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap; + vcl::Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap; while ( pOverlapWindow ) { if ( pOverlapWindow->mpWindowImpl->mbOverlapVisible ) @@ -421,7 +423,7 @@ void Window::ImplShowAllOverlaps() void Window::ImplHideAllOverlaps() { - Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap; + vcl::Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap; while ( pOverlapWindow ) { if ( pOverlapWindow->IsVisible() ) @@ -441,7 +443,7 @@ void Window::ToTop( sal_uInt16 nFlags ) ImplFocusToTop( nFlags, IsReallyVisible() ); } -void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) +void Window::SetZOrder( vcl::Window* pRefWindow, sal_uInt16 nFlags ) { if ( mpWindowImpl->mpBorderWindow ) @@ -573,7 +575,7 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) // Invalidate all windows which are next to each other // Is INCOMPLETE !!! Rectangle aWinRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); - Window* pWindow = NULL; + vcl::Window* pWindow = NULL; if ( ImplIsOverlapWindow() ) { if ( mpWindowImpl->mpOverlapWindow ) @@ -641,24 +643,24 @@ bool Window::IsTopWindow() const if( mpWindowImpl->mpWinData->mnIsTopWindow == (sal_uInt16)~0) // still uninitialized { // #113722#, cache result of expensive queryInterface call - Window *pThisWin = (Window*)this; + vcl::Window *pThisWin = (vcl::Window*)this; uno::Reference< XTopWindow > xTopWindow( pThisWin->GetComponentInterface(), UNO_QUERY ); pThisWin->mpWindowImpl->mpWinData->mnIsTopWindow = xTopWindow.is() ? 1 : 0; } return mpWindowImpl->mpWinData->mnIsTopWindow == 1 ? true : false; } -Window* Window::FindWindow( const Point& rPos ) const +vcl::Window* Window::FindWindow( const Point& rPos ) const { Point aPos = OutputToScreenPixel( rPos ); - return ((Window*)this)->ImplFindWindow( aPos ); + return ((vcl::Window*)this)->ImplFindWindow( aPos ); } -Window* Window::ImplFindWindow( const Point& rFramePos ) +vcl::Window* Window::ImplFindWindow( const Point& rFramePos ) { - Window* pTempWindow; - Window* pFindWindow; + vcl::Window* pTempWindow; + vcl::Window* pFindWindow; // first check all overlapping windows pTempWindow = mpWindowImpl->mpFirstOverlap; @@ -696,7 +698,7 @@ Window* Window::ImplFindWindow( const Point& rFramePos ) return NULL; } -bool Window::ImplIsRealParentPath( const Window* pWindow ) const +bool Window::ImplIsRealParentPath( const vcl::Window* pWindow ) const { pWindow = pWindow->GetParent(); while ( pWindow ) @@ -709,7 +711,7 @@ bool Window::ImplIsRealParentPath( const Window* pWindow ) const return false; } -bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const +bool Window::ImplIsChild( const vcl::Window* pWindow, bool bSystemWindow ) const { do { @@ -726,7 +728,7 @@ bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const return false; } -bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const +bool Window::ImplIsWindowOrChild( const vcl::Window* pWindow, bool bSystemWindow ) const { if ( this == pWindow ) return true; @@ -749,7 +751,7 @@ void Window::ImplResetReallyVisible() // TODO. It's kind of a hack that we're re-using the VCLEVENT_WINDOW_HIDE. Normally, we should // introduce another event which explicitly triggers the Accessibility implementations. - Window* pWindow = mpWindowImpl->mpFirstOverlap; + vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; while ( pWindow ) { if ( pWindow->mpWindowImpl->mbReallyVisible ) @@ -766,7 +768,7 @@ void Window::ImplResetReallyVisible() } } -void Window::ImplUpdateWindowPtr( Window* pWindow ) +void Window::ImplUpdateWindowPtr( vcl::Window* pWindow ) { if ( mpWindowImpl->mpFrameWindow != pWindow->mpWindowImpl->mpFrameWindow ) { @@ -783,7 +785,7 @@ void Window::ImplUpdateWindowPtr( Window* pWindow ) else mpWindowImpl->mpOverlapWindow = pWindow->mpWindowImpl->mpOverlapWindow; - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->ImplUpdateWindowPtr( pWindow ); @@ -793,7 +795,7 @@ void Window::ImplUpdateWindowPtr( Window* pWindow ) void Window::ImplUpdateWindowPtr() { - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->ImplUpdateWindowPtr( this ); @@ -806,7 +808,7 @@ void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame ) bool bVisible = IsVisible(); Show( false ); ImplRemoveWindow( bNewFrame ); - Window* pRealParent = mpWindowImpl->mpRealParent; + vcl::Window* pRealParent = mpWindowImpl->mpRealParent; ImplInsertWindow( ImplGetParent() ); mpWindowImpl->mpRealParent = pRealParent; ImplUpdateWindowPtr(); @@ -815,10 +817,10 @@ void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame ) if ( bNewFrame ) { - Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap; + vcl::Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap; while ( pOverlapWindow ) { - Window* pNextOverlapWindow = pOverlapWindow->mpWindowImpl->mpNext; + vcl::Window* pNextOverlapWindow = pOverlapWindow->mpWindowImpl->mpNext; pOverlapWindow->ImplUpdateOverlapWindowPtr( bNewFrame ); pOverlapWindow = pNextOverlapWindow; } @@ -831,19 +833,19 @@ void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame ) SystemWindow* Window::GetSystemWindow() const { - const Window* pWin = this; + const vcl::Window* pWin = this; while ( pWin && !pWin->IsSystemWindow() ) pWin = pWin->GetParent(); return (SystemWindow*)pWin; } -static SystemWindow *ImplGetLastSystemWindow( Window *pWin ) +static SystemWindow *ImplGetLastSystemWindow( vcl::Window *pWin ) { // get the most top-level system window, the one that contains the taskpanelist SystemWindow *pSysWin = NULL; if( !pWin ) return pSysWin; - Window *pMyParent = pWin; + vcl::Window *pMyParent = pWin; while ( pMyParent ) { if ( pMyParent->IsSystemWindow() ) @@ -853,7 +855,7 @@ static SystemWindow *ImplGetLastSystemWindow( Window *pWin ) return pSysWin; } -void Window::SetParent( Window* pNewParent ) +void Window::SetParent( vcl::Window* pNewParent ) { DBG_ASSERT( pNewParent, "Window::SetParent(): pParent == NULL" ); DBG_ASSERT( pNewParent != this, "someone tried to reparent a window to itself" ); @@ -877,8 +879,8 @@ void Window::SetParent( Window* pNewParent ) // remove ownerdraw decorated windows from list in the top-most frame window if( (GetStyle() & WB_OWNERDRAWDECORATION) && mpWindowImpl->mbFrame ) { - ::std::vector< Window* >& rList = ImplGetOwnerDrawList(); - ::std::vector< Window* >::iterator p; + ::std::vector< vcl::Window* >& rList = ImplGetOwnerDrawList(); + ::std::vector< vcl::Window* >::iterator p; p = ::std::find( rList.begin(), rList.end(), this ); if( p != rList.end() ) rList.erase( p ); @@ -903,8 +905,8 @@ void Window::SetParent( Window* pNewParent ) Show( false, SHOW_NOFOCUSCHANGE ); // check if the overlap window changes - Window* pOldOverlapWindow; - Window* pNewOverlapWindow = NULL; + vcl::Window* pOldOverlapWindow; + vcl::Window* pNewOverlapWindow = NULL; if ( ImplIsOverlapWindow() ) pOldOverlapWindow = NULL; else @@ -953,10 +955,10 @@ void Window::SetParent( Window* pNewParent ) { if ( bNewFrame ) { - Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap; + vcl::Window* pOverlapWindow = mpWindowImpl->mpFirstOverlap; while ( pOverlapWindow ) { - Window* pNextOverlapWindow = pOverlapWindow->mpWindowImpl->mpNext; + vcl::Window* pNextOverlapWindow = pOverlapWindow->mpWindowImpl->mpNext; pOverlapWindow->ImplUpdateOverlapWindowPtr( bNewFrame ); pOverlapWindow = pNextOverlapWindow; } @@ -970,10 +972,10 @@ void Window::SetParent( Window* pNewParent ) IsWindowOrChild( pOldOverlapWindow->mpWindowImpl->mpLastFocusWindow )) ) pOldOverlapWindow->mpWindowImpl->mpLastFocusWindow = NULL; - Window* pOverlapWindow = pOldOverlapWindow->mpWindowImpl->mpFirstOverlap; + vcl::Window* pOverlapWindow = pOldOverlapWindow->mpWindowImpl->mpFirstOverlap; while ( pOverlapWindow ) { - Window* pNextOverlapWindow = pOverlapWindow->mpWindowImpl->mpNext; + vcl::Window* pNextOverlapWindow = pOverlapWindow->mpWindowImpl->mpNext; if ( ImplIsRealParentPath( pOverlapWindow->ImplGetWindow() ) ) pOverlapWindow->ImplUpdateOverlapWindowPtr( bNewFrame ); pOverlapWindow = pNextOverlapWindow; @@ -1023,7 +1025,7 @@ sal_uInt16 Window::GetChildCount() const { sal_uInt16 nChildCount = 0; - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { nChildCount++; @@ -1033,11 +1035,11 @@ sal_uInt16 Window::GetChildCount() const return nChildCount; } -Window* Window::GetChild( sal_uInt16 nChild ) const +vcl::Window* Window::GetChild( sal_uInt16 nChild ) const { sal_uInt16 nChildCount = 0; - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { if ( nChild == nChildCount ) @@ -1049,7 +1051,7 @@ Window* Window::GetChild( sal_uInt16 nChild ) const return NULL; } -Window* Window::GetWindow( sal_uInt16 nType ) const +vcl::Window* Window::GetWindow( sal_uInt16 nType ) const { switch ( nType ) @@ -1077,7 +1079,7 @@ Window* Window::GetWindow( sal_uInt16 nType ) const case WINDOW_OVERLAP: if ( ImplIsOverlapWindow() ) - return (Window*)this; + return (vcl::Window*)this; else return mpWindowImpl->mpOverlapWindow; @@ -1088,7 +1090,7 @@ Window* Window::GetWindow( sal_uInt16 nType ) const return mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpOverlapWindow; case WINDOW_CLIENT: - return ((Window*)this)->ImplGetWindow(); + return ((vcl::Window*)this)->ImplGetWindow(); case WINDOW_REALPARENT: return ImplGetParent(); @@ -1099,7 +1101,7 @@ Window* Window::GetWindow( sal_uInt16 nType ) const case WINDOW_BORDER: if ( mpWindowImpl->mpBorderWindow ) return mpWindowImpl->mpBorderWindow->GetWindow( WINDOW_BORDER ); - return (Window*)this; + return (vcl::Window*)this; case WINDOW_FIRSTTOPWINDOWCHILD: return ImplGetWinData()->maTopWindowChildren.empty() ? NULL : *ImplGetWinData()->maTopWindowChildren.begin(); @@ -1111,8 +1113,8 @@ Window* Window::GetWindow( sal_uInt16 nType ) const { if ( !mpWindowImpl->mpRealParent ) return NULL; - const ::std::list< Window* >& rTopWindows( mpWindowImpl->mpRealParent->ImplGetWinData()->maTopWindowChildren ); - ::std::list< Window* >::const_iterator myPos = + const ::std::list< vcl::Window* >& rTopWindows( mpWindowImpl->mpRealParent->ImplGetWinData()->maTopWindowChildren ); + ::std::list< vcl::Window* >::const_iterator myPos = ::std::find( rTopWindows.begin(), rTopWindows.end(), this ); if ( myPos == rTopWindows.end() ) return NULL; @@ -1125,8 +1127,8 @@ Window* Window::GetWindow( sal_uInt16 nType ) const { if ( !mpWindowImpl->mpRealParent ) return NULL; - const ::std::list< Window* >& rTopWindows( mpWindowImpl->mpRealParent->ImplGetWinData()->maTopWindowChildren ); - ::std::list< Window* >::const_iterator myPos = + const ::std::list< vcl::Window* >& rTopWindows( mpWindowImpl->mpRealParent->ImplGetWinData()->maTopWindowChildren ); + ::std::list< vcl::Window* >::const_iterator myPos = ::std::find( rTopWindows.begin(), rTopWindows.end(), this ); if ( ( myPos == rTopWindows.end() ) || ( ++myPos == rTopWindows.end() ) ) return NULL; @@ -1138,7 +1140,7 @@ Window* Window::GetWindow( sal_uInt16 nType ) const return NULL; } -bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const +bool Window::IsChild( const vcl::Window* pWindow, bool bSystemWindow ) const { do { @@ -1155,7 +1157,7 @@ bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const return false; } -bool Window::IsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const +bool Window::IsWindowOrChild( const vcl::Window* pWindow, bool bSystemWindow ) const { if ( this == pWindow ) @@ -1163,9 +1165,9 @@ bool Window::IsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const return ImplIsChild( pWindow, bSystemWindow ); } -void Window::ImplSetFrameParent( const Window* pParent ) +void Window::ImplSetFrameParent( const vcl::Window* pParent ) { - Window* pFrameWindow = ImplGetSVData()->maWinData.mpFirstFrame; + vcl::Window* pFrameWindow = ImplGetSVData()->maWinData.mpFirstFrame; while( pFrameWindow ) { // search all frames that are children of this window @@ -1181,4 +1183,6 @@ void Window::ImplSetFrameParent( const Window* pParent ) } } +} /* namespace vcl */ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 6425ed4d8a9c..9adb1e1712e2 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -111,7 +111,7 @@ bool StatusBar::ImplIsItemUpdate() return false; } -void StatusBar::ImplInit( Window* pParent, WinBits nStyle ) +void StatusBar::ImplInit( vcl::Window* pParent, WinBits nStyle ) { mpImplData = new ImplData; @@ -142,7 +142,7 @@ void StatusBar::ImplInit( Window* pParent, WinBits nStyle ) SetOutputSizePixel( CalcWindowSizePixel() ); } -StatusBar::StatusBar( Window* pParent, WinBits nStyle ) : +StatusBar::StatusBar( vcl::Window* pParent, WinBits nStyle ) : Window( WINDOW_STATUSBAR ) { ImplInit( pParent, nStyle ); @@ -458,7 +458,7 @@ void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText, ImplCallEventListeners( VCLEVENT_STATUSBAR_DRAWITEM, (void*) sal_IntPtr(pItem->mnId) ); } -void DrawProgress( Window* pWindow, const Point& rPos, +void DrawProgress( vcl::Window* pWindow, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, const Rectangle& rFramePosSize @@ -475,7 +475,7 @@ void DrawProgress( Window* pWindow, const Point& rPos, Rectangle aControlRegion( aDrawRect ); if( bNeedErase ) { - Window* pEraseWindow = pWindow; + vcl::Window* pEraseWindow = pWindow; while( pEraseWindow->IsPaintTransparent() && ! pEraseWindow->ImplGetWindowImpl()->mbFrame ) { diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 6fd6f04ea96f..b509d455d1cf 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -85,7 +85,7 @@ long ImplSysChildProc( void* pInst, SalObject* /* pObject */, if ( !pWindow->ImplGetFrameData()->mnFocusId ) { pWindow->ImplGetFrameData()->mbStartFocusState = true; - pWindow->ImplGetFrameData()->mnFocusId = Application::PostUserEvent( LINK( pWindow->ImplGetFrameWindow(), Window, ImplAsyncFocusHdl ) ); + pWindow->ImplGetFrameData()->mnFocusId = Application::PostUserEvent( LINK( pWindow->ImplGetFrameWindow(), vcl::Window, ImplAsyncFocusHdl ) ); } break; @@ -107,7 +107,7 @@ long ImplSysChildProc( void* pInst, SalObject* /* pObject */, return nRet; } -void SystemChildWindow::ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) +void SystemChildWindow::ImplInitSysChild( vcl::Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) { mpWindowImpl->mpSysObj = ImplGetSVData()->mpDefInst->CreateObject( pParent->ImplGetFrame(), pData, bShow ); @@ -122,13 +122,13 @@ void SystemChildWindow::ImplInitSysChild( Window* pParent, WinBits nStyle, Syste } } -SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle ) : +SystemChildWindow::SystemChildWindow( vcl::Window* pParent, WinBits nStyle ) : Window( WINDOW_SYSTEMCHILDWINDOW ) { ImplInitSysChild( pParent, nStyle, NULL ); } -SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) : +SystemChildWindow::SystemChildWindow( vcl::Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) : Window( WINDOW_SYSTEMCHILDWINDOW ) { ImplInitSysChild( pParent, nStyle, pData, bShow ); diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 60c80929355d..9666c34ad3ba 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -96,7 +96,7 @@ SystemWindow::SystemWindow(WindowType nType) Init(); } -void SystemWindow::loadUI(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, +void SystemWindow::loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame) { mbIsDefferedInit = true; @@ -119,7 +119,7 @@ bool SystemWindow::Notify( NotifyEvent& rNEvt ) MenuBar* pMBar = mpMenuBar; if ( !pMBar && ( GetType() == WINDOW_FLOATINGWINDOW ) ) { - Window* pWin = ImplGetFrameWindow()->ImplGetWindow(); + vcl::Window* pWin = ImplGetFrameWindow()->ImplGetWindow(); if( pWin && pWin->IsSystemWindow() ) pMBar = ((SystemWindow*)pWin)->GetMenuBar(); } @@ -148,7 +148,7 @@ bool SystemWindow::PreNotify( NotifyEvent& rNEvt ) TaskPaneList *pTList = mpImplData->mpTaskPaneList; if( !pTList && ( GetType() == WINDOW_FLOATINGWINDOW ) ) { - Window* pWin = ImplGetFrameWindow()->ImplGetWindow(); + vcl::Window* pWin = ImplGetFrameWindow()->ImplGetWindow(); if( pWin && pWin->IsSystemWindow() ) pTList = ((SystemWindow*)pWin)->mpImplData->mpTaskPaneList; } @@ -156,7 +156,7 @@ bool SystemWindow::PreNotify( NotifyEvent& rNEvt ) { // search topmost system window which is the one to handle dialog/toolbar cycling SystemWindow *pSysWin = this; - Window *pWin = this; + vcl::Window *pWin = this; while( pWin ) { pWin = pWin->GetParent(); @@ -182,7 +182,7 @@ TaskPaneList* SystemWindow::GetTaskPaneList() MenuBar* pMBar = mpMenuBar; if ( !pMBar && ( GetType() == WINDOW_FLOATINGWINDOW ) ) { - Window* pWin = ImplGetFrameWindow()->ImplGetWindow(); + vcl::Window* pWin = ImplGetFrameWindow()->ImplGetWindow(); if ( pWin && pWin->IsSystemWindow() ) pMBar = ((SystemWindow*)pWin)->GetMenuBar(); } @@ -205,7 +205,7 @@ bool SystemWindow::Close() return false; // Is Window not closeable, ignore close - Window* pBorderWin = ImplGetBorderWindow(); + vcl::Window* pBorderWin = ImplGetBorderWindow(); WinBits nStyle; if ( pBorderWin ) nStyle = pBorderWin->GetStyle(); @@ -241,7 +241,7 @@ void SystemWindow::SetRepresentedURL( const OUString& i_rURL ) mpImplData->maRepresentedURL = i_rURL; if ( !mbSysChild && bChanged ) { - const Window* pWindow = this; + const vcl::Window* pWindow = this; while ( pWindow->mpWindowImpl->mpBorderWindow ) pWindow = pWindow->mpWindowImpl->mpBorderWindow; @@ -259,7 +259,7 @@ void SystemWindow::SetIcon( sal_uInt16 nIcon ) if ( !mbSysChild ) { - const Window* pWindow = this; + const vcl::Window* pWindow = this; while ( pWindow->mpWindowImpl->mpBorderWindow ) pWindow = pWindow->mpWindowImpl->mpBorderWindow; @@ -273,7 +273,7 @@ void SystemWindow::EnableSaveBackground( bool bSave ) if( ImplGetSVData()->maWinData.mbNoSaveBackground ) bSave = false; - Window* pWindow = this; + vcl::Window* pWindow = this; while ( pWindow->mpWindowImpl->mpBorderWindow ) pWindow = pWindow->mpWindowImpl->mpBorderWindow; if ( pWindow->mpWindowImpl->mbOverlapWin && !pWindow->mpWindowImpl->mbFrame ) @@ -286,7 +286,7 @@ void SystemWindow::EnableSaveBackground( bool bSave ) bool SystemWindow::IsSaveBackgroundEnabled() const { - const Window* pWindow = this; + const vcl::Window* pWindow = this; while ( pWindow->mpWindowImpl->mpBorderWindow ) pWindow = pWindow->mpWindowImpl->mpBorderWindow; if ( pWindow->mpWindowImpl->mpOverlapData ) @@ -567,7 +567,7 @@ static OString ImplWindowStateToStr(const WindowStateData& rData) return rStrBuf.makeStringAndClear(); } -void SystemWindow::ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin ) +void SystemWindow::ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin ) { Rectangle aScreenRect; if( !Application::IsUnifiedDisplay() ) @@ -609,7 +609,7 @@ void SystemWindow::ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, lo bMove = true; io_rY = aScreenRect.Bottom() - i_nHeight; } - Window* pParent = i_pConfigureWin->GetParent(); + vcl::Window* pParent = i_pConfigureWin->GetParent(); if( bMove && pParent ) { // calculate absolute screen pos here, since that is what is contained in WindowState @@ -631,7 +631,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData ) if ( mbSysChild ) return; - Window* pWindow = this; + vcl::Window* pWindow = this; while ( pWindow->mpWindowImpl->mpBorderWindow ) pWindow = pWindow->mpWindowImpl->mpBorderWindow; @@ -675,7 +675,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData ) { Rectangle aDesktop = GetDesktopRectPixel(); ImplSVData *pSVData = ImplGetSVData(); - Window *pWin = pSVData->maWinData.mpFirstFrame; + vcl::Window *pWin = pSVData->maWinData.mpFirstFrame; bool bWrapped = false; while( pWin ) { @@ -784,7 +784,7 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const if ( mbSysChild ) return; - const Window* pWindow = this; + const vcl::Window* pWindow = this; while ( pWindow->mpWindowImpl->mpBorderWindow ) pWindow = pWindow->mpWindowImpl->mpBorderWindow; @@ -884,8 +884,8 @@ void SystemWindow::SetMenuBar(MenuBar* pMenuBar, const css::uno::Reference<css:: if ( mpMenuBar != pMenuBar ) { MenuBar* pOldMenuBar = mpMenuBar; - Window* pOldWindow = NULL; - Window* pNewWindow=NULL; + vcl::Window* pOldWindow = NULL; + vcl::Window* pNewWindow=NULL; mpMenuBar = pMenuBar; if ( mpWindowImpl->mpBorderWindow && (mpWindowImpl->mpBorderWindow->GetType() == WINDOW_BORDERWINDOW) ) @@ -956,7 +956,7 @@ void SystemWindow::SetMenuBarMode( sal_uInt16 nMode ) } } -bool SystemWindow::ImplIsInTaskPaneList( Window* pWin ) +bool SystemWindow::ImplIsInTaskPaneList( vcl::Window* pWin ) { if( mpImplData && mpImplData->mpTaskPaneList ) return mpImplData->mpTaskPaneList->IsInList( pWin ); diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx index cbd60dc7abe4..b67b978d9166 100644 --- a/vcl/source/window/tabdlg.cxx +++ b/vcl/source/window/tabdlg.cxx @@ -39,9 +39,9 @@ void TabDialog::ImplPosControls() Size aCtrlSize( IMPL_MINSIZE_BUTTON_WIDTH, IMPL_MINSIZE_BUTTON_HEIGHT ); long nDownCtrl = 0; long nOffY = 0; - Window* pTabControl = NULL; + vcl::Window* pTabControl = NULL; - Window* pChild = GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window* pChild = GetWindow( WINDOW_FIRSTCHILD ); while ( pChild ) { if ( pChild->IsVisible() && (pChild != mpViewWindow) ) @@ -155,7 +155,7 @@ void TabDialog::ImplPosControls() if ( nCtrlBarWidth <= (aTabSize.Width()+nBtnEx) ) nX = (aTabSize.Width()+nBtnEx) - nCtrlBarWidth + IMPL_DIALOG_OFFSET; - Window* pChild2 = GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window* pChild2 = GetWindow( WINDOW_FIRSTCHILD ); while ( pChild2 ) { if ( pChild2->IsVisible() && (pChild2 != mpViewWindow) ) @@ -206,14 +206,14 @@ void TabDialog::ImplPosControls() mbPosControls = false; } -TabDialog::TabDialog( Window* pParent, WinBits nStyle ) : +TabDialog::TabDialog( vcl::Window* pParent, WinBits nStyle ) : Dialog( WINDOW_TABDIALOG ) { ImplInitTabDialogData(); ImplInit( pParent, nStyle ); } -TabDialog::TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : +TabDialog::TabDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : Dialog(pParent, rID, rUIXMLDescription, WINDOW_TABDIALOG) { ImplInitTabDialogData(); diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 655c334292c2..f96cbebd0cb7 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> -void TabPage::ImplInit( Window* pParent, WinBits nStyle ) +void TabPage::ImplInit( vcl::Window* pParent, WinBits nStyle ) { if ( !(nStyle & WB_NODIALOGCONTROL) ) nStyle |= WB_DIALOGCONTROL; @@ -48,7 +48,7 @@ void TabPage::ImplInit( Window* pParent, WinBits nStyle ) void TabPage::ImplInitSettings() { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() ) { EnableChildTransparentMode( true ); @@ -69,13 +69,13 @@ void TabPage::ImplInitSettings() } } -TabPage::TabPage( Window* pParent, WinBits nStyle ) : +TabPage::TabPage( vcl::Window* pParent, WinBits nStyle ) : Window( WINDOW_TABPAGE ) { ImplInit( pParent, nStyle ); } -TabPage::TabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription) +TabPage::TabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription) : Window(WINDOW_TABPAGE) { ImplInit(pParent, 0); diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx index 29e70809bec6..f5cb91b4d57f 100644 --- a/vcl/source/window/taskpanelist.cxx +++ b/vcl/source/window/taskpanelist.cxx @@ -28,13 +28,13 @@ #include <algorithm> // can't have static linkage because SUNPRO 5.2 complains -Point ImplTaskPaneListGetPos( const Window *w ) +Point ImplTaskPaneListGetPos( const vcl::Window *w ) { Point pos; if( w->ImplIsDockingWindow() ) { pos = ((DockingWindow*)w)->GetPosPixel(); - Window *pF = ((DockingWindow*)w)->GetFloatingWindow(); + vcl::Window *pF = ((DockingWindow*)w)->GetFloatingWindow(); if( pF ) pos = pF->OutputToAbsoluteScreenPixel( pF->ScreenToOutputPixel( pos ) ); else @@ -47,9 +47,9 @@ Point ImplTaskPaneListGetPos( const Window *w ) } // compares window pos left-to-right -struct LTRSort : public ::std::binary_function< const Window*, const Window*, bool > +struct LTRSort : public ::std::binary_function< const vcl::Window*, const vcl::Window*, bool > { - bool operator()( const Window* w1, const Window* w2 ) const + bool operator()( const vcl::Window* w1, const vcl::Window* w2 ) const { Point pos1(ImplTaskPaneListGetPos( w1 )); Point pos2(ImplTaskPaneListGetPos( w2 )); @@ -60,9 +60,9 @@ struct LTRSort : public ::std::binary_function< const Window*, const Window*, bo return ( pos1.X() < pos2.X() ); } }; -struct LTRSortBackward : public ::std::binary_function< const Window*, const Window*, bool > +struct LTRSortBackward : public ::std::binary_function< const vcl::Window*, const vcl::Window*, bool > { - bool operator()( const Window* w2, const Window* w1 ) const + bool operator()( const vcl::Window* w2, const vcl::Window* w1 ) const { Point pos1(ImplTaskPaneListGetPos( w1 )); Point pos2(ImplTaskPaneListGetPos( w2 )); @@ -74,7 +74,7 @@ struct LTRSortBackward : public ::std::binary_function< const Window*, const Win } }; -static void ImplTaskPaneListGrabFocus( Window *pWindow, bool bForward ) +static void ImplTaskPaneListGrabFocus( vcl::Window *pWindow, bool bForward ) { // put focus in child of floating windows which is typically a toolbar // that can deal with the focus @@ -91,12 +91,12 @@ TaskPaneList::~TaskPaneList() { } -void TaskPaneList::AddWindow( Window *pWindow ) +void TaskPaneList::AddWindow( vcl::Window *pWindow ) { if( pWindow ) { - ::std::vector< Window* >::iterator insertionPos = mTaskPanes.end(); - for ( ::std::vector< Window* >::iterator p = mTaskPanes.begin(); + ::std::vector< vcl::Window* >::iterator insertionPos = mTaskPanes.end(); + for ( ::std::vector< vcl::Window* >::iterator p = mTaskPanes.begin(); p != mTaskPanes.end(); ++p ) @@ -129,9 +129,9 @@ void TaskPaneList::AddWindow( Window *pWindow ) } } -void TaskPaneList::RemoveWindow( Window *pWindow ) +void TaskPaneList::RemoveWindow( vcl::Window *pWindow ) { - ::std::vector< Window* >::iterator p; + ::std::vector< vcl::Window* >::iterator p; p = ::std::find( mTaskPanes.begin(), mTaskPanes.end(), pWindow ); if( p != mTaskPanes.end() ) { @@ -140,9 +140,9 @@ void TaskPaneList::RemoveWindow( Window *pWindow ) } } -bool TaskPaneList::IsInList( Window *pWindow ) +bool TaskPaneList::IsInList( vcl::Window *pWindow ) { - ::std::vector< Window* >::iterator p; + ::std::vector< vcl::Window* >::iterator p; p = ::std::find( mTaskPanes.begin(), mTaskPanes.end(), pWindow ); if( p != mTaskPanes.end() ) return true; @@ -171,10 +171,10 @@ bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) bSplitterOnly = aKeyCode.IsMod1() && aKeyCode.IsShift(); // is the focus in the list ? - ::std::vector< Window* >::iterator p = mTaskPanes.begin(); + ::std::vector< vcl::Window* >::iterator p = mTaskPanes.begin(); while( p != mTaskPanes.end() ) { - Window *pWin = *p; + vcl::Window *pWin = *p; if( pWin->HasChildPathFocus( true ) ) { bFocusInList = true; @@ -187,7 +187,7 @@ bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) } // activate next task pane - Window *pNextWin = NULL; + vcl::Window *pNextWin = NULL; if( bSplitterOnly ) pNextWin = FindNextSplitter( *p, true ); @@ -220,7 +220,7 @@ bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) // the focus is not in the list: activate first float if F6 was pressed if( !bFocusInList ) { - Window *pWin; + vcl::Window *pWin; if( bSplitterOnly ) pWin = FindNextSplitter( NULL, true ); else @@ -237,14 +237,14 @@ bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent ) } // returns next splitter -Window* TaskPaneList::FindNextSplitter( Window *pWindow, bool bForward ) +vcl::Window* TaskPaneList::FindNextSplitter( vcl::Window *pWindow, bool bForward ) { if( bForward ) ::std::stable_sort( mTaskPanes.begin(), mTaskPanes.end(), LTRSort() ); else ::std::stable_sort( mTaskPanes.begin(), mTaskPanes.end(), LTRSortBackward() ); - ::std::vector< Window* >::iterator p = mTaskPanes.begin(); + ::std::vector< vcl::Window* >::iterator p = mTaskPanes.begin(); while( p != mTaskPanes.end() ) { if( !pWindow || *p == pWindow ) @@ -274,14 +274,14 @@ Window* TaskPaneList::FindNextSplitter( Window *pWindow, bool bForward ) } // returns first valid item (regardless of type) if pWindow==0, otherwise returns next valid float -Window* TaskPaneList::FindNextFloat( Window *pWindow, bool bForward ) +vcl::Window* TaskPaneList::FindNextFloat( vcl::Window *pWindow, bool bForward ) { if( bForward ) ::std::stable_sort( mTaskPanes.begin(), mTaskPanes.end(), LTRSort() ); else ::std::stable_sort( mTaskPanes.begin(), mTaskPanes.end(), LTRSortBackward() ); - ::std::vector< Window* >::iterator p = mTaskPanes.begin(); + ::std::vector< vcl::Window* >::iterator p = mTaskPanes.begin(); while( p != mTaskPanes.end() ) { if( !pWindow || *p == pWindow ) diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 91059ff9fe5c..c42f80f5a45f 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -548,9 +548,9 @@ void ToolBox::ImplErase( ToolBox* pThis, const Rectangle &rRect, bool bHighlight // to have the same highlight color (transparency in DrawSelectionBackground()) // items with open popups will also painted using a constant color if( !pThis->mpData->mbNativeButtons && - (bHighlight || ! (((Window*) pThis)->GetStyle() & WB_3DLOOK ) ) ) + (bHighlight || ! (((vcl::Window*) pThis)->GetStyle() & WB_3DLOOK ) ) ) { - if( (((Window*) pThis)->GetStyle() & WB_3DLOOK ) ) + if( (((vcl::Window*) pThis)->GetStyle() & WB_3DLOOK ) ) { pThis->Push( PUSH_LINECOLOR | PUSH_FILLCOLOR ); pThis->SetLineColor(); @@ -1349,7 +1349,7 @@ IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel ) return (long) true; } -void ToolBox::ImplInit( Window* pParent, WinBits nStyle ) +void ToolBox::ImplInit( vcl::Window* pParent, WinBits nStyle ) { // initialize variables @@ -1547,16 +1547,16 @@ void ToolBox::ImplLoadRes( const ResId& rResId ) } } -ToolBox::ToolBox( Window* pParent, WinBits nStyle ) : +ToolBox::ToolBox( vcl::Window* pParent, WinBits nStyle ) : DockingWindow( WINDOW_TOOLBOX ) { ImplInit( pParent, nStyle ); } -ToolBox::ToolBox( Window* pParent, const ResId& rResId ) : +ToolBox::ToolBox( vcl::Window* pParent, const ResId& rResId ) : DockingWindow( WINDOW_TOOLBOX ) { - SAL_INFO( "vcl.window", "vcl: ToolBox::ToolBox( Window* pParent, const ResId& rResId )" ); + SAL_INFO( "vcl.window", "vcl: ToolBox::ToolBox( vcl::Window* pParent, const ResId& rResId )" ); rResId.SetRT( RSC_TOOLBOX ); WinBits nStyle = ImplInitRes( rResId ); @@ -3547,7 +3547,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) // eg, in a edit control // and do not highlight when focus is in a different toolbox bool bDrawHotSpot = true; - Window *pWin = Application::GetFocusWindow(); + vcl::Window *pWin = Application::GetFocusWindow(); if( pWin && pWin->ImplGetWindowImpl()->mbToolBox && pWin != this ) bDrawHotSpot = false; @@ -4084,7 +4084,7 @@ void ToolBox::Resize() { if (mpData->m_aItems[i].mbExpand) { - Window *pWindow = mpData->m_aItems[i].mpWindow; + vcl::Window *pWindow = mpData->m_aItems[i].mpWindow; SAL_WARN_IF(!pWindow, "vcl.layout", "only tabitems with window supported at the moment"); if (!pWindow) continue; @@ -4124,7 +4124,7 @@ void ToolBox::Resize() for (size_t i = 0; i < aExpandables.size(); ++i) { size_t nIndex = aExpandables[i]; - Window *pWindow = mpData->m_aItems[nIndex].mpWindow; + vcl::Window *pWindow = mpData->m_aItems[nIndex].mpWindow; Size aWinSize(pWindow->GetSizePixel()); Size aPrefSize(pWindow->get_preferred_size()); aWinSize.Width() = aPrefSize.Width() + nDiff; @@ -4275,7 +4275,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt ) { // internal TAB cycling only if parent is not a dialog or if we are the only child // otherwise the dialog control will take over - Window *pParent = ImplGetParent(); + vcl::Window *pParent = ImplGetParent(); bool bOldSchoolContainer = ((pParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) == WB_DIALOGCONTROL && pParent->GetChildCount() != 1); @@ -4713,12 +4713,12 @@ Size ToolBox::GetOptimalSize() const { // If we have any expandable entries, then force them to their // optimal sizes, then reset them afterwards - std::map<Window*, Size> aExpandables; + std::map<vcl::Window*, Size> aExpandables; for (size_t i = 0; i < mpData->m_aItems.size(); ++i) { if (mpData->m_aItems[i].mbExpand) { - Window *pWindow = mpData->m_aItems[i].mpWindow; + vcl::Window *pWindow = mpData->m_aItems[i].mpWindow; SAL_WARN_IF(!pWindow, "vcl.layout", "only tabitems with window supported at the moment"); if (!pWindow) continue; @@ -4732,9 +4732,9 @@ Size ToolBox::GetOptimalSize() const Size aSize(ImplCalcSize( this, mnLines )); - for (std::map<Window*, Size>::iterator aI = aExpandables.begin(); aI != aExpandables.end(); ++aI) + for (std::map<vcl::Window*, Size>::iterator aI = aExpandables.begin(); aI != aExpandables.end(); ++aI) { - Window *pWindow = aI->first; + vcl::Window *pWindow = aI->first; Size aWinSize = aI->second; pWindow->SetSizePixel(aWinSize); } @@ -4958,7 +4958,7 @@ bool ToolBox::ImplActivateItem( vcl::KeyCode aKeyCode ) return bRet; } -bool ImplCloseLastPopup( Window *pParent ) +bool ImplCloseLastPopup( vcl::Window *pParent ) { // close last popup toolbox (see also: // ImplHandleMouseFloatMode(...) in winproc.cxx ) @@ -5029,7 +5029,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) mnKeyModifier = aKeyCode.GetModifier(); sal_uInt16 nCode = aKeyCode.GetCode(); - Window *pParent = ImplGetParent(); + vcl::Window *pParent = ImplGetParent(); bool bOldSchoolContainer = ((pParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) == WB_DIALOGCONTROL); bool bParentIsContainer = bOldSchoolContainer || isContainerWindow(pParent); @@ -5128,7 +5128,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) else { // send focus to document pane - Window *pWin = this; + vcl::Window *pWin = this; while( pWin ) { if( !pWin->GetParent() ) @@ -5166,7 +5166,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) // #i13931# forward alphanum keyinput into embedded control if( (aKeyGroup == KEYGROUP_NUM || aKeyGroup == KEYGROUP_ALPHA ) && pItem && pItem->mpWindow && pItem->mbEnabled ) { - Window *pFocusWindow = Application::GetFocusWindow(); + vcl::Window *pFocusWindow = Application::GetFocusWindow(); ImplHideFocus(); mbChangingHighlight = true; // avoid focus change due to loss of focus pItem->mpWindow->ImplControlFocus( GETFOCUS_TAB ); @@ -5193,7 +5193,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) if (HasFocus() && mpData->mbKeyInputDisabled && bParentIsContainer) { sal_uInt16 n = 0; - Window *pFocusControl = pParent->ImplGetDlgWindow( n, DLGWINDOW_FIRST ); + vcl::Window *pFocusControl = pParent->ImplGetDlgWindow( n, DLGWINDOW_FIRST ); if ( pFocusControl && pFocusControl != this ) pFocusControl->ImplControlFocus( GETFOCUS_INIT ); } @@ -5532,7 +5532,7 @@ void ToolBox::ImplShowFocus() ImplToolItem* pItem = ImplGetItem( mnHighItemId ); if( pItem->mpWindow ) { - Window *pWin = pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow ? pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow : pItem->mpWindow; + vcl::Window *pWin = pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow ? pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow : pItem->mpWindow; pWin->ImplGetWindowImpl()->mbDrawSelectionBackground = true; pWin->Invalidate( 0 ); } @@ -5546,7 +5546,7 @@ void ToolBox::ImplHideFocus() ImplToolItem* pItem = ImplGetItem( mnHighItemId ); if( pItem->mpWindow ) { - Window *pWin = pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow ? pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow : pItem->mpWindow; + vcl::Window *pWin = pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow ? pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow : pItem->mpWindow; pWin->ImplGetWindowImpl()->mbDrawSelectionBackground = false; pWin->Invalidate( 0 ); } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 0f2731fcef75..2f8e1fdf663c 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -636,7 +636,7 @@ void ToolBox::InsertItem(const OUString& rCommand, const uno::Reference<frame::X pItem->maMinimalItemSize = rRequestedSize; } -void ToolBox::InsertWindow( sal_uInt16 nItemId, Window* pWindow, +void ToolBox::InsertWindow( sal_uInt16 nItemId, vcl::Window* pWindow, ToolBoxItemBits nBits, sal_uInt16 nPos ) { DBG_ASSERT( nItemId, "ToolBox::InsertWindow(): ItemId == 0" ); @@ -1301,7 +1301,7 @@ const OUString& ToolBox::GetItemText( sal_uInt16 nItemId ) const return pItem->maText; } -void ToolBox::SetItemWindow( sal_uInt16 nItemId, Window* pNewWindow ) +void ToolBox::SetItemWindow( sal_uInt16 nItemId, vcl::Window* pNewWindow ) { sal_uInt16 nPos = GetItemPos( nItemId ); @@ -1316,7 +1316,7 @@ void ToolBox::SetItemWindow( sal_uInt16 nItemId, Window* pNewWindow ) } } -Window* ToolBox::GetItemWindow( sal_uInt16 nItemId ) const +vcl::Window* ToolBox::GetItemWindow( sal_uInt16 nItemId ) const { ImplToolItem* pItem = ImplGetItem( nItemId ); @@ -1910,7 +1910,7 @@ void ToolBox::ImplExecuteCustomMenu() ImplDelData aBorderDel; bool bBorderDel = false; - Window *pWin = this; + vcl::Window *pWin = this; Rectangle aMenuRect = mpData->maMenubuttonItem.maRect; if( IsFloatingMode() ) { diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index da309e446b8a..74ad67bf23af 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -81,19 +81,21 @@ using namespace ::com::sun::star::datatransfer::dnd; using ::com::sun::star::awt::XTopWindow; +namespace vcl { + Window::Window( WindowType nType ) { ImplInitWindowData( nType ); } -Window::Window( Window* pParent, WinBits nStyle ) +Window::Window( vcl::Window* pParent, WinBits nStyle ) { ImplInitWindowData( WINDOW_WINDOW ); ImplInit( pParent, nStyle, NULL ); } -Window::Window( Window* pParent, const ResId& rResId ) +Window::Window( vcl::Window* pParent, const ResId& rResId ) : mpWindowImpl(NULL) { rResId.SetRT( RSC_WINDOW ); @@ -109,10 +111,10 @@ Window::Window( Window* pParent, const ResId& rResId ) #if OSL_DEBUG_LEVEL > 0 namespace { - OString lcl_createWindowInfo(const Window& i_rWindow) + OString lcl_createWindowInfo(const vcl::Window& i_rWindow) { // skip border windows, they don't carry information which helps diagnosing the problem - const Window* pWindow( &i_rWindow ); + const vcl::Window* pWindow( &i_rWindow ); while ( pWindow && ( pWindow->GetType() == WINDOW_BORDERWINDOW ) ) pWindow = pWindow->GetWindow( WINDOW_FIRSTCHILD ); if ( !pWindow ) @@ -131,7 +133,7 @@ namespace Window::~Window() { - vcl::LazyDeletor<Window>::Undelete( this ); + vcl::LazyDeletor<vcl::Window>::Undelete( this ); DBG_ASSERT( !mpWindowImpl->mbInDtor, "~Window - already in DTOR!" ); @@ -163,8 +165,8 @@ Window::~Window() // remove ownerdraw decorated windows from list in the top-most frame window if( (GetStyle() & WB_OWNERDRAWDECORATION) && mpWindowImpl->mbFrame ) { - ::std::vector< Window* >& rList = ImplGetOwnerDrawList(); - ::std::vector< Window* >::iterator p; + ::std::vector< vcl::Window* >& rList = ImplGetOwnerDrawList(); + ::std::vector< vcl::Window* >::iterator p; p = ::std::find( rList.begin(), rList.end(), this ); if( p != rList.end() ) rList.erase( p ); @@ -246,7 +248,7 @@ Window::~Window() { OStringBuffer aErrorStr; bool bError = false; - Window* pTempWin; + vcl::Window* pTempWin; if (mpWindowImpl->mpFrameData != 0) { pTempWin = mpWindowImpl->mpFrameData->mpFirstOverlap; @@ -325,7 +327,7 @@ Window::~Window() Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); // abort in debug builds, this must be fixed! } - Window* pMyParent = GetParent(); + vcl::Window* pMyParent = GetParent(); SystemWindow* pMySysWin = NULL; while ( pMyParent ) @@ -349,7 +351,7 @@ Window::~Window() if( mpWindowImpl->mbIsInTaskPaneList ) { - Window* pMyParent = GetParent(); + vcl::Window* pMyParent = GetParent(); SystemWindow* pMySysWin = NULL; while ( pMyParent ) @@ -418,7 +420,7 @@ Window::~Window() } // if we get focus pass focus to another window - Window* pOverlapWindow = ImplGetFirstOverlapWindow(); + vcl::Window* pOverlapWindow = ImplGetFirstOverlapWindow(); if ( pSVData->maWinData.mpFocusWin == this || bHasFocussedChild ) // #122232#, see above, try some cleanup { @@ -430,8 +432,8 @@ Window::~Window() } else { - Window* pParent = GetParent(); - Window* pBorderWindow = mpWindowImpl->mpBorderWindow; + vcl::Window* pParent = GetParent(); + vcl::Window* pBorderWindow = mpWindowImpl->mpBorderWindow; // when windows overlap, give focus to the parent // of the next FrameWindow if ( pBorderWindow ) @@ -512,7 +514,7 @@ Window::~Window() { ImplWinData* pParentWinData = mpWindowImpl->mpRealParent->ImplGetWinData(); - ::std::list< Window* >::iterator myPos = ::std::find( pParentWinData->maTopWindowChildren.begin(), + ::std::list< vcl::Window* >::iterator myPos = ::std::find( pParentWinData->maTopWindowChildren.begin(), pParentWinData->maTopWindowChildren.end(), this ); DBG_ASSERT( myPos != pParentWinData->maTopWindowChildren.end(), "Window::~Window: inconsistency in top window chain!" ); if ( myPos != pParentWinData->maTopWindowChildren.end() ) @@ -552,7 +554,7 @@ Window::~Window() pSVData->maWinData.mpFirstFrame = mpWindowImpl->mpFrameData->mpNextFrame; else { - Window* pSysWin = pSVData->maWinData.mpFirstFrame; + vcl::Window* pSysWin = pSVData->maWinData.mpFirstFrame; while ( pSysWin->mpWindowImpl->mpFrameData->mpNextFrame != this ) pSysWin = pSysWin->mpWindowImpl->mpFrameData->mpNextFrame; pSysWin->mpWindowImpl->mpFrameData->mpNextFrame = mpWindowImpl->mpFrameData->mpNextFrame; @@ -566,6 +568,8 @@ Window::~Window() delete mpWindowImpl; mpWindowImpl = NULL; } +} /* namespace vcl */ + WindowImpl::WindowImpl( WindowType nType ) { maZoom = Fraction( 1, 1 ); @@ -726,6 +730,8 @@ WindowImpl::~WindowImpl() delete mpControlFont; } +namespace vcl { + bool Window::AcquireGraphics() const { DBG_TESTSOLARMUTEX(); @@ -749,7 +755,7 @@ bool Window::AcquireGraphics() const OutputDevice* pReleaseOutDev = pSVData->maGDIData.mpLastWinGraphics; while ( pReleaseOutDev ) { - if ( ((Window*)pReleaseOutDev)->mpWindowImpl->mpFrame == mpWindowImpl->mpFrame ) + if ( ((vcl::Window*)pReleaseOutDev)->mpWindowImpl->mpFrame == mpWindowImpl->mpFrame ) break; pReleaseOutDev = pReleaseOutDev->mpPrevGraphics; } @@ -777,11 +783,11 @@ bool Window::AcquireGraphics() const if ( mpGraphics ) { mpNextGraphics = pSVData->maGDIData.mpFirstWinGraphics; - pSVData->maGDIData.mpFirstWinGraphics = const_cast<Window*>(this); + pSVData->maGDIData.mpFirstWinGraphics = const_cast<vcl::Window*>(this); if ( mpNextGraphics ) - mpNextGraphics->mpPrevGraphics = const_cast<Window*>(this); + mpNextGraphics->mpPrevGraphics = const_cast<vcl::Window*>(this); if ( !pSVData->maGDIData.mpLastWinGraphics ) - pSVData->maGDIData.mpLastWinGraphics = const_cast<Window*>(this); + pSVData->maGDIData.mpLastWinGraphics = const_cast<vcl::Window*>(this); } if ( mpGraphics ) @@ -806,7 +812,7 @@ void Window::ReleaseGraphics( bool bRelease ) ImplSVData* pSVData = ImplGetSVData(); - Window* pWindow = (Window*)this; + vcl::Window* pWindow = (vcl::Window*)this; if ( bRelease ) pWindow->mpWindowImpl->mpFrame->ReleaseGraphics( mpGraphics ); @@ -844,12 +850,12 @@ static sal_Int32 CountDPIScaleFactor(sal_Int32 nDPI) return nResult; } -void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ) +void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ) { DBG_ASSERT( mpWindowImpl->mbFrame || pParent, "Window::Window(): pParent == NULL" ); ImplSVData* pSVData = ImplGetSVData(); - Window* pRealParent = pParent; + vcl::Window* pRealParent = pParent; // inherit 3D look if ( !mpWindowImpl->mbOverlapWin && pParent && (pParent->GetStyle() & WB_3DLOOK) ) @@ -870,7 +876,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste nStyle |= WB_BORDER; } ImplBorderWindow* pBorderWin = new ImplBorderWindow( pParent, nStyle & (WB_BORDER | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_NEEDSFOCUS), nBorderTypeStyle ); - ((Window*)pBorderWin)->mpWindowImpl->mpClientWindow = this; + ((vcl::Window*)pBorderWin)->mpWindowImpl->mpClientWindow = this; pBorderWin->GetBorder( mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder, mpWindowImpl->mnRightBorder, mpWindowImpl->mnBottomBorder ); mpWindowImpl->mpBorderWindow = pBorderWin; pParent = mpWindowImpl->mpBorderWindow; @@ -1128,7 +1134,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste GetAccessibleParentWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_CHILDCREATED, this ); } -void Window::ImplInitAppFontData( Window* pWindow ) +void Window::ImplInitAppFontData( vcl::Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); long nTextHeight = pWindow->GetTextHeight(); @@ -1192,7 +1198,7 @@ ImplWinData* Window::ImplGetWinData() const { static const char* pNoNWF = getenv( "SAL_NO_NWF" ); - ((Window*)this)->mpWindowImpl->mpWinData = new ImplWinData; + ((vcl::Window*)this)->mpWindowImpl->mpWinData = new ImplWinData; mpWindowImpl->mpWinData->mpExtOldText = NULL; mpWindowImpl->mpWinData->mpExtOldAttrAry = NULL; mpWindowImpl->mpWinData->mpCursorRect = NULL; @@ -1278,20 +1284,6 @@ bool Window::ImplCheckUIFont( const vcl::Font& rFont ) return bUIFontOk; } -bool ImplDoTiledRendering() -{ -#if !HAVE_FEATURE_DESKTOP - // We do tiled rendering only for iOS at the moment, actually, but - // let's see what happens if we assume it for Android, too. - return true; -#else - // We need some way to know globally if this process will use - // tiled rendering or not. Or should this be a per-window setting? - // Or what? - return false; -#endif -} - SalGraphics* Window::ImplGetFrameGraphics() const { if ( mpWindowImpl->mpFrameWindow->mpGraphics ) @@ -1330,7 +1322,7 @@ void Window::ImplSetReallyVisible() // TODO. It's kind of a hack that we're re-using the VCLEVENT_WINDOW_SHOW. Normally, we should // introduce another event which explicitly triggers the Accessibility implementations. - Window* pWindow = mpWindowImpl->mpFirstOverlap; + vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; while ( pWindow ) { if ( pWindow->mpWindowImpl->mbVisible ) @@ -1464,13 +1456,13 @@ bool Window::ImplUpdatePos() } else { - Window* pParent = ImplGetParent(); + vcl::Window* pParent = ImplGetParent(); mnOutOffX = mpWindowImpl->mnX + pParent->mnOutOffX; mnOutOffY = mpWindowImpl->mnY + pParent->mnOutOffY; } - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { if ( pChild->ImplUpdatePos() ) @@ -1489,7 +1481,7 @@ void Window::ImplUpdateSysObjPos() if ( mpWindowImpl->mpSysObj ) mpWindowImpl->mpSysObj->SetPosSize( mnOutOffX, mnOutOffY, mnOutWidth, mnOutHeight ); - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->ImplUpdateSysObjPos(); @@ -1804,7 +1796,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, void Window::ImplNewInputContext() { ImplSVData* pSVData = ImplGetSVData(); - Window* pFocusWin = pSVData->maWinData.mpFocusWin; + vcl::Window* pFocusWin = pSVData->maWinData.mpFocusWin; if ( !pFocusWin ) return; @@ -1855,7 +1847,7 @@ void Window::doLazyDelete() Show( false ); SetParent( ImplGetDefaultWindow() ); } - vcl::LazyDeletor<Window>::Delete( this ); + vcl::LazyDeletor<vcl::Window>::Delete( this ); } sal_uInt16 Window::GetIndicatorState() const @@ -2011,7 +2003,7 @@ bool Window::IsLocked( bool bChildren ) const if ( bChildren || mpWindowImpl->mbChildNotify ) { - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { if ( pChild->IsLocked( true ) ) @@ -2039,7 +2031,7 @@ void Window::SetExtendedStyle( WinBits nExtendedStyle ) if ( mpWindowImpl->mnExtendedStyle != nExtendedStyle ) { - Window* pWindow = ImplGetBorderWindow(); + vcl::Window* pWindow = ImplGetBorderWindow(); if( ! pWindow ) pWindow = this; if( pWindow->mpWindowImpl->mbFrame ) @@ -2071,7 +2063,7 @@ void Window::SetBorderStyle( sal_uInt16 nBorderStyle ) // this is a little awkward: some controls (e.g. svtools ProgressBar) // cannot avoid getting constructed with WB_BORDER but want to disable // borders in case of NWF drawing. So they need a method to remove their border window - Window* pBorderWin = mpWindowImpl->mpBorderWindow; + vcl::Window* pBorderWin = mpWindowImpl->mpBorderWindow; // remove us as border window's client pBorderWin->mpWindowImpl->mpClientWindow = NULL; mpWindowImpl->mpBorderWindow = NULL; @@ -2128,9 +2120,9 @@ long Window::CalcTitleWidth() const // border of external dialogs const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); vcl::Font aFont = GetFont(); - ((Window*)this)->SetPointFont( rStyleSettings.GetTitleFont() ); + ((vcl::Window*)this)->SetPointFont( rStyleSettings.GetTitleFont() ); long nTitleWidth = GetTextWidth( GetText() ); - ((Window*)this)->SetFont( aFont ); + ((vcl::Window*)this)->SetFont( aFont ); nTitleWidth += rStyleSettings.GetTitleHeight() * 3; nTitleWidth += rStyleSettings.GetBorderSize() * 2; nTitleWidth += 10; @@ -2208,11 +2200,11 @@ void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLe } } -void Window::CollectChildren(::std::vector<Window *>& rAllChildren ) +void Window::CollectChildren(::std::vector<vcl::Window *>& rAllChildren ) { rAllChildren.push_back( this ); - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->CollectChildren( rAllChildren ); @@ -2357,7 +2349,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) StateChanged( STATE_CHANGE_VISIBLE ); - Window* pTestParent; + vcl::Window* pTestParent; if ( ImplIsOverlapWindow() ) pTestParent = mpWindowImpl->mpOverlapWindow; else @@ -2547,7 +2539,7 @@ void Window::Enable( bool bEnable, bool bChild ) if ( bChild || mpWindowImpl->mbChildNotify ) { - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->Enable( bEnable, bChild ); @@ -2563,7 +2555,7 @@ void Window::SetCallHandlersOnInputDisabled( bool bCall ) { mpWindowImpl->mbCallHandlersDuringInputDisabled = bCall ? true : false; - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->SetCallHandlersOnInputDisabled( bCall ); @@ -2620,7 +2612,7 @@ void Window::EnableInput( bool bEnable, bool bChild ) if ( bChild || mpWindowImpl->mbChildNotify ) { - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->EnableInput( bEnable, bChild ); @@ -2640,7 +2632,7 @@ void Window::EnableInput( bool bEnable, bool bChild ) } void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin, - const Window* pExcludeWindow ) + const vcl::Window* pExcludeWindow ) { EnableInput( bEnable, bChild ); @@ -2650,7 +2642,7 @@ void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin, // shouldn't be the case, than this must be changed in dialog.cxx if( pExcludeWindow ) pExcludeWindow = pExcludeWindow->ImplGetFirstOverlapWindow(); - Window* pSysWin = mpWindowImpl->mpFrameWindow->mpWindowImpl->mpFrameData->mpFirstOverlap; + vcl::Window* pSysWin = mpWindowImpl->mpFrameWindow->mpWindowImpl->mpFrameData->mpFirstOverlap; while ( pSysWin ) { // Is Window in the path from this window @@ -2665,7 +2657,7 @@ void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin, } // enable/disable floating system windows as well - Window* pFrameWin = ImplGetSVData()->maWinData.mpFirstFrame; + vcl::Window* pFrameWin = ImplGetSVData()->maWinData.mpFirstFrame; while ( pFrameWin ) { if( pFrameWin->ImplIsFloatingWindow() ) @@ -2685,8 +2677,8 @@ void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin, // the same for ownerdraw floating windows if( mpWindowImpl->mbFrame ) { - ::std::vector< Window* >& rList = mpWindowImpl->mpFrameData->maOwnerDrawList; - ::std::vector< Window* >::iterator p = rList.begin(); + ::std::vector< vcl::Window* >& rList = mpWindowImpl->mpFrameData->maOwnerDrawList; + ::std::vector< vcl::Window* >::iterator p = rList.begin(); while( p != rList.end() ) { // Is Window in the path from this window @@ -2723,7 +2715,7 @@ void Window::AlwaysEnableInput( bool bAlways, bool bChild ) if ( bChild || mpWindowImpl->mbChildNotify ) { - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->AlwaysEnableInput( bAlways, bChild ); @@ -2752,7 +2744,7 @@ void Window::AlwaysDisableInput( bool bAlways, bool bChild ) if ( bChild || mpWindowImpl->mbChildNotify ) { - Window* pChild = mpWindowImpl->mpFirstChild; + vcl::Window* pChild = mpWindowImpl->mpFirstChild; while ( pChild ) { pChild->AlwaysDisableInput( bAlways, bChild ); @@ -2804,7 +2796,7 @@ void Window::setPosSizePixel( long nX, long nY, mpWindowImpl->mbDefSize = false; // The top BorderWindow is the window which is to be positioned - Window* pWindow = this; + vcl::Window* pWindow = this; while ( pWindow->mpWindowImpl->mpBorderWindow ) pWindow = pWindow->mpWindowImpl->mpBorderWindow; @@ -2821,7 +2813,7 @@ void Window::setPosSizePixel( long nX, long nY, nHeight = pWindow->mnOutHeight; sal_uInt16 nSysFlags=0; - Window *pParent = GetParent(); + vcl::Window *pParent = GetParent(); if( nFlags & WINDOW_POSSIZE_WIDTH ) nSysFlags |= SAL_FRAME_POSSIZE_WIDTH; @@ -2970,14 +2962,14 @@ long Window::ImplGetUnmirroredOutOffX() Point Window::OutputToNormalizedScreenPixel( const Point& rPos ) const { // relative to top level parent - long offx = ((Window*) this)->ImplGetUnmirroredOutOffX(); + long offx = ((vcl::Window*) this)->ImplGetUnmirroredOutOffX(); return Point( rPos.X()+offx, rPos.Y()+mnOutOffY ); } Point Window::NormalizedScreenToOutputPixel( const Point& rPos ) const { // relative to top level parent - long offx = ((Window*) this)->ImplGetUnmirroredOutOffX(); + long offx = ((vcl::Window*) this)->ImplGetUnmirroredOutOffX(); return Point( rPos.X()-offx, rPos.Y()-mnOutOffY ); } @@ -3018,24 +3010,24 @@ Rectangle Window::ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle &rR return Rectangle( p1, p2 ); } -Rectangle Window::GetWindowExtentsRelative( Window *pRelativeWindow ) const +Rectangle Window::GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const { // with decoration return ImplGetWindowExtentsRelative( pRelativeWindow, false ); } -Rectangle Window::GetClientWindowExtentsRelative( Window *pRelativeWindow ) const +Rectangle Window::GetClientWindowExtentsRelative( vcl::Window *pRelativeWindow ) const { // without decoration return ImplGetWindowExtentsRelative( pRelativeWindow, true ); } -Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bClientOnly ) const +Rectangle Window::ImplGetWindowExtentsRelative( vcl::Window *pRelativeWindow, bool bClientOnly ) const { SalFrameGeometry g = mpWindowImpl->mpFrame->GetGeometry(); // make sure we use the extent of our border window, // otherwise we miss a few pixels - const Window *pWin = (!bClientOnly && mpWindowImpl->mpBorderWindow) ? mpWindowImpl->mpBorderWindow : this; + const vcl::Window *pWin = (!bClientOnly && mpWindowImpl->mpBorderWindow) ? mpWindowImpl->mpBorderWindow : this; Point aPos( pWin->OutputToScreenPixel( Point(0,0) ) ); aPos.X() += g.nX; @@ -3052,7 +3044,7 @@ Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bC if( pRelativeWindow ) { // #106399# express coordinates relative to borderwindow - Window *pRelWin = (!bClientOnly && pRelativeWindow->mpWindowImpl->mpBorderWindow) ? pRelativeWindow->mpWindowImpl->mpBorderWindow : pRelativeWindow; + vcl::Window *pRelWin = (!bClientOnly && pRelativeWindow->mpWindowImpl->mpBorderWindow) ? pRelativeWindow->mpWindowImpl->mpBorderWindow : pRelativeWindow; aPos = pRelWin->AbsoluteScreenToOutputPixel( aPos ); } return Rectangle( aPos, aSize ); @@ -3121,7 +3113,7 @@ void Window::SetFakeFocus( bool bFocus ) bool Window::HasChildPathFocus( bool bSystemWindow ) const { - Window* pFocusWin = ImplGetSVData()->maWinData.mpFocusWin; + vcl::Window* pFocusWin = ImplGetSVData()->maWinData.mpFocusWin; if ( pFocusWin ) return ImplIsWindowOrChild( pFocusWin, bSystemWindow ); return false; @@ -3161,7 +3153,7 @@ void Window::SetText( const OUString& rStr ) // name change. if ( IsReallyVisible() ) { - Window* pWindow = GetAccessibleRelationLabelFor(); + vcl::Window* pWindow = GetAccessibleRelationLabelFor(); if ( pWindow && pWindow != this ) pWindow->ImplCallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldTitle ); } @@ -3220,7 +3212,7 @@ const OUString& Window::GetHelpText() const Help* pHelp = Application::GetHelp(); if ( pHelp ) { - ((Window*)this)->mpWindowImpl->maHelpText = pHelp->GetHelpText( aStrHelpId, this ); + ((vcl::Window*)this)->mpWindowImpl->maHelpText = pHelp->GetHelpText( aStrHelpId, this ); mpWindowImpl->mbHelpTextDynamic = false; } } @@ -3270,7 +3262,7 @@ void Window::SetComponentInterface( Reference< css::awt::XWindowPeer > xIFace ) pWrapper->SetWindowInterface( this, xIFace ); } -void Window::ImplCallDeactivateListeners( Window *pNew ) +void Window::ImplCallDeactivateListeners( vcl::Window *pNew ) { // no deactivation if the newly activated window is my child if ( !pNew || !ImplIsChild( pNew ) ) @@ -3287,7 +3279,7 @@ void Window::ImplCallDeactivateListeners( Window *pNew ) } } -void Window::ImplCallActivateListeners( Window *pOld ) +void Window::ImplCallActivateListeners( vcl::Window *pOld ) { // no activation if the old active window is my child if ( !pOld || !ImplIsChild( pOld ) ) @@ -3557,7 +3549,7 @@ void Window::DrawSelectionBackground( const Rectangle& rRect, // controls should return the window that gets the // focus by default, so keyevents can be sent to that window directly -Window* Window::GetPreferredKeyInputWindow() +vcl::Window* Window::GetPreferredKeyInputWindow() { return this; } @@ -3565,7 +3557,7 @@ Window* Window::GetPreferredKeyInputWindow() bool Window::IsScrollable() const { // check for scrollbars - Window *pChild = mpWindowImpl->mpFirstChild; + vcl::Window *pChild = mpWindowImpl->mpFirstChild; while( pChild ) { if( pChild->GetType() == WINDOW_SCROLLBAR ) @@ -3597,8 +3589,8 @@ bool Window::IsInModalNonRefMode() const void Window::ImplIncModalCount() { - Window* pFrameWindow = mpWindowImpl->mpFrameWindow; - Window* pParent = pFrameWindow; + vcl::Window* pFrameWindow = mpWindowImpl->mpFrameWindow; + vcl::Window* pParent = pFrameWindow; while( pFrameWindow ) { pFrameWindow->mpWindowImpl->mpFrameData->mnModalMode++; @@ -3611,8 +3603,8 @@ void Window::ImplIncModalCount() } void Window::ImplDecModalCount() { - Window* pFrameWindow = mpWindowImpl->mpFrameWindow; - Window* pParent = pFrameWindow; + vcl::Window* pFrameWindow = mpWindowImpl->mpFrameWindow; + vcl::Window* pParent = pFrameWindow; while( pFrameWindow ) { pFrameWindow->mpWindowImpl->mpFrameData->mnModalMode--; @@ -3640,13 +3632,13 @@ void Window::ImplNotifyIconifiedState( bool bIconified ) bool Window::HasActiveChildFrame() { bool bRet = false; - Window *pFrameWin = ImplGetSVData()->maWinData.mpFirstFrame; + vcl::Window *pFrameWin = ImplGetSVData()->maWinData.mpFirstFrame; while( pFrameWin ) { if( pFrameWin != mpWindowImpl->mpFrameWindow ) { bool bDecorated = false; - Window *pChildFrame = pFrameWin->ImplGetWindow(); + vcl::Window *pChildFrame = pFrameWin->ImplGetWindow(); // #i15285# unfortunately WB_MOVEABLE is the same as WB_TABSTOP which can // be removed for ToolBoxes to influence the keyboard accessibility // thus WB_MOVEABLE is no indicator for decoration anymore @@ -3695,7 +3687,7 @@ void Window::EnableNativeWidget( bool bEnable ) } // push down, useful for compound controls - Window *pChild = mpWindowImpl->mpFirstChild; + vcl::Window *pChild = mpWindowImpl->mpFirstChild; while( pChild ) { pChild->EnableNativeWidget( bEnable ); @@ -3752,7 +3744,7 @@ Reference< css::rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscr aArg[ 3 ] = makeAny( mpWindowImpl->mbAlwaysOnTop ? true : false ); aArg[ 4 ] = makeAny( Reference< css::awt::XWindow >( - const_cast<Window*>(this)->GetComponentInterface(), + const_cast<vcl::Window*>(this)->GetComponentInterface(), UNO_QUERY )); Reference< XComponentContext > xContext = comphelper::getProcessComponentContext(); @@ -3891,4 +3883,21 @@ Any Window::GetSystemDataAny() const return aRet; } +} /* namespace vcl */ + +bool ImplDoTiledRendering() +{ +#if !HAVE_FEATURE_DESKTOP + // We do tiled rendering only for iOS at the moment, actually, but + // let's see what happens if we assume it for Android, too. + return true; +#else + // We need some way to know globally if this process will use + // tiled rendering or not. Or should this be a per-window setting? + // Or what? + return false; +#endif +} + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 9b42b5763660..9d143f1aabdd 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -47,6 +47,8 @@ using namespace com::sun::star; +namespace vcl { + void Window::ShowFocus( const Rectangle& rRect ) { if( mpWindowImpl->mbInShowFocus ) @@ -934,7 +936,7 @@ void Window::EnableDocking( bool bEnable ) } // retrieves the list of owner draw decorated windows for this window hiearchy -::std::vector<Window *>& Window::ImplGetOwnerDrawList() +::std::vector<vcl::Window *>& Window::ImplGetOwnerDrawList() { return ImplGetTopmostFrameWindow()->mpWindowImpl->mpFrameData->maOwnerDrawList; } @@ -961,7 +963,7 @@ const OString& Window::GetUniqueId() const // --------- old inline methods --------------- -Window* Window::ImplGetWindow() +vcl::Window* Window::ImplGetWindow() { if ( mpWindowImpl->mpClientWindow ) return mpWindowImpl->mpClientWindow; @@ -979,22 +981,22 @@ SalFrame* Window::ImplGetFrame() const return mpWindowImpl->mpFrame; } -Window* Window::ImplGetParent() const +vcl::Window* Window::ImplGetParent() const { return mpWindowImpl->mpParent; } -Window* Window::ImplGetClientWindow() const +vcl::Window* Window::ImplGetClientWindow() const { return mpWindowImpl->mpClientWindow; } -Window* Window::ImplGetBorderWindow() const +vcl::Window* Window::ImplGetBorderWindow() const { return mpWindowImpl->mpBorderWindow; } -Window* Window::ImplGetFirstOverlapWindow() +vcl::Window* Window::ImplGetFirstOverlapWindow() { if ( mpWindowImpl->mbOverlapWin ) return this; @@ -1002,7 +1004,7 @@ Window* Window::ImplGetFirstOverlapWindow() return mpWindowImpl->mpOverlapWindow; } -const Window* Window::ImplGetFirstOverlapWindow() const +const vcl::Window* Window::ImplGetFirstOverlapWindow() const { if ( mpWindowImpl->mbOverlapWin ) return this; @@ -1010,7 +1012,7 @@ const Window* Window::ImplGetFirstOverlapWindow() const return mpWindowImpl->mpOverlapWindow; } -Window* Window::ImplGetFrameWindow() const +vcl::Window* Window::ImplGetFrameWindow() const { return mpWindowImpl->mpFrameWindow; } @@ -1097,7 +1099,7 @@ WindowType Window::GetType() const Dialog* Window::GetParentDialog() const { - const Window *pWindow = this; + const vcl::Window *pWindow = this; while( pWindow ) { @@ -1210,7 +1212,7 @@ bool Window::IsInPaint() const return mpWindowImpl->mbInPaint; } -Window* Window::GetParent() const +vcl::Window* Window::GetParent() const { return mpWindowImpl->mpRealParent; } @@ -1401,11 +1403,11 @@ void Window::SetOutputSizePixel( const Size& rNewSize ) //as dirty for the size remains unchanged, but layout changed circumstances namespace { - bool queue_ungrouped_resize(Window *pOrigWindow) + bool queue_ungrouped_resize(vcl::Window *pOrigWindow) { bool bSomeoneCares = false; - Window *pWindow = pOrigWindow->GetParent(); + vcl::Window *pWindow = pOrigWindow->GetParent(); if (pWindow) { if (isContainerWindow(*pWindow)) @@ -1435,11 +1437,11 @@ void Window::queue_resize(StateChangedType eReason) } if (pWindowImpl->m_xSizeGroup && pWindowImpl->m_xSizeGroup->get_mode() != VCL_SIZE_GROUP_NONE) { - std::set<Window*> &rWindows = pWindowImpl->m_xSizeGroup->get_widgets(); - for (std::set<Window*>::iterator aI = rWindows.begin(), + std::set<vcl::Window*> &rWindows = pWindowImpl->m_xSizeGroup->get_widgets(); + for (std::set<vcl::Window*>::iterator aI = rWindows.begin(), aEnd = rWindows.end(); aI != aEnd; ++aI) { - Window *pOther = *aI; + vcl::Window *pOther = *aI; if (pOther == this) continue; queue_ungrouped_resize(pOther); @@ -1450,7 +1452,7 @@ void Window::queue_resize(StateChangedType eReason) { //fdo#57090 force a resync of the borders of the borderwindow onto this //window in case they have changed - Window* pBorderWindow = ImplGetBorderWindow(); + vcl::Window* pBorderWindow = ImplGetBorderWindow(); if (pBorderWindow) pBorderWindow->Resize(); } @@ -1727,11 +1729,11 @@ Size Window::get_preferred_size() const if (eMode != VCL_SIZE_GROUP_NONE) { const bool bIgnoreInHidden = pWindowImpl->m_xSizeGroup->get_ignore_hidden(); - const std::set<Window*> &rWindows = pWindowImpl->m_xSizeGroup->get_widgets(); - for (std::set<Window*>::const_iterator aI = rWindows.begin(), + const std::set<vcl::Window*> &rWindows = pWindowImpl->m_xSizeGroup->get_widgets(); + for (std::set<vcl::Window*>::const_iterator aI = rWindows.begin(), aEnd = rWindows.end(); aI != aEnd; ++aI) { - const Window *pOther = *aI; + const vcl::Window *pOther = *aI; if (pOther == this) continue; if (bIgnoreInHidden && !pOther->IsVisible()) @@ -2035,4 +2037,7 @@ std::vector<FixedText*> Window::list_mnemonic_labels() const return mpWindowImpl->m_aMnemonicLabels; } +} /* namespace vcl */ + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx index 6774a022ad4f..570b7478fa98 100644 --- a/vcl/source/window/window3.cxx +++ b/vcl/source/window/window3.cxx @@ -27,6 +27,8 @@ WaitObject::~WaitObject() mpWindow->LeaveWait(); } +namespace vcl { + Size Window::GetOptimalSize() const { return Size(); @@ -45,7 +47,7 @@ void Window::ImplAdjustNWFSizes() default: { // iterate over children - Window* pWin = GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window* pWin = GetWindow( WINDOW_FIRSTCHILD ); while( pWin ) { pWin->ImplAdjustNWFSizes(); @@ -56,4 +58,7 @@ void Window::ImplAdjustNWFSizes() } } +} /* namespace vcl */ + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 197a173b2d7f..4c948b4fd0d6 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -60,7 +60,7 @@ bool ImplCallPreNotify( NotifyEvent& rEvt ) || rEvt.GetWindow()->PreNotify( rEvt ); } -static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, +static bool ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rMousePos, sal_uInt16 nCode, sal_uInt16 nSVEvent, bool bMouseLeave ) { @@ -160,7 +160,7 @@ static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos, return false; } -static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos ) +static void ImplHandleMouseHelpRequest( vcl::Window* pChild, const Point& rMousePos ) { ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->maHelpData.mpHelpWin || @@ -190,7 +190,7 @@ static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos ) } } -static void ImplSetMousePointer( Window* pChild ) +static void ImplSetMousePointer( vcl::Window* pChild ) { ImplSVData* pSVData = ImplGetSVData(); if ( pSVData->maHelpData.mbExtHelpMode ) @@ -199,7 +199,7 @@ static void ImplSetMousePointer( Window* pChild ) pChild->ImplGetFrame()->SetPointer( pChild->ImplGetMousePointer() ); } -static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL, +static bool ImplCallCommand( vcl::Window* pChild, sal_uInt16 nEvt, void* pData = NULL, bool bMouse = false, Point* pPos = NULL ) { Point aPos; @@ -246,7 +246,7 @@ static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL struct ContextMenuEvent { - Window* pWindow; + vcl::Window* pWindow; ImplDelData aDelData; Point aChildPos; }; @@ -265,13 +265,13 @@ static long ContextMenuEventLink( void* pCEvent, void* ) return 0; } -bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeave, +bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeave, long nX, long nY, sal_uLong nMsgTime, sal_uInt16 nCode, sal_uInt16 nMode ) { ImplSVData* pSVData = ImplGetSVData(); Point aMousePos( nX, nY ); - Window* pChild(NULL); + vcl::Window* pChild(NULL); bool bRet(false); sal_uInt16 nClicks(0); ImplFrameData* pWinFrameData = pWindow->ImplGetFrameData(); @@ -450,7 +450,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav // call Start-Drag handler if required // Warning: should be called before Move, as otherwise during // fast mouse movements the applications move to the selection state - Window* pMouseDownWin = pWinFrameData->mpMouseDownWin; + vcl::Window* pMouseDownWin = pWinFrameData->mpMouseDownWin; if ( pMouseDownWin ) { // check for matching StartDrag mode. We only compare @@ -526,7 +526,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav } // test for mouseleave and mouseenter - Window* pMouseMoveWin = pWinFrameData->mpMouseMoveWin; + vcl::Window* pMouseMoveWin = pWinFrameData->mpMouseMoveWin; if ( pChild != pMouseMoveWin ) { if ( pMouseMoveWin ) @@ -709,7 +709,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav { // if the MouseMove handler changes the help window's visibility // the HelpRequest handler should not be called anymore - Window* pOldHelpTextWin = pSVData->maHelpData.mpHelpWin; + vcl::Window* pOldHelpTextWin = pSVData->maHelpData.mpHelpWin; pChild->ImplGetWindowImpl()->mbMouseMove = false; pChild->MouseMove( aMEvt ); if ( pOldHelpTextWin != pSVData->maHelpData.mpHelpWin ) @@ -831,7 +831,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav return bRet; } -static Window* ImplGetKeyInputWindow( Window* pWindow ) +static vcl::Window* ImplGetKeyInputWindow( vcl::Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -845,7 +845,7 @@ static Window* ImplGetKeyInputWindow( Window* pWindow ) // find window - is every time the window which has currently the // focus or the last time the focus. // the first floating window always has the focus - Window* pChild = pSVData->maWinData.mpFirstFloat; + vcl::Window* pChild = pSVData->maWinData.mpFirstFloat; if( !pChild || ( pChild->ImplGetWindowImpl()->mbFloatWin && !((FloatingWindow *)pChild)->GrabsFocus() ) ) pChild = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin; else @@ -872,7 +872,7 @@ static Window* ImplGetKeyInputWindow( Window* pWindow ) return pChild; } -static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, +static bool ImplHandleKey( vcl::Window* pWindow, sal_uInt16 nSVEvent, sal_uInt16 nKeyCode, sal_uInt16 nCharCode, sal_uInt16 nRepeat, bool bForward ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1001,7 +1001,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, } // find window - Window* pChild = ImplGetKeyInputWindow( pWindow ); + vcl::Window* pChild = ImplGetKeyInputWindow( pWindow ); if ( !pChild ) return false; @@ -1051,7 +1051,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, bool bToolboxFocus=false; if( (nCode == KEY_F1) && aKeyCode.IsShift() ) { - Window *pWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin; + vcl::Window *pWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin; while( pWin ) { if( pWin->ImplGetWindowImpl()->mbToolBox ) @@ -1159,13 +1159,13 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent, return nRet; } -static bool ImplHandleExtTextInput( Window* pWindow, +static bool ImplHandleExtTextInput( vcl::Window* pWindow, const OUString& rText, const sal_uInt16* pTextAttr, sal_Int32 nCursorPos, sal_uInt16 nCursorFlags ) { ImplSVData* pSVData = ImplGetSVData(); - Window* pChild = NULL; + vcl::Window* pChild = NULL; int nTries = 200; while( nTries-- ) @@ -1252,10 +1252,10 @@ static bool ImplHandleExtTextInput( Window* pWindow, return !ImplCallCommand( pChild, COMMAND_EXTTEXTINPUT, &aData ); } -static bool ImplHandleEndExtTextInput( Window* /* pWindow */ ) +static bool ImplHandleEndExtTextInput( vcl::Window* /* pWindow */ ) { ImplSVData* pSVData = ImplGetSVData(); - Window* pChild = pSVData->maWinData.mpExtTextInputWin; + vcl::Window* pChild = pSVData->maWinData.mpExtTextInputWin; bool nRet = false; if ( pChild ) @@ -1279,12 +1279,12 @@ static bool ImplHandleEndExtTextInput( Window* /* pWindow */ ) return nRet; } -static void ImplHandleExtTextInputPos( Window* pWindow, +static void ImplHandleExtTextInputPos( vcl::Window* pWindow, Rectangle& rRect, long& rInputWidth, bool * pVertical ) { ImplSVData* pSVData = ImplGetSVData(); - Window* pChild = pSVData->maWinData.mpExtTextInputWin; + vcl::Window* pChild = pSVData->maWinData.mpExtTextInputWin; if ( !pChild ) pChild = ImplGetKeyInputWindow( pWindow ); @@ -1325,14 +1325,14 @@ static void ImplHandleExtTextInputPos( Window* pWindow, = pChild != 0 && pChild->GetInputContext().GetFont().IsVertical(); } -static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang ) +static bool ImplHandleInputContextChange( vcl::Window* pWindow, LanguageType eNewLang ) { - Window* pChild = ImplGetKeyInputWindow( pWindow ); + vcl::Window* pChild = ImplGetKeyInputWindow( pWindow ); CommandInputContextData aData( eNewLang ); return !ImplCallCommand( pChild, COMMAND_INPUTCONTEXTCHANGE, &aData ); } -static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, +static bool ImplCallWheelCommand( vcl::Window* pWindow, const Point& rPos, const CommandWheelData* pWheelData ) { Point aCmdMousePos = pWindow->ImplFrameToOutput( rPos ); @@ -1354,7 +1354,7 @@ static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos, return false; } -static bool acceptableWheelScrollTarget(const Window *pMouseWindow) +static bool acceptableWheelScrollTarget(const vcl::Window *pMouseWindow) { return (pMouseWindow && pMouseWindow->IsInputEnabled() && !pMouseWindow->IsInModalMode()); } @@ -1370,10 +1370,10 @@ static bool shouldReusePreviousMouseWindow(const SalWheelMouseEvent& rPrevEvt, c return (rEvt.mnX == rPrevEvt.mnX && rEvt.mnY == rPrevEvt.mnY && rEvt.mnTime-rPrevEvt.mnTime < 500/*ms*/); } -static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEvt, bool scaleDirectly = false ) +static bool ImplHandleWheelEvent( vcl::Window* pWindow, const SalWheelMouseEvent& rEvt, bool scaleDirectly = false ) { static SalWheelMouseEvent aPreviousEvent; - static Window *pPreviousWindow; + static vcl::Window *pPreviousWindow; ImplDelData aDogTag( pWindow ); @@ -1409,7 +1409,7 @@ static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv // first check any floating window ( eg. drop down listboxes) bool bIsFloat = false; - Window *pMouseWindow = NULL; + vcl::Window *pMouseWindow = NULL; if ( pSVData->maWinData.mpFirstFloat && !pSVData->maWinData.mpCaptureWin && !pSVData->maWinData.mpFirstFloat->ImplIsFloatPopupModeWindow( pWindow ) ) { @@ -1463,7 +1463,7 @@ static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv // if the command was not handled try the focus window if ( bRet ) { - Window* pFocusWindow = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin; + vcl::Window* pFocusWindow = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin; if ( pFocusWindow && (pFocusWindow != pMouseWindow) && (pFocusWindow == pSVData->maWinData.mpFocusWin) ) { @@ -1499,13 +1499,13 @@ static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv #define IMPL_PAINT_CHECKRTL ((sal_uInt16)0x0020) -static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool bImmediateUpdate ) +static void ImplHandlePaint( vcl::Window* pWindow, const Rectangle& rBoundRect, bool bImmediateUpdate ) { // give up background save when system paints arrive - Window* pSaveBackWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFirstBackWin; + vcl::Window* pSaveBackWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFirstBackWin; while ( pSaveBackWin ) { - Window* pNext = pSaveBackWin->ImplGetWindowImpl()->mpOverlapData->mpNextBackWin; + vcl::Window* pNext = pSaveBackWin->ImplGetWindowImpl()->mpOverlapData->mpNextBackWin; Rectangle aRect( Point( pSaveBackWin->GetOutOffXPixel(), pSaveBackWin->GetOutOffYPixel() ), Size( pSaveBackWin->GetOutputWidthPixel(), pSaveBackWin->GetOutputHeightPixel() ) ); if ( aRect.IsOver( rBoundRect ) ) @@ -1529,11 +1529,11 @@ static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool } } -static void KillOwnPopups( Window* pWindow ) +static void KillOwnPopups( vcl::Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); - Window *pParent = pWindow->ImplGetWindowImpl()->mpFrameWindow; - Window *pChild = pSVData->maWinData.mpFirstFloat; + vcl::Window *pParent = pWindow->ImplGetWindowImpl()->mpFrameWindow; + vcl::Window *pChild = pSVData->maWinData.mpFirstFloat; if ( pChild && pParent->ImplIsWindowOrChild( pChild, true ) ) { if ( !(pSVData->maWinData.mpFirstFloat->GetPopupModeFlags() & FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE) ) @@ -1541,7 +1541,7 @@ static void KillOwnPopups( Window* pWindow ) } } -void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) +void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight ) { if( pWindow->GetStyle() & (WB_MOVEABLE|WB_SIZEABLE) ) { @@ -1608,7 +1608,7 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) pWindow->ImplGetWindowImpl()->mpFrameData->mbMinimized = bMinimized; } -static void ImplHandleMove( Window* pWindow ) +static void ImplHandleMove( vcl::Window* pWindow ) { if( pWindow->ImplGetWindowImpl()->mbFrame && pWindow->ImplIsFloatingWindow() && pWindow->IsReallyVisible() ) { @@ -1633,16 +1633,16 @@ static void ImplHandleMove( Window* pWindow ) } -static void ImplHandleMoveResize( Window* pWindow, long nNewWidth, long nNewHeight ) +static void ImplHandleMoveResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight ) { ImplHandleMove( pWindow ); ImplHandleResize( pWindow, nNewWidth, nNewHeight ); } -static void ImplActivateFloatingWindows( Window* pWindow, bool bActive ) +static void ImplActivateFloatingWindows( vcl::Window* pWindow, bool bActive ) { // First check all overlapping windows - Window* pTempWindow = pWindow->ImplGetWindowImpl()->mpFirstOverlap; + vcl::Window* pTempWindow = pWindow->ImplGetWindowImpl()->mpFirstOverlap; while ( pTempWindow ) { if ( !pTempWindow->GetActivateMode() ) @@ -1657,7 +1657,7 @@ static void ImplActivateFloatingWindows( Window* pWindow, bool bActive ) } } -IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) +IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl) { ImplGetWindowImpl()->mpFrameData->mnFocusId = 0; @@ -1694,7 +1694,7 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) if ( !bHandled ) { ImplSVData* pSVData = ImplGetSVData(); - Window* pTopLevelWindow = ImplGetWindowImpl()->mpFrameData->mpFocusWin->ImplGetFirstOverlapWindow(); + vcl::Window* pTopLevelWindow = ImplGetWindowImpl()->mpFrameData->mpFocusWin->ImplGetFirstOverlapWindow(); if ( ( ! pTopLevelWindow->IsInputEnabled() || pTopLevelWindow->IsInModalMode() ) && pSVData->maWinData.mpLastExecuteDlg ) pSVData->maWinData.mpLastExecuteDlg->ToTop( TOTOP_RESTOREWHENMIN | TOTOP_GRABFOCUSONLY); @@ -1707,7 +1707,7 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) } else { - Window* pFocusWin = ImplGetWindowImpl()->mpFrameData->mpFocusWin; + vcl::Window* pFocusWin = ImplGetWindowImpl()->mpFrameData->mpFocusWin; if ( pFocusWin ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1715,7 +1715,7 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) if ( pSVData->maWinData.mpFocusWin == pFocusWin ) { // FocusWindow umsetzen - Window* pOverlapWindow = pFocusWin->ImplGetFirstOverlapWindow(); + vcl::Window* pOverlapWindow = pFocusWin->ImplGetFirstOverlapWindow(); pOverlapWindow->ImplGetWindowImpl()->mpLastFocusWindow = pFocusWin; pSVData->maWinData.mpFocusWin = NULL; @@ -1723,11 +1723,11 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide( true ); // Deaktivate rufen - Window* pOldFocusWindow = pFocusWin; + vcl::Window* pOldFocusWindow = pFocusWin; if ( pOldFocusWindow ) { - Window* pOldOverlapWindow = pOldFocusWindow->ImplGetFirstOverlapWindow(); - Window* pOldRealWindow = pOldOverlapWindow->ImplGetWindow(); + vcl::Window* pOldOverlapWindow = pOldFocusWindow->ImplGetFirstOverlapWindow(); + vcl::Window* pOldRealWindow = pOldOverlapWindow->ImplGetWindow(); pOldOverlapWindow->ImplGetWindowImpl()->mbActive = false; pOldOverlapWindow->Deactivate(); @@ -1765,7 +1765,7 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl) return 0; } -static void ImplHandleGetFocus( Window* pWindow ) +static void ImplHandleGetFocus( vcl::Window* pWindow ) { pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus = true; @@ -1774,14 +1774,14 @@ static void ImplHandleGetFocus( Window* pWindow ) if ( !pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId ) { pWindow->ImplGetWindowImpl()->mpFrameData->mbStartFocusState = !pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus; - pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId = Application::PostUserEvent( LINK( pWindow, Window, ImplAsyncFocusHdl ) ); - Window* pFocusWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin; + pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId = Application::PostUserEvent( LINK( pWindow, vcl::Window, ImplAsyncFocusHdl ) ); + vcl::Window* pFocusWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin; if ( pFocusWin && pFocusWin->ImplGetWindowImpl()->mpCursor ) pFocusWin->ImplGetWindowImpl()->mpCursor->ImplShow(); } } -static void ImplHandleLoseFocus( Window* pWindow ) +static void ImplHandleLoseFocus( vcl::Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1811,17 +1811,17 @@ static void ImplHandleLoseFocus( Window* pWindow ) if ( !pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId ) { pWindow->ImplGetWindowImpl()->mpFrameData->mbStartFocusState = !pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus; - pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId = Application::PostUserEvent( LINK( pWindow, Window, ImplAsyncFocusHdl ) ); + pWindow->ImplGetWindowImpl()->mpFrameData->mnFocusId = Application::PostUserEvent( LINK( pWindow, vcl::Window, ImplAsyncFocusHdl ) ); } - Window* pFocusWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin; + vcl::Window* pFocusWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFocusWin; if ( pFocusWin && pFocusWin->ImplGetWindowImpl()->mpCursor ) pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide( true ); } struct DelayedCloseEvent { - Window* pWindow; + vcl::Window* pWindow; ImplDelData aDelData; }; @@ -1843,7 +1843,7 @@ static long DelayedCloseEventLink( void* pCEvent, void* ) return 0; } -void ImplHandleClose( Window* pWindow ) +void ImplHandleClose( vcl::Window* pWindow ) { ImplSVData* pSVData = ImplGetSVData(); @@ -1875,7 +1875,7 @@ void ImplHandleClose( Window* pWindow ) if (bWasPopup) return; - Window *pWin = pWindow->ImplGetWindow(); + vcl::Window *pWin = pWindow->ImplGetWindow(); SystemWindow* pSysWin = dynamic_cast<SystemWindow*>(pWin); if (pSysWin) { @@ -1948,7 +1948,7 @@ static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent ) return nMode; } -inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent ) +inline bool ImplHandleSalMouseLeave( vcl::Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, true, pEvent->mnX, pEvent->mnY, @@ -1956,7 +1956,7 @@ inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseMoveMode( pEvent ) ); } -inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent ) +inline bool ImplHandleSalMouseMove( vcl::Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, false, pEvent->mnX, pEvent->mnY, @@ -1964,7 +1964,7 @@ inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseMoveMode( pEvent ) ); } -inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent ) +inline bool ImplHandleSalMouseButtonDown( vcl::Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONDOWN, false, pEvent->mnX, pEvent->mnY, @@ -1977,7 +1977,7 @@ inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent ImplGetMouseButtonMode( pEvent ) ); } -inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent ) +inline bool ImplHandleSalMouseButtonUp( vcl::Window* pWindow, SalMouseEvent* pEvent ) { return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONUP, false, pEvent->mnX, pEvent->mnY, @@ -1990,16 +1990,16 @@ inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent ) ImplGetMouseButtonMode( pEvent ) ); } -static bool ImplHandleSalMouseActivate( Window* /*pWindow*/, SalMouseActivateEvent* /*pEvent*/ ) +static bool ImplHandleSalMouseActivate( vcl::Window* /*pWindow*/, SalMouseActivateEvent* /*pEvent*/ ) { return false; } -static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt16 nEvent ) +static bool ImplHandleMenuEvent( vcl::Window* pWindow, SalMenuEvent* pEvent, sal_uInt16 nEvent ) { // Find SystemWindow and its Menubar and let it dispatch the command bool nRet = false; - Window *pWin = pWindow->ImplGetWindowImpl()->mpFirstChild; + vcl::Window *pWin = pWindow->ImplGetWindowImpl()->mpFirstChild; while ( pWin ) { if ( pWin->ImplGetWindowImpl()->mbSysWin ) @@ -2036,10 +2036,10 @@ static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt return nRet; } -static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) +static void ImplHandleSalKeyMod( vcl::Window* pWindow, SalKeyModEvent* pEvent ) { ImplSVData* pSVData = ImplGetSVData(); - Window* pTrackWin = pSVData->maWinData.mpTrackWin; + vcl::Window* pTrackWin = pSVData->maWinData.mpTrackWin; if ( pTrackWin ) pWindow = pTrackWin; #ifdef MACOSX @@ -2061,7 +2061,7 @@ static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) // #105224# send commandevent to allow special treatment of Ctrl-LeftShift/Ctrl-RightShift etc. // find window - Window* pChild = ImplGetKeyInputWindow( pWindow ); + vcl::Window* pChild = ImplGetKeyInputWindow( pWindow ); if ( !pChild ) return; @@ -2073,10 +2073,10 @@ static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent ) } } -static void ImplHandleInputLanguageChange( Window* pWindow ) +static void ImplHandleInputLanguageChange( vcl::Window* pWindow ) { // find window - Window* pChild = ImplGetKeyInputWindow( pWindow ); + vcl::Window* pChild = ImplGetKeyInputWindow( pWindow ); if ( !pChild ) return; @@ -2135,7 +2135,7 @@ static void ImplHandleSalSettings( sal_uInt16 nEvent ) } } -static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEvent* pEvt ) +static void ImplHandleSalExtTextInputPos( vcl::Window* pWindow, SalExtTextInputPosEvent* pEvt ) { Rectangle aCursorRect; ImplHandleExtTextInputPos( pWindow, aCursorRect, pEvt->mnExtWidth, &pEvt->mbVertical ); @@ -2155,14 +2155,14 @@ static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEve } } -static bool ImplHandleShowDialog( Window* pWindow, int nDialogId ) +static bool ImplHandleShowDialog( vcl::Window* pWindow, int nDialogId ) { if( ! pWindow ) return false; if( pWindow->GetType() == WINDOW_BORDERWINDOW ) { - Window* pWrkWin = pWindow->GetWindow( WINDOW_CLIENT ); + vcl::Window* pWrkWin = pWindow->GetWindow( WINDOW_CLIENT ); if( pWrkWin ) pWindow = pWrkWin; } @@ -2170,11 +2170,11 @@ static bool ImplHandleShowDialog( Window* pWindow, int nDialogId ) return ImplCallCommand( pWindow, COMMAND_SHOWDIALOG, &aCmdData ); } -static void ImplHandleSurroundingTextRequest( Window *pWindow, +static void ImplHandleSurroundingTextRequest( vcl::Window *pWindow, OUString& rText, Selection &rSelRange ) { - Window* pChild = ImplGetKeyInputWindow( pWindow ); + vcl::Window* pChild = ImplGetKeyInputWindow( pWindow ); if ( !pChild ) { @@ -2191,7 +2191,7 @@ static void ImplHandleSurroundingTextRequest( Window *pWindow, } } -static void ImplHandleSalSurroundingTextRequest( Window *pWindow, +static void ImplHandleSalSurroundingTextRequest( vcl::Window *pWindow, SalSurroundingTextRequestEvent *pEvt ) { Selection aSelRange; @@ -2214,11 +2214,11 @@ static void ImplHandleSalSurroundingTextRequest( Window *pWindow, pEvt->mnEnd = aSelRange.Max(); } -static void ImplHandleSurroundingTextSelectionChange( Window *pWindow, +static void ImplHandleSurroundingTextSelectionChange( vcl::Window *pWindow, sal_uLong nStart, sal_uLong nEnd ) { - Window* pChild = ImplGetKeyInputWindow( pWindow ); + vcl::Window* pChild = ImplGetKeyInputWindow( pWindow ); if( pChild ) { CommandSelectionChangeData data( nStart, nEnd ); @@ -2226,14 +2226,14 @@ static void ImplHandleSurroundingTextSelectionChange( Window *pWindow, } } -static void ImplHandleStartReconversion( Window *pWindow ) +static void ImplHandleStartReconversion( vcl::Window *pWindow ) { - Window* pChild = ImplGetKeyInputWindow( pWindow ); + vcl::Window* pChild = ImplGetKeyInputWindow( pWindow ); if( pChild ) ImplCallCommand( pChild, COMMAND_PREPARERECONVERSION ); } -static void ImplHandleSalQueryCharPosition( Window *pWindow, +static void ImplHandleSalQueryCharPosition( vcl::Window *pWindow, SalQueryCharPositionEvent *pEvt ) { pEvt->mbValid = false; @@ -2244,7 +2244,7 @@ static void ImplHandleSalQueryCharPosition( Window *pWindow, pEvt->mnCursorBoundHeight = 0; ImplSVData* pSVData = ImplGetSVData(); - Window* pChild = pSVData->maWinData.mpExtTextInputWin; + vcl::Window* pChild = pSVData->maWinData.mpExtTextInputWin; if ( !pChild ) pChild = ImplGetKeyInputWindow( pWindow ); @@ -2276,7 +2276,7 @@ static void ImplHandleSalQueryCharPosition( Window *pWindow, } } -bool ImplWindowFrameProc( Window* pWindow, SalFrame* /*pFrame*/, +bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/, sal_uInt16 nEvent, const void* pEvent ) { DBG_TESTSOLARMUTEX(); diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 9b614ea12181..33515067570e 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -43,7 +43,7 @@ void WorkWindow::ImplInitWorkWindowData() mbFullScreenMode = false; } -void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ) +void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ) { sal_uInt16 nFrameStyle = BORDERWINDOW_STYLE_FRAME; if ( nStyle & WB_APP ) @@ -67,14 +67,14 @@ void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pS SetActivateMode( ACTIVATE_MODE_GRABFOCUS ); } -void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ) +void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ) { if( aSystemWorkWindowToken.hasValue() ) { ::com::sun::star::uno::Sequence< sal_Int8 > aSeq; aSystemWorkWindowToken >>= aSeq; SystemParentData* pData = (SystemParentData*)aSeq.getArray(); - DBG_ASSERT( aSeq.getLength() == sizeof( SystemParentData ) && pData->nSize == sizeof( SystemParentData ), "WorkWindow::WorkWindow( Window*, const Any&, WinBits ) called with invalid Any" ); + DBG_ASSERT( aSeq.getLength() == sizeof( SystemParentData ) && pData->nSize == sizeof( SystemParentData ), "WorkWindow::WorkWindow( vcl::Window*, const Any&, WinBits ) called with invalid Any" ); // init with style 0 as does WorkWindow::WorkWindow( SystemParentData* ); ImplInit( pParent, 0, pData ); } @@ -88,14 +88,14 @@ WorkWindow::WorkWindow( WindowType nType ) : ImplInitWorkWindowData(); } -WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) : +WorkWindow::WorkWindow( vcl::Window* pParent, WinBits nStyle ) : SystemWindow( WINDOW_WORKWINDOW ) { ImplInitWorkWindowData(); ImplInit( pParent, nStyle, NULL ); } -WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) : +WorkWindow::WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) : SystemWindow( WINDOW_WORKWINDOW ) { ImplInitWorkWindowData(); diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index 1679306486b2..fc219b7b3142 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -176,8 +176,8 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : && SupportInputMethodStyle( pInputMethod->GetSupportedStyles() ) ) { const SystemEnvData* pEnv = pFrame->GetSystemData(); - XLIB_Window aClientWindow = pEnv->aShellWindow; - XLIB_Window aFocusWindow = pEnv->aWindow; + ::Window aClientWindow = pEnv->aShellWindow; + ::Window aFocusWindow = pEnv->aWindow; // for status callbacks and commit string callbacks #define PREEDIT_BUFSZ 16 @@ -420,7 +420,7 @@ SalI18N_InputContext::HandleDestroyIM() // called once on each frame, it relys on a valid maContext void -SalI18N_InputContext::ExtendEventMask( XLIB_Window aFocusWindow ) +SalI18N_InputContext::ExtendEventMask( ::Window aFocusWindow ) { unsigned long nIMEventMask; XWindowAttributes aWindowAttributes; @@ -587,8 +587,8 @@ SalI18N_InputContext::SetICFocus( SalFrame* pFocusFrame ) maClientData.pFrame = pFocusFrame; const SystemEnvData* pEnv = pFocusFrame->GetSystemData(); - XLIB_Window aClientWindow = pEnv->aShellWindow; - XLIB_Window aFocusWindow = pEnv->aWindow; + ::Window aClientWindow = pEnv->aShellWindow; + ::Window aFocusWindow = pEnv->aWindow; XSetICValues( maContext, XNFocusWindow, aFocusWindow, diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx index 7e1587386546..0cd33d220168 100644 --- a/vcl/unx/generic/app/i18n_im.cxx +++ b/vcl/unx/generic/app/i18n_im.cxx @@ -378,7 +378,7 @@ SalI18N_InputMethod::CreateMethod ( Display *pDisplay ) // give IM the opportunity to look at the event, and possibly hide it bool -SalI18N_InputMethod::FilterEvent( XEvent *pEvent, XLIB_Window window ) +SalI18N_InputMethod::FilterEvent( XEvent *pEvent, ::Window window ) { if (!mbUseable) return False; diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index b0d5e8eb9a8a..2291f6be95f4 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -195,9 +195,9 @@ Point XIMStatusWindow::updatePosition() SalExtTextInputPosEvent aPosEvent; m_pLastParent->CallCallback( SALEVENT_EXTTEXTINPUTPOS, (void*)&aPosEvent ); int x, y; - XLIB_Window aChild; + ::Window aChild; XTranslateCoordinates( (Display*)pParentEnvData->pDisplay, - (XLIB_Window)pParentEnvData->aShellWindow, + (::Window)pParentEnvData->aShellWindow, GetGenericData()->GetSalDisplay()->GetRootWindow( GetGenericData()->GetSalDisplay()->GetDefaultXScreen() ), 0, 0, &x, &y, @@ -269,7 +269,7 @@ IMPL_LINK_NOARG(XIMStatusWindow, DelayedShowHdl) if( m_bDelayedShow ) { XRaiseWindow( (Display*)pData->pDisplay, - (XLIB_Window)pData->aShellWindow ); + (::Window)pData->aShellWindow ); } return 0; } @@ -351,7 +351,7 @@ IIIMPStatusWindow::IIIMPStatusWindow( SalFrame* pParent, bool bOn ) : if( nDistance < 20 ) nDistance = 20; XMoveWindow( (Display*)pEnvData->pDisplay, - (XLIB_Window)pEnvData->aShellWindow, + (::Window)pEnvData->aShellWindow, rGeom.nX, rGeom.nY + rGeom.nHeight + nDistance ); @@ -441,7 +441,7 @@ void IIIMPStatusWindow::GetFocus() const SystemEnvData* pParentEnvData = m_pResetFocus->GetSystemData(); GetGenericData()->ErrorTrapPush(); XSetInputFocus( (Display*)pParentEnvData->pDisplay, - (XLIB_Window)pParentEnvData->aShellWindow, + (::Window)pParentEnvData->aShellWindow, RevertToNone, CurrentTime ); @@ -471,7 +471,7 @@ IMPL_LINK( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn ) const SystemEnvData* pEnv = pParent->GetSystemData(); GetGenericData()->ErrorTrapPush(); XSetInputFocus( (Display*)pEnv->pDisplay, - (XLIB_Window)pEnv->aShellWindow, + (::Window)pEnv->aShellWindow, RevertToNone, CurrentTime ); diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx index ee3cc914ffb5..82e94a544b27 100644 --- a/vcl/unx/generic/app/randrwrapper.cxx +++ b/vcl/unx/generic/app/randrwrapper.cxx @@ -39,11 +39,11 @@ class RandRWrapper Bool(*m_pXRRQueryExtension)(Display*,int*,int*); XRRScreenConfiguration*(*m_pXRRGetScreenInfo)(Display*,Drawable); void(*m_pXRRFreeScreenConfigInfo)(XRRScreenConfiguration*); - void(*m_pXRRSelectInput)(Display*,XLIB_Window,int); + void(*m_pXRRSelectInput)(Display*,::Window,int); int(*m_pXRRUpdateConfiguration)(XEvent*); XRRScreenSize*(*m_pXRRConfigSizes)(XRRScreenConfiguration*,int*); SizeID(*m_pXRRConfigCurrentConfiguration)(XRRScreenConfiguration*,Rotation*); - int(*m_pXRRRootToScreen)(Display*, XLIB_Window); + int(*m_pXRRRootToScreen)(Display*, ::Window); bool m_bValid; @@ -71,7 +71,7 @@ public: if( m_bValid ) m_pXRRFreeScreenConfigInfo( i_pConfig ); } - void XRRSelectInput( Display* i_pDisp, XLIB_Window i_window, int i_nMask ) + void XRRSelectInput( Display* i_pDisp, ::Window i_window, int i_nMask ) { if( m_bValid ) m_pXRRSelectInput( i_pDisp, i_window, i_nMask ); @@ -88,7 +88,7 @@ public: { return m_bValid ? m_pXRRConfigCurrentConfiguration( i_pConfig, o_pRot ) : 0; } - int XRRRootToScreen( Display *dpy, XLIB_Window root ) + int XRRRootToScreen( Display *dpy, ::Window root ) { return m_bValid ? m_pXRRRootToScreen( dpy, root ) : -1; } @@ -99,11 +99,11 @@ void RandRWrapper::initFromModule() m_pXRRQueryExtension = (Bool(*)(Display*,int*,int*))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRQueryExtension" ); m_pXRRGetScreenInfo = (XRRScreenConfiguration*(*)(Display*,Drawable))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRGetScreenInfo" ); m_pXRRFreeScreenConfigInfo = (void(*)(XRRScreenConfiguration*))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRFreeScreenConfigInfo" ); - m_pXRRSelectInput = (void(*)(Display*,XLIB_Window,int))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRSelectInput" ); + m_pXRRSelectInput = (void(*)(Display*,::Window,int))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRSelectInput" ); m_pXRRUpdateConfiguration = (int(*)(XEvent*))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRUpdateConfiguration" ); m_pXRRConfigSizes = (XRRScreenSize*(*)(XRRScreenConfiguration*,int*))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRConfigSizes" ); m_pXRRConfigCurrentConfiguration = (SizeID(*)(XRRScreenConfiguration*,Rotation*))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRConfigCurrentConfiguration" ); - m_pXRRRootToScreen = (int(*)(Display*,XLIB_Window))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRRootToScreen" ); + m_pXRRRootToScreen = (int(*)(Display*,::Window))osl_getAsciiFunctionSymbol( m_pRandRLib, "XRRRootToScreen" ); m_bValid = m_pXRRQueryExtension && m_pXRRGetScreenInfo && @@ -197,7 +197,7 @@ public: if( m_bValid ) ::XRRFreeScreenConfigInfo( i_pConfig ); } - void XRRSelectInput( Display* i_pDisp, XLIB_Window i_window, int i_nMask ) + void XRRSelectInput( Display* i_pDisp, ::Window i_window, int i_nMask ) { if( m_bValid ) ::XRRSelectInput( i_pDisp, i_window, i_nMask ); @@ -214,7 +214,7 @@ public: { return m_bValid ? ::XRRConfigCurrentConfiguration( i_pConfig, o_pRot ) : 0; } - int XRRRootToScreen( Display *dpy, XLIB_Window root ) + int XRRRootToScreen( Display *dpy, ::Window root ) { return m_bValid ? ::XRRRootToScreen( dpy, root ) : -1; } @@ -255,7 +255,7 @@ void RandRWrapper::releaseWrapper() #include <cstdio> #endif -void SalDisplay::InitRandR( XLIB_Window aRoot ) const +void SalDisplay::InitRandR( ::Window aRoot ) const { #ifdef USE_RANDR if( m_bUseRandRWrapper ) diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index ee6aad78d4e2..325062954cdb 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -1830,7 +1830,7 @@ int SalDisplay::CaptureMouse( SalFrame *pCapture ) if( !pEnv || !*pEnv ) { int ret = XGrabPointer( GetDisplay(), - (XLIB_Window)pEnvData->aWindow, + (::Window)pEnvData->aWindow, False, PointerMotionMask| ButtonPressMask|ButtonReleaseMask, GrabModeAsync, @@ -1889,7 +1889,7 @@ bool SalX11Display::Dispatch( XEvent *pEvent ) { if( pEvent->type == XLIB_KeyPress || pEvent->type == KeyRelease ) { - XLIB_Window aWindow = pEvent->xkey.window; + ::Window aWindow = pEvent->xkey.window; std::list< SalFrame* >::const_iterator it; for( it = m_aFrames.begin(); it != m_aFrames.end(); ++it ) @@ -1969,7 +1969,7 @@ bool SalX11Display::Dispatch( XEvent *pEvent ) for( it = m_aFrames.begin(); it != m_aFrames.end(); ++it ) { X11SalFrame* pFrame = static_cast< X11SalFrame* >(*it); - XLIB_Window aDispatchWindow = pEvent->xany.window; + ::Window aDispatchWindow = pEvent->xany.window; if( pFrame->GetWindow() == aDispatchWindow || pFrame->GetShellWindow() == aDispatchWindow || pFrame->GetForeignParent() == aDispatchWindow diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx index 5ce45b825580..4c0536f9f5cf 100644 --- a/vcl/unx/generic/app/sm.cxx +++ b/vcl/unx/generic/app/sm.cxx @@ -263,7 +263,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SessionManagerClient, SaveYourselfHdl, void*, pStat const std::list< SalFrame* >& rFrames = GetGenericData()->GetSalDisplay()->getFrames(); for( std::list< SalFrame* >::const_iterator it = rFrames.begin(); it != rFrames.end(); ++it ) { - Window *pWindow = (*it)->GetWindow(); + vcl::Window *pWindow = (*it)->GetWindow(); if (pWindow && pWindow->IsVisible()) { *pSmRestartHint = SmRestartIfRunning; diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 4d67081bd683..20bb31e3a801 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -539,7 +539,7 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDisplay* pSalDisplay ) : // check for GnomeWM if( m_aWMAtoms[ WIN_SUPPORTING_WM_CHECK ] && m_aWMAtoms[ WIN_PROTOCOLS ] ) { - XLIB_Window aWMChild = None; + ::Window aWMChild = None; if( XGetWindowProperty( m_pDisplay, m_pSalDisplay->GetRootWindow( m_pSalDisplay->GetDefaultXScreen() ), m_aWMAtoms[ WIN_SUPPORTING_WM_CHECK ], @@ -556,10 +556,10 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDisplay* pSalDisplay ) : && nItems != 0 ) { - aWMChild = *(XLIB_Window*)pProperty; + aWMChild = *(::Window*)pProperty; XFree( pProperty ); pProperty = NULL; - XLIB_Window aCheckWindow = None; + ::Window aCheckWindow = None; GetGenericData()->ErrorTrapPush(); if( XGetWindowProperty( m_pDisplay, aWMChild, @@ -580,7 +580,7 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDisplay* pSalDisplay ) : { GetGenericData()->ErrorTrapPush(); - aCheckWindow = *(XLIB_Window*)pProperty; + aCheckWindow = *(::Window*)pProperty; XFree( pProperty ); pProperty = NULL; if( aCheckWindow == aWMChild ) @@ -744,7 +744,7 @@ bool WMAdaptor::getNetWmName() if( m_aWMAtoms[ NET_SUPPORTING_WM_CHECK ] && m_aWMAtoms[ NET_WM_NAME ] ) { - XLIB_Window aWMChild = None; + ::Window aWMChild = None; if( XGetWindowProperty( m_pDisplay, m_pSalDisplay->GetRootWindow( m_pSalDisplay->GetDefaultXScreen() ), m_aWMAtoms[ NET_SUPPORTING_WM_CHECK ], @@ -761,10 +761,10 @@ bool WMAdaptor::getNetWmName() && nItems != 0 ) { - aWMChild = *(XLIB_Window*)pProperty; + aWMChild = *(::Window*)pProperty; XFree( pProperty ); pProperty = NULL; - XLIB_Window aCheckWindow = None; + ::Window aCheckWindow = None; GetGenericData()->ErrorTrapPush(); if( XGetWindowProperty( m_pDisplay, aWMChild, @@ -784,7 +784,7 @@ bool WMAdaptor::getNetWmName() if ( ! GetGenericData()->ErrorTrapPop( false ) ) { GetGenericData()->ErrorTrapPush(); - aCheckWindow = *(XLIB_Window*)pProperty; + aCheckWindow = *(::Window*)pProperty; XFree( pProperty ); pProperty = NULL; if( aCheckWindow == aWMChild ) @@ -1050,7 +1050,7 @@ void WMAdaptor::setWMName( X11SalFrame* pFrame, const OUString& rWMName ) const int nBytes = aProp.nitems ? aProp.nitems : aTitle.getLength(); const SystemEnvData* pEnv = pFrame->GetSystemData(); XChangeProperty( m_pDisplay, - (XLIB_Window)pEnv->aShellWindow, + (::Window)pEnv->aShellWindow, XA_WM_NAME, nType, nFormat, @@ -1058,7 +1058,7 @@ void WMAdaptor::setWMName( X11SalFrame* pFrame, const OUString& rWMName ) const pData, nBytes ); XChangeProperty( m_pDisplay, - (XLIB_Window)pEnv->aShellWindow, + (::Window)pEnv->aShellWindow, XA_WM_ICON_NAME, nType, nFormat, @@ -1066,7 +1066,7 @@ void WMAdaptor::setWMName( X11SalFrame* pFrame, const OUString& rWMName ) const pData, nBytes ); XChangeProperty( m_pDisplay, - (XLIB_Window)pEnv->aShellWindow, + (::Window)pEnv->aShellWindow, m_aWMAtoms[ WM_LOCALE_NAME ], XA_STRING, 8, @@ -1092,7 +1092,7 @@ void NetWMAdaptor::setWMName( X11SalFrame* pFrame, const OUString& rWMName ) con const SystemEnvData* pEnv = pFrame->GetSystemData(); if( m_aWMAtoms[ NET_WM_NAME ] ) XChangeProperty( m_pDisplay, - (XLIB_Window)pEnv->aShellWindow, + (::Window)pEnv->aShellWindow, m_aWMAtoms[ NET_WM_NAME ], m_aWMAtoms[ UTF8_STRING ], 8, @@ -1101,7 +1101,7 @@ void NetWMAdaptor::setWMName( X11SalFrame* pFrame, const OUString& rWMName ) con aTitle.getLength() ); if( m_aWMAtoms[ NET_WM_ICON_NAME ] ) XChangeProperty( m_pDisplay, - (XLIB_Window)pEnv->aShellWindow, + (::Window)pEnv->aShellWindow, m_aWMAtoms[ NET_WM_ICON_NAME ], m_aWMAtoms[ UTF8_STRING ], 8, @@ -1801,7 +1801,7 @@ void WMAdaptor::changeReferenceFrame( X11SalFrame* pFrame, X11SalFrame* pReferen && ! pFrame->IsFloatGrabWindow() ) { - XLIB_Window aTransient = pFrame->pDisplay_->GetRootWindow( pFrame->GetScreenNumber() ); + ::Window aTransient = pFrame->pDisplay_->GetRootWindow( pFrame->GetScreenNumber() ); pFrame->mbTransientForRoot = true; if( pReferenceFrame ) { @@ -2102,7 +2102,7 @@ void NetWMAdaptor::showFullScreen( X11SalFrame* pFrame, bool bFullScreen ) const { if( m_pSalDisplay->IsXinerama() ) { - XLIB_Window aRoot, aChild; + ::Window aRoot, aChild; int root_x = 0, root_y = 0, lx, ly; unsigned int mask; XQueryPointer( m_pDisplay, @@ -2180,7 +2180,7 @@ int WMAdaptor::getCurrentWorkArea() const /* * WMAdaptor::getWindowWorkArea */ -int WMAdaptor::getWindowWorkArea( XLIB_Window aWindow ) const +int WMAdaptor::getWindowWorkArea( ::Window aWindow ) const { int nCurrent = -1; if( m_aWMAtoms[ NET_WM_DESKTOP ] ) diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index aa1c84a30846..163d48eadb43 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -72,7 +72,7 @@ static bool is_gnome_desktop( Display* pDisplay ) if( nUTFAtom && nNetWMNameAtom ) { // another, more expensive check: search for a gnome-panel - XLIB_Window aRoot, aParent, *pChildren = NULL; + ::Window aRoot, aParent, *pChildren = NULL; unsigned int nChildren = 0; XQueryTree( pDisplay, DefaultRootWindow( pDisplay ), &aRoot, &aParent, &pChildren, &nChildren ); diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx index 19df17212532..3a8f67a0d037 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.cxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx @@ -28,7 +28,7 @@ using namespace x11; */ DropTargetDropContext::DropTargetDropContext( - XLIB_Window aDropWindow, + ::Window aDropWindow, XLIB_Time aTimestamp, SelectionManager& rManager ) : m_aDropWindow( aDropWindow ), @@ -62,7 +62,7 @@ void DropTargetDropContext::dropComplete( sal_Bool success ) throw(std::exceptio */ DropTargetDragContext::DropTargetDragContext( - XLIB_Window aDropWindow, + ::Window aDropWindow, XLIB_Time aTimestamp, SelectionManager& rManager ) : m_aDropWindow( aDropWindow ), @@ -91,7 +91,7 @@ void DropTargetDragContext::rejectDrag() throw(std::exception) */ DragSourceContext::DragSourceContext( - XLIB_Window aDropWindow, + ::Window aDropWindow, XLIB_Time aTimestamp, SelectionManager& rManager ) : m_aDropWindow( aDropWindow ), diff --git a/vcl/unx/generic/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx index 3b9138bb7981..bf162092024d 100644 --- a/vcl/unx/generic/dtrans/X11_dndcontext.hxx +++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx @@ -38,12 +38,12 @@ namespace x11 { ::com::sun::star::datatransfer::dnd::XDropTargetDropContext > { - XLIB_Window m_aDropWindow; + ::Window m_aDropWindow; XLIB_Time m_nTimestamp; SelectionManager& m_rManager; com::sun::star::uno::Reference< XInterface > m_xManagerRef; public: - DropTargetDropContext( XLIB_Window, XLIB_Time, SelectionManager& ); + DropTargetDropContext( ::Window, XLIB_Time, SelectionManager& ); virtual ~DropTargetDropContext(); // XDropTargetDropContext @@ -57,12 +57,12 @@ namespace x11 { ::com::sun::star::datatransfer::dnd::XDropTargetDragContext > { - XLIB_Window m_aDropWindow; + ::Window m_aDropWindow; XLIB_Time m_nTimestamp; SelectionManager& m_rManager; com::sun::star::uno::Reference< XInterface > m_xManagerRef; public: - DropTargetDragContext( XLIB_Window, XLIB_Time, SelectionManager& ); + DropTargetDragContext( ::Window, XLIB_Time, SelectionManager& ); virtual ~DropTargetDragContext(); // XDropTargetDragContext @@ -75,12 +75,12 @@ namespace x11 { ::com::sun::star::datatransfer::dnd::XDragSourceContext > { - XLIB_Window m_aDropWindow; + ::Window m_aDropWindow; XLIB_Time m_nTimestamp; SelectionManager& m_rManager; com::sun::star::uno::Reference< XInterface > m_xManagerRef; public: - DragSourceContext( XLIB_Window, XLIB_Time, SelectionManager& ); + DragSourceContext( ::Window, XLIB_Time, SelectionManager& ); virtual ~DragSourceContext(); // XDragSourceContext diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 3bcc984f13c4..4082bab94404 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -876,7 +876,7 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In if( it == m_aSelections.end() ) return false; - XLIB_Window aSelectionOwner = XGetSelectionOwner( m_pDisplay, selection ); + ::Window aSelectionOwner = XGetSelectionOwner( m_pDisplay, selection ); if( aSelectionOwner == None ) return false; if( aSelectionOwner == m_aWindow ) @@ -1423,7 +1423,7 @@ static sal_Size GetTrueFormatSize(int nFormat) } bool SelectionManager::sendData( SelectionAdaptor* pAdaptor, - XLIB_Window requestor, + ::Window requestor, Atom target, Atom property, Atom selection ) @@ -1510,7 +1510,7 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor, { #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "using INCR protocol\n" ); - boost::unordered_map< XLIB_Window, boost::unordered_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor ); + boost::unordered_map< ::Window, boost::unordered_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor ); if( win_it != m_aIncrementals.end() ) { boost::unordered_map< Atom, IncrementalTransfer >::const_iterator inc_it = win_it->second.find( property ); @@ -1904,7 +1904,7 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify ) // feed incrementals if( rNotify.state == PropertyDelete ) { - boost::unordered_map< XLIB_Window, boost::unordered_map< Atom, IncrementalTransfer > >::iterator it; + boost::unordered_map< ::Window, boost::unordered_map< Atom, IncrementalTransfer > >::iterator it; it = m_aIncrementals.find( rNotify.window ); if( it != m_aIncrementals.end() ) { @@ -2082,12 +2082,12 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) osl::ResettableMutexGuard aGuard(m_aMutex); // handle drop related events - XLIB_Window aSource = rMessage.data.l[0]; - XLIB_Window aTarget = rMessage.window; + ::Window aSource = rMessage.data.l[0]; + ::Window aTarget = rMessage.window; bool bHandled = false; - ::boost::unordered_map< XLIB_Window, DropTargetEntry >::iterator it = + ::boost::unordered_map< ::Window, DropTargetEntry >::iterator it = m_aDropTargets.find( aTarget ); #if OSL_DEBUG_LEVEL > 1 @@ -2101,7 +2101,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) fprintf( stderr, "but no target found\n" ); else if( ! it->second.m_pTarget->m_bActive ) fprintf( stderr, "but target is inactive\n" ); - else if( m_aDropEnterEvent.data.l[0] != None && (XLIB_Window)m_aDropEnterEvent.data.l[0] != aSource ) + else if( m_aDropEnterEvent.data.l[0] != None && (::Window)m_aDropEnterEvent.data.l[0] != aSource ) fprintf( stderr, "but source 0x%lx is unknown (expected 0x%lx or 0)\n", aSource, m_aDropEnterEvent.data.l[0] ); else fprintf( stderr, "processing.\n" ); @@ -2122,7 +2122,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) if( it != m_aDropTargets.end() && it->second.m_pTarget->m_bActive && - ( m_aDropEnterEvent.data.l[0] == None || XLIB_Window(m_aDropEnterEvent.data.l[0]) == aSource ) + ( m_aDropEnterEvent.data.l[0] == None || ::Window(m_aDropEnterEvent.data.l[0]) == aSource ) ) { if( rMessage.message_type == m_nXdndEnter ) @@ -2138,7 +2138,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) } else if( rMessage.message_type == m_nXdndPosition && - aSource == XLIB_Window(m_aDropEnterEvent.data.l[0]) + aSource == ::Window(m_aDropEnterEvent.data.l[0]) ) { bHandled = true; @@ -2146,7 +2146,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) if( ! m_bDropEnterSent ) m_nDropTimestamp = m_nDropTime; - XLIB_Window aChild; + ::Window aChild; XTranslateCoordinates( m_pDisplay, it->second.m_aRootWindow, it->first, @@ -2194,7 +2194,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) } else if( rMessage.message_type == m_nXdndLeave && - aSource == XLIB_Window(m_aDropEnterEvent.data.l[0]) + aSource == ::Window(m_aDropEnterEvent.data.l[0]) ) { bHandled = true; @@ -2212,7 +2212,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) } else if( rMessage.message_type == m_nXdndDrop && - aSource == XLIB_Window(m_aDropEnterEvent.data.l[0]) + aSource == ::Window(m_aDropEnterEvent.data.l[0]) ) { bHandled = true; @@ -2259,7 +2259,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) * methods for XDropTargetDropContext */ -void SelectionManager::dropComplete( bool bSuccess, XLIB_Window aDropWindow, XLIB_Time ) +void SelectionManager::dropComplete( bool bSuccess, ::Window aDropWindow, XLIB_Time ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -2455,14 +2455,14 @@ void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime ) if( m_bDropSent ) return; - ::boost::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it = + ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( m_aDropWindow ); if( it != m_aDropTargets.end() ) { if( it->second.m_pTarget->m_bActive ) { int x, y; - XLIB_Window aChild; + ::Window aChild; XTranslateCoordinates( m_pDisplay, it->second.m_aRootWindow, m_aDropWindow, m_nLastDragX, m_nLastDragY, &x, &y, &aChild ); DropTargetDragEvent dtde; dtde.Source = static_cast< OWeakObject* >(it->second.m_pTarget ); @@ -2516,7 +2516,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) bool bHandled = false; // for shortcut - ::boost::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it = + ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( m_aDropWindow ); #if OSL_DEBUG_LEVEL > 1 switch( rMessage.type ) @@ -2622,7 +2622,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) bool bForce = false; int root_x = rMessage.type == MotionNotify ? rMessage.xmotion.x_root : rMessage.xcrossing.x_root; int root_y = rMessage.type == MotionNotify ? rMessage.xmotion.y_root : rMessage.xcrossing.y_root; - XLIB_Window root = rMessage.type == MotionNotify ? rMessage.xmotion.root : rMessage.xcrossing.root; + ::Window root = rMessage.type == MotionNotify ? rMessage.xmotion.root : rMessage.xcrossing.root; m_nDragTimestamp = rMessage.type == MotionNotify ? rMessage.xmotion.time : rMessage.xcrossing.time; aGuard.clear(); @@ -2718,7 +2718,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) { bHandled = true; int x, y; - XLIB_Window aChild; + ::Window aChild; XTranslateCoordinates( m_pDisplay, rMessage.xbutton.root, m_aDropWindow, rMessage.xbutton.x_root, rMessage.xbutton.y_root, &x, &y, &aChild ); DropTargetDropEvent dtde; dtde.Source = static_cast< OWeakObject* >(it->second.m_pTarget ); @@ -2768,7 +2768,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) { bHandled = true; - XLIB_Window aDummy; + ::Window aDummy; XEvent aEvent; aEvent.type = ButtonPress; aEvent.xbutton.display = m_pDisplay; @@ -2825,7 +2825,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage ) return bHandled; } -void SelectionManager::accept( sal_Int8 dragOperation, XLIB_Window aDropWindow, XLIB_Time ) +void SelectionManager::accept( sal_Int8 dragOperation, ::Window aDropWindow, XLIB_Time ) { if( aDropWindow == m_aCurrentDropWindow ) { @@ -2845,7 +2845,7 @@ void SelectionManager::accept( sal_Int8 dragOperation, XLIB_Window aDropWindow, } } -void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time ) +void SelectionManager::reject( ::Window aDropWindow, XLIB_Time ) { if( aDropWindow == m_aCurrentDropWindow ) { @@ -2889,7 +2889,7 @@ sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw(std::e return aCursor; } -int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy ) +int SelectionManager::getXdndVersion( ::Window aWindow, ::Window& rProxy ) { Atom* pProperties = NULL; int nProperties = 0; @@ -2917,7 +2917,7 @@ int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy ) if( pBytes ) { if( nType == XA_WINDOW ) - rProxy = *(XLIB_Window*)pBytes; + rProxy = *(::Window*)pBytes; XFree( pBytes ); pBytes = NULL; if( rProxy != None ) @@ -2927,7 +2927,7 @@ int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy ) &nType, &nFormat, &nItems, &nBytes, &pBytes ); if( pBytes ) { - if( nType == XA_WINDOW && *(XLIB_Window*)pBytes != rProxy ) + if( nType == XA_WINDOW && *(::Window*)pBytes != rProxy ) rProxy = None; XFree( pBytes ); pBytes = NULL; @@ -2942,7 +2942,7 @@ int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy ) if ( pProperties ) XFree (pProperties); - XLIB_Window aAwareWindow = rProxy != None ? rProxy : aWindow; + ::Window aAwareWindow = rProxy != None ? rProxy : aWindow; XGetWindowProperty( m_pDisplay, aAwareWindow, m_nXdndAware, 0, 1, False, XA_ATOM, &nType, &nFormat, &nItems, &nBytes, &pBytes ); @@ -2958,7 +2958,7 @@ int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy ) return nVersion; } -void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) +void SelectionManager::updateDragWindow( int nX, int nY, ::Window aRoot ) { osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -2967,9 +2967,9 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) m_nLastDragX = nX; m_nLastDragY = nY; - XLIB_Window aParent = aRoot; - XLIB_Window aChild; - XLIB_Window aNewProxy = None, aNewCurrentWindow = None; + ::Window aParent = aRoot; + ::Window aChild; + ::Window aNewProxy = None, aNewCurrentWindow = None; int nNewProtocolVersion = -1; int nWinX, nWinY; @@ -3009,7 +3009,7 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot ) dsde.DropAction = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY; dsde.UserAction = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY; - ::boost::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it; + ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it; if( aNewCurrentWindow != m_aDropWindow ) { #if OSL_DEBUG_LEVEL > 1 @@ -3158,11 +3158,11 @@ void SelectionManager::startDrag( // the pointer is located in. since said window should be one // of our DropTargets at the time of executeDrag we can use // them for a start - XLIB_Window aRoot, aParent, aChild; + ::Window aRoot, aParent, aChild; int root_x(0), root_y(0), win_x(0), win_y(0); unsigned int mask(0); - ::boost::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it; + ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it; it = m_aDropTargets.begin(); while( it != m_aDropTargets.end() ) { @@ -3457,7 +3457,7 @@ void SelectionManager::dragDoDispatch() */ -void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLIB_Time ) +void SelectionManager::setCursor( sal_Int32 cursor, ::Window aDropWindow, XLIB_Time ) { osl::MutexGuard aGuard( m_aMutex ); if( aDropWindow == m_aDropWindow && Cursor(cursor) != m_aCurrentCursor ) @@ -3471,7 +3471,7 @@ void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLI } } -void SelectionManager::setImage( sal_Int32, XLIB_Window, XLIB_Time ) +void SelectionManager::setImage( sal_Int32, ::Window, XLIB_Time ) { } @@ -3687,7 +3687,7 @@ void SelectionManager::run( void* pThis ) { if( it->first != This->m_nXdndSelection && ! it->second->m_bOwner ) { - XLIB_Window aOwner = XGetSelectionOwner( This->m_pDisplay, it->first ); + ::Window aOwner = XGetSelectionOwner( This->m_pDisplay, it->first ); if( aOwner != it->second->m_aLastOwner ) { it->second->m_aLastOwner = aOwner; @@ -3868,12 +3868,12 @@ extern "C" typedef int(*xerror_hdl_t)(Display*,XErrorEvent*); } -void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTarget ) +void SelectionManager::registerDropTarget( ::Window aWindow, DropTarget* pTarget ) { osl::MutexGuard aGuard(m_aMutex); // sanity check - ::boost::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it = + ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( aWindow ); if( it != m_aDropTargets.end() ) OSL_FAIL( "attempt to register window as drop target twice" ); @@ -3910,7 +3910,7 @@ void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTar OSL_FAIL( "attempt to register None as drop target" ); } -void SelectionManager::deregisterDropTarget( XLIB_Window aWindow ) +void SelectionManager::deregisterDropTarget( ::Window aWindow ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -3918,7 +3918,7 @@ void SelectionManager::deregisterDropTarget( XLIB_Window aWindow ) if( aWindow == m_aDragSourceWindow && m_aDragRunning.check() ) { // abort drag - boost::unordered_map< XLIB_Window, DropTargetEntry >::const_iterator it = + boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it = m_aDropTargets.find( m_aDropWindow ); if( it != m_aDropTargets.end() ) { diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 4aef1eb4d00b..489a915a62ad 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -74,7 +74,7 @@ namespace x11 { ::osl::Mutex m_aMutex; bool m_bActive; sal_Int8 m_nDefaultActions; - XLIB_Window m_aTargetWindow; + ::Window m_aTargetWindow; class SelectionManager* m_pSelectionManager; css::uno::Reference< css::datatransfer::dnd::XDragSource > m_xSelectionManager; @@ -165,7 +165,7 @@ namespace x11 { { css::uno::Sequence< sal_Int8 > m_aData; int m_nBufferPos; - XLIB_Window m_aRequestor; + ::Window m_aRequestor; Atom m_aProperty; Atom m_aTarget; int m_nFormat; @@ -199,7 +199,7 @@ namespace x11 { Atom m_aUTF8Type; bool m_bHaveCompound; bool m_bOwner; - XLIB_Window m_aLastOwner; + ::Window m_aLastOwner; PixmapHolder* m_pPixmap; // m_nOrigXLIB_Timestamp contains the XLIB_Timestamp at which the seclection // was acquired; needed for XLIB_TimeSTAMP target @@ -224,7 +224,7 @@ namespace x11 { struct DropTargetEntry { DropTarget* m_pTarget; - XLIB_Window m_aRootWindow; + ::Window m_aRootWindow; DropTargetEntry() : m_pTarget( NULL ), m_aRootWindow( None ) {} DropTargetEntry( DropTarget* pTarget ) : @@ -248,7 +248,7 @@ namespace x11 { int m_EndThreadPipe[2]; oslThread m_aDragExecuteThread; ::osl::Condition m_aDragRunning; - XLIB_Window m_aWindow; + ::Window m_aWindow; css::uno::Reference< css::frame::XDesktop2 > m_xDesktop; css::uno::Reference< css::awt::XDisplayConnection > m_xDisplayConnection; @@ -261,13 +261,13 @@ namespace x11 { // contains the XdndEnterEvent of a drop action running // with one of our targets. The data.l[0] member - // (conatining the drag source XLIB_Window) is set + // (conatining the drag source ::Window) is set // to None while that is not the case XClientMessageEvent m_aDropEnterEvent; // set to false on XdndEnter // set to true on first XdndPosition or XdndLeave bool m_bDropEnterSent; - XLIB_Window m_aCurrentDropWindow; + ::Window m_aCurrentDropWindow; // XLIB_Time code of XdndDrop XLIB_Time m_nDropTime; sal_Int8 m_nLastDropAction; @@ -285,10 +285,10 @@ namespace x11 { // drag only // None if no Dnd action is running with us as source - XLIB_Window m_aDropWindow; - // either m_aDropXLIB_Window or its XdndProxy - XLIB_Window m_aDropProxy; - XLIB_Window m_aDragSourceWindow; + ::Window m_aDropWindow; + // either m_aDropWindow or its XdndProxy + ::Window m_aDropProxy; + ::Window m_aDragSourceWindow; // XTransferable for Xdnd when we are drag source css::uno::Reference< css::datatransfer::XTransferable > m_xDragSourceTransferable; @@ -322,7 +322,7 @@ namespace x11 { // drag and drop int m_nCurrentProtocolVersion; - ::boost::unordered_map< XLIB_Window, DropTargetEntry > + ::boost::unordered_map< ::Window, DropTargetEntry > m_aDropTargets; // some special atoms that are needed often @@ -361,7 +361,7 @@ namespace x11 { ::boost::unordered_map< Atom, Selection* > m_aSelections; // IncrementalTransfers in progress - boost::unordered_map< XLIB_Window, boost::unordered_map< Atom, IncrementalTransfer > > + boost::unordered_map< ::Window, boost::unordered_map< Atom, IncrementalTransfer > > m_aIncrementals; // do not use X11 multithreading capabilities @@ -388,10 +388,10 @@ namespace x11 { void sendDragStatus( Atom nDropAction ); void sendDropPosition( bool bForce, XLIB_Time eventXLIB_Time ); bool updateDragAction( int modifierState ); - int getXdndVersion( XLIB_Window aXLIB_Window, XLIB_Window& rProxy ); + int getXdndVersion( ::Window aXLIB_Window, ::Window& rProxy ); Cursor createCursor( const unsigned char* pPointerData, const unsigned char* pMaskData, int width, int height, int hotX, int hotY ); - // coordinates on root XLIB_Window - void updateDragWindow( int nX, int nY, XLIB_Window aRoot ); + // coordinates on root ::Window + void updateDragWindow( int nX, int nY, ::Window aRoot ); bool getPasteData( Atom selection, Atom type, css::uno::Sequence< sal_Int8 >& rData ); // returns true if conversion was successful @@ -400,7 +400,7 @@ namespace x11 { Atom nSelection, int & rFormat, css::uno::Sequence< sal_Int8 >& rData ); - bool sendData( SelectionAdaptor* pAdaptor, XLIB_Window requestor, Atom target, Atom property, Atom selection ); + bool sendData( SelectionAdaptor* pAdaptor, ::Window requestor, Atom target, Atom property, Atom selection ); // thread dispatch loop public: @@ -426,7 +426,7 @@ namespace x11 { static SelectionManager& get( const OUString& rDisplayName = OUString() ); Display * getDisplay() { return m_pDisplay; }; - XLIB_Window getWindow() { return m_aWindow; }; + ::Window getWindow() { return m_aWindow; }; void registerHandler( Atom selection, SelectionAdaptor& rAdaptor ); void deregisterHandler( Atom selection ); @@ -450,18 +450,18 @@ namespace x11 { bool getPasteData( Atom selection, const OUString& rType, css::uno::Sequence< sal_Int8 >& rData ); // for XDropTarget to register/deregister itself - void registerDropTarget( XLIB_Window aXLIB_Window, DropTarget* pTarget ); - void deregisterDropTarget( XLIB_Window aXLIB_Window ); + void registerDropTarget( ::Window aXLIB_Window, DropTarget* pTarget ); + void deregisterDropTarget( ::Window aXLIB_Window ); // for XDropTarget{Drag|Drop}Context - void accept( sal_Int8 dragOperation, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); - void reject( XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); - void dropComplete( bool success, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); + void accept( sal_Int8 dragOperation, ::Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); + void reject( ::Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); + void dropComplete( bool success, ::Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); // for XDragSourceContext sal_Int32 getCurrentCursor() { return m_aCurrentCursor;} - void setCursor( sal_Int32 cursor, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); - void setImage( sal_Int32 image, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); + void setCursor( sal_Int32 cursor, ::Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); + void setImage( sal_Int32 image, ::Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); void transferablesFlavorsChanged(); void shutdown() throw(); diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx index 0fb3fe6bdee9..3f47e88885ea 100644 --- a/vcl/unx/generic/dtrans/bmp.cxx +++ b/vcl/unx/generic/dtrans/bmp.cxx @@ -306,7 +306,7 @@ sal_uInt8* x11::X11_getBmpFromPixmap( ) { // get geometry of drawable - XLIB_Window aRoot; + ::Window aRoot; int x,y; unsigned int w, h, bw, d; XGetGeometry( pDisplay, aDrawable, &aRoot, &x, &y, &w, &h, &bw, &d ); diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 4af97a5dc49c..84859dad4b85 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -240,7 +240,7 @@ void X11SalGraphics::YieldGraphicsExpose() // get frame if necessary SalFrame* pFrame = m_pFrame; Display* pDisplay = GetXDisplay(); - XLIB_Window aWindow = GetDrawable(); + ::Window aWindow = GetDrawable(); if( ! pFrame ) { const std::list< SalFrame* >& rFrames = GetGenericData()->GetSalDisplay()->getFrames(); diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index cd0d0b5c0aeb..83925d9f3186 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -42,7 +42,7 @@ SalVirtualDevice* X11SalInstance::CreateVirtualDevice( SalGraphics* pGraphics, if( pData && pData->hDrawable != None ) { - XLIB_Window aRoot; + ::Window aRoot; int x, y; unsigned int w = 0, h = 0, bw, d; Display* pDisp = GetGenericData()->GetSalDisplay()->GetDisplay(); diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 99417d8304f5..a9727e9f07ed 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -844,13 +844,13 @@ namespace Edit* m_pPassEdit; public: - RTSPWDialog(const OString& rServer, const OString& rUserName, Window* pParent); + RTSPWDialog(const OString& rServer, const OString& rUserName, vcl::Window* pParent); OString getUserName() const; OString getPassword() const; }; - RTSPWDialog::RTSPWDialog( const OString& rServer, const OString& rUserName, Window* pParent ) + RTSPWDialog::RTSPWDialog( const OString& rServer, const OString& rUserName, vcl::Window* pParent ) : ModalDialog(pParent, "CUPSPasswordDialog", "vcl/ui/cupspassworddialog.ui") { diff --git a/vcl/unx/generic/window/FWS.cxx b/vcl/unx/generic/window/FWS.cxx index a2dbdae3da16..97a089d0c4cf 100644 --- a/vcl/unx/generic/window/FWS.cxx +++ b/vcl/unx/generic/window/FWS.cxx @@ -102,7 +102,7 @@ WMSupportsFWS (Display *display, int screen) return False; } - fwsCommWindow = *(Window *) propData; + fwsCommWindow = *(::Window *) propData; #if OSL_DEBUG_LEVEL > 1 fprintf (stderr, "Using fwsCommWindow = 0x%lx.\n", fwsCommWindow); #endif diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index ebce145a0e45..b99c2aa9a899 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -94,8 +94,8 @@ using namespace vcl_sal; | PropertyChangeMask \ | ColormapChangeMask -static XLIB_Window hPresentationWindow = None, hPresFocusWindow = None; -static ::std::list< XLIB_Window > aPresentationReparentList; +static ::Window hPresentationWindow = None, hPresFocusWindow = None; +static ::std::list< ::Window > aPresentationReparentList; static int nVisibleFloats = 0; static void doReparentPresentationDialogues( SalDisplay* pDisplay ) @@ -104,7 +104,7 @@ static void doReparentPresentationDialogues( SalDisplay* pDisplay ) while( aPresentationReparentList.begin() != aPresentationReparentList.end() ) { int x, y; - XLIB_Window aRoot, aChild; + ::Window aRoot, aChild; unsigned int w, h, bw, d; XGetGeometry( pDisplay->GetDisplay(), aPresentationReparentList.front(), @@ -353,8 +353,8 @@ void X11SalFrame::Init( sal_uLong nSalFrameStyle, SalX11Screen nXScreen, SystemP Attributes.event_mask = CLIENT_EVENTS; const SalVisual& rVis = GetDisplay()->GetVisual( m_nXScreen ); - XLIB_Window aFrameParent = pParentData ? pParentData->aWindow : GetDisplay()->GetRootWindow( m_nXScreen ); - XLIB_Window aClientLeader = None; + ::Window aFrameParent = pParentData ? pParentData->aWindow : GetDisplay()->GetRootWindow( m_nXScreen ); + ::Window aClientLeader = None; if( bUseGeometry ) { @@ -403,14 +403,14 @@ void X11SalFrame::Init( sal_uLong nSalFrameStyle, SalX11Screen nXScreen, SystemP int x_ret, y_ret; unsigned int bw, d; - XLIB_Window aRoot, aParent; + ::Window aRoot, aParent; XGetGeometry( GetXDisplay(), pParentData->aWindow, &aRoot, &x_ret, &y_ret, &w, &h, &bw, &d ); mhForeignParent = pParentData->aWindow; mhShellWindow = aParent = mhForeignParent; - XLIB_Window* pChildren; + ::Window* pChildren; unsigned int nChildren; bool bBreak = false; do @@ -500,7 +500,7 @@ void X11SalFrame::Init( sal_uLong nSalFrameStyle, SalX11Screen nXScreen, SystemP else if( GetDisplay()->IsXinerama() ) { // place frame on same screen as mouse pointer - XLIB_Window aRoot, aChild; + ::Window aRoot, aChild; int root_x = 0, root_y = 0, lx, ly; unsigned int mask; XQueryPointer( GetXDisplay(), @@ -1378,7 +1378,7 @@ void X11SalFrame::ToTop( sal_uInt16 nFlags ) XMapWindow( GetXDisplay(), GetWindow() ); } - XLIB_Window aToTopWindow = IsSysChildWindow() ? GetWindow() : GetShellWindow(); + ::Window aToTopWindow = IsSysChildWindow() ? GetWindow() : GetShellWindow(); if( ! (nFlags & SAL_FRAME_TOTOP_GRABFOCUS_ONLY) ) { XRaiseWindow( GetXDisplay(), aToTopWindow ); @@ -1442,7 +1442,7 @@ void X11SalFrame::Center( ) // get xinerama screen we are on // if there is a parent, use its center for screen determination // else use the pointer - XLIB_Window aRoot, aChild; + ::Window aRoot, aChild; int root_x, root_y, x, y; unsigned int mask; if( mpParent ) @@ -1486,7 +1486,7 @@ void X11SalFrame::Center( ) if( pFrame->nStyle_ & SAL_FRAME_STYLE_PLUG ) { - XLIB_Window aRoot; + ::Window aRoot; unsigned int bw, depth; XGetGeometry( GetXDisplay(), pFrame->GetShellWindow(), @@ -1897,7 +1897,7 @@ void X11SalFrame::SetPosSize( const Rectangle &rPosSize ) if( Application::GetSettings().GetLayoutRTL() ) values.x = mpParent->maGeometry.nWidth-values.width-1-values.x; - XLIB_Window aChild; + ::Window aChild; // coordinates are relative to parent, so translate to root coordinates XTranslateCoordinates( GetDisplay()->GetDisplay(), mpParent->GetWindow(), @@ -2203,7 +2203,7 @@ void X11SalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nScreen ) ------------------------------------------------------------------- */ static Bool -IsRunningXAutoLock( Display *p_display, XLIB_Window a_window ) +IsRunningXAutoLock( Display *p_display, ::Window a_window ) { const char *p_atomname = "XAUTOLOCK_SEMAPHORE_PID"; Atom a_pidatom; @@ -2247,7 +2247,7 @@ MessageToXAutoLock( Display *p_display, int n_message ) { const char *p_atomname = "XAUTOLOCK_MESSAGE" ; Atom a_messageatom; - XLIB_Window a_rootwindow; + ::Window a_rootwindow; a_rootwindow = RootWindowOfScreen( ScreenOfDisplay(p_display, 0) ); if ( ! IsRunningXAutoLock(p_display, a_rootwindow) ) @@ -2555,7 +2555,7 @@ SalFrame* X11SalFrame::GetParent() const return mpParent; } -void X11SalFrame::createNewWindow( XLIB_Window aNewParent, SalX11Screen nXScreen ) +void X11SalFrame::createNewWindow( ::Window aNewParent, SalX11Screen nXScreen ) { bool bWasVisible = bMapped_; if( bWasVisible ) @@ -2682,7 +2682,7 @@ static sal_uInt16 sal_GetCode( int state ) SalFrame::SalPointerState X11SalFrame::GetPointerState() { SalPointerState aState; - XLIB_Window aRoot, aChild; + ::Window aRoot, aChild; int rx, ry, wx, wy; unsigned int nMask = 0; XQueryPointer( GetXDisplay(), @@ -2847,7 +2847,7 @@ long X11SalFrame::HandleMouseEvent( XEvent *pEvent ) * is unknown (the above case implicitly assumes * that floats are on top which should be true) */ - XLIB_Window aRoot, aChild; + ::Window aRoot, aChild; int root_x, root_y, win_x, win_y; unsigned int mask_return; if( XQueryPointer( GetXDisplay(), @@ -3482,7 +3482,7 @@ long X11SalFrame::HandleExposeEvent( XEvent *pEvent ) return 1; } -void X11SalFrame::RestackChildren( XLIB_Window* pTopLevelWindows, int nTopLevelWindows ) +void X11SalFrame::RestackChildren( ::Window* pTopLevelWindows, int nTopLevelWindows ) { if( maChildren.begin() != maChildren.end() ) { @@ -3528,7 +3528,7 @@ void X11SalFrame::RestackChildren() if( ! GetDisplay()->getWMAdaptor()->isTransientBehaviourAsExpected() && maChildren.begin() != maChildren.end() ) { - XLIB_Window aRoot, aParent, *pChildren = NULL; + ::Window aRoot, aParent, *pChildren = NULL; unsigned int nChildren; if( XQueryTree( GetXDisplay(), GetDisplay()->GetRootWindow( m_nXScreen ), @@ -3596,7 +3596,7 @@ long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent ) pEvent->width, pEvent->height ); - XLIB_Window hDummy; + ::Window hDummy; XTranslateCoordinates( GetXDisplay(), GetWindow(), pDisplay_->GetRootWindow( pDisplay_->GetDefaultXScreen() ), @@ -3664,8 +3664,8 @@ IMPL_LINK_NOARG(X11SalFrame, HandleAlwaysOnTopRaise) long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) { Display *pDisplay = pEvent->display; - XLIB_Window hWM_Parent; - XLIB_Window hRoot, *Children, hDummy; + ::Window hWM_Parent; + ::Window hRoot, *Children, hDummy; unsigned int nChildren; bool bNone = pDisplay_->GetProperties() & PROPERTY_SUPPORT_WM_Parent_Pixmap_None; @@ -3755,7 +3755,7 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) ) { int x = 0, y = 0; - XLIB_Window aChild; + ::Window aChild; XTranslateCoordinates( GetXDisplay(), GetStackingWindow(), GetDisplay()->GetRootWindow( m_nXScreen ), @@ -4207,7 +4207,7 @@ void X11SalFrame::ResetClipRegion() XWindowAttributes win_attrib; XRectangle win_size; - XLIB_Window aShapeWindow = mhShellWindow; + ::Window aShapeWindow = mhShellWindow; XGetWindowAttributes ( GetDisplay()->GetDisplay(), aShapeWindow, @@ -4257,7 +4257,7 @@ void X11SalFrame::EndSetClipRegion() const int ordering = YSorted; const int op = ShapeSet; - XLIB_Window aShapeWindow = mhShellWindow; + ::Window aShapeWindow = mhShellWindow; XShapeCombineRectangles ( GetDisplay()->GetDisplay(), aShapeWindow, dest_kind, diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index 7a61bd1c92bd..4b53995fd186 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -62,7 +62,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay(); const SystemEnvData* pEnv = pParent->GetSystemData(); Display* pDisp = pSalDisp->GetDisplay(); - XLIB_Window aObjectParent = (XLIB_Window)pEnv->aWindow; + ::Window aObjectParent = (::Window)pEnv->aWindow; // find out on which screen that window is XWindowAttributes aParentAttr; @@ -271,7 +271,7 @@ X11SalObject::ResetClipRegion() XWindowAttributes win_attrib; XRectangle win_size; - XLIB_Window aShapeWindow = maPrimary; + ::Window aShapeWindow = maPrimary; XGetWindowAttributes ( (Display*)maSystemChildData.pDisplay, aShapeWindow, @@ -329,7 +329,7 @@ X11SalObject::EndSetClipRegion() op = ShapeUnion; } - XLIB_Window aShapeWindow = maPrimary; + ::Window aShapeWindow = maPrimary; XShapeCombineRectangles ( (Display*)maSystemChildData.pDisplay, aShapeWindow, @@ -439,7 +439,7 @@ bool X11SalObject::Dispatch( XEvent* pEvent ) SalMouseEvent aEvt; const SystemEnvData* pParentData = pObject->mpParent->GetSystemData(); int dest_x, dest_y; - XLIB_Window aChild = None; + ::Window aChild = None; XTranslateCoordinates( pEvent->xbutton.display, pEvent->xbutton.root, pParentData->aWindow, diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx index 01a55a72ac8f..54e0ac3e0b18 100644 --- a/vcl/unx/gtk/a11y/atkfactory.cxx +++ b/vcl/unx/gtk/a11y/atkfactory.cxx @@ -111,10 +111,10 @@ wrapper_factory_create_accessible( GObject *obj ) GtkSalFrame* pFrame = GtkSalFrame::getFromWindow( GTK_WINDOW( parent_widget ) ); g_return_val_if_fail( pFrame != NULL, NULL ); - Window* pFrameWindow = pFrame->GetWindow(); + vcl::Window* pFrameWindow = pFrame->GetWindow(); if( pFrameWindow ) { - Window* pWindow = pFrameWindow; + vcl::Window* pWindow = pFrameWindow; // skip accessible objects already exposed by the frame objects if( WINDOW_BORDERWINDOW == pWindow->GetType() ) diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index 96990c910f5c..b2eae95ea044 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -396,7 +396,7 @@ void DocumentFocusListener::detachRecursive( * page tabs in gtk are widgets, so we need to simulate focus events for those */ -static void handle_tabpage_activated(Window *pWindow) +static void handle_tabpage_activated(vcl::Window *pWindow) { uno::Reference< accessibility::XAccessible > xAccessible = pWindow->GetAccessible(); @@ -436,7 +436,7 @@ static void notify_toolbox_item_focus(ToolBox *pToolBox) atk_wrapper_focus_tracker_notify_when_idle( xContext->getAccessibleChild( nPos ) ); } -static void handle_toolbox_highlight(Window *pWindow) +static void handle_toolbox_highlight(vcl::Window *pWindow) { ToolBox *pToolBox = static_cast <ToolBox *> (pWindow); @@ -451,7 +451,7 @@ static void handle_toolbox_highlight(Window *pWindow) notify_toolbox_item_focus(pToolBox); } -static void handle_toolbox_highlightoff(Window *pWindow) +static void handle_toolbox_highlightoff(vcl::Window *pWindow) { ToolBox *pToolBox = static_cast <ToolBox *> (pWindow); ToolBox* pToolBoxParent = dynamic_cast< ToolBox* >( pToolBox->GetParent() ); @@ -482,7 +482,7 @@ static void create_wrapper_for_child( static void handle_toolbox_buttonchange(VclWindowEvent const *pEvent) { - Window* pWindow = pEvent->GetWindow(); + vcl::Window* pWindow = pEvent->GetWindow(); sal_Int32 index = (sal_Int32)(sal_IntPtr) pEvent->GetData(); if( pWindow && pWindow->IsReallyVisible() ) @@ -497,14 +497,14 @@ static void handle_toolbox_buttonchange(VclWindowEvent const *pEvent) /*****************************************************************************/ -static std::set< Window * > g_aWindowList; +static std::set< vcl::Window * > g_aWindowList; static void handle_get_focus(::VclWindowEvent const * pEvent) { static rtl::Reference< DocumentFocusListener > aDocumentFocusListener = new DocumentFocusListener(); - Window *pWindow = pEvent->GetWindow(); + vcl::Window *pWindow = pEvent->GetWindow(); // The menu bar is handled through VCLEVENT_MENU_HIGHLIGHTED if( ! pWindow || !pWindow->IsReallyVisible() || pWindow->GetType() == WINDOW_MENUBARWINDOW ) diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index a74de46bc0d0..0f39c0169f23 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -37,7 +37,7 @@ static void (* window_real_initialize) (AtkObject *obj, gpointer data) = NULL; static void (* window_real_finalize) (GObject *obj) = NULL; static void -init_from_window( AtkObject *accessible, Window *pWindow ) +init_from_window( AtkObject *accessible, vcl::Window *pWindow ) { static AtkRole aDefaultRole = ATK_ROLE_INVALID; @@ -75,7 +75,7 @@ init_from_window( AtkObject *accessible, Window *pWindow ) sal_uInt16 type = WINDOW_WINDOW; bool parentIsMenuFloatingWindow = false; - Window *pParent = pWindow->GetParent(); + vcl::Window *pParent = pWindow->GetParent(); if( pParent ) { type = pParent->GetType(); parentIsMenuFloatingWindow = pParent->IsMenuFloatingWindow(); @@ -91,7 +91,7 @@ init_from_window( AtkObject *accessible, Window *pWindow ) default: { - Window *pChild = pWindow->GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pChild = pWindow->GetWindow(WINDOW_FIRSTCHILD); if( pChild ) { if( WINDOW_HELPTEXTWINDOW == pChild->GetType() ) @@ -159,9 +159,9 @@ static gboolean ooo_tooltip_unmap( GtkWidget* pToolTip, gpointer ) /*****************************************************************************/ static bool -isChildPopupMenu(Window* pWindow) +isChildPopupMenu(vcl::Window* pWindow) { - Window* pChild = pWindow->GetAccessibleChildWindow(0); + vcl::Window* pChild = pWindow->GetAccessibleChildWindow(0); if (!pChild) return false; @@ -183,7 +183,7 @@ ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data) GtkSalFrame *pFrame = GtkSalFrame::getFromWindow( GTK_WINDOW( data ) ); if( pFrame ) { - Window *pWindow = pFrame->GetWindow(); + vcl::Window *pWindow = pFrame->GetWindow(); if( pWindow ) { init_from_window( obj, pWindow ); diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index ccae7d181a80..f2e70b3e8ab1 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -111,7 +111,7 @@ RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit { GtkWindow *pParent = NULL; - ::Window * pWindow = ::Application::GetActiveTopWindow(); + vcl::Window * pWindow = ::Application::GetActiveTopWindow(); if( pWindow ) { GtkSalFrame *pFrame = dynamic_cast<GtkSalFrame *>( pWindow->ImplGetFrame() ); diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index dd9dc6e0797e..38e02484cb68 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -525,7 +525,7 @@ void GtkSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) { GtkSalFrame* pFrame = GetGtkFrame(); - XLIB_Window aWin = None; + ::Window aWin = None; if( pFrame && m_pWindow ) { /* #i64117# some themes set the background pixmap VERY frequently */ diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index 2056a13b87fb..71fb8251c4ff 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -412,7 +412,7 @@ GtkPrintDialog::impl_initDialog() //To-Do, like fpicker, set UI language m_pDialog = m_pWrapper->print_unix_dialog_new(NULL, NULL); - Window* const pTopWindow(Application::GetActiveTopWindow()); + vcl::Window* const pTopWindow(Application::GetActiveTopWindow()); if (pTopWindow) { GtkSalFrame* const pFrame(dynamic_cast<GtkSalFrame*>(pTopWindow->ImplGetFrame())); diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index ad8e692d65d7..b39875f99d2a 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -672,7 +672,7 @@ gboolean ensure_dbus_setup( gpointer data ) GActionGroup* pActionGroup = ( ( GActionGroup* ) g_lo_action_group_new( reinterpret_cast< gpointer >( pSalFrame ) ) ); // Generate menu paths. - XLIB_Window windowId = GDK_WINDOW_XID( gdkWindow ); + ::Window windowId = GDK_WINDOW_XID( gdkWindow ); gchar* aDBusWindowPath = g_strdup_printf( "/org/libreoffice/window/%lu", windowId ); gchar* aDBusMenubarPath = g_strdup_printf( "/org/libreoffice/window/%lu/menus/menubar", windowId ); @@ -1153,7 +1153,7 @@ static void lcl_set_accept_focus( GtkWindow* pWindow, gboolean bAccept, bool bBe else if( ! bBeforeRealize ) { Display* pDisplay = GetGtkSalData()->GetGtkDisplay()->GetDisplay(); - XLIB_Window aWindow = widget_get_xid(GTK_WIDGET(pWindow)); + ::Window aWindow = widget_get_xid(GTK_WIDGET(pWindow)); XWMHints* pHints = XGetWMHints( pDisplay, aWindow ); if( ! pHints ) { @@ -1375,8 +1375,8 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle ) GdkNativeWindow GtkSalFrame::findTopLevelSystemWindow( GdkNativeWindow aWindow ) { #if !GTK_CHECK_VERSION(3,0,0) - XLIB_Window aRoot, aParent; - XLIB_Window* pChildren; + ::Window aRoot, aParent; + ::Window* pChildren; unsigned int nChildren; bool bBreak = false; do @@ -1442,7 +1442,7 @@ void GtkSalFrame::Init( SystemParentData* pSysData ) #if !GTK_CHECK_VERSION(3,0,0) int x_ret, y_ret; unsigned int w, h, bw, d; - XLIB_Window aRoot; + ::Window aRoot; XGetGeometry( getDisplay()->GetDisplay(), pSysData->aWindow, &aRoot, &x_ret, &y_ret, &w, &h, &bw, &d ); maGeometry.nWidth = w; @@ -1453,7 +1453,7 @@ void GtkSalFrame::Init( SystemParentData* pSysData ) { XReparentWindow( getDisplay()->GetDisplay(), widget_get_xid(m_pWindow), - (XLIB_Window)pSysData->aWindow, + (::Window)pSysData->aWindow, 0, 0 ); } #else @@ -2927,7 +2927,7 @@ void GtkSalFrame::SetParent( SalFrame* pNewParent ) #if !GTK_CHECK_VERSION(3,0,0) -void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, SalX11Screen nXScreen ) +void GtkSalFrame::createNewWindow( ::Window aNewParent, bool bXEmbed, SalX11Screen nXScreen ) { bool bWasVisible = m_pWindow && IS_WIDGET_MAPPED(m_pWindow); if( bWasVisible ) @@ -3121,7 +3121,7 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent ) bContinueDispatch = false; // update position int x = 0, y = 0; - XLIB_Window aChild; + ::Window aChild; XTranslateCoordinates( getDisplay()->GetDisplay(), widget_get_xid(m_pWindow), getDisplay()->GetRootWindow( getDisplay()->GetDefaultXScreen() ), @@ -3884,7 +3884,7 @@ void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer fram GdkWindow* pWin = widget_get_window(GTK_WIDGET(pThis->getWindow())); if( pWin ) { - XLIB_Window aWin = GDK_WINDOW_XWINDOW(pWin); + ::Window aWin = GDK_WINDOW_XWINDOW(pWin); if( aWin != None ) XSetWindowBackgroundPixmap( pThis->getDisplay()->GetDisplay(), aWin, @@ -4437,7 +4437,7 @@ uno::Reference<accessibility::XAccessibleEditableText> return uno::Reference< accessibility::XAccessibleEditableText >(); } -static uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText(Window *pFocusWin) +static uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText(vcl::Window *pFocusWin) { uno::Reference<accessibility::XAccessibleEditableText> xText; try @@ -4455,7 +4455,7 @@ static uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText(Windo gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pContext, gpointer /*im_handler*/ ) { - Window *pFocusWin = Application::GetFocusWindow(); + vcl::Window *pFocusWin = Application::GetFocusWindow(); if (!pFocusWin) return true; @@ -4477,7 +4477,7 @@ gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon gboolean GtkSalFrame::IMHandler::signalIMDeleteSurrounding( GtkIMContext*, gint offset, gint nchars, gpointer /*im_handler*/ ) { - Window *pFocusWin = Application::GetFocusWindow(); + vcl::Window *pFocusWin = Application::GetFocusWindow(); if (!pFocusWin) return true; diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index fd92f1359ced..4acd5f5053d2 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -708,7 +708,7 @@ void UnxFilePicker::initFilePicker() // TODO pass here the real parent (not possible for system dialogs // yet), and default to GetDefDialogParent() only when the real parent // is NULL - Window *pParentWin = Application::GetDefDialogParent(); + vcl::Window *pParentWin = Application::GetDefDialogParent(); if ( pParentWin ) { const SystemEnvData* pSysData = ((SystemWindow *)pParentWin)->GetSystemData(); diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 816292668aa6..c4e16c3c8a89 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -272,7 +272,7 @@ class WidgetPainter */ bool drawStyledWidget( QWidget *pWidget, ControlState nState, const ImplControlValue& aValue, - Display *dpy, XLIB_Window drawable, SalX11Screen nXScreen, + Display *dpy, ::Window drawable, SalX11Screen nXScreen, int nDepth, GC gc, ControlPart nPart = PART_ENTIRE_CONTROL ); @@ -465,7 +465,7 @@ WidgetPainter::~WidgetPainter( void ) bool WidgetPainter::drawStyledWidget( QWidget *pWidget, ControlState nState, const ImplControlValue& aValue, - Display *dpy, XLIB_Window drawable, SalX11Screen nXScreen, + Display *dpy, ::Window drawable, SalX11Screen nXScreen, int nDepth, GC gc, ControlPart nPart ) { if ( !pWidget ) @@ -1383,7 +1383,7 @@ bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, bool bReturn = false; Display *dpy = GetXDisplay(); - XLIB_Window drawable = GetDrawable(); + ::Window drawable = GetDrawable(); GC gc = SelectPen(); //SelectFont(); // GC with current clipping region set if ( (nType == CTRL_PUSHBUTTON) && (nPart == PART_ENTIRE_CONTROL) ) diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 8fa2bf080530..17ae41c76f09 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -243,7 +243,7 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute() } //get the window id of the main OO window to set it for the dialog as a parent - Window *pParentWin = Application::GetDefDialogParent(); + vcl::Window *pParentWin = Application::GetDefDialogParent(); if ( pParentWin ) { const SystemEnvData* pSysData = ((SystemWindow *)pParentWin)->GetSystemData(); diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 63a5dc1d6c62..d37b009adf79 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -199,7 +199,7 @@ void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect ) WinSalFrame* pFrame = GetWindowPtr( hWnd ); if( pFrame ) { - Window *pWin = pFrame->GetWindow(); + vcl::Window *pWin = pFrame->GetWindow(); while( pWin ) { WorkWindow *pWorkWin = (pWin->GetType() == WINDOW_WORKWINDOW) ? (WorkWindow *) pWin : NULL; @@ -1113,7 +1113,7 @@ HWND ImplGetParentHwnd( HWND hWnd ) WinSalFrame* pFrame = GetWindowPtr( hWnd ); if( !pFrame || !pFrame->GetWindow()) return ::GetParent( hWnd ); - Window *pRealParent = pFrame->GetWindow()->ImplGetWindowImpl()->mpRealParent; + vcl::Window *pRealParent = pFrame->GetWindow()->ImplGetWindowImpl()->mpRealParent; if( pRealParent ) return static_cast<WinSalFrame*>(pRealParent->ImplGetWindowImpl()->mpFrame)->mhWnd; else @@ -1172,7 +1172,7 @@ static void ImplSalShow( HWND hWnd, bool bVisible, bool bNoActivate ) if( aDogTag.isDeleted() ) return; - Window *pClientWin = pFrame->GetWindow()->ImplGetClientWindow(); + vcl::Window *pClientWin = pFrame->GetWindow()->ImplGetClientWindow(); if ( pFrame->mbFloatWin || ( pClientWin && (pClientWin->GetStyle() & WB_SYSTEMFLOATWIN) ) ) pFrame->mnShowState = SW_SHOWNOACTIVATE; else @@ -1235,7 +1235,7 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; if ( !bVisible ) { - Window *pClientWin = GetWindow()->ImplGetClientWindow(); + vcl::Window *pClientWin = GetWindow()->ImplGetClientWindow(); if ( mbFloatWin || ( pClientWin && (pClientWin->GetStyle() & WB_SYSTEMFLOATWIN) ) ) mnShowState = SW_SHOWNOACTIVATE; else @@ -3043,7 +3043,7 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg, // #103168# post again if async focus has not arrived yet // hopefully we will not receive the corresponding button up before this // button down arrives again - Window *pWin = pFrame->GetWindow(); + vcl::Window *pWin = pFrame->GetWindow(); if( pWin && pWin->ImplGetWindowImpl()->mpFrameData->mnFocusId ) { ImplPostMessage( hWnd, nMsg, wParam, lParam ); @@ -5218,7 +5218,7 @@ static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam ) } WinSalFrame* pFrame = GetWindowPtr( hWnd ); - Window *pWindow = pFrame ? pFrame->GetWindow() : NULL; + vcl::Window *pWindow = pFrame ? pFrame->GetWindow() : NULL; if( pWindow ) { @@ -5695,7 +5695,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP // #95133# a system dialog is opened/closed, using our app window as parent { WinSalFrame* pFrame = GetWindowPtr( hWnd ); - Window *pWin = NULL; + vcl::Window *pWin = NULL; if( pFrame ) pWin = pFrame->GetWindow(); diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index eb992818fa00..f251a9a33ba7 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -64,7 +64,7 @@ public: class TestWindow : public Dialog { public: - TestWindow() : Dialog( (Window *) NULL ) + TestWindow() : Dialog( (vcl::Window *) NULL ) { SetText( OUString("OutDev grinding") ); SetSizePixel( Size( 1024, 1024 ) ); diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx index 3224694f4c26..ed2b297d01b9 100644 --- a/vcl/workben/svdem.cxx +++ b/vcl/workben/svdem.cxx @@ -60,7 +60,7 @@ SAL_IMPLEMENT_MAIN() class MyWin : public WorkWindow { public: - MyWin( Window* pParent, WinBits nWinStyle ); + MyWin( vcl::Window* pParent, WinBits nWinStyle ); void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -80,7 +80,7 @@ void Main() Application::Execute(); } -MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : +MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ) { } diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 050b0dbea485..c47169c7da51 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -84,7 +84,7 @@ class MyWin : public WorkWindow ImageControl m_aImage; PushButton m_aQuitButton; public: - MyWin( Window* pParent, WinBits nWinStyle ); + MyWin( vcl::Window* pParent, WinBits nWinStyle ); virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -113,7 +113,7 @@ void Main() Application::Execute(); } -MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : +MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ), m_aListButton( this, 0 ), m_aSvpBitmaps( this, WB_BORDER ), diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index 2ccde8f781d9..edaad437ed8e 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -69,7 +69,7 @@ class MyWin : public WorkWindow { Bitmap m_aBitmap; public: - MyWin( Window* pParent, WinBits nWinStyle ); + MyWin( vcl::Window* pParent, WinBits nWinStyle ); virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -89,7 +89,7 @@ void Main() Application::Execute(); } -MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : +MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ), m_aBitmap( Size( 256, 256 ), 32 ) { diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index f8490d84dfc1..f79340135004 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -63,7 +63,7 @@ SAL_IMPLEMENT_MAIN() class MyWin : public WorkWindow { public: - MyWin( Window* pParent, WinBits nWinStyle ); + MyWin( vcl::Window* pParent, WinBits nWinStyle ); virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -83,7 +83,7 @@ void Main() Application::Execute(); } -MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : +MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ) { } diff --git a/winaccessibility/source/service/AccFrameEventListener.cxx b/winaccessibility/source/service/AccFrameEventListener.cxx index c509caea6b50..29cb395720ba 100644 --- a/winaccessibility/source/service/AccFrameEventListener.cxx +++ b/winaccessibility/source/service/AccFrameEventListener.cxx @@ -88,7 +88,7 @@ void AccFrameEventListener::HandleChildChangedEvent(Any oldValue, Any newValue) VCLXWindow* pvclwindow = dynamic_cast<VCLXWindow*>(m_xAccessible.get()); - Window* window = pvclwindow->GetWindow(); + vcl::Window* window = pvclwindow->GetWindow(); const SystemEnvData* systemdata=window->GetSystemData(); //add this child diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx index a3df23bb2e96..ef89bfb0299d 100644 --- a/winaccessibility/source/service/AccTopWindowListener.cxx +++ b/winaccessibility/source/service/AccTopWindowListener.cxx @@ -53,7 +53,7 @@ void AccTopWindowListener::HandleWindowOpened( com::sun::star::accessibility::XA { //get SystemData from window VCLXWindow* pvclwindow = (VCLXWindow*)pAccessible; - Window* window = pvclwindow->GetWindow(); + vcl::Window* window = pvclwindow->GetWindow(); // The SalFrame of window may be destructed at this time const SystemEnvData* systemdata = NULL; try diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx index b53f5dc9270f..fd1142f9987f 100644 --- a/winaccessibility/source/service/msaaservice_impl.cxx +++ b/winaccessibility/source/service/msaaservice_impl.cxx @@ -147,7 +147,7 @@ Sequence< OUString > MSAAServiceImpl::getSupportedServiceNames() throw (RuntimeE } static void AccessBridgeHandleExistingWindow(const Reference< XMSAAService > &xAccMgr, - Window *pWindow, bool bShow) + vcl::Window *pWindow, bool bShow) { if ( pWindow ) { @@ -156,7 +156,7 @@ static void AccessBridgeHandleExistingWindow(const Reference< XMSAAService > &xA SAL_INFO( "iacc2", "Decide whether to register existing window with IAccessible2" ); // Test for combo box - drop down floating windows first - Window * pParentWindow = pWindow->GetParent(); + vcl::Window * pParentWindow = pWindow->GetParent(); if ( pParentWindow ) { @@ -221,7 +221,7 @@ static void AccessBridgeUpdateOldTopWindows( const Reference< XMSAAService > &xA for ( sal_uInt16 i = 0; i < nTopWindowCount; i++ ) { - Window* pTopWindow = Application::GetTopWindow( i ); + vcl::Window* pTopWindow = Application::GetTopWindow( i ); css::uno::Reference< css::accessibility::XAccessible > xAccessible = pTopWindow->GetAccessible(); if ( xAccessible.is() ) { diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index f6d109d361d9..40bafdd4c755 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -63,7 +63,7 @@ private: void ImplInitialize(); public: - CertificateChooser( Window* pParent, css::uno::Reference< css::uno::XComponentContext>& rxCtx, css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const SignatureInformations& rCertsToIgnore ); + CertificateChooser( vcl::Window* pParent, css::uno::Reference< css::uno::XComponentContext>& rxCtx, css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const SignatureInformations& rCertsToIgnore ); virtual ~CertificateChooser(); short Execute() SAL_OVERRIDE; diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index 85320659efe2..4e9188616099 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -56,7 +56,7 @@ private: css::uno::Reference< css::xml::crypto::XSecurityEnvironment > mxSecurityEnvironment; css::uno::Reference< css::security::XCertificate > mxCert; public: - CertificateViewer( Window* pParent, const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const css::uno::Reference< css::security::XCertificate >& rXCert, bool bCheckForPrivateKey ); + CertificateViewer( vcl::Window* pParent, const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment, const css::uno::Reference< css::security::XCertificate >& rXCert, bool bCheckForPrivateKey ); virtual ~CertificateViewer(); }; @@ -66,7 +66,7 @@ class CertificateViewerTP : public TabPage protected: CertificateViewer* mpDlg; public: - CertificateViewerTP( Window* _pParent, const OString& rID, + CertificateViewerTP( vcl::Window* _pParent, const OString& rID, const OUString& rUIXMLDescription, CertificateViewer* _pDlg ); void SetTabDlg( CertificateViewer* _pTabDlg ) { @@ -86,7 +86,7 @@ private: FixedImage* m_pKeyImg; FixedText* m_pHintCorrespPrivKeyFI; public: - CertificateViewerGeneralTP( Window* pParent, CertificateViewer* _pDlg ); + CertificateViewerGeneralTP( vcl::Window* pParent, CertificateViewer* _pDlg ); virtual void ActivatePage() SAL_OVERRIDE; }; @@ -106,7 +106,7 @@ private: void InsertElement( const OUString& _rField, const OUString& _rValue, const OUString& _rDetails, bool _bFixedWidthFont = false ); public: - CertificateViewerDetailsTP( Window* pParent, CertificateViewer* _pDlg ); + CertificateViewerDetailsTP( vcl::Window* pParent, CertificateViewer* _pDlg ); virtual ~CertificateViewerDetailsTP(); virtual void ActivatePage() SAL_OVERRIDE; @@ -135,7 +135,7 @@ private: bool bValid); public: - CertificateViewerCertPathTP( Window* pParent, CertificateViewer* _pDlg ); + CertificateViewerCertPathTP( vcl::Window* pParent, CertificateViewer* _pDlg ); virtual ~CertificateViewerCertPathTP(); virtual void ActivatePage() SAL_OVERRIDE; diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx index c16ae4bacb22..c73fc3bbbd3b 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx @@ -113,7 +113,7 @@ private: bool canAddRemove(); public: - DigitalSignaturesDialog( Window* pParent, css::uno::Reference< + DigitalSignaturesDialog( vcl::Window* pParent, css::uno::Reference< css::uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode, bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature); virtual ~DigitalSignaturesDialog(); diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 67b02140df42..63c16d71293f 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -63,7 +63,7 @@ private: DECL_LINK( OkBtnHdl, void* ); public: - MacroSecurity(Window* pParent, + MacroSecurity(vcl::Window* pParent, const css::uno::Reference< css::uno::XComponentContext>& rxCtx, const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& rxSecurityEnvironment); virtual ~MacroSecurity(); @@ -79,7 +79,7 @@ class MacroSecurityTP : public TabPage protected: MacroSecurity* mpDlg; public: - MacroSecurityTP(Window* _pParent, const OString& rID, + MacroSecurityTP(vcl::Window* _pParent, const OString& rID, const OUString& rUIXMLDescription, MacroSecurity* _pDlg); void SetTabDlg(MacroSecurity* pTabDlg) @@ -104,7 +104,7 @@ protected: DECL_LINK(RadioButtonHdl, void *); public: - MacroSecurityLevelTP( Window* pParent, MacroSecurity* _pDlg ); + MacroSecurityLevelTP( vcl::Window* pParent, MacroSecurity* _pDlg ); virtual void ClosePage( void ) SAL_OVERRIDE; }; @@ -138,7 +138,7 @@ private: void ImplCheckButtons(); public: - MacroSecurityTrustedSourcesTP(Window* pParent, MacroSecurity* _pDlg); + MacroSecurityTrustedSourcesTP(vcl::Window* pParent, MacroSecurity* _pDlg); virtual ~MacroSecurityTrustedSourcesTP(); virtual void ActivatePage() SAL_OVERRIDE; diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index a3c1676f5b1b..4ad295d74d33 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -48,7 +48,7 @@ sal_uInt16 CertificateChooser::GetSelectedEntryPos( void ) const return (sal_uInt16) nSel; } -CertificateChooser::CertificateChooser( Window* _pParent, uno::Reference< uno::XComponentContext>& _rxCtx, uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const SignatureInformations& _rCertsToIgnore ) +CertificateChooser::CertificateChooser( vcl::Window* _pParent, uno::Reference< uno::XComponentContext>& _rxCtx, uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const SignatureInformations& _rCertsToIgnore ) : ModalDialog(_pParent, "SelectCertificateDialog", "xmlsec/ui/selectcertificatedialog.ui") , maCertsToIgnore( _rCertsToIgnore ) { @@ -99,8 +99,8 @@ short CertificateChooser::Execute() // Problem: This Dialog should be visible right now, and the parent should not be accessible. // Show, Update, DIsableInput... - Window* pMe = this; - Window* pParent = GetParent(); + vcl::Window* pMe = this; + vcl::Window* pParent = GetParent(); if ( pParent ) pParent->EnableInput( false ); pMe->Show(); diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 02ce1d8c64ac..d4f0f5a22d7e 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; CertificateViewer::CertificateViewer( - Window* _pParent, + vcl::Window* _pParent, const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, const css::uno::Reference< css::security::XCertificate >& _rXCert, bool bCheckForPrivateKey ) : TabDialog(_pParent, "ViewCertDialog", "xmlsec/ui/viewcertdialog.ui" ) @@ -66,14 +66,14 @@ CertificateViewer::~CertificateViewer() delete mpTabCtrl->GetTabPage(mnPathId); } -CertificateViewerTP::CertificateViewerTP( Window* _pParent, const OString& rID, +CertificateViewerTP::CertificateViewerTP( vcl::Window* _pParent, const OString& rID, const OUString& rUIXMLDescription, CertificateViewer* _pDlg ) : TabPage(_pParent, rID, rUIXMLDescription) , mpDlg(_pDlg) { } -CertificateViewerGeneralTP::CertificateViewerGeneralTP( Window* _pParent, CertificateViewer* _pDlg ) +CertificateViewerGeneralTP::CertificateViewerGeneralTP( vcl::Window* _pParent, CertificateViewer* _pDlg ) :CertificateViewerTP ( _pParent, "CertGeneral", "xmlsec/ui/certgeneral.ui", _pDlg ) { get( m_pCertImg, "certimage" ); @@ -174,7 +174,7 @@ void CertificateViewerDetailsTP::InsertElement( const OUString& _rField, const O pEntry->SetUserData( ( void* ) new Details_UserDatat( _rDetails, _bFixedWidthFont ) ); } -CertificateViewerDetailsTP::CertificateViewerDetailsTP( Window* _pParent, CertificateViewer* _pDlg ) +CertificateViewerDetailsTP::CertificateViewerDetailsTP( vcl::Window* _pParent, CertificateViewer* _pDlg ) :CertificateViewerTP ( _pParent, "CertDetails", "xmlsec/ui/certdetails.ui", _pDlg ) ,m_aFixedWidthFont( OutputDevice::GetDefaultFont( DEFAULTFONT_UI_FIXED, LANGUAGE_DONTKNOW, DEFAULTFONT_FLAGS_ONLYONE, this ) ) { @@ -299,7 +299,7 @@ struct CertPath_UserData }; -CertificateViewerCertPathTP::CertificateViewerCertPathTP( Window* _pParent, CertificateViewer* _pDlg ) +CertificateViewerCertPathTP::CertificateViewerCertPathTP( vcl::Window* _pParent, CertificateViewer* _pDlg ) : CertificateViewerTP(_pParent, "CertPage", "xmlsec/ui/certpage.ui", _pDlg) , mpParent(_pDlg) , mbFirstActivateDone(false) diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 032e6d63135c..1016a5f99c94 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -161,7 +161,7 @@ bool DigitalSignaturesDialog::isXML(const OUString& rURI ) } DigitalSignaturesDialog::DigitalSignaturesDialog( - Window* pParent, + vcl::Window* pParent, uno::Reference< uno::XComponentContext >& rxCtx, DocumentSignatureMode eMode, bool bReadOnly, const OUString& sODFVersion, bool bHasDocumentSignature) : ModalDialog(pParent, "DigitalSignaturesDialog", "xmlsec/ui/digitalsignaturesdialog.ui") diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 28fa791d5c81..d76fdcde83d4 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -58,7 +58,7 @@ IMPL_LINK_NOARG(MacroSecurity, OkBtnHdl) return 0; } -MacroSecurity::MacroSecurity( Window* _pParent, +MacroSecurity::MacroSecurity( vcl::Window* _pParent, const css::uno::Reference< css::uno::XComponentContext> &_rxCtx, const css::uno::Reference< css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment) : TabDialog(_pParent, "MacroSecurityDialog", "xmlsec/ui/macrosecuritydialog.ui") @@ -88,14 +88,14 @@ MacroSecurity::~MacroSecurity() delete m_pTabCtrl->GetTabPage(m_nSecLevelId); } -MacroSecurityTP::MacroSecurityTP(Window* _pParent, const OString& rID, +MacroSecurityTP::MacroSecurityTP(vcl::Window* _pParent, const OString& rID, const OUString& rUIXMLDescription, MacroSecurity* _pDlg) : TabPage(_pParent, rID, rUIXMLDescription) , mpDlg(_pDlg) { } -MacroSecurityLevelTP::MacroSecurityLevelTP(Window* _pParent, MacroSecurity* _pDlg) +MacroSecurityLevelTP::MacroSecurityLevelTP(vcl::Window* _pParent, MacroSecurity* _pDlg) : MacroSecurityTP(_pParent, "SecurityLevelPage", "xmlsec/ui/securitylevelpage.ui", _pDlg) { get(m_pVeryHighRB, "vhigh"); @@ -339,7 +339,7 @@ public: } }; -MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(Window* _pParent, MacroSecurity* _pDlg) +MacroSecurityTrustedSourcesTP::MacroSecurityTrustedSourcesTP(vcl::Window* _pParent, MacroSecurity* _pDlg) : MacroSecurityTP(_pParent, "SecurityTrustPage", "xmlsec/ui/securitytrustpage.ui", _pDlg) { get(m_pTrustCertROFI, "lockcertimg"); diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx index f3c4db858d7a..77e665f76ed5 100644 --- a/xmlsecurity/workben/signaturetest.cxx +++ b/xmlsecurity/workben/signaturetest.cxx @@ -132,7 +132,7 @@ private: DECL_LINK( StartVerifySignatureHdl, void* ); public: - MyWin( Window* pParent, WinBits nWinStyle ); + MyWin( vcl::Window* pParent, WinBits nWinStyle ); }; @@ -144,7 +144,7 @@ void Main() Application::Execute(); } -MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : +MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ), maTokenLine( this ), maTest1Line( this ), |