diff options
Diffstat (limited to 'include')
284 files changed, 1212 insertions, 1188 deletions
diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx index e7c16c8c67d9..52d351ec6e12 100644 --- a/include/avmedia/mediaplayer.hxx +++ b/include/avmedia/mediaplayer.hxx @@ -31,7 +31,7 @@ namespace avmedia class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow { public: - MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); + MediaPlayer( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); virtual ~MediaPlayer(); SFX_DECL_CHILDWINDOW_WITHID( MediaPlayer ); @@ -43,7 +43,7 @@ class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow { public: - MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, Window* pParent ); + MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, vcl::Window* pParent ); virtual ~MediaFloater(); void setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately ); diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx index 3e4d636ca7d0..4c512979288a 100644 --- a/include/avmedia/mediatoolbox.hxx +++ b/include/avmedia/mediatoolbox.hxx @@ -45,7 +45,7 @@ public: virtual ~MediaToolBoxControl(); 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; private: diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index a42e95efbc40..1ab2c0552fa6 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -32,7 +32,7 @@ #define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME -1.0 -class Window; +namespace vcl { class Window; } class KeyEvent; class MouseEvent; class CommandEvent; @@ -53,7 +53,7 @@ namespace avmedia class AVMEDIA_DLLPUBLIC MediaWindow { public: - MediaWindow( Window* parent, bool bInternalMediaControl ); + MediaWindow( vcl::Window* parent, bool bInternalMediaControl ); virtual ~MediaWindow(); void setURL( const OUString& rURL, const OUString& rReferer ); @@ -62,7 +62,7 @@ namespace avmedia bool isValid() const; Size getPreferredSize() const; - Window* getWindow() const; + vcl::Window* getWindow() const; void setPosSize( const Rectangle& rNewRect ); @@ -97,9 +97,9 @@ namespace avmedia static void getMediaFilters( FilterNameVector& rFilterNameVector ); /// @param o_pbLink if not 0, this is an "insert" dialog: display link /// checkbox and store its state in *o_pbLink - static bool executeMediaURLDialog( Window* pParent, + static bool executeMediaURLDialog( vcl::Window* pParent, OUString& rURL, bool *const o_pbLink ); - static void executeFormatErrorBox( Window* pParent ); + static void executeFormatErrorBox( vcl::Window* pParent ); static bool isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep = false, Size* pPreferredSizePixel = NULL ); static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 ); diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx index cb42627114ff..9d85248f9340 100644 --- a/include/cppcanvas/vclfactory.hxx +++ b/include/cppcanvas/vclfactory.hxx @@ -31,7 +31,7 @@ #include <cppcanvas/cppcanvasdllapi.h> -class Window; +namespace vcl { class Window; } class Bitmap; class BitmapEx; class Polygon; @@ -70,7 +70,7 @@ namespace cppcanvas BitmapCanvasSharedPtr createBitmapCanvas( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >& xCanvas ); - SpriteCanvasSharedPtr createSpriteCanvas( const ::Window& rVCLWindow ) const; + SpriteCanvasSharedPtr createSpriteCanvas( const vcl::Window& rVCLWindow ) const; SpriteCanvasSharedPtr createSpriteCanvas( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas >& xCanvas ) const; diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 448d864aba25..47292d09a7ac 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -32,7 +32,7 @@ class FixedLine; namespace dbaui { class IController; - class DBACCESS_DLLPUBLIC ODataView : public Window + class DBACCESS_DLLPUBLIC ODataView : public vcl::Window { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; // the service factory to work with @@ -42,7 +42,7 @@ namespace dbaui ::std::auto_ptr< ::svt::AcceleratorExecute> m_pAccel; public: - ODataView( Window* pParent, + ODataView( vcl::Window* pParent, IController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& , WinBits nStyle = 0 ); diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index e11098df228a..4bdd59c5d9af 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -65,7 +65,7 @@ namespace dbtools class SQLExceptionInfo; } -class Window; +namespace vcl { class Window; } namespace dbaui { class ODataView; @@ -424,7 +424,7 @@ namespace dbaui */ virtual void InvalidateAll(); // late construction - virtual bool Construct(Window* pParent); + virtual bool Construct(vcl::Window* pParent); /** get the layout manager @param _xFrame diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 715d519ec2ae..e10b7a1b826c 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -83,7 +83,7 @@ class Rectangle; class SvStream; class Link; class OutputDevice; -class Window; +namespace vcl { class Window; } class SfxPoolItem; class SvxNumBulletItem; class SvxBulletItem; @@ -142,7 +142,7 @@ private: EDITENG_DLLPRIVATE EditEngine( const EditEngine& ); EDITENG_DLLPRIVATE EditEngine& operator=( const EditEngine& ); - EDITENG_DLLPRIVATE bool PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, Window* pFrameWin = NULL ); + EDITENG_DLLPRIVATE bool PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, vcl::Window* pFrameWin = NULL ); EDITENG_DLLPRIVATE void CursorMoved(ContentNode* pPrevNode); EDITENG_DLLPRIVATE void CheckIdleFormatter(); diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 62c37d942cca..176de82f65e5 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -33,7 +33,7 @@ class ImpEditEngine; class ImpEditView; class SvxSearchItem; class SvxFieldItem; -class Window; +namespace vcl { class Window; } class Pointer; class KeyEvent; class MouseEvent; @@ -85,14 +85,14 @@ private: EDITENG_DLLPRIVATE EditView& operator=( const EditView& ); public: - EditView( EditEngine* pEng, Window* pWindow ); + EditView( EditEngine* pEng, vcl::Window* pWindow ); virtual ~EditView(); void SetEditEngine( EditEngine* pEditEngine ); EditEngine* GetEditEngine() const; - void SetWindow( Window* pWin ); - Window* GetWindow() const; + void SetWindow( vcl::Window* pWin ); + vcl::Window* GetWindow() const; void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 ); void Invalidate(); @@ -136,7 +136,7 @@ public: void InsertText( const OUString& rNew, bool bSelect = false ); - bool PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL ); + bool PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window* pFrameWin = NULL ); bool MouseButtonUp( const MouseEvent& rMouseEvent ); bool MouseButtonDown( const MouseEvent& rMouseEvent ); @@ -187,7 +187,7 @@ public: void SetAnchorMode( EVAnchorMode eMode ); EVAnchorMode GetAnchorMode() const; - void CompleteAutoCorrect( Window* pFrameWin = NULL ); + void CompleteAutoCorrect( vcl::Window* pFrameWin = NULL ); EESpellState StartSpeller( bool bMultipleDoc = false ); EESpellState StartThesaurus(); diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx index 6a2567909330..a767061454cb 100644 --- a/include/editeng/edtdlg.hxx +++ b/include/editeng/edtdlg.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace linguistic2 class XHyphenator; } } } } -class Window; +namespace vcl { class Window; } class ResId; class Link; class SvxSpellWrapper; @@ -42,7 +42,7 @@ class AbstractThesaurusDialog : public VclAbstractDialog public: virtual OUString GetWord() = 0; virtual sal_uInt16 GetLanguage() const = 0; - virtual Window* GetWindow() = 0; + virtual vcl::Window* GetWindow() = 0; }; class AbstractHyphenWordDialog : public VclAbstractDialog @@ -50,7 +50,7 @@ class AbstractHyphenWordDialog : public VclAbstractDialog public: virtual void SelLeft() = 0; virtual void SelRight() = 0; - virtual Window* GetWindow() = 0; + virtual vcl::Window* GetWindow() = 0; }; class AbstractHangulHanjaConversionDialog : public VclAbstractTerminatedDialog @@ -87,14 +87,14 @@ class EDITENG_DLLPUBLIC EditAbstractDialogFactory : virtual public VclAbstractDi public: virtual ~EditAbstractDialogFactory(); // needed for export of vtable static EditAbstractDialogFactory* Create(); - virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, + virtual AbstractThesaurusDialog* CreateThesaurusDialog( vcl::Window*, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, const OUString &rWord, sal_Int16 nLanguage ) = 0; - virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( Window*, + virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( vcl::Window*, const OUString &rWord, LanguageType nLang, css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) = 0; - virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, + virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( vcl::Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0; }; diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx index 178e6be93cd8..08f8b4e21ebc 100644 --- a/include/editeng/hangulhanja.hxx +++ b/include/editeng/hangulhanja.hxx @@ -110,7 +110,7 @@ namespace editeng public: HangulHanjaConversion( - Window* _pUIParent, + vcl::Window* _pUIParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::lang::Locale& _rSourceLocale, const ::com::sun::star::lang::Locale& _rTargetLocale, diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 18ac8316d799..5a020c147830 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -49,7 +49,7 @@ class SvxBulletItem; class SvxFont; class SvxSearchItem; class SvxFieldItem; -class Window; +namespace vcl { class Window; } class KeyEvent; class MouseEvent; class Pointer; @@ -203,7 +203,7 @@ private: EDITENG_DLLPRIVATE sal_Int32 ImpCalcSelectedPages( bool bIncludeFirstSelected ); public: - OutlinerView( Outliner* pOut, Window* pWindow ); + OutlinerView( Outliner* pOut, vcl::Window* pWindow ); virtual ~OutlinerView(); EditView& GetEditView() const { return *pEditView; } @@ -211,7 +211,7 @@ public: void Scroll( long nHorzScroll, long nVertScroll ); void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 ); - bool PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin = NULL ); + bool PostKeyEvent( const KeyEvent& rKEvt, vcl::Window* pFrameWin = NULL ); bool MouseButtonDown( const MouseEvent& ); bool MouseButtonUp( const MouseEvent& ); bool MouseMove( const MouseEvent& ); @@ -221,8 +221,8 @@ public: Outliner* GetOutliner() const { return pOwner; } - void SetWindow( Window* pWindow ); - Window* GetWindow() const; + void SetWindow( vcl::Window* pWindow ); + vcl::Window* GetWindow() const; void SetReadOnly( bool bReadOnly ); bool IsReadOnly() const; diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index 0039f440d101..2763be8ecaae 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenator; }}}} -class Window; +namespace vcl { class Window; } class SdrObject; // misc functions --------------------------------------------------------------- @@ -48,7 +48,7 @@ private: friend class SvxHyphenWordDialog; friend struct SvxHyphenWordDialog_Impl; - Window* pWin; + vcl::Window* pWin; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xLast; // result of last spelling/hyphenation attempt ::com::sun::star::uno::Reference< @@ -72,12 +72,12 @@ private: bool FindSpellError(); // Check for errors (over areas) public: - SvxSpellWrapper( Window* pWn, + SvxSpellWrapper( vcl::Window* pWn, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpellChecker, const bool bStart = false, const bool bIsAllRight = false, const bool bOther = false, const bool bRevAllow = true ); - SvxSpellWrapper( Window* pWn, + SvxSpellWrapper( vcl::Window* pWn, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphenator, const bool bStart = false, const bool bOther = false ); @@ -109,7 +109,7 @@ public: ::com::sun::star::linguistic2::XHyphenator > GetXHyphenator() { return xHyph; } inline bool IsAllRight() { return bAllRight; } - inline Window* GetWin() { return pWin; } + inline vcl::Window* GetWin() { return pWin; } inline void EnableAutoCorrect() { bAuto = true; } protected: diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index 9564de3b6ef3..aff3c036f4e3 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -40,7 +40,7 @@ class CharClass; class SfxPoolItem; class SvxAutoCorrect; class SfxObjectShell; -class Window; +namespace vcl { class Window; } struct CompareSvStringsISortDtor { @@ -291,7 +291,7 @@ public: // to the actual SwTxtNode/EditNode string because it inserts the character // in rDoc and expects that to side-effect rTxt sal_uLong DoAutoCorrect( SvxAutoCorrDoc& rDoc, const OUString& rTxt, - sal_Int32 nPos, sal_Unicode cInsChar, bool bInsert, Window* pFrameWin = NULL ); + sal_Int32 nPos, sal_Unicode cInsChar, bool bInsert, vcl::Window* pFrameWin = NULL ); // Return for the autotext expansion the previous word, // AutoCorrect - corresponding algorithm diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx index 8ed168f50c72..72d1567e7b9e 100644 --- a/include/editeng/unolingu.hxx +++ b/include/editeng/unolingu.hxx @@ -34,7 +34,7 @@ class LinguMgrExitLstnr; -class Window; +namespace vcl { class Window; } @@ -183,7 +183,7 @@ EDITENG_DLLPUBLIC ::com::sun::star::uno::Reference< // misc functions -EDITENG_DLLPUBLIC short SvxDicError( Window *pParent, sal_Int16 nError ); +EDITENG_DLLPUBLIC short SvxDicError( vcl::Window *pParent, sal_Int16 nError ); #endif diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 6aa3f4d4ed15..ed412c58ac64 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -50,7 +50,7 @@ class FORMULA_DLLPUBLIC FormulaModalDialog : public ModalDialog, public formul { friend class FormulaDlg_Impl; public: - FormulaModalDialog( Window* pParent + FormulaModalDialog( vcl::Window* pParent , bool _bSupportFunctionResult , bool _bSupportResult , bool _bSupportMatrix @@ -69,7 +69,7 @@ protected: ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( bool bForced = false ); - void SetFocusWin(Window *pWin,const OString& nUniqueId); + void SetFocusWin(vcl::Window *pWin,const OString& nUniqueId); void SetMeText(const OUString& _sText); void Update(); @@ -91,7 +91,7 @@ class FORMULA_DLLPUBLIC FormulaDlg: public: FormulaDlg( SfxBindings* pB , SfxChildWindow* pCW - , Window* pParent + , vcl::Window* pParent , bool _bSupportFunctionResult , bool _bSupportResult , bool _bSupportMatrix @@ -113,7 +113,7 @@ protected: ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( bool bForced = false ); - void SetFocusWin(Window *pWin,const OString& nUniqueId); + void SetFocusWin(vcl::Window *pWin,const OString& nUniqueId); void HighlightFunctionParas(const OUString& aFormula); void SetMeText(const OUString& _sText); diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index 5752cf078de8..097d73772bf5 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -34,7 +34,7 @@ class FORMULA_DLLPUBLIC RefEdit : public Edit private: Timer aTimer; IControlReferenceHandler* pAnyRefDlg; // parent dialog - Window* pLabelWidget; + vcl::Window* pLabelWidget; DECL_LINK( UpdateHdl, void* ); @@ -44,8 +44,8 @@ protected: virtual void LoseFocus() SAL_OVERRIDE; public: - RefEdit( Window* _pParent,IControlReferenceHandler* pParent, Window* pShrinkModeLabel, const ResId& rResId ); - RefEdit( Window* _pParent, Window* pShrinkModeLabel, WinBits nStyle = WB_BORDER ); + RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent, vcl::Window* pShrinkModeLabel, const ResId& rResId ); + RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits nStyle = WB_BORDER ); virtual ~RefEdit(); @@ -64,14 +64,14 @@ public: void StartUpdateData(); - void SetReferences( IControlReferenceHandler* pDlg, Window *pLabelWidget ); + void SetReferences( IControlReferenceHandler* pDlg, vcl::Window *pLabelWidget ); IControlReferenceHandler* GetRefDialog() { return pAnyRefDlg; } - Window* GetLabelWidgetForShrinkMode() + vcl::Window* GetLabelWidgetForShrinkMode() { return pLabelWidget; } @@ -95,7 +95,7 @@ protected: virtual void LoseFocus() SAL_OVERRIDE; public: - RefButton(Window* _pParent, WinBits nStyle = 0); + RefButton(vcl::Window* _pParent, WinBits nStyle = 0); void SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit ); void SetStartImage(); void SetEndImage(); diff --git a/include/postx.h b/include/postx.h index bb97adb09921..1b02f2b78c98 100644 --- a/include/postx.h +++ b/include/postx.h @@ -25,7 +25,6 @@ #endif /* X Types */ -#undef Window #undef Region #undef Icon #undef Time diff --git a/include/prex.h b/include/prex.h index 63d93906623a..97fc31352715 100644 --- a/include/prex.h +++ b/include/prex.h @@ -32,7 +32,6 @@ /* Types from <X11/X.h> that clash, but we do use. */ #define Region XLIB_Region #define Time XLIB_Time -#define Window XLIB_Window #if defined __cplusplus extern "C" { diff --git a/include/sfx2/QuerySaveDocument.hxx b/include/sfx2/QuerySaveDocument.hxx index 5c84050fcca4..09922feb60ba 100644 --- a/include/sfx2/QuerySaveDocument.hxx +++ b/include/sfx2/QuerySaveDocument.hxx @@ -22,7 +22,7 @@ #include <rtl/ustring.hxx> #include <sfx2/dllapi.h> -class Window; +namespace vcl { class Window; } /** Opens the general query save document dialog. @param _pParent @@ -31,7 +31,7 @@ class Window; The title of the document. */ SFX2_DLLPUBLIC short ExecuteQuerySaveDocument( - Window* _pParent, const OUString& _rTitle); + vcl::Window* _pParent, const OUString& _rTitle); #endif // INCLUDED_SFX2_QUERYSAVEDOCUMENT_HXX diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index ca2200067552..5c456af41ded 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -81,7 +81,7 @@ class SfxWorkWindow; class SfxFilterMatcher; class SfxModule; class SfxModule; -class Window; +namespace vcl { class Window; } struct SfxChildWinFactory; struct SfxMenuCtrlFactory; struct SfxStbCtrlFactory; @@ -176,7 +176,7 @@ public: */ sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const OUString& rFileName, bool bCopy=true, SfxItemSet* pArgs = 0 ); SfxTemplateDialog* GetTemplateDialog(); - Window* GetTopWindow() const; + vcl::Window* GetTopWindow() const; // members SfxFilterMatcher& GetFilterMatcher(); diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 6c4c1f49d99b..864cf09734c6 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -44,7 +44,7 @@ class FixedLine; //and SfxDockingWindow, where it is changed into a UniqueId and cleared //This reverses the clear of the HelpId -inline void reverseUniqueHelpIdHack(Window &rWindow) +inline void reverseUniqueHelpIdHack(vcl::Window &rWindow) { if (rWindow.GetHelpId().isEmpty()) rWindow.SetHelpId(rWindow.GetUniqueId()); @@ -68,7 +68,7 @@ private: SAL_DLLPRIVATE void init(); protected: - SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription); + SfxModalDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription); OUString& GetExtraData() { return aExtraData; } sal_uInt32 GetUniqId() const { return nUniqId; } @@ -100,7 +100,7 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog protected: SfxModelessDialog( SfxBindings*, SfxChildWindow*, - Window*, const OString& rID, const OUString& rUIXMLDescription ); + vcl::Window*, const OString& rID, const OUString& rUIXMLDescription ); virtual ~SfxModelessDialog(); virtual bool Close() SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; @@ -132,11 +132,11 @@ class SFX2_DLLPUBLIC SfxFloatingWindow: public FloatingWindow protected: SfxFloatingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, WinBits nWinBits=WB_STDMODELESS); SfxFloatingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~SfxFloatingWindow(); @@ -178,11 +178,11 @@ typedef const sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog { public: - SfxSingleTabDialog(Window *pParent, const SfxItemSet& rOptionsSet, + SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet, const OString& rID = OString("SingleTabDialog"), const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui")); - SfxSingleTabDialog(Window *pParent, const SfxItemSet* pInSet = 0, + SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet* pInSet = 0, const OString& rID = OString("SingleTabDialog"), const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui")); diff --git a/include/sfx2/checkin.hxx b/include/sfx2/checkin.hxx index b5b87b0c9f31..c5d93f68846d 100644 --- a/include/sfx2/checkin.hxx +++ b/include/sfx2/checkin.hxx @@ -24,7 +24,7 @@ class SfxCheckinDialog : public ModalDialog DECL_DLLPRIVATE_LINK(OKHdl, void *); public: - SfxCheckinDialog( Window* pParent ); + SfxCheckinDialog( vcl::Window* pParent ); OUString GetComment( ); bool IsMajor( ); diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 966056e20682..74818e24ac85 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -71,13 +71,13 @@ struct SfxChildWinInfo }; // ChildWindow factory methods -typedef SfxChildWindow* (*SfxChildWinCtor)( ::Window *pParentWindow, +typedef SfxChildWindow* (*SfxChildWinCtor)( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo *pInfo); // ChildWindowsContexts factory methods -typedef SfxChildWindowContext* (*SfxChildWinContextCtor)( ::Window *pParentWindow, +typedef SfxChildWindowContext* (*SfxChildWinContextCtor)( vcl::Window *pParentWindow, SfxBindings *pBindings, SfxChildWinInfo *pInfo); struct SfxChildWinContextFactory @@ -122,7 +122,7 @@ struct SfxChildWindow_Impl; class SFX2_DLLPUBLIC SfxChildWindowContext { friend class SfxChildWindow; - ::Window* pWindow; + vcl::Window* pWindow; sal_uInt16 nContextId; protected: @@ -131,9 +131,9 @@ protected: public: virtual ~SfxChildWindowContext(); - void SetWindow( ::Window* pWin ) + void SetWindow( vcl::Window* pWin ) { pWindow=pWin; } - ::Window* GetWindow() const + vcl::Window* GetWindow() const { return pWindow; } sal_uInt16 GetContextId() const { return nContextId; } @@ -147,12 +147,12 @@ public: class SFX2_DLLPUBLIC SfxChildWindow { - ::Window* pParent; // parent window ( Topwindow ) + vcl::Window* pParent; // parent window ( Topwindow ) sal_uInt16 nType; // ChildWindow-Id protected: SfxChildAlignment eChildAlignment; // Current ::com::sun::star::drawing::Alignment - ::Window* pWindow; // actual contents + vcl::Window* pWindow; // actual contents SfxChildWindow_Impl* pImp; // Implementation data private: @@ -163,14 +163,14 @@ private: { return pContext; } protected: - SfxChildWindow(::Window *pParentWindow, sal_uInt16 nId); + SfxChildWindow(vcl::Window *pParentWindow, sal_uInt16 nId); public: virtual ~SfxChildWindow(); void Destroy(); - ::Window* GetWindow() const + vcl::Window* GetWindow() const { return pWindow; } - ::Window* GetParent() const + vcl::Window* GetParent() const { return pParent; } SfxChildAlignment GetAlignment() const { return eChildAlignment; } @@ -194,17 +194,17 @@ public: sal_uInt16 GetContextId() const { return pContext ? pContext->GetContextId(): 0; } - ::Window* GetContextWindow() const + vcl::Window* GetContextWindow() const { return pContext ? pContext->GetWindow(): 0; } - ::Window* GetContextWindow( SfxModule *pModule ) const; + vcl::Window* GetContextWindow( SfxModule *pModule ) const; virtual SfxChildWinInfo GetInfo() const; void SaveStatus(const SfxChildWinInfo& rInfo); static void RegisterChildWindow(SfxModule*, SfxChildWinFactory*); - static SfxChildWindow* CreateChildWindow( sal_uInt16, ::Window*, SfxBindings*, SfxChildWinInfo&); + static SfxChildWindow* CreateChildWindow( sal_uInt16, vcl::Window*, SfxBindings*, SfxChildWinInfo&); void SetHideNotDelete( bool bOn ); bool IsHideNotDelete() const; bool IsHideAtToggle() const; @@ -231,19 +231,19 @@ public: //! soon obsolete ! #define SFX_DECL_CHILDWINDOW_CONTEXT(Class) \ - static SfxChildWindowContext* CreateImpl(::Window *pParent, \ + static SfxChildWindowContext* CreateImpl(vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ static void RegisterChildWindowContext(SfxModule *pMod=0); \ //! The Macro of the future ... #define SFX_DECL_CHILDWINDOWCONTEXT(Class) \ - static SfxChildWindowContext* CreateImpl(::Window *pParent, \ + static SfxChildWindowContext* CreateImpl(vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ static void RegisterChildWindowContext(sal_uInt16, SfxModule *pMod=0); \ //! soon obsolete ! #define SFX_IMPL_CHILDWINDOW_CONTEXT(Class, MyID, ShellClass) \ - SfxChildWindowContext* Class::CreateImpl( ::Window *pParent, \ + SfxChildWindowContext* Class::CreateImpl( vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ { \ SfxChildWindowContext *pContext = new Class(pParent, \ @@ -264,7 +264,7 @@ public: // factory. As long as Id is set to 0 and patched in // SfxChildWindow::CreateContext #define SFX_IMPL_CHILDWINDOWCONTEXT(Class, MyID) \ - SfxChildWindowContext* Class::CreateImpl( ::Window *pParent, \ + SfxChildWindowContext* Class::CreateImpl( vcl::Window *pParent, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ { \ SfxChildWindowContext *pContext = new Class(pParent,0,pBindings,pInfo);\ @@ -279,7 +279,7 @@ public: #define SFX_DECL_CHILDWINDOW(Class) \ public : \ - static SfxChildWindow* CreateImpl(::Window *pParent, sal_uInt16 nId, \ + static SfxChildWindow* CreateImpl(vcl::Window *pParent, sal_uInt16 nId, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ static void RegisterChildWindow (bool bVisible=false, SfxModule *pMod=NULL, sal_uInt16 nFlags=0); \ virtual SfxChildWinInfo GetInfo() const SAL_OVERRIDE @@ -295,7 +295,7 @@ public: SFX_IMPL_POS_CHILDWINDOW_WITHID(Class, MyID, CHILDWIN_NOPOS) #define SFX_IMPL_POS_CHILDWINDOW(Class, MyID, Pos) \ - SfxChildWindow* Class::CreateImpl( ::Window *pParent, \ + SfxChildWindow* Class::CreateImpl( vcl::Window *pParent, \ sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \ { \ SfxChildWindow *pWin = new Class(pParent, nId, pBindings, pInfo);\ diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index 52eda07573fe..447bf5cb54d3 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -221,10 +221,10 @@ private: hide a control, if an item is unknown. */ class SFX2_DLLPUBLIC DummyWindowWrapper: - public SingleControlWrapper< Window, void* > + public SingleControlWrapper< vcl::Window, void* > { public: - explicit DummyWindowWrapper( Window& rWindow ); + explicit DummyWindowWrapper( vcl::Window& rWindow ); virtual bool IsControlDontKnow() const SAL_OVERRIDE; virtual void SetControlDontKnow( bool ) SAL_OVERRIDE; diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx index 74a3af3cd4a8..1d2a2a994efe 100644 --- a/include/sfx2/dialoghelper.hxx +++ b/include/sfx2/dialoghelper.hxx @@ -16,7 +16,7 @@ class DateTime; class LocaleDataWrapper; -class Window; +namespace vcl { class Window; } class VclBuilderContainer; //when two tab pages both have the same basic layout with a preview on the @@ -26,17 +26,17 @@ class VclBuilderContainer; //there has to be a "maingrid" container which contains all the widgets //except for the preview widget -void SFX2_DLLPUBLIC setPreviewsToSamePlace(Window *pParent, VclBuilderContainer *pPage); +void SFX2_DLLPUBLIC setPreviewsToSamePlace(vcl::Window *pParent, VclBuilderContainer *pPage); -Size SFX2_DLLPUBLIC getParagraphPreviewOptimalSize(const Window *pReference); +Size SFX2_DLLPUBLIC getParagraphPreviewOptimalSize(const vcl::Window *pReference); -Size SFX2_DLLPUBLIC getDrawPreviewOptimalSize(const Window *pReference); +Size SFX2_DLLPUBLIC getDrawPreviewOptimalSize(const vcl::Window *pReference); -Size SFX2_DLLPUBLIC getDrawListBoxOptimalSize(const Window *pReference); +Size SFX2_DLLPUBLIC getDrawListBoxOptimalSize(const vcl::Window *pReference); -Size SFX2_DLLPUBLIC getPreviewStripSize(const Window *pReference); +Size SFX2_DLLPUBLIC getPreviewStripSize(const vcl::Window *pReference); -Size SFX2_DLLPUBLIC getPreviewOptionsSize(const Window *pReference); +Size SFX2_DLLPUBLIC getPreviewOptionsSize(const vcl::Window *pReference); OUString SFX2_DLLPUBLIC getWidestTime(const LocaleDataWrapper& rWrapper); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 111043d3e499..a70b5ee16f46 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -217,13 +217,13 @@ private: void ImplCheckPasswordState(); protected: - SfxDocumentPage( Window* pParent, const SfxItemSet& ); + SfxDocumentPage( vcl::Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); void EnableUseUserData(); }; @@ -240,13 +240,13 @@ private: SfxDocumentInfoItem* m_pInfoItem; protected: - SfxDocumentDescPage( Window* pParent, const SfxItemSet& ); + SfxDocumentDescPage( vcl::Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); }; // class SfxDocumentInfoDialog ------------------------------------------- @@ -259,7 +259,7 @@ protected: virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) SAL_OVERRIDE; public: - SfxDocumentInfoDialog( Window* pParent, const SfxItemSet& ); + SfxDocumentInfoDialog( vcl::Window* pParent, const SfxItemSet& ); void AddFontTabPage(); }; @@ -274,7 +274,7 @@ private: public: inline CustomPropertiesEdit( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : Edit( pParent, rResId ), m_pLine( pLine ) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -287,7 +287,7 @@ private: public: inline CustomPropertiesTypeBox( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : ListBox( pParent, rResId ), m_pLine( pLine ) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -302,7 +302,7 @@ public: ::boost::optional<sal_Int16> m_TZ; inline CustomPropertiesDateField( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : DateField( pParent, rResId ), m_pLine( pLine ) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -316,7 +316,7 @@ public: bool m_isUTC; inline CustomPropertiesTimeField( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : TimeField( pParent, rResId ), m_pLine( pLine ), m_isUTC(false) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -328,7 +328,7 @@ class CustomPropertiesDurationField : public Edit protected: virtual void RequestHelp(const HelpEvent& rEvt) SAL_OVERRIDE; public: - CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); + CustomPropertiesDurationField( vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); virtual ~CustomPropertiesDurationField(); void SetDuration( const com::sun::star::util::Duration& rDuration ); @@ -340,7 +340,7 @@ class CustomPropertiesEditButton : public PushButton CustomPropertyLine* m_pLine; public: - CustomPropertiesEditButton( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); + CustomPropertiesEditButton( vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); virtual ~CustomPropertiesEditButton(); DECL_LINK(ClickHdl, void *); @@ -353,7 +353,7 @@ private: public: inline CustomPropertiesRemoveButton( - Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : + vcl::Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) : ImageButton( pParent, rResId ), m_pLine( pLine ) {} inline CustomPropertyLine* GetLine() const { return m_pLine; } @@ -366,7 +366,7 @@ private: RadioButton m_aNoButton; public: - CustomPropertiesYesNoButton( Window* pParent, const ResId& rResId ); + CustomPropertiesYesNoButton( vcl::Window* pParent, const ResId& rResId ); virtual void Resize() SAL_OVERRIDE; @@ -394,14 +394,14 @@ struct CustomPropertyLine bool m_bIsRemoved; bool m_bTypeLostFocus; - CustomPropertyLine( Window* pParent ); + CustomPropertyLine( vcl::Window* pParent ); void SetRemoved(); }; // class CustomPropertiesWindow ------------------------------------------ -class CustomPropertiesWindow : public Window +class CustomPropertiesWindow : public vcl::Window { private: FixedText* m_pHeaderAccName; @@ -441,7 +441,7 @@ private: void ValidateLine( CustomPropertyLine* pLine, bool bIsFromTypeBox ); public: - CustomPropertiesWindow(Window* pParent, + CustomPropertiesWindow(vcl::Window* pParent, FixedText *pHeaderAccName, FixedText *pHeaderAccType, FixedText *pHeaderAccValue); @@ -479,7 +479,7 @@ private: DECL_LINK( RemovedHdl, void* ); public: - CustomPropertiesControl(Window* pParent); + CustomPropertiesControl(vcl::Window* pParent); virtual ~CustomPropertiesControl(); void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny, bool bInteractive ); @@ -505,21 +505,21 @@ private: using TabPage::DeactivatePage; protected: - SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& ); + SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); }; struct CmisValue : public VclBuilderContainer { Edit* m_aValueEdit; - CmisValue( Window* pParent, const OUString& aStr ); + CmisValue( vcl::Window* pParent, const OUString& aStr ); }; struct CmisDateTime : public VclBuilderContainer @@ -527,7 +527,7 @@ struct CmisDateTime : public VclBuilderContainer DateField* m_aDateField; TimeField* m_aTimeField; - CmisDateTime( Window* pParent, const ::com::sun::star::util::DateTime& aDateTime ); + CmisDateTime( vcl::Window* pParent, const ::com::sun::star::util::DateTime& aDateTime ); }; struct CmisYesNo : public VclBuilderContainer @@ -535,7 +535,7 @@ struct CmisYesNo : public VclBuilderContainer RadioButton* m_aYesButton; RadioButton* m_aNoButton; - CmisYesNo( Window* pParent, bool bValue); + CmisYesNo( vcl::Window* pParent, bool bValue); }; // struct CmisPropertyLine --------------------------------------------- @@ -556,7 +556,7 @@ struct CmisPropertyLine : public VclBuilderContainer std::vector< CmisYesNo* > m_aYesNos; sal_Int32 m_nNumValue; long getItemHeight() const; - CmisPropertyLine( Window* pParent ); + CmisPropertyLine( vcl::Window* pParent ); virtual ~CmisPropertyLine(); }; @@ -627,14 +627,14 @@ private: DECL_LINK(UpdateHdl, void *); protected: - SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& ); + SfxCmisPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); }; #endif // #ifndef _ INCLUDED_SFX2_DINFDLG_HXX diff --git a/include/sfx2/dinfedt.hxx b/include/sfx2/dinfedt.hxx index 84c59666d31f..f56409a49c6d 100644 --- a/include/sfx2/dinfedt.hxx +++ b/include/sfx2/dinfedt.hxx @@ -29,7 +29,7 @@ class InfoEdit_Impl : public Edit { public: - InfoEdit_Impl( Window* pParent, const ResId& rResId ) : + InfoEdit_Impl( vcl::Window* pParent, const ResId& rResId ) : Edit( pParent, rResId ) {} virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 2319e8c99e02..eac691e0ad05 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -152,12 +152,12 @@ public: SfxViewFrame* GetFrame() const; SfxModule* GetModule() const; // caller has to clean up the Manager on his own - static SfxPopupMenuManager* Popup( sal_uInt16 nConfigId,Window *pWin, const Point *pPos ); + static SfxPopupMenuManager* Popup( sal_uInt16 nConfigId, vcl::Window *pWin, const Point *pPos ); void ExecutePopup( const ResId &rId, - Window *pWin = 0, const Point *pPosPixel = 0 ); + vcl::Window *pWin = 0, const Point *pPosPixel = 0 ); static void ExecutePopup( sal_uInt16 nConfigId = 0, - Window *pWin = 0, const Point *pPosPixel = 0 ); + vcl::Window *pWin = 0, const Point *pPosPixel = 0 ); bool IsAppDispatcher() const; bool IsFlushed() const; diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index d90f9bef74c9..4e00ab2cc55e 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -73,11 +73,11 @@ protected: public: SfxDockingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, WinBits nWinBits=0); SfxDockingWindow( SfxBindings *pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const ResId& rResId); virtual ~SfxDockingWindow(); @@ -116,7 +116,7 @@ public: class SfxDockingWrapper : public SfxChildWindow { public: - SfxDockingWrapper( Window* pParent , + SfxDockingWrapper( vcl::Window* pParent , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index 96ebdcda01ae..99f77fb76f43 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.hxx @@ -35,7 +35,7 @@ #include <boost/utility.hpp> -class Window; +namespace vcl { class Window; } class SfxFilter; class SfxObjectFactory; class SfxMedium; @@ -60,17 +60,17 @@ public: class SfxFrameWindow { - Window* pWindow; + vcl::Window* pWindow; public: - SfxFrameWindow( Window *pWin ) + SfxFrameWindow( vcl::Window *pWin ) : pWindow( pWin ) {} virtual ~SfxFrameWindow() { delete pWindow; } - Window* GetWindow() const + vcl::Window* GetWindow() const { return pWindow; } - void SetWindow( Window *pWin ) + void SetWindow( vcl::Window *pWin ) { pWindow = pWin; } }; diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 000f502a664a..10a2a12b158c 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -55,7 +55,7 @@ namespace com } class SfxItemSet; -class Window; +namespace vcl { class Window; } // the SFXWB constants are for the nFlags parameter of the constructor #define SFXWB_INSERT 0x04000000L // turn Open into Insert dialog @@ -103,7 +103,7 @@ private: public: FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, - Window* _pPreferredParent = NULL ); + vcl::Window* _pPreferredParent = NULL ); FileDialogHelper( sal_Int16 nDialogType, sal_Int64 nFlags, @@ -126,7 +126,7 @@ public: const OUString& aExtName, const OUString& rStandardDir, const ::com::sun::star::uno::Sequence< OUString >& rBlackList, - Window* _pPreferredParent = NULL ); + vcl::Window* _pPreferredParent = NULL ); virtual ~FileDialogHelper(); diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 7a64d9b2f52d..954846855339 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -63,7 +63,7 @@ namespace com class SvBorder; class SfxWorkWindow; -class Window; +namespace vcl { class Window; } class SfxFrame; class SfxFrame_Impl; class SfxObjectShell; @@ -105,7 +105,7 @@ private: SfxFrame* pParentFrame; SfxFrameArr_Impl* pChildArr; SfxFrame_Impl* pImp; - Window* pWindow; + vcl::Window* pWindow; protected: bool Close(); @@ -114,7 +114,7 @@ protected: SAL_DLLPRIVATE void RemoveChildFrame_Impl( SfxFrame* ); SfxFrame( ); // not implemented - SAL_DLLPRIVATE SfxFrame( Window& i_rContainerWindow, bool bHidden ); + SAL_DLLPRIVATE SfxFrame( vcl::Window& i_rContainerWindow, bool bHidden ); public: TYPEINFO(); @@ -122,9 +122,9 @@ public: static SfxFrame* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ); static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > CreateBlankFrame(); - static SfxFrame* Create( SfxObjectShell& rDoc, Window& rWindow, sal_uInt16 nViewId, bool bHidden ); + static SfxFrame* Create( SfxObjectShell& rDoc, vcl::Window& rWindow, sal_uInt16 nViewId, bool bHidden ); - Window& GetWindow() const { return *pWindow;} + vcl::Window& GetWindow() const { return *pWindow;} void CancelTransfers( bool bCancelLoadEnv = true ); bool DoClose(); sal_uInt16 GetChildFrameCount() const; diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 383ebc868b59..386e4150dfca 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -25,7 +25,7 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow SfxBindings* m_pBindings; public: - SfxInfoBarContainerChild( Window* pParent, + SfxInfoBarContainerChild( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); @@ -38,7 +38,7 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow /** Class representing a single InfoBar to be added in a SfxInfoBarContainerWindow. */ -class SfxInfoBarWindow : public Window +class SfxInfoBarWindow : public vcl::Window { private: OUString m_sId; @@ -47,7 +47,7 @@ class SfxInfoBarWindow : public Window std::vector< PushButton* > m_aActionBtns; public: - SfxInfoBarWindow( Window* parent, const OUString& sId, + SfxInfoBarWindow( vcl::Window* parent, const OUString& sId, const OUString& sMessage, std::vector< PushButton* > aButtons ); virtual ~SfxInfoBarWindow( ); @@ -60,7 +60,7 @@ class SfxInfoBarWindow : public Window DECL_LINK( CloseHandler, void* ); }; -class SfxInfoBarContainerWindow : public Window +class SfxInfoBarContainerWindow : public vcl::Window { private: SfxInfoBarContainerChild* m_pChildWin; diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 0a8b5f8a72b0..10ab174bbdbd 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -33,7 +33,7 @@ class SfxInPlaceClient_Impl; class SfxViewShell; class SfxObjectShell; -class Window; +namespace vcl { class Window; } class Fraction; @@ -44,7 +44,7 @@ friend class SfxInPlaceClient_Impl; SfxInPlaceClient_Impl* m_pImp; SfxViewShell* m_pViewSh; - Window* m_pEditWin; + vcl::Window* m_pEditWin; // called after the requested new object area was negotiated SAL_DLLPRIVATE virtual void ObjectAreaChanged(); @@ -59,11 +59,11 @@ friend class SfxInPlaceClient_Impl; SAL_DLLPRIVATE virtual void MakeVisible(); public: - SfxInPlaceClient( SfxViewShell* pViewShell, Window* pDraw, sal_Int64 nAspect = com::sun::star::embed::Aspects::MSOLE_CONTENT ); + SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window* pDraw, sal_Int64 nAspect = com::sun::star::embed::Aspects::MSOLE_CONTENT ); virtual ~SfxInPlaceClient(); SfxViewShell* GetViewShell() const { return m_pViewSh; } - Window* GetEditWin() const { return m_pEditWin; } + vcl::Window* GetEditWin() const { return m_pEditWin; } com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject() const; void SetObject( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rObject ); void SetObjectState( sal_Int32 ); diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index f7e36c7f538b..a0f2eb6d78df 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -286,7 +286,7 @@ class SFX2_DLLPUBLIC DummyItemConnection: public ItemConnectionBase, public DummyWindowWrapper { public: - explicit DummyItemConnection( sal_uInt16 nSlot, Window& rWindow, + explicit DummyItemConnection( sal_uInt16 nSlot, vcl::Window& rWindow, ItemConnFlags nFlags = ITEMCONN_DEFAULT ); protected: diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx index 2bc866cf5e97..9dc778fe8f76 100644 --- a/include/sfx2/linkmgr.hxx +++ b/include/sfx2/linkmgr.hxx @@ -129,7 +129,7 @@ public: void UpdateAllLinks( bool bAskUpdate = true, bool bCallErrHdl = true, bool bUpdateGrfLinks = false, - Window* pParentWin = 0 ); + vcl::Window* pParentWin = 0 ); // Call for list of links (eg for link-dialog) const SvBaseLinks& GetLinks() const { return aLinkTbl; } diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx index 19ad30e8a81c..c39e5310ef67 100644 --- a/include/sfx2/linksrc.hxx +++ b/include/sfx2/linksrc.hxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; }}}} -class Window; +namespace vcl { class Window; } namespace rtl { class OUString; } @@ -85,7 +85,7 @@ public: virtual bool IsDataComplete() const; // Link impl: DECL_LINK( MyEndEditHdl, sfx2::FileDialogHelper* ); <= param is the dialog - virtual void Edit( Window *, SvBaseLink *, const Link& rEndEditHdl ); + virtual void Edit( vcl::Window *, SvBaseLink *, const Link& rEndEditHdl ); void AddDataAdvise( SvBaseLink *, const rtl::OUString & rMimeType, diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index d57b10533e4e..a68bf499f638 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -144,7 +144,7 @@ public: void Disconnect(); // Link impl: DECL_LINK( MyEndDialogHdl, SvBaseLink* ); <= param is this - virtual void Edit( Window*, const Link& rEndEditHdl ); + virtual void Edit( vcl::Window*, const Link& rEndEditHdl ); // should the link appear in the dialog? (to the left in the link in the...) bool IsVisible() const { return bVisible; } diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index dbf6538cee72..06deead04eae 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -73,10 +73,10 @@ friend class SfxStyleDialog; void UpdateName_Impl(ListBox *, const OUString &rNew); void SetDescriptionText_Impl(); - SfxManageStyleSheetPage(Window *pParent, const SfxItemSet &rAttrSet ); + SfxManageStyleSheetPage(vcl::Window *pParent, const SfxItemSet &rAttrSet ); virtual ~SfxManageStyleSheetPage(); - static SfxTabPage* Create(Window *pParent, const SfxItemSet *rAttrSet ); + static SfxTabPage* Create(vcl::Window *pParent, const SfxItemSet *rAttrSet ); protected: virtual bool FillItemSet(SfxItemSet *) SAL_OVERRIDE; diff --git a/include/sfx2/mnumgr.hxx b/include/sfx2/mnumgr.hxx index 66c9d6f7dfa7..93106583d6ea 100644 --- a/include/sfx2/mnumgr.hxx +++ b/include/sfx2/mnumgr.hxx @@ -93,13 +93,13 @@ private: public: SfxPopupMenuManager( PopupMenu*, SfxBindings& ); ~SfxPopupMenuManager(); - static void ExecutePopup( const ResId&, SfxViewFrame* pViewFrame, const Point& rPoint, Window* pWindow ); + static void ExecutePopup( const ResId&, SfxViewFrame* pViewFrame, const Point& rPoint, vcl::Window* pWindow ); // @deprecated!! // Don't use this method any longer. The whole class will be removed in the future. // Changing code which relies on Popup would need much more effort. - static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow ); + static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, vcl::Window* pWindow ); - sal_uInt16 Execute( const Point& rPos, Window *pWindow ); + sal_uInt16 Execute( const Point& rPos, vcl::Window *pWindow ); void RemoveDisabledEntries(); Menu* GetSVMenu(); diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index cf9130f97b8a..77ba76675543 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -46,7 +46,7 @@ struct SfxMenuCtrlFactory; struct SfxStbCtrlFactory; struct SfxTbxCtrlFactory; class SfxTabPage; -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace frame { class XFrame; @@ -86,7 +86,7 @@ public: void RegisterMenuControl(SfxMenuCtrlFactory*); virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rSet ); virtual void Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE; diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx index 9d40799f40e1..37f7a144dce9 100644 --- a/include/sfx2/navigat.hxx +++ b/include/sfx2/navigat.hxx @@ -27,7 +27,7 @@ class SfxNavigatorWrapper : public SfxChildWindow { public: - SfxNavigatorWrapper( Window* pParent , + SfxNavigatorWrapper( vcl::Window* pParent , sal_uInt16 nId , SfxBindings* pBindings , SfxChildWinInfo* pInfo ); @@ -42,7 +42,7 @@ class SFX2_DLLPUBLIC SfxNavigator : public SfxDockingWindow public: SfxNavigator( SfxBindings* pBindings , SfxChildWindow* pChildWin , - Window* pParent , + vcl::Window* pParent , WinBits nBits ); virtual void Resize() SAL_OVERRIDE; diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx index c817282bed5e..aa53d4ce4ae7 100644 --- a/include/sfx2/new.hxx +++ b/include/sfx2/new.hxx @@ -56,7 +56,7 @@ private: public: - SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags = 0); + SfxNewFileDialog(vcl::Window *pParent, sal_uInt16 nFlags = 0); virtual ~SfxNewFileDialog(); // Returns false, when '- No -' is set as Template diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index e6494905b3fe..f0f47e26bb15 100644 --- a/include/sfx2/newstyle.hxx +++ b/include/sfx2/newstyle.hxx @@ -43,7 +43,7 @@ private: DECL_DLLPRIVATE_LINK( ModifyHdl, ComboBox * ); public: - SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& ); + SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& ); virtual ~SfxNewStyleDlg(); OUString GetName() const { return comphelper::string::stripStart(m_pColBox->GetText(), ' '); } diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 9b8a01c4a217..d9d4e956e5cd 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -344,7 +344,7 @@ public: void SignScriptingContent(); virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( - Window *pParent, const SfxItemSet& ); + vcl::Window *pParent, const SfxItemSet& ); ErrCode CallBasic( const OUString& rMacro, const OUString& rBasicName, SbxArray* pArgs = 0, SbxValue* pRet = 0 ); @@ -407,7 +407,7 @@ public: virtual bool PrepareClose(bool bUI = true); virtual bool IsInformationLost(); virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ); - sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, Window* pParent ); + sal_Int16 QueryHiddenInformation( HiddenWarningFact eFact, vcl::Window* pParent ); virtual bool HasSecurityOptOpenReadOnly() const; bool IsSecurityOptOpenReadOnly() const; void SetSecurityOptOpenReadOnly( bool bOpenReadOnly = true ); @@ -510,7 +510,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames(); - Window* GetDialogParent( SfxMedium* pMedium=0 ); + vcl::Window* GetDialogParent( SfxMedium* pMedium=0 ); static SfxObjectShell* CreateObject( const OUString& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static SfxObjectShell* CreateObjectByFactoryName( const OUString& rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index ed96e330cc18..363e9b9e1c71 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -74,7 +74,7 @@ private: void SetPasswdText(); public: - SfxPasswordDialog(Window* pParent, const OUString* pGroupText = NULL); + SfxPasswordDialog(vcl::Window* pParent, const OUString* pGroupText = NULL); OUString GetUser() const { diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 5d84648453fd..4857ce4b1235 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -93,15 +93,15 @@ protected: public: - SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + SfxCommonPrintOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SfxCommonPrintOptionsTabPage(); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; - virtual Window* GetParentLabeledBy( const Window* pLabel ) const SAL_OVERRIDE; - virtual Window* GetParentLabelFor( const Window* pLabel ) const SAL_OVERRIDE; + virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabel ) const SAL_OVERRIDE; + virtual vcl::Window* GetParentLabelFor( const vcl::Window* pLabel ) const SAL_OVERRIDE; - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); }; #endif // INCLUDED_SFX2_PRINTOPT_HXX diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index eead7a37b489..1468ee81fe82 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -41,7 +41,7 @@ private: SfxTabPage* pPage; public: - SfxPrintOptionsDialog( Window *pParent, + SfxPrintOptionsDialog( vcl::Window *pParent, SfxViewShell *pViewShell, const SfxItemSet *rOptions ); virtual ~SfxPrintOptionsDialog(); diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index c7280672bb42..68176cf8a7eb 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -41,7 +41,7 @@ enum ApplicationType class SFX2_DLLPUBLIC RecentDocsView : public ThumbnailView { public: - RecentDocsView( Window* pParent ); + RecentDocsView( vcl::Window* pParent ); virtual ~RecentDocsView(); void insertItem(const OUString &rURL, const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId); diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index dca4430aa094..eecaf318ab0a 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -33,14 +33,14 @@ class SfxSecurityPage : public SfxTabPage std::auto_ptr< SfxSecurityPage_Impl > m_pImpl; protected: - SfxSecurityPage( Window* pParent, const SfxItemSet& ); + SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& ); virtual ~SfxSecurityPage(); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* ); }; diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index fcfd9bb8140e..d5b8352dd062 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -37,7 +37,7 @@ class SfxViewFrame; class SfxBindings; class SfxItemSet; class ResId; -class Window; +namespace vcl { class Window; } namespace rtl { class OUString; }; @@ -118,43 +118,43 @@ class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialog public: virtual ~SfxAbstractDialogFactory(); // needed for export of vtable static SfxAbstractDialogFactory* Create(); - virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0; - virtual VclAbstractDialog* CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0; + virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0; + virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, SfxViewFrame* pViewFrame, bool bEditFmt=false, const rtl::OUString *pUserButtonText=0 ) = 0; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttrSet, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, bool bEditFmt=false, const rtl::OUString *pUserButtonText=0 ) = 0; virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0; - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const OUString& rCommand, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 )=0; - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommand, + virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0; - virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent )=0; - virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=0 )=0; - virtual VclAbstractDialog * CreateSvxScriptOrgDialog( Window* pParent, const rtl::OUString& rLanguage ) = 0; + virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent )=0; + virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=0 )=0; + virtual VclAbstractDialog * CreateSvxScriptOrgDialog( vcl::Window* pParent, const rtl::OUString& rLanguage ) = 0; virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( - Window* pParent, + vcl::Window* pParent, bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) = 0; virtual VclAbstractDialog* CreateScriptErrorDialog( - Window* pParent, com::sun::star::uno::Any aException ) = 0; + vcl::Window* pParent, com::sun::star::uno::Any aException ) = 0; virtual VclAbstractDialog* CreateOptionsDialog( - Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) = 0; + vcl::Window* pParent, const OUString& rExtensionId, const OUString& rApplicationContext ) = 0; }; #endif diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx index d3ab2cec93bb..84250598312d 100644 --- a/include/sfx2/sfxhelp.hxx +++ b/include/sfx2/sfxhelp.hxx @@ -35,9 +35,9 @@ class SFX2_DLLPUBLIC SfxHelp : public Help SfxHelp_Impl* pImp; private: - SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const Window* pWindow, const OUString& rKeyword ); + SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const vcl::Window* pWindow, const OUString& rKeyword ); SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord ) SAL_OVERRIDE; - SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const Window* pWindow ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const vcl::Window* pWindow ) SAL_OVERRIDE; SAL_DLLPRIVATE OUString GetHelpModuleName_Impl(); SAL_DLLPRIVATE OUString CreateHelpURL_Impl( const OUString& aCommandURL, const OUString& rModuleName ); @@ -48,7 +48,7 @@ public: inline void SetTicket( const OUString& rTicket ) { aTicket = rTicket; } inline void SetUser( const OUString& rUser ) { aUser = rUser; } - virtual OUString GetHelpText( const OUString&, const Window* pWindow ) SAL_OVERRIDE; + virtual OUString GetHelpText( const OUString&, const vcl::Window* pWindow ) SAL_OVERRIDE; static OUString CreateHelpURL( const OUString& aCommandURL, const OUString& rModuleName ); static OUString GetDefaultHelpModule(); diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index d0a13ddfba55..c574b6f45c8c 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -29,7 +29,7 @@ #include <tools/rtti.hxx> class ResMgr; -class Window; +namespace vcl { class Window; } class ToolBox; class SfxItemPool; class SfxPoolItem; diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx index aebb0b348eb4..a078e00c20c2 100644 --- a/include/sfx2/sidebar/ControlFactory.hxx +++ b/include/sfx2/sidebar/ControlFactory.hxx @@ -39,9 +39,9 @@ class SFX2_DLLPUBLIC ControlFactory public: /** Create the menu button for the task bar. */ - static CheckBox* CreateMenuButton (Window* pParentWindow); + static CheckBox* CreateMenuButton (vcl::Window* pParentWindow); - static ImageRadioButton* CreateTabItem (Window* pParentWindow); + static ImageRadioButton* CreateTabItem (vcl::Window* pParentWindow); }; diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx index a6c65e1a1293..5f482786e7a8 100644 --- a/include/sfx2/sidebar/ILayoutableWindow.hxx +++ b/include/sfx2/sidebar/ILayoutableWindow.hxx @@ -24,7 +24,7 @@ #include <sal/types.h> #include <com/sun/star/ui/LayoutSize.hpp> -class Window; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { diff --git a/include/sfx2/sidebar/SidebarChildWindow.hxx b/include/sfx2/sidebar/SidebarChildWindow.hxx index defc03c75fcf..50caeb6114c0 100644 --- a/include/sfx2/sidebar/SidebarChildWindow.hxx +++ b/include/sfx2/sidebar/SidebarChildWindow.hxx @@ -35,14 +35,14 @@ class SFX2_DLLPUBLIC SidebarChildWindow { public: SidebarChildWindow( - Window* pParent, + vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); SFX_DECL_CHILDWINDOW_WITHID(SidebarChildWindow); - static sal_Int32 GetDefaultWidth (Window* pWindow); + static sal_Int32 GetDefaultWidth (vcl::Window* pWindow); }; diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index 537c085280f4..6215f6d03e64 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -35,7 +35,7 @@ #include <boost/function.hpp> -class Window; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { @@ -61,7 +61,7 @@ public: static css::uno::Reference<css::ui::XUIElement> Create ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pControl, + vcl::Window* pControl, const css::ui::LayoutSize& rLayoutSize); // XContextChangeEventListener @@ -103,7 +103,7 @@ protected: SidebarPanelBase ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pWindow, + vcl::Window* pWindow, const css::ui::LayoutSize& rLayoutSize); virtual ~SidebarPanelBase (void); @@ -111,7 +111,7 @@ protected: throw (css::uno::RuntimeException) SAL_OVERRIDE; private: - Window* mpControl; + vcl::Window* mpControl; const ::rtl::OUString msResourceURL; const css::ui::LayoutSize maLayoutSize; }; diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 8bcc6be00f82..0a6f37fa8463 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -39,7 +39,7 @@ class SFX2_DLLPUBLIC SidebarToolBox : public ToolBox { public: - SidebarToolBox(Window* pParentWindow); + SidebarToolBox(vcl::Window* pParentWindow); virtual ~SidebarToolBox (void); using ToolBox::InsertItem; diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx index 41a90204a538..e428d9abe58b 100644 --- a/include/sfx2/styledlg.hxx +++ b/include/sfx2/styledlg.hxx @@ -37,7 +37,7 @@ protected: virtual const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; public: - SfxStyleDialog(Window* pParent, const OString& rID, + SfxStyleDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, SfxStyleSheetBase&); virtual ~SfxStyleDialog(); diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index d916df3bb2d1..5e88ed9471cd 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -37,7 +37,7 @@ class SfxViewFrame; class SfxTabPage; class SfxBindings; -typedef SfxTabPage* (*CreateTabPage)(Window *pParent, const SfxItemSet *rAttrSet); +typedef SfxTabPage* (*CreateTabPage)(vcl::Window *pParent, const SfxItemSet *rAttrSet); typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value struct TabPageImpl; @@ -124,10 +124,10 @@ protected: void SavePosAndId(); public: - SfxTabDialog(Window* pParent, + SfxTabDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet * = 0, bool bEditFmt = false); - SfxTabDialog(SfxViewFrame *pViewFrame, Window* pParent, + SfxTabDialog(SfxViewFrame *pViewFrame, vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet * = 0, bool bEditFmt = false); virtual ~SfxTabDialog(); @@ -237,7 +237,7 @@ private: SAL_DLLPRIVATE void SetInputSet( const SfxItemSet* pNew ) { pSet = pNew; } protected: - SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet); + SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet); sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); } diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index f7b6ef0d455f..da1f70140728 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -60,7 +60,7 @@ namespace sfx2 { public: TaskPaneWrapper( - Window* i_pParent, + vcl::Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo @@ -102,7 +102,7 @@ namespace sfx2 /** SFX-less version of a module dependent task pane, filled with tool panels as specified in the respective module's configuration */ - class SFX2_DLLPUBLIC ModuleTaskPane : public Window + class SFX2_DLLPUBLIC ModuleTaskPane : public vcl::Window { public: /** creates a new instance @@ -114,7 +114,7 @@ namespace sfx2 responsible for, thus controlling which tool panels are actually available. */ ModuleTaskPane( - Window& i_rParentWindow, + vcl::Window& i_rParentWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame ); virtual ~ModuleTaskPane(); @@ -186,7 +186,7 @@ namespace sfx2 { public: TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, - Window* i_pParent, WinBits i_nBits ); + vcl::Window* i_pParent, WinBits i_nBits ); // ITaskPaneToolPanelAccess virtual void ActivateToolPanel( const OUString& i_rPanelURL ) SAL_OVERRIDE; diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 27bcb9e31171..a1c99d1672bc 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -142,13 +142,13 @@ public: const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); - SfxPopupWindow(sal_uInt16 nId, Window *pParent, + SfxPopupWindow(sal_uInt16 nId, vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); SfxPopupWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow, + vcl::Window* pParentWindow, WinBits nBits ); virtual ~SfxPopupWindow(); @@ -202,7 +202,7 @@ protected: virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); virtual SfxPopupWindow* CreatePopupWindowCascading(); - virtual Window* CreateItemWindow( Window *pParent ); + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ); // Must be called by subclass to set a new popup window instance void SetPopupWindow( SfxPopupWindow* pWindow ); @@ -294,7 +294,7 @@ class SfxDragButton_Impl : public FixedImage { public: - SfxDragButton_Impl( Window *pParent ); + SfxDragButton_Impl( vcl::Window *pParent ); virtual void Command ( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -305,7 +305,7 @@ class SfxDragToolBoxControl_Impl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox ); - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE; }; diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index 00ecf03c4cf3..b2a500bae4c9 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -80,8 +80,8 @@ class SFX2_DLLPUBLIC TemplateAbstractView : public ThumbnailView { public: - TemplateAbstractView(Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren); - TemplateAbstractView(Window* pParent); + TemplateAbstractView(vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren); + TemplateAbstractView(vcl::Window* pParent); virtual ~TemplateAbstractView (); diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index de9dead245c0..984b06a2d16d 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -48,7 +48,7 @@ class SFX2_DLLPUBLIC SfxTemplateManagerDlg : public ModelessDialog public: - SfxTemplateManagerDlg (Window *parent = DIALOG_NO_PARENT); + SfxTemplateManagerDlg (vcl::Window *parent = DIALOG_NO_PARENT); virtual ~SfxTemplateManagerDlg (); diff --git a/include/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx index a38f9817e0ce..9f5d9dfd2965 100644 --- a/include/sfx2/templateinfodlg.hxx +++ b/include/sfx2/templateinfodlg.hxx @@ -25,7 +25,7 @@ class SfxTemplateInfoDlg : public ModalDialog { public: - SfxTemplateInfoDlg (Window *pParent = NULL); + SfxTemplateInfoDlg (vcl::Window *pParent = NULL); virtual ~SfxTemplateInfoDlg (); @@ -40,7 +40,7 @@ private: PushButton* mpBtnClose; VclBox* mpBox; - Window *mpPreviewView; // gets released when xWindows get destroyed (dont delete in constructor) + vcl::Window *mpPreviewView; // gets released when xWindows get destroyed (dont delete in constructor) svtools::ODocumentInfoPreview *mpInfoView; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > m_xFrame; diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index a6f4e336b62d..6d2e1d044dcf 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -29,7 +29,7 @@ class SFX2_DLLPUBLIC TemplateLocalView : public TemplateAbstractView public: - TemplateLocalView ( Window* pParent ); + TemplateLocalView ( vcl::Window* pParent ); virtual ~TemplateLocalView (); diff --git a/include/sfx2/templateremoteview.hxx b/include/sfx2/templateremoteview.hxx index 0b6e9d897e77..6c64e9a6dcaf 100644 --- a/include/sfx2/templateremoteview.hxx +++ b/include/sfx2/templateremoteview.hxx @@ -21,7 +21,7 @@ class TemplateRemoteView : public TemplateAbstractView { public: - TemplateRemoteView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren); + TemplateRemoteView (vcl::Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren); virtual ~TemplateRemoteView (); diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index a15d4e7095af..4bd6ac4292d6 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -45,7 +45,7 @@ friend class SfxTemplateDialog_Impl; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; public: - SfxTemplateDialog( SfxBindings*, SfxChildWindow*, Window* ); + SfxTemplateDialog( SfxBindings*, SfxChildWindow*, vcl::Window* ); virtual ~SfxTemplateDialog(); virtual void Update(); @@ -62,7 +62,7 @@ class SFX2_DLLPUBLIC SfxTemplateDialogWrapper : public SfxChildWindow { public: SfxTemplateDialogWrapper - (Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*); + (vcl::Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*); SFX_DECL_CHILDWINDOW_WITHID(SfxTemplateDialogWrapper); }; @@ -71,7 +71,7 @@ public: class SFX2_DLLPUBLIC SfxTemplatePanelControl : public DockingWindow { public: - SfxTemplatePanelControl (SfxBindings* pBindings, Window* pParentWindow); + SfxTemplatePanelControl (SfxBindings* pBindings, vcl::Window* pParentWindow); virtual ~SfxTemplatePanelControl(); virtual void Update(); diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 31faaf7c40b0..298ea3df3157 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -180,7 +180,7 @@ class SFX2_DLLPUBLIC ThumbnailView : public Control { public: - ThumbnailView(Window* pParent, WinBits nWinStyle = WB_TABSTOP, bool bDisableTransientChildren = false); + ThumbnailView(vcl::Window* pParent, WinBits nWinStyle = WB_TABSTOP, bool bDisableTransientChildren = false); virtual ~ThumbnailView(); diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index e1295f948efd..f2fa42dca7f3 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -36,7 +36,7 @@ const int THUMBNAILVIEW_ITEM_CORNER = 5; class CheckBox; namespace vcl { class Font; } -class Window; +namespace vcl { class Window; } class ThumbnailView; namespace basegfx { diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index 0b1f4dc5ec77..6e45253c9c02 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -39,11 +39,11 @@ namespace sfx2 public: TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, - Window* i_pParent, WinBits i_nStyle = 0 + vcl::Window* i_pParent, WinBits i_nStyle = 0 ); TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, - Window* i_pParent, const ResId& i_rResId + vcl::Window* i_pParent, const ResId& i_rResId ); virtual ~TitledDockingWindow(); @@ -81,8 +81,8 @@ namespace sfx2 /** returns the content window, which is to be used as parent window for any content to be displayed in the docking window. */ - ::Window& GetContentWindow() { return m_aContentWindow; } - const ::Window& GetContentWindow() const { return m_aContentWindow; } + vcl::Window& GetContentWindow() { return m_aContentWindow; } + const vcl::Window& GetContentWindow() const { return m_aContentWindow; } ToolBox& GetToolBox() { return m_aToolbox; } const ToolBox& GetToolBox() const { return m_aToolbox; } diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx index 687be03d1b1a..541b18fecb32 100644 --- a/include/sfx2/viewfac.hxx +++ b/include/sfx2/viewfac.hxx @@ -26,7 +26,7 @@ class SfxViewFrame; class SfxViewShell; -class Window; +namespace vcl { class Window; } typedef SfxViewShell* (*SfxViewCtor)(SfxViewFrame*, SfxViewShell*); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 919ed9da96a3..1d043fcd2ded 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -117,7 +117,7 @@ public: SfxDispatcher* GetDispatcher() { return pDispatcher; } SfxBindings& GetBindings() { return *pBindings; } const SfxBindings& GetBindings() const { return *pBindings; } - Window& GetWindow() const; + vcl::Window& GetWindow() const; virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); SfxProgress* GetProgress() const; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index b32c78930768..20114cfac991 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -40,7 +40,7 @@ class SfxBaseController; class Size; class Fraction; -class Window; +namespace vcl { class Window; } class KeyEvent; class WorkWindow; class SvBorder; @@ -137,7 +137,7 @@ friend class SfxPrinterController; SfxInPlaceClientList* pIPClientList; SfxViewFrame* pFrame; SfxShell* pSubShell; - Window* pWindow; + vcl::Window* pWindow; bool bNoNewWindow; protected: @@ -176,7 +176,7 @@ public: SfxInPlaceClient* GetIPClient() const; SfxInPlaceClient* GetUIActiveClient() const; - SfxInPlaceClient* FindIPClient( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, Window *pObjParentWin ) const; + SfxInPlaceClient* FindIPClient( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, vcl::Window *pObjParentWin ) const; virtual ErrCode DoVerb(long nVerb); @@ -218,8 +218,8 @@ public: bool Escape(); // Viewing Interface - Window* GetWindow() const { return pWindow; } - void SetWindow( Window *pViewPort ); + vcl::Window* GetWindow() const { return pWindow; } + void SetWindow( vcl::Window *pViewPort ); virtual void AdjustPosSizePixel( const Point &rOfs, const Size &rSize ); const SvBorder& GetBorderPixel() const; void SetBorderPixel( const SvBorder &rBorder ); @@ -230,7 +230,7 @@ public: virtual SfxPrinter* GetPrinter( bool bCreate = false ); virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); virtual bool HasPrintOptionsPage() const; - virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); + virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ); virtual JobSetup GetJobSetup() const; Printer* GetActivePrinter() const; diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx index 8f21baac5177..ee671b7a0f8a 100644 --- a/include/svtools/DocumentInfoPreview.hxx +++ b/include/svtools/DocumentInfoPreview.hxx @@ -39,9 +39,9 @@ namespace com { namespace sun { namespace star { namespace svtools { -class SVT_DLLPUBLIC ODocumentInfoPreview: public Window { +class SVT_DLLPUBLIC ODocumentInfoPreview: public vcl::Window { public: - ODocumentInfoPreview(Window * pParent, WinBits nBits); + ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits); virtual ~ODocumentInfoPreview(); diff --git a/include/svtools/GraphicExportOptionsDialog.hxx b/include/svtools/GraphicExportOptionsDialog.hxx index 803467a082c6..1982aa1bc679 100644 --- a/include/svtools/GraphicExportOptionsDialog.hxx +++ b/include/svtools/GraphicExportOptionsDialog.hxx @@ -61,7 +61,7 @@ private: DECL_LINK( resolutionModifiedHandle, void* ); public: - GraphicExportOptionsDialog( Window* pWindow, const css::uno::Reference<css::lang::XComponent>& rxSourceDocument ); + GraphicExportOptionsDialog( vcl::Window* pWindow, const css::uno::Reference<css::lang::XComponent>& rxSourceDocument ); virtual ~GraphicExportOptionsDialog(); css::uno::Sequence<css::beans::PropertyValue> getFilterData(); diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 9d79ff9b558c..7990542d3c07 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -48,8 +48,8 @@ private : public : - PlaceEditDialog( Window* pParent); - PlaceEditDialog(Window* pParent, const boost::shared_ptr<Place> &pPlace ); + PlaceEditDialog( vcl::Window* pParent); + PlaceEditDialog(vcl::Window* pParent, const boost::shared_ptr<Place> &pPlace ); virtual ~PlaceEditDialog(); // Returns a place instance with given information diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index 23557fefdb28..23ffc5008c73 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -48,7 +48,7 @@ namespace com { namespace sun { namespace star { namespace awt { class Rectangle; class Ruler; -class Window; +namespace vcl { class Window; } typedef ::cppu::WeakAggComponentImplHelper5< diff --git a/include/svtools/accessibletable.hxx b/include/svtools/accessibletable.hxx index 29fb95f6f70a..1f88a354972d 100644 --- a/include/svtools/accessibletable.hxx +++ b/include/svtools/accessibletable.hxx @@ -86,11 +86,11 @@ public: AccessibleTableControlObjType eObjType ) const= 0; // Window - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0; + virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const = 0; virtual void GrabFocus()= 0; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true )= 0; - virtual Window* GetAccessibleParentWindow() const= 0; - virtual Window* GetWindowInstance()= 0; + virtual vcl::Window* GetAccessibleParentWindow() const= 0; + virtual vcl::Window* GetWindowInstance()= 0; virtual sal_Int32 GetAccessibleControlCount() const = 0; virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )= 0; virtual long GetRowCount() const= 0; diff --git a/include/svtools/accessibletableprovider.hxx b/include/svtools/accessibletableprovider.hxx index acd3feace9a9..bd219963c96f 100644 --- a/include/svtools/accessibletableprovider.hxx +++ b/include/svtools/accessibletableprovider.hxx @@ -116,11 +116,11 @@ public: virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) = 0; // Window - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const = 0; + virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const = 0; virtual void GrabFocus() = 0; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) = 0; - virtual Window* GetAccessibleParentWindow() const = 0; - virtual Window* GetWindowInstance() = 0; + virtual vcl::Window* GetAccessibleParentWindow() const = 0; + virtual vcl::Window* GetWindowInstance() = 0; virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) = 0; virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) = 0; diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 0ade142d02f8..020d38c70e55 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -69,7 +69,7 @@ namespace svt m_pImpl; public: - AddressBookSourceDialog( Window* _pParent, + AddressBookSourceDialog( vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); /** if you use this ctor, the dialog @@ -91,7 +91,7 @@ namespace svt the table name to display. It must refer to a valid table, relative to a connection obtained from <arg>_rxTransientDS</arg> */ - AddressBookSourceDialog( Window* _pParent, + AddressBookSourceDialog( vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxTransientDS, const OUString& _rDataSourceName, diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index c4e1b998772a..34eb59335a88 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -128,7 +128,7 @@ typedef sal_uLong BrowserMode; class BrowseEvent { - Window* pWin; + vcl::Window* pWin; long nRow; Rectangle aRect; sal_uInt16 nCol; @@ -136,12 +136,12 @@ class BrowseEvent public: BrowseEvent(); - BrowseEvent( Window* pWindow, + BrowseEvent( vcl::Window* pWindow, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ); - Window* GetWindow() const { return pWin; } + vcl::Window* GetWindow() const { return pWin; } long GetRow() const { return nRow; } sal_uInt16 GetColumn() const { return nCol; } sal_uInt16 GetColumnId() const { return nColId; } @@ -157,7 +157,7 @@ class BrowserMouseEvent: public MouseEvent, public BrowseEvent public: BrowserMouseEvent(); BrowserMouseEvent( BrowserDataWin* pWin, const MouseEvent& rEvt ); - BrowserMouseEvent( Window* pWin, const MouseEvent& rEvt, + BrowserMouseEvent( vcl::Window* pWin, const MouseEvent& rEvt, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ); }; @@ -217,7 +217,7 @@ public: static const sal_uInt16 HandleColumnId = 0; private: - Window* pDataWin; // window to display data rows + vcl::Window* pDataWin; // window to display data rows ScrollBar* pVScroll; // vertical scrollbar ScrollBar aHScroll; // horizontal scrollbar @@ -339,7 +339,7 @@ protected: virtual bool SeekRow( long nRow ) = 0; virtual void DrawCursor(); virtual void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); - virtual void PaintData( Window& rWin, const Rectangle& rRect ); + virtual void PaintData( vcl::Window& rWin, const Rectangle& rRect ); virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const = 0; // Advice for the subclass: the visible scope of rows has changed. @@ -397,9 +397,9 @@ protected: virtual void ImplEndTracking(); public: - BrowseBox( Window* pParent, WinBits nBits = 0, + BrowseBox( vcl::Window* pParent, WinBits nBits = 0, BrowserMode nMode = 0 ); - BrowseBox( Window* pParent, const ResId& rId, + BrowseBox( vcl::Window* pParent, const ResId& rId, BrowserMode nMode = 0 ); virtual ~BrowseBox(); @@ -520,7 +520,7 @@ public: bool IsResizing() const { return bResizing; } // access to positions of fields, column and rows - Window& GetDataWindow() const { return *pDataWin; } + vcl::Window& GetDataWindow() const { return *pDataWin; } Rectangle GetRowRectPixel( long nRow, bool bRelToBrowser = true ) const; Rectangle GetFieldRectPixel( long nRow, sal_uInt16 nColId, @@ -788,11 +788,11 @@ public: virtual bool IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumn ) const SAL_OVERRIDE; virtual OUString GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const SAL_OVERRIDE; virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) SAL_OVERRIDE; - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const SAL_OVERRIDE; + virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; - virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE; - virtual Window* GetWindowInstance() SAL_OVERRIDE; + virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; private: // the following declares some Window/OutputDevice methods private. This happened in the course diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 03b5d2345e34..3ad7b9718276 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -257,7 +257,7 @@ protected: DECL_STATIC_LINK( Calendar, ScrollHdl, Timer *); public: - Calendar( Window* pParent, WinBits nWinStyle = 0 ); + Calendar( vcl::Window* pParent, WinBits nWinStyle = 0 ); virtual ~Calendar(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -415,13 +415,13 @@ private: DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* ); public: - CalendarField( Window* pParent, WinBits nWinStyle ); + CalendarField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~CalendarField(); virtual void Select(); virtual bool ShowDropDown( bool bShow ) SAL_OVERRIDE; - virtual Calendar* CreateCalendar( Window* pParent ); + virtual Calendar* CreateCalendar( vcl::Window* pParent ); Calendar* GetCalendar(); void SetDefaultDate( const Date& rDate ) { maDefaultDate = rDate; } diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx index 3db4fb4bdc40..5df3ae5350c0 100644 --- a/include/svtools/cliplistener.hxx +++ b/include/svtools/cliplistener.hxx @@ -25,7 +25,7 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp> -class Window; +namespace vcl { class Window; } class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelper1< @@ -38,7 +38,7 @@ public: TransferableClipboardListener( const Link& rCallback ); virtual ~TransferableClipboardListener(); - void AddRemoveListener( Window* pWin, bool bAdd ); + void AddRemoveListener( vcl::Window* pWin, bool bAdd ); void ClearCallbackLink(); // XEventListener diff --git a/include/svtools/colrdlg.hxx b/include/svtools/colrdlg.hxx index 37bfc6d1799f..daee9bb1fef6 100644 --- a/include/svtools/colrdlg.hxx +++ b/include/svtools/colrdlg.hxx @@ -24,7 +24,7 @@ #include <tools/color.hxx> -class Window; +namespace vcl { class Window; } // - ColorDialog - @@ -39,7 +39,7 @@ namespace svtools class SVT_DLLPUBLIC SvColorDialog { public: - SvColorDialog( ::Window* pParent ); + SvColorDialog( vcl::Window* pParent ); virtual ~SvColorDialog(); void SetColor( const Color& rColor ); @@ -50,7 +50,7 @@ public: virtual short Execute(); private: - Window* mpParent; + vcl::Window* mpParent; Color maColor; sal_Int16 meMode; }; diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 5d728141791e..de433f61389d 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -155,9 +155,9 @@ class SVT_DLLPUBLIC ColorListBox : public ListBox SVT_DLLPRIVATE void ImplDestroyColorEntries(); public: - ColorListBox( Window* pParent, + ColorListBox( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER ); - ColorListBox( Window* pParent, const ResId& rResId ); + ColorListBox( vcl::Window* pParent, const ResId& rResId ); virtual ~ColorListBox(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; @@ -302,7 +302,7 @@ public: typedef Color (*ColorFunc)(Color); typedef Color (*ColorDistFunc)(Color, Color); - LineListBox( Window* pParent, WinBits nWinStyle = WB_BORDER ); + LineListBox( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER ); virtual ~LineListBox(); /** Set the width in Twips */ @@ -404,7 +404,7 @@ protected: void LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep = ';' ); void SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep = ';' ) const; public: - FontNameBox( Window* pParent, + FontNameBox( vcl::Window* pParent, WinBits nWinStyle = WB_SORT ); virtual ~FontNameBox(); @@ -432,7 +432,7 @@ class SVT_DLLPUBLIC FontStyleBox : public ComboBox private: using ComboBox::SetText; public: - FontStyleBox( Window* pParent, WinBits nBits ); + FontStyleBox( vcl::Window* pParent, WinBits nBits ); virtual ~FontStyleBox(); virtual void Select() SAL_OVERRIDE; @@ -477,7 +477,7 @@ protected: virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; public: - FontSizeBox( Window* pParent, WinBits nWinStyle = 0 ); + FontSizeBox( vcl::Window* pParent, WinBits nWinStyle = 0 ); virtual ~FontSizeBox(); void Reformat() SAL_OVERRIDE; diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index 1b7bf1ed5bc7..cf455bea9f3b 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -49,7 +49,7 @@ namespace svt @param _rOperateOn the window on which to operate */ - virtual void operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const = 0; + virtual void operateOn( const VclWindowEvent& _rTrigger, vcl::Window& _rOperateOn ) const = 0; virtual ~IWindowOperator(); }; @@ -93,7 +93,7 @@ namespace svt ::std::auto_ptr< DialogController_Data > m_pImpl; public: - DialogController( Window& _rInstigator, const PWindowEventFilter& _pEventFilter, const PWindowOperator& _pOperator ); + DialogController( vcl::Window& _rInstigator, const PWindowEventFilter& _pEventFilter, const PWindowOperator& _pOperator ); virtual ~DialogController(); /** adds a window to the list of dependent windows @@ -104,7 +104,7 @@ namespace svt The caller is responsible for life-time control: The given window must live at least as long as the ->DialogController instance does. */ - void addDependentWindow( Window& _rWindow ); + void addDependentWindow( vcl::Window& _rWindow ); /** resets the controller so that no actions happened anymore. @@ -115,7 +115,7 @@ namespace svt private: void impl_Init(); void impl_updateAll( const VclWindowEvent& _rTriggerEvent ); - void impl_update( const VclWindowEvent& _rTriggerEvent, Window& _rWindow ); + void impl_update( const VclWindowEvent& _rTriggerEvent, vcl::Window& _rWindow ); DECL_LINK( OnWindowEvent, const VclWindowEvent* ); @@ -156,10 +156,10 @@ namespace svt denotes the window which should be enabled when ->_rRadio is checked, and disabled when it's unchecked */ - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2 ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 ); - void enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 ); + void enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow ); + void enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2 ); + void enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3 ); + void enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3, vcl::Window& _rDependentWindow4, vcl::Window& _rDependentWindow5 ); /** ensures that a given window is enabled or disabled, according to the mark state of a given check box @@ -169,9 +169,9 @@ namespace svt denotes the window which should be enabled when ->_rBox is marked, and disabled when it's unmarked */ - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2 ); - void enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 ); + void enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow ); + void enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2 ); + void enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3, vcl::Window& _rDependentWindow4 ); /** adds a non-standard controller whose functionality is not covered by the other methods @@ -215,7 +215,7 @@ namespace svt { } - virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, Window& _rOperateOn ) const SAL_OVERRIDE + virtual void operateOn( const VclWindowEvent& /*_rTrigger*/, vcl::Window& _rOperateOn ) const SAL_OVERRIDE { _rOperateOn.Enable( m_rCheckable.IsChecked() ); } @@ -232,9 +232,9 @@ namespace svt */ class SVT_DLLPUBLIC FilterForRadioOrCheckToggle : public IWindowEventFilter { - const Window& m_rWindow; + const vcl::Window& m_rWindow; public: - FilterForRadioOrCheckToggle( const Window& _rWindow ) + FilterForRadioOrCheckToggle( const vcl::Window& _rWindow ) :m_rWindow( _rWindow ) { } diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 4cb50bd8b89b..db10afd92f49 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -189,7 +189,7 @@ namespace svt class SVT_DLLPUBLIC MultiLineTextCell : public MultiLineEdit { public: - MultiLineTextCell( Window* _pParent, WinBits _nStyle ) + MultiLineTextCell( vcl::Window* _pParent, WinBits _nStyle ) :MultiLineEdit( _pParent, _nStyle ) { } @@ -277,7 +277,7 @@ namespace svt Link m_aClickLink,m_aModifyLink; public: - CheckBoxControl(Window* pParent, WinBits nWinStyle = 0); + CheckBoxControl(vcl::Window* pParent, WinBits nWinStyle = 0); virtual ~CheckBoxControl(); virtual void GetFocus() SAL_OVERRIDE; @@ -327,7 +327,7 @@ namespace svt friend class ComboBoxCellController; public: - ComboBoxControl(Window* pParent, WinBits nWinStyle = 0); + ComboBoxControl(vcl::Window* pParent, WinBits nWinStyle = 0); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -360,7 +360,7 @@ namespace svt friend class ListBoxCellController; public: - ListBoxControl(Window* pParent, WinBits nWinStyle = 0); + ListBoxControl(vcl::Window* pParent, WinBits nWinStyle = 0); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -472,7 +472,7 @@ namespace svt aOldController; ImplSVEvent * nStartEvent, * nEndEvent, * nCellModifiedEvent; // event ids - Window* m_pFocusWhileRequest; + vcl::Window* m_pFocusWhileRequest; // In ActivateCell, we grab the focus asynchronously, but if between requesting activation // and the asynchornous event the focus has changed, we won't grab it for ourself. @@ -588,8 +588,8 @@ namespace svt // secure starting of StartEditHdl public: - EditBrowseBox(Window* pParent, sal_Int32 nBrowserFlags = EBBF_NONE, WinBits nBits = WB_TABSTOP, BrowserMode nMode = 0 ); - EditBrowseBox(Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags = EBBF_NONE, BrowserMode nMode = 0 ); + EditBrowseBox(vcl::Window* pParent, sal_Int32 nBrowserFlags = EBBF_NONE, WinBits nBits = WB_TABSTOP, BrowserMode nMode = 0 ); + EditBrowseBox(vcl::Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags = EBBF_NONE, BrowserMode nMode = 0 ); virtual ~EditBrowseBox(); bool IsEditing() const {return aController.Is();} diff --git a/include/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx index 98c13b38e26a..8ec02d388281 100644 --- a/include/svtools/editsyntaxhighlighter.hxx +++ b/include/svtools/editsyntaxhighlighter.hxx @@ -39,7 +39,7 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER , HighlighterLanguage aLanguage = HIGHLIGHT_SQL); + MultiLineEditSyntaxHighlight( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER , HighlighterLanguage aLanguage = HIGHLIGHT_SQL); virtual ~MultiLineEditSyntaxHighlight(); virtual void UpdateData() SAL_OVERRIDE; diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index d5038c7bd590..991e9e8033fd 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -26,17 +26,17 @@ #include <tools/errinf.hxx> -class Window; +namespace vcl { class Window; } class ResMgr; class SVT_DLLPUBLIC SfxErrorContext : private ErrorContext { public: SfxErrorContext( - sal_uInt16 nCtxIdP, Window *pWin=0, + sal_uInt16 nCtxIdP, vcl::Window *pWin=0, sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); SfxErrorContext( - sal_uInt16 nCtxIdP, const OUString &aArg1, Window *pWin=0, + sal_uInt16 nCtxIdP, const OUString &aArg1, vcl::Window *pWin=0, sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); bool GetString(sal_uLong nErrId, OUString &rStr) SAL_OVERRIDE; diff --git a/include/svtools/extensionlistbox.hxx b/include/svtools/extensionlistbox.hxx index 42a7523d9b5a..57f7725d6d8c 100644 --- a/include/svtools/extensionlistbox.hxx +++ b/include/svtools/extensionlistbox.hxx @@ -38,7 +38,7 @@ class IExtensionListBox: public Control public: enum { ENTRY_NOTFOUND = -1 }; - IExtensionListBox( Window* pParent, WinBits nWinStyle = 0 ): Control( pParent, nWinStyle ){} + IExtensionListBox( vcl::Window* pParent, WinBits nWinStyle = 0 ): Control( pParent, nWinStyle ){} /** @return The count of the entries in the list box. */ virtual sal_Int32 getItemCount() const = 0; diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index aa591df7edc4..04e6e0a2819c 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -39,7 +39,7 @@ typedef sal_uInt16 FileControlMode_Internal; #define FILECTRL_ORIGINALBUTTONTEXT ((sal_uInt16)0x0002) -class SVT_DLLPUBLIC FileControl : public Window +class SVT_DLLPUBLIC FileControl : public vcl::Window { private: Edit maEdit; @@ -64,7 +64,7 @@ protected: DECL_DLLPRIVATE_LINK( ButtonHdl, void* ); public: - FileControl( Window* pParent, WinBits nStyle, FileControlMode = 0 ); + FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode = 0 ); virtual ~FileControl(); Edit& GetEdit() { return maEdit; } diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index f75cb5c0ec4a..c1dfde0f65fb 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -37,7 +37,7 @@ namespace svt OUString m_sPreservedText; public: - FileURLBox( Window* _pParent, WinBits _nStyle ); + FileURLBox( vcl::Window* _pParent, WinBits _nStyle ); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index 334f6ca7901d..283f4aa3e899 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -80,7 +80,7 @@ protected: virtual void GetFocus() SAL_OVERRIDE; public: - SvtFileView( Window* pParent, WinBits nBits, bool bOnlyFolder, bool bMultiSelection ); + SvtFileView( vcl::Window* pParent, WinBits nBits, bool bOnlyFolder, bool bMultiSelection ); virtual ~SvtFileView(); virtual Size GetOptimalSize() const SAL_OVERRIDE; @@ -214,7 +214,7 @@ private: PushButton* m_pAllButton; public: - QueryDeleteDlg_Impl(Window* pParent, const OUString& rName); + QueryDeleteDlg_Impl(vcl::Window* pParent, const OUString& rName); void EnableAllButton() { m_pAllButton->Enable(true); } }; diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index d7bd1f1f1eac..3c13f0fefb5d 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -94,7 +94,7 @@ protected: bool m_bUseInputStringForFormatting; public: - FormattedField(Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0); + FormattedField(vcl::Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0); virtual ~FormattedField(); // Min-/Max-Verwaltung @@ -266,7 +266,7 @@ protected: validation::NumberValidator* m_pNumberValidator; public: - DoubleNumericField(Window* pParent, WinBits nStyle = 0) + DoubleNumericField(vcl::Window* pParent, WinBits nStyle = 0) :FormattedField(pParent, nStyle) ,m_pNumberValidator( NULL ) { @@ -294,7 +294,7 @@ class DoubleCurrencyField : public FormattedField bool m_bChangingFormat; public: - DoubleCurrencyField(Window* pParent, WinBits nStyle = 0); + DoubleCurrencyField(vcl::Window* pParent, WinBits nStyle = 0); OUString getCurrencySymbol() const { return m_sCurrencySymbol; } void setCurrencySymbol(const OUString& rSymbol); diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 19a34f1dafbf..f0445ff96405 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -40,7 +40,7 @@ #include <tools/link.hxx> class Dialog; -class Window; +namespace vcl { class Window; } class VclWindowEvent; @@ -124,7 +124,7 @@ namespace svt but the application-wide solar mutex is (to guard the not thread-safe ctor of the dialog). @param pParent the parent window for the new dialog */ - virtual Dialog* createDialog(Window* _pParent) = 0; + virtual Dialog* createDialog(vcl::Window* _pParent) = 0; /// called to destroy the dialog used. the default implementation just deletes m_pDialog and resets it to NULL virtual void destroyDialog(); diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 63fb5e91e6f1..39210b4e631e 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -233,7 +233,7 @@ typedef sal_uInt16 HeaderBarItemBits; class VCLXHeaderBar; -class SVT_DLLPUBLIC HeaderBar : public Window +class SVT_DLLPUBLIC HeaderBar : public vcl::Window { private: ImplHeadItemList* mpItemList; @@ -291,7 +291,7 @@ private: SVT_DLLPRIVATE void ImplEndDrag( bool bCancel ); public: - HeaderBar( Window* pParent, WinBits nWinBits = WB_STDHEADERBAR ); + HeaderBar( vcl::Window* pParent, WinBits nWinBits = WB_STDHEADERBAR ); virtual ~HeaderBar(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index aa38892b60ab..eacfe4896372 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -52,7 +52,7 @@ namespace svt void implInit(); public: - HyperLabel( Window* _pParent, WinBits _nWinStyle = 0 ); + HyperLabel( vcl::Window* _pParent, WinBits _nWinStyle = 0 ); virtual ~HyperLabel( ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 8d073a88765a..b9852ce6fc7b 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -59,9 +59,9 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SvtURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); - SvtURLBox( Window* pParent, WinBits _nStyle, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); - SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); + SvtURLBox( vcl::Window* pParent, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); + SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); + SvtURLBox( vcl::Window* pParent, const ResId& _rResId, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); virtual ~SvtURLBox(); void SetBaseURL( const OUString& rURL ); diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index f93200899de3..f336a9858036 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -261,7 +261,7 @@ protected: public: - SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle = WB_ICON | WB_BORDER ); + SvtIconChoiceCtrl( vcl::Window* pParent, WinBits nWinStyle = WB_ICON | WB_BORDER ); virtual ~SvtIconChoiceCtrl(); void SetStyle( WinBits nWinStyle ); diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx index 86466f08059a..27fbf710ac2d 100644 --- a/include/svtools/popupwindowcontroller.hxx +++ b/include/svtools/popupwindowcontroller.hxx @@ -27,7 +27,7 @@ #include <svtools/toolboxcontroller.hxx> #include <boost/scoped_ptr.hpp> -class Window; +namespace vcl { class Window; } namespace svt { @@ -41,7 +41,7 @@ public: const OUString& aCommandURL ); virtual ~PopupWindowController(); - virtual ::Window* createPopupWindow( ::Window* pParent ) = 0; + virtual vcl::Window* createPopupWindow( vcl::Window* pParent ) = 0; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index c4df80474254..b7ed0fd8f3dc 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -59,7 +59,7 @@ private: DECL_DLLPRIVATE_LINK( ImplStatusHdl, void* ); public: - PrinterSetupDialog( Window* pWindow ); + PrinterSetupDialog( vcl::Window* pWindow ); virtual ~PrinterSetupDialog(); void SetPrinter( Printer* pNewPrinter ) { mpPrinter = pNewPrinter; } diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx index 5d354621bc26..48aa5b2bcf3f 100644 --- a/include/svtools/restartdialog.hxx +++ b/include/svtools/restartdialog.hxx @@ -15,7 +15,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <svtools/svtdllapi.h> -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } @@ -38,7 +38,7 @@ enum RestartReason { SVT_DLLPUBLIC void executeRestartDialog( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context, - Window * parent, RestartReason reason); + vcl::Window * parent, RestartReason reason); } diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index 7abcd48c05e8..578ba284adb8 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -68,12 +68,12 @@ namespace svt public: RoadmapWizard( - Window* _pParent, + vcl::Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags = WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP ); RoadmapWizard( - Window* _pParent, + vcl::Window* _pParent, sal_uInt32 _nButtonFlags = WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP ); virtual ~RoadmapWizard( ); diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 67eb55d84035..49d4e424da4b 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -607,7 +607,7 @@ struct RulerUnitData class ImplRulerData; -class SVT_DLLPUBLIC Ruler : public Window +class SVT_DLLPUBLIC Ruler : public vcl::Window { private: VirtualDevice maVirDev; @@ -712,7 +712,7 @@ protected: RulerUnitData GetCurrentRulerUnit() const; public: - Ruler( Window* pParent, WinBits nWinStyle = WB_STDRULER ); + Ruler( vcl::Window* pParent, WinBits nWinStyle = WB_STDRULER ); virtual ~Ruler(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/svtools/scrwin.hxx b/include/svtools/scrwin.hxx index 7b86396c88f8..41a6a00ca341 100644 --- a/include/svtools/scrwin.hxx +++ b/include/svtools/scrwin.hxx @@ -41,7 +41,7 @@ typedef sal_uInt16 ScrollableWindowFlags; // - ScrollableWindow - -class SVT_DLLPUBLIC ScrollableWindow: public Window +class SVT_DLLPUBLIC ScrollableWindow: public vcl::Window { private: Point aPixOffset; // offset to virtual window (pixel) @@ -62,7 +62,7 @@ private: DECL_DLLPRIVATE_LINK( EndScrollHdl, ScrollBar * ); public: - ScrollableWindow( Window* pParent, WinBits nBits = 0, + ScrollableWindow( vcl::Window* pParent, WinBits nBits = 0, ScrollableWindowFlags = SCRWIN_DEFAULT ); virtual void Resize() SAL_OVERRIDE; diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 53fc594e0c00..5ade4fbbbe6a 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -34,7 +34,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SvSimpleTableContainer( Window* pParent, WinBits nBits = WB_BORDER ); + SvSimpleTableContainer( vcl::Window* pParent, WinBits nBits = WB_BORDER ); void SetTable(SvSimpleTable* pTable); diff --git a/include/svtools/stdctrl.hxx b/include/svtools/stdctrl.hxx index 271b5d3de6b9..38c548caffd2 100644 --- a/include/svtools/stdctrl.hxx +++ b/include/svtools/stdctrl.hxx @@ -28,7 +28,7 @@ class SVT_DLLPUBLIC FixedInfo : public FixedText { public: - FixedInfo( Window* pParent, const ResId& rResId ); + FixedInfo( vcl::Window* pParent, const ResId& rResId ); }; #endif // INCLUDED_SVTOOLS_STDCTRL_HXX diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index 9f3869af6dd2..dea0989121ad 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -55,16 +55,16 @@ namespace svt <p>Beware: In opposite to the old DragServer::CopyString, this method does not <em>add</em> the string to the clipboard, instead the old clipboard content is <em>replaced</em>!</p> */ - SVT_DLLPUBLIC static void CopyString( const OUString& _rContent, Window* _pWindow = NULL ); + SVT_DLLPUBLIC static void CopyString( const OUString& _rContent, vcl::Window* _pWindow = NULL ); /** extracts a string from the system clipboard given @return <TRUE/> if the extraction was successful, i.e. if the clipboard contained a string content */ - SVT_DLLPUBLIC static bool PasteString( OUString& _rContent, Window* _pWindow = NULL ); + SVT_DLLPUBLIC static bool PasteString( OUString& _rContent, vcl::Window* _pWindow = NULL ); /** starts dragging a simple string */ - SVT_DLLPUBLIC static void StartStringDrag( const OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ); + SVT_DLLPUBLIC static void StartStringDrag( const OUString& _rContent, vcl::Window* _pWindow, sal_Int8 _nDragSourceActions ); }; diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 8c66b83511e7..ff9c00f05317 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -140,7 +140,7 @@ class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem sal_uInt16 nItemFlags; sal_uInt16 nBaseOffs; - void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, Window* pParent ); + void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, vcl::Window* pParent ); public: // An SvLBoxButton can be of three different kinds: an // enabled checkbox (the normal kind), a disabled checkbox diff --git a/include/svtools/svmedit.hxx b/include/svtools/svmedit.hxx index 892d80fcc18f..33c2b90fe6f2 100644 --- a/include/svtools/svmedit.hxx +++ b/include/svtools/svmedit.hxx @@ -31,7 +31,7 @@ class SVT_DLLPUBLIC MultiLineEdit : public VclMultiLineEdit { public: - MultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); + MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface(bool bCreate = true) SAL_OVERRIDE; diff --git a/include/svtools/svmedit2.hxx b/include/svtools/svmedit2.hxx index 9c9a6aed4180..2e17023629c9 100644 --- a/include/svtools/svmedit2.hxx +++ b/include/svtools/svmedit2.hxx @@ -27,7 +27,7 @@ class TextAttrib; class SVT_DLLPUBLIC ExtMultiLineEdit : public MultiLineEdit { public: - ExtMultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); + ExtMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); virtual ~ExtMultiLineEdit(); // methods of TextView diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index 8ade2a01fbd5..24450a3083a2 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -63,7 +63,7 @@ protected: SvTreeListEntry* GetChildOnPos( SvTreeListEntry* _pParent, sal_uLong _nEntryPos, sal_uLong& _rPos ) const; public: - SvTabListBox( Window* pParent, WinBits = WB_BORDER ); + SvTabListBox( vcl::Window* pParent, WinBits = WB_BORDER ); virtual ~SvTabListBox(); void SetTabs( long* pTabs, MapUnit = MAP_APPFONT ); sal_uInt16 TabCount() const { return (sal_uInt16)nTabCount; } @@ -137,7 +137,7 @@ private: void RecalculateAccessibleChildren(); public: - SvHeaderTabListBox( Window* pParent, WinBits nBits ); + SvHeaderTabListBox( vcl::Window* pParent, WinBits nBits ); virtual ~SvHeaderTabListBox(); virtual void Paint( const Rectangle& ) SAL_OVERRIDE; @@ -223,7 +223,7 @@ public: virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const SAL_OVERRIDE; virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const SAL_OVERRIDE; - virtual Window* GetWindowInstance() SAL_OVERRIDE; + virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; using SvTreeListBox::FillAccessibleStateSet; virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const SAL_OVERRIDE; @@ -234,10 +234,10 @@ public: virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) SAL_OVERRIDE; // Window - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const SAL_OVERRIDE; + virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; - virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; /** Creates and returns the accessible object of the whole BrowseBox. */ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index bc15dd4c298e..bf53f75998d0 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -327,7 +327,7 @@ enum TabBarAllowRenamingReturnCode { struct TabBar_Impl; struct ImplTabBarItem; -class SVT_DLLPUBLIC TabBar : public Window +class SVT_DLLPUBLIC TabBar : public vcl::Window { friend class ImplTabButton; friend class ImplTabSizer; @@ -404,7 +404,7 @@ public: static const sal_uInt16 PAGE_NOT_FOUND; static const sal_uInt16 INSERT_TAB_POS; - TabBar( Window* pParent, WinBits nWinStyle = WB_STDTABBAR ); + TabBar( vcl::Window* pParent, WinBits nWinStyle = WB_STDTABBAR ); virtual ~TabBar(); virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/svtools/table/tablerenderer.hxx b/include/svtools/table/tablerenderer.hxx index a365f33b6d56..9e66e1b01326 100644 --- a/include/svtools/table/tablerenderer.hxx +++ b/include/svtools/table/tablerenderer.hxx @@ -210,14 +210,14 @@ namespace svt { namespace table The cell cursor is used to indicate the active/current cell of a table control. */ - virtual void ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect) = 0; + virtual void ShowCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) = 0; /** hides the cell cursor previously drawn into the given rectangle The cell cursor is used to indicate the active/current cell of a table control. */ - virtual void HideCellCursor( Window& _rView, const Rectangle& _rCursorRect) = 0; + virtual void HideCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) = 0; /** checks whether a given cell content fits into a given target area on a given device. diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 5f2f0f26e310..86a49dbf2b5e 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -47,11 +47,11 @@ class SVT_DLLPUBLIC ToolbarMenu : public DockingWindow friend struct ToolbarMenu_Impl; public: ToolbarMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow, + vcl::Window* pParentWindow, WinBits nBits ); ToolbarMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, - Window* pParentWindow, + vcl::Window* pParentWindow, const ResId& rResId ); virtual ~ToolbarMenu(); diff --git a/include/svtools/toolpanel/drawerlayouter.hxx b/include/svtools/toolpanel/drawerlayouter.hxx index 2cef5d718d68..93b11f4f17e0 100644 --- a/include/svtools/toolpanel/drawerlayouter.hxx +++ b/include/svtools/toolpanel/drawerlayouter.hxx @@ -45,7 +45,7 @@ namespace svt { public: DrawerDeckLayouter( - ::Window& i_rParentWindow, + vcl::Window& i_rParentWindow, IToolPanelDeck& i_rPanels ); virtual ~DrawerDeckLayouter(); @@ -71,13 +71,13 @@ namespace svt private: // triggers a re-arrance of the panel deck elements void impl_triggerRearrange() const; - size_t impl_getPanelPositionFromWindow( const Window* i_pDrawerWindow ) const; + size_t impl_getPanelPositionFromWindow( const vcl::Window* i_pDrawerWindow ) const; void impl_removeDrawer( const size_t i_nPosition ); DECL_LINK( OnWindowEvent, VclSimpleEvent* ); private: - Window& m_rParentWindow; + vcl::Window& m_rParentWindow; IToolPanelDeck& m_rPanelDeck; ::std::vector< PToolPanelDrawer > m_aDrawers; ::boost::optional< size_t > m_aLastKnownActivePanel; diff --git a/include/svtools/toolpanel/paneltabbar.hxx b/include/svtools/toolpanel/paneltabbar.hxx index 190b86bf5668..0964d79c9e40 100644 --- a/include/svtools/toolpanel/paneltabbar.hxx +++ b/include/svtools/toolpanel/paneltabbar.hxx @@ -50,7 +50,7 @@ namespace svt class SVT_DLLPUBLIC PanelTabBar : public Control { public: - PanelTabBar( Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ); + PanelTabBar( vcl::Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ); virtual ~PanelTabBar(); // attribute access diff --git a/include/svtools/toolpanel/tablayouter.hxx b/include/svtools/toolpanel/tablayouter.hxx index db89736db832..3ad6060df5df 100644 --- a/include/svtools/toolpanel/tablayouter.hxx +++ b/include/svtools/toolpanel/tablayouter.hxx @@ -30,7 +30,7 @@ #include <boost/noncopyable.hpp> -class Window; +namespace vcl { class Window; } namespace svt @@ -59,7 +59,7 @@ namespace svt specifies the content to show on the tab items */ TabDeckLayouter( - Window& i_rParent, + vcl::Window& i_rParent, IToolPanelDeck& i_rPanels, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent diff --git a/include/svtools/toolpanel/toolpanel.hxx b/include/svtools/toolpanel/toolpanel.hxx index 27084d8bd460..fafeb3981e11 100644 --- a/include/svtools/toolpanel/toolpanel.hxx +++ b/include/svtools/toolpanel/toolpanel.hxx @@ -30,7 +30,7 @@ #include <boost/noncopyable.hpp> class Rectangle; -class Window; +namespace vcl { class Window; } namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } @@ -66,7 +66,7 @@ namespace svt method will always get the same parent window. The complete area of this window is available, and should be used, for the panel window. */ - virtual void Activate( Window& i_rParentWindow ) = 0; + virtual void Activate( vcl::Window& i_rParentWindow ) = 0; /** deactivates the panel diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx index 1f2497c1aeec..48127c569fd6 100644 --- a/include/svtools/toolpanel/toolpaneldeck.hxx +++ b/include/svtools/toolpanel/toolpaneldeck.hxx @@ -136,7 +136,7 @@ namespace svt ,public IToolPanelDeck { public: - ToolPanelDeck( Window& i_rParent, const WinBits i_nStyle = WB_DIALOGCONTROL ); + ToolPanelDeck( vcl::Window& i_rParent, const WinBits i_nStyle = WB_DIALOGCONTROL ); virtual ~ToolPanelDeck(); // attributes @@ -148,8 +148,8 @@ namespace svt This is a single dedicated window, which is passed to the IToolPanel::ActivatePanel method whenever a panel is activated, to act as parent window for the panel's VCL-Window. */ - ::Window& GetPanelWindowAnchor(); - const ::Window& GetPanelWindowAnchor() const; + vcl::Window& GetPanelWindowAnchor(); + const vcl::Window& GetPanelWindowAnchor() const; // IToolPanelDeck virtual size_t GetPanelCount() const SAL_OVERRIDE; diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 03932c561600..3013a62a28eb 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -48,7 +48,7 @@ class ImageMap; class INetBookmark; class INetImage; class FileList; -class Window; +namespace vcl { class Window; } class Link; // Drag&Drop defines @@ -251,13 +251,13 @@ public: void PrepareOLE( const TransferableObjectDescriptor& rObjDesc ); - void CopyToClipboard( Window *pWindow ) const; - void CopyToSelection( Window *pWindow ) const; - void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, + void CopyToClipboard( vcl::Window *pWindow ) const; + void CopyToSelection( vcl::Window *pWindow ) const; + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ); - static void ClearSelection( Window *pWindow ); + static void ClearSelection( vcl::Window *pWindow ); static ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > GetSystemClipboard(); static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); @@ -367,8 +367,8 @@ public: public: - static TransferableDataHelper CreateFromSystemClipboard( Window * pWindow ); - static TransferableDataHelper CreateFromSelection( Window * pWindow ); + static TransferableDataHelper CreateFromSystemClipboard( vcl::Window * pWindow ); + static TransferableDataHelper CreateFromSelection( vcl::Window * pWindow ); static bool IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor, const ::com::sun::star::datatransfer::DataFlavor& rRequestFlavor, bool bCompareParameters = false ); @@ -416,7 +416,7 @@ public: // to be overridden by the application virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - DragSourceHelper( Window* pWindow ); + DragSourceHelper( vcl::Window* pWindow ); virtual ~DragSourceHelper(); }; @@ -475,7 +475,7 @@ public: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - DropTargetHelper( Window* pWindow ); + DropTargetHelper( vcl::Window* pWindow ); DropTargetHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget >& rxDropTarget ); virtual ~DropTargetHelper(); @@ -519,7 +519,7 @@ public: bool HasAnyData() const; using TransferableHelper::StartDrag; - void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, const Link& rCallbck, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ); diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 12b75979f922..ac8a2812d569 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -344,8 +344,8 @@ protected: public: - SvTreeListBox( Window* pParent, WinBits nWinStyle=0 ); - SvTreeListBox( Window* pParent, const ResId& rResId ); + SvTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 ); + SvTreeListBox( vcl::Window* pParent, const ResId& rResId ); virtual ~SvTreeListBox(); SvTreeList* GetModel() const { return pModel; } @@ -807,7 +807,7 @@ class SvInplaceEdit2 DECL_LINK( EscapeHdl_Impl, void * ); public: - SvInplaceEdit2( Window* pParent, const Point& rPos, const Size& rSize, + SvInplaceEdit2( vcl::Window* pParent, const Point& rPos, const Size& rSize, const OUString& rData, const Link& rNotifyEditEnd, const Selection&, bool bMultiLine = false ); ~SvInplaceEdit2(); diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index 38c3099da9fd..a85c0fd9e84d 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -37,7 +37,7 @@ namespace svt OUString m_sPreservedText; public: - OFileURLControl(Window* _pParent, WinBits nStyle); + OFileURLControl(vcl::Window* _pParent, WinBits nStyle); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 0670ee094ace..8ade613810df 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -284,8 +284,8 @@ protected: virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() SAL_OVERRIDE; public: - ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren = false ); - ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false ); + ValueSet( vcl::Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren = false ); + ValueSet( vcl::Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false ); virtual ~ValueSet(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index 9618af1a6af5..56bd679a0d89 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -98,7 +98,7 @@ namespace svt if the OWizardPage is used in an OWizardMachine, this parameter must be the OWizardMachine (which is derived from Window) */ - OWizardPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription); + OWizardPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription); virtual ~OWizardPage(); // IWizardPageController overridables @@ -165,15 +165,15 @@ namespace svt m_pImpl; // hold members in this structure to allow keeping compatible when members are added - SVT_DLLPRIVATE void addButtons(Window* _pParent, sal_uInt32 _nButtonFlags); + SVT_DLLPRIVATE void addButtons(vcl::Window* _pParent, sal_uInt32 _nButtonFlags); public: /** ctor For the button flags, use any combination of the WZB_* flags. */ - OWizardMachine(Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ); - OWizardMachine(Window* _pParent, sal_uInt32 _nButtonFlags ); + OWizardMachine(vcl::Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ); + OWizardMachine(vcl::Window* _pParent, sal_uInt32 _nButtonFlags ); virtual ~OWizardMachine(); /// enable (or disable) buttons @@ -349,7 +349,7 @@ namespace svt DECL_DLLPRIVATE_LINK(OnPrevPage, void*); DECL_DLLPRIVATE_LINK(OnFinish, void*); - SVT_DLLPRIVATE void implResetDefault(Window* _pWindow); + SVT_DLLPRIVATE void implResetDefault(vcl::Window* _pWindow); SVT_DLLPRIVATE void implUpdateTitle(); SVT_DLLPRIVATE void implConstruct( const sal_uInt32 _nButtonFlags ); }; diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 7680d41aeff3..e65d596ec880 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -210,7 +210,7 @@ private: TabPage* mpCurTabPage; PushButton* mpPrevBtn; PushButton* mpNextBtn; - Window* mpViewWindow; + vcl::Window* mpViewWindow; sal_uInt16 mnCurLevel; WindowAlign meViewAlign; Link maActivateHdl; @@ -244,8 +244,8 @@ private: SVT_DLLPRIVATE TabPage* ImplGetPage( sal_uInt16 nLevel ) const; public: - WizardDialog( Window* pParent, WinBits nStyle = WB_STDTABDIALOG ); - WizardDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + WizardDialog( vcl::Window* pParent, WinBits nStyle = WB_STDTABDIALOG ); + WizardDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~WizardDialog(); virtual void Resize() SAL_OVERRIDE; @@ -276,8 +276,8 @@ public: void SetNextButton( PushButton* pButton ) { mpNextBtn = pButton; } PushButton* GetNextButton() const { return mpNextBtn; } - void SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; } - Window* GetViewWindow() const { return mpViewWindow; } + void SetViewWindow( vcl::Window* pWindow ) { mpViewWindow = pWindow; } + vcl::Window* GetViewWindow() const { return mpViewWindow; } void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; } WindowAlign GetViewAlign() const { return meViewAlign; } diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index d9df9dc9d34c..470b09ed4b09 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/awt/XWindow.hpp> -class Window; +namespace vcl { class Window; } @@ -47,7 +47,7 @@ public: virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; virtual bool operator == ( const SfxPoolItem& rAttr ) const SAL_OVERRIDE; - Window * GetWindowPtr() const { return VCLUnoHelper::GetWindow( m_xWin ); } + vcl::Window * GetWindowPtr() const { return VCLUnoHelper::GetWindow( m_xWin ); } com::sun::star::uno::Reference< com::sun::star::awt::XWindow > GetXWindow() const { return m_xWin; } }; 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. */ diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx index 86be3cbc7c66..0f2c93f2d590 100644 --- a/include/toolkit/awt/scrollabledialog.hxx +++ b/include/toolkit/awt/scrollabledialog.hxx @@ -57,7 +57,7 @@ namespace toolkit ScrollBarVisibility maScrollVis; void lcl_Scroll( long nX, long nY ); public: - ScrollableWrapper( Window* pParent, WinBits nStyle = WB_STDDIALOG ); + ScrollableWrapper( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG ); virtual ~ScrollableWrapper(); virtual void SetScrollWidth( long nWidth ) SAL_OVERRIDE; virtual long GetScrollWidth() SAL_OVERRIDE { return maScrollArea.Width(); } diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 9faf70655f11..d27228c8a09a 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -34,7 +34,7 @@ #include <tools/link.hxx> -class Window; +namespace vcl { class Window; } class VCLXWindow; class VclSimpleEvent; class VclWindowEvent; @@ -83,7 +83,7 @@ public: virtual ~VCLXAccessibleComponent(); VCLXWindow* GetVCLXWindow() const { return mpVCLXindow; } - Window* GetWindow() const; + vcl::Window* GetWindow() const; virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx index d0839302829f..a8b5e2b0b472 100644 --- a/include/toolkit/awt/vclxtopwindow.hxx +++ b/include/toolkit/awt/vclxtopwindow.hxx @@ -46,7 +46,7 @@ protected: bool isSystemDependentWindowPeer() const { return m_bWHWND; } - virtual Window* GetWindowImpl() = 0; + virtual vcl::Window* GetWindowImpl() = 0; virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl() = 0; VCLXTopWindow_Base( const bool _bSupportSystemWindowPeer ); @@ -86,7 +86,7 @@ class TOOLKIT_DLLPUBLIC VCLXTopWindow: public VCLXTopWindow_Base, public VCLXContainer { protected: - virtual Window* GetWindowImpl() SAL_OVERRIDE; + virtual vcl::Window* GetWindowImpl() SAL_OVERRIDE; virtual ::cppu::OInterfaceContainerHelper& GetTopWindowListenersImpl() SAL_OVERRIDE; public: diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index 7970959412be..f3f1e133bd53 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -46,7 +46,7 @@ #include <list> #include <boost/function.hpp> -class Window; +namespace vcl { class Window; } class VclSimpleEvent; class VclWindowEvent; struct SystemParentData; @@ -128,13 +128,13 @@ public: VCLXWindow( bool bWithDefaultProps = false ); virtual ~VCLXWindow(); - virtual void SetWindow( Window* pWindow ); - Window* GetWindow() const { return (Window*)GetOutputDevice(); } + virtual void SetWindow( vcl::Window* pWindow ); + vcl::Window* GetWindow() const { return (vcl::Window*)GetOutputDevice(); } void suspendVclEventListening( ); void resumeVclEventListening( ); - void notifyWindowRemoved( Window& _rWindow ); + void notifyWindowRemoved( vcl::Window& _rWindow ); // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 7fcf873354d2..1985154b0f6e 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -674,7 +674,7 @@ public: // ::com::sun::star::awt::XLayoutConstrains ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static ::com::sun::star::awt::Size SAL_CALL implGetMinimumSize( Window* p ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::awt::Size SAL_CALL implGetMinimumSize( vcl::Window* p ) throw(::com::sun::star::uno::RuntimeException); static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx index a1c9ea92c4c9..928c37bdf914 100644 --- a/include/toolkit/controls/accessiblecontrolcontext.hxx +++ b/include/toolkit/controls/accessiblecontrolcontext.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XWindow.hpp> -class Window; +namespace vcl { class Window; } namespace toolkit { @@ -117,7 +117,7 @@ namespace toolkit // stops listening at the control model void stopModelListening( ); - Window* implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const; + vcl::Window* implGetWindow( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const; }; diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx index 42e7856842d7..08f5a89cb78a 100644 --- a/include/toolkit/helper/vclunohelper.hxx +++ b/include/toolkit/helper/vclunohelper.hxx @@ -60,7 +60,7 @@ namespace com { namespace sun { namespace star { namespace awt { #include <tools/fldunit.hxx> #include <tools/poly.hxx> -class Window; +namespace vcl { class Window; } class OutputDevice; class MouseEvent; class KeyEvent; @@ -79,10 +79,10 @@ public: static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap> CreateBitmap( const BitmapEx& rBitmap ); // Window - static Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ); - static Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow2 ); - static Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindowPeer ); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> GetInterface( Window* pWindow ); + static vcl::Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& rxWindow ); + static vcl::Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2>& rxWindow2 ); + static vcl::Window* GetWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& rxWindowPeer ); + static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> GetInterface( vcl::Window* pWindow ); // OutputDevice static OutputDevice* GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice>& rxDevice ); @@ -112,7 +112,7 @@ public: // Rectangle static bool IsZero( ::com::sun::star::awt::Rectangle rRect ); - static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> CreateControlContainer( Window* pWindow ); + static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> CreateControlContainer( vcl::Window* pWindow ); // MapUnits static MapUnit UnoEmbed2VCLMapUnit( sal_Int32 nUnoEmbedMapUnit ); diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx index 89155398e59e..a16b56a179f4 100644 --- a/include/tools/errinf.hxx +++ b/include/tools/errinf.hxx @@ -30,7 +30,7 @@ class EDcr_Impl; class ErrHdl_Impl; -class Window; +namespace vcl { class Window; } class ErrorInfo { @@ -121,20 +121,20 @@ class TOOLS_DLLPUBLIC ErrorContext private: ErrorContext* pNext; - Window* pWin; + vcl::Window* pWin; public: - ErrorContext(Window *pWin=0); + ErrorContext(vcl::Window *pWin=0); virtual ~ErrorContext(); virtual bool GetString( sal_uIntPtr nErrId, OUString& rCtxStr ) = 0; - Window* GetParent() { return pWin; } + vcl::Window* GetParent() { return pWin; } static ErrorContext* GetContext(); }; typedef sal_uInt16 WindowDisplayErrorFunc( - Window *, sal_uInt16 nMask, const OUString &rErr, const OUString &rAction); + vcl::Window *, sal_uInt16 nMask, const OUString &rErr, const OUString &rAction); typedef void BasicDisplayErrorFunc( const OUString &rErr, const OUString &rAction); diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx index 3464d03de94c..d877e6d3dc46 100644 --- a/include/vcl/abstdlg.hxx +++ b/include/vcl/abstdlg.hxx @@ -22,7 +22,7 @@ #include <rtl/ustring.hxx> #include <vcl/dllapi.h> -class Window; +namespace vcl { class Window; } class ResId; class Link; @@ -69,10 +69,10 @@ public: static VclAbstractDialogFactory* Create(); // nDialogId was previously a ResId without ResMgr; the ResourceId is now // an implementation detail of the factory - virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId ) = 0; + virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) = 0; // creates instance of PasswordToOpenModifyDialog from cui - virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) = 0; + virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) = 0; }; #endif diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx index 3a955433bc33..958b0f394be9 100644 --- a/include/vcl/btndlg.hxx +++ b/include/vcl/btndlg.hxx @@ -61,7 +61,7 @@ protected: SAL_DLLPRIVATE long ImplGetButtonSize(); public: - ButtonDialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); + ButtonDialog( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG ); virtual ~ButtonDialog(); virtual void Resize() SAL_OVERRIDE; diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index f9adddb84585..4e62f41f95fc 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -44,7 +44,7 @@ class VCL_DLLPUBLIC VclBuilder: private boost::noncopyable { public: typedef std::map<OString, OString> stringmap; - typedef ::Window* (*customMakeWidget)(::Window *pParent, stringmap &rVec); + typedef vcl::Window* (*customMakeWidget)(vcl::Window *pParent, stringmap &rVec); private: typedef boost::ptr_map<OUString, osl::Module> ModuleMap; //We store these until the builder is deleted, that way we can use the @@ -73,10 +73,10 @@ private: struct WinAndId { OString m_sID; - ::Window *m_pWindow; + vcl::Window *m_pWindow; short m_nResponseId; PackingData m_aPackingData; - WinAndId(const OString &rId, ::Window *pWindow, bool bVertical) + WinAndId(const OString &rId, vcl::Window *pWindow, bool bVertical) : m_sID(rId) , m_pWindow(pWindow) , m_nResponseId(RET_CANCEL) @@ -184,7 +184,7 @@ private: } }; - typedef std::map< ::Window*, stringmap> AtkMap; + typedef std::map< vcl::Window*, stringmap> AtkMap; struct ParserState { @@ -209,7 +209,7 @@ private: Translations m_aTranslations; - std::map< ::Window*, ::Window*> m_aRedundantParentWidgets; + std::map< vcl::Window*, vcl::Window*> m_aRedundantParentWidgets; std::vector<SizeGroup> m_aSizeGroups; @@ -232,17 +232,17 @@ private: OString m_sID; OString m_sHelpRoot; ResHookProc m_pStringReplace; - ::Window *m_pParent; + vcl::Window *m_pParent; bool m_bToplevelHasDeferredInit; bool m_bToplevelHasDeferredProperties; bool m_bToplevelParentFound; ParserState *m_pParserState; - ::Window *get_by_name(const OString& sID); + vcl::Window *get_by_name(const OString& sID); void delete_by_name(const OString& sID); class sortIntoBestTabTraversalOrder - : public std::binary_function<const ::Window*, const ::Window*, bool> + : public std::binary_function<const vcl::Window*, const vcl::Window*, bool> { VclBuilder *m_pBuilder; public: @@ -250,22 +250,22 @@ private: : m_pBuilder(pBuilder) { } - bool operator()(const ::Window *pA, const ::Window *pB) const; + bool operator()(const vcl::Window *pA, const vcl::Window *pB) const; }; /// XFrame to be able to extract labels and other properties of the UNO commands (like of .uno:Bold). css::uno::Reference<css::frame::XFrame> m_xFrame; public: - VclBuilder(::Window *pParent, const OUString& sUIRootDir, const OUString& sUIFile, + VclBuilder(vcl::Window *pParent, const OUString& sUIRootDir, const OUString& sUIFile, const OString& sID = OString(), const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); ~VclBuilder(); - ::Window *get_widget_root(); + vcl::Window *get_widget_root(); //sID must exist and be of type T template <typename T> T* get(T*& ret, const OString& sID) { - ::Window *w = get_by_name(sID); + vcl::Window *w = get_by_name(sID); SAL_WARN_IF(!w, "vcl.layout", "widget \"" << sID.getStr() << "\" not found in .ui"); SAL_WARN_IF(!dynamic_cast<T*>(w), "vcl.layout", ".ui widget \"" << sID.getStr() << "\" needs to correspond to vcl type " << typeid(T).name()); @@ -281,9 +281,9 @@ public: return ret; } //sID may not exist, but must be of type T if it does - template <typename T /*= ::Window if we had c++11*/> T* get(const OString& sID) + template <typename T /*= vcl::Window if we had c++11*/> T* get(const OString& sID) { - ::Window *w = get_by_name(sID); + vcl::Window *w = get_by_name(sID); SAL_WARN_IF(w && !dynamic_cast<T*>(w), "vcl.layout", ".ui widget \"" << sID.getStr() << "\" needs to correspond to vcl type " << typeid(T).name()); assert(!w || dynamic_cast<T*>(w)); @@ -293,16 +293,16 @@ public: PopupMenu* get_menu(const OString& sID); //given an sID return the response value for that widget - short get_response(const ::Window *pWindow) const; + short get_response(const vcl::Window *pWindow) const; - OString get_by_window(const ::Window *pWindow) const; - void delete_by_window(const ::Window *pWindow); + OString get_by_window(const vcl::Window *pWindow) const; + void delete_by_window(const vcl::Window *pWindow); //release ownership of pWindow, i.e. don't delete it - void drop_ownership(const ::Window *pWindow); + void drop_ownership(const vcl::Window *pWindow); //apply the properties of rProps to pWindow - static void set_properties(::Window *pWindow, const stringmap &rProps); + static void set_properties(vcl::Window *pWindow, const stringmap &rProps); //Convert _ gtk markup to ~ vcl markup static OString convertMnemonicMarkup(const OString &rIn); @@ -322,8 +322,8 @@ public: void setDeferredProperties(); //Helpers to retrofit all the existing code to the builder - static void reorderWithinParent(std::vector< ::Window*>& rChilds, bool bIsButtonBox); - static void reorderWithinParent(::Window &rWindow, sal_uInt16 nNewPosition); + static void reorderWithinParent(std::vector< vcl::Window*>& rChilds, bool bIsButtonBox); + static void reorderWithinParent(vcl::Window &rWindow, sal_uInt16 nNewPosition); /// Get label of the command (like of .uno:Save) from the description service static OUString getCommandLabel(const OUString& rCommand, const css::uno::Reference<css::uno::XComponentContext>& rContext, const OUString& rModuleId); @@ -335,12 +335,12 @@ public: css::uno::Reference<css::frame::XFrame> getFrame() { return m_xFrame; } private: - ::Window *insertObject(::Window *pParent, + vcl::Window *insertObject(vcl::Window *pParent, const OString &rClass, const OString &rID, stringmap &rProps, stringmap &rPangoAttributes, stringmap &rAtkProps, std::vector<OString> &rItems); - ::Window *makeObject(::Window *pParent, + vcl::Window *makeObject(vcl::Window *pParent, const OString &rClass, const OString &rID, stringmap &rVec, const std::vector<OString> &rItems); @@ -358,10 +358,10 @@ private: void handleTranslations(xmlreader::XmlReader &reader); - void handleChild(::Window *pParent, xmlreader::XmlReader &reader); - ::Window* handleObject(::Window *pParent, xmlreader::XmlReader &reader); - void handlePacking(::Window *pCurrent, ::Window *pParent, xmlreader::XmlReader &reader); - void applyPackingProperty(::Window *pCurrent, ::Window *pParent, xmlreader::XmlReader &reader); + void handleChild(vcl::Window *pParent, xmlreader::XmlReader &reader); + vcl::Window* handleObject(vcl::Window *pParent, xmlreader::XmlReader &reader); + void handlePacking(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader); + void applyPackingProperty(vcl::Window *pCurrent, vcl::Window *pParent, xmlreader::XmlReader &reader); void collectProperty(xmlreader::XmlReader &reader, const OString &rID, stringmap &rVec); void collectPangoAttribute(xmlreader::XmlReader &reader, stringmap &rMap); void collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rMap); @@ -376,21 +376,21 @@ private: void handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 nRowIndex); void handleAdjustment(const OString &rID, stringmap &rProperties); void handleTextBuffer(const OString &rID, stringmap &rProperties); - void handleTabChild(::Window *pParent, xmlreader::XmlReader &reader); + void handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &reader); void handleMenu(xmlreader::XmlReader &reader, const OString &rID); std::vector<OString> handleItems(xmlreader::XmlReader &reader, const OString &rID); void handleSizeGroup(xmlreader::XmlReader &reader, const OString &rID); - void handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, ::Window *pWindow); + void handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, vcl::Window *pWindow); void handleActionWidget(xmlreader::XmlReader &reader); - PackingData get_window_packing_data(const ::Window *pWindow) const; - void set_window_packing_position(const ::Window *pWindow, sal_Int32 nPosition); + PackingData get_window_packing_data(const vcl::Window *pWindow) const; + void set_window_packing_position(const vcl::Window *pWindow, sal_Int32 nPosition); - ::Window* prepareWidgetOwnScrolling(::Window *pParent, WinBits &rWinStyle); - void cleanupWidgetOwnScrolling(::Window *pScrollParent, ::Window *pWindow, stringmap &rMap); + vcl::Window* prepareWidgetOwnScrolling(vcl::Window *pParent, WinBits &rWinStyle); + void cleanupWidgetOwnScrolling(vcl::Window *pScrollParent, vcl::Window *pWindow, stringmap &rMap); void set_response(const OString& sID, short nResponse); }; @@ -421,7 +421,7 @@ public: { return m_pUIBuilder->get<T>(ret, sID); } - template <typename T /*= ::Window if we had c++11*/> T* get(const OString & sID) + template <typename T /*= vcl::Window if we had c++11*/> T* get(const OString & sID) { return m_pUIBuilder->get<T>(sID); } diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index c06ff8c766c8..7a9623286569 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -112,7 +112,7 @@ protected: Link maToggleHdl; SAL_DLLPRIVATE void ImplInitPushButtonData(); - SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); + SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawFlags, const Rectangle& rRect, bool bLayout, bool bMenuBtnSep ); @@ -126,14 +126,14 @@ protected: SAL_DLLPRIVATE PushButton( const PushButton & ); SAL_DLLPRIVATE PushButton& operator=( const PushButton & ); - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); using Control::ImplInitSettings; using Window::ImplInit; public: SAL_DLLPRIVATE void ImplSetDefButton( bool bSet ); - SAL_DLLPRIVATE static void ImplDrawPushButtonFrame( Window* pDev, Rectangle& rRect, sal_uInt16 nStyle ); - SAL_DLLPRIVATE static bool ImplHitTestPushButton( Window* pDev, const Point& rPos ); + SAL_DLLPRIVATE static void ImplDrawPushButtonFrame( vcl::Window* pDev, Rectangle& rRect, sal_uInt16 nStyle ); + SAL_DLLPRIVATE static bool ImplHitTestPushButton( vcl::Window* pDev, const Point& rPos ); SAL_DLLPRIVATE bool ImplIsDefButton() const; protected: @@ -145,8 +145,8 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: - explicit PushButton( Window* pParent, WinBits nStyle = 0 ); - explicit PushButton( Window* pParent, const ResId& ); + explicit PushButton( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit PushButton( vcl::Window* pParent, const ResId& ); virtual ~PushButton(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -210,14 +210,14 @@ class VCL_DLLPUBLIC OKButton : public PushButton protected: using PushButton::ImplInit; private: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE OKButton (const OKButton &); SAL_DLLPRIVATE OKButton & operator= (const OKButton &); public: - explicit OKButton( Window* pParent, WinBits nStyle = WB_DEFBUTTON ); + explicit OKButton( vcl::Window* pParent, WinBits nStyle = WB_DEFBUTTON ); virtual void Click() SAL_OVERRIDE; }; @@ -228,14 +228,14 @@ class VCL_DLLPUBLIC CancelButton : public PushButton protected: using PushButton::ImplInit; private: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE CancelButton (const CancelButton &); SAL_DLLPRIVATE CancelButton & operator= (const CancelButton &); public: - explicit CancelButton( Window* pParent, WinBits nStyle = 0 ); + explicit CancelButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void Click() SAL_OVERRIDE; }; @@ -243,7 +243,7 @@ public: class VCL_DLLPUBLIC CloseButton : public CancelButton { public: - explicit CloseButton(Window* pParent, WinBits nStyle = 0); + explicit CloseButton(vcl::Window* pParent, WinBits nStyle = 0); }; @@ -256,15 +256,15 @@ class VCL_DLLPUBLIC HelpButton : public PushButton protected: using PushButton::ImplInit; private: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE HelpButton( const HelpButton & ); SAL_DLLPRIVATE HelpButton & operator= ( const HelpButton & ); public: - explicit HelpButton( Window* pParent, WinBits nStyle = 0 ); - explicit HelpButton( Window* pParent, const ResId& ); + explicit HelpButton( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit HelpButton( vcl::Window* pParent, const ResId& ); virtual void Click() SAL_OVERRIDE; }; @@ -291,7 +291,7 @@ private: // to the left or right ( depending on RTL or LTR settings ) bool mbLegacyNoTextAlign; SAL_DLLPRIVATE void ImplInitRadioButtonData(); - SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); + SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDrawRadioButtonState(); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, @@ -311,7 +311,7 @@ private: protected: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: @@ -335,8 +335,8 @@ protected: void DrawRadioButtonState( ); public: - explicit RadioButton( Window* pParent, WinBits nWinStyle = 0 ); - explicit RadioButton( Window* pParent, const ResId& ); + explicit RadioButton( vcl::Window* pParent, WinBits nWinStyle = 0 ); + explicit RadioButton( vcl::Window* pParent, const ResId& ); virtual ~RadioButton(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -420,7 +420,7 @@ private: // to the left or right ( depending on RTL or LTR settings ) bool mbLegacyNoTextAlign; SAL_DLLPRIVATE void ImplInitCheckBoxData(); - SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); + SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplInvalidateOrDrawCheckBoxState(); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, @@ -438,7 +438,7 @@ private: protected: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); virtual void FillLayoutData() const SAL_OVERRIDE; virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; @@ -452,8 +452,8 @@ public: SAL_DLLPRIVATE void ImplCheck(); SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); public: - explicit CheckBox( Window* pParent, WinBits nStyle = 0 ); - explicit CheckBox( Window* pParent, const ResId& ); + explicit CheckBox( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit CheckBox( vcl::Window* pParent, const ResId& ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; @@ -522,8 +522,8 @@ private: SAL_DLLPRIVATE ImageButton & operator= ( const ImageButton & ); public: - ImageButton( Window* pParent, WinBits nStyle = 0 ); - ImageButton( Window* pParent, const ResId& rResId ); + ImageButton( vcl::Window* pParent, WinBits nStyle = 0 ); + ImageButton( vcl::Window* pParent, const ResId& rResId ); virtual ~ImageButton(); }; @@ -534,7 +534,7 @@ class VCL_DLLPUBLIC ImageRadioButton : public RadioButton SAL_DLLPRIVATE ImageRadioButton & operator= ( const ImageRadioButton & ); public: - explicit ImageRadioButton( Window* pParent, WinBits nStyle = 0 ); + explicit ImageRadioButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~ImageRadioButton(); }; @@ -545,7 +545,7 @@ class VCL_DLLPUBLIC TriStateBox : public CheckBox SAL_DLLPRIVATE TriStateBox & operator= ( const TriStateBox & ); public: - explicit TriStateBox( Window* pParent, WinBits nStyle = 0 ); + explicit TriStateBox( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~TriStateBox(); }; @@ -554,7 +554,7 @@ class VCL_DLLPUBLIC DisclosureButton : public CheckBox protected: SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState() SAL_OVERRIDE; public: - explicit DisclosureButton( Window* pParent, WinBits nStyle = 0 ); + explicit DisclosureButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; }; diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index b80d088ab748..3928a4cb1be6 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -81,7 +81,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplCalcEditHeight(); @@ -92,8 +92,8 @@ protected: virtual void FillLayoutData() const SAL_OVERRIDE; public: - explicit ComboBox( Window* pParent, WinBits nStyle = 0 ); - explicit ComboBox( Window* pParent, const ResId& ); + explicit ComboBox( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit ComboBox( vcl::Window* pParent, const ResId& ); virtual ~ComboBox(); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 02b1acb2669e..11582347936d 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -34,7 +34,7 @@ class StyleSettings; // - Control - -class VCL_DLLPUBLIC Control : public Window +class VCL_DLLPUBLIC Control : public vcl::Window { protected: ::vcl::ImplControlData* mpControlData; @@ -125,8 +125,8 @@ public: SAL_DLLPRIVATE void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect ); public: - explicit Control( Window* pParent, WinBits nWinStyle = 0 ); - explicit Control( Window* pParent, const ResId& ); + explicit Control( vcl::Window* pParent, WinBits nWinStyle = 0 ); + explicit Control( vcl::Window* pParent, const ResId& ); virtual ~Control(); virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index 0fa4b8277ec5..2d3b83c0b119 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -25,7 +25,7 @@ #include <vcl/dllapi.h> struct ImplCursorData; -class Window; +namespace vcl { class Window; } // Cursor styles #define CURSOR_SHADOW ((sal_uInt16)0x0001) @@ -40,7 +40,7 @@ class VCL_DLLPUBLIC Cursor { private: ImplCursorData* mpData; - Window* mpWindow; // only for shadow cursor + vcl::Window* mpWindow; // only for shadow cursor long mnSlant; Size maSize; Point maPos; @@ -71,8 +71,8 @@ public: void Hide(); bool IsVisible() const { return mbVisible; } - void SetWindow( Window* pWindow ); - Window* GetWindow() const { return mpWindow; } + void SetWindow( vcl::Window* pWindow ); + vcl::Window* GetWindow() const { return mpWindow; } void SetPos( const Point& rNewPos ); const Point& GetPos() const { return maPos; } diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx index c61f93f9632f..3c6e9aa303c0 100644 --- a/include/vcl/debugevent.hxx +++ b/include/vcl/debugevent.hxx @@ -21,7 +21,7 @@ class VCL_DLLPUBLIC DebugEventInjector : Timer { sal_uInt32 mnEventsLeft; DebugEventInjector( sal_uInt32 nMaxEvents ); - Window *ChooseWindow(); + vcl::Window *ChooseWindow(); void InjectTextEvent(); void InjectMenuEvent(); void InjectMouseEvent(); diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index ff9f249f3367..85060404a3f4 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -27,7 +27,7 @@ // parameter to pass to the dialog constructor if really no parent is wanted // whereas NULL chooses the default dialog parent -#define DIALOG_NO_PARENT ((Window*)0xffffffff) +#define DIALOG_NO_PARENT ((vcl::Window*)0xffffffff) // - Dialog - @@ -61,7 +61,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); public: SAL_DLLPRIVATE bool IsInClose() const { return mbInClose; } @@ -69,7 +69,7 @@ public: protected: explicit Dialog( WindowType nType ); - explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType ); + explicit Dialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; virtual void settingOptimalLayoutSize(VclBox *pBox) SAL_OVERRIDE; @@ -79,8 +79,8 @@ protected: void set_content_area(VclBox *pBox); public: - explicit Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); - explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit Dialog( vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG ); + explicit Dialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~Dialog(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -111,7 +111,7 @@ public: void EndDialog( long nResult = 0 ); - static void EndAllDialogs( Window* pParent=NULL ); + static void EndAllDialogs( vcl::Window* pParent=NULL ); void GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; @@ -131,15 +131,15 @@ class VCL_DLLPUBLIC ModelessDialog : public Dialog SAL_DLLPRIVATE ModelessDialog & operator= (const ModelessDialog &); public: - explicit ModelessDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit ModelessDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); }; // - ModalDialog - class VCL_DLLPUBLIC ModalDialog : public Dialog { public: - explicit ModalDialog( Window* pParent, WinBits nStyle = WB_STDMODAL ); - explicit ModalDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit ModalDialog( vcl::Window* pParent, WinBits nStyle = WB_STDMODAL ); + explicit ModalDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); protected: using Window::Show; diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx index 0208557ca0e5..c0b75181159e 100644 --- a/include/vcl/dockingarea.hxx +++ b/include/vcl/dockingarea.hxx @@ -24,7 +24,7 @@ // A simple container for docked toolbars // - its main purpose is theming support -class VCL_DLLPUBLIC DockingAreaWindow : public Window +class VCL_DLLPUBLIC DockingAreaWindow : public vcl::Window { class ImplData; @@ -36,7 +36,7 @@ private: SAL_DLLPRIVATE DockingAreaWindow & operator= (const DockingAreaWindow &); public: - explicit DockingAreaWindow( Window* pParent ); + explicit DockingAreaWindow( vcl::Window* pParent ); virtual ~DockingAreaWindow(); void SetAlign( WindowAlign eNewAlign ); diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index f60e895f03d8..f683cc83dda2 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -72,19 +72,19 @@ struct EndPopupModeData class ImplDockingWindowWrapper { - friend class Window; + friend class ::vcl::Window; friend class DockingManager; friend class DockingWindow; private: // the original 'Docking'window - Window *mpDockingWindow; + vcl::Window *mpDockingWindow; // the original DockingWindow members FloatingWindow* mpFloatWin; - Window* mpOldBorderWin; - Window* mpParent; + vcl::Window* mpOldBorderWin; + vcl::Window* mpParent; Point maFloatPos; Point maDockPos; Point maMouseOff; @@ -122,10 +122,10 @@ private: bool ImplStartDockingEnabled() { return mbStartDockingEnabled; } public: - ImplDockingWindowWrapper( const Window *pWindow ); + ImplDockingWindowWrapper( const vcl::Window *pWindow ); virtual ~ImplDockingWindowWrapper(); - Window* GetWindow() { return mpDockingWindow; } + vcl::Window* GetWindow() { return mpDockingWindow; } bool ImplStartDocking( const Point& rPos ); // those methods actually call the corresponding handlers @@ -191,43 +191,43 @@ public: DockingManager(); ~DockingManager(); - void AddWindow( const Window *pWin ); - void RemoveWindow( const Window *pWin ); + void AddWindow( const vcl::Window *pWin ); + void RemoveWindow( const vcl::Window *pWin ); - ImplDockingWindowWrapper* GetDockingWindowWrapper( const Window *pWin ); - bool IsDockable( const Window *pWin ); + ImplDockingWindowWrapper* GetDockingWindowWrapper( const vcl::Window *pWin ); + bool IsDockable( const vcl::Window *pWin ); - bool IsFloating( const Window *pWin ); - void SetFloatingMode( const Window *pWin, bool bFloating ); + bool IsFloating( const vcl::Window *pWin ); + void SetFloatingMode( const vcl::Window *pWin, bool bFloating ); - void Lock( const Window *pWin ); - void Unlock( const Window *pWin ); - bool IsLocked( const Window *pWin ); + void Lock( const vcl::Window *pWin ); + void Unlock( const vcl::Window *pWin ); + bool IsLocked( const vcl::Window *pWin ); - void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin ); - void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin, sal_uLong nPopupModeFlags ); + void StartPopupMode( ToolBox *pParentToolBox, const vcl::Window *pWin ); + void StartPopupMode( ToolBox *pParentToolBox, const vcl::Window *pWin, sal_uLong nPopupModeFlags ); - bool IsInPopupMode( const Window *pWin ); - void EndPopupMode( const Window *pWin ); + bool IsInPopupMode( const vcl::Window *pWin ); + void EndPopupMode( const vcl::Window *pWin ); // required because those methods are not virtual in Window (!!!) and must // be availbale from the toolkit - void SetPosSizePixel( Window *pWin, long nX, long nY, + void SetPosSizePixel( vcl::Window *pWin, long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); - Rectangle GetPosSizePixel( const Window *pWin ); + Rectangle GetPosSizePixel( const vcl::Window *pWin ); }; // - DockingWindow - -class VCL_DLLPUBLIC DockingWindow : public Window +class VCL_DLLPUBLIC DockingWindow : public vcl::Window { class ImplData; private: FloatingWindow* mpFloatWin; - Window* mpOldBorderWin; + vcl::Window* mpOldBorderWin; ImplData* mpImplData; Point maFloatPos; Point maDockPos; @@ -266,7 +266,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); @@ -277,8 +277,8 @@ protected: DockingWindow( WindowType nType ); public: - DockingWindow( Window* pParent, WinBits nStyle = WB_STDDOCKWIN ); - DockingWindow( Window* pParent, const ResId& rResId ); + DockingWindow( vcl::Window* pParent, WinBits nStyle = WB_STDDOCKWIN ); + DockingWindow( vcl::Window* pParent, const ResId& rResId ); virtual ~DockingWindow(); virtual void StartDocking(); diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 966eacffd2bc..58a49db4733f 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -45,7 +45,7 @@ struct Impl_IMEInfos; #define EDIT_NOLIMIT SAL_MAX_INT32 #define EDIT_UPDATEDATA_TIMEOUT 350 -typedef OUString (*FncGetSpecialChars)( Window* pWin, const vcl::Font& rFont ); +typedef OUString (*FncGetSpecialChars)( vcl::Window* pWin, const vcl::Font& rFont ); class VCL_DLLPUBLIC TextFilter { @@ -131,14 +131,14 @@ private: protected: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplSetSelection( const Selection& rSelection, bool bPaint = true ); SAL_DLLPRIVATE int ImplGetNativeControlType() const; SAL_DLLPRIVATE long ImplGetExtraOffset() const; - static SAL_DLLPRIVATE void ImplInvalidateOutermostBorder( Window* pWin ); + static SAL_DLLPRIVATE void ImplInvalidateOutermostBorder( vcl::Window* pWin ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSourceListener > mxDnDListener; @@ -161,8 +161,8 @@ public: // public because needed in button.cxx SAL_DLLPRIVATE bool ImplUseNativeBorder( WinBits nStyle ); - Edit( Window* pParent, WinBits nStyle = WB_BORDER ); - Edit( Window* pParent, const ResId& rResId ); + Edit( vcl::Window* pParent, WinBits nStyle = WB_BORDER ); + Edit( vcl::Window* pParent, const ResId& rResId ); virtual ~Edit(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -177,7 +177,7 @@ public: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual void Modify(); virtual void UpdateData(); @@ -250,7 +250,7 @@ public: sal_Int32 GetCharPos( const Point& rWindowPos ) const; // shows a warning box saying "text too long, truncated" - static void ShowTruncationWarning( Window* pParent ); + static void ShowTruncationWarning( vcl::Window* pParent ); static void SetGetSpecialCharsFunction( FncGetSpecialChars fn ); static FncGetSpecialChars GetGetSpecialCharsFunction(); diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx index 9f7ab05f8ecf..3cd5f8ac1708 100644 --- a/include/vcl/event.hxx +++ b/include/vcl/event.hxx @@ -28,7 +28,7 @@ class AllSettings; class OutputDevice; -class Window; +namespace vcl { class Window; } struct IDataObject; namespace com { namespace sun { namespace star { namespace awt { @@ -393,7 +393,7 @@ inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt, class VCL_DLLPUBLIC NotifyEvent { private: - Window* mpWindow; + vcl::Window* mpWindow; void* mpData; sal_uInt16 mnType; long mnRetValue; @@ -401,12 +401,12 @@ private: public: NotifyEvent(); NotifyEvent( sal_uInt16 nType, - Window* pWindow, + vcl::Window* pWindow, const void* pEvent = NULL, long nRet = 0 ); sal_uInt16 GetType() const { return mnType; } - Window* GetWindow() const { return mpWindow; } + vcl::Window* GetWindow() const { return mpWindow; } void* GetData() const { return mpData; } void SetReturnValue( long nRet ) { mnRetValue = nRet; } @@ -425,7 +425,7 @@ inline NotifyEvent::NotifyEvent() mnRetValue = 0; } -inline NotifyEvent::NotifyEvent( sal_uInt16 nType, Window* pWindow, +inline NotifyEvent::NotifyEvent( sal_uInt16 nType, vcl::Window* pWindow, const void* pEvent, long nRet ) { mpWindow = pWindow; diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index ad3e31044e18..1bf15e177a36 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -483,7 +483,7 @@ public: class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter { public: - explicit PatternField( Window* pParent, WinBits nWinStyle ); + explicit PatternField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~PatternField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -502,8 +502,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit NumericField( Window* pParent, WinBits nWinStyle ); - explicit NumericField( Window* pParent, const ResId& ); + explicit NumericField( vcl::Window* pParent, WinBits nWinStyle ); + explicit NumericField( vcl::Window* pParent, const ResId& ); virtual ~NumericField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -532,8 +532,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit MetricField( Window* pParent, WinBits nWinStyle ); - explicit MetricField( Window* pParent, const ResId& ); + explicit MetricField( vcl::Window* pParent, WinBits nWinStyle ); + explicit MetricField( vcl::Window* pParent, const ResId& ); virtual ~MetricField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -600,7 +600,7 @@ public: class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter { public: - CurrencyField( Window* pParent, WinBits nWinStyle ); + CurrencyField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~CurrencyField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -631,8 +631,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit DateField( Window* pParent, WinBits nWinStyle ); - explicit DateField( Window* pParent, const ResId& ); + explicit DateField( vcl::Window* pParent, WinBits nWinStyle ); + explicit DateField( vcl::Window* pParent, const ResId& ); virtual ~DateField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -667,8 +667,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit TimeField( Window* pParent, WinBits nWinStyle ); - explicit TimeField( Window* pParent, const ResId& ); + explicit TimeField( vcl::Window* pParent, WinBits nWinStyle ); + explicit TimeField( vcl::Window* pParent, const ResId& ); virtual ~TimeField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -698,7 +698,7 @@ public: class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter { public: - PatternBox( Window* pParent, WinBits nWinStyle ); + PatternBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~PatternBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -717,7 +717,7 @@ public: class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter { public: - explicit NumericBox( Window* pParent, WinBits nWinStyle ); + explicit NumericBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~NumericBox(); virtual Size CalcMinimumSize() const SAL_OVERRIDE; @@ -741,7 +741,7 @@ public: class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter { public: - explicit MetricBox( Window* pParent, WinBits nWinStyle ); + explicit MetricBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~MetricBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -774,7 +774,7 @@ public: class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter { public: - explicit CurrencyBox( Window* pParent, WinBits nWinStyle ); + explicit CurrencyBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~CurrencyBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -795,7 +795,7 @@ public: class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter { public: - explicit DateBox( Window* pParent, WinBits nWinStyle ); + explicit DateBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~DateBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -815,7 +815,7 @@ public: class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter { public: - explicit TimeBox( Window* pParent, WinBits nWinStyle ); + explicit TimeBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~TimeBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index f875f19b7afc..4e335516d021 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -38,11 +38,11 @@ class VCL_DLLPUBLIC FixedText : public Control private: sal_Int32 m_nMaxWidthChars; sal_Int32 m_nMinWidthChars; - Window *m_pMnemonicWindow; + vcl::Window *m_pMnemonicWindow; using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, @@ -56,11 +56,11 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; - virtual Window* getAccessibleRelationLabelFor() const SAL_OVERRIDE; + virtual vcl::Window* getAccessibleRelationLabelFor() const SAL_OVERRIDE; public: - explicit FixedText( Window* pParent, WinBits nStyle = 0 ); - explicit FixedText( Window* pParent, const ResId& rResId ); + explicit FixedText( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit FixedText( vcl::Window* pParent, const ResId& rResId ); virtual ~FixedText(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -78,14 +78,14 @@ public: Size CalcMinimumSize(long nMaxWidth = 0x7fffffff) const; virtual Size GetOptimalSize() const SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; - void set_mnemonic_widget(Window *pWindow); - Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } + void set_mnemonic_widget(vcl::Window *pWindow); + vcl::Window* get_mnemonic_widget() const { return m_pMnemonicWindow; } }; class VCL_DLLPUBLIC SelectableFixedText : public Edit { public: - explicit SelectableFixedText( Window* pParent, WinBits nStyle = 0 ); + explicit SelectableFixedText( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void LoseFocus() SAL_OVERRIDE; }; @@ -99,7 +99,7 @@ class VCL_DLLPUBLIC FixedLine : public Control private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( bool bLayout = false ); @@ -112,8 +112,8 @@ protected: GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: - explicit FixedLine( Window* pParent, WinBits nStyle = WB_HORZ ); - explicit FixedLine( Window* pParent, const ResId& ); + explicit FixedLine( vcl::Window* pParent, WinBits nStyle = WB_HORZ ); + explicit FixedLine( vcl::Window* pParent, const ResId& ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; @@ -132,14 +132,14 @@ private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ); public: - explicit FixedBitmap( Window* pParent, WinBits nStyle = 0 ); + explicit FixedBitmap( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~FixedBitmap(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -166,7 +166,7 @@ private: private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); @@ -176,8 +176,8 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - explicit FixedImage( Window* pParent, WinBits nStyle = 0 ); - explicit FixedImage( Window* pParent, const ResId& ); + explicit FixedImage( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit FixedImage( vcl::Window* pParent, const ResId& ); virtual ~FixedImage(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx index 8181dbc64a41..c85bd1cb6ac0 100644 --- a/include/vcl/fixedhyper.hxx +++ b/include/vcl/fixedhyper.hxx @@ -64,7 +64,7 @@ class VCL_DLLPUBLIC FixedHyperlink : public FixedText With ResId or WinBits. */ - FixedHyperlink( Window* pParent, WinBits nWinStyle = 0 ); + FixedHyperlink( vcl::Window* pParent, WinBits nWinStyle = 0 ); /** dtor diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 580c6c16229a..5ad30a7282e5 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -75,7 +75,7 @@ class VCL_DLLPUBLIC FloatingWindow : public SystemWindow class ImplData; private: FloatingWindow* mpNextFloat; - Window* mpFirstPopupModeWin; + vcl::Window* mpFirstPopupModeWin; ImplData* mpImplData; Rectangle maFloatRect; ImplSVEvent * mnPostId; @@ -101,16 +101,16 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); public: - SAL_DLLPRIVATE FloatingWindow* ImplFloatHitTest( Window* pReference, const Point& rPos, HitTest& rHitTest ); + SAL_DLLPRIVATE FloatingWindow* ImplFloatHitTest( vcl::Window* pReference, const Point& rPos, HitTest& rHitTest ); SAL_DLLPRIVATE FloatingWindow* ImplFindLastLevelFloat(); - SAL_DLLPRIVATE bool ImplIsFloatPopupModeWindow( const Window* pWindow ); + SAL_DLLPRIVATE bool ImplIsFloatPopupModeWindow( const vcl::Window* pWindow ); SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = true; } SAL_DLLPRIVATE bool ImplIsMouseDown() const { return mbMouseDown; } - SAL_DLLPRIVATE static Point ImplCalcPos( Window* pWindow, + SAL_DLLPRIVATE static Point ImplCalcPos( vcl::Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); SAL_DLLPRIVATE void ImplEndPopupMode( sal_uInt16 nFlags = 0, sal_uLong nFocusId = 0 ); @@ -119,8 +119,8 @@ public: virtual void doDeferredInit(WinBits nBits) SAL_OVERRIDE; public: - explicit FloatingWindow(Window* pParent, WinBits nStyle = WB_STDFLOATWIN); - explicit FloatingWindow(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, + explicit FloatingWindow(vcl::Window* pParent, WinBits nStyle = WB_STDFLOATWIN); + explicit FloatingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~FloatingWindow(); @@ -136,7 +136,7 @@ public: void StartPopupMode( const Rectangle& rRect, sal_uLong nFlags = 0 ); void StartPopupMode( ToolBox* pBox, sal_uLong nFlags = 0 ); void EndPopupMode( sal_uInt16 nFlags = 0 ); - void AddPopupModeWindow( Window* pWindow ); + void AddPopupModeWindow( vcl::Window* pWindow ); sal_uLong GetPopupModeFlags() const { return mnPopupModeFlags; } void SetPopupModeFlags( sal_uLong nFlags ) { mnPopupModeFlags = nFlags; } bool IsInPopupMode() const { return mbPopupMode; } @@ -149,7 +149,7 @@ public: bool GrabsFocus() const { return mbGrabFocus; } - static Point CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); + static Point CalcFloatingPosition( vcl::Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); }; #endif // INCLUDED_VCL_FLOATWIN_HXX diff --git a/include/vcl/fltcall.hxx b/include/vcl/fltcall.hxx index ca64e68f0902..6e7ab514ea5a 100644 --- a/include/vcl/fltcall.hxx +++ b/include/vcl/fltcall.hxx @@ -28,12 +28,12 @@ class FilterConfigItem; class SvStream; class Graphic; -class Window; +namespace vcl { class Window; } struct FltCallDialogParameter { - Window* pWindow; + vcl::Window* pWindow; ResMgr* pResMgr; FieldUnit eFieldUnit; OUString aFilterExt; @@ -41,7 +41,7 @@ struct FltCallDialogParameter // In and Out PropertySequence for all filter dialogs ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aFilterData; - FltCallDialogParameter( Window* pW, ResMgr* pRsMgr, FieldUnit eFiUni ) : + FltCallDialogParameter( vcl::Window* pW, ResMgr* pRsMgr, FieldUnit eFiUni ) : pWindow ( pW ), pResMgr ( pRsMgr ), eFieldUnit ( eFiUni ) {}; diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index d600bb15041d..9e7b933fe228 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -33,7 +33,7 @@ class VCL_DLLPUBLIC GroupBox : public Control private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, @@ -46,7 +46,7 @@ private: GetCanonicalTextColor( const StyleSettings& _rStyle ) const SAL_OVERRIDE; public: - explicit GroupBox( Window* pParent, WinBits nStyle = 0 ); + explicit GroupBox( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx index b41f6adb51ad..42c9e55d540a 100644 --- a/include/vcl/help.hxx +++ b/include/vcl/help.hxx @@ -26,7 +26,7 @@ class Point; class Rectangle; -class Window; +namespace vcl { class Window; } // - Help-Types - @@ -59,9 +59,9 @@ public: Help(); virtual ~Help(); - virtual bool Start( const OUString& rHelpId, const Window* pWindow ); + virtual bool Start( const OUString& rHelpId, const vcl::Window* pWindow ); virtual bool SearchKeyword( const OUString& rKeyWord ); - virtual OUString GetHelpText( const OUString& aHelpURL, const Window* pWindow ); + virtual OUString GetHelpText( const OUString& aHelpURL, const vcl::Window* pWindow ); static void EnableContextHelp(); static void DisableContextHelp(); @@ -76,10 +76,10 @@ public: static void EnableBalloonHelp(); static void DisableBalloonHelp(); static bool IsBalloonHelpEnabled(); - static bool ShowBalloon( Window* pParent, + static bool ShowBalloon( vcl::Window* pParent, const Point& rScreenPos, const OUString& rHelpText ); - static bool ShowBalloon( Window* pParent, + static bool ShowBalloon( vcl::Window* pParent, const Point& rScreenPos, const Rectangle&, const OUString& rHelpText ); @@ -87,12 +87,12 @@ public: static void EnableQuickHelp(); static void DisableQuickHelp(); static bool IsQuickHelpEnabled(); - static bool ShowQuickHelp( Window* pParent, + static bool ShowQuickHelp( vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rHelpText, const OUString& rLongHelpText, sal_uInt16 nStyle = 0 ); - static bool ShowQuickHelp( Window* pParent, + static bool ShowQuickHelp( vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rHelpText, sal_uInt16 nStyle = 0 ) @@ -100,11 +100,11 @@ public: static void HideBalloonAndQuickHelp(); - static sal_uLong ShowTip( Window* pParent, + static sal_uLong ShowTip( vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rText, sal_uInt16 nStyle = 0 ); static void UpdateTip( sal_uLong nId, - Window* pParent, + vcl::Window* pParent, const Rectangle& rScreenRect, const OUString& rText ); static void HideTip( sal_uLong nId ); diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx index bbe9cb48022e..753ad9f126d2 100644 --- a/include/vcl/imgctrl.hxx +++ b/include/vcl/imgctrl.hxx @@ -35,7 +35,7 @@ private: ::sal_Int16 mnScaleMode; public: - ImageControl( Window* pParent, WinBits nStyle = 0 ); + ImageControl( vcl::Window* pParent, WinBits nStyle = 0 ); // set/get the scale mode. This is one of the css.awt.ImageScaleMode constants void SetScaleMode( const ::sal_Int16 _nMode ); diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx index b7e745c365c9..1c8a2661d557 100644 --- a/include/vcl/keycod.hxx +++ b/include/vcl/keycod.hxx @@ -26,7 +26,7 @@ #include <vcl/keycodes.hxx> #include <vcl/vclenum.hxx> -class Window; +namespace vcl { class Window; } namespace vcl { @@ -56,27 +56,27 @@ public: { return (nCode & KEY_MODTYPE); } sal_uInt16 GetAllModifier() const { return (nCode & KEY_ALLMODTYPE); } - bool IsShift() const + bool IsShift() const { return ((nCode & KEY_SHIFT) != 0); } - bool IsMod1() const + bool IsMod1() const { return ((nCode & KEY_MOD1) != 0); } - bool IsMod2() const + bool IsMod2() const { return ((nCode & KEY_MOD2) != 0); } - bool IsMod3() const + bool IsMod3() const { return ((nCode & KEY_MOD3) != 0); } sal_uInt16 GetGroup() const { return (nCode & KEYGROUP_TYPE); } - OUString GetName( Window* pWindow = NULL ) const; + OUString GetName( vcl::Window* pWindow = NULL ) const; - bool IsFunction() const + bool IsFunction() const { return (eFunc != KEYFUNC_DONTKNOW); } - KeyFuncType GetFunction() const; + KeyFuncType GetFunction() const; - KeyCode& operator = ( const KeyCode& rKeyCode ); - bool operator ==( const KeyCode& rKeyCode ) const; - bool operator !=( const KeyCode& rKeyCode ) const; + KeyCode& operator = ( const KeyCode& rKeyCode ); + bool operator ==( const KeyCode& rKeyCode ) const; + bool operator !=( const KeyCode& rKeyCode ) const; }; } // namespace vcl diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index cddac9ed8e87..374a42c6e9fe 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -20,20 +20,20 @@ #include <boost/multi_array.hpp> #include <set> -class VCL_DLLPUBLIC VclContainer : public Window +class VCL_DLLPUBLIC VclContainer : public vcl::Window { public: - VclContainer(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN); + VclContainer(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN); //These take into account the external margins of the rWindow widget //while GetOptimalSize/get_preferred_size and SetPosSizePixel are //oblivious to them - static Size getLayoutRequisition(const Window &rWindow); - static void setLayoutPosSize(Window &rWindow, const Point &rPos, const Size &rSize); + static Size getLayoutRequisition(const vcl::Window &rWindow); + static void setLayoutPosSize(vcl::Window &rWindow, const Point &rPos, const Size &rSize); //applies the allocation pos and size onto rWindow via setLayoutPosSize taking into account //the rWindows alignment desires within that allocation - static void setLayoutAllocation(Window &rWindow, const Point &rPos, const Size &rSize); + static void setLayoutAllocation(vcl::Window &rWindow, const Point &rPos, const Size &rSize); void markLayoutDirty() { @@ -66,7 +66,7 @@ protected: bool m_bVerticalContainer; int m_nSpacing; public: - VclBox(Window *pParent, bool bHomogeneous, int nSpacing) + VclBox(vcl::Window *pParent, bool bHomogeneous, int nSpacing) : VclContainer(pParent) , m_bHomogeneous(bHomogeneous) , m_bVerticalContainer(false) @@ -107,13 +107,13 @@ protected: virtual long getSecondaryCoordinate(const Point &rPos) const = 0; virtual void setSecondaryCoordinate(Point &rPos, long) const = 0; - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const = 0; + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const = 0; }; class VCL_DLLPUBLIC VclVBox : public VclBox { public: - VclVBox(Window *pParent, bool bHomogeneous = false, int nSpacing = 0) + VclVBox(vcl::Window *pParent, bool bHomogeneous = false, int nSpacing = 0) : VclBox(pParent, bHomogeneous, nSpacing) { m_bVerticalContainer = true; @@ -151,7 +151,7 @@ protected: { rPos.setX(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_vexpand(); } @@ -160,7 +160,7 @@ protected: class VCL_DLLPUBLIC VclHBox : public VclBox { public: - VclHBox(Window *pParent, bool bHomogeneous = false, int nSpacing = 0) + VclHBox(vcl::Window *pParent, bool bHomogeneous = false, int nSpacing = 0) : VclBox(pParent, bHomogeneous, nSpacing) { m_bVerticalContainer = false; @@ -198,7 +198,7 @@ protected: { rPos.setY(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_hexpand(); } @@ -217,7 +217,7 @@ enum VclButtonBoxStyle class VCL_DLLPUBLIC VclButtonBox : public VclBox { public: - VclButtonBox(Window *pParent, int nSpacing) + VclButtonBox(vcl::Window *pParent, int nSpacing) : VclBox(pParent, false, nSpacing) , m_eLayoutStyle(VCL_BUTTONBOX_DEFAULT_STYLE) { @@ -252,7 +252,7 @@ private: class VCL_DLLPUBLIC VclVButtonBox : public VclButtonBox { public: - VclVButtonBox(Window *pParent, int nSpacing = 0) + VclVButtonBox(vcl::Window *pParent, int nSpacing = 0) : VclButtonBox(pParent, nSpacing) { m_bVerticalContainer = true; @@ -290,7 +290,7 @@ protected: { rPos.setX(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_vexpand(); } @@ -299,7 +299,7 @@ protected: class VCL_DLLPUBLIC VclHButtonBox : public VclButtonBox { public: - VclHButtonBox(Window *pParent, int nSpacing = 0) + VclHButtonBox(vcl::Window *pParent, int nSpacing = 0) : VclButtonBox(pParent, nSpacing) { m_bVerticalContainer = false; @@ -337,7 +337,7 @@ protected: { rPos.setY(nPos); } - virtual bool getPrimaryDimensionChildExpand(const Window &rWindow) const SAL_OVERRIDE + virtual bool getPrimaryDimensionChildExpand(const vcl::Window &rWindow) const SAL_OVERRIDE { return rWindow.get_expand() || rWindow.get_hexpand(); } @@ -353,7 +353,7 @@ private: struct GridEntry { - Window *pChild; + vcl::Window *pChild; sal_Int32 nSpanWidth; sal_Int32 nSpanHeight; GridEntry() @@ -395,7 +395,7 @@ private: virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; public: - VclGrid(Window *pParent) + VclGrid(vcl::Window *pParent) : VclContainer(pParent) , m_bRowHomogeneous(false), m_bColumnHomogeneous(false) , m_nRowSpacing(0), m_nColumnSpacing(0) @@ -436,18 +436,18 @@ public: virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; }; -VCL_DLLPUBLIC void setGridAttach(Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, +VCL_DLLPUBLIC void setGridAttach(vcl::Window &rWidget, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nWidth = 1, sal_Int32 nHeight = 1); class VCL_DLLPUBLIC VclBin : public VclContainer { public: - VclBin(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN) + VclBin(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN) : VclContainer(pParent, nStyle) { } - virtual Window *get_child(); - virtual const Window *get_child() const; + virtual vcl::Window *get_child(); + virtual const vcl::Window *get_child() const; virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; }; @@ -455,22 +455,22 @@ public: class VCL_DLLPUBLIC VclFrame : public VclBin { private: - Window *m_pLabel; + vcl::Window *m_pLabel; private: friend class VclBuilder; - void designate_label(Window *pWindow); + void designate_label(vcl::Window *pWindow); public: - VclFrame(Window *pParent) + VclFrame(vcl::Window *pParent) : VclBin(pParent) , m_pLabel(NULL) { } void set_label(const OUString &rLabel); OUString get_label() const; - virtual Window *get_child() SAL_OVERRIDE; - virtual const Window *get_child() const SAL_OVERRIDE; - Window *get_label_widget(); - const Window *get_label_widget() const; + virtual vcl::Window *get_child() SAL_OVERRIDE; + virtual const vcl::Window *get_child() const SAL_OVERRIDE; + vcl::Window *get_label_widget(); + const vcl::Window *get_label_widget() const; protected: virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; @@ -480,7 +480,7 @@ protected: class VCL_DLLPUBLIC VclAlignment : public VclBin { public: - VclAlignment(Window *pParent) + VclAlignment(vcl::Window *pParent) : VclBin(pParent) , m_nBottomPadding(0) , m_nLeftPadding(0) @@ -510,7 +510,7 @@ private: class VCL_DLLPUBLIC VclExpander : public VclBin { public: - VclExpander(Window *pParent) + VclExpander(vcl::Window *pParent) : VclBin(pParent) , m_bResizeTopLevel(true) , m_aDisclosureButton(this) @@ -518,8 +518,8 @@ public: m_aDisclosureButton.SetToggleHdl(LINK(this, VclExpander, ClickHdl)); m_aDisclosureButton.Show(); } - virtual Window *get_child() SAL_OVERRIDE; - virtual const Window *get_child() const SAL_OVERRIDE; + virtual vcl::Window *get_child() SAL_OVERRIDE; + virtual const vcl::Window *get_child() const SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; bool get_expanded() const { @@ -553,9 +553,9 @@ private: class VCL_DLLPUBLIC VclScrolledWindow : public VclBin { public: - VclScrolledWindow(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL); - virtual Window *get_child() SAL_OVERRIDE; - virtual const Window *get_child() const SAL_OVERRIDE; + VclScrolledWindow(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL); + virtual vcl::Window *get_child() SAL_OVERRIDE; + virtual const vcl::Window *get_child() const SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; ScrollBar& getVertScrollBar() { return m_aVScroll; } ScrollBar& getHorzScrollBar() { return m_aHScroll; } @@ -579,7 +579,7 @@ private: class VCL_DLLPUBLIC VclViewport : public VclBin { public: - VclViewport(Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN) + VclViewport(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN) : VclBin(pParent, nStyle) { } @@ -598,10 +598,10 @@ private: //Any Commands an EventBoxHelper receives are forwarded to its parent //The VclEventBox ensures that m_aEventBoxHelper is the //first child and is transparent, but covers the rest of the children - class EventBoxHelper : public Window + class EventBoxHelper : public vcl::Window { public: - EventBoxHelper(Window* pParent) + EventBoxHelper(vcl::Window* pParent) : Window(pParent, 0) { SetSizePixel(pParent->GetSizePixel()); @@ -617,14 +617,14 @@ private: EventBoxHelper m_aEventBoxHelper; public: - VclEventBox(Window* pParent) + VclEventBox(vcl::Window* pParent) : VclBin(pParent) , m_aEventBoxHelper(this) { m_aEventBoxHelper.Show(); } - virtual Window *get_child() SAL_OVERRIDE; - virtual const Window *get_child() const SAL_OVERRIDE; + virtual vcl::Window *get_child() SAL_OVERRIDE; + virtual const vcl::Window *get_child() const SAL_OVERRIDE; virtual Size calculateRequisition() const SAL_OVERRIDE; virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; @@ -642,7 +642,7 @@ enum VclSizeGroupMode class VCL_DLLPUBLIC VclSizeGroup { private: - std::set<Window*> m_aWindows; + std::set<vcl::Window*> m_aWindows; bool m_bIgnoreHidden; VclSizeGroupMode m_eMode; @@ -653,19 +653,19 @@ public: , m_eMode(VCL_SIZE_GROUP_HORIZONTAL) { } - void insert(Window *pWindow) + void insert(vcl::Window *pWindow) { m_aWindows.insert(pWindow); } - void erase(Window *pWindow) + void erase(vcl::Window *pWindow) { m_aWindows.erase(pWindow); } - const std::set<Window*>& get_widgets() const + const std::set<vcl::Window*>& get_widgets() const { return m_aWindows; } - std::set<Window*>& get_widgets() + std::set<vcl::Window*>& get_widgets() { return m_aWindows; } @@ -712,24 +712,24 @@ private: VclMultiLineEdit* m_pPrimaryMessage; VclMultiLineEdit* m_pSecondaryMessage; std::vector<PushButton*> m_aOwnedButtons; - std::map<const Window*, short> m_aResponses; + std::map<const vcl::Window*, short> m_aResponses; OUString m_sPrimaryString; OUString m_sSecondaryString; DECL_DLLPRIVATE_LINK(ButtonHdl, Button *); void setButtonHandlers(VclButtonBox *pButtonBox); - short get_response(const Window *pWindow) const; + short get_response(const vcl::Window *pWindow) const; void create_owned_areas(); friend class VclBuilder; - MessageDialog(Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); + MessageDialog(vcl::Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); public: - MessageDialog(Window* pParent, + MessageDialog(vcl::Window* pParent, const OUString &rMessage, VclMessageType eMessageType = VCL_MESSAGE_ERROR, VclButtonsType eButtonsType = VCL_BUTTONS_OK, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); - MessageDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription); + MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; ///Emitted when an action widget is clicked @@ -740,7 +740,7 @@ public: void set_secondary_text(const OUString &rSecondaryString); virtual ~MessageDialog(); - static void SetMessagesWidths(Window *pParent, VclMultiLineEdit *pPrimaryMessage, + static void SetMessagesWidths(vcl::Window *pParent, VclMultiLineEdit *pPrimaryMessage, VclMultiLineEdit *pSecondaryMessage); }; @@ -751,57 +751,57 @@ VCL_DLLPUBLIC Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize); //i.e. acts like pChild = pChild->GetWindow(WINDOW_FIRSTCHILD); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC Window* firstLogicalChildOfParent(Window *pTopLevel); +VCL_DLLPUBLIC vcl::Window* firstLogicalChildOfParent(vcl::Window *pTopLevel); //Get next window after pChild of a pTopLevel window as //if any intermediate layout widgets didn't exist //i.e. acts like pChild = pChild->GetWindow(WINDOW_NEXT); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC Window* nextLogicalChildOfParent(Window *pTopLevel, Window *pChild); +VCL_DLLPUBLIC vcl::Window* nextLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChild); //Get previous window before pChild of a pTopLevel window as //if any intermediate layout widgets didn't exist //i.e. acts like pChild = pChild->GetWindow(WINDOW_PREV); //in a flat hierarchy where dialogs only have one layer //of children -VCL_DLLPUBLIC Window* prevLogicalChildOfParent(Window *pTopLevel, Window *pChild); +VCL_DLLPUBLIC vcl::Window* prevLogicalChildOfParent(vcl::Window *pTopLevel, vcl::Window *pChild); //Returns true is the Window has a single child which is a container -VCL_DLLPUBLIC bool isLayoutEnabled(const Window *pWindow); +VCL_DLLPUBLIC bool isLayoutEnabled(const vcl::Window *pWindow); -inline bool isContainerWindow(const Window &rWindow) +inline bool isContainerWindow(const vcl::Window &rWindow) { WindowType eType = rWindow.GetType(); return (eType == WINDOW_CONTAINER || eType == WINDOW_SCROLLWINDOW); } -inline bool isContainerWindow(const Window *pWindow) +inline bool isContainerWindow(const vcl::Window *pWindow) { return pWindow && isContainerWindow(*pWindow); } //Returns true if the containing dialog is doing its initial //layout and isn't visible yet -VCL_DLLPUBLIC bool isInitialLayout(const Window *pWindow); +VCL_DLLPUBLIC bool isInitialLayout(const vcl::Window *pWindow); // retro-fitting utilities //Get a Size which is large enough to contain all children with //an equal amount of space at top left and bottom right -Size getLegacyBestSizeForChildren(const Window &rWindow); +Size getLegacyBestSizeForChildren(const vcl::Window &rWindow); //Get first parent which is not a layout widget -VCL_DLLPUBLIC Window* getNonLayoutParent(Window *pParent); +VCL_DLLPUBLIC vcl::Window* getNonLayoutParent(vcl::Window *pParent); //Get first real parent which is not a layout widget -Window* getNonLayoutRealParent(Window *pParent); +vcl::Window* getNonLayoutRealParent(vcl::Window *pParent); //return true if this window and its stack of containers are all shown -bool isVisibleInLayout(const Window *pWindow); +bool isVisibleInLayout(const vcl::Window *pWindow); //return true if this window and its stack of containers are all enabled -bool isEnabledInLayout(const Window *pWindow); +bool isEnabledInLayout(const vcl::Window *pWindow); #endif diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index 89b8364788c4..74de049e8f5a 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -89,7 +89,7 @@ private: BigInt mnLast; public: - LongCurrencyField( Window* pParent, WinBits nWinStyle ); + LongCurrencyField( vcl::Window* pParent, WinBits nWinStyle ); virtual ~LongCurrencyField(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -116,7 +116,7 @@ public: class VCL_DLLPUBLIC LongCurrencyBox : public ComboBox, public LongCurrencyFormatter { public: - LongCurrencyBox( Window* pParent, WinBits nWinStyle ); + LongCurrencyBox( vcl::Window* pParent, WinBits nWinStyle ); virtual ~LongCurrencyBox(); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 29bf86d0b784..621b571c224a 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -69,7 +69,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); bool IsDropDownBox() const { return mpFloatWin ? true : false; } @@ -80,8 +80,8 @@ protected: virtual void FillLayoutData() const SAL_OVERRIDE; public: - explicit ListBox( Window* pParent, WinBits nStyle = WB_BORDER ); - explicit ListBox( Window* pParent, const ResId& ); + explicit ListBox( vcl::Window* pParent, WinBits nStyle = WB_BORDER ); + explicit ListBox( vcl::Window* pParent, const ResId& ); virtual ~ListBox(); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; @@ -95,7 +95,7 @@ public: virtual void DoubleClick(); virtual void GetFocus() SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual const Wallpaper& GetDisplayBackground() const SAL_OVERRIDE; @@ -255,7 +255,7 @@ private: bool IsValueChangedFromSaved() const; public: - explicit MultiListBox( Window* pParent, WinBits nStyle = 0 ); + explicit MultiListBox( vcl::Window* pParent, WinBits nStyle = 0 ); }; diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 77313014bde8..6ca076fc1473 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -44,7 +44,7 @@ class Image; class PopupMenu; class KeyEvent; class MenuFloatingWindow; -class Window; +namespace vcl { class Window; } class SalMenu; class IMenuBarWindow; struct SystemMenuData; @@ -122,7 +122,7 @@ private: MenuItemList* pItemList; // Liste mit den MenuItems MenuLogo* pLogo; Menu* pStartedFrom; - Window* pWindow; + vcl::Window* pWindow; Link aActivateHdl; // Active-Handler Link aDeactivateHdl; // Deactivate-Handler @@ -158,14 +158,14 @@ protected: SAL_DLLPRIVATE Menu* ImplGetStartMenu(); SAL_DLLPRIVATE Menu* ImplFindSelectMenu(); SAL_DLLPRIVATE Menu* ImplFindMenu( sal_uInt16 nId ); - SAL_DLLPRIVATE Size ImplCalcSize( const Window* pWin ); + SAL_DLLPRIVATE Size ImplCalcSize( const vcl::Window* pWin ); SAL_DLLPRIVATE bool ImplIsVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE bool ImplIsSelectable( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const; SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisible() const; SAL_DLLPRIVATE sal_uInt16 ImplGetPrevVisible( sal_uInt16 nPos ) const; SAL_DLLPRIVATE sal_uInt16 ImplGetNextVisible( sal_uInt16 nPos ) const; - SAL_DLLPRIVATE void ImplPaint( Window* pWin, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) const; + SAL_DLLPRIVATE void ImplPaint( vcl::Window* pWin, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, bool bHighlighted = false, bool bLayout = false, bool bRollover = false ) const; SAL_DLLPRIVATE void ImplSelect(); SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem ); SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ); @@ -178,11 +178,11 @@ protected: // returns native check and option menu symbol height in rCheckHeight and rRadioHeight // return value is maximum width and height of checkboxes and radiobuttons - SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize( const Window*, long& rCheckHeight, long& rRadioHeight ) const; + SAL_DLLPRIVATE Size ImplGetNativeCheckAndRadioSize( const vcl::Window*, long& rCheckHeight, long& rRadioHeight ) const; // returns native submenu arrow size and spacing from right border // return value is whether it's supported natively - SAL_DLLPRIVATE bool ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long& rArrowSpacing ) const; + SAL_DLLPRIVATE bool ImplGetNativeSubmenuArrowSize( vcl::Window* pWin, Size& rArrowSize, long& rArrowSpacing ) const; SAL_DLLPRIVATE void ImplAddDel( ImplMenuDelData &rDel ); SAL_DLLPRIVATE void ImplRemoveDel( ImplMenuDelData &rDel ); @@ -200,7 +200,7 @@ public: SAL_DLLPRIVATE void ImplKillLayoutData() const; SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const { return pStartedFrom; } - SAL_DLLPRIVATE Window* ImplGetWindow() const { return pWindow; } + SAL_DLLPRIVATE vcl::Window* ImplGetWindow() const { return pWindow; } void ImplSelectWithStart( Menu* pStartMenu = NULL ); protected: @@ -365,7 +365,7 @@ public: // gets the activation key of the specified item KeyEvent GetActivationKey( sal_uInt16 nItemId ) const; - Window* GetWindow() const { return pWindow; } + vcl::Window* GetWindow() const { return pWindow; } void SetAccessibleName( sal_uInt16 nItemId, const OUString& rStr ); OUString GetAccessibleName( sal_uInt16 nItemId ) const; @@ -408,9 +408,9 @@ class VCL_DLLPUBLIC MenuBar : public Menu friend class MenuFloatingWindow; friend class SystemWindow; - SAL_DLLPRIVATE static Window* ImplCreate(Window* pParent, Window* pWindow, MenuBar* pMenu, const css::uno::Reference<css::frame::XFrame> &rFrame); - SAL_DLLPRIVATE static void ImplDestroy( MenuBar* pMenu, bool bDelete ); - SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu = true ); + SAL_DLLPRIVATE static vcl::Window* ImplCreate(vcl::Window* pParent, vcl::Window* pWindow, MenuBar* pMenu, const css::uno::Reference<css::frame::XFrame> &rFrame); + SAL_DLLPRIVATE static void ImplDestroy( MenuBar* pMenu, bool bDelete ); + SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu = true ); protected: @@ -507,7 +507,7 @@ private: SAL_DLLPRIVATE MenuFloatingWindow* ImplGetFloatingWindow() const { return (MenuFloatingWindow*)Menu::ImplGetWindow(); } protected: - SAL_DLLPRIVATE sal_uInt16 ImplExecute( Window* pWindow, const Rectangle& rRect, sal_uLong nPopupFlags, Menu* pStaredFrom, bool bPreSelectFirst ); + SAL_DLLPRIVATE sal_uInt16 ImplExecute( vcl::Window* pWindow, const Rectangle& rRect, sal_uLong nPopupFlags, Menu* pStaredFrom, bool bPreSelectFirst ); SAL_DLLPRIVATE long ImplCalcHeight( sal_uInt16 nEntries ) const; SAL_DLLPRIVATE sal_uInt16 ImplCalcVisEntries( long nMaxHeight, sal_uInt16 nStartEntry = 0, sal_uInt16* pLastVisible = NULL ) const; @@ -525,8 +525,8 @@ public: void SetText( const OUString& rTitle ) { aTitleText = rTitle; } const OUString& GetText() const { return aTitleText; } - sal_uInt16 Execute( Window* pWindow, const Point& rPopupPos ); - sal_uInt16 Execute( Window* pWindow, const Rectangle& rRect, sal_uInt16 nFlags = 0 ); + sal_uInt16 Execute( vcl::Window* pWindow, const Point& rPopupPos ); + sal_uInt16 Execute( vcl::Window* pWindow, const Rectangle& rRect, sal_uInt16 nFlags = 0 ); // Fuer das TestTool void EndExecute( sal_uInt16 nSelect = 0 ); diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index 22ca3091daf8..78209c818d47 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -54,10 +54,10 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); public: - explicit MenuButton( Window* pParent, WinBits nStyle = 0 ); + explicit MenuButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~MenuButton(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx index 12293fec20e3..f77339136ba3 100644 --- a/include/vcl/morebtn.hxx +++ b/include/vcl/morebtn.hxx @@ -46,10 +46,10 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); public: - explicit MoreButton( Window* pParent, WinBits nStyle = 0 ); + explicit MoreButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~MoreButton(); void Click() SAL_OVERRIDE; diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index f06704786b81..04ea155cb6d8 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -46,7 +46,7 @@ protected: SAL_DLLPRIVATE void ImplPosControls(); public: - MessBox( Window* pParent, WinBits nStyle, + MessBox( vcl::Window* pParent, WinBits nStyle, const OUString& rTitle, const OUString& rMessage ); virtual ~MessBox(); @@ -72,8 +72,8 @@ private: SAL_DLLPRIVATE void ImplInitInfoBoxData(); public: - InfoBox( Window* pParent, const OUString& rMessage ); - InfoBox( Window* pParent, WinBits nStyle, + InfoBox( vcl::Window* pParent, const OUString& rMessage ); + InfoBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ); static Image GetStandardImage(); @@ -85,7 +85,7 @@ private: SAL_DLLPRIVATE void ImplInitWarningBoxData(); public: - WarningBox( Window* pParent, WinBits nStyle, + WarningBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ); void SetDefaultCheckBoxText(); @@ -99,7 +99,7 @@ private: SAL_DLLPRIVATE void ImplInitErrorBoxData(); public: - ErrorBox( Window* pParent, WinBits nStyle, + ErrorBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ); static Image GetStandardImage(); @@ -111,7 +111,7 @@ private: SAL_DLLPRIVATE void ImplInitQueryBoxData(); public: - QueryBox( Window* pParent, WinBits nStyle, + QueryBox( vcl::Window* pParent, WinBits nStyle, const OUString& rMessage ); void SetDefaultCheckBoxText(); diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 4d8436d30d43..4017923c5464 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -100,8 +100,8 @@ struct GLWindow #elif defined( ANDROID ) #elif defined( UNX ) Display* dpy; - int screen; - XLIB_Window win; + int screen; + Window win; #if defined( GLX_EXT_texture_from_pixmap ) GLXFBConfig fbc; #endif @@ -155,7 +155,7 @@ public: void requestLegacyContext(); - bool init(Window* pParent = 0); + bool init(vcl::Window* pParent = 0); bool init(SystemChildWindow* pChildWindow); void makeCurrent(); @@ -180,7 +180,7 @@ public: bool supportMultiSampling() const; - static SystemWindowData generateWinData(Window* pParent, bool bRequestLegacyContext); + static SystemWindowData generateWinData(vcl::Window* pParent, bool bRequestLegacyContext); private: SAL_DLLPRIVATE bool initWindow(); @@ -191,8 +191,8 @@ private: #endif GLWindow m_aGLWin; - boost::scoped_ptr<Window> m_pWindow; - Window* mpWindow; //points to m_pWindow or the parent window, don't delete it + boost::scoped_ptr<vcl::Window> m_pWindow; + vcl::Window* mpWindow; //points to m_pWindow or the parent window, don't delete it SystemChildWindow* m_pChildWindow; boost::scoped_ptr<SystemChildWindow> m_pChildWindowGC; bool mbInitialized; diff --git a/include/vcl/openglwin.hxx b/include/vcl/openglwin.hxx index 1419dda33e2f..c95b02d5261a 100644 --- a/include/vcl/openglwin.hxx +++ b/include/vcl/openglwin.hxx @@ -32,10 +32,10 @@ public: }; // pImpl Pattern to avoid linking against OpenGL libs when using the class without the context -class VCLOPENGL_DLLPUBLIC OpenGLWindow : public Window +class VCLOPENGL_DLLPUBLIC OpenGLWindow : public vcl::Window { public: - OpenGLWindow(Window* pParent); + OpenGLWindow(vcl::Window* pParent); virtual ~OpenGLWindow(); OpenGLContext& getContext(); diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 8089cc16bb5a..a0e18f2c79dc 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -94,7 +94,7 @@ class SalLayout; class ImplLayoutArgs; class ImplFontAttributes; class VirtualDevice; -class Window; +namespace vcl { class Window; } struct SalTwoRect; // Layout options @@ -258,10 +258,10 @@ class VCL_DLLPUBLIC OutputDevice: private boost::noncopyable friend class Printer; friend class System; friend class VirtualDevice; - friend class Window; + friend class vcl::Window; friend class WorkWindow; friend class vcl::PDFWriterImpl; - friend void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ); + friend void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight ); private: mutable SalGraphics* mpGraphics; ///< Graphics context to draw on diff --git a/include/vcl/popupmenuwindow.hxx b/include/vcl/popupmenuwindow.hxx index 87ef34c60c08..266738a170c3 100644 --- a/include/vcl/popupmenuwindow.hxx +++ b/include/vcl/popupmenuwindow.hxx @@ -28,7 +28,7 @@ private: struct ImplData; ImplData* mpImplData; public: - PopupMenuFloatingWindow( Window* pParent, WinBits nStyle = (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER) ); + PopupMenuFloatingWindow( vcl::Window* pParent, WinBits nStyle = (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER) ); virtual ~PopupMenuFloatingWindow(); sal_uInt16 GetMenuStackLevel() const; @@ -36,7 +36,7 @@ public: bool IsPopupMenu() const; //determine if a given window is an activated PopupMenuFloatingWindow - static bool isPopupMenu(const Window *pWindow); + static bool isPopupMenu(const vcl::Window *pWindow); }; #endif diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index 943dd54d1b94..782b2c549a9a 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -55,7 +55,7 @@ // - ProgressBar - -class VCL_DLLPUBLIC ProgressBar : public Window +class VCL_DLLPUBLIC ProgressBar : public vcl::Window { private: Point maPos; @@ -71,7 +71,7 @@ private: SAL_DLLPRIVATE void ImplDrawProgress( sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ); public: - ProgressBar( Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); + ProgressBar( vcl::Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); virtual ~ProgressBar(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 01c343027d0d..8cb430d4619b 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -43,7 +43,7 @@ class SalInfoPrinter; struct SalPrinterQueueInfo; class SalPrinter; class VirtualDevice; -class Window; +namespace vcl { class Window; } namespace vcl { class PrinterController; @@ -232,7 +232,7 @@ private: SAL_DLLPRIVATE void ImplInitData(); SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); - SAL_DLLPRIVATE void ImplInitDisplay( const Window* pWindow ); + SAL_DLLPRIVATE void ImplInitDisplay( const vcl::Window* pWindow ); SAL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const OUString& rPrinterName, const OUString* pDriver ); SAL_DLLPRIVATE void ImplUpdatePageData(); @@ -318,7 +318,7 @@ public: bool SetJobSetup( const JobSetup& rSetup ); const JobSetup& GetJobSetup() const { return maJobSetup; } - bool Setup( Window* pWindow = NULL ); + bool Setup( vcl::Window* pWindow = NULL ); bool SetPrinterProps( const Printer* pPrinter ); // SetPrinterOptions is used internally only now @@ -557,7 +557,7 @@ public: SAL_DLLPRIVATE void pushPropertiesToPrinter(); SAL_DLLPRIVATE void resetPaperToLastConfigured(); VCL_PLUGIN_PUBLIC void setJobState( com::sun::star::view::PrintableState ); - SAL_DLLPRIVATE bool setupPrinter( Window* i_pDlgParent ); + SAL_DLLPRIVATE bool setupPrinter( vcl::Window* i_pDlgParent ); SAL_DLLPRIVATE int getPageCountProtected() const; SAL_DLLPRIVATE css::uno::Sequence< css::beans::PropertyValue > getPageParametersProtected( int i_nPage ) const; diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx index 7211885e03c1..6f334f7e11fe 100644 --- a/include/vcl/region.hxx +++ b/include/vcl/region.hxx @@ -30,6 +30,7 @@ class ImplRegionBand; class RegionBand; class Polygon; class PolyPolygon; +namespace vcl { class Window; } typedef boost::shared_ptr< RegionBand > RegionBandPtr; typedef boost::shared_ptr< PolyPolygon > PolyPolygonPtr; @@ -40,7 +41,7 @@ class VCL_DLLPUBLIC Region { private: friend class OutputDevice; - friend class Window; + friend class vcl::Window; friend class Bitmap; // possible contents diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index febefc08c1fe..65bbca0dc2fe 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -70,7 +70,7 @@ private: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplUpdateRects( bool bUpdate = true ); SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos ); @@ -89,7 +89,7 @@ private: DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, void* ); public: - explicit ScrollBar( Window* pParent, WinBits nStyle = WB_VERT ); + explicit ScrollBar( vcl::Window* pParent, WinBits nStyle = WB_VERT ); virtual ~ScrollBar(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -145,15 +145,15 @@ public: // - ScrollBarBox - -class VCL_DLLPUBLIC ScrollBarBox : public Window +class VCL_DLLPUBLIC ScrollBarBox : public vcl::Window { private: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); public: - explicit ScrollBarBox( Window* pParent, WinBits nStyle = 0 ); + explicit ScrollBarBox( vcl::Window* pParent, WinBits nStyle = 0 ); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index bdb2e3cb4248..afe30c39a87a 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -24,7 +24,7 @@ #include <vcl/timer.hxx> #include <vcl/event.hxx> -class Window; +namespace vcl { class Window; } class CommandEvent; // Timerticks @@ -77,7 +77,7 @@ class VCL_DLLPUBLIC SelectionEngine { private: FunctionSet* pFunctionSet; - Window* pWin; + vcl::Window* pWin; Rectangle aArea; Timer aWTimer; // generate fake mouse moves MouseEvent aLastMove; @@ -91,7 +91,7 @@ private: // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging public: - SelectionEngine( Window* pWindow, + SelectionEngine( vcl::Window* pWindow, FunctionSet* pFunctions = NULL, sal_uLong nAutoRepeatInterval = SELENG_AUTOREPEAT_INTERVAL ); ~SelectionEngine(); @@ -129,8 +129,8 @@ public: { return aLastMove.GetPosPixel(); } const MouseEvent& GetMouseEvent() const { return aLastMove; } - void SetWindow( Window*); - Window* GetWindow() const { return pWin; } + void SetWindow( vcl::Window*); + vcl::Window* GetWindow() const { return pWin; } void LockModifiers( sal_uInt16 nModifiers ) { nLockedMods = nModifiers; } diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index b0ce5303110d..bc30d29d4060 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -55,7 +55,7 @@ private: using Control::ImplInitSettings; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplUpdateRects( bool bUpdate = true ); SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos ); @@ -71,7 +71,7 @@ private: SAL_DLLPRIVATE long ImplDoSlideAction( ScrollType eScrollType ); public: - Slider( Window* pParent, WinBits nStyle = WB_HORZ ); + Slider( vcl::Window* pParent, WinBits nStyle = WB_HORZ ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx index 136f2fdc0ed2..14bc46b57cf9 100644 --- a/include/vcl/sound.hxx +++ b/include/vcl/sound.hxx @@ -22,7 +22,7 @@ #include <vcl/dllapi.h> -class Window; +namespace vcl { class Window; } // - Sound - @@ -31,7 +31,7 @@ class Window; class VCL_DLLPUBLIC Sound { public: - static void Beep( Window* pWindow = NULL ); + static void Beep( vcl::Window* pWindow = NULL ); }; #endif // INCLUDED_VCL_SOUND_HXX diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 5ba88e9cd19b..1900822b1844 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -52,11 +52,11 @@ private: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); DECL_DLLPRIVATE_LINK( ImplTimeout, Timer* ); public: - explicit SpinButton( Window* pParent, WinBits nStyle = 0 ); + explicit SpinButton( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~SpinButton(); virtual void Up(); diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 2d09032d4e2e..fe5431be04b6 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -51,7 +51,7 @@ protected: mbInDropDown:1; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); private: DECL_DLLPRIVATE_LINK( ImplTimeout, Timer* ); @@ -70,8 +70,8 @@ protected: Rectangle * ImplFindPartRect( const Point& rPt ); public: - explicit SpinField( Window* pParent, WinBits nWinStyle = 0 ); - explicit SpinField( Window* pParent, const ResId& ); + explicit SpinField( vcl::Window* pParent, WinBits nWinStyle = 0 ); + explicit SpinField( vcl::Window* pParent, const ResId& ); virtual ~SpinField(); virtual bool ShowDropDown( bool bShow ); diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index ff42f32030b3..b478317fe718 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -25,10 +25,10 @@ #define SPLITTER_DEFAULTSTEPSIZE 0xFFFF -class VCL_DLLPUBLIC Splitter : public Window +class VCL_DLLPUBLIC Splitter : public vcl::Window { private: - Window* mpRefWin; + vcl::Window* mpRefWin; long mnSplitPos; long mnLastSplitPos; long mnStartSplitPos; @@ -59,11 +59,11 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nWinStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nWinStyle ); public: - explicit Splitter( Window* pParent, WinBits nStyle = WB_VSCROLL ); - explicit Splitter( Window* pParent, const ResId& ); + explicit Splitter( vcl::Window* pParent, WinBits nStyle = WB_VSCROLL ); + explicit Splitter( vcl::Window* pParent, const ResId& ); virtual ~Splitter(); virtual void StartSplit(); @@ -86,9 +86,9 @@ public: void StartDrag(); void SetDragRectPixel( const Rectangle& rDragRect, - Window* pRefWin = NULL ); + vcl::Window* pRefWin = NULL ); const Rectangle& GetDragRectPixel() const { return maDragRect; } - Window* GetDragWindow() const { return mpRefWin; } + vcl::Window* GetDragWindow() const { return mpRefWin; } virtual void SetSplitPosPixel( long nPos ); long GetSplitPosPixel() const { return mnSplitPos; } diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index b71b8e745b6e..83f640696814 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -88,7 +88,7 @@ private: Link maFadeOutHdl; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplCalcLayout(); SAL_DLLPRIVATE void ImplUpdate(); @@ -125,7 +125,7 @@ private: SAL_DLLPRIVATE SplitWindow (const SplitWindow &); SAL_DLLPRIVATE SplitWindow & operator= (const SplitWindow &); public: - SplitWindow( Window* pParent, WinBits nStyle = 0 ); + SplitWindow( vcl::Window* pParent, WinBits nStyle = 0 ); virtual ~SplitWindow(); virtual void StartSplit(); @@ -146,7 +146,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void InsertItem( sal_uInt16 nId, Window* pWindow, long nSize, + void InsertItem( sal_uInt16 nId, vcl::Window* pWindow, long nSize, sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nSetId = 0, SplitWindowItemBits nBits = 0 ); void InsertItem( sal_uInt16 nId, long nSize, @@ -173,7 +173,7 @@ public: */ long GetItemSize( sal_uInt16 nId, SplitWindowItemBits nBits ) const; sal_uInt16 GetSet( sal_uInt16 nId ) const; - sal_uInt16 GetItemId( Window* pWindow ) const; + sal_uInt16 GetItemId( vcl::Window* pWindow ) const; sal_uInt16 GetItemId( const Point& rPos ) const; sal_uInt16 GetItemPos( sal_uInt16 nId, sal_uInt16 nSetId = 0 ) const; sal_uInt16 GetItemId( sal_uInt16 nPos, sal_uInt16 nSetId = 0 ) const; diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx index 250d08d5fbe1..0f74411eaec2 100644 --- a/include/vcl/status.hxx +++ b/include/vcl/status.hxx @@ -32,7 +32,7 @@ typedef ::std::vector< ImplStatusItem* > ImplStatusItemList; // - Progress-Ausgabe - -void VCL_DLLPUBLIC DrawProgress( Window* pWindow, const Point& rPos, +void VCL_DLLPUBLIC DrawProgress( vcl::Window* pWindow, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, const Rectangle& rFramePosSize @@ -69,7 +69,7 @@ typedef sal_uInt16 StatusBarItemBits; // - StatusBar - -class VCL_DLLPUBLIC StatusBar : public Window +class VCL_DLLPUBLIC StatusBar : public vcl::Window { class ImplData; private: @@ -96,7 +96,7 @@ private: Link maDoubleClickHdl; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplFormat(); SAL_DLLPRIVATE bool ImplIsItemUpdate(); @@ -110,7 +110,7 @@ private: SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisiblePos() const; public: - StatusBar( Window* pParent, + StatusBar( vcl::Window* pParent, WinBits nWinStyle = WB_BORDER | WB_RIGHT ); virtual ~StatusBar(); diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx index cfd865c748c0..205b008a8b2d 100644 --- a/include/vcl/stdtext.hxx +++ b/include/vcl/stdtext.hxx @@ -23,7 +23,7 @@ #include <rtl/ustring.hxx> #include <vcl/dllapi.h> -class Window; +namespace vcl { class Window; } #define STANDARD_TEXT_FIRST STANDARD_TEXT_SERVICE_NOT_AVAILABLE #define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((sal_uInt16)0) @@ -31,7 +31,7 @@ class Window; OUString VCL_DLLPUBLIC GetStandardText(sal_uInt16 nStdText); -void VCL_DLLPUBLIC ShowServiceNotAvailableError(Window* pParent, const OUString& rServiceName, bool bError); +void VCL_DLLPUBLIC ShowServiceNotAvailableError(vcl::Window* pParent, const OUString& rServiceName, bool bError); #endif // INCLUDED_VCL_STDTEXT_HXX diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index f4b7abc97d2c..e303bc6ec708 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -48,7 +48,7 @@ class DataChangedEvent; class Accelerator; class Help; class OutputDevice; -class Window; +namespace vcl { class Window; } class WorkWindow; class MenuBar; class UnoWrapperBase; @@ -313,7 +313,7 @@ public: class TheWindow : public WorkWindow { public: - TheWindow(Window *parent, WinBits windowStyle) : + TheWindow(vcl::Window *parent, WinBits windowStyle) : WorkWindow(parent, windowStyle) {} virtual void Paint(const Rectangle &); @@ -811,7 +811,7 @@ public: @see ImplCallEventListeners(VclSimpleEvent* pEvent) */ - static void ImplCallEventListeners( sal_uLong nEvent, Window* pWin, void* pData ); + static void ImplCallEventListeners( sal_uLong nEvent, vcl::Window* pWin, void* pData ); /** Send event to all VCL application event listeners @@ -829,7 +829,7 @@ public: @see PostKeyEvent */ - static bool HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); + static bool HandleKey( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ); /** Send keypress event @@ -839,7 +839,7 @@ public: @see HandleKey */ - static ImplSVEvent * PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); + static ImplSVEvent * PostKeyEvent( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ); /** Send mouse event @@ -847,7 +847,7 @@ public: @param pWin Pointer to window to which the event is sent @param pKeyEvent Mouse event to send */ - static ImplSVEvent * PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent ); + static ImplSVEvent * PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, MouseEvent* pMouseEvent ); /** Send zoom event @@ -858,7 +858,7 @@ public: @param pWin Pointer to window to which the event is sent @param pZoomEvent Zoom event to send */ - static ImplSVEvent * PostZoomEvent( sal_uLong nEvent, Window *pWin, ZoomEvent* pZoomEvent ); + static ImplSVEvent * PostZoomEvent( sal_uLong nEvent, vcl::Window *pWin, ZoomEvent* pZoomEvent ); /* Send scroll event @@ -869,7 +869,7 @@ public: @param pWin Pointer to window to which the event is sent @param pScrollEvent Scroll event to send */ - static ImplSVEvent * PostScrollEvent( sal_uLong nEvent, Window *pWin, ScrollEvent* pScrollEvent ); + static ImplSVEvent * PostScrollEvent( sal_uLong nEvent, vcl::Window *pWin, ScrollEvent* pScrollEvent ); /** Remove mouse and keypress events from a window... any also zoom and scroll events if the platform supports it. @@ -878,7 +878,7 @@ public: @see HandleKey, PostKeyEvent, PostMouseEvent, PostZoomEvent, PostScrollEvent */ - static void RemoveMouseAndKeyEvents( Window *pWin ); + static void RemoveMouseAndKeyEvents( vcl::Window *pWin ); /** Post a user event to the default window. @@ -962,7 +962,7 @@ public: @see GetAppWindow, GetDefaultDevice */ - static Window* GetFocusWindow(); + static vcl::Window* GetFocusWindow(); /** Get the default "device" (in this case the default window). @@ -980,7 +980,7 @@ public: @see GetNextTopLevelWindow, GetTopWindowCount, GetTopWindow, GetActiveTopWindow */ - static Window* GetFirstTopLevelWindow(); + static vcl::Window* GetFirstTopLevelWindow(); /** Get the next top level window. @@ -989,7 +989,7 @@ public: @returns Pointer to next top window. */ - static Window* GetNextTopLevelWindow( Window* pWindow ); + static vcl::Window* GetNextTopLevelWindow( vcl::Window* pWindow ); /** Return the number of top-level windows being used by the application @@ -1013,7 +1013,7 @@ public: @see GetFirstTopLevelWindow, GetNextTopLevelWindow, GetTopWindowCount, GetActiveTopWindow */ - static Window* GetTopWindow( long nIndex ); + static vcl::Window* GetTopWindow( long nIndex ); /** Get the "active" top window. @@ -1025,7 +1025,7 @@ public: @see GetFirstTopLevelWindow, GetNextTopLevelWindow, GetTopWindowCount, GetTopWindow */ - static Window* GetActiveTopWindow(); + static vcl::Window* GetActiveTopWindow(); ///@} @@ -1265,7 +1265,7 @@ public: @see GetDefDialogParent */ - static void SetDefDialogParent( Window* pWindow ); + static void SetDefDialogParent( vcl::Window* pWindow ); /** Get the default parent window for dialog boxes. @@ -1278,7 +1278,7 @@ public: @returns Pointer to the default window. */ - static Window* GetDefDialogParent(); + static vcl::Window* GetDefDialogParent(); /** Gets the dialog cancel mode for headless environments. diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx index 1fe833eda532..9a8c57d6ec5b 100644 --- a/include/vcl/syschild.hxx +++ b/include/vcl/syschild.hxx @@ -26,11 +26,11 @@ struct SystemEnvData; struct SystemWindowData; -class VCL_DLLPUBLIC SystemChildWindow : public Window +class VCL_DLLPUBLIC SystemChildWindow : public vcl::Window { private: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = false ); + SAL_DLLPRIVATE void ImplInitSysChild( vcl::Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = false ); SAL_DLLPRIVATE void ImplTestJavaException( void* pEnv ); // Copy assignment is forbidden and not implemented. @@ -38,9 +38,9 @@ private: SAL_DLLPRIVATE SystemChildWindow & operator= (const SystemChildWindow &); public: - explicit SystemChildWindow( Window* pParent, WinBits nStyle = 0 ); + explicit SystemChildWindow( vcl::Window* pParent, WinBits nStyle = 0 ); // create a SystemChildWindow using the given SystemWindowData - explicit SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = true ); + explicit SystemChildWindow( vcl::Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow = true ); virtual ~SystemChildWindow(); const SystemEnvData* GetSystemData() const; diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 382e9b1e2c03..11877a000cbb 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -130,7 +130,7 @@ public: // - SystemWindow - class VCL_DLLPUBLIC SystemWindow - : public Window + : public vcl::Window , public VclBuilderContainer { friend class WorkWindow; @@ -155,22 +155,22 @@ private: Timer maLayoutTimer; protected: bool mbIsDefferedInit; - Window* mpDialogParent; + vcl::Window* mpDialogParent; public: using Window::ImplIsInTaskPaneList; - SAL_DLLPRIVATE bool ImplIsInTaskPaneList( Window* pWin ); + SAL_DLLPRIVATE bool ImplIsInTaskPaneList( vcl::Window* pWin ); SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDefferedInit; } private: SAL_DLLPRIVATE void Init(); - SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin ); + SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin ); SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, VclContainer &rBox); DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, void* ); protected: // Single argument ctors shall be explicit. explicit SystemWindow(WindowType nType); - void loadUI(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); + void loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); void SetWindowStateData( const WindowStateData& rData ); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index f1c0f1ab4594..5351e452e924 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -72,7 +72,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); virtual void FillLayoutData() const SAL_OVERRIDE; virtual const vcl::Font& GetCanonicalFont( const StyleSettings& _rStyle ) const SAL_OVERRIDE; @@ -80,7 +80,7 @@ protected: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); public: - TabControl( Window* pParent, + TabControl( vcl::Window* pParent, WinBits nStyle = WB_STDTABCONTROL ); virtual ~TabControl(); diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx index 312a6a32fee0..e4f42482c23a 100644 --- a/include/vcl/tabdlg.hxx +++ b/include/vcl/tabdlg.hxx @@ -30,7 +30,7 @@ class VCL_DLLPUBLIC TabDialog : public Dialog { private: FixedLine* mpFixedLine; - Window* mpViewWindow; + vcl::Window* mpViewWindow; WindowAlign meViewAlign; bool mbPosControls; @@ -38,15 +38,15 @@ private: SAL_DLLPRIVATE void ImplPosControls(); public: - TabDialog( Window* pParent, + TabDialog( vcl::Window* pParent, WinBits nStyle = WB_STDTABDIALOG ); - TabDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); + TabDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~TabDialog(); virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - void SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; } - Window* GetViewWindow() const { return mpViewWindow; } + void SetViewWindow( vcl::Window* pWindow ) { mpViewWindow = pWindow; } + vcl::Window* GetViewWindow() const { return mpViewWindow; } void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; } WindowAlign GetViewAlign() const { return meViewAlign; } }; diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx index 86f994618d4e..c7361972ccb1 100644 --- a/include/vcl/tabpage.hxx +++ b/include/vcl/tabpage.hxx @@ -30,17 +30,17 @@ class VCL_DLLPUBLIC TabPage - : public Window + : public vcl::Window , public VclBuilderContainer { private: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); public: - explicit TabPage( Window* pParent, WinBits nStyle = 0 ); - explicit TabPage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); + explicit TabPage( vcl::Window* pParent, WinBits nStyle = 0 ); + explicit TabPage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; diff --git a/include/vcl/taskpanelist.hxx b/include/vcl/taskpanelist.hxx index 8910ca2873c3..6e8888dc4eec 100644 --- a/include/vcl/taskpanelist.hxx +++ b/include/vcl/taskpanelist.hxx @@ -27,19 +27,19 @@ class VCL_DLLPUBLIC TaskPaneList { - ::std::vector<Window *> mTaskPanes; - Window *FindNextFloat( Window *pWindow, bool bForward = true ); - Window *FindNextSplitter( Window *pWindow, bool bForward = true ); + ::std::vector<vcl::Window *> mTaskPanes; + vcl::Window *FindNextFloat( vcl::Window *pWindow, bool bForward = true ); + vcl::Window *FindNextSplitter( vcl::Window *pWindow, bool bForward = true ); public: - bool IsInList( Window *pWindow ); + bool IsInList( vcl::Window *pWindow ); public: TaskPaneList(); ~TaskPaneList(); - void AddWindow( Window *pWindow ); - void RemoveWindow( Window *pWindow ); + void AddWindow( vcl::Window *pWindow ); + void RemoveWindow( vcl::Window *pWindow ); bool HandleKeyEvent( KeyEvent aKeyEvent ); }; diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx index e4cd946f190f..9aa9498a6bf2 100644 --- a/include/vcl/textview.hxx +++ b/include/vcl/textview.hxx @@ -28,7 +28,7 @@ class TextEngine; class OutputDevice; -class Window; +namespace vcl { class Window; } class KeyEvent; class MouseEvent; class CommandEvent; @@ -100,11 +100,11 @@ protected: using DragAndDropClient::dragOver; public: - TextView( TextEngine* pEng, Window* pWindow ); + TextView( TextEngine* pEng, vcl::Window* pWindow ); virtual ~TextView(); TextEngine* GetTextEngine() const; - Window* GetWindow() const; + vcl::Window* GetWindow() const; void Invalidate(); void Scroll( long nHorzScroll, long nVertScroll ); diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx index a8102bd133e7..aaf8edf5fba5 100644 --- a/include/vcl/throbber.hxx +++ b/include/vcl/throbber.hxx @@ -46,7 +46,7 @@ public: }; public: - Throbber(Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet = IMAGES_AUTO); + Throbber(vcl::Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet = IMAGES_AUTO); virtual ~Throbber(); // Properties diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index c27c1b2e2aef..13a8ddc40f9f 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -202,7 +202,7 @@ private: public: using Window::ImplInit; private: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); using DockingWindow::ImplInitSettings; SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); @@ -285,8 +285,8 @@ protected: void SetCurItemId(sal_uInt16 nSet) { mnCurItemId = nSet; } public: - ToolBox( Window* pParent, WinBits nStyle = 0 ); - ToolBox( Window* pParent, const ResId& rResId ); + ToolBox( vcl::Window* pParent, WinBits nStyle = 0 ); + ToolBox( vcl::Window* pParent, const ResId& rResId ); virtual ~ToolBox(); virtual void Click(); @@ -341,7 +341,7 @@ public: void InsertItem( sal_uInt16 nItemId, const OUString& rText, ToolBoxItemBits nBits = 0, sal_uInt16 nPos = TOOLBOX_APPEND ); - void InsertWindow( sal_uInt16 nItemId, Window* pWindow, + void InsertWindow( sal_uInt16 nItemId, vcl::Window* pWindow, ToolBoxItemBits nBits = 0, sal_uInt16 nPos = TOOLBOX_APPEND ); void InsertSpace( sal_uInt16 nPos = TOOLBOX_APPEND ); @@ -412,8 +412,8 @@ public: void SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror ); void SetItemText( sal_uInt16 nItemId, const OUString& rText ); const OUString& GetItemText( sal_uInt16 nItemId ) const; - void SetItemWindow( sal_uInt16 nItemId, Window* pNewWindow ); - Window* GetItemWindow( sal_uInt16 nItemId ) const; + void SetItemWindow( sal_uInt16 nItemId, vcl::Window* pNewWindow ); + vcl::Window* GetItemWindow( sal_uInt16 nItemId ) const; sal_uInt16 GetHighlightItemId() const { return mnHighItemId; } void StartSelection(); diff --git a/include/vcl/unowrap.hxx b/include/vcl/unowrap.hxx index 5cd880215483..84035e90eadc 100644 --- a/include/vcl/unowrap.hxx +++ b/include/vcl/unowrap.hxx @@ -26,7 +26,7 @@ class XWindowPeer; class XToolkit; class EventList; -class Window; +namespace vcl { class Window; } class OutputDevice; class MouseEvent; class CommandEvent; @@ -67,10 +67,10 @@ public: virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) = 0; // Window - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, bool bCreate ) = 0; - virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow, bool bCreate ) = 0; + virtual void SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0; - virtual void WindowDestroyed( Window* pWindow ) = 0; + virtual void WindowDestroyed( vcl::Window* pWindow ) = 0; // Accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index 25bc14709115..276321b0e5df 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -30,7 +30,7 @@ #include <list> #include <vector> -class Window; +namespace vcl { class Window; } class Menu; namespace com { namespace sun { namespace star { @@ -42,15 +42,15 @@ namespace com { namespace sun { namespace star { #define VCLEVENT_OBJECT_DYING 1 // VclWindowEvent: -#define VCLEVENT_WINDOW_CHILDCREATED 500 // pData = Window* -#define VCLEVENT_WINDOW_CHILDDESTROYED 501 // pData = Window* +#define VCLEVENT_WINDOW_CHILDCREATED 500 // pData = vcl::Window* +#define VCLEVENT_WINDOW_CHILDDESTROYED 501 // pData = vcl::Window* #define VCLEVENT_WINDOW_PAINT 1000 // pData = Rectangle* #define VCLEVENT_WINDOW_MOVE 1001 #define VCLEVENT_WINDOW_RESIZE 1002 #define VCLEVENT_WINDOW_SHOW 1003 #define VCLEVENT_WINDOW_HIDE 1004 #define VCLEVENT_WINDOW_ACTIVATE 1005 -#define VCLEVENT_WINDOW_DEACTIVATE 1006 // pData = Window* = pPrevActiveWindow +#define VCLEVENT_WINDOW_DEACTIVATE 1006 // pData = vcl::Window* = pPrevActiveWindow #define VCLEVENT_WINDOW_CLOSE 1007 #define VCLEVENT_WINDOW_GETFOCUS 1008 #define VCLEVENT_WINDOW_LOSEFOCUS 1009 @@ -217,15 +217,15 @@ public: class VCL_DLLPUBLIC VclWindowEvent : public VclSimpleEvent { private: - Window* pWindow; + vcl::Window* pWindow; void* pData; public: - VclWindowEvent( Window* pWin, sal_uLong n, void* pDat = NULL ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } + VclWindowEvent( vcl::Window* pWin, sal_uLong n, void* pDat = NULL ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } virtual ~VclWindowEvent() {} TYPEINFO_OVERRIDE(); - Window* GetWindow() const { return pWindow; } + vcl::Window* GetWindow() const { return pWindow; } void* GetData() const { return pData; } }; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 29cb6fbcccf7..fe5280d1ba2d 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -58,7 +58,7 @@ protected: ScrollBar* GetVScrollBar() const; public: - VclMultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); + VclMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); virtual ~VclMultiLineEdit(); void SelectionChanged(); diff --git a/include/vcl/waitobj.hxx b/include/vcl/waitobj.hxx index 2ef2f69f0ee9..d6deecf33f29 100644 --- a/include/vcl/waitobj.hxx +++ b/include/vcl/waitobj.hxx @@ -26,9 +26,9 @@ class VCL_DLLPUBLIC WaitObject { private: - Window* mpWindow; + vcl::Window* mpWindow; public: - WaitObject( Window* pWindow ) + WaitObject( vcl::Window* pWindow ) { mpWindow = pWindow; if ( mpWindow ) diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index bf8a8294c6fe..ce75def7b31f 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -317,11 +317,33 @@ const char* ImplDbgCheckWindow( const void* pObj ); bool ImplDoTiledRendering(); +namespace vcl { class Window; } +vcl::Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); + +namespace vcl { class Cursor; } class Dialog; class WindowImpl; class PaintHelper; class VclBuilder; class VclSizeGroup; +class OutputDevice; +class Application; +class SystemWindow; +class WorkWindow; +class Dialog; +class MessBox; +class DockingWindow; +class FloatingWindow; +class GroupBox; +class PushButton; +class RadioButton; +class SystemChildWindow; +class ImplBorderWindow; +class VclBuilder; +class ImplDockingWindowWrapper; +class ImplPopupFloatWin; +class MenuFloatingWindow; +namespace svt { class PopupWindowControllerImpl; } struct WindowResHeader { @@ -330,30 +352,32 @@ struct WindowResHeader sal_uLong nRSStyle; }; +namespace vcl { + class VCL_DLLPUBLIC Window : public OutputDevice, public Resource { friend class vcl::Cursor; - friend class OutputDevice; - friend class Application; - friend class SystemWindow; - friend class WorkWindow; - friend class Dialog; - friend class MessBox; - friend class DockingWindow; - friend class FloatingWindow; - friend class GroupBox; - friend class PushButton; - friend class RadioButton; - friend class SystemChildWindow; - friend class ImplBorderWindow; - friend class VclBuilder; - friend class PaintHelper; + friend class ::OutputDevice; + friend class ::Application; + friend class ::SystemWindow; + friend class ::WorkWindow; + friend class ::Dialog; + friend class ::MessBox; + friend class ::DockingWindow; + friend class ::FloatingWindow; + friend class ::GroupBox; + friend class ::PushButton; + friend class ::RadioButton; + friend class ::SystemChildWindow; + friend class ::ImplBorderWindow; + friend class ::VclBuilder; + friend class ::PaintHelper; // TODO: improve missing functionality // only required because of SetFloatingMode() - friend class ImplDockingWindowWrapper; - friend class ImplPopupFloatWin; - friend class MenuFloatingWindow; + friend class ::ImplDockingWindowWrapper; + friend class ::ImplPopupFloatWin; + friend class ::MenuFloatingWindow; friend class svt::PopupWindowControllerImpl; @@ -374,9 +398,9 @@ private: OutputDevice* mpOutputDevice; #ifdef DBG_UTIL - friend const char* ImplDbgCheckWindow( const void* pObj ); + friend const char* ::ImplDbgCheckWindow( const void* pObj ); #endif - friend Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); + friend vcl::Window* ::ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); public: @@ -388,26 +412,26 @@ public: DECL_DLLPRIVATE_LINK( ImplHideOwnerDrawWindowsHdl, void* ); - SAL_DLLPRIVATE static void ImplInitAppFontData( Window* pWindow ); + SAL_DLLPRIVATE static void ImplInitAppFontData( vcl::Window* pWindow ); - SAL_DLLPRIVATE Window* ImplGetFrameWindow() const; + SAL_DLLPRIVATE vcl::Window* ImplGetFrameWindow() const; SalFrame* ImplGetFrame() const; SAL_DLLPRIVATE ImplFrameData* ImplGetFrameData(); - SAL_DLLPRIVATE Window* ImplGetWindow(); + SAL_DLLPRIVATE vcl::Window* ImplGetWindow(); SAL_DLLPRIVATE ImplWinData* ImplGetWinData() const; - SAL_DLLPRIVATE Window* ImplGetClientWindow() const; - SAL_DLLPRIVATE Window* ImplGetDlgWindow( sal_uInt16 n, sal_uInt16 nType, sal_uInt16 nStart = 0, sal_uInt16 nEnd = 0xFFFF, sal_uInt16* pIndex = NULL ); - SAL_DLLPRIVATE Window* ImplGetParent() const; - SAL_DLLPRIVATE Window* ImplFindWindow( const Point& rFramePos ); + SAL_DLLPRIVATE vcl::Window* ImplGetClientWindow() const; + SAL_DLLPRIVATE vcl::Window* ImplGetDlgWindow( sal_uInt16 n, sal_uInt16 nType, sal_uInt16 nStart = 0, sal_uInt16 nEnd = 0xFFFF, sal_uInt16* pIndex = NULL ); + SAL_DLLPRIVATE vcl::Window* ImplGetParent() const; + SAL_DLLPRIVATE vcl::Window* ImplFindWindow( const Point& rFramePos ); SAL_DLLPRIVATE void ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplInvalidateOverlapFrameRegion( const Region& rRegion ); SAL_DLLPRIVATE bool ImplSetClipFlag( bool bSysObjOnlySmaller = false ); - SAL_DLLPRIVATE bool ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow = false ) const; - SAL_DLLPRIVATE bool ImplIsChild( const Window* pWindow, bool bSystemWindow = false ) const; + SAL_DLLPRIVATE bool ImplIsWindowOrChild( const vcl::Window* pWindow, bool bSystemWindow = false ) const; + SAL_DLLPRIVATE bool ImplIsChild( const vcl::Window* pWindow, bool bSystemWindow = false ) const; SAL_DLLPRIVATE bool ImplIsFloatingWindow() const; SAL_DLLPRIVATE bool ImplIsPushButton() const; SAL_DLLPRIVATE bool ImplIsSplitter() const; @@ -454,7 +478,7 @@ public: protected: - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ); SAL_DLLPRIVATE Point ImplOutputToFrame( const Point& rPos ); @@ -464,7 +488,7 @@ protected: SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); - SAL_DLLPRIVATE Window* ImplGetBorderWindow() const; + SAL_DLLPRIVATE vcl::Window* ImplGetBorderWindow() const; SAL_DLLPRIVATE void ImplInvalidate( const Region* rRegion, sal_uInt16 nFlags ); @@ -491,18 +515,18 @@ private: SAL_DLLPRIVATE void ImplInitWindowData( WindowType nType ); - SAL_DLLPRIVATE void ImplSetFrameParent( const Window* pParent ); + SAL_DLLPRIVATE void ImplSetFrameParent( const vcl::Window* pParent ); - SAL_DLLPRIVATE void ImplInsertWindow( Window* pParent ); + SAL_DLLPRIVATE void ImplInsertWindow( vcl::Window* pParent ); SAL_DLLPRIVATE void ImplRemoveWindow( bool bRemoveFrameData ); SAL_DLLPRIVATE SalGraphics* ImplGetFrameGraphics() const; - SAL_DLLPRIVATE void ImplCallFocusChangeActivate( Window* pNewOverlapWindow, Window* pOldOverlapWindow ); - SAL_DLLPRIVATE Window* ImplGetFirstOverlapWindow(); - SAL_DLLPRIVATE const Window* ImplGetFirstOverlapWindow() const; + SAL_DLLPRIVATE void ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow, vcl::Window* pOldOverlapWindow ); + SAL_DLLPRIVATE vcl::Window* ImplGetFirstOverlapWindow(); + SAL_DLLPRIVATE const vcl::Window* ImplGetFirstOverlapWindow() const; - SAL_DLLPRIVATE bool ImplIsRealParentPath( const Window* pWindow ) const; + SAL_DLLPRIVATE bool ImplIsRealParentPath( const vcl::Window* pWindow ) const; SAL_DLLPRIVATE bool ImplTestMousePointerSet(); @@ -546,7 +570,7 @@ private: SAL_DLLPRIVATE void ImplCallOverlapPaint(); SAL_DLLPRIVATE void ImplPostPaint(); - SAL_DLLPRIVATE void ImplUpdateWindowPtr( Window* pWindow ); + SAL_DLLPRIVATE void ImplUpdateWindowPtr( vcl::Window* pWindow ); SAL_DLLPRIVATE void ImplUpdateWindowPtr(); SAL_DLLPRIVATE void ImplUpdateOverlapWindowPtr( bool bNewFrame ); @@ -584,18 +608,18 @@ private: SAL_DLLPRIVATE bool ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ); SAL_DLLPRIVATE bool ImplHasDlgCtrl(); SAL_DLLPRIVATE void ImplDlgCtrlNextWindow(); - SAL_DLLPRIVATE void ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus ); - SAL_DLLPRIVATE Window* ImplFindDlgCtrlWindow( Window* pWindow ); + SAL_DLLPRIVATE void ImplDlgCtrlFocusChanged( vcl::Window* pWindow, bool bGetFocus ); + SAL_DLLPRIVATE vcl::Window* ImplFindDlgCtrlWindow( vcl::Window* pWindow ); SAL_DLLPRIVATE long ImplLogicUnitToPixelX( long nX, MapUnit eUnit ); SAL_DLLPRIVATE long ImplLogicUnitToPixelY( long nY, MapUnit eUnit ); - SAL_DLLPRIVATE bool ImplIsWindowInFront( const Window* pTestWindow ) const; + SAL_DLLPRIVATE bool ImplIsWindowInFront( const vcl::Window* pTestWindow ) const; SAL_DLLPRIVATE static void ImplNewInputContext(); - SAL_DLLPRIVATE void ImplCallActivateListeners(Window*); - SAL_DLLPRIVATE void ImplCallDeactivateListeners(Window*); + SAL_DLLPRIVATE void ImplCallActivateListeners(vcl::Window*); + SAL_DLLPRIVATE void ImplCallDeactivateListeners(vcl::Window*); SAL_DLLPRIVATE void ImplHandleScroll( ScrollBar* pHScrl, long nX, ScrollBar* pVScrl, long nY ); @@ -603,11 +627,11 @@ private: SAL_DLLPRIVATE long ImplGetUnmirroredOutOffX(); // retrieves the list of owner draw decorated windows for this window hiearchy - SAL_DLLPRIVATE ::std::vector<Window *>& ImplGetOwnerDrawList(); + SAL_DLLPRIVATE ::std::vector<vcl::Window *>& ImplGetOwnerDrawList(); - SAL_DLLPRIVATE Window* ImplGetTopmostFrameWindow(); + SAL_DLLPRIVATE vcl::Window* ImplGetTopmostFrameWindow(); - SAL_DLLPRIVATE Rectangle ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bClientOnly ) const; + SAL_DLLPRIVATE Rectangle ImplGetWindowExtentsRelative( vcl::Window *pRelativeWindow, bool bClientOnly ) const; SAL_DLLPRIVATE bool ImplStopDnd(); SAL_DLLPRIVATE void ImplStartDnd(); @@ -649,9 +673,9 @@ public: public: // Single argument ctors shall be explicit. - explicit Window( Window* pParent, WinBits nStyle = 0 ); + explicit Window( vcl::Window* pParent, WinBits nStyle = 0 ); - Window( Window* pParent, const ResId& rResId ); + Window( vcl::Window* pParent, const ResId& rResId ); virtual ~Window(); OutputDevice const* GetOutDev() const { return mpOutputDevice; }; @@ -683,7 +707,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); - virtual Window* GetPreferredKeyInputWindow(); + virtual vcl::Window* GetPreferredKeyInputWindow(); /*virtual*/ void AddEventListener( const Link& rEventListener ); /*virtual*/ void RemoveEventListener( const Link& rEventListener ); @@ -798,8 +822,8 @@ public: // paint additional parts of your window if necessary void ExpandPaintClipRegion( const Region& rRegion ); - void SetParent( Window* pNewParent ); - Window* GetParent() const; + void SetParent( vcl::Window* pNewParent ); + vcl::Window* GetParent() const; // return the dialog we are contained in or NULL if un-contained Dialog* GetParentDialog() const; @@ -816,7 +840,7 @@ public: void EnableInput( bool bEnable = true, bool bChild = true ); void EnableInput( bool bEnable, bool bChild, bool bSysWin, - const Window* pExcludeWindow = NULL ); + const vcl::Window* pExcludeWindow = NULL ); bool IsInputEnabled() const; /** Override <code>EnableInput</code>. This can be necessary due to other people @@ -891,7 +915,7 @@ public: sal_uInt16 GetActivateMode() const; void ToTop( sal_uInt16 nFlags = 0 ); - void SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ); + void SetZOrder( vcl::Window* pRefWindow, sal_uInt16 nFlags ); void EnableAlwaysOnTop( bool bEnable = true ); bool IsAlwaysOnTopEnabled() const; @@ -918,9 +942,9 @@ public: Point AbsoluteScreenToOutputPixel( const Point& rPos ) const; Rectangle GetDesktopRectPixel() const; // window extents including border and decoratrion - Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const; + Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const; // window extents of the client window, coordinates to be used in SetPosPixel - Rectangle GetClientWindowExtentsRelative( Window *pRelativeWindow ) const; + Rectangle GetClientWindowExtentsRelative( vcl::Window *pRelativeWindow ) const; virtual bool IsScrollable() const; virtual void Scroll( long nHorzScroll, long nVertScroll, @@ -1013,19 +1037,19 @@ public: void SetUniqueId( const OString& ); const OString& GetUniqueId() const; - Window* FindWindow( const Point& rPos ) const; + vcl::Window* FindWindow( const Point& rPos ) const; sal_uInt16 GetChildCount() const; - Window* GetChild( sal_uInt16 nChild ) const; - Window* GetWindow( sal_uInt16 nType ) const; - bool IsChild( const Window* pWindow, bool bSystemWindow = false ) const; - bool IsWindowOrChild( const Window* pWindow, bool bSystemWindow = false ) const; + vcl::Window* GetChild( sal_uInt16 nChild ) const; + vcl::Window* GetWindow( sal_uInt16 nType ) const; + bool IsChild( const vcl::Window* pWindow, bool bSystemWindow = false ) const; + bool IsWindowOrChild( const vcl::Window* pWindow, bool bSystemWindow = false ) const; void SetData( void* pNewData ); void* GetData() const; /// Add all children to @rAllChildren recursively. - SAL_DLLPRIVATE void CollectChildren(::std::vector<Window *>& rAllChildren ); + SAL_DLLPRIVATE void CollectChildren(::std::vector<vcl::Window *>& rAllChildren ); void ShowFocus( const Rectangle& rRect ); void HideFocus(); @@ -1083,9 +1107,9 @@ public: void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ); - Window* GetAccessibleParentWindow() const; + vcl::Window* GetAccessibleParentWindow() const; sal_uInt16 GetAccessibleChildWindowCount(); - Window* GetAccessibleChildWindow( sal_uInt16 n ); + vcl::Window* GetAccessibleChildWindow( sal_uInt16 n ); void SetAccessibleRole( sal_uInt16 nRole ); sal_uInt16 GetAccessibleRole() const; @@ -1096,14 +1120,14 @@ public: void SetAccessibleDescription( const OUString& rDescr ); OUString GetAccessibleDescription() const; - void SetAccessibleRelationLabeledBy( Window* pLabeledBy ); - Window* GetAccessibleRelationLabeledBy() const; + void SetAccessibleRelationLabeledBy( vcl::Window* pLabeledBy ); + vcl::Window* GetAccessibleRelationLabeledBy() const; - void SetAccessibleRelationLabelFor( Window* pLabelFor ); - Window* GetAccessibleRelationLabelFor() const; + void SetAccessibleRelationLabelFor( vcl::Window* pLabelFor ); + vcl::Window* GetAccessibleRelationLabelFor() const; - void SetAccessibleRelationMemberOf( Window* pMemberOf ); - Window* GetAccessibleRelationMemberOf() const; + void SetAccessibleRelationMemberOf( vcl::Window* pMemberOf ); + vcl::Window* GetAccessibleRelationMemberOf() const; // to avoid sending accessibility events in cases like closing dialogs @@ -1112,19 +1136,19 @@ public: void SetAccessibilityEventsSuppressed(bool bSuppressed); // Deprecated - can use SetAccessibleRelationLabelFor/By nowadys - virtual Window* GetParentLabelFor( const Window* pLabel ) const; - virtual Window* GetParentLabeledBy( const Window* pLabeled ) const; + virtual vcl::Window* GetParentLabelFor( const vcl::Window* pLabel ) const; + virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabeled ) const; KeyEvent GetActivationKey() const; protected: // These eventually are supposed to go when everything is converted to .ui - SAL_DLLPRIVATE Window* getLegacyNonLayoutAccessibleRelationMemberOf() const; - SAL_DLLPRIVATE Window* getLegacyNonLayoutAccessibleRelationLabeledBy() const; - SAL_DLLPRIVATE Window* getLegacyNonLayoutAccessibleRelationLabelFor() const; + SAL_DLLPRIVATE vcl::Window* getLegacyNonLayoutAccessibleRelationMemberOf() const; + SAL_DLLPRIVATE vcl::Window* getLegacyNonLayoutAccessibleRelationLabeledBy() const; + SAL_DLLPRIVATE vcl::Window* getLegacyNonLayoutAccessibleRelationLabelFor() const; // Let Label override the code part of GetAccessibleRelationLabelFor - virtual Window* getAccessibleRelationLabelFor() const; + virtual vcl::Window* getAccessibleRelationLabelFor() const; virtual sal_uInt16 getDefaultAccessibleRole() const; virtual OUString getDefaultAccessibleName() const; @@ -1146,7 +1170,7 @@ private: SAL_DLLPRIVATE bool ImplIsAccessibleCandidate() const; SAL_DLLPRIVATE bool ImplIsAccessibleNativeFrame() const; SAL_DLLPRIVATE sal_uInt16 ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirstWindowType ) const; - SAL_DLLPRIVATE Window* ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, bool bTopLevel = true ) const; + SAL_DLLPRIVATE vcl::Window* ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, bool bTopLevel = true ) const; SAL_DLLPRIVATE bool ImplRegisterAccessibleNativeFrame(); SAL_DLLPRIVATE void ImplRevokeAccessibleNativeFrame(); ///@} @@ -1410,6 +1434,7 @@ public: virtual Selection GetSurroundingTextSelection() const; }; +} #endif // INCLUDED_VCL_WINDOW_HXX diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx index 1c06d52d83bc..5b3a266790f2 100644 --- a/include/vcl/wrkwin.hxx +++ b/include/vcl/wrkwin.hxx @@ -50,7 +50,7 @@ private: mbFullScreenMode:1; SAL_DLLPRIVATE void ImplInitWorkWindowData(); - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken ); private: SAL_DLLPRIVATE WorkWindow( const WorkWindow& rWin ); @@ -58,12 +58,12 @@ private: protected: explicit WorkWindow( WindowType nType ); - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL ); + SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL ); SAL_DLLPRIVATE void ImplSetFrameState( sal_uLong aFrameState ); public: - explicit WorkWindow( Window* pParent, WinBits nStyle = WB_STDWORK ); - explicit WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); + explicit WorkWindow( vcl::Window* pParent, WinBits nStyle = WB_STDWORK ); + explicit WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle = WB_STDWORK ); explicit WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version virtual ~WorkWindow(); diff --git a/include/vcl/xtextedt.hxx b/include/vcl/xtextedt.hxx index fa29f7c5f18c..c5dd3770851f 100644 --- a/include/vcl/xtextedt.hxx +++ b/include/vcl/xtextedt.hxx @@ -52,7 +52,7 @@ protected: bool ImpIndentBlock( bool bRight ); public: - ExtTextView( ExtTextEngine* pEng, Window* pWindow ); + ExtTextView( ExtTextEngine* pEng, vcl::Window* pWindow ); virtual ~ExtTextView(); bool MatchGroup(); |