diff options
Diffstat (limited to 'sw/source')
308 files changed, 914 insertions, 914 deletions
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(); |