diff options
Diffstat (limited to 'sc/source/ui/miscdlgs')
36 files changed, 82 insertions, 82 deletions
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index aa65b05f7da9..36758e5fdde1 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -79,7 +79,7 @@ ScRedlinData::~ScRedlinData() // class ScAcceptChgDlg -ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData) : SfxModelessDialog(pB, pCW, pParent, "AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui"), @@ -874,7 +874,7 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, RefHandle) pWnd->SetCloseHdl(LINK( this, ScAcceptChgDlg,RefInfoHandle)); pWnd->SetRefString(pTPFilter->GetRange()); ScSimpleRefDlgWrapper::SetAutoReOpen(false); - Window* pWin=pWnd->GetWindow(); + vcl::Window* pWin=pWnd->GetWindow(); pWin->SetPosSizePixel(GetPosPixel(),GetSizePixel()); Hide(); pWin->SetText(GetText()); @@ -900,7 +900,7 @@ IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, OUString*, pResult) if(pWnd!=NULL) { - Window* pWin=pWnd->GetWindow(); + vcl::Window* pWin=pWnd->GetWindow(); Size aWinSize=pWin->GetSizePixel(); aWinSize.Width()=GetSizePixel().Width(); SetPosSizePixel(pWin->GetPosPixel(),aWinSize); diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 6e1dd5c3d4ba..c402daf3d240 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -95,10 +95,10 @@ void ScFormulaReferenceHelper::enableInput( bool bEnable ) ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); if(pViewSh!=NULL) { - Window *pWin=pViewSh->GetWindow(); + vcl::Window *pWin=pViewSh->GetWindow(); if(pWin) { - Window *pParent=pWin->GetParent(); + vcl::Window *pParent=pWin->GetParent(); if(pParent) { pParent->EnableInput(bEnable,true); @@ -345,7 +345,7 @@ IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator *, pSelAccel ) return long(true); } -typedef std::vector<Window*> winvec; +typedef std::vector<vcl::Window*> winvec; void ScFormulaReferenceHelper::RefInputDone( bool bForced ) { @@ -397,7 +397,7 @@ void ScFormulaReferenceHelper::RefInputDone( bool bForced ) // All others: Show(); for (winvec::iterator aI = m_aHiddenWidgets.begin(); aI != m_aHiddenWidgets.end(); ++aI) { - Window *pWindow = *aI; + vcl::Window *pWindow = *aI; pWindow->Show(); } m_aHiddenWidgets.clear(); @@ -407,7 +407,7 @@ void ScFormulaReferenceHelper::RefInputDone( bool bForced ) pRefEdit->set_width_request(mnOldEditWidthReq); Dialog* pResizeDialog = pRefEdit->GetParentDialog(); pResizeDialog->set_border_width(m_nOldBorderWidth); - if (Window *pActionArea = pResizeDialog->get_action_area()) + if (vcl::Window *pActionArea = pResizeDialog->get_action_area()) pActionArea->Show(); pResizeDialog->setOptimalLayoutSize(); } @@ -417,14 +417,14 @@ void ScFormulaReferenceHelper::RefInputDone( bool bForced ) } } -typedef std::set<Window*> winset; +typedef std::set<vcl::Window*> winset; namespace { - void hideUnless(Window *pTop, const winset& rVisibleWidgets, + void hideUnless(vcl::Window *pTop, const winset& rVisibleWidgets, winvec &rWasVisibleWidgets) { - for (Window* pChild = pTop->GetWindow(WINDOW_FIRSTCHILD); pChild; + for (vcl::Window* pChild = pTop->GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { if (!pChild->IsVisible()) @@ -476,7 +476,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: // Save and adjust window title sOldDialogText = m_pWindow->GetText(); - if (Window *pLabel = pRefEdit->GetLabelWidgetForShrinkMode()) + if (vcl::Window *pLabel = pRefEdit->GetLabelWidgetForShrinkMode()) { OUString sLabel = pLabel->GetText(); if (!sLabel.isEmpty()) @@ -492,11 +492,11 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: if (!mbOldDlgLayoutEnabled) { - for (Window* pChild = m_pWindow->GetWindow(WINDOW_FIRSTCHILD); pChild; + for (vcl::Window* pChild = m_pWindow->GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT)) { - Window *pWin = pChild->GetWindow(WINDOW_CLIENT); - if (pWin == (Window*)pRefEdit || pWin == (Window*)pRefBtn) + vcl::Window *pWin = pChild->GetWindow(WINDOW_CLIENT); + if (pWin == (vcl::Window*)pRefEdit || pWin == (vcl::Window*)pRefBtn) continue; // do nothing else if (pWin->IsVisible()) { @@ -512,8 +512,8 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: //and all its direct parents. winset m_aVisibleWidgets; pResizeDialog = pRefEdit->GetParentDialog(); - Window *pContentArea = pResizeDialog->get_content_area(); - for (Window *pCandidate = pRefEdit; + vcl::Window *pContentArea = pResizeDialog->get_content_area(); + for (vcl::Window *pCandidate = pRefEdit; pCandidate && (pCandidate != pContentArea && pCandidate->IsVisible()); pCandidate = pCandidate->GetWindow(WINDOW_REALPARENT)) { @@ -521,7 +521,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: } //same again with pRefBtn, except stop if there's a //shared parent in the existing widgets - for (Window *pCandidate = pRefBtn; + for (vcl::Window *pCandidate = pRefBtn; pCandidate && (pCandidate != pContentArea && pCandidate->IsVisible()); pCandidate = pCandidate->GetWindow(WINDOW_REALPARENT)) { @@ -581,7 +581,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: pRefEdit->set_width_request(aOldEditSize.Width()); m_nOldBorderWidth = pResizeDialog->get_border_width(); pResizeDialog->set_border_width(0); - if (Window *pActionArea = pResizeDialog->get_action_area()) + if (vcl::Window *pActionArea = pResizeDialog->get_action_area()) pActionArea->Hide(); pResizeDialog->setOptimalLayoutSize(); } @@ -693,10 +693,10 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag, bool bChildren) ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); if(pViewSh!=NULL) { - Window *pWin=pViewSh->GetWindow(); + vcl::Window *pWin=pViewSh->GetWindow(); if(pWin) { - Window *pParent=pWin->GetParent(); + vcl::Window *pParent=pWin->GetParent(); if(pParent) { pParent->EnableInput(bFlag,false); @@ -729,10 +729,10 @@ static void lcl_InvalidateWindows() ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); if(pViewSh!=NULL) { - Window *pWin=pViewSh->GetWindow(); + vcl::Window *pWin=pViewSh->GetWindow(); if(pWin) { - Window *pParent=pWin->GetParent(); + vcl::Window *pParent=pWin->GetParent(); if(pParent) pParent->Invalidate(); } @@ -759,7 +759,7 @@ static void lcl_HideAllReferences() //The class of ScAnyRefDlg is rewritten by PengYunQuan for Validity Cell Range Picker // class ScRefHandler -ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB, bool bBindRef ): +ScRefHandler::ScRefHandler( vcl::Window &rWindow, SfxBindings* pB, bool bBindRef ): m_rWindow( rWindow ), m_bInRefMode( false ), m_aHelper(this,pB), @@ -835,7 +835,7 @@ bool ScRefHandler::LeaveRefMode() lcl_HideAllReferences(); - if( Dialog *pDlg = dynamic_cast<Dialog*>( static_cast<Window*>(*this) ) ) + if( Dialog *pDlg = dynamic_cast<Dialog*>( static_cast<vcl::Window*>(*this) ) ) pDlg->SetModalInputMode(false); SetDispatcherLock( false ); //! here and in DoClose ? @@ -1001,7 +1001,7 @@ void ScRefHandler::RefInputDone( bool bForced ) m_aHelper.RefInputDone( bForced ); } -ScRefHdlModalImpl::ScRefHdlModalImpl(Window* pParent, const OString& rID, +ScRefHdlModalImpl::ScRefHdlModalImpl(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : ModalDialog( pParent, rID, rUIXMLDescription) , ScRefHandler(dynamic_cast<Window&>(*this), NULL, true) @@ -1020,7 +1020,7 @@ void ScRefHdlModalImpl::StateChanged( StateChangedType nStateChange ) ScRefHandler::stateChanged( nStateChange, true ); } -ScAnyRefModalDlg::ScAnyRefModalDlg(Window* pParent, const OString& rID, +ScAnyRefModalDlg::ScAnyRefModalDlg(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : ScRefHdlModalImpl(pParent, rID, rUIXMLDescription) { diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index ec571cec12e4..81253359236d 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -54,7 +54,7 @@ // ScAutoFmtPreview -ScAutoFmtPreview::ScAutoFmtPreview(Window* pParent) +ScAutoFmtPreview::ScAutoFmtPreview(vcl::Window* pParent) : Window(pParent) , pCurData(NULL) , aVD(*this) @@ -73,7 +73,7 @@ ScAutoFmtPreview::ScAutoFmtPreview(Window* pParent) Init(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScAutoFmtPreview(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScAutoFmtPreview(vcl::Window *pParent, VclBuilder::stringmap &) { return new ScAutoFmtPreview(pParent); } diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index cda2832adb06..90a42345bb38 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -371,7 +371,7 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA // class ScConflictsDlg -ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ) +ScConflictsDlg::ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ) :ModalDialog( pParent, "ConflictsDialog", "modules/scalc/ui/conflictsdialog.ui" ) ,m_pLbConflictsContainer ( get<SvSimpleTableContainer>("container") ) ,m_pLbConflicts ( new SvxRedlinTable(*m_pLbConflictsContainer) ) diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index c009bd4752c2..5d5e833ca768 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -23,7 +23,7 @@ #include "scresid.hxx" #include "miscdlgs.hrc" -ScColOrRowDlg::ScColOrRowDlg(Window* pParent, const OUString& rStrTitle, +ScColOrRowDlg::ScColOrRowDlg(vcl::Window* pParent, const OUString& rStrTitle, const OUString& rStrLabel, bool bColDefault) : ModalDialog(pParent, "ColOrRowDialog", "modules/scalc/ui/colorrowdialog.ui") diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index a8496f6c0015..9fc3a5145c58 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -38,7 +38,7 @@ const sal_uLong nEntryDataDelim = 2; // note: some of the initialisation is done in Init ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, + vcl::Window* pParent, ScViewData* ptrViewData ) : ScAnyRefDlg ( pB, pCW, pParent, "NameRangesDialog" , "modules/scalc/ui/namerangesdialog.ui" ), diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 3c91496db987..460fd58024d4 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -20,7 +20,7 @@ #define HDL(hdl) LINK( this, ScDataFormDlg, hdl ) -ScDataFormDlg::ScDataFormDlg(Window* pParent, ScTabViewShell* pTabViewShellOri) +ScDataFormDlg::ScDataFormDlg(vcl::Window* pParent, ScTabViewShell* pTabViewShellOri) : ModalDialog(pParent, "DataFormDialog", "modules/scalc/ui/dataform.ui") , pTabViewShell(pTabViewShellOri) , bNoSelection(false) diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index 5dc52bde35a8..345293b81201 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -17,7 +17,7 @@ namespace sc { -DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, Window* pParent) +DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, vcl::Window* pParent) : ModalDialog(pParent, "DataStreamDialog", "modules/scalc/ui/datastreams.ui") , mpDocShell(pDocShell) { diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index e63c58cc142b..06e43a4b5e19 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -25,7 +25,7 @@ static sal_uInt8 nDelItemChecked=0; -ScDeleteCellDlg::ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove) +ScDeleteCellDlg::ScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove) : ModalDialog(pParent, "DeleteCellsDialog", "modules/scalc/ui/deletecells.ui") { get(m_pBtnCellsUp, "up"); diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index 52a48716743f..21eccac2c1b1 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -28,7 +28,7 @@ InsertDeleteFlags ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_S IDF_NOTE | IDF_FORMULA | IDF_VALUE); -ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, +ScDeleteContentsDlg::ScDeleteContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults ) : ModalDialog ( pParent, "DeleteContentsDialog", "modules/scalc/ui/deletecontents.ui" ), diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index deb798d1738f..9067a15bb28c 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -31,7 +31,7 @@ // class ScFillSeriesDlg -ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, +ScFillSeriesDlg::ScFillSeriesDlg( vcl::Window* pParent, ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index 31dff0c2f333..47de6c1b1fe9 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -22,7 +22,7 @@ #include "groupdlg.hxx" #include "scresid.hxx" -ScGroupDlg::ScGroupDlg(Window* pParent, bool bUngroup, bool bRows) +ScGroupDlg::ScGroupDlg(vcl::Window* pParent, bool bUngroup, bool bRows) : ModalDialog(pParent, bUngroup ? OString("UngroupDialog") : diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index e44a966cddf0..c7f5a684168d 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -38,7 +38,7 @@ // class ScHighlightChgDlg -ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData) : ScAnyRefDlg(pB, pCW, pParent, "ShowChangesDialog", "modules/scalc/ui/showchangesdialog.ui") @@ -51,7 +51,7 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind get(m_pCbAccept, "showaccepted"); get(m_pCbReject, "showrejected"); get(m_pEdAssign, "range"); - m_pEdAssign->SetReferences(this, m_pFilterCtr->get<Window>("range")); + m_pEdAssign->SetReferences(this, m_pFilterCtr->get<vcl::Window>("range")); m_pEdAssign->SetSizePixel(m_pEdAssign->get_preferred_size()); get(m_pRbAssign, "rangeref"); m_pRbAssign->SetReferences(this, m_pEdAssign); diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index 3d1f338cd75c..b2f805974027 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -25,7 +25,7 @@ static sal_uInt8 nInsItemChecked=0; -ScInsertCellDlg::ScInsertCellDlg( Window* pParent,bool bDisallowCellMove) : +ScInsertCellDlg::ScInsertCellDlg( vcl::Window* pParent,bool bDisallowCellMove) : ModalDialog ( pParent, "InsertCellsDialog", "modules/scalc/ui/insertcells.ui") { get(m_pBtnCellsDown, "down"); diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 13ad6a460cbc..dcb74f2c7946 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -29,7 +29,7 @@ sal_uInt16 ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0; sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd -ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, +ScInsertContentsDlg::ScInsertContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults, const OUString* pStrTitle ) diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 8242d3b31740..eda2e79bb4dd 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -34,7 +34,7 @@ #include "globstr.hrc" #include "instbdlg.hxx" -ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile ) +ScInsertTableDlg::ScInsertTableDlg( vcl::Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile ) : ModalDialog(pParent, "InsertSheetDialog", "modules/scalc/ui/insertsheet.ui") , rViewData(rData) , rDoc(*rData.GetDocument()) @@ -120,7 +120,7 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile ) short ScInsertTableDlg::Execute() { // set Parent of DocumentInserter and Doc-Manager - Window* pOldDefParent = Application::GetDefDialogParent(); + vcl::Window* pOldDefParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); if ( m_pBtnFromFile->IsChecked() ) diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 69ef6f032c1e..9fd2f570c257 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -25,7 +25,7 @@ #include "scresid.hxx" #include "miscdlgs.hrc" -ScSelEntryDlg::ScSelEntryDlg(Window* pParent, const std::vector<OUString> &rEntryList) +ScSelEntryDlg::ScSelEntryDlg(vcl::Window* pParent, const std::vector<OUString> &rEntryList) : ModalDialog(pParent, "SelectRangeDialog", "modules/scalc/ui/selectrange.ui") { get(m_pLb, "treeview"); diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 4b9d90ca84b2..b85753ee1f1b 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -37,7 +37,7 @@ #include "docsh.hxx" #include "tablink.hxx" -ScLinkedAreaDlg::ScLinkedAreaDlg(Window* pParent) +ScLinkedAreaDlg::ScLinkedAreaDlg(vcl::Window* pParent) : ModalDialog(pParent, "ExternalDataDialog", "modules/scalc/ui/externaldata.ui") , pSourceShell(NULL) , pDocInserter(NULL) @@ -69,7 +69,7 @@ short ScLinkedAreaDlg::Execute() { // set parent for file dialog or filter options - Window* pOldDefParent = Application::GetDefDialogParent(); + vcl::Window* pOldDefParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); short nRet = ModalDialog::Execute(); diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 107f0b5fe6bf..c6782d1a25a2 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -23,7 +23,7 @@ #include "scresid.hxx" #include "miscdlgs.hrc" -ScMetricInputDlg::ScMetricInputDlg( Window* pParent, +ScMetricInputDlg::ScMetricInputDlg( vcl::Window* pParent, const OString& sDialogName, long nCurrent, long nDefault, diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 65dc45acd880..32d997b971b2 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -29,7 +29,7 @@ #include "scresid.hxx" #include "globstr.hrc" -ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const OUString& rDefault) +ScMoveTableDlg::ScMoveTableDlg(vcl::Window* pParent, const OUString& rDefault) : ModalDialog ( pParent, "MoveCopySheetDialog", "modules/scalc/ui/movecopysheet.ui" ), maDefaultName( rDefault ), diff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxx index 72308b838371..fa876ba2bccc 100644 --- a/sc/source/ui/miscdlgs/namecrea.cxx +++ b/sc/source/ui/miscdlgs/namecrea.cxx @@ -22,7 +22,7 @@ #include "namecrea.hxx" #include "scresid.hxx" -ScNameCreateDlg::ScNameCreateDlg( Window * pParent, sal_uInt16 nFlags ) +ScNameCreateDlg::ScNameCreateDlg( vcl::Window * pParent, sal_uInt16 nFlags ) : ModalDialog(pParent, "CreateNamesDialog", "modules/scalc/ui/createnamesdialog.ui") { get(m_pTopBox, "top"); diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 36050651c662..e65e0cbae03b 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -46,7 +46,7 @@ using namespace com::sun::star; -ScSolverProgressDialog::ScSolverProgressDialog(Window* pParent) +ScSolverProgressDialog::ScSolverProgressDialog(vcl::Window* pParent) : ModelessDialog(pParent, "SolverProgressDialog", "modules/scalc/ui/solverprogressdialog.ui") { @@ -65,14 +65,14 @@ void ScSolverProgressDialog::SetTimeLimit( sal_Int32 nSeconds ) m_pFtTime->SetText( aNew ); } -ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( Window* pParent, const OUString& rErrorText ) +ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( vcl::Window* pParent, const OUString& rErrorText ) : ModalDialog(pParent, "NoSolutionDialog", "modules/scalc/ui/nosolutiondialog.ui") { get(m_pFtErrorText, "error"); m_pFtErrorText->SetText(rErrorText); } -ScSolverSuccessDialog::ScSolverSuccessDialog( Window* pParent, const OUString& rSolution ) +ScSolverSuccessDialog::ScSolverSuccessDialog( vcl::Window* pParent, const OUString& rSolution ) : ModalDialog(pParent, "SolverSuccessDialog", "modules/scalc/ui/solversuccessdialog.ui") { get(m_pFtResult, "result"); @@ -93,12 +93,12 @@ IMPL_LINK( ScSolverSuccessDialog, ClickHdl, PushButton*, pBtn ) return 0; } -ScCursorRefEdit::ScCursorRefEdit( Window* pParent, Window *pLabel ) +ScCursorRefEdit::ScCursorRefEdit( vcl::Window* pParent, vcl::Window *pLabel ) : formula::RefEdit( pParent, pLabel ) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScCursorRefEdit(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScCursorRefEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new ScCursorRefEdit(pParent, NULL); @@ -145,7 +145,7 @@ ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bM // class ScOptSolverDlg -ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocShell* pDocSh, ScAddress aCursorPos ) : ScAnyRefDlg(pB, pCW, pParent, "SolverDialog", "modules/scalc/ui/solverdlg.ui") diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index f82217514d79..5c2e89582887 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -31,7 +31,7 @@ static const ScTableProtection::Option aOptions[] = { }; static const sal_uInt16 nOptionCount = sizeof(aOptions) / sizeof (aOptions[0]); -ScTableProtectionDlg::ScTableProtectionDlg(Window* pParent) +ScTableProtectionDlg::ScTableProtectionDlg(vcl::Window* pParent) : ModalDialog( pParent, "ProtectSheetDialog", "modules/scalc/ui/protectsheetdlg.ui" ) { get(m_pPasswords, "passwords"); diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index 158376a8be8b..f9af84eab2b2 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -26,7 +26,7 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> -ScRedComDialog::ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet, +ScRedComDialog::ScRedComDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet, ScDocShell *pShell, ScChangeAction *pAction, bool bPrevNext) : pChangeAction(NULL) , pDocShell(NULL) diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index a029bae05be6..d804ea16a353 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -27,7 +27,7 @@ #include <vcl/msgbox.hxx> -ScRetypePassDlg::ScRetypePassDlg(Window* pParent) : +ScRetypePassDlg::ScRetypePassDlg(vcl::Window* pParent) : ModalDialog(pParent, "RetypePass", "modules/scalc/ui/retypepassdialog.ui"), maTextNotProtected(ScResId(STR_NOT_PROTECTED)), @@ -43,7 +43,7 @@ ScRetypePassDlg::ScRetypePassDlg(Window* pParent) : get(mpBtnOk ,"ok"); get(mpTextDocStatus, "docStatusLabel"); get(mpBtnRetypeDoc, "retypeDocButton"); - Window *pScrolledWindow = get<Window>("scrolledwindow"); + vcl::Window *pScrolledWindow = get<vcl::Window>("scrolledwindow"); Size aSize(LogicToPixel(Size(190, 90), MAP_APPFONT)); pScrolledWindow->set_width_request(aSize.Width()); pScrolledWindow->set_height_request(aSize.Height()); @@ -61,11 +61,11 @@ void ScRetypePassDlg::DeleteSheets() { for(std::vector<VclHBox*>::iterator it = maSheets.begin(); it != maSheets.end(); ++it) { - Window *pWindow = (*it); - Window *pChild = pWindow->GetWindow(WINDOW_FIRSTCHILD); + vcl::Window *pWindow = (*it); + vcl::Window *pChild = pWindow->GetWindow(WINDOW_FIRSTCHILD); while (pChild) { - Window *pOldChild = pChild; + vcl::Window *pOldChild = pChild; pChild = pChild->GetWindow(WINDOW_NEXT); delete pOldChild; } @@ -305,7 +305,7 @@ IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, PushButton*, pBtn ) return 0; } -ScRetypePassInputDlg::ScRetypePassInputDlg(Window* pParent, ScPassHashProtectable* pProtected) +ScRetypePassInputDlg::ScRetypePassInputDlg(vcl::Window* pParent, ScPassHashProtectable* pProtected) : ModalDialog(pParent, "RetypePasswordDialog", "modules/scalc/ui/retypepassworddialog.ui") , mpProtected(pProtected) diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index c36b40d5e3ce..f622954d24ca 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -51,7 +51,7 @@ // AutoFormat-Dialog: -ScAutoFormatDlg::ScAutoFormatDlg(Window* pParent, +ScAutoFormatDlg::ScAutoFormatDlg(vcl::Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScViewData *pViewData) diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index ef79599353a4..562342bf20e8 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -69,7 +69,7 @@ public: // class ScShareDocumentDlg -ScShareDocumentDlg::ScShareDocumentDlg( Window* pParent, ScViewData* pViewData ) +ScShareDocumentDlg::ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewData ) : ModalDialog(pParent, "ShareDocumentDialog", "modules/scalc/ui/sharedocumentdlg.ui") , mpViewData(pViewData) , mpDocShell(NULL) diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 72db862fd30c..48ed2c95b5ce 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -25,7 +25,7 @@ #include "scresid.hxx" #include "miscdlgs.hrc" -ScShowTabDlg::ScShowTabDlg(Window* pParent) +ScShowTabDlg::ScShowTabDlg(vcl::Window* pParent) : ModalDialog(pParent, "ShowSheetDialog", "modules/scalc/ui/showsheetdialog.ui") { get(m_pFrame, "frame"); diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 484bb80cc0f7..6736f55a31c8 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -34,7 +34,7 @@ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE #define ABS_DREF3D ABS_DREF | SCA_TAB_3D -ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData) : ScAnyRefDlg(pB, pCW, pParent, "SimpleRefDialog", "modules/scalc/ui/simplerefdialog.ui") , diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 177bc5fd5f0c..25f0330b07e7 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -101,7 +101,7 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const rDev.SetFont( aOldFont ); } -ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, +ScSolverOptionsDialog::ScSolverOptionsDialog( vcl::Window* pParent, const uno::Sequence<OUString>& rImplNames, const uno::Sequence<OUString>& rDescriptions, const OUString& rEngine, @@ -380,7 +380,7 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl) return 0; } -ScSolverIntegerDialog::ScSolverIntegerDialog(Window * pParent) +ScSolverIntegerDialog::ScSolverIntegerDialog(vcl::Window * pParent) : ModalDialog( pParent, "IntegerDialog", "modules/scalc/ui/integerdialog.ui" ) { @@ -408,7 +408,7 @@ sal_Int32 ScSolverIntegerDialog::GetValue() const return (sal_Int32) nValue; } -ScSolverValueDialog::ScSolverValueDialog( Window * pParent ) +ScSolverValueDialog::ScSolverValueDialog( vcl::Window * pParent ) : ModalDialog( pParent, "DoubleDialog", "modules/scalc/ui/doubledialog.ui" ) { diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 0cd255297ae0..f4bdae6b51bd 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -33,13 +33,13 @@ namespace { - void lclErrorDialog( Window* pParent, const OUString& aString ) + void lclErrorDialog( vcl::Window* pParent, const OUString& aString ) { MessageDialog(pParent, aString).Execute(); } } -ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocument* pDocument, ScAddress aCursorPos ) diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index ae04d4b6f6c1..c053016f33fe 100644 --- a/sc/source/ui/miscdlgs/strindlg.cxx +++ b/sc/source/ui/miscdlgs/strindlg.cxx @@ -22,7 +22,7 @@ #include "strindlg.hxx" #include "scresid.hxx" -ScStringInputDlg::ScStringInputDlg( Window* pParent, +ScStringInputDlg::ScStringInputDlg( vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 1953b79225e9..aaf122f6ebbb 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -37,7 +37,7 @@ #define HDL(hdl) LINK(this,ScTabBgColorDlg,hdl) -ScTabBgColorDlg::ScTabBgColorDlg(Window* pParent, const OUString& rTitle, +ScTabBgColorDlg::ScTabBgColorDlg(vcl::Window* pParent, const OUString& rTitle, const OUString& rTabBgColorNoColorText, const Color& rDefaultColor, const OString& sHelpId) : ModalDialog(pParent, "TabColorDialog", "modules/scalc/ui/tabcolordialog.ui") @@ -130,13 +130,13 @@ IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorOKHdl_Impl) return 0; } -ScTabBgColorDlg::ScTabBgColorValueSet::ScTabBgColorValueSet(Window* pParent, WinBits nStyle) +ScTabBgColorDlg::ScTabBgColorValueSet::ScTabBgColorValueSet(vcl::Window* pParent, WinBits nStyle) : SvxColorValueSet(pParent, nStyle) , m_pTabBgColorDlg(NULL) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScTabBgColorValueSet(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScTabBgColorValueSet(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index e81850f6d64a..44d545510111 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -32,7 +32,7 @@ // class ScTabOpDlg -ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocument* pDocument, const ScRefAddress& rCursorPos ) diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 1cfb3cfbb7e7..4051d3ff3761 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -31,7 +31,7 @@ #include <svl/intitem.hxx> #include <svx/flagsdef.hxx> -ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, +ScCharDlg::ScCharDlg( vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ) : SfxTabDialog(pParent, "CharDialog", "modules/scalc/ui/chardialog.ui", pAttr) @@ -62,7 +62,7 @@ void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } } -ScParagraphDlg::ScParagraphDlg(Window* pParent, const SfxItemSet* pAttr) +ScParagraphDlg::ScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr) : SfxTabDialog(pParent, "ParagraphDialog", "modules/scalc/ui/paradialog.ui", pAttr) , m_nTabPageId(0) diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index 6a5863182d37..de69700e75f5 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -24,7 +24,7 @@ #include "scresid.hxx" #include "sc.hrc" -ScCbWarningBox::ScCbWarningBox( Window* pParent, const OUString& rMsgStr, bool bDefYes ) : +ScCbWarningBox::ScCbWarningBox( vcl::Window* pParent, const OUString& rMsgStr, bool bDefYes ) : WarningBox( pParent, WB_YES_NO | (bDefYes ? WB_DEF_YES : WB_DEF_NO), rMsgStr ) { // By default, the check box is ON, and the user needs to un-check it to @@ -54,7 +54,7 @@ void ScCbWarningBox::DisableDialog() { } -ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) : +ScReplaceWarnBox::ScReplaceWarnBox( vcl::Window* pParent ) : ScCbWarningBox( pParent, OUString( ScResId( STR_REPLCELLSWARN ) ), true ) { SetHelpId( HID_SC_REPLCELLSWARN ); |