diff options
Diffstat (limited to 'svx/source')
216 files changed, 724 insertions, 724 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index efc6e794a318..06042560a02f 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -149,7 +149,7 @@ SdrObject* AccessibleControlShape::getSdrObject() const } namespace { - Reference< XContainer > lcl_getControlContainer( const Window* _pWin, const SdrView* _pView ) + Reference< XContainer > lcl_getControlContainer( const vcl::Window* _pWin, const SdrView* _pView ) { Reference< XContainer > xReturn; DBG_ASSERT( _pView, "lcl_getControlContainer: invalid view!" ); @@ -192,7 +192,7 @@ void AccessibleControlShape::Init() // I'm aware of at the moment ..... // get the control which belongs to our model (relative to our view) - const Window* pViewWindow = maShapeTreeInfo.GetWindow(); + const vcl::Window* pViewWindow = maShapeTreeInfo.GetWindow(); SdrUnoObj* pUnoObjectImpl = PTR_CAST( SdrUnoObj, getSdrObject() ); SdrView* pView = maShapeTreeInfo.GetSdrView(); OSL_ENSURE( pView && pViewWindow && pUnoObjectImpl, "AccessibleControlShape::Init: no view, or no view window, no SdrUnoObj!" ); diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 2f3f8629c5ca..123e0b2f07e1 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -56,7 +56,7 @@ namespace accessibility */ AccessibleProxyEditSource_Impl( SdrObject& rObj, SdrView& rView, - const Window& rViewWindow ); + const vcl::Window& rViewWindow ); virtual ~AccessibleProxyEditSource_Impl(); // from the SvxEditSource interface @@ -175,7 +175,7 @@ namespace accessibility AccessibleProxyEditSource_Impl::AccessibleProxyEditSource_Impl( SdrObject& rObj, SdrView& rView, - const Window& rViewWindow ) : + const vcl::Window& rViewWindow ) : maEditSource( rObj, 0, rView, rViewWindow ) { } @@ -221,7 +221,7 @@ namespace accessibility AccessibleEmptyEditSource::AccessibleEmptyEditSource( SdrObject& rObj, SdrView& rView, - const Window& rViewWindow ) : + const vcl::Window& rViewWindow ) : mpEditSource( new AccessibleEmptyEditSource_Impl() ), mrObj(rObj), mrView(rView), diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx index 9f71fd0bd44c..e0f5b01252d0 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx @@ -28,7 +28,7 @@ class SdrObject; class SdrView; -class Window; +namespace vcl { class Window; } namespace accessibility { @@ -49,7 +49,7 @@ namespace accessibility Make sure you only create such an object if the shape _really_ does not contain text. */ - AccessibleEmptyEditSource( SdrObject& rObj, SdrView& rView, const Window& rViewWindow ); + AccessibleEmptyEditSource( SdrObject& rObj, SdrView& rView, const vcl::Window& rViewWindow ); virtual ~AccessibleEmptyEditSource(); // from the SvxEditSource interface @@ -83,7 +83,7 @@ namespace accessibility SdrObject& mrObj; SdrView& mrView; - const Window& mrViewWindow; + const vcl::Window& mrViewWindow; bool mbEditSourceEmpty; }; diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 78ef214bb8c9..5695268aa13d 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -164,7 +164,7 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent( ) sal_Int32 nIdx = 0; if( meBorder == FRAMEBORDER_NONE ) { - Window* pTabPage = mpFrameSel->GetParent(); + vcl::Window* pTabPage = mpFrameSel->GetParent(); sal_Int32 nChildren = pTabPage->GetChildCount(); for( nIdx = 0; nIdx < nChildren; ++nIdx ) if( pTabPage->GetChild( static_cast< sal_uInt16 >( nIdx ) ) == mpFrameSel ) @@ -217,7 +217,7 @@ Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( if(meBorder == FRAMEBORDER_NONE) { //add the label relation - Window *pLabeledBy = mpFrameSel->GetAccessibleRelationLabeledBy(); + vcl::Window *pLabeledBy = mpFrameSel->GetAccessibleRelationLabeledBy(); if ( pLabeledBy && pLabeledBy != mpFrameSel ) { AccessibleRelation aLabelRelation; @@ -226,7 +226,7 @@ Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet( aLabelRelation.TargetSet.getArray()[0] = pLabeledBy->GetAccessible(); pHelper->AddRelation(aLabelRelation); } - Window* pMemberOf = mpFrameSel->GetAccessibleRelationMemberOf(); + vcl::Window* pMemberOf = mpFrameSel->GetAccessibleRelationMemberOf(); if ( pMemberOf && pMemberOf != mpFrameSel ) { AccessibleRelation aMemberOfRelation; @@ -479,7 +479,7 @@ Any AccFrameSelector::getAccessibleKeyBinding( ) throw (RuntimeException) Reference< XAccessibleRelationSet > xRet = new utl::AccessibleRelationSetHelper; if(meBorder == FRAMEBORDER_NONE) { - Window* pPrev = mpFrameSel->GetWindow( WINDOW_PREV ); + vcl::Window* pPrev = mpFrameSel->GetWindow( WINDOW_PREV ); if(pPrev && WINDOW_FIXEDTEXT == pPrev->GetType()) { OUString sText = pPrev->GetText(); @@ -635,7 +635,7 @@ IMPL_LINK( AccFrameSelector, WindowEventListener, VclSimpleEvent*, pEvent ) DBG_ASSERT( pWinEvent, "AccFrameSelector::WindowEventListener - unknown window event" ); if ( pWinEvent ) { - Window* pWindow = pWinEvent->GetWindow(); + vcl::Window* pWindow = pWinEvent->GetWindow(); DBG_ASSERT( pWindow, "AccFrameSelector::WindowEventListener: no window!" ); if ( !pWindow->IsAccessibilityEventsSuppressed() || ( pWinEvent->GetId() == VCLEVENT_OBJECT_DYING ) ) { diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index f97949ec0882..ad4104295e72 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -147,7 +147,7 @@ void AccessibleShape::Init (void) if (xText.is()) { SdrView* pView = maShapeTreeInfo.GetSdrView (); - const Window* pWindow = maShapeTreeInfo.GetWindow (); + const vcl::Window* pWindow = maShapeTreeInfo.GetWindow (); if (pView != NULL && pWindow != NULL && mxShape.is()) { // #107948# Determine whether shape text is empty diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index 4c2c31f40872..3be00eee0bf4 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -141,7 +141,7 @@ void AccessibleShapeTreeInfo::SetController ( -void AccessibleShapeTreeInfo::SetWindow (Window* pWindow) +void AccessibleShapeTreeInfo::SetWindow (vcl::Window* pWindow) { mpWindow = pWindow; } diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx index 9beb6709cfa8..454ddaf16b20 100644 --- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx +++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx @@ -39,11 +39,11 @@ VCLXAccessibleSvxFindReplaceDialog::~VCLXAccessibleSvxFindReplaceDialog() void VCLXAccessibleSvxFindReplaceDialog::FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) { VCLXAccessibleComponent::FillAccessibleRelationSet( rRelationSet ); - Window* pDlg = GetWindow(); + vcl::Window* pDlg = GetWindow(); if ( pDlg ) { SvxSearchDialog* pSrchDlg = static_cast<SvxSearchDialog*>( pDlg ); - Window* pDocWin = pSrchDlg->GetDocWin(); + vcl::Window* pDocWin = pSrchDlg->GetDocWin(); if ( !pDocWin ) { return; diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index c156252efc8e..6ce00e7f88a9 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -975,12 +975,12 @@ void ChildrenManagerImpl::UpdateSelection (void) } } - Window *pParentWindow = maShapeTreeInfo.GetWindow(); + vcl::Window *pParentWindow = maShapeTreeInfo.GetWindow(); bool bShapeActive= false; // For table cell, the table's parent must be checked to make sure it has focus. if (pParentWindow) { - Window *pPWindow = pParentWindow->GetParent(); + vcl::Window *pPWindow = pParentWindow->GetParent(); if (pParentWindow->HasFocus() || (pPWindow && pPWindow->HasFocus())) bShapeActive =true; } diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 0838e3138ffa..5ee2f88d14c3 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -797,11 +797,11 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeEx Rectangle aBounds ( 0, 0, 0, 0 ); - Window* pWindow = mpControl; + vcl::Window* pWindow = mpControl; if (pWindow != NULL) { aBounds = pWindow->GetWindowExtentsRelative (NULL); - Window* pParent = pWindow->GetAccessibleParentWindow(); + vcl::Window* pParent = pWindow->GetAccessibleParentWindow(); if (pParent != NULL) { Rectangle aParentRect = pParent->GetWindowExtentsRelative (NULL); diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 6045211372b7..ed94dac21a7c 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -147,7 +147,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( { OExternalLockGuard aGuard( this ); ensureAlive(); - Window* pParent = mpParent->GetParent(); + vcl::Window* pParent = mpParent->GetParent(); uno::Reference< css::accessibility::XAccessible > xRet; if ( pParent ) @@ -159,12 +159,12 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( ::com::sun::star::awt::Rectangle SvxShowCharSetVirtualAcc::implGetBounds( ) throw (RuntimeException) { ::com::sun::star::awt::Rectangle aBounds ( 0, 0, 0, 0 ); - Window* pWindow = mpParent; + vcl::Window* pWindow = mpParent; if ( pWindow ) { Rectangle aRect = pWindow->GetWindowExtentsRelative( NULL ); aBounds = AWTRectangle( aRect ); - Window* pParent = pWindow->GetAccessibleParentWindow(); + vcl::Window* pParent = pWindow->GetAccessibleParentWindow(); if ( pParent ) { Rectangle aParentRect = pParent->GetWindowExtentsRelative( NULL ); diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index c80ad4d227ff..f7f49f043ed4 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -95,7 +95,7 @@ uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleParent( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); - Window *pTabPage = getNonLayoutParent(&mrPixelCtl); + vcl::Window *pTabPage = getNonLayoutParent(&mrPixelCtl); assert(pTabPage && WINDOW_TABPAGE == pTabPage->GetType()); return pTabPage->GetAccessible( true ); } @@ -105,7 +105,7 @@ sal_Int32 SvxPixelCtlAccessible::getAccessibleIndexInParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); sal_uInt16 nIdx = 0; - Window *pTabPage = getNonLayoutParent(&mrPixelCtl); + vcl::Window *pTabPage = getNonLayoutParent(&mrPixelCtl); assert(pTabPage && WINDOW_TABPAGE == pTabPage->GetType()); sal_uInt16 nChildren = pTabPage->GetChildCount(); for(nIdx = 0; nIdx < nChildren; nIdx++) @@ -140,7 +140,7 @@ uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRel ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleRelationSetHelper* rRelationSet = new utl::AccessibleRelationSetHelper; uno::Reference< css::accessibility::XAccessibleRelationSet > rSet = rRelationSet; - Window *pLabeledBy = mrPixelCtl.GetAccessibleRelationLabeledBy(); + vcl::Window *pLabeledBy = mrPixelCtl.GetAccessibleRelationLabeledBy(); if ( pLabeledBy && pLabeledBy != &mrPixelCtl ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); @@ -148,7 +148,7 @@ uno::Reference< XAccessibleRelationSet > SvxPixelCtlAccessible::getAccessibleRel rRelationSet->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::LABELED_BY, aSequence ) ); } - Window* pMemberOf = mrPixelCtl.GetAccessibleRelationMemberOf(); + vcl::Window* pMemberOf = mrPixelCtl.GetAccessibleRelationMemberOf(); if ( pMemberOf && pMemberOf != &mrPixelCtl ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index eb7038253661..79507b68230c 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -357,18 +357,18 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAcc //return Reference< XAccessibleRelationSet >(); utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; uno::Reference< css::accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper; - Window* pWindow = mpRepr; + vcl::Window* pWindow = mpRepr; if ( pWindow ) { - // Window *pLabeledBy = pWindow->GetAccRelationLabeledBy(); - Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); + // vcl::Window *pLabeledBy = pWindow->GetAccRelationLabeledBy(); + vcl::Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); if ( pLabeledBy && pLabeledBy != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); aSequence[0] = pLabeledBy->GetAccessible(); pRelationSetHelper->AddRelation( css::accessibility::AccessibleRelation( css::accessibility::AccessibleRelationType::LABELED_BY, aSequence ) ); } - Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf(); + vcl::Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf(); if ( pMemberOf && pMemberOf != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); @@ -764,7 +764,7 @@ void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive( void ) throw( lang:: SvxRectCtlChildAccessibleContext::SvxRectCtlChildAccessibleContext( const Reference<XAccessible>& rxParent, - const Window& rParentWindow, + const vcl::Window& rParentWindow, const OUString& rName, const OUString& rDescription, const Rectangle& rBoundingBox, diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index d05e5007b5ba..72106d4a52d5 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -25,7 +25,7 @@ namespace svx { SpellDialogChildWindow::SpellDialogChildWindow ( - Window* _pParent, + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* /*pInfo*/) diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 962234304aa4..855938ba4de8 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -68,7 +68,7 @@ class ColorWindow : public Control public: - ColorWindow( Window* pParent, const ResId& rId ) : + ColorWindow( vcl::Window* pParent, const ResId& rId ) : Control( pParent, rId ), aColor( COL_WHITE ) {}; @@ -366,7 +366,7 @@ void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState* -SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, sal_uInt16 nId, +SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( vcl::Window* pParent_, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( pParent_, nId ) @@ -384,7 +384,7 @@ SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, sal_uInt16 nId, SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const ResId& rResId ) : SfxDockingWindow ( pBindinx, pCW, pParent, rResId ), aTbxPipette ( this, BMP_RESID( TBX_PIPETTE ) ), diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index f61f60cde809..c47922d47629 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -63,7 +63,7 @@ void SvxContourDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, } } -SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, sal_uInt16 nId, +SvxContourDlgChildWindow::SvxContourDlgChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) { @@ -79,7 +79,7 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, sal_uInt16 } SvxContourDlg::SvxContourDlg(SfxBindings* _pBindings, SfxChildWindow* pCW, - Window* _pParent) + vcl::Window* _pParent) : SfxFloatingWindow(_pBindings, pCW, _pParent , "FloatingContour", "svx/ui/floatingcontour.ui") , pSuperClass(NULL) @@ -199,7 +199,7 @@ void SvxContourDlg::Update( const Graphic& rGraphic, bool bGraphicLinked, } SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, - Window* _pParent) : + vcl::Window* _pParent) : SvxContourDlg ( _pBindings, pCW, _pParent ), pUpdateEditingObject( NULL ), pCheckObj ( NULL ), @@ -211,7 +211,7 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow * { get(m_pTbx1, "toolbar"); get(m_pMtfTolerance, "spinbutton"); - m_pContourWnd = new ContourWindow(get<Window>("container"), WB_BORDER); + m_pContourWnd = new ContourWindow(get<vcl::Window>("container"), WB_BORDER); m_pContourWnd->set_hexpand(true); m_pContourWnd->set_vexpand(true); m_pContourWnd->Show(); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index b62da41ebb8e..62418f043dd2 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -53,7 +53,7 @@ sal_uInt32& SvxShowCharSet::getSelectedChar() return cSelectedChar; } -SvxShowCharSet::SvxShowCharSet(Window* pParent) +SvxShowCharSet::SvxShowCharSet(vcl::Window* pParent) : Control(pParent, WB_TABSTOP | WB_BORDER) , m_pAccessible(NULL) , aVscrollSB( this, WB_VERT) @@ -82,7 +82,7 @@ void SvxShowCharSet::Resize() SetFont(GetFont()); //force recalculation of correct fontsize } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxShowCharSet(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxShowCharSet(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxShowCharSet(pParent); } diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index a3738c97ae13..7d852b379b6e 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -26,7 +26,7 @@ #include <vcl/builder.hxx> -SvxCheckListBox::SvxCheckListBox( Window* pParent, WinBits nWinStyle ) : +SvxCheckListBox::SvxCheckListBox( vcl::Window* pParent, WinBits nWinStyle ) : SvTreeListBox( pParent, nWinStyle ) @@ -34,7 +34,7 @@ SvxCheckListBox::SvxCheckListBox( Window* pParent, WinBits nWinStyle ) : Init_Impl(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxCheckListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxCheckListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 7b22043a9b42..8175a0baee83 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -39,7 +39,7 @@ using namespace com::sun::star::beans; #include <stdio.h> -CompressGraphicsDialog::CompressGraphicsDialog( Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings ) : +CompressGraphicsDialog::CompressGraphicsDialog( vcl::Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings ) : ModalDialog ( pParent, "CompressGraphicDialog", "svx/ui/compressgraphicdialog.ui" ), m_pGraphicObj ( pGraphicObj ), m_aGraphic ( pGraphicObj->GetGraphicObject().GetGraphic() ), @@ -53,7 +53,7 @@ CompressGraphicsDialog::CompressGraphicsDialog( Window* pParent, SdrGrafObj* pGr Initialize(); } -CompressGraphicsDialog::CompressGraphicsDialog( Window* pParent, Graphic& rGraphic, Size rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings ) : +CompressGraphicsDialog::CompressGraphicsDialog( vcl::Window* pParent, Graphic& rGraphic, Size rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings ) : ModalDialog ( pParent, "CompressGraphicDialog", "svx/ui/compressgraphicdialog.ui" ), m_pGraphicObj ( NULL ), m_aGraphic ( rGraphic ), diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 3e7c0ab7866a..a2c56212eec2 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -36,7 +36,7 @@ #include <vcl/settings.hxx> #include <boost/scoped_ptr.hpp> -SvxXConnectionPreview::SvxXConnectionPreview( Window* pParent, WinBits nStyle) +SvxXConnectionPreview::SvxXConnectionPreview( vcl::Window* pParent, WinBits nStyle) : Control(pParent, nStyle) , pEdgeObj(NULL) , pObjList(NULL) @@ -46,7 +46,7 @@ SvxXConnectionPreview::SvxXConnectionPreview( Window* pParent, WinBits nStyle) SetStyles(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXConnectionPreview(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXConnectionPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index e7cc1dac7d87..96a99d3a534b 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -81,7 +81,7 @@ class SvxSuperContourDlg : public SvxContourDlg public: SvxSuperContourDlg(SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent); + vcl::Window* pParent); virtual ~SvxSuperContourDlg(); void SetExecState( bool bEnable ); diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 6289f3db1e75..28db0b862969 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star; #define TRANSCOL Color( COL_WHITE ) -ContourWindow::ContourWindow( Window* pParent, WinBits nBits ) : +ContourWindow::ContourWindow( vcl::Window* pParent, WinBits nBits ) : GraphCtrl ( pParent, nBits ), aWorkRect ( 0, 0, 0, 0 ), bPipetteMode ( false ), diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx index e92f45bd93e9..63d68ff82543 100644 --- a/svx/source/dialog/contwnd.hxx +++ b/svx/source/dialog/contwnd.hxx @@ -49,7 +49,7 @@ protected: public: - ContourWindow(Window* pParent, WinBits nBits); + ContourWindow(vcl::Window* pParent, WinBits nBits); virtual ~ContourWindow(); void SetPolyPolygon( const PolyPolygon& rPolyPoly ); diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 1e5078a57587..6125f0f3870a 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -374,7 +374,7 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, } } -SvxTPView::SvxTPView(Window * pParent) +SvxTPView::SvxTPView(vcl::Window * pParent) : TabPage(pParent, "RedlineViewPage", "svx/ui/redlineviewpage.ui") , bEnableAccept(true) , bEnableAcceptAll(true) @@ -524,7 +524,7 @@ IMPL_LINK( SvxTPView, PbClickHdl, PushButton*, pPushB ) return 0; } -SvxTPFilter::SvxTPFilter( Window * pParent) +SvxTPFilter::SvxTPFilter( vcl::Window * pParent) : TabPage(pParent, "RedlineFilterPage", "svx/ui/redlinefilterpage.ui") , pRedlinTable(NULL) , bModified(false) @@ -1056,7 +1056,7 @@ IMPL_LINK( SvxTPFilter, RefHandle, PushButton*, pRef ) return 0; } -SvxAcceptChgCtr::SvxAcceptChgCtr(Window* pParent) +SvxAcceptChgCtr::SvxAcceptChgCtr(vcl::Window* pParent) : TabControl(pParent, WB_TABSTOP | WB_DIALOGCONTROL) { m_pUIBuilder = new VclBuilder(this, getUIRootDir(), "svx/ui/redlinecontrol.ui", "RedlineControl"); diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index 5016c12d5eb5..089faad66941 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -29,7 +29,7 @@ namespace svx { - sal_uInt16 administrateDatabaseRegistration( Window* _parentWindow ) + sal_uInt16 administrateDatabaseRegistration( vcl::Window* _parentWindow ) { sal_uInt16 nResult = RET_CANCEL; diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index ddf6bc8799cd..c14125ddb0e6 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -38,7 +38,7 @@ const long DIAL_OUTER_WIDTH = 8; -DialControlBmp::DialControlBmp( Window& rParent ) : +DialControlBmp::DialControlBmp( vcl::Window& rParent ) : VirtualDevice( rParent, 0, 0 ), mbEnabled( true ), mrParent( rParent ), @@ -223,7 +223,7 @@ void DialControlBmp::DrawBackground() -DialControl::DialControl_Impl::DialControl_Impl ( Window& rParent ) : +DialControl::DialControl_Impl::DialControl_Impl ( vcl::Window& rParent ) : mpBmpEnabled(new DialControlBmp(rParent)), mpBmpDisabled(new DialControlBmp(rParent)), mpBmpBuffered(new DialControlBmp(rParent)), @@ -264,7 +264,7 @@ void DialControl::DialControl_Impl::SetSize( const Size& rWinSize ) -DialControl::DialControl( Window* pParent, WinBits nBits ) : +DialControl::DialControl( vcl::Window* pParent, WinBits nBits ) : Control( pParent, nBits ), mpImpl( new DialControl_Impl( *this ) ) { @@ -275,7 +275,7 @@ DialControl::~DialControl() { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDialControl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDialControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new DialControl(pParent, WB_TABSTOP); } diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index ca9526734cd3..5845b50daece 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -41,7 +41,7 @@ using namespace com::sun::star; -Svx3DPreviewControl::Svx3DPreviewControl(Window* pParent, const ResId& rResId) +Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, const ResId& rResId) : Control(pParent, rResId), mpModel(0), mpFmPage(0), @@ -57,7 +57,7 @@ Svx3DPreviewControl::Svx3DPreviewControl(Window* pParent, const ResId& rResId) SetBackground(); } -Svx3DPreviewControl::Svx3DPreviewControl(Window* pParent, WinBits nStyle) +Svx3DPreviewControl::Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle) : Control(pParent, nStyle), mpModel(0), mpFmPage(0), @@ -253,7 +253,7 @@ void Svx3DPreviewControl::Set3DAttributes( const SfxItemSet& rAttr ) #define NO_LIGHT_SELECTED (0xffffffff) #define MAX_NUMBER_LIGHTS (8) -Svx3DLightControl::Svx3DLightControl(Window* pParent, WinBits nStyle) +Svx3DLightControl::Svx3DLightControl(vcl::Window* pParent, WinBits nStyle) : Svx3DPreviewControl(pParent, nStyle), maUserInteractiveChangeCallback(), maUserSelectionChangeCallback(), @@ -954,7 +954,7 @@ basegfx::B3DVector Svx3DLightControl::GetLightDirection(sal_uInt32 nNum) const -SvxLightCtl3D::SvxLightCtl3D( Window* pParent, const ResId& rResId) +SvxLightCtl3D::SvxLightCtl3D( vcl::Window* pParent, const ResId& rResId) : Control(pParent, rResId), maLightControl(this, 0), maHorScroller(this, WB_HORZ | WB_DRAG), @@ -965,7 +965,7 @@ SvxLightCtl3D::SvxLightCtl3D( Window* pParent, const ResId& rResId) Init(); } -SvxLightCtl3D::SvxLightCtl3D( Window* pParent) +SvxLightCtl3D::SvxLightCtl3D( vcl::Window* pParent) : Control(pParent, WB_BORDER | WB_TABSTOP), maLightControl(this, 0), maHorScroller(this, WB_HORZ | WB_DRAG), @@ -981,7 +981,7 @@ Size SvxLightCtl3D::GetOptimalSize() const return LogicToPixel(Size(80, 100), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLightCtl3D(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxLightCtl3D(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxLightCtl3D(pParent); } diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index b8b677c12e6b..10b7f40f0679 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -66,7 +66,7 @@ Bitmap& SvxRectCtl::GetRectBitmap( void ) return *pBitmap; } -SvxRectCtl::SvxRectCtl(Window* pParent, RECT_POINT eRpt, +SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RECT_POINT eRpt, sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle) : Control(pParent, WB_BORDER | WB_TABSTOP) , pAccContext(NULL) @@ -96,7 +96,7 @@ Size SvxRectCtl::GetOptimalSize() const return LogicToPixel(Size(78, 39), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxRectCtl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxRectCtl(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxRectCtl(pParent); } @@ -263,7 +263,7 @@ void SvxRectCtl::MouseButtonDown( const MouseEvent& rMEvt ) SetActualRP( eRP ); - Window *pTabPage = getNonLayoutParent(this); + vcl::Window *pTabPage = getNonLayoutParent(this); if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType()) ( (SvxTabPage*)pTabPage)->PointChanged( this, eRP ); } @@ -348,7 +348,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) { SetActualRP( eNewRP ); - Window *pTabPage = getNonLayoutParent(this); + vcl::Window *pTabPage = getNonLayoutParent(this); if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType()) ((SvxTabPage*) pTabPage)->PointChanged(this, eRP); @@ -669,7 +669,7 @@ void SvxRectCtl::SetState( CTL_STATE nState ) eRP = GetRPFromPoint( _aPtNew ); Invalidate(); - Window *pTabPage = getNonLayoutParent(this); + vcl::Window *pTabPage = getNonLayoutParent(this); if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType()) ((SvxTabPage*)pTabPage)->PointChanged(this, eRP); } @@ -707,7 +707,7 @@ Rectangle SvxRectCtl::CalculateFocusRectangle( RECT_POINT eRectPoint ) const Reference< XAccessible > SvxRectCtl::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); DBG_ASSERT( pParent, "-SvxRectCtl::CreateAccessible(): No Parent!" ); @@ -796,7 +796,7 @@ long SvxPixelCtl::ShowPosition( const Point &pt) aFocusPosition.setY(nY); Invalidate(Rectangle(Point(0,0),aRectSize)); - Window *pTabPage = getNonLayoutParent(this); + vcl::Window *pTabPage = getNonLayoutParent(this); if (pTabPage && WINDOW_TABPAGE == pTabPage->GetType()) ( (SvxTabPage*)pTabPage)->PointChanged( this, RP_MM ); // RectPoint ist dummy @@ -804,7 +804,7 @@ long SvxPixelCtl::ShowPosition( const Point &pt) } -SvxPixelCtl::SvxPixelCtl(Window* pParent, sal_uInt16 nNumber) +SvxPixelCtl::SvxPixelCtl(vcl::Window* pParent, sal_uInt16 nNumber) : Control(pParent, WB_BORDER) , nLines(nNumber) , bPaintable(true) @@ -832,7 +832,7 @@ Size SvxPixelCtl::GetOptimalSize() const return LogicToPixel(Size(72, 72), MAP_APPFONT); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPixelCtl(Window *pParent, VclBuilder::stringmap&) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPixelCtl(vcl::Window *pParent, VclBuilder::stringmap&) { return new SvxPixelCtl(pParent, 8); } @@ -1108,7 +1108,7 @@ void SvxPixelCtl::Reset() // Constructor: BitmapCtl for SvxPixelCtl -SvxBitmapCtl::SvxBitmapCtl( Window* /*pParent*/, const Size& rSize ) +SvxBitmapCtl::SvxBitmapCtl( vcl::Window* /*pParent*/, const Size& rSize ) : aSize(rSize) , nLines(0) , pBmpArray(NULL) @@ -1128,7 +1128,7 @@ BitmapEx SvxBitmapCtl::GetBitmapEx() return BitmapEx(aRetval); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorLB(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorLB(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP; @@ -1195,14 +1195,14 @@ void FillAttrLB::Fill( const XColorListRef &pColorTab ) // Fills the listbox (provisional) with strings -HatchingLB::HatchingLB( Window* pParent, WinBits nWinStyle) +HatchingLB::HatchingLB( vcl::Window* pParent, WinBits nWinStyle) : ListBox( pParent, nWinStyle ), mpList ( NULL ) { SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeHatchingLB(Window *pParent, VclBuilder::stringmap& rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeHatchingLB(vcl::Window *pParent, VclBuilder::stringmap& rMap) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1290,14 +1290,14 @@ void FillAttrLB::Fill( const XHatchListRef &pList ) // Fills the listbox (provisional) with strings -GradientLB::GradientLB( Window* pParent, WinBits aWB) +GradientLB::GradientLB( vcl::Window* pParent, WinBits aWB) : ListBox( pParent, aWB ), mpList(NULL) { SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGradientLB(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGradientLB(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1407,7 +1407,7 @@ void FillAttrLB::Fill( const XGradientListRef &pList ) // BitmapLB Constructor -BitmapLB::BitmapLB( Window* pParent, WinBits aWB) +BitmapLB::BitmapLB( vcl::Window* pParent, WinBits aWB) : ListBox( pParent, aWB ), maBitmapEx(), mpList(NULL) @@ -1415,7 +1415,7 @@ BitmapLB::BitmapLB( Window* pParent, WinBits aWB) SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeBitmapLB(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeBitmapLB(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -1538,7 +1538,7 @@ void BitmapLB::Modify(const Size& rSize, const XBitmapEntry& rEntry, sal_Int32 n } } -FillAttrLB::FillAttrLB(Window* pParent, WinBits aWB) +FillAttrLB::FillAttrLB(vcl::Window* pParent, WinBits aWB) : ColorListBox(pParent, aWB) { } @@ -1578,14 +1578,14 @@ void FillTypeLB::Fill() SetUpdateMode( true ); } -LineLB::LineLB(Window* pParent, WinBits aWB) +LineLB::LineLB(vcl::Window* pParent, WinBits aWB) : ListBox(pParent, aWB), mbAddStandardFields(true) { // No EdgeBlending for LineStyle/Dash SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLineLB(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineLB(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP; @@ -1682,13 +1682,13 @@ void LineLB::Modify( const XDashEntry& rEntry, sal_Int32 nPos, const Bitmap& rBi // Fills the listbox (provisional) with strings -LineEndLB::LineEndLB( Window* pParent, WinBits aWB ) +LineEndLB::LineEndLB( vcl::Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) { // No EdgeBlending for LineEnds SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLineEndLB(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineEndLB(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_TABSTOP; @@ -1824,7 +1824,7 @@ void SvxPreviewBase::InitSettings(bool bForeground, bool bBackground) Invalidate(); } -SvxPreviewBase::SvxPreviewBase(Window* pParent) +SvxPreviewBase::SvxPreviewBase(vcl::Window* pParent) : Control(pParent, WB_BORDER) , mpModel(new SdrModel()) , mpBufferDevice(new VirtualDevice(*this)) @@ -1963,7 +1963,7 @@ void SvxXLinePreview::Resize() mpLineObjC->SetPathPoly(basegfx::B2DPolyPolygon(aPolygonC)); } -SvxXLinePreview::SvxXLinePreview(Window* pParent) +SvxXLinePreview::SvxXLinePreview(vcl::Window* pParent) : SvxPreviewBase(pParent) , mpLineObjA(NULL) , mpLineObjB(NULL) @@ -1983,7 +1983,7 @@ SvxXLinePreview::SvxXLinePreview(Window* pParent) mpLineObjC->SetModel(&getModel()); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXLinePreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXLinePreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxXLinePreview(pParent); } @@ -2068,7 +2068,7 @@ void SvxXLinePreview::Paint( const Rectangle& ) LocalPostPaint(); } -SvxXRectPreview::SvxXRectPreview(Window* pParent) +SvxXRectPreview::SvxXRectPreview(vcl::Window* pParent) : SvxPreviewBase(pParent) , mpRectangleObject(0) { @@ -2094,7 +2094,7 @@ void SvxXRectPreview::Resize() SvxPreviewBase::Resize(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXRectPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXRectPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxXRectPreview(pParent); } @@ -2126,7 +2126,7 @@ void SvxXRectPreview::Paint( const Rectangle& ) LocalPostPaint(); } -SvxXShadowPreview::SvxXShadowPreview( Window* pParent ) +SvxXShadowPreview::SvxXShadowPreview( vcl::Window* pParent ) : SvxPreviewBase(pParent) , mpRectangleObject(0) , mpRectangleShadow(0) @@ -2149,7 +2149,7 @@ SvxXShadowPreview::SvxXShadowPreview( Window* pParent ) mpRectangleShadow->SetModel(&getModel()); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXShadowPreview (Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXShadowPreview (vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxXShadowPreview(pParent); } diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index c119619880d5..bb3f1bf6f71d 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -527,7 +527,7 @@ css::util::URL RecoveryCore::impl_getParsedURL(const OUString& sURL) return aURL; } -PluginProgressWindow::PluginProgressWindow( Window* pParent , +PluginProgressWindow::PluginProgressWindow( vcl::Window* pParent , const css::uno::Reference< css::lang::XComponent >& xProgress) : Window (pParent ) , m_xProgress(xProgress) @@ -545,7 +545,7 @@ PluginProgressWindow::~PluginProgressWindow() } -PluginProgress::PluginProgress( Window* pParent, +PluginProgress::PluginProgress( vcl::Window* pParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ) { m_pPlugProgressWindow = new PluginProgressWindow(pParent, static_cast< css::lang::XComponent* >(this)); @@ -623,7 +623,7 @@ void SAL_CALL PluginProgress::reset() } -SaveDialog::SaveDialog(Window* pParent, RecoveryCore* pCore) +SaveDialog::SaveDialog(vcl::Window* pParent, RecoveryCore* pCore) : Dialog(pParent, "DocRecoverySaveDialog", "svx/ui/docrecoverysavedialog.ui") , m_pCore(pCore) @@ -677,7 +677,7 @@ IMPL_LINK_NOARG(SaveDialog, OKButtonHdl) return 0; } -SaveProgressDialog::SaveProgressDialog(Window* pParent, RecoveryCore* pCore) +SaveProgressDialog::SaveProgressDialog(vcl::Window* pParent, RecoveryCore* pCore) : ModalDialog(pParent, "DocRecoveryProgressDialog", "svx/ui/docrecoveryprogressdialog.ui") , m_pCore(pCore) @@ -828,7 +828,7 @@ void RecovDocList::InitEntry(SvTreeListEntry* pEntry, } -short impl_askUserForWizardCancel(Window* pParent, sal_Int16 nRes) +short impl_askUserForWizardCancel(vcl::Window* pParent, sal_Int16 nRes) { MessageDialog aQuery(pParent, SVX_RES(nRes), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); if (aQuery.Execute() == RET_YES) @@ -837,7 +837,7 @@ short impl_askUserForWizardCancel(Window* pParent, sal_Int16 nRes) return DLG_RET_CANCEL; } -RecoveryDialog::RecoveryDialog(Window* pParent, RecoveryCore* pCore) +RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore) : Dialog(pParent, "DocRecoveryRecoverDialog", "svx/ui/docrecoveryrecoverdialog.ui") , m_aTitleRecoveryInProgress(SVX_RESSTR(RID_SVXSTR_RECOVERY_INPROGRESS)) @@ -1205,7 +1205,7 @@ OUString RecoveryDialog::impl_getStatusString( const TURLInfo& rInfo ) const return sStatus; } -BrokenRecoveryDialog::BrokenRecoveryDialog(Window* pParent , +BrokenRecoveryDialog::BrokenRecoveryDialog(vcl::Window* pParent , RecoveryCore* pCore , bool bBeforeRecovery) : ModalDialog ( pParent, "DocRecoveryBrokenDialog", "svx/ui/docrecoverybrokendialog.ui" ) diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 02f346a3ee9e..5e20a83fad8f 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -478,19 +478,19 @@ void SvxFontPrevWindow::Init() SetBorderStyle( WINDOW_BORDER_MONO ); } -SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) : +SvxFontPrevWindow::SvxFontPrevWindow( vcl::Window* pParent, const ResId& rId ) : Window( pParent, rId ) { Init(); } -SvxFontPrevWindow::SvxFontPrevWindow(Window* pParent, WinBits nStyle) +SvxFontPrevWindow::SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle) : Window(pParent, nStyle) { Init(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontPrevWindow(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFontPrevWindow(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index a951fe8fc6eb..dd4d1d6dfe3f 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -83,7 +83,7 @@ void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEnt -SvxFontListBox::SvxFontListBox(Window* pParent, WinBits nStyle) +SvxFontListBox::SvxFontListBox(vcl::Window* pParent, WinBits nStyle) : SvTabListBox(pParent, nStyle) , maStdFont(GetFont()) , mpEntryColor(NULL) @@ -93,7 +93,7 @@ SvxFontListBox::SvxFontListBox(Window* pParent, WinBits nStyle) maEntryFont = maStdFont; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFontListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFontListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 0a8a647a43ed..17d0d55d3d76 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -156,7 +156,7 @@ void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState SvxFontWorkChildWindow::SvxFontWorkChildWindow ( - Window* _pParent, + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo @@ -178,7 +178,7 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* _pParent, + vcl::Window* _pParent, const ResId& rResId ) : SfxDockingWindow( pBindinx, pCW, _pParent, rResId ), diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index f4b9dc52efbb..de7ff69ddd1f 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -38,7 +38,7 @@ inline SvxFrameDirection lclVoidToEnum( void* pDirection ) } // namespace -FrameDirectionListBox::FrameDirectionListBox( Window* pParent, WinBits nBits ) +FrameDirectionListBox::FrameDirectionListBox( vcl::Window* pParent, WinBits nBits ) : ListBox(pParent, nBits) , meSaveValue(FRMDIR_HORI_LEFT_TOP) { @@ -48,7 +48,7 @@ FrameDirectionListBox::~FrameDirectionListBox() { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFrameDirectionListBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFrameDirectionListBox(vcl::Window *pParent, VclBuilder::stringmap &) { FrameDirectionListBox* pListBox = new FrameDirectionListBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK|WB_TABSTOP); pListBox->EnableAutoSize(true); diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index e72575baa366..0fc0d0f1a21c 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -781,7 +781,7 @@ bool FrameSelectorImpl::SelectedBordersEqual() const return bEqual; } -FrameSelector::FrameSelector(Window* pParent) +FrameSelector::FrameSelector(vcl::Window* pParent) : Control(pParent, WB_BORDER|WB_TABSTOP) { // not in c'tor init list (avoid warning about usage of *this) @@ -789,7 +789,7 @@ FrameSelector::FrameSelector(Window* pParent) EnableRTL( false ); // #107808# don't mirror the mouse handling } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFrameSelector(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFrameSelector(vcl::Window *pParent, VclBuilder::stringmap &) { return new FrameSelector(pParent); } diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 03ba7aebb062..c39f9d55e452 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -53,7 +53,7 @@ void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, c } } -GraphCtrl::GraphCtrl( Window* pParent, WinBits nStyle ) : +GraphCtrl::GraphCtrl( vcl::Window* pParent, WinBits nStyle ) : Control ( pParent, nStyle ), aMap100 ( MAP_100TH_MM ), nWinStyle ( 0 ), @@ -73,7 +73,7 @@ GraphCtrl::GraphCtrl( Window* pParent, WinBits nStyle ) : EnableRTL( false ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGraphCtrl(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGraphCtrl(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -748,7 +748,7 @@ IMPL_LINK( GraphCtrl, UpdateHdl, Timer*, pTimer ) { if( mpAccContext == NULL ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); DBG_ASSERT( pParent, "-GraphCtrl::CreateAccessible(): No Parent!" ); diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 0deaeb51f97c..2842ae87286a 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -42,7 +42,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj { SfxViewFrame* pViewFrame = SfxViewFrame::Current(); SfxObjectShell* pShell = pViewFrame ? pViewFrame->GetObjectShell() : NULL; - Window* pWindow = ( pViewFrame && pViewFrame->GetViewShell() ) ? pViewFrame->GetViewShell()->GetWindow() : NULL; + vcl::Window* pWindow = ( pViewFrame && pViewFrame->GetViewShell() ) ? pViewFrame->GetViewShell()->GetWindow() : NULL; Graphic aGraphic; switch( rReq.GetSlot() ) diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 3051c57ab536..108a77a3c7bb 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -88,7 +88,7 @@ static const sal_uInt16 pRanges[] = namespace svx { - bool ShowBorderBackgroundDlg( Window* pParent, SfxItemSet* pBBSet, + bool ShowBorderBackgroundDlg( vcl::Window* pParent, SfxItemSet* pBBSet, bool bEnableBackgroundSelector ) { bool bRes = false; @@ -125,7 +125,7 @@ const sal_uInt16* SvxHeaderPage::GetRanges() -SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxHeaderPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxHeaderPage( pParent, *rSet ); } @@ -139,14 +139,14 @@ const sal_uInt16* SvxFooterPage::GetRanges() -SfxTabPage* SvxFooterPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* SvxFooterPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new SvxFooterPage( pParent, *rSet ); } -SvxHeaderPage::SvxHeaderPage( Window* pParent, const SfxItemSet& rAttr ) : +SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_HEADERSET ) @@ -155,7 +155,7 @@ SvxHeaderPage::SvxHeaderPage( Window* pParent, const SfxItemSet& rAttr ) : -SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) : +SvxFooterPage::SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_FOOTERSET ) @@ -163,7 +163,7 @@ SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) : } -SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) : +SvxHFPage::SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) : SfxTabPage(pParent, "HFFormatPage", "svx/ui/headfootformatpage.ui", &rSet), nId(nSetId), pBBSet(NULL), @@ -1133,7 +1133,7 @@ IMPL_LINK_NOARG(SvxHFPage, RangeHdl) return 0; } -static void lcl_Move(Window& rWin, sal_Int32 nDiff) +static void lcl_Move(vcl::Window& rWin, sal_Int32 nDiff) { Point aPos(rWin.GetPosPixel()); aPos.Y() -= nDiff; @@ -1144,7 +1144,7 @@ void SvxHFPage::EnableDynamicSpacing() { m_pDynSpacingCB->Show(); //move all following controls - Window* aMoveWindows[] = + vcl::Window* aMoveWindows[] = { m_pHeightFT, m_pHeightEdit, diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index f1e227d6a18d..9aeefe8e85a0 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -45,7 +45,7 @@ struct MyStruct SfxWorkWindow* pWorkWin; }; -SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId, +SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ), @@ -60,7 +60,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId, pWindow = mpDlg->GetWindow(); ((MyStruct*)pImp)->bVisible = false; - Window* pTopWindow = 0; + vcl::Window* pTopWindow = 0; if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 && (0 != (pTopWindow = SfxGetpApp()->GetTopWindow()))) { diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 5deb794ed74c..a40c91ec71e6 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -93,7 +93,7 @@ void SvxIMapDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, } } -SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, sal_uInt16 nId, +SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -117,12 +117,12 @@ void SvxIMapDlgChildWindow::UpdateIMapDlg( const Graphic& rGraphic, const ImageM SVXIMAPDLG()->UpdateLink( rGraphic, pImageMap, pTargetList, pEditingObj ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeStatusBar(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeStatusBar(vcl::Window *pParent, VclBuilder::stringmap &) { return new StatusBar(pParent); } -SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, Window* _pParent) +SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window* _pParent) : SfxModelessDialog(_pBindings, pCW, _pParent, "ImapDialog", "svx/ui/imapdialog.ui") , pCheckObj(NULL) , aIMapItem(SID_IMAP_EXEC, *this, *_pBindings) diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 36af678166ff..a1f8358bc8a8 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -56,7 +56,7 @@ using ::com::sun::star::uno::Reference; #define TRANSCOL Color( COL_WHITE ) -IMapWindow::IMapWindow( Window* pParent, WinBits nBits, const Reference< XFrame >& rxDocumentFrame ) : +IMapWindow::IMapWindow( vcl::Window* pParent, WinBits nBits, const Reference< XFrame >& rxDocumentFrame ) : GraphCtrl( pParent, nBits ), DropTargetHelper( this ), mxDocumentFrame( rxDocumentFrame ) diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index f62a832c7758..3d889247857e 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -132,7 +132,7 @@ protected: public: - IMapWindow( Window* pParent, WinBits nBits, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame ); + IMapWindow( vcl::Window* pParent, WinBits nBits, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame ); virtual ~IMapWindow(); bool ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ); diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 8d3f6f98ca38..eec98dee33a4 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -107,7 +107,7 @@ static bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nL } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLanguageBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxLanguageBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; bool bDropdown = VclBuilder::extractDropdown(rMap); @@ -120,7 +120,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLanguageBox(Window *pPar return pLanguageBox; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLanguageComboBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxLanguageComboBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; bool bDropdown = VclBuilder::extractDropdown(rMap); @@ -492,7 +492,7 @@ sal_Int32 SvxLanguageBoxBase::GetSavedValueLBB() const } -SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nBits, bool bCheck ) +SvxLanguageBox::SvxLanguageBox( vcl::Window* pParent, WinBits nBits, bool bCheck ) : ListBox( pParent, nBits ) , SvxLanguageBoxBase( bCheck ) { @@ -507,7 +507,7 @@ SvxLanguageBox::~SvxLanguageBox() } -SvxLanguageComboBox::SvxLanguageComboBox( Window* pParent, WinBits nBits, bool bCheck ) +SvxLanguageComboBox::SvxLanguageComboBox( vcl::Window* pParent, WinBits nBits, bool bCheck ) : ComboBox( pParent, nBits ) , SvxLanguageBoxBase( bCheck ) , mnSavedValuePos( COMBOBOX_ENTRY_NOTFOUND ) diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx index 1f223ce251e1..6ecced415026 100644 --- a/svx/source/dialog/linkwarn.cxx +++ b/svx/source/dialog/linkwarn.cxx @@ -20,7 +20,7 @@ #include <svx/linkwarn.hxx> #include <svtools/miscopt.hxx> -SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const OUString& _rFileName ) +SvxLinkWarningDialog::SvxLinkWarningDialog( vcl::Window* pParent, const OUString& _rFileName ) : MessageDialog(pParent, "LinkWarnDialog" , "svx/ui/linkwarndialog.ui") { get(m_pWarningOnBox, "ask"); diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index 29b2c4bf9879..8810a874ba91 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -27,7 +27,7 @@ #include <vcl/settings.hxx> #include <boost/scoped_ptr.hpp> -SvxXMeasurePreview::SvxXMeasurePreview( Window* pParent, WinBits nStyle) +SvxXMeasurePreview::SvxXMeasurePreview( vcl::Window* pParent, WinBits nStyle) : Control(pParent, nStyle) { SetMapMode( MAP_100TH_MM ); @@ -62,7 +62,7 @@ void SvxXMeasurePreview::Resize() pMeasureObj->SetPoint(aPt2, 1); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxXMeasurePreview(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxXMeasurePreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 81b4d502e720..bd178f8a82f7 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -115,7 +115,7 @@ bool SvxGridItem::GetPresentation } // TabPage Screen Settings -SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : +SvxGridTabPage::SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet) : SfxTabPage( pParent, "OptGridPage" , "svx/ui/optgridpage.ui", &rCoreSet ), bAttrModified( false ) @@ -173,7 +173,7 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : -SfxTabPage* SvxGridTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* SvxGridTabPage::Create( vcl::Window* pParent, const SfxItemSet& rAttrSet ) { return ( new SvxGridTabPage( pParent, rAttrSet ) ); } diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index 99c3bb76b22d..b1b61e9ed1a0 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -31,7 +31,7 @@ namespace svx { struct OrientationHelper_Impl { - typedef std::pair< Window*, TriState > WindowPair; + typedef std::pair< vcl::Window*, TriState > WindowPair; typedef std::vector< WindowPair > WindowVec; DialControl& mrCtrlDial; @@ -42,10 +42,10 @@ struct OrientationHelper_Impl explicit OrientationHelper_Impl( DialControl& rCtrlDial, CheckBox& rCbStacked ); - void AddDependentWindow( Window& rWindow, TriState eDisableIfStacked ); + void AddDependentWindow( vcl::Window& rWindow, TriState eDisableIfStacked ); void EnableDependentWindows(); - void EnableWindow( Window& rWindow, TriState eDisableIfStacked ); + void EnableWindow( vcl::Window& rWindow, TriState eDisableIfStacked ); void ShowDependentWindows(); @@ -65,7 +65,7 @@ OrientationHelper_Impl::OrientationHelper_Impl( DialControl& rCtrlDial, CheckBox mrCbStacked.SetClickHdl( LINK( this, OrientationHelper_Impl, ClickHdl ) ); } -void OrientationHelper_Impl::AddDependentWindow( Window& rWindow, TriState eDisableIfStacked ) +void OrientationHelper_Impl::AddDependentWindow( vcl::Window& rWindow, TriState eDisableIfStacked ) { maWinVec.push_back( std::make_pair( &rWindow, eDisableIfStacked ) ); EnableWindow( rWindow, eDisableIfStacked ); @@ -77,7 +77,7 @@ void OrientationHelper_Impl::EnableDependentWindows() EnableWindow( *aIt->first, aIt->second ); } -void OrientationHelper_Impl::EnableWindow( Window& rWindow, TriState eDisableIfStacked ) +void OrientationHelper_Impl::EnableWindow( vcl::Window& rWindow, TriState eDisableIfStacked ) { bool bDisableOnStacked = false; switch( eDisableIfStacked ) @@ -117,7 +117,7 @@ OrientationHelper::~OrientationHelper() { } -void OrientationHelper::AddDependentWindow( Window& rWindow, TriState eDisableIfStacked ) +void OrientationHelper::AddDependentWindow( vcl::Window& rWindow, TriState eDisableIfStacked ) { mpImpl->AddDependentWindow( rWindow, eDisableIfStacked ); } diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 8dea4db44760..fa7b9befa814 100644 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -34,7 +34,7 @@ #define CELL_WIDTH 1600L #define CELL_HEIGHT 800L -SvxPageWindow::SvxPageWindow(Window* pParent) +SvxPageWindow::SvxPageWindow(vcl::Window* pParent) : Window(pParent), aWinSize(), aSize(), @@ -93,7 +93,7 @@ SvxPageWindow::~SvxPageWindow() delete pFtBorder; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPageWindow(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxPageWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxPageWindow(pParent); } diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index ac4c7f341052..c8b1624075b9 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -22,7 +22,7 @@ #include <vcl/builder.hxx> #include <vcl/settings.hxx> -SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, WinBits nBits) : +SvxParaPrevWindow::SvxParaPrevWindow( vcl::Window* pParent, WinBits nBits) : Window( pParent, nBits), @@ -45,7 +45,7 @@ SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, WinBits nBits) : SetBorderStyle( WINDOW_BORDER_MONO ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxParaPrevWindow(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxParaPrevWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxParaPrevWindow(pParent, WB_BORDER); } diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index af770701c26f..c794ebb309b5 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -71,7 +71,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl) -SvxPasswordDialog::SvxPasswordDialog(Window* pParent, bool bAllowEmptyPasswords, bool bDisableOldPassword) +SvxPasswordDialog::SvxPasswordDialog(vcl::Window* pParent, bool bAllowEmptyPasswords, bool bDisableOldPassword) : SfxModalDialog(pParent, "PasswordDialog", "svx/ui/passwd.ui") , aOldPasswdErrStr(SVX_RESSTR(RID_SVXSTR_ERR_OLD_PASSWD)) , aRepeatPasswdErrStr(SVX_RESSTR(RID_SVXSTR_ERR_REPEAT_PASSWD )) diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index 62f3db4bfbe7..f7cc2d0cee7f 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -49,7 +49,7 @@ OUString SvxPluginFileDlg::GetPath() const return maFileDlg.GetPath(); } -SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind ) +SvxPluginFileDlg::SvxPluginFileDlg (vcl::Window *, sal_uInt16 nKind ) : maFileDlg(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, SFXWB_INSERT) { // set title of the dialogwindow diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx index c2aa1125b3b0..14a2c9a8d0d5 100644 --- a/svx/source/dialog/prtqry.cxx +++ b/svx/source/dialog/prtqry.cxx @@ -22,7 +22,7 @@ #include <svx/prtqry.hxx> #include <svx/dialmgr.hxx> -SvxPrtQryBox::SvxPrtQryBox(Window* pParent) : +SvxPrtQryBox::SvxPrtQryBox(vcl::Window* pParent) : MessBox(pParent, 0, SVX_RESSTR(RID_SVXSTR_QRY_PRINT_TITLE), SVX_RESSTR(RID_SVXSTR_QRY_PRINT_MSG)) diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index b4db0011d6c2..6e177aa02cb2 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -23,7 +23,7 @@ SvxRelativeField::SvxRelativeField( - Window *const pParent, WinBits const nBits, FieldUnit const eUnit) + vcl::Window *const pParent, WinBits const nBits, FieldUnit const eUnit) : MetricField( pParent, nBits) , nRelMin(0) , nRelMax(0) @@ -39,8 +39,8 @@ SvxRelativeField::SvxRelativeField( SetMax( 9999 ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL -makeSvxRelativeField(Window *const pParent, VclBuilder::stringmap & rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL +makeSvxRelativeField(vcl::Window *const pParent, VclBuilder::stringmap & rMap) { OString const custom(VclBuilder::extractCustomProperty(rMap)); FieldUnit const eUnit(VclBuilder::detectUnit(custom)); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 3dab36e07d46..83a6e5e28749 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -60,7 +60,7 @@ static const sal_Char cDisplayName[] = "DisplayName"; static const sal_Char cRubyCharStyleName[] = "RubyCharStyleName"; static const sal_Char cRubies[] = "Rubies"; -SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, sal_uInt16 nId, +SvxRubyChildWindow::SvxRubyChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : SfxChildWindow(_pParent, nId) { @@ -191,7 +191,7 @@ void SvxRubyData_Impl::AssertOneEntry() } SvxRubyDialog::SvxRubyDialog(SfxBindings *pBind, SfxChildWindow *pCW, - Window* _pParent) + vcl::Window* _pParent) : SfxModelessDialog(pBind, pCW, _pParent, "AsianPhoneticGuideDialog", "svx/ui/asianphoneticguidedialog.ui") , nLastPos(0) @@ -752,7 +752,7 @@ void SvxRubyDialog::EnableControls(bool bEnable) m_pApplyPB->Enable(bEnable); } -RubyPreview::RubyPreview(Window *pParent) +RubyPreview::RubyPreview(vcl::Window *pParent) : Window(pParent, WB_BORDER) , m_pParentDlg(NULL) { @@ -760,7 +760,7 @@ RubyPreview::RubyPreview(Window *pParent) SetBorderStyle( WINDOW_BORDER_MONO ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRubyPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRubyPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new RubyPreview(pParent); } @@ -913,7 +913,7 @@ bool RubyEdit::PreNotify( NotifyEvent& rNEvt ) return nHandled; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRubyEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRubyEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new RubyEdit(pParent); } diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index a78060580bcb..aaad310bfb98 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -245,7 +245,7 @@ void SearchAttrItemList::Remove(size_t nPos, size_t nLen) SrchAttrItemList::erase( begin() + nPos, begin() + nPos + nLen ); } -SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ) +SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ) : SfxModelessDialog(&rBind, pChildWin, pParent, "FindReplaceDialog", "svx/ui/findreplacedialog.ui") , mpDocWin(NULL) @@ -2213,7 +2213,7 @@ SFX_IMPL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper, SID_SEARCH_DLG); -SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, sal_uInt16 nId, +SvxSearchDialogWrapper::SvxSearchDialogWrapper( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -2245,7 +2245,7 @@ SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const } -static Window* lcl_GetSearchLabelWindow() +static vcl::Window* lcl_GetSearchLabelWindow() { css::uno::Reference< css::beans::XPropertySet > xPropSet( SfxViewFrame::Current()->GetFrame().GetFrameInterface(), css::uno::UNO_QUERY_THROW); @@ -2274,7 +2274,7 @@ void SvxSearchDialogWrapper::SetSearchLabel(const SearchLabel& rSL) else if (rSL == SL_NotFound) sStr = SVX_RESSTR(RID_SVXSTR_SEARCH_NOT_FOUND); - if (Window *pSearchLabel = lcl_GetSearchLabelWindow()) + if (vcl::Window *pSearchLabel = lcl_GetSearchLabelWindow()) { if (sStr.isEmpty()) pSearchLabel->Hide(); diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx index 6579f2d47c7f..c1ba57d229ac 100644 --- a/svx/source/dialog/stddlg.cxx +++ b/svx/source/dialog/stddlg.cxx @@ -30,7 +30,7 @@ short SvxStandardDialog::Execute() return nRet; } -SvxStandardDialog::SvxStandardDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) +SvxStandardDialog::SvxStandardDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) : SfxModalDialog(pParent, rID, rUIXMLDescription) { } diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 9a474e15bd98..f0e961aaebf9 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -389,7 +389,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) pDev->SetLineColor(aOldColor); } -SvxNumValueSet::SvxNumValueSet(Window* pParent, WinBits nWinBits) +SvxNumValueSet::SvxNumValueSet(vcl::Window* pParent, WinBits nWinBits) : ValueSet(pParent, nWinBits) , nPageType(0) , bHTMLMode(false) @@ -397,7 +397,7 @@ SvxNumValueSet::SvxNumValueSet(Window* pParent, WinBits nWinBits) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNumValueSet(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxNumValueSet(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxNumValueSet(pParent, WB_TABSTOP); } @@ -463,13 +463,13 @@ void SvxNumValueSet::SetOutlineNumberingSettings( } } -SvxBmpNumValueSet::SvxBmpNumValueSet(Window* pParent, WinBits nWinBits) +SvxBmpNumValueSet::SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits) : SvxNumValueSet(pParent, nWinBits) { init(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxBmpNumValueSet(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxBmpNumValueSet(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxBmpNumValueSet(pParent, WB_TABSTOP); } diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 60ace556fe04..7c5a71308679 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -55,11 +55,11 @@ #ifdef DEBUG_RULER #include <vcl/lstbox.hxx> -class RulerDebugWindow : public Window +class RulerDebugWindow : public vcl::Window { ListBox aBox; public: - RulerDebugWindow(Window* pParent) : + RulerDebugWindow(vcl::Window* pParent) : Window(pParent, WB_BORDER|WB_SIZEMOVE|WB_DIALOGCONTROL|WB_CLIPCHILDREN|WB_SYSTEMWINDOW), aBox(this, WB_BORDER) { @@ -89,7 +89,7 @@ void RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const OUSt { if(!pDebugWindow) { - Window* pParent = Application::GetFocusWindow(); + vcl::Window* pParent = Application::GetFocusWindow(); while(pParent->GetParent()) pParent = pParent->GetParent(); pDebugWindow = new RulerDebugWindow(pParent); @@ -196,8 +196,8 @@ void SvxRuler_Impl::SetPercSize(sal_uInt16 nSize) // Ruler: SetBorders SvxRuler::SvxRuler( - Window* pParent, // StarView Parent - Window* pWin, // Output window: is used for conversion + vcl::Window* pParent, // StarView Parent + vcl::Window* pWin, // Output window: is used for conversion // logical units <-> pixels sal_uInt16 flags, // Display flags, see ruler.hxx SfxBindings &rBindings, // associated Bindings diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 6eb6e1b3f190..bea9c10078b6 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::text; #define FLYINFLY_BORDER 3 #define DEMOTEXT "Ij" -SvxSwFrameExample::SvxSwFrameExample( Window *pParent, WinBits nStyle ) : +SvxSwFrameExample::SvxSwFrameExample( vcl::Window *pParent, WinBits nStyle ) : Window(pParent, nStyle), @@ -52,7 +52,7 @@ SvxSwFrameExample::SvxSwFrameExample( Window *pParent, WinBits nStyle ) : SetMapMode(MAP_PIXEL); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxSwFrameExample(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxSwFrameExample(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxSwFrameExample(pParent, 0); } diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 86afcac86d1c..cfa119d50aa1 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -33,13 +33,13 @@ #include <rtl/strbuf.hxx> #include <osl/nlsupport.h> -SvxTextEncodingBox::SvxTextEncodingBox( Window* pParent, WinBits nBits ) +SvxTextEncodingBox::SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits ) : ListBox( pParent, nBits ) { m_pEncTable = new SvxTextEncodingTable; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxTextEncodingBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxTextEncodingBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; bool bDropdown = VclBuilder::extractDropdown(rMap); diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx index 887c7230795b..c33ca311563f 100644 --- a/svx/source/dialog/wrapfield.cxx +++ b/svx/source/dialog/wrapfield.cxx @@ -22,12 +22,12 @@ namespace svx { -WrapField::WrapField( Window* pParent, WinBits nBits ) : +WrapField::WrapField( vcl::Window* pParent, WinBits nBits ) : NumericField( pParent, nBits ) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeWrapField(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeWrapField(vcl::Window *pParent, VclBuilder::stringmap &) { return new WrapField(pParent, WB_SPIN|WB_REPEAT|WB_BORDER|WB_TABSTOP); } diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index d28b3cded20b..d418277476cb 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -84,7 +84,7 @@ namespace { } Svx3DWin::Svx3DWin( SfxBindings* pInBindings, - SfxChildWindow *pCW, Window* pParent ) : + SfxChildWindow *pCW, vcl::Window* pParent ) : SfxDockingWindow ( pInBindings, pCW, pParent, SVX_RES( RID_SVXFLOAT_3D ) ), aBtnGeo ( this, SVX_RES( BTN_GEO ) ), @@ -3231,7 +3231,7 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn ) // Derivation from SfxChildWindow as "containers" for effects -Svx3DChildWindow::Svx3DChildWindow( Window* _pParent, +Svx3DChildWindow::Svx3DChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 56d5a8320822..5db0927a4008 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1000,7 +1000,7 @@ void FmGridHeader::Command(const CommandEvent& rEvt) FmGridControl::FmGridControl( const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - Window* pParent, + vcl::Window* pParent, FmXGridPeer* _pPeer, WinBits nBits) :DbGridControl(_rxContext, pParent, nBits) diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index d452b5ce9f45..24a3312bf0cc 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -432,7 +432,7 @@ sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< ::com::sun::star::aw } -FmXGridPeer* FmXGridControl::imp_CreatePeer(Window* pParent) +FmXGridPeer* FmXGridControl::imp_CreatePeer(vcl::Window* pParent) { FmXGridPeer* pReturn = new FmXGridPeer(m_xContext); @@ -477,7 +477,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt: // mbCreatingPeer is virtually the same as m_nPeerCreationLevel, but it's the base class' method // to prevent recursion. - Window* pParentWin = NULL; + vcl::Window* pParentWin = NULL; if (rParentPeer.is()) { VCLXWindow* pParent = VCLXWindow::GetImplementation(rParentPeer); @@ -1078,13 +1078,13 @@ FmXGridPeer::FmXGridPeer(const Reference< XComponentContext >& _rxContext) } -FmGridControl* FmXGridPeer::imp_CreateControl(Window* pParent, WinBits nStyle) +FmGridControl* FmXGridPeer::imp_CreateControl(vcl::Window* pParent, WinBits nStyle) { return new FmGridControl(m_xContext, pParent, this, nStyle); } -void FmXGridPeer::Create(Window* pParent, WinBits nStyle) +void FmXGridPeer::Create(vcl::Window* pParent, WinBits nStyle) { FmGridControl* pWin = imp_CreateControl(pParent, nStyle); DBG_ASSERT(pWin != NULL, "FmXGridPeer::Create : imp_CreateControl didn't return a control !"); @@ -1711,7 +1711,7 @@ void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( RuntimeException, std::exce { if (bOn != isDesignMode()) { - Window* pWin = GetWindow(); + vcl::Window* pWin = GetWindow(); if (pWin) ((FmGridControl*) pWin)->SetDesignMode(bOn); } @@ -1725,7 +1725,7 @@ void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( RuntimeException, std::exce sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException, std::exception ) { - Window* pWin = GetWindow(); + vcl::Window* pWin = GetWindow(); if (pWin) return ((FmGridControl*) pWin)->IsDesignMode(); else @@ -2027,7 +2027,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext() Reference< XAccessibleContext > xContext; // use the AccessibleContext provided by the VCL window - Window* pGrid = GetWindow(); + vcl::Window* pGrid = GetWindow(); if ( pGrid ) { Reference< XAccessible > xAcc( pGrid->GetAccessible( true ) ); @@ -2057,7 +2057,7 @@ Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeExc if (GetWindow()) { FmGridControl* pGrid = (FmGridControl*) GetWindow(); - Window* pDataWindow = &pGrid->GetDataWindow(); + vcl::Window* pDataWindow = &pGrid->GetDataWindow(); if ( _rPropertyName == FM_PROP_NAME ) { diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index fdc23002211f..9feb232991e4 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -456,7 +456,7 @@ void DbGridColumn::Paint(OutputDevice& rDev, const Reference< XNumberFormatter >& xFormatter) { bool bEnabled = ( rDev.GetOutDevType() != OUTDEV_WINDOW ) - || ( static_cast< Window& >( rDev ).IsEnabled() ); + || ( static_cast< vcl::Window& >( rDev ).IsEnabled() ); FmXDataCell* pDataCell = PTR_CAST(FmXDataCell, m_pCell); if (pDataCell) @@ -517,7 +517,7 @@ void DbGridColumn::Paint(OutputDevice& rDev, } -void DbGridColumn::ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat ) +void DbGridColumn::ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ) { if ( m_pCell ) m_pCell->ImplInitWindow( rParent, _eInitWhat ); @@ -722,9 +722,9 @@ bool DbCellControl::Commit() } -void DbCellControl::ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat ) +void DbCellControl::ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ) { - Window* pWindows[] = { m_pPainter, m_pWindow }; + vcl::Window* pWindows[] = { m_pPainter, m_pWindow }; if ( ( _eInitWhat & InitWritingMode ) != 0 ) { @@ -861,7 +861,7 @@ void DbCellControl::implAdjustEnabled( const Reference< XPropertySet >& _rxModel } -void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor ) +void DbCellControl::Init( vcl::Window& rParent, const Reference< XRowSet >& _rxCursor ) { ImplInitWindow( rParent, InitAll ); @@ -937,7 +937,7 @@ void DbCellControl::SetTextLineColor(const Color& _rColor) namespace { - static void lcl_implAlign( Window* _pWindow, WinBits _nAlignmentBit ) + static void lcl_implAlign( vcl::Window* _pWindow, WinBits _nAlignmentBit ) { WinBits nStyle = _pWindow->GetStyle(); nStyle &= ~(WB_LEFT | WB_RIGHT | WB_CENTER); @@ -1083,7 +1083,7 @@ DbTextField::~DbTextField( ) } -void DbTextField::Init( Window& rParent, const Reference< XRowSet >& xCursor) +void DbTextField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor) { sal_Int16 nAlignment = m_rColumn.SetAlignmentFromModel(-1); @@ -1243,7 +1243,7 @@ DbFormattedField::~DbFormattedField() } -void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCursor) +void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor) { sal_Int16 nAlignment = m_rColumn.SetAlignmentFromModel(-1); @@ -1614,7 +1614,7 @@ DbCheckBox::DbCheckBox( DbGridColumn& _rColumn ) namespace { - void setCheckBoxStyle( Window* _pWindow, bool bMono ) + void setCheckBoxStyle( vcl::Window* _pWindow, bool bMono ) { AllSettings aSettings = _pWindow->GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); @@ -1628,7 +1628,7 @@ namespace } -void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor ) +void DbCheckBox::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor ) { setTransparent( true ); @@ -1762,7 +1762,7 @@ void DbPatternField::implAdjustGenericFieldSetting( const Reference< XPropertySe } -void DbPatternField::Init( Window& rParent, const Reference< XRowSet >& xCursor) +void DbPatternField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor) { m_rColumn.SetAlignmentFromModel(-1); @@ -1849,7 +1849,7 @@ DbSpinField::DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign ) } -void DbSpinField::Init( Window& _rParent, const Reference< XRowSet >& _rxCursor ) +void DbSpinField::Init( vcl::Window& _rParent, const Reference< XRowSet >& _rxCursor ) { m_rColumn.SetAlignmentFromModel( m_nStandardAlign ); @@ -1943,7 +1943,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe } -SpinField* DbNumericField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) +SpinField* DbNumericField::createField( vcl::Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) { return new DoubleNumericField( _pParent, _nFieldStyle ); } @@ -2071,7 +2071,7 @@ void DbCurrencyField::implAdjustGenericFieldSetting( const Reference< XPropertyS } -SpinField* DbCurrencyField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) +SpinField* DbCurrencyField::createField( vcl::Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) { return new LongCurrencyField( _pParent, _nFieldStyle ); } @@ -2177,7 +2177,7 @@ DbDateField::DbDateField( DbGridColumn& _rColumn ) } -SpinField* DbDateField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& _rxModel ) +SpinField* DbDateField::createField( vcl::Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& _rxModel ) { // check if there is a DropDown property set to TRUE bool bDropDown = !hasProperty( FM_PROP_DROPDOWN, _rxModel ) @@ -2305,7 +2305,7 @@ DbTimeField::DbTimeField( DbGridColumn& _rColumn ) } -SpinField* DbTimeField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) +SpinField* DbTimeField::createField( vcl::Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ ) { return new TimeField( _pParent, _nFieldStyle ); } @@ -2458,7 +2458,7 @@ void DbComboBox::implAdjustGenericFieldSetting( const Reference< XPropertySet >& } -void DbComboBox::Init( Window& rParent, const Reference< XRowSet >& xCursor ) +void DbComboBox::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor ) { m_rColumn.SetAlignmentFromModel(::com::sun::star::awt::TextAlign::LEFT); @@ -2583,7 +2583,7 @@ void DbListBox::SetList(const Any& rItems) } -void DbListBox::Init( Window& rParent, const Reference< XRowSet >& xCursor) +void DbListBox::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor) { m_rColumn.SetAlignment(::com::sun::star::awt::TextAlign::LEFT); @@ -2751,7 +2751,7 @@ void DbFilterField::SetList(const Any& rItems, bool bComboBox) } -void DbFilterField::CreateControl(Window* pParent, const Reference< ::com::sun::star::beans::XPropertySet >& xModel) +void DbFilterField::CreateControl(vcl::Window* pParent, const Reference< ::com::sun::star::beans::XPropertySet >& xModel) { switch (m_nControlClass) { @@ -2808,7 +2808,7 @@ void DbFilterField::CreateControl(Window* pParent, const Reference< ::com::sun:: } -void DbFilterField::Init( Window& rParent, const Reference< XRowSet >& xCursor ) +void DbFilterField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor ) { Reference< ::com::sun::star::beans::XPropertySet > xModel(m_rColumn.getModel()); m_rColumn.SetAlignment(::com::sun::star::awt::TextAlign::LEFT); @@ -3168,13 +3168,13 @@ FmXGridCell::FmXGridCell( DbGridColumn* pColumn, DbCellControl* _pControl ) void FmXGridCell::init() { - Window* pEventWindow( getEventWindow() ); + vcl::Window* pEventWindow( getEventWindow() ); if ( pEventWindow ) pEventWindow->AddEventListener( LINK( this, FmXGridCell, OnWindowEvent ) ); } -Window* FmXGridCell::getEventWindow() const +vcl::Window* FmXGridCell::getEventWindow() const { if ( m_pCellControl ) return &m_pCellControl->GetWindow(); @@ -3425,7 +3425,7 @@ void FmXGridCell::onFocusLost( const awt::FocusEvent& _rEvent ) } -void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) { @@ -3550,7 +3550,7 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev, } sal_uInt16 nStyle = TEXT_DRAW_CLIP | TEXT_DRAW_VCENTER; - if ( ( rDev.GetOutDevType() == OUTDEV_WINDOW ) && !static_cast< Window& >( rDev ).IsEnabled() ) + if ( ( rDev.GetOutDevType() == OUTDEV_WINDOW ) && !static_cast< vcl::Window& >( rDev ).IsEnabled() ) nStyle |= TEXT_DRAW_DISABLE; switch (m_pColumn->GetAlignment()) @@ -3825,7 +3825,7 @@ void FmXEditCell::onFocusLost( const awt::FocusEvent& _rEvent ) } -void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) { @@ -3972,13 +3972,13 @@ void SAL_CALL FmXCheckBoxCell::setActionCommand( const OUString& _Command ) thro } -Window* FmXCheckBoxCell::getEventWindow() const +vcl::Window* FmXCheckBoxCell::getEventWindow() const { return m_pBox; } -void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) { @@ -4309,7 +4309,7 @@ void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeExcept } -void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { if ( ( &_rWindow == m_pBox ) && ( _nEventId == VCLEVENT_LISTBOX_SELECT ) @@ -4512,7 +4512,7 @@ void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Run } -void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 5939b8823094..7a8cbabd554c 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -275,7 +275,7 @@ void FmXGridSourcePropListener::_propertyChanged(const PropertyChangeEvent& evt) m_pParent->DataSourcePropertyChanged(evt); } -DbGridControl::NavigationBar::AbsolutePos::AbsolutePos(Window* pParent, WinBits nStyle) +DbGridControl::NavigationBar::AbsolutePos::AbsolutePos(vcl::Window* pParent, WinBits nStyle) :NumericField(pParent, nStyle) { SetMin(1); @@ -326,7 +326,7 @@ void DbGridControl::NavigationBar::PositionDataSource(sal_Int32 nRecord) m_bPositioning = false; } -DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) +DbGridControl::NavigationBar::NavigationBar(vcl::Window* pParent, WinBits nStyle) :Control(pParent, nStyle) ,m_aRecordText(this, WB_VCENTER) ,m_aAbsolute(this, WB_CENTER | WB_VCENTER) @@ -598,7 +598,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich) { bool bAvailable = GetState(nWhich); DbGridControl* pParent = (DbGridControl*)GetParent(); - Window* pWnd = NULL; + vcl::Window* pWnd = NULL; switch (nWhich) { case NavigationBar::RECORD_FIRST: @@ -709,7 +709,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType ) { Control::StateChanged( nType ); - Window* pWindows[] = { &m_aRecordText, + vcl::Window* pWindows[] = { &m_aRecordText, &m_aAbsolute, &m_aRecordOf, &m_aRecordCount, @@ -859,7 +859,7 @@ void DbGridRow::SetState(CursorWrapper* pCur, bool bPaintCursor) DbGridControl::DbGridControl( Reference< XComponentContext > _rxContext, - Window* pParent, + vcl::Window* pParent, WinBits nBits) :DbGridControl_Base(pParent, EBBF_NONE, nBits, DEFAULT_BROWSE_MODE ) ,m_xContext(_rxContext) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index bfc357101e1f..92b3552a0e21 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -124,7 +124,7 @@ namespace svxform m_xPropSet( _rxSet ) {} }; - DataTreeListBox::DataTreeListBox(Window* pParent, WinBits nBits) + DataTreeListBox::DataTreeListBox(vcl::Window* pParent, WinBits nBits) : SvTreeListBox(pParent, nBits) , m_pXFormsPage(NULL) , m_eGroup(DGTUnknown) @@ -291,12 +291,12 @@ namespace svxform // class XFormsPage - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDataTreeListBox(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDataTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new DataTreeListBox((XFormsPage*)pParent, WB_BORDER); } - XFormsPage::XFormsPage( Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ) : + XFormsPage::XFormsPage( vcl::Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ) : TabPage( pParent, "XFormsPage", "svx/ui/xformspage.ui" ), m_pNaviWin ( _pNaviWin ), @@ -1343,7 +1343,7 @@ namespace svxform } } - DataNavigatorWindow::DataNavigatorWindow(Window* pParent, SfxBindings* pBindings) + DataNavigatorWindow::DataNavigatorWindow(vcl::Window* pParent, SfxBindings* pBindings) : Window(pParent) , m_pInstPage(NULL) , m_pSubmissionPage(NULL) @@ -2045,7 +2045,7 @@ namespace svxform void DataNavigatorWindow::Resize() { - Window *pChild = GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); if (!pChild) return; VclContainer::setLayoutAllocation(*pChild, Point(0,0), GetSizePixel()); @@ -2053,7 +2053,7 @@ namespace svxform Size DataNavigatorWindow::GetOptimalSize() const { - const Window *pChild = GetWindow(WINDOW_FIRSTCHILD); + const vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); if (!pChild) return Window::GetOptimalSize(); return VclContainer::getLayoutRequisition(*pChild); @@ -2128,7 +2128,7 @@ namespace svxform } } - DataNavigator::DataNavigator( SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent ) : + DataNavigator::DataNavigator( SfxBindings* _pBindings, SfxChildWindow* _pMgr, vcl::Window* _pParent ) : SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ), @@ -2234,7 +2234,7 @@ namespace svxform DataNavigatorManager::DataNavigatorManager( - Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo ) : + vcl::Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo ) : SfxChildWindow( _pParent, _nId ) @@ -2245,7 +2245,7 @@ namespace svxform ( (SfxDockingWindow*)pWindow )->Initialize( _pInfo ); } - AddDataItemDialog::AddDataItemDialog(Window* pParent, ItemNode* _pNode, + AddDataItemDialog::AddDataItemDialog(vcl::Window* pParent, ItemNode* _pNode, const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper) : ModalDialog(pParent, "AddDataItemDialog" , "svx/ui/adddataitemdialog.ui") , m_xUIHelper(_rUIHelper) @@ -2722,7 +2722,7 @@ namespace svxform m_pItemFrame->set_label(sText); } - AddConditionDialog::AddConditionDialog(Window* pParent, + AddConditionDialog::AddConditionDialog(vcl::Window* pParent, const OUString& _rPropertyName, const Reference< XPropertySet >& _rPropSet) : ModalDialog(pParent, "AddConditionDialog", "svx/ui/addconditiondialog.ui") @@ -3017,7 +3017,7 @@ namespace svxform } } - ManageNamespaceDialog::ManageNamespaceDialog(Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit) + ManageNamespaceDialog::ManageNamespaceDialog(vcl::Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit) : ModalDialog(pParent, "AddNamespaceDialog", "svx/ui/addnamespacedialog.ui") , m_pConditionDlg ( _pCondDlg ) { @@ -3057,7 +3057,7 @@ namespace svxform } AddSubmissionDialog::AddSubmissionDialog( - Window* pParent, ItemNode* _pNode, + vcl::Window* pParent, ItemNode* _pNode, const Reference< css::xforms::XFormsUIHelper1 >& _rUIHelper) : ModalDialog(pParent, "AddSubmissionDialog", "svx/ui/addsubmissiondialog.ui") @@ -3274,7 +3274,7 @@ namespace svxform m_pRefBtn->Enable( m_xTempBinding.is() ); } - AddModelDialog::AddModelDialog(Window* pParent, bool bIsEdit) + AddModelDialog::AddModelDialog(vcl::Window* pParent, bool bIsEdit) : ModalDialog(pParent, "AddModelDialog", "svx/ui/addmodeldialog.ui") { get(m_pNameED, "name"); @@ -3284,7 +3284,7 @@ namespace svxform SetText(get<FixedText>("alttitle")->GetText()); } - AddInstanceDialog::AddInstanceDialog(Window* pParent, bool _bEdit) + AddInstanceDialog::AddInstanceDialog(vcl::Window* pParent, bool _bEdit) : ModalDialog(pParent, "AddInstanceDialog" , "svx/ui/addinstancedialog.ui") { get(m_pNameED, "name"); @@ -3322,7 +3322,7 @@ namespace svxform return 0; } - LinkedInstanceWarningBox::LinkedInstanceWarningBox( Window* pParent ) + LinkedInstanceWarningBox::LinkedInstanceWarningBox( vcl::Window* pParent ) : MessageDialog(pParent, "FormLinkWarnDialog", "svx/ui/formlinkwarndialog.ui") { } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index c3117a96c2a1..42930b756cf0 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1118,7 +1118,7 @@ void FmFilterString::Paint( rDev.DrawText( aPos, GetText() ); } -FmFilterNavigator::FmFilterNavigator( Window* pParent ) +FmFilterNavigator::FmFilterNavigator( vcl::Window* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HASBUTTONSATROOT ) ,m_pModel( NULL ) ,m_pEditingCurrently( NULL ) @@ -1859,7 +1859,7 @@ void FmFilterNavigator::DeleteSelection() } FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWindow* _pMgr, - Window* _pParent ) + vcl::Window* _pParent ) :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ) ,SfxControllerItem( SID_FM_FILTER_NAVIGATOR_CONTROL, *_pBindings ) { @@ -1991,7 +1991,7 @@ void FmFilterNavigatorWin::GetFocus() SFX_IMPL_DOCKINGWINDOW( FmFilterNavigatorWinMgr, SID_FM_FILTER_NAVIGATOR ) -FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr( Window *_pParent, sal_uInt16 _nId, +FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr( vcl::Window *_pParent, sal_uInt16 _nId, SfxBindings *_pBindings, SfxChildWinInfo* _pInfo ) :SfxChildWindow( _pParent, _nId ) { diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 6eefc8108c18..19685b5accfc 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -79,7 +79,7 @@ using ::com::sun::star::awt::XWindow; SFX_IMPL_FLOATINGWINDOW(FmPropBrwMgr, SID_FM_SHOW_PROPERTIES) -FmPropBrwMgr::FmPropBrwMgr( Window* _pParent, sal_uInt16 _nId, +FmPropBrwMgr::FmPropBrwMgr( vcl::Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo) :SfxChildWindow(_pParent, _nId) { @@ -184,7 +184,7 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj) } FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* _pBindings, - SfxChildWindow* _pMgr, Window* _pParent, const SfxChildWinInfo* _pInfo ) + SfxChildWindow* _pMgr, vcl::Window* _pParent, const SfxChildWinInfo* _pInfo ) :SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE) ) ,SfxControllerItem(SID_FM_PROPERTY_CONTROL, *_pBindings) ,m_bInitialStateChange(true) @@ -207,7 +207,7 @@ FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* // responsibility for this window (as soon as we initialize a frame with a window, the frame // is responsible for its life time, but |this| is controlled by the belonging SfxChildWindow) // #i34249# - Window* pContainerWindow = new Window( this ); + vcl::Window* pContainerWindow = new vcl::Window( this ); pContainerWindow->Show(); m_xFrameContainerWindow = VCLUnoHelper::GetInterface ( pContainerWindow ); diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 40e4fe05246e..7ad362e500af 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -43,7 +43,7 @@ namespace svxform } - void OLocalExchange::copyToClipboard( Window* _pWindow, const GrantAccess& ) + void OLocalExchange::copyToClipboard( vcl::Window* _pWindow, const GrantAccess& ) { if ( m_bClipboardOwner ) { // simulate a lostOwnership to notify parties interested in @@ -85,7 +85,7 @@ namespace svxform } - void OLocalExchange::startDrag( Window* _pWindow, sal_Int8 _nDragSourceActions, const GrantAccess& ) + void OLocalExchange::startDrag( vcl::Window* _pWindow, sal_Int8 _nDragSourceActions, const GrantAccess& ) { m_bDragging = true; StartDrag( _pWindow, _nDragSourceActions ); @@ -360,7 +360,7 @@ namespace svxform return new OControlExchange; } - OLocalExchangeHelper::OLocalExchangeHelper(Window* _pDragSource) + OLocalExchangeHelper::OLocalExchangeHelper(vcl::Window* _pDragSource) :m_pDragSource(_pDragSource) ,m_pTransferable(NULL) { diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index e49e4dab2de8..7bb5193e4ab4 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -499,7 +499,7 @@ namespace svxform { NavigatorFrame::NavigatorFrame( SfxBindings* _pBindings, SfxChildWindow* _pMgr, - Window* _pParent ) + vcl::Window* _pParent ) :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ) ,SfxControllerItem( SID_FM_FMEXPLORER_CONTROL, *_pBindings ) { @@ -603,7 +603,7 @@ namespace svxform SFX_IMPL_DOCKINGWINDOW( NavigatorFrameManager, SID_FM_SHOW_FMEXPLORER ) - NavigatorFrameManager::NavigatorFrameManager( Window* _pParent, sal_uInt16 _nId, + NavigatorFrameManager::NavigatorFrameManager( vcl::Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo ) :SfxChildWindow( _pParent, _nId ) { diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 3a8e1369d2ef..fdb4176b148a 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -139,7 +139,7 @@ const Reference< css::form::XForms > & FmFormPage::GetForms( bool _bForceCreate } -bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView, +bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView* pView, const HelpEvent& rEvt ) { if( pView->IsAction() ) diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 69d232a590ae..31ce9bcac9f8 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -495,7 +495,7 @@ void FmFormShell::Execute(SfxRequest &rReq) if ( pGrabFocusItem && pGrabFocusItem->GetValue() ) { // see below SfxViewShell* pShell = GetViewShell(); - Window* pShellWnd = pShell ? pShell->GetWindow() : NULL; + vcl::Window* pShellWnd = pShell ? pShell->GetWindow() : NULL; if ( pShellWnd ) pShellWnd->GrabFocus(); break; @@ -555,7 +555,7 @@ void FmFormShell::Execute(SfxRequest &rReq) if ( bHasControlFocus ) { const OutputDevice* pDevice = GetCurrentViewDevice(); - Window* pWindow = dynamic_cast< Window* >( const_cast< OutputDevice* >( pDevice ) ); + vcl::Window* pWindow = dynamic_cast< vcl::Window* >( const_cast< OutputDevice* >( pDevice ) ); if ( pWindow ) pWindow->GrabFocus(); } @@ -1327,7 +1327,7 @@ void FmFormShell::ToggleControlFocus( const SdrUnoObj& i_rUnoObject, const SdrVi if ( bHasControlFocus ) { - Window* pWindow( dynamic_cast< Window* >( &i_rDevice ) ); + vcl::Window* pWindow( dynamic_cast< vcl::Window* >( &i_rDevice ) ); OSL_ENSURE( pWindow, "FmFormShell::ToggleControlFocus: I need a Window, really!" ); if ( pWindow ) pWindow->GrabFocus(); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 379188c3f769..c07e66a27fbb 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2886,7 +2886,7 @@ Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlMod { // fallabck (some controls might not have been created, yet, since they were never visible so far) Reference< XControl > xContainerControl( xControlContainer, UNO_QUERY_THROW ); - const Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerControl->getPeer() ); + const vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerControl->getPeer() ); ENSURE_OR_THROW( pContainerWindow, "unexpected control container implementation" ); const SdrView* pSdrView = m_pShell ? m_pShell->GetFormView() : NULL; diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index 7c743d910459..9126dd8a90d5 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -33,7 +33,7 @@ namespace svx { - TextControlCharAttribDialog::TextControlCharAttribDialog( Window* pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList ) + TextControlCharAttribDialog::TextControlCharAttribDialog( vcl::Window* pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList ) : SfxTabDialog( pParent, "TextControlCharacterPropertiesDialog", "svx/ui/textcontrolchardialog.ui", &_rCoreSet ) , m_aFontList(_rFontList) @@ -67,7 +67,7 @@ namespace svx } } - TextControlParaAttribDialog::TextControlParaAttribDialog(Window* _pParent, + TextControlParaAttribDialog::TextControlParaAttribDialog(vcl::Window* _pParent, const SfxItemSet& _rCoreSet) : SfxTabDialog( _pParent, "TextControlParagraphPropertiesDialog", "svx/ui/textcontrolparadialog.ui", &_rCoreSet ) diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index a1c5702c858b..080f5cbd07fb 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -482,9 +482,9 @@ namespace svx } - static Window* lcl_getWindow( const Reference< XControl >& _rxControl ) + static vcl::Window* lcl_getWindow( const Reference< XControl >& _rxControl ) { - Window* pWindow = NULL; + vcl::Window* pWindow = NULL; try { Reference< XWindowPeer > xControlPeer; @@ -967,7 +967,7 @@ namespace svx case SID_PASTE: { - Window* pActiveControlVCLWindow = lcl_getWindow( m_xActiveControl ); + vcl::Window* pActiveControlVCLWindow = lcl_getWindow( m_xActiveControl ); if ( pActiveControlVCLWindow ) { TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pActiveControlVCLWindow) ); diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 9e51d7295fd8..93b6f2f13646 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -122,7 +122,7 @@ namespace } -void displayException(const Any& _rExcept, Window* _pParent) +void displayException(const Any& _rExcept, vcl::Window* _pParent) { // check whether we need to display it if ( !lcl_shouldDisplayError( _rExcept ) ) @@ -131,7 +131,7 @@ void displayException(const Any& _rExcept, Window* _pParent) try { // the parent window - Window* pParentWindow = _pParent ? _pParent : Application::GetDefDialogParent(); + vcl::Window* pParentWindow = _pParent ? _pParent : Application::GetDefDialogParent(); Reference< XWindow > xParentWindow = VCLUnoHelper::GetInterface(pParentWindow); Reference< XExecutableDialog > xErrorDialog = ErrorMessageDialog::create(::comphelper::getProcessComponentContext(), "", xParentWindow, _rExcept); @@ -144,25 +144,25 @@ void displayException(const Any& _rExcept, Window* _pParent) } -void displayException(const ::com::sun::star::sdbc::SQLException& _rExcept, Window* _pParent) +void displayException(const ::com::sun::star::sdbc::SQLException& _rExcept, vcl::Window* _pParent) { displayException(makeAny(_rExcept), _pParent); } -void displayException(const ::com::sun::star::sdbc::SQLWarning& _rExcept, Window* _pParent) +void displayException(const ::com::sun::star::sdbc::SQLWarning& _rExcept, vcl::Window* _pParent) { displayException(makeAny(_rExcept), _pParent); } -void displayException(const ::com::sun::star::sdb::SQLContext& _rExcept, Window* _pParent) +void displayException(const ::com::sun::star::sdb::SQLContext& _rExcept, vcl::Window* _pParent) { displayException(makeAny(_rExcept), _pParent); } -void displayException(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent, Window* _pParent) +void displayException(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent, vcl::Window* _pParent) { displayException(_rEvent.Reason, _pParent); } diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index b5da823bbc3a..b62e8eb4ceef 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -276,8 +276,8 @@ void FmFormView::ChangeDesignMode(bool bDesign) { if ( GetActualOutDev() && GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW ) { - const Window* pWindow = static_cast< const Window* >( GetActualOutDev() ); - const_cast< Window* >( pWindow )->GrabFocus(); + const vcl::Window* pWindow = static_cast< const vcl::Window* >( GetActualOutDev() ); + const_cast< vcl::Window* >( pWindow )->GrabFocus(); } // redraw UNO objects @@ -480,7 +480,7 @@ void FmFormView::EndCompleteRedraw( SdrPaintWindow& rPaintWindow, bool bPaintFor } -bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin) +bool FmFormView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) { bool bDone = false; const vcl::KeyCode& rKeyCode = rKEvt.GetKeyCode(); @@ -541,7 +541,7 @@ bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource) } -bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ) +bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, vcl::Window* _pWin ) { bool bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin ); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index c9b1b60e7cb6..ba83abac5989 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -167,7 +167,7 @@ FormViewPageWindowAdapter::FormViewPageWindowAdapter( const css::uno::Reference< : m_xControlContainer( _rWindow.GetControlContainer() ), m_xContext( _rContext ), m_pViewImpl( _pViewImpl ), - m_pWindow( dynamic_cast< Window* >( &_rWindow.GetPaintWindow().GetOutputDevice() ) ) + m_pWindow( dynamic_cast< vcl::Window* >( &_rWindow.GetPaintWindow().GetOutputDevice() ) ) { // create an XFormController for every form @@ -684,7 +684,7 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/) // setting the controller to activate if (m_pView->GetFormShell() && m_pView->GetActualOutDev() && m_pView->GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW) { - Window* pWindow = const_cast<Window*>(static_cast<const Window*>(m_pView->GetActualOutDev())); + vcl::Window* pWindow = const_cast<vcl::Window*>(static_cast<const vcl::Window*>(m_pView->GetActualOutDev())); PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0]; for ( PageWindowAdapterList::const_iterator i = m_aPageWindowAdapters.begin(); i != m_aPageWindowAdapters.end(); @@ -851,7 +851,7 @@ static Reference< XControl > lcl_firstFocussableControl( const Sequence< Referen namespace { - void lcl_ensureControlsOfFormExist_nothrow( const SdrPage& _rPage, const SdrView& _rView, const Window& _rWindow, const Reference< XForm >& _rxForm ) + void lcl_ensureControlsOfFormExist_nothrow( const SdrPage& _rPage, const SdrView& _rView, const vcl::Window& _rWindow, const Reference< XForm >& _rxForm ) { try { @@ -926,7 +926,7 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/) Reference< XIndexAccess > xForms( pPage ? Reference< XIndexAccess >( pPage->GetForms(), UNO_QUERY ) : Reference< XIndexAccess >() ); const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0]; - const Window* pWindow = pAdapter.get() ? pAdapter->getWindow() : NULL; + const vcl::Window* pWindow = pAdapter.get() ? pAdapter->getWindow() : NULL; ENSURE_OR_RETURN( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!", 0L ); @@ -965,12 +965,12 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/) // ensure that the control is visible // 80210 - 12/07/00 - FS - const Window* pCurrentWindow = m_pView ? dynamic_cast<const Window*>(m_pView->GetActualOutDev()) : NULL; + const vcl::Window* pCurrentWindow = m_pView ? dynamic_cast<const vcl::Window*>(m_pView->GetActualOutDev()) : NULL; if ( pCurrentWindow ) { awt::Rectangle aRect = xControlWindow->getPosSize(); ::Rectangle aNonUnoRect( aRect.X, aRect.Y, aRect.X + aRect.Width, aRect.Y + aRect.Height ); - m_pView->MakeVisible( pCurrentWindow->PixelToLogic( aNonUnoRect ), *const_cast< Window* >( pCurrentWindow ) ); + m_pView->MakeVisible( pCurrentWindow->PixelToLogic( aNonUnoRect ), *const_cast< vcl::Window* >( pCurrentWindow ) ); } } catch (const Exception&) diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 0d950c53e9e7..41391c4222d3 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3525,10 +3525,10 @@ sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( Runt } -Window* FormController::getDialogParentWindow() +vcl::Window* FormController::getDialogParentWindow() { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); - Window* pParentWindow = NULL; + vcl::Window* pParentWindow = NULL; try { Reference< XControl > xContainerControl( getContainer(), UNO_QUERY_THROW ); @@ -3613,7 +3613,7 @@ Reference< XControl > FormController::locateControl( const Reference< XControlMo namespace { - void displayErrorSetFocus( const OUString& _rMessage, const Reference< XControl >& _rxFocusControl, Window* _pDialogParent ) + void displayErrorSetFocus( const OUString& _rMessage, const Reference< XControl >& _rxFocusControl, vcl::Window* _pDialogParent ) { SQLContext aError; aError.Message = SVX_RESSTR(RID_STR_WRITEERROR); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 262d00afa15d..b88efa16cabd 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -112,7 +112,7 @@ namespace svxform } } - NavigatorTree::NavigatorTree( Window* pParent ) + NavigatorTree::NavigatorTree( vcl::Window* pParent ) :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL ) // #100258# OJ WB_HSCROLL added ,m_aControlExchange(this) ,m_pNavModel( NULL ) @@ -2102,7 +2102,7 @@ namespace svxform OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); if ( ( OUTDEV_WINDOW == rOutDev.GetOutDevType() ) && !aMarkRect.IsEmpty() ) { - pFormView->MakeVisible( aMarkRect, (Window&)rOutDev ); + pFormView->MakeVisible( aMarkRect, (vcl::Window&)rOutDev ); } } // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i ) } @@ -2175,7 +2175,7 @@ namespace svxform OutputDevice& rOutDev = pPaintWindow->GetOutputDevice(); if ( OUTDEV_WINDOW == rOutDev.GetOutDevType() ) { - pFormView->MakeVisible( aMarkRect, (Window&)rOutDev ); + pFormView->MakeVisible( aMarkRect, (vcl::Window&)rOutDev ); } } // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i ) } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 6de6ee7ab443..8f0d11bf6124 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -175,7 +175,7 @@ FmFieldWinData::~FmFieldWinData() { } -FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent) +FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, vcl::Window* _pParent) :SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE)) ,SfxControllerItem(SID_FM_FIELDS_CONTROL, *_pBindings) ,::comphelper::OPropertyChangeListener(m_aMutex) @@ -411,7 +411,7 @@ void FmFieldWin::FillInfo( SfxChildWinInfo& rInfo ) const SFX_IMPL_FLOATINGWINDOW(FmFieldWinMgr, SID_FM_ADD_FIELD) -FmFieldWinMgr::FmFieldWinMgr(Window* _pParent, sal_uInt16 _nId, +FmFieldWinMgr::FmFieldWinMgr(vcl::Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo) :SfxChildWindow(_pParent, _nId) { diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 6e202f7e9fc0..6c7714e4083d 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; using ::com::sun::star::beans::XPropertySet; -SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pController ) +SvxFmAbsRecWin::SvxFmAbsRecWin( vcl::Window* _pParent, SfxToolBoxControl* _pController ) :NumericField( _pParent, WB_BORDER ) ,m_pController(_pController) { @@ -275,7 +275,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons } -Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent ) +vcl::Window* SvxFmTbxCtlAbsRec::CreateItemWindow( vcl::Window* pParent ) { SvxFmAbsRecWin* pWin = new SvxFmAbsRecWin( pParent, this ); pWin->SetUniqueId( UID_ABSOLUTE_RECORD_WINDOW ); @@ -295,7 +295,7 @@ SvxFmTbxCtlRecText::~SvxFmTbxCtlRecText() } -Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent ) +vcl::Window* SvxFmTbxCtlRecText::CreateItemWindow( vcl::Window* pParent ) { OUString aText(SVX_RESSTR(RID_STR_REC_TEXT)); FixedText* pFixedText = new FixedText( pParent ); @@ -321,7 +321,7 @@ SvxFmTbxCtlRecFromText::~SvxFmTbxCtlRecFromText() } -Window* SvxFmTbxCtlRecFromText::CreateItemWindow( Window* pParent ) +vcl::Window* SvxFmTbxCtlRecFromText::CreateItemWindow( vcl::Window* pParent ) { OUString aText(SVX_RESSTR(RID_STR_REC_FROM_TEXT)); FixedText* pFixedText = new FixedText( pParent, WB_CENTER ); @@ -348,7 +348,7 @@ SvxFmTbxCtlRecTotal::~SvxFmTbxCtlRecTotal() } -Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent ) +vcl::Window* SvxFmTbxCtlRecTotal::CreateItemWindow( vcl::Window* pParent ) { pFixedText = new FixedText( pParent ); OUString aSample("123456"); diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 26049284e9fd..d00bc97b7c0c 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -145,7 +145,7 @@ namespace svxform } - Dialog* OAddConditionDialog::createDialog(Window* _pParent) + Dialog* OAddConditionDialog::createDialog(vcl::Window* _pParent) { if ( !m_xBinding.is() || m_sFacetName.isEmpty() ) throw RuntimeException( OUString(), *this ); diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index bf83c0d4e3a2..1498a7952b1b 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -37,7 +37,7 @@ static const sal_Int32 gnInitialVerticalSplitPosition (150); GalleryControl::GalleryControl ( SfxBindings* /*pBindings*/, - Window* pParentWindow) + vcl::Window* pParentWindow) : Window(pParentWindow, GAL_RES(RID_SVXDLG_GALLERYBROWSER)), mpGallery (Gallery::GetGalleryInstance()), mpSplitter(new GallerySplitter( @@ -171,7 +171,7 @@ void GalleryControl::Resize (void) maLastSize = aNewSize; } -bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, Window* ) +bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, vcl::Window* ) { const sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); bool bRet = ( !rKEvt.GetKeyCode().IsMod1() && diff --git a/svx/source/gallery2/GallerySplitter.cxx b/svx/source/gallery2/GallerySplitter.cxx index d504692b662a..44b3c5e59cef 100644 --- a/svx/source/gallery2/GallerySplitter.cxx +++ b/svx/source/gallery2/GallerySplitter.cxx @@ -22,7 +22,7 @@ GallerySplitter::GallerySplitter( - Window* pParent, + vcl::Window* pParent, const ResId& rResId, const ::boost::function<void(void)>& rDataChangeFunctor) : Splitter( pParent, rResId ), diff --git a/svx/source/gallery2/GallerySplitter.hxx b/svx/source/gallery2/GallerySplitter.hxx index 9ffe4c88bef6..1097b3b64a5d 100644 --- a/svx/source/gallery2/GallerySplitter.hxx +++ b/svx/source/gallery2/GallerySplitter.hxx @@ -26,7 +26,7 @@ class GallerySplitter : public Splitter { public: GallerySplitter ( - Window* pParent, + vcl::Window* pParent, const ResId& rResId, const ::boost::function<void(void)>& rDataChangeFunctor); virtual ~GallerySplitter (void); diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 414ef427cbae..ba2aa7220803 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -114,7 +114,7 @@ bool GalleryThemeListBox::PreNotify( NotifyEvent& rNEvt ) // - GalleryBrowser1 - GalleryBrowser1::GalleryBrowser1( - Window* pParent, + vcl::Window* pParent, const ResId& rResId, Gallery* pGallery, const ::boost::function<sal_Bool(const KeyEvent&,Window*)>& rKeyInputHandler, @@ -516,7 +516,7 @@ void GalleryBrowser1::ShowContextMenu() Application::PostUserEvent( LINK( this, GalleryBrowser1, ShowContextMenuHdl ), this ); } -bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) +bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) { bool bRet = false; if (maKeyInputHandler) diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index 23fbb678f40a..94a8d3e3a371 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -122,7 +122,7 @@ private: public: GalleryBrowser1( - Window* pParent, + vcl::Window* pParent, const ResId& rResId, Gallery* pGallery, const ::boost::function<sal_Bool(const KeyEvent&,Window*)>& rKeyInputHandler, @@ -134,7 +134,7 @@ public: OUString GetSelectedTheme() { return mpThemes->GetEntryCount() ? mpThemes->GetEntry( mpThemes->GetSelectEntryPos() ) : OUString(); } void ShowContextMenu(); - bool KeyInput( const KeyEvent& rKEvt, Window* pWindow ); + bool KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ); }; #endif // INCLUDED_SVX_SOURCE_GALLERY2_GALBRWS1_HXX diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index bf2da8b6bb2a..0e305bb12479 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -130,7 +130,7 @@ public: GalleryBrowser2* pBrowser ); virtual ~GalleryThemePopup(); - void ExecutePopup( Window *pParent, const ::Point &aPos ); + void ExecutePopup( vcl::Window *pParent, const ::Point &aPos ); virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent &rEvent) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL disposing( const css::lang::EventObject &rSource) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -231,7 +231,7 @@ void GalleryThemePopup::Execute( } } -void GalleryThemePopup::ExecutePopup( Window *pWindow, const ::Point &aPos ) +void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos ) { css::uno::Reference< css::frame::XStatusListener > xThis( this ); @@ -414,7 +414,7 @@ void GalleryToolBox::KeyInput( const KeyEvent& rKEvt ) } -GalleryBrowser2::GalleryBrowser2( Window* pParent, const ResId& rResId, Gallery* pGallery ) : +GalleryBrowser2::GalleryBrowser2( vcl::Window* pParent, const ResId& rResId, Gallery* pGallery ) : Control ( pParent, rResId ), mpGallery ( pGallery ), mpCurTheme ( NULL ), @@ -610,7 +610,7 @@ sal_Int8 GalleryBrowser2::ExecuteDrop( DropTargetHelper&, const ExecuteDropEvent return nRet; } -void GalleryBrowser2::StartDrag( Window*, const Point* pDragPoint ) +void GalleryBrowser2::StartDrag( vcl::Window*, const Point* pDragPoint ) { if( mpCurTheme ) { @@ -622,13 +622,13 @@ void GalleryBrowser2::StartDrag( Window*, const Point* pDragPoint ) } } -void GalleryBrowser2::TogglePreview( Window*, const Point* ) +void GalleryBrowser2::TogglePreview( vcl::Window*, const Point* ) { SetMode( ( GALLERYBROWSERMODE_PREVIEW != GetMode() ) ? GALLERYBROWSERMODE_PREVIEW : meLastMode ); GetViewWindow()->GrabFocus(); } -void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint ) +void GalleryBrowser2::ShowContextMenu( vcl::Window*, const Point* pContextPoint ) { Point aSelPos; const sal_uIntPtr nItemId = ImplGetSelectedItemId( pContextPoint, aSelPos ); @@ -652,7 +652,7 @@ void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint ) } } -bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) +bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) { Point aSelPos; const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos ); @@ -855,9 +855,9 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) } } -Window* GalleryBrowser2::GetViewWindow() const +vcl::Window* GalleryBrowser2::GetViewWindow() const { - Window* pRet; + vcl::Window* pRet; switch( GetMode() ) { @@ -1199,13 +1199,13 @@ void GalleryBrowser2::Execute( sal_uInt16 nId ) case( MN_COPYCLIPBOARD ): { - Window* pWindow; + vcl::Window* pWindow; switch( GetMode() ) { - case( GALLERYBROWSERMODE_ICON ): pWindow = (Window*) mpIconView; break; - case( GALLERYBROWSERMODE_LIST ): pWindow = (Window*) mpListView; break; - case( GALLERYBROWSERMODE_PREVIEW ): pWindow = (Window*) mpPreview; break; + case( GALLERYBROWSERMODE_ICON ): pWindow = (vcl::Window*) mpIconView; break; + case( GALLERYBROWSERMODE_LIST ): pWindow = (vcl::Window*) mpListView; break; + case( GALLERYBROWSERMODE_PREVIEW ): pWindow = (vcl::Window*) mpPreview; break; default: pWindow = NULL; diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 31a21008f17c..af04a9d0947a 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -37,7 +37,7 @@ #define GALLERY_BRWBOX_TITLE 1 -GalleryPreview::GalleryPreview(Window* pParent, WinBits nStyle, GalleryTheme* pTheme) +GalleryPreview::GalleryPreview(vcl::Window* pParent, WinBits nStyle, GalleryTheme* pTheme) : Window(pParent, nStyle) , DropTargetHelper(this) , DragSourceHelper(this) @@ -47,7 +47,7 @@ GalleryPreview::GalleryPreview(Window* pParent, WinBits nStyle, GalleryTheme* pT InitSettings(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeGalleryPreview(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeGalleryPreview(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 9ec75fe04a86..bad9fefaeb8b 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -562,7 +562,7 @@ void GalleryTransferable::DragFinished( sal_Int8 nDropAction ) mpTheme->SetDragPos( 0 ); if ( nDropAction ) { - Window *pFocusWindow = Application::GetFocusWindow(); + vcl::Window *pFocusWindow = Application::GetFocusWindow(); if ( pFocusWindow ) pFocusWindow->GrabFocusToDocument(); } @@ -576,12 +576,12 @@ void GalleryTransferable::ObjectReleased() delete mpURL, mpURL = NULL; } -void GalleryTransferable::CopyToClipboard( Window* pWindow ) +void GalleryTransferable::CopyToClipboard( vcl::Window* pWindow ) { TransferableHelper::CopyToClipboard( pWindow ); } -void GalleryTransferable::StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, +void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer, sal_Int32 nDragImage ) { INetURLObject aURL; diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 17204a0a05a6..df2630420657 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1278,13 +1278,13 @@ bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran return bRet; } -void GalleryTheme::CopyToClipboard( Window* pWindow, sal_uIntPtr nPos ) +void GalleryTheme::CopyToClipboard( vcl::Window* pWindow, sal_uIntPtr nPos ) { GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, false ); pTransferable->CopyToClipboard( pWindow ); } -void GalleryTheme::StartDrag( Window* pWindow, sal_uIntPtr nPos ) +void GalleryTheme::StartDrag( vcl::Window* pWindow, sal_uIntPtr nPos ) { GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, true ); pTransferable->StartDrag( pWindow, DND_ACTION_COPY | DND_ACTION_LINK ); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 8c79cbafc27c..c7a75a9f4598 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -126,7 +126,7 @@ namespace svxform using SvTreeListBox::ExecuteDrop; public: - DataTreeListBox( Window* pParent, WinBits nBits ); + DataTreeListBox( vcl::Window* pParent, WinBits nBits ); virtual ~DataTreeListBox(); virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; @@ -286,7 +286,7 @@ namespace svxform virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - XFormsPage( Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ); + XFormsPage( vcl::Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ); virtual ~XFormsPage(); virtual void Resize() SAL_OVERRIDE; @@ -321,7 +321,7 @@ namespace svxform typedef std::vector< XFormsPage* > PageList; typedef ::rtl::Reference < DataListener > DataListener_ref; - class DataNavigatorWindow : public Window, public VclBuilderContainer + class DataNavigatorWindow : public vcl::Window, public VclBuilderContainer { private: ListBox* m_pModelsBox; @@ -369,7 +369,7 @@ namespace svxform virtual Size GetOptimalSize() const SAL_OVERRIDE; public: - DataNavigatorWindow( Window* pParent, SfxBindings* pBindings ); + DataNavigatorWindow( vcl::Window* pParent, SfxBindings* pBindings ); virtual ~DataNavigatorWindow(); void SetDocModified(); @@ -397,7 +397,7 @@ namespace svxform virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ) SAL_OVERRIDE; public: - DataNavigator( SfxBindings* pBindings, SfxChildWindow* pMgr, Window* pParent ); + DataNavigator( SfxBindings* pBindings, SfxChildWindow* pMgr, vcl::Window* pParent ); virtual ~DataNavigator(); using Window::Update; @@ -412,7 +412,7 @@ namespace svxform class SVX_DLLPUBLIC DataNavigatorManager : public SfxChildWindow { public: - SVX_DLLPRIVATE DataNavigatorManager( Window* pParent, sal_uInt16 nId, + SVX_DLLPRIVATE DataNavigatorManager( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW( DataNavigatorManager ); }; @@ -468,7 +468,7 @@ namespace svxform public: AddDataItemDialog( - Window* pParent, ItemNode* _pNode, const XFormsUIHelper1_ref& _rUIHelper ); + vcl::Window* pParent, ItemNode* _pNode, const XFormsUIHelper1_ref& _rUIHelper ); virtual ~AddDataItemDialog(); void InitText( DataItemType _eType ); @@ -495,7 +495,7 @@ namespace svxform DECL_LINK(OKHdl, void *); public: - AddConditionDialog(Window* pParent, + AddConditionDialog(vcl::Window* pParent, const OUString& _rPropertyName, const XPropertySet_ref& _rBinding); XFormsUIHelper1_ref GetUIHelper() const { return m_xUIHelper; } @@ -548,7 +548,7 @@ namespace svxform DECL_LINK(OKHdl, void *); public: - ManageNamespaceDialog(Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit); + ManageNamespaceDialog(vcl::Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit); void SetNamespace(const OUString& _rPrefix, const OUString& _rURL) { @@ -590,7 +590,7 @@ namespace svxform void FillAllBoxes(); public: - AddSubmissionDialog( Window* pParent, ItemNode* _pNode, + AddSubmissionDialog( vcl::Window* pParent, ItemNode* _pNode, const XFormsUIHelper1_ref& _rUIHelper ); virtual ~AddSubmissionDialog(); @@ -605,7 +605,7 @@ namespace svxform CheckBox* m_pModifyCB; public: - AddModelDialog( Window* pParent, bool _bEdit ); + AddModelDialog( vcl::Window* pParent, bool _bEdit ); OUString GetName() const { return m_pNameED->GetText(); } void SetName( const OUString& _rName ) { m_pNameED->SetText( _rName );} @@ -629,7 +629,7 @@ namespace svxform DECL_LINK(FilePickerHdl, void *); public: - AddInstanceDialog( Window* pParent, bool _bEdit ); + AddInstanceDialog( vcl::Window* pParent, bool _bEdit ); void SetRenameMode() { @@ -650,7 +650,7 @@ namespace svxform class LinkedInstanceWarningBox : public MessageDialog { public: - LinkedInstanceWarningBox( Window* pParent ); + LinkedInstanceWarningBox( vcl::Window* pParent ); }; diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 7c0a7c5e859a..bd5dbac2b6e9 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -299,12 +299,12 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener }; -class PluginProgressWindow : public Window +class PluginProgressWindow : public vcl::Window { private: css::uno::Reference< css::lang::XComponent > m_xProgress; public: - PluginProgressWindow( Window* pParent , + PluginProgressWindow( vcl::Window* pParent , const css::uno::Reference< css::lang::XComponent >& xProgress); virtual ~PluginProgressWindow(); }; @@ -325,7 +325,7 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat // native interface public: /** @short TODO */ - PluginProgress( Window* pParent, + PluginProgress( vcl::Window* pParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ); @@ -392,7 +392,7 @@ class SaveDialog : public Dialog and the current list of open documents, which should be shown inside this dialog. */ - SaveDialog(Window* pParent, RecoveryCore* pCore); + SaveDialog(vcl::Window* pParent, RecoveryCore* pCore); DECL_LINK(OKButtonHdl, void*); }; @@ -403,7 +403,7 @@ class SaveProgressDialog : public ModalDialog // member private: OUString m_aProgrBaseTxt; - Window* m_pProgrParent; + vcl::Window* m_pProgrParent; // @short TODO RecoveryCore* m_pCore; @@ -425,7 +425,7 @@ class SaveProgressDialog : public ModalDialog @param pCore used to start emegrency save. */ - SaveProgressDialog(Window* pParent, + SaveProgressDialog(vcl::Window* pParent, RecoveryCore* pCore ); /** @short start the emergency save operation. */ @@ -500,7 +500,7 @@ class RecoveryDialog : public Dialog private: FixedText* m_pTitleFT; FixedText* m_pDescrFT; - Window* m_pProgrParent; + vcl::Window* m_pProgrParent; RecovDocList* m_pFileListLB; PushButton* m_pNextBtn; CancelButton* m_pCancelBtn; @@ -528,7 +528,7 @@ class RecoveryDialog : public Dialog // member public: /** @short TODO */ - RecoveryDialog(Window* pParent, + RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore ); virtual ~RecoveryDialog(); @@ -575,7 +575,7 @@ class BrokenRecoveryDialog : public ModalDialog /** @short TODO */ - BrokenRecoveryDialog(Window* pParent , + BrokenRecoveryDialog(vcl::Window* pParent , RecoveryCore* pCore , bool bBeforeRecovery); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 96d9e209f2a7..13dde0681aaa 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -228,7 +228,7 @@ inline bool OFilterItemExchange::hasFormat( const DataFlavorExVector& _rFormats class OFilterExchangeHelper : public OLocalExchangeHelper { public: - OFilterExchangeHelper(Window* _pDragSource) : OLocalExchangeHelper(_pDragSource) { } + OFilterExchangeHelper(vcl::Window* _pDragSource) : OLocalExchangeHelper(_pDragSource) { } OFilterItemExchange* operator->() const { return static_cast<OFilterItemExchange*>(m_pTransferable); } @@ -252,7 +252,7 @@ class FmFilterNavigator : public SvTreeListBox, public SfxListener DROP_ACTION m_aDropActionType; public: - FmFilterNavigator( Window* pParent ); + FmFilterNavigator( vcl::Window* pParent ); virtual ~FmFilterNavigator(); void UpdateContent( @@ -325,7 +325,7 @@ protected: public: FmFilterNavigatorWin( SfxBindings *pBindings, SfxChildWindow *pMgr, - Window* pParent ); + vcl::Window* pParent ); virtual ~FmFilterNavigatorWin(); void UpdateContent( FmFormShell* pFormShell ); @@ -341,7 +341,7 @@ public: class FmFilterNavigatorWinMgr : public SfxChildWindow { public: - FmFilterNavigatorWinMgr( Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, + FmFilterNavigatorWinMgr( vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo ); SFX_DECL_CHILDWINDOW( FmFilterNavigatorWinMgr ); }; diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index bdd5cad691ce..a092468415e0 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -33,7 +33,7 @@ class FmPropBrwMgr : public SfxChildWindow { public: - FmPropBrwMgr(Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); + FmPropBrwMgr(vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); SFX_DECL_CHILDWINDOW(FmPropBrwMgr); }; @@ -79,7 +79,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xORB, SfxBindings* pBindings, SfxChildWindow* pMgr, - Window* pParent, + vcl::Window* pParent, const SfxChildWinInfo* _pInfo ); virtual ~FmPropBrw(); diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 6ad001dd84de..ea6d34a5b3c7 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -67,8 +67,8 @@ namespace svxform bool isDragging() const { return m_bDragging; } bool isClipboardOwner() const { return m_bClipboardOwner; } - void startDrag( Window* pWindow, sal_Int8 nDragSourceActions, const GrantAccess& ); - void copyToClipboard( Window* _pWindow, const GrantAccess& ); + void startDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, const GrantAccess& ); + void copyToClipboard( vcl::Window* _pWindow, const GrantAccess& ); void setClipboardListener( const Link& _rListener ) { m_aClipboardListener = _rListener; } @@ -85,7 +85,7 @@ namespace svxform virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE; private: - void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ) + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ) { // don't allow this base class method to be called from outside TransferableHelper::StartDrag(pWindow, nDragSourceActions, nDragPointer, nDragImage); } @@ -98,11 +98,11 @@ namespace svxform class SVX_DLLPUBLIC OLocalExchangeHelper { protected: - Window* m_pDragSource; + vcl::Window* m_pDragSource; OLocalExchange* m_pTransferable; public: - OLocalExchangeHelper( Window* _pDragSource ); + OLocalExchangeHelper( vcl::Window* _pDragSource ); virtual ~OLocalExchangeHelper(); void prepareDrag( ); @@ -226,7 +226,7 @@ namespace svxform class OControlExchangeHelper : public OLocalExchangeHelper { public: - OControlExchangeHelper(Window* _pDragSource) : OLocalExchangeHelper(_pDragSource) { } + OControlExchangeHelper(vcl::Window* _pDragSource) : OLocalExchangeHelper(_pDragSource) { } OControlExchange* operator->() const { return static_cast< OControlExchange* >( m_pTransferable ); } OControlExchange& operator*() const { return *static_cast< OControlExchange* >( m_pTransferable ); } diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index edec6ffffa10..4c527052d62c 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -499,7 +499,7 @@ namespace svxform virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; public: - NavigatorTree(Window* pParent ); + NavigatorTree(vcl::Window* pParent ); virtual ~NavigatorTree(); void Clear(); @@ -568,7 +568,7 @@ namespace svxform public: NavigatorFrame( SfxBindings *pBindings, SfxChildWindow *pMgr, - Window* pParent ); + vcl::Window* pParent ); virtual ~NavigatorFrame(); void UpdateContent( FmFormShell* pFormShell ); @@ -580,7 +580,7 @@ namespace svxform class SVX_DLLPUBLIC NavigatorFrameManager : public SfxChildWindow { public: - SVX_DLLPRIVATE NavigatorFrameManager( Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, + SVX_DLLPRIVATE NavigatorFrameManager( vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo ); SFX_DECL_CHILDWINDOW( NavigatorFrameManager ); }; diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx index d13860193a80..f8012557d624 100644 --- a/svx/source/inc/fmtextcontroldialogs.hxx +++ b/svx/source/inc/fmtextcontroldialogs.hxx @@ -37,7 +37,7 @@ namespace svx sal_uInt16 m_nCharPositionPageId; public: - TextControlCharAttribDialog( Window* pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList ); + TextControlCharAttribDialog( vcl::Window* pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList ); protected: virtual void PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage ) SAL_OVERRIDE; @@ -46,7 +46,7 @@ namespace svx class TextControlParaAttribDialog : public SfxTabDialog { public: - TextControlParaAttribDialog(Window* _pParent, const SfxItemSet& _rCoreSet); + TextControlParaAttribDialog(vcl::Window* _pParent, const SfxItemSet& _rCoreSet); }; } // namespace svx diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 2d54fe8a69b1..ee224cdd232e 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -53,7 +53,7 @@ class FmFormObj; class FmFormModel; class FmFormView; class FmFormShell; -class Window; +namespace vcl { class Window; } class OutputDevice; class SdrUnoObj; struct ImplSVEvent; @@ -93,7 +93,7 @@ class FormViewPageWindowAdapter : public FormViewPageWindowAdapter_Base ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xControlContainer; css::uno::Reference<css::uno::XComponentContext> m_xContext; FmXFormView* m_pViewImpl; - Window* m_pWindow; + vcl::Window* m_pWindow; protected: virtual ~FormViewPageWindowAdapter(); @@ -127,7 +127,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getControlContainer() const { return m_xControlContainer; } void updateTabOrder( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm ); void dispose(); - Window* getWindow() const {return m_pWindow;} + vcl::Window* getWindow() const {return m_pWindow;} }; typedef ::rtl::Reference< FormViewPageWindowAdapter > PFormViewPageWindowAdapter; diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 3b1a23aaea3b..8d794458b869 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -94,7 +94,7 @@ typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTe typedef ::std::vector< FmFilterRow > FmFilterRows; typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > > FmFormControllers; -class Window; +namespace vcl { class Window; } namespace svxform { @@ -522,7 +522,7 @@ namespace svxform bool isLocked() const {return m_bLocked;} bool determineLockState() const; - Window* getDialogParentWindow(); + vcl::Window* getDialogParentWindow(); // returns the window which should be used as parent window for dialogs ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor> createInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>& _xInterception); diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 2fc71c15ad46..2746fa602858 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -171,7 +171,7 @@ public: void SetReadOnly(bool bRead){m_bReadOnly = bRead;} void SetObject(sal_Int16 nPos) {m_bObject = m_bReadOnly = true; m_nFieldPos = nPos;} - void ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat ); + void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ); // Properties, die auf den ::com::sun::star::frame::Controller durchschlagen koennen sal_Int16 SetAlignment(sal_Int16 _nAlign); @@ -217,8 +217,8 @@ private: protected: DbGridColumn& m_rColumn; - Window* m_pPainter; - Window* m_pWindow; + vcl::Window* m_pPainter; + vcl::Window* m_pWindow; protected: // attribute access @@ -270,7 +270,7 @@ public: virtual ~DbCellControl(); - Window& GetWindow() const + vcl::Window& GetWindow() const { ENSURE_OR_THROW( m_pWindow, "no window" ); return *m_pWindow; @@ -284,7 +284,7 @@ public: void SetTextLineColor(const Color& _rColor); // Initialisieren bevor ein Control angezeigt wird - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); virtual ::svt::CellControllerRef CreateController() const = 0; // Schreiben des Wertes in das Model @@ -301,7 +301,7 @@ public: virtual void PaintFieldToCell( OutputDevice& rDev, const Rectangle& rRect, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); virtual void PaintCell( OutputDevice& _rDev, const Rectangle& _rRect ); - void ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat ); + void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ); double GetValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const; @@ -402,7 +402,7 @@ public: ::svt::IEditImplementation* GetEditImplementation() { return m_pEdit; } bool IsSimpleEdit() const { return m_bIsSimpleEdit; } - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) SAL_OVERRIDE; virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; @@ -432,7 +432,7 @@ public: virtual ~DbFormattedField(); - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) SAL_OVERRIDE; virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; @@ -453,7 +453,7 @@ public: TYPEINFO_OVERRIDE(); DbCheckBox(DbGridColumn& _rColumn); - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; virtual void PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, @@ -476,7 +476,7 @@ public: TYPEINFO_OVERRIDE(); DbComboBox(DbGridColumn& _rColumn); - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) SAL_OVERRIDE; virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; @@ -504,7 +504,7 @@ public: TYPEINFO_OVERRIDE(); DbListBox(DbGridColumn& _rColumn); - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) SAL_OVERRIDE; virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; @@ -528,7 +528,7 @@ class DbPatternField : public DbCellControl public: TYPEINFO_OVERRIDE(); DbPatternField( DbGridColumn& _rColumn, const css::uno::Reference<css::uno::XComponentContext>& _rContext ); - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) SAL_OVERRIDE; virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; @@ -564,12 +564,12 @@ protected: DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign = com::sun::star::awt::TextAlign::RIGHT ); public: - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxCursor ) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; protected: virtual SpinField* createField( - Window* _pParent, + vcl::Window* _pParent, WinBits _nFieldStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) = 0; @@ -591,7 +591,7 @@ protected: // DbSpinField virtual SpinField* createField( - Window* _pParent, + vcl::Window* _pParent, WinBits _nFieldStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE; @@ -616,7 +616,7 @@ protected: // DbSpinField virtual SpinField* createField( - Window* _pParent, + vcl::Window* _pParent, WinBits _nFieldStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE; @@ -645,7 +645,7 @@ protected: // DbSpinField virtual SpinField* createField( - Window* _pParent, + vcl::Window* _pParent, WinBits _nFieldStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE; @@ -670,7 +670,7 @@ protected: // DbSpinField virtual SpinField* createField( - Window* _pParent, + vcl::Window* _pParent, WinBits _nFieldStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) SAL_OVERRIDE; @@ -697,7 +697,7 @@ public: DbFilterField(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, DbGridColumn& _rColumn); virtual ~DbFilterField(); - virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; + virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) SAL_OVERRIDE; virtual ::svt::CellControllerRef CreateController() const SAL_OVERRIDE; virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect) SAL_OVERRIDE; virtual void Update() SAL_OVERRIDE; @@ -718,7 +718,7 @@ protected: protected: void SetList(const ::com::sun::star::uno::Any& rItems, bool bComboBox); - void CreateControl(Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xModel); + void CreateControl(vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xModel); DECL_LINK( OnClick, void* ); }; @@ -809,7 +809,7 @@ public: virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; bool Commit() {return m_pCellControl->Commit();} - void ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat ) + void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ) { m_pCellControl->ImplInitWindow( rParent, _eInitWhat ); } bool isAlignedController() const { return m_pCellControl->isAlignedController(); } @@ -817,8 +817,8 @@ public: { m_pCellControl->AlignControl(nAlignment);} protected: - virtual Window* getEventWindow() const; - virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); + virtual vcl::Window* getEventWindow() const; + virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ); // default implementations call our focus listeners, don't forget to call them if you override this virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ); @@ -934,7 +934,7 @@ public: virtual void SAL_CALL removeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; + virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ) SAL_OVERRIDE; virtual void onFocusLost( const ::com::sun::star::awt::FocusEvent& _rEvent ) SAL_OVERRIDE; @@ -985,8 +985,8 @@ public: virtual void SAL_CALL setActionCommand( const OUString& Command ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual Window* getEventWindow() const SAL_OVERRIDE; - virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; + virtual vcl::Window* getEventWindow() const SAL_OVERRIDE; + virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; }; @@ -1038,7 +1038,7 @@ public: virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; + virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; DECL_LINK( OnDoubleClick, void* ); }; @@ -1083,7 +1083,7 @@ public: virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 _Lines ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; + virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE; }; diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx index 6ddbbc56fb4e..4824352dc16b 100644 --- a/svx/source/inc/recoveryui.hxx +++ b/svx/source/inc/recoveryui.hxx @@ -58,7 +58,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo css::uno::Reference< css::uno::XComponentContext > m_xContext; /** @short TODO */ - Window* m_pParentWindow; + vcl::Window* m_pParentWindow; /** @short TODO */ RecoveryUI::EJob m_eJob; diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index b8d76d1b7930..0ade59b50584 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -57,7 +57,7 @@ namespace com { namespace sun { namespace star { namespace awt { class Rectangle; class SvxRectCtl; class SvxRectCtlChildAccessibleContext; -class Window; +namespace vcl { class Window; } typedef ::cppu::WeakAggComponentImplHelper6< @@ -324,7 +324,7 @@ class SvxRectCtlChildAccessibleContext : public SvxRectCtlChildAccessibleContext public: SvxRectCtlChildAccessibleContext( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - const Window& rParentWindow, + const vcl::Window& rParentWindow, const OUString& rName, const OUString& rDescription, const Rectangle& rBoundingBox, long nIndexInParent ); @@ -504,7 +504,7 @@ private: Rectangle* mpBoundingBox; /// window of parent - const Window& mrParentWindow; + const vcl::Window& mrParentWindow; /// client id in the AccessibleEventNotifier queue sal_uInt32 mnClientId; diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 3e49fee12807..368da9823251 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -85,7 +85,7 @@ class FmFieldWin :public SfxFloatingWindow public: FmFieldWin(SfxBindings *pBindings, - SfxChildWindow *pMgr, Window* pParent); + SfxChildWindow *pMgr, vcl::Window* pParent); virtual ~FmFieldWin(); virtual void Resize() SAL_OVERRIDE; @@ -123,7 +123,7 @@ protected: class FmFieldWinMgr : public SfxChildWindow { public: - FmFieldWinMgr(Window *pParent, sal_uInt16 nId, + FmFieldWinMgr(vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); SFX_DECL_CHILDWINDOW(FmFieldWinMgr); }; diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index adb279fa5c9a..e1d79e5a7559 100644 --- a/svx/source/inc/tbxform.hxx +++ b/svx/source/inc/tbxform.hxx @@ -31,7 +31,7 @@ class SvxFmAbsRecWin : public NumericField SfxToolBoxControl* m_pController; // for invalidating our content whe losing the focus public: - SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pController ); + SvxFmAbsRecWin( vcl::Window* _pParent, SfxToolBoxControl* _pController ); virtual ~SvxFmAbsRecWin(); virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; @@ -72,7 +72,7 @@ public: SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxFmTbxCtlAbsRec(); - virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -87,7 +87,7 @@ public: SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxFmTbxCtlRecText(); - virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; }; @@ -99,7 +99,7 @@ public: SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxFmTbxCtlRecFromText(); - virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; }; @@ -113,7 +113,7 @@ public: SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxFmTbxCtlRecTotal(); - virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window* pParent ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; }; diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index e5b59df68e29..61e86bb54ef7 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -66,7 +66,7 @@ namespace svxform protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE; }; diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx index 57ae8d38b8fb..3313eedf53a2 100644 --- a/svx/source/sdr/contact/sdrmediawindow.cxx +++ b/svx/source/sdr/contact/sdrmediawindow.cxx @@ -30,7 +30,7 @@ namespace sdr { namespace contact { // - SdrMediaWindow - -SdrMediaWindow::SdrMediaWindow( Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ) : +SdrMediaWindow::SdrMediaWindow( vcl::Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ) : ::avmedia::MediaWindow( pParent, false ), mrViewObjectContactOfSdrMediaObj( rViewObjContact ) { @@ -46,7 +46,7 @@ SdrMediaWindow::~SdrMediaWindow() void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow && getWindow() ) { @@ -62,7 +62,7 @@ void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt ) void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow && getWindow() ) { @@ -77,7 +77,7 @@ void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt ) void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow && getWindow() ) { @@ -92,7 +92,7 @@ void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt ) void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow ) pWindow->KeyInput( rKEvt ); @@ -102,7 +102,7 @@ void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt ) void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow ) pWindow->KeyUp( rKEvt ); @@ -112,7 +112,7 @@ void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt ) void SdrMediaWindow::Command( const CommandEvent& rCEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow && getWindow() ) { @@ -127,7 +127,7 @@ void SdrMediaWindow::Command( const CommandEvent& rCEvt ) sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); sal_Int8 nRet = DND_ACTION_NONE; if( pWindow ) @@ -147,7 +147,7 @@ sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt ) sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); sal_Int8 nRet = DND_ACTION_NONE; if( pWindow ) @@ -167,7 +167,7 @@ sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) void SdrMediaWindow::StartDrag( sal_Int8 nAction, const Point& rPosPixel ) { - Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); + vcl::Window* pWindow = mrViewObjectContactOfSdrMediaObj.getWindow(); if( pWindow ) { diff --git a/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx index 6416bad6cb8c..3bf306413884 100644 --- a/svx/source/sdr/contact/sdrmediawindow.hxx +++ b/svx/source/sdr/contact/sdrmediawindow.hxx @@ -34,7 +34,7 @@ class SdrMediaWindow : public ::avmedia::MediaWindow { public: - SdrMediaWindow( Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ); + SdrMediaWindow( vcl::Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ); virtual ~SdrMediaWindow(); virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index 537a34a76478..4f68e3bd29d8 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -83,7 +83,7 @@ namespace sdr { namespace contact { Reference< XControl > ViewContactOfUnoControl::getTemporaryControlForWindow( - const Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer ) const + const vcl::Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer ) const { SdrUnoObj* pUnoObject = dynamic_cast< SdrUnoObj* >( TryToGetSdrObject() ); OSL_ENSURE( pUnoObject, "ViewContactOfUnoControl::getTemporaryControlForDevice: no SdrUnoObj!" ); diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx index ff71c14bde19..68d7ba130b2f 100644 --- a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx @@ -34,16 +34,16 @@ ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj() { } -Window* ViewObjectContactOfOpenGLObj::getWindow() const +vcl::Window* ViewObjectContactOfOpenGLObj::getWindow() const { - Window* pRetval = 0; + vcl::Window* pRetval = 0; boost::optional<const OutputDevice&> oPageOutputDev = getPageViewOutputDevice(); if( oPageOutputDev ) { if(OUTDEV_WINDOW == oPageOutputDev->GetOutDevType()) { - pRetval = static_cast< Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get())); + pRetval = static_cast< vcl::Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get())); } } diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index 79873095ca46..961821e5b595 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -39,7 +39,7 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r mpMediaWindow( NULL ) { #if HAVE_FEATURE_AVMEDIA - Window* pWindow = getWindow(); + vcl::Window* pWindow = getWindow(); if( pWindow ) { @@ -60,16 +60,16 @@ ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj() -Window* ViewObjectContactOfSdrMediaObj::getWindow() const +vcl::Window* ViewObjectContactOfSdrMediaObj::getWindow() const { - Window* pRetval = 0; + vcl::Window* pRetval = 0; boost::optional<const OutputDevice&> oPageOutputDev = getPageViewOutputDevice(); if( oPageOutputDev ) { if(OUTDEV_WINDOW == oPageOutputDev->GetOutDevType()) { - pRetval = static_cast< Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get())); + pRetval = static_cast< vcl::Window* >(&const_cast<OutputDevice&>(oPageOutputDev.get())); } } diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index bc22a54aefd2..096da89be126 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -260,7 +260,7 @@ namespace sdr { namespace contact { Reference< XWindowPeer > xPeer( m_xControl->getPeer() ); if ( xPeer.is() ) { - Window* pWindow = VCLUnoHelper::GetWindow( xPeer ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xPeer ); OSL_ENSURE( pWindow, "ControlHolder::invalidate: no implementation access!" ); if ( pWindow ) pWindow->Invalidate(); @@ -273,7 +273,7 @@ namespace sdr { namespace contact { // no check whether we're valid, this is the responsibility of the caller // Argh. Why does XView have a setZoom only, but not a getZoom? - Window* pWindow = VCLUnoHelper::GetWindow( m_xControl->getPeer() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( m_xControl->getPeer() ); OSL_ENSURE( pWindow, "ControlHolder::getZoom: no implementation access!" ); ::basegfx::B2DVector aZoom( 1, 1 ); @@ -434,10 +434,10 @@ namespace sdr { namespace contact { { if ( !m_rControlContainer.is() ) { - const Window* pWindow = dynamic_cast< const Window* >( &_rDevice ); + const vcl::Window* pWindow = dynamic_cast< const vcl::Window* >( &_rDevice ); OSL_ENSURE( pWindow, "InvisibleControlViewAccess::getControlContainer: expected to be called for a window only!" ); if ( pWindow ) - m_rControlContainer = VCLUnoHelper::CreateControlContainer( const_cast< Window* >( pWindow ) ); + m_rControlContainer = VCLUnoHelper::CreateControlContainer( const_cast< vcl::Window* >( pWindow ) ); } return m_rControlContainer; } @@ -1067,7 +1067,7 @@ namespace sdr { namespace contact { m_xContainer.set(_rPageView.getControlContainer( _rDevice ), css::uno::UNO_QUERY); DBG_ASSERT( ( m_xContainer.is() // either have a XControlContainer || ( ( !_rPageView.getControlContainer( _rDevice ).is() ) // or don't have any container, - && ( dynamic_cast< const Window* >( &_rDevice ) == NULL ) // which is allowed for non-Window instances only + && ( dynamic_cast< const vcl::Window* >( &_rDevice ) == NULL ) // which is allowed for non-Window instances only ) ), "ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow: no XContainer at the ControlContainer!" ); @@ -1628,7 +1628,7 @@ namespace sdr { namespace contact { Reference< XControl > ViewObjectContactOfUnoControl::getTemporaryControlForWindow( - const Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer, const SdrUnoObj& _rUnoObject ) + const vcl::Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer, const SdrUnoObj& _rUnoObject ) { ControlHolder aControl; diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index f843d5ae3a7d..80758a01578c 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -315,7 +315,7 @@ namespace sdr (sal_Int32)ceil(rRange.getMaxY() + fDiscreteOne)); // simply invalidate - ((Window&)getOutputDevice()).Invalidate(aInvalidateRectangle, INVALIDATE_NOERASE); + ((vcl::Window&)getOutputDevice()).Invalidate(aInvalidateRectangle, INVALIDATE_NOERASE); } else { @@ -326,7 +326,7 @@ namespace sdr (sal_Int32)ceil(rRange.getMaxX()), (sal_Int32)ceil(rRange.getMaxY())); // simply invalidate - ((Window&)getOutputDevice()).Invalidate(aInvalidateRectangle, INVALIDATE_NOERASE); + ((vcl::Window&)getOutputDevice()).Invalidate(aInvalidateRectangle, INVALIDATE_NOERASE); } } } diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index c510207a8a63..7cc57642da12 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -193,7 +193,7 @@ namespace sdr // but always the exact redraw area if(OUTDEV_WINDOW == rSource.GetOutDevType()) { - Window& rWindow = (Window&)rSource; + vcl::Window& rWindow = (vcl::Window&)rSource; Region aPaintRegionPixel = rWindow.LogicToPixel(rWindow.GetPaintRegion()); aRegion.Intersect(aPaintRegionPixel); @@ -274,7 +274,7 @@ namespace sdr // #i80730# switch off VCL cursor during overlay refresh if(bTargetIsWindow) { - Window& rWindow = static_cast< Window& >(rmOutputDevice); + vcl::Window& rWindow = static_cast< vcl::Window& >(rmOutputDevice); vcl::Cursor* pCursor = rWindow.GetCursor(); if(pCursor && pCursor->IsVisible()) @@ -391,7 +391,7 @@ namespace sdr // To get the update, the windows in question are updated manulally here. if(bTargetIsWindow) { - Window& rWindow = static_cast< Window& >(rmOutputDevice); + vcl::Window& rWindow = static_cast< vcl::Window& >(rmOutputDevice); const Rectangle aRegionRectanglePixel( maBufferRememberedRangePixel.getMinX(), @@ -404,7 +404,7 @@ namespace sdr // #i80730# restore visibility of VCL cursor if(bCursorWasEnabled) { - Window& rWindow = static_cast< Window& >(rmOutputDevice); + vcl::Window& rWindow = static_cast< vcl::Window& >(rmOutputDevice); vcl::Cursor* pCursor = rWindow.GetCursor(); if(pCursor) diff --git a/svx/source/sidebar/ColorPanel.cxx b/svx/source/sidebar/ColorPanel.cxx index ee55024d4455..d6c81113e2ba 100644 --- a/svx/source/sidebar/ColorPanel.cxx +++ b/svx/source/sidebar/ColorPanel.cxx @@ -25,7 +25,7 @@ namespace svx { namespace sidebar { -ColorPanel::ColorPanel (::Window* pParent) +ColorPanel::ColorPanel (vcl::Window* pParent) : ValueSet(pParent), mnPreferredColumnCount(2) { @@ -53,7 +53,7 @@ ColorPanel::~ColorPanel (void) void ColorPanel::Resize (void) { - ::Window::Resize(); + vcl::Window::Resize(); Size aWindowSize = GetOutputSizePixel(); SetPosSizePixel(Point(0,0), aWindowSize); if (IsVisible() && aWindowSize.Width() > 0) diff --git a/svx/source/sidebar/ColorPanel.hxx b/svx/source/sidebar/ColorPanel.hxx index 8a26d821f1e4..d4dc6980c71f 100644 --- a/svx/source/sidebar/ColorPanel.hxx +++ b/svx/source/sidebar/ColorPanel.hxx @@ -33,10 +33,10 @@ class ColorPanel : public ValueSet { public: - ColorPanel (::Window* pParent); + ColorPanel (vcl::Window* pParent); virtual ~ColorPanel (void); - // From ::Window + // From vcl::Window virtual void Resize (void); virtual void DataChanged (const DataChangedEvent& rEvent); diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx index d730350a75c7..2d28f8a99ba2 100644 --- a/svx/source/sidebar/EmptyPanel.cxx +++ b/svx/source/sidebar/EmptyPanel.cxx @@ -26,7 +26,7 @@ namespace svx { namespace sidebar { -EmptyPanel::EmptyPanel (::Window* pParent) +EmptyPanel::EmptyPanel (vcl::Window* pParent) : Control(pParent, SVX_RES(RID_SIDEBAR_EMPTY_PANEL)), maMessageControl(this, SVX_RES(FT_MESSAGE)) { diff --git a/svx/source/sidebar/EmptyPanel.hxx b/svx/source/sidebar/EmptyPanel.hxx index 2fa9a65aa7ec..de166cf80953 100644 --- a/svx/source/sidebar/EmptyPanel.hxx +++ b/svx/source/sidebar/EmptyPanel.hxx @@ -34,7 +34,7 @@ class EmptyPanel : public Control { public: - EmptyPanel (::Window* pParent); + EmptyPanel (vcl::Window* pParent); virtual ~EmptyPanel (void); virtual void Resize (void) SAL_OVERRIDE; diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index cf45ff59f777..e6f265a1de46 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -112,7 +112,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( aArguments.getOrDefault("ApplicationName", OUString()), aArguments.getOrDefault("ContextName", OUString())); - ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if ( ! xParentWindow.is() || pParentWindow==NULL) throw RuntimeException( "PanelFactory::createUIElement called without ParentWindow", @@ -126,7 +126,7 @@ Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( "PanelFactory::createUIElement called without SfxBindings", NULL); - Window* pControl = NULL; + vcl::Window* pControl = NULL; ui::LayoutSize aLayoutSize (-1,-1,-1); #define DoesResourceEndWith(s) rsResourceURL.endsWithAsciiL(s,strlen(s)) diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx index 04a62186f912..08256d180236 100644 --- a/svx/source/sidebar/PanelLayout.cxx +++ b/svx/source/sidebar/PanelLayout.cxx @@ -14,7 +14,7 @@ #include <svx/sidebar/PanelLayout.hxx> #include <vcl/layout.hxx> -PanelLayout::PanelLayout(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> &rFrame) +PanelLayout::PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> &rFrame) : Control(pParent) , m_bInClose(false) { @@ -56,7 +56,7 @@ void PanelLayout::queue_resize(StateChangedType /*eReason*/) IMPL_LINK( PanelLayout, ImplHandlePanelLayoutTimerHdl, void*, EMPTYARG ) { - Window *pChild = GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); assert(pChild); VclContainer::setLayoutAllocation(*pChild, Point(0, 0), GetSizePixel()); return 0; @@ -68,7 +68,7 @@ void PanelLayout::setPosSizePixel(long nX, long nY, long nWidth, long nHeight, s bool bCanHandleSmallerHeight = false; bool bIsLayoutEnabled = isLayoutEnabled(this); - Window *pChild = GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pChild = GetWindow(WINDOW_FIRSTCHILD); if (bIsLayoutEnabled && pChild->GetType() == WINDOW_SCROLLWINDOW) { diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index ee9eca71f4b2..2081fcad61b8 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -60,7 +60,7 @@ const sal_Int32 AreaPropertyPanel::DEFAULT_BORDER = 0; AreaPropertyPanel::AreaPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "AreaPropertyPanel", "svx/ui/sidebararea.ui", rxFrame), @@ -578,7 +578,7 @@ void AreaPropertyPanel::SetupIcons(void) AreaPropertyPanel* AreaPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index e1b34c402ddd..b0c2b0ea1deb 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -57,7 +57,7 @@ class AreaPropertyPanel { public: static AreaPropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); @@ -167,7 +167,7 @@ private: // constructor/destuctor AreaPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~AreaPropertyPanel(void); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx index 9b5a94648b61..6d6690c77d84 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx @@ -53,7 +53,7 @@ namespace svx { namespace sidebar { AreaTransparencyGradientControl::AreaTransparencyGradientControl ( - Window* pParent, + vcl::Window* pParent, AreaPropertyPanel& rPanel) : PopupControl( pParent,SVX_RES(RID_POPUPPANEL_AREAPAGE_TRGR)), maFtTrgrCenterX(this, SVX_RES(FT_TRGR_CENTER_X)), diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx index 628e13825a1f..1a8d31b16573 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx @@ -38,7 +38,7 @@ class AreaTransparencyGradientControl : public PopupControl { public: AreaTransparencyGradientControl ( - Window* pParent, + vcl::Window* pParent, AreaPropertyPanel& rPanel); virtual ~AreaTransparencyGradientControl (void); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index e6998756fedc..f2d1390580a2 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -23,7 +23,7 @@ namespace svx { namespace sidebar { AreaTransparencyGradientPopup::AreaTransparencyGradientPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx index 01fd47671520..5d6ac9e8ec7c 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx @@ -34,7 +34,7 @@ class AreaTransparencyGradientPopup { public : AreaTransparencyGradientPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~AreaTransparencyGradientPopup (void); diff --git a/svx/source/sidebar/debug/ColorPanel.cxx b/svx/source/sidebar/debug/ColorPanel.cxx index 3138531ad44a..11ac13553b49 100644 --- a/svx/source/sidebar/debug/ColorPanel.cxx +++ b/svx/source/sidebar/debug/ColorPanel.cxx @@ -25,7 +25,7 @@ namespace svx { namespace sidebar { -ColorPanel::ColorPanel (::Window* pParent) +ColorPanel::ColorPanel (vcl::Window* pParent) : ValueSet(pParent, WB_ITEMBORDER) { WinBits aStyle = @@ -52,7 +52,7 @@ ColorPanel::~ColorPanel (void) void ColorPanel::Resize (void) { - ::Window::Resize(); + vcl::Window::Resize(); Size aWindowSize = GetOutputSizePixel(); SetPosSizePixel(Point(0,0), aWindowSize); if (IsVisible() && aWindowSize.Width() > 0) diff --git a/svx/source/sidebar/debug/ColorPanel.hxx b/svx/source/sidebar/debug/ColorPanel.hxx index c297c5bf7acd..bac417d4ea69 100644 --- a/svx/source/sidebar/debug/ColorPanel.hxx +++ b/svx/source/sidebar/debug/ColorPanel.hxx @@ -33,10 +33,10 @@ class ColorPanel : public ValueSet { public: - ColorPanel (::Window* pParent); + ColorPanel (vcl::Window* pParent); virtual ~ColorPanel (void); - // From ::Window + // From vcl::Window virtual void Resize (void) SAL_OVERRIDE; virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; diff --git a/svx/source/sidebar/debug/ContextPanel.cxx b/svx/source/sidebar/debug/ContextPanel.cxx index 9a68627f8909..ca87b672e269 100644 --- a/svx/source/sidebar/debug/ContextPanel.cxx +++ b/svx/source/sidebar/debug/ContextPanel.cxx @@ -21,7 +21,7 @@ namespace svx { namespace sidebar { -ContextPanel::ContextPanel (::Window* pParent) +ContextPanel::ContextPanel (vcl::Window* pParent) : Window(pParent, 0), maApplicationName(this, 0), maContextName(this, 0) diff --git a/svx/source/sidebar/debug/ContextPanel.hxx b/svx/source/sidebar/debug/ContextPanel.hxx index 0a83b6687bf0..e55026c3836c 100644 --- a/svx/source/sidebar/debug/ContextPanel.hxx +++ b/svx/source/sidebar/debug/ContextPanel.hxx @@ -30,11 +30,11 @@ namespace svx { namespace sidebar { /** Display the current context. */ class ContextPanel - : public Window, + : public vcl::Window, public sfx2::sidebar::IContextChangeReceiver { public: - ContextPanel (::Window* pParent); + ContextPanel (vcl::Window* pParent); virtual ~ContextPanel (void); // From IContextChangeReceiverInterface diff --git a/svx/source/sidebar/debug/NotYetImplementedPanel.cxx b/svx/source/sidebar/debug/NotYetImplementedPanel.cxx index d51d493e2700..e91d1933773b 100644 --- a/svx/source/sidebar/debug/NotYetImplementedPanel.cxx +++ b/svx/source/sidebar/debug/NotYetImplementedPanel.cxx @@ -21,7 +21,7 @@ namespace svx { namespace sidebar { -NotYetImplementedPanel::NotYetImplementedPanel (::Window* pParent) +NotYetImplementedPanel::NotYetImplementedPanel (vcl::Window* pParent) : Window(pParent, 0), maMessageControl(this, 0) { diff --git a/svx/source/sidebar/debug/NotYetImplementedPanel.hxx b/svx/source/sidebar/debug/NotYetImplementedPanel.hxx index 43e6ed3f0535..11abe3aafb88 100644 --- a/svx/source/sidebar/debug/NotYetImplementedPanel.hxx +++ b/svx/source/sidebar/debug/NotYetImplementedPanel.hxx @@ -29,10 +29,10 @@ namespace svx { namespace sidebar { /** Display a panel as placeholder for a not-yet-implemented panel. */ class NotYetImplementedPanel - : public Window + : public vcl::Window { public: - NotYetImplementedPanel (::Window* pParent); + NotYetImplementedPanel (vcl::Window* pParent); virtual ~NotYetImplementedPanel (void); private: diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 235f622bab26..720062e5224a 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -40,7 +40,7 @@ namespace svx { namespace sidebar { GraphicPropertyPanel::GraphicPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "GraphicPropertyPanel", "svx/ui/sidebargraphic.ui", rxFrame), @@ -222,7 +222,7 @@ void GraphicPropertyPanel::SetupIcons(void) GraphicPropertyPanel* GraphicPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index e60d52d7acb6..8f3babcd40e8 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -40,7 +40,7 @@ class GraphicPropertyPanel { public: static GraphicPropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); @@ -95,7 +95,7 @@ private: // constructor/destuctor GraphicPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~GraphicPropertyPanel(); diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx index b7ae54d43874..7f4925b22e51 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx @@ -46,7 +46,7 @@ namespace svx { namespace sidebar { InsertPropertyPanel::InsertPropertyPanel ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame) : PanelLayout(pParent, "InsertPropertyPanel", "svx/ui/sidebarinsert.ui", rxFrame), mxFrame(rxFrame) @@ -66,7 +66,7 @@ InsertPropertyPanel::InsertPropertyPanel ( // general ;-) // In other words, we should find the underlying problem, and remove the // WindowEventListener for good. - Window* pTopWindow = pParent; + vcl::Window* pTopWindow = pParent; while (pTopWindow->GetParent() != NULL) pTopWindow = pTopWindow->GetParent(); pTopWindow->AddChildEventListener(LINK(this, InsertPropertyPanel, WindowEventListener)); @@ -78,7 +78,7 @@ InsertPropertyPanel::InsertPropertyPanel ( InsertPropertyPanel::~InsertPropertyPanel (void) { // Remove window child listener. - Window* pTopWindow = this; + vcl::Window* pTopWindow = this; while (pTopWindow->GetParent() != NULL) pTopWindow = pTopWindow->GetParent(); pTopWindow->RemoveChildEventListener(LINK(this, InsertPropertyPanel, WindowEventListener)); @@ -100,7 +100,7 @@ IMPL_LINK(InsertPropertyPanel, WindowEventListener, VclSimpleEvent*, pEvent) return 1; VclWindowEvent* pWindowEvent = dynamic_cast<VclWindowEvent*>(pEvent); - Window* pWindow = pWindowEvent ? pWindowEvent->GetWindow() : NULL; + vcl::Window* pWindow = pWindowEvent ? pWindowEvent->GetWindow() : NULL; ToolBox* pToolBox = dynamic_cast<ToolBox*>(pWindow); if (pToolBox == NULL) return 1; diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hxx b/svx/source/sidebar/insert/InsertPropertyPanel.hxx index e694e8207c95..b0a5426b84d5 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.hxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.hxx @@ -39,7 +39,7 @@ class InsertPropertyPanel { public: InsertPropertyPanel ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame); virtual ~InsertPropertyPanel (void); diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index ff171deb07ee..f948c4455ec8 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -154,7 +154,7 @@ namespace { namespace svx { namespace sidebar { LinePropertyPanel::LinePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "LinePropertyPanel", "svx/ui/sidebarline.ui", rxFrame), @@ -300,7 +300,7 @@ void LinePropertyPanel::SetupIcons(void) LinePropertyPanel* LinePropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 0cdf79d4e9c7..ec5b90e2b01f 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -61,7 +61,7 @@ class LinePropertyPanel { public: static LinePropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); @@ -162,7 +162,7 @@ private: // constructor/destuctor LinePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~LinePropertyPanel(void); diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index 3483d3a794f7..bbbd1df9b47e 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -36,7 +36,7 @@ namespace svx { namespace sidebar { LineWidthControl::LineWidthControl ( - Window* pParent, + vcl::Window* pParent, LinePropertyPanel& rPanel) : svx::sidebar::PopupControl(pParent,SVX_RES(RID_POPUPPANEL_LINEPAGE_WIDTH)), mrLinePropertyPanel(rPanel), diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx index 7e06a6b58beb..c2904381647a 100644 --- a/svx/source/sidebar/line/LineWidthControl.hxx +++ b/svx/source/sidebar/line/LineWidthControl.hxx @@ -36,7 +36,7 @@ class LineWidthControl : public svx::sidebar::PopupControl { public: - LineWidthControl (Window* pParent, LinePropertyPanel& rPanel); + LineWidthControl (vcl::Window* pParent, LinePropertyPanel& rPanel); virtual ~LineWidthControl (void); virtual void GetFocus() SAL_OVERRIDE; diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 248d17aa4a6d..fe464a415700 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -28,7 +28,7 @@ namespace svx { namespace sidebar { LineWidthPopup::LineWidthPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/line/LineWidthPopup.hxx b/svx/source/sidebar/line/LineWidthPopup.hxx index e48069725ac8..8cbe0e5ee960 100644 --- a/svx/source/sidebar/line/LineWidthPopup.hxx +++ b/svx/source/sidebar/line/LineWidthPopup.hxx @@ -33,7 +33,7 @@ class LineWidthPopup { public : LineWidthPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~LineWidthPopup (void); diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index eb9ee9300f12..d9af174bc253 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -25,7 +25,7 @@ namespace svx { namespace sidebar { LineWidthValueSet::LineWidthValueSet ( - Window* pParent, const ResId& rResId) + vcl::Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ), pVDev(NULL), nSelItem(0), diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx index a3bb77382c8f..75c2b69286a1 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.hxx +++ b/svx/source/sidebar/line/LineWidthValueSet.hxx @@ -28,7 +28,7 @@ class LineWidthValueSet : public ValueSet { public: - LineWidthValueSet (Window* pParent, const ResId& rResId); + LineWidthValueSet (vcl::Window* pParent, const ResId& rResId); virtual ~LineWidthValueSet (void); void SetUnit(OUString* str); diff --git a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx index a35c4d478411..268728a4a76e 100644 --- a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx +++ b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx @@ -34,7 +34,7 @@ namespace svx { namespace sidebar { ParaBulletsControl::ParaBulletsControl( - Window* pParent, + vcl::Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel ) : PopupControl( pParent,SVX_RES(RID_POPUPPANEL_PARAPAGE_BULLETS) ) , maBulletsVS( this,SVX_RES(VS_VALUES) ) diff --git a/svx/source/sidebar/paragraph/ParaBulletsControl.hxx b/svx/source/sidebar/paragraph/ParaBulletsControl.hxx index 6578328d4cd5..d54f98765c31 100644 --- a/svx/source/sidebar/paragraph/ParaBulletsControl.hxx +++ b/svx/source/sidebar/paragraph/ParaBulletsControl.hxx @@ -46,7 +46,7 @@ private: DECL_LINK(MoreButtonClickHdl_Impl, void*); public: - ParaBulletsControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel); + ParaBulletsControl(vcl::Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel); virtual ~ParaBulletsControl(); void UpdateValueSet(); }; diff --git a/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx b/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx index 2e68ea73ff3c..5c769737fb81 100644 --- a/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaBulletsPopup.cxx @@ -24,7 +24,7 @@ namespace svx { namespace sidebar { ParaBulletsPopup::ParaBulletsPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx b/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx index 3d37df749fa9..2b80cb015014 100644 --- a/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx +++ b/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx @@ -33,7 +33,7 @@ class ParaBulletsPopup { public : ParaBulletsPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~ParaBulletsPopup (void); diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 08892b9828c8..2b64dd949919 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -50,7 +50,7 @@ namespace svx { namespace sidebar { -ParaLineSpacingControl::ParaLineSpacingControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel) +ParaLineSpacingControl::ParaLineSpacingControl(vcl::Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel) : PopupControl( pParent,SVX_RES(RID_POPUPPANEL_PARAPAGE_LINESPACING)) , mbUseLineSPCustom (false) , mbLineSPDisable (false) diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index 6130bd09b63c..5f86353a2179 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -39,7 +39,7 @@ namespace svx { namespace sidebar { class ParaLineSpacingControl:public svx::sidebar::PopupControl { public: - ParaLineSpacingControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel); + ParaLineSpacingControl(vcl::Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel); virtual ~ParaLineSpacingControl(); void Rearrange(SfxItemState currSPState,FieldUnit currMetricUnit,SvxLineSpacingItem* currSPItem,const ::sfx2::sidebar::EnumContext currentContext); //virtual void Paint(const Rectangle& rect); diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx index 8f50dd867fe2..6a989484d502 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx @@ -24,7 +24,7 @@ namespace svx { namespace sidebar { ParaLineSpacingPopup::ParaLineSpacingPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx index 3a7929a9a56c..060181d0abb9 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx @@ -34,7 +34,7 @@ class ParaLineSpacingPopup { public : ParaLineSpacingPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~ParaLineSpacingPopup (void); diff --git a/svx/source/sidebar/paragraph/ParaNumberingControl.cxx b/svx/source/sidebar/paragraph/ParaNumberingControl.cxx index 6a5975918382..7125ef9b443a 100644 --- a/svx/source/sidebar/paragraph/ParaNumberingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaNumberingControl.cxx @@ -51,7 +51,7 @@ Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider() } ParaNumberingControl::ParaNumberingControl( - Window* pParent, + vcl::Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel ) : PopupControl( pParent,SVX_RES(RID_POPUPPANEL_PARAPAGE_NUMBERING) ) , maNumberVS( this,SVX_RES(VS_NUMBERING) ) diff --git a/svx/source/sidebar/paragraph/ParaNumberingControl.hxx b/svx/source/sidebar/paragraph/ParaNumberingControl.hxx index fd4234bed91c..3bbeae8d476f 100644 --- a/svx/source/sidebar/paragraph/ParaNumberingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaNumberingControl.hxx @@ -48,7 +48,7 @@ private: DECL_LINK(MoreButtonClickHdl_Impl, void*); public: - ParaNumberingControl( Window* pParent, + ParaNumberingControl( vcl::Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel); virtual ~ParaNumberingControl(); void UpdateValueSet(); diff --git a/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx b/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx index 45a7a1f84885..287141ea3c16 100644 --- a/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaNumberingPopup.cxx @@ -24,7 +24,7 @@ namespace svx { namespace sidebar { ParaNumberingPopup::ParaNumberingPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx b/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx index ec62640009b0..862b584fe0f1 100644 --- a/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx +++ b/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx @@ -33,7 +33,7 @@ class ParaNumberingPopup { public : ParaNumberingPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~ParaNumberingPopup (void); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 52b1100fbcf2..a390fed35fc7 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -79,7 +79,7 @@ namespace svx {namespace sidebar { #define NEGA_MAXVALUE -10000000 ParaPropertyPanel* ParaPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) @@ -1090,7 +1090,7 @@ PopupControl* ParaPropertyPanel::CreateBGColorPopupControl (PopupContainer* pPar } -ParaPropertyPanel::ParaPropertyPanel(Window* pParent, +ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 6b06910fd5f3..db00d8f0f372 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -61,7 +61,7 @@ class ParaPropertyPanel { public: static ParaPropertyPanel* Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); @@ -157,7 +157,7 @@ private: ParaPropertyPanel ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index f4e4acb29933..4cf7cfa99286 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -52,7 +52,7 @@ namespace svx { namespace sidebar { PosSizePropertyPanel::PosSizePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) @@ -228,7 +228,7 @@ void PosSizePropertyPanel::SetupIcons(void) PosSizePropertyPanel* PosSizePropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar) diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 7b0bbd63901f..8983c23deac6 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -49,7 +49,7 @@ class PosSizePropertyPanel { public: static PosSizePropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); @@ -165,7 +165,7 @@ private: // constructor/destuctor PosSizePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx b/svx/source/sidebar/possize/SidebarDialControl.cxx index e48fa55dee44..b4d0bee4703c 100644 --- a/svx/source/sidebar/possize/SidebarDialControl.cxx +++ b/svx/source/sidebar/possize/SidebarDialControl.cxx @@ -24,13 +24,13 @@ namespace svx { namespace sidebar { -SidebarDialControl::SidebarDialControl (Window* pParent, WinBits nBits) +SidebarDialControl::SidebarDialControl (vcl::Window* pParent, WinBits nBits) : svx::DialControl(pParent, nBits) { Init(GetOutputSizePixel()); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarDialControl(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSidebarDialControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new SidebarDialControl(pParent, WB_TABSTOP); } diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index d81a63ef36f2..0d45f75f027d 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -30,7 +30,7 @@ namespace svx { namespace sidebar { TextCharacterSpacingControl::TextCharacterSpacingControl ( - Window* pParent, + vcl::Window* pParent, svx::sidebar::TextPropertyPanel& rPanel, SfxBindings* pBindings) : PopupControl( pParent,SVX_RES(RID_POPUPPANEL_TEXTPAGE_SPACING)) diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index 957a58a79668..b96dd8945d1a 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -41,7 +41,7 @@ class TextCharacterSpacingControl:public svx::sidebar::PopupControl { public: TextCharacterSpacingControl ( - Window* pParent, + vcl::Window* pParent, svx::sidebar::TextPropertyPanel& rPanel, SfxBindings* pBindings); virtual ~TextCharacterSpacingControl(); diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index c50cdeed1191..7a4fe17f94db 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -24,7 +24,7 @@ namespace svx { namespace sidebar { TextCharacterSpacingPopup::TextCharacterSpacingPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx index 8f53a065da85..17ad29cfd09f 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx @@ -30,7 +30,7 @@ class TextCharacterSpacingPopup { public : TextCharacterSpacingPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~TextCharacterSpacingPopup (void); diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 68d65c0a53ca..318c64d8743b 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -63,7 +63,7 @@ long TextPropertyPanel::GetSelFontSize() } TextPropertyPanel* TextPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& rContext) @@ -83,7 +83,7 @@ TextPropertyPanel* TextPropertyPanel::Create ( } -TextPropertyPanel::TextPropertyPanel ( Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& /*rContext*/ ) +TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& /*rContext*/ ) : PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui", rxFrame), maFontSizeControl (SID_ATTR_CHAR_FONTHEIGHT, *pBindings, *this, OUString("FontHeight"), rxFrame), maUnderlineControl (SID_ATTR_CHAR_UNDERLINE, *pBindings, *this, OUString("Underline"), rxFrame), diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index 414789dcb0de..9385dcc17d61 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -47,7 +47,7 @@ class TextPropertyPanel { public: static TextPropertyPanel* Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& rContext); @@ -98,7 +98,7 @@ private: SfxBindings* mpBindings; TextPropertyPanel ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& rContext); diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index 240b3513637e..0d393e968735 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -29,7 +29,7 @@ namespace svx { namespace sidebar { TextUnderlineControl::TextUnderlineControl ( - Window* pParent, + vcl::Window* pParent, svx::sidebar::TextPropertyPanel& rPanel, SfxBindings* pBindings) : svx::sidebar::PopupControl( pParent,SVX_RES(RID_POPUPPANEL_TEXTPAGE_UNDERLINE)) diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index 4ff4366e3140..5e32256c3364 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -33,7 +33,7 @@ class TextUnderlineControl:public svx::sidebar::PopupControl { public: TextUnderlineControl ( - Window* pParent, + vcl::Window* pParent, svx::sidebar::TextPropertyPanel& rPanel, SfxBindings* pBindings); void Rearrange(FontUnderline eLine); diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index 1a58d951e80c..b71e33b4303c 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -23,7 +23,7 @@ namespace svx { namespace sidebar { TextUnderlinePopup::TextUnderlinePopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/text/TextUnderlinePopup.hxx b/svx/source/sidebar/text/TextUnderlinePopup.hxx index 54a827975160..ce4caa0b28f9 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.hxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.hxx @@ -30,7 +30,7 @@ class TextUnderlinePopup { public : TextUnderlinePopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~TextUnderlinePopup (void); diff --git a/svx/source/sidebar/tools/ColorControl.cxx b/svx/source/sidebar/tools/ColorControl.cxx index bece0cf8ab5c..affabdac5387 100644 --- a/svx/source/sidebar/tools/ColorControl.cxx +++ b/svx/source/sidebar/tools/ColorControl.cxx @@ -82,7 +82,7 @@ namespace { ColorControl::ColorControl ( - Window* pParent, + vcl::Window* pParent, SfxBindings* /* pBindings */, const ResId& rControlResId, const ResId& rValueSetResId, diff --git a/svx/source/sidebar/tools/ColorPopup.cxx b/svx/source/sidebar/tools/ColorPopup.cxx index c8dc10438ad3..cd778304a508 100644 --- a/svx/source/sidebar/tools/ColorPopup.cxx +++ b/svx/source/sidebar/tools/ColorPopup.cxx @@ -23,7 +23,7 @@ namespace svx { namespace sidebar { ColorPopup::ColorPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator) : Popup( pParent, diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx index 544c611dd53b..49b421fb473d 100644 --- a/svx/source/sidebar/tools/Popup.cxx +++ b/svx/source/sidebar/tools/Popup.cxx @@ -26,7 +26,7 @@ namespace svx { namespace sidebar { Popup::Popup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator, const ::rtl::OUString& rsAccessibleName) : mpControl(), diff --git a/svx/source/sidebar/tools/PopupContainer.cxx b/svx/source/sidebar/tools/PopupContainer.cxx index 0bd666192fb4..dc29c558f986 100644 --- a/svx/source/sidebar/tools/PopupContainer.cxx +++ b/svx/source/sidebar/tools/PopupContainer.cxx @@ -22,7 +22,7 @@ namespace svx { namespace sidebar { -PopupContainer::PopupContainer (Window* pParent) +PopupContainer::PopupContainer (vcl::Window* pParent) : FloatingWindow(pParent, WB_SYSTEMWINDOW | WB_3DLOOK) // | WB_POPUP_FOCUSWIN) { } diff --git a/svx/source/sidebar/tools/PopupControl.cxx b/svx/source/sidebar/tools/PopupControl.cxx index d20afbe91aaa..d8c686546e29 100644 --- a/svx/source/sidebar/tools/PopupControl.cxx +++ b/svx/source/sidebar/tools/PopupControl.cxx @@ -25,7 +25,7 @@ using ::sfx2::sidebar::Theme; namespace svx { namespace sidebar { PopupControl::PopupControl ( - Window* pParent, + vcl::Window* pParent, const ResId& rResId) : Control( pParent,rResId) { diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index 793fc4fd0ba1..7712e625c55f 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -70,7 +70,7 @@ static vcl::Font& lcl_GetDefaultBulletFont() ValueSetWithTextControl::ValueSetWithTextControl( const tControlType eControlType, - Window* pParent, + vcl::Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ) , meControlType( eControlType ) @@ -270,7 +270,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt ) pDev->Pop(); } -SvxNumValueSet2::SvxNumValueSet2( Window* pParent, const ResId& rResId) : +SvxNumValueSet2::SvxNumValueSet2( vcl::Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ), aLineColor ( COL_LIGHTGRAY ), pVDev ( NULL ) @@ -424,7 +424,7 @@ void SvxNumValueSet2::UserDraw( const UserDrawEvent& rUDEvt ) -SvxNumValueSet3::SvxNumValueSet3( Window* pParent, const ResId& rResId) : +SvxNumValueSet3::SvxNumValueSet3( vcl::Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ) { SetColCount( 3 ); diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 0fd7532b745d..01d5f5cb9b0e 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star; const SdrPaintWindow& rPaintWindow( GetOriginalPaintWindow() ? *GetOriginalPaintWindow() : GetPaintWindow() ); if ( rPaintWindow.OutputToWindow() && !rView.IsPrintPreview() ) { - Window& rWindow = dynamic_cast< Window& >( rPaintWindow.GetOutputDevice() ); + vcl::Window& rWindow = dynamic_cast< vcl::Window& >( rPaintWindow.GetOutputDevice() ); const_cast< SdrPageWindow* >( this )->mxControlContainer = VCLUnoHelper::CreateControlContainer( &rWindow ); // #100394# xC->setVisible triggers window->Show() and this has @@ -375,7 +375,7 @@ void SdrPageWindow::InvalidatePageWindow(const basegfx::B2DRange& rRange) if(GetPageView().IsVisible() && GetPaintWindow().OutputToWindow()) { const SvtOptionsDrawinglayer aDrawinglayerOpt; - Window& rWindow(static_cast< Window& >(GetPaintWindow().GetOutputDevice())); + vcl::Window& rWindow(static_cast< vcl::Window& >(GetPaintWindow().GetOutputDevice())); basegfx::B2DRange aDiscreteRange(rRange); aDiscreteRange.transform(rWindow.GetViewTransformation()); diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 98d700d463dd..4b6b47d01e25 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -32,11 +32,11 @@ //sibling after that is going to fail hard class CandidateMgr { - std::vector<Window*> m_aCandidates; - std::set<Window*> m_aDeletedCandidates; + std::vector<vcl::Window*> m_aCandidates; + std::set<vcl::Window*> m_aDeletedCandidates; DECL_LINK(WindowEventListener, VclSimpleEvent*); public: - void PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect); + void PaintTransparentChildren(vcl::Window & rWindow, Rectangle const& rPixelRect); ~CandidateMgr(); }; @@ -45,7 +45,7 @@ IMPL_LINK(CandidateMgr, WindowEventListener, VclSimpleEvent*, pEvent) VclWindowEvent* pWinEvent = dynamic_cast< VclWindowEvent* >( pEvent ); if (pWinEvent) { - Window* pWindow = pWinEvent->GetWindow(); + vcl::Window* pWindow = pWinEvent->GetWindow(); if (pWinEvent->GetId() == VCLEVENT_OBJECT_DYING) { m_aDeletedCandidates.insert(pWindow); @@ -57,17 +57,17 @@ IMPL_LINK(CandidateMgr, WindowEventListener, VclSimpleEvent*, pEvent) CandidateMgr::~CandidateMgr() { - for (std::vector<Window*>::iterator aI = m_aCandidates.begin(); + for (std::vector<vcl::Window*>::iterator aI = m_aCandidates.begin(); aI != m_aCandidates.end(); ++aI) { - Window* pCandidate = *aI; + vcl::Window* pCandidate = *aI; if (m_aDeletedCandidates.find(pCandidate) != m_aDeletedCandidates.end()) continue; pCandidate->RemoveEventListener(LINK(this, CandidateMgr, WindowEventListener)); } } -void PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect) +void PaintTransparentChildren(vcl::Window & rWindow, Rectangle const& rPixelRect) { if (!rWindow.IsChildTransparentModeEnabled()) return; @@ -76,9 +76,9 @@ void PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect) aManager.PaintTransparentChildren(rWindow, rPixelRect); } -void CandidateMgr::PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect) +void CandidateMgr::PaintTransparentChildren(vcl::Window & rWindow, Rectangle const& rPixelRect) { - Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD ); + vcl::Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD ); while (pCandidate) { if (pCandidate->IsPaintTransparent()) @@ -96,7 +96,7 @@ void CandidateMgr::PaintTransparentChildren(Window & rWindow, Rectangle const& r pCandidate = pCandidate->GetWindow( WINDOW_NEXT ); } - for (std::vector<Window*>::iterator aI = m_aCandidates.begin(); + for (std::vector<vcl::Window*>::iterator aI = m_aCandidates.begin(); aI != m_aCandidates.end(); ++aI) { pCandidate = *aI; @@ -247,7 +247,7 @@ void SdrPaintWindow::impCreateOverlayManager() // Request a repaint so that the buffered overlay manager fills // its buffer properly. This is a workaround for missing buffer // updates. - Window* pWindow = dynamic_cast<Window*>(&GetOutputDevice()); + vcl::Window* pWindow = dynamic_cast<vcl::Window*>(&GetOutputDevice()); if (pWindow != NULL) pWindow->Invalidate(); diff --git a/svx/source/svdraw/selectioncontroller.cxx b/svx/source/svdraw/selectioncontroller.cxx index a1b7896cacc3..a64f80cba7ea 100644 --- a/svx/source/svdraw/selectioncontroller.cxx +++ b/svx/source/svdraw/selectioncontroller.cxx @@ -23,22 +23,22 @@ namespace sdr { -bool SelectionController::onKeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/) +bool SelectionController::onKeyInput(const KeyEvent& /*rKEvt*/, vcl::Window* /*pWin*/) { return false; } -bool SelectionController::onMouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) +bool SelectionController::onMouseButtonDown(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; } -bool SelectionController::onMouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) +bool SelectionController::onMouseButtonUp(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; } -bool SelectionController::onMouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) +bool SelectionController::onMouseMove(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; } diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index a84c3ff67564..3102b6bc6018 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -319,7 +319,7 @@ void SdrCreateView::HideConnectMarker() ImpClearConnectMarker(); } -bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) { if(CheckEdgeMode() && pWin) { @@ -701,7 +701,7 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) SdrTextObj* pText=PTR_CAST(SdrTextObj,pObjMerk); if (pText!=NULL && pText->IsTextFrame()) { - SdrBeginTextEdit(pText, pPVMerk, (Window*)0L, true, (SdrOutliner*)0L, (OutlinerView*)0L); + SdrBeginTextEdit(pText, pPVMerk, (vcl::Window*)0L, true, (SdrOutliner*)0L, (OutlinerView*)0L); } } } diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index ebef27daece7..5b7cd4e30a8d 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -259,7 +259,7 @@ void SdrObjEditView::ModelHasChanged() { OutlinerView* pOLV=pTextEditOutliner->GetView(nOV); { // invalidate old OutlinerView area - Window* pWin=pOLV->GetWindow(); + vcl::Window* pWin=pOLV->GetWindow(); Rectangle aTmpRect(aOldArea); sal_uInt16 nPixSiz=pOLV->GetInvalidateMore()+1; Size aMore(pWin->PixelToLogic(Size(nPixSiz,nPixSiz))); @@ -375,7 +375,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const { - Window* pWin = rOutlView.GetWindow(); + vcl::Window* pWin = rOutlView.GetWindow(); if(pWin) { @@ -422,7 +422,7 @@ void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const } } -OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, bool /*bNoPaint*/, OutlinerView* pGivenView) const +OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoPaint*/, OutlinerView* pGivenView) const { // background Color aBackground(GetTextEditBackgroundColor(*this)); @@ -519,7 +519,7 @@ SdrUndoManager* SdrObjEditView::getSdrUndoManagerForEnhancedTextEdit() const } bool SdrObjEditView::SdrBeginTextEdit( - SdrObject* pObj, SdrPageView* pPV, Window* pWin, + SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin, bool bIsNewObj, SdrOutliner* pGivenOutliner, OutlinerView* pGivenOutlinerView, bool bDontDeleteOutliner, bool bOnlyOneView, @@ -557,7 +557,7 @@ bool SdrObjEditView::SdrBeginTextEdit( if(OUTDEV_WINDOW == pPaintWindow->GetOutputDevice().GetOutDevType()) { - pWin = (Window*)(&pPaintWindow->GetOutputDevice()); + pWin = (vcl::Window*)(&pPaintWindow->GetOutputDevice()); } } @@ -703,7 +703,7 @@ bool SdrObjEditView::SdrBeginTextEdit( if(&rOutDev != pWin && OUTDEV_WINDOW == rOutDev.GetOutDevType()) { - OutlinerView* pOutlView = ImpMakeOutlinerView((Window*)(&rOutDev), !bEmpty, 0L); + OutlinerView* pOutlView = ImpMakeOutlinerView((vcl::Window*)(&rOutDev), !bEmpty, 0L); pTextEditOutliner->InsertView(pOutlView, (sal_uInt16)i); } } @@ -806,7 +806,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) { SdrEndTextEditKind eRet=SDRENDTEXTEDIT_UNCHANGED; SdrTextObj* pTEObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() ); - Window* pTEWin =pTextEditWin; + vcl::Window* pTEWin =pTextEditWin; SdrOutliner* pTEOutliner =pTextEditOutliner; OutlinerView* pTEOutlinerView=pTextEditOutlinerView; vcl::Cursor* pTECursorMerker=pTextEditCursorMerker; @@ -993,7 +993,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) i--; OutlinerView* pOLV=pTEOutliner->GetView(i); sal_uInt16 nMorePix=pOLV->GetInvalidateMore() + 10; - Window* pWin=pOLV->GetWindow(); + vcl::Window* pWin=pOLV->GetWindow(); Rectangle aRect(pOLV->GetOutputArea()); pTEOutliner->RemoveView(i); if (!bTextEditDontDelete || i!=0) @@ -1080,7 +1080,7 @@ SdrPageView* SdrObjEditView::GetTextEditPageView() const -OutlinerView* SdrObjEditView::ImpFindOutlinerView(Window* pWin) const +OutlinerView* SdrObjEditView::ImpFindOutlinerView(vcl::Window* pWin) const { if (pWin==NULL) return NULL; if (pTextEditOutliner==NULL) return NULL; @@ -1093,7 +1093,7 @@ OutlinerView* SdrObjEditView::ImpFindOutlinerView(Window* pWin) const return pNewView; } -void SdrObjEditView::SetTextEditWin(Window* pWin) +void SdrObjEditView::SetTextEditWin(vcl::Window* pWin) { if(mxTextEditObj.is() && pWin!=NULL && pWin!=pTextEditWin) { @@ -1157,7 +1157,7 @@ bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const OutlinerView* pOLV=pTextEditOutliner->GetView(0); if( pOLV ) { - Window* pWin=pOLV->GetWindow(); + vcl::Window* pWin=pOLV->GetWindow(); if (pText!=NULL && pText->IsTextFrame() && pOLV!=NULL && pWin!=NULL) { sal_uInt16 nPixSiz=pOLV->GetInvalidateMore(); Rectangle aEditArea(aMinTextEditArea); @@ -1178,7 +1178,7 @@ bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const -bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) +bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) { if(pTextEditOutlinerView) { @@ -1201,7 +1201,7 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) return SdrGlueEditView::KeyInput(rKEvt,pWin); } -bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) +bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) { if (pTextEditOutlinerView!=NULL) { bool bPostIt=pTextEditOutliner->IsInSelectionMode(); @@ -1236,7 +1236,7 @@ bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) return SdrGlueEditView::MouseButtonDown(rMEvt,pWin); } -bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) +bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) { if (pTextEditOutlinerView!=NULL) { bool bPostIt=pTextEditOutliner->IsInSelectionMode(); @@ -1267,7 +1267,7 @@ bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) return SdrGlueEditView::MouseButtonUp(rMEvt,pWin); } -bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) { if (pTextEditOutlinerView!=NULL) { bool bSelMode=pTextEditOutliner->IsInSelectionMode(); @@ -1305,7 +1305,7 @@ bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin) return SdrGlueEditView::MouseMove(rMEvt,pWin); } -bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin) +bool SdrObjEditView::Command(const CommandEvent& rCEvt, vcl::Window* pWin) { // as long as OutlinerView returns a sal_Bool, it only gets COMMAND_STARTDRAG if (pTextEditOutlinerView!=NULL) @@ -1667,7 +1667,7 @@ void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin) if(mxTextEditObj.is() && !bTextEditOnlyOneView && pNewWin->GetOutDevType()==OUTDEV_WINDOW) { - OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,false,NULL); + OutlinerView* pOutlView=ImpMakeOutlinerView((vcl::Window*)pNewWin,false,NULL); pTextEditOutliner->InsertView(pOutlView); } } @@ -1681,7 +1681,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin) for (sal_uIntPtr i=pTextEditOutliner->GetViewCount(); i>0;) { i--; OutlinerView* pOLV=pTextEditOutliner->GetView(i); - if (pOLV && pOLV->GetWindow()==(Window*)pOldWin) { + if (pOLV && pOLV->GetWindow()==(vcl::Window*)pOldWin) { delete pTextEditOutliner->RemoveView(i); } } @@ -1697,7 +1697,7 @@ bool SdrObjEditView::IsTextEditInSelectionMode() const // MacroMode -bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin) +bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin) { BrkMacroObj(); if (pObj!=NULL && pPV!=NULL && pWin!=NULL && pObj->HasMacro()) { diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 41b37ae0e885..44734489febe 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -235,7 +235,7 @@ void SdrGluePoint::Shear(const Point& rRef, long /*nWink*/, double tn, bool bVSh if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt); } -void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const +void SdrGluePoint::Invalidate(vcl::Window& rWin, const SdrObject* pObj) const { bool bMapMerk=rWin.IsMapModeEnabled(); Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); @@ -315,7 +315,7 @@ sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP) return nInsPos; } -void SdrGluePointList::Invalidate(Window& rWin, const SdrObject* pObj) const +void SdrGluePointList::Invalidate(vcl::Window& rWin, const SdrObject* pObj) const { sal_uInt16 nAnz=GetCount(); for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index bb0041645e9c..390bb851adcc 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -165,7 +165,7 @@ class ImpItemEdit: public Edit _SdrItemBrowserControl* pBrowse; public: - ImpItemEdit(Window* pParent, _SdrItemBrowserControl* pBrowse_, WinBits nBits=0) + ImpItemEdit(vcl::Window* pParent, _SdrItemBrowserControl* pBrowse_, WinBits nBits=0) : Edit(pParent, nBits), pBrowse(pBrowse_) {} @@ -208,7 +208,7 @@ void ImpItemEdit::KeyInput(const KeyEvent& rKEvt) #define MYBROWSEMODE (BROWSER_THUMBDRAGGING|BROWSER_KEEPHIGHLIGHT|BROWSER_NO_HSCROLL|BROWSER_HIDECURSOR) -_SdrItemBrowserControl::_SdrItemBrowserControl(Window* pParent, WinBits nBits): +_SdrItemBrowserControl::_SdrItemBrowserControl(vcl::Window* pParent, WinBits nBits): BrowseBox(pParent,nBits,MYBROWSEMODE), aList() { @@ -506,7 +506,7 @@ bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) pEditControl->Show(); pEditControl->GrabFocus(); pEditControl->SetSelection(Selection(SELECTION_MIN,SELECTION_MAX)); - Window* pParent=GetParent(); + vcl::Window* pParent=GetParent(); aWNamMerk=pParent->GetText(); OUString aNeuNam(aWNamMerk); aNeuNam += " "; @@ -534,7 +534,7 @@ bool _SdrItemBrowserControl::EndChangeEntry() pEditControl=NULL; delete pAktChangeEntry; pAktChangeEntry=NULL; - Window* pParent=GetParent(); + vcl::Window* pParent=GetParent(); pParent->SetText(aWNamMerk); SetMode(MYBROWSEMODE); bRet = true; @@ -549,7 +549,7 @@ void _SdrItemBrowserControl::BrkChangeEntry() pEditControl=NULL; delete pAktChangeEntry; pAktChangeEntry=NULL; - Window* pParent=GetParent(); + vcl::Window* pParent=GetParent(); pParent->SetText(aWNamMerk); SetMode(MYBROWSEMODE); } @@ -1044,7 +1044,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem // - _SdrItemBrowserWindow - -_SdrItemBrowserWindow::_SdrItemBrowserWindow(Window* pParent, WinBits nBits): +_SdrItemBrowserWindow::_SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits): FloatingWindow(pParent,nBits), aBrowse(this) { @@ -1080,7 +1080,7 @@ SdrItemBrowser::SdrItemBrowser(SdrView& rView): SetDirty(); } -Window* SdrItemBrowser::ImpGetViewWin(SdrView& rView) +vcl::Window* SdrItemBrowser::ImpGetViewWin(SdrView& rView) { const sal_uInt32 nWinCount(rView.PaintWindowCount()); @@ -1090,7 +1090,7 @@ Window* SdrItemBrowser::ImpGetViewWin(SdrView& rView) if(OUTDEV_WINDOW == pCandidate->GetOutputDevice().GetOutDevType()) { - return (Window*)(&pCandidate->GetOutputDevice()); + return (vcl::Window*)(&pCandidate->GetOutputDevice()); } } @@ -1099,7 +1099,7 @@ Window* SdrItemBrowser::ImpGetViewWin(SdrView& rView) void SdrItemBrowser::ForceParent() { - Window* pWin=ImpGetViewWin(*pView); + vcl::Window* pWin=ImpGetViewWin(*pView); if (pWin!=NULL) SetParent(pWin); } diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 890a418f6817..3a41d0b7fd5b 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1035,7 +1035,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) } /** handle mouse over effects for handles */ -bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) { if(aHdl.GetHdlCount()) { diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index edee086f559b..3c5f21ede3c0 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -555,7 +555,7 @@ uno::Reference< awt::XControl > SdrUnoObj::GetUnoControl(const SdrView& _rView, uno::Reference< awt::XControl > SdrUnoObj::GetTemporaryControlForWindow( - const Window& _rWindow, uno::Reference< awt::XControlContainer >& _inout_ControlContainer ) const + const vcl::Window& _rWindow, uno::Reference< awt::XControlContainer >& _inout_ControlContainer ) const { uno::Reference< awt::XControl > xControl; diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index c4cc0849544f..c03339346cef 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -733,7 +733,7 @@ void SdrPageView::ImpInvalidateHelpLineArea(sal_uInt16 nNum) const aR.Right() += aSiz.Width(); aR.Top() -= aSiz.Height(); aR.Bottom() += aSiz.Height(); - ((SdrView&)GetView()).InvalidateOneWin((Window&)rOutDev, aR); + ((SdrView&)GetView()).InvalidateOneWin((vcl::Window&)rOutDev, aR); } } } diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 8c2070d120f1..edd234dd7a6f 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -597,7 +597,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::c if(pOut && OUTDEV_WINDOW == pOut->GetOutDevType()) { - Window* pWindow = (Window*)pOut; + vcl::Window* pWindow = (vcl::Window*)pOut; if(pWindow->IsInPaint()) { @@ -836,7 +836,7 @@ Region SdrPaintView::OptimizeDrawLayersRegion(OutputDevice* pOut, const Region& // would be set. if(pOut && OUTDEV_WINDOW == pOut->GetOutDevType() && !bDisableIntersect) { - Window* pWindow = (Window*)pOut; + vcl::Window* pWindow = (vcl::Window*)pOut; if(pWindow->IsInPaint()) { @@ -874,7 +874,7 @@ void SdrPaintView::ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const -bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/) +bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, vcl::Window* /*pWin*/) { return false; } @@ -899,7 +899,7 @@ void SdrPaintView::GlueInvalidate() const const SdrObject* pObj=pOL->GetObj(nObjNum); const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=NULL && pGPL->GetCount()!=0) { - pGPL->Invalidate((Window&)rOutDev, pObj); + pGPL->Invalidate((vcl::Window&)rOutDev, pObj); } } } @@ -917,7 +917,7 @@ void SdrPaintView::InvalidateAllWin() if(pPaintWindow->OutputToWindow()) { - InvalidateOneWin((Window&)pPaintWindow->GetOutputDevice()); + InvalidateOneWin((vcl::Window&)pPaintWindow->GetOutputDevice()); } } } @@ -951,19 +951,19 @@ void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, bool bPlus1Pix) if (aRect.IsOver(aOutRect)) { - InvalidateOneWin((Window&)rOutDev, aRect); + InvalidateOneWin((vcl::Window&)rOutDev, aRect); } } } } -void SdrPaintView::InvalidateOneWin(Window& rWin) +void SdrPaintView::InvalidateOneWin(vcl::Window& rWin) { // do not erase background, that causes flicker (!) rWin.Invalidate(INVALIDATE_NOERASE); } -void SdrPaintView::InvalidateOneWin(Window& rWin, const Rectangle& rRect) +void SdrPaintView::InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect) { // do not erase background, that causes flicker (!) rWin.Invalidate(rRect, INVALIDATE_NOERASE); @@ -1134,7 +1134,7 @@ void SdrPaintView::ShowItemBrowser(bool bShow) } #endif -void SdrPaintView::MakeVisible(const Rectangle& rRect, Window& rWin) +void SdrPaintView::MakeVisible(const Rectangle& rRect, vcl::Window& rWin) { MapMode aMap(rWin.GetMapMode()); Size aActualSize(rWin.GetOutputSize()); diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index b981adfc882d..981659fb2bc4 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -175,7 +175,7 @@ SdrView::~SdrView() maAccessibilityOptions.RemoveListener(this); } -bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) +bool SdrView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) { SetActualWin(pWin); bool bRet = SdrCreateView::KeyInput(rKEvt,pWin); @@ -218,7 +218,7 @@ bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) return bRet; } -bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) +bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) { SetActualWin(pWin); if (rMEvt.IsLeft()) aDragStat.SetMouseDown(true); @@ -231,7 +231,7 @@ bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) return bRet; } -bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) +bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) { SetActualWin(pWin); if (rMEvt.IsLeft()) aDragStat.SetMouseDown(false); @@ -245,7 +245,7 @@ bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) return bRet; } -bool SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +bool SdrView::MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) { SetActualWin(pWin); aDragStat.SetMouseDown(rMEvt.IsLeft()); @@ -259,7 +259,7 @@ bool SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin) return bRet; } -bool SdrView::Command(const CommandEvent& rCEvt, Window* pWin) +bool SdrView::Command(const CommandEvent& rCEvt, vcl::Window* pWin) { SetActualWin(pWin); bool bRet = SdrCreateView::Command(rCEvt,pWin); @@ -488,7 +488,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co // we currently don't account for ticker text if(pActualOutDev && pActualOutDev->GetOutDevType() == OUTDEV_WINDOW) { - OutlinerView aOLV(pOutliner, (Window*)pActualOutDev); + OutlinerView aOLV(pOutliner, (vcl::Window*)pActualOutDev); const EditView& aEV=aOLV.GetEditView(); const SvxFieldItem* pItem=aEV.GetField(aTemporaryTextRelativePosition); if (pItem!=NULL) { @@ -822,7 +822,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) if (eHit==SDRHIT_TEXTEDIT) { bool bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() && - SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, false, (SdrOutliner*)0L)); + SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (vcl::Window*)pActualOutDev, false, (SdrOutliner*)0L)); if(bRet2) { @@ -905,7 +905,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) bRet=BegCreateCaptionObj(aLogicPos,Size(5*nHgt,2*nHgt)); } else bRet=BegCreateObj(aLogicPos); } break; - case SDREVENT_BEGMACROOBJ: bRet=BegMacroObj(aLogicPos,nHitTolLog,rVEvt.pObj,rVEvt.pPV,(Window*)pActualOutDev); break; + case SDREVENT_BEGMACROOBJ: bRet=BegMacroObj(aLogicPos,nHitTolLog,rVEvt.pObj,rVEvt.pPV,(vcl::Window*)pActualOutDev); break; case SDREVENT_BEGTEXTEDIT: { if (!IsObjMarked(rVEvt.pObj)) { UnmarkAllObj(); @@ -913,7 +913,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } bRet = pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType()&& - SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, false, (SdrOutliner*)0L); + SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (vcl::Window*)pActualOutDev, false, (SdrOutliner*)0L); if(bRet) { @@ -926,7 +926,7 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) default: break; } // switch if (bRet && pActualOutDev!=NULL && pActualOutDev->GetOutDevType()==OUTDEV_WINDOW) { - Window* pWin=(Window*)pActualOutDev; + vcl::Window* pWin=(vcl::Window*)pActualOutDev; // left mouse button pressed? bool bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown; // left mouse button released? diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 535f4fc3259c..fc4e732e4851 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -797,7 +797,7 @@ bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) -bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/) +bool SdrExchangeView::Paste(vcl::Window* /*pWin*/, sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Paste: Not supported any more." ); return false; diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 166f2c3efab8..b223f23ef7f0 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -65,7 +65,7 @@ AccessibleCell::~AccessibleCell (void) void AccessibleCell::Init (void) { SdrView* pView = maShapeTreeInfo.GetSdrView(); - const Window* pWindow = maShapeTreeInfo.GetWindow (); + const vcl::Window* pWindow = maShapeTreeInfo.GetWindow (); if( (pView != NULL) && (pWindow != NULL) && mxCell.is()) { OutlinerParaObject* pOutlinerParaObject = mxCell->GetEditOutlinerParaObject(); // Get the OutlinerParaObject if text edit is active diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index f51cd66db7d8..4d6b368045a7 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -206,7 +206,7 @@ const sal_uInt16 ACTION_START_SELECTION = 14; const sal_uInt16 ACTION_HANDLED_BY_VIEW = 15; const sal_uInt16 ACTION_TAB = 18; -bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, Window* pWindow ) +bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWindow ) { if( !checkTableObject() ) return false; @@ -245,7 +245,7 @@ bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, Window* pWindow ) // ::com::sun::star::awt::XMouseClickHandler: -bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, Window* pWindow ) +bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWindow ) { if( !pWindow || !checkTableObject() ) return false; @@ -298,7 +298,7 @@ bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin -bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, Window* /*pWin*/) +bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* /*pWin*/) { if( !checkTableObject() ) return false; @@ -313,7 +313,7 @@ bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, Window* /*pWin -bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, Window* pWindow ) +bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWindow ) { if( !checkTableObject() ) return false; @@ -1372,7 +1372,7 @@ bool SvxTableController::checkTableObject() -sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, Window* /*pWindow*/ ) +sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, vcl::Window* /*pWindow*/ ) { const bool bMod1 = rKEvt.GetKeyCode().IsMod1(); // ctrl const bool bMod2 = rKEvt.GetKeyCode().IsMod2(); // Alt @@ -1559,7 +1559,7 @@ sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, Window* return nAction; } -bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, Window* pWindow ) +bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::Window* pWindow ) { ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); if( !pTableObj ) @@ -1671,7 +1671,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, Window -void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, Window* pWindow, sal_uInt16 nAction ) +void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, vcl::Window* pWindow, sal_uInt16 nAction ) { if( mxTableObj.is() && static_cast<SdrTableObj*>(mxTableObj.get())->IsTextEditActive() ) mpView->SdrEndTextEdit(true); @@ -1789,7 +1789,7 @@ void SvxTableController::findMergeOrigin( CellPos& rPos ) -void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const awt::MouseEvent* pMouseEvent /*= 0*/, sal_uInt16 nAction /*= ACTION_NONE */ ) +void SvxTableController::EditCell( const CellPos& rPos, vcl::Window* pWindow, const awt::MouseEvent* pMouseEvent /*= 0*/, sal_uInt16 nAction /*= ACTION_NONE */ ) { SdrPageView* pPV = mpView->GetSdrPageView(); diff --git a/svx/source/tbxctrls/SvxColorChildWindow.cxx b/svx/source/tbxctrls/SvxColorChildWindow.cxx index a896c0df448e..c390fb0d0ee4 100644 --- a/svx/source/tbxctrls/SvxColorChildWindow.cxx +++ b/svx/source/tbxctrls/SvxColorChildWindow.cxx @@ -27,7 +27,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID( SvxColorChildWindow, SID_COLOR_CONTROL ) // Ableitung vom SfxChildWindow als "Behaelter" fuer Animator -SvxColorChildWindow::SvxColorChildWindow( Window* _pParent, +SvxColorChildWindow::SvxColorChildWindow( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx index 2faeb6fde7cf..cd98b5afdae1 100644 --- a/svx/source/tbxctrls/SvxColorValueSet.cxx +++ b/svx/source/tbxctrls/SvxColorValueSet.cxx @@ -23,13 +23,13 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -SvxColorValueSet::SvxColorValueSet(Window* _pParent, WinBits nWinStyle) +SvxColorValueSet::SvxColorValueSet(vcl::Window* _pParent, WinBits nWinStyle) : ValueSet(_pParent, nWinStyle) { SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxColorValueSet(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxColorValueSet(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -40,7 +40,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxColorValueSet(Window *pP return new SvxColorValueSet(pParent, nWinBits); } -SvxColorValueSet::SvxColorValueSet(Window* _pParent, const ResId& rResId) +SvxColorValueSet::SvxColorValueSet(vcl::Window* _pParent, const ResId& rResId) : ValueSet(_pParent, rResId) { SetEdgeBlending(true); @@ -136,7 +136,7 @@ Size SvxColorValueSet::layoutAllVisible(sal_uInt32 nEntryCount) void SvxColorValueSet::Resize() { - Window *pParent = GetParent(); + vcl::Window *pParent = GetParent(); //don't do this for the drop down color palettes if (pParent && pParent->GetType() != WINDOW_FLOATINGWINDOW) layoutToGivenHeight(GetOutputSizePixel().Height(), GetItemCount()); diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index 2d25c7e06da4..0dc41ee09292 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -65,7 +65,7 @@ public: sal_uInt16 nSlotId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rWndTitle, - Window* pParentWindow); + vcl::Window* pParentWindow); virtual ~SvxColorWindow_Impl(); void StartSelection(); diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index e5ff211eef23..9ceb3d8fb738 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -89,7 +89,7 @@ bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*, sal_ return( rxOStm->GetError() == ERRCODE_NONE ); } -SvxColorValueSet_docking::SvxColorValueSet_docking( Window* _pParent, const ResId& rResId ) : +SvxColorValueSet_docking::SvxColorValueSet_docking( vcl::Window* _pParent, const ResId& rResId ) : SvxColorValueSet( _pParent, rResId ), DragSourceHelper( this ), mbLeftButton(true) @@ -182,7 +182,7 @@ SvxColorDockingWindow::SvxColorDockingWindow ( SfxBindings* _pBindings, SfxChildWindow* pCW, - Window* _pParent, + vcl::Window* _pParent, const ResId& rResId ) : diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 8a03c6b64ae6..ce53af14846d 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -63,7 +63,7 @@ static const sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow + vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DIRECTION )) , mrController( rController ) , @@ -238,7 +238,7 @@ ExtrusionDirectionControl::ExtrusionDirectionControl( -::Window* ExtrusionDirectionControl::createPopupWindow( ::Window* pParent ) +vcl::Window* ExtrusionDirectionControl::createPopupWindow( vcl::Window* pParent ) { return new ExtrusionDirectionWindow( *this, m_xFrame, pParent ); } @@ -284,7 +284,7 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl::getSupportedServiceName return ExtrusionDirectionControl_getSupportedServiceNames(); } -ExtrusionDepthDialog::ExtrusionDepthDialog( Window* pParent, double fDepth, FieldUnit eDefaultUnit ) +ExtrusionDepthDialog::ExtrusionDepthDialog( vcl::Window* pParent, double fDepth, FieldUnit eDefaultUnit ) : ModalDialog( pParent, "ExtrustionDepthDialog", "svx/ui/extrustiondepthdialog.ui" ) { get(m_pMtrDepth, "depth"); @@ -303,7 +303,7 @@ double aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 }; ExtrusionDepthWindow::ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow + vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_DEPTH )) , mrController( rController ) , maImgDepth0( SVX_RES( IMG_DEPTH_0 ) ) @@ -488,7 +488,7 @@ ExtrusionDepthController::ExtrusionDepthController( -::Window* ExtrusionDepthController::createPopupWindow( ::Window* pParent ) +vcl::Window* ExtrusionDepthController::createPopupWindow( vcl::Window* pParent ) { return new ExtrusionDepthWindow( *this, m_xFrame, pParent ); } @@ -533,7 +533,7 @@ Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames return ExtrusionDepthController_getSupportedServiceNames(); } -ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ) +ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_LIGHTING )) , mrController( rController ) , maImgBright( SVX_RES( IMG_LIGHTING_BRIGHT ) ) @@ -745,7 +745,7 @@ ExtrusionLightingControl::ExtrusionLightingControl( -::Window* ExtrusionLightingControl::createPopupWindow( ::Window* pParent ) +vcl::Window* ExtrusionLightingControl::createPopupWindow( vcl::Window* pParent ) { return new ExtrusionLightingWindow( *this, m_xFrame, pParent ); } @@ -794,7 +794,7 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow + vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_SURFACE ) ) , mrController( rController ) , maImgSurface1( SVX_RES( IMG_WIRE_FRAME ) ) @@ -888,7 +888,7 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl( -::Window* ExtrusionSurfaceControl::createPopupWindow( ::Window* pParent ) +vcl::Window* ExtrusionSurfaceControl::createPopupWindow( vcl::Window* pParent ) { return new ExtrusionSurfaceWindow( *this, m_xFrame, pParent ); } diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index dd559f1bf586..6559985e7f0d 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -40,7 +40,7 @@ namespace svx class ExtrusionDirectionWindow : public svtools::ToolbarMenu { public: - ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ); + ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -71,7 +71,7 @@ class ExtrusionDirectionControl : public svt::PopupWindowController public: ExtrusionDirectionControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -106,7 +106,7 @@ private: void implSetDepth( double fDepth ); public: - ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ); + ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -119,7 +119,7 @@ class ExtrusionDepthController : public svt::PopupWindowController public: ExtrusionDepthController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -157,7 +157,7 @@ private: DECL_LINK( SelectHdl, void * ); public: - ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ); + ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -170,7 +170,7 @@ class ExtrusionLightingControl : public svt::PopupWindowController public: ExtrusionLightingControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -198,7 +198,7 @@ private: void implSetSurface( int nSurface, bool bEnabled ); public: - ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ); + ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; }; @@ -210,7 +210,7 @@ class ExtrusionSurfaceControl : public svt::PopupWindowController public: ExtrusionSurfaceControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 2a5b26a0e3a2..5b4aa1aaf5d5 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -502,7 +502,7 @@ void SvxFillToolBoxControl::Update(const SfxPoolItem* pState) } } -Window* SvxFillToolBoxControl::CreateItemWindow(Window *pParent) +vcl::Window* SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent) { if(GetSlotId() == SID_ATTR_FILL_STYLE) { @@ -533,7 +533,7 @@ Window* SvxFillToolBoxControl::CreateItemWindow(Window *pParent) return NULL; } -FillControl::FillControl(Window* pParent,WinBits nStyle) +FillControl::FillControl(vcl::Window* pParent,WinBits nStyle) : Window(pParent,nStyle | WB_DIALOGCONTROL), mpLbFillType(new SvxFillTypeBox(this)), mpLbFillAttr(new SvxFillAttrBox(this)), diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index e1fd6143bdfc..043982559b94 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -70,7 +70,7 @@ namespace svx const int nColCount = 4; const int nLineCount = 4; -FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, Window* pParent, sal_uInt16 /*nSID*/ ) : +FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, vcl::Window* pParent, sal_uInt16 /*nSID*/ ) : ModalDialog(pParent, "FontworkGalleryDialog", "svx/ui/fontworkgallerydialog.ui" ), mnThemeId ( 0xffff ), mpSdrView ( pSdrView ), @@ -298,7 +298,7 @@ void FontWorkShapeTypeControl::Select(sal_uInt16 /*nSelectModifier*/) class FontworkAlignmentWindow : public ToolbarMenu { public: - FontworkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ); + FontworkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ); virtual void statusChanged( const frame::FeatureStateEvent& Event ) throw ( RuntimeException ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; @@ -319,7 +319,7 @@ private: void implSetAlignment( int nAlignmentMode, bool bEnabled ); }; -FontworkAlignmentWindow::FontworkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ) +FontworkAlignmentWindow::FontworkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_ALIGNMENT )) , mrController( rController ) , maImgAlgin1( SVX_RES( IMG_FONTWORK_ALIGN_LEFT_16 ) ) @@ -419,7 +419,7 @@ class FontworkAlignmentControl : public svt::PopupWindowController public: FontworkAlignmentControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -438,7 +438,7 @@ FontworkAlignmentControl::FontworkAlignmentControl( const Reference< XComponentC -::Window* FontworkAlignmentControl::createPopupWindow( ::Window* pParent ) +vcl::Window* FontworkAlignmentControl::createPopupWindow( vcl::Window* pParent ) { return new FontworkAlignmentWindow( *this, m_xFrame, pParent ); } @@ -485,7 +485,7 @@ Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames class FontworkCharacterSpacingWindow : public ToolbarMenu { public: - FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ); + FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ); virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; private: @@ -503,7 +503,7 @@ private: -FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ) +FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING )) , mrController( rController ) , msFontworkCharacterSpacing( ".uno:FontworkCharacterSpacing" ) @@ -650,7 +650,7 @@ class FontworkCharacterSpacingControl : public svt::PopupWindowController public: FontworkCharacterSpacingControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); - virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -667,7 +667,7 @@ FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Referenc -::Window* FontworkCharacterSpacingControl::createPopupWindow( ::Window* pParent ) +vcl::Window* FontworkCharacterSpacingControl::createPopupWindow( vcl::Window* pParent ) { return new FontworkCharacterSpacingWindow( *this, m_xFrame, pParent ); } @@ -711,7 +711,7 @@ Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl::getSupportedServi return FontworkCharacterSpacingControl_getSupportedServiceNames(); } -FontworkCharacterSpacingDialog::FontworkCharacterSpacingDialog( Window* pParent, sal_Int32 nScale ) +FontworkCharacterSpacingDialog::FontworkCharacterSpacingDialog( vcl::Window* pParent, sal_Int32 nScale ) : ModalDialog( pParent, "FontworkSpacingDialog" , "svx/ui/fontworkspacingdialog.ui" ) { get(m_pMtrScale, "entry"); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 2fff9959d316..55e51bd3d974 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -98,13 +98,13 @@ protected: public: - ImplGrafMetricField( Window* pParent, const OUString& aCmd, const Reference< XFrame >& rFrame ); + ImplGrafMetricField( vcl::Window* pParent, const OUString& aCmd, const Reference< XFrame >& rFrame ); virtual ~ImplGrafMetricField(); void Update( const SfxPoolItem* pItem ); }; -ImplGrafMetricField::ImplGrafMetricField( Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ) : +ImplGrafMetricField::ImplGrafMetricField( vcl::Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ) : MetricField( pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_3DLOOK ), maCommand( rCmd ), mxFrame( rFrame ) @@ -251,7 +251,7 @@ protected: public: - ImplGrafControl( Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ); + ImplGrafControl( vcl::Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ); virtual ~ImplGrafControl(); void Update( const SfxPoolItem* pItem ) { maField.Update( pItem ); } @@ -259,7 +259,7 @@ public: }; ImplGrafControl::ImplGrafControl( - Window* pParent, + vcl::Window* pParent, const OUString& rCmd, const Reference< XFrame >& rFrame ) : Control( pParent, WB_TABSTOP ) @@ -321,13 +321,13 @@ private: public: - ImplGrafModeControl( Window* pParent, const Reference< XFrame >& rFrame ); + ImplGrafModeControl( vcl::Window* pParent, const Reference< XFrame >& rFrame ); virtual ~ImplGrafModeControl(); void Update( const SfxPoolItem* pItem ); }; -ImplGrafModeControl::ImplGrafModeControl( Window* pParent, const Reference< XFrame >& rFrame ) : +ImplGrafModeControl::ImplGrafModeControl( vcl::Window* pParent, const Reference< XFrame >& rFrame ) : ListBox( pParent, WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ), mnCurPos( 0 ), mxFrame( rFrame ) @@ -410,7 +410,7 @@ void ImplGrafModeControl::ImplReleaseFocus() { if( SfxViewShell::Current() ) { - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + vcl::Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if( pShellWnd ) pShellWnd->GrabFocus(); @@ -489,7 +489,7 @@ void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const } } -Window* SvxGrafToolBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* SvxGrafToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return( new ImplGrafControl( pParent, m_aCommandURL, m_xFrame ) ); } @@ -576,7 +576,7 @@ void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, c } } -Window* SvxGrafModeToolBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* SvxGrafModeToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return( new ImplGrafModeControl( pParent, m_xFrame ) ); } diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index f40bf9a53aa5..f6541949abb8 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star::beans; #define LOGICAL_EDIT_HEIGHT 12 -SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) : +SvxLineBox::SvxLineBox( vcl::Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) : LineLB( pParent, nBits ), nCurPos ( 0 ), aLogicalSize(40,140), @@ -220,7 +220,7 @@ void SvxLineBox::ReleaseFocus_Impl() if( SfxViewShell::Current() ) { - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + vcl::Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); @@ -255,7 +255,7 @@ void SvxLineBox::FillControl() } SvxMetricField::SvxMetricField( - Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) + vcl::Window* pParent, const Reference< XFrame >& rFrame, WinBits nBits ) : MetricField(pParent, nBits) , aCurTxt() , ePoolUnit(SFX_MAPUNIT_CM) @@ -321,7 +321,7 @@ void SvxMetricField::ReleaseFocus_Impl() { if( SfxViewShell::Current() ) { - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + vcl::Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); } @@ -415,7 +415,7 @@ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt ) MetricField::DataChanged( rDCEvt ); } -SvxFillTypeBox::SvxFillTypeBox( Window* pParent, WinBits nBits ) : +SvxFillTypeBox::SvxFillTypeBox( vcl::Window* pParent, WinBits nBits ) : FillTypeLB( pParent, nBits | WB_TABSTOP ), nCurPos ( 0 ), bSelect ( false ), @@ -427,7 +427,7 @@ SvxFillTypeBox::SvxFillTypeBox( Window* pParent, WinBits nBits ) : Show(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFillTypeBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFillTypeBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxFillTypeBox(pParent); } @@ -496,14 +496,14 @@ void SvxFillTypeBox::ReleaseFocus_Impl() { if( SfxViewShell::Current() ) { - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + vcl::Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); } } -SvxFillAttrBox::SvxFillAttrBox( Window* pParent, WinBits nBits ) : +SvxFillAttrBox::SvxFillAttrBox( vcl::Window* pParent, WinBits nBits ) : FillAttrLB( pParent, nBits | WB_TABSTOP ), nCurPos( 0 ), bRelease( true ) @@ -514,7 +514,7 @@ SvxFillAttrBox::SvxFillAttrBox( Window* pParent, WinBits nBits ) : Show(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFillAttrBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxFillAttrBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvxFillAttrBox(pParent); } @@ -581,7 +581,7 @@ void SvxFillAttrBox::ReleaseFocus_Impl() { if( SfxViewShell::Current() ) { - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + vcl::Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 5dea6904fca6..c2b2b553cbb4 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -73,7 +73,7 @@ public: bool IsUserSelected() const { return bUserSel; } void SetUserSelected( bool bVal ) { bUserSel = bVal; } - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; }; SvxPopupWindowListBox::SvxPopupWindowListBox(sal_uInt16 nSlotId, const OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx) @@ -109,7 +109,7 @@ void SvxPopupWindowListBox::PopupModeEnd() if( SfxViewShell::Current() ) { - Window* pShellWnd = SfxViewShell::Current()->GetWindow(); + vcl::Window* pShellWnd = SfxViewShell::Current()->GetWindow(); if (pShellWnd) pShellWnd->GrabFocus(); } @@ -123,7 +123,7 @@ void SvxPopupWindowListBox::StateChanged( SfxPopupWindow::StateChanged( nSID, eState, pState ); } -Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow() +vcl::Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow() { // allows forwarding key events in the correct window // without setting the focus diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 07eb01230c05..0e7b5f5672cf 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -182,7 +182,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) -Window* SvxLineStyleToolBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* SvxLineStyleToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return new SvxLineBox( pParent, m_xFrame ); } @@ -243,7 +243,7 @@ void SvxLineWidthToolBoxControl::StateChanged( -Window* SvxLineWidthToolBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* SvxLineWidthToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { return( new SvxMetricField( pParent, m_xFrame ) ); } @@ -270,7 +270,7 @@ SvxLineEndWindow::SvxLineEndWindow( SvxLineEndWindow::SvxLineEndWindow( sal_uInt16 nSlotId, const Reference< XFrame >& rFrame, - Window* pParentWindow, + vcl::Window* pParentWindow, const OUString& rWndTitle ) : SfxPopupWindow( nSlotId, rFrame, diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 9562072ec6f5..764aafa5ad4e 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -96,7 +96,7 @@ // don't make more than 15 entries visible at once #define MAX_STYLES_ENTRIES static_cast< sal_uInt16 >( 15 ) -static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize ); +static void lcl_CalcSizeValueSet( vcl::Window &rWin, ValueSet &rValueSet, const Size &aItemSize ); // namespaces using namespace ::editeng; @@ -116,7 +116,7 @@ class SvxStyleBox_Impl : public ComboBox { using Window::IsVisible; public: - SvxStyleBox_Impl( Window* pParent, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, + SvxStyleBox_Impl( vcl::Window* pParent, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, const Reference< XFrame >& _xFrame,const OUString& rClearFormatKey, const OUString& rMoreKey, bool bInSpecialMode ); virtual ~SvxStyleBox_Impl(); @@ -189,7 +189,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SvxFontNameBox_Impl( Window* pParent, const Reference< XDispatchProvider >& rDispatchProvider,const Reference< XFrame >& _xFrame + SvxFontNameBox_Impl( vcl::Window* pParent, const Reference< XDispatchProvider >& rDispatchProvider,const Reference< XFrame >& _xFrame , WinBits nStyle = WB_SORT ); virtual ~SvxFontNameBox_Impl(); @@ -216,7 +216,7 @@ class SvxFrmValueSet_Impl : public ValueSet sal_uInt16 nModifier; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: - SvxFrmValueSet_Impl(Window* pParent, WinBits nWinStyle) + SvxFrmValueSet_Impl(vcl::Window* pParent, WinBits nWinStyle) : ValueSet(pParent, nWinStyle), nModifier(0) {} sal_uInt16 GetModifier() const {return nModifier;} @@ -242,11 +242,11 @@ private: protected: virtual void Resize() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; public: - SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ); + SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ); virtual ~SvxFrameWindow_Impl(); void StartSelection(); @@ -267,11 +267,11 @@ private: protected: virtual void Resize() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual void GetFocus() SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ); + SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ); virtual SfxPopupWindow* Clone() const SAL_OVERRIDE; }; @@ -293,7 +293,7 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener SvxStyleToolBoxControl& rControl; }; -SvxStyleBox_Impl::SvxStyleBox_Impl(Window* pParent, +SvxStyleBox_Impl::SvxStyleBox_Impl(vcl::Window* pParent, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, @@ -727,7 +727,7 @@ static bool lcl_GetDocFontList( const FontList** ppFontList, SvxFontNameBox_Impl return bChanged; } -SvxFontNameBox_Impl::SvxFontNameBox_Impl( Window* pParent, const Reference< XDispatchProvider >& rDispatchProvider,const Reference< XFrame >& _xFrame, WinBits nStyle ) : +SvxFontNameBox_Impl::SvxFontNameBox_Impl( vcl::Window* pParent, const Reference< XDispatchProvider >& rDispatchProvider,const Reference< XFrame >& _xFrame, WinBits nStyle ) : FontNameBox ( pParent, nStyle | WinBits( WB_DROPDOWN | WB_AUTOHSCROLL ) ), pFontList ( NULL ), @@ -850,7 +850,7 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) } else if ( EVENT_LOSEFOCUS == rNEvt.GetType() ) { - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); if ( !HasFocus() && GetSubEdit() != pFocusWin ) SetText( GetSavedValue() ); // send EndPreview @@ -1003,7 +1003,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, sal_uInt16 nSlotId, const Reference< XFrame >& rFrame, const OUString& rWndTitle, - Window* pParentWindow ): + vcl::Window* pParentWindow ): SfxPopupWindow( nSlotId, pParentWindow, "palette_popup_window", "svx/ui/colorwindow.ui", @@ -1225,7 +1225,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co } } -SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : +SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ) : SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ), aFrameSet ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), bParagraphMode(false) @@ -1286,7 +1286,7 @@ SfxPopupWindow* SvxFrameWindow_Impl::Clone() const return new SvxFrameWindow_Impl( GetId(), GetFrame(), GetParent() ); } -Window* SvxFrameWindow_Impl::GetPreferredKeyInputWindow() +vcl::Window* SvxFrameWindow_Impl::GetPreferredKeyInputWindow() { return &aFrameSet; } @@ -1495,7 +1495,7 @@ static Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) return SvxBorderLine::threeDMediumColor( aMain ); } -SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : +SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ) : SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION | WB_AUTOSIZE ) ), m_aLineStyleLb( this ) @@ -1596,7 +1596,7 @@ bool SvxLineWindow_Impl::Close() return SfxPopupWindow::Close(); } -Window* SvxLineWindow_Impl::GetPreferredKeyInputWindow() +vcl::Window* SvxLineWindow_Impl::GetPreferredKeyInputWindow() { return &m_aLineStyleLb; } @@ -2122,7 +2122,7 @@ void SvxStyleToolBoxControl::StateChanged( Update(); } -Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* SvxStyleToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { SvxStyleBox_Impl* pBox = new SvxStyleBox_Impl( pParent, OUString( ".uno:StyleApply" ), @@ -2182,7 +2182,7 @@ void SvxFontNameToolBoxControl::StateChanged( rTbx.EnableItem( nId, SfxItemState::DISABLED != eState ); } -Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent ) +vcl::Window* SvxFontNameToolBoxControl::CreateItemWindow( vcl::Window *pParent ) { SvxFontNameBox_Impl* pBox = new SvxFontNameBox_Impl( pParent, Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY ), @@ -2493,7 +2493,7 @@ void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, -static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize ) +static void lcl_CalcSizeValueSet( vcl::Window &rWin, ValueSet &rValueSet, const Size &aItemSize ) { Size aSize = rValueSet.CalcWindowSizePixel( aItemSize ); aSize.Width() += 4; diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 981db9a86a00..8960b3b5e6f3 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -86,7 +86,7 @@ class FontHeightToolBoxControl : public svt::ToolboxController, class SvxFontSizeBox_Impl : public FontSizeBox { public: - SvxFontSizeBox_Impl( Window* pParent, + SvxFontSizeBox_Impl( vcl::Window* pParent, const uno::Reference< frame::XDispatchProvider >& rDispatchProvider, const uno::Reference< frame::XFrame >& _xFrame, FontHeightToolBoxControl& rCtrl ); @@ -114,7 +114,7 @@ private: }; SvxFontSizeBox_Impl::SvxFontSizeBox_Impl( - Window* _pParent, + vcl::Window* _pParent, const uno::Reference< frame::XDispatchProvider >& _rDispatchProvider, const uno::Reference< frame::XFrame >& _xFrame, FontHeightToolBoxControl& _rCtrl ) : @@ -249,7 +249,7 @@ bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) } else if( EVENT_LOSEFOCUS == rNEvt.GetType() ) { - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); if(!HasFocus() && GetSubEdit() != pFocusWin) SetText(GetSavedValue()); } @@ -405,7 +405,7 @@ uno::Reference< awt::XWindow > SAL_CALL FontHeightToolBoxControl::createItemWind uno::Reference< awt::XWindow > xItemWindow; uno::Reference< awt::XWindow > xParent( Parent ); - Window* pParent = VCLUnoHelper::GetWindow( xParent ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent ); if ( pParent ) { SolarMutexGuard aSolarMutexGuard; diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 6bb512c0aedd..c23a2cb03706 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -86,7 +86,7 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand == COMMAND_FINDTEXT ) { - Window* pItemWin = pToolBox->GetItemWindow(i); + vcl::Window* pItemWin = pToolBox->GetItemWindow(i); if (pItemWin) sFindText = pItemWin->GetText(); } else if ( sItemCommand == COMMAND_MATCHCASE ) @@ -127,7 +127,7 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext } } -FindTextFieldControl::FindTextFieldControl( Window* pParent, WinBits nStyle, +FindTextFieldControl::FindTextFieldControl( vcl::Window* pParent, WinBits nStyle, css::uno::Reference< css::frame::XFrame >& xFrame, const css::uno::Reference< css::uno::XComponentContext >& xContext) : ComboBox( pParent, nStyle ), @@ -227,7 +227,7 @@ bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) { Remember_Impl(GetText()); - Window* pWindow = GetParent(); + vcl::Window* pWindow = GetParent(); ToolBox* pToolBox = (ToolBox*)pWindow; impl_executeSearch( m_xContext, m_xFrame, pToolBox, bShift); @@ -416,7 +416,7 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< : { svt::ToolboxController::initialize(aArguments); - Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); ToolBox* pToolBox = (ToolBox*)pWindow; if ( pToolBox ) { @@ -445,7 +445,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL FindTextToolbarController::cre css::uno::Reference< css::awt::XWindow > xItemWindow; css::uno::Reference< css::awt::XWindow > xParent( Parent ); - Window* pParent = VCLUnoHelper::GetWindow( xParent ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent ); if ( pParent ) { ToolBox* pToolbar = ( ToolBox* )pParent; @@ -478,7 +478,7 @@ void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::Featur IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl) { // enable or disable item DownSearch/UpSearch of findbar - Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); ToolBox* pToolBox = (ToolBox*)pWindow; if ( pToolBox && m_pFindTextFieldControl ) { @@ -576,7 +576,7 @@ void SAL_CALL UpDownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ if ( m_bDisposed ) throw css::lang::DisposedException(); - Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); ToolBox* pToolBox = (ToolBox*)pWindow; impl_executeSearch(m_xContext, m_xFrame, pToolBox, meType == UP ); @@ -669,7 +669,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL MatchCaseToolboxController::cr css::uno::Reference< css::awt::XWindow > xItemWindow; css::uno::Reference< css::awt::XWindow > xParent( Parent ); - Window* pParent = VCLUnoHelper::GetWindow( xParent ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent ); if ( pParent ) { ToolBox* pToolbar = (ToolBox* )pParent; @@ -761,7 +761,7 @@ void SAL_CALL FindAllToolboxController::execute( sal_Int16 /*KeyModifier*/ ) thr if ( m_bDisposed ) throw css::lang::DisposedException(); - Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( getParent() ); ToolBox* pToolBox = (ToolBox*)pWindow; impl_executeSearch(m_xContext, m_xFrame, pToolBox, false, true); @@ -842,7 +842,7 @@ void SAL_CALL ExitSearchToolboxController::initialize( const css::uno::Sequence< // XToolbarController void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) throw ( css::uno::RuntimeException, std::exception ) { - Window *pFocusWindow = Application::GetFocusWindow(); + vcl::Window *pFocusWindow = Application::GetFocusWindow(); if ( pFocusWindow ) pFocusWindow->GrabFocusToDocument(); @@ -941,7 +941,7 @@ void SAL_CALL SearchLabelToolboxController::statusChanged( const css::frame::Fea css::uno::Reference< css::awt::XWindow > SAL_CALL SearchLabelToolboxController::createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw ( css::uno::RuntimeException, std::exception ) { - Window *pSL= new FixedText(VCLUnoHelper::GetWindow( Parent )); + vcl::Window *pSL= new FixedText(VCLUnoHelper::GetWindow( Parent )); pSL->SetSizePixel(Size(250, 25)); return VCLUnoHelper::GetInterface(pSL); } @@ -1057,7 +1057,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css } css::uno::Reference< css::awt::XWindow > xWindow(xUIElement->getRealInterface(), css::uno::UNO_QUERY); - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); ToolBox* pToolBox = (ToolBox*)pWindow; if ( pToolBox ) { @@ -1067,7 +1067,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand == COMMAND_FINDTEXT ) { - Window* pItemWin = pToolBox->GetItemWindow( i ); + vcl::Window* pItemWin = pToolBox->GetItemWindow( i ); if ( pItemWin ) { FindTextFieldControl* pFindTextFieldControl = dynamic_cast<FindTextFieldControl*>(pItemWin); diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index c5d1102b2c10..36a5e930dab4 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -82,7 +82,7 @@ void SvxVertCTLTextTbxCtrl::StateChanged( if(bCalc) { ToolBox& rTbx = GetToolBox(); - Window* pParent = rTbx.GetParent(); + vcl::Window* pParent = rTbx.GetParent(); WindowType nWinType = pParent->GetType(); if(WINDOW_FLOATINGWINDOW == nWinType) { diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 68777790e1ea..135dca78325f 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -197,7 +197,7 @@ FontworkBar::~FontworkBar() SetRepeatTarget(NULL); } -static Window* ImpGetViewWin(SdrView* pView) +static vcl::Window* ImpGetViewWin(SdrView* pView) { if( pView ) { @@ -208,7 +208,7 @@ static Window* ImpGetViewWin(SdrView* pView) if(OUTDEV_WINDOW == pOut->GetOutDevType()) { - return (Window*)pOut; + return (vcl::Window*)pOut; } } } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 87aa9c4b0689..689709125aee 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -379,8 +379,8 @@ void DictionaryList::Resize() } void DictionaryList::init(const Reference< linguistic2::XConversionDictionary>& xDictionary, - Window *pED_Term, Window *pED_Mapping, ListBox *pLB_Property, - Window *pFT_Term, Window *pFT_Mapping, Window *pFT_Property) + vcl::Window *pED_Term, vcl::Window *pED_Mapping, ListBox *pLB_Property, + vcl::Window *pFT_Term, vcl::Window *pFT_Mapping, vcl::Window *pFT_Property) { SetStyle( WB_VSCROLL | WB_TABSTOP ); SetSelectionMode( SINGLE_SELECTION ); @@ -428,7 +428,7 @@ void ChineseDictionaryDialog::initDictionaryControl(DictionaryList *pList, m_pFT_Term, m_pFT_Mapping, m_pFT_Property); } -ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) +ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent ) : ModalDialog(pParent, "ChineseDictionaryDialog", "svx/ui/chinesedictionary.ui") , m_nTextConversionOptions(i18n::TextConversionOption::NONE) diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index b088bb07196d..97cef0a2ff33 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -63,8 +63,8 @@ public: DictionaryList(SvSimpleTableContainer& rParent, WinBits nBits); void init(const css::uno::Reference< css::linguistic2::XConversionDictionary>& xDictionary, - Window *pED_Term, Window *pED_Mapping, ListBox *pLB_Property, - Window *pFT_Term, Window *pFT_Mapping, Window *pFT_Property); + vcl::Window *pED_Term, vcl::Window *pED_Mapping, ListBox *pLB_Property, + vcl::Window *pFT_Term, vcl::Window *pFT_Mapping, vcl::Window *pFT_Property); void deleteAll(); void refillFromDictionary( sal_Int32 nTextConversionOptions /*i18n::TextConversionOption*/ ); @@ -99,8 +99,8 @@ public: css::uno::Reference<css::linguistic2::XConversionDictionary> m_xDictionary; private: - Window* m_pED_Term; - Window* m_pED_Mapping; + vcl::Window* m_pED_Term; + vcl::Window* m_pED_Mapping; ListBox* m_pLB_Property; std::vector< DictionaryEntry* > m_aToBeDeleted; @@ -111,7 +111,7 @@ private: class ChineseDictionaryDialog : public ModalDialog { public: - ChineseDictionaryDialog( Window* pParent ); + ChineseDictionaryDialog( vcl::Window* pParent ); virtual ~ChineseDictionaryDialog(); //this method should be called once before calling execute diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index 16baa1947b72..1b8645595bd4 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx @@ -129,7 +129,7 @@ sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeExc if( !m_pDialog ) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if( m_xParentWindow.is() ) { VCLXWindow* pImplementation = VCLXWindow::GetImplementation(m_xParentWindow); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index adf98f688268..8dec51d66809 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -34,7 +34,7 @@ namespace textconversiondlgs using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) +ChineseTranslationDialog::ChineseTranslationDialog( vcl::Window* pParent ) : ModalDialog(pParent, "ChineseConversionDialog", "svx/ui/chineseconversiondialog.ui") , m_pDictionaryDialog(0) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index 03342a604aaa..5e1f0909d9f2 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx @@ -37,7 +37,7 @@ class ChineseDictionaryDialog; class ChineseTranslationDialog : public ModalDialog { public: - ChineseTranslationDialog( Window* pParent ); + ChineseTranslationDialog( vcl::Window* pParent ); virtual ~ChineseTranslationDialog(); void getSettings( bool& rbDirectionToSimplified diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 6ca0b5849cc4..425e9719f95d 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -67,7 +67,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo css::uno::Reference< css::uno::XComponentContext > m_xContext; /** @short TODO */ - Window* m_pParentWindow; + vcl::Window* m_pParentWindow; /** @short TODO */ RecoveryUI::EJob m_eJob; diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index c893adb96c6c..b5f957f82655 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -86,7 +86,7 @@ private: SdrObject* mpObject; SdrText* mpText; SdrView* mpView; - const Window* mpWindow; + const vcl::Window* mpWindow; SdrModel* mpModel; SdrOutliner* mpOutliner; SvxOutlinerForwarder* mpTextForwarder; @@ -121,7 +121,7 @@ private: public: SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText ); - SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const Window& rWindow ); + SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const vcl::Window& rWindow ); virtual ~SvxTextEditSourceImpl(); void SAL_CALL acquire(); @@ -194,7 +194,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText -SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const Window& rWindow ) +SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const vcl::Window& rWindow ) : maRefCount ( 0 ), mpObject ( &rObject ), mpText ( pText ), @@ -1036,7 +1036,7 @@ SvxTextEditSource::SvxTextEditSource( SdrObject* pObject, SdrText* pText ) } -SvxTextEditSource::SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const Window& rWindow ) +SvxTextEditSource::SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const vcl::Window& rWindow ) { mpImpl = new SvxTextEditSourceImpl( rObj, pText, rView, rWindow ); mpImpl->acquire(); |