diff options
Diffstat (limited to 'svtools')
92 files changed, 281 insertions, 281 deletions
diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx index a42c6a0e2d42..c1f8e4689dbe 100644 --- a/svtools/inc/roadmap.hxx +++ b/svtools/inc/roadmap.hxx @@ -56,7 +56,7 @@ namespace svt void implInit(); public: - ORoadmap( Window* _pParent, WinBits _nWinStyle = 0 ); + ORoadmap( vcl::Window* _pParent, WinBits _nWinStyle = 0 ); virtual ~ORoadmap( ); void SetRoadmapBitmap( const BitmapEx& maBitmap, bool _bInvalidate = true ); @@ -109,7 +109,7 @@ namespace svt void DeselectOldRoadmapItems(); ItemId GetNextAvailableItemId( ItemIndex _NewIndex ); ItemId GetPreviousAvailableItemId( ItemIndex _NewIndex ); - RoadmapItem* GetByPointer(Window* pWindow); + RoadmapItem* GetByPointer(vcl::Window* pWindow); RoadmapItem* InsertHyperLabel( ItemIndex _Index, const OUString& _aStr, ItemId _RMID, bool _bEnabled = true ); void UpdatefollowingHyperLabels( ItemIndex _Index ); }; diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx index 9bd98251cff4..4df38f8eeaf5 100644 --- a/svtools/inc/table/gridtablerenderer.hxx +++ b/svtools/inc/table/gridtablerenderer.hxx @@ -83,8 +83,8 @@ namespace svt { namespace table bool i_hasControlFocus, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle ) SAL_OVERRIDE; - virtual void ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; - virtual void HideCellCursor( Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; + virtual void ShowCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; + virtual void HideCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) SAL_OVERRIDE; virtual bool FitsIntoCell( ::com::sun::star::uno::Any const & i_cellContent, ColPos const i_colPos, RowPos const i_rowPos, diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index 4cf5b4c0f5fe..7b0e01bf0b8d 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -65,7 +65,7 @@ namespace svt { namespace table public: - TableControl( Window* _pParent, WinBits _nStyle ); + TableControl( vcl::Window* _pParent, WinBits _nStyle ); virtual ~TableControl(); /// sets a new table model @@ -141,7 +141,7 @@ namespace svt { namespace table if the row, which should be removed, is selected, it will be erased from the vector */ SelectionEngine* getSelEngine(); - Window& getDataWindow(); + vcl::Window& getDataWindow(); // Window overridables virtual void GetFocus() SAL_OVERRIDE; @@ -166,11 +166,11 @@ namespace svt { namespace table // IAccessibleTable - virtual Rectangle GetWindowExtentsRelative( Window *pRelativeWindow ) const SAL_OVERRIDE; + virtual Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible( bool bCreate = true ) SAL_OVERRIDE; - virtual Window* GetAccessibleParentWindow() const SAL_OVERRIDE; - virtual Window* GetWindowInstance() SAL_OVERRIDE; + virtual vcl::Window* GetAccessibleParentWindow() const SAL_OVERRIDE; + virtual vcl::Window* GetWindowInstance() SAL_OVERRIDE; virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE; virtual bool ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint ) SAL_OVERRIDE; virtual long GetRowCount() const SAL_OVERRIDE; diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/svtools/inc/vclxaccessibleheaderbar.hxx index 31abcd6fd865..f283821e3b2a 100644 --- a/svtools/inc/vclxaccessibleheaderbar.hxx +++ b/svtools/inc/vclxaccessibleheaderbar.hxx @@ -67,7 +67,7 @@ private: class VCLXHeaderBar : public VCLXWindow { public: - VCLXHeaderBar(Window* pHeaderBar); + VCLXHeaderBar(vcl::Window* pHeaderBar); virtual ~VCLXHeaderBar(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE; diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index e2427b012e91..4416b2347537 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -113,7 +113,7 @@ void BrowseBox::ConstructImpl( BrowserMode nMode ) -BrowseBox::BrowseBox( Window* pParent, WinBits nBits, BrowserMode nMode ) +BrowseBox::BrowseBox( vcl::Window* pParent, WinBits nBits, BrowserMode nMode ) :Control( pParent, nBits | WB_3DLOOK ) ,DragSourceHelper( this ) ,DropTargetHelper( this ) @@ -124,7 +124,7 @@ BrowseBox::BrowseBox( Window* pParent, WinBits nBits, BrowserMode nMode ) -BrowseBox::BrowseBox( Window* pParent, const ResId& rId, BrowserMode nMode ) +BrowseBox::BrowseBox( vcl::Window* pParent, const ResId& rId, BrowserMode nMode ) :Control( pParent, rId ) ,DragSourceHelper( this ) ,DropTargetHelper( this ) diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 7f0b0a85d0f8..74561dab7749 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1101,7 +1101,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool -void BrowseBox::PaintData( Window& rWin, const Rectangle& rRect ) +void BrowseBox::PaintData( vcl::Window& rWin, const Rectangle& rRect ) { if ( !bBootstrapped && IsReallyVisible() ) BrowseBox::StateChanged( STATE_CHANGE_INITSHOW ); @@ -2028,7 +2028,7 @@ void BrowseBox::SetCursorColor(const Color& _rCol) Rectangle BrowseBox::calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if ( !_bOnScreen ) pParent = GetAccessibleParentWindow(); @@ -2052,7 +2052,7 @@ Rectangle BrowseBox::calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen) Rectangle BrowseBox::calcTableRect(bool _bOnScreen) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if ( !_bOnScreen ) pParent = GetAccessibleParentWindow(); @@ -2068,7 +2068,7 @@ Rectangle BrowseBox::calcTableRect(bool _bOnScreen) Rectangle BrowseBox::GetFieldRectPixelAbs( sal_Int32 _nRowId, sal_uInt16 _nColId, bool /*_bIsHeader*/, bool _bOnScreen ) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if ( !_bOnScreen ) pParent = GetAccessibleParentWindow(); diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 76f932098db9..d2a44ffe8464 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -87,7 +87,7 @@ namespace svt Reference< XAccessible > BrowseBox::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); DBG_ASSERT( pParent, "BrowseBox::CreateAccessible - parent not found" ); if( pParent && !m_pImpl->m_pAccessible) @@ -542,7 +542,7 @@ bool BrowseBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector ); } -Rectangle BrowseBox::GetWindowExtentsRelative( Window *pRelativeWindow ) const +Rectangle BrowseBox::GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const { return Control::GetWindowExtentsRelative( pRelativeWindow ); } @@ -557,12 +557,12 @@ Reference< XAccessible > BrowseBox::GetAccessible( bool bCreate ) return Control::GetAccessible( bCreate ); } -Window* BrowseBox::GetAccessibleParentWindow() const +vcl::Window* BrowseBox::GetAccessibleParentWindow() const { return Control::GetAccessibleParentWindow(); } -Window* BrowseBox::GetWindowInstance() +vcl::Window* BrowseBox::GetWindowInstance() { return this; } diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index 396b40ce4d48..0803feb4a6ce 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -45,7 +45,7 @@ void ButtonFrame::Draw( OutputDevice& rDev ) if( rDev.GetOutDevType() == OUTDEV_WINDOW ) { - Window *pWin = (Window*) &rDev; + vcl::Window *pWin = (vcl::Window*) &rDev; if( bPressed ) pWin->DrawSelectionBackground( aRect, 0, true, false, false ); } @@ -242,7 +242,7 @@ void BrowserDataWin::LeaveUpdateLock() } -void InitSettings_Impl( Window *pWin, +void InitSettings_Impl( vcl::Window *pWin, bool bFont, bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = @@ -619,7 +619,7 @@ void BrowserDataWin::RequestHelp( const HelpEvent& rHEvt ) -BrowseEvent::BrowseEvent( Window* pWindow, +BrowseEvent::BrowseEvent( vcl::Window* pWindow, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ): pWin(pWindow), @@ -640,7 +640,7 @@ BrowserMouseEvent::BrowserMouseEvent( BrowserDataWin *pWindow, -BrowserMouseEvent::BrowserMouseEvent( Window *pWindow, const MouseEvent& rEvt, +BrowserMouseEvent::BrowserMouseEvent( vcl::Window *pWindow, const MouseEvent& rEvt, long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId, const Rectangle& rRect ): MouseEvent(rEvt), diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index be291cf42191..27cc8e1c44a8 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -104,7 +104,7 @@ class BrowserDataWin { public: BrowserHeader* pHeaderBar; // only for BROWSER_HEADERBAR_NEW - Window* pEventWin; // Window of forwarded events + vcl::Window* pEventWin; // Window of forwarded events ScrollBarBox* pCornerWin; // Window in the corner btw the ScrollBars bool bInDtor; AutoTimer aMouseTimer; // recalls MouseMove on dragging out @@ -199,14 +199,14 @@ class BrowserScrollBar: public ScrollBar BrowserDataWin* _pDataWin; public: - BrowserScrollBar( Window* pParent, WinBits nStyle, + BrowserScrollBar( vcl::Window* pParent, WinBits nStyle, BrowserDataWin *pDataWin ) : ScrollBar( pParent, nStyle ), _nTip( 0 ), _nLastPos( ULONG_MAX ), _pDataWin( pDataWin ) {} - //ScrollBar( Window* pParent, const ResId& rResId ); + //ScrollBar( vcl::Window* pParent, const ResId& rResId ); virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; virtual void EndScroll() SAL_OVERRIDE; @@ -214,7 +214,7 @@ public: -void InitSettings_Impl( Window *pWin, +void InitSettings_Impl( vcl::Window *pWin, bool bFont = true, bool bForeground = true, bool bBackground = true ); diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index da54a710f408..26807c03cdb3 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -41,7 +41,7 @@ namespace svt //= ComboBoxControl - ComboBoxControl::ComboBoxControl(Window* pParent, WinBits nWinStyle) + ComboBoxControl::ComboBoxControl(vcl::Window* pParent, WinBits nWinStyle) :ComboBox(pParent, nWinStyle|WB_DROPDOWN|WB_NOBORDER) { EnableAutoSize(false); @@ -149,7 +149,7 @@ namespace svt //= ListBoxControl - ListBoxControl::ListBoxControl(Window* pParent, WinBits nWinStyle) + ListBoxControl::ListBoxControl(vcl::Window* pParent, WinBits nWinStyle) :ListBox(pParent, nWinStyle|WB_DROPDOWN|WB_NOBORDER) { EnableAutoSize(false); @@ -246,7 +246,7 @@ namespace svt //= CheckBoxControl - CheckBoxControl::CheckBoxControl(Window* pParent, WinBits nWinStyle) + CheckBoxControl::CheckBoxControl(vcl::Window* pParent, WinBits nWinStyle) :Control(pParent, nWinStyle) { const Wallpaper& rParentBackground = pParent->GetBackground(); diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 59e33c69f9b8..4e7d6efc9ee2 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -47,7 +47,7 @@ namespace svt namespace { - sal_uInt16 getRealGetFocusFlags( Window* _pWindow ) + sal_uInt16 getRealGetFocusFlags( vcl::Window* _pWindow ) { sal_uInt16 nFlags = 0; while ( _pWindow && !nFlags ) @@ -133,7 +133,7 @@ namespace svt } - EditBrowseBox::EditBrowseBox(Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags, BrowserMode _nMode ) + EditBrowseBox::EditBrowseBox(vcl::Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags, BrowserMode _nMode ) :BrowseBox( pParent, rId, _nMode ) ,nStartEvent(0) ,nEndEvent(0) @@ -154,7 +154,7 @@ namespace svt } - EditBrowseBox::EditBrowseBox( Window* pParent, sal_Int32 nBrowserFlags, WinBits nBits, BrowserMode _nMode ) + EditBrowseBox::EditBrowseBox( vcl::Window* pParent, sal_Int32 nBrowserFlags, WinBits nBits, BrowserMode _nMode ) :BrowseBox( pParent, nBits, _nMode ) ,nStartEvent(0) ,nEndEvent(0) @@ -554,7 +554,7 @@ namespace svt // the position of the event relative to the controller's window Point aPos = _rEvt.GetPosPixel() - _rEvt.GetRect().TopLeft(); // the (child) window which should really get the event - Window* pRealHandler = aController->GetWindow().FindWindow(aPos); + vcl::Window* pRealHandler = aController->GetWindow().FindWindow(aPos); if (pRealHandler) // the coords relative to this real handler aPos -= pRealHandler->GetPosPixel(); @@ -570,7 +570,7 @@ namespace svt if (_bUp) pRealHandler->MouseButtonUp(aEvent); - Window *pWin = &aController->GetWindow(); + vcl::Window *pWin = &aController->GetWindow(); if (!pWin->IsTracking()) { for (pWin = pWin->GetWindow(WINDOW_FIRSTCHILD); @@ -916,7 +916,7 @@ namespace svt if (nNewRow != nEditRow) { - Window& rWindow = GetDataWindow(); + vcl::Window& rWindow = GetDataWindow(); if ((nEditRow >= 0) && (GetBrowserFlags() & EBBF_NO_HANDLE_COLUMN_CONTENT) == 0) { Rectangle aRect = GetFieldRectPixel(nEditRow, 0, false ); diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index b55404b65c90..79d554f00dd2 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -136,7 +136,7 @@ void EditBrowseBox::GrabTableFocus() void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags ) { bool bFocus = false; - for (Window* pWindow = Application::GetFocusWindow(); + for (vcl::Window* pWindow = Application::GetFocusWindow(); pWindow && !bFocus; pWindow = pWindow->GetParent()) bFocus = pWindow == this; diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index 793a7f39b84d..c8f25e7b047e 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -43,7 +43,7 @@ namespace svtools { -ODocumentInfoPreview::ODocumentInfoPreview(Window * pParent, WinBits nBits): +ODocumentInfoPreview::ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits): Window(pParent, WB_DIALOGCONTROL), m_pEditWin(this, nBits), m_pInfoTable(new SvtDocInfoTable_Impl), m_aLanguageTag(SvtPathOptions().GetLanguageTag()) // detect application language @@ -55,7 +55,7 @@ ODocumentInfoPreview::ODocumentInfoPreview(Window * pParent, WinBits nBits): ODocumentInfoPreview::~ODocumentInfoPreview() {} -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeODocumentInfoPreview(Window *pParent, VclBuilder::stringmap&) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeODocumentInfoPreview(vcl::Window *pParent, VclBuilder::stringmap&) { return new ODocumentInfoPreview(pParent, WB_BORDER | WB_READONLY); } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 6dbe87f6e392..1d2e63d33734 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -191,7 +191,7 @@ protected: virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const SAL_OVERRIDE; public: - ViewTabListBox_Impl( Window* pParentWin, SvtFileView_Impl* pParent, sal_Int16 nFlags ); + ViewTabListBox_Impl( vcl::Window* pParentWin, SvtFileView_Impl* pParent, sal_Int16 nFlags ); virtual ~ViewTabListBox_Impl(); virtual void Resize() SAL_OVERRIDE; @@ -563,7 +563,7 @@ OUString CreateExactSizeText( sal_Int64 nSize ) // class ViewTabListBox_Impl --------------------------------------------- -ViewTabListBox_Impl::ViewTabListBox_Impl( Window* pParentWin, +ViewTabListBox_Impl::ViewTabListBox_Impl( vcl::Window* pParentWin, SvtFileView_Impl* pParent, sal_Int16 nFlags ) : @@ -1062,7 +1062,7 @@ bool ViewTabListBox_Impl::Kill( const OUString& rContent ) } // class SvtFileView ----------------------------------------------------- -SvtFileView::SvtFileView( Window* pParent, WinBits nBits, +SvtFileView::SvtFileView( vcl::Window* pParent, WinBits nBits, bool bOnlyFolder, bool bMultiSelection ) : Control( pParent, nBits ) @@ -1095,7 +1095,7 @@ SvtFileView::~SvtFileView() delete pTemp; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtFileView(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvtFileView(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nBits = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK; @@ -2312,7 +2312,7 @@ void SvtFileView_Impl::SetActualFolder( const INetURLObject& rActualFolder ) namespace svtools { -QueryDeleteDlg_Impl::QueryDeleteDlg_Impl(Window* pParent, const OUString& rName) +QueryDeleteDlg_Impl::QueryDeleteDlg_Impl(vcl::Window* pParent, const OUString& rName) : MessageDialog(pParent, "QueryDeleteDialog", "svt/ui/querydeletedialog.ui") { get(m_pAllButton, "all"); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 44eadff34deb..0c39c577f24b 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -3664,7 +3664,7 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt ) sHelpText = sQuickHelpText; else sHelpText = aEntryText; - Help::ShowQuickHelp( (Window*)pView, aOptTextRect, sHelpText, QUICKHELP_LEFT | QUICKHELP_VCENTER ); + Help::ShowQuickHelp( (vcl::Window*)pView, aOptTextRect, sHelpText, QUICKHELP_LEFT | QUICKHELP_VCENTER ); } return true; diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 0689d688b0f8..da44f6e5ef64 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -70,7 +70,7 @@ SvxIconChoiceCtrlColumnInfo::SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtr | \*****************************************************************************/ -SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, WinBits nWinStyle ) : +SvtIconChoiceCtrl::SvtIconChoiceCtrl( vcl::Window* pParent, WinBits nWinStyle ) : // WB_CLIPCHILDREN on, as ScrollBars lie on the window! Control( pParent, nWinStyle | WB_CLIPCHILDREN ), @@ -493,7 +493,7 @@ void SvtIconChoiceCtrl::CallImplEventListeners(sal_uLong nEvent, void* pData) } ::com::sun::star::uno::Reference< XAccessible > SvtIconChoiceCtrl::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); DBG_ASSERT( pParent, "SvTreeListBox::CreateAccessible - accessible parent not found" ); ::com::sun::star::uno::Reference< XAccessible > xAccessible; diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 05a155612f4d..3de35c3f8e9d 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -26,13 +26,13 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -SvSimpleTableContainer::SvSimpleTableContainer(Window* pParent, WinBits nBits) +SvSimpleTableContainer::SvSimpleTableContainer(vcl::Window* pParent, WinBits nBits) : Control(pParent, nBits) , m_pTable(NULL) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvSimpleTableContainer(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvSimpleTableContainer(vcl::Window *pParent, VclBuilder::stringmap &) { return new SvSimpleTableContainer(pParent, WB_TABSTOP | WB_DIALOGCONTROL | WB_BORDER); diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index b11ec76af6f3..82d59421e57e 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -396,7 +396,7 @@ void SvLBoxButton::Clone( SvLBoxItem* pSource ) pData = ((SvLBoxButton*)pSource)->pData; } -void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Window* i_pParent ) +void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, vcl::Window* i_pParent ) { if ( i_pParent->IsNativeControlSupported( i_eType, PART_ENTIRE_CONTROL) ) { diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 558be20a0650..b71fca5b646d 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -89,7 +89,7 @@ void SvTabListBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, } -SvTabListBox::SvTabListBox( Window* pParent, WinBits nBits ) +SvTabListBox::SvTabListBox( vcl::Window* pParent, WinBits nBits ) : SvTreeListBox( pParent, nBits ) { pTabList = 0; @@ -98,7 +98,7 @@ SvTabListBox::SvTabListBox( Window* pParent, WinBits nBits ) SetHighlightRange(); // select full width } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvTabListBox(Window *pParent, +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvTabListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; @@ -506,7 +506,7 @@ namespace svt // class SvHeaderTabListBox ---------------------------------------------- -SvHeaderTabListBox::SvHeaderTabListBox( Window* pParent, WinBits nWinStyle ) : +SvHeaderTabListBox::SvHeaderTabListBox( vcl::Window* pParent, WinBits nWinStyle ) : SvTabListBox( pParent, nWinStyle ), @@ -641,7 +641,7 @@ IMPL_LINK_NOARG(SvHeaderTabListBox, ScrollHdl_Impl) IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl) { - Window* pParent = m_pImpl->m_pHeaderBar->GetAccessibleParentWindow(); + vcl::Window* pParent = m_pImpl->m_pHeaderBar->GetAccessibleParentWindow(); DBG_ASSERT( pParent, "SvHeaderTabListBox..CreateAccessibleHdl_Impl - accessible parent not found" ); if ( pParent ) { @@ -839,7 +839,7 @@ Rectangle SvHeaderTabListBox::calcHeaderRect( bool _bIsColumnBar, bool _bOnScree Rectangle aRect; if ( _bIsColumnBar ) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if ( !_bOnScreen ) pParent = m_pImpl->m_pHeaderBar->GetAccessibleParentWindow(); @@ -850,7 +850,7 @@ Rectangle SvHeaderTabListBox::calcHeaderRect( bool _bIsColumnBar, bool _bOnScree Rectangle SvHeaderTabListBox::calcTableRect( bool _bOnScreen ) { - Window* pParent = NULL; + vcl::Window* pParent = NULL; if ( !_bOnScreen ) pParent = GetAccessibleParentWindow(); @@ -872,7 +872,7 @@ Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 aTopLeft.X() = aItemRect.Left(); Size aSize = aItemRect.GetSize(); aRect = Rectangle( aTopLeft, aSize ); - Window* pParent = NULL; + vcl::Window* pParent = NULL; if ( !_bOnScreen ) pParent = GetAccessibleParentWindow(); aTopLeft = aRect.TopLeft(); @@ -1153,7 +1153,7 @@ bool SvHeaderTabListBox::GetGlyphBoundRects( const Point& rOrigin, const OUStrin return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector ); } -Rectangle SvHeaderTabListBox::GetWindowExtentsRelative( Window *pRelativeWindow ) const +Rectangle SvHeaderTabListBox::GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const { return Control::GetWindowExtentsRelative( pRelativeWindow ); } @@ -1168,19 +1168,19 @@ Reference< XAccessible > SvHeaderTabListBox::GetAccessible( bool bCreate ) return Control::GetAccessible( bCreate ); } -Window* SvHeaderTabListBox::GetAccessibleParentWindow() const +vcl::Window* SvHeaderTabListBox::GetAccessibleParentWindow() const { return Control::GetAccessibleParentWindow(); } -Window* SvHeaderTabListBox::GetWindowInstance() +vcl::Window* SvHeaderTabListBox::GetWindowInstance() { return this; } Reference< XAccessible > SvHeaderTabListBox::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); DBG_ASSERT( pParent, "SvHeaderTabListBox::::CreateAccessible - accessible parent not found" ); Reference< XAccessible > xAccessible; diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 2e19444c95bd..a1e51b4a1768 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -61,7 +61,7 @@ class MyEdit_Impl : public Edit { SvInplaceEdit2* pOwner; public: - MyEdit_Impl( Window* pParent, SvInplaceEdit2* pOwner ); + MyEdit_Impl( vcl::Window* pParent, SvInplaceEdit2* pOwner ); virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; }; @@ -70,12 +70,12 @@ class MyMultiEdit_Impl : public MultiLineEdit { SvInplaceEdit2* pOwner; public: - MyMultiEdit_Impl( Window* pParent, SvInplaceEdit2* pOwner ); + MyMultiEdit_Impl( vcl::Window* pParent, SvInplaceEdit2* pOwner ); virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; }; -MyEdit_Impl::MyEdit_Impl( Window* pParent, SvInplaceEdit2* _pOwner ) : +MyEdit_Impl::MyEdit_Impl( vcl::Window* pParent, SvInplaceEdit2* _pOwner ) : Edit( pParent, WB_LEFT ), @@ -95,7 +95,7 @@ void MyEdit_Impl::LoseFocus() pOwner->LoseFocus(); } -MyMultiEdit_Impl::MyMultiEdit_Impl( Window* pParent, SvInplaceEdit2* _pOwner ) +MyMultiEdit_Impl::MyMultiEdit_Impl( vcl::Window* pParent, SvInplaceEdit2* _pOwner ) : MultiLineEdit( pParent, WB_CENTER ), pOwner(_pOwner) @@ -116,7 +116,7 @@ void MyMultiEdit_Impl::LoseFocus() SvInplaceEdit2::SvInplaceEdit2 ( - Window* pParent, const Point& rPos, + vcl::Window* pParent, const Point& rPos, const Size& rSize, const OUString& rData, const Link& rNotifyEditEnd, @@ -374,7 +374,7 @@ struct SvTreeListBoxImpl }; -SvTreeListBox::SvTreeListBox(Window* pParent, WinBits nWinStyle) : +SvTreeListBox::SvTreeListBox(vcl::Window* pParent, WinBits nWinStyle) : Control(pParent, nWinStyle | WB_CLIPCHILDREN), DropTargetHelper(this), DragSourceHelper(this), @@ -403,7 +403,7 @@ SvTreeListBox::SvTreeListBox(Window* pParent, WinBits nWinStyle) : SetSublistOpenWithLeftRight(); } -SvTreeListBox::SvTreeListBox(Window* pParent, const ResId& rResId) : +SvTreeListBox::SvTreeListBox(vcl::Window* pParent, const ResId& rResId) : Control(pParent, rResId), DropTargetHelper(this), DragSourceHelper(this), @@ -431,7 +431,7 @@ SvTreeListBox::SvTreeListBox(Window* pParent, const ResId& rResId) : SetSublistOpenWithLeftRight(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvTreeListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = WB_TABSTOP; OString sBorder = VclBuilder::extractCustomProperty(rMap); @@ -3826,7 +3826,7 @@ void SvTreeListBox::EnableList( bool _bEnable ) ::com::sun::star::uno::Reference< XAccessible > SvTreeListBox::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); DBG_ASSERT( pParent, "SvTreeListBox::CreateAccessible - accessible parent not found" ); ::com::sun::star::uno::Reference< XAccessible > xAccessible; diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 920a3ccfa85a..ff3a748a4475 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -238,7 +238,7 @@ void Calendar::ImplInitSettings() -Calendar::Calendar( Window* pParent, WinBits nWinStyle ) : +Calendar::Calendar( vcl::Window* pParent, WinBits nWinStyle ) : Control( pParent, nWinStyle & (WB_TABSTOP | WB_GROUP | WB_BORDER | WB_3DLOOK | WB_RANGESELECT | WB_MULTISELECT) ), maCalendarWrapper( Application::GetAppLocaleDataWrapper().getComponentContext() ), maOldFormatFirstDate( 0, 0, 1900 ), @@ -2192,7 +2192,7 @@ private: FixedLine* mpFixedLine; public: - ImplCFieldFloatWin( Window* pParent ); + ImplCFieldFloatWin( vcl::Window* pParent ); virtual ~ImplCFieldFloatWin(); void SetCalendar( Calendar* pCalendar ) @@ -2207,7 +2207,7 @@ public: -ImplCFieldFloatWin::ImplCFieldFloatWin( Window* pParent ) : +ImplCFieldFloatWin::ImplCFieldFloatWin( vcl::Window* pParent ) : FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW ) { mpCalendar = NULL; @@ -2369,7 +2369,7 @@ bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt ) return FloatingWindow::Notify( rNEvt ); } -CalendarField::CalendarField(Window* pParent, WinBits nWinStyle) +CalendarField::CalendarField(vcl::Window* pParent, WinBits nWinStyle) : DateField(pParent, nWinStyle) , mpFloatWin(NULL) , mpCalendar(NULL) @@ -2513,7 +2513,7 @@ bool CalendarField::ShowDropDown( bool bShow ) -Calendar* CalendarField::CreateCalendar( Window* pParent ) +Calendar* CalendarField::CreateCalendar( vcl::Window* pParent ) { return new Calendar( pParent, mnCalendarStyle | WB_TABSTOP ); } diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index f3359c82d56d..a51de50c1963 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -90,21 +90,21 @@ void ColorListBox::ImplDestroyColorEntries() pColorList->clear(); } -ColorListBox::ColorListBox( Window* pParent, WinBits nWinStyle ) : +ColorListBox::ColorListBox( vcl::Window* pParent, WinBits nWinStyle ) : ListBox( pParent, nWinStyle ) { ImplInit(); SetEdgeBlending(true); } -ColorListBox::ColorListBox( Window* pParent, const ResId& rResId ) : +ColorListBox::ColorListBox( vcl::Window* pParent, const ResId& rResId ) : ListBox( pParent, rResId ) { ImplInit(); SetEdgeBlending(true); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeColorListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -715,7 +715,7 @@ void LineListBox::ImplInit() UpdatePaintLineColor(); } -LineListBox::LineListBox( Window* pParent, WinBits nWinStyle ) : +LineListBox::LineListBox( vcl::Window* pParent, WinBits nWinStyle ) : ListBox( pParent, nWinStyle ), m_nWidth( 5 ), m_sNone( ), @@ -725,7 +725,7 @@ LineListBox::LineListBox( Window* pParent, WinBits nWinStyle ) : ImplInit(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLineListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -953,7 +953,7 @@ void LineListBox::DataChanged( const DataChangedEvent& rDCEvt ) UpdateEntries( m_nWidth ); } -FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) : +FontNameBox::FontNameBox( vcl::Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { mpFontList = NULL; @@ -961,7 +961,7 @@ FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) : InitFontMRUEntriesFile(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontNameBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -1315,7 +1315,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt ) } } -FontStyleBox::FontStyleBox(Window* pParent, WinBits nBits) +FontStyleBox::FontStyleBox(vcl::Window* pParent, WinBits nBits) : ComboBox(pParent, nBits) { //Use the standard texts to get an optimal size and stick to that size. @@ -1339,7 +1339,7 @@ Size FontStyleBox::GetOptimalSize() const return ComboBox::GetOptimalSize(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontStyleBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontStyleBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; @@ -1533,13 +1533,13 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList ) } } -FontSizeBox::FontSizeBox( Window* pParent, WinBits nWinSize ) : +FontSizeBox::FontSizeBox( vcl::Window* pParent, WinBits nWinSize ) : MetricBox( pParent, nWinSize ) { ImplInit(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontSizeBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFontSizeBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { bool bDropdown = VclBuilder::extractDropdown(rMap); WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index c26a13c7ec7f..f6df0e4fac02 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::ui; -FileControl::FileControl( Window* pParent, WinBits nStyle, FileControlMode nFlags ) : +FileControl::FileControl( vcl::Window* pParent, WinBits nStyle, FileControlMode nFlags ) : Window( pParent, nStyle|WB_DIALOGCONTROL ), maEdit( this, (nStyle&(~WB_BORDER))|WB_NOTABSTOP ), maButton( this, (nStyle&(~WB_BORDER))|WB_NOLIGHTBORDER|WB_NOPOINTERFOCUS|WB_NOTABSTOP ), diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx index 13f96f01a3ff..5ed40d77eaac 100644 --- a/svtools/source/control/fileurlbox.cxx +++ b/svtools/source/control/fileurlbox.cxx @@ -30,7 +30,7 @@ namespace svt //= FileURLBox - FileURLBox::FileURLBox( Window* _pParent, WinBits _nStyle ) + FileURLBox::FileURLBox( vcl::Window* _pParent, WinBits _nStyle ) :SvtURLBox( _pParent, _nStyle, INET_PROT_FILE ) { DisableHistory(); diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index df5f6656cdde..edb8ad31aac5 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -297,7 +297,7 @@ FormattedField::StaticFormatter::~StaticFormatter() } -FormattedField::FormattedField(Window* pParent, WinBits nStyle, SvNumberFormatter* pInitialFormatter, sal_Int32 nFormatKey) +FormattedField::FormattedField(vcl::Window* pParent, WinBits nStyle, SvNumberFormatter* pInitialFormatter, sal_Int32 nFormatKey) :SpinField(pParent, nStyle) ,m_aLastSelection(0,0) ,m_dMinValue(0) @@ -328,7 +328,7 @@ FormattedField::FormattedField(Window* pParent, WinBits nStyle, SvNumberFormatte } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFormattedField(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeFormattedField(vcl::Window *pParent, VclBuilder::stringmap &) { WinBits nWinBits = WB_BORDER | WB_SPIN; return new FormattedField(pParent, nWinBits); @@ -1067,7 +1067,7 @@ void DoubleNumericField::ResetConformanceTester() m_pNumberValidator = new validation::NumberValidator( cSeparatorThousand, cSeparatorDecimal ); } -DoubleCurrencyField::DoubleCurrencyField(Window* pParent, WinBits nStyle) +DoubleCurrencyField::DoubleCurrencyField(vcl::Window* pParent, WinBits nStyle) :FormattedField(pParent, nStyle) ,m_bChangingFormat(false) { diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index def0e6ad1997..5f513e6e0220 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -103,7 +103,7 @@ void HeaderBar::ImplInit( WinBits nWinStyle ) -HeaderBar::HeaderBar( Window* pParent, WinBits nWinStyle ) : +HeaderBar::HeaderBar( vcl::Window* pParent, WinBits nWinStyle ) : Window( pParent, nWinStyle & WB_3DLOOK ) { ImplInit( nWinStyle ); @@ -303,7 +303,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, const Rectangle* pRect, sal_uLong ) { - Window *const pWin = (pDev->GetOutDevType()==OUTDEV_WINDOW) ? (Window*) pDev : NULL; + vcl::Window *const pWin = (pDev->GetOutDevType()==OUTDEV_WINDOW) ? (vcl::Window*) pDev : NULL; ImplControlValue aControlValue(0); Rectangle aCtrlRegion; ControlState nState(0); diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx index e6aab88342e4..5c724842f7d1 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/svtools/source/control/hyperlabel.cxx @@ -48,7 +48,7 @@ namespace svt { } - HyperLabel::HyperLabel( Window* _pParent, WinBits _nWinStyle ) + HyperLabel::HyperLabel( vcl::Window* _pParent, WinBits _nWinStyle ) :FixedText( _pParent, _nWinStyle ) ,m_pImpl( new HyperLabelImpl ) { diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index a5850531c182..21a40a6fd250 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -832,7 +832,7 @@ void SvtURLBox::TryAutoComplete() } -SvtURLBox::SvtURLBox( Window* pParent, INetProtocol eSmart, bool bSetDefaultHelpID ) +SvtURLBox::SvtURLBox( vcl::Window* pParent, INetProtocol eSmart, bool bSetDefaultHelpID ) : ComboBox( pParent , WB_DROPDOWN | WB_AUTOSIZE | WB_AUTOHSCROLL ), eSmartProtocol( eSmart ), bAutoCompleteMode( false ), @@ -851,7 +851,7 @@ SvtURLBox::SvtURLBox( Window* pParent, INetProtocol eSmart, bool bSetDefaultHelp } -SvtURLBox::SvtURLBox( Window* pParent, WinBits _nStyle, INetProtocol eSmart, +SvtURLBox::SvtURLBox( vcl::Window* pParent, WinBits _nStyle, INetProtocol eSmart, bool bSetDefaultHelpID ) : ComboBox( pParent, _nStyle ), eSmartProtocol( eSmart ), @@ -865,7 +865,7 @@ SvtURLBox::SvtURLBox( Window* pParent, WinBits _nStyle, INetProtocol eSmart, Init(bSetDefaultHelpID); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtURLBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvtURLBox(vcl::Window *pParent, VclBuilder::stringmap &) { WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP| WB_DROPDOWN|WB_AUTOSIZE|WB_AUTOHSCROLL; @@ -875,7 +875,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtURLBox(Window *pParent, } -SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart, +SvtURLBox::SvtURLBox( vcl::Window* pParent, const ResId& _rResId, INetProtocol eSmart, bool bSetDefaultHelpID ) : ComboBox( pParent , _rResId ), eSmartProtocol( eSmart ), diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index cc90d4344ed4..58f3d06ba0e8 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -45,7 +45,7 @@ namespace svt class IDLabel : public FixedText { public: - IDLabel( Window* _pParent, WinBits _nWinStyle = 0 ); + IDLabel( vcl::Window* _pParent, WinBits _nWinStyle = 0 ); virtual ~IDLabel( ); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; @@ -79,7 +79,7 @@ namespace svt bool IsEnabled() const; void GrabFocus(); - bool Contains( const Window* _pWindow ) const; + bool Contains( const vcl::Window* _pWindow ) const; HyperLabel* GetDescriptionHyperLabel() const { return mpDescription; } @@ -162,7 +162,7 @@ namespace svt //= Roadmap - ORoadmap::ORoadmap( Window* _pParent, WinBits _nWinStyle ) + ORoadmap::ORoadmap( vcl::Window* _pParent, WinBits _nWinStyle ) :Control( _pParent, _nWinStyle ) ,m_pImpl( new RoadmapImpl( *this ) ) @@ -598,7 +598,7 @@ namespace svt } - RoadmapItem* ORoadmap::GetByPointer(Window* pWindow) + RoadmapItem* ORoadmap::GetByPointer(vcl::Window* pWindow) { const HL_Vector& rItems = m_pImpl->getHyperLabels(); for ( HL_Vector::const_iterator i = rItems.begin(); @@ -618,7 +618,7 @@ namespace svt // capture KeyEvents for taskpane cycling if ( _rNEvt.GetType() == EVENT_KEYINPUT ) { - Window* pWindow = _rNEvt.GetWindow(); + vcl::Window* pWindow = _rNEvt.GetWindow(); RoadmapItem* pItem = GetByPointer( pWindow ); if ( pItem != NULL ) { @@ -693,7 +693,7 @@ namespace svt } - bool RoadmapItem::Contains( const Window* _pWindow ) const + bool RoadmapItem::Contains( const vcl::Window* _pWindow ) const { return ( mpID == _pWindow ) || ( mpDescription == _pWindow ); } @@ -851,7 +851,7 @@ namespace svt } - IDLabel::IDLabel( Window* _pParent, WinBits _nWinStyle ) + IDLabel::IDLabel( vcl::Window* _pParent, WinBits _nWinStyle ) :FixedText( _pParent, _nWinStyle ) { diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 0a0170f2cc49..6dfce365f415 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -283,7 +283,7 @@ void Ruler::ImplInit( WinBits nWinBits ) pAccContext = NULL; } -Ruler::Ruler( Window* pParent, WinBits nWinStyle ) : +Ruler::Ruler( vcl::Window* pParent, WinBits nWinStyle ) : Window( pParent, nWinStyle & WB_3DLOOK ), maVirDev( *this ), maMapMode( MAP_100TH_MM ), @@ -2802,7 +2802,7 @@ void Ruler::DrawTicks() uno::Reference< XAccessible > Ruler::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); OSL_ENSURE( pParent, "-SvxRuler::CreateAccessible(): No Parent!" ); uno::Reference< XAccessible > xAccParent = pParent->GetAccessible(); if( xAccParent.is() ) diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 68feada7de87..e948e2c76144 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -40,7 +40,7 @@ void ScrollableWindow::ImpInitialize( ScrollableWindowFlags nFlags ) -ScrollableWindow::ScrollableWindow( Window* pParent, WinBits nBits, +ScrollableWindow::ScrollableWindow( vcl::Window* pParent, WinBits nBits, ScrollableWindowFlags nFlags ) : Window( pParent, WinBits(nBits|WB_CLIPCHILDREN) ), aVScroll( this, WinBits(WB_VSCROLL | WB_DRAG) ), diff --git a/svtools/source/control/stdctrl.cxx b/svtools/source/control/stdctrl.cxx index bc117dcc848c..4e3b03c8c5ce 100644 --- a/svtools/source/control/stdctrl.cxx +++ b/svtools/source/control/stdctrl.cxx @@ -19,7 +19,7 @@ #include <svtools/stdctrl.hxx> -FixedInfo::FixedInfo( Window* pParent, const ResId& rResId ) : +FixedInfo::FixedInfo( vcl::Window* pParent, const ResId& rResId ) : FixedText( pParent, rResId ) { SetStyle( GetStyle() | WB_INFO ); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 81afa0a95f81..7dd15b0d55e1 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -142,7 +142,7 @@ bool ImplTabButton::PreNotify( NotifyEvent& rNEvt ) // - ImplTabSizer - -class ImplTabSizer : public Window +class ImplTabSizer : public vcl::Window { public: ImplTabSizer( TabBar* pParent, WinBits nWinStyle = 0 ); @@ -434,7 +434,7 @@ void TabBar::ImplInit( WinBits nWinStyle ) -TabBar::TabBar( Window* pParent, WinBits nWinStyle ) : +TabBar::TabBar( vcl::Window* pParent, WinBits nWinStyle ) : Window( pParent, (nWinStyle & WB_3DLOOK) | WB_CLIPCHILDREN ) { ImplInit( nWinStyle ); diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 2be0e430d8bb..fb03917624d5 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -41,7 +41,7 @@ namespace svtools { -static Window* GetTopMostParentSystemWindow( Window* pWindow ) +static vcl::Window* GetTopMostParentSystemWindow( vcl::Window* pWindow ) { OSL_ASSERT( pWindow ); if ( pWindow ) @@ -437,7 +437,7 @@ IMPL_LINK( ToolbarMenu, HighlightHdl, Control *, pControl ) -ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWindow, WinBits nBits ) +ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, vcl::Window* pParentWindow, WinBits nBits ) : DockingWindow(pParentWindow, nBits) { implInit(rFrame); @@ -445,7 +445,7 @@ ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWind -ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWindow, const ResId& rResId ) +ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, vcl::Window* pParentWindow, const ResId& rResId ) : DockingWindow(pParentWindow, rResId) { implInit(rFrame); @@ -462,7 +462,7 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame) initWindow(); - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this ); } @@ -471,7 +471,7 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame) ToolbarMenu::~ToolbarMenu() { - Window* pWindow = GetTopMostParentSystemWindow( this ); + vcl::Window* pWindow = GetTopMostParentSystemWindow( this ); if ( pWindow ) ((SystemWindow *)pWindow)->GetTaskPaneList()->RemoveWindow( this ); @@ -584,7 +584,7 @@ void ToolbarMenu::initWindow() -static long ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) +static long ImplGetNativeCheckAndRadioSize( vcl::Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) { rMaxWidth = rCheckHeight = rRadioHeight = 0; @@ -1283,7 +1283,7 @@ void ToolbarMenu::KeyInput( const KeyEvent& rKEvent ) } -static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRect, bool i_bHighlight ) +static void ImplPaintCheckBackground( vcl::Window* i_pWindow, const Rectangle& i_rRect, bool i_bHighlight ) { bool bNativeOk = false; if( i_pWindow->IsNativeControlSupported( CTRL_TOOLBAR, PART_BUTTON ) ) diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index a8bae45688eb..2464694faa0c 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -182,7 +182,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (R Reference< XAccessible > xRet; - Window* pParent = mpParent->mrMenu.GetParent(); + vcl::Window* pParent = mpParent->mrMenu.GetParent(); if( pParent ) xRet = pParent->GetAccessible(); @@ -196,7 +196,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeEx const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); - Window* pParent = mpParent->mrMenu.GetParent(); + vcl::Window* pParent = mpParent->mrMenu.GetParent(); if( pParent ) { for( sal_uInt16 i = 0, nCount = pParent->GetChildCount(); i < nCount ; i++ ) @@ -238,7 +238,7 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException, s if( aRet.isEmpty() ) { - Window* pLabel = mpParent->mrMenu.GetAccessibleRelationLabeledBy(); + vcl::Window* pLabel = mpParent->mrMenu.GetAccessibleRelationLabeledBy(); if( pLabel && pLabel != &mpParent->mrMenu ) aRet = OutputDevice::GetNonMnemonicString( pLabel->GetText() ); } diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx index 771bd144f426..e22b6b351c26 100644 --- a/svtools/source/control/urlcontrol.cxx +++ b/svtools/source/control/urlcontrol.cxx @@ -26,13 +26,13 @@ namespace svt { //= OFileURLControl - OFileURLControl::OFileURLControl(Window* _pParent, WinBits nStyle) + OFileURLControl::OFileURLControl(vcl::Window* _pParent, WinBits nStyle) : SvtURLBox(_pParent, nStyle, INET_PROT_FILE) { DisableHistory(); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOFileURLControl(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOFileURLControl(vcl::Window *pParent, VclBuilder::stringmap &) { WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP| WB_DROPDOWN|WB_AUTOSIZE|WB_AUTOHSCROLL; diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 585908b4a0e8..56f515c3877a 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -216,7 +216,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - Window* pParent = mpParent->GetParent(); + vcl::Window* pParent = mpParent->GetParent(); uno::Reference< accessibility::XAccessible > xRet; if( pParent ) @@ -232,7 +232,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - Window* pParent = mpParent->GetParent(); + vcl::Window* pParent = mpParent->GetParent(); sal_Int32 nRet = 0; if( pParent ) @@ -292,7 +292,7 @@ OUString SAL_CALL ValueSetAcc::getAccessibleName() if ( aRet.isEmpty() ) { - Window* pLabel = mpParent->GetAccessibleRelationLabeledBy(); + vcl::Window* pLabel = mpParent->GetAccessibleRelationLabeledBy(); if ( pLabel && pLabel != mpParent ) aRet = OutputDevice::GetNonMnemonicString( pLabel->GetText() ); @@ -312,13 +312,13 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::ge ThrowIfDisposed(); SolarMutexGuard g; uno::Reference< accessibility::XAccessibleRelationSet > xRelSet; - Window* pWindow = (Window*)mpParent; + vcl::Window* pWindow = (vcl::Window*)mpParent; if ( pWindow ) { utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper; xRelSet = pRelationSet; - Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); + vcl::Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy(); if ( pLabeledBy && pLabeledBy != pWindow ) { uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1); @@ -326,7 +326,7 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::ge pRelationSet->AddRelation( accessibility::AccessibleRelation( accessibility::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/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 3792f2ef1262..f7d0fa936015 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -94,7 +94,7 @@ void ValueSet::ImplInit() ImplInitSettings( true, true, true ); } -ValueSet::ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren ) : +ValueSet::ValueSet( vcl::Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren ) : Control( pParent, nWinStyle ), maVirDev( *this ), maColor( COL_TRANSPARENT ) @@ -103,7 +103,7 @@ ValueSet::ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientCh mbIsTransientChildrenDisabled = bDisableTransientChildren; } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeValueSet(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeValueSet(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinBits = WB_TABSTOP; @@ -114,7 +114,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeValueSet(Window *pParent, V return new ValueSet(pParent, nWinBits); } -ValueSet::ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransientChildren ) : +ValueSet::ValueSet( vcl::Window* pParent, const ResId& rResId, bool bDisableTransientChildren ) : Control( pParent, rResId ), maVirDev( *this ), maColor( COL_TRANSPARENT ) diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx index 9ec4012b9526..94415b4f1420 100644 --- a/svtools/source/control/vclxaccessibleheaderbar.cxx +++ b/svtools/source/control/vclxaccessibleheaderbar.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -VCLXHeaderBar::VCLXHeaderBar(Window* pHeaderBar) +VCLXHeaderBar::VCLXHeaderBar(vcl::Window* pHeaderBar) { SetWindow(pHeaderBar); } diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index ec4328fb006b..e63ce8700237 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -16,7 +16,7 @@ using namespace boost; -PlaceEditDialog::PlaceEditDialog( Window* pParent ) : +PlaceEditDialog::PlaceEditDialog( vcl::Window* pParent ) : ModalDialog( pParent, "PlaceEditDialog", "svt/ui/placeedit.ui" ), m_pCurrentDetails( ) { @@ -42,7 +42,7 @@ PlaceEditDialog::PlaceEditDialog( Window* pParent ) : InitDetails( ); } -PlaceEditDialog::PlaceEditDialog( Window* pParent, const boost::shared_ptr<Place>& pPlace ) : +PlaceEditDialog::PlaceEditDialog( vcl::Window* pParent, const boost::shared_ptr<Place>& pPlace ) : ModalDialog( pParent, "PlaceEditDialog", "svt/ui/placeedit.ui" ), m_pCurrentDetails( ) { diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 809b222e5d01..a35fe0f9e7d9 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -510,7 +510,7 @@ void AssignmentPersistentData::Commit() - AddressBookSourceDialog::AddressBookSourceDialog(Window* _pParent, + AddressBookSourceDialog::AddressBookSourceDialog(vcl::Window* _pParent, const Reference< XComponentContext >& _rxORB ) : ModalDialog(_pParent, "AddressTemplateDialog", "svt/ui/addresstemplatedialog.ui") , m_sNoFieldSelection(SVT_RESSTR(STR_NO_FIELD_SELECTION)) @@ -521,7 +521,7 @@ void AssignmentPersistentData::Commit() } - AddressBookSourceDialog::AddressBookSourceDialog( Window* _pParent, const Reference< XComponentContext >& _rxORB, + AddressBookSourceDialog::AddressBookSourceDialog( vcl::Window* _pParent, const Reference< XComponentContext >& _rxORB, const Reference< XDataSource >& _rxTransientDS, const OUString& _rDataSourceName, const OUString& _rTable, const Sequence< AliasProgrammaticPair >& _rMapping ) : ModalDialog(_pParent, "AddressTemplateDialog", "svt/ui/addresstemplatedialog.ui") diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx index 76c5300c5595..232aaf42e9b8 100644 --- a/svtools/source/dialogs/colrdlg.cxx +++ b/svtools/source/dialogs/colrdlg.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::ui::dialogs; // - ColorDialog - -SvColorDialog::SvColorDialog( Window* pWindow ) +SvColorDialog::SvColorDialog( vcl::Window* pWindow ) : mpParent( pWindow ) , meMode( svtools::ColorPickerMode_SELECT ) { diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 90b047783b65..d5fe5fa9b394 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -216,7 +216,7 @@ OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) -PrinterSetupDialog::PrinterSetupDialog(Window* pParent) +PrinterSetupDialog::PrinterSetupDialog(vcl::Window* pParent) : ModalDialog(pParent, "PrinterSetupDialog", "svt/ui/printersetupdialog.ui") { diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index fefdf3f5ab3d..d116d9b1bfc2 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -25,7 +25,7 @@ namespace { class RestartDialog: public ModalDialog { public: - RestartDialog(Window * parent, svtools::RestartReason reason): + RestartDialog(vcl::Window * parent, svtools::RestartReason reason): ModalDialog(parent, "RestartDialog", "svt/ui/restartdialog.ui") { get(btnYes_, "yes"); @@ -52,7 +52,7 @@ private: DECL_LINK(hdlYes, void *); DECL_LINK(hdlNo, void *); - Window * reason_; + vcl::Window * reason_; PushButton * btnYes_; PushButton * btnNo_; }; @@ -71,7 +71,7 @@ IMPL_LINK_NOARG(RestartDialog, hdlNo) { void svtools::executeRestartDialog( css::uno::Reference< css::uno::XComponentContext > const & context, - Window * parent, RestartReason reason) + vcl::Window * parent, RestartReason reason) { if (RestartDialog(parent, reason).Execute()) { css::task::OfficeRestartManager::get(context)->requestRestart( diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index bb2881445435..649f970c92d9 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -118,14 +118,14 @@ namespace svt } //= RoadmapWizard - RoadmapWizard::RoadmapWizard( Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) + RoadmapWizard::RoadmapWizard( vcl::Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) :OWizardMachine( _pParent, i_nStyle, _nButtonFlags ) ,m_pImpl( new RoadmapWizardImpl ) { impl_construct(); } - RoadmapWizard::RoadmapWizard( Window* _pParent, sal_uInt32 _nButtonFlags ) + RoadmapWizard::RoadmapWizard( vcl::Window* _pParent, sal_uInt32 _nButtonFlags ) :OWizardMachine( _pParent, _nButtonFlags ) ,m_pImpl( new RoadmapWizardImpl ) { diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 88f61450c741..4c7ee7a81ef4 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -40,7 +40,7 @@ namespace svt } }; - OWizardPage::OWizardPage(Window *pParent, const OString& rID, + OWizardPage::OWizardPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription) : TabPage(pParent, rID, rUIXMLDescription) , m_pImpl(new WizardPageImplData) @@ -100,7 +100,7 @@ namespace svt } }; - OWizardMachine::OWizardMachine(Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) + OWizardMachine::OWizardMachine(vcl::Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) :WizardDialog( _pParent, i_nStyle ) ,m_pFinish(NULL) ,m_pCancel(NULL) @@ -112,7 +112,7 @@ namespace svt implConstruct( _nButtonFlags ); } - OWizardMachine::OWizardMachine(Window* _pParent, sal_uInt32 _nButtonFlags ) + OWizardMachine::OWizardMachine(vcl::Window* _pParent, sal_uInt32 _nButtonFlags ) :WizardDialog( _pParent, "WizardDialog", "svt/ui/wizarddialog.ui" ) ,m_pFinish(NULL) ,m_pCancel(NULL) @@ -301,9 +301,9 @@ namespace svt } - void OWizardMachine::implResetDefault(Window* _pWindow) + void OWizardMachine::implResetDefault(vcl::Window* _pWindow) { - Window* pChildLoop = _pWindow->GetWindow(WINDOW_FIRSTCHILD); + vcl::Window* pChildLoop = _pWindow->GetWindow(WINDOW_FIRSTCHILD); while (pChildLoop) { // does the window participate in the tabbing order? diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index eba9962d71f1..54febf2b8797 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -347,7 +347,7 @@ TabPage* WizardDialog::ImplGetPage( sal_uInt16 nLevel ) const return NULL; } -WizardDialog::WizardDialog( Window* pParent, WinBits nStyle ) : +WizardDialog::WizardDialog( vcl::Window* pParent, WinBits nStyle ) : ModalDialog( pParent, nStyle ) { ImplInitData(); @@ -355,7 +355,7 @@ WizardDialog::WizardDialog( Window* pParent, WinBits nStyle ) : -WizardDialog::WizardDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : +WizardDialog::WizardDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : ModalDialog( pParent, rID, rUIXMLDescription ) { ImplInitData(); diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index 0042d8e50d8d..1410921320f7 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -25,13 +25,13 @@ #include <vcl/txtattr.hxx> -MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle, +MultiLineEditSyntaxHighlight::MultiLineEditSyntaxHighlight( vcl::Window* pParent, WinBits nWinStyle, HighlighterLanguage aLanguage): MultiLineEdit(pParent,nWinStyle), mbDoBracketHilight(true), aHighlighter(aLanguage) { EnableUpdateData(300); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeMultiLineEditSyntaxHighlight(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeMultiLineEditSyntaxHighlight(vcl::Window *pParent, VclBuilder::stringmap &) { return new MultiLineEditSyntaxHighlight(pParent); } diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index c1319e57cf2a..3f645d556932 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -21,7 +21,7 @@ #include "unoiface.hxx" -MultiLineEdit::MultiLineEdit( Window* pParent, WinBits nWinStyle ) +MultiLineEdit::MultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ) : VclMultiLineEdit( pParent,nWinStyle ) { } diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx index a50a4a62871b..9bb4c5f85478 100644 --- a/svtools/source/edit/svmedit2.cxx +++ b/svtools/source/edit/svmedit2.cxx @@ -21,7 +21,7 @@ #include <svtools/svmedit2.hxx> #include <vcl/xtextedt.hxx> -ExtMultiLineEdit::ExtMultiLineEdit( Window* pParent, WinBits nWinStyle ) : +ExtMultiLineEdit::ExtMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ) : MultiLineEdit( pParent, nWinStyle ) diff --git a/svtools/source/filter/GraphicExportOptionsDialog.cxx b/svtools/source/filter/GraphicExportOptionsDialog.cxx index 260b22aa5918..20e2ed7fc28d 100644 --- a/svtools/source/filter/GraphicExportOptionsDialog.cxx +++ b/svtools/source/filter/GraphicExportOptionsDialog.cxx @@ -23,7 +23,7 @@ using namespace css::beans; using namespace css::lang; using namespace css::uno; -GraphicExportOptionsDialog::GraphicExportOptionsDialog(Window* pWindow, const Reference<XComponent>& rxSourceDocument) : +GraphicExportOptionsDialog::GraphicExportOptionsDialog(vcl::Window* pWindow, const Reference<XComponent>& rxSourceDocument) : ModalDialog(pWindow, "GraphicExporter", "svt/ui/GraphicExportOptionsDialog.ui"), mResolution(96.0), mRenderer(rxSourceDocument) diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 4ef43e98d75b..be2a12e09dfc 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -945,7 +945,7 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice, if( pOutputDevice->GetOutDevType() == OUTDEV_WINDOW ) { - const Region aPaintRgn( ( (Window*) pOutputDevice )->GetPaintRegion() ); + const Region aPaintRgn( ( (vcl::Window*) pOutputDevice )->GetPaintRegion() ); if( !aPaintRgn.IsNull() ) aOutRect.Intersection( pOutputDevice->LogicToPixel( aPaintRgn.GetBoundRect() ) ); } diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index 9e64a3dec7f1..08716455213a 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -119,7 +119,7 @@ IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserReq xWinPeer->setProperty( OUString( "PluginParent" ), uno::makeAny( (sal_Int64) 0 ) ); - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pWindow ) Dialog::EndAllDialogs( pWindow ); } diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx index eee3307916d7..595fb071a24f 100644 --- a/svtools/source/hatchwindow/hatchwindow.cxx +++ b/svtools/source/hatchwindow/hatchwindow.cxx @@ -44,7 +44,7 @@ void VCLXHatchWindow::initializeWindow( const uno::Reference< awt::XWindowPeer > { SolarMutexGuard aGuard; - Window* pParent = NULL; + vcl::Window* pParent = NULL; VCLXWindow* pParentComponent = VCLXWindow::GetImplementation( xParent ); if ( pParentComponent ) diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx index 4f68835d38bb..5ddfba33b8a6 100644 --- a/svtools/source/hatchwindow/ipwin.cxx +++ b/svtools/source/hatchwindow/ipwin.cxx @@ -138,7 +138,7 @@ void SvResizeHelper::Draw( OutputDevice * pDev ) |* |* Description *************************************************************************/ -void SvResizeHelper::InvalidateBorder( Window * pWin ) +void SvResizeHelper::InvalidateBorder( vcl::Window * pWin ) { Rectangle aMoveRects[ 4 ]; FillMoveRectsPixel( aMoveRects ); @@ -151,7 +151,7 @@ void SvResizeHelper::InvalidateBorder( Window * pWin ) |* |* Description *************************************************************************/ -bool SvResizeHelper::SelectBegin( Window * pWin, const Point & rPos ) +bool SvResizeHelper::SelectBegin( vcl::Window * pWin, const Point & rPos ) { if( -1 == nGrab ) { @@ -171,7 +171,7 @@ bool SvResizeHelper::SelectBegin( Window * pWin, const Point & rPos ) |* |* Description *************************************************************************/ -short SvResizeHelper::SelectMove( Window * pWin, const Point & rPos ) +short SvResizeHelper::SelectMove( vcl::Window * pWin, const Point & rPos ) { if( -1 == nGrab ) { @@ -421,7 +421,7 @@ void SvResizeHelper::ValidateRect( Rectangle & rValidate ) const |* |* Description *************************************************************************/ -bool SvResizeHelper::SelectRelease( Window * pWin, const Point & rPos, +bool SvResizeHelper::SelectRelease( vcl::Window * pWin, const Point & rPos, Rectangle & rOutPosSize ) { if( -1 != nGrab ) @@ -441,7 +441,7 @@ bool SvResizeHelper::SelectRelease( Window * pWin, const Point & rPos, |* |* Description *************************************************************************/ -void SvResizeHelper::Release( Window * pWin ) +void SvResizeHelper::Release( vcl::Window * pWin ) { if( nGrab != -1 ) { @@ -458,7 +458,7 @@ void SvResizeHelper::Release( Window * pWin ) *************************************************************************/ SvResizeWindow::SvResizeWindow ( - Window * pParent, + vcl::Window * pParent, VCLXHatchWindow* pWrapper ) : Window( pParent, WB_CLIPCHILDREN ) diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx index f3e9dde7137c..534f0d4a6ac6 100644 --- a/svtools/source/hatchwindow/ipwin.hxx +++ b/svtools/source/hatchwindow/ipwin.hxx @@ -58,20 +58,20 @@ public: void FillHandleRectsPixel( Rectangle aRects[ 8 ] ) const; void FillMoveRectsPixel( Rectangle aRects[ 4 ] ) const; void Draw( OutputDevice * ); - void InvalidateBorder( Window * ); - bool SelectBegin( Window *, const Point & rPos ); - short SelectMove( Window * pWin, const Point & rPos ); + void InvalidateBorder( vcl::Window * ); + bool SelectBegin( vcl::Window *, const Point & rPos ); + short SelectMove( vcl::Window * pWin, const Point & rPos ); Point GetTrackPosPixel( const Rectangle & rRect ) const; Rectangle GetTrackRectPixel( const Point & rTrackPos ) const; void ValidateRect( Rectangle & rValidate ) const; - bool SelectRelease( Window *, const Point & rPos, Rectangle & rOutPosSize ); - void Release( Window * pWin ); + bool SelectRelease( vcl::Window *, const Point & rPos, Rectangle & rOutPosSize ); + void Release( vcl::Window * pWin ); }; /********************** SvResizeWindow *********************************** *************************************************************************/ class VCLXHatchWindow; -class SvResizeWindow : public Window +class SvResizeWindow : public vcl::Window { Pointer m_aOldPointer; short m_nMoveGrab; // last pointer type @@ -80,7 +80,7 @@ class SvResizeWindow : public Window VCLXHatchWindow* m_pWrapper; public: - SvResizeWindow( Window* pParent, VCLXHatchWindow* pWrapper ); + SvResizeWindow( vcl::Window* pParent, VCLXHatchWindow* pWrapper ); void SetHatchBorderPixel( const Size & rSize ); diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index af95a045a405..36588b1b65c0 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -124,7 +124,7 @@ public: VCLXFileControl(); virtual ~VCLXFileControl(); - void SetWindow( Window* pWindow ) SAL_OVERRIDE; + void SetWindow( vcl::Window* pWindow ) SAL_OVERRIDE; // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -210,7 +210,7 @@ protected: void NotifyTextListeners(); ::com::sun::star::uno::Any convertEffectiveValue(const ::com::sun::star::uno::Any& rValue); - virtual void SetWindow(Window* _pWindow) SAL_OVERRIDE; + virtual void SetWindow(vcl::Window* _pWindow) SAL_OVERRIDE; static void ImplGetPropertyIds( std::list< sal_uInt16 > &aIds ); virtual void GetPropertyIds( std::list< sal_uInt16 > &aIds ) SAL_OVERRIDE { return ImplGetPropertyIds( aIds ); } diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx index 4102cd3482c5..a3b6fff35375 100644 --- a/svtools/source/misc/cliplistener.cxx +++ b/svtools/source/misc/cliplistener.cxx @@ -58,7 +58,7 @@ void SAL_CALL TransferableClipboardListener::changedContents( } } -void TransferableClipboardListener::AddRemoveListener( Window* pWin, bool bAdd ) +void TransferableClipboardListener::AddRemoveListener( vcl::Window* pWin, bool bAdd ) { try { diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index 516b3afc7c35..987e841d01ce 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -49,12 +49,12 @@ namespace svt struct DialogController_Data { - Window& rInstigator; - ::std::vector< Window* > aConcernedWindows; + vcl::Window& rInstigator; + ::std::vector< vcl::Window* > aConcernedWindows; PWindowEventFilter pEventFilter; PWindowOperator pOperator; - DialogController_Data( Window& _rInstigator, const PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator ) + DialogController_Data( vcl::Window& _rInstigator, const PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator ) :rInstigator( _rInstigator ) ,pEventFilter( _pEventFilter ) ,pOperator( _pOperator ) @@ -66,7 +66,7 @@ namespace svt //= DialogController - DialogController::DialogController( Window& _rInstigator, const PWindowEventFilter& _pEventFilter, + DialogController::DialogController( vcl::Window& _rInstigator, const PWindowEventFilter& _pEventFilter, const PWindowOperator& _pOperator ) :m_pImpl( new DialogController_Data( _rInstigator, _pEventFilter, _pOperator ) ) { @@ -92,7 +92,7 @@ namespace svt } - void DialogController::addDependentWindow( Window& _rWindow ) + void DialogController::addDependentWindow( vcl::Window& _rWindow ) { m_pImpl->aConcernedWindows.push_back( &_rWindow ); @@ -111,7 +111,7 @@ namespace svt void DialogController::impl_updateAll( const VclWindowEvent& _rTriggerEvent ) { - for ( ::std::vector< Window* >::iterator loop = m_pImpl->aConcernedWindows.begin(); + for ( ::std::vector< vcl::Window* >::iterator loop = m_pImpl->aConcernedWindows.begin(); loop != m_pImpl->aConcernedWindows.end(); ++loop ) @@ -119,7 +119,7 @@ namespace svt } - void DialogController::impl_update( const VclWindowEvent& _rTriggerEvent, Window& _rWindow ) + void DialogController::impl_update( const VclWindowEvent& _rTriggerEvent, vcl::Window& _rWindow ) { m_pImpl->pOperator->operateOn( _rTriggerEvent, _rWindow ); } @@ -173,7 +173,7 @@ namespace svt } - void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow ) + void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow ) { PDialogController pController( new RadioDependentEnabler( _rRadio ) ); pController->addDependentWindow( _rDependentWindow ); @@ -181,7 +181,7 @@ namespace svt } - void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2 ) + void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2 ) { PDialogController pController( new RadioDependentEnabler( _rRadio ) ); pController->addDependentWindow( _rDependentWindow1 ); @@ -190,7 +190,7 @@ namespace svt } - void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 ) + void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3 ) { PDialogController pController( new RadioDependentEnabler( _rRadio ) ); pController->addDependentWindow( _rDependentWindow1 ); @@ -200,7 +200,7 @@ namespace svt } - void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 ) + void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3, vcl::Window& _rDependentWindow4, vcl::Window& _rDependentWindow5 ) { PDialogController pController( new RadioDependentEnabler( _rRadio ) ); pController->addDependentWindow( _rDependentWindow1 ); @@ -212,7 +212,7 @@ namespace svt } - void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow ) + void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow ) { PDialogController pController( new RadioDependentEnabler( _rBox ) ); pController->addDependentWindow( _rDependentWindow ); @@ -220,7 +220,7 @@ namespace svt } - void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2 ) + void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2 ) { PDialogController pController( new RadioDependentEnabler( _rBox ) ); pController->addDependentWindow( _rDependentWindow1 ); @@ -229,7 +229,7 @@ namespace svt } - void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 ) + void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, vcl::Window& _rDependentWindow1, vcl::Window& _rDependentWindow2, vcl::Window& _rDependentWindow3, vcl::Window& _rDependentWindow4 ) { PDialogController pController( new RadioDependentEnabler( _rBox ) ); pController->addDependentWindow( _rDependentWindow1 ); diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 924ead10b3eb..4a6afd53e55e 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -32,7 +32,7 @@ static sal_uInt16 aWndFunc( - Window *pWin, // Parent of the dialog + vcl::Window *pWin, // Parent of the dialog sal_uInt16 nFlags, const OUString &rErr, // error text const OUString &rAction) // action text @@ -370,7 +370,7 @@ bool SfxErrorHandler::GetErrorString( SfxErrorContext::SfxErrorContext( - sal_uInt16 nCtxIdP, Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) + sal_uInt16 nCtxIdP, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) : ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP) { if( nResId==USHRT_MAX ) @@ -380,7 +380,7 @@ SfxErrorContext::SfxErrorContext( SfxErrorContext::SfxErrorContext( - sal_uInt16 nCtxIdP, const OUString &aArg1P, Window *pWindow, + sal_uInt16 nCtxIdP, const OUString &aArg1P, vcl::Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP) : ErrorContext(pWindow), nCtxId(nCtxIdP), nResId(nResIdP), pMgr(pMgrP), aArg1(aArg1P) diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx index f6f614e8095b..0c8637f46c14 100644 --- a/svtools/source/misc/stringtransfer.cxx +++ b/svtools/source/misc/stringtransfer.cxx @@ -57,7 +57,7 @@ namespace svt //= OStringTransfer - void OStringTransfer::CopyString( const OUString& _rContent, Window* _pWindow ) + void OStringTransfer::CopyString( const OUString& _rContent, vcl::Window* _pWindow ) { OStringTransferable* pTransferable = new OStringTransferable( _rContent ); Reference< XTransferable > xTransfer = pTransferable; @@ -65,7 +65,7 @@ namespace svt } - bool OStringTransfer::PasteString( OUString& _rContent, Window* _pWindow ) + bool OStringTransfer::PasteString( OUString& _rContent, vcl::Window* _pWindow ) { TransferableDataHelper aClipboardData = TransferableDataHelper::CreateFromSystemClipboard( _pWindow ); @@ -89,7 +89,7 @@ namespace svt } - void OStringTransfer::StartStringDrag( const OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions ) + void OStringTransfer::StartStringDrag( const OUString& _rContent, vcl::Window* _pWindow, sal_Int8 _nDragSourceActions ) { OStringTransferable* pTransferable = new OStringTransferable( _rContent ); Reference< XTransferable > xTransfer = pTransferable; diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 9cc21e72acbd..15914496e28f 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1007,7 +1007,7 @@ void TransferableHelper::PrepareOLE( const TransferableObjectDescriptor& rObjDes -void TransferableHelper::CopyToClipboard( Window *pWindow ) const +void TransferableHelper::CopyToClipboard( vcl::Window *pWindow ) const { DBG_ASSERT( pWindow, "Window pointer is NULL" ); Reference< XClipboard > xClipboard; @@ -1040,7 +1040,7 @@ void TransferableHelper::CopyToClipboard( Window *pWindow ) const -void TransferableHelper::CopyToSelection( Window *pWindow ) const +void TransferableHelper::CopyToSelection( vcl::Window *pWindow ) const { DBG_ASSERT( pWindow, "Window pointer is NULL" ); Reference< XClipboard > xSelection; @@ -1070,7 +1070,7 @@ void TransferableHelper::CopyToSelection( Window *pWindow ) const -void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions, +void TransferableHelper::StartDrag( vcl::Window* pWindow, sal_Int8 nDnDSourceActions, sal_Int32 nDnDPointer, sal_Int32 nDnDImage ) { @@ -1119,7 +1119,7 @@ void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions, -void TransferableHelper::ClearSelection( Window *pWindow ) +void TransferableHelper::ClearSelection( vcl::Window *pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); Reference< XClipboard > xSelection( pWindow->GetPrimarySelection() ); @@ -1132,7 +1132,7 @@ void TransferableHelper::ClearSelection( Window *pWindow ) Reference< XClipboard> TransferableHelper::GetSystemClipboard() { - Window *pFocusWindow = Application::GetFocusWindow(); + vcl::Window *pFocusWindow = Application::GetFocusWindow(); if( pFocusWindow ) return pFocusWindow->GetClipboard(); @@ -2238,7 +2238,7 @@ void TransferableDataHelper::StopClipboardListening( ) -TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window * pWindow ) +TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( vcl::Window * pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); @@ -2272,7 +2272,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window -TransferableDataHelper TransferableDataHelper::CreateFromSelection( Window* pWindow ) +TransferableDataHelper TransferableDataHelper::CreateFromSelection( vcl::Window* pWindow ) { DBG_ASSERT( pWindow, "Window pointer is NULL" ); diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index c79ddbf8bfc9..a5e80c4ca878 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -79,7 +79,7 @@ void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( cons // - DragSourceHelper - -DragSourceHelper::DragSourceHelper( Window* pWindow ) : +DragSourceHelper::DragSourceHelper( vcl::Window* pWindow ) : mxDragGestureRecognizer( pWindow->GetDragGestureRecognizer() ) { if( mxDragGestureRecognizer.is() ) @@ -253,7 +253,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dropActionChanged( const Dro // - DropTargetHelper - -DropTargetHelper::DropTargetHelper( Window* pWindow ) : +DropTargetHelper::DropTargetHelper( vcl::Window* pWindow ) : mxDropTarget( pWindow->GetDropTarget() ), mpFormats( new DataFlavorExVector ) { @@ -596,7 +596,7 @@ bool TransferDataContainer::HasAnyData() const void TransferDataContainer::StartDrag( - Window* pWindow, sal_Int8 nDragSourceActions, + vcl::Window* pWindow, sal_Int8 nDragSourceActions, const Link& rLnk, sal_Int32 nDragPointer, sal_Int32 nDragImage ) { pImpl->aFinshedLnk = rLnk; diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx index 3a106bd52f31..a6d7c613540e 100644 --- a/svtools/source/table/gridtablerenderer.cxx +++ b/svtools/source/table/gridtablerenderer.cxx @@ -558,13 +558,13 @@ namespace svt { namespace table } - void GridTableRenderer::ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect) + void GridTableRenderer::ShowCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) { _rView.ShowFocus( _rCursorRect ); } - void GridTableRenderer::HideCellCursor( Window& _rView, const Rectangle& _rCursorRect) + void GridTableRenderer::HideCellCursor( vcl::Window& _rView, const Rectangle& _rCursorRect) { (void)_rCursorRect; _rView.HideFocus(); diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index b18d48ac436a..9afa63df04cc 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -46,7 +46,7 @@ namespace svt { namespace table //= TableControl - TableControl::TableControl( Window* _pParent, WinBits _nStyle ) + TableControl::TableControl( vcl::Window* _pParent, WinBits _nStyle ) :Control( _pParent, _nStyle ) ,m_pImpl( new TableControl_Impl( *this ) ) { @@ -266,7 +266,7 @@ namespace svt { namespace table } - Window& TableControl::getDataWindow() + vcl::Window& TableControl::getDataWindow() { return m_pImpl->getDataWindow(); } @@ -274,7 +274,7 @@ namespace svt { namespace table Reference< XAccessible > TableControl::CreateAccessible() { - Window* pParent = GetAccessibleParentWindow(); + vcl::Window* pParent = GetAccessibleParentWindow(); ENSURE_OR_RETURN( pParent, "TableControl::CreateAccessible - parent not found", NULL ); return m_pImpl->getAccessible( *pParent ); @@ -500,7 +500,7 @@ namespace svt { namespace table } - Rectangle TableControl::GetWindowExtentsRelative( Window *pRelativeWindow ) const + Rectangle TableControl::GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const { return Control::GetWindowExtentsRelative( pRelativeWindow ); } @@ -518,13 +518,13 @@ namespace svt { namespace table } - Window* TableControl::GetAccessibleParentWindow() const + vcl::Window* TableControl::GetAccessibleParentWindow() const { return Control::GetAccessibleParentWindow(); } - Window* TableControl::GetWindowInstance() + vcl::Window* TableControl::GetWindowInstance() { return this; } diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 8975e2f3902c..fc52b5441e68 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -624,7 +624,7 @@ namespace svt { namespace table } - void lcl_setButtonRepeat( Window& _rWindow, sal_uLong _nDelay ) + void lcl_setButtonRepeat( vcl::Window& _rWindow, sal_uLong _nDelay ) { AllSettings aSettings = _rWindow.GetSettings(); MouseSettings aMouseSettings = aSettings.GetMouseSettings(); @@ -636,7 +636,7 @@ namespace svt { namespace table } - bool lcl_updateScrollbar( Window& _rParent, ScrollBar*& _rpBar, + bool lcl_updateScrollbar( vcl::Window& _rParent, ScrollBar*& _rpBar, bool const i_needBar, long _nVisibleUnits, long _nPosition, long _nLineSize, long _nRange, bool _bHorizontal, const Link& _rScrollHandler ) @@ -2439,7 +2439,7 @@ namespace svt { namespace table } - Reference< XAccessible > TableControl_Impl::getAccessible( Window& i_parentWindow ) + Reference< XAccessible > TableControl_Impl::getAccessible( vcl::Window& i_parentWindow ) { DBG_TESTSOLARMUTEX(); if ( m_pAccessibleTable == NULL ) diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index dc624c4c06ea..5143d082426d 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -297,7 +297,7 @@ namespace svt { namespace table // A11Y ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - getAccessible( Window& i_parentWindow ); + getAccessible( vcl::Window& i_parentWindow ); void disposeAccessible(); inline bool isAccessibleAlive() const { return impl_isAccessibleAlive(); } diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx index 53dfb141bd74..c606d6a4b205 100644 --- a/svtools/source/table/tabledatawindow.hxx +++ b/svtools/source/table/tabledatawindow.hxx @@ -38,7 +38,7 @@ namespace svt { namespace table /** the window containing the content area (including headers) of a table control */ - class TableDataWindow : public Window + class TableDataWindow : public vcl::Window { friend class TableFunctionSet; private: diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx index d8abf3395315..b2e692c1bd55 100644 --- a/svtools/source/toolpanel/drawerlayouter.cxx +++ b/svtools/source/toolpanel/drawerlayouter.cxx @@ -38,7 +38,7 @@ namespace svt //= DrawerDeckLayouter - DrawerDeckLayouter::DrawerDeckLayouter( ::Window& i_rParentWindow, IToolPanelDeck& i_rPanels ) + DrawerDeckLayouter::DrawerDeckLayouter( vcl::Window& i_rParentWindow, IToolPanelDeck& i_rPanels ) :m_rParentWindow( i_rParentWindow ) ,m_rPanelDeck( i_rPanels ) ,m_aDrawers() @@ -211,7 +211,7 @@ namespace svt } - size_t DrawerDeckLayouter::impl_getPanelPositionFromWindow( const Window* i_pDrawerWindow ) const + size_t DrawerDeckLayouter::impl_getPanelPositionFromWindow( const vcl::Window* i_pDrawerWindow ) const { for ( ::std::vector< PToolPanelDrawer >::const_iterator drawerPos = m_aDrawers.begin(); drawerPos != m_aDrawers.end(); diff --git a/svtools/source/toolpanel/dummypanel.cxx b/svtools/source/toolpanel/dummypanel.cxx index 95dffda0f0a2..7ba14f893572 100644 --- a/svtools/source/toolpanel/dummypanel.cxx +++ b/svtools/source/toolpanel/dummypanel.cxx @@ -42,7 +42,7 @@ namespace svt } - void DummyPanel::Activate( Window& ) + void DummyPanel::Activate( vcl::Window& ) { } diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx index f4a884aaad27..ad038ede55f3 100644 --- a/svtools/source/toolpanel/dummypanel.hxx +++ b/svtools/source/toolpanel/dummypanel.hxx @@ -42,7 +42,7 @@ namespace svt virtual OUString GetDisplayName() const SAL_OVERRIDE; virtual Image GetImage() const SAL_OVERRIDE; virtual OString GetHelpID() const SAL_OVERRIDE; - virtual void Activate( Window& i_rParentWindow ) SAL_OVERRIDE; + virtual void Activate( vcl::Window& i_rParentWindow ) SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; virtual void SetSizePixel( const Size& i_rPanelWindowSize ) SAL_OVERRIDE; virtual void GrabFocus() SAL_OVERRIDE; diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 1af8a6669861..5a2548a9d1e4 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -86,7 +86,7 @@ namespace svt virtual void renderBackground() const = 0; virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const = 0; virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const = 0; - virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const = 0; + virtual void postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const = 0; // TODO: postRenderItem takes the "real" window, i.e. effectively the tab bar. This is because // DrawSelectionBackground needs to be applied after everything else is painted, and is available at the Window @@ -115,7 +115,7 @@ namespace svt virtual void renderBackground() const SAL_OVERRIDE; virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; - virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; + virtual void postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; protected: OutputDevice& getTargetDevice() const { return m_rTargetDevice; } @@ -149,7 +149,7 @@ namespace svt } - void VCLItemRenderer::postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const + void VCLItemRenderer::postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const { const bool bActive = ( ( i_nItemFlags & ITEM_STATE_ACTIVE ) != 0 ); const bool bHovered = ( ( i_nItemFlags & ITEM_STATE_HOVERED ) != 0 ); @@ -190,7 +190,7 @@ namespace svt virtual void renderBackground() const SAL_OVERRIDE; virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; - virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; + virtual void postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; protected: OutputDevice& getTargetDevice() const { return m_rTargetDevice; } @@ -243,7 +243,7 @@ namespace svt } - void NWFToolboxItemRenderer::postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const + void NWFToolboxItemRenderer::postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const { (void)i_rActualWindow; (void)i_rItemRect; @@ -268,7 +268,7 @@ namespace svt virtual void renderBackground() const SAL_OVERRIDE; virtual Rectangle calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; virtual void preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; - virtual void postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; + virtual void postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const SAL_OVERRIDE; protected: OutputDevice& getTargetDevice() const { return m_rTargetDevice; } @@ -330,7 +330,7 @@ namespace svt } - void NWFTabItemRenderer::postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const + void NWFTabItemRenderer::postRenderItem( vcl::Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const { (void)i_rActualWindow; (void)i_rItemRect; @@ -989,7 +989,7 @@ namespace svt //= PanelTabBar - PanelTabBar::PanelTabBar( Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ) + PanelTabBar::PanelTabBar( vcl::Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ) :Control( &i_rParentWindow, 0 ) ,m_pImpl( new PanelTabBar_Impl( *this, i_rPanelDeck, i_eAlignment, i_eItemContent ) ) { diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx index 3ca23007ba02..3a0c473732b1 100644 --- a/svtools/source/toolpanel/paneltabbarpeer.cxx +++ b/svtools/source/toolpanel/paneltabbarpeer.cxx @@ -69,7 +69,7 @@ namespace svt - Window* pAccessibleParent( m_pTabBar->GetAccessibleParentWindow() ); + vcl::Window* pAccessibleParent( m_pTabBar->GetAccessibleParentWindow() ); ENSURE_OR_RETURN( pAccessibleParent != NULL, "no accessible parent => no accessible context", NULL ); Reference< XAccessible > xAccessibleParent( pAccessibleParent->GetAccessible(), UNO_SET_THROW ); return m_aAccessibleFactory.getFactory().createAccessibleToolPanelTabBar( xAccessibleParent, m_pTabBar->GetPanelDeck(), *m_pTabBar ); diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx index 0f82dd40b0a4..68a09a37b655 100644 --- a/svtools/source/toolpanel/tablayouter.cxx +++ b/svtools/source/toolpanel/tablayouter.cxx @@ -44,7 +44,7 @@ namespace svt ::std::auto_ptr< PanelTabBar > pTabBar; AccessibleFactoryAccess aAccessibleFactory; - TabDeckLayouter_Data( Window& i_rParent, IToolPanelDeck& i_rPanels, + TabDeckLayouter_Data( vcl::Window& i_rParent, IToolPanelDeck& i_rPanels, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ) :eAlignment( i_eAlignment ) ,rPanels( i_rPanels ) @@ -80,7 +80,7 @@ namespace svt //= TabDeckLayouter - TabDeckLayouter::TabDeckLayouter( Window& i_rParent, IToolPanelDeck& i_rPanels, + TabDeckLayouter::TabDeckLayouter( vcl::Window& i_rParent, IToolPanelDeck& i_rPanels, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent ) :m_pData( new TabDeckLayouter_Data( i_rParent, i_rPanels, i_eAlignment, i_eItemContent ) ) { diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx index 19c0a22febb4..27dfa5146c0f 100644 --- a/svtools/source/toolpanel/toolpaneldeck.cxx +++ b/svtools/source/toolpanel/toolpaneldeck.cxx @@ -87,7 +87,7 @@ namespace svt PDeckLayouter GetLayouter() const { return m_pLayouter; } void SetLayouter( const PDeckLayouter& i_pNewLayouter ); - Window& GetPanelWindowAnchor() { return m_aPanelAnchor; } + vcl::Window& GetPanelWindowAnchor() { return m_aPanelAnchor; } bool IsDead() const { return m_bInDtor; } @@ -130,7 +130,7 @@ namespace svt private: ToolPanelDeck& m_rDeck; - Window m_aPanelAnchor; + vcl::Window m_aPanelAnchor; ToolPanelCollection m_aPanels; PToolPanel m_pDummyPanel; PanelDeckListeners m_aListeners; @@ -341,7 +341,7 @@ namespace svt //= ToolPanelDeck - ToolPanelDeck::ToolPanelDeck( Window& i_rParent, const WinBits i_nStyle ) + ToolPanelDeck::ToolPanelDeck( vcl::Window& i_rParent, const WinBits i_nStyle ) :Control( &i_rParent, i_nStyle ) ,m_pImpl( new ToolPanelDeck_Impl( *this ) ) { @@ -425,13 +425,13 @@ namespace svt } - Window& ToolPanelDeck::GetPanelWindowAnchor() + vcl::Window& ToolPanelDeck::GetPanelWindowAnchor() { return m_pImpl->GetPanelWindowAnchor(); } - const Window& ToolPanelDeck::GetPanelWindowAnchor() const + const vcl::Window& ToolPanelDeck::GetPanelWindowAnchor() const { return m_pImpl->GetPanelWindowAnchor(); } diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx index 4979872af744..333fa43c10d0 100644 --- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx +++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx @@ -67,7 +67,7 @@ namespace svt if ( m_pDeck == NULL ) throw DisposedException( OUString(), *this ); - Window* pAccessibleParent( m_pDeck->GetAccessibleParentWindow() ); + vcl::Window* pAccessibleParent( m_pDeck->GetAccessibleParentWindow() ); ENSURE_OR_RETURN( pAccessibleParent != NULL, "no accessible parent => no accessible context", NULL ); Reference< XAccessible > xAccessibleParent( pAccessibleParent->GetAccessible(), UNO_SET_THROW ); return m_aAccessibleFactory.getFactory().createAccessibleToolPanelDeck( xAccessibleParent, *m_pDeck ); diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx index a5e5c12232b3..8fce1ad89f1c 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -71,7 +71,7 @@ namespace svt //= ToolPanelDrawer - ToolPanelDrawer::ToolPanelDrawer( Window& i_rParent, const OUString& i_rTitle ) + ToolPanelDrawer::ToolPanelDrawer( vcl::Window& i_rParent, const OUString& i_rTitle ) :Window( &i_rParent, WB_TABSTOP ) ,m_pPaintDevice( new VirtualDevice( *this ) ) ,m_aVisualization( *this ) diff --git a/svtools/source/toolpanel/toolpaneldrawer.hxx b/svtools/source/toolpanel/toolpaneldrawer.hxx index 92898ba202ab..3186ca1f6cfc 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.hxx +++ b/svtools/source/toolpanel/toolpaneldrawer.hxx @@ -41,7 +41,7 @@ namespace svt (We could also inject the A11Y component on the A11Y level only, but this would mean additional code. With this approach here, VCL/toolkit will take care of creating and maintaining the A11Y component for us.) */ - class DrawerVisualization : public Window + class DrawerVisualization : public vcl::Window { public: DrawerVisualization( ToolPanelDrawer& i_rParent ); @@ -59,10 +59,10 @@ namespace svt //= ToolPanelDrawer - class ToolPanelDrawer : public Window + class ToolPanelDrawer : public vcl::Window { public: - ToolPanelDrawer( Window& i_rParent, const OUString& i_rTitle ); + ToolPanelDrawer( vcl::Window& i_rParent, const OUString& i_rTitle ); virtual ~ToolPanelDrawer(); long GetPreferredHeightPixel() const; diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx index e8f86818dbac..3c9772945e02 100644 --- a/svtools/source/uno/addrtempuno.cxx +++ b/svtools/source/uno/addrtempuno.cxx @@ -71,7 +71,7 @@ namespace { protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; @@ -212,7 +212,7 @@ namespace { } - Dialog* OAddressBookSourceDialogUno::createDialog(Window* _pParent) + Dialog* OAddressBookSourceDialogUno::createDialog(vcl::Window* _pParent) { if ( m_xDataSource.is() && !m_sTable.isEmpty() ) return new AddressBookSourceDialog(_pParent, m_aContext, m_xDataSource, m_sDataSourceName, m_sTable, m_aAliases ); diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx index dce6708f98ee..b751f5a8a45e 100644 --- a/svtools/source/uno/contextmenuhelper.cxx +++ b/svtools/source/uno/contextmenuhelper.cxx @@ -313,7 +313,7 @@ ContextMenuHelper::executePopupMenu( uno::Reference< awt::XWindow > xWindow( xFrame->getContainerWindow() ); if ( xWindow.is() ) { - Window* pParent = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xWindow ); sal_uInt16 nResult = pMenu->Execute( pParent, rPos ); if ( nResult > 0 ) diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 0ce8959edbac..e2e154ff2ecb 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -169,7 +169,7 @@ bool OGenericUnoDialog::impl_ensureDialog_lck() // get the parameters for the dialog from the current settings // the parent window - Window* pParent = NULL; + vcl::Window* pParent = NULL; VCLXWindow* pImplementation = VCLXWindow::GetImplementation(m_xParent); if (pImplementation) pParent = pImplementation->GetWindow(); diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 9ecd48e31cfc..f77f16aae914 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -40,13 +40,13 @@ public: PopupWindowControllerImpl(); ~PopupWindowControllerImpl(); - void SetPopupWindow( ::Window* pPopupWindow, ToolBox* pToolBox ); + void SetPopupWindow( vcl::Window* pPopupWindow, ToolBox* pToolBox ); DECL_LINK( WindowEventListener, VclSimpleEvent* ); - DECL_STATIC_LINK( PopupWindowControllerImpl, AsyncDeleteWindowHdl, Window* ); + DECL_STATIC_LINK( PopupWindowControllerImpl, AsyncDeleteWindowHdl, vcl::Window* ); private: - ::Window* mpPopupWindow; + vcl::Window* mpPopupWindow; ToolBox* mpToolBox; }; @@ -62,7 +62,7 @@ PopupWindowControllerImpl::~PopupWindowControllerImpl() SetPopupWindow(0,0); } -void PopupWindowControllerImpl::SetPopupWindow( ::Window* pPopupWindow, ToolBox* pToolBox ) +void PopupWindowControllerImpl::SetPopupWindow( vcl::Window* pPopupWindow, ToolBox* pToolBox ) { if( mpPopupWindow ) { @@ -122,7 +122,7 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclSimpleEvent*, pEve -IMPL_STATIC_LINK( PopupWindowControllerImpl, AsyncDeleteWindowHdl, Window*, pWindow ) +IMPL_STATIC_LINK( PopupWindowControllerImpl, AsyncDeleteWindowHdl, vcl::Window*, pWindow ) { (void)*pThis; delete pWindow; @@ -218,13 +218,13 @@ Reference< awt::XWindow > SAL_CALL PopupWindowController::createPopupWindow() th ToolBox* pToolBox = dynamic_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) ); if( pToolBox ) { - ::Window* pItemWindow = pToolBox->GetItemWindow( pToolBox->GetDownItemId() ); - ::Window* pWin = createPopupWindow( pItemWindow ? pItemWindow : pToolBox ); + vcl::Window* pItemWindow = pToolBox->GetItemWindow( pToolBox->GetDownItemId() ); + vcl::Window* pWin = createPopupWindow( pItemWindow ? pItemWindow : pToolBox ); if( pWin ) { pWin->EnableDocking(true); mpImpl->SetPopupWindow(pWin,pToolBox); - ::Window::GetDockingManager()->StartPopupMode( pToolBox, pWin, + vcl::Window::GetDockingManager()->StartPopupMode( pToolBox, pWin, FLOATWIN_POPUPMODE_GRABFOCUS | FLOATWIN_POPUPMODE_NOFOCUSCLOSE | FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE | diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx index a0fb056e090c..b9ef5a4f0d85 100644 --- a/svtools/source/uno/statusbarcontroller.cxx +++ b/svtools/source/uno/statusbarcontroller.cxx @@ -285,7 +285,7 @@ throw ( RuntimeException, std::exception ) if ( m_bDisposed ) return; - Window* pWindow = VCLUnoHelper::GetWindow( m_xParentWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( m_xParentWindow ); if ( pWindow && pWindow->GetType() == WINDOW_STATUSBAR && m_nID != 0 ) { OUString aStrValue; diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index dda1e9492687..df7c51b5297d 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -89,7 +89,7 @@ SVTXGridControl::~SVTXGridControl() } -void SVTXGridControl::SetWindow( Window* pWindow ) +void SVTXGridControl::SetWindow( vcl::Window* pWindow ) { SVTXGridControl_Base::SetWindow( pWindow ); impl_checkTableModelInit(); @@ -858,7 +858,7 @@ void SVTXGridControl::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno: SolarMutexGuard aGuard; m_pTableModel->setEnabled( bEnable ); - Window * pWindow = GetWindow(); + vcl::Window * pWindow = GetWindow(); if ( pWindow ) { pWindow->Enable( bEnable, true ); diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx index 5b9f585d6bfd..2deaddeb72e0 100644 --- a/svtools/source/uno/svtxgridcontrol.hxx +++ b/svtools/source/uno/svtxgridcontrol.hxx @@ -106,7 +106,7 @@ public: protected: // VCLXWindow - virtual void SetWindow( Window* pWindow ) SAL_OVERRIDE; + virtual void SetWindow( vcl::Window* pWindow ) SAL_OVERRIDE; private: void impl_updateColumnsFromModel_nothrow(); diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 90f0c7d4aeb3..39ca76b9f9a9 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -84,7 +84,7 @@ public: class UnoTreeListBoxImpl : public SvTreeListBox { public: - UnoTreeListBoxImpl( TreeControlPeer* pPeer, Window* pParent, WinBits nWinStyle ); + UnoTreeListBoxImpl( TreeControlPeer* pPeer, vcl::Window* pParent, WinBits nWinStyle ); virtual ~UnoTreeListBoxImpl(); sal_uInt32 insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos=TREELIST_APPEND ); @@ -204,7 +204,7 @@ UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode -Window* TreeControlPeer::createVclControl( Window* pParent, sal_Int64 nWinStyle ) +vcl::Window* TreeControlPeer::createVclControl( vcl::Window* pParent, sal_Int64 nWinStyle ) { mpTreeImpl = new UnoTreeListBoxImpl( this, pParent, nWinStyle ); return mpTreeImpl; @@ -222,7 +222,7 @@ void TreeControlPeer::disposeControl() -void TreeControlPeer::SetWindow( Window* pWindow ) +void TreeControlPeer::SetWindow( vcl::Window* pWindow ) { VCLXWindow::SetWindow( pWindow ); } @@ -1475,7 +1475,7 @@ bool TreeControlPeer::loadImage( const OUString& rURL, Image& rImage ) // class UnoTreeListBoxImpl -UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, Window* pParent, WinBits nWinStyle ) +UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, vcl::Window* pParent, WinBits nWinStyle ) : SvTreeListBox( pParent, nWinStyle ) , mxPeer( pPeer ) { diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx index 617be2d205d7..613d255732c4 100644 --- a/svtools/source/uno/treecontrolpeer.hxx +++ b/svtools/source/uno/treecontrolpeer.hxx @@ -55,10 +55,10 @@ public: TreeControlPeer(); virtual ~TreeControlPeer(); - Window* createVclControl( Window* pParent, sal_Int64 nWinStyle ); + vcl::Window* createVclControl( vcl::Window* pParent, sal_Int64 nWinStyle ); // VCLXWindow - virtual void SetWindow( Window* pWindow ) SAL_OVERRIDE; + virtual void SetWindow( vcl::Window* pWindow ) SAL_OVERRIDE; // ::com::sun::star::view::XSelectionSupplier virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& xSelection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 2c3ea4d05891..b0ac7e01313a 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -42,7 +42,7 @@ namespace { - static void lcl_setWinBits( Window* _pWindow, WinBits _nBits, bool _bSet ) + static void lcl_setWinBits( vcl::Window* _pWindow, WinBits _nBits, bool _bSet ) { WinBits nStyle = _pWindow->GetStyle(); if ( _bSet ) @@ -59,9 +59,9 @@ namespace extern "C" { -SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, Window* pParent, WinBits nWinBits ) +SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::sun::star::awt::WindowDescriptor* pDescriptor, vcl::Window* pParent, WinBits nWinBits ) { - Window* pWindow = NULL; + vcl::Window* pWindow = NULL; OUString aServiceName( pDescriptor->WindowServiceName ); if ( aServiceName.equalsIgnoreAsciiCase( "MultiLineEdit" ) ) { @@ -589,7 +589,7 @@ void SAL_CALL VCLXFileControl::setProperty( const OUString& PropertyName, const } } -void VCLXFileControl::SetWindow( Window* pWindow ) +void VCLXFileControl::SetWindow( vcl::Window* pWindow ) { FileControl* pPrevFileControl = dynamic_cast<FileControl*>( GetWindow() ); if ( pPrevFileControl ) @@ -616,7 +616,7 @@ void VCLXFileControl::setText( const OUString& aText ) throw(::com::sun::star::u { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { pWindow->SetText( aText ); @@ -644,7 +644,7 @@ OUString VCLXFileControl::getText() throw(::com::sun::star::uno::RuntimeExceptio SolarMutexGuard aGuard; OUString aText; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) aText = pWindow->GetText(); return aText; @@ -823,7 +823,7 @@ SVTXFormattedField::~SVTXFormattedField() } -void SVTXFormattedField::SetWindow( Window* _pWindow ) +void SVTXFormattedField::SetWindow( vcl::Window* _pWindow ) { VCLXSpinField::SetWindow(_pWindow); if (GetFormattedField()) @@ -2138,7 +2138,7 @@ void VCLXProgressBar::setForegroundColor( sal_Int32 nColor ) throw(::com::sun::s { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { Color aColor( nColor ); @@ -2150,7 +2150,7 @@ void VCLXProgressBar::setBackgroundColor( sal_Int32 nColor ) throw(::com::sun::s { SolarMutexGuard aGuard; - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { Color aColor( nColor ); @@ -2226,7 +2226,7 @@ void VCLXProgressBar::setProperty( const OUString& PropertyName, const ::com::su break; case BASEPROPERTY_FILLCOLOR: { - Window* pWindow = GetWindow(); + vcl::Window* pWindow = GetWindow(); if ( pWindow ) { bool bVoid = Value.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_VOID; diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index c3f20273c686..c36ccbc33cf3 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -136,7 +136,7 @@ namespace { virtual ~Wizard(); protected: - virtual Dialog* createDialog( Window* _pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE; virtual void destroyDialog() SAL_OVERRIDE; private: @@ -268,7 +268,7 @@ namespace { } - Dialog* Wizard::createDialog( Window* i_pParent ) + Dialog* Wizard::createDialog( vcl::Window* i_pParent ) { WizardShell* pDialog( new WizardShell( i_pParent, m_xController, m_aWizardSteps ) ); pDialog->SetHelpId( lcl_getHelpId( m_sHelpURL ) ); diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx index 4d86bd4d17d5..a28cfd219d33 100644 --- a/svtools/source/uno/wizard/wizardpagecontroller.cxx +++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx @@ -102,7 +102,7 @@ namespace svt { namespace uno try { Reference< XWindow > xPageWindow( m_xWizardPage->getWindow(), UNO_SET_THROW ); - Window* pPageWindow = VCLUnoHelper::GetWindow( xPageWindow ); + vcl::Window* pPageWindow = VCLUnoHelper::GetWindow( xPageWindow ); if ( pPageWindow == NULL ) { // windows created via the XContainerWindowProvider might be controls, not real windows, so resolve diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index 9b3022c93918..d10db321ee60 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -62,7 +62,7 @@ namespace svt { namespace uno //= WizardShell - WizardShell::WizardShell( Window* i_pParent, const Reference< XWizardController >& i_rController, + WizardShell::WizardShell( vcl::Window* i_pParent, const Reference< XWizardController >& i_rController, const Sequence< Sequence< sal_Int16 > >& i_rPaths ) :WizardShell_Base( i_pParent, WB_MOVEABLE | WB_CLOSEABLE ) ,m_xController( i_rController ) diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx index 9d2bc6b85212..4d2e3e8f0315 100644 --- a/svtools/source/uno/wizard/wizardshell.hxx +++ b/svtools/source/uno/wizard/wizardshell.hxx @@ -44,7 +44,7 @@ namespace svt { namespace uno { public: WizardShell( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XWizardController >& i_rController, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< sal_Int16 > >& i_rPaths ); |