diff options
Diffstat (limited to 'svx/source/dialog')
47 files changed, 149 insertions, 149 deletions
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); } |