diff options
Diffstat (limited to 'sc/source/ui/inc')
153 files changed, 321 insertions, 321 deletions
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 2339a7b35d4a..5b5f96345655 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -30,7 +30,7 @@ namespace accessibility class AccessibleTextHelper; } class EditView; -class Window; +namespace vcl { class Window; } /** @descr This base class provides an implementation of the @@ -51,7 +51,7 @@ public: ScAccessibleEditObject( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, - EditView* pEditView, Window* pWin, const OUString& rName, + EditView* pEditView, vcl::Window* pWin, const OUString& rName, const OUString& rDescription, EditObjectType eObjectType); protected: @@ -188,7 +188,7 @@ public: private: accessibility::AccessibleTextHelper* mpTextHelper; EditView* mpEditView; - Window* mpWindow; + vcl::Window* mpWindow; EditObjectType meObjectType; bool mbHasFocus; diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 0f5179d8d4ff..61cd3ae7c9a3 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -117,7 +117,7 @@ class ScAccessibleEditObjectTextData : public ScAccessibleTextData { public: // Add a para to indicate whether the object is cloned - ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, bool isClone = false); + ScAccessibleEditObjectTextData(EditView* pEditView, vcl::Window* pWin, bool isClone = false); virtual ~ScAccessibleEditObjectTextData(); virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; @@ -139,14 +139,14 @@ protected: EditView* mpEditView; EditEngine* mpEditEngine; SvxEditEngineForwarder* mpForwarder; - Window* mpWindow; + vcl::Window* mpWindow; bool mbIsCloned; }; class ScAccessibleEditLineTextData : public ScAccessibleEditObjectTextData { public: - ScAccessibleEditLineTextData(EditView* pEditView, Window* pWin); + ScAccessibleEditLineTextData(EditView* pEditView, vcl::Window* pWin); virtual ~ScAccessibleEditLineTextData(); virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; @@ -285,7 +285,7 @@ private: typedef ::std::auto_ptr< SvxTextForwarder > TextForwarderPtr; typedef ::std::auto_ptr< ScCsvViewForwarder > ViewForwarderPtr; - Window* mpWindow; + vcl::Window* mpWindow; EditEngine* mpEditEngine; TextForwarderPtr mpTextForwarder; ViewForwarderPtr mpViewForwarder; @@ -295,7 +295,7 @@ private: public: explicit ScAccessibleCsvTextData( - Window* pWindow, + vcl::Window* pWindow, EditEngine* pEditEngine, const OUString& rCellText, const Rectangle& rBoundBox, diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index e033be5f0dd1..a6808a53b3e5 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -52,7 +52,7 @@ private: public: ScAnalysisOfVarianceDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScAnalysisOfVarianceDialog(); diff --git a/sc/source/ui/inc/ChildWindowWrapper.hxx b/sc/source/ui/inc/ChildWindowWrapper.hxx index 8cc06ebfc093..6e50bf951cb4 100644 --- a/sc/source/ui/inc/ChildWindowWrapper.hxx +++ b/sc/source/ui/inc/ChildWindowWrapper.hxx @@ -22,7 +22,7 @@ template <sal_Int16 WindowID> class ChildWindowWrapper : public SfxChildWindow { public: - ChildWindowWrapper( Window* pParentP, sal_uInt16 nId, + ChildWindowWrapper( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow(pParentP, nId) { @@ -41,7 +41,7 @@ public: } static SfxChildWindow* CreateImpl( - Window *pParent, sal_uInt16 nId, + vcl::Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo ) { SfxChildWindow* pWindow = new ChildWindowWrapper(pParent, nId, pBindings, pInfo); diff --git a/sc/source/ui/inc/CorrelationDialog.hxx b/sc/source/ui/inc/CorrelationDialog.hxx index 42747a31ba14..ce2fee57ef48 100644 --- a/sc/source/ui/inc/CorrelationDialog.hxx +++ b/sc/source/ui/inc/CorrelationDialog.hxx @@ -18,7 +18,7 @@ class ScCorrelationDialog : public ScMatrixComparisonGenerator public: ScCorrelationDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData); + vcl::Window* pParent, ScViewData* pViewData); virtual bool Close() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/CovarianceDialog.hxx b/sc/source/ui/inc/CovarianceDialog.hxx index 6d97dfdab752..e3727ba35816 100644 --- a/sc/source/ui/inc/CovarianceDialog.hxx +++ b/sc/source/ui/inc/CovarianceDialog.hxx @@ -18,7 +18,7 @@ class ScCovarianceDialog : public ScMatrixComparisonGenerator public: ScCovarianceDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData); + vcl::Window* pParent, ScViewData* pViewData); virtual bool Close() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx index 380a75719e0f..b455fae7d517 100644 --- a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx +++ b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx @@ -26,7 +26,7 @@ class ScDescriptiveStatisticsDialog : public ScStatisticsInputOutputDialog public: ScDescriptiveStatisticsDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScDescriptiveStatisticsDialog(); diff --git a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx index 4572ac3e14f1..9012c6755435 100644 --- a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx +++ b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx @@ -29,7 +29,7 @@ private: public: ScExponentialSmoothingDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScExponentialSmoothingDialog(); diff --git a/sc/source/ui/inc/FTestDialog.hxx b/sc/source/ui/inc/FTestDialog.hxx index 1dce57264dd3..2a8c59711313 100644 --- a/sc/source/ui/inc/FTestDialog.hxx +++ b/sc/source/ui/inc/FTestDialog.hxx @@ -18,7 +18,7 @@ class ScFTestDialog : public ScStatisticsTwoVariableDialog public: ScFTestDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScFTestDialog(); diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx index b6819102c502..863a835f79af 100644 --- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx +++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx @@ -26,7 +26,7 @@ class ScMatrixComparisonGenerator : public ScStatisticsInputOutputDialog public: ScMatrixComparisonGenerator( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData, + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUiXmlDescription ); virtual ~ScMatrixComparisonGenerator(); diff --git a/sc/source/ui/inc/MovingAverageDialog.hxx b/sc/source/ui/inc/MovingAverageDialog.hxx index 7183453925d3..dab6acc8e5a2 100644 --- a/sc/source/ui/inc/MovingAverageDialog.hxx +++ b/sc/source/ui/inc/MovingAverageDialog.hxx @@ -29,7 +29,7 @@ private: public: ScMovingAverageDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScMovingAverageDialog(); diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 3635d831808e..e94d9bda1984 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -107,7 +107,7 @@ private: bool GetDestination(ScRange& aDestinationRange, bool& bToNewSheet); public: - ScPivotLayoutDialog(SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, Window* pParent, + ScPivotLayoutDialog(SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, vcl::Window* pParent, ScViewData* pViewData, const ScDPObject* pPivotTableObject, bool bCreateNewPivotTable); virtual ~ScPivotLayoutDialog(); diff --git a/sc/source/ui/inc/PivotLayoutTreeList.hxx b/sc/source/ui/inc/PivotLayoutTreeList.hxx index c4dbcf156b75..858d9afa1dcf 100644 --- a/sc/source/ui/inc/PivotLayoutTreeList.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeList.hxx @@ -16,7 +16,7 @@ class ScPivotLayoutTreeList : public ScPivotLayoutTreeListBase { public: - ScPivotLayoutTreeList(Window* pParent, WinBits nBits); + ScPivotLayoutTreeList(vcl::Window* pParent, WinBits nBits); virtual ~ScPivotLayoutTreeList(); virtual bool DoubleClickHdl() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx index 4d2d415bf1fd..eaa1d9cb84c9 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListBase.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListBase.hxx @@ -40,7 +40,7 @@ protected: public: void Setup(ScPivotLayoutDialog* pParent); - ScPivotLayoutTreeListBase(Window* pParent, WinBits nBits, SvPivotTreeListType eType = UNDEFINED); + ScPivotLayoutTreeListBase(vcl::Window* pParent, WinBits nBits, SvPivotTreeListType eType = UNDEFINED); virtual ~ScPivotLayoutTreeListBase(); virtual sal_Int8 AcceptDrop(const AcceptDropEvent& rEvent) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/PivotLayoutTreeListData.hxx b/sc/source/ui/inc/PivotLayoutTreeListData.hxx index 327d379fbddb..c8c83b469508 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListData.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListData.hxx @@ -20,7 +20,7 @@ private: boost::ptr_vector<ScItemValue> maDataItemValues; public: - ScPivotLayoutTreeListData(Window* pParent, WinBits nBits); + ScPivotLayoutTreeListData(vcl::Window* pParent, WinBits nBits); virtual ~ScPivotLayoutTreeListData(); virtual bool DoubleClickHdl() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx b/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx index 82019dcc6484..168f6275c8dd 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListLabel.hxx @@ -21,7 +21,7 @@ private: SCCOL maDataItem; public: - ScPivotLayoutTreeListLabel(Window* pParent, WinBits nBits); + ScPivotLayoutTreeListLabel(vcl::Window* pParent, WinBits nBits); virtual ~ScPivotLayoutTreeListLabel(); void FillLabelFields(ScDPLabelDataVector& rLabelVector); ScItemValue* GetItem(SCCOL nColumn); diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index 66163925a37f..d940b39689ce 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -26,7 +26,7 @@ class ScRandomNumberGeneratorDialog : public ScAnyRefDlg public: ScRandomNumberGeneratorDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScRandomNumberGeneratorDialog(); diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 8e4269f004d7..022b5e8075d0 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -24,7 +24,7 @@ class ScSamplingDialog : public ScAnyRefDlg public: ScSamplingDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScSamplingDialog(); diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index ee879f584b4d..1ed3e59105f1 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -29,7 +29,7 @@ public: ScStatisticsInputOutputDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData, + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ); virtual ~ScStatisticsInputOutputDialog(); diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 99d0f98b46cb..960e96664aa5 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -29,7 +29,7 @@ public: ScStatisticsTwoVariableDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData, + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ); virtual ~ScStatisticsTwoVariableDialog(); diff --git a/sc/source/ui/inc/TTestDialog.hxx b/sc/source/ui/inc/TTestDialog.hxx index d90519c4ca98..b56008a563d5 100644 --- a/sc/source/ui/inc/TTestDialog.hxx +++ b/sc/source/ui/inc/TTestDialog.hxx @@ -18,7 +18,7 @@ class ScTTestDialog : public ScStatisticsTwoVariableDialog public: ScTTestDialog( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ); + vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScTTestDialog(); diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 4f2041931ed9..93f1c4dcd370 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -202,7 +202,7 @@ protected: SvTreeListEntry* pEntry, bool bFilter = false); public: - ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData); virtual ~ScAcceptChgDlg(); diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 18d19a3ae3d7..b189a2820492 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -47,11 +47,11 @@ class ScFormulaReferenceHelper ::std::auto_ptr<ScCompiler> pRefComp; formula::RefEdit* pRefEdit; // active input field formula::RefButton* pRefBtn; // associated button - Window* m_pWindow; + vcl::Window* m_pWindow; SfxBindings* m_pBindings; ::std::auto_ptr<Accelerator> pAccel; // for Enter/Escape - ::std::vector<Window*> m_aHiddenWidgets; // vector of hidden Controls + ::std::vector<vcl::Window*> m_aHiddenWidgets; // vector of hidden Controls sal_Int32 m_nOldBorderWidth; // border width for expanded dialog SCTAB nRefTab; // used for ShowReference @@ -61,7 +61,7 @@ class ScFormulaReferenceHelper Size aOldEditSize; // Original size of the input field long mnOldEditWidthReq; Point aOldButtonPos; // Original position of the button - Window* mpOldEditParent; // Original parent of the edit field and the button + vcl::Window* mpOldEditParent; // Original parent of the edit field and the button bool mbOldDlgLayoutEnabled; // Original layout state of parent dialog bool mbOldEditParentLayoutEnabled; // Original layout state of edit widget parent @@ -87,7 +87,7 @@ public: void RefInputDone( bool bForced = false ); void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); - inline void SetWindow(Window* _pWindow) { m_pWindow = _pWindow; } + inline void SetWindow(vcl::Window* _pWindow) { m_pWindow = _pWindow; } bool DoClose( sal_uInt16 nId ); void SetDispatcherLock( bool bLock ); void EnableSpreadsheets( bool bFlag = true, bool bChildren = true ); @@ -96,7 +96,7 @@ public: static void enableInput(bool _bInput); protected: - Window * GetWindow(){ return m_pWindow; } + vcl::Window* GetWindow(){ return m_pWindow; } public: bool CanInputStart( const formula::RefEdit *pEdit ){ return !!pEdit; } @@ -106,12 +106,12 @@ public: class SC_DLLPUBLIC ScRefHandler : public IAnyRefDialog { - Window & m_rWindow; + vcl::Window & m_rWindow; bool m_bInRefMode; public: - operator Window *(){ return &m_rWindow; } - Window * operator ->() { return static_cast<Window *>(*this); } + operator vcl::Window *(){ return &m_rWindow; } + vcl::Window* operator ->() { return static_cast<vcl::Window *>(*this); } friend class formula::RefButton; friend class formula::RefEdit; @@ -120,7 +120,7 @@ private: m_aHelper; SfxBindings* pMyBindings; - Window* pActiveWin; + vcl::Window* pActiveWin; Timer aTimer; OUString aDocName; // document on which the dialog was opened @@ -142,7 +142,7 @@ protected: void stateChanged(const StateChangedType nStateChange, const bool bBindRef); public: - ScRefHandler( Window &rWindow, SfxBindings* pB, bool bBindRef ); + ScRefHandler( vcl::Window &rWindow, SfxBindings* pB, bool bBindRef ); virtual ~ScRefHandler(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE = 0; @@ -177,7 +177,7 @@ public: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; protected: - ScRefHdlModalImpl(Window* pParent, const OString& rID, + ScRefHdlModalImpl(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); private: @@ -264,7 +264,7 @@ void ScRefHdlrImplBase<TWindow, bBindRef>::StateChanged( StateChangedType nState class ScAnyRefModalDlg : public ScRefHdlModalImpl { public: - ScAnyRefModalDlg(Window* pParent, const OString& rID, + ScAnyRefModalDlg(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); }; diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index 430c1d8a2733..dab930898c55 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -33,7 +33,7 @@ class ScViewData; class ScPrintAreasDlg : public ScAnyRefDlg { public: - ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ); + ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent ); virtual ~ScPrintAreasDlg(); virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 852685349be7..456274c0d2f0 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -22,7 +22,7 @@ #include <sfx2/tabdlg.hxx> -class Window; +namespace vcl { class Window; } class SfxViewFrame; class SfxItemSet; @@ -30,7 +30,7 @@ class ScAttrDlg : public SfxTabDialog { public: ScAttrDlg( SfxViewFrame* pFrame, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pCellAttrs ); virtual ~ScAttrDlg(); diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index 291681c7b5ea..59879825d07b 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -40,10 +40,10 @@ class ScDocument; enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; -class SC_DLLPUBLIC ScAutoFmtPreview : public Window +class SC_DLLPUBLIC ScAutoFmtPreview : public vcl::Window { public: - ScAutoFmtPreview(Window* pParent); + ScAutoFmtPreview(vcl::Window* pParent); void DetectRTL(ScViewData *pViewData); virtual ~ScAutoFmtPreview(); diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 744c9bffea76..aa2adc004049 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -45,7 +45,7 @@ public: virtual void execute() = 0; }; - explicit ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel = 0); + explicit ScMenuFloatingWindow(vcl::Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel = 0); virtual ~ScMenuFloatingWindow(); virtual void PopupModeEnd() SAL_OVERRIDE; @@ -194,7 +194,7 @@ class ScCheckListBox : public SvTreeListBox public: - ScCheckListBox( Window* pParent, WinBits nWinStyle = 0 ); + ScCheckListBox( vcl::Window* pParent, WinBits nWinStyle = 0 ); virtual ~ScCheckListBox() { delete mpCheckButton; } void Init(); void CheckEntry( const OUString& sName, SvTreeListEntry* pParent, bool bCheck = true ); @@ -234,13 +234,13 @@ public: Config(); }; - explicit ScCheckListMenuWindow(Window* pParent, ScDocument* pDoc); + explicit ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* pDoc); virtual ~ScCheckListMenuWindow(); virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; void setMemberSize(size_t n); @@ -334,7 +334,7 @@ private: OKButton maBtnOk; CancelButton maBtnCancel; - ::std::vector<Window*> maTabStopCtrls; + ::std::vector<vcl::Window*> maTabStopCtrls; size_t mnCurTabStop; ::std::vector<Member> maMembers; diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx index 4c53384b227a..43841987d74e 100644 --- a/sc/source/ui/inc/client.hxx +++ b/sc/source/ui/inc/client.hxx @@ -39,7 +39,7 @@ private: virtual void MakeVisible() SAL_OVERRIDE; public: - ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ); + ScClient( ScTabViewShell* pViewShell, vcl::Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ); virtual ~ScClient(); SdrGrafObj* GetGrafEdit() const { return pGrafEdit; } diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index cc261d1855d3..f5c1c159877a 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -49,7 +49,7 @@ private: void Init(); public: - ScDataBarSettingsDlg(Window* pParent, const ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos); + ScDataBarSettingsDlg(vcl::Window* pParent, const ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos); ScDataBarFormatData* GetData(); }; diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index e52c6fd03b65..308d75591789 100644 --- a/sc/source/ui/inc/colrowba.hxx +++ b/sc/source/ui/inc/colrowba.hxx @@ -33,7 +33,7 @@ class ScColBar : public ScHeaderControl ScHeaderFunctionSet* pFuncSet; public: - ScColBar( Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, + ScColBar( vcl::Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ); virtual ~ScColBar(); @@ -65,7 +65,7 @@ class ScRowBar : public ScHeaderControl ScHeaderFunctionSet* pFuncSet; public: - ScRowBar( Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, + ScRowBar( vcl::Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ); virtual ~ScRowBar(); diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 833578f4ba4f..6f6d2c0c7d04 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -70,7 +70,7 @@ private: void DoScroll(long nDiff); public: - ScCondFormatList(Window* pParent, WinBits nStyle); + ScCondFormatList(vcl::Window* pParent, WinBits nStyle); void init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScConditionalFormat* pFormat, const ScRangeList& rRanges, const ScAddress& rPos, @@ -114,7 +114,7 @@ protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: - SC_DLLPUBLIC ScCondFormatDlg(Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, + SC_DLLPUBLIC ScCondFormatDlg(vcl::Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); virtual ~ScCondFormatDlg(); diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index fd6ba0a8623a..bc4d79b8dce8 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -65,7 +65,7 @@ protected: virtual OUString GetExpressionString() = 0; public: - ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos ); + ScCondFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos ); virtual ~ScCondFrmtEntry(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -101,7 +101,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener DECL_LINK( ConditionTypeSelectHdl, void* ); public: - ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, + ScConditionFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; @@ -128,7 +128,7 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry DECL_LINK( StyleSelectHdl, void* ); public: - ScFormulaFrmtEntry( Window* pParent, ScDocument* PDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); + ScFormulaFrmtEntry( vcl::Window* pParent, ScDocument* PDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; virtual void SetActive() SAL_OVERRIDE; @@ -159,7 +159,7 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry DECL_LINK( EntryTypeHdl, ListBox* ); public: - ScColorScale2FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); + ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; virtual void SetActive() SAL_OVERRIDE; virtual void SetInactive() SAL_OVERRIDE; @@ -192,7 +192,7 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry DECL_LINK( EntryTypeHdl, ListBox* ); public: - ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); + ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; virtual void SetActive() SAL_OVERRIDE; virtual void SetInactive() SAL_OVERRIDE; @@ -222,7 +222,7 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry DECL_LINK( OptionBtnHdl, void* ); DECL_LINK( DataBarTypeSelectHdl, void* ); public: - ScDataBarFrmtEntry( Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = NULL ); + ScDataBarFrmtEntry( vcl::Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; virtual void SetActive() SAL_OVERRIDE; virtual void SetInactive() SAL_OVERRIDE; @@ -233,7 +233,7 @@ public: class ScDateFrmtEntry : public ScCondFrmtEntry, public SfxListener { public: - ScDateFrmtEntry( Window* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat = NULL ); + ScDateFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; virtual void SetActive() SAL_OVERRIDE; virtual void SetInactive() SAL_OVERRIDE; @@ -275,7 +275,7 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry DECL_LINK( IconSetTypeHdl, void* ); public: - ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat = NULL ); + ScIconSetFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat = NULL ); virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; virtual void SetActive() SAL_OVERRIDE; virtual void SetInactive() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index 4531b9defc96..ee25532926b3 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -48,7 +48,7 @@ public: class ScCondFormatManagerDlg : public ModalDialog { public: - ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos); + ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos); virtual ~ScCondFormatManagerDlg(); ScConditionalFormatList* GetConditionalFormatList(); diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 05d16ff85a23..461a7c7d20a9 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -157,7 +157,7 @@ private: DECL_LINK( KeepAllOthersHandle, void* ); public: - ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ); + ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ); virtual ~ScConflictsDlg(); void UpdateView(); diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 80b862cf9be7..0f3c60c69781 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -36,7 +36,7 @@ class ScAreaData; class ScConsolidateDlg : public ScAnyRefDlg { public: - ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScConsolidateDlg(); diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 20aaab6f5fdb..d98bdb825053 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -122,7 +122,7 @@ protected: virtual void InitEntry(SvTreeListEntry*,const OUString&,const Image&,const Image&, SvLBoxButtonKind) SAL_OVERRIDE; public: - ScContentTree( Window* pParent, const ResId& rResId ); + ScContentTree( vcl::Window* pParent, const ResId& rResId ); virtual ~ScContentTree(); OUString getAltLongDescText(SvTreeListEntry* pEntry, bool isAltText) const; diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx index d9ccf31f2360..1f6de3df6b05 100644 --- a/sc/source/ui/inc/corodlg.hxx +++ b/sc/source/ui/inc/corodlg.hxx @@ -26,7 +26,7 @@ class ScColRowLabelDlg : public ModalDialog { public: - ScColRowLabelDlg(Window* pParent, + ScColRowLabelDlg(vcl::Window* pParent, bool bCol = false, bool bRow = false) : ModalDialog(pParent, "ChangeSourceDialog", diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index 488d9a48930b..571d04a20bea 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.hxx @@ -28,7 +28,7 @@ class ScColOrRowDlg : public ModalDialog { public: - ScColOrRowDlg(Window* pParent, const OUString& rStrTitle, + ScColOrRowDlg(vcl::Window* pParent, const OUString& rStrTitle, const OUString& rStrLabel, bool bColDefault = true); private: VclFrame* m_pFrame; diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 8bdeda1442af..be92e60efdad 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -33,7 +33,7 @@ class ScDocument; class ScColRowNameRangesDlg : public ScAnyRefDlg { public: - ScColRowNameRangesDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScColRowNameRangesDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData ); virtual ~ScColRowNameRangesDlg(); diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index f8db0c894928..c66bac55d988 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -239,7 +239,7 @@ private: public: explicit ScCsvControl( ScCsvControl& rParent ); - explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ); + explicit ScCsvControl( vcl::Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ); virtual ~ScCsvControl(); // event handling --------------------------------------------------------- diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 789f7c234e58..cda528abf86c 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -61,7 +61,7 @@ private: bool mbFixedMode; /// false = Separators, true = Fixed width. public: - explicit ScCsvTableBox( Window* pParent, WinBits nBits ); + explicit ScCsvTableBox( vcl::Window* pParent, WinBits nBits ); /** Finishes initialization. Must be called after constructing a new object. */ void Init(); diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index a9d213e1ed41..b157c05cf6e4 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.hxx @@ -39,7 +39,7 @@ private: DECL_LINK( SelectHdl, void* ); public: - ScDataPilotDatabaseDlg(Window* pParent); + ScDataPilotDatabaseDlg(vcl::Window* pParent); void GetValues( ScImportSourceDesc& rDesc ); }; diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index e3e3180313b2..e024ba3f5451 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -37,7 +37,7 @@ private: ListBox* m_pLbNamedRange; public: - ScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal); + ScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bEnableExternal); virtual ~ScDataPilotSourceTypeDlg(); bool IsDatabase() const; @@ -60,7 +60,7 @@ private: Edit *m_pEdPasswd; public: - ScDataPilotServiceDlg( Window* pParent, + ScDataPilotServiceDlg( vcl::Window* pParent, const com::sun::star::uno::Sequence<OUString>& rServices ); virtual ~ScDataPilotServiceDlg(); diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index 8587241b2497..00460ece6b8f 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -55,7 +55,7 @@ private: boost::ptr_vector<boost::nullable<Edit> > maEdits; public: - ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShell); + ScDataFormDlg( vcl::Window* pParent, ScTabViewShell* pTabViewShell); virtual ~ScDataFormDlg(); void FillCtrls(SCROW nCurrentRow); diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index 793c359d868c..03baa2fad810 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -25,7 +25,7 @@ class ScDocShell; class ScDocument; -class Window; +namespace vcl { class Window; } namespace sc { diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx index bde22e836ebf..09b461fa8635 100644 --- a/sc/source/ui/inc/datastreamdlg.hxx +++ b/sc/source/ui/inc/datastreamdlg.hxx @@ -53,7 +53,7 @@ class DataStreamDlg : public ModalDialog ScRange GetStartRange(); public: - DataStreamDlg(ScDocShell *pDocShell, Window* pParent); + DataStreamDlg(ScDocShell *pDocShell, vcl::Window* pParent); void Init( const DataStream& rStrm ); diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 72c376c55ae7..207fdbfdbce9 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -42,7 +42,7 @@ private: void GetSelectedMemberList(ScDPUniqueStringSet& rEntries, long& rDimension); public: - ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); + ScDBFunc( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); virtual ~ScDBFunc(); // only UISort repeat the partial results if necessary diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 5dd4ab1885bd..ae2fdda42293 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -35,7 +35,7 @@ class ScDocument; class ScDbNameDlg : public ScAnyRefDlg { public: - ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData ); virtual ~ScDbNameDlg(); diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx index 2898be599fe9..6683fcb81a02 100644 --- a/sc/source/ui/inc/delcldlg.hxx +++ b/sc/source/ui/inc/delcldlg.hxx @@ -35,7 +35,7 @@ private: RadioButton* m_pBtnDelCols; public: - ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false); + ScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove = false); DelCellCmd GetDelCellCmd() const; }; diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index c119b495a1f0..6bc898a82134 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -46,7 +46,7 @@ private: DECL_LINK( DelAllHdl, void * ); public: - ScDeleteContentsDlg( Window* pParent, + ScDeleteContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults = IDF_NONE ); virtual ~ScDeleteContentsDlg(); void DisableObjects(); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 65724103cbe7..98f71096f23d 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -235,7 +235,7 @@ public: void SetVisAreaOrSize( const Rectangle& rVisArea, bool bModifyStart ); - virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( Window *pParent, + virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( vcl::Window *pParent, const SfxItemSet &rSet ) SAL_OVERRIDE; void GetDocStat( ScDocStat& rDocStat ); @@ -269,13 +269,13 @@ public: ScChangeAction* GetChangeAction( const ScAddress& rPos ); void SetChangeComment( ScChangeAction* pAction, const OUString& rComment ); - void ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent, bool bPrevNext = true ); + void ExecuteChangeCommentDialog( ScChangeAction* pAction, vcl::Window* pParent, bool bPrevNext = true ); /// Protect/unprotect ChangeTrack and return <TRUE/> if /// protection was successfully changed. /// If bJustQueryIfProtected==sal_True protection is not /// changed and <TRUE/> is returned if not protected or /// password was entered correctly. - bool ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQueryIfProtected = false ); + bool ExecuteChangeProtectionDialog( vcl::Window* _pParent, bool bJustQueryIfProtected = false ); void SetPrintZoom( SCTAB nTab, sal_uInt16 nScale, sal_uInt16 nPages ); bool AdjustPrintZoom( const ScRange& rRange ); @@ -287,7 +287,7 @@ public: void NotifyStyle( const SfxStyleSheetHint& rHint ); void DoAutoStyle( const ScRange& rRange, const OUString& rStyle ); - Window* GetActiveDialogParent(); + vcl::Window* GetActiveDialogParent(); void ErrorMessage( sal_uInt16 nGlobStrId ); bool IsEditable() const; diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index dd5c6dbe2b2b..5317ada395bb 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -92,7 +92,7 @@ private: class ScDPNumGroupDlg : public ModalDialog { public: - explicit ScDPNumGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo ); + explicit ScDPNumGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& rInfo ); ScDPNumGroupInfo GetGroupInfo() const; @@ -112,7 +112,7 @@ private: class ScDPDateGroupDlg : public ModalDialog { public: - explicit ScDPDateGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo, + explicit ScDPDateGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ); ScDPNumGroupInfo GetGroupInfo() const; diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 713cd21fbd48..50b90bcf4b6d 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -78,7 +78,7 @@ public: void ExecFormatPaintbrush(SfxRequest& rReq); void StateFormatPaintbrush(SfxItemSet& rSet); - void ExecuteMacroAssign( SdrObject* pObj, Window* pWin ); + void ExecuteMacroAssign( SdrObject* pObj, vcl::Window* pWin ); void ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff ); void ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff ); void ExecuteTextAttrDlg( SfxRequest& rReq, sal_uInt16 nTabPage = 0xffff ); diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index 21c785aff16d..d19cb263a746 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -66,14 +66,14 @@ public: virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE; - virtual void MakeVisible( const Rectangle& rRect, Window& rWin ) SAL_OVERRIDE; + virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) SAL_OVERRIDE; virtual void DeleteMarked() SAL_OVERRIDE; virtual bool SdrBeginTextEdit( SdrObject* pObj, SdrPageView* pPV = 0L, - ::Window* pWin = 0L, + vcl::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, @@ -90,7 +90,7 @@ public: void InvalidateAttribs(); void InvalidateDrawTextAttrs(); - bool BeginDrag( Window* pWindow, const Point& rStartPos ); + bool BeginDrag( vcl::Window* pWindow, const Point& rStartPos ); void DoCut(); void DoCopy(); @@ -105,8 +105,8 @@ public: void SetCellAnchored(); ScAnchorType GetAnchorType() const; - void VCAddWin( Window* pWin ); - void VCRemoveWin( Window* pWin ); + void VCAddWin( vcl::Window* pWin ); + void VCRemoveWin( vcl::Window* pWin ); void UpdateIMap( SdrObject* pObj ); diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index a74d4ae3a673..f56bd95c2252 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -98,7 +98,7 @@ public: { nSourceDocID = nVal; } sal_uInt32 GetSourceDocID() const { return nSourceDocID; } - static ScDrawTransferObj* GetOwnClipboard( Window* pUIWin ); + static ScDrawTransferObj* GetOwnClipboard( vcl::Window* pUIWin ); virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 34e173d2eb0a..80408668dde0 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -36,7 +36,7 @@ class ScFunctionChildWindow : public SfxChildWindow { public: - ScFunctionChildWindow( Window*, sal_uInt16, SfxBindings*, + ScFunctionChildWindow( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW_WITHID(ScFunctionChildWindow); @@ -101,7 +101,7 @@ protected: public: ScFunctionDockWin( SfxBindings* pBindings, SfxChildWindow *pCW, - Window* pParent, + vcl::Window* pParent, const ResId& rResId ); virtual ~ScFunctionDockWin(); diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx index 6ef8666afb78..81c370bb1255 100644 --- a/sc/source/ui/inc/editfield.hxx +++ b/sc/source/ui/inc/editfield.hxx @@ -26,7 +26,7 @@ class ScDoubleField : public Edit { public: - explicit ScDoubleField( Window* pParent, WinBits nStyle ); + explicit ScDoubleField( vcl::Window* pParent, WinBits nStyle ); bool GetValue( double& rfValue ) const; void SetValue( double fValue, diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index a1df80ebc9d0..c68b604cee46 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -33,7 +33,7 @@ class ScDocument; class ScFillSeriesDlg : public ModalDialog { public: - ScFillSeriesDlg( Window* pParent, + ScFillSeriesDlg( vcl::Window* pParent, ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 330a426abccc..1b1fdc54c1f9 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -53,7 +53,7 @@ class ScFilterDlg : public ScAnyRefDlg }; typedef boost::ptr_map<SCCOL,EntryList> EntryListsMap; public: - ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScFilterDlg(); @@ -160,7 +160,7 @@ private: class ScSpecialFilterDlg : public ScAnyRefDlg { public: - ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScSpecialFilterDlg(); diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 70d795968d4a..62d4ebd572d0 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -53,7 +53,7 @@ class ScFormulaDlg : public formula::FormulaDlg, static ScAddress aCursorPos; public: ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData ,formula::IFunctionManager* _pFunctionMgr); + vcl::Window* pParent, ScViewData* pViewData ,formula::IFunctionManager* _pFunctionMgr); virtual ~ScFormulaDlg(); // IFormulaEditorHelper diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx index ac34403416fe..201d3ec92efa 100644 --- a/sc/source/ui/inc/fuconarc.hxx +++ b/sc/source/ui/inc/fuconarc.hxx @@ -26,7 +26,7 @@ class FuConstArc : public FuConstruct { public: - FuConstArc( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuConstArc( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuConstArc(); diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index 56289a5b2a5a..1eed3b80d92c 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.hxx @@ -29,7 +29,7 @@ class FuConstCustomShape : public FuConstruct void SetAttributes( SdrObject* pObj ); public: - FuConstCustomShape(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuConstCustomShape(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuConstCustomShape(); diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx index 0051ed185e60..aae5648253f0 100644 --- a/sc/source/ui/inc/fuconpol.hxx +++ b/sc/source/ui/inc/fuconpol.hxx @@ -28,7 +28,7 @@ class FuConstPolygon : public FuConstruct Point aLastPos; public: - FuConstPolygon(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuConstPolygon(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuConstPolygon(); diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx index 92fa41a81bfe..7f65782e7d57 100644 --- a/sc/source/ui/inc/fuconrec.hxx +++ b/sc/source/ui/inc/fuconrec.hxx @@ -26,7 +26,7 @@ class FuConstRectangle : public FuConstruct { public: - FuConstRectangle(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuConstRectangle(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuConstRectangle(); diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index 60c6d6472aa8..2acbc8c58d30 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -26,7 +26,7 @@ class FuConstruct : public FuDraw { public: - FuConstruct(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuConstruct(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuConstruct(); diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index 407c9b593e69..69884c55f0ad 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -30,7 +30,7 @@ protected: sal_uInt16 nIdentifier; public: - FuConstUnoControl(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuConstUnoControl(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuConstUnoControl(); diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index 10a6adef5a4c..760d8bb0f58e 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -31,7 +31,7 @@ class FuDraw : public FuPoor Pointer aOldPointer; public: - FuDraw(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuDraw(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuDraw(); diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx index 6d30688b12f6..f6b8f7d4f969 100644 --- a/sc/source/ui/inc/fuinsert.hxx +++ b/sc/source/ui/inc/fuinsert.hxx @@ -26,7 +26,7 @@ class FuInsertGraphic : public FuPoor { public: - FuInsertGraphic( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuInsertGraphic( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertGraphic(); @@ -37,7 +37,7 @@ class FuInsertGraphic : public FuPoor class FuInsertOLE : public FuPoor { public: - FuInsertOLE( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuInsertOLE( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual void Activate() SAL_OVERRIDE; @@ -47,7 +47,7 @@ class FuInsertOLE : public FuPoor class FuInsertChart : public FuPoor { public: - FuInsertChart( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuInsertChart( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual void Activate() SAL_OVERRIDE; @@ -57,7 +57,7 @@ class FuInsertChart : public FuPoor class FuInsertChartFromFile : public FuPoor { public: - FuInsertChartFromFile( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuInsertChartFromFile( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq, const OUString& rURL); virtual void Activate() SAL_OVERRIDE; @@ -67,7 +67,7 @@ class FuInsertChartFromFile : public FuPoor class FuInsertMedia : public FuPoor { public: - FuInsertMedia( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuInsertMedia( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertMedia(); diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 1226d1b5ef85..49494c609133 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -45,7 +45,7 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ); public: - ScListBox( Window* pParent, const ResId& rResId ); + ScListBox( vcl::Window* pParent, const ResId& rResId ); }; class ScFuncPage : public TabPage @@ -72,7 +72,7 @@ protected: public: - ScFuncPage( Window* pParent); + ScFuncPage( vcl::Window* pParent); void SetCategory(sal_uInt16 nCat); void SetFunction(sal_uInt16 nFunc); diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index ca9762d46906..5bbab26c8457 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -26,7 +26,7 @@ class ScDrawView; class ScTabViewShell; -class Window; +namespace vcl { class Window; } class SdrModel; class Dialog; @@ -44,7 +44,7 @@ class FuPoor protected: ScDrawView* pView; ScTabViewShell* pViewShell; - Window* pWindow; + vcl::Window* pWindow; SdrModel* pDrDoc; SfxRequest aSfxRequest; @@ -66,7 +66,7 @@ private: sal_uInt16 mnCode; public: - FuPoor(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuPoor(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuPoor(); @@ -74,7 +74,7 @@ public: void SetMouseButtonCode(sal_uInt16 nNew) { if(nNew != mnCode) mnCode = nNew; } sal_uInt16 GetMouseButtonCode() const { return mnCode; } - virtual void Paint(const Rectangle&, Window*) {} + virtual void Paint(const Rectangle&, vcl::Window*) {} virtual void DoCut(); virtual void DoCopy(); @@ -95,7 +95,7 @@ public: virtual void Activate(); virtual void Deactivate(); - void SetWindow(Window* pWin) { pWindow = pWin; } + void SetWindow(vcl::Window* pWin) { pWindow = pWin; } sal_uInt16 GetSlotID() const { return( aSfxRequest.GetSlot() ); } diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index 89f3b392998f..5009f1b60c5b 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.hxx @@ -28,7 +28,7 @@ class SdrPageView; class FuSelection : public FuDraw { public: - FuSelection(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuSelection(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq ); virtual ~FuSelection(); diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx index cad47c949697..330d628f557e 100644 --- a/sc/source/ui/inc/futext.hxx +++ b/sc/source/ui/inc/futext.hxx @@ -33,7 +33,7 @@ protected: SdrTextObj* pTextObj; public: - FuText(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, + FuText(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); virtual ~FuText(); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 808633561987..05f99946a4b9 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -83,7 +83,7 @@ struct SpellCallbackInfo; // predefines namespace sdr { namespace overlay { class OverlayObjectList; }} -class ScGridWindow : public Window, public DropTargetHelper, public DragSourceHelper +class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSourceHelper { // ScFilterListBox is always used for selection list friend class ScFilterListBox; @@ -305,7 +305,7 @@ protected: public: enum AutoFilterMode { Normal, Top10, Custom, Empty, NonEmpty, SortAscending, SortDescending }; - ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ); + ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ); virtual ~ScGridWindow(); // #i70788# flush and get overlay diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx index 73c5889f2558..04a98c6a15c5 100644 --- a/sc/source/ui/inc/groupdlg.hxx +++ b/sc/source/ui/inc/groupdlg.hxx @@ -27,7 +27,7 @@ class ScGroupDlg : public ModalDialog { public: - ScGroupDlg(Window* pParent, bool bUnGroup = false, bool bRows = true); + ScGroupDlg(vcl::Window* pParent, bool bUnGroup = false, bool bRows = true); virtual ~ScGroupDlg(); bool GetColsChecked() const; diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index f4ebde0e210b..5320494d7427 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -29,7 +29,7 @@ // Size of the sliders #define HDR_SLIDERSIZE 2 -class ScHeaderControl : public Window +class ScHeaderControl : public vcl::Window { private: SelectionEngine* pSelEngine; @@ -101,7 +101,7 @@ protected: virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; public: - ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine, + ScHeaderControl( vcl::Window* pParent, SelectionEngine* pSelectionEngine, SCCOLROW nNewSize, bool bNewVertical ); virtual ~ScHeaderControl(); diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index 5d1f64574c5b..dfc68829613a 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -29,7 +29,7 @@ class ScHFEditDlg : public SfxTabDialog { SvxNumType eNumType; protected: - ScHFEditDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, const OString& rID, const OUString& rUIXMLDescription ); public: @@ -39,70 +39,70 @@ public: class ScHFEditHeaderDlg : public ScHFEditDlg { public: - ScHFEditHeaderDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditFooterDlg : public ScHFEditDlg { public: - ScHFEditFooterDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditLeftHeaderDlg : public ScHFEditDlg { public: - ScHFEditLeftHeaderDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditLeftHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditRightHeaderDlg : public ScHFEditDlg { public: - ScHFEditRightHeaderDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditRightHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditLeftFooterDlg : public ScHFEditDlg { public: - ScHFEditLeftFooterDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditLeftFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditRightFooterDlg : public ScHFEditDlg { public: - ScHFEditRightFooterDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditRightFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditSharedHeaderDlg : public ScHFEditDlg { public: - ScHFEditSharedHeaderDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditSharedHeaderDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditSharedFooterDlg : public ScHFEditDlg { public: - ScHFEditSharedFooterDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditSharedFooterDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditAllDlg : public ScHFEditDlg { public: - ScHFEditAllDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditAllDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; class ScHFEditActiveDlg : public ScHFEditDlg { public: - ScHFEditActiveDlg(SfxViewFrame* pFrame, Window* pParent, + ScHFEditActiveDlg(SfxViewFrame* pFrame, vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle); }; diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 9dae49bc8e10..dc07789af6f0 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -78,7 +78,7 @@ protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: - ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData); virtual ~ScHighlightChgDlg(); diff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxx index 89ab1eeb0337..f3e8b03c2f86 100644 --- a/sc/source/ui/inc/hintwin.hxx +++ b/sc/source/ui/inc/hintwin.hxx @@ -22,7 +22,7 @@ #include <vcl/window.hxx> -class ScHintWindow : public Window +class ScHintWindow : public vcl::Window { private: OUString aTitle; @@ -36,7 +36,7 @@ protected: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - ScHintWindow( Window* pParent, const OUString& rTit, const OUString& rMsg ); + ScHintWindow( vcl::Window* pParent, const OUString& rTit, const OUString& rMsg ); virtual ~ScHintWindow(); }; diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index c34d7629a3c7..65ea47c3c927 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -66,9 +66,9 @@ private: ScTypedCaseStrSet::const_iterator miAutoPosColumn; ScTypedCaseStrSet::const_iterator miAutoPosFormula; - Window* pTipVisibleParent; + vcl::Window* pTipVisibleParent; sal_uLong nTipVisible; - Window* pTipVisibleSecParent; + vcl::Window* pTipVisibleSecParent; sal_uLong nTipVisibleSec; OUString aManualTip; OUString aAutoSearch; diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index bfce54fed442..e9ac66ca69fd 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -40,10 +40,10 @@ class ScRangeList; class ScTabViewShell; class Accelerator; -class ScTextWndBase : public Window +class ScTextWndBase : public vcl::Window { public: - ScTextWndBase( Window* pParent, WinBits nStyle ); + ScTextWndBase( vcl::Window* pParent, WinBits nStyle ); virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) = 0; virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) = 0; virtual void SetTextString( const OUString& rString ) = 0; @@ -60,7 +60,7 @@ public: class ScTextWnd : public ScTextWndBase, public DragSourceHelper // edit window { public: - ScTextWnd( Window* pParent, ScTabViewShell* pViewSh ); + ScTextWnd( vcl::Window* pParent, ScTabViewShell* pViewSh ); virtual ~ScTextWnd(); virtual void SetTextString( const OUString& rString ) SAL_OVERRIDE; @@ -137,7 +137,7 @@ private: bool bFormulaMode; public: - ScPosWnd( Window* pParent ); + ScPosWnd( vcl::Window* pParent ); virtual ~ScPosWnd(); void SetPos( const OUString& rPosStr ); // Displayed Text @@ -199,7 +199,7 @@ class ScInputBarGroup : public ScTextWndBase { public: - ScInputBarGroup( Window* Parent, ScTabViewShell* pViewSh ); + ScInputBarGroup( vcl::Window* Parent, ScTabViewShell* pViewSh ); virtual ~ScInputBarGroup(); virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE; virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE; @@ -236,7 +236,7 @@ private: class ScInputWindow : public ToolBox // Parent toolbox { public: - ScInputWindow( Window* pParent, SfxBindings* pBind ); + ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ); virtual ~ScInputWindow(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -301,7 +301,7 @@ private: class ScInputWindowWrapper : public SfxChildWindow { public: - ScInputWindowWrapper( Window* pParent, + ScInputWindowWrapper( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx index 8ce7449a5cc9..dd9a250f7acb 100644 --- a/sc/source/ui/inc/inscldlg.hxx +++ b/sc/source/ui/inc/inscldlg.hxx @@ -35,7 +35,7 @@ private: RadioButton* m_pBtnInsCol; public: - ScInsertCellDlg( Window* pParent,bool bDisallowCellMove = false ); + ScInsertCellDlg( vcl::Window* pParent,bool bDisallowCellMove = false ); virtual ~ScInsertCellDlg(); InsCellCmd GetInsCellCmd() const; diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 92bcfbd03ec2..30f89fe35eda 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -30,7 +30,7 @@ class ScInsertContentsDlg : public ModalDialog { public: - ScInsertContentsDlg( Window* pParent, + ScInsertContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults = IDF_NONE, const OUString* pStrTitle = NULL ); virtual ~ScInsertContentsDlg(); diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index ad68712fe22a..a6361e7a6d64 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -42,7 +42,7 @@ namespace sfx2 { class FileDialogHelper; } class ScInsertTableDlg : public ModalDialog { public: - ScInsertTableDlg( Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile ); + ScInsertTableDlg( vcl::Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile ); virtual ~ScInsertTableDlg(); virtual short Execute() SAL_OVERRIDE; // overloaded to set parent dialog diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index 5b09058cc091..39c2fd61a67b 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -35,7 +35,7 @@ private: DECL_LINK( DblClkHdl, void * ); public: - ScSelEntryDlg(Window* pParent, const std::vector<OUString> &rEntryList); + ScSelEntryDlg(vcl::Window* pParent, const std::vector<OUString> &rEntryList); OUString GetSelectEntry() const; }; diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 1601e24969de..6c11b2f0053b 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -62,7 +62,7 @@ private: const OUString& rOptions ); public: - ScLinkedAreaDlg( Window* pParent ); + ScLinkedAreaDlg( vcl::Window* pParent ); virtual ~ScLinkedAreaDlg(); void InitFromOldLink( const OUString& rFile, const OUString& rFilter, diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index 0337f9dfcc11..ab422cf22819 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -28,7 +28,7 @@ class ScMetricInputDlg : public ModalDialog { public: - ScMetricInputDlg( Window* pParent, + ScMetricInputDlg( vcl::Window* pParent, const OString& sDialogName, long nCurrent, long nDefault, diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 2b703ec612bb..0087e42927e6 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -30,7 +30,7 @@ class ScMoveTableDlg : public ModalDialog { public: - ScMoveTableDlg(Window* pParent, const OUString& rDefault); + ScMoveTableDlg(vcl::Window* pParent, const OUString& rDefault); virtual ~ScMoveTableDlg(); sal_uInt16 GetSelectedDocument () const { return nDocument; } diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx index 7757bf265bcd..ef8762605dbc 100644 --- a/sc/source/ui/inc/namecrea.hxx +++ b/sc/source/ui/inc/namecrea.hxx @@ -33,7 +33,7 @@ protected: CheckBox* m_pBottomBox; CheckBox* m_pRightBox; public: - ScNameCreateDlg( Window * pParent, sal_uInt16 nFlags ); + ScNameCreateDlg( vcl::Window * pParent, sal_uInt16 nFlags ); sal_uInt16 GetFlags() const; }; diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index 2b262a642fe6..b21a0be4924b 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -73,7 +73,7 @@ protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: - ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* pViewData, const std::map<OUString, ScRangeName*>& aRangeMap, const ScAddress& aCursorPos, const bool bUndo); diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 63c749778afb..cb586b928554 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -119,7 +119,7 @@ protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: - ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData, const ScAddress& aCursorPos, boost::ptr_map<OUString, ScRangeName>* pRangeMap = NULL ); virtual ~ScNameDlg(); diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index 44910754d2f0..62d4a4d89061 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -46,7 +46,7 @@ private: std::vector<OUString> maSelectedNames; boost::ptr_map<OUString, ScRangeName> maRangeMap; public: - ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool bInsList=true ); + ScNamePasteDlg( vcl::Window * pParent, ScDocShell* pShell, bool bInsList=true ); virtual ~ScNamePasteDlg(); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 4cc39795b60c..cb31d364db9c 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -91,10 +91,10 @@ private: // class ScScenarioWindow ------------------------------------------------ -class ScScenarioWindow : public Window +class ScScenarioWindow : public vcl::Window { public: - ScScenarioWindow( Window* pParent, const OUString& aQH_List, const OUString& aQH_Comment); + ScScenarioWindow( vcl::Window* pParent, const OUString& aQH_List, const OUString& aQH_Comment); virtual ~ScScenarioWindow(); void NotifyState( const SfxPoolItem* pState ); @@ -205,7 +205,7 @@ private: // class ScNavigatorDlg -class ScNavigatorDlg : public Window, public SfxListener +class ScNavigatorDlg : public vcl::Window, public SfxListener { friend class ScNavigatorControllerItem; friend class ScNavigatorDialogWrapper; @@ -305,7 +305,7 @@ protected: virtual void Resizing( Size& rSize ); public: - ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Window* pParent, + ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl::Window* pParent, const bool bUseStyleSettingsBackground); virtual ~ScNavigatorDlg(); @@ -322,7 +322,7 @@ public: class ScNavigatorDialogWrapper: public SfxChildWindowContext { public: - ScNavigatorDialogWrapper( Window* pParent, + ScNavigatorDialogWrapper( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index 72d4ef2db96c..537837aa7af3 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -31,10 +31,10 @@ class SdrObject; class ScNoteMarker { private: - Window* pWindow; - Window* pRightWin; - Window* pBottomWin; - Window* pDiagWin; + vcl::Window* pWindow; + vcl::Window* pRightWin; + vcl::Window* pBottomWin; + vcl::Window* pDiagWin; ScDocument* pDoc; ScAddress aDocPos; OUString aUserText; @@ -52,7 +52,7 @@ private: DECL_LINK( TimeHdl, void* ); public: - ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal, + ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight, vcl::Window* pBottom, vcl::Window* pDiagonal, ScDocument* pD, ScAddress aPos, const OUString& rUser, const MapMode& rMap, bool bLeftEdge, bool bForce, bool bKeyboard ); ~ScNoteMarker(); diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index ecc83948550c..107447d8529e 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -29,7 +29,7 @@ enum ScOutlineMode { SC_OUTLINE_HOR, SC_OUTLINE_VER }; /** The window left of or above the spreadsheet containing the outline groups and controls to expand/collapse them. */ -class ScOutlineWindow : public Window +class ScOutlineWindow : public vcl::Window { private: ScViewData& mrViewData; /// View data containing the document. @@ -57,7 +57,7 @@ private: public: ScOutlineWindow( - Window* pParent, + vcl::Window* pParent, ScOutlineMode eMode, ScViewData* pViewData, ScSplitPos eWhich ); diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 56129165239e..0e5e07c6b518 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -45,10 +45,10 @@ class ScRedlineOptionsTabPage : public SfxTabPage public: - ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); + ScRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ScRedlineOptionsTabPage(); - 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/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 1ae4aa78d913..6d1fd0f35f1b 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -40,7 +40,7 @@ class ScCursorRefEdit : public formula::RefEdit Link maCursorDownLink; public: - ScCursorRefEdit( Window* pParent, Window *pLabel ); + ScCursorRefEdit( vcl::Window* pParent, vcl::Window *pLabel ); void SetCursorLinks( const Link& rUp, const Link& rDown ); protected: @@ -93,7 +93,7 @@ public: class ScOptSolverDlg : public ScAnyRefDlg { public: - ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocShell* pDocSh, ScAddress aCursorPos ); virtual ~ScOptSolverDlg(); @@ -205,7 +205,7 @@ class ScSolverProgressDialog : public ModelessDialog FixedText* m_pFtTime; public: - ScSolverProgressDialog( Window* pParent ); + ScSolverProgressDialog( vcl::Window* pParent ); void HideTimeLimit(); void SetTimeLimit( sal_Int32 nSeconds ); @@ -216,7 +216,7 @@ class ScSolverNoSolutionDialog : public ModalDialog FixedText* m_pFtErrorText; public: - ScSolverNoSolutionDialog(Window* pParent, const OUString& rErrorText); + ScSolverNoSolutionDialog(vcl::Window* pParent, const OUString& rErrorText); }; class ScSolverSuccessDialog : public ModalDialog @@ -228,7 +228,7 @@ class ScSolverSuccessDialog : public ModalDialog DECL_LINK(ClickHdl, PushButton*); public: - ScSolverSuccessDialog( Window* pParent, const OUString& rSolution ); + ScSolverSuccessDialog( vcl::Window* pParent, const OUString& rSolution ); }; #endif diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 8651c8f1384b..7032928fe4c0 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -38,7 +38,7 @@ class ScTypedStrData; class ScPivotFilterDlg : public ModalDialog { public: - ScPivotFilterDlg(Window* pParent, const SfxItemSet& rArgSet, SCTAB nSourceTab); + ScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgSet, SCTAB nSourceTab); virtual ~ScPivotFilterDlg(); const ScQueryItem& GetOutputItem(); diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 4a57af5759bc..e6a247add44a 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -29,7 +29,7 @@ class ScDocShell; class ScPreviewShell; class FmFormView; -class ScPreview : public Window +class ScPreview : public vcl::Window { private: ScMarkData::MarkedTabsType maSelectedTabs; @@ -116,7 +116,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; public: - ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ); + ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ); virtual ~ScPreview(); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 4ae03f6ef50e..660812fea376 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -44,7 +44,7 @@ class ScPreviewShell: public SfxViewShell ScPreview* pPreview; // Output window ScrollBar* pHorScroll; ScrollBar* pVerScroll; - Window* pCorner; + vcl::Window* pCorner; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSourceData; // ViewData sal_uInt8 nSourceDesignMode; // form design mode from TabView @@ -54,7 +54,7 @@ class ScPreviewShell: public SfxViewShell SfxBroadcaster* pAccessibilityBroadcaster; bool GetPageSize( Size& aPageSize ); private: - void Construct( Window* pParent ); + void Construct( vcl::Window* pParent ); DECL_LINK(ScrollHandler, ScrollBar* ); DECL_LINK(CloseHdl, SystemWindow*); void DoScroll( sal_uInt16 nMode ); @@ -111,7 +111,7 @@ public: virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; + virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; void AddAccessibilityObject( SfxListener& rObject ); void RemoveAccessibilityObject( SfxListener& rObject ); diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index c4e53a92203f..b1451d5ff54d 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -51,7 +51,7 @@ class ScPrivatSplit : public Control public: - ScPrivatSplit( Window* pWindow, const ResId& rResId, + ScPrivatSplit( vcl::Window* pWindow, const ResId& rResId, SC_SPLIT_DIRECTION eScSplit); virtual short GetDeltaX(); diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index 7c9c58873948..812b40258dc7 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -27,13 +27,13 @@ #include <vcl/layout.hxx> #include <svx/checklbx.hxx> -class Window; +namespace vcl { class Window; } class ScTableProtection; class ScTableProtectionDlg : public ModalDialog { public: - explicit ScTableProtectionDlg(Window* pParent); + explicit ScTableProtectionDlg(vcl::Window* pParent); virtual ~ScTableProtectionDlg(); virtual short Execute() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 986c9e09a6f5..3d0cc117ef73 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -47,7 +47,7 @@ class ScDPObject; class ScDPFunctionListBox : public ListBox { public: - ScDPFunctionListBox(Window* pParent, WinBits nStyle); + ScDPFunctionListBox(vcl::Window* pParent, WinBits nStyle); void SetSelection( sal_uInt16 nFuncMask ); sal_uInt16 GetSelection() const; @@ -60,7 +60,7 @@ class ScDPFunctionDlg : public ModalDialog { typedef ::boost::unordered_map< OUString, OUString, OUStringHash > NameMapType; public: - explicit ScDPFunctionDlg( Window* pParent, const ScDPLabelDataVector& rLabelVec, + explicit ScDPFunctionDlg( vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); sal_uInt16 GetFuncMask() const; @@ -100,7 +100,7 @@ private: class ScDPSubtotalDlg : public ModalDialog { public: - explicit ScDPSubtotalDlg( Window* pParent, ScDPObject& rDPObj, + explicit ScDPSubtotalDlg( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, const ScDPNameVec& rDataFields, bool bEnableLayout ); @@ -135,7 +135,7 @@ private: class ScDPSubtotalOptDlg : public ModalDialog { public: - explicit ScDPSubtotalOptDlg( Window* pParent, ScDPObject& rDPObj, + explicit ScDPSubtotalOptDlg( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields, bool bEnableLayout ); @@ -187,7 +187,7 @@ private: class ScDPShowDetailDlg : public ModalDialog { public: - explicit ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ); + explicit ScDPShowDetailDlg( vcl::Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ); virtual short Execute() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx index a65e2f5658bc..86e2588f416b 100644 --- a/sc/source/ui/inc/redcom.hxx +++ b/sc/source/ui/inc/redcom.hxx @@ -47,7 +47,7 @@ protected: public: - ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet, + ScRedComDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, ScDocShell *pShell, ScChangeAction *pAction, bool bPrevNext = false); ~ScRedComDialog(); diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index f2f23effa63e..7ae4a9f0a29e 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -31,7 +31,7 @@ class Class : public SfxChildWindow \ { \ public: \ - Class( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); \ + Class( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); \ SFX_DECL_CHILDWINDOW_WITHID(Class); \ }; @@ -124,7 +124,7 @@ private: class ScAcceptChgDlgWrapper: public SfxChildWindow { public: - ScAcceptChgDlgWrapper( Window*, + ScAcceptChgDlgWrapper( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); @@ -137,7 +137,7 @@ class ScAcceptChgDlgWrapper: public SfxChildWindow class ScSimpleRefDlgWrapper: public SfxChildWindow { public: - ScSimpleRefDlgWrapper( Window*, + ScSimpleRefDlgWrapper( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); @@ -159,9 +159,9 @@ class SC_DLLPUBLIC ScValidityRefChildWin : public SfxChildWindow { bool m_bVisibleLock:1; bool m_bFreeWindowLock:1; - Window * m_pSavedWndParent; + vcl::Window * m_pSavedWndParent; public: - ScValidityRefChildWin( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); + ScValidityRefChildWin( vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW_WITHID(ScValidityRefChildWin); virtual ~ScValidityRefChildWin(); bool LockVisible( bool bLock ){ bool bVis = m_bVisibleLock; m_bVisibleLock = bLock; return bVis; } diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index a01b791cf338..2763202b0395 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -33,7 +33,7 @@ #include <boost/shared_ptr.hpp> -class Window; +namespace vcl { class Window; } class ScDocProtection; class ScTableProtection; class ScDocument; @@ -44,7 +44,7 @@ public: typedef ::boost::shared_ptr<ScDocProtection> DocProtectionPtr; typedef ::boost::shared_ptr<ScTableProtection> TabProtectionPtr; - explicit ScRetypePassDlg(Window* pParent); + explicit ScRetypePassDlg(vcl::Window* pParent); virtual ~ScRetypePassDlg(); virtual short Execute() SAL_OVERRIDE; @@ -102,7 +102,7 @@ private: class ScRetypePassInputDlg : public ModalDialog { public: - explicit ScRetypePassInputDlg(Window* pParent, ScPassHashProtectable* pProtected); + explicit ScRetypePassInputDlg(vcl::Window* pParent, ScPassHashProtectable* pProtected); virtual ~ScRetypePassInputDlg(); virtual short Execute() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 80b22a5b284c..2675f3b346a3 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -30,7 +30,7 @@ class ScNewScenarioDlg : public ModalDialog { public: - ScNewScenarioDlg(Window* pParent, const OUString& rName, bool bEdit = false, bool bSheetProtected = false); + ScNewScenarioDlg(vcl::Window* pParent, const OUString& rName, bool bEdit = false, bool bSheetProtected = false); void SetScenarioData( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ); diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 1fff0a436b4b..646e4ef4bf77 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -77,7 +77,7 @@ class ScImportAsciiDlg : public ModalDialog public: ScImportAsciiDlg( - Window* pParent, const OUString& aDatName, + vcl::Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall ); virtual ~ScImportAsciiDlg(); diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 66508e84fae4..c8ad3276b271 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -23,7 +23,7 @@ class ScAutoFormatDlg : public ModalDialog { public: - ScAutoFormatDlg(Window* pParent, + ScAutoFormatDlg(vcl::Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScViewData *pViewData); diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 4ab267d299bd..adb8f2032725 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -28,7 +28,7 @@ class ScDelimiterTable; class ScImportOptionsDlg : public ModalDialog { public: - ScImportOptionsDlg( Window* pParent, + ScImportOptionsDlg( vcl::Window* pParent, bool bAscii = true, const ScImportOptions* pOptions = NULL, const OUString* pStrTitle = NULL, diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index f3720363e2c1..b2d133c2cdb8 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -52,7 +52,7 @@ public: void ClearTextAreas(); protected: - ScHFEditPage( Window* pParent, + ScHFEditPage( vcl::Window* pParent, const SfxItemSet& rCoreSet, sal_uInt16 nWhich, bool bHeader ); @@ -104,37 +104,37 @@ private: class ScRightHeaderEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); private: - ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); + ScRightHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class ScLeftHeaderEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); private: - ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); + ScLeftHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class ScRightFooterEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); private: - ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet ); + ScRightFooterEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class ScLeftFooterEditPage : public ScHFEditPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); private: - ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rSet ); + ScLeftFooterEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; #endif diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx index 0d6d435f9f3e..437d90a3adc8 100644 --- a/sc/source/ui/inc/searchresults.hxx +++ b/sc/source/ui/inc/searchresults.hxx @@ -27,7 +27,7 @@ class SearchResultsDlg : public ModelessDialog DECL_LINK( ListSelectHdl, void * ); public: - SearchResultsDlg( SfxBindings* _pBindings, Window* pParent, sal_uInt16 nId ); + SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent, sal_uInt16 nId ); virtual ~SearchResultsDlg(); void FillResults( ScDocument* pDoc, const ScRangeList& rMatchedRanges ); @@ -39,7 +39,7 @@ class SearchResultsDlgWrapper : public SfxChildWindow { public: SearchResultsDlgWrapper( - Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); virtual ~SearchResultsDlgWrapper(); diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index 4f2988436c8b..ca027f040ee4 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.hxx @@ -32,7 +32,7 @@ class ScViewSelectionEngine : public SelectionEngine private: ScSplitPos eWhich; public: - ScViewSelectionEngine( Window* pWindow, ScTabView* pView, + ScViewSelectionEngine( vcl::Window* pWindow, ScTabView* pView, ScSplitPos eSplitPos ); ScSplitPos GetWhich() const { return eWhich; } @@ -103,7 +103,7 @@ public: class ScHeaderSelectionEngine : public SelectionEngine { public: - ScHeaderSelectionEngine( Window* pWindow, ScHeaderFunctionSet* pFuncSet ); + ScHeaderSelectionEngine( vcl::Window* pWindow, ScHeaderFunctionSet* pFuncSet ); }; #endif diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index cb4c6b27c480..f8d746fd4cc9 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -47,7 +47,7 @@ private: DECL_LINK( ToggleHandle, void* ); public: - ScShareDocumentDlg( Window* pParent, ScViewData* pViewData ); + ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewData ); virtual ~ScShareDocumentDlg(); bool IsShareDocumentChecked() const; diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 75e56b1afea7..6c55a64d51f7 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -34,7 +34,7 @@ private: DECL_LINK( DblClkHdl, void * ); public: - ScShowTabDlg( Window* pParent ); + ScShowTabDlg( vcl::Window* pParent ); /** Sets dialog title, fixed text for listbox and help IDs. */ void SetDescription( diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index a45de80bcd6a..5a03ca5b279b 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -67,7 +67,7 @@ protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: - ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData ); virtual ~ScSimpleRefDlg(); diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index b2db7ac5a709..eb03c6e61e5f 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -55,7 +55,7 @@ class ScSolverOptionsDialog : public ModalDialog void EditOption(); public: - ScSolverOptionsDialog( Window* pParent, + ScSolverOptionsDialog( vcl::Window* pParent, const com::sun::star::uno::Sequence<OUString>& rImplNames, const com::sun::star::uno::Sequence<OUString>& rDescriptions, const OUString& rEngine, @@ -73,7 +73,7 @@ class ScSolverIntegerDialog : public ModalDialog NumericField* m_pNfValue; public: - ScSolverIntegerDialog( Window * pParent ); + ScSolverIntegerDialog( vcl::Window * pParent ); void SetOptionName( const OUString& rName ); void SetValue( sal_Int32 nValue ); @@ -86,7 +86,7 @@ class ScSolverValueDialog : public ModalDialog Edit* m_pEdValue; public: - ScSolverValueDialog( Window * pParent ); + ScSolverValueDialog( vcl::Window * pParent ); void SetOptionName( const OUString& rName ); void SetValue( double fValue ); diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 5c6ff014b2b6..2799c58975a8 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -38,7 +38,7 @@ enum ScSolverErr class ScSolverDlg : public ScAnyRefDlg { public: - ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocument* pDocument, ScAddress aCursorPos ); virtual ~ScSolverDlg(); diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx index 3ec193ebd31d..d627f02623bb 100644 --- a/sc/source/ui/inc/sortdlg.hxx +++ b/sc/source/ui/inc/sortdlg.hxx @@ -29,7 +29,7 @@ class ScSortDlg : public SfxTabDialog { public: - ScSortDlg(Window* pParent, const SfxItemSet* pArgSet); + ScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet); void SetHeaders( bool bHeaders ) { bIsHeaders = bHeaders; } void SetByRows ( bool bByRows ) { bIsByRows = bByRows; } @@ -44,7 +44,7 @@ private: class ScSortWarningDlg : public ModalDialog { public: - ScSortWarningDlg( Window* pParent, const OUString& rExtendText,const OUString& rCurrentText ); + ScSortWarningDlg( vcl::Window* pParent, const OUString& rExtendText,const OUString& rCurrentText ); DECL_LINK( BtnHdl, PushButton* ); private: FixedText* aFtText; diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index 8913acfd514a..5c9c1fa833bc 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -31,7 +31,7 @@ struct ScSortKeyItem : public VclBuilderContainer RadioButton* m_pBtnUp; RadioButton* m_pBtnDown; - ScSortKeyItem(Window* pParent); + ScSortKeyItem(vcl::Window* pParent); void DisableField(); void EnableField(); diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx index f3b1fc473f5c..d2a359e0e6a4 100644 --- a/sc/source/ui/inc/spelldialog.hxx +++ b/sc/source/ui/inc/spelldialog.hxx @@ -42,7 +42,7 @@ class ScSpellDialogChildWindow : public ::svx::SpellDialogChildWindow public: SFX_DECL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow ); - explicit ScSpellDialogChildWindow( Window* pParent, sal_uInt16 nId, + explicit ScSpellDialogChildWindow( vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); virtual ~ScSpellDialogChildWindow(); diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index e1160930d010..d2e46d22a7f4 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -121,7 +121,7 @@ protected: private: /** Returns the spelling dialog if it is open. */ - Window* GetDialogParent(); + vcl::Window* GetDialogParent(); }; /** Edit engine for text conversion. */ diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx index 2b4703de824f..367d32d8811e 100644 --- a/sc/source/ui/inc/strindlg.hxx +++ b/sc/source/ui/inc/strindlg.hxx @@ -27,7 +27,7 @@ class ScStringInputDlg : public ModalDialog { public: - ScStringInputDlg(Window* pParent, + ScStringInputDlg(vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index d49365b62060..04a70a1f7633 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -27,7 +27,7 @@ class SfxStyleSheetBase; class ScStyleDlg : public SfxStyleDialog { public: - ScStyleDlg( Window* pParent, + ScStyleDlg( vcl::Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId ); diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 4c08dad42737..6496689d3a75 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -27,7 +27,7 @@ class ScSubTotalDlg : public SfxTabDialog { public: - ScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet); + ScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet); private: PushButton* m_pBtnRemove; DECL_LINK( RemoveHdl, PushButton * ); diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 63fbe9eabb05..86d46e3c9240 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -28,7 +28,7 @@ class ScTabBgColorDlg : public ModalDialog { public: - ScTabBgColorDlg( Window* pParent, + ScTabBgColorDlg( vcl::Window* pParent, const OUString& rTitle, const OUString& rTabBgColorNoColorText, const Color& rDefaultColor, @@ -39,7 +39,7 @@ public: class ScTabBgColorValueSet : public SvxColorValueSet { public: - ScTabBgColorValueSet(Window* pParent, WinBits nStyle); + ScTabBgColorValueSet(vcl::Window* pParent, WinBits nStyle); void SetDialog(ScTabBgColorDlg* pTabBgColorDlg) { m_pTabBgColorDlg = pTabBgColorDlg; diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index 02ce3e0cb221..b058d39c1434 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -62,7 +62,7 @@ protected: virtual void Mirror() SAL_OVERRIDE; public: - ScTabControl( Window* pParent, ScViewData* pData ); + ScTabControl( vcl::Window* pParent, ScViewData* pData ); virtual ~ScTabControl(); using TabBar::StartDrag; diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 3b6cf707babd..a1806c1153c9 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -40,7 +40,7 @@ enum ScTabOpErr class ScTabOpDlg : public ScAnyRefDlg { public: - ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, + ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocument* pDocument, const ScRefAddress& rCursorPos ); virtual ~ScTabOpDlg(); diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 5f8087506785..e13b70def98b 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -27,7 +27,7 @@ class ScTabPageProtection : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges (); virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; @@ -38,7 +38,7 @@ protected: virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; private: - ScTabPageProtection( Window* pParent, + ScTabPageProtection( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ); private: TriStateBox* m_pBtnHideCell; diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx index ee889bdec6d4..a05aca5075b4 100644 --- a/sc/source/ui/inc/tabsplit.hxx +++ b/sc/source/ui/inc/tabsplit.hxx @@ -37,7 +37,7 @@ protected: virtual void Splitting( Point& rSplitPos ) SAL_OVERRIDE; public: - ScTabSplitter( Window* pParent, WinBits nWinStyle, + ScTabSplitter( vcl::Window* pParent, WinBits nWinStyle, ScViewData* pData ); virtual ~ScTabSplitter(); diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 891af9e82567..0bc4751487c4 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -64,7 +64,7 @@ namespace chart2 { namespace data { // Help - Window -class ScCornerButton : public Window +class ScCornerButton : public vcl::Window { private: ScViewData* pViewData; @@ -75,7 +75,7 @@ protected: virtual void Resize() SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: - ScCornerButton( Window* pParent, ScViewData* pData, bool bAdditional ); + ScCornerButton( vcl::Window* pParent, ScViewData* pData, bool bAdditional ); virtual ~ScCornerButton(); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; @@ -87,7 +87,7 @@ class ScTabView : boost::noncopyable private: enum BlockMode { None = 0, Normal = 1, Own = 2 }; - Window* pFrameWin; // First !!! + vcl::Window* pFrameWin; // First !!! ScViewData aViewData; // must be at the front ! ScViewSelectionEngine* pSelEngine; @@ -227,7 +227,7 @@ protected: void UpdateIMap( SdrObject* pObj ); public: - ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); + ScTabView( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); ~ScTabView(); void MakeDrawLayer(); @@ -319,9 +319,9 @@ public: void FakeButtonUp( ScSplitPos eWhich ); ScGridWindow* GetActiveWin(); - Window* GetWindowByPos( ScSplitPos ePos ) { return pGridWin[ePos]; } + vcl::Window* GetWindowByPos( ScSplitPos ePos ) { return pGridWin[ePos]; } - ScSplitPos FindWindow( Window* pWindow ) const; + ScSplitPos FindWindow( vcl::Window* pWindow ) const; void SetActivePointer( const Pointer& rPointer ); @@ -508,7 +508,7 @@ public: void EnableRefInput(bool bFlag = true); - Window* GetFrameWin() const { return pFrameWin; } + vcl::Window* GetFrameWin() const { return pFrameWin; } bool HasPaintBrush() const { return pBrushDocument || pDrawBrushSet; } ScDocument* GetBrushDocument() const { return pBrushDocument; } diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index e6573085524f..9020c2184c84 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -243,7 +243,7 @@ public: virtual ~ScTabViewShell(); - SC_DLLPUBLIC Window* GetDialogParent(); + SC_DLLPUBLIC vcl::Window* GetDialogParent(); bool IsRefInputMode() const; void ExecuteInputDirect(); @@ -348,7 +348,7 @@ public: sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false ) SAL_OVERRIDE; virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; - virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; + virtual SfxTabPage* CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; void ConnectObject( SdrOle2Obj* pObj ); bool ActivateObject( SdrOle2Obj* pObj, long nVerb ); @@ -358,7 +358,7 @@ public: SC_DLLPUBLIC static ScTabViewShell* GetActiveViewShell(); SfxModelessDialog* CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW, SfxChildWinInfo* pInfo, - Window* pParent, sal_uInt16 nSlotId ); + vcl::Window* pParent, sal_uInt16 nSlotId ); void UpdateOleZoom(); inline SbxObject* GetScSbxObject() const diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 83c3b4bef254..d2c6cbccaaaf 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -34,10 +34,10 @@ public: virtual ~ScZoomSliderControl(); 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; }; -class ScZoomSliderWnd: public Window +class ScZoomSliderWnd: public vcl::Window { private: struct ScZoomSliderWnd_Impl; @@ -51,7 +51,7 @@ private: void DoPaint( const Rectangle& rRect ); public: - ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, + ScZoomSliderWnd( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , sal_uInt16 nCurrentZoom ); virtual ~ScZoomSliderWnd(); void UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ); diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx index dd199546695c..1bea02d2a0ea 100644 --- a/sc/source/ui/inc/textdlgs.hxx +++ b/sc/source/ui/inc/textdlgs.hxx @@ -33,7 +33,7 @@ private: virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE; public: - ScCharDlg(Window* pParent, const SfxItemSet* pAttr, + ScCharDlg(vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell); }; @@ -45,7 +45,7 @@ private: virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE; public: - ScParagraphDlg(Window* pParent, const SfxItemSet* pAttr); + ScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr); }; #endif diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index 3cdfa31dcada..b944ce19a8d3 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -29,7 +29,7 @@ class ScTextImportOptionsDlg : public ModalDialog { public: - ScTextImportOptionsDlg(Window* pParent); + ScTextImportOptionsDlg(vcl::Window* pParent); virtual ~ScTextImportOptionsDlg(); virtual short Execute() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 2b47c7869ff4..629eb735c7be 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -32,7 +32,7 @@ class ScDocOptions; class ScTpCalcOptions : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; @@ -40,7 +40,7 @@ public: virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; private: - ScTpCalcOptions( Window* pParent, + ScTpCalcOptions( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~ScTpCalcOptions(); diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 07167ce8a31c..6ddeeeca0b1f 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -19,14 +19,14 @@ class ScTpCompatOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static SfxTabPage* Create (Window* pParent, const SfxItemSet* rCoreAttrs); + static SfxTabPage* Create (vcl::Window* pParent, const SfxItemSet* rCoreAttrs); virtual bool FillItemSet(SfxItemSet* rCoreAttrs) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rCoreAttrs) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: - explicit ScTpCompatOptions(Window* pParent, const SfxItemSet& rCoreAttrs); + explicit ScTpCompatOptions(vcl::Window* pParent, const SfxItemSet& rCoreAttrs); virtual ~ScTpCompatOptions(); private: diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 7da63f45c3e7..251c3676a391 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -19,14 +19,14 @@ class ScTpDefaultsOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static SfxTabPage* Create (Window* pParent, const SfxItemSet* rCoreSet); + static SfxTabPage* Create (vcl::Window* pParent, const SfxItemSet* rCoreSet); virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: - explicit ScTpDefaultsOptions(Window* pParent, const SfxItemSet& rCoreSet); + explicit ScTpDefaultsOptions(vcl::Window* pParent, const SfxItemSet& rCoreSet); virtual ~ScTpDefaultsOptions(); void CheckNumSheets(); diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index fac10841d727..adf1c64a8eac 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -33,14 +33,14 @@ class ScTpFormulaOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static SfxTabPage* Create (Window* pParent, const SfxItemSet* rCoreSet); + static SfxTabPage* Create (vcl::Window* pParent, const SfxItemSet* rCoreSet); virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: - explicit ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreSet); + explicit ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& rCoreSet); virtual ~ScTpFormulaOptions(); void ResetSeparators(); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 15acb7d8b256..526aad0f19be 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -36,7 +36,7 @@ public: void SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; } protected: - ScHFPage( Window* pParent, + ScHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); @@ -60,21 +60,21 @@ private: class ScHeaderPage : public ScHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: - ScHeaderPage( Window* pParent, const SfxItemSet& rSet ); + ScHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; class ScFooterPage : public ScHFPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: - ScFooterPage( Window* pParent, const SfxItemSet& rSet ); + ScFooterPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPHF_HXX diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 9f0f28d0d91a..d304ebd68f97 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -53,7 +53,7 @@ enum ScEditWindowLocation class SC_DLLPUBLIC ScEditWindow : public Control { public: - ScEditWindow( Window* pParent, WinBits nBits , ScEditWindowLocation eLoc ); + ScEditWindow( vcl::Window* pParent, WinBits nBits , ScEditWindowLocation eLoc ); virtual ~ScEditWindow(); using Control::SetFont; @@ -118,7 +118,7 @@ protected: public: - ScExtIButton(Window* pParent, WinBits nBits ); + ScExtIButton(vcl::Window* pParent, WinBits nBits ); void SetPopupMenu(PopupMenu* pPopUp); diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 35f5a68f3769..cc987a98adfc 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -29,11 +29,11 @@ class ScTpPrintOptions : public SfxTabPage CheckBox* m_pSelectedSheetsCB; CheckBox* m_pForceBreaksCB; - ScTpPrintOptions( Window* pParent, const SfxItemSet& rCoreSet ); + ScTpPrintOptions( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~ScTpPrintOptions(); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 7a900e70aec3..8eaf1ec057da 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -47,11 +47,11 @@ struct ScSortParam; class ScTabPageSortFields : public SfxTabPage { public: - ScTabPageSortFields( Window* pParent, + ScTabPageSortFields( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTabPageSortFields(); - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -106,13 +106,13 @@ class CollatorWrapper; class ScTabPageSortOptions : public SfxTabPage { public: - ScTabPageSortOptions( Window* pParent, + ScTabPageSortOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTabPageSortOptions(); #undef SfxTabPage #define SfxTabPage ::SfxTabPage - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index b661f85321e9..96f141fdbdd8 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -27,10 +27,10 @@ class ScDocStatPage: public SfxTabPage { public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet ); private: - ScDocStatPage( Window *pParent, const SfxItemSet& rSet ); + ScDocStatPage( vcl::Window *pParent, const SfxItemSet& rSet ); virtual ~ScDocStatPage(); protected: diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 24a6e3670d15..79e3727e751c 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -36,7 +36,7 @@ struct ScSubTotalParam; class ScTpSubTotalGroup : public SfxTabPage { protected: - ScTpSubTotalGroup( Window* pParent, + ScTpSubTotalGroup( vcl::Window* pParent, const SfxItemSet& rArgSet ); public: @@ -76,13 +76,13 @@ private: class ScTpSubTotalGroup1 : public ScTpSubTotalGroup { protected: - ScTpSubTotalGroup1( Window* pParent, + ScTpSubTotalGroup1( vcl::Window* pParent, const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup1(); - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -91,13 +91,13 @@ public: class ScTpSubTotalGroup2 : public ScTpSubTotalGroup { protected: - ScTpSubTotalGroup2( Window* pParent, + ScTpSubTotalGroup2( vcl::Window* pParent, const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup2(); - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -106,13 +106,13 @@ public: class ScTpSubTotalGroup3 : public ScTpSubTotalGroup { protected: - ScTpSubTotalGroup3( Window* pParent, + ScTpSubTotalGroup3( vcl::Window* pParent, const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalGroup3(); - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -121,13 +121,13 @@ public: class ScTpSubTotalOptions : public SfxTabPage { protected: - ScTpSubTotalOptions( Window* pParent, + ScTpSubTotalOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); public: virtual ~ScTpSubTotalOptions(); - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 5053babb0f9e..182c1fd530af 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -28,7 +28,7 @@ class ScTablePage : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); static const sal_uInt16* GetRanges (); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; @@ -38,7 +38,7 @@ public: virtual void DataChanged ( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: - ScTablePage( Window* pParent, const SfxItemSet& rCoreSet ); + ScTablePage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); virtual ~ScTablePage(); void ShowImage(); diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 8345335966c3..5e84d88a0beb 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -33,7 +33,7 @@ class ScRangeUtil; class ScTpUserLists : public SfxTabPage { public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreAttrs ) SAL_OVERRIDE; @@ -41,7 +41,7 @@ public: virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; private: - ScTpUserLists( Window* pParent, + ScTpUserLists( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTpUserLists(); diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 49c8e815fdb0..e426d9c742a9 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -64,12 +64,12 @@ class ScTpContentOptions : public SfxTabPage DECL_LINK( SelLbObjHdl, ListBox* ); DECL_LINK( CBHdl, CheckBox* ); - ScTpContentOptions( Window* pParent, + ScTpContentOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTpContentOptions(); public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; @@ -112,12 +112,12 @@ class ScTpLayoutOptions : public SfxTabPage DECL_LINK( UpdateHdl, CheckBox* ); - ScTpLayoutOptions( Window* pParent, + ScTpLayoutOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTpLayoutOptions(); public: - static SfxTabPage* Create ( Window* pParent, + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index 6ee2855b7d0c..bd11836bcf97 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -99,7 +99,7 @@ public: void SetDragWasInternal(); SC_DLLPUBLIC void SetUseInApi( bool bSet ); - static SC_DLLPUBLIC ScTransferObj* GetOwnClipboard( Window* pUIWin ); + static SC_DLLPUBLIC ScTransferObj* GetOwnClipboard( vcl::Window* pUIWin ); static SfxObjectShell* SetDrawClipDoc( bool bAnyOle ); // update ScGlobal::pDrawClipDocShellRef virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 9876d4c7e724..9fb3b77a6119 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -83,9 +83,9 @@ class ScValidationDlg; class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage { public: - explicit ScTPValidationValue( Window* pParent, const SfxItemSet& rArgSet ); + explicit ScTPValidationValue( vcl::Window* pParent, const SfxItemSet& rArgSet ); - static SfxTabPage* Create( Window* pParent, const SfxItemSet* rArgSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rArgSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rArgSet ) SAL_OVERRIDE; @@ -125,7 +125,7 @@ private: sal_Unicode mcFmlaSep; /// List separator in formulas. DECL_LINK(EditSetFocusHdl, void *); - DECL_LINK( KillFocusHdl, Window *); + DECL_LINK( KillFocusHdl, vcl::Window *); void OnClick( Button *pBtn ); formula::RefEdit* m_pRefEdit; public: @@ -134,7 +134,7 @@ public: ScTPValidationValue* m_pPage; virtual void Click() SAL_OVERRIDE; public: - ScRefButtonEx(Window* pParent, WinBits nStyle) + ScRefButtonEx(vcl::Window* pParent, WinBits nStyle) : ::formula::RefButton(pParent, nStyle) , m_pPage(NULL) { @@ -183,13 +183,13 @@ class ScValidationDlg bool LeaveRefStatus(); public: - explicit ScValidationDlg( Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = NULL ); + explicit ScValidationDlg( vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = NULL ); virtual ~ScValidationDlg() { if( m_bOwnRefHdlr ) RemoveRefDlg( false ); } - static ScValidationDlg * Find1AliveObject( Window *pAncestor ) + static ScValidationDlg * Find1AliveObject( vcl::Window *pAncestor ) { return static_cast<ScValidationDlg *>( SC_MOD()->Find1RefWindow( SLOTID, pAncestor ) ); } @@ -226,7 +226,7 @@ public: } bool IsRefInputting(){ return m_bRefInputting; } - Window* get_refinput_shrink_parent() { return m_pHBox; } + vcl::Window* get_refinput_shrink_parent() { return m_pHBox; } virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE { @@ -285,10 +285,10 @@ private: // DECL_LINK( SelectHdl, ListBox * ); public: - ScTPValidationHelp( Window* pParent, const SfxItemSet& rArgSet ); + ScTPValidationHelp( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTPValidationHelp(); - static SfxTabPage* Create ( Window* pParent, const SfxItemSet* rArgSet ); + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; @@ -310,10 +310,10 @@ private: DECL_LINK(ClickSearchHdl, void *); public: - ScTPValidationError( Window* pParent, const SfxItemSet& rArgSet ); + ScTPValidationError( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTPValidationError(); - static SfxTabPage* Create ( Window* pParent, const SfxItemSet* rArgSet ); + static SfxTabPage* Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index bb3e26373158..515bc67a4f75 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -94,7 +94,7 @@ class ScEditEngineDefaulter; class EditView; class EditStatus; class Outliner; -class Window; +namespace vcl { class Window; } class SfxObjectShell; class SfxBindings; class SfxDispatcher; @@ -240,7 +240,7 @@ public: ScMarkData& GetMarkData(); const ScMarkData& GetMarkData() const; - Window* GetDialogParent(); // forwarded from tabvwsh + vcl::Window* GetDialogParent(); // forwarded from tabvwsh ScGridWindow* GetActiveWin(); // from View ScDrawView* GetScDrawView(); // from View bool IsMinimized(); // from View @@ -404,7 +404,7 @@ public: void ResetEditView(); void SetEditEngine( ScSplitPos eWhich, ScEditEngineDefaulter* pNewEngine, - Window* pWin, SCCOL nNewX, SCROW nNewY ); + vcl::Window* pWin, SCCOL nNewX, SCROW nNewY ); void GetEditView( ScSplitPos eWhich, EditView*& rViewPtr, SCCOL& rCol, SCROW& rRow ); bool HasEditView( ScSplitPos eWhich ) const { return pEditView[eWhich] && bEditActive[eWhich]; } @@ -422,7 +422,7 @@ public: SCCOL GetEditEndCol() const { return nEditEndCol; } SCROW GetEditEndRow() const { return nEditEndRow; } - Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, Window* pWin, + Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, vcl::Window* pWin, const ScPatternAttr* pPattern, bool bForceToTop ); void SetTabNo( SCTAB nNewTab ); diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index a764bf2129bc..cd664cd5b45d 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -68,7 +68,7 @@ private: bool bFormatValid; public: - ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); + ScViewFunc( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); ~ScViewFunc(); const ScPatternAttr* GetSelectionPattern (); diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx index 3111fa511cad..1030abf4818d 100644 --- a/sc/source/ui/inc/warnbox.hxx +++ b/sc/source/ui/inc/warnbox.hxx @@ -28,7 +28,7 @@ class ScCbWarningBox : public WarningBox public: /** @param rMsgStr Resource ID for the message text. @param bDefYes true = "Yes" focused, false = "No" focused. */ - ScCbWarningBox( Window* pParent, const OUString& rMsgStr, bool bDefYes = true ); + ScCbWarningBox( vcl::Window* pParent, const OUString& rMsgStr, bool bDefYes = true ); /** Opens dialog if IsDialogEnabled() returns true. @descr If after executing the dialog the checkbox "Do not show again" is set, @@ -45,7 +45,7 @@ public: class ScReplaceWarnBox : public ScCbWarningBox { public: - ScReplaceWarnBox( Window* pParent ); + ScReplaceWarnBox( vcl::Window* pParent ); /** Reads the configuration key "ReplaceCellsWarning". */ virtual bool IsDialogEnabled() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index c9614895eaf1..1a4407821d97 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -56,7 +56,7 @@ class ScXMLSourceDlg : public ScAnyRefDlg public: ScXMLSourceDlg( - SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDoc); + SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocument* pDoc); virtual bool IsRefInputMode() const SAL_OVERRIDE; virtual void SetReference(const ScRange& rRange, ScDocument* pDoc) SAL_OVERRIDE; |