diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /include/svx | |
| parent | Disable HTML export "hspace" and "vspace" check on OSX (diff) | |
| download | core-827c46e7d75000cb03b0ce21759f9d0825f0c096.tar.gz core-827c46e7d75000cb03b0ce21759f9d0825f0c096.zip | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'include/svx')
85 files changed, 280 insertions, 280 deletions
diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx index d56663384819..ec316f2498bb 100644 --- a/include/svx/AccessibleShapeTreeInfo.hxx +++ b/include/svx/AccessibleShapeTreeInfo.hxx @@ -28,7 +28,7 @@ #include <svx/svxdllapi.h> class SdrView; -class Window; +namespace vcl { class Window; } namespace accessibility { @@ -140,13 +140,13 @@ public: /** Set the window that is used to construct SvxTextEditSources which in turn is used to create accessible edit engines. */ - void SetWindow (Window* pWindow); + void SetWindow (vcl::Window* pWindow); /** Return the current Window. @return The returned value may be NULL. */ - Window* GetWindow (void) const { return mpWindow;} + vcl::Window* GetWindow (void) const { return mpWindow;} /** The view forwarder allows the transformation between internal and pixel coordinates and can be asked for the visible area. @@ -188,7 +188,7 @@ private: /** This window is necessary to construct an SvxTextEditSource which in turn is used to create an accessible edit engine. */ - Window* mpWindow; + vcl::Window* mpWindow; /** The view forwarder allows the transformation between internal and pixel coordinates and can be asked for the visible area. diff --git a/include/svx/SpellDialogChildWindow.hxx b/include/svx/SpellDialogChildWindow.hxx index 2c9e826e510f..2f6bc5cae067 100644 --- a/include/svx/SpellDialogChildWindow.hxx +++ b/include/svx/SpellDialogChildWindow.hxx @@ -49,7 +49,7 @@ class SVX_DLLPUBLIC SpellDialogChildWindow AbstractSpellDialog* m_pAbstractSpellDialog; public: SpellDialogChildWindow ( - Window*pParent, + vcl::Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); diff --git a/include/svx/SvxColorChildWindow.hxx b/include/svx/SvxColorChildWindow.hxx index 220f47c8ea20..1cceb372878d 100644 --- a/include/svx/SvxColorChildWindow.hxx +++ b/include/svx/SvxColorChildWindow.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC SvxColorChildWindow : public SfxChildWindow { public: - SvxColorChildWindow( Window*, sal_uInt16, SfxBindings*, + SvxColorChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW_WITHID(SvxColorChildWindow); diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx index a3130ed4a731..585b54ff7b0c 100644 --- a/include/svx/SvxColorValueSet.hxx +++ b/include/svx/SvxColorValueSet.hxx @@ -29,8 +29,8 @@ class SVX_DLLPUBLIC SvxColorValueSet : public ValueSet private: protected: public: - SvxColorValueSet(Window* pParent, WinBits nWinStyle = WB_ITEMBORDER); - SvxColorValueSet(Window* pParent, const ResId& rResId); + SvxColorValueSet(vcl::Window* pParent, WinBits nWinStyle = WB_ITEMBORDER); + SvxColorValueSet(vcl::Window* pParent, const ResId& rResId); virtual void Resize() SAL_OVERRIDE; diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index 95a7b8669724..480e8e2fdf6b 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -59,7 +59,7 @@ public: class SVX_DLLPUBLIC SvxBmpMaskChildWindow : public SfxChildWindow { public: - SvxBmpMaskChildWindow( Window*, + SvxBmpMaskChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); @@ -146,7 +146,7 @@ public: SvxBmpMask( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const ResId& rResId ); virtual ~SvxBmpMask(); diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 073f4f10e6ae..1615fa2ed025 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -42,7 +42,7 @@ namespace svx class SVX_DLLPUBLIC SvxShowCharSet : public Control { public: - SvxShowCharSet( Window* pParent ); + SvxShowCharSet( vcl::Window* pParent ); virtual ~SvxShowCharSet(); void SetFont( const vcl::Font& rFont ); diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx index 405f4649fcb8..a709487f1a56 100644 --- a/include/svx/checklbx.hxx +++ b/include/svx/checklbx.hxx @@ -43,7 +43,7 @@ private: SvLBoxButtonKind eButtonKind ) SAL_OVERRIDE; public: - SvxCheckListBox( Window* pParent, WinBits nWinStyle = 0 ); + SvxCheckListBox( vcl::Window* pParent, WinBits nWinStyle = 0 ); void SetNormalStaticImage(const Image& rNormalStaticImage); virtual ~SvxCheckListBox(); diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index 2a1df616d24e..e4d4975e6a59 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -58,8 +58,8 @@ protected: DECL_STATIC_LINK(SvxColorValueSet_docking, ExecDragHdl, void*); public: - SvxColorValueSet_docking( Window* pParent, WinBits nWinStyle = WB_ITEMBORDER ); - SvxColorValueSet_docking( Window* pParent, const ResId& rResId ); + SvxColorValueSet_docking( vcl::Window* pParent, WinBits nWinStyle = WB_ITEMBORDER ); + SvxColorValueSet_docking( vcl::Window* pParent, const ResId& rResId ); bool IsLeftButton() const { return mbLeftButton; } }; @@ -102,7 +102,7 @@ protected: public: SvxColorDockingWindow( SfxBindings* pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const ResId& rResId ); virtual ~SvxColorDockingWindow(); diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index d1d6318821e0..b8dcf80da12a 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -81,8 +81,8 @@ private: sal_uLong GetSelectedInterpolationType(); public: - CompressGraphicsDialog( Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings ); - CompressGraphicsDialog( Window* pParent, Graphic& rGraphic, Size rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings ); + CompressGraphicsDialog( vcl::Window* pParent, SdrGrafObj* pGraphicObj, SfxBindings& rBindings ); + CompressGraphicsDialog( vcl::Window* pParent, Graphic& rGraphic, Size rViewSize100mm, Rectangle& rCropRectangle, SfxBindings& rBindings ); virtual ~CompressGraphicsDialog(); diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx index d8a8924253f5..6caac030eb93 100644 --- a/include/svx/connctrl.hxx +++ b/include/svx/connctrl.hxx @@ -44,7 +44,7 @@ private: SVX_DLLPRIVATE void SetStyles(); SVX_DLLPRIVATE void AdaptSize(); public: - SvxXConnectionPreview( Window* pParent, WinBits nStyle); + SvxXConnectionPreview( vcl::Window* pParent, WinBits nStyle); virtual ~SvxXConnectionPreview(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index 4d42c1d47d84..75954e0f2b2c 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -37,7 +37,7 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow { public: - SvxContourDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); + SvxContourDlgChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW_WITHID( SvxContourDlgChildWindow ); }; @@ -74,7 +74,7 @@ protected: public: SvxContourDlg(SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent); + vcl::Window* pParent); virtual ~SvxContourDlg(); const Graphic& GetGraphic() const; diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index f2f7dbf38ed6..685696106672 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -202,7 +202,7 @@ protected: void EnableDateLine2(bool bFlag); public: - SvxTPFilter( Window * pParent); + SvxTPFilter( vcl::Window * pParent); virtual void DeactivatePage() SAL_OVERRIDE; void SetRedlinTable(SvxRedlinTable*); @@ -314,7 +314,7 @@ private: DECL_LINK( PbClickHdl, PushButton* ); public: - SvxTPView(Window * pParent); + SvxTPView(vcl::Window * pParent); virtual ~SvxTPView(); void InsertWriterHeader(); @@ -373,7 +373,7 @@ private: sal_uInt16 m_nFilterPageId; public: - SvxAcceptChgCtr(Window* pParent); + SvxAcceptChgCtr(vcl::Window* pParent); virtual ~SvxAcceptChgCtr(); diff --git a/include/svx/databaseregistrationui.hxx b/include/svx/databaseregistrationui.hxx index 80df7133279b..625f08887b65 100644 --- a/include/svx/databaseregistrationui.hxx +++ b/include/svx/databaseregistrationui.hxx @@ -22,7 +22,7 @@ #include <svx/svxdllapi.h> -class Window; +namespace vcl { class Window; } #define SID_SB_POOLING_ENABLED (RID_OFA_START + 247) #define SID_SB_DRIVER_TIMEOUTS (RID_OFA_START + 248) @@ -32,7 +32,7 @@ namespace svx { /** opens a dialog which allows the user to administrate the database registrations */ - sal_uInt16 SVX_DLLPUBLIC administrateDatabaseRegistration( Window* _parentWindow ); + sal_uInt16 SVX_DLLPUBLIC administrateDatabaseRegistration( vcl::Window* _parentWindow ); } // namespace svx diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 36a6931e8190..800bb1a90f1e 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -36,7 +36,7 @@ namespace svx { class DialControlBmp : public VirtualDevice { public: - explicit DialControlBmp( Window& rParent ); + explicit DialControlBmp( vcl::Window& rParent ); void InitBitmap(const vcl::Font& rFont); void SetSize(const Size& rSize); @@ -58,7 +58,7 @@ private: void Init(); - Window& mrParent; + vcl::Window& mrParent; long mnCenterX; long mnCenterY; }; @@ -80,7 +80,7 @@ private: class SVX_DLLPUBLIC DialControl : public Control { public: - explicit DialControl( Window* pParent, WinBits nBits ); + explicit DialControl( vcl::Window* pParent, WinBits nBits ); virtual ~DialControl(); @@ -143,7 +143,7 @@ protected: long mnCenterY; bool mbNoRot; - explicit DialControl_Impl( Window& rParent ); + explicit DialControl_Impl( vcl::Window& rParent ); void Init( const Size& rWinSize, const vcl::Font& rWinFont ); void SetSize( const Size& rWinSize ); }; diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 3ebb61fb21c2..8d3901bc3a5e 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -55,8 +55,8 @@ protected: void Construct(); public: - Svx3DPreviewControl(Window* pParent, const ResId& rResId); - Svx3DPreviewControl(Window* pParent, WinBits nStyle = 0); + Svx3DPreviewControl(vcl::Window* pParent, const ResId& rResId); + Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle = 0); virtual ~Svx3DPreviewControl(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -111,7 +111,7 @@ class SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewControl void TrySelection(Point aPosPixel); public: - Svx3DLightControl(Window* pParent, WinBits nStyle = 0); + Svx3DLightControl(vcl::Window* pParent, WinBits nStyle = 0); virtual ~Svx3DLightControl(); virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; @@ -165,8 +165,8 @@ private: Link maUserSelectionChangeCallback; public: - SvxLightCtl3D( Window* pParent, const ResId& rResId); - SvxLightCtl3D( Window* pParent); + SvxLightCtl3D( vcl::Window* pParent, const ResId& rResId); + SvxLightCtl3D( vcl::Window* pParent); virtual ~SvxLightCtl3D(); // react to size changes diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 6127f70d26b2..21cba2546081 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -42,11 +42,11 @@ class SvxTabPage : public SfxTabPage { public: - SvxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) + SvxTabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet) : SfxTabPage(pParent, rID, rUIXMLDescription, &rAttrSet) { } - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) = 0; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) = 0; }; /************************************************************************* @@ -95,7 +95,7 @@ protected: Point GetApproxLogPtFromPixPt( const Point& rRoughPixelPoint ) const; public: - SvxRectCtl( Window* pParent, RECT_POINT eRpt = RP_MM, + SvxRectCtl( vcl::Window* pParent, RECT_POINT eRpt = RP_MM, sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT ); void SetControlSettings(RECT_POINT eRpt = RP_MM, sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT); @@ -142,7 +142,7 @@ protected: const sal_uInt16* pBmpArray; public: - SvxBitmapCtl( Window* pParent, const Size& rSize ); + SvxBitmapCtl( vcl::Window* pParent, const Size& rSize ); ~SvxBitmapCtl(); BitmapEx GetBitmapEx(); @@ -176,7 +176,7 @@ protected: void ChangePixel( sal_uInt16 nPixel ); public: - SvxPixelCtl( Window* pParent, sal_uInt16 nNumber = 8 ); + SvxPixelCtl( vcl::Window* pParent, sal_uInt16 nNumber = 8 ); virtual ~SvxPixelCtl(); @@ -225,8 +225,8 @@ class SVX_DLLPUBLIC ColorLB : public ColorListBox { public: - ColorLB( Window* pParent, ResId Id ) : ColorListBox( pParent, Id ) {} - ColorLB( Window* pParent, WinBits aWB ) : ColorListBox( pParent, aWB ) {} + ColorLB( vcl::Window* pParent, ResId Id ) : ColorListBox( pParent, Id ) {} + ColorLB( vcl::Window* pParent, WinBits aWB ) : ColorListBox( pParent, aWB ) {} virtual void Fill( const XColorListRef &pTab ); @@ -240,7 +240,7 @@ class SVX_DLLPUBLIC HatchingLB : public ListBox { XHatchListRef mpList; public: - explicit HatchingLB(Window* pParent, WinBits aWB); + explicit HatchingLB(vcl::Window* pParent, WinBits aWB); virtual void Fill( const XHatchListRef &pList ); @@ -254,7 +254,7 @@ class SVX_DLLPUBLIC GradientLB : public ListBox { XGradientListRef mpList; public: - explicit GradientLB(Window* pParent, WinBits aWB); + explicit GradientLB(vcl::Window* pParent, WinBits aWB); virtual void Fill( const XGradientListRef &pList ); @@ -269,7 +269,7 @@ public: class SVX_DLLPUBLIC BitmapLB : public ListBox { public: - explicit BitmapLB(Window* pParent, WinBits aWB); + explicit BitmapLB(vcl::Window* pParent, WinBits aWB); virtual void Fill(const XBitmapListRef &pList); @@ -291,7 +291,7 @@ private: BitmapEx maBitmapEx; public: - FillAttrLB( Window* pParent, WinBits aWB ); + FillAttrLB( vcl::Window* pParent, WinBits aWB ); virtual void Fill( const XColorListRef &pList ); virtual void Fill( const XHatchListRef &pList ); @@ -305,8 +305,8 @@ class FillTypeLB : public ListBox { public: - FillTypeLB( Window* pParent, ResId Id ) : ListBox( pParent, Id ) {} - FillTypeLB( Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {} + FillTypeLB( vcl::Window* pParent, ResId Id ) : ListBox( pParent, Id ) {} + FillTypeLB( vcl::Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {} virtual void Fill(); }; @@ -321,7 +321,7 @@ private: bool mbAddStandardFields : 1; public: - LineLB(Window* pParent, WinBits aWB); + LineLB(vcl::Window* pParent, WinBits aWB); virtual ~LineLB(); virtual void Fill(const XDashListRef &pList); @@ -340,7 +340,7 @@ class SVX_DLLPUBLIC LineEndLB : public ListBox { public: - LineEndLB( Window* pParent, WinBits aWB ); + LineEndLB( vcl::Window* pParent, WinBits aWB ); virtual ~LineEndLB (void); virtual void Fill( const XLineEndListRef &pList, bool bStart = true ); @@ -371,7 +371,7 @@ protected: void LocalPostPaint(); public: - SvxPreviewBase(Window* pParent); + SvxPreviewBase(vcl::Window* pParent); virtual ~SvxPreviewBase(); // change support @@ -401,7 +401,7 @@ private: Size maSymbolSize; public: - SvxXLinePreview( Window* pParent ); + SvxXLinePreview( vcl::Window* pParent ); virtual ~SvxXLinePreview(); void SetLineAttributes(const SfxItemSet& rItemSet); @@ -427,7 +427,7 @@ private: SdrObject* mpRectangleObject; public: - SvxXRectPreview(Window* pParent); + SvxXRectPreview(vcl::Window* pParent); virtual ~SvxXRectPreview(); void SetAttributes(const SfxItemSet& rItemSet); @@ -451,7 +451,7 @@ private: SdrObject* mpRectangleShadow; public: - SvxXShadowPreview(Window *pParent); + SvxXShadowPreview(vcl::Window *pParent); virtual ~SvxXShadowPreview(); diff --git a/include/svx/f3dchild.hxx b/include/svx/f3dchild.hxx index 87eeb5313e81..a306f2f3d7fc 100644 --- a/include/svx/f3dchild.hxx +++ b/include/svx/f3dchild.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC Svx3DChildWindow : public SfxChildWindow { public: - Svx3DChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); + Svx3DChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW_WITHID(Svx3DChildWindow); }; diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index 215ce4de56a8..c8878d9f8355 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -67,12 +67,12 @@ public: virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) SAL_OVERRIDE; void Update(const SfxPoolItem* pState); - virtual Window* CreateItemWindow(Window* pParent) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow(vcl::Window* pParent) SAL_OVERRIDE; }; -class FillControl : public Window +class FillControl : public vcl::Window { private: friend class SvxFillToolBoxControl; @@ -99,7 +99,7 @@ private: void updateLastFillAttrControlSelectEntryPos(); public: - FillControl(Window* pParent, WinBits nStyle = 0); + FillControl(vcl::Window* pParent, WinBits nStyle = 0); virtual ~FillControl(); virtual void Resize() SAL_OVERRIDE; diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index c88fa556f392..610ec06b896a 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -238,7 +238,7 @@ protected: public: Svx3DWin( SfxBindings* pBindings, SfxChildWindow *pCW, - Window* pParent ); + vcl::Window* pParent ); virtual ~Svx3DWin(); void InitColorLB( const SdrModel* pDoc ); diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 914758f31475..f373f5e59787 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -106,7 +106,7 @@ class SVX_DLLPUBLIC FmGridControl : public DbGridControl public: FmGridControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&, - Window* pParent, + vcl::Window* pParent, FmXGridPeer* _pPeer, WinBits nBits); diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 4d5fd549840b..a14bb5b4a960 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -309,7 +309,7 @@ public: virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual FmXGridPeer* imp_CreatePeer(Window* pParent); + virtual FmXGridPeer* imp_CreatePeer(vcl::Window* pParent); // ImplCreatePeer would be better, but doesn't work because it's not exported }; @@ -376,7 +376,7 @@ public: virtual ~FmXGridPeer(); // spaeter Constructor, immer nach dem realen Constructor zu rufen ! - void Create(Window* pParent, WinBits nStyle); + void Create(vcl::Window* pParent, WinBits nStyle); // UNO connection DECLARE_UNO3_DEFAULTS(FmXGridPeer, VCLXWindow) @@ -515,7 +515,7 @@ public: virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle); + virtual FmGridControl* imp_CreateControl(vcl::Window* pParent, WinBits nStyle); static ::com::sun::star::uno::Sequence< ::com::sun::star::util::URL>& getSupportedURLs(); static ::com::sun::star::uno::Sequence<sal_uInt16>& getSupportedGridSlots(); diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index 7331b1de0eea..e381a64bada7 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -70,7 +70,7 @@ public: const OUString& GetName() const { return m_sPageName; } void SetName( const OUString& rName ) { m_sPageName = rName; } bool RequestHelp( - Window* pWin, + vcl::Window* pWin, SdrView* pView, const HelpEvent& rEvt ); }; diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index f8ecdcc994f6..1d1309854a0e 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -89,7 +89,7 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell class FormShellWaitObject { - Window* m_pWindow; + vcl::Window* m_pWindow; public: FormShellWaitObject(const FmFormShell* _pShell); ~FormShellWaitObject(); diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 946599ec8107..61edca34e54b 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -70,18 +70,18 @@ #include <set> -class Window; +namespace vcl { class Window; } // common types // displaying a database exception for the user // display info about a simple css::sdbc::SQLException -void displayException(const css::sdbc::SQLException&, Window* _pParent = NULL); -void displayException(const css::sdbc::SQLWarning&, Window* _pParent = NULL); -SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, Window* _pParent = NULL); -void displayException(const css::sdb::SQLErrorEvent&, Window* _pParent = NULL); -void displayException(const css::uno::Any&, Window* _pParent = NULL); +void displayException(const css::sdbc::SQLException&, vcl::Window* _pParent = NULL); +void displayException(const css::sdbc::SQLWarning&, vcl::Window* _pParent = NULL); +SVX_DLLPUBLIC void displayException(const css::sdb::SQLContext&, vcl::Window* _pParent = NULL); +void displayException(const css::sdb::SQLErrorEvent&, vcl::Window* _pParent = NULL); +void displayException(const css::uno::Any&, vcl::Window* _pParent = NULL); sal_Int32 getElementPos(const css::uno::Reference< css::container::XIndexAccess>& xCont, const css::uno::Reference< css::uno::XInterface>& xElement); diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 21e27fa9500e..3e116f0a278c 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -109,7 +109,7 @@ public: // for copying complete form structures, not only control models virtual SdrModel* GetMarkedObjModel() const SAL_OVERRIDE; - virtual bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ) SAL_OVERRIDE; + virtual bool MouseButtonDown( const MouseEvent& _rMEvt, vcl::Window* _pWin ) SAL_OVERRIDE; /** grab the focus to the first form control on the view @param _bForceSync @@ -123,7 +123,7 @@ public: GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; // SdrView - bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; + bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) SAL_OVERRIDE; /// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL" FmFormPage* GetCurPage(); diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index aaa73142dd7f..0c9461f73891 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -34,7 +34,7 @@ class FontPrevWin_Impl; // class SvxFontPrevWindow ----------------------------------------------- -class SVX_DLLPUBLIC SvxFontPrevWindow : public Window +class SVX_DLLPUBLIC SvxFontPrevWindow : public vcl::Window { using OutputDevice::SetFont; private: @@ -46,8 +46,8 @@ private: SVX_DLLPRIVATE void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); public: - SvxFontPrevWindow( Window* pParent, const ResId& rId ); - SvxFontPrevWindow(Window* pParent, WinBits nStyle); + SvxFontPrevWindow( vcl::Window* pParent, const ResId& rId ); + SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle); virtual ~SvxFontPrevWindow(); virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index d5a1b25bdff1..5755a308e0c0 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -70,7 +70,7 @@ private: bool mbUseFont; /// true = Use maEntryFont/mpEntryColor in InitEntry(). public: - SvxFontListBox(Window* pParent, WinBits nStyle = WB_BORDER); + SvxFontListBox(vcl::Window* pParent, WinBits nStyle = WB_BORDER); /** Inserts a list entry and sets the font used for this entry. @param pColor The font color. NULL = use default listbox text color. */ diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index 5292cc180f69..656eb91a0beb 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -75,7 +75,7 @@ public: class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow { public: - SvxFontWorkChildWindow(Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); + SvxFontWorkChildWindow(vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW_WITHID(SvxFontWorkChildWindow); }; @@ -158,7 +158,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow public: SvxFontWorkDialog( SfxBindings *pBindinx, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const ResId& rResId ); virtual ~SvxFontWorkDialog(); diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index fba83a09f8e2..7bd4534a83ae 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -36,7 +36,7 @@ class FmFormModel; class SdrView; -class Window; +namespace vcl { class Window; } class SdrTextObj; class SdrObject; class SdrModel; @@ -67,7 +67,7 @@ class FontworkCharacterSpacingDialog : public ModalDialog MetricField* m_pMtrScale; public: - FontworkCharacterSpacingDialog( Window* pParent, sal_Int32 nScale ); + FontworkCharacterSpacingDialog( vcl::Window* pParent, sal_Int32 nScale ); sal_Int32 getScale() const; }; @@ -97,7 +97,7 @@ class SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog std::vector< BitmapEx> maFavoritesHorizontal; public: - FontWorkGalleryDialog( SdrView* pView, Window* pParent, sal_uInt16 nSID ); + FontWorkGalleryDialog( SdrView* pView, vcl::Window* pParent, sal_uInt16 nSID ); virtual ~FontWorkGalleryDialog(); // SJ: if the SdrObject** is set, the SdrObject is not inserted into the page when executing the dialog diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index a738659aa54a..80bd1b12f0ad 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -39,7 +39,7 @@ namespace svx { class SVX_DLLPUBLIC FrameDirectionListBox : public ListBox { public: - explicit FrameDirectionListBox( Window* pParent, WinBits nBits ); + explicit FrameDirectionListBox( vcl::Window* pParent, WinBits nBits ); virtual ~FrameDirectionListBox(); /** Inserts a string with corresponding direction enum into the listbox. */ diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 4a3f0ffeb8be..29d1ddfbfbfc 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -83,7 +83,7 @@ enum FrameBorderState class SVX_DLLPUBLIC FrameSelector : public Control { public: - FrameSelector(Window* pParent); + FrameSelector(vcl::Window* pParent); virtual ~FrameSelector(); /** Initializes the control, enables/disables frame borders according to flags. */ diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index 752fdf38cc6c..4abfde111486 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -40,7 +40,7 @@ class GalleryTheme; class GalleryBrowser2; -class SVX_DLLPUBLIC GalleryPreview : public Window, public DropTargetHelper, public DragSourceHelper +class SVX_DLLPUBLIC GalleryPreview : public vcl::Window, public DropTargetHelper, public DragSourceHelper { private: @@ -71,7 +71,7 @@ private: public: - GalleryPreview(Window* pParent, + GalleryPreview(vcl::Window* pParent, WinBits nStyle = WB_TABSTOP | WB_BORDER, GalleryTheme* pTheme = NULL); diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index def4f9b01c17..4feff17a0f2c 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -181,8 +181,8 @@ protected: virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; virtual void ObjectReleased() SAL_OVERRIDE; - void CopyToClipboard( Window* pWindow ); - void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, + void CopyToClipboard( vcl::Window* pWindow ); + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ); }; diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index d7f36437d396..e36d804b13c9 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -216,8 +216,8 @@ public: SAL_DLLPRIVATE bool InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos ); - SAL_DLLPRIVATE void CopyToClipboard( Window* pWindow, sal_uIntPtr nPos ); - SAL_DLLPRIVATE void StartDrag( Window* pWindow, sal_uIntPtr nPos ); + SAL_DLLPRIVATE void CopyToClipboard( vcl::Window* pWindow, sal_uIntPtr nPos ); + SAL_DLLPRIVATE void StartDrag( vcl::Window* pWindow, sal_uIntPtr nPos ); public: diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index a5412f2b5985..acfd5f356cfa 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -68,7 +68,7 @@ public: virtual ~SvxGrafToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; @@ -160,7 +160,7 @@ public: virtual ~SvxGrafModeToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 1e04dc6d31c2..4e8060d77717 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -80,7 +80,7 @@ protected: public: - GraphCtrl( Window* pParent, WinBits nStyle ); + GraphCtrl( vcl::Window* pParent, WinBits nStyle ); virtual ~GraphCtrl(); void SetWinStyle( WinBits nWinBits ); diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 662b9b2501a2..3aaecfea60f3 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -142,7 +142,7 @@ public: class AbsolutePos : public NumericField { public: - AbsolutePos(Window* pParent, WinBits nStyle = 0); + AbsolutePos(vcl::Window* pParent, WinBits nStyle = 0); virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; @@ -182,7 +182,7 @@ public: RECORD_NEW }; - NavigationBar(Window* pParent, WinBits nStyle = 0); + NavigationBar(vcl::Window* pParent, WinBits nStyle = 0); // Status methods for Controls void InvalidateAll(sal_Int32 nCurrentPos = -1, bool bAll = false); @@ -366,7 +366,7 @@ protected: public: DbGridControl( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >, - Window* pParent, + vcl::Window* pParent, WinBits nBits = WB_BORDER); virtual ~DbGridControl(); diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 1569f9ed73d9..d7f15be412e2 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -31,7 +31,7 @@ namespace svx { - SVX_DLLPUBLIC bool ShowBorderBackgroundDlg( Window* pParent, SfxItemSet* pBBSet, + SVX_DLLPUBLIC bool ShowBorderBackgroundDlg( vcl::Window* pParent, SfxItemSet* pBBSet, bool bEnableBackgroundSelector ); } @@ -65,7 +65,7 @@ protected: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); + SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); FixedText* m_pPageLbl; CheckBox* m_pTurnOnBox; @@ -110,11 +110,11 @@ private: class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: - SvxHeaderPage( Window* pParent, const SfxItemSet& rSet ); + SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; // class SvxFooterPage --------------------------------------------------- @@ -122,17 +122,17 @@ private: class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: - SVX_DLLPRIVATE SvxFooterPage( Window* pParent, const SfxItemSet& rSet ); + SVX_DLLPRIVATE SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class SVX_DLLPUBLIC DeleteHeaderDialog : public MessageDialog { public: - DeleteHeaderDialog(Window *pParent) + DeleteHeaderDialog(vcl::Window *pParent) : MessageDialog(pParent, "DeleteHeaderDialog", "svx/ui/deleteheaderdialog.ui") { @@ -142,7 +142,7 @@ public: class SVX_DLLPUBLIC DeleteFooterDialog : public MessageDialog { public: - DeleteFooterDialog(Window *pParent) + DeleteFooterDialog(vcl::Window *pParent) : MessageDialog(pParent, "DeleteFooterDialog", "svx/ui/deletefooterdialog.ui") { diff --git a/include/svx/hyperdlg.hxx b/include/svx/hyperdlg.hxx index 4baa8e9807e0..86f02bfca409 100644 --- a/include/svx/hyperdlg.hxx +++ b/include/svx/hyperdlg.hxx @@ -37,7 +37,7 @@ private: AbstractSvxHpLinkDlg* mpDlg; public: - SvxHlinkDlgWrapper( Window*pParent, sal_uInt16 nId, + SvxHlinkDlgWrapper( vcl::Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW_WITHID(SvxHlinkDlgWrapper); diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 200fa88bdb31..76bc59fe4c53 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -47,7 +47,7 @@ class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public SfxChildWindow { public: - SvxIMapDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); + SvxIMapDlgChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW_WITHID( SvxIMapDlgChildWindow ); @@ -134,7 +134,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow public: SvxIMapDlg( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent ); + vcl::Window* pParent ); virtual ~SvxIMapDlg(); void SetExecState( bool bEnable ); diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 2bbb824b2d7e..0df5118feda8 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -46,7 +46,7 @@ class SvxLineBox : public LineLB void ReleaseFocus_Impl(); public: - SvxLineBox( Window* pParent, + SvxLineBox( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); virtual ~SvxLineBox(); @@ -84,7 +84,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SvxMetricField( Window* pParent, + SvxMetricField( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); virtual ~SvxMetricField(); @@ -99,7 +99,7 @@ public: class SvxFillTypeBox : public FillTypeLB { public: - SvxFillTypeBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); + SvxFillTypeBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); virtual ~SvxFillTypeBox(); void Selected() { bSelect = true; } @@ -122,7 +122,7 @@ private: class SvxFillAttrBox : public FillAttrLB { public: - SvxFillAttrBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); + SvxFillAttrBox( vcl::Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); virtual ~SvxFillAttrBox(); bool IsRelease() { return bRelease;} diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index 909c1c8d9984..da82e900453b 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -114,7 +114,7 @@ protected: class SVX_DLLPUBLIC SvxLanguageBox : public ListBox, public SvxLanguageBoxBase { public: - SvxLanguageBox( Window* pParent, WinBits nBits, bool bCheck = false ); + SvxLanguageBox( vcl::Window* pParent, WinBits nBits, bool bCheck = false ); virtual ~SvxLanguageBox(); private: @@ -141,7 +141,7 @@ private: class SVX_DLLPUBLIC SvxLanguageComboBox : public ComboBox, public SvxLanguageBoxBase { public: - SvxLanguageComboBox( Window* pParent, WinBits nBits, bool bCheck = false ); + SvxLanguageComboBox( vcl::Window* pParent, WinBits nBits, bool bCheck = false ); virtual ~SvxLanguageComboBox(); enum EditedAndValid diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index 4beb9bde5fce..c7c80a48b15a 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -52,7 +52,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; void Update( const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; @@ -69,7 +69,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; }; @@ -115,7 +115,7 @@ public: const OUString& rWndTitle ); SvxLineEndWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow, + vcl::Window* pParentWindow, const OUString& rWndTitle ); virtual ~SvxLineEndWindow(); diff --git a/include/svx/linkwarn.hxx b/include/svx/linkwarn.hxx index beb715452238..8fc66afffb18 100644 --- a/include/svx/linkwarn.hxx +++ b/include/svx/linkwarn.hxx @@ -30,7 +30,7 @@ private: CheckBox* m_pWarningOnBox; public: - SvxLinkWarningDialog(Window* pParent, const OUString& _rFileName); + SvxLinkWarningDialog(vcl::Window* pParent, const OUString& _rFileName); virtual ~SvxLinkWarningDialog(); }; diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index 2c037e2320a2..83161ca627ed 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -41,7 +41,7 @@ private: SdrModel* pModel; public: - SvxXMeasurePreview(Window* pParent, WinBits nStyle); + SvxXMeasurePreview(vcl::Window* pParent, WinBits nStyle); virtual ~SvxXMeasurePreview(); virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index ff64b4850175..eefdcb9c8ed7 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -66,7 +66,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet com::sun::star::container::XIndexAccess> > aOutlineSettings; public: - SvxNumValueSet(Window* pParent, WinBits nWinBits = WB_TABSTOP); + SvxNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP); void init(sal_uInt16 nType); virtual ~SvxNumValueSet(); @@ -105,7 +105,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet Timer& GetFormatTimer() {return aFormatTimer;} public: - SvxBmpNumValueSet(Window* pParent, WinBits nWinBits = WB_TABSTOP); + SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP); virtual ~SvxBmpNumValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 86e5e1d5ee96..1d6e62b6c0f5 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -100,9 +100,9 @@ class SVX_DLLPUBLIC SvxGridTabPage : public SfxTabPage using TabPage::DeactivatePage; public: - SvxGridTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxGridTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx index 7401b9153c6c..c7946c94c16d 100644 --- a/include/svx/orienthelper.hxx +++ b/include/svx/orienthelper.hxx @@ -68,7 +68,7 @@ public: TRISTATE_TRUE: Window always disabled, if stacked text is turned on. TRISTATE_FALSE: Window always disabled, if stacked text is turned off. TRISTATE_INDET: Window will be enabled/disabled independent from stacked text. */ - void AddDependentWindow( Window& rWindow, TriState eDisableIfStacked = TRISTATE_INDET ); + void AddDependentWindow( vcl::Window& rWindow, TriState eDisableIfStacked = TRISTATE_INDET ); /** Enables or disables the dial control and all dependent windows. */ void Enable( bool bEnable = true ); diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index ee1ffbb030f5..8b6da4dd29f0 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -27,7 +27,7 @@ class SvxBoxItem; // class SvxPageWindow --------------------------------------------------- -class SVX_DLLPUBLIC SvxPageWindow : public Window +class SVX_DLLPUBLIC SvxPageWindow : public vcl::Window { using Window::GetBorder; @@ -87,7 +87,7 @@ protected: const Rectangle& rDefineRange); public: - SvxPageWindow( Window* pParent ); + SvxPageWindow( vcl::Window* pParent ); virtual ~SvxPageWindow(); //UUUU diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index a67f6f07eeb4..bfbd6a2687bc 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -37,7 +37,7 @@ enum SvxPrevLineSpace // class SvxParaPrevWindow ----------------------------------------------- -class SVX_DLLPUBLIC SvxParaPrevWindow : public Window +class SVX_DLLPUBLIC SvxParaPrevWindow : public vcl::Window { using Window::Draw; private: @@ -68,7 +68,7 @@ protected: void DrawParagraph( bool bAll ); public: - SvxParaPrevWindow( Window* pParent, WinBits nBits); + SvxParaPrevWindow( vcl::Window* pParent, WinBits nBits); void SetFirstLineOfst( short nNew ) { nFirstLineOfst = nNew; } void SetLeftMargin( long nNew ) { nLeftMargin = nNew; } diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index 3b2f95800d5b..920fa19c7c68 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -51,7 +51,7 @@ private: DECL_LINK(EditModifyHdl, void *); public: - SvxPasswordDialog( Window* pParent, bool bAllowEmptyPasswords = false, bool bDisableOldPassword = false ); + SvxPasswordDialog( vcl::Window* pParent, bool bAllowEmptyPasswords = false, bool bDisableOldPassword = false ); virtual ~SvxPasswordDialog(); OUString GetOldPassword() const { return m_pOldPasswdED->GetText(); } diff --git a/include/svx/pfiledlg.hxx b/include/svx/pfiledlg.hxx index 39599affb16b..0b4e52ce733b 100644 --- a/include/svx/pfiledlg.hxx +++ b/include/svx/pfiledlg.hxx @@ -36,7 +36,7 @@ private: public: // with nKind = SID_INSERT_SOUND or // nKind = SID_INSERT_VIDEO - SvxPluginFileDlg (Window *pParent, sal_uInt16 nKind ); + SvxPluginFileDlg (vcl::Window *pParent, sal_uInt16 nKind ); ~SvxPluginFileDlg (); ErrCode Execute(); diff --git a/include/svx/prtqry.hxx b/include/svx/prtqry.hxx index 3a1446610639..afe6b9b6d85a 100644 --- a/include/svx/prtqry.hxx +++ b/include/svx/prtqry.hxx @@ -25,7 +25,7 @@ class SVX_DLLPUBLIC SvxPrtQryBox : public MessBox { public: - SvxPrtQryBox(Window* pParent); + SvxPrtQryBox(vcl::Window* pParent); virtual ~SvxPrtQryBox(); }; diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx index 91fb36d6d709..d5825d7ffbe0 100644 --- a/include/svx/relfld.hxx +++ b/include/svx/relfld.hxx @@ -40,7 +40,7 @@ protected: void Modify() SAL_OVERRIDE; public: - SvxRelativeField(Window* pParent, WinBits nBits, FieldUnit eUnit); + SvxRelativeField(vcl::Window* pParent, WinBits nBits, FieldUnit eUnit); void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150, sal_uInt16 nStep = 5 ); diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index c9daaaa85811..bd605a17778e 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -40,14 +40,14 @@ namespace com{namespace sun{namespace star{ class SvxRubyDialog; -class RubyPreview : public Window +class RubyPreview : public vcl::Window { protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; SvxRubyDialog* m_pParentDlg; public: - RubyPreview(Window *pParent); + RubyPreview(vcl::Window *pParent); void setRubyDialog(SvxRubyDialog* pParentDlg) { m_pParentDlg = pParentDlg; @@ -59,7 +59,7 @@ class SVX_DLLPUBLIC SvxRubyChildWindow : public SfxChildWindow { public: - SvxRubyChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); + SvxRubyChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW( SvxRubyChildWindow ); @@ -72,11 +72,11 @@ class RubyEdit : public Edit virtual void GetFocus() SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - RubyEdit(Window* pParent, const ResId& rResId) + RubyEdit(vcl::Window* pParent, const ResId& rResId) : Edit(pParent, rResId) { } - RubyEdit(Window* pParent) + RubyEdit(vcl::Window* pParent) : Edit(pParent, WB_BORDER) { } @@ -161,7 +161,7 @@ protected: public: SvxRubyDialog(SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent); + vcl::Window* pParent); virtual ~SvxRubyDialog(); virtual void Activate() SAL_OVERRIDE; diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index fee6b3c855b5..96f301229928 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -57,7 +57,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener boost::scoped_ptr<SvxColumnItem> mpColumnItem; // columns boost::scoped_ptr<SvxObjectItem> mpObjectItem; // object - Window* pEditWin; + vcl::Window* pEditWin; boost::scoped_ptr<SvxRuler_Impl> mpRulerImpl; @@ -251,7 +251,7 @@ public: #define SVXRULER_SUPPORT_PARAGRAPH_MARGINS_VERTICAL 0x0040 #define SVXRULER_SUPPORT_REDUCED_METRIC 0x0080 //shorten the context menu to select metric - SvxRuler(Window* pParent, Window *pEditWin, sal_uInt16 nRulerFlags, + SvxRuler(vcl::Window* pParent, vcl::Window *pEditWin, sal_uInt16 nRulerFlags, SfxBindings &rBindings, WinBits nWinStyle = WB_STDRULER); virtual ~SvxRuler(); diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 0f2de215415f..11824be41b17 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -46,10 +46,10 @@ public: SVX_DLLPRIVATE virtual ~SvxTableController(); // from sdr::SelectionController - SVX_DLLPRIVATE virtual bool onKeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; SVX_DLLPRIVATE virtual bool DeleteMarked() SAL_OVERRIDE; @@ -134,12 +134,12 @@ private: SVX_DLLPRIVATE void MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow ); - SVX_DLLPRIVATE void EditCell( const CellPos& rPos, ::Window* pWindow, const ::com::sun::star::awt::MouseEvent* pMouseEvent = 0, sal_uInt16 nAction = 0 ); + SVX_DLLPRIVATE void EditCell( const CellPos& rPos, vcl::Window* pWindow, const ::com::sun::star::awt::MouseEvent* pMouseEvent = 0, sal_uInt16 nAction = 0 ); SVX_DLLPRIVATE bool StopTextEdit(); - SVX_DLLPRIVATE sal_uInt16 getKeyboardAction( const KeyEvent& rKEvt, Window* pWindow ); - SVX_DLLPRIVATE bool executeAction( sal_uInt16 nAction, bool bSelect, Window* pWindow ); - SVX_DLLPRIVATE void gotoCell( const CellPos& rCell, bool bSelect, Window* pWindow, sal_uInt16 nAction = 0 ); + SVX_DLLPRIVATE sal_uInt16 getKeyboardAction( const KeyEvent& rKEvt, vcl::Window* pWindow ); + SVX_DLLPRIVATE bool executeAction( sal_uInt16 nAction, bool bSelect, vcl::Window* pWindow ); + SVX_DLLPRIVATE void gotoCell( const CellPos& rCell, bool bSelect, vcl::Window* pWindow, sal_uInt16 nAction = 0 ); SVX_DLLPRIVATE void StartSelection( const CellPos& rPos ); SVX_DLLPRIVATE void UpdateSelection( const CellPos& rPos ); diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index abdbcc016d72..ca65289bf220 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -44,7 +44,7 @@ namespace sdr /// paint the transparent children of rWin that overlap rPixelRect /// (for example, transparent form controls like check boxes) void SVX_DLLPUBLIC -PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect); +PaintTransparentChildren(vcl::Window & rWindow, Rectangle const& rPixelRect); class SdrPreRenderDevice diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx index 9836527459df..98532141ae87 100644 --- a/include/svx/selectioncontroller.hxx +++ b/include/svx/selectioncontroller.hxx @@ -28,7 +28,7 @@ class KeyEvent; class MouseEvent; -class Window; +namespace vcl { class Window; } class SfxItemSet; class SfxRequest; class SfxStyleSheet; @@ -41,10 +41,10 @@ namespace sdr class SVX_DLLPUBLIC SelectionController: public cppu::OWeakObject { public: - virtual bool onKeyInput(const KeyEvent& rKEvt, Window* pWin); - virtual bool onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin); - virtual bool onMouseButtonUp(const MouseEvent& rMEvt, Window* pWin); - virtual bool onMouseMove(const MouseEvent& rMEvt, Window* pWin); + virtual bool onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWin); + virtual bool onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin); + virtual bool onMouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin); + virtual bool onMouseMove(const MouseEvent& rMEvt, vcl::Window* pWin); virtual void onSelectionHasChanged(); diff --git a/include/svx/sidebar/ColorControl.hxx b/include/svx/sidebar/ColorControl.hxx index 8888dcbd66d1..87ebf3013e67 100644 --- a/include/svx/sidebar/ColorControl.hxx +++ b/include/svx/sidebar/ColorControl.hxx @@ -26,7 +26,7 @@ #include <boost/function.hpp> #include <svx/SvxColorValueSet.hxx> -class Window; +namespace vcl { class Window; } class SfxBindings; class RedId; class FloatingWindow; @@ -58,7 +58,7 @@ public: When zero is given then no such field is created. */ ColorControl ( - Window* pParent, + vcl::Window* pParent, SfxBindings* pBindings, const ResId& rControlResId, const ResId& rValueSetResId, diff --git a/include/svx/sidebar/ColorPopup.hxx b/include/svx/sidebar/ColorPopup.hxx index 12e99342da88..3226be019e32 100644 --- a/include/svx/sidebar/ColorPopup.hxx +++ b/include/svx/sidebar/ColorPopup.hxx @@ -38,7 +38,7 @@ class SVX_DLLPUBLIC ColorPopup { public : ColorPopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); virtual ~ColorPopup (void); diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index 13b6086b63fd..9e8b90aac1fe 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -30,7 +30,7 @@ private: DECL_DLLPRIVATE_LINK( ImplHandlePanelLayoutTimerHdl, void* ); public: - PanelLayout(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> &rFrame); virtual ~PanelLayout(); diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx index e5e23b88ce48..c5a1eee729dd 100644 --- a/include/svx/sidebar/Popup.hxx +++ b/include/svx/sidebar/Popup.hxx @@ -26,7 +26,7 @@ #include <boost/function.hpp> #include <boost/scoped_ptr.hpp> -class Window; +namespace vcl { class Window; } class ToolBox; namespace svx { namespace sidebar { @@ -51,7 +51,7 @@ public : PopupControl). */ Popup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator, const ::rtl::OUString& rsAccessibleName); virtual ~Popup (void); @@ -90,7 +90,7 @@ protected: virtual void CreateContainerAndControl (void); private: - Window* mpParent; + vcl::Window* mpParent; ::boost::function<PopupControl*(PopupContainer*)> maControlCreator; ::boost::function<void(void)> maPopupModeEndCallback; const ::rtl::OUString msAccessibleName; diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx index b9ed9286704c..f8f6f524573f 100644 --- a/include/svx/sidebar/PopupContainer.hxx +++ b/include/svx/sidebar/PopupContainer.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC PopupContainer : public FloatingWindow { public: - PopupContainer (Window* pParent); + PopupContainer (vcl::Window* pParent); virtual ~PopupContainer (void); virtual bool Notify (NotifyEvent& rNEvt) SAL_OVERRIDE; diff --git a/include/svx/sidebar/PopupControl.hxx b/include/svx/sidebar/PopupControl.hxx index ccc361f910a8..84bed5af5870 100644 --- a/include/svx/sidebar/PopupControl.hxx +++ b/include/svx/sidebar/PopupControl.hxx @@ -36,7 +36,7 @@ class SVX_DLLPUBLIC PopupControl { public : PopupControl ( - Window* pParent, + vcl::Window* pParent, const ResId& rResId); virtual ~PopupControl (void); diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx index c897e9e4051a..a77d0f412419 100644 --- a/include/svx/sidebar/SidebarDialControl.hxx +++ b/include/svx/sidebar/SidebarDialControl.hxx @@ -28,7 +28,7 @@ namespace svx { namespace sidebar { class SVX_DLLPUBLIC SidebarDialControl : public svx::DialControl { public: - SidebarDialControl (Window* pParent, WinBits nBits = 0); + SidebarDialControl (vcl::Window* pParent, WinBits nBits = 0); virtual ~SidebarDialControl (void); virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx index 5542e2bac2cb..4cb6fbd9c5bc 100644 --- a/include/svx/sidebar/ValueSetWithTextControl.hxx +++ b/include/svx/sidebar/ValueSetWithTextControl.hxx @@ -65,7 +65,7 @@ public: ValueSetWithTextControl( const tControlType eControlType, - Window* pParent, + vcl::Window* pParent, const ResId& rResId); virtual ~ValueSetWithTextControl(void); @@ -129,7 +129,7 @@ class SVX_DLLPUBLIC SvxNumValueSet2 : public ValueSet public: - SvxNumValueSet2( Window* pParent, const ResId& rResId); + SvxNumValueSet2( vcl::Window* pParent, const ResId& rResId); virtual ~SvxNumValueSet2(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; @@ -146,7 +146,7 @@ class SVX_DLLPUBLIC SvxNumValueSet2 : public ValueSet class SVX_DLLPUBLIC SvxNumValueSet3 : public ValueSet { public: - SvxNumValueSet3( Window* pParent, const ResId& rResId); + SvxNumValueSet3( vcl::Window* pParent, const ResId& rResId); virtual ~SvxNumValueSet3(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 7ec864e14544..15d221bcd773 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -91,7 +91,7 @@ class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow { SvxSearchDialog *dialog; public: - SvxSearchDialogWrapper( Window*pParent, sal_uInt16 nId, + SvxSearchDialogWrapper( vcl::Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); virtual ~SvxSearchDialogWrapper (); @@ -118,7 +118,7 @@ friend class SvxSearchDialogWrapper; friend class SvxJSearchOptionsDialog; public: - SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ); + SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ); virtual ~SvxSearchDialog(); virtual bool Close() SAL_OVERRIDE; @@ -138,8 +138,8 @@ public: sal_Int32 GetTransliterationFlags() const; - void SetDocWin( Window* pDocWin ) { mpDocWin = pDocWin; } - Window* GetDocWin() { return mpDocWin; } + void SetDocWin( vcl::Window* pDocWin ) { mpDocWin = pDocWin; } + vcl::Window* GetDocWin() { return mpDocWin; } void SetSrchFlag( bool bSuccess = false ) { mbSuccess = bSuccess; } bool GetSrchFlag() { return mbSuccess; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > @@ -150,7 +150,7 @@ public: void SetSearchLabel(const OUString& rStr) { m_pSearchLabel->SetText(rStr); } private: - Window* mpDocWin; + vcl::Window* mpDocWin; bool mbSuccess; VclFrame* m_pSearchFrame; diff --git a/include/svx/stddlg.hxx b/include/svx/stddlg.hxx index 44ef8246b864..9251475d4194 100644 --- a/include/svx/stddlg.hxx +++ b/include/svx/stddlg.hxx @@ -27,7 +27,7 @@ class SVX_DLLPUBLIC SvxStandardDialog: public SfxModalDialog { public: - SvxStandardDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + SvxStandardDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~SvxStandardDialog(); short Execute() SAL_OVERRIDE; diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index 64130cd3b954..5a5730c7c8de 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -82,7 +82,7 @@ public: virtual void BrkAction() SAL_OVERRIDE; virtual void TakeActionRect(Rectangle& rRect) const SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; void SetMeasureLayer(const OUString& rName) { aMeasureLayer=rName; } const OUString& GetMeasureLayer() const { return aMeasureLayer; } diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 1e6c1348d044..70f661237e2d 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -66,12 +66,12 @@ protected: SdrPageView* pTextEditPV; SdrOutliner* pTextEditOutliner; // Na eben der Outliner fuers TextEdit OutlinerView* pTextEditOutlinerView; // die aktuelle View des Outliners - Window* pTextEditWin; // passendes Win zu pTextEditOutlinerView + vcl::Window* pTextEditWin; // passendes Win zu pTextEditOutlinerView vcl::Cursor* pTextEditCursorMerker; // Zum Restaurieren des Cursors am jeweiligen Win ImpSdrEditPara* pEditPara; // Da hau' ich erstmal alles rein um kompatibel zu bleiben... SdrObject* pMacroObj; SdrPageView* pMacroPV; - Window* pMacroWin; + vcl::Window* pMacroWin; Rectangle aTextEditArea; Rectangle aMinTextEditArea; @@ -102,11 +102,11 @@ protected: // provide their document UndoManager and derive it from SdrUndoManager. virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const; - OutlinerView* ImpFindOutlinerView(Window* pWin) const; + OutlinerView* ImpFindOutlinerView(vcl::Window* pWin) const; // Eine neue OutlinerView auf dem Heap anlegen und alle erforderlichen Parameter setzen. // pTextEditObj, pTextEditPV und pTextEditOutliner muessen initiallisiert sein. - OutlinerView* ImpMakeOutlinerView(Window* pWin, bool bNoPaint, OutlinerView* pGivenView) const; + OutlinerView* ImpMakeOutlinerView(vcl::Window* pWin, bool bNoPaint, OutlinerView* pGivenView) const; void ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectangle& rRect, OutputDevice& rTargetDevice) const; void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const; @@ -172,7 +172,7 @@ public: // dieser Instanz und ausserdem auch den StatusEventHdl. // Ebenso kann eine spezifische OutlinerView vorgegeben werden. - virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, bool bIsNewObj = false, + virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, vcl::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true); // bDontDeleteReally ist ein Spezialparameter fuer den Writer. @@ -203,8 +203,8 @@ public: virtual SdrPageView* GetTextEditPageView() const SAL_OVERRIDE; // Das aktuelle Win des Outliners - Window* GetTextEditWin() const { return pTextEditWin; } - void SetTextEditWin(Window* pWin); + vcl::Window* GetTextEditWin() const { return pTextEditWin; } + void SetTextEditWin(vcl::Window* pWin); // An den hier abgeholten Outliner kann man schliesslich // Events versenden, Attribute setzen, Cut/Copy/Paste rufen, @@ -214,11 +214,11 @@ public: const OutlinerView* GetTextEditOutlinerView() const { return pTextEditOutlinerView; } OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; } - virtual bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool Command(const CommandEvent& rCEvt, Window* pWin) SAL_OVERRIDE; + virtual bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool Command(const CommandEvent& rCEvt, vcl::Window* pWin) SAL_OVERRIDE; // #97766# make virtual to change implementation e.g. for SdOutlineView virtual sal_uInt16 GetScriptType() const; @@ -245,8 +245,8 @@ public: // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==sal_True). void SetMacroMode(bool bOn) { bMacroMode=bOn; } bool IsMacroMode() const { return bMacroMode; } - bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin); - bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); } + bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin); + bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); } void MovMacroObj(const Point& rPnt); void BrkMacroObj(); bool EndMacroObj(); diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index d49e71b0ede4..165a7f8ff517 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_SVDGLUE_HXX #define INCLUDED_SVX_SVDGLUE_HXX -class Window; +namespace vcl { class Window; } class OutputDevice; class SvStream; class SdrObject; @@ -92,7 +92,7 @@ public: sal_uInt16 GetVertAlign() const { return nAlign&0xFF00; } void SetVertAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); } bool IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; - void Invalidate(Window& rWin, const SdrObject* pObj) const; + void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const; Point GetAbsolutePos(const SdrObject& rObj) const; void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj); long GetAlignAngle() const; @@ -130,7 +130,7 @@ public: const SdrGluePoint& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } sal_uInt16 FindGluePoint(sal_uInt16 nId) const; sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack = false, bool bNext = false, sal_uInt16 nId0=0) const; - void Invalidate(Window& rWin, const SdrObject* pObj) const; + void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt void SetReallyAbsolute(bool bOn, const SdrObject& rObj); void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj); diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 5f9435baf6e1..5d59a1c20df7 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -36,7 +36,7 @@ class VirtualDevice; class OutputDevice; class Region; -class Window; +namespace vcl { class Window; } class SdrHdlList; class SdrMarkView; class SdrObject; diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 5de8fa0db933..fe6742afaa05 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -147,7 +147,7 @@ protected: virtual void SetMarkRects(); // Rects at the PageViews virtual void CheckMarked(); // Scan MarkList after Del and Lock Layer ... virtual void AddDragModeHdl(SdrDragMode eMode); - virtual bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; // add custom handles (used by other apps, e.g. AnchorPos) virtual void AddCustomHdl(); diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 57475455553b..0a796da753ba 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -124,7 +124,7 @@ public: */ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > GetTemporaryControlForWindow( - const Window& _rWindow, + const vcl::Window& _rWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const; diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index c248e8c83de9..1c63d3faede7 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -439,8 +439,8 @@ public: // Wenn die View kein Invalidate() an den Fenstern durchfuehren soll, muss // man diese beiden folgenden Methoden ueberladen und entsprechend anders // reagieren. - virtual void InvalidateOneWin(Window& rWin); - virtual void InvalidateOneWin(Window& rWin, const Rectangle& rRect); + virtual void InvalidateOneWin(vcl::Window& rWin); + virtual void InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect); void SetActiveLayer(const OUString& rName) { aAktLayer=rName; } const OUString& GetActiveLayer() const { return aAktLayer; } @@ -477,15 +477,15 @@ public: // Default=FALSE. Flag ist nicht persistent. bool IsSwapAsynchron() const { return bSwapAsynchron; } void SetSwapAsynchron(bool bJa=true) { bSwapAsynchron=bJa; } - virtual bool KeyInput(const KeyEvent& rKEvt, Window* pWin); + virtual bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin); - virtual bool MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return false; } - virtual bool MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return false; } - virtual bool MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return false; } - virtual bool Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return false; } + virtual bool MouseButtonDown(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; } + virtual bool MouseButtonUp(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; } + virtual bool MouseMove(const MouseEvent& /*rMEvt*/, vcl::Window* /*pWin*/) { return false; } + virtual bool Command(const CommandEvent& /*rCEvt*/, vcl::Window* /*pWin*/) { return false; } bool Cut(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; } bool Yank(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; } - bool Paste(Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; } + bool Paste(vcl::Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; } /* new interface src537 */ bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const; @@ -494,7 +494,7 @@ public: SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const; bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); - virtual void MakeVisible(const Rectangle& rRect, Window& rWin); + virtual void MakeVisible(const Rectangle& rRect, vcl::Window& rWin); // Fuer PlugIn. Wird vom Paint des OLE-Obj gerufen. virtual void DoConnect(SdrOle2Obj* pOleObj); @@ -519,8 +519,8 @@ public: // bei bShow=sal_False wird der Browser destruiert #ifdef DBG_UTIL void ShowItemBrowser(bool bShow=true); - bool IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); } - Window* GetItemBrowser() const { return (Window*)pItemBrowser; } + bool IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((vcl::Window*)pItemBrowser)->IsVisible(); } + vcl::Window* GetItemBrowser() const { return (vcl::Window*)pItemBrowser; } #endif // Muss von App beim Scrollen usw. gerufen werden, damit ein u.U. diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index 81debfd248df..fca5eb484505 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -194,11 +194,11 @@ public: void SetMasterPagePaintCaching(bool bOn); bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; } - bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - virtual bool Command(const CommandEvent& rCEvt, Window* pWin) SAL_OVERRIDE; + bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin) SAL_OVERRIDE; + virtual bool Command(const CommandEvent& rCEvt, vcl::Window* pWin) SAL_OVERRIDE; virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; @@ -270,17 +270,17 @@ public: // ~~~~~~~~~~~~~~~~~~~~ // Einfache Events: // ~~~~~~~~~~~~~~~~ -// sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); -// sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); -// sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); -// sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); -// sal_Bool Command(const CommandEvent& rCEvt, Window* pWin); +// sal_Bool KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin); +// sal_Bool MouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWin); +// sal_Bool MouseButtonUp(const MouseEvent& rMEvt, vcl::Window* pWin); +// sal_Bool MouseMove(const MouseEvent& rMEvt, vcl::Window* pWin); +// sal_Bool Command(const CommandEvent& rCEvt, vcl::Window* pWin); // // Exchange (Clipboard derzeit noch ohne SdrPrivateData): // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT); // sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT); -// sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT); +// sal_Bool Paste(vcl::Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT); // // SfxItems: // ~~~~~~~~~ diff --git a/include/svx/svdviter.hxx b/include/svx/svdviter.hxx index 4dfb92741602..56870623826f 100644 --- a/include/svx/svdviter.hxx +++ b/include/svx/svdviter.hxx @@ -34,7 +34,7 @@ Using this class, you can find out: - All PageViews in which a model is displayed - All PageViews in which a certain page is visible (also as MasterPage) - All PageViews in which a certain object is visible (also as MasterPage) -- Window* First/NextWindow() +- vcl::Window* First/NextWindow() - All Windows in which a model is displayed - All Windows in which a certain page is visible (also as MasterPage) - All Windows in which a certain object is visible (also as MasterPage) @@ -53,7 +53,7 @@ Not considered are: */ class OutputDevice; -class Window; +namespace vcl { class Window; } class SdrView; class SdrPageView; class SdrModel; diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx index f92a2f0c1f5b..2f7bd106c273 100644 --- a/include/svx/svdxcgv.hxx +++ b/include/svx/svdxcgv.hxx @@ -114,7 +114,7 @@ public: bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT ); - bool Paste( Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT ); + bool Paste( vcl::Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT ); bool PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 ); }; diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 06376c51711a..6ec31bef4251 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -42,7 +42,7 @@ namespace linguistic2{ }}}} class SvxSpellWrapper; -typedef SfxTabPage* (*CreateSvxDistributePage)(Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); +typedef SfxTabPage* (*CreateSvxDistributePage)(vcl::Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); typedef const sal_uInt16* (*DialogGetRanges)(); struct ExchangeData; @@ -86,7 +86,7 @@ class AbstractSpellDialog : public VclAbstractDialog virtual void SetLanguage( sal_uInt16 nLang ) = 0; virtual bool Close() = 0; virtual void Invalidate() = 0; - virtual Window* GetWindow() = 0; + virtual vcl::Window* GetWindow() = 0; virtual SfxBindings& GetBindings() = 0; }; @@ -215,7 +215,7 @@ public: class AbstractSvxHpLinkDlg : public VclAbstractDialog { public: - virtual Window* GetWindow() = 0; + virtual vcl::Window* GetWindow() = 0; virtual bool QueryClose() = 0; }; @@ -264,7 +264,7 @@ public: virtual void HideAuthor() = 0; virtual void SetReadonlyPostIt(bool bDisable) = 0; virtual bool IsOkEnabled() const = 0; - virtual Window * GetWindow() = 0; + virtual vcl::Window * GetWindow() = 0; }; class SvxAbstractSplittTableDialog : public VclAbstractDialog @@ -297,175 +297,175 @@ public: // define dtor as this will create typeinfo and in svx library and export vtable virtual ~SvxAbstractDialogFactory(); - virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent, + virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttrSet, SdrView* pView, SdrModel* pModel=0 ) = 0 ; - virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, + virtual AbstractSvxCaptionDialog* CreateCaptionDialog( vcl::Window* pParent, const SdrView* pView, sal_uInt16 nAnchorTypes = 0 ) = 0; - virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, + virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone)= 0; - virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0; + virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window* pParent ) = 0; - virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, + virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )=0; - virtual AbstractSpellDialog * CreateSvxSpellDialog(Window* pParent, + virtual AbstractSpellDialog * CreateSvxSpellDialog(vcl::Window* pParent, SfxBindings* pBindings, svx::SpellDialogChildWindow* pSpellChildWindow )=0; - virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, + virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( vcl::Window* pParent, GalleryTheme* pThm ) = 0; - virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, + virtual AbstractSearchProgress * CreateSearchProgressDialog( vcl::Window* pParent, const INetURLObject& rStartURL ) = 0; - virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ) = 0; - virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent, + virtual AbstractTakeProgress * CreateTakeProgressDialog( vcl::Window* pParent ) = 0; + virtual AbstractTitleDialog * CreateTitleDialog( vcl::Window* pParent, const OUString& rOldText ) = 0; - virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent, + virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ) = 0; - virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent, + virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet ) = 0; - virtual AbstractURLDlg * CreateURLDialog( Window* pParent, + virtual AbstractURLDlg * CreateURLDialog( vcl::Window* pParent, const OUString& rURL, const OUString& rAltText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ) = 0; virtual AbstractSvxHlinkDlgMarkWnd* CreateSvxHlinkDlgMarkWndDialog( SvxHyperlinkTabPageBase* pParent, sal_uInt32 nResId ) =0; - virtual SfxAbstractTabDialog* CreateTabItemDialog(Window* pParent, + virtual SfxAbstractTabDialog* CreateTabItemDialog(vcl::Window* pParent, const SfxItemSet& rSet) = 0; - virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, + virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges)=0; - virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, + virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( vcl::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, sal_uInt16 nLonger ) = 0; //UUUU add for SvxBorderBackgroundDlg virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bEnableSelector = false, bool bEnableDrawingLayerFillStyles = false) = 0; - virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, + virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, sal_uInt16 nAnchorTypes = 0) = 0; - virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, + virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pSdrView, sal_uInt32 nResId, bool bSizeTabPage = false )=0; - virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent, + virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( vcl::Window* pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags )=0; - virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) = 0; - virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, + virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) = 0; + virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) = 0; - virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( Window* pParent, + virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId) = 0; - virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent, + virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent, const OUString& rName, const OUString& rDesc ) = 0; // #i68101# - virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const OUString& rName ) = 0; - virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const OUString& rTitle, const OUString& rDescription) = 0; + virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(vcl::Window* pParent, const OUString& rName ) = 0; + virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(vcl::Window* pParent, const OUString& rTitle, const OUString& rDescription) = 0; - virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId, + virtual AbstractSvxMessDialog * CreateSvxMessDialog( vcl::Window* pParent, sal_uInt32 nResId, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ) = 0; - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(Window* pParent) = 0 ; - virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(Window* pParent) = 0 ; - virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog(vcl::Window* pParent) = 0 ; + virtual AbstractSvxMultiPathDialog * CreateSvxPathSelectDialog(vcl::Window* pParent) = 0 ; + virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings, sal_uInt32 nResId)=0; - virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, + virtual AbstractFmSearchDialog* CreateFmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss(vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterPoster(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSepia (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nCount)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSmooth (vcl::Window* pParent, const Graphic& rGraphic, double nRadius)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert)=0; - virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, + virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges)=0; - virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent, + virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow) = 0 ; - virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog + virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog SdrModel* pModel, const SdrObject* pObj = NULL, bool bHasObj = true )=0; - virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE = 0; - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, + virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE = 0; + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, sal_uInt32 nResId )=0; - virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, sal_uInt32 nResId )=0; - virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, + virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext = false) = 0; - virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE = 0; + virtual VclAbstractDialog* CreateSvxScriptOrgDialog( vcl::Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE = 0; virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() = 0; virtual DialogGetRanges GetDialogGetRangesFunc() = 0; virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( - Window* pParent, + vcl::Window* pParent, bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) SAL_OVERRIDE = 0; virtual VclAbstractDialog* CreateScriptErrorDialog( - Window* pParent, com::sun::star::uno::Any aException) SAL_OVERRIDE = 0; + vcl::Window* pParent, com::sun::star::uno::Any aException) SAL_OVERRIDE = 0; virtual VclAbstractDialog* CreateSvxMacroAssignDlg( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) = 0; - virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL )=0; + virtual SfxAbstractTabDialog* CreateSvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL )=0; - virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )=0; + virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( vcl::Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )=0; - virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) = 0; + virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( vcl::Window* pParent ) = 0; - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ) = 0; + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ) = 0; }; #endif diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx index b5de0c81f162..b6f698c0773f 100644 --- a/include/svx/swframeexample.hxx +++ b/include/svx/swframeexample.hxx @@ -27,7 +27,7 @@ // class SwFrmPagePreview ------------------------------------------------------- -class SVX_DLLPUBLIC SvxSwFrameExample : public Window +class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window { Color m_aTransColor; // transparency Color m_aBgCol; // background @@ -73,7 +73,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SvxSwFrameExample(Window* pParent, WinBits nStyle); + SvxSwFrameExample(vcl::Window* pParent, WinBits nStyle); virtual ~SvxSwFrameExample(); inline void SetWrap(sal_uInt16 nW) { nWrap = nW; } diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 3d2fa357d5b8..5b6a88fe782a 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -159,7 +159,7 @@ public: SvxStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxStyleToolBoxControl(); - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -209,7 +209,7 @@ public: virtual void StateChanged ( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow ( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow ( vcl::Window *pParent ) SAL_OVERRIDE; }; diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx index 2e88a2bb1aee..e0df5adeef38 100644 --- a/include/svx/txencbox.hxx +++ b/include/svx/txencbox.hxx @@ -33,7 +33,7 @@ private: SVX_DLLPRIVATE sal_Int32 EncodingToPos_Impl( rtl_TextEncoding nEnc ) const; public: - SvxTextEncodingBox( Window* pParent, WinBits nBits ); + SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits ); virtual ~SvxTextEncodingBox(); /** Fill with all known encodings but exclude those matching one or more diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx index 42a20ec8f5b1..2a702106d785 100644 --- a/include/svx/unoshtxt.hxx +++ b/include/svx/unoshtxt.hxx @@ -37,7 +37,7 @@ class SvxTextForwarder; class SdrObject; class SdrModel; class SdrView; -class Window; +namespace vcl { class Window; } class SvxTextEditSourceImpl; class SdrText; @@ -51,7 +51,7 @@ public: The window is necessary, since our views can display on multiple windows */ - SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const Window& rViewWindow ); + SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const vcl::Window& rViewWindow ); virtual ~SvxTextEditSource(); diff --git a/include/svx/wrapfield.hxx b/include/svx/wrapfield.hxx index 02b4f961bccd..ff7cf3ada785 100644 --- a/include/svx/wrapfield.hxx +++ b/include/svx/wrapfield.hxx @@ -32,7 +32,7 @@ namespace svx { class SVX_DLLPUBLIC WrapField : public NumericField { public: - explicit WrapField( Window* pParent, WinBits nBits ); + explicit WrapField( vcl::Window* pParent, WinBits nBits ); protected: /** Up event with wrap-around functionality. */ |