diff options
Diffstat (limited to 'sc/source/ui')
375 files changed, 988 insertions, 988 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 9fd32a04e7ca..2989da515245 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -154,7 +154,7 @@ Rectangle ScAccessibleCell::GetBoundingBoxOnScreen(void) const Rectangle aCellRect(GetBoundingBox()); if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) { Rectangle aRect = pWindow->GetWindowExtentsRelative(NULL); @@ -177,7 +177,7 @@ Rectangle ScAccessibleCell::GetBoundingBox() const aCellRect.SetSize(Size(nSizeX, nSizeY)); aCellRect.SetPos(mpViewShell->GetViewData().GetScrPos(maCellAddress.Col(), maCellAddress.Row(), meSplitPos, true)); - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) { Rectangle aRect(pWindow->GetWindowExtentsRelative(pWindow->GetAccessibleParentWindow())); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 4c66e032611b..975dfc7ab344 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1414,14 +1414,14 @@ ScAccessibleDocument::ScAccessibleDocument( if (pViewShell) { pViewShell->AddAccessibilityObject(*this); - Window *pWin = pViewShell->GetWindowByPos(eSplitPos); + vcl::Window *pWin = pViewShell->GetWindowByPos(eSplitPos); if( pWin ) { pWin->AddChildEventListener( LINK( this, ScAccessibleDocument, WindowChildEventListener )); sal_uInt16 nCount = pWin->GetChildCount(); for( sal_uInt16 i=0; i < nCount; ++i ) { - Window *pChildWin = pWin->GetChild( i ); + vcl::Window *pChildWin = pWin->GetChild( i ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) AddChild( pChildWin->GetAccessible(), false ); @@ -1461,7 +1461,7 @@ void SAL_CALL ScAccessibleDocument::disposing() FreeAccessibleSpreadsheet(); if (mpViewShell) { - Window *pWin = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window *pWin = mpViewShell->GetWindowByPos(meSplitPos); if( pWin ) pWin->RemoveChildEventListener( LINK( this, ScAccessibleDocument, WindowChildEventListener )); @@ -1493,7 +1493,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEve { case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children { - Window* pChildWin = static_cast < Window * >( pVclEvent->GetData() ); + vcl::Window* pChildWin = static_cast < vcl::Window * >( pVclEvent->GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) { AddChild( pChildWin->GetAccessible(), true ); @@ -1502,7 +1502,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclSimpleEvent*, pEve break; case VCLEVENT_WINDOW_HIDE: // send destroy on hide for direct accessible children { - Window* pChildWin = static_cast < Window * >( pVclEvent->GetData() ); + vcl::Window* pChildWin = static_cast < vcl::Window * >( pVclEvent->GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) { RemoveChild( pChildWin->GetAccessible(), true ); @@ -2228,7 +2228,7 @@ Rectangle ScAccessibleDocument::GetBoundingBoxOnScreen() const Rectangle aRect; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) aRect = pWindow->GetWindowExtentsRelative(NULL); } @@ -2241,7 +2241,7 @@ Rectangle ScAccessibleDocument::GetBoundingBox() const Rectangle aRect; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) aRect = pWindow->GetWindowExtentsRelative(pWindow->GetAccessibleParentWindow()); } diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index bd2c99cda1ff..aaae4ef6649a 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -542,7 +542,7 @@ Rectangle ScIAccessibleViewForwarder::GetVisibleArea() const { SolarMutexGuard aGuard; Rectangle aVisRect; - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin) { aVisRect.SetSize(pWin->GetOutputSizePixel()); @@ -558,7 +558,7 @@ Point ScIAccessibleViewForwarder::LogicToPixel (const Point& rPoint) const { SolarMutexGuard aGuard; Point aPoint; - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin && mpAccDoc) { Rectangle aRect(mpAccDoc->GetBoundingBoxOnScreen()); @@ -572,7 +572,7 @@ Size ScIAccessibleViewForwarder::LogicToPixel (const Size& rSize) const { SolarMutexGuard aGuard; Size aSize; - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin) aSize = pWin->LogicToPixel(rSize, maMapMode); return aSize; @@ -582,7 +582,7 @@ Point ScIAccessibleViewForwarder::PixelToLogic (const Point& rPoint) const { SolarMutexGuard aGuard; Point aPoint; - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin && mpAccDoc) { Rectangle aRect(mpAccDoc->GetBoundingBoxOnScreen()); @@ -595,7 +595,7 @@ Size ScIAccessibleViewForwarder::PixelToLogic (const Size& rSize) const { SolarMutexGuard aGuard; Size aSize; - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin) aSize = pWin->PixelToLogic(rSize, maMapMode); return aSize; @@ -1085,7 +1085,7 @@ void ScShapeChildren::FillShapes(const Rectangle& aPixelPaintRect, const MapMode { OSL_ENSURE(nRangeId < maShapeRanges.size(), "this is not a valid range for draw objects"); SdrPage* pPage = GetDrawPage(); - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pPage && pWin) { bool bForeAdded(false); @@ -1183,7 +1183,7 @@ struct ScPagePreviewCountData long nForeShapes; long nControls; - ScPagePreviewCountData( const ScPreviewLocationData& rData, Window* pSizeWindow, + ScPagePreviewCountData( const ScPreviewLocationData& rData, vcl::Window* pSizeWindow, ScNotesChildren* pNotesChildren, ScShapeChildren* pShapeChildren ); long GetTotal() const @@ -1193,7 +1193,7 @@ struct ScPagePreviewCountData }; ScPagePreviewCountData::ScPagePreviewCountData( const ScPreviewLocationData& rData, - Window* pSizeWindow, ScNotesChildren* pNotesChildren, + vcl::Window* pSizeWindow, ScNotesChildren* pNotesChildren, ScShapeChildren* pShapeChildren) : nBackShapes( 0 ), nHeaders( 0 ), @@ -1321,7 +1321,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint } Size aOutputSize; - Window* pSizeWindow = mpViewShell->GetWindow(); + vcl::Window* pSizeWindow = mpViewShell->GetWindow(); if ( pSizeWindow ) aOutputSize = pSizeWindow->GetOutputSizePixel(); Point aPoint; @@ -1359,7 +1359,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint else if (pSimpleHint->GetId() == SC_HINT_ACC_VISAREACHANGED) { Size aOutputSize; - Window* pSizeWindow = mpViewShell->GetWindow(); + vcl::Window* pSizeWindow = mpViewShell->GetWindow(); if ( pSizeWindow ) aOutputSize = pSizeWindow->GetOutputSizePixel(); Point aPoint; @@ -1627,7 +1627,7 @@ Rectangle ScAccessibleDocumentPagePreview::GetBoundingBoxOnScreen() const throw Rectangle aRect; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) aRect = pWindow->GetWindowExtentsRelative(NULL); } @@ -1639,7 +1639,7 @@ Rectangle ScAccessibleDocumentPagePreview::GetBoundingBox() const throw (uno::Ru Rectangle aRect; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) aRect = pWindow->GetWindowExtentsRelative(pWindow->GetAccessibleParentWindow()); } diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index fe59b03703d7..6981ece98856 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::accessibility; ScAccessibleEditObject::ScAccessibleEditObject( const uno::Reference<XAccessible>& rxParent, - EditView* pEditView, Window* pWin, const OUString& rName, + EditView* pEditView, vcl::Window* pWin, const OUString& rName, const OUString& rDescription, EditObjectType eObjectType) : ScAccessibleContextBase(rxParent, AccessibleRole::TEXT_FRAME), @@ -513,19 +513,19 @@ uno::Reference< XAccessibleRelationSet > ScAccessibleEditObject::getAccessibleRe throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - Window* pWindow = mpWindow; + vcl::Window* pWindow = mpWindow; utl::AccessibleRelationSetHelper* rRelationSet = new utl::AccessibleRelationSetHelper; uno::Reference< XAccessibleRelationSet > rSet = rRelationSet; if ( pWindow ) { - Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); + vcl::Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); if ( pLabeledBy && pLabeledBy != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); aSequence[0] = pLabeledBy->GetAccessible(); rRelationSet->AddRelation( AccessibleRelation( AccessibleRelationType::LABELED_BY, aSequence ) ); } - Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf(); + vcl::Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf(); if ( pMemberOf && pMemberOf != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 4eafb7a46005..5749093d83e3 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -350,7 +350,7 @@ Rectangle ScAccessiblePageHeader::GetBoundingBoxOnScreen() const throw (uno::Run Rectangle aCellRect(GetBoundingBox()); if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) { Rectangle aRect = pWindow->GetWindowExtentsRelative(NULL); @@ -374,7 +374,7 @@ Rectangle ScAccessiblePageHeader::GetBoundingBox() const throw (uno::RuntimeExce // the Rectangle could contain negative coordinates so it should be cliped Rectangle aClipRect(Point(0, 0), aRect.GetSize()); - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) aClipRect = pWindow->GetWindowExtentsRelative(pWindow->GetAccessibleParentWindow()); aRect = aClipRect.GetIntersection(aRect); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 3f6b018126b1..68e8cd664340 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -211,7 +211,7 @@ Rectangle ScAccessiblePreviewCell::GetBoundingBoxOnScreen() const throw (uno::Ru if (mpViewShell) { mpViewShell->GetLocationData().GetCellPosition( maCellAddress, aCellRect ); - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) { Rectangle aRect = pWindow->GetWindowExtentsRelative(NULL); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 12221e5d0117..4b50e6383f4a 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -341,7 +341,7 @@ Rectangle ScAccessiblePreviewHeaderCell::GetBoundingBoxOnScreen() const throw (u if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) { Rectangle aRect = pWindow->GetWindowExtentsRelative(NULL); @@ -438,7 +438,7 @@ void ScAccessiblePreviewHeaderCell::FillTableInfo() const if ( mpViewShell && !mpTableInfo ) { Size aOutputSize; - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if ( pWindow ) aOutputSize = pWindow->GetOutputSizePixel(); Point aPoint; diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index 79a67150840b..f8cda3b2e754 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -633,7 +633,7 @@ Rectangle ScAccessiblePreviewTable::GetBoundingBoxOnScreen() const throw (uno::R Rectangle aCellRect(GetBoundingBox()); if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) { Rectangle aRect = pWindow->GetWindowExtentsRelative(NULL); @@ -679,7 +679,7 @@ void ScAccessiblePreviewTable::FillTableInfo() const if ( mpViewShell && !mpTableInfo ) { Size aOutputSize; - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if ( pWindow ) aOutputSize = pWindow->GetOutputSizePixel(); Point aPoint; diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index a1e9b8b49229..f1c5b4402317 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1355,7 +1355,7 @@ Rectangle ScAccessibleSpreadsheet::GetBoundingBoxOnScreen() const Rectangle aRect; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) aRect = pWindow->GetWindowExtentsRelative(NULL); } @@ -1368,7 +1368,7 @@ Rectangle ScAccessibleSpreadsheet::GetBoundingBox() const Rectangle aRect; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) //#101986#; extends to the same window, because the parent is the document and it has the same window aRect = pWindow->GetWindowExtentsRelative(pWindow); @@ -1439,7 +1439,7 @@ Rectangle ScAccessibleSpreadsheet::GetVisArea(ScTabViewShell* pViewShell, ScSpli Rectangle aVisArea; if (pViewShell) { - Window* pWindow = pViewShell->GetWindowByPos(eSplitPos); + vcl::Window* pWindow = pViewShell->GetWindowByPos(eSplitPos); if (pWindow) { aVisArea.SetPos(pViewShell->GetViewData().GetPixPos(eSplitPos)); diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 3dc8ba52fdd7..9e1e37bb4728 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -82,7 +82,7 @@ Rectangle ScViewForwarder::GetVisArea() const Rectangle aVisArea; if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) { aVisArea.SetSize(pWindow->GetSizePixel()); @@ -109,7 +109,7 @@ Point ScViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& rMapMod { if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) return pWindow->LogicToPixel( rPoint, rMapMode ); } @@ -124,7 +124,7 @@ Point ScViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMapMod { if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); + vcl::Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) return pWindow->PixelToLogic( rPoint, rMapMode ); } @@ -142,11 +142,11 @@ void ScViewForwarder::SetInvalid() class ScEditObjectViewForwarder : public SvxViewForwarder { - Window* mpWindow; + vcl::Window* mpWindow; // #i49561# EditView needed for access to its visible area. const EditView* mpEditView; public: - ScEditObjectViewForwarder( Window* pWindow, + ScEditObjectViewForwarder( vcl::Window* pWindow, const EditView* _pEditView); virtual ~ScEditObjectViewForwarder(); @@ -158,7 +158,7 @@ public: void SetInvalid(); }; -ScEditObjectViewForwarder::ScEditObjectViewForwarder( Window* pWindow, +ScEditObjectViewForwarder::ScEditObjectViewForwarder( vcl::Window* pWindow, const EditView* _pEditView ) : mpWindow(pWindow), @@ -290,7 +290,7 @@ Point ScPreviewViewForwarder::LogicToPixel( const Point& rPoint, const MapMode& { if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) { MapMode aMapMode(pWindow->GetMapMode().GetMapUnit()); @@ -309,7 +309,7 @@ Point ScPreviewViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& { if (mpViewShell) { - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if (pWindow) { MapMode aMapMode(pWindow->GetMapMode()); @@ -338,7 +338,7 @@ Rectangle ScPreviewViewForwarder::GetVisRect() const if ( mpViewShell ) { Size aOutputSize; - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if ( pWindow ) aOutputSize = pWindow->GetOutputSizePixel(); Point aPoint; @@ -353,7 +353,7 @@ Rectangle ScPreviewViewForwarder::CorrectVisArea(const Rectangle& rVisArea) cons Rectangle aVisArea(rVisArea); Point aPos = aVisArea.TopLeft(); // get first the position to remember negative positions after clipping - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin) aVisArea = pWin->GetWindowExtentsRelative(pWin).GetIntersection(aVisArea); @@ -545,9 +545,9 @@ Rectangle ScPreviewNoteViewForwarder::GetVisArea() const class ScEditViewForwarder : public SvxEditViewForwarder { EditView* mpEditView; - Window* mpWindow; + vcl::Window* mpWindow; public: - ScEditViewForwarder(EditView* pEditView, Window* pWin); + ScEditViewForwarder(EditView* pEditView, vcl::Window* pWin); virtual ~ScEditViewForwarder(); virtual bool IsValid() const SAL_OVERRIDE; @@ -565,7 +565,7 @@ public: void SetInvalid(); }; -ScEditViewForwarder::ScEditViewForwarder(EditView* pEditView, Window* pWin) +ScEditViewForwarder::ScEditViewForwarder(EditView* pEditView, vcl::Window* pWin) : mpEditView(pEditView), mpWindow(pWin) { @@ -815,7 +815,7 @@ SvxTextForwarder* ScAccessibleCellTextData::GetTextForwarder() aSize.setWidth( nWidth ); aSize.setHeight( aSize.getHeight() - nTopM - nBottomM ); - Window* pWin = mpViewShell->GetWindowByPos( meSplitPos ); + vcl::Window* pWin = mpViewShell->GetWindowByPos( meSplitPos ); if ( pWin ) { aSize = pWin->PixelToLogic( aSize, pEditEngine->GetRefMapMode() ); @@ -962,7 +962,7 @@ ScDocShell* ScAccessibleCellTextData::GetDocShell(ScTabViewShell* pViewShell) return pDocSh; } -ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, bool isClone) +ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, vcl::Window* pWin, bool isClone) : mpViewForwarder(NULL), mpEditViewForwarder(NULL), @@ -1073,7 +1073,7 @@ IMPL_LINK(ScAccessibleEditObjectTextData, NotifyHdl, EENotify*, aNotify) return 0; } -ScAccessibleEditLineTextData::ScAccessibleEditLineTextData(EditView* pEditView, Window* pWin) +ScAccessibleEditLineTextData::ScAccessibleEditLineTextData(EditView* pEditView, vcl::Window* pWin) : ScAccessibleEditObjectTextData(pEditView, pWin), mbEditEngineCreated(false) @@ -1284,7 +1284,7 @@ SvxTextForwarder* ScAccessiblePreviewCellTextData::GetTextForwarder() if (!bEditEngineBefore && pEditEngine) { Size aSize(mpViewShell->GetLocationData().GetCellOutputRect(aCellPos).GetSize()); - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin) aSize = pWin->PixelToLogic(aSize, pEditEngine->GetRefMapMode()); pEditEngine->SetPaperSize(aSize); @@ -1384,7 +1384,7 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder() if ( mpViewShell ) { Size aOutputSize; - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if ( pWindow ) aOutputSize = pWindow->GetOutputSizePixel(); Point aPoint; @@ -1515,7 +1515,7 @@ SvxTextForwarder* ScAccessibleHeaderTextData::GetTextForwarder() Rectangle aVisRect; mpViewShell->GetLocationData().GetHeaderPosition(aVisRect); Size aSize(aVisRect.GetSize()); - Window* pWin = mpViewShell->GetWindow(); + vcl::Window* pWin = mpViewShell->GetWindow(); if (pWin) aSize = pWin->PixelToLogic(aSize, mpEditEngine->GetRefMapMode()); mpEditEngine->SetPaperSize(aSize); @@ -1618,7 +1618,7 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder() if ( mpViewShell ) { Size aOutputSize; - Window* pWindow = mpViewShell->GetWindow(); + vcl::Window* pWindow = mpViewShell->GetWindow(); if ( pWindow ) aOutputSize = pWindow->GetOutputSizePixel(); Point aPoint; @@ -1650,10 +1650,10 @@ SvxViewForwarder* ScAccessibleNoteTextData::GetViewForwarder() class ScCsvViewForwarder : public SvxViewForwarder { Rectangle maBoundBox; - Window* mpWindow; + vcl::Window* mpWindow; public: - explicit ScCsvViewForwarder( Window* pWindow, const Rectangle& rBoundBox ); + explicit ScCsvViewForwarder( vcl::Window* pWindow, const Rectangle& rBoundBox ); virtual bool IsValid() const SAL_OVERRIDE; virtual Rectangle GetVisArea() const SAL_OVERRIDE; @@ -1663,7 +1663,7 @@ public: void SetInvalid(); }; -ScCsvViewForwarder::ScCsvViewForwarder( Window* pWindow, const Rectangle& rBoundBox ) : +ScCsvViewForwarder::ScCsvViewForwarder( vcl::Window* pWindow, const Rectangle& rBoundBox ) : maBoundBox( rBoundBox ), mpWindow( pWindow ) { @@ -1697,7 +1697,7 @@ void ScCsvViewForwarder::SetInvalid() } ScAccessibleCsvTextData::ScAccessibleCsvTextData( - Window* pWindow, EditEngine* pEditEngine, + vcl::Window* pWindow, EditEngine* pEditEngine, const OUString& rCellText, const Rectangle& rBoundBox, const Size& rCellSize ) : mpWindow( pWindow ), mpEditEngine( pEditEngine ), diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx index a764c1397321..efb130e1a97b 100644 --- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx @@ -96,7 +96,7 @@ void lclMakeSubRangesList(ScRangeList& rRangeList, ScRange& rInputRange, ScStati ScAnalysisOfVarianceDialog::ScAnalysisOfVarianceDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsInputOutputDialog( pSfxBindings, pChildWindow, pParent, pViewData, "AnalysisOfVarianceDialog", "modules/scalc/ui/analysisofvariancedialog.ui" ), diff --git a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx index 2591b9f47322..3184b2281e0c 100644 --- a/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx @@ -22,7 +22,7 @@ namespace ScCorrelationDialog::ScCorrelationDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScMatrixComparisonGenerator( pSfxBindings, pChildWindow, pParent, pViewData, "CorrelationDialog", "modules/scalc/ui/correlationdialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx index b4ed14e74564..e26c650f5566 100644 --- a/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx @@ -22,7 +22,7 @@ namespace ScCovarianceDialog::ScCovarianceDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScMatrixComparisonGenerator( pSfxBindings, pChildWindow, pParent, pViewData, "CovarianceDialog", "modules/scalc/ui/covariancedialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx index 0d98e79d9a1e..157e974fadae 100644 --- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx @@ -61,7 +61,7 @@ static const OUString strWildcardNumber("%NUMBER%"); ScDescriptiveStatisticsDialog::ScDescriptiveStatisticsDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsInputOutputDialog( pSfxBindings, pChildWindow, pParent, pViewData, "DescriptiveStatisticsDialog", "modules/scalc/ui/descriptivestatisticsdialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx index 091f1a05833b..8063b4ab82d9 100644 --- a/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/ExponentialSmoothingDialog.cxx @@ -28,7 +28,7 @@ ScExponentialSmoothingDialog::ScExponentialSmoothingDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsInputOutputDialog( pSfxBindings, pChildWindow, pParent, pViewData, "ExponentialSmoothingDialog", "modules/scalc/ui/exponentialsmoothingdialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx index 785d47550214..2b3eb52944be 100644 --- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx @@ -38,7 +38,7 @@ static const OUString strWildcardVariable2Range("%VAR2_RANGE%"); ScFTestDialog::ScFTestDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsTwoVariableDialog( pSfxBindings, pChildWindow, pParent, pViewData, "TTestDialog", "modules/scalc/ui/ttestdialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx index ac7039ae9251..4ac7c8eed48a 100644 --- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx +++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx @@ -53,7 +53,7 @@ namespace ScMatrixComparisonGenerator::ScMatrixComparisonGenerator( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData, const OString& rID, + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUiXmlDescription) : ScStatisticsInputOutputDialog(pSfxBindings, pChildWindow, pParent, pViewData, rID, rUiXmlDescription) {} diff --git a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx index 2786e53b6626..7a76c2fc9095 100644 --- a/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/MovingAverageDialog.cxx @@ -28,7 +28,7 @@ ScMovingAverageDialog::ScMovingAverageDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsInputOutputDialog( pSfxBindings, pChildWindow, pParent, pViewData, "MovingAverageDialog", "modules/scalc/ui/movingaveragedialog.ui" ) diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index f3e14e7ebb34..905f409b5d7b 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -56,7 +56,7 @@ const sal_Int64 DIGITS = 4; ScRandomNumberGeneratorDialog::ScRandomNumberGeneratorDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, "RandomNumberGeneratorDialog", "modules/scalc/ui/randomnumbergenerator.ui" ), mpViewData ( pViewData ), diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index afe5d64a8081..49b2d4315577 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -28,7 +28,7 @@ ScSamplingDialog::ScSamplingDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, "SamplingDialog", "modules/scalc/ui/samplingdialog.ui" ), mpActiveEdit ( NULL ), diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx index d8e835a538cd..1c104a6506f8 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx @@ -55,7 +55,7 @@ ScRangeList ScStatisticsInputOutputDialog::MakeRowRangeList(SCTAB aTab, ScAddres ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) : + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) : ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, rID, rUIXMLDescription ), mViewData ( pViewData ), mDocument ( pViewData->GetDocument() ), diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx index a55da6df51ad..190704beabe8 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx @@ -27,7 +27,7 @@ ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) : + vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) : ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, rID, rUIXMLDescription ), mViewData ( pViewData ), mDocument ( pViewData->GetDocument() ), diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx index 07a61c8c0fa6..684b40f9a2b1 100644 --- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx @@ -38,7 +38,7 @@ static const OUString strWildcardVariable2Range("%VAR2_RANGE%"); ScTTestDialog::ScTTestDialog( SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, - Window* pParent, ScViewData* pViewData ) : + vcl::Window* pParent, ScViewData* pViewData ) : ScStatisticsTwoVariableDialog( pSfxBindings, pChildWindow, pParent, pViewData, "TTestDialog", "modules/scalc/ui/ttestdialog.ui" ) diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx index 0982b2ed42e7..7472b7435d5f 100644 --- a/sc/source/ui/app/client.cxx +++ b/sc/source/ui/app/client.cxx @@ -39,7 +39,7 @@ using namespace com::sun::star; -ScClient::ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ) : +ScClient::ScClient( ScTabViewShell* pViewShell, vcl::Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ) : SfxInPlaceClient( pViewShell, pDraw, pObj->GetAspect() ), pModel( pSdrModel ), pGrafEdit( 0 ) @@ -229,7 +229,7 @@ void ScClient::ViewChanged() ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, pSfxViewSh ); if ( pViewSh ) { - Window* pWin = pViewSh->GetActiveWin(); + vcl::Window* pWin = pViewSh->GetActiveWin(); if ( pWin->LogicToPixel( aVisSize ) != pWin->LogicToPixel( aLogicRect.GetSize() ) ) { aLogicRect.SetSize( aVisSize ); diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 83b67b22d1ba..c2f2f1ac96ad 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -248,7 +248,7 @@ ScDrawTransferObj::~ScDrawTransferObj() delete pDragSourceView; } -ScDrawTransferObj* ScDrawTransferObj::GetOwnClipboard( Window* ) +ScDrawTransferObj* ScDrawTransferObj::GetOwnClipboard( vcl::Window* ) { ScDrawTransferObj* pObj = SC_MOD()->GetClipData().pDrawClipboard; return pObj; diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 940f856f0c31..87cdfebb4d34 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1688,7 +1688,7 @@ void ScInputHandler::UpdateActiveView() // GetActiveWin (the currently active pane) fails for ref input across the // panes of a split view. - Window* pShellWin = pActiveViewSh ? + vcl::Window* pShellWin = pActiveViewSh ? pActiveViewSh->GetWindowByPos( pActiveViewSh->GetViewData().GetEditActivePart() ) : NULL; @@ -1699,7 +1699,7 @@ void ScInputHandler::UpdateActiveView() for (sal_uInt16 i=1; i<nCount; i++) { EditView* pThis = pEngine->GetView(i); - Window* pWin = pThis->GetWindow(); + vcl::Window* pWin = pThis->GetWindow(); if ( pWin==pShellWin ) pTableView = pThis; } @@ -2412,7 +2412,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) lcl_SelectionToEnd(pTableView); } - Window* pFrameWin = pActiveViewSh ? pActiveViewSh->GetFrameWin() : NULL; + vcl::Window* pFrameWin = pActiveViewSh ? pActiveViewSh->GetFrameWin() : NULL; if (pTopView) pTopView->CompleteAutoCorrect(); // CompleteAutoCorrect for both Views @@ -2439,7 +2439,7 @@ void ScInputHandler::EnterHandler( sal_uInt8 nBlockMode ) pActiveViewSh->StopMarking(); // (the InfoBox consumes the MouseButtonUp) //FIXME: We still run into problems if the input is triggered by activating another View - Window* pParent = Application::GetDefDialogParent(); + vcl::Window* pParent = Application::GetDefDialogParent(); if ( pData->DoError( pParent, aString, aCursorPos ) ) bForget = true; // Do not take over input } @@ -3163,7 +3163,7 @@ bool ScInputHandler::KeyInput( const KeyEvent& rKEvt, bool bStartEdit /* = false { if (pTableView) { - Window* pFrameWin = pActiveViewSh ? pActiveViewSh->GetFrameWin() : NULL; + vcl::Window* pFrameWin = pActiveViewSh ? pActiveViewSh->GetFrameWin() : NULL; if ( pTableView->PostKeyEvent( rKEvt, pFrameWin ) ) bUsed = true; } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 7c78b001c6d1..9b9457f33bed 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -104,7 +104,7 @@ enum ScNameInputType SC_MANAGE_NAMES }; -ScTextWndBase::ScTextWndBase( Window* pParent, WinBits nStyle ) +ScTextWndBase::ScTextWndBase( vcl::Window* pParent, WinBits nStyle ) : Window ( pParent, nStyle ) { if ( IsNativeControlSupported( CTRL_EDITBOX, PART_ENTIRE_CONTROL ) ) @@ -118,7 +118,7 @@ ScTextWndBase::ScTextWndBase( Window* pParent, WinBits nStyle ) SFX_IMPL_CHILDWINDOW_WITHID(ScInputWindowWrapper,FID_INPUTLINE_STATUS) -ScInputWindowWrapper::ScInputWindowWrapper( Window* pParentP, +ScInputWindowWrapper::ScInputWindowWrapper( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* /* pInfo */ ) @@ -154,7 +154,7 @@ static bool lcl_isExperimentalMode() // class ScInputWindow -static ScTextWndBase* lcl_chooseRuntimeImpl( Window* pParent, SfxBindings* pBind ) +static ScTextWndBase* lcl_chooseRuntimeImpl( vcl::Window* pParent, SfxBindings* pBind ) { ScTabViewShell* pViewSh = NULL; SfxDispatcher* pDisp = pBind->GetDispatcher(); @@ -170,7 +170,7 @@ static ScTextWndBase* lcl_chooseRuntimeImpl( Window* pParent, SfxBindings* pBind return new ScInputBarGroup( pParent, pViewSh ); } -ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) : +ScInputWindow::ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ) : // With WB_CLIPCHILDREN otherwise we get flickering ToolBox ( pParent, WinBits(WB_CLIPCHILDREN) ), aWndPos ( this ), @@ -895,7 +895,7 @@ void ScInputWindow::MouseButtonUp( const MouseEvent& rMEvt ) ToolBox::MouseButtonUp( rMEvt ); } -ScInputBarGroup::ScInputBarGroup(Window* pParent, ScTabViewShell* pViewSh) +ScInputBarGroup::ScInputBarGroup(vcl::Window* pParent, ScTabViewShell* pViewSh) : ScTextWndBase ( pParent, WinBits(WB_HIDE | WB_TABSTOP ) ), aMultiTextWnd ( this, pViewSh ), aButton ( this, WB_TABSTOP | WB_RECTSTYLE | WB_SMALLSTYLE ), @@ -949,7 +949,7 @@ void ScInputBarGroup::SetTextString( const OUString& rString ) void ScInputBarGroup::Resize() { - Window *w=GetParent(); + vcl::Window *w=GetParent(); ScInputWindow *pParent; pParent=dynamic_cast<ScInputWindow*>(w); @@ -1054,7 +1054,7 @@ void ScInputBarGroup::DecrementVerticalSize() IMPL_LINK_NOARG(ScInputBarGroup, ClickHdl) { - Window *w=GetParent(); + vcl::Window *w=GetParent(); ScInputWindow *pParent; pParent=dynamic_cast<ScInputWindow*>(w); @@ -1081,7 +1081,7 @@ IMPL_LINK_NOARG(ScInputBarGroup, ClickHdl) void ScInputBarGroup::TriggerToolboxLayout() { - Window *w=GetParent(); + vcl::Window *w=GetParent(); ScInputWindow &rParent = dynamic_cast<ScInputWindow&>(*w); SfxViewFrame* pViewFrm = SfxViewFrame::Current(); @@ -1436,7 +1436,7 @@ void ScMultiTextWnd::SetTextString( const OUString& rNewString ) DoScroll(); } -ScTextWnd::ScTextWnd( Window* pParent, ScTabViewShell* pViewSh ) +ScTextWnd::ScTextWnd( vcl::Window* pParent, ScTabViewShell* pViewSh ) : ScTextWndBase ( pParent, WinBits(WB_HIDE | WB_BORDER) ), DragSourceHelper( this ), pEditEngine ( NULL ), @@ -2049,7 +2049,7 @@ void ScTextWnd::TextGrabFocus() // Position window -ScPosWnd::ScPosWnd( Window* pParent ) : +ScPosWnd::ScPosWnd( vcl::Window* pParent ) : ComboBox ( pParent, WinBits(WB_HIDE | WB_DROPDOWN) ), pAccel ( NULL ), nTipVisible ( 0 ), @@ -2321,7 +2321,7 @@ void ScPosWnd::Modify() { // show the help tip at the text cursor position - Window* pWin = GetSubEdit(); + vcl::Window* pWin = GetSubEdit(); if (!pWin) pWin = this; Point aPos; @@ -2519,7 +2519,7 @@ void ScPosWnd::ReleaseFocus_Impl() // Set focus to active View if ( pCurSh ) { - Window* pShellWnd = pCurSh->GetWindow(); + vcl::Window* pShellWnd = pCurSh->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index fde742995a1e..7922e40097b8 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -260,7 +260,7 @@ void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt3 } else if ( pViewShell->ISA(ScPreviewShell) ) { - Window* pWin = pViewShell->GetWindow(); + vcl::Window* pWin = pViewShell->GetWindow(); if (pWin) pWin->Invalidate(); } @@ -2093,7 +2093,7 @@ void ScModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) } } -SfxTabPage* ScModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) { SfxTabPage* pRet = NULL; ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -2215,9 +2215,9 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo ) return 0; } -bool ScModule::RegisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ) +bool ScModule::RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ) { - std::list<Window*> & rlRefWindow = m_mapRefWindow[nSlotId]; + std::list<vcl::Window*> & rlRefWindow = m_mapRefWindow[nSlotId]; if( std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ) == rlRefWindow.end() ) { @@ -2228,16 +2228,16 @@ bool ScModule::RegisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ) return false; } -bool ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ) +bool ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd ) { - std::map<sal_uInt16, std::list<Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId ); + std::map<sal_uInt16, std::list<vcl::Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId ); if( iSlot == m_mapRefWindow.end() ) return false; - std::list<Window*> & rlRefWindow = iSlot->second; + std::list<vcl::Window*> & rlRefWindow = iSlot->second; - std::list<Window*>::iterator i = std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ); + std::list<vcl::Window*>::iterator i = std::find( rlRefWindow.begin(), rlRefWindow.end(), pWnd ); if( i == rlRefWindow.end() ) return false; @@ -2250,21 +2250,21 @@ bool ScModule::UnregisterRefWindow( sal_uInt16 nSlotId, Window *pWnd ) return true; } -Window * ScModule::Find1RefWindow( sal_uInt16 nSlotId, Window *pWndAncestor ) +vcl::Window * ScModule::Find1RefWindow( sal_uInt16 nSlotId, vcl::Window *pWndAncestor ) { if (!pWndAncestor) return NULL; - std::map<sal_uInt16, std::list<Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId ); + std::map<sal_uInt16, std::list<vcl::Window*> >::iterator iSlot = m_mapRefWindow.find( nSlotId ); if( iSlot == m_mapRefWindow.end() ) return NULL; - std::list<Window*> & rlRefWindow = iSlot->second; + std::list<vcl::Window*> & rlRefWindow = iSlot->second; - while( Window *pParent = pWndAncestor->GetParent() ) pWndAncestor = pParent; + while( vcl::Window *pParent = pWndAncestor->GetParent() ) pWndAncestor = pParent; - for( std::list<Window*>::iterator i = rlRefWindow.begin(); i!=rlRefWindow.end(); ++i ) + for( std::list<vcl::Window*>::iterator i = rlRefWindow.begin(); i!=rlRefWindow.end(); ++i ) if ( pWndAncestor->IsWindowOrChild( *i, (*i)->IsSystemWindow() ) ) return *i; diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 36759531bfbd..02733c174912 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -197,7 +197,7 @@ ScTransferObj::~ScTransferObj() } -ScTransferObj* ScTransferObj::GetOwnClipboard( Window* pUIWin ) +ScTransferObj* ScTransferObj::GetOwnClipboard( vcl::Window* pUIWin ) { ScTransferObj* pObj = SC_MOD()->GetClipData().pCellClipboard; if ( pObj && pUIWin ) diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 8c7c350e5789..de389644c4d7 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -34,7 +34,7 @@ #include <editeng/flstitem.hxx> #include <sfx2/app.hxx> -ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet* pCellAttrs) +ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, vcl::Window* pParent, const SfxItemSet* pCellAttrs) : SfxTabDialog(pFrameP, pParent, "FormatCellsDialog", "modules/scalc/ui/formatcellsdialog.ui", pCellAttrs) { SvtCJKOptions aCJKOptions; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 85667ea63435..2bb26ceb8706 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -600,20 +600,20 @@ bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const } // =========================Factories for createdialog =================== -AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( Window* pParent, const OUString& aDatName, +AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( vcl::Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall ) { ScImportAsciiDlg* pDlg = new ScImportAsciiDlg( pParent, aDatName,pInStream, eCall ); return new AbstractScImportAsciiDlg_Impl( pDlg ); } -AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg(Window* pParent) +AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg(vcl::Window* pParent) { ScTextImportOptionsDlg* pDlg = new ScTextImportOptionsDlg(pParent); return new AbstractScTextImportOptionsDlg_Impl(pDlg); } -AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg(Window* pParent, +AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg(vcl::Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScViewData *pViewData) @@ -622,7 +622,7 @@ AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg(Wi return new AbstractScAutoFormatDlg_Impl(pDlg); } -AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg(Window* pParent, +AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg(vcl::Window* pParent, bool bCol , bool bRow) { @@ -630,13 +630,13 @@ AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg return new AbstractScColRowLabelDlg_Impl( pDlg ); } -AbstractScSortWarningDlg* ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) +AbstractScSortWarningDlg* ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) { ScSortWarningDlg* pDlg = new ScSortWarningDlg(pParent, rExtendText, rCurrentText ); return new AbstractScSortWarningDlg_Impl( pDlg ); } -AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, +AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos, int nId ) { ScCondFormatManagerDlg* pDlg = NULL; @@ -654,20 +654,20 @@ AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormat return NULL; } -AbstractScDataPilotDatabaseDlg * ScAbstractDialogFactory_Impl::CreateScDataPilotDatabaseDlg(Window* pParent) +AbstractScDataPilotDatabaseDlg * ScAbstractDialogFactory_Impl::CreateScDataPilotDatabaseDlg(vcl::Window* pParent) { ScDataPilotDatabaseDlg * pDlg = new ScDataPilotDatabaseDlg( pParent ); return new AbstractScDataPilotDatabaseDlg_Impl( pDlg ); } AbstractScDataPilotSourceTypeDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSourceTypeDlg( - Window* pParent, bool bEnableExternal) + vcl::Window* pParent, bool bEnableExternal) { ScDataPilotSourceTypeDlg* pDlg = new ScDataPilotSourceTypeDlg(pParent, bEnableExternal); return new AbstractScDataPilotSourceTypeDlg_Impl(pDlg); } -AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( Window* pParent, +AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotServiceDlg( vcl::Window* pParent, const com::sun::star::uno::Sequence<OUString>& rServices, int nId ) { @@ -686,28 +686,28 @@ AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSe return 0; } -AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(Window* pParent, +AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove) { ScDeleteCellDlg * pDlg = new ScDeleteCellDlg(pParent, bDisallowCellMove); return new AbstractScDeleteCellDlg_Impl( pDlg ); } -AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg(Window* pParent, +AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg(vcl::Window* pParent, ScTabViewShell* pTabViewShell) { ScDataFormDlg* pDlg = new ScDataFormDlg(pParent, pTabViewShell); return new AbstractScDataFormDlg_Impl(pDlg); } -AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent, +AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(vcl::Window* pParent, InsertDeleteFlags nCheckDefaults) { ScDeleteContentsDlg* pDlg = new ScDeleteContentsDlg(pParent, nCheckDefaults); return new AbstractScDeleteContentsDlg_Impl( pDlg ); } -AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Window* pParent, +AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( vcl::Window* pParent, ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, @@ -721,7 +721,7 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi return new AbstractScFillSeriesDlg_Impl( pDlg ); } -AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Window* pParent, +AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( vcl::Window* pParent, bool bUnGroup, bool bRows ) { @@ -729,7 +729,7 @@ AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Wind return new AbstractScGroupDlg_Impl( pDlg ); } -AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( Window* pParent, +AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( vcl::Window* pParent, int nId, bool bDisallowCellMove ) { @@ -748,7 +748,7 @@ AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( W return 0; } -AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( Window* pParent, +AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults, const OUString* pStrTitle ) { @@ -756,27 +756,27 @@ AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertConten return new AbstractScInsertContentsDlg_Impl( pDlg ); } -AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData, +AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg(vcl::Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile) { ScInsertTableDlg* pDlg = new ScInsertTableDlg( pParent, rViewData,nTabCount, bFromFile ); return new AbstractScInsertTableDlg_Impl( pDlg ); } -AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Window* pParent, +AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( vcl::Window* pParent, const std::vector<OUString> &rEntryList ) { ScSelEntryDlg * pDlg = new ScSelEntryDlg( pParent, rEntryList ); return new AbstractScSelEntryDlg_Impl( pDlg ); } -AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg(Window* pParent) +AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg(vcl::Window* pParent) { ScLinkedAreaDlg* pDlg = new ScLinkedAreaDlg( pParent ); return new AbstractScLinkedAreaDlg_Impl( pDlg ); } -AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg ( Window* pParent, +AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg ( vcl::Window* pParent, const OString& sDialogName, long nCurrent, long nDefault, @@ -792,33 +792,33 @@ AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg return new AbstractScMetricInputDlg_Impl( pDlg ); } -AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg(Window* pParent, +AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg(vcl::Window* pParent, const OUString& rDefault) { ScMoveTableDlg * pDlg = new ScMoveTableDlg( pParent, rDefault ); return new AbstractScMoveTableDlg_Impl( pDlg ); } -AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg(Window * pParent, sal_uInt16 nFlags) +AbstractScNameCreateDlg * ScAbstractDialogFactory_Impl::CreateScNameCreateDlg(vcl::Window * pParent, sal_uInt16 nFlags) { ScNameCreateDlg * pDlg = new ScNameCreateDlg( pParent, nFlags ); return new AbstractScNameCreateDlg_Impl( pDlg ); } -AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList ) +AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( vcl::Window * pParent, ScDocShell* pShell, bool bInsList ) { ScNamePasteDlg * pDlg = new ScNamePasteDlg( pParent, pShell, bInsList ); return new AbstractScNamePasteDlg_Impl( pDlg ); } -AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg(Window* pParent, +AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgSet, sal_uInt16 nSourceTab) { ScPivotFilterDlg *pDlg = new ScPivotFilterDlg(pParent, rArgSet, nSourceTab); return new AbstractScPivotFilterDlg_Impl(pDlg); } -AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg ( Window* pParent, +AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg ( vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ) @@ -827,7 +827,7 @@ AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg ( return new AbstractScDPFunctionDlg_Impl( pDlg ); } -AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( Window* pParent, +AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, @@ -839,7 +839,7 @@ AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( } AbstractScDPNumGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg( - Window* pParent, int nId, const ScDPNumGroupInfo& rInfo ) + vcl::Window* pParent, int nId, const ScDPNumGroupInfo& rInfo ) { if( nId == RID_SCDLG_DPNUMGROUP ) return new AbstractScDPNumGroupDlg_Impl( new ScDPNumGroupDlg( pParent, rInfo ) ); @@ -847,7 +847,7 @@ AbstractScDPNumGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg( } AbstractScDPDateGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg( - Window* pParent, int nId, + vcl::Window* pParent, int nId, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) { if( nId == RID_SCDLG_DPDATEGROUP ) @@ -856,27 +856,27 @@ AbstractScDPDateGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg( } AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDlg ( - Window* pParent, int nId, ScDPObject& rDPObj, sal_uInt16 nOrient ) + vcl::Window* pParent, int nId, ScDPObject& rDPObj, sal_uInt16 nOrient ) { if( nId == RID_SCDLG_DPSHOWDETAIL ) return new AbstractScDPShowDetailDlg_Impl( new ScDPShowDetailDlg( pParent, rDPObj, nOrient ) ); return 0; } -AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg(Window* pParent, const OUString& rName, +AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg(vcl::Window* pParent, const OUString& rName, bool bEdit, bool bSheetProtected) { ScNewScenarioDlg *pDlg = new ScNewScenarioDlg(pParent, rName, bEdit, bSheetProtected); return new AbstractScNewScenarioDlg_Impl( pDlg ); } -AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg(Window* pParent) +AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg(vcl::Window* pParent) { ScShowTabDlg * pDlg = new ScShowTabDlg( pParent); return new AbstractScShowTabDlg_Impl( pDlg ); } -AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg ( Window* pParent, +AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg ( vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, @@ -887,7 +887,7 @@ AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg } AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg( - Window* pParent, + vcl::Window* pParent, const OUString& rTitle, const OUString& rTabBgColorNoColorText, const Color& rDefaultColor, @@ -897,7 +897,7 @@ AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg( return new AbstractScTabBgColorDlg_Impl( pDlg ); } -AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( Window* pParent, +AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( vcl::Window* pParent, bool bAscii, const ScImportOptions* pOptions, const OUString* pStrTitle, @@ -910,14 +910,14 @@ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptions } SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg(SfxViewFrame* pFrame, - Window* pParent, const SfxItemSet* pCellAttrs) + vcl::Window* pParent, const SfxItemSet* pCellAttrs) { SfxTabDialog* pDlg = new ScAttrDlg(pFrame, pParent, pCellAttrs); return new ScAbstractTabDialog_Impl(pDlg); } SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame* pFrame, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, sal_uInt16 nResId ) @@ -964,7 +964,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF return pDlg ? new ScAbstractTabDialog_Impl( pDlg ) : NULL; } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* pParent, +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( vcl::Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId, int nId) @@ -985,34 +985,34 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* return 0; } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet) +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) { SfxTabDialog* pDlg = new ScSubTotalDlg( pParent, pArgSet ); return new ScAbstractTabDialog_Impl( pDlg ); } SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg( - Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) + vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) { SfxTabDialog* pDlg = new ScCharDlg(pParent, pAttr, pDocShell); return new ScAbstractTabDialog_Impl(pDlg); } SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( - Window* pParent, const SfxItemSet* pAttr) + vcl::Window* pParent, const SfxItemSet* pAttr) { SfxTabDialog* pDlg = new ScParagraphDlg(pParent, pAttr); return new ScAbstractTabDialog_Impl(pDlg); } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg(Window* pParent, +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh) { SfxTabDialog* pDlg = new ScValidationDlg(pParent, pArgSet, pTabVwSh); return new ScAbstractTabDialog_Impl(pDlg); } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet) +SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) { SfxTabDialog* pDlg = new ScSortDlg( pParent, pArgSet ); return new ScAbstractTabDialog_Impl( pDlg ); diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index a0c8be1fed69..6e493396bad5 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -394,43 +394,43 @@ class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory public: virtual ~ScAbstractDialogFactory_Impl() {} - virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, const OUString& aDatName, + virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall) SAL_OVERRIDE; - virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent) SAL_OVERRIDE; + virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(vcl::Window* pParent) SAL_OVERRIDE; - virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg(Window* pParent, + virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg(vcl::Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScViewData *pViewData) SAL_OVERRIDE; - virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, + virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (vcl::Window* pParent, bool bCol = false, bool bRow = false) SAL_OVERRIDE; - virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) SAL_OVERRIDE; + virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) SAL_OVERRIDE; - virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, + virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos, int nId ) SAL_OVERRIDE; - virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(Window* pParent) SAL_OVERRIDE; + virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(vcl::Window* pParent) SAL_OVERRIDE; - virtual AbstractScDataPilotSourceTypeDlg* CreateScDataPilotSourceTypeDlg(Window* pParent, + virtual AbstractScDataPilotSourceTypeDlg* CreateScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bEnableExternal) SAL_OVERRIDE; - virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, + virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( vcl::Window* pParent, const com::sun::star::uno::Sequence<OUString>& rServices, int nId ) SAL_OVERRIDE; - virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false ) SAL_OVERRIDE; + virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(vcl::Window* pParent, bool bDisallowCellMove = false ) SAL_OVERRIDE; //for dataform - virtual AbstractScDataFormDlg* CreateScDataFormDlg(Window* pParent, + virtual AbstractScDataFormDlg* CreateScDataFormDlg(vcl::Window* pParent, ScTabViewShell* pTabViewShell) SAL_OVERRIDE; - virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, + virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(vcl::Window* pParent, InsertDeleteFlags nCheckDefaults = IDF_NONE) SAL_OVERRIDE; - virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, + virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( vcl::Window* pParent, ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, @@ -439,27 +439,27 @@ public: double fStep, double fMax, sal_uInt16 nPossDir) SAL_OVERRIDE; - virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, + virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( vcl::Window* pParent, bool bUnGroup = false, bool bRows = true) SAL_OVERRIDE; - virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, + virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( vcl::Window* pParent, int nId, bool bDisallowCellMove = false ) SAL_OVERRIDE; - virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, + virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( vcl::Window* pParent, InsertDeleteFlags nCheckDefaults = IDF_NONE, const OUString* pStrTitle = NULL ) SAL_OVERRIDE; - virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData, + virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(vcl::Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile) SAL_OVERRIDE; - virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, + virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( vcl::Window* pParent, const std::vector<OUString> &rEntryList ) SAL_OVERRIDE; - virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent) SAL_OVERRIDE; + virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(vcl::Window* pParent) SAL_OVERRIDE; - virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, + virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( vcl::Window* pParent, const OString& sDialogName, long nCurrent, long nDefault, @@ -470,60 +470,60 @@ public: long nFirst = 1, long nLast = 100 ) SAL_OVERRIDE; - virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(Window * pParent, + virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(vcl::Window * pParent, const OUString& rDefault) SAL_OVERRIDE; - virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent, + virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(vcl::Window * pParent, sal_uInt16 nFlags) SAL_OVERRIDE; - virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ) SAL_OVERRIDE; + virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( vcl::Window * pParent, ScDocShell* pShell, bool bInsList=true ) SAL_OVERRIDE; - virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg(Window* pParent, + virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgSet, sal_uInt16 nSourceTab) SAL_OVERRIDE; - virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, + virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ) SAL_OVERRIDE; - virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent, + virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, const ScDPNameVec& rDataFields, bool bEnableLayout ) SAL_OVERRIDE; - virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( Window* pParent, + virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( vcl::Window* pParent, int nId, const ScDPNumGroupInfo& rInfo ) SAL_OVERRIDE; - virtual AbstractScDPDateGroupDlg * CreateScDPDateGroupDlg( Window* pParent, + virtual AbstractScDPDateGroupDlg * CreateScDPDateGroupDlg( vcl::Window* pParent, int nId, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) SAL_OVERRIDE; - virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( Window* pParent, int nId, + virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( vcl::Window* pParent, int nId, ScDPObject& rDPObj, sal_uInt16 nOrient ) SAL_OVERRIDE; - virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const OUString& rName, + virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( vcl::Window* pParent, const OUString& rName, bool bEdit = false, bool bSheetProtected = false ) SAL_OVERRIDE; - virtual AbstractScShowTabDlg * CreateScShowTabDlg(Window* pParent) SAL_OVERRIDE; + virtual AbstractScShowTabDlg * CreateScShowTabDlg(vcl::Window* pParent) SAL_OVERRIDE; - virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent, + virtual AbstractScStringInputDlg * CreateScStringInputDlg ( vcl::Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, const OString& sHelpId, const OString& sEditHelpId ) SAL_OVERRIDE; - virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, + virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( vcl::Window* pParent, const OUString& rTitle, //Dialog Title const OUString& rTabBgColorNoColorText, //Label for no tab color const Color& rDefaultColor, //Currently selected Color const OString& sHelpId ) SAL_OVERRIDE; - virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, + virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( vcl::Window* pParent, bool bAscii = true, const ScImportOptions* pOptions = NULL, const OUString* pStrTitle = NULL, @@ -531,32 +531,32 @@ public: bool bOnlyDbtoolsEncodings = false, bool bImport = true ) SAL_OVERRIDE; virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, - Window* pParent, + vcl::Window* pParent, const SfxItemSet* pCellAttrs ) SAL_OVERRIDE; virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, sal_uInt16 nResId = RID_SCDLG_HFEDIT ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent, + virtual SfxAbstractTabDialog * CreateScStyleDlg( vcl::Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId, int nId) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, + virtual SfxAbstractTabDialog * CreateScSubTotalDlg( vcl::Window* pParent, const SfxItemSet* pArgSet ) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateScCharDlg(Window* pParent, + virtual SfxAbstractTabDialog * CreateScCharDlg(vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateScParagraphDlg(Window* pParent, + virtual SfxAbstractTabDialog * CreateScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateScValidationDlg(Window* pParent, + virtual SfxAbstractTabDialog * CreateScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet) SAL_OVERRIDE; + virtual SfxAbstractTabDialog * CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) SAL_OVERRIDE; // For TabPage virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) SAL_OVERRIDE; diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 2884663d4df0..2989420dfbf8 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -38,7 +38,7 @@ static const sal_uInt16 pProtectionRanges[] = // Zellschutz-Tabpage: -ScTabPageProtection::ScTabPageProtection(Window* pParent, const SfxItemSet& rCoreAttrs) +ScTabPageProtection::ScTabPageProtection(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "CellProtectionPage", "modules/scalc/ui/cellprotectionpage.ui", &rCoreAttrs) { @@ -64,7 +64,7 @@ const sal_uInt16* ScTabPageProtection::GetRanges() return pProtectionRanges; } -SfxTabPage* ScTabPageProtection::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* ScTabPageProtection::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new ScTabPageProtection( pParent, *rAttrSet ) ); } diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 570117ea5caf..dd3e57d364f2 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -71,7 +71,7 @@ IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999; -ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel) : +ScMenuFloatingWindow::ScMenuFloatingWindow(vcl::Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel) : PopupMenuFloatingWindow(pParent), maOpenTimer(this), maCloseTimer(this), @@ -852,7 +852,7 @@ void ScCheckListMenuWindow::CancelButton::Click() ::CancelButton::Click(); } -ScCheckListMenuWindow::ScCheckListMenuWindow(Window* pParent, ScDocument* pDoc) : +ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* pDoc) : ScMenuFloatingWindow(pParent, pDoc), maChecks(this, WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT ), maChkToggleAll(this, 0), @@ -1210,7 +1210,7 @@ void ScCheckListMenuWindow::Paint(const Rectangle& rRect) DrawRect(Rectangle(aPos,aSize)); } -Window* ScCheckListMenuWindow::GetPreferredKeyInputWindow() +vcl::Window* ScCheckListMenuWindow::GetPreferredKeyInputWindow() { return maTabStopCtrls[mnCurTabStop]; } @@ -1327,7 +1327,7 @@ void ScCheckListMenuWindow::addMember(const OUString& rName, bool bVisible) maMembers.push_back(aMember); } -ScCheckListBox::ScCheckListBox( Window* pParent, WinBits nWinStyle ) +ScCheckListBox::ScCheckListBox( vcl::Window* pParent, WinBits nWinStyle ) : SvTreeListBox( pParent, nWinStyle ), mpCheckButton( NULL ) { Init(); diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index 6c8755cfe4fd..59da99c4933b 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -41,12 +41,12 @@ sal_Unicode lclGetGroupSep() } // namespace -ScDoubleField::ScDoubleField( Window* pParent, WinBits nStyle ) : +ScDoubleField::ScDoubleField( vcl::Window* pParent, WinBits nStyle ) : Edit( pParent, nStyle ) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScDoubleField(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScDoubleField(vcl::Window *pParent, VclBuilder::stringmap &rMap) { VclBuilder::ensureDefaultWidthChars(rMap); return new ScDoubleField(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index bf00d6d6d462..6e2e8bc501c0 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -79,7 +79,7 @@ void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState } } -Window* ScZoomSliderControl::CreateItemWindow( Window *pParent ) +vcl::Window* ScZoomSliderControl::CreateItemWindow( vcl::Window *pParent ) { // #i98000# Don't try to get a value via SfxViewFrame::Current here. // The view's value is always notified via StateChanged later. @@ -216,7 +216,7 @@ long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const return nRect; } -ScZoomSliderWnd::ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, +ScZoomSliderWnd::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 ): Window( pParent ), mpImpl( new ScZoomSliderWnd_Impl( nCurrentZoom ) ), diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index 6de2470aa2dd..b3fa94ebe8ee 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -60,7 +60,7 @@ void SetValue( ScColorScaleEntry* pEntry, Edit& aEdit) } -ScDataBarSettingsDlg::ScDataBarSettingsDlg(Window* pWindow, const ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos): +ScDataBarSettingsDlg::ScDataBarSettingsDlg(vcl::Window* pWindow, const ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos): ModalDialog( pWindow, "DataBarOptions", "modules/scalc/ui/databaroptions.ui" ), mpNumberFormatter( pDoc->GetFormatTable() ), mpDoc(pDoc), diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index d9a08f85d987..b868e20b5bfb 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -34,7 +34,7 @@ #include "globstr.hrc" -ScCondFormatList::ScCondFormatList(Window* pParent, WinBits nStyle) +ScCondFormatList::ScCondFormatList(vcl::Window* pParent, WinBits nStyle) : Control(pParent, nStyle | WB_DIALOGCONTROL) , mbHasScrollBar(false) , mpScrollBar(new ScrollBar(this, WB_VERT )) @@ -127,7 +127,7 @@ void ScCondFormatList::init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent, RecalcAll(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScCondFormatList(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScCondFormatList(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = 0; @@ -395,7 +395,7 @@ IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl ) //ScCondFormatDlg -ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, +ScCondFormatDlg::ScCondFormatDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType) : ScAnyRefModalDlg(pParent, "ConditionalFormatDialog", diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index fa54d2afce6e..5f92b615280c 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -33,7 +33,7 @@ #include <set> -ScCondFrmtEntry::ScCondFrmtEntry(Window* pParent, ScDocument* pDoc, const ScAddress& rPos): +ScCondFrmtEntry::ScCondFrmtEntry(vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos): Control(pParent, ScResId( RID_COND_ENTRY ) ), mbActive(false), maFtCondNr( this, ScResId( FT_COND_NR ) ), @@ -90,7 +90,7 @@ void ScCondFrmtEntry::SetHeight() long nMaxHeight = 0; for(sal_uInt16 i = 0; i < nChildren; i++) { - Window *pChild = GetChild(i); + vcl::Window *pChild = GetChild(i); if(!pChild || !pChild->IsVisible()) continue; Point aPos = pChild->GetPosPixel(); @@ -164,7 +164,7 @@ void FillStyleListBox( ScDocument* pDoc, ListBox& rLbStyle ) } -ScConditionFrmtEntry::ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, +ScConditionFrmtEntry::ScConditionFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbCondType( this, ScResId( LB_CELLIS_TYPE ) ), @@ -548,7 +548,7 @@ IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl) // formula -ScFormulaFrmtEntry::ScFormulaFrmtEntry( Window* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormat ): +ScFormulaFrmtEntry::ScFormulaFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maFtStyle( this, ScResId( FT_STYLE ) ), maLbStyle( this, ScResId( LB_STYLE ) ), @@ -716,7 +716,7 @@ ScColorScaleEntry* createColorScaleEntry( const ListBox& rType, const ColorListB } -ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): +ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE_MIN ) ), @@ -867,7 +867,7 @@ IMPL_LINK( ScColorScale2FrmtEntry, EntryTypeHdl, ListBox*, pBox ) return 0; } -ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): +ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), maLbEntryTypeMin( this, ScResId( LB_TYPE_COL_SCALE_MIN ) ), @@ -1103,7 +1103,7 @@ void SetDataBarEntryTypes( const ScColorScaleEntry& rEntry, ListBox& rLbType, Ed } -ScDataBarFrmtEntry::ScDataBarFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat ): +ScDataBarFrmtEntry::ScDataBarFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), maLbDataBarMinType( this, ScResId( LB_TYPE_COL_SCALE_MIN ) ), @@ -1229,7 +1229,7 @@ IMPL_LINK_NOARG( ScDataBarFrmtEntry, OptionBtnHdl ) return 0; } -ScDateFrmtEntry::ScDateFrmtEntry( Window* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat ): +ScDateFrmtEntry::ScDateFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat ): ScCondFrmtEntry( pParent, pDoc, ScAddress() ), maLbDateEntry( this, ScResId( LB_DATE_TYPE ) ), maFtStyle( this, ScResId( FT_STYLE ) ), @@ -1330,7 +1330,7 @@ class ScIconSetFrmtDataEntry : public Control ListBox maLbEntryType; public: - ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, ScDocument* pDoc, + ScIconSetFrmtDataEntry( vcl::Window* pParent, ScIconSetType eType, ScDocument* pDoc, sal_Int32 i, const ScColorScaleEntry* pEntry = NULL ); ScColorScaleEntry* CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const; @@ -1338,7 +1338,7 @@ class ScIconSetFrmtDataEntry : public Control void SetFirstEntry(); }; -ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( Window* pParent, ScIconSetType eType, ScDocument* pDoc, sal_Int32 i, const ScColorScaleEntry* pEntry ): +ScIconSetFrmtDataEntry::ScIconSetFrmtDataEntry( vcl::Window* pParent, ScIconSetType eType, ScDocument* pDoc, sal_Int32 i, const ScColorScaleEntry* pEntry ): Control( pParent, ScResId( RID_ICON_SET_ENTRY ) ), maImgIcon( this, ScResId( IMG_ICON ) ), maFtEntry( this, ScResId( FT_ICON_SET_ENTRY_TEXT ) ), @@ -1420,7 +1420,7 @@ void ScIconSetFrmtDataEntry::SetFirstEntry() maLbEntryType.SelectEntryPos(1); } -ScIconSetFrmtEntry::ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat ): +ScIconSetFrmtEntry::ScIconSetFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat ): ScCondFrmtEntry( pParent, pDoc, rPos ), maLbColorFormat( this, ScResId( LB_COLOR_FORMAT ) ), maLbIconSetType( this, ScResId( LB_ICONSET_TYPE ) ) diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 92e2bca67baa..d61fd36a669a 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -106,7 +106,7 @@ void ScCondFormatManagerWindow::setColSizes() SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); } -ScCondFormatManagerDlg::ScCondFormatManagerDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos): +ScCondFormatManagerDlg::ScCondFormatManagerDlg(vcl::Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos): ModalDialog(pParent, "CondFormatManager", "modules/scalc/ui/condformatmanager.ui"), mpFormatList( pFormatList ? new ScConditionalFormatList(*pFormatList) : NULL), mpDoc(pDoc), diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index 1a4954cffca6..ec241f3ad917 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -65,7 +65,7 @@ ScRange lclGetRangeForNamedRange(OUString const & aName, ScDocument* pDocument) } ScPivotLayoutDialog::ScPivotLayoutDialog( - SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, Window* pParent, + SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, vcl::Window* pParent, ScViewData* pViewData, const ScDPObject* pPivotTableObject, bool bNewPivotTable) : ScAnyRefDlg (pSfxBindings, pChildWindow, pParent, "PivotTableLayout", "modules/scalc/ui/pivottablelayoutdialog.ui"), maPivotTableObject (*pPivotTableObject), diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx index eedd01e2b469..7f75da8968a5 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx @@ -18,12 +18,12 @@ using namespace std; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScPivotLayoutTreeList(Window *pParent, VclBuilder::stringmap& ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScPivotLayoutTreeList(vcl::Window *pParent, VclBuilder::stringmap& ) { return new ScPivotLayoutTreeList(pParent, WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE); } -ScPivotLayoutTreeList::ScPivotLayoutTreeList(Window* pParent, WinBits nBits) : +ScPivotLayoutTreeList::ScPivotLayoutTreeList(vcl::Window* pParent, WinBits nBits) : ScPivotLayoutTreeListBase(pParent, nBits) {} diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx index 3710e4ca0f03..84b61d466996 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx @@ -18,7 +18,7 @@ using namespace std; -ScPivotLayoutTreeListBase::ScPivotLayoutTreeListBase(Window* pParent, WinBits nBits, SvPivotTreeListType eType) +ScPivotLayoutTreeListBase::ScPivotLayoutTreeListBase(vcl::Window* pParent, WinBits nBits, SvPivotTreeListType eType) : SvTreeListBox(pParent, nBits) , meType(eType) , mpParent(NULL) diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx index a9daa316b513..3b9b4f1cd4c4 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx @@ -18,7 +18,7 @@ using namespace std; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScPivotLayoutTreeListData(Window *pParent, VclBuilder::stringmap& ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScPivotLayoutTreeListData(vcl::Window *pParent, VclBuilder::stringmap& ) { return new ScPivotLayoutTreeListData(pParent, WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE); } @@ -64,7 +64,7 @@ OUString lclCreateDataItemName(const sal_uInt16 nFunctionMask, const OUString& r } // anonymous namespace -ScPivotLayoutTreeListData::ScPivotLayoutTreeListData(Window* pParent, WinBits nBits) : +ScPivotLayoutTreeListData::ScPivotLayoutTreeListData(vcl::Window* pParent, WinBits nBits) : ScPivotLayoutTreeListBase(pParent, nBits, DATA_LIST) {} diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx index 705693441c6b..1780161bd6ac 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx @@ -18,12 +18,12 @@ using namespace std; -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScPivotLayoutTreeListLabel(Window *pParent, VclBuilder::stringmap& ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScPivotLayoutTreeListLabel(vcl::Window *pParent, VclBuilder::stringmap& ) { return new ScPivotLayoutTreeListLabel(pParent, WB_BORDER | WB_TABSTOP | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE); } -ScPivotLayoutTreeListLabel::ScPivotLayoutTreeListLabel(Window* pParent, WinBits nBits) +ScPivotLayoutTreeListLabel::ScPivotLayoutTreeListLabel(vcl::Window* pParent, WinBits nBits) : ScPivotLayoutTreeListBase(pParent, nBits, LABEL_LIST) , maDataItem(0) { diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index fc70a15d9c93..bf401cee91a5 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -58,7 +58,7 @@ public: bool bIsDbArea; }; -ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet ) : ScAnyRefDlg ( pB, pCW, pParent, "ConsolidateDialog" , "modules/scalc/ui/consolidatedialog.ui" ), diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 381309dd7efd..56c8eb7cf6be 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -64,7 +64,7 @@ ScCsvControl::ScCsvControl( ScCsvControl& rParent ) : { } -ScCsvControl::ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ) : +ScCsvControl::ScCsvControl( vcl::Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ) : Control( pParent, nBits ), mrData( rData ), mpAccessible( NULL ), diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index f65704846918..c78aabaeab67 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -23,7 +23,7 @@ #include <vcl/settings.hxx> #include "editutil.hxx" -ScCsvTableBox::ScCsvTableBox( Window* pParent, WinBits nBits ) : +ScCsvTableBox::ScCsvTableBox( vcl::Window* pParent, WinBits nBits ) : ScCsvControl( pParent, maData, nBits ), maRuler( *this ), maGrid( *this ), @@ -54,7 +54,7 @@ ScCsvTableBox::ScCsvTableBox( Window* pParent, WinBits nBits ) : InitControls(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScCsvTableBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScCsvTableBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new ScCsvTableBox(pParent, WB_BORDER); } diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 95ca794d69ff..5cf72605ee55 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -43,7 +43,7 @@ using namespace com::sun::star; #define DP_TYPELIST_QUERY 1 #define DP_TYPELIST_SQLNAT 3 -ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) : +ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( vcl::Window* pParent ) : ModalDialog(pParent, "SelectDataSourceDialog", "modules/scalc/ui/selectdatasource.ui") { diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 4d50ebd96bf6..f32ce2bf0ad1 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -25,7 +25,7 @@ using namespace com::sun::star; -ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal) +ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(vcl::Window* pParent, bool bEnableExternal) : ModalDialog( pParent, "SelectSourceDialog", "modules/scalc/ui/selectsource.ui" ) { get(m_pBtnSelection, "selection"); @@ -93,7 +93,7 @@ IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn ) return 0; } -ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent, +ScDataPilotServiceDlg::ScDataPilotServiceDlg( vcl::Window* pParent, const uno::Sequence<OUString>& rServices ) : ModalDialog ( pParent, "DapiserviceDialog", "modules/scalc/ui/dapiservicedialog.ui" ) { diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 022283e06e78..c46be30d3661 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -111,7 +111,7 @@ void DBSaveData::Restore() // class ScDbNameDlg -ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData) : ScAnyRefDlg(pB, pCW, pParent, "DefineDatabaseRangeDialog", @@ -140,9 +140,9 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, get(m_pBtnCancel, "cancel"); get(m_pBtnAdd, "add"); aStrAdd = m_pBtnAdd->GetText(); - aStrModify = get<Window>("modify")->GetText(); + aStrModify = get<vcl::Window>("modify")->GetText(); get(m_pBtnRemove, "delete"); - aStrInvalid = get<Window>("invalid")->GetText(); + aStrInvalid = get<vcl::Window>("invalid")->GetText(); m_pFTSource->SetStyle(m_pFTSource->GetStyle() | WB_NOLABEL); m_pFTOperations->SetStyle(m_pFTOperations->GetStyle() | WB_NOLABEL); diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index ce688274b838..77ae5247a2d1 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -146,7 +146,7 @@ void ScDPDateGroupEditHelper::ImplSetValue( double fValue ) mpEdValue->SetDate( aDate ); } -ScDPNumGroupDlg::ScDPNumGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo ) : +ScDPNumGroupDlg::ScDPNumGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& rInfo ) : ModalDialog ( pParent, "PivotTableGroupByNumber", "modules/scalc/ui/groupbynumber.ui" ), mpRbAutoStart ( get<RadioButton>("auto_start") ), mpRbManStart ( get<RadioButton>("manual_start") ), @@ -194,7 +194,7 @@ ScDPNumGroupInfo ScDPNumGroupDlg::GetGroupInfo() const return aInfo; } -ScDPDateGroupDlg::ScDPDateGroupDlg( Window* pParent, +ScDPDateGroupDlg::ScDPDateGroupDlg( vcl::Window* pParent, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) : ModalDialog( pParent, "PivotTableGroupByDate", "modules/scalc/ui/groupbydate.ui" ), mpRbAutoStart ( get<RadioButton>("auto_start") ), diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index c80dede2be71..f3fa5d401e6d 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -49,7 +49,7 @@ ScFilterDlg::EntryList::EntryList() : mnHeaderPos(INVALID_HEADER_POS) {} -ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet) : ScAnyRefDlg ( pB, pCW, pParent, "StandardFilterDialog", "modules/scalc/ui/standardfilterdialog.ui" ) diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 5ffa9fabadd5..c5032bb9aa17 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -39,7 +39,7 @@ #include <svl/zforlist.hxx> #include <svl/sharedstringpool.hxx> -ScPivotFilterDlg::ScPivotFilterDlg(Window* pParent, const SfxItemSet& rArgSet, +ScPivotFilterDlg::ScPivotFilterDlg(vcl::Window* pParent, const SfxItemSet& rArgSet, SCTAB nSourceTab ) : ModalDialog(pParent, "PivotFilterDialog", "modules/scalc/ui/pivotfilterdialog.ui" ) diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 8813613b4a08..935e02a982d8 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -151,13 +151,13 @@ static const ScDPListBoxWrapper::MapEntryType spShowFromMap[] = } // namespace -ScDPFunctionListBox::ScDPFunctionListBox(Window* pParent, WinBits nStyle) +ScDPFunctionListBox::ScDPFunctionListBox(vcl::Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) { FillFunctionNames(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScDPFunctionListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScDPFunctionListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -193,7 +193,7 @@ void ScDPFunctionListBox::FillFunctionNames() } ScDPFunctionDlg::ScDPFunctionDlg( - Window* pParent, const ScDPLabelDataVector& rLabelVec, + vcl::Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData) : ModalDialog(pParent, "DataFieldDialog", "modules/scalc/ui/datafielddialog.ui") @@ -406,7 +406,7 @@ IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl) return 0; } -ScDPSubtotalDlg::ScDPSubtotalDlg( Window* pParent, ScDPObject& rDPObj, +ScDPSubtotalDlg::ScDPSubtotalDlg( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, const ScDPNameVec& rDataFields, bool bEnableLayout ) : ModalDialog(pParent, "PivotFieldDialog", @@ -507,7 +507,7 @@ IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn ) return 0; } -ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( Window* pParent, ScDPObject& rDPObj, +ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( vcl::Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields, bool bEnableLayout ) : ModalDialog(pParent, "DataFieldOptionsDialog", @@ -757,7 +757,7 @@ IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox ) return 0; } -ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) : +ScDPShowDetailDlg::ScDPShowDetailDlg( vcl::Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) : ModalDialog ( pParent, "ShowDetail", "modules/scalc/ui/showdetaildialog.ui" ), mrDPObj(rDPObj) { diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 0d7de73194fd..9ba5f255481b 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -36,7 +36,7 @@ #include "scresid.hxx" #include "scendlg.hxx" -ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const OUString& rName, bool bEdit, bool bSheetProtected) +ScNewScenarioDlg::ScNewScenarioDlg( vcl::Window* pParent, const OUString& rName, bool bEdit, bool bSheetProtected) : ModalDialog(pParent, "ScenarioDialog", "modules/scalc/ui/scenariodialog.ui") diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index a625ecbf6f4f..b5101c3b3147 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -228,7 +228,7 @@ static void save_Separators( aItem.PutProperties(aNames, aValues); } -ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent, const OUString& aDatName, +ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall ) : ModalDialog (pParent, "TextImportCsvDialog", "modules/scalc/ui/textimportcsv.ui"), diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index b7d682a40211..98ee9d90c898 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -99,7 +99,7 @@ OUString ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const // ScImportOptionsDlg ScImportOptionsDlg::ScImportOptionsDlg( - Window* pParent, + vcl::Window* pParent, bool bAscii, const ScImportOptions* pOptions, const OUString* pStrTitle, diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index af6fe97c2900..1815e03b496c 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -42,7 +42,7 @@ // class ScSpecialFilterDialog -ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, const SfxItemSet& rArgSet ) : ScAnyRefDlg ( pB, pCW, pParent, "AdvancedFilterDialog", "modules/scalc/ui/advancedfilterdialog.ui" ), diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 8129dc42cd0d..97c6b98641c8 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.cxx @@ -24,7 +24,7 @@ #include "sortdlg.hxx" #include "scresid.hxx" -ScSortDlg::ScSortDlg(Window* pParent, const SfxItemSet* pArgSet) +ScSortDlg::ScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) : SfxTabDialog(pParent, "SortDialog", "modules/scalc/ui/sortdialog.ui", pArgSet) , bIsHeaders(false) , bIsByRows(false) @@ -33,7 +33,7 @@ ScSortDlg::ScSortDlg(Window* pParent, const SfxItemSet* pArgSet) AddTabPage("options", ScTabPageSortOptions::Create, 0); } -ScSortWarningDlg::ScSortWarningDlg(Window* pParent, +ScSortWarningDlg::ScSortWarningDlg(vcl::Window* pParent, const OUString& rExtendText, const OUString& rCurrentText) : ModalDialog(pParent, "SortWarning", "modules/scalc/ui/sortwarning.ui") { diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index f82f72ae6045..9e0b76e821f8 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -11,7 +11,7 @@ #include "sortdlg.hxx" #include <vcl/layout.hxx> -ScSortKeyItem::ScSortKeyItem(Window* pParent) +ScSortKeyItem::ScSortKeyItem(vcl::Window* pParent) { m_pUIBuilder = new VclBuilder(pParent, getUIRootDir(), "modules/scalc/ui/sortkey.ui"); diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index b1fe324f3dca..c4a718a9e6d7 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -23,7 +23,7 @@ #include "scresid.hxx" #include "subtdlg.hxx" -ScSubTotalDlg::ScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet) +ScSubTotalDlg::ScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) : SfxTabDialog(pParent, "SubTotalDialog", "modules/scalc/ui/subtotaldialog.ui", pArgSet) { diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index 485dc48cbee1..fb1b34945c14 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -25,7 +25,7 @@ #include <vcl/window.hxx> #include <vcl/settings.hxx> -ScTextImportOptionsDlg::ScTextImportOptionsDlg(Window* pParent) +ScTextImportOptionsDlg::ScTextImportOptionsDlg(vcl::Window* pParent) : ModalDialog(pParent, "TextImportOptionsDialog", "modules/scalc/ui/textimportoptions.ui") { get(m_pBtnOk, "ok"); diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index d0ad201f6228..8b8a0a8375bd 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -67,7 +67,7 @@ using namespace com::sun::star; // Sort Criteria Tab page -ScTabPageSortFields::ScTabPageSortFields(Window* pParent, +ScTabPageSortFields::ScTabPageSortFields(vcl::Window* pParent, const SfxItemSet& rArgSet) : SfxTabPage(pParent, "SortCriteriaPage", "modules/scalc/ui/sortcriteriapage.ui", &rArgSet) @@ -135,7 +135,7 @@ void ScTabPageSortFields::Init() } } -SfxTabPage* ScTabPageSortFields::Create( Window* pParent, +SfxTabPage* ScTabPageSortFields::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTabPageSortFields( pParent, *rArgSet ) ); @@ -477,7 +477,7 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) // Sort option Tab Page: -ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, +ScTabPageSortOptions::ScTabPageSortOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage(pParent, "SortOptionsPage", "modules/scalc/ui/sortoptionspage.ui", &rArgSet) @@ -608,7 +608,7 @@ void ScTabPageSortOptions::Init() } SfxTabPage* ScTabPageSortOptions::Create( - Window* pParent, + vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTabPageSortOptions( pParent, *rArgSet ) ); diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index c8fd47da5408..fcddba84506f 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -34,7 +34,7 @@ // Subtotals group tabpage: -ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, +ScTpSubTotalGroup::ScTpSubTotalGroup( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage ( pParent, "SubTotalGrpPage", "modules/scalc/ui/subtotalgrppage.ui", @@ -378,27 +378,27 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) // Derived Group TabPages: -SfxTabPage* ScTpSubTotalGroup1::Create( Window* pParent, +SfxTabPage* ScTpSubTotalGroup1::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTpSubTotalGroup1( pParent, *rArgSet ) ); } -SfxTabPage* ScTpSubTotalGroup2::Create( Window* pParent, +SfxTabPage* ScTpSubTotalGroup2::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTpSubTotalGroup2( pParent, *rArgSet ) ); } -SfxTabPage* ScTpSubTotalGroup3::Create( Window* pParent, +SfxTabPage* ScTpSubTotalGroup3::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTpSubTotalGroup3( pParent, *rArgSet ) ); } -ScTpSubTotalGroup1::ScTpSubTotalGroup1( Window* pParent, const SfxItemSet& rArgSet ) : +ScTpSubTotalGroup1::ScTpSubTotalGroup1( vcl::Window* pParent, const SfxItemSet& rArgSet ) : ScTpSubTotalGroup( pParent, rArgSet ) {} -ScTpSubTotalGroup2::ScTpSubTotalGroup2( Window* pParent, const SfxItemSet& rArgSet ) : +ScTpSubTotalGroup2::ScTpSubTotalGroup2( vcl::Window* pParent, const SfxItemSet& rArgSet ) : ScTpSubTotalGroup( pParent, rArgSet ) {} -ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgSet ) : +ScTpSubTotalGroup3::ScTpSubTotalGroup3( vcl::Window* pParent, const SfxItemSet& rArgSet ) : ScTpSubTotalGroup( pParent, rArgSet ) {} @@ -416,7 +416,7 @@ bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet* rArgSet ) { return FILLSET(3); // Optionen-Tabpage: -ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, +ScTpSubTotalOptions::ScTpSubTotalOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage ( pParent, @@ -462,7 +462,7 @@ void ScTpSubTotalOptions::Init() FillUserSortListBox(); } -SfxTabPage* ScTpSubTotalOptions::Create( Window* pParent, +SfxTabPage* ScTpSubTotalOptions::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTpSubTotalOptions( pParent, *rArgSet ) ); diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 703556626491..78413609218e 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -80,7 +80,7 @@ static const sal_uInt16 pValueRanges[] = 0 }; -ScValidationDlg::ScValidationDlg(Window* pParent, const SfxItemSet* pArgSet, +ScValidationDlg::ScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh, SfxBindings *pB /*= NULL*/) : ScValidationDlgBase(pParent ? pParent : SfxGetpApp()->GetTopWindow(), "ValidationDialog", "modules/scalc/ui/validationdialog.ui", pArgSet, pB) @@ -124,7 +124,7 @@ void ScTPValidationValue::RefInputStartPreHdl( formula::RefEdit* pEdit, formula: { if ( ScValidationDlg *pValidationDlg = GetValidationDlg() ) { - Window *pNewParent = pValidationDlg->get_refinput_shrink_parent(); + vcl::Window *pNewParent = pValidationDlg->get_refinput_shrink_parent(); if( pEdit == m_pRefEdit && m_pRefEdit->GetParent() != pNewParent ) { m_pRefEdit->SetParent(pNewParent); @@ -290,7 +290,7 @@ bool lclGetStringListFromFormula( OUString& rStringList, const OUString& rFmlaSt } // namespace -ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rArgSet ) +ScTPValidationValue::ScTPValidationValue( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage( pParent, "ValidationCriteriaPage", "modules/scalc/ui/validationcriteriapage.ui", &rArgSet) , maStrMin(ScResId(SCSTR_VALID_MINIMUM)) @@ -356,7 +356,7 @@ void ScTPValidationValue::Init() CheckHdl( NULL ); } -SfxTabPage* ScTPValidationValue::Create( Window* pParent, const SfxItemSet* rArgSet ) +SfxTabPage* ScTPValidationValue::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return( new ScTPValidationValue( pParent, *rArgSet ) ); } @@ -467,7 +467,7 @@ void ScTPValidationValue::SetSecondFormula( const OUString& rFmlaStr ) ScValidationDlg * ScTPValidationValue::GetValidationDlg() { - if( Window *pParent = GetParent() ) + if( vcl::Window *pParent = GetParent() ) do{ if ( dynamic_cast<ScValidationDlg*>( pParent ) ) return static_cast< ScValidationDlg * >( pParent ); @@ -487,7 +487,7 @@ void ScTPValidationValue::SetupRefDlg() pValidationDlg->SetRefInputStartPreHdl( (ScRefHandlerHelper::PINPUTSTARTDLTYPE)( &ScTPValidationValue::RefInputStartPreHdl ) ); pValidationDlg->SetRefInputDonePostHdl( (ScRefHandlerHelper::PCOMMONHDLTYPE)( &ScTPValidationValue::RefInputDonePostHdl ) ); - Window *pLabel = NULL; + vcl::Window *pLabel = NULL; if ( m_pEdMax->IsVisible() ) { @@ -544,7 +544,7 @@ IMPL_LINK_NOARG(ScTPValidationValue, EditSetFocusHdl) return 0; } -IMPL_LINK( ScTPValidationValue, KillFocusHdl, Window *, pWnd ) +IMPL_LINK( ScTPValidationValue, KillFocusHdl, vcl::Window *, pWnd ) { if( pWnd == m_pRefEdit || pWnd == m_pBtnRef ) if( ScValidationDlg *pValidationDlg = GetValidationDlg() ) @@ -627,7 +627,7 @@ IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl) // Input Help Page -ScTPValidationHelp::ScTPValidationHelp( Window* pParent, +ScTPValidationHelp::ScTPValidationHelp( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage ( pParent, @@ -651,7 +651,7 @@ void ScTPValidationHelp::Init() pTsbHelp->EnableTriState( false ); } -SfxTabPage* ScTPValidationHelp::Create( Window* pParent, +SfxTabPage* ScTPValidationHelp::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTPValidationHelp( pParent, *rArgSet ) ); @@ -688,7 +688,7 @@ bool ScTPValidationHelp::FillItemSet( SfxItemSet* rArgSet ) // Error Alert Page -ScTPValidationError::ScTPValidationError( Window* pParent, +ScTPValidationError::ScTPValidationError( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage ( pParent, @@ -721,7 +721,7 @@ void ScTPValidationError::Init() SelectActionHdl( NULL ); } -SfxTabPage* ScTPValidationError::Create( Window* pParent, +SfxTabPage* ScTPValidationError::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) { return ( new ScTPValidationError( pParent, *rArgSet ) ); @@ -778,7 +778,7 @@ IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl) IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl) { - Window* pOld = Application::GetDefDialogParent(); + vcl::Window* pOld = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); // Use static SfxApplication method to bring up selector dialog for @@ -872,7 +872,7 @@ bool ScValidationDlg::RemoveRefDlg( bool bRestoreModal /* = true */ ) return true; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScRefButtonEx(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScRefButtonEx(vcl::Window *pParent, VclBuilder::stringmap &) { return new ScTPValidationValue::ScRefButtonEx(pParent, 0); } @@ -893,7 +893,7 @@ void ScTPValidationValue::OnClick( Button *pBtn ) bool ScValidationDlg::IsChildFocus() { - if ( const Window *pWin = Application::GetFocusWindow() ) + if ( const vcl::Window *pWin = Application::GetFocusWindow() ) while( NULL != ( pWin = pWin->GetParent() ) ) if( pWin == this ) return true; diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index ba6e8ddaa372..f317734af97e 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -22,7 +22,7 @@ namespace sc { -SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, Window* pParent, sal_uInt16 /* nId */ ) : +SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent, sal_uInt16 /* nId */ ) : ModelessDialog(pParent, "SearchResultsDialog", "modules/scalc/ui/searchresults.ui"), mpBindings(_pBindings), mpDoc(NULL) { @@ -115,7 +115,7 @@ IMPL_LINK_NOARG( SearchResultsDlg, ListSelectHdl ) } SearchResultsDlgWrapper::SearchResultsDlgWrapper( - Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* /*pInfo*/ ) : + vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* /*pInfo*/ ) : SfxChildWindow(_pParent, nId) { pWindow = new SearchResultsDlg(pBindings, _pParent, nId); diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 7239ad0bf9e4..e02e795773e8 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -84,7 +84,7 @@ ScAreaLink::~ScAreaLink() delete pImpl; } -void ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ ) +void ScAreaLink::Edit(vcl::Window* pParent, const Link& /* rEndEditHdl */ ) { // use own dialog instead of SvBaseLink::Edit... // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index ea6e52a41f02..6c0b23772d5a 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -137,7 +137,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } } - Window* pWaitWin = rDocShell.GetActiveDialogParent(); + vcl::Window* pWaitWin = rDocShell.GetActiveDialogParent(); if (pWaitWin) pWaitWin->EnterWait(); ScDocShellModificator aModificator( rDocShell ); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index a235b332e40a..b220f716afc4 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -369,7 +369,7 @@ bool ScDocFunc::DetectiveMarkInvalid(SCTAB nTab) bool bUndo (rDoc.IsUndoEnabled()); ScDrawLayer* pModel = rDoc.GetDrawLayer(); - Window* pWaitWin = rDocShell.GetActiveDialogParent(); + vcl::Window* pWaitWin = rDocShell.GetActiveDialogParent(); if (pWaitWin) pWaitWin->EnterWait(); if (bUndo) diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 36e1c2d9a30a..0db4a22e40ec 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1604,10 +1604,10 @@ bool ScDocShell::Save() SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this ); if (pFrame1) { - Window* pWindow = &pFrame1->GetWindow(); + vcl::Window* pWindow = &pFrame1->GetWindow(); if ( pWindow ) { - Window* pSysWin = pWindow->GetSystemWindow(); + vcl::Window* pSysWin = pWindow->GetSystemWindow(); if ( pSysWin ) { pSysWin->SetAccessibleName(OUString()); @@ -2508,7 +2508,7 @@ bool ScDocShell::PrepareClose( bool bUI ) ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell,p); if(pViewSh!=NULL) { - Window *pWin=pViewSh->GetWindow(); + vcl::Window *pWin=pViewSh->GetWindow(); if(pWin!=NULL) pWin->GrabFocus(); } } @@ -2887,7 +2887,7 @@ void ScDocShell::GetDocStat( ScDocStat& rDocStat ) } SfxDocumentInfoDialog* ScDocShell::CreateDocumentInfoDialog( - Window *pParent, const SfxItemSet &rSet ) + vcl::Window *pParent, const SfxItemSet &rSet ) { SfxDocumentInfoDialog* pDlg = new SfxDocumentInfoDialog( pParent, rSet ); ScDocShell* pDocSh = PTR_CAST(ScDocShell,SfxObjectShell::Current()); @@ -2908,7 +2908,7 @@ SfxDocumentInfoDialog* ScDocShell::CreateDocumentInfoDialog( return pDlg; } -Window* ScDocShell::GetActiveDialogParent() +vcl::Window* ScDocShell::GetActiveDialogParent() { ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); if ( pViewSh ) diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 4a81000ea5e0..74ed3063c01e 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -620,7 +620,7 @@ void ScDocShell::SetChangeComment( ScChangeAction* pAction, const OUString& rCom } } -void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pParent, bool bPrevNext) +void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, vcl::Window* pParent, bool bPrevNext) { if (!pAction) return; // ohne Aktion ist nichts.. diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 631f61b136b6..8027dc8577ff 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -303,7 +303,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); if (pViewSh && bValid && !aChartName.isEmpty() ) { - Window* pParent = pViewSh->GetDialogParent(); + vcl::Window* pParent = pViewSh->GetDialogParent(); SCCOL nCol1 = aSingleRange.aStart.Col(); SCROW nRow1 = aSingleRange.aStart.Row(); @@ -562,7 +562,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) // xmlsec05/06: // getting real parent window when called from Security-Options TP - Window* pParent = NULL; + vcl::Window* pParent = NULL; const SfxPoolItem* pParentItem; if( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr(); @@ -621,7 +621,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) case SID_CHG_PROTECT : { - Window* pParent = NULL; + vcl::Window* pParent = NULL; const SfxPoolItem* pParentItem; if( pReqArgs && SfxItemState::SET == pReqArgs->GetItemState( SID_ATTR_XWINDOW, false, &pParentItem ) ) pParent = ( ( const XWindowItem* ) pParentItem )->GetWindowPtr(); @@ -1116,7 +1116,7 @@ void UpdateAcceptChangesDialog() } } -bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQueryIfProtected ) +bool ScDocShell::ExecuteChangeProtectionDialog( vcl::Window* _pParent, bool bJustQueryIfProtected ) { bool bDone = false; ScChangeTrack* pChangeTrack = aDocument.GetChangeTrack(); diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index f0bb58fd6caa..06186c769aac 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -69,7 +69,7 @@ void ScDocShell::ErrorMessage( sal_uInt16 nGlobStrId ) { //! StopMarking an der (aktiven) View? - Window* pParent = GetActiveDialogParent(); + vcl::Window* pParent = GetActiveDialogParent(); ScWaitCursorOff aWaitOff( pParent ); bool bFocus = pParent && pParent->HasFocus(); diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 8468f47c5c04..61f97e60cee9 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -136,7 +136,7 @@ void ScDocShell::SetVisAreaOrSize( const Rectangle& rVisArea, bool bModifyStart SvInPlaceEnvironment* pEnv = GetIPEnv(); if (pEnv) { - Window* pWin = pEnv->GetEditWin(); + vcl::Window* pWin = pEnv->GetEditWin(); pEnv->MakeScale( aArea.GetSize(), MAP_100TH_MM, pWin->LogicToPixel( aArea.GetSize() ) ); } */ @@ -530,7 +530,7 @@ void ScDocShell::CheckConfigOptions() ScTabViewShell* pViewShell = GetBestViewShell(); if (pViewShell) { - Window* pParent = pViewShell->GetFrameWin(); + vcl::Window* pParent = pViewShell->GetFrameWin(); InfoBox aBox(pParent, ScGlobal::GetRscString(STR_OPTIONS_WARN_SEPARATORS)); aBox.Execute(); } diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx index 419778f0bf29..7da7c3855d8c 100644 --- a/sc/source/ui/docshell/documentlinkmgr.cxx +++ b/sc/source/ui/docshell/documentlinkmgr.cxx @@ -129,7 +129,7 @@ bool DocumentLinkManager::hasDdeLinks() const return false; } -bool DocumentLinkManager::updateDdeLinks( Window* pWin ) +bool DocumentLinkManager::updateDdeLinks( vcl::Window* pWin ) { if (!mpImpl->mpLinkManager) return false; diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index adcf1e98e931..bfed0655d84f 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1328,7 +1328,7 @@ void ScExternalRefLink::Closed() return SUCCESS; } -void ScExternalRefLink::Edit(Window* pParent, const Link& /*rEndEditHdl*/) +void ScExternalRefLink::Edit(vcl::Window* pParent, const Link& /*rEndEditHdl*/) { SvBaseLink::Edit(pParent, LINK(this, ScExternalRefLink, ExternalRefEndEditHdl)); } diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 446530cfd96c..b9a462c6dce9 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -48,7 +48,7 @@ struct TableLink_Impl { ScDocShell* m_pDocSh; - Window* m_pOldParent; + vcl::Window* m_pOldParent; Link m_aEndEditLink; TableLink_Impl() : m_pDocSh( NULL ), m_pOldParent( NULL ) {} @@ -106,7 +106,7 @@ ScTableLink::~ScTableLink() delete pImpl; } -void ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl ) +void ScTableLink::Edit( vcl::Window* pParent, const Link& rEndEditHdl ) { // DefModalDialogParent setzen, weil evtl. aus der DocShell beim ConvertFrom // ein Optionen-Dialog kommt... diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 892cc1d2008f..7895be53451e 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -27,12 +27,12 @@ // Dokumentinfo-Tabpage: -SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet* rSet ) +SfxTabPage* ScDocStatPage::Create( vcl::Window *pParent, const SfxItemSet* rSet ) { return new ScDocStatPage( pParent, *rSet ); } -ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) +ScDocStatPage::ScDocStatPage( vcl::Window *pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "StatisticsInfoPage", "modules/scalc/ui/statisticsinfopage.ui", &rSet ) { get(m_pFtTables,"nosheets"); diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 4cf5ca959641..32257f897f1d 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -101,7 +101,7 @@ static void lcl_setModified( SfxObjectShell* pShell ) void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) { sal_uInt16 nSlot = rReq.GetSlot(); - Window* pWin = pViewData->GetActiveWin(); + vcl::Window* pWin = pViewData->GetActiveWin(); ScDrawView* pView = pViewData->GetScDrawView(); SdrModel* pDoc = pViewData->GetDocument()->GetDrawLayer(); @@ -314,7 +314,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) } } -void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, Window* pWin ) +void ScDrawShell::ExecuteMacroAssign( SdrObject* pObj, vcl::Window* pWin ) { SvxMacroItem aItem ( SfxGetpApp()->GetPool().GetWhich( SID_ATTR_MACROITEM ) ); ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj, true ); diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 9c7a9bbc0437..73ab0cd8ff5b 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -282,7 +282,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet ) { Point aMousePos = pViewData->GetMousePosPixel(); - Window* pWindow = pViewData->GetActiveWin(); + vcl::Window* pWindow = pViewData->GetActiveWin(); ScDrawView* pDrView = pViewData->GetScDrawView(); Point aPos = pWindow->PixelToLogic(aMousePos); bool bHasMarked = pDrView->AreObjectsMarked(); diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 83bb2c0ad6bf..5a82ec95bc23 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -502,7 +502,7 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet ) // create listener pClipEvtLstnr = new TransferableClipboardListener( LINK( this, ScDrawTextObjectBar, ClipboardChanged ) ); pClipEvtLstnr->acquire(); - Window* pWin = pViewData->GetActiveWin(); + vcl::Window* pWin = pViewData->GetActiveWin(); pClipEvtLstnr->AddRemoveListener( pWin, true ); // get initial state diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx index 1ded6ea6741d..0340bcfe1d8b 100644 --- a/sc/source/ui/drawfunc/fuconarc.cxx +++ b/sc/source/ui/drawfunc/fuconarc.cxx @@ -32,7 +32,7 @@ |* \************************************************************************/ -FuConstArc::FuConstArc( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuConstArc::FuConstArc( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) : FuConstruct( pViewSh, pWin, pViewP, pDoc, rReq ) { diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 17ccbd4d8cac..d37d247b8ed0 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star; -FuConstCustomShape::FuConstCustomShape( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) +FuConstCustomShape::FuConstCustomShape( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) : FuConstruct( pViewSh, pWin, pViewP, pDoc, rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index 250e54cc6322..6265683fdd68 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -33,7 +33,7 @@ |* \************************************************************************/ -FuConstPolygon::FuConstPolygon(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuConstPolygon::FuConstPolygon(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq) { diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 7d08431a6145..846de7792fd9 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -37,7 +37,7 @@ |* \************************************************************************/ -FuConstRectangle::FuConstRectangle(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuConstRectangle::FuConstRectangle(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq) { diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 4d7f695cd499..5a2fd1f62419 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -42,7 +42,7 @@ |* \************************************************************************/ -FuConstruct::FuConstruct(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuConstruct::FuConstruct(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuDraw(pViewSh, pWin, pViewP, pDoc, rReq) { diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx index 94419c60eb51..83e8c18ed06f 100644 --- a/sc/source/ui/drawfunc/fuconuno.cxx +++ b/sc/source/ui/drawfunc/fuconuno.cxx @@ -28,7 +28,7 @@ |* \************************************************************************/ -FuConstUnoControl::FuConstUnoControl(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuConstUnoControl::FuConstUnoControl(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq) , nInventor(0) diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx index 1a49040ffecf..23ba487d8342 100644 --- a/sc/source/ui/drawfunc/fudraw.cxx +++ b/sc/source/ui/drawfunc/fudraw.cxx @@ -47,7 +47,7 @@ |* \************************************************************************/ -FuDraw::FuDraw(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuDraw::FuDraw(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuPoor (pViewSh, pWin, pViewP, pDoc, rReq), aNewPointer ( POINTER_ARROW ), @@ -704,7 +704,7 @@ void FuDraw::Deactivate() |* \************************************************************************/ -static bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, Window* pWindow ) +static bool lcl_UrlHit( SdrView* pView, const Point& rPosPixel, vcl::Window* pWindow ) { SdrViewEvent aVEvt; MouseEvent aMEvt( rPosPixel, 1, 0, MOUSE_LEFT ); diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 3b96207d14ca..3c92010345c7 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -90,7 +90,7 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r static void lcl_InsertGraphic( const Graphic& rGraphic, const OUString& rFileName, const OUString& rFilterName, bool bAsLink, bool bApi, - ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView ) + ScTabViewShell* pViewSh, vcl::Window* pWindow, SdrView* pView ) { ScDrawView* pDrawView = pViewSh->GetScDrawView(); @@ -175,7 +175,7 @@ static void lcl_InsertGraphic( const Graphic& rGraphic, } static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi, - ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView, + ScTabViewShell* pViewSh, vcl::Window* pWindow, SdrView* pView, const Size& rPrefSize, bool const bLink ) { SdrPageView* pPV = pView->GetSdrPageView(); @@ -226,7 +226,7 @@ static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi, \************************************************************************/ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh, - Window* pWin, + vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) @@ -331,7 +331,7 @@ void FuInsertGraphic::Deactivate() \************************************************************************/ FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh, - Window* pWin, + vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) : diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 0a7703d78142..535309bb7c01 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -195,7 +195,7 @@ void lcl_ChartInit( const uno::Reference < embed::XEmbeddedObject >& xObj, ScVie } -FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) { @@ -346,11 +346,11 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie xObj->setVisualAreaSize( nAspect, aSz ); // re-convert aSize to 1/100th mm to avoid rounding errors in comparison below - aSize = Window::LogicToLogic( aTmp, + aSize = vcl::Window::LogicToLogic( aTmp, MapMode( aMapUnit ), aMap100 ); } else - aSize = Window::LogicToLogic( aSize, + aSize = vcl::Window::LogicToLogic( aSize, MapMode( aMapUnit ), aMap100 ); } @@ -426,7 +426,7 @@ void FuInsertOLE::Deactivate() FuPoor::Deactivate(); } -FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) { @@ -533,7 +533,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* } if (bSizeCh) { - aSize = Window::LogicToLogic( aSize, MapMode( MAP_100TH_MM ), MapMode( aMapUnit ) ); + aSize = vcl::Window::LogicToLogic( aSize, MapMode( MAP_100TH_MM ), MapMode( aMapUnit ) ); aSz.Width = aSize.Width(); aSz.Height = aSize.Height(); xObj->setVisualAreaSize( nAspect, aSz ); @@ -776,7 +776,7 @@ void FuInsertChart::Deactivate() FuPoor::Deactivate(); } -FuInsertChartFromFile::FuInsertChartFromFile( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuInsertChartFromFile::FuInsertChartFromFile( ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq, const OUString& rURL): FuPoor(pViewSh, pWin, pViewP, pDoc, rReq) { diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 5d5b4ebd8867..9a331363c95d 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -30,7 +30,7 @@ #include <vcl/svapp.hxx> #include <svx/sdrhittesthelper.hxx> -FuPoor::FuPoor(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuPoor::FuPoor(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : pView(pViewP), pViewShell(pViewSh), diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 75fea9f31369..35feb3fd0b50 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -63,7 +63,7 @@ using namespace com::sun::star; |* \************************************************************************/ -FuSelection::FuSelection(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuSelection::FuSelection(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) : FuDraw(pViewSh, pWin, pViewP, pDoc, rReq), bVCAction(false) diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index ec407b1fe328..cb33a3260966 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -106,7 +106,7 @@ static void lcl_UpdateHyphenator( Outliner& rOutliner, SdrObject* pObj ) |* \************************************************************************/ -FuText::FuText(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, +FuText::FuText(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq) : FuConstruct(pViewSh, pWin, pViewP, pDoc, rReq), pTextObj(NULL) diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 2951cae85d51..e602a5608641 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -57,7 +57,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID( ScFunctionChildWindow, FID_FUNCTION_BOX ) #* #************************************************************************/ -ScFunctionChildWindow::ScFunctionChildWindow( Window* pParentP, +ScFunctionChildWindow::ScFunctionChildWindow( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -87,7 +87,7 @@ ScFunctionChildWindow::ScFunctionChildWindow( Window* pParentP, #************************************************************************/ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, - SfxChildWindow *pCW, Window* pParent, const ResId& rResId ) : + SfxChildWindow *pCW, vcl::Window* pParent, const ResId& rResId ) : SfxDockingWindow( pBindingsP, pCW, pParent, rResId ), aPrivatSplit ( this, ResId( FT_SPLIT, *rResId.GetResMgr() ),SC_SPLIT_VERT), @@ -915,7 +915,7 @@ void ScFunctionDockWin::DoEnter() } if ( pCurSh ) { - Window* pShellWnd = pCurSh->GetWindow(); + vcl::Window* pShellWnd = pCurSh->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index e12f796451e4..aca2b706c5d7 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -64,7 +64,7 @@ ScAddress ScFormulaDlg::aCursorPos; // Initialisierung / gemeinsame Funktionen fuer Dialog ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, - Window* pParent, ScViewData* pViewData,formula::IFunctionManager* _pFunctionMgr ) + vcl::Window* pParent, ScViewData* pViewData,formula::IFunctionManager* _pFunctionMgr ) : formula::FormulaDlg( pB, pCW, pParent, true,true,true, _pFunctionMgr,this) , m_aHelper(this,pB) { diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx index 6bdfa3b022a5..d111b7970f34 100644 --- a/sc/source/ui/formdlg/privsplt.cxx +++ b/sc/source/ui/formdlg/privsplt.cxx @@ -34,7 +34,7 @@ #* #************************************************************************/ -ScPrivatSplit::ScPrivatSplit(Window* pParent, const ResId& rResId, +ScPrivatSplit::ScPrivatSplit(vcl::Window* pParent, const ResId& rResId, SC_SPLIT_DIRECTION eSplit) : Control(pParent, rResId) , nDeltaX(0) 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; 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 ); diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 36a36d01feb6..214bfb152172 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -32,7 +32,7 @@ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE #define ABS_DREF3D ABS_DREF | SCA_TAB_3D -ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* pViewData, const std::map<OUString, ScRangeName*>& aRangeMap, const ScAddress& aCursorPos, const bool bUndo ) : ScAnyRefDlg( pB, pCW, pParent, "DefineNameDialog", "modules/scalc/ui/definename.ui" ) diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index daa5cf3005bb..6cc2afc689d9 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -47,7 +47,7 @@ //logic -ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, +ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScViewData* ptrViewData, const ScAddress& aCursorPos, boost::ptr_map<OUString, ScRangeName>* pRangeMap ) : ScAnyRefDlg(pB, pCW, pParent, "ManageNamesDialog", "modules/scalc/ui/managenamesdialog.ui") diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index b03ccf4dfa26..faf2acc87850 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -26,7 +26,7 @@ #include "rangenam.hxx" #include "viewdata.hxx" -ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool ) +ScNamePasteDlg::ScNamePasteDlg( vcl::Window * pParent, ScDocShell* pShell, bool ) : ModalDialog( pParent, "InsertNameDialog", "modules/scalc/ui/insertname.ui" ) { get(m_pBtnPasteAll, "pasteall"); diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 029eca29e968..feab52a78dea 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -112,7 +112,7 @@ ScDocShell* ScContentTree::GetManualOrCurrent() // ScContentTree -ScContentTree::ScContentTree( Window* pParent, const ResId& rResId ) : +ScContentTree::ScContentTree( vcl::Window* pParent, const ResId& rResId ) : SvTreeListBox ( pParent, rResId ), aEntryImages ( ScResId( RID_IMAGELIST_NAVCONT ) ), nRootType ( SC_CONTENT_ROOT ), @@ -483,7 +483,7 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt ) case SC_CONTENT_GRAPHIC: case SC_CONTENT_DRAWING: { - Window* pWindow=(Window*)GetParent(pEntry); + vcl::Window* pWindow=(vcl::Window*)GetParent(pEntry); ScNavigatorDlg* pScNavigatorDlg = (ScNavigatorDlg*)pWindow; ScTabViewShell* pScTabViewShell = NULL; ScDrawView* pScDrawView = NULL; @@ -965,12 +965,12 @@ void ScContentTree::GetDrawNames( sal_uInt16 nType ) SvTreeListEntry* pChild=InsertEntry( aName, pParent ); if(pChild) pChild->SetMarked(false); - Window* pWindow=NULL; + vcl::Window* pWindow=NULL; ScTabViewShell* pScTabViewShell=NULL; ScDrawView* pScDrawView=NULL; ScNavigatorDlg* pScNavigatorDlg=NULL; if(pChild) - pWindow=(Window*)GetParent(pChild); + pWindow=(vcl::Window*)GetParent(pChild); if(pWindow) pScNavigatorDlg = (ScNavigatorDlg*)pWindow; if (pScNavigatorDlg!=NULL) @@ -1219,7 +1219,7 @@ static bool lcl_GetRange( ScDocument* pDoc, sal_uInt16 nType, const OUString& rN return bFound; } -static void lcl_DoDragObject( ScDocShell* pSrcShell, const OUString& rName, sal_uInt16 nType, Window* pWin ) +static void lcl_DoDragObject( ScDocShell* pSrcShell, const OUString& rName, sal_uInt16 nType, vcl::Window* pWin ) { ScDocument& rSrcDoc = pSrcShell->GetDocument(); ScDrawLayer* pModel = rSrcDoc.GetDrawLayer(); @@ -1257,7 +1257,7 @@ static void lcl_DoDragObject( ScDocShell* pSrcShell, const OUString& rName, sal_ } } -static void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, sal_uInt16 nFlags, Window* pWin ) +static void lcl_DoDragCells( ScDocShell* pSrcShell, const ScRange& rRange, sal_uInt16 nFlags, vcl::Window* pWin ) { ScMarkData aMark; aMark.SelectTable( rRange.aStart.Tab(), true ); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index f60f4b25d804..5881dc21e17b 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -70,7 +70,7 @@ void ScNavigatorDlg::ReleaseFocus() if ( pCurSh ) { - Window* pShellWnd = pCurSh->GetWindow(); + vcl::Window* pShellWnd = pCurSh->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); } @@ -480,7 +480,7 @@ ScNavigatorSettings::ScNavigatorSettings() : SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR ) ScNavigatorDialogWrapper::ScNavigatorDialogWrapper( - Window* pParent, + vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBind, SfxChildWinInfo* /* pInfo */ ) : @@ -552,7 +552,7 @@ void ScNavigatorDialogWrapper::Resizing( Size& rSize ) #define REGISTER_SLOT(i,id) \ ppBoundItems[i]=new ScNavigatorControllerItem(id,*this,rBindings); -ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Window* pParent, +ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl::Window* pParent, const bool bUseStyleSettingsBackground) : Window( pParent, ScResId(RID_SCDLG_NAVIGATOR) ), rBindings ( *pB ), // is used in CommandToolBox ctor diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 850c0b3840ca..0466e870c892 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -194,7 +194,7 @@ void ScScenarioListBox::DeleteScenario( bool bQueryBox ) // class ScScenarioWindow ------------------------------------------------ -ScScenarioWindow::ScScenarioWindow( Window* pParent, const OUString& aQH_List, +ScScenarioWindow::ScScenarioWindow( vcl::Window* pParent, const OUString& aQH_List, const OUString& aQH_Comment) : Window ( pParent, WB_TABSTOP | WB_DIALOGCONTROL ), aLbScenario ( *this ), diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 7682e20011c8..12a62b903fe7 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -121,7 +121,7 @@ ScCalcConfig::StringConversion toStringConversion(sal_Int32 nPos) } -ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rConfig) +ScCalcOptionsDialog::ScCalcOptionsDialog(vcl::Window* pParent, const ScCalcConfig& rConfig) : ModalDialog(pParent, "FormulaCalculationOptions", "modules/scalc/ui/formulacalculationoptions.ui") , maCalcA1(ScResId(SCSTR_FORMULA_SYNTAX_CALC_A1).toString()) @@ -150,23 +150,23 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rC mpBtnAutomaticSelectionTrue->SetToggleHdl(LINK(this, ScCalcOptionsDialog, BtnAutomaticSelectHdl)); - maCaptionStringRefSyntax = get<Window>("ref_syntax_caption")->GetText(); - maDescStringRefSyntax = get<Window>("ref_syntax_desc")->GetText(); - maUseFormulaSyntax = get<Window>("use_formula_syntax")->GetText(); + maCaptionStringRefSyntax = get<vcl::Window>("ref_syntax_caption")->GetText(); + maDescStringRefSyntax = get<vcl::Window>("ref_syntax_desc")->GetText(); + maUseFormulaSyntax = get<vcl::Window>("use_formula_syntax")->GetText(); - maCaptionStringConversion = get<Window>("string_conversion_caption")->GetText(); - maDescStringConversion = get<Window>("string_conversion_desc")->GetText(); - maStringConversionAsError = get<Window>("string_conversion_as_error")->GetText(); - maStringConversionAsZero = get<Window>("string_conversion_as_zero")->GetText(); - maStringConversionUnambiguous = get<Window>("string_conversion_unambiguous")->GetText(); - maStringConversionLocaleDependent = get<Window>("string_conversion_locale_dependent")->GetText(); + maCaptionStringConversion = get<vcl::Window>("string_conversion_caption")->GetText(); + maDescStringConversion = get<vcl::Window>("string_conversion_desc")->GetText(); + maStringConversionAsError = get<vcl::Window>("string_conversion_as_error")->GetText(); + maStringConversionAsZero = get<vcl::Window>("string_conversion_as_zero")->GetText(); + maStringConversionUnambiguous = get<vcl::Window>("string_conversion_unambiguous")->GetText(); + maStringConversionLocaleDependent = get<vcl::Window>("string_conversion_locale_dependent")->GetText(); - maCaptionEmptyStringAsZero = get<Window>("empty_str_as_zero_caption")->GetText(); - maDescEmptyStringAsZero = get<Window>("empty_str_as_zero_desc")->GetText(); + maCaptionEmptyStringAsZero = get<vcl::Window>("empty_str_as_zero_caption")->GetText(); + maDescEmptyStringAsZero = get<vcl::Window>("empty_str_as_zero_desc")->GetText(); - maCaptionOpenCLEnabled = get<Window>("opencl_enabled")->GetText(); - maDescOpenCLEnabled = get<Window>("opencl_enabled_desc")->GetText(); - maSoftware = get<Window>("software")->GetText(); + maCaptionOpenCLEnabled = get<vcl::Window>("opencl_enabled")->GetText(); + maDescOpenCLEnabled = get<vcl::Window>("opencl_enabled_desc")->GetText(); + maSoftware = get<vcl::Window>("software")->GetText(); mpLbSettings->set_height_request(8 * mpLbSettings->GetTextHeight()); mpLbSettings->SetStyle(mpLbSettings->GetStyle() | WB_CLIPCHILDREN | WB_FORCE_MAKEVISIBLE); diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 9097725bf4b6..a26b34437ba7 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -28,7 +28,7 @@ class ScCalcOptionsDialog : public ModalDialog { public: - ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rConfig); + ScCalcOptionsDialog(vcl::Window* pParent, const ScCalcConfig& rConfig); virtual ~ScCalcOptionsDialog(); DECL_LINK( SettingsSelHdl, Control* ); diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index a8080ef5ee70..b19eac983ea9 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -38,7 +38,7 @@ #include "opredlin.hxx" -ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( Window* pParent, +ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent,"OptChangesPage", "modules/scalc/ui/optchangespage.ui", &rSet), aAuthorStr (ScResId(SCSTR_AUTHOR)) @@ -59,7 +59,7 @@ ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage() { } -SfxTabPage* ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet ) +SfxTabPage* ScRedlineOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) { return new ScRedlineOptionsTabPage( pParent, *rSet ); } diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 662eeabf3210..b8a4e2e477e4 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -35,7 +35,7 @@ #include <math.h> -ScTpCalcOptions::ScTpCalcOptions(Window* pParent, const SfxItemSet& rCoreAttrs) +ScTpCalcOptions::ScTpCalcOptions(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "OptCalculatePage", "modules/scalc/ui/optcalculatepage.ui", &rCoreAttrs) , pOldOptions(new ScDocOptions( @@ -79,7 +79,7 @@ void ScTpCalcOptions::Init() m_pBtnDate1904->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) ); } -SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* ScTpCalcOptions::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new ScTpCalcOptions( pParent, *rAttrSet ) ); } diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 9dc16bacc7fe..10dc87bc0a89 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -15,7 +15,7 @@ #include "scresid.hxx" #include "appoptio.hxx" -ScTpCompatOptions::ScTpCompatOptions(Window *pParent, const SfxItemSet &rCoreAttrs) : +ScTpCompatOptions::ScTpCompatOptions(vcl::Window *pParent, const SfxItemSet &rCoreAttrs) : SfxTabPage(pParent, "OptCompatibilityPage","modules/scalc/ui/optcompatibilitypage.ui", &rCoreAttrs) { get(m_pLbKeyBindings,"keybindings"); @@ -25,7 +25,7 @@ ScTpCompatOptions::~ScTpCompatOptions() { } -SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet *rCoreAttrs) +SfxTabPage* ScTpCompatOptions::Create(vcl::Window *pParent, const SfxItemSet *rCoreAttrs) { return new ScTpCompatOptions(pParent, *rCoreAttrs); } diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 8dd1f4219baa..c53c61395e1f 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -16,7 +16,7 @@ #include "defaultsoptions.hxx" #include "document.hxx" -ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, const SfxItemSet &rCoreSet) : +ScTpDefaultsOptions::ScTpDefaultsOptions(vcl::Window *pParent, const SfxItemSet &rCoreSet) : SfxTabPage(pParent, "OptDefaultPage", "modules/scalc/ui/optdefaultpage.ui", &rCoreSet) { @@ -32,7 +32,7 @@ ScTpDefaultsOptions::~ScTpDefaultsOptions() { } -SfxTabPage* ScTpDefaultsOptions::Create(Window *pParent, const SfxItemSet *rCoreAttrs) +SfxTabPage* ScTpDefaultsOptions::Create(vcl::Window *pParent, const SfxItemSet *rCoreAttrs) { return new ScTpDefaultsOptions(pParent, *rCoreAttrs); } diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 0cedac43dcc2..01641e8796c4 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -38,7 +38,7 @@ using ::com::sun::star::lang::Locale; using ::com::sun::star::i18n::LocaleDataItem; -ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreAttrs) : +ScTpFormulaOptions::ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "OptFormula", "modules/scalc/ui/optformula.ui", &rCoreAttrs), mnDecSep(0) { @@ -220,7 +220,7 @@ IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Edit*, pEdit ) return 0; } -SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet* rCoreSet) +SfxTabPage* ScTpFormulaOptions::Create(vcl::Window* pParent, const SfxItemSet* rCoreSet) { return new ScTpFormulaOptions(pParent, *rCoreSet); } diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 9b65283d7cd1..99d13ac98256 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -27,7 +27,7 @@ #include "scresid.hxx" #include "sc.hrc" -ScTpPrintOptions::ScTpPrintOptions( Window* pParent, +ScTpPrintOptions::ScTpPrintOptions( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage ( pParent, "optCalcPrintPage", @@ -43,7 +43,7 @@ ScTpPrintOptions::~ScTpPrintOptions() { } -SfxTabPage* ScTpPrintOptions::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* ScTpPrintOptions::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return new ScTpPrintOptions( pParent, *rAttrSet ); } diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 71b038c8077a..aa331aae35db 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -44,7 +44,7 @@ static const sal_Unicode cDelimiter = ','; // Benutzerdefinierte Listen: -ScTpUserLists::ScTpUserLists( Window* pParent, +ScTpUserLists::ScTpUserLists( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage ( pParent, @@ -135,7 +135,7 @@ void ScTpUserLists::Init() } -SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet* rAttrSet ) +SfxTabPage* ScTpUserLists::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) { return ( new ScTpUserLists( pParent, *rAttrSet ) ); } diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 0beeeb909b20..2d81b53ecdcd 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -37,7 +37,7 @@ // STATIC DATA ----------------------------------------------------------- -ScTpContentOptions::ScTpContentOptions( Window* pParent, +ScTpContentOptions::ScTpContentOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage(pParent, "TpViewPage", "modules/scalc/ui/tpviewpage.ui", &rArgSet), pLocalOptions(0) @@ -98,7 +98,7 @@ ScTpContentOptions::~ScTpContentOptions() delete pLocalOptions; } -SfxTabPage* ScTpContentOptions::Create( Window* pParent, +SfxTabPage* ScTpContentOptions::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return new ScTpContentOptions(pParent, *rCoreSet); @@ -346,7 +346,7 @@ IMPL_LINK( ScTpContentOptions, GridHdl, ListBox*, pLb ) return 0; } -ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent, +ScTpLayoutOptions::ScTpLayoutOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage( pParent, "ScGeneralPage", "modules/scalc/ui/scgeneralpage.ui", &rArgSet), @@ -408,7 +408,7 @@ ScTpLayoutOptions::~ScTpLayoutOptions() { } -SfxTabPage* ScTpLayoutOptions::Create( Window* pParent, +SfxTabPage* ScTpLayoutOptions::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { ScTpLayoutOptions* pNew = new ScTpLayoutOptions(pParent, *rCoreSet); diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 982816334f2d..61a6ad69a0b3 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -86,7 +86,7 @@ static void printAddressFlags(sal_uInt16 nFlag) // class ScPrintAreasDlg -ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ) +ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent ) : ScAnyRefDlg(pB, pCW, pParent, "PrintAreasDialog", "modules/scalc/ui/printareasdialog.ui") , bDlgLostFocus(false) , pDoc(NULL) diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index 07d835cb649d..bfd430d0c977 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -42,7 +42,7 @@ Get(ATTR_PAGE_SHARED)).GetValue() ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, const OString& rID, const OUString& rUIXMLDescription ) @@ -58,7 +58,7 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, } ScHFEditHeaderDlg::ScHFEditHeaderDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -69,7 +69,7 @@ ScHFEditHeaderDlg::ScHFEditHeaderDlg( SfxViewFrame* pFrameP, } ScHFEditFooterDlg::ScHFEditFooterDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -80,7 +80,7 @@ ScHFEditFooterDlg::ScHFEditFooterDlg( SfxViewFrame* pFrameP, } ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -90,7 +90,7 @@ ScHFEditLeftHeaderDlg::ScHFEditLeftHeaderDlg( SfxViewFrame* pFrameP, } ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -100,7 +100,7 @@ ScHFEditRightHeaderDlg::ScHFEditRightHeaderDlg( SfxViewFrame* pFrameP, } ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -110,7 +110,7 @@ ScHFEditLeftFooterDlg::ScHFEditLeftFooterDlg( SfxViewFrame* pFrameP, } ScHFEditRightFooterDlg::ScHFEditRightFooterDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -120,7 +120,7 @@ ScHFEditRightFooterDlg::ScHFEditRightFooterDlg( SfxViewFrame* pFrameP, } ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -132,7 +132,7 @@ ScHFEditSharedHeaderDlg::ScHFEditSharedHeaderDlg( SfxViewFrame* pFrameP, } ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -144,7 +144,7 @@ ScHFEditSharedFooterDlg::ScHFEditSharedFooterDlg( SfxViewFrame* pFrameP, } ScHFEditAllDlg::ScHFEditAllDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, @@ -157,7 +157,7 @@ ScHFEditAllDlg::ScHFEditAllDlg( SfxViewFrame* pFrameP, } ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame* pFrameP, - Window* pParent, + vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle) : ScHFEditDlg( pFrameP, pParent, rCoreSet, rPageStyle, diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 6feb8f595fe2..d01f01c4265d 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -55,7 +55,7 @@ static ScEditWindow* pActiveEdWnd = NULL; // class ScHFEditPage -ScHFEditPage::ScHFEditPage( Window* pParent, +ScHFEditPage::ScHFEditPage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs, sal_uInt16 nWhichId, bool bHeader ) @@ -114,8 +114,8 @@ ScHFEditPage::ScHFEditPage( Window* pParent, //swap left/right areas and their lables in RTL mode if( Application::GetSettings().GetLayoutRTL() ) { - Window *pLeft = get<Window>("labelFT_LEFT"); - Window *pRight = get<Window>("labelFT_RIGHT"); + vcl::Window *pLeft = get<vcl::Window>("labelFT_LEFT"); + vcl::Window *pRight = get<vcl::Window>("labelFT_RIGHT"); sal_Int32 nOldLeftAttach = pLeft->get_grid_left_attach(); sal_Int32 nOldRightAttach = pRight->get_grid_left_attach(); pLeft->set_grid_left_attach(nOldRightAttach); @@ -827,50 +827,50 @@ IMPL_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn ) // class ScRightHeaderEditPage -ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet ) +ScRightHeaderEditPage::ScRightHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_HEADERRIGHT ), true ) {} -SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScRightHeaderEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScRightHeaderEditPage( pParent, *rCoreSet ) ); }; // class ScLeftHeaderEditPage -ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet ) +ScLeftHeaderEditPage::ScLeftHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_HEADERLEFT ), true ) {} -SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScLeftHeaderEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScLeftHeaderEditPage( pParent, *rCoreSet ) ); }; // class ScRightFooterEditPage -ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet ) +ScRightFooterEditPage::ScRightFooterEditPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_FOOTERRIGHT ), false ) {} -SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScRightFooterEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScRightFooterEditPage( pParent, *rCoreSet ) ); }; // class ScLeftFooterEditPage -ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet ) +ScLeftFooterEditPage::ScLeftFooterEditPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_FOOTERLEFT ), false ) {} -SfxTabPage* ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScLeftFooterEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScLeftFooterEditPage( pParent, *rCoreSet ) ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index d5e80c0c5399..21054e5effe2 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -40,7 +40,7 @@ // class ScHFPage -ScHFPage::ScHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) +ScHFPage::ScHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) : SvxHFPage ( pParent, rSet, nSetId ), aDataSet ( *rSet.GetPool(), @@ -234,12 +234,12 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl) // class ScHeaderPage -ScHeaderPage::ScHeaderPage( Window* pParent, const SfxItemSet& rSet ) +ScHeaderPage::ScHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet ) : ScHFPage( pParent, rSet, SID_ATTR_PAGE_HEADERSET ) { } -SfxTabPage* ScHeaderPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScHeaderPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScHeaderPage( pParent, *rCoreSet ) ); } @@ -251,12 +251,12 @@ const sal_uInt16* ScHeaderPage::GetRanges() // class ScFooterPage -ScFooterPage::ScFooterPage( Window* pParent, const SfxItemSet& rSet ) +ScFooterPage::ScFooterPage( vcl::Window* pParent, const SfxItemSet& rSet ) : ScHFPage( pParent, rSet, SID_ATTR_PAGE_FOOTERSET ) { } -SfxTabPage* ScFooterPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScFooterPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScFooterPage( pParent, *rCoreSet ) ); } diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index da94badf402e..c6ce541199a7 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -68,7 +68,7 @@ static void lcl_GetFieldData( ScHeaderFieldData& rData ) // class ScEditWindow -ScEditWindow::ScEditWindow( Window* pParent, WinBits nBits, ScEditWindowLocation eLoc ) +ScEditWindow::ScEditWindow( vcl::Window* pParent, WinBits nBits, ScEditWindowLocation eLoc ) : Control( pParent, nBits ), eLocation(eLoc), pAcc(NULL) @@ -129,7 +129,7 @@ ScEditWindow::~ScEditWindow() delete pEdView; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScEditWindow(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScEditWindow(vcl::Window *pParent, VclBuilder::stringmap &) { return new ScEditWindow (pParent, WB_BORDER|WB_TABSTOP, Left); } @@ -327,7 +327,7 @@ void ScEditWindow::LoseFocus() return pAcc; } -ScExtIButton::ScExtIButton(Window* pParent, WinBits nBits ) +ScExtIButton::ScExtIButton(vcl::Window* pParent, WinBits nBits ) : ImageButton(pParent,nBits), pPopupMenu(NULL) { nSelected=0; @@ -335,7 +335,7 @@ ScExtIButton::ScExtIButton(Window* pParent, WinBits nBits ) SetDropDown(PUSHBUTTON_DROPDOWN_TOOLBOX); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScExtIButton(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScExtIButton(vcl::Window *pParent, VclBuilder::stringmap &) { return new ScExtIButton (pParent, 0);// WB_BORDER|WB_TABSTOP); } diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index aa58550fd7f7..67793662e95d 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -79,7 +79,7 @@ static bool lcl_PutBoolItem( sal_uInt16 nWhich, #define SC_TPTABLE_SCALE_TO 1 #define SC_TPTABLE_SCALE_TO_PAGES 2 -ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) : +ScTablePage::ScTablePage( vcl::Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage( pParent, "SheetPrintPage","modules/scalc/ui/sheetprintpage.ui", &rCoreAttrs ) { @@ -132,7 +132,7 @@ const sal_uInt16* ScTablePage::GetRanges() return pPageTableRanges; } -SfxTabPage* ScTablePage::Create( Window* pParent, const SfxItemSet* rCoreSet ) +SfxTabPage* ScTablePage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScTablePage( pParent, *rCoreSet ) ); } diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 03432bec2530..3e59aea864ca 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -36,7 +36,7 @@ using namespace css::uno; namespace sc { namespace sidebar { AlignmentPropertyPanel::AlignmentPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "AlignmentPropertyPanel", "modules/scalc/ui/sidebaralignment.ui", rxFrame), @@ -186,7 +186,7 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG) } AlignmentPropertyPanel* AlignmentPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 1f0649c276cf..32c705ba2c02 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -40,7 +40,7 @@ class AlignmentPropertyPanel { public: static AlignmentPropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); @@ -92,7 +92,7 @@ private: // constructor/destuctor AlignmentPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~AlignmentPropertyPanel(); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index 49bfa73a0570..8d2ade9ab010 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -139,7 +139,7 @@ void CellAppearancePropertyPanel::EndCellBorderStylePopupMode(void) } CellAppearancePropertyPanel::CellAppearancePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent, "CellAppearancePropertyPanel", "modules/scalc/ui/sidebarcellappearance.ui", rxFrame), @@ -339,7 +339,7 @@ IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG) } CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 6538a70c5b3c..90cb2012d4df 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -49,7 +49,7 @@ private: public: static CellAppearancePropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); @@ -172,7 +172,7 @@ private: // constructor/destuctor CellAppearancePropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~CellAppearancePropertyPanel(); diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index ab45a9236a87..31b10db7dad2 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -42,7 +42,7 @@ namespace sc { namespace sidebar { #define FRM_VALID_OUTER 0x0f #define FRM_VALID_ALL 0xff -CellBorderStyleControl::CellBorderStyleControl(Window* pParent, CellAppearancePropertyPanel& rPanel) +CellBorderStyleControl::CellBorderStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel) : svx::sidebar::PopupControl(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE)), mrCellAppearancePropertyPanel(rPanel), maTBBorder1(this, ScResId(TB_BORDER1)), diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx index 3c353cba8781..7cf04e2d68fd 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx @@ -46,7 +46,7 @@ private: DECL_LINK(TB3SelectHdl, ToolBox *); public: - CellBorderStyleControl(Window* pParent, CellAppearancePropertyPanel& rPanel); + CellBorderStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel); virtual ~CellBorderStyleControl(void); }; diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.cxx b/sc/source/ui/sidebar/CellBorderStylePopup.cxx index 972b7762bcbf..ae491f611005 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.cxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.cxx @@ -23,7 +23,7 @@ namespace sc { namespace sidebar { CellBorderStylePopup::CellBorderStylePopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator) : Popup(pParent, rControlCreator, ::OUString("CellBorderStyle")) { diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.hxx b/sc/source/ui/sidebar/CellBorderStylePopup.hxx index 2cc6d43bb19e..de5b3727cafd 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.hxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.hxx @@ -28,7 +28,7 @@ class CellBorderStylePopup : public svx::sidebar::Popup { public : CellBorderStylePopup( - Window* pParent, + vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator); virtual ~CellBorderStylePopup(void); }; diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 32455bfb0467..fcb00dfd1510 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -33,7 +33,7 @@ namespace sc { namespace sidebar { -CellLineStyleControl::CellLineStyleControl(Window* pParent, CellAppearancePropertyPanel& rPanel) +CellLineStyleControl::CellLineStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel) : svx::sidebar::PopupControl(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE)), mrCellAppearancePropertyPanel(rPanel), maPushButtonMoreOptions(this, ScResId(PB_OPTIONS)), diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index 78efddac6995..a00079ac8dbd 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -45,7 +45,7 @@ private: DECL_LINK(PBClickHdl, PushButton*); public: - CellLineStyleControl(Window* pParent, CellAppearancePropertyPanel& rPanel); + CellLineStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel); void GetFocus() SAL_OVERRIDE; void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis); diff --git a/sc/source/ui/sidebar/CellLineStylePopup.cxx b/sc/source/ui/sidebar/CellLineStylePopup.cxx index 528bce04c395..fa56a7700824 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.cxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.cxx @@ -23,7 +23,7 @@ namespace sc { namespace sidebar { CellLineStylePopup::CellLineStylePopup ( - Window* pParent, + vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator) : Popup(pParent, rControlCreator, OUString("CellLineStyle")) { diff --git a/sc/source/ui/sidebar/CellLineStylePopup.hxx b/sc/source/ui/sidebar/CellLineStylePopup.hxx index 82c1a794a963..cfca1afe76b7 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.hxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.hxx @@ -28,7 +28,7 @@ class CellLineStylePopup : public svx::sidebar::Popup { public : CellLineStylePopup( - Window* pParent, + vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator); virtual ~CellLineStylePopup(void); diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx index ee2b9a7ec514..fc0d3e472dcb 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx @@ -23,7 +23,7 @@ namespace sc { namespace sidebar { -CellLineStyleValueSet::CellLineStyleValueSet( Window* pParent, const ResId& rResId) +CellLineStyleValueSet::CellLineStyleValueSet( vcl::Window* pParent, const ResId& rResId) : ValueSet( pParent, rResId ), pVDev(NULL), nSelItem(0) diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx index ad35fdc94873..969f346005d4 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx @@ -33,7 +33,7 @@ private: sal_uInt16 nSelItem; OUString maStrUnit[CELL_LINE_STYLE_ENTRIES]; public: - CellLineStyleValueSet( Window* pParent, const ResId& rResId); + CellLineStyleValueSet( vcl::Window* pParent, const ResId& rResId); virtual ~CellLineStyleValueSet(); void SetUnit(const OUString* str); diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index a63f065182e7..f19d78e3a503 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -46,7 +46,7 @@ const char UNO_INSERTFIXEDTEXT[] = ".uno:InsertFixedText"; namespace sc { namespace sidebar { NumberFormatPropertyPanel::NumberFormatPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) : PanelLayout(pParent,"NumberFormatPropertyPanel", "modules/scalc/ui/sidebarnumberformat.ui", rxFrame), @@ -167,7 +167,7 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatValueHdl, void*, EMPTYARG ) } NumberFormatPropertyPanel* NumberFormatPropertyPanel::Create ( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings) { diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 3c34b375694b..984257e92256 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -38,7 +38,7 @@ class NumberFormatPropertyPanel public: public: static NumberFormatPropertyPanel* Create( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); @@ -80,7 +80,7 @@ private: // constructor/destuctor NumberFormatPropertyPanel( - Window* pParent, + vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); virtual ~NumberFormatPropertyPanel(); diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index cd0e946ae389..cb7a91a5b6c8 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -93,7 +93,7 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( const sal_uInt64 nBindingsValue (aArguments.getOrDefault("SfxBindings", sal_uInt64(0))); SfxBindings* pBindings = reinterpret_cast<SfxBindings*>(nBindingsValue); - ::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); + vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(xParentWindow); if ( ! xParentWindow.is() || pParentWindow==NULL) throw RuntimeException( "PanelFactory::createUIElement called without ParentWindow", @@ -137,7 +137,7 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( } else if (DoesResourceEndWith("/NavigatorPanel")) { - Window* pPanel = new ScNavigatorDlg(pBindings, NULL, pParentWindow, false); + vcl::Window* pPanel = new ScNavigatorDlg(pBindings, NULL, pParentWindow, false); xElement = sfx2::sidebar::SidebarPanelBase::Create( rsResourceURL, xFrame, @@ -146,7 +146,7 @@ Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( } else if (DoesResourceEndWith("/FunctionsPanel")) { - Window* pPanel = new ScFunctionDockWin(pBindings, NULL, pParentWindow, ScResId(FID_FUNCTION_BOX)); + vcl::Window* pPanel = new ScFunctionDockWin(pBindings, NULL, pParentWindow, ScResId(FID_FUNCTION_BOX)); xElement = sfx2::sidebar::SidebarPanelBase::Create( rsResourceURL, xFrame, diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index 4502b111733c..c6dfe8e5d3c8 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -39,7 +39,7 @@ #include <svl/aeitem.hxx> #include <svx/flagsdef.hxx> -ScStyleDlg::ScStyleDlg( Window* pParent, +ScStyleDlg::ScStyleDlg( vcl::Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId ) diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 9750e70d9e8e..be1db435025f 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -229,7 +229,7 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName, sal_Int64 nAspect(embed::Aspects::MSOLE_CONTENT); MapUnit aMapUnit(VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( nAspect ) )); Size aSize(aInsRect.GetSize()); - aSize = Window::LogicToLogic( aSize, MapMode( MAP_100TH_MM ), MapMode( aMapUnit ) ); + aSize = vcl::Window::LogicToLogic( aSize, MapMode( MAP_100TH_MM ), MapMode( aMapUnit ) ); awt::Size aSz; aSz.Width = aSize.Width(); aSz.Height = aSize.Height(); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 9a255233e384..4fa327f198f7 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -300,7 +300,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScViewPaneBase::getReferredCells() namespace { - bool lcl_prepareFormShellCall( ScTabViewShell* _pViewShell, sal_uInt16 _nPane, FmFormShell*& _rpFormShell, Window*& _rpWindow, SdrView*& _rpSdrView ) + bool lcl_prepareFormShellCall( ScTabViewShell* _pViewShell, sal_uInt16 _nPane, FmFormShell*& _rpFormShell, vcl::Window*& _rpWindow, SdrView*& _rpSdrView ) { if ( !_pViewShell ) return false; @@ -323,7 +323,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFor uno::Reference< form::runtime::XFormController > xController; - Window* pWindow( NULL ); + vcl::Window* pWindow( NULL ); SdrView* pSdrView( NULL ); FmFormShell* pFormShell( NULL ); if ( lcl_prepareFormShellCall( pViewShell, nPane, pFormShell, pWindow, pSdrView ) ) @@ -349,7 +349,7 @@ void SAL_CALL ScViewPaneBase::setFormDesignMode( sal_Bool _DesignMode ) throw (u { SolarMutexGuard aGuard; - Window* pWindow( NULL ); + vcl::Window* pWindow( NULL ); SdrView* pSdrView( NULL ); FmFormShell* pFormShell( NULL ); if ( lcl_prepareFormShellCall( pViewShell, nPane, pFormShell, pWindow, pSdrView ) ) @@ -366,7 +366,7 @@ uno::Reference<awt::XControl> SAL_CALL ScViewPaneBase::getControl( uno::Reference<awt::XControl> xRet; - Window* pWindow( NULL ); + vcl::Window* pWindow( NULL ); SdrView* pSdrView( NULL ); FmFormShell* pFormShell( NULL ); if ( lcl_prepareFormShellCall( pViewShell, nPane, pFormShell, pWindow, pSdrView ) ) @@ -1137,7 +1137,7 @@ uno::Reference< uno::XInterface > ScTabViewObj::GetClickedObject(const Point& rP if (pDrawPage && pDrawView && pDrawView->GetSdrPageView()) { - Window* pActiveWin = rData.GetActiveWin(); + vcl::Window* pActiveWin = rData.GetActiveWin(); Point aPos = pActiveWin->PixelToLogic(rPoint); sal_uInt16 nHitLog = (sal_uInt16) pActiveWin->PixelToLogic( @@ -1692,7 +1692,7 @@ void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRow pViewSh->RemoveSplit(); Point aWinStart; - Window* pWin = pViewSh->GetWindowByPos( SC_SPLIT_BOTTOMLEFT ); + vcl::Window* pWin = pViewSh->GetWindowByPos( SC_SPLIT_BOTTOMLEFT ); if (pWin) aWinStart = pWin->GetPosPixel(); @@ -1973,7 +1973,7 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName else if ( aString.equalsAscii( SC_UNO_VISAREASCREEN ) ) { ScViewData& rViewData = pViewSh->GetViewData(); - Window* pActiveWin = rViewData.GetActiveWin(); + vcl::Window* pActiveWin = rViewData.GetActiveWin(); if ( pActiveWin ) { Rectangle aRect = pActiveWin->GetWindowExtentsRelative( NULL ); diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 2e18439ff2c1..6a745588fc16 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -195,7 +195,7 @@ void implnPasteSpecial( const uno::Reference< frame::XModel>& xModel, InsertDele if ( pTabViewShell ) { ScViewData& rView = pTabViewShell->GetViewData(); - Window* pWin = rView.GetActiveWin(); + vcl::Window* pWin = rView.GetActiveWin(); if (pWin) { ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index a0cb6d060a67..9d76d4417fa2 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -152,24 +152,24 @@ private: void stopModelListening(); /** Returns the controller for the passed VCL window. */ - uno::Reference< frame::XController > getControllerForWindow( Window* pWindow ) const; + uno::Reference< frame::XController > getControllerForWindow( vcl::Window* pWindow ) const; /** Calls the Workbook_Window[Activate|Deactivate] event handler. */ - void processWindowActivateEvent( Window* pWindow, bool bActivate ); + void processWindowActivateEvent( vcl::Window* pWindow, bool bActivate ); /** Posts a Workbook_WindowResize user event. */ - void postWindowResizeEvent( Window* pWindow ); + void postWindowResizeEvent( vcl::Window* pWindow ); /** Callback link for Application::PostUserEvent(). */ - DECL_LINK( processWindowResizeEvent, Window* ); + DECL_LINK( processWindowResizeEvent, vcl::Window* ); private: - typedef ::std::map< Window*, uno::Reference< frame::XController > > WindowControllerMap; + typedef ::std::map< vcl::Window*, uno::Reference< frame::XController > > WindowControllerMap; ::osl::Mutex maMutex; ScVbaEventsHelper& mrVbaEvents; uno::Reference< frame::XModel > mxModel; ScDocShell* mpDocShell; WindowControllerMap maControllers; /// Maps VCL top windows to their controllers. - Window* mpActiveWindow; /// Currently activated window, to prevent multiple (de)activation. + vcl::Window* mpActiveWindow; /// Currently activated window, to prevent multiple (de)activation. bool mbWindowResized; /// True = window resize system event processed. bool mbBorderChanged; /// True = borders changed system event processed. bool mbDisposed; @@ -218,7 +218,7 @@ void ScVbaEventListener::startControllerListening( const uno::Reference< frame:: if( xControllerBorder.is() ) try { xControllerBorder->addBorderResizeListener( this ); } catch( uno::Exception& ) {} - if( Window* pWindow = VCLUnoHelper::GetWindow( xWindow ) ) + if( vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ) ) maControllers[ pWindow ] = rxController; } @@ -238,7 +238,7 @@ void ScVbaEventListener::stopControllerListening( const uno::Reference< frame::X if( xControllerBorder.is() ) try { xControllerBorder->removeBorderResizeListener( this ); } catch( uno::Exception& ) {} - if( Window* pWindow = VCLUnoHelper::GetWindow( xWindow ) ) + if( vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ) ) { maControllers.erase( pWindow ); if( pWindow == mpActiveWindow ) @@ -273,7 +273,7 @@ void SAL_CALL ScVbaEventListener::windowActivated( const lang::EventObject& rEve if( !mbDisposed ) { uno::Reference< awt::XWindow > xWindow( rEvent.Source, uno::UNO_QUERY ); - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); OSL_TRACE( "ScVbaEventListener::windowActivated - pWindow = 0x%p, mpActiveWindow = 0x%p", pWindow, mpActiveWindow ); // do not fire activation event multiple time for the same window if( pWindow && (pWindow != mpActiveWindow) ) @@ -295,7 +295,7 @@ void SAL_CALL ScVbaEventListener::windowDeactivated( const lang::EventObject& rE if( !mbDisposed ) { uno::Reference< awt::XWindow > xWindow( rEvent.Source, uno::UNO_QUERY ); - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); OSL_TRACE( "ScVbaEventListener::windowDeactivated - pWindow = 0x%p, mpActiveWindow = 0x%p", pWindow, mpActiveWindow ); // do not fire the deactivation event, if the window is not active (prevent multiple deactivation) if( pWindow && (pWindow == mpActiveWindow) ) @@ -444,13 +444,13 @@ void ScVbaEventListener::stopModelListening() } } -uno::Reference< frame::XController > ScVbaEventListener::getControllerForWindow( Window* pWindow ) const +uno::Reference< frame::XController > ScVbaEventListener::getControllerForWindow( vcl::Window* pWindow ) const { WindowControllerMap::const_iterator aIt = maControllers.find( pWindow ); return (aIt == maControllers.end()) ? uno::Reference< frame::XController >() : aIt->second; } -void ScVbaEventListener::processWindowActivateEvent( Window* pWindow, bool bActivate ) +void ScVbaEventListener::processWindowActivateEvent( vcl::Window* pWindow, bool bActivate ) { uno::Reference< frame::XController > xController = getControllerForWindow( pWindow ); if( xController.is() ) @@ -461,7 +461,7 @@ void ScVbaEventListener::processWindowActivateEvent( Window* pWindow, bool bActi } } -void ScVbaEventListener::postWindowResizeEvent( Window* pWindow ) +void ScVbaEventListener::postWindowResizeEvent( vcl::Window* pWindow ) { // check that the passed window is still alive (it must be registered in maControllers) if( pWindow && (maControllers.count( pWindow ) > 0) ) @@ -472,7 +472,7 @@ void ScVbaEventListener::postWindowResizeEvent( Window* pWindow ) } } -IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, Window*, EMPTYARG pWindow ) +IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, vcl::Window*, EMPTYARG pWindow ) { ::osl::MutexGuard aGuard( maMutex ); @@ -487,7 +487,7 @@ IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, Window*, EMPTYARG pWind if( !mbDisposed && pWindow && (maControllers.count( pWindow ) > 0) ) { // do not fire event unless all mouse buttons have been released - Window::PointerState aPointerState = pWindow->GetPointerState(); + vcl::Window::PointerState aPointerState = pWindow->GetPointerState(); if( (aPointerState.mnState & (MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT)) == 0 ) { uno::Reference< frame::XController > xController = getControllerForWindow( pWindow ); diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index a29ae357f88f..4976326d87db 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -207,7 +207,7 @@ void implnPasteSpecial(sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpt if ( pTabViewShell ) { ScViewData* pView = pTabViewShell->GetViewData(); - Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL; + vcl::Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL; if ( pView && pWin ) { if ( bAsLink && bOtherDoc ) diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 4af143c894f5..8a03fc4e8847 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -373,7 +373,7 @@ static bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDat void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ) { - Window* pWin = GetViewData()->GetActiveWin(); + vcl::Window* pWin = GetViewData()->GetActiveWin(); bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) ); @@ -467,7 +467,7 @@ bool checkDestRanges(ScViewData& rViewData) // Multiple destination ranges. ScDocument* pDoc = rViewData.GetDocument(); - Window* pWin = rViewData.GetActiveWin(); + vcl::Window* pWin = rViewData.GetActiveWin(); if (!pWin) return false; @@ -505,7 +505,7 @@ void ScCellShell::GetClipState( SfxItemSet& rSet ) // create listener pImpl->m_pClipEvtLstnr = new TransferableClipboardListener( LINK( this, ScCellShell, ClipboardChanged ) ); pImpl->m_pClipEvtLstnr->acquire(); - Window* pWin = GetViewData()->GetActiveWin(); + vcl::Window* pWin = GetViewData()->GetActiveWin(); pImpl->m_pClipEvtLstnr->AddRemoveListener( pWin, true ); // get initial state @@ -1047,7 +1047,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) if ( pViewFrame && pViewFrame->HasChildWindow( nWhich ) ) { SfxChildWindow* pChild = pViewFrame->GetChildWindow( nWhich ); - Window* pWin = ( pChild ? pChild->GetWindow() : NULL ); + vcl::Window* pWin = ( pChild ? pChild->GetWindow() : NULL ); if ( pWin && pWin->IsVisible() ) { bVisible = true; diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 93439bf32d11..bb9ce1ad1cae 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1258,7 +1258,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( nFormat ) { - Window* pWin = GetViewData()->GetActiveWin(); + vcl::Window* pWin = GetViewData()->GetActiveWin(); bool bCells = ( ScTransferObj::GetOwnClipboard( pWin ) != NULL ); bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL ); bool bOle = ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE ); @@ -1287,7 +1287,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) bool bAsLink = false; InsCellCmd eMoveMode = INS_NONE; - Window* pWin = GetViewData()->GetActiveWin(); + vcl::Window* pWin = GetViewData()->GetActiveWin(); ScDocument* pDoc = GetViewData()->GetDocument(); bool bOtherDoc = !pDoc->IsClipboardSource(); ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); @@ -1475,7 +1475,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) case SID_PASTE_ONLY_TEXT: case SID_PASTE_ONLY_FORMULA: { - Window* pWin = GetViewData()->GetActiveWin(); + vcl::Window* pWin = GetViewData()->GetActiveWin(); if ( ScTransferObj::GetOwnClipboard( pWin ) ) // own cell data { rReq.SetSlot( FID_INS_CELL_CONTENTS ); @@ -1499,7 +1499,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // differentiate between own cell data and draw objects/external data // this makes FID_INS_CELL_CONTENTS superfluous { - Window* pWin = GetViewData()->GetActiveWin(); + vcl::Window* pWin = GetViewData()->GetActiveWin(); // Clipboard-ID given as parameter? Basic "PasteSpecial(Format)" const SfxPoolItem* pItem=NULL; diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 273296b95ed8..09ba55e8c1fb 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -779,7 +779,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_AUTOFORMAT: { - Window* pDlgParent = pTabViewShell->GetDialogParent(); + vcl::Window* pDlgParent = pTabViewShell->GetDialogParent(); SCCOL nStartCol; SCROW nStartRow; SCTAB nStartTab; diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx index 2c3171c6b0d2..8b08840c6ba8 100644 --- a/sc/source/ui/view/cliputil.cxx +++ b/sc/source/ui/view/cliputil.cxx @@ -24,7 +24,7 @@ void ScClipUtil::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, bool bShowDialog ) { - Window* pWin = pViewData->GetActiveWin(); + vcl::Window* pWin = pViewData->GetActiveWin(); ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); ScDocument* pThisDoc = pViewData->GetDocument(); ScDPObject* pDPObj = pThisDoc->GetDPAtCursor( pViewData->GetCurX(), diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index 3bc9c474d707..e5608552ec0c 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -52,7 +52,7 @@ static OUString lcl_MetricString( long nTwips, const OUString& rText ) } } -ScColBar::ScColBar( Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, +ScColBar::ScColBar( vcl::Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : ScHeaderControl( pParent, pEng, MAXCOL+1, false ), pViewData( pData ), @@ -211,7 +211,7 @@ bool ScColBar::IsLayoutRTL() const // overloaded only for columns return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); } -ScRowBar::ScRowBar( Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, +ScRowBar::ScRowBar( vcl::Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : ScHeaderControl( pParent, pEng, MAXROW+1, true ), pViewData( pData ), diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index b0c0efc66e84..06b0f3120ba0 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -37,7 +37,7 @@ #include "queryentry.hxx" #include "markdata.hxx" -ScDBFunc::ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : +ScDBFunc::ScDBFunc( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScViewFunc( pParent, rDocSh, pViewShell ) { } diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx index 5c4396d5e8aa..1bab90d9a35d 100644 --- a/sc/source/ui/view/drawvie2.cxx +++ b/sc/source/ui/view/drawvie2.cxx @@ -28,12 +28,12 @@ void ScDrawView::UpdateBrowser() // VC's und den Browser dazu gibts nicht mehr... } -void ScDrawView::VCAddWin( Window* /* pWin */ ) +void ScDrawView::VCAddWin( vcl::Window* /* pWin */ ) { // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } -void ScDrawView::VCRemoveWin( Window* /* pWin */ ) +void ScDrawView::VCRemoveWin( vcl::Window* /* pWin */ ) { // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index d9c0a691ce6d..c2f73702bddf 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -88,7 +88,7 @@ void ScDrawView::CheckOle( const SdrMarkList& rMarkList, bool& rAnyOle, bool& rO } } -bool ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos ) +bool ScDrawView::BeginDrag( vcl::Window* pWindow, const Point& rStartPos ) { bool bReturn = false; @@ -520,7 +520,7 @@ void ScDrawView::SetMarkedOriginalSize() } if (pViewData) { - Window* pActWin = pViewData->GetActiveWin(); + vcl::Window* pActWin = pViewData->GetActiveWin(); if (pActWin) { aOriginalSize = pActWin->LogicToLogic( diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 8d7d71cd899b..718091033af3 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -509,7 +509,7 @@ void ScDrawView::MarkListHasChanged() if(OUTDEV_WINDOW == rOutDev.GetOutDevType()) { - ((Window&)rOutDev).Update(); + ((vcl::Window&)rOutDev).Update(); } } @@ -537,7 +537,7 @@ void ScDrawView::MarkListHasChanged() bool ScDrawView::SdrBeginTextEdit( SdrObject* pObj, SdrPageView* pPV, - ::Window* pWinL, + vcl::Window* pWinL, bool bIsNewObj, SdrOutliner* pGivenOutliner, OutlinerView* pGivenOutlinerView, @@ -817,7 +817,7 @@ void ScDrawView::LockCalcLayer( SdrLayerID nLayer, bool bLock ) SetLayerLocked( pLockLayer->GetName(), bLock ); } -void ScDrawView::MakeVisible( const Rectangle& rRect, Window& rWin ) +void ScDrawView::MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) { //! rWin richtig auswerten //! ggf Zoom aendern diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index e2f22472ba23..956cea9ccd59 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -780,7 +780,7 @@ void ScEditShell::GetClipState( SfxItemSet& rSet ) // create listener pClipEvtLstnr = new TransferableClipboardListener( LINK( this, ScEditShell, ClipboardChanged ) ); pClipEvtLstnr->acquire(); - Window* pWin = pViewData->GetActiveWin(); + vcl::Window* pWin = pViewData->GetActiveWin(); pClipEvtLstnr->AddRemoveListener( pWin, true ); // get initial state diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 48ec587da9b1..a2159a2856ec 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -842,7 +842,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) // If GetDefDialogParent is a dialog, it must be used // (style catalog) - Window* pParent = Application::GetDefDialogParent(); + vcl::Window* pParent = Application::GetDefDialogParent(); if ( !pParent || !pParent->IsDialog() ) { // GetDefDialogParent currently doesn't return the window diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 059d766099f9..e777df8c87f6 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -215,7 +215,7 @@ protected: void SelectHdl(); public: - ScFilterListBox( Window* pParent, ScGridWindow* pGrid, + ScFilterListBox( vcl::Window* pParent, ScGridWindow* pGrid, SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ); virtual ~ScFilterListBox(); @@ -234,7 +234,7 @@ public: }; // ListBox in einem FloatingWindow (pParent) -ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid, +ScFilterListBox::ScFilterListBox( vcl::Window* pParent, ScGridWindow* pGrid, SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ) : ListBox( pParent, WB_AUTOHSCROLL ), pGridWin( pGrid ), @@ -329,13 +329,13 @@ void ScFilterListBox::SelectHdl() class ScFilterFloatingWindow : public FloatingWindow { public: - ScFilterFloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN ); + ScFilterFloatingWindow( vcl::Window* pParent, WinBits nStyle = WB_STDFLOATWIN ); virtual ~ScFilterFloatingWindow(); // required for System FloatingWindows that will not process KeyInput by themselves - virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual vcl::Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; }; -ScFilterFloatingWindow::ScFilterFloatingWindow( Window* pParent, WinBits nStyle ) : +ScFilterFloatingWindow::ScFilterFloatingWindow( vcl::Window* pParent, WinBits nStyle ) : FloatingWindow( pParent, nStyle|WB_SYSTEMWINDOW ) // make it a system floater {} @@ -344,7 +344,7 @@ ScFilterFloatingWindow::~ScFilterFloatingWindow() EndPopupMode(); } -Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() +vcl::Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() { // redirect keyinput in the child window return GetWindow(WINDOW_FIRSTCHILD) ? GetWindow(WINDOW_FIRSTCHILD)->GetPreferredKeyInputWindow() : NULL; // will be the FilterBox @@ -422,7 +422,7 @@ static bool lcl_GetHyperlinkCell( } // WB_DIALOGCONTROL noetig fuer UNO-Controls -ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ) +ScGridWindow::ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ) : Window( pParent, WB_CLIPCHILDREN | WB_DIALOGCONTROL ), DropTargetHelper( this ), DragSourceHelper( this ), @@ -2656,7 +2656,7 @@ bool ScGridWindow::PreNotify( NotifyEvent& rNEvt ) sal_uInt16 nType = rNEvt.GetType(); if ( nType == EVENT_MOUSEBUTTONUP || nType == EVENT_MOUSEBUTTONDOWN ) { - Window* pWindow = rNEvt.GetWindow(); + vcl::Window* pWindow = rNEvt.GetWindow(); if (pWindow == this && pViewData) { SfxViewFrame* pViewFrame = pViewData->GetViewShell()->GetViewFrame(); @@ -2799,7 +2799,7 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) pViewData->GetView()->GetSelEngine()->Command( aDragEvent ); } -static void lcl_SetTextCursorPos( ScViewData* pViewData, ScSplitPos eWhich, Window* pWin ) +static void lcl_SetTextCursorPos( ScViewData* pViewData, ScSplitPos eWhich, vcl::Window* pWin ) { SCCOL nCol = pViewData->GetCurX(); SCROW nRow = pViewData->GetCurY(); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 4a2ecd02cc74..cbdd99d638fb 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -130,7 +130,7 @@ static void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, long nButtonY = bTextBelow ? aInner.Bottom() : aOuter.Top(); - ScDDComboBoxButton aComboButton((Window*)pDev); + ScDDComboBoxButton aComboButton((vcl::Window*)pDev); aComboButton.SetOptSizePixel(); long nBWidth = ( aComboButton.GetSizePixel().Width() * rZoomY.GetNumerator() ) / rZoomY.GetDenominator(); diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 9adb789f9ed7..632e79afe7be 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -189,10 +189,10 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard ) bool bHSplit = pViewData->GetHSplitMode() != SC_SPLIT_NONE; bool bVSplit = pViewData->GetVSplitMode() != SC_SPLIT_NONE; - Window* pLeft = pViewData->GetView()->GetWindowByPos( bVSplit ? SC_SPLIT_TOPLEFT : SC_SPLIT_BOTTOMLEFT ); - Window* pRight = bHSplit ? pViewData->GetView()->GetWindowByPos( bVSplit ? SC_SPLIT_TOPRIGHT : SC_SPLIT_BOTTOMRIGHT ) : 0; - Window* pBottom = bVSplit ? pViewData->GetView()->GetWindowByPos( SC_SPLIT_BOTTOMLEFT ) : 0; - Window* pDiagonal = (bHSplit && bVSplit) ? pViewData->GetView()->GetWindowByPos( SC_SPLIT_BOTTOMRIGHT ) : 0; + vcl::Window* pLeft = pViewData->GetView()->GetWindowByPos( bVSplit ? SC_SPLIT_TOPLEFT : SC_SPLIT_BOTTOMLEFT ); + vcl::Window* pRight = bHSplit ? pViewData->GetView()->GetWindowByPos( bVSplit ? SC_SPLIT_TOPRIGHT : SC_SPLIT_BOTTOMRIGHT ) : 0; + vcl::Window* pBottom = bVSplit ? pViewData->GetView()->GetWindowByPos( SC_SPLIT_BOTTOMLEFT ) : 0; + vcl::Window* pDiagonal = (bHSplit && bVSplit) ? pViewData->GetView()->GetWindowByPos( SC_SPLIT_BOTTOMRIGHT ) : 0; OSL_ENSURE( pLeft, "ScGridWindow::ShowNoteMarker - missing top-left grid window" ); /* If caption is shown from right or bottom windows, adjust diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 40997f2da53e..790786c693c4 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -44,7 +44,7 @@ #define SC_HDRPAINT_TEXT 6 #define SC_HDRPAINT_COUNT 7 -ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine, +ScHeaderControl::ScHeaderControl( vcl::Window* pParent, SelectionEngine* pSelectionEngine, SCCOLROW nNewSize, bool bNewVertical ) : Window ( pParent ), pSelEngine ( pSelectionEngine ), diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index e07cd4aa0b4d..afa1daf0944d 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.cxx @@ -24,7 +24,7 @@ #define HINT_INDENT 3 #define HINT_MARGIN 4 -ScHintWindow::ScHintWindow( Window* pParent, const OUString& rTit, const OUString& rMsg ) : +ScHintWindow::ScHintWindow( vcl::Window* pParent, const OUString& rTit, const OUString& rMsg ) : Window( pParent, WinBits( WB_BORDER ) ), aTitle( rTit ), aMessage( convertLineEnd(rMsg, LINEEND_CR) ) diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index f7171048f552..12ed0678ce46 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -34,7 +34,7 @@ #define SC_NOTEMARK_TIME 800 #define SC_NOTEMARK_SHORT 70 -ScNoteMarker::ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal, +ScNoteMarker::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 ) : pWindow( pWin ), @@ -112,7 +112,7 @@ IMPL_LINK_NOARG(ScNoteMarker, TimeHdl) return 0; } -static void lcl_DrawWin( SdrObject* pObject, Window* pWindow, const MapMode& rMap ) +static void lcl_DrawWin( SdrObject* pObject, vcl::Window* pWindow, const MapMode& rMap ) { MapMode aOld = pWindow->GetMapMode(); pWindow->SetMapMode( rMap ); diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 88590de2b441..da59eda93515 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -38,7 +38,7 @@ const sal_uInt16 SC_OL_IMAGE_MINUS = SC_OL_IMAGE_PLUS + 1; const sal_uInt16 SC_OL_IMAGE_NOTPRESSED = SC_OL_IMAGE_MINUS + 1; const sal_uInt16 SC_OL_IMAGE_PRESSED = SC_OL_IMAGE_NOTPRESSED + 1; -ScOutlineWindow::ScOutlineWindow( Window* pParent, ScOutlineMode eMode, ScViewData* pViewData, ScSplitPos eWhich ) : +ScOutlineWindow::ScOutlineWindow( vcl::Window* pParent, ScOutlineMode eMode, ScViewData* pViewData, ScSplitPos eWhich ) : Window( pParent ), mrViewData( *pViewData ), meWhich( eWhich ), diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index f6b3f31c8248..dbd970d60af7 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -83,7 +83,7 @@ static long lcl_GetDisplayStart( SCTAB nTab, ScDocument* pDoc, std::vector<long> return nDisplayStart; } -ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ) : +ScPreview::ScPreview( vcl::Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ) : Window( pParent ), nPageNo( 0 ), nZoom( 100 ), diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index e1c9a71cf206..798ac3a10aa6 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -100,11 +100,11 @@ SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, "PrintPreview" ) SFX_VIEW_REGISTRATION(ScDocShell); } -void ScPreviewShell::Construct( Window* pParent ) +void ScPreviewShell::Construct( vcl::Window* pParent ) { // Find the top-most window, and set the close window handler to intercept // the window close event. - Window* pWin = pParent; + vcl::Window* pWin = pParent; while (!pWin->IsSystemWindow()) { if (pWin->GetParent()) @@ -536,7 +536,7 @@ bool ScPreviewShell::HasPrintOptionsPage() const return true; } -SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ) +SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index ff4b8782d1a1..29f4b4d92ee6 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -55,7 +55,7 @@ SfxChildWinInfo ScValidityRefChildWin::GetInfo() const { SfxChildWinInfo anInfo = SfxChildWindow::GetInfo(); - if( Window *pWnd = GetWindow() ) + if( vcl::Window *pWnd = GetWindow() ) { anInfo.aSize = pWnd->GetSizePixel(); @@ -73,7 +73,7 @@ namespace } #define IMPL_CHILD_CTOR(Class,sid) \ - Class::Class( Window* pParentP, \ + Class::Class( vcl::Window* pParentP, \ sal_uInt16 nId, \ SfxBindings* p, \ SfxChildWinInfo* pInfo ) \ @@ -132,7 +132,7 @@ static long nScSimpleRefX; static long nScSimpleRefY; static bool bAutoReOpen = true; -ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( Window* pParentP, +ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* p, SfxChildWinInfo* pInfo ) @@ -228,7 +228,7 @@ void ScSimpleRefDlgWrapper::StartRefInput() // ScAcceptChgDlgWrapper //FIXME: should be moved into ViewShell -ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP, +ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -278,7 +278,7 @@ namespace } } -ScValidityRefChildWin::ScValidityRefChildWin( Window* pParentP, +ScValidityRefChildWin::ScValidityRefChildWin( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* p, SfxChildWinInfo* /*pInfo*/ ) diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index 2ba0735db856..3dcbe415db71 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -67,7 +67,7 @@ sal_uLong ScViewFunctionSet::CalcUpdateInterval( const Size& rWinSize, const Poi bool bLeftScroll, bool bTopScroll, bool bRightScroll, bool bBottomScroll ) { sal_uLong nUpdateInterval = SELENG_AUTOREPEAT_INTERVAL_MAX; - Window* pWin = pEngine->GetWindow(); + vcl::Window* pWin = pEngine->GetWindow(); Rectangle aScrRect = pWin->GetDesktopRectPixel(); Point aRootPos = pWin->OutputToAbsoluteScreenPixel(Point(0,0)); if (bRightScroll) @@ -202,7 +202,7 @@ void ScViewFunctionSet::BeginDrag() pTransferObj->SetDragSource( pDocSh, rMark ); - Window* pWindow = pViewData->GetActiveWin(); + vcl::Window* pWindow = pViewData->GetActiveWin(); if ( pWindow->IsTracking() ) pWindow->EndTracking( ENDTRACK_CANCEL ); // abort selecting @@ -732,7 +732,7 @@ void ScViewFunctionSet::DeselectAll() bAnchor = false; } -ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView, +ScViewSelectionEngine::ScViewSelectionEngine( vcl::Window* pWindow, ScTabView* pView, ScSplitPos eSplitPos ) : SelectionEngine( pWindow, &pView->GetFunctionSet() ), eWhich( eSplitPos ) @@ -916,7 +916,7 @@ void ScHeaderFunctionSet::DeselectAll() bAnchor = false; } -ScHeaderSelectionEngine::ScHeaderSelectionEngine( Window* pWindow, ScHeaderFunctionSet* pFuncSet ) : +ScHeaderSelectionEngine::ScHeaderSelectionEngine( vcl::Window* pWindow, ScHeaderFunctionSet* pFuncSet ) : SelectionEngine( pWindow, pFuncSet ) { SetSelectionMode( MULTIPLE_SELECTION ); diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index 65fc6dcd9863..43da32180ebb 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -39,7 +39,7 @@ SFX_IMPL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow, SID_SPELL_DIALOG ) -ScSpellDialogChildWindow::ScSpellDialogChildWindow( Window* pParentP, sal_uInt16 nId, +ScSpellDialogChildWindow::ScSpellDialogChildWindow( vcl::Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : ::svx::SpellDialogChildWindow( pParentP, nId, pBindings, pInfo ), mpViewShell( 0 ), diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 4d5a2e352da8..ad7e6bc54b1e 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -285,7 +285,7 @@ void ScSpellingEngine::ConvertAll( EditView& rEditView ) OSL_ENSURE( eState != EE_SPELL_NOSPELLER, "ScSpellingEngine::Convert - no spell checker" ); if( eState == EE_SPELL_NOLANGUAGE ) { - Window* pParent = GetDialogParent(); + vcl::Window* pParent = GetDialogParent(); ScWaitCursorOff aWaitOff( pParent ); InfoBox( pParent, ScGlobal::GetRscString( STR_NOLANGERR ) ).Execute(); } @@ -303,7 +303,7 @@ bool ScSpellingEngine::NeedsConversion() bool ScSpellingEngine::ShowTableWrapDialog() { - Window* pParent = GetDialogParent(); + vcl::Window* pParent = GetDialogParent(); ScWaitCursorOff aWaitOff( pParent ); MessBox aMsgBox( pParent, WinBits( WB_YES_NO | WB_DEF_YES ), ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), @@ -313,18 +313,18 @@ bool ScSpellingEngine::ShowTableWrapDialog() void ScSpellingEngine::ShowFinishDialog() { - Window* pParent = GetDialogParent(); + vcl::Window* pParent = GetDialogParent(); ScWaitCursorOff aWaitOff( pParent ); InfoBox( pParent, ScGlobal::GetRscString( STR_SPELLING_STOP_OK ) ).Execute(); } -Window* ScSpellingEngine::GetDialogParent() +vcl::Window* ScSpellingEngine::GetDialogParent() { sal_uInt16 nWinId = ScSpellDialogChildWindow::GetChildWindowId(); SfxViewFrame* pViewFrm = mrViewData.GetViewShell()->GetViewFrame(); if( pViewFrm->HasChildWindow( nWinId ) ) if( SfxChildWindow* pChild = pViewFrm->GetChildWindow( nWinId ) ) - if( Window* pWin = pChild->GetWindow() ) + if( vcl::Window* pWin = pChild->GetWindow() ) if( pWin->IsVisible() ) return pWin; diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 66484c27653d..914ead8adf0c 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -37,7 +37,7 @@ // STATIC DATA ----------------------------------------------------------- -ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) : +ScTabControl::ScTabControl( vcl::Window* pParent, ScViewData* pData ) : TabBar( pParent, WinBits(WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_RANGESELECT | WB_MULTISELECT | WB_DRAG ) ), DropTargetHelper( this ), @@ -488,7 +488,7 @@ void ScTabControl::DoDrag( const Region& /* rRegion */ ) pTransferObj->SetDragSource( pDocSh, aTabMark ); - Window* pWindow = pViewData->GetActiveWin(); + vcl::Window* pWindow = pViewData->GetActiveWin(); SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D pTransferObj->StartDrag( pWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK ); } diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index 80419ee58acd..c2f15e457bbf 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -23,7 +23,7 @@ #include <vcl/settings.hxx> -ScTabSplitter::ScTabSplitter( Window* pParent, WinBits nWinStyle, ScViewData* pData ) : +ScTabSplitter::ScTabSplitter( vcl::Window* pParent, WinBits nWinStyle, ScViewData* pData ) : Splitter( pParent, nWinStyle ), pViewData(pData) { @@ -61,7 +61,7 @@ void ScTabSplitter::MouseButtonDown( const MouseEvent& rMEvt ) void ScTabSplitter::Splitting( Point& rSplitPos ) { - Window* pParent = GetParent(); + vcl::Window* pParent = GetParent(); Point aScreenPos = pParent->OutputToNormalizedScreenPixel( rSplitPos ); pViewData->GetView()->SnapSplitPos( aScreenPos ); Point aNew = pParent->NormalizedScreenToOutputPixel( aScreenPos ); diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 40c41d55055b..9150af64bee9 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star; // Corner-Button -ScCornerButton::ScCornerButton( Window* pParent, ScViewData* pData, bool bAdditional ) : +ScCornerButton::ScCornerButton( vcl::Window* pParent, ScViewData* pData, bool bAdditional ) : Window( pParent, WinBits( 0 ) ), pViewData( pData ), bAdd( bAdditional ) @@ -184,7 +184,7 @@ static bool lcl_HasRowOutline( const ScViewData& rViewData ) return false; } -ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : +ScTabView::ScTabView( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : pFrameWin( pParent ), aViewData( &rDocSh, pViewShell ), pSelEngine( NULL ), @@ -271,7 +271,7 @@ IMPL_LINK_NOARG(ScTabView, TimerHdl) // --- Resize --------------------------------------------------------------------- -static void lcl_SetPosSize( Window& rWindow, const Point& rPos, const Size& rSize, +static void lcl_SetPosSize( vcl::Window& rWindow, const Point& rPos, const Size& rSize, long nTotalWidth, bool bLayoutRTL ) { Point aNewPos = rPos; @@ -870,7 +870,7 @@ void ScTabView::ActiveGrabFocus() pGridWin[ePos]->GrabFocus(); } -ScSplitPos ScTabView::FindWindow( Window* pWindow ) const +ScSplitPos ScTabView::FindWindow( vcl::Window* pWindow ) const { ScSplitPos eVal = SC_SPLIT_BOTTOMLEFT; // Default for (sal_uInt16 i=0; i<4; i++) @@ -1378,7 +1378,7 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY } } -inline void ShowHide( Window* pWin, bool bShow ) +inline void ShowHide( vcl::Window* pWin, bool bShow ) { OSL_ENSURE(pWin || !bShow, "Fenster ist nicht da"); if (pWin) @@ -1884,7 +1884,7 @@ Point ScTabView::GetMousePosPixel() return aPos; } -static bool lcl_MouseIsOverWin( const Point& rScreenPosPixel, Window* pWin ) +static bool lcl_MouseIsOverWin( const Point& rScreenPosPixel, vcl::Window* pWin ) { if (pWin) { @@ -1919,7 +1919,7 @@ void ScTabView::SnapSplitPos( Point& rScreenPosPixel ) if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ) ePos = SC_SPLIT_TOPLEFT; - Window* pWin = pGridWin[ePos]; + vcl::Window* pWin = pGridWin[ePos]; if (!pWin) { OSL_FAIL("Window NULL"); @@ -1950,7 +1950,7 @@ void ScTabView::FreezeSplitters( bool bFreeze ) ScSplitPos ePos = SC_SPLIT_BOTTOMLEFT; if ( eOldV != SC_SPLIT_NONE ) ePos = SC_SPLIT_TOPLEFT; - Window* pWin = pGridWin[ePos]; + vcl::Window* pWin = pGridWin[ePos]; bool bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); @@ -2072,7 +2072,7 @@ void ScTabView::SplitAtCursor() ScSplitPos ePos = SC_SPLIT_BOTTOMLEFT; if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ) ePos = SC_SPLIT_TOPLEFT; - Window* pWin = pGridWin[ePos]; + vcl::Window* pWin = pGridWin[ePos]; Point aWinStart = pWin->GetPosPixel(); SCCOL nPosX = aViewData.GetCurX(); @@ -2136,7 +2136,7 @@ void ScTabView::SetNewVisArea() pGridWin[i]->SetMapMode(aDrawMode[i]); } - Window* pActive = pGridWin[aViewData.GetActivePart()]; + vcl::Window* pActive = pGridWin[aViewData.GetActivePart()]; if (pActive) aViewData.GetViewShell()->VisAreaChanged( pActive->PixelToLogic(Rectangle(Point(),pActive->GetOutputSizePixel())) ); diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 93452fd1d844..c79d356065ae 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -1410,7 +1410,7 @@ void ScTabView::ErrorMessage( sal_uInt16 nGlobStrId ) StopMarking(); // falls per Focus aus MouseButtonDown aufgerufen - Window* pParent = aViewData.GetDialogParent(); + vcl::Window* pParent = aViewData.GetDialogParent(); ScWaitCursorOff aWaitOff( pParent ); bool bFocus = pParent && pParent->HasFocus(); diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 0e24bc2dc173..ba35eb87d86d 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -673,7 +673,7 @@ void ScTabView::RemoveHintWindow() } // find window that should not be over the cursor -static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) +static vcl::Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) { //! auch Spelling ??? (dann beim Aufruf Membervariable setzen) @@ -683,7 +683,7 @@ static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) SfxChildWindow* pChild = pViewFrm->GetChildWindow(SID_SEARCH_DLG); if (pChild) { - Window* pWin = pChild->GetWindow(); + vcl::Window* pWin = pChild->GetWindow(); if (pWin && pWin->IsVisible()) return pWin; } @@ -695,7 +695,7 @@ static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) SfxChildWindow* pChild = pViewFrm->GetChildWindow(FID_CHG_ACCEPT); if (pChild) { - Window* pWin = pChild->GetWindow(); + vcl::Window* pWin = pChild->GetWindow(); if (pWin && pWin->IsVisible()) return pWin; } @@ -769,13 +769,13 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, if ( eMode == SC_FOLLOW_JUMP ) { - Window* pCare = lcl_GetCareWin( aViewData.GetViewShell()->GetViewFrame() ); + vcl::Window* pCare = lcl_GetCareWin( aViewData.GetViewShell()->GetViewFrame() ); if (pCare) { bool bLimit = false; Rectangle aDlgPixel; Size aWinSize; - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); if (pWin) { aDlgPixel = pCare->GetWindowExtentsRelative( pWin ); diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 85284311e604..5ddd896dbb59 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -67,7 +67,7 @@ void ScTabView::ShowRefTip() aHelp = aHelp.replaceFirst("%2", OUString::number(nCols) ); ScSplitPos eWhich = aViewData.GetActivePart(); - Window* pWin = pGridWin[eWhich]; + vcl::Window* pWin = pGridWin[eWhich]; if ( pWin ) { Point aStart = aViewData.GetScrPos( nStartX, nStartY, eWhich ); @@ -245,7 +245,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) // Tip-Hilfe fuer Auto-Fill if ( aViewData.GetRefType() == SC_REFTYPE_FILL && Help::IsQuickHelpEnabled() ) { - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); if ( pWin ) { OUString aHelpStr; diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index e553fc1b0891..4f263d61a450 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -536,7 +536,7 @@ void ScTabView::ScrollToObject( SdrObject* pDrawObj ) void ScTabView::MakeVisible( const Rectangle& rHMMRect ) { - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); Size aWinSize = pWin->GetOutputSizePixel(); SCTAB nTab = aViewData.GetTabNo(); diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index ce22a5f73415..b67f38023dfc 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -56,7 +56,7 @@ SdrView* ScTabViewShell::GetDrawView() const void ScTabViewShell::WindowChanged() { - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); ScDrawView* pDrView = GetScDrawView(); if (pDrView) @@ -81,7 +81,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) ScTabView* pTabView = GetViewData().GetView(); SfxBindings& rBindings = GetViewFrame()->GetBindings(); - Window* pWin = pTabView->GetActiveWin(); + vcl::Window* pWin = pTabView->GetActiveWin(); ScDrawView* pView = pTabView->GetScDrawView(); SdrModel* pDoc = pView->GetModel(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 9640e60508a7..f04e93174755 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -331,7 +331,7 @@ void ScTabViewShell::UpdateOleZoom() Size aObjSize = ((const SfxObjectShell*)pDocSh)->GetVisArea().GetSize(); if ( aObjSize.Width() > 0 && aObjSize.Height() > 0 ) { - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); Size aWinHMM = pWin->PixelToLogic( pWin->GetOutputSizePixel(), MAP_100TH_MM ); SetZoomFactor( Fraction( aWinHMM.Width(),aObjSize.Width() ), Fraction( aWinHMM.Height(),aObjSize.Height() ) ); @@ -434,7 +434,7 @@ void ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const // auf ganze Zellen anpassen (in 1/100 mm) Size aPixelSize = rRect.GetSize(); - Window* pWin = ((ScTabViewShell*)this)->GetActiveWin(); + vcl::Window* pWin = ((ScTabViewShell*)this)->GetActiveWin(); Size aLogicSize = pWin->PixelToLogic( aPixelSize ); const ScViewData& rViewData = GetViewData(); @@ -505,7 +505,7 @@ void ScTabViewShell::ReadUserDataSequence (const uno::Sequence < beans::Property void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::PropertyValue >& rSettings ) { - Window* pOldWin = GetActiveWin(); + vcl::Window* pOldWin = GetActiveWin(); bool bFocus = pOldWin && pOldWin->HasFocus(); GetViewData().ReadUserDataSequence(rSettings); @@ -514,7 +514,7 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper if ( GetViewData().IsPagebreakMode() ) SetCurSubShell( GetCurObjectSelectionType(), true ); - Window* pNewWin = GetActiveWin(); + vcl::Window* pNewWin = GetActiveWin(); if (pNewWin && pNewWin != pOldWin) { SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? @@ -540,7 +540,7 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper void ScTabViewShell::DoReadUserData( const OUString& rData ) { - Window* pOldWin = GetActiveWin(); + vcl::Window* pOldWin = GetActiveWin(); bool bFocus = pOldWin && pOldWin->HasFocus(); GetViewData().ReadUserData(rData); @@ -549,7 +549,7 @@ void ScTabViewShell::DoReadUserData( const OUString& rData ) if ( GetViewData().IsPagebreakMode() ) SetCurSubShell( GetCurObjectSelectionType(), true ); - Window* pNewWin = GetActiveWin(); + vcl::Window* pNewWin = GetActiveWin(); if (pNewWin && pNewWin != pOldWin) { SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? @@ -1065,7 +1065,7 @@ bool ScTabViewShell::HasPrintOptionsPage() const return true; } -SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ) +SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); @@ -1167,7 +1167,7 @@ void ScTabViewShell::StartSimpleRefDialog( pWnd->SetRefString( rInitVal ); pWnd->SetFlags( bCloseOnButtonUp, bSingleCell, bMultiSelection ); ScSimpleRefDlgWrapper::SetAutoReOpen( false ); - Window* pWin = pWnd->GetWindow(); + vcl::Window* pWin = pWnd->GetWindow(); pWin->SetText( rTitle ); pWnd->StartRefInput(); } @@ -1181,7 +1181,7 @@ void ScTabViewShell::StopSimpleRefDialog() ScSimpleRefDlgWrapper* pWnd = (ScSimpleRefDlgWrapper*)pViewFrm->GetChildWindow( nId ); if (pWnd) { - Window* pWin = pWnd->GetWindow(); + vcl::Window* pWin = pWnd->GetWindow(); if (pWin && pWin->IsSystemWindow()) ((SystemWindow*)pWin)->Close(); // calls abort handler } diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 3e4ddf8ddb67..289c7e85ce39 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -72,7 +72,7 @@ void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj ) // wird aus dem Paint gerufen uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef(); - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); // wenn schon connected ist, nicht nochmal SetObjArea/SetSizeScale @@ -106,7 +106,7 @@ bool ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) RemoveHintWindow(); uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef(); - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); ErrCode nErr = ERRCODE_NONE; bool bErrorShown = false; @@ -274,7 +274,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) SfxBindings& rBindings = GetViewFrame()->GetBindings(); ScTabView* pTabView = GetViewData().GetView(); - Window* pWin = pTabView->GetActiveWin(); + vcl::Window* pWin = pTabView->GetActiveWin(); ScDrawView* pView = pTabView->GetScDrawView(); ScDocShell* pDocSh = GetViewData().GetDocShell(); ScDocument& rDoc = pDocSh->GetDocument(); diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 35a6089c9ee3..04abff508635 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -113,7 +113,7 @@ void ScTabViewShell::SwitchBetweenRefDialogs(SfxModelessDialog* pDialog) SfxModelessDialog* ScTabViewShell::CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW, SfxChildWinInfo* pInfo, - Window* pParent, sal_uInt16 nSlotId ) + vcl::Window* pParent, sal_uInt16 nSlotId ) { // Dialog nur aufmachen, wenn ueber ScModule::SetRefDialog gerufen, damit // z.B. nach einem Absturz offene Ref-Dialoge nicht wiederkommen (#42341#). diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx index 22be8e158d5e..de13fc68b63c 100644 --- a/sc/source/ui/view/tabvwshd.cxx +++ b/sc/source/ui/view/tabvwshd.cxx @@ -35,7 +35,7 @@ //! Parent-Window fuer Dialoge //! Problem: OLE Server! -Window* ScTabViewShell::GetDialogParent() +vcl::Window* ScTabViewShell::GetDialogParent() { // if a ref-input dialog is open, use it as parent // (necessary when a slot is executed from the dialog's OK handler) @@ -47,7 +47,7 @@ Window* ScTabViewShell::GetDialogParent() SfxChildWindow* pChild = pViewFrm->GetChildWindow(nCurRefDlgId); if (pChild) { - Window* pWin = pChild->GetWindow(); + vcl::Window* pWin = pChild->GetWindow(); if (pWin && pWin->IsVisible()) return pWin; } diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 72e10f842bc6..30fe1927d504 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -242,7 +242,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) ScTabView* pTabView = GetViewData().GetView(); if( pTabView ) { - Window* pWin = pTabView->GetActiveWin(); + vcl::Window* pWin = pTabView->GetActiveWin(); if( pWin ) { pSearchDlg->SetDocWin( pWin ); @@ -312,7 +312,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) ScTabView* pTabView = GetViewData().GetView(); if( pTabView ) { - Window* pWin = pTabView->GetActiveWin(); + vcl::Window* pWin = pTabView->GetActiveWin(); if( pWin ) { pSearchDlg->SetDocWin( pWin ); diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index a89b31ce4f9a..688813c496b9 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -905,7 +905,7 @@ void ScViewData::ResetOldCursor() } Rectangle ScViewData::GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, - Window* pWin, const ScPatternAttr* pPattern, + vcl::Window* pWin, const ScPatternAttr* pPattern, bool bForceToTop ) { return ScEditUtil( pDoc, nPosX, nPosY, nTabNo, GetScrPos(nPosX,nPosY,eWhich,true), @@ -915,7 +915,7 @@ Rectangle ScViewData::GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, void ScViewData::SetEditEngine( ScSplitPos eWhich, ScEditEngineDefaulter* pNewEngine, - Window* pWin, SCCOL nNewX, SCROW nNewY ) + vcl::Window* pWin, SCCOL nNewX, SCROW nNewY ) { bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo ); ScHSplitPos eHWhich = WhichH(eWhich); @@ -1139,7 +1139,7 @@ void ScViewData::EditGrowX() ScEditEngineDefaulter* pEngine = (ScEditEngineDefaulter*) pCurView->GetEditEngine(); - Window* pWin = pCurView->GetWindow(); + vcl::Window* pWin = pCurView->GetWindow(); SCCOL nLeft = GetPosX(eHWhich); SCCOL nRight = nLeft + VisibleCellsX(eHWhich); @@ -1326,7 +1326,7 @@ void ScViewData::EditGrowY( bool bInitial ) } EditEngine* pEngine = pCurView->GetEditEngine(); - Window* pWin = pCurView->GetWindow(); + vcl::Window* pWin = pCurView->GetWindow(); SCROW nBottom = GetPosY(eVWhich) + VisibleCellsY(eVWhich); @@ -2096,7 +2096,7 @@ const ScMarkData& ScViewData::GetMarkData() const return *mpMarkData; } -Window* ScViewData::GetDialogParent() +vcl::Window* ScViewData::GetDialogParent() { OSL_ENSURE( pViewShell, "GetDialogParent() ohne ViewShell" ); return pViewShell->GetDialogParent(); diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 8b0ace1610c0..fd2dee266295 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -439,7 +439,7 @@ void ScViewFunc::PasteDraw() ScViewData& rViewData = GetViewData(); SCCOL nPosX = rViewData.GetCurX(); SCROW nPosY = rViewData.GetCurY(); - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); Point aPos = pWin->PixelToLogic( rViewData.GetScrPos( nPosX, nPosY, rViewData.GetActivePart() ) ); ScDrawTransferObj* pDrawClip = ScDrawTransferObj::GetOwnClipboard( pWin ); @@ -455,7 +455,7 @@ void ScViewFunc::PasteFromSystem() { UpdateInputLine(); - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); ScDrawTransferObj* pDrawClip = ScDrawTransferObj::GetOwnClipboard( pWin ); @@ -582,7 +582,7 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran ScViewData& rViewData = GetViewData(); SCCOL nPosX = rViewData.GetCurX(); SCROW nPosY = rViewData.GetCurY(); - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); Point aPos = pWin->PixelToLogic( rViewData.GetScrPos( nPosX, nPosY, rViewData.GetActivePart() ) ); PasteDraw( aPos, pDrawClip->GetModel(), false, @@ -662,7 +662,7 @@ bool ScViewFunc::PasteFromSystem( sal_uLong nFormatId, bool bApi ) UpdateInputLine(); bool bRet = true; - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); if ( nFormatId == 0 && pOwnClip ) { @@ -768,7 +768,7 @@ static bool lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL namespace { -bool checkDestRangeForOverwrite(const ScRangeList& rDestRanges, const ScDocument* pDoc, const ScMarkData& rMark, Window* pParentWnd) +bool checkDestRangeForOverwrite(const ScRangeList& rDestRanges, const ScDocument* pDoc, const ScMarkData& rMark, vcl::Window* pParentWnd) { bool bIsEmpty = true; ScMarkData::const_iterator itrTab = rMark.begin(), itrTabEnd = rMark.end(); diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 05efdf5a0b10..8ddef3c7316a 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -95,11 +95,11 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, boost::scoped_ptr<ScTabEditEngine> pEngine(new ScTabEditEngine( *pPattern, rDoc.GetEnginePool() )); pEngine->EnableUndo( false ); - Window* pActWin = GetActiveWin(); + vcl::Window* pActWin = GetActiveWin(); if (pActWin) { pEngine->SetPaperSize(Size(100000,100000)); - Window aWin( pActWin ); + vcl::Window aWin( pActWin ); EditView aEditView( pEngine.get(), &aWin ); aEditView.SetOutputArea(Rectangle(0,0,100000,100000)); diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index fef41354be2b..b937eb3bf121 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -413,7 +413,7 @@ bool ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic, } Point aPos( rPos ); - Window* pWin = GetActiveWin(); + vcl::Window* pWin = GetActiveWin(); MapMode aSourceMap = rGraphic.GetPrefMapMode(); MapMode aDestMap( MAP_100TH_MM ); diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index a7ed961f7943..c3782e46561f 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -88,7 +88,7 @@ static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDo } } -ScViewFunc::ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : +ScViewFunc::ScViewFunc( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScTabView( pParent, rDocSh, pViewShell ), bFormatValid( false ) { diff --git a/sc/source/ui/view/waitoff.cxx b/sc/source/ui/view/waitoff.cxx index e0c3a6e8f9a4..a2ff18da928e 100644 --- a/sc/source/ui/view/waitoff.cxx +++ b/sc/source/ui/view/waitoff.cxx @@ -21,7 +21,7 @@ #include "waitoff.hxx" -ScWaitCursorOff::ScWaitCursorOff( Window* pWinP ) +ScWaitCursorOff::ScWaitCursorOff( vcl::Window* pWinP ) : pWin( pWinP ), nWaiters(0) diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 1d2d1b072eb0..6a81c2248d09 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -67,7 +67,7 @@ OUString getXPath( } ScXMLSourceDlg::ScXMLSourceDlg( - SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDoc) + SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, ScDocument* pDoc) : ScAnyRefDlg(pB, pCW, pParent, "XMLSourceDialog", "modules/scalc/ui/xmlsourcedialog.ui") , mpCurRefEntry(NULL) |