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 /cui/source/inc | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
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 'cui/source/inc')
72 files changed, 270 insertions, 270 deletions
diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx index ed1357658df2..b984838fa09c 100644 --- a/cui/source/inc/ControlFocusHelper.hxx +++ b/cui/source/inc/ControlFocusHelper.hxx @@ -29,7 +29,7 @@ private: Control* m_pFocusCtrl; public: - SvxControlFocusHelper( Window* pParent, const ResId& rId ) : + SvxControlFocusHelper( vcl::Window* pParent, const ResId& rId ) : Control( pParent, rId ), m_pFocusCtrl( NULL ) {} void SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; } diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index cd0179b88b79..5bbe67ab91de 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -75,7 +75,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SentenceEditWindow_Impl(Window* pParent, WinBits nBits); + SentenceEditWindow_Impl(vcl::Window* pParent, WinBits nBits); virtual ~SentenceEditWindow_Impl(); void SetModifyHdl(const Link& rLink) SAL_OVERRIDE { m_aModifyLink = rLink;} @@ -217,7 +217,7 @@ protected: public: SpellDialog( svx::SpellDialogChildWindow* pChildWindow, - Window * pParent, + vcl::Window * pParent, SfxBindings* pBindings); virtual ~SpellDialog(); diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index dd275a06dc96..72c45c2bc728 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -64,7 +64,7 @@ protected: virtual void Resize() SAL_OVERRIDE; public: - AboutDialog(Window* pParent); + AboutDialog(vcl::Window* pParent); DECL_LINK( HandleClick, PushButton* ); }; diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 7ece823d5b88..88d096f8425f 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -62,7 +62,7 @@ protected: const Image&, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE; public: - SfxAccCfgTabListBox_Impl(Window *pParent, WinBits nStyle) + SfxAccCfgTabListBox_Impl(vcl::Window *pParent, WinBits nStyle) : SvTabListBox(pParent, nStyle) , m_pAccelConfigPage(NULL) { @@ -170,7 +170,7 @@ private: void CreateCustomItems( SvTreeListEntry* pEntry, const OUString& aCol1, const OUString& aCol2 ); public: - SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet ); + SfxAcceleratorConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SfxAcceleratorConfigPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 3aa641cbe318..bb249b5822ce 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -59,7 +59,7 @@ class AlignmentTabPage : public SfxTabPage public: virtual ~AlignmentTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -68,7 +68,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: - explicit AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreSet ); + explicit AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); void InitVsRefEgde(); void UpdateEnableControls(); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 5d70cc9d9fea..2ca4b4c440c7 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -52,7 +52,7 @@ class OfaAutoCorrDlg : public SfxTabDialog DECL_LINK(SelectLanguageHdl, ListBox*); public: - OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet); + OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet *pSet); void EnableLanguage(bool bEnable); }; @@ -108,9 +108,9 @@ private: OUString m_sAccidentalCaps; public: - OfaAutocorrOptionsPage(Window* pParent, const SfxItemSet& rSet); + OfaAutocorrOptionsPage(vcl::Window* pParent, const SfxItemSet& rSet); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -165,12 +165,12 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); - OfaSwAutoFmtOptionsPage( Window* pParent, + OfaSwAutoFmtOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaSwAutoFmtOptionsPage(); public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -185,9 +185,9 @@ class AutoCorrEdit : public Edit bool bSpaces; public: - AutoCorrEdit(Window* pParent, const ResId& rResId) : + AutoCorrEdit(vcl::Window* pParent, const ResId& rResId) : Edit(pParent, rResId), bSpaces(false){} - AutoCorrEdit(Window* pParent) : + AutoCorrEdit(vcl::Window* pParent) : Edit(pParent), bSpaces(false){} void SetActionHdl( const Link& rLink ) @@ -260,10 +260,10 @@ private: void setTabs(); public: - OfaAutocorrReplacePage( Window* pParent, const SfxItemSet& rSet ); + OfaAutocorrReplacePage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaAutocorrReplacePage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -318,10 +318,10 @@ private: LanguageType eOldLanguage, LanguageType eNewLanguage); public: - OfaAutocorrExceptPage( Window* pParent, const SfxItemSet& rSet ); + OfaAutocorrExceptPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaAutocorrExceptPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -383,11 +383,11 @@ private: SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); - OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaQuoteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~OfaQuoteTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -404,7 +404,7 @@ public: { OfaAutoCompleteTabPage* m_pPage; public: - AutoCompleteMultiListBox(Window *pParent, WinBits nBits) + AutoCompleteMultiListBox(vcl::Window *pParent, WinBits nBits) : MultiListBox(pParent, nBits) , m_pPage(NULL) { @@ -432,12 +432,12 @@ private: DECL_LINK( CheckHdl, CheckBox* ); - OfaAutoCompleteTabPage( Window* pParent, + OfaAutoCompleteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~OfaAutoCompleteTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -466,7 +466,7 @@ private: PushButton* m_pPropertiesPB; /// construction via Create() - OfaSmartTagOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + OfaSmartTagOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); /** Inserts items into m_aSmartTagTypesLB @@ -504,7 +504,7 @@ public: virtual ~OfaSmartTagOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 0402ecb85c0d..ab4145fcece1 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -46,13 +46,13 @@ class SvxBackgroundTabPage : public SvxTabPage { using TabPage::DeactivatePage; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; /// Shift-ListBox activation void ShowSelector(); @@ -67,7 +67,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: - SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet ); + SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~SvxBackgroundTabPage(); VclContainer* m_pAsGrid; diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx index f5fc9d242f88..ca5d43550925 100644 --- a/cui/source/inc/bbdlg.hxx +++ b/cui/source/inc/bbdlg.hxx @@ -28,7 +28,7 @@ class SvxBorderBackgroundDlg: public SfxTabDialog { public: - SvxBorderBackgroundDlg(Window *pParent, + SvxBorderBackgroundDlg(vcl::Window *pParent, const SfxItemSet& rCoreSet, bool bEnableSelector = false, bool bEnableDrawingLayerFillStyles = false); diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index e3e352b72af9..0a5aea5504b6 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -43,7 +43,7 @@ class SvxBorderTabPage : public SfxTabPage using TabPage::DeactivatePage; public: - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); static const sal_uInt16* GetRanges(); @@ -58,7 +58,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: - SvxBorderTabPage( Window* pParent, const SfxItemSet& rCoreAttrs ); + SvxBorderTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); virtual ~SvxBorderTabPage(); // Controls diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 6d786a227c35..ebbff4af7b1f 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -64,7 +64,7 @@ private: sal_uInt16 m_nEventsPageId; public: - SvxConfigDialog( Window*, const SfxItemSet* ); + SvxConfigDialog( vcl::Window*, const SfxItemSet* ); virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); @@ -321,7 +321,7 @@ protected: bool m_bIsInternalDrag; public: - SvxMenuEntriesListBox(Window*, SvxConfigPage*); + SvxMenuEntriesListBox(vcl::Window*, SvxConfigPage*); virtual ~SvxMenuEntriesListBox(); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; @@ -390,7 +390,7 @@ protected: ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; - SvxConfigPage( Window*, const SfxItemSet& ); + SvxConfigPage( vcl::Window*, const SfxItemSet& ); DECL_LINK( MoveHdl, Button * ); @@ -481,7 +481,7 @@ private: void DeleteSelectedTopLevel() SAL_OVERRIDE; public: - SvxMenuConfigPage( Window *pParent, const SfxItemSet& rItemSet ); + SvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SvxMenuConfigPage(); SaveInData* CreateSaveInData( @@ -513,7 +513,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog public: SvxMainMenuOrganizerDialog ( - Window*, SvxEntries*, + vcl::Window*, SvxEntries*, SvxConfigEntry*, bool bCreateMenu = false ); virtual ~SvxMainMenuOrganizerDialog (); @@ -542,7 +542,7 @@ protected: public: - SvxToolbarEntriesListBox(Window* pParent, SvxToolbarConfigPage* pPg); + SvxToolbarEntriesListBox(vcl::Window* pParent, SvxToolbarConfigPage* pPg); virtual ~SvxToolbarEntriesListBox(); void SetChangedListener( const Link& aChangedListener ) @@ -582,7 +582,7 @@ private: void DeleteSelectedTopLevel() SAL_OVERRIDE; public: - SvxToolbarConfigPage( Window *pParent, const SfxItemSet& rItemSet ); + SvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet& rItemSet ); virtual ~SvxToolbarConfigPage(); SvTreeListEntry* AddFunction( SvTreeListEntry* pTarget = NULL, @@ -670,7 +670,7 @@ private: DECL_LINK(ModifyHdl, Edit*); public: - SvxNewToolbarDialog(Window* pWindow, const OUString& rName); + SvxNewToolbarDialog(vcl::Window* pWindow, const OUString& rName); ListBox* m_pSaveInListBox; @@ -733,7 +733,7 @@ private: public: SvxIconSelectorDialog( - Window *pWindow, + vcl::Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XImageManager >& rXImageManager, const ::com::sun::star::uno::Reference< @@ -754,12 +754,12 @@ class SvxIconReplacementDialog : public MessBox { public: SvxIconReplacementDialog( - Window *pWindow, + vcl::Window *pWindow, const OUString& aMessage, bool aYestoAll); SvxIconReplacementDialog( - Window *pWindow, + vcl::Window *pWindow, const OUString& aMessage ); OUString ReplaceIconName( const OUString& ); @@ -772,7 +772,7 @@ private: FixedImage* pFImageInfo; VclMultiLineEdit* pLineEditDescription; public: - SvxIconChangeDialog(Window *pWindow, const OUString& aMessage); + SvxIconChangeDialog(vcl::Window *pWindow, const OUString& aMessage); }; #endif // INCLUDED_CUI_SOURCE_INC_CFG_HXX diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index f14200363424..c2c124298101 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -111,7 +111,7 @@ class SfxConfigFunctionListBox : public SvTreeListBox virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: - SfxConfigFunctionListBox(Window*, WinBits nStyle); + SfxConfigFunctionListBox(vcl::Window*, WinBits nStyle); virtual ~SfxConfigFunctionListBox(); void ClearAll(); @@ -163,7 +163,7 @@ protected: virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE; public: - SfxConfigGroupListBox(Window* pParent, WinBits nStyle); + SfxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SfxConfigGroupListBox(); void ClearAll(); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index ab2841623eba..424a976b4df0 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -51,7 +51,7 @@ protected: bool m_bPreviewBackgroundToCharacter; - SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset); + SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset); virtual ~SvxCharBasePage(); @@ -113,7 +113,7 @@ private: SvxCharNamePage_Impl* m_pImpl; - SvxCharNamePage( Window* pParent, const SfxItemSet& rSet ); + SvxCharNamePage( vcl::Window* pParent, const SfxItemSet& rSet ); void Initialize(); const FontList* GetFontList() const; @@ -152,7 +152,7 @@ public: public: virtual ~SvxCharNamePage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -210,7 +210,7 @@ private: OUString m_aTransparentColorName; - SvxCharEffectsPage( Window* pParent, const SfxItemSet& rSet ); + SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxCharEffectsPage(); void Initialize(); @@ -231,7 +231,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -284,7 +284,7 @@ private: sal_uInt8 m_nSuperProp; sal_uInt8 m_nSubProp; - SvxCharPositionPage( Window* pParent, const SfxItemSet& rSet ); + SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxCharPositionPage(); void Initialize(); @@ -310,7 +310,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; @@ -334,7 +334,7 @@ private: sal_uInt16 m_nStartBracketPosition; sal_uInt16 m_nEndBracketPosition; - SvxCharTwoLinesPage(Window* pParent, const SfxItemSet& rSet); + SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxCharTwoLinesPage(); void UpdatePreview_Impl(); @@ -353,7 +353,7 @@ public: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index b0e034ea16f3..e66fcd65f9f2 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -60,10 +60,10 @@ private: public: - SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttrs ); + SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxConnectionPage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -79,7 +79,7 @@ public: class SvxConnectionDialog : public SfxSingleTabDialog { public: - SvxConnectionDialog( Window* pParent, const SfxItemSet& rAttr, + SvxConnectionDialog( vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView ); virtual ~SvxConnectionDialog(); }; diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 0c982672ce74..a4d95279c2ac 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -39,7 +39,7 @@ namespace svx class SvxShowText : public Control { public: - SvxShowText( Window* pParent, + SvxShowText( vcl::Window* pParent, bool bCenter = false ); virtual ~SvxShowText(); @@ -97,7 +97,7 @@ private: void fillAllSubsets(ListBox &rListBox); public: - SvxCharacterMap( Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 ); + SvxCharacterMap( vcl::Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 ); virtual ~SvxCharacterMap(); void DisableFontSelection(); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 84fabd0d5eeb..d163b3d44b6f 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -76,7 +76,7 @@ class FmSearchDialog : public ModalDialog OUString m_sSearch; OUString m_sCancel; - Window* m_pPreSearchFocus; + vcl::Window* m_pPreSearchFocus; Link m_lnkFoundHandler; ///< Handler for "found" Link m_lnkCanceledNotFoundHdl; ///< Handler for Positioning the Cursors @@ -107,7 +107,7 @@ public: (of course needed : the string number i in strUsedFields of a context must correspond with the interface number i in the arrFields of the context) */ - FmSearchDialog(Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, + FmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link& lnkContextSupplier); virtual ~FmSearchDialog(); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 8106bc725973..83f234f9724c 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -83,7 +83,7 @@ private: FixedText* m_pFtSearchDir; FixedText* m_pFtSearchType; CancelButton* m_pBtnCancel; - Window * parent_; + vcl::Window * parent_; INetURLObject startUrl_; rtl::Reference< SearchThread > maSearchThread; @@ -91,7 +91,7 @@ private: void Terminate(); public: - SearchProgress( Window* pParent, const INetURLObject& rStartURL ); + SearchProgress( vcl::Window* pParent, const INetURLObject& rStartURL ); virtual ~SearchProgress() {}; DECL_LINK( CleanUpHdl, void* ); @@ -127,7 +127,7 @@ class TakeProgress : public ModalDialog private: FixedText* m_pFtTakeFile; CancelButton* m_pBtnCancel; - Window * window_; + vcl::Window * window_; rtl::Reference< TakeThread > maTakeThread; TokenList_impl maTakenList; @@ -136,7 +136,7 @@ private: public: - TakeProgress( Window* pWindow ); + TakeProgress( vcl::Window* pWindow ); DECL_LINK( CleanUpHdl, void* ); @@ -159,7 +159,7 @@ private: DECL_LINK( ActualizeHdl, INetURLObject* pURL ); public: - ActualizeProgress( Window* pWindow, GalleryTheme* pThm ); + ActualizeProgress( vcl::Window* pWindow, GalleryTheme* pThm ); virtual ~ActualizeProgress() {}; virtual short Execute() SAL_OVERRIDE; @@ -170,7 +170,7 @@ class TitleDialog : public ModalDialog private: Edit* m_pEdit; public: - TitleDialog(Window* pParent, const OUString& rOldText); + TitleDialog(vcl::Window* pParent, const OUString& rOldText); OUString GetTitle() const { return m_pEdit->GetText(); } }; @@ -184,7 +184,7 @@ private: DECL_LINK( ClickOkHdl, void* ); DECL_LINK( ClickResNameHdl, void* ); public: - GalleryIdDialog( Window* pParent, GalleryTheme* pThm ); + GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); sal_uLong GetId() const { return m_pLbResName->GetSelectEntryPos(); } }; @@ -198,7 +198,7 @@ class GalleryThemeProperties : public SfxTabDialog virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE; public: - GalleryThemeProperties(Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet); + GalleryThemeProperties(vcl::Window* pParent, ExchangeData* pData, SfxItemSet* pItemSet); }; class TPGalleryThemeGeneral : public SfxTabPage @@ -219,13 +219,13 @@ private: public: - TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& rSet ); + TPGalleryThemeGeneral( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~TPGalleryThemeGeneral() {} void SetXChgData( ExchangeData* pData ); const ExchangeData* GetXChgData() const { return pData; } - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); }; typedef ::std::vector< FilterEntry* > FilterEntryList_impl; @@ -284,7 +284,7 @@ class TPGalleryThemeProperties : public SfxTabPage DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); public: - TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ); + TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet ); virtual ~TPGalleryThemeProperties(); void SetXChgData( ExchangeData* pData ); @@ -292,7 +292,7 @@ public: void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); }; #endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index f501472c7560..f4faabb50960 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -50,7 +50,7 @@ private: public: - GraphicPreviewWindow(Window* pParent, WinBits nStyle); + GraphicPreviewWindow(vcl::Window* pParent, WinBits nStyle); void init(const Graphic* pOrigGraphic, const Link& rLink) { mpOrigGraphic = pOrigGraphic; @@ -84,7 +84,7 @@ protected: public: - GraphicFilterDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic); + GraphicFilterDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0; }; @@ -101,7 +101,7 @@ private: public: - GraphicFilterSmooth( Window* pParent, const Graphic& rGraphic, double nRadius); + GraphicFilterSmooth( vcl::Window* pParent, const Graphic& rGraphic, double nRadius); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; double GetRadius() const { return mpMtrRadius->GetValue() / 10.0; } @@ -120,7 +120,7 @@ private: public: - GraphicFilterMosaic(Window* pParent, const Graphic& rGraphic, + GraphicFilterMosaic(vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; @@ -141,7 +141,7 @@ private: public: - GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, + GraphicFilterSolarize( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; @@ -158,7 +158,7 @@ class GraphicFilterSepia : public GraphicFilterDialog private: MetricField* mpMtrSepia; public: - GraphicFilterSepia( Window* pParent, const Graphic& rGraphic, + GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; sal_uInt16 GetSepiaPercent() const @@ -176,7 +176,7 @@ class GraphicFilterPoster : public GraphicFilterDialog private: NumericField* mpNumPoster; public: - GraphicFilterPoster( Window* pParent, const Graphic& rGraphic, + GraphicFilterPoster( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterColorCount ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; @@ -194,7 +194,7 @@ private: virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; public: - EmbossControl(Window* pParent) + EmbossControl(vcl::Window* pParent) : SvxRectCtl(pParent) {} void SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; } @@ -205,7 +205,7 @@ class GraphicFilterEmboss : public GraphicFilterDialog private: EmbossControl* mpCtlLight; public: - GraphicFilterEmboss( Window* pParent, const Graphic& rGraphic, + GraphicFilterEmboss( vcl::Window* pParent, const Graphic& rGraphic, RECT_POINT eLightSource ); virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 244c195ce817..8ef2930ae952 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -78,7 +78,7 @@ protected: void Apply(); public: - SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings ); + SvxHpLinkDlg (vcl::Window* pParent, SfxBindings* pBindings ); virtual ~SvxHpLinkDlg (); virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx index 2a22bc5b3312..3266a2a3449c 100644 --- a/cui/source/inc/cuiimapwnd.hxx +++ b/cui/source/inc/cuiimapwnd.hxx @@ -41,7 +41,7 @@ class URLDlg : public ModalDialog public: - URLDlg( Window* pWindow, + URLDlg( vcl::Window* pWindow, const OUString& rURL, const OUString& rAlternativeText, const OUString& rDescription, const OUString& rTarget, const OUString& rName, TargetList& rTargetList ); diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 49a3f0637016..86190a8c0ce3 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -64,10 +64,10 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; public: - SvxGeneralTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxGeneralTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxGeneralTabPage (); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 660e3c79eb9a..10b3b5bccd11 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -44,7 +44,7 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ); public: - SvxJSearchOptionsDialog(Window *pParent, + SvxJSearchOptionsDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags); // Window diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index adc998ad08cc..5bfbe3cc0044 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -75,7 +75,7 @@ protected: void SavePalettes(); public: - SvxAreaTabDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow ); + SvxAreaTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, bool bShadow ); virtual ~SvxAreaTabDialog(); void SetNewColorList( XColorListRef pColTab ) @@ -159,17 +159,17 @@ class SvxTransparenceTabPage : public SvxTabPage void InvalidatePreview (bool bEnable = true ); public: - SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs); + SvxTransparenceTabPage(vcl::Window* pParent, const SfxItemSet& rInAttrs); void Construct(); - static SfxTabPage* Create(Window*, const SfxItemSet*); + static SfxTabPage* Create(vcl::Window*, const SfxItemSet*); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE; - virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; + virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; } @@ -288,18 +288,18 @@ private: void ClickBitmapHdl_Impl(); public: - SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetGradientList( XGradientListRef pGrdLst) @@ -354,17 +354,17 @@ private: DECL_LINK( ModifyShadowHdl_Impl, void * ); public: - SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } @@ -433,11 +433,11 @@ private: void SetControlState_Impl( XGradientStyle eXGS ); public: - SvxGradientTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxGradientTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -509,18 +509,18 @@ private: long CheckChanges_Impl(); public: - SvxHatchTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxHatchTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetHatchingList( XHatchListRef pHtchLst) @@ -594,19 +594,19 @@ private: long CheckChanges_Impl(); public: - SvxBitmapTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxBitmapTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxBitmapTabPage(); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; } void SetBitmapList( XBitmapListRef pBmpLst) { pBitmapList = pBmpLst; } @@ -627,7 +627,7 @@ public: Return a label control that provides a name for the specified control. */ - virtual Window* GetParentLabeledBy( const Window* pLabeled ) const SAL_OVERRIDE; + virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabeled ) const SAL_OVERRIDE; }; /************************************************************************/ @@ -729,12 +729,12 @@ private: void UpdateModified(); public: - SvxColorTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxColorTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxColorTabPage(); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 83aac99004f3..bc4fffcd48bf 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -61,7 +61,7 @@ protected: void SavePalettes(); public: - SvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, + SvxLineTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel, const SdrObject* pObj = NULL, bool bHasObj = true ); virtual ~SvxLineTabDialog(); @@ -202,12 +202,12 @@ public: void ShowSymbolControls(bool bOn); - SvxLineTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxLineTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxLineTabPage(); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -216,7 +216,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; @@ -301,11 +301,11 @@ private: void CheckChanges_Impl(); public: - SvxLineDefTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxLineDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -370,12 +370,12 @@ private: void CheckChanges_Impl(); public: - SvxLineEndDefTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxLineEndDefTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxLineEndDefTabPage(); void Construct(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 42e905ee73f3..1f2b34d616db 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -32,7 +32,7 @@ public: NumericField* m_pRecordNo; public: - FmInputRecordNoDialog(Window * pParent); + FmInputRecordNoDialog(vcl::Window * pParent); void SetValue(long dNew) { m_pRecordNo->SetValue(dNew); } long GetValue() const { return static_cast<long>(m_pRecordNo->GetValue()); } diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 37cf8b5e8c3b..f35f2adb57c8 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -89,10 +89,10 @@ namespace svx #endif public: - DbRegistrationOptionsPage( Window* pParent, const SfxItemSet& rSet ); + DbRegistrationOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~DbRegistrationOptionsPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -128,7 +128,7 @@ namespace svx ,public SfxSingleTabDialog { public: - DatabaseRegistrationDialog( Window* pParent, const SfxItemSet& rAttr ); + DatabaseRegistrationDialog( vcl::Window* pParent, const SfxItemSet& rAttr ); virtual ~DatabaseRegistrationDialog(); virtual short Execute() SAL_OVERRIDE; diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index a4a306f564f1..e6d9ea26c9fd 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -39,7 +39,7 @@ private: DECL_LINK(ModifyHdl, void *); public: - SvxNameDialog( Window* pWindow, const OUString& rName, const OUString& rDesc ); + SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ); void GetName( OUString& rName ){rName = pEdtName->GetText();} @@ -87,7 +87,7 @@ private: public: // constructor - SvxObjectNameDialog(Window* pWindow, const OUString& rName); + SvxObjectNameDialog(vcl::Window* pWindow, const OUString& rName); // data access void GetName(OUString& rName) {rName = pEdtName->GetText(); } @@ -117,7 +117,7 @@ private: public: // constructor - SvxObjectTitleDescDialog(Window* pWindow, const OUString& rTitle, const OUString& rDesc); + SvxObjectTitleDescDialog(vcl::Window* pWindow, const OUString& rTitle, const OUString& rDesc); // data access void GetTitle(OUString& rTitle) {rTitle = pEdtTitle->GetText(); } @@ -138,7 +138,7 @@ private: DECL_LINK(Button2Hdl, void *); public: - SvxMessDialog( Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ); + SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ); virtual ~SvxMessDialog(); void SetButtonText( sal_uInt16 nBtnId, const OUString& rNewTxt ); diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index ad54f935ff4d..e0be5f3dd87e 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -41,15 +41,15 @@ class SvxDistributePage : public SvxTabPage RadioButton* m_pBtnVerBottom; public: - SvxDistributePage(Window* pWindow, const SfxItemSet& rInAttrs, + SvxDistributePage(vcl::Window* pWindow, const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); - static SfxTabPage* Create(Window*, const SfxItemSet&, + static SfxTabPage* Create(vcl::Window*, const SfxItemSet&, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE; virtual void Reset(const SfxItemSet*) SAL_OVERRIDE; - virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; + virtual void PointChanged(vcl::Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE; SvxDistributeHorizontal GetDistributeHor() const { return m_eDistributeHor; } SvxDistributeVertical GetDistributeVer() const { return m_eDistributeVer; } @@ -60,7 +60,7 @@ class SvxDistributeDialog : public SfxSingleTabDialog SvxDistributePage* mpPage; public: - SvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, + SvxDistributeDialog(vcl::Window* pParent, const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index e10d09bfedf0..8d7392ac26ac 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -26,14 +26,14 @@ #include <vcl/graph.hxx> #include <sfx2/tabdlg.hxx> -class SvxCropExample : public Window +class SvxCropExample : public vcl::Window { Size aFrameSize; Point aTopLeft, aBottomRight; Graphic aGrf; public: - SvxCropExample( Window* pPar, WinBits nStyle ); + SvxCropExample( vcl::Window* pPar, WinBits nStyle ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; @@ -93,7 +93,7 @@ class SvxGrfCropPage : public SfxTabPage bool bSetOrigSize; - SvxGrfCropPage( Window *pParent, const SfxItemSet &rSet ); + SvxGrfCropPage( vcl::Window *pParent, const SfxItemSet &rSet ); virtual ~SvxGrfCropPage(); DECL_LINK( ZoomHdl, MetricField * ); @@ -111,7 +111,7 @@ class SvxGrfCropPage : public SfxTabPage Size GetGrfOrigSize( const Graphic& ) const; public: - static SfxTabPage *Create( Window *pParent, const SfxItemSet *rSet ); + static SfxTabPage *Create( vcl::Window *pParent, const SfxItemSet *rSet ); virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index cbee8ef6b0d7..4cea2af82cd2 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -41,7 +41,7 @@ namespace svx class SuggestionSet : public ValueSet { public: - SuggestionSet( Window* pParent ); + SuggestionSet( vcl::Window* pParent ); virtual ~SuggestionSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; @@ -51,7 +51,7 @@ namespace svx class SuggestionDisplay : public Control { public: - SuggestionDisplay( Window* pParent, WinBits nBits ); + SuggestionDisplay( vcl::Window* pParent, WinBits nBits ); virtual ~SuggestionDisplay(); void DisplayListBox( bool bDisplayListBox ); @@ -134,7 +134,7 @@ namespace svx public: HangulHanjaConversionDialog( - Window* _pParent, + vcl::Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); virtual ~HangulHanjaConversionDialog( ); @@ -220,7 +220,7 @@ namespace svx void Init( void ); ///< reads settings from core and init controls public: - HangulHanjaOptionsDialog( Window* _pParent ); + HangulHanjaOptionsDialog( vcl::Window* _pParent ); virtual ~HangulHanjaOptionsDialog(); void AddDict( const OUString& _rName, bool _bChecked ); @@ -238,7 +238,7 @@ namespace svx DECL_LINK( OKHdl, void* ); DECL_LINK( ModifyHdl, void* ); public: - HangulHanjaNewDictDialog( Window* _pParent ); + HangulHanjaNewDictDialog( vcl::Window* _pParent ); bool GetName( OUString& _rRetName ) const; }; @@ -256,7 +256,7 @@ namespace svx bool ShouldScroll( bool _bUp ) const; void DoJump( bool _bUp ); public: - SuggestionEdit( Window* pParent, WinBits nBits ); + SuggestionEdit( vcl::Window* pParent, WinBits nBits ); virtual ~SuggestionEdit(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void init( ScrollBar* pScrollBar, SuggestionEdit* pPrev, SuggestionEdit* pNext); @@ -310,7 +310,7 @@ namespace svx bool DeleteEntryFromDictionary( const OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict ); public: - HangulHanjaEditDictDialog( Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); + HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); virtual ~HangulHanjaEditDictDialog(); void UpdateScrollbar( void ); diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 18b22a252c18..f536a1d77b57 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -33,7 +33,7 @@ protected: DECL_LINK( HeaderEndDrag_Impl, HeaderBar* ); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - MacroEventListBox( Window* pParent, WinBits nStyle ); + MacroEventListBox( vcl::Window* pParent, WinBits nStyle ); virtual void Resize() SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 04159107b07b..98731d7e6172 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -50,10 +50,10 @@ protected: SvxLinkInsertMode& eMode ) SAL_OVERRIDE; public: - SvxHyperlinkNewDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkNewDocTp (); - static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual bool AskApply () SAL_OVERRIDE; virtual void DoApply () SAL_OVERRIDE; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index ea69d978a6e7..1b7e3525840d 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -66,10 +66,10 @@ protected: OUString GetCurrentURL (); public: - SvxHyperlinkDocTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkDocTp (); - static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE; diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index 11f1eb8d4c30..e11b74456b32 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -77,10 +77,10 @@ protected: virtual void SetMarkWndShouldOpen (bool bOpen) SAL_OVERRIDE {mbMarkWndOpen=bOpen;} public: - SvxHyperlinkInternetTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + SvxHyperlinkInternetTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkInternetTp (); - static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual void SetMarkStr ( const OUString& aStrMark ) SAL_OVERRIDE; diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 9a366bc10684..44aacc78453d 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -55,10 +55,10 @@ protected: SvxLinkInsertMode& eMode ) SAL_OVERRIDE; public: - SvxHyperlinkMailTp ( Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); + SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet); virtual ~SvxHyperlinkMailTp (); - static IconChoicePage* Create( Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); + static IconChoicePage* Create( vcl::Window* pWindow, IconChoiceDialog* pDlg, const SfxItemSet& rItemSet ); virtual void SetInitFocus() SAL_OVERRIDE; }; diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index b858f51f54d9..2108beb587b4 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -42,7 +42,7 @@ private: SvxHlinkDlgMarkWnd* mpParentWnd; public: - SvxHlmarkTreeLBox(Window* pParent, WinBits nStyle); + SvxHlmarkTreeLBox(vcl::Window* pParent, WinBits nStyle); void SetParentWnd(SvxHlinkDlgMarkWnd* pParent) { diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index d63bd1c563ca..02e42c5e7e71 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -59,7 +59,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE ); + SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart = INET_PROT_FILE ); }; @@ -79,7 +79,7 @@ private: mxDocumentFrame; protected: - Window* mpDialog; + vcl::Window* mpDialog; bool mbStdControlsInit; @@ -111,7 +111,7 @@ protected: public: SvxHyperlinkTabPageBase ( - Window *pParent, + vcl::Window *pParent, IconChoiceDialog* pDlg, const OString& rID, const OUString& rUIXMLDescription, @@ -134,7 +134,7 @@ public: virtual void ActivatePage( const SfxItemSet& rItemSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - bool IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); } + bool IsMarkWndVisible () { return ((vcl::Window*)mpMarkWnd)->IsVisible(); } Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); } bool MoveToExtraWnd ( Point aNewPos, bool bDisConnectDlg = false ); @@ -147,8 +147,8 @@ protected: virtual void SetMarkWndShouldOpen(bool bOpen); void ShowMarkWnd (); - void HideMarkWnd () { ( ( Window* ) mpMarkWnd )->Hide(); } - void InvalidateMarkWnd () { ( ( Window* ) mpMarkWnd )->Invalidate(); } + void HideMarkWnd () { ( ( vcl::Window* ) mpMarkWnd )->Hide(); } + void InvalidateMarkWnd () { ( ( vcl::Window* ) mpMarkWnd )->Invalidate(); } SfxDispatcher* GetDispatcher() const; diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index f4e4293ad958..4d0b7ba7c489 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -34,7 +34,7 @@ class SvxSpellWrapper; class HyphenEdit : public Edit { public: - HyphenEdit(Window* pParent); + HyphenEdit(vcl::Window* pParent); protected: virtual void KeyInput(const KeyEvent &rKEvt) SAL_OVERRIDE; @@ -82,7 +82,7 @@ class SvxHyphenWordDialog : public SfxModalDialog public: SvxHyphenWordDialog( const OUString &rWord, LanguageType nLang, - Window* pParent, + vcl::Window* pParent, css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ); virtual ~SvxHyphenWordDialog(); diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 8248a720c5ff..269e61d3e006 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -41,7 +41,7 @@ class IconChoiceDialog; class IconChoicePage; // Create-Function -typedef IconChoicePage* (*CreatePage)(Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet &rAttrSet); +typedef IconChoicePage* (*CreatePage)(vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet &rAttrSet); typedef const sal_uInt16* (*GetPageRanges)(); // gives international Which-value /// Data-structure for pages in dialog @@ -84,7 +84,7 @@ private : void ImplInitSettings(); protected : - IconChoicePage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ); + IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ); sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } sal_uInt16 GetWhich( sal_uInt16 nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } @@ -182,7 +182,7 @@ protected : public : // the IconChoiceCtrl's could also be set in the Ctor - IconChoiceDialog ( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + IconChoiceDialog ( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet * pItemSet = 0 ); virtual ~IconChoiceDialog (); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index bd793a7b0ece..f845ea80289a 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -44,7 +44,7 @@ protected: const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& m_xStorage; comphelper::EmbeddedObjectContainer aCnt; - InsertObjectDialog_Impl(Window * pParent, const OString& rID, + InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID, const OUString& rUIXMLDescription, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage); public: @@ -83,7 +83,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl { return m_pRbNewObject->IsChecked(); } public: - SvInsertOleDlg( Window* pParent, + SvInsertOleDlg( vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, const SvObjectServerList* pServers = NULL ); virtual short Execute() SAL_OVERRIDE; @@ -106,7 +106,7 @@ private: OUString GetPlugInOptions() const { return m_pEdPluginsOptions->GetText(); } public: - SvInsertPlugInDialog(Window* pParent, + SvInsertPlugInDialog(vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage); virtual ~SvInsertPlugInDialog(); virtual short Execute() SAL_OVERRIDE; @@ -139,9 +139,9 @@ private: void Init(); public: - SfxInsertFloatingFrameDialog(Window *pParent, + SfxInsertFloatingFrameDialog(vcl::Window *pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ); - SfxInsertFloatingFrameDialog( Window* pParent, + SfxInsertFloatingFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); virtual short Execute() SAL_OVERRIDE; }; diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 65932047dc04..012916b89423 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -42,7 +42,7 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog bool bColumn; public: - SvxInsRowColDlg( Window* pParent, bool bCol, const OString& sHelpId ); + SvxInsRowColDlg( vcl::Window* pParent, bool bCol, const OString& sHelpId ); virtual short Execute(void) SAL_OVERRIDE; diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 1b73b594c2eb..743ba930f0eb 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -73,9 +73,9 @@ private: const SdrView* pView; public: - SvxCaptionTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxCaptionTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -104,7 +104,7 @@ private: virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: - SvxCaptionTabDialog(Window* pParent, const SdrView* pView, + SvxCaptionTabDialog(vcl::Window* pParent, const SdrView* pView, sal_uInt16 nAnchorTypes = 0); /// link for the Writer to validate positions diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index f42889593a31..d5440bda7a1b 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -91,7 +91,7 @@ class SvBaseLinksDlg : public ModalDialog void SetManager( sfx2::LinkManager* ); public: - SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, bool bHtml = false ); + SvBaseLinksDlg( vcl::Window * pParent, sfx2::LinkManager*, bool bHtml = false ); virtual ~SvBaseLinksDlg(); void SetActLink( sfx2::SvBaseLink * pLink ); }; diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 988ff02abd9e..bdcd93c6f724 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -47,7 +47,7 @@ class _SfxMacroTabPage : public SfxTabPage protected: _SfxMacroTabPage_Impl* mpImpl; - _SfxMacroTabPage( Window* pParent, const SfxItemSet& rItemSet ); + _SfxMacroTabPage( vcl::Window* pParent, const SfxItemSet& rItemSet ); void InitAndSetHandler(); void FillEvents(); @@ -90,20 +90,20 @@ class SfxMacroTabPage : public _SfxMacroTabPage { public: SfxMacroTabPage( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet ); // --------- inherit from the base ------------- - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); }; class SfxMacroAssignDlg : public SfxSingleTabDialog { public: SfxMacroAssignDlg( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet ); }; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index 19ee9d2459f1..f151c36ba6e7 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -72,7 +72,7 @@ protected: bool bReadOnly, bDocModified, bAppEvents, bInitialized; EventDisplayNames aDisplayNames; - _SvxMacroTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet ); + _SvxMacroTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet ); void EnableButtons(); ::com::sun::star::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash ); @@ -97,7 +97,7 @@ class SvxMacroTabPage : public _SvxMacroTabPage { public: SvxMacroTabPage( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xNameReplace, @@ -112,7 +112,7 @@ typedef const sal_uInt16* (*GetTabPageRanges)(); // gives international Which-va class SvxMacroAssignSingleTabDialog : public SfxSingleTabDialog { public: - SvxMacroAssignSingleTabDialog(Window* pParent, const SfxItemSet& rOptionsSet); + SvxMacroAssignSingleTabDialog(vcl::Window* pParent, const SfxItemSet& rOptionsSet); private: DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * ); @@ -123,7 +123,7 @@ class SvxMacroAssignDlg : public SvxMacroAssignSingleTabDialog { public: SvxMacroAssignDlg( - Window* pParent, + vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& xNameReplace, diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 260937710207..a42ea5e7c4e4 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -64,16 +64,16 @@ private: public: - SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ); + SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxMeasurePage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } @@ -86,7 +86,7 @@ public: class SvxMeasureDialog : public SfxSingleTabDialog { public: - SvxMeasureDialog(Window* pParent, const SfxItemSet& rAttr, + SvxMeasureDialog(vcl::Window* pParent, const SfxItemSet& rAttr, const SdrView* pView); }; diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 095ce1ad3fe5..0508ff40aba1 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -49,7 +49,7 @@ private: DECL_LINK(CheckHdl_Impl, svx::SvxRadioButtonListBox*); public: - SvxMultiPathDialog(Window* pParent); + SvxMultiPathDialog(vcl::Window* pParent); virtual ~SvxMultiPathDialog(); OUString GetPath() const; @@ -68,7 +68,7 @@ private: DECL_LINK(SelectHdl_Impl, void *); public: - SvxPathSelectDialog(Window* pParent); + SvxPathSelectDialog(vcl::Window* pParent); virtual ~SvxPathSelectDialog(); OUString GetPath() const; diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 37d1ce46bd28..63ed48b9943b 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -33,7 +33,7 @@ private: NumericField* mpNumRows; public: - SvxNewTableDialog( Window* pWindow ); + SvxNewTableDialog( vcl::Window* pWindow ); virtual short Execute(void) SAL_OVERRIDE; virtual void Apply(void); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 10c311c2c8d5..0bbec43c9fe4 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -41,7 +41,7 @@ class vector; -class SvxNumberPreview : public Window +class SvxNumberPreview : public vcl::Window { private: OUString aPrevStr; @@ -56,7 +56,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - SvxNumberPreview(Window* pParent, WinBits nStyle = WB_BORDER); + SvxNumberPreview(vcl::Window* pParent, WinBits nStyle = WB_BORDER); void NotifyChange( const OUString& rPrevStr, const Color* pColor = NULL ); }; @@ -70,7 +70,7 @@ class SvxNumberFormatTabPage : public SfxTabPage public: virtual ~SvxNumberFormatTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); @@ -87,7 +87,7 @@ public: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; private: - SvxNumberFormatTabPage( Window* pParent, + SvxNumberFormatTabPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); FixedText* m_pFtCategory; ListBox* m_pLbCategory; @@ -128,7 +128,7 @@ private: OUString sAutomaticEntry; - Window* pLastActivWindow; + vcl::Window* pLastActivWindow; void Init_Impl(); void FillCurrencyBox(); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 5ead54c2c0bc..83987766ba73 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -38,7 +38,7 @@ class SvxBmpNumValueSet; class SvxNumValueSet; class SvxBrushItem; -class SvxNumberingPreview : public Window +class SvxNumberingPreview : public vcl::Window { const SvxNumRule* pActNum; vcl::Font aStdFont; @@ -51,7 +51,7 @@ class SvxNumberingPreview : public Window virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - SvxNumberingPreview(Window* pParent, WinBits nWinBits = WB_BORDER); + SvxNumberingPreview(vcl::Window* pParent, WinBits nWinBits = WB_BORDER); void SetNumRule(const SvxNumRule* pNum) {pActNum = pNum; Invalidate();}; @@ -106,11 +106,11 @@ class SvxSingleNumPickTabPage : public SfxTabPage DECL_LINK(DoubleClickHdl_Impl, void *); public: - SvxSingleNumPickTabPage(Window* pParent, + SvxSingleNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxSingleNumPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -142,11 +142,11 @@ class SvxBulletPickTabPage : public SfxTabPage DECL_LINK(NumSelectHdl_Impl, void *); DECL_LINK(DoubleClickHdl_Impl, void *); public: - SvxBulletPickTabPage(Window* pParent, + SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxBulletPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -185,11 +185,11 @@ class SvxNumPickTabPage : public SfxTabPage DECL_LINK(DoubleClickHdl_Impl, void *); public: - SvxNumPickTabPage(Window* pParent, + SvxNumPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -230,11 +230,11 @@ class SvxBitmapPickTabPage : public SfxTabPage DECL_LINK(LinkBmpHdl_Impl, void *); public: - SvxBitmapPickTabPage(Window* pParent, + SvxBitmapPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxBitmapPickTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -342,11 +342,11 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_STATIC_LINK( SvxNumOptionsTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* ); public: - SvxNumOptionsTabPage(Window* pParent, + SvxNumOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumOptionsTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; @@ -445,7 +445,7 @@ class SvxNumPositionTabPage : public SfxTabPage DECL_LINK( IndentAtHdl_Impl, MetricField* ); public: - SvxNumPositionTabPage(Window* pParent, + SvxNumPositionTabPage(vcl::Window* pParent, const SfxItemSet& rSet); virtual ~SvxNumPositionTabPage(); @@ -454,7 +454,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); void SetMetric(FieldUnit eSet); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index be965554cfcc..d2d182420783 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -52,12 +52,12 @@ class SvxAsianLayoutPage : public SfxTabPage DECL_LINK(ChangeStandardHdl, CheckBox*); DECL_LINK(ModifyHdl, Edit*); - SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ); + SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ); public: virtual ~SvxAsianLayoutPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 4e0a5779b2da..e26a4b37f253 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -63,7 +63,7 @@ private: DECL_LINK(ModifyHdl_Impl, void *); public: - SvxNewDictionaryDialog( Window* pParent, + SvxNewDictionaryDialog( vcl::Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ); @@ -80,9 +80,9 @@ class SvxDictEdit : public Edit bool bSpaces; public: - SvxDictEdit(Window* pParent, const ResId& rResId) : + SvxDictEdit(vcl::Window* pParent, const ResId& rResId) : Edit(pParent, rResId), bSpaces(false){} - SvxDictEdit(Window* pParent, WinBits aWB) : + SvxDictEdit(vcl::Window* pParent, WinBits aWB) : Edit(pParent, aWB), bSpaces(false){} void SetActionHdl( const Link& rLink ) @@ -148,7 +148,7 @@ protected: // virtual void Paint( const Rectangle& rRect ); public: - SvxEditDictionaryDialog( Window* pParent, + SvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl ); diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 8d31b7b3fb18..0a914642a354 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -84,7 +84,7 @@ class SvxEditModulesDlg : public ModalDialog DECL_LINK(OpenURLHdl_Impl, void *); public: - SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData); + SvxEditModulesDlg(vcl::Window* pParent, SvxLinguData_Impl& rData); virtual ~SvxEditModulesDlg(); }; @@ -130,7 +130,7 @@ private: SvxLinguData_Impl* pLinguData; - SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet ); + SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); @@ -148,7 +148,7 @@ private: public: virtual ~SvxLinguTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 0d4de78e4e61..8db65294ce6d 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -69,10 +69,10 @@ private: const OUString& _rUserPath, const OUString& _rWritablePath ); public: - SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxPathTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxPathTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index dcbdc212807f..d95220e13a15 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -178,7 +178,7 @@ private: void CheckMarginEdits( bool _bClear ); bool IsMarginOutOfRange(); - SvxPageDescPage( Window* pParent, const SfxItemSet& rSet ); + SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rSet ); //UUUU void EnableDrawingLayerFillStyles(bool bNew) { mbEnableDrawingLayerFillStyles = bNew; } @@ -188,7 +188,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE; diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 08a370acd4ef..4209e04339a6 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -48,7 +48,7 @@ class SvxStdParagraphTabPage: public SfxTabPage using TabPage::DeactivatePage; private: - SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxStdParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // indention SvxRelativeField* m_pLeftIndent; @@ -99,7 +99,7 @@ protected: public: DECL_LINK(ELRLoseFocusHdl, void *); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -153,14 +153,14 @@ class SvxParaAlignTabPage : public SfxTabPage void UpdateExample_Impl( bool bAll = false ); - SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxParaAlignTabPage(); protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -191,7 +191,7 @@ class SvxExtParagraphTabPage: public SfxTabPage public: virtual ~SvxExtParagraphTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); @@ -204,7 +204,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: - SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // hyphenation TriStateBox* m_pHyphenBox; @@ -263,7 +263,7 @@ class SvxAsianTabPage : public SfxTabPage CheckBox* m_pHangingPunctCB; CheckBox* m_pScriptSpaceCB; - SvxAsianTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); DECL_LINK( ClickHdl_Impl, CheckBox* ); @@ -271,7 +271,7 @@ public: virtual ~SvxAsianTabPage(); - static SfxTabPage* Create( Window* pParent, + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index c201c5f8f55a..1fe8c58551f8 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -37,7 +37,7 @@ class PasswordToOpenModifyDialog : public SfxModalDialog PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ); public: - PasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, + PasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */, bool bIsPasswordToModify ); virtual ~PasswordToOpenModifyDialog(); diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index a667ae5c914a..c7b815f764cb 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -54,7 +54,7 @@ class SvPasteObjectDialog : public ModalDialog DECL_LINK( DoubleClickHdl, ListBox * ); public: - SvPasteObjectDialog( Window* pParent ); + SvPasteObjectDialog( vcl::Window* pParent ); virtual ~SvPasteObjectDialog(); void Insert( SotFormatStringId nFormat, const OUString & rFormatName ); diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 1f0f200cdfe2..624649689e6a 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -43,7 +43,7 @@ class SvxPostItDialog : public SfxModalDialog { public: - SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, + SvxPostItDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext = false); virtual ~SvxPostItDialog(); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index f51c2f6dd365..3b7240675e13 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -75,7 +75,7 @@ public: void Init( const OUString& language ); void RequestSubEntries( SvTreeListEntry* pRootEntry, ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model ); - SFTreeListBox(Window* pParent); + SFTreeListBox(vcl::Window* pParent); virtual ~SFTreeListBox(); void ExpandAllTrees(); @@ -100,7 +100,7 @@ class CuiInputDialog : public ModalDialog private: Edit* m_pEdit; public: - CuiInputDialog(Window * pParent, sal_uInt16 nMode); + CuiInputDialog(vcl::Window * pParent, sal_uInt16 nMode); OUString GetObjectName() const { return m_pEdit->GetText(); } void SetObjectName(const OUString& rName) @@ -177,7 +177,7 @@ protected: public: // prob need another arg in the ctor // to specify the language or provider - SvxScriptOrgDialog( Window* pParent, const OUString& language ); + SvxScriptOrgDialog( vcl::Window* pParent, const OUString& language ); virtual ~SvxScriptOrgDialog(); virtual short Execute() SAL_OVERRIDE; @@ -195,7 +195,7 @@ private: public: SvxScriptErrorDialog( - Window* parent, ::com::sun::star::uno::Any aException ); + vcl::Window* parent, ::com::sun::star::uno::Any aException ); virtual ~SvxScriptErrorDialog(); diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx index bcae0d840c38..66080975ca5d 100644 --- a/cui/source/inc/sdrcelldlg.hxx +++ b/cui/source/inc/sdrcelldlg.hxx @@ -42,7 +42,7 @@ protected: virtual void Apply(); public: - SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ); + SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel ); virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 3f4c1f211a2d..b22b85e30f30 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -100,7 +100,7 @@ friend class SvxConfigGroupListBox; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: - SvxConfigFunctionListBox(Window* pParent, WinBits nStyle); + SvxConfigFunctionListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SvxConfigFunctionListBox(); void ClearAll(); OUString GetHelpText( SvTreeListEntry *pEntry ); @@ -160,7 +160,7 @@ protected: virtual bool Expand( SvTreeListEntry* pParent ) SAL_OVERRIDE; public: - SvxConfigGroupListBox(Window* pParent, WinBits nStyle); + SvxConfigGroupListBox(vcl::Window* pParent, WinBits nStyle); virtual ~SvxConfigGroupListBox(); void Init(bool bShowSlots, const ::com::sun::star::uno::Reference @@ -198,7 +198,7 @@ class SvxScriptSelectorDialog : public ModelessDialog public: SvxScriptSelectorDialog ( - Window* pParent = NULL, + vcl::Window* pParent = NULL, bool bShowSlots = false, const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >& xFrame = 0 diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index d43868a4f5da..dceddb7e3a00 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -41,7 +41,7 @@ class FmShowColsDialog : public ModalDialog ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xColumns; public: - FmShowColsDialog(Window* pParent); + FmShowColsDialog(vcl::Window* pParent); void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols); diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index 94c3b983f985..212559f32968 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -39,7 +39,7 @@ protected: virtual void Apply() SAL_OVERRIDE; public: - SvxSplitTableDlg(Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); + SvxSplitTableDlg(vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); virtual ~SvxSplitTableDlg(); DECL_LINK( ClickHdl, Button * ); diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index c81a79d86003..0965484c9c45 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -29,7 +29,7 @@ class SvxSearchFormatDialog : public SfxTabDialog { public: - SvxSearchFormatDialog( Window* pParent, const SfxItemSet& rSet ); + SvxSearchFormatDialog( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SvxSearchFormatDialog(); protected: @@ -48,7 +48,7 @@ private: class SvxSearchAttributeDialog : public ModalDialog { public: - SvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst, + SvxSearchAttributeDialog( vcl::Window* pParent, SearchAttrItemList& rLst, const sal_uInt16* pWhRanges ); private: @@ -71,7 +71,7 @@ private: CheckBox* m_pRelaxBox; public: - SvxSearchSimilarityDialog( Window* pParent, + SvxSearchSimilarityDialog( vcl::Window* pParent, bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 315fb57654a4..94f34aa489ac 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -122,10 +122,10 @@ class SvxSwPosSizeTabPage : public SfxTabPage void setOptimalRelWidth(); public: - SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxSwPosSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SvxSwPosSizeTabPage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index e5b64a687335..c5bf5475bdf8 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -50,7 +50,7 @@ class SvxTabulatorTabPage : public SfxTabPage public: virtual ~SvxTabulatorTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; @@ -62,7 +62,7 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: - SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet ); + SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); // tabulators and positions MetricBox* m_pTabBox; diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index f043b8583c97..2981c4ae8005 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -73,10 +73,10 @@ private: sal_uInt16 GetSelectedDirection(); public: - SvxTextAnimationPage( Window* pWindow, const SfxItemSet& rInAttrs ); + SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxTextAnimationPage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -101,7 +101,7 @@ private: public: - SvxTextTabDialog( Window* pParent, const SfxItemSet* pAttr, + SvxTextTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView ); virtual ~SvxTextTabDialog() {}; }; diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 1cac8d762b6a..4f67dbfb902f 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -74,16 +74,16 @@ private: public: - SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ); + SvxTextAttrPage( vcl::Window* pWindow, const SfxItemSet& rInAttrs ); virtual ~SvxTextAttrPage(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 4ab94e7c2bd6..95e712c2af6e 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -42,7 +42,7 @@ class LookUpComboBox : public ComboBox LookUpComboBox& operator = ( const LookUpComboBox & ); public: - LookUpComboBox(Window *pParent); + LookUpComboBox(vcl::Window *pParent); virtual ~LookUpComboBox(); DECL_LINK( ModifyTimer_Hdl, Timer * ); @@ -83,7 +83,7 @@ class ThesaurusAlternativesCtrl ThesaurusAlternativesCtrl & operator = ( const ThesaurusAlternativesCtrl & ); public: - ThesaurusAlternativesCtrl(Window* pParent); + ThesaurusAlternativesCtrl(vcl::Window* pParent); void init(SvxThesaurusDialog *pDialog); virtual ~ThesaurusAlternativesCtrl(); @@ -108,7 +108,7 @@ class ReplaceEdit : public Edit ReplaceEdit & operator = ( const ReplaceEdit & ); public: - ReplaceEdit(Window *pParent); + ReplaceEdit(vcl::Window *pParent); virtual ~ReplaceEdit(); void init(Button *pBtn) { m_pBtn = pBtn; } @@ -159,7 +159,7 @@ public: virtual void Apply() SAL_OVERRIDE; public: - SvxThesaurusDialog( Window* pParent, + SvxThesaurusDialog( vcl::Window* pParent, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, const OUString &rWord, LanguageType nLanguage ); virtual ~SvxThesaurusDialog(); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 6e388159673a..f4f692593fe1 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -59,7 +59,7 @@ private: public: - SvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr, + SvxTransformTabDialog( vcl::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView, sal_uInt16 nAnchorTypes = 0); virtual ~SvxTransformTabDialog(); @@ -145,9 +145,9 @@ private: void SetMaxSize( Rectangle aRect ); public: - SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -156,7 +156,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { mpView = pSdrView; } @@ -200,9 +200,9 @@ private: FieldUnit eDlgUnit; public: - SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxAngleTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -211,7 +211,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } @@ -244,9 +244,9 @@ private: FieldUnit eDlgUnit; public: - SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs ); + SvxSlantTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; @@ -255,7 +255,7 @@ public: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; - virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; + virtual void PointChanged( vcl::Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE; void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 447723d3ebb5..ac2d360734e6 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -196,10 +196,10 @@ protected: virtual short Execute() SAL_OVERRIDE; public: - OfaTreeOptionsDialog( Window* pParent, + OfaTreeOptionsDialog( vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame, bool bActivateLastSelection = true ); - OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId ); + OfaTreeOptionsDialog( vcl::Window* pParent, const OUString& rExtensionId ); virtual ~OfaTreeOptionsDialog(); OptionsPageInfo* AddTabPage( sal_uInt16 nId, const OUString& rPageName, sal_uInt16 nGroup ); @@ -272,7 +272,7 @@ private: public: ExtensionsTabPage( - Window* pParent, WinBits nStyle, + vcl::Window* pParent, WinBits nStyle, const OUString& rPageURL, const OUString& rEvtHdl, const com::sun::star::uno::Reference< com::sun::star::awt::XContainerWindowProvider >& rProvider ); diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 64c46b53ac42..a8b3176ddb56 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -55,7 +55,7 @@ private: DECL_LINK( OKHdl, Button* ); public: - SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ); + SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~SvxZoomDialog(); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } |