diff options
Diffstat (limited to 'dbaccess')
227 files changed, 532 insertions, 532 deletions
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 136290f8d8d0..c643e8042942 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -126,7 +126,7 @@ namespace dbmm }; // MacroMigrationDialog - MacroMigrationDialog::MacroMigrationDialog(Window* _pParent, const Reference<XComponentContext>& _rContext, + MacroMigrationDialog::MacroMigrationDialog(vcl::Window* _pParent, const Reference<XComponentContext>& _rContext, const Reference< XOfficeDatabaseDocument >& _rxDocument) : MacroMigrationDialog_Base(_pParent) , m_pData( new MacroMigrationDialog_Data( _rContext, _rxDocument ) ) diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx index 9db62481463f..b5ee3d1be704 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx @@ -36,7 +36,7 @@ namespace dbmm { public: MacroMigrationDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XOfficeDatabaseDocument >& _rxDocument ); diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index 04c9cc7aaf73..3a2f559fdab8 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -45,7 +45,7 @@ namespace dbmm using ::com::sun::star::uno::Sequence; using ::com::sun::star::frame::XModel; - MacroMigrationPage::MacroMigrationPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription) + MacroMigrationPage::MacroMigrationPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription) : MacroMigrationPage_Base(pParent, rID, rUIXMLDescription) { } @@ -61,7 +61,7 @@ namespace dbmm } // PreparationPage - PreparationPage::PreparationPage(Window *pParent) + PreparationPage::PreparationPage(vcl::Window *pParent) : MacroMigrationPage(pParent, "PreparePage" ,"dbaccess/ui/preparepage.ui") { get(m_pCloseDocError, "closedocerror"); @@ -162,7 +162,7 @@ namespace dbmm } // ProgressPage - ProgressPage::ProgressPage(Window* pParent) + ProgressPage::ProgressPage(vcl::Window* pParent) : MacroMigrationPage(pParent, "MigratePage" ,"dbaccess/ui/migratepage.ui") { get(m_pObjectCount, "count"); @@ -246,7 +246,7 @@ namespace dbmm } // ResultPage - ResultPage::ResultPage(Window* pParent) + ResultPage::ResultPage(vcl::Window* pParent) : MacroMigrationPage(pParent, "SummaryPage" ,"dbaccess/ui/summarypage.ui") { get(m_pChanges, "textview"); diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx index 46989c58cb78..fc6ffc934521 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx @@ -45,7 +45,7 @@ namespace dbmm class MacroMigrationPage : public MacroMigrationPage_Base { public: - MacroMigrationPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription); + MacroMigrationPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription); protected: const MacroMigrationDialog& getDialog() const; @@ -56,7 +56,7 @@ namespace dbmm class PreparationPage : public MacroMigrationPage { public: - PreparationPage(Window *pParent); + PreparationPage(vcl::Window *pParent); static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); @@ -100,7 +100,7 @@ namespace dbmm class ProgressPage : public MacroMigrationPage, public IMigrationProgress { public: - ProgressPage(Window *pParent); + ProgressPage(vcl::Window *pParent); static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); @@ -131,7 +131,7 @@ namespace dbmm class ResultPage : public MacroMigrationPage { public: - ResultPage(Window *pParent); + ResultPage(vcl::Window *pParent); static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 4913bcd737ae..f61045458791 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -88,7 +88,7 @@ namespace dbmm virtual ~MacroMigrationDialogService(); protected: - virtual Dialog* createDialog( Window* _pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE; virtual void destroyDialog() SAL_OVERRIDE; private: @@ -121,7 +121,7 @@ namespace dbmm return *(new MacroMigrationDialogService( _rxContext ) ); } - Dialog* MacroMigrationDialogService::createDialog( Window* _pParent ) + Dialog* MacroMigrationDialogService::createDialog( vcl::Window* _pParent ) { return new MacroMigrationDialog( _pParent, m_aContext, m_xDocument ); } diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 570e32821377..0c03368c977a 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -405,7 +405,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto uno::Reference< ::com::sun::star::awt::XWindow > xWindow; { SolarMutexGuard aGuard; - Window* pFocusWindow = Application::GetFocusWindow(); + vcl::Window* pFocusWindow = Application::GetFocusWindow(); xWindow = VCLUnoHelper::GetInterface( pFocusWindow ); if( pFocusWindow ) pFocusWindow->EnterWait(); @@ -418,7 +418,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto if ( xWindow.is() ) { SolarMutexGuard aGuard; - Window* pFocusWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pFocusWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pFocusWindow ) pFocusWindow->LeaveWait(); } diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 4996d491ce68..092ee4a909b1 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -312,7 +312,7 @@ OApplicationController::~OApplicationController() dispose(); } SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< Window> aTemp( getView() ); + ::std::auto_ptr< vcl::Window> aTemp( getView() ); SAL_WNODEPRECATED_DECLARATIONS_POP clearView(); @@ -429,7 +429,7 @@ void SAL_CALL OApplicationController::disposing() OApplicationController_CBASE::disposing(); // here the m_refCount must be equal 5 } -bool OApplicationController::Construct(Window* _pParent) +bool OApplicationController::Construct(vcl::Window* _pParent) { setView( * new OApplicationView( _pParent, getORB(), *this, m_ePreviewMode ) ); getView()->SetUniqueId(UID_APP_VIEW); @@ -452,7 +452,7 @@ bool OApplicationController::Construct(Window* _pParent) if ( !bSuccess ) { SAL_WNODEPRECATED_DECLARATIONS_PUSH - ::std::auto_ptr< Window> aTemp( getView() ); + ::std::auto_ptr< vcl::Window> aTemp( getView() ); SAL_WNODEPRECATED_DECLARATIONS_POP clearView(); return false; diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 18fdb41d14fc..2e262c67d22f 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -546,7 +546,7 @@ namespace dbaui virtual void disconnect(); // late construction - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; virtual void describeSupportedFeatures() SAL_OVERRIDE; protected: diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 691775f20836..af80ee80ad34 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -125,17 +125,17 @@ namespace return (nIndex != -1 ? lcl_findEntry_impl(rTree,_rName.copy(sErase.getLength() + 1),_pFirst) : NULL); } // class OPreviewWindow - class OTablePreviewWindow : public Window + class OTablePreviewWindow : public vcl::Window { DECL_LINK(OnDisableInput, void*); void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OTablePreviewWindow( Window* pParent, WinBits nStyle = 0 ); + OTablePreviewWindow( vcl::Window* pParent, WinBits nStyle = 0 ); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; - OTablePreviewWindow::OTablePreviewWindow(Window* pParent, WinBits nStyle) : Window( pParent, nStyle) + OTablePreviewWindow::OTablePreviewWindow(vcl::Window* pParent, WinBits nStyle) : Window( pParent, nStyle) { ImplInitSettings( true, true, true ); } @@ -186,7 +186,7 @@ namespace } // class OAppDetailPageHelper -OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL) +OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode) : Window(_pParent,WB_DIALOGCONTROL) ,m_rBorderWin(_rBorderWin) ,m_aFL(this,WB_VERT) ,m_aTBPreview(this,WB_TABSTOP ) @@ -675,10 +675,10 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA } } -void OAppDetailPageHelper::setDetailPage(Window* _pWindow) +void OAppDetailPageHelper::setDetailPage(vcl::Window* _pWindow) { OSL_ENSURE(_pWindow,"OAppDetailPageHelper::setDetailPage: Window is NULL!"); - Window* pCurrent = getCurrentView(); + vcl::Window* pCurrent = getCurrentView(); if ( pCurrent ) pCurrent->Hide(); @@ -965,7 +965,7 @@ void OAppDetailPageHelper::Resize() long nOutputWidth = aOutputSize.Width(); long nOutputHeight = aOutputSize.Height(); - Window* pWindow = getCurrentView(); + vcl::Window* pWindow = getCurrentView(); if ( pWindow ) { Size aFLSize = LogicToPixel( Size( 2, 6 ), MAP_APPFONT ); @@ -1273,7 +1273,7 @@ void OAppDetailPageHelper::ImplInitSettings() m_pTablePreview->SetBackground( rStyleSettings.GetFieldColor() ); } -OPreviewWindow::OPreviewWindow(Window* _pParent) +OPreviewWindow::OPreviewWindow(vcl::Window* _pParent) : Window(_pParent) { ImplInitSettings( true, true, true ); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index f102e5e37708..24affd63da1e 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -47,7 +47,7 @@ namespace dbaui class OAppBorderWindow; class DBTreeListBox; - class OPreviewWindow : public Window + class OPreviewWindow : public vcl::Window { GraphicObject m_aGraphicObj; Rectangle m_aPreviewRect; @@ -66,7 +66,7 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OPreviewWindow(Window* _pParent); + OPreviewWindow(vcl::Window* _pParent); // window overloads virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; @@ -75,7 +75,7 @@ namespace dbaui }; // A helper class for the controls in the detail page. // Combines general functionality. - class OAppDetailPageHelper : public Window + class OAppDetailPageHelper : public vcl::Window { DBTreeListBox* m_pLists[ELEMENT_COUNT]; OAppBorderWindow& m_rBorderWin; @@ -85,7 +85,7 @@ namespace dbaui OPreviewWindow m_aPreview; ::svtools::ODocumentInfoPreview m_aDocumentInfo; - Window* m_pTablePreview; + vcl::Window* m_pTablePreview; ::std::auto_ptr<PopupMenu> m_aMenu; PreviewMode m_ePreviewMode; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > @@ -129,7 +129,7 @@ namespace dbaui @param _pWindow The control which should be visible. */ - void setDetailPage(Window* _pWindow); + void setDetailPage(vcl::Window* _pWindow); /** sets all HandleCallbacks @param _pTreeView @@ -167,7 +167,7 @@ namespace dbaui void ImplInitSettings(); public: - OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode); + OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode); virtual ~OAppDetailPageHelper(); // window overloads diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index e6e01c4e9809..4882593c2526 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -339,7 +339,7 @@ void OCreationList::KeyInput( const KeyEvent& rKEvt ) } } -OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView) +OTasksWindow::OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetailView) : Window(_pParent,WB_DIALOGCONTROL ) ,m_aCreation(*this) ,m_aDescription(this) @@ -886,7 +886,7 @@ bool OApplicationDetailView::isSortUp() const return m_pControlHelper->isSortUp(); } -Window* OApplicationDetailView::getTreeWindow() const +vcl::Window* OApplicationDetailView::getTreeWindow() const { return m_pControlHelper->getCurrentView(); } diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 4f83589343b7..ac12a0d0cfe8 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -109,7 +109,7 @@ namespace dbaui sal_uInt16 nTitleId; }; - class OTasksWindow : public Window + class OTasksWindow : public vcl::Window { OCreationList m_aCreation; FixedText m_aDescription; @@ -122,7 +122,7 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView); + OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetailView); virtual ~OTasksWindow(); // window overloads @@ -352,7 +352,7 @@ namespace dbaui SvTreeListEntry* getEntry( const Point& _aPoint ) const; - Window* getTreeWindow() const; + vcl::Window* getTreeWindow() const; private: void impl_createPage( ElementType _eType, diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 62afddd51d2a..ff73ba0fdafc 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -29,7 +29,7 @@ using namespace ::dbaui; // class OApplicationIconControl -OApplicationIconControl::OApplicationIconControl(Window* _pParent) +OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent) : SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/ WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER) ,DropTargetHelper(this) diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx index f8038ace0142..5fcecef90022 100644 --- a/dbaccess/source/ui/app/AppIconControl.hxx +++ b/dbaccess/source/ui/app/AppIconControl.hxx @@ -32,7 +32,7 @@ namespace dbaui IControlActionListener* m_pActionListener; public: - OApplicationIconControl(Window* _pParent); + OApplicationIconControl(vcl::Window* _pParent); virtual ~OApplicationIconControl(); void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 4f12cb9eb566..8c3d451bd0e3 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; // class OApplicationSwapWindow -OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWindow& _rBorderWindow ) +OApplicationSwapWindow::OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow ) :Window(_pParent,WB_DIALOGCONTROL ) ,m_aIconControl(this) ,m_eLastType(E_NONE) diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index 2282039f9995..5c10903cf9be 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -27,7 +27,7 @@ namespace dbaui { class OAppBorderWindow; - class OApplicationSwapWindow : public Window, + class OApplicationSwapWindow : public vcl::Window, public IClipboardTest { OApplicationIconControl m_aIconControl; @@ -41,7 +41,7 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OApplicationSwapWindow( Window* _pParent, OAppBorderWindow& _rBorderWindow ); + OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow ); virtual ~OApplicationSwapWindow(); // window overloads virtual void Resize() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index 72e37369f362..4276a553122b 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -27,7 +27,7 @@ namespace dbaui { -OTitleWindow::OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift) +OTitleWindow::OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift) : Window(_pParent,_nBits | WB_DIALOGCONTROL) , m_aSpace1(this) , m_aSpace2(this) @@ -40,7 +40,7 @@ OTitleWindow::OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits, SetBorderStyle(WINDOW_BORDER_MONO); ImplInitSettings( true, true, true ); - Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle }; + vcl::Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle }; for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i) pWindows[i]->Show(); } @@ -50,13 +50,13 @@ OTitleWindow::~OTitleWindow() if ( m_pChild ) { m_pChild->Hide(); - boost::scoped_ptr<Window> aTemp(m_pChild); + boost::scoped_ptr<vcl::Window> aTemp(m_pChild); m_pChild = NULL; } } -void OTitleWindow::setChildWindow(Window* _pChild) +void OTitleWindow::setChildWindow(vcl::Window* _pChild) { m_pChild = _pChild; } @@ -151,7 +151,7 @@ void OTitleWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackgro if( bBackground ) SetBackground( rStyleSettings.GetFieldColor() ); - Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle}; + vcl::Window* pWindows [] = { &m_aSpace1, &m_aSpace2, &m_aTitle}; for (size_t i=0; i < sizeof(pWindows)/sizeof(pWindows[0]); ++i) { vcl::Font aFont = pWindows[i]->GetFont(); diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index 0f1bedafd939..e33144a87395 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -23,18 +23,18 @@ namespace dbaui { - class OTitleWindow : public Window + class OTitleWindow : public vcl::Window { FixedText m_aSpace1; FixedText m_aSpace2; FixedText m_aTitle; - Window* m_pChild; + vcl::Window* m_pChild; bool m_bShift; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OTitleWindow(Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true); + OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true); virtual ~OTitleWindow(); // window overloads @@ -45,14 +45,14 @@ namespace dbaui @param _pChild The child window. */ - void setChildWindow(Window* _pChild); + void setChildWindow(vcl::Window* _pChild); /** gets the child window. @return The child winodw. */ - inline Window* getChildWindow() const { return m_pChild; } + inline vcl::Window* getChildWindow() const { return m_pChild; } /** sets the title text out of the resource @param _nTitleId diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 3b22fd88badc..a3375b651fb0 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -90,13 +90,13 @@ OAppBorderWindow::~OAppBorderWindow() if ( m_pPanel ) { m_pPanel->Hide(); - boost::scoped_ptr<Window> aTemp(m_pPanel); + boost::scoped_ptr<vcl::Window> aTemp(m_pPanel); m_pPanel = NULL; } if ( m_pDetailView ) { m_pDetailView->Hide(); - boost::scoped_ptr<Window> aTemp(m_pDetailView); + boost::scoped_ptr<vcl::Window> aTemp(m_pDetailView); m_pDetailView = NULL; } @@ -177,7 +177,7 @@ OApplicationSwapWindow* OAppBorderWindow::getPanel() const // class OApplicationView -OApplicationView::OApplicationView( Window* pParent +OApplicationView::OApplicationView( vcl::Window* pParent ,const Reference< XComponentContext >& _rxOrb ,IApplicationController& _rAppController ,PreviewMode _ePreviewMode @@ -208,7 +208,7 @@ OApplicationView::~OApplicationView() { stopComponentListening(m_xObject); m_pWin->Hide(); - boost::scoped_ptr<Window> aTemp(m_pWin); + boost::scoped_ptr<vcl::Window> aTemp(m_pWin); m_pWin = NULL; } } diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 109f63114ca1..a19118ac1917 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -42,7 +42,7 @@ namespace dbaui class OApplicationDetailView; class OApplicationSwapWindow; class OTitleWindow; - class OAppBorderWindow : public Window + class OAppBorderWindow : public vcl::Window { OTitleWindow* m_pPanel; OApplicationDetailView* m_pDetailView; @@ -97,7 +97,7 @@ namespace dbaui // Window virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: - OApplicationView( Window* pParent + OApplicationView( vcl::Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ,IApplicationController& _rAppController ,PreviewMode _ePreviewMode diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 96ee1a44b88a..dfa6774cb25f 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -722,7 +722,7 @@ void SbaXDataBrowserController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:FormSlots/insertRecord", ID_BROWSER_INSERT_ROW, CommandGroup::INSERT ); } -bool SbaXDataBrowserController::Construct(Window* pParent) +bool SbaXDataBrowserController::Construct(vcl::Window* pParent) { // create/initialize the form and the grid model m_xRowSet = CreateForm(); diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 6be18a14ae17..9292887c63e3 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -65,7 +65,7 @@ namespace // UnoDataBrowserView -UnoDataBrowserView::UnoDataBrowserView( Window* pParent, +UnoDataBrowserView::UnoDataBrowserView( vcl::Window* pParent, IController& _rController, const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) :ODataView(pParent,_rController,_rxContext) @@ -161,7 +161,7 @@ void UnoDataBrowserView::setTreeView(DBTreeView* _pTreeView) { if (m_pTreeView) { - boost::scoped_ptr<Window> aTemp(m_pTreeView); + boost::scoped_ptr<vcl::Window> aTemp(m_pTreeView); m_pTreeView = NULL; } m_pTreeView = _pTreeView; diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index ec220d3b562a..bf06baa5ebbe 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -59,7 +59,7 @@ namespace dbaui } }; - ODataView::ODataView( Window* pParent, + ODataView::ODataView( vcl::Window* pParent, IController& _rController, const Reference< XComponentContext >& _rxContext, WinBits nStyle) diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index e769f378ebd2..2d140c3b1326 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; // class DBTreeView -DBTreeView::DBTreeView( Window* pParent, WinBits nBits) +DBTreeView::DBTreeView( vcl::Window* pParent, WinBits nBits) : Window( pParent, nBits ) , m_pTreeListBox(NULL) { @@ -53,7 +53,7 @@ DBTreeView::~DBTreeView() m_pTreeListBox->GetModel()->RemoveView(m_pTreeListBox); m_pTreeListBox->DisconnectFromModel(); } - boost::scoped_ptr<Window> aTemp(m_pTreeListBox); + boost::scoped_ptr<vcl::Window> aTemp(m_pTreeListBox); m_pTreeListBox = NULL; } } diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx index b084411f63e1..99bf4416ce8c 100644 --- a/dbaccess/source/ui/browser/dbtreeview.hxx +++ b/dbaccess/source/ui/browser/dbtreeview.hxx @@ -28,7 +28,7 @@ namespace dbaui class DBTreeListBox; // - DBTreeView - - class DBTreeView : public Window + class DBTreeView : public vcl::Window { private: DBTreeListBox* m_pTreeListBox; @@ -37,7 +37,7 @@ namespace dbaui virtual void Resize() SAL_OVERRIDE; public: - DBTreeView( Window* pParent, + DBTreeView( vcl::Window* pParent, WinBits nBits ); virtual ~DBTreeView(); diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index c06a5047ccd2..c8526427cbf3 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -226,7 +226,7 @@ OGenericUnoController::~OGenericUnoController() } -bool OGenericUnoController::Construct(Window* /*pParent*/) +bool OGenericUnoController::Construct(vcl::Window* /*pParent*/) { OSL_ENSURE( getView(), "the view is NULL!" ); @@ -297,7 +297,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen xParent = xFrame->getContainerWindow(); VCLXWindow* pParentComponent = VCLXWindow::GetImplementation(xParent); - Window* pParentWin = pParentComponent ? pParentComponent->GetWindow() : NULL; + vcl::Window* pParentWin = pParentComponent ? pParentComponent->GetWindow() : NULL; if (!pParentWin) { throw IllegalArgumentException("Parent window is null", *this, 1 ); @@ -318,7 +318,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen catch(Exception&) { // no one clears my view if I won't - boost::scoped_ptr<Window> aTemp(m_pView); + boost::scoped_ptr<vcl::Window> aTemp(m_pView); m_pView = NULL; throw; } diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 2d7d9c1804c2..125b881af63c 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -145,7 +145,7 @@ SbaXGridControl::~SbaXGridControl() { } -FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent) +FmXGridPeer* SbaXGridControl::imp_CreatePeer(vcl::Window* pParent) { FmXGridPeer* pReturn = new SbaXGridPeer(m_xContext); @@ -549,7 +549,7 @@ SbaXGridPeer* SbaXGridPeer::getImplementation(const Reference< XInterface >& _rx return NULL; } -FmGridControl* SbaXGridPeer::imp_CreateControl(Window* pParent, WinBits nStyle) +FmGridControl* SbaXGridPeer::imp_CreateControl(vcl::Window* pParent, WinBits nStyle) { return new SbaGridControl( m_xContext, pParent, this, nStyle); } @@ -706,7 +706,7 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM // SbaGridControl SbaGridControl::SbaGridControl(Reference< XComponentContext > _rM, - Window* pParent, FmXGridPeer* _pPeer, WinBits nBits) + vcl::Window* pParent, FmXGridPeer* _pPeer, WinBits nBits) :FmGridControl(_rM,pParent, _pPeer, nBits) ,m_pMasterListener(NULL) ,m_nAsyncDropEvent(0) diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index a088b29feaf6..6d59880cf35b 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -325,7 +325,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing() SbaXDataBrowserController::disposing(); } -bool SbaTableQueryBrowser::Construct(Window* pParent) +bool SbaTableQueryBrowser::Construct(vcl::Window* pParent) { if ( !SbaXDataBrowserController::Construct( pParent ) ) return false; @@ -1339,7 +1339,7 @@ void SbaTableQueryBrowser::implCheckExternalSlot( sal_uInt16 _nId ) if ( !m_xMainToolbar.is() ) return; - Window* pToolboxWindow = VCLUnoHelper::GetWindow( m_xMainToolbar ); + vcl::Window* pToolboxWindow = VCLUnoHelper::GetWindow( m_xMainToolbar ); ToolBox* pToolbox = dynamic_cast< ToolBox* >( pToolboxWindow ); OSL_ENSURE( pToolbox, "SbaTableQueryBrowser::implCheckExternalSlot: cannot obtain the toolbox window!" ); diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index a6d8810f7b0b..a4d44cbc6464 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; // OColumnControlWindow -OColumnControlWindow::OColumnControlWindow(Window* pParent +OColumnControlWindow::OColumnControlWindow(vcl::Window* pParent ,const Reference<XComponentContext>& _rxContext) : OFieldDescControl(pParent,NULL) , m_xContext(_rxContext) diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx index 3a14cdd3d2cf..9335be836606 100644 --- a/dbaccess/source/ui/control/FieldControls.cxx +++ b/dbaccess/source/ui/control/FieldControls.cxx @@ -26,7 +26,7 @@ namespace dbaui { namespace { -void lcl_setSpecialReadOnly( bool _bReadOnly, Window* _pWin ) +void lcl_setSpecialReadOnly( bool _bReadOnly, vcl::Window* _pWin ) { StyleSettings aSystemStyle = Application::GetSettings().GetStyleSettings(); const Color& rNewColor = _bReadOnly ? aSystemStyle.GetDialogColor() : aSystemStyle.GetFieldColor(); @@ -36,7 +36,7 @@ void lcl_setSpecialReadOnly( bool _bReadOnly, Window* _pWin ) } -OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, +OPropColumnEditCtrl::OPropColumnEditCtrl(vcl::Window* pParent, rtl::OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition, @@ -56,7 +56,7 @@ OPropColumnEditCtrl::SetSpecialReadOnly(bool _bReadOnly) -OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) +OPropEditCtrl::OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) :Edit(pParent, nWinStyle) ,m_nPos(nPosition) { @@ -78,14 +78,14 @@ OPropNumericEditCtrl::SetSpecialReadOnly(bool _bReadOnly) } -OPropNumericEditCtrl::OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) +OPropNumericEditCtrl::OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) :NumericField(pParent, nWinStyle) ,m_nPos(nPosition) { m_strHelpText = ModuleRes(nHelpId); } -OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) +OPropListBoxCtrl::OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition, WinBits nWinStyle) :ListBox(pParent, nWinStyle) ,m_nPos(nPosition) { diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 44bf027627b3..d0c35b7cd759 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -93,7 +93,7 @@ namespace } // class OFieldDescControl -OFieldDescControl::OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar ) +OFieldDescControl::OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar ) :TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL ) ,pHelp( pHelpBar ) ,pLastFocusWindow(NULL) @@ -163,11 +163,11 @@ OFieldDescControl::~OFieldDescControl() { { - boost::scoped_ptr<Window> aTemp(m_pVertScroll); + boost::scoped_ptr<vcl::Window> aTemp(m_pVertScroll); m_pVertScroll = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pHorzScroll); + boost::scoped_ptr<vcl::Window> aTemp(m_pHorzScroll); m_pHorzScroll = NULL; } if ( m_bAdded ) @@ -226,7 +226,7 @@ IMPL_LINK(OFieldDescControl, OnScroll, ScrollBar*, /*pBar*/) namespace { - void getMaxXPosition(Window* _pWindow,long& _rnMaxXPosition) + void getMaxXPosition(vcl::Window* _pWindow,long& _rnMaxXPosition) { if (_pWindow) { @@ -1556,7 +1556,7 @@ void OFieldDescControl::GetFocus() } } -void OFieldDescControl::implFocusLost(Window* _pWhich) +void OFieldDescControl::implFocusLost(vcl::Window* _pWhich) { OSL_ENSURE(!_pWhich || IsChild(_pWhich), "OFieldDescControl::implFocusLost : invalid window !"); diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 9082511dded4..35bf2e2f0d00 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -78,7 +78,7 @@ namespace dbaui */ sal_uInt16 getColumnIdent( sal_uInt16 _nColId ) const; public: - ORelationControl(Window *pParent); + ORelationControl(vcl::Window *pParent); void SetController(OTableListBoxControl* pController) { m_pBoxControl = pController; @@ -127,7 +127,7 @@ namespace dbaui }; // class ORelationControl - ORelationControl::ORelationControl(Window *pParent) + ORelationControl::ORelationControl(vcl::Window *pParent) : EditBrowseBox(pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, WB_TABSTOP | WB_BORDER | BROWSER_AUTOSIZE_LASTCOL) @@ -138,7 +138,7 @@ namespace dbaui { } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeORelationControl(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeORelationControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new ORelationControl(pParent); } diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx index 1d4fe29ad2e9..bd3fd01c8f09 100644 --- a/dbaccess/source/ui/control/SqlNameEdit.cxx +++ b/dbaccess/source/ui/control/SqlNameEdit.cxx @@ -81,12 +81,12 @@ namespace dbaui } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOSQLNameEdit(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOSQLNameEdit(vcl::Window *pParent, VclBuilder::stringmap &) { return new dbaui::OSQLNameEdit(pParent); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOSQLNameComboBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOSQLNameComboBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new dbaui::OSQLNameComboBox(pParent); } diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index abf2d5f489f4..f334c2b621b1 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -46,7 +46,7 @@ const sal_uInt16 COL_DROP = 8; // OTableGrantControl -OTableGrantControl::OTableGrantControl( Window* pParent, WinBits nBits) +OTableGrantControl::OTableGrantControl( vcl::Window* pParent, WinBits nBits) :EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, nBits ) ,m_pCheckCell( NULL ) ,m_pEdit( NULL ) diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index 975cefd84de9..d199b6f32fef 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -28,7 +28,7 @@ using namespace ::dbaui; // class OSplitterView -OSplitterView::OSplitterView(Window* _pParent,bool _bVertical) : Window(_pParent,WB_DIALOGCONTROL) // ,WB_BORDER +OSplitterView::OSplitterView(vcl::Window* _pParent,bool _bVertical) : Window(_pParent,WB_DIALOGCONTROL) // ,WB_BORDER ,m_pSplitter( NULL ) ,m_pLeft(NULL) ,m_pRight(NULL) @@ -183,7 +183,7 @@ void OSplitterView::Resize() } -void OSplitterView::set(Window* _pRight,Window* _pLeft) +void OSplitterView::set(vcl::Window* _pRight,Window* _pLeft) { m_pLeft = _pLeft; m_pRight = _pRight; diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx index 7327a5889f6d..3181a82a53aa 100644 --- a/dbaccess/source/ui/control/charsetlistbox.cxx +++ b/dbaccess/source/ui/control/charsetlistbox.cxx @@ -25,7 +25,7 @@ namespace dbaui { - CharSetListBox::CharSetListBox( Window* _pParent, WinBits _nBits = WB_DROPDOWN ) + CharSetListBox::CharSetListBox( vcl::Window* _pParent, WinBits _nBits = WB_DROPDOWN ) : ListBox( _pParent, _nBits ) { SetDropDownLineCount( 20 ); @@ -38,7 +38,7 @@ namespace dbaui } } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCharSetListBox(Window *pParent) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeCharSetListBox(vcl::Window *pParent) { return new CharSetListBox(pParent); } diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index 3c856db50c18..22d8241448ca 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -25,7 +25,7 @@ namespace dbaui { -OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, WinBits _nBits,bool _bShowPrefix) +OConnectionURLEdit::OConnectionURLEdit(vcl::Window* _pParent, WinBits _nBits,bool _bShowPrefix) :Edit(_pParent, _nBits) ,m_pTypeCollection(NULL) ,m_pForcedPrefix(NULL) @@ -33,7 +33,7 @@ OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, WinBits _nBits,bool _bS { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeConnectionURLEdit(Window *pParent) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeConnectionURLEdit(vcl::Window *pParent) { return new OConnectionURLEdit(pParent, WB_BORDER, false); } diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index cdc185fb3e4c..71120eca7bc1 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::view; #define SPACEBETWEENENTRIES 4 // class DBTreeListBox -DBTreeListBox::DBTreeListBox( Window* pParent, WinBits nWinStyle ,bool _bHandleEnterKey) +DBTreeListBox::DBTreeListBox( vcl::Window* pParent, WinBits nWinStyle ,bool _bHandleEnterKey) :SvTreeListBox(pParent,nWinStyle) ,m_pDragedEntry(NULL) ,m_pActionListener(NULL) diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 3cb9c7d6c158..d51db97fb548 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -28,7 +28,7 @@ namespace dbaui using namespace ::com::sun::star::lang; -OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, WinBits nWinStyle ) +OMarkableTreeListBox::OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle ) : DBTreeListBox(pParent, nWinStyle) { diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index e696386b6f4b..f808ae9ae2e6 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -156,13 +156,13 @@ namespace dbaui // OpenButton - OpenDocumentButton::OpenDocumentButton( Window* _pParent, const sal_Char* _pAsciiModuleName ) + OpenDocumentButton::OpenDocumentButton( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName ) :PushButton( _pParent ) { impl_init( _pAsciiModuleName ); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentButton( Window *pParent, VclBuilder::stringmap & ) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOpenDocumentButton( vcl::Window *pParent, VclBuilder::stringmap & ) { return new OpenDocumentButton( pParent, "com.sun.star.sdb.OfficeDatabaseDocument" ); } @@ -186,13 +186,13 @@ namespace dbaui // OpenDocumentListBox - OpenDocumentListBox::OpenDocumentListBox( Window* _pParent, const sal_Char* _pAsciiModuleName ) + OpenDocumentListBox::OpenDocumentListBox( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName ) :ListBox( _pParent, WB_BORDER | WB_DROPDOWN ) { impl_init( _pAsciiModuleName ); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOpenDocumentListBox( Window *pParent, VclBuilder::stringmap & ) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOpenDocumentListBox( vcl::Window *pParent, VclBuilder::stringmap & ) { return new OpenDocumentListBox( pParent, "com.sun.star.sdb.OfficeDatabaseDocument" ); } diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 86dbf17aa0b3..20cacd7db203 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -65,7 +65,7 @@ namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject; namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer; // OTableTreeListBox -OTableTreeListBox::OTableTreeListBox(Window* pParent, WinBits nWinStyle) +OTableTreeListBox::OTableTreeListBox(vcl::Window* pParent, WinBits nWinStyle) :OMarkableTreeListBox(pParent, nWinStyle) ,m_xImageProvider( new ImageProvider ) ,m_bVirtualRoot(false) @@ -74,7 +74,7 @@ OTableTreeListBox::OTableTreeListBox(Window* pParent, WinBits nWinStyle) implSetDefaultImages(); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOTableTreeListBox(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOTableTreeListBox(vcl::Window *pParent, VclBuilder::stringmap &rMap) { WinBits nWinStyle = 0; OString sBorder = VclBuilder::extractCustomProperty(rMap); diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 6d82fc53b2d9..0a54a5a92a13 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::task; using namespace ::com::sun::star::sdbc; using namespace comphelper; -OCollectionView::OCollectionView( Window * pParent +OCollectionView::OCollectionView( vcl::Window * pParent ,const Reference< XContent>& _xContent ,const OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 5c4dc6ab3c6c..b31c067e4690 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -87,7 +87,7 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - OConnectionHelper::OConnectionHelper( Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs) + OConnectionHelper::OConnectionHelper( vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs) : OGenericAdministrationPage(pParent, _rId, _rUIXMLDescription, _rCoreAttrs) , m_bUserGrabFocus(false) , m_pCollection(NULL) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 78aa62db9293..117295bea89d 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -40,7 +40,7 @@ namespace dbaui bool m_bUserGrabFocus : 1; public: - OConnectionHelper( Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs); + OConnectionHelper( vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs); virtual ~OConnectionHelper(); FixedText *m_pFT_Connection; OConnectionURLEdit *m_pConnectionURL; diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index c76327c0e883..4e7b8cc39987 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -81,12 +81,12 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - SfxTabPage* OConnectionTabPage::Create( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* OConnectionTabPage::Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OConnectionTabPage( pParent, *_rAttrSet ) ); } // OConnectionTabPage - OConnectionTabPage::OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs) + OConnectionTabPage::OConnectionTabPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs) :OConnectionHelper(pParent, "ConnectionPage", "dbaccess/ui/connectionpage.ui", _rCoreAttrs) { get(m_pFL2, "userlabel"); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 692d5536440f..5e1c84fb88a1 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -55,7 +55,7 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ); virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; @@ -68,7 +68,7 @@ namespace dbaui affect the type may be changed (compared to the previous URL).</p> */ private: - OConnectionTabPage(Window* pParent, const SfxItemSet& _rCoreAttrs); + OConnectionTabPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); // nControlFlags is a combination of the CBTP_xxx-constants virtual ~OConnectionTabPage(); diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index e362b451b7e0..db19ebb9d21b 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -63,32 +63,32 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE); } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE); } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL); } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE); } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL); } - OConnectionTabPageSetup::OConnectionTabPageSetup(Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId) + OConnectionTabPageSetup::OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId) :OConnectionHelper(pParent, _rId, _rUIXMLDescription, _rCoreAttrs) ,m_bUserGrabFocus(true) { diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index 02dbbdfc0d49..5705c1530cc2 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -46,11 +46,11 @@ namespace dbaui DECL_LINK(OnEditModified,Edit*); public: - static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateDbaseTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateMSAccessTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateADOTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateODBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateUserDefinedTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; @@ -68,7 +68,7 @@ namespace dbaui OUString getConnectionURL( ) const; protected: - OConnectionTabPageSetup(Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId); + OConnectionTabPageSetup(vcl::Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderResId, sal_uInt16 _nUrlResId); virtual bool checkTestConnection() SAL_OVERRIDE; // nControlFlags is a combination of the CBTP_xxx-constants virtual ~OConnectionTabPageSetup(); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index d025ab71141e..ceef0fe6f67f 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -60,13 +60,13 @@ namespace dbaui { using namespace ::com::sun::star; - OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OTextConnectionPageSetup( pParent, _rAttrSet ) ); } // OTextConnectionPageSetup - OTextConnectionPageSetup::OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OTextConnectionPageSetup::OTextConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OConnectionTabPageSetup(pParent, "DBWizTextPage", "dbaccess/ui/dbwiztextpage.ui", _rCoreAttrs, STR_TEXT_HELPTEXT, STR_TEXT_HEADERTEXT, STR_TEXT_PATH_OR_FILE) { @@ -124,13 +124,13 @@ using namespace ::com::sun::star; return m_pTextConnectionHelper->prepareLeave(); } - OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OLDAPConnectionPageSetup( pParent, _rAttrSet ) ); } // OLDAPPageSetup - OLDAPConnectionPageSetup::OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OLDAPConnectionPageSetup::OLDAPConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage(pParent, "LDAPConnectionPage", "dbaccess/ui/ldapconnectionpage.ui",_rCoreAttrs) { get(m_pFTHelpText, "helpLabel"); @@ -217,13 +217,13 @@ using namespace ::com::sun::star; return 0L; } - OMySQLIntroPageSetup* OMySQLIntroPageSetup::CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet ) + OMySQLIntroPageSetup* OMySQLIntroPageSetup::CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet ) { return ( new OMySQLIntroPageSetup( _pParent, _rAttrSet) ); } - OMySQLIntroPageSetup::OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OMySQLIntroPageSetup::OMySQLIntroPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage(pParent, "DBWizMysqlIntroPage", "dbaccess/ui/dbwizmysqlintropage.ui", _rCoreAttrs) { get(m_pODBCDatabase, "odbc"); @@ -290,7 +290,7 @@ using namespace ::com::sun::star; } // MySQLNativeSetupPage - MySQLNativeSetupPage::MySQLNativeSetupPage( Window* _pParent, const SfxItemSet& _rCoreAttrs ) + MySQLNativeSetupPage::MySQLNativeSetupPage( vcl::Window* _pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage( _pParent, "DBWizMysqlNativePage", "dbaccess/ui/dbwizmysqlnativepage.ui", _rCoreAttrs ) ,m_aMySQLSettings ( *get<VclVBox>("MySQLSettingsContainer"), getControlModifiedLink() ) { @@ -300,7 +300,7 @@ using namespace ::com::sun::star; SetRoadmapStateValue(false); } - OGenericAdministrationPage* MySQLNativeSetupPage::Create( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* MySQLNativeSetupPage::Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return new MySQLNativeSetupPage( pParent, _rAttrSet ); } @@ -343,7 +343,7 @@ using namespace ::com::sun::star; } // OMySQLJDBCConnectionPageSetup - OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId) + OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, sal_uInt16 _nDriverClassId) :OGenericAdministrationPage(pParent, "SpecialJDBCConnectionPage", "dbaccess/ui/specialjdbcconnectionpage.ui", _rCoreAttrs) ,m_nPortId(_nPortId) { @@ -387,7 +387,7 @@ using namespace ::com::sun::star; SetRoadmapStateValue(false); } - OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, _rAttrSet, @@ -398,7 +398,7 @@ using namespace ::com::sun::star; STR_MYSQL_DRIVERCLASSTEXT) ); } - OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent, _rAttrSet, @@ -512,13 +512,13 @@ using namespace ::com::sun::star; return 0L; } - OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OJDBCConnectionPageSetup( pParent, _rAttrSet)); } // OMySQLJDBCConnectionPageSetup - OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs) + OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs) :OConnectionTabPageSetup(pParent, "JDBCConnectionPage", "dbaccess/ui/jdbcconnectionpage.ui", _rCoreAttrs, STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL) { @@ -621,13 +621,13 @@ using namespace ::com::sun::star; return 0L; } - OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OSpreadSheetConnectionPageSetup( pParent, _rAttrSet ) ); } - OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OConnectionTabPageSetup(pParent, "DBWizSpreadsheetPage", "dbaccess/ui/dbwizspreadsheetpage.ui", _rCoreAttrs, STR_SPREADSHEET_HELPTEXT, STR_SPREADSHEET_HEADERTEXT, STR_SPREADSHEETPATH) { get(m_pPasswordrequired, "passwordrequired"); @@ -662,13 +662,13 @@ using namespace ::com::sun::star; return bChangedSomething; } - OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) + OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ) { return ( new OAuthentificationPageSetup( pParent, _rAttrSet) ); } - OAuthentificationPageSetup::OAuthentificationPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OAuthentificationPageSetup::OAuthentificationPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OGenericAdministrationPage(pParent, "AuthentificationPage", "dbaccess/ui/authentificationpage.ui", _rCoreAttrs ) { get(m_pFTHelpText, "helptext"); @@ -729,13 +729,13 @@ using namespace ::com::sun::star; return bChangedSomething; } - OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet) + OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet) { return ( new OFinalDBPageSetup( pParent, _rAttrSet) ); } - OFinalDBPageSetup::OFinalDBPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs) + OFinalDBPageSetup::OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs) : OGenericAdministrationPage(pParent, "PageFinal", "dbaccess/ui/finalpagewizard.ui", _rCoreAttrs) { diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 6ffd08b5c770..4756b6c75b57 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -40,8 +40,8 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); + static OGenericAdministrationPage* CreateSpreadSheetTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + OSpreadSheetConnectionPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); protected: CheckBox *m_pPasswordrequired; @@ -59,8 +59,8 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateTextTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + OTextConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; private: @@ -81,8 +81,8 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateLDAPTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + OLDAPConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); virtual Link getControlModifiedLink() SAL_OVERRIDE { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); } protected: @@ -111,9 +111,9 @@ namespace dbaui MySQLNativeSettings m_aMySQLSettings; public: - MySQLNativeSetupPage( Window* _pParent, const SfxItemSet& _rCoreAttrs ); + MySQLNativeSetupPage( vcl::Window* _pParent, const SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* Create( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) SAL_OVERRIDE; @@ -132,15 +132,15 @@ namespace dbaui class OGeneralSpecialJDBCConnectionPageSetup : public OGenericAdministrationPage { public: - OGeneralSpecialJDBCConnectionPageSetup( Window* pParent + OGeneralSpecialJDBCConnectionPageSetup( vcl::Window* pParent , const SfxItemSet& _rCoreAttrs , sal_uInt16 _nPortId , sal_uInt16 _nDefaultPortResId , sal_uInt16 _nHelpTextResId , sal_uInt16 _nHeaderTextResId , sal_uInt16 _nDriverClassId ); - static OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateMySQLJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + static OGenericAdministrationPage* CreateOracleJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; @@ -173,8 +173,8 @@ namespace dbaui class OJDBCConnectionPageSetup : public OConnectionTabPageSetup { public: - OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs ); - static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); + OJDBCConnectionPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); + static OGenericAdministrationPage* CreateJDBCTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: virtual bool checkTestConnection() SAL_OVERRIDE; @@ -202,9 +202,9 @@ namespace dbaui VIA_NATIVE }; - OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs); + OMySQLIntroPageSetup( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); - static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet ); + static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( vcl::Window* _pParent, const SfxItemSet& _rAttrSet ); ConnectionType getMySQLMode(); Link maClickHdl; void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } @@ -232,8 +232,8 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); + static OGenericAdministrationPage* CreateAuthentificationTabPage( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); + OAuthentificationPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); protected: FixedText* m_pFTHelpText; @@ -254,7 +254,7 @@ namespace dbaui { public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet); + static OGenericAdministrationPage* CreateFinalDBTabPageSetup( vcl::Window* pParent, const SfxItemSet& _rAttrSet); FixedText* m_pFTFinalHeader; FixedText* m_pFTFinalHelpText; @@ -265,7 +265,7 @@ namespace dbaui CheckBox* m_pCBStartTableWizard; FixedText* m_pFTFinalText; - OFinalDBPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs); + OFinalDBPageSetup(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); bool IsDatabaseDocumentToBeRegistered(); bool IsDatabaseDocumentToBeOpened(); bool IsTableWizardToBeStarted(); diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 5387c6359e0f..f459c81add7f 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -139,7 +139,7 @@ namespace } // ODbDataSourceAdministrationHelper -ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Reference< XComponentContext >& _xORB,Window* _pParent,IItemSetHelper* _pItemSetHelper) +ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Reference< XComponentContext >& _xORB, vcl::Window* _pParent,IItemSetHelper* _pItemSetHelper) : m_xContext(_xORB) , m_pParent(_pParent) , m_pItemSetHelper(_pItemSetHelper) diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index de06359af2bd..4b46778afb92 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <svl/poolitem.hxx> -class Window; +namespace vcl { class Window; } namespace dbaui { namespace DataSourceInfoConverter @@ -68,12 +68,12 @@ namespace dbaui MapInt2String m_aDirectPropTranslator; /// translating property id's into names (direct properties of a data source) MapInt2String m_aIndirectPropTranslator; /// translating property id's into names (indirect properties of a data source) - Window* m_pParent; + vcl::Window* m_pParent; IItemSetHelper* m_pItemSetHelper; public: ODbDataSourceAdministrationHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xORB - ,Window* _pParent + ,vcl::Window* _pParent ,IItemSetHelper* _pItemSetHelper); /** translate the current dialog SfxItems into driver relevant PropertyValues diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index a31fd62625fd..6a6ed636f295 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -24,7 +24,7 @@ #include <vector> class SfxTabPage; -class Window; +namespace vcl { class Window; } namespace dbaui { /// a collection class for all details a driver needs @@ -44,53 +44,53 @@ namespace dbaui /** Creates the detail page for Dbase */ - static SfxTabPage* CreateDbase2( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateDbase2( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for ado */ - static SfxTabPage* CreateDbase( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateDbase( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for ado */ - static SfxTabPage* CreateAdo( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateAdo( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for ODBC */ - static SfxTabPage* CreateODBC( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateODBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for user */ - static SfxTabPage* CreateUser( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateUser( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for MySQLODBC */ - static SfxTabPage* CreateMySQLODBC( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateMySQLODBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for MySQLJDBC */ - static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateMySQLJDBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for MySQLNATIVE */ - static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateMySQLNATIVE( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for Oracle JDBC */ - static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateOracleJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for LDAP */ - static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateLDAP( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /// Creates the detail page for Text - static SfxTabPage* CreateText( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateText( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /// creates the GeneratedValues page - static SfxTabPage* CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateGeneratedValuesPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); /// creates the "Special Settings" page of the "Advanced Settings" dialog - static SfxTabPage* CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* CreateSpecialSettingsPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); }; } diff --git a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx index 1907630ada63..2c8b9b68ab48 100644 --- a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx +++ b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx @@ -13,7 +13,7 @@ namespace dbaui { QueryPropertiesDialog::QueryPropertiesDialog( - Window* pParent, const bool bDistinct, const sal_Int64 nLimit ) + vcl::Window* pParent, const bool bDistinct, const sal_Int64 nLimit ) : ModalDialog(pParent, "QueryPropertiesDialog", "dbaccess/ui/querypropertiesdialog.ui") , m_pRB_Distinct( 0 ) , m_pRB_NonDistinct( 0 ) diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index f7f2789ef8b2..a4a51e3d2623 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::container; // OTableSubscriptionDialog -OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent +OTableSubscriptionDialog::OTableSubscriptionDialog(vcl::Window* pParent ,SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName) diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index aab6965310df..c99292a925ef 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -56,7 +56,7 @@ namespace dbaui { - OTextConnectionHelper::OTextConnectionHelper( Window* pParent, const short _nAvailableSections ) + OTextConnectionHelper::OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections ) :TabPage(pParent, "TextPage", "dbaccess/ui/textpage.ui") ,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST)) ,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST)) @@ -114,7 +114,7 @@ namespace dbaui struct SectionDescriptor { short nFlag; - Window* pFirstControl; + vcl::Window* pFirstControl; } aSections[] = { { TC_EXTENSION, m_pExtensionHeader }, { TC_SEPARATORS, m_pFormatHeader }, @@ -131,14 +131,14 @@ namespace dbaui continue; } - Window* pThisSection = aSections[section].pFirstControl; - Window* pNextSection = aSections[section+1].pFirstControl; + vcl::Window* pThisSection = aSections[section].pFirstControl; + vcl::Window* pNextSection = aSections[section+1].pFirstControl; // hide all elements from this section - Window* pControl = pThisSection; + vcl::Window* pControl = pThisSection; while ( ( pControl != pNextSection ) && pControl ) { - Window* pRealWindow = pControl->GetWindow( WINDOW_CLIENT ); + vcl::Window* pRealWindow = pControl->GetWindow( WINDOW_CLIENT ); #if OSL_DEBUG_LEVEL > 0 OUString sWindowText( pRealWindow->GetText() ); (void)sWindowText; diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index a45574ba8a9b..b9317f8b46b6 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -47,7 +47,7 @@ namespace dbaui Link m_aModifiedHandler; /// to be called if something on the page has been modified public: - OTextConnectionHelper( Window* pParent, const short _nAvailableSections ); + OTextConnectionHelper( vcl::Window* pParent, const short _nAvailableSections ); virtual ~OTextConnectionHelper(); private: diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index d6dc4f2bae98..6afe53364b3b 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -61,13 +61,13 @@ class OPasswordDialog : public ModalDialog DECL_LINK( ModifiedHdl, Edit * ); public: - OPasswordDialog( Window* pParent,const OUString& _sUserName); + OPasswordDialog( vcl::Window* pParent,const OUString& _sUserName); OUString GetOldPassword() const { return m_pEDOldPassword->GetText(); } OUString GetNewPassword() const { return m_pEDPassword->GetText(); } }; -OPasswordDialog::OPasswordDialog(Window* _pParent,const OUString& _sUserName) +OPasswordDialog::OPasswordDialog(vcl::Window* _pParent,const OUString& _sUserName) : ModalDialog(_pParent, "PasswordDialog", "dbaccess/ui/password.ui") { get(m_pUser, "userframe"); @@ -108,7 +108,7 @@ IMPL_LINK( OPasswordDialog, ModifiedHdl, Edit *, pEdit ) } // OUserAdmin -OUserAdmin::OUserAdmin(Window* pParent,const SfxItemSet& _rAttrSet) +OUserAdmin::OUserAdmin(vcl::Window* pParent,const SfxItemSet& _rAttrSet) : OGenericAdministrationPage( pParent, "UserAdminPage", "dbaccess/ui/useradminpage.ui", _rAttrSet) , m_pUSER(0) , m_pNEWUSER(0) @@ -181,7 +181,7 @@ void OUserAdmin::FillUserNames() } -SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet* _rAttrSet ) +SfxTabPage* OUserAdmin::Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OUserAdmin( pParent, *_rAttrSet ) ); } diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 8d8115cce534..605baea7b30e 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -60,9 +60,9 @@ protected: void FillUserNames(); - OUserAdmin( Window* pParent, const SfxItemSet& _rCoreAttrs); + OUserAdmin( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); public: - static SfxTabPage* Create( Window* pParent, const SfxItemSet* _rAttrSet ); + static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ); virtual ~OUserAdmin(); OUString GetUser(); diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 633e83e2998c..2b17eccec0f9 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -46,7 +46,7 @@ namespace dbaui using namespace ::com::sun::star::sdbcx; // OUserAdminDlg - OUserAdminDlg::OUserAdminDlg(Window* _pParent + OUserAdminDlg::OUserAdminDlg(vcl::Window* _pParent , SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName @@ -119,7 +119,7 @@ namespace dbaui static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( m_pImpl->getORB() ); static_cast<OGenericAdministrationPage&>(_rPage).SetAdminDialog(this,this); - Window *pWin = GetViewWindow(); + vcl::Window *pWin = GetViewWindow(); if(pWin) pWin->Invalidate(); diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 94459d8be876..ddff2e67b7cf 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -56,14 +56,14 @@ namespace dbaui } // IWindowOperator - virtual void operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const SAL_OVERRIDE; + virtual void operateOn( const VclWindowEvent& _rTrigger, vcl::Window& _rOperateOn ) const SAL_OVERRIDE; private: const OUString m_sDisabledText; OUString m_sUserText; }; - void TextResetOperator::operateOn( const VclWindowEvent& _rTrigger, Window& _rOperateOn ) const + void TextResetOperator::operateOn( const VclWindowEvent& _rTrigger, vcl::Window& _rOperateOn ) const { OSL_ENSURE( _rTrigger.GetWindow() == &_rOperateOn, "TextResetOperator::operateOn: you're misusing this implementation!" ); @@ -116,7 +116,7 @@ namespace dbaui ,public ::svt::DialogController { public: - TextResetOperatorController( Window& _rObservee, const OUString& _rDisabledText ) + TextResetOperatorController( vcl::Window& _rObservee, const OUString& _rDisabledText ) :TextResetOperatorController_Base( _rDisabledText ) ,::svt::DialogController( _rObservee, getEventFilter(), getOperator() ) { @@ -125,7 +125,7 @@ namespace dbaui }; // MySQLNativeSettings - MySQLNativeSettings::MySQLNativeSettings( Window& _rParent, const Link& _rControlModificationLink ) + MySQLNativeSettings::MySQLNativeSettings( vcl::Window& _rParent, const Link& _rControlModificationLink ) :TabPage( &_rParent, "MysqlNativeSettings", "dbaccess/ui/mysqlnativesettings.ui" ) { get(m_pDatabaseNameLabel, "dbnamelabel"); diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index daff95a6a918..e6e214dca1b9 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -52,7 +52,7 @@ namespace dbaui m_aControlDependencies; public: - MySQLNativeSettings( Window& _rParent, const Link& _rControlModificationLink ); + MySQLNativeSettings( vcl::Window& _rParent, const Link& _rControlModificationLink ); virtual ~MySQLNativeSettings(); void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 8a5991e6a0b0..0d1510998831 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -56,7 +56,7 @@ namespace dbaui { } - OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) + OGenericAdministrationPage::OGenericAdministrationPage(vcl::Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet) :SfxTabPage(_pParent, _rId, _rUIXMLDescription, &_rAttrSet) ,m_abEnableRoadmap(false) ,m_pAdminDialog(NULL) @@ -258,7 +258,7 @@ namespace dbaui Point aReference = _rReference.GetPosPixel(); aReference.Y() += _rReference.GetSizePixel().Height(); - const Window* pConverter = _rControl.GetParent(); + const vcl::Window* pConverter = _rControl.GetParent(); Size aOffset = pConverter->LogicToPixel( Size( _nIndentAppFont, ( _eRelation == RelatedControls ? 3 : 6 ) ), MAP_APPFONT ); Point aControlPos( aReference.X() + aOffset.Width(), aReference.Y() + aOffset.Height() ); diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index bf6ec61d005f..d822a6a64031 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -102,7 +102,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xORB; public: - OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet); + OGenericAdministrationPage(vcl::Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet); /// set a handler which gets called every time something on the page has been modified void SetModifiedHandler(const Link& _rHandler) { m_aModifiedHandler = _rHandler; } @@ -256,7 +256,7 @@ namespace dbaui /** fits the button size to be large enough to contain the buttons text */ static void fitSizeRightAligned( PushButton& io_button ); - // why is CalcMinimumSize not a virtual method of ::Window? + // why is CalcMinimumSize not a virtual method of vcl::Window? }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index e5721abe2ecc..d10b40cd32d6 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -314,7 +314,7 @@ bool QueryListFacade::isLeafSelected() const return pEntry && !m_rQueryList.GetModel()->HasChildren( pEntry ); } -OAddTableDlg::OAddTableDlg( Window* pParent, IAddTableDialogContext& _rContext ) +OAddTableDlg::OAddTableDlg( vcl::Window* pParent, IAddTableDialogContext& _rContext ) : ModelessDialog(pParent, "TablesJoinDialog", "dbaccess/ui/tablesjoindialog.ui") , m_rContext(_rContext) { diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 27c202e58799..dadbb5c467fb 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -55,7 +55,7 @@ namespace dbaui }; // SpecialSettingsPage - SpecialSettingsPage::SpecialSettingsPage( Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ) + SpecialSettingsPage::SpecialSettingsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ) : OGenericAdministrationPage(pParent, "SpecialSettingsPage", "dbaccess/ui/specialsettingspage.ui", _rCoreAttrs) , m_pIsSQL92Check( NULL ) @@ -295,7 +295,7 @@ namespace dbaui } // GeneratedValuesPage - GeneratedValuesPage::GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + GeneratedValuesPage::GeneratedValuesPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) : OGenericAdministrationPage(pParent, "GeneratedValuesPage", "dbaccess/ui/generatedvaluespage.ui", _rCoreAttrs) { @@ -368,7 +368,7 @@ namespace dbaui } // AdvancedSettingsDialog - AdvancedSettingsDialog::AdvancedSettingsDialog( Window* _pParent, SfxItemSet* _pItems, + AdvancedSettingsDialog::AdvancedSettingsDialog( vcl::Window* _pParent, SfxItemSet* _pItems, const Reference< XComponentContext >& _rxContext, const Any& _aDataSourceName ) : SfxTabDialog(_pParent, "AdvancedSettingsDialog", "dbaccess/ui/advancedsettingsdialog.ui", _pItems) @@ -435,7 +435,7 @@ namespace dbaui static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( getORB() ); static_cast<OGenericAdministrationPage&>(_rPage).SetAdminDialog(this,this); - Window *pWin = GetViewWindow(); + vcl::Window *pWin = GetViewWindow(); if(pWin) pWin->Invalidate(); diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index ff28557b804d..af8d91a8d258 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -74,7 +74,7 @@ namespace dbaui public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - SpecialSettingsPage(Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ); + SpecialSettingsPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta ); protected: virtual ~SpecialSettingsPage(); @@ -110,7 +110,7 @@ namespace dbaui public: virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; - GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + GeneratedValuesPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: // nControlFlags is a combination of the CBTP_xxx-constants diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 8f99adbb4533..ff60c14f8995 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -47,7 +47,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::container; // ODbAdminDialog -ODbAdminDialog::ODbAdminDialog(Window* _pParent +ODbAdminDialog::ODbAdminDialog(vcl::Window* _pParent , SfxItemSet* _pItems , const Reference< XComponentContext >& _rxContext) : SfxTabDialog(_pParent, "AdminDialog", @@ -85,7 +85,7 @@ void ODbAdminDialog::PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( getORB() ); static_cast<OGenericAdministrationPage&>(_rPage).SetAdminDialog(this,this); - Window *pWin = GetViewWindow(); + vcl::Window *pWin = GetViewWindow(); if(pWin) pWin->Invalidate(); diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index ad111503149d..238a8ba415aa 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -40,7 +40,7 @@ using namespace ::svt; const OString aGroupIdent("dBase III"); -ODbaseIndexDialog::ODbaseIndexDialog(Window * pParent, const OUString& aDataSrcName) +ODbaseIndexDialog::ODbaseIndexDialog(vcl::Window * pParent, const OUString& aDataSrcName) : ModalDialog(pParent, "DBaseIndexDialog", "dbaccess/ui/dbaseindexdialog.ui") , m_aDSN(aDataSrcName) , m_bCaseSensitiv(true) diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index e2cc016a9085..58aae3b04091 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -112,7 +112,7 @@ protected: void checkButtons(); public: - ODbaseIndexDialog( Window * pParent, const OUString& aDataSrcName ); + ODbaseIndexDialog( vcl::Window * pParent, const OUString& aDataSrcName ); }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 03ffa016812c..00dcddd2d87d 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -62,7 +62,7 @@ using namespace com::sun::star::container; #define ADDITIONAL_PAGE_MYSQL_NATIVE 12 // ODbTypeWizDialog -ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent +ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent ,SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 175f6c8d37c0..5649db4547ea 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -100,7 +100,7 @@ using namespace ::comphelper; using namespace ::cppu; // ODbTypeWizDialogSetup -ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent +ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* _pParent ,SfxItemSet* _pItems ,const Reference< XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index a0257d58dd4f..0904d6d1967c 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -56,7 +56,7 @@ namespace dbaui using namespace ::com::sun::star::container; using namespace ::dbtools; - OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, const OString& rId, + OCommonBehaviourTabPage::OCommonBehaviourTabPage(vcl::Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags) @@ -187,7 +187,7 @@ namespace dbaui } // ODbaseDetailsPage - ODbaseDetailsPage::ODbaseDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + ODbaseDetailsPage::ODbaseDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "DbasePage", "dbaccess/ui/dbasepage.ui", _rCoreAttrs, CBTP_USE_CHARSET) { get(m_pShowDeleted, "showDelRowsCheckbutton"); @@ -204,7 +204,7 @@ namespace dbaui } - SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateDbase( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new ODbaseDetailsPage( pParent, *_rAttrSet ) ); } @@ -260,7 +260,7 @@ namespace dbaui } // OAdoDetailsPage - OAdoDetailsPage::OAdoDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OAdoDetailsPage::OAdoDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "AutoCharset", "dbaccess/ui/autocharsetpage.ui", _rCoreAttrs, CBTP_USE_CHARSET ) { @@ -270,20 +270,20 @@ namespace dbaui { } - SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateAdo( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OAdoDetailsPage( pParent, *_rAttrSet ) ); } // OOdbcDetailsPage - OOdbcDetailsPage::OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OOdbcDetailsPage::OOdbcDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "ODBC", "dbaccess/ui/odbcpage.ui", _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS) { get(m_pUseCatalog, "useCatalogCheckbutton"); m_pUseCatalog->SetToggleHdl(getControlModifiedLink()); } - SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateODBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OOdbcDetailsPage( pParent, *_rAttrSet ) ); } @@ -308,7 +308,7 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } // OOdbcDetailsPage - OUserDriverDetailsPage::OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OUserDriverDetailsPage::OUserDriverDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) : OCommonBehaviourTabPage(pParent, "UserDetailsPage", "dbaccess/ui/userdetailspage.ui", _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS) { @@ -321,7 +321,7 @@ namespace dbaui m_pUseCatalog->SetToggleHdl(getControlModifiedLink()); } - SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateUser( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OUserDriverDetailsPage( pParent, *_rAttrSet ) ); } @@ -373,18 +373,18 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } // OMySQLODBCDetailsPage - OMySQLODBCDetailsPage::OMySQLODBCDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OMySQLODBCDetailsPage::OMySQLODBCDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "AutoCharset", "dbaccess/ui/autocharsetpage.ui", _rCoreAttrs, CBTP_USE_CHARSET ) { } - SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLODBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OMySQLODBCDetailsPage( pParent, *_rAttrSet ) ); } // OMySQLJDBCDetailsPage - OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, bool bShowSocket ) + OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, bool bShowSocket ) :OCommonBehaviourTabPage(pParent, "GeneralSpecialJDBCDetails", "dbaccess/ui/generalspecialjdbcdetailspage.ui", _rCoreAttrs, CBTP_USE_CHARSET) ,m_nPortId(_nPortId) ,m_bUseClass(true) @@ -514,7 +514,7 @@ namespace dbaui } // MySQLNativePage - MySQLNativePage::MySQLNativePage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + MySQLNativePage::MySQLNativePage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "MysqlNativePage", "dbaccess/ui/mysqlnativepage.ui", _rCoreAttrs, CBTP_USE_CHARSET ) ,m_aMySQLSettings ( *get<VclVBox>("MySQLSettingsContainer"), getControlModifiedLink() ) { @@ -584,22 +584,22 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OGeneralSpecialJDBCDetailsPage( pParent, *_rAttrSet,DSID_MYSQL_PORTNUMBER ) ); } - SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateMySQLNATIVE( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new MySQLNativePage( pParent, *_rAttrSet ) ); } - SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateOracleJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OGeneralSpecialJDBCDetailsPage( pParent, *_rAttrSet,DSID_ORACLE_PORTNUMBER, false) ); } // OLDAPDetailsPage - OLDAPDetailsPage::OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OLDAPDetailsPage::OLDAPDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "LDAP", "dbaccess/ui/ldappage.ui", _rCoreAttrs, 0) { get(m_pETBaseDN, "baseDNEntry"); @@ -619,7 +619,7 @@ namespace dbaui m_pCBUseSSL->SetClickHdl(LINK(this, OLDAPDetailsPage,OnCheckBoxClick)); } - SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateLDAP( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OLDAPDetailsPage( pParent, *_rAttrSet ) ); } @@ -676,7 +676,7 @@ namespace dbaui } // OTextDetailsPage - OTextDetailsPage::OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) + OTextDetailsPage::OTextDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ) :OCommonBehaviourTabPage(pParent, "EmptyPage", "dbaccess/ui/emptypage.ui", _rCoreAttrs, 0) { @@ -689,7 +689,7 @@ namespace dbaui } - SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateText( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) { return ( new OTextDetailsPage( pParent, *_rAttrSet ) ); } @@ -727,12 +727,12 @@ namespace dbaui return m_pTextConnectionHelper->prepareLeave(); } - SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ) { return new GeneratedValuesPage( _pParent, *_rAttrSet ); } - SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet* _rAttrSet ) + SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ) { OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( *_rAttrSet ); DataSourceMetaData aMetaData( eType ); diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 8fbba3c536fa..6ffef01e1434 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -73,7 +73,7 @@ namespace dbaui virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE; // nControlFlags is a combination of the CBTP_xxx-constants - OCommonBehaviourTabPage(Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags); + OCommonBehaviourTabPage(vcl::Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags); protected: virtual ~OCommonBehaviourTabPage(); @@ -94,7 +94,7 @@ namespace dbaui public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - ODbaseDetailsPage(Window* pParent, const SfxItemSet& _rCoreAttrs); + ODbaseDetailsPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); private: CheckBox* m_pShowDeleted; FixedText* m_pFT_Message; @@ -120,7 +120,7 @@ namespace dbaui virtual ~OAdoDetailsPage(); public: - OAdoDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OAdoDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); }; // OOdbcDetailsPage @@ -129,7 +129,7 @@ namespace dbaui public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OOdbcDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; private: @@ -142,7 +142,7 @@ namespace dbaui public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OUserDriverDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; @@ -159,14 +159,14 @@ namespace dbaui class OMySQLODBCDetailsPage : public OCommonBehaviourTabPage { public: - OMySQLODBCDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OMySQLODBCDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); }; // OGeneralSpecialJDBCDetailsPage class OGeneralSpecialJDBCDetailsPage : public OCommonBehaviourTabPage { public: - OGeneralSpecialJDBCDetailsPage( Window* pParent + OGeneralSpecialJDBCDetailsPage( vcl::Window* pParent , const SfxItemSet& _rCoreAttrs , sal_uInt16 _nPortId , bool bShowSocket = true @@ -198,7 +198,7 @@ namespace dbaui class MySQLNativePage : public OCommonBehaviourTabPage { public: - MySQLNativePage( Window* pParent, + MySQLNativePage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); private: @@ -223,7 +223,7 @@ namespace dbaui public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OLDAPDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; private: @@ -244,7 +244,7 @@ namespace dbaui virtual ~OMozillaDetailsPage(); public: - OMozillaDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OMozillaDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); }; // OTextDetailsPage @@ -253,7 +253,7 @@ namespace dbaui public: virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; - OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); + OTextDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ); OTextConnectionHelper* m_pTextConnectionHelper; private: diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index e78dd8387beb..b02b73332e6f 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -35,7 +35,7 @@ namespace dbaui using namespace ::com::sun::star::lang; // DirectSQLDialog - DirectSQLDialog::DirectSQLDialog( Window* _pParent, const Reference< XConnection >& _rxConn ) + DirectSQLDialog::DirectSQLDialog( vcl::Window* _pParent, const Reference< XConnection >& _rxConn ) :ModalDialog(_pParent, "DirectSQLDialog" , "dbaccess/ui/directsqldialog.ui") ,m_nHistoryLimit(20) ,m_nStatusCount(1) diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index 8af7569c36b6..468233f5c748 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -34,7 +34,7 @@ using namespace dbaui; -SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs, +SbaSbAttrDlg::SbaSbAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs, SvNumberFormatter* pFormatter, bool bHasFormat, bool bRow) : SfxTabDialog(pParent, "FieldDialog", "dbaccess/ui/fielddialog.ui", pCellAttrs) , m_nNumberFormatId(0) diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index 72219bb317ab..e2817a3d9b7a 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -176,7 +176,7 @@ namespace } } -OSaveAsDlg::OSaveAsDlg( Window * pParent, +OSaveAsDlg::OSaveAsDlg( vcl::Window * pParent, const sal_Int32& _rType, const Reference< XComponentContext >& _rxContext, const Reference< XConnection>& _xConnection, @@ -269,7 +269,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent, implInit(); } -OSaveAsDlg::OSaveAsDlg( Window * pParent, +OSaveAsDlg::OSaveAsDlg( vcl::Window * pParent, const Reference< XComponentContext >& _rxContext, const OUString& rDefault, const OUString& _sLabel, diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index 209aecebb219..f73a1a27e95f 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -27,7 +27,7 @@ namespace dbaui #define DEF_ROW_HEIGHT 45 #define DEF_COL_WIDTH 227 -DlgSize::DlgSize( Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard ) +DlgSize::DlgSize( vcl::Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard ) : ModalDialog(pParent, bRow ? OString("RowHeightDialog") : OString("ColWidthDialog"), bRow ? OUString("dbaccess/ui/rowheightdialog.ui") : OUString("dbaccess/ui/colwidthdialog.ui")) , m_nPrevValue(nVal) diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 5583bfc5abb1..bcd1dc6add60 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::ui::dialogs; using namespace ::comphelper; -ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet) +ODatasourceSelectDialog::ODatasourceSelectDialog(vcl::Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet) : ModalDialog(_pParent, "ChooseDataSourceDialog", "dbaccess/ui/choosedatasourcedialog.ui") , m_pOutputSet(_pOutputSet) diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index d1e0deaddc67..298d7464fb87 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -52,7 +52,7 @@ protected: #endif public: - ODatasourceSelectDialog( Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet = NULL ); + ODatasourceSelectDialog( vcl::Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet = NULL ); virtual ~ODatasourceSelectDialog(); OUString GetSelected() const { return m_pDatasource->GetSelectEntry();} diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 77f970304606..29b08e0c7091 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -51,7 +51,7 @@ namespace dbaui using namespace ::com::sun::star::container; // OGeneralPage - OGeneralPage::OGeneralPage( Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ) + OGeneralPage::OGeneralPage( vcl::Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ) :OGenericAdministrationPage( pParent, "PageGeneral", _rUIXMLDescription, _rItems ) ,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN ) ,m_pSpecialMessage ( NULL ) @@ -439,7 +439,7 @@ namespace dbaui } // OGeneralPageDialog - OGeneralPageDialog::OGeneralPageDialog( Window* pParent, const SfxItemSet& _rItems ) + OGeneralPageDialog::OGeneralPageDialog( vcl::Window* pParent, const SfxItemSet& _rItems ) :OGeneralPage( pParent, "dbaccess/ui/generalpagedialog.ui", _rItems ) { } @@ -482,7 +482,7 @@ namespace dbaui } // OGeneralPageWizard - OGeneralPageWizard::OGeneralPageWizard( Window* pParent, const SfxItemSet& _rItems ) + OGeneralPageWizard::OGeneralPageWizard( vcl::Window* pParent, const SfxItemSet& _rItems ) :OGeneralPage( pParent, "dbaccess/ui/generalpagewizard.ui", _rItems ) ,m_pRB_CreateDatabase ( NULL ) ,m_pRB_OpenExistingDatabase ( NULL ) diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 8fe77e17845c..0668f679721a 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -33,7 +33,7 @@ namespace dbaui class OGeneralPage : public OGenericAdministrationPage { protected: - OGeneralPage( Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ); + OGeneralPage( vcl::Window* pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems ); virtual ~OGeneralPage(); OUString m_eCurrentSelection; /// currently selected type @@ -102,7 +102,7 @@ namespace dbaui class OGeneralPageDialog : public OGeneralPage { public: - OGeneralPageDialog( Window* pParent, const SfxItemSet& _rItems ); + OGeneralPageDialog( vcl::Window* pParent, const SfxItemSet& _rItems ); protected: virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; @@ -115,7 +115,7 @@ namespace dbaui class OGeneralPageWizard : public OGeneralPage { public: - OGeneralPageWizard( Window* pParent, const SfxItemSet& _rItems ); + OGeneralPageWizard( vcl::Window* pParent, const SfxItemSet& _rItems ); public: enum CreationMode diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 278af5a99388..9f2989efc949 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -87,7 +87,7 @@ namespace dbaui } // DbaIndexList - DbaIndexList::DbaIndexList(Window* _pParent, WinBits nWinBits) + DbaIndexList::DbaIndexList(vcl::Window* _pParent, WinBits nWinBits) :SvTreeListBox(_pParent, nWinBits) ,m_bSuspendSelectHdl(false) { @@ -158,13 +158,13 @@ namespace dbaui return bReturn; } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDbaIndexList(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDbaIndexList(vcl::Window *pParent, VclBuilder::stringmap &) { return new DbaIndexList (pParent, WB_BORDER); } // DbaIndexDialog - DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< OUString >& _rFieldNames, + DbaIndexDialog::DbaIndexDialog( vcl::Window* _pParent, const Sequence< OUString >& _rFieldNames, const Reference< XNameAccess >& _rxIndexes, const Reference< XConnection >& _rxConnection, const Reference< XComponentContext >& _rxContext,sal_Int32 _nMaxColumnsInIndex) diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index b82f719ba14d..08901ac03c97 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -90,7 +90,7 @@ namespace dbaui } // IndexFieldsControl - IndexFieldsControl::IndexFieldsControl( Window* _pParent, WinBits nWinStyle) + IndexFieldsControl::IndexFieldsControl( vcl::Window* _pParent, WinBits nWinStyle) : EditBrowseBox(_pParent, EBBF_SMART_TAB_TRAVEL | EBBF_ACTIVATE_ON_BUTTONDOWN, nWinStyle, BROWSER_STANDARD_FLAGS) , m_aSeekRow(m_aFields.end()) , m_pSortingCell(NULL) @@ -103,7 +103,7 @@ namespace dbaui GetDataWindow().SetUniqueId( UID_DLGINDEX_INDEXDETAILS_MAIN ); } - extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDbaIndexFieldsControl(Window *pParent, VclBuilder::stringmap &) + extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeDbaIndexFieldsControl(vcl::Window *pParent, VclBuilder::stringmap &) { return new IndexFieldsControl (pParent, WB_BORDER | WB_NOTABSTOP); } diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 0d4267e5f182..d21d742670f8 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -51,7 +51,7 @@ namespace dbaui OParameterDialog::OParameterDialog( - Window* pParent, const Reference< XIndexAccess > & rParamContainer, + vcl::Window* pParent, const Reference< XIndexAccess > & rParamContainer, const Reference< XConnection > & _rxConnection, const Reference< XComponentContext >& rxContext) :ModalDialog( pParent, "Parameters", "dbaccess/ui/parametersdialog.ui") ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND) @@ -341,7 +341,7 @@ namespace dbaui m_pOKBtn->SetStyle(m_pOKBtn->GetStyle() | WB_DEFBUTTON); // set to focus to one of the buttons temporary (with this their "default"-state is really updated) - Window* pOldFocus = Application::GetFocusWindow(); + vcl::Window* pOldFocus = Application::GetFocusWindow(); // if the old focus window is the value edit do some preparations ... Selection aSel; diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 21b05b13ce2c..c686ae53f19b 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -62,7 +62,7 @@ void Replace_SQL_PlaceHolder(OUString& aString) } -DlgFilterCrit::DlgFilterCrit(Window * pParent, +DlgFilterCrit::DlgFilterCrit(vcl::Window * pParent, const Reference< XComponentContext >& rxContext, const Reference< XConnection>& _rxConnection, const Reference< XSingleSelectQueryComposer >& _rxComposer, diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 47f42749ffcb..69f5fe4ae4e3 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::beans; -DlgOrderCrit::DlgOrderCrit(Window * pParent, +DlgOrderCrit::DlgOrderCrit(vcl::Window * pParent, const Reference< XConnection>& _rxConnection, const Reference< XSingleSelectQueryComposer >& _rxComposer, const Reference< XNameAccess>& _rxCols) diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 991319d1b880..2ab17aac08b2 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -301,13 +301,13 @@ class OExceptionChainDialog : public ModalDialog ExceptionDisplayChain m_aExceptions; public: - OExceptionChainDialog( Window* pParent, const ExceptionDisplayChain& _rExceptions ); + OExceptionChainDialog( vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions ); protected: DECL_LINK(OnExceptionSelected, void*); }; -OExceptionChainDialog::OExceptionChainDialog(Window* pParent, const ExceptionDisplayChain& _rExceptions) +OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const ExceptionDisplayChain& _rExceptions) : ModalDialog(pParent, "SQLExceptionDialog", "dbaccess/ui/sqlexception.ui") , m_aExceptions(_rExceptions) { @@ -413,7 +413,7 @@ struct SQLMessageBox_Impl namespace { - void lcl_positionInAppFont( const Window& _rParent, Window& _rChild, long _nX, long _nY, long _Width, long _Height ) + void lcl_positionInAppFont( const vcl::Window& _rParent, vcl::Window& _rChild, long _nX, long _nY, long _Width, long _Height ) { Point aPos = _rParent.LogicToPixel( Point( _nX, _nY ), MAP_APPFONT ); Size aSize = _rParent.LogicToPixel( Size( _Width, _Height ), MAP_APPFONT ); @@ -664,7 +664,7 @@ void OSQLMessageBox::Construct( WinBits _nStyle, MessageType _eImage ) impl_addDetailsButton(); } -OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rException, WinBits _nStyle, const OUString& _rHelpURL ) +OSQLMessageBox::OSQLMessageBox(vcl::Window* _pParent, const SQLExceptionInfo& _rException, WinBits _nStyle, const OUString& _rHelpURL ) :ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG ) ,m_aInfoImage( this ) ,m_aTitle( this, WB_WORDBREAK | WB_LEFT ) @@ -675,7 +675,7 @@ OSQLMessageBox::OSQLMessageBox(Window* _pParent, const SQLExceptionInfo& _rExcep Construct( _nStyle, AUTO ); } -OSQLMessageBox::OSQLMessageBox( Window* _pParent, const OUString& _rTitle, const OUString& _rMessage, WinBits _nStyle, MessageType _eType, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) +OSQLMessageBox::OSQLMessageBox( vcl::Window* _pParent, const OUString& _rTitle, const OUString& _rMessage, WinBits _nStyle, MessageType _eType, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) :ButtonDialog( _pParent, WB_HORZ | WB_STDDIALOG ) ,m_aInfoImage( this ) ,m_aTitle( this, WB_WORDBREAK | WB_LEFT ) @@ -704,14 +704,14 @@ IMPL_LINK( OSQLMessageBox, ButtonClickHdl, Button *, /*pButton*/ ) } // OSQLWarningBox -OSQLWarningBox::OSQLWarningBox( Window* _pParent, const OUString& _rMessage, WinBits _nStyle, +OSQLWarningBox::OSQLWarningBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) :OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_WARNING ), _rMessage, _nStyle, OSQLMessageBox::Warning, _pAdditionalErrorInfo ) { } // OSQLErrorBox -OSQLErrorBox::OSQLErrorBox( Window* _pParent, const OUString& _rMessage, WinBits _nStyle, +OSQLErrorBox::OSQLErrorBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo ) :OSQLMessageBox( _pParent, ModuleRes( STR_EXCEPTION_ERROR ), _rMessage, _nStyle, OSQLMessageBox::Error, _pAdditionalErrorInfo ) { diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index a45578c1b8c7..4a34d3809877 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -69,7 +69,7 @@ namespace dbaui using namespace ::comphelper; // OTableSubscriptionPage - OTableSubscriptionPage::OTableSubscriptionPage(Window* pParent, const SfxItemSet& _rCoreAttrs, + OTableSubscriptionPage::OTableSubscriptionPage(vcl::Window* pParent, const SfxItemSet& _rCoreAttrs, OTableSubscriptionDialog* _pTablesDlg) : OGenericAdministrationPage(pParent, "TablesFilterPage", "dbaccess/ui/tablesfilterpage.ui", _rCoreAttrs) diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index acfeaa45834f..fe217b06f703 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -62,7 +62,7 @@ namespace dbaui */ virtual void resizeControls(const Size& _rDiff); - OTableSubscriptionPage( Window* pParent, const SfxItemSet& _rCoreAttrs ,OTableSubscriptionDialog* _pTablesDlg); + OTableSubscriptionPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs ,OTableSubscriptionDialog* _pTablesDlg); virtual ~OTableSubscriptionPage(); protected: diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index 6d8a27bad872..11f84162318b 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -29,7 +29,7 @@ namespace dbaui { // TextConnectionSettingsDialog - TextConnectionSettingsDialog::TextConnectionSettingsDialog( Window* _pParent, SfxItemSet& _rItems ) + TextConnectionSettingsDialog::TextConnectionSettingsDialog( vcl::Window* _pParent, SfxItemSet& _rItems ) :ModalDialog( _pParent, "TextConnectionSettingsDialog", "dbaccess/ui/textconnectionsettings.ui" ) ,m_rItems( _rItems ) { diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 6c6fecb8bac0..80dc9bbaa45e 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -54,7 +54,7 @@ namespace dbaui /// sets the fixedtext to the right content void initCurrentPath(); public: - OCollectionView( Window * pParent + OCollectionView( vcl::Window * pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent ,const OUString& _sDefaultName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index 19c55b9b69ce..b09d6ff6e030 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -53,7 +53,7 @@ namespace dbaui virtual void CellModified(long nRow, sal_uInt16 nColId ) SAL_OVERRIDE; public: - OColumnControlWindow(Window* pParent + OColumnControlWindow(vcl::Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); virtual ~OColumnControlWindow(); diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 3d7c3cd45890..ff1bfec69880 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -34,7 +34,7 @@ namespace dbaui short m_nPos; OUString m_strHelpText; public: - OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropColumnEditCtrl(vcl::Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } @@ -52,7 +52,7 @@ namespace dbaui OUString m_strHelpText; public: - OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } @@ -68,7 +68,7 @@ namespace dbaui OUString m_strHelpText; public: - OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropNumericEditCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } @@ -85,7 +85,7 @@ namespace dbaui OUString m_strHelpText; public: - OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); + OPropListBoxCtrl(vcl::Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); bool IsModified() const { return IsValueChangedFromSaved(); } diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 01bb0591b54d..4205212e7bd8 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -66,8 +66,8 @@ namespace dbaui { private: OTableDesignHelpBar* pHelp; - Window* pLastFocusWindow; - Window* m_pActFocusWindow; + vcl::Window* pLastFocusWindow; + vcl::Window* m_pActFocusWindow; FixedText* pDefaultText; FixedText* pRequiredText; @@ -170,10 +170,10 @@ namespace dbaui const OPropColumnEditCtrl* getColumnCtrl() const { return m_pColumnName; } - void implFocusLost(Window* _pWhich); + void implFocusLost(vcl::Window* _pWhich); public: - OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar); + OFieldDescControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar); virtual ~OFieldDescControl(); void DisplayData(OFieldDescription* pFieldDescr ); diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index be666126f457..ff86d28f8eaf 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -38,7 +38,7 @@ namespace dbaui OJoinController& m_rController; public: - OJoinDesignView(Window* pParent, + OJoinDesignView(vcl::Window* pParent, OJoinController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~OJoinDesignView(); diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index 448a8c7820f3..18ab49a2c4fd 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -54,7 +54,7 @@ namespace dbaui // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener ); + void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener ); static OJoinExchangeData GetSourceDescription(const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxObject); static bool isFormatAvailable( const DataFlavorExVector& _rFormats ,SotFormatStringId _nSlotID=SOT_FORMATSTR_ID_SBA_JOIN); diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index f3e39b917018..c9c500263402 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -48,18 +48,18 @@ namespace dbaui // this class conatins only the scrollbars to avoid that // the tablewindows clip the scrollbars class OJoinTableView; - class OScrollWindowHelper : public Window + class OScrollWindowHelper : public vcl::Window { ScrollBar m_aHScrollBar; ScrollBar m_aVScrollBar; - Window* m_pCornerWindow; + vcl::Window* m_pCornerWindow; OJoinTableView* m_pTableView; protected: virtual void Resize() SAL_OVERRIDE; public: - OScrollWindowHelper( Window* pParent); + OScrollWindowHelper( vcl::Window* pParent); virtual ~OScrollWindowHelper(); void setTableView(OJoinTableView* _pTableView); @@ -72,7 +72,7 @@ namespace dbaui }; - class OJoinTableView : public Window, + class OJoinTableView : public vcl::Window, public IDragTransferableListener, public DropTargetHelper { @@ -109,7 +109,7 @@ namespace dbaui OJoinDesignViewAccess* m_pAccessible; public: - OJoinTableView( Window* pParent, OJoinDesignView* pView ); + OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView ); virtual ~OJoinTableView(); // window override diff --git a/dbaccess/source/ui/inc/LimitBox.hxx b/dbaccess/source/ui/inc/LimitBox.hxx index 5e5db54b797b..5f9187a38bba 100644 --- a/dbaccess/source/ui/inc/LimitBox.hxx +++ b/dbaccess/source/ui/inc/LimitBox.hxx @@ -23,7 +23,7 @@ namespace dbaui class LimitBox: public NumericBox { public: - LimitBox( Window* pParent, WinBits nStyle ); + LimitBox( vcl::Window* pParent, WinBits nStyle ); virtual ~LimitBox(); virtual OUString CreateFieldText( sal_Int64 nValue ) const SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx index 442668be6cc4..6b19daedb287 100644 --- a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx +++ b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx @@ -28,7 +28,7 @@ class QueryPropertiesDialog : public ModalDialog public: QueryPropertiesDialog( - Window* pParent, const bool bDistinct, const sal_Int64 nLimit ); + vcl::Window* pParent, const bool bDistinct, const sal_Int64 nLimit ); virtual ~QueryPropertiesDialog(); bool getDistinct() const; diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index f42285e4fc01..ef4174c19878 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -57,7 +57,7 @@ namespace dbaui virtual bool supressCrossNaturalJoin(const TTableConnectionData::value_type& _pData) const SAL_OVERRIDE; public: - OQueryTableView(Window* pParent,OQueryDesignView* pView); + OQueryTableView(vcl::Window* pParent,OQueryDesignView* pView); virtual ~OQueryTableView(); /// base class overwritten: create and delete windows diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index f1f7c0422733..9e9cdc4c6392 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -25,7 +25,7 @@ namespace dbaui { class OSqlEdit; - class OQueryTextView : public Window + class OQueryTextView : public vcl::Window { friend class OQueryViewSwitch; OSqlEdit* m_pEdit; diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 5953f3b310cf..00868b542329 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -55,7 +55,7 @@ namespace dbaui void mergeData(const TTableConnectionData& _aConnectionData); - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index b2c8936aac7b..f7a97a9687f5 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -32,7 +32,7 @@ namespace dbaui class ORelationDesignView : public OJoinDesignView { public: - ORelationDesignView(Window* pParent, ORelationController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + ORelationDesignView(vcl::Window* pParent, ORelationController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~ORelationDesignView(); // set the statement for representation diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index aec50985d581..9b38d8fb47b6 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -52,7 +52,7 @@ namespace dbaui virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: - ORelationTableView( Window* pParent, ORelationDesignView* pView ); + ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView ); virtual ~ORelationTableView(); virtual void RemoveTabWin( OTableWindow* pTabWin ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index 8430dc4d4f38..4368648429d9 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -56,12 +56,12 @@ namespace dbaui ,public OSQLNameChecker { public: - OSQLNameEdit(Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) + OSQLNameEdit(vcl::Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) : Edit(_pParent,nStyle) ,OSQLNameChecker(_rAllowedChars) { } - OSQLNameEdit(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) + OSQLNameEdit(vcl::Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) : Edit(_pParent,_rRes) ,OSQLNameChecker(_rAllowedChars) { @@ -77,12 +77,12 @@ namespace dbaui ,public OSQLNameChecker { public: - OSQLNameComboBox(Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) + OSQLNameComboBox(vcl::Window* _pParent,WinBits nStyle = WB_BORDER, const OUString& _rAllowedChars = OUString()) : ComboBox(_pParent,nStyle) , OSQLNameChecker(_rAllowedChars) { } - OSQLNameComboBox(Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) + OSQLNameComboBox(vcl::Window* _pParent,const ResId& _rRes,const OUString& _rAllowedChars = OUString()) : ComboBox(_pParent,_rRes) , OSQLNameChecker(_rAllowedChars) { diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index 95f60752ae65..76428fb60b24 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -36,7 +36,7 @@ namespace dbaui class OJoinTableView; class OConnectionLine; - class OTableConnection : public Window + class OTableConnection : public vcl::Window { ::std::vector<OConnectionLine*> m_vConnLine; TTableConnectionData::value_type diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index d0f6b4d8f543..999a7fe15aee 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -113,7 +113,7 @@ namespace dbaui inline TOTypeInfoSP getTypeInfoFallBack() const { return m_pTypeInfo; } - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index ca99ce7464ce..e1a9f1e84ae4 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -46,7 +46,7 @@ namespace dbaui bool m_bClipboardFilled; public: - OTableRowView(Window* pParent); + OTableRowView(vcl::Window* pParent); virtual ~OTableRowView(); virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) = 0; diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index a025d341afe8..900c32374754 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -39,7 +39,7 @@ namespace dbaui virtual void Resize() SAL_OVERRIDE; public: - OTableDesignHelpBar( Window* pParent ); + OTableDesignHelpBar( vcl::Window* pParent ); virtual ~OTableDesignHelpBar(); void SetHelpText( const OUString& rText ); diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index c37bc7969450..1643aaccb037 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -30,7 +30,7 @@ namespace dbaui class OTableController; class OTableFieldDescWin; class OTableEditorCtrl; - class OTableBorderWindow : public Window + class OTableBorderWindow : public vcl::Window { Splitter m_aHorzSplitter; OTableFieldDescWin* m_pFieldDescWin; @@ -42,7 +42,7 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OTableBorderWindow(Window* pParent); + OTableBorderWindow(vcl::Window* pParent); virtual ~OTableBorderWindow(); // window overloads virtual void Resize() SAL_OVERRIDE; @@ -73,7 +73,7 @@ namespace dbaui virtual void resizeDocumentView(Rectangle& rRect) SAL_OVERRIDE; public: - OTableDesignView( Window* pParent, + OTableDesignView( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&, OTableController& _rController); virtual ~OTableDesignView(); diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index 376d958e089f..9a6992bd732c 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -33,7 +33,7 @@ namespace comphelper class NamedValueCollection; } -class Window; +namespace vcl { class Window; } namespace dbaui { @@ -49,7 +49,7 @@ namespace dbaui OUString m_aFieldAlias; ///< column alias OUString m_aFunctionName;///< contains the function name (only if m_eFunctionType != FKT_NONE) - Window* m_pTabWindow; + vcl::Window* m_pTabWindow; sal_Int32 m_eDataType; sal_Int32 m_eFunctionType; @@ -79,7 +79,7 @@ namespace dbaui void SetVisible( bool bVis=true ) { m_bVisible = bVis; } void SetGroupBy( bool bGb=false ) { m_bGroupBy = bGb; } - void SetTabWindow( Window* pWin ){ m_pTabWindow = pWin; } + void SetTabWindow( vcl::Window* pWin ){ m_pTabWindow = pWin; } void SetField( const OUString& rF ) { m_aFieldName = rF; } void SetFieldAlias( const OUString& rF ) { m_aFieldAlias = rF; } void SetTable( const OUString& rT ) { m_aTableName = rT; } @@ -105,7 +105,7 @@ namespace dbaui OUString GetCriteria( sal_uInt16 nIdx ) const; sal_Int32 GetColWidth() const { return m_nColWidth; } sal_Int32 GetFieldIndex() const { return m_nIndex; } - Window* GetTabWindow() const { return m_pTabWindow;} + vcl::Window* GetTabWindow() const { return m_pTabWindow;} sal_Int32 GetFunctionType() const { return m_eFunctionType; } sal_uInt16 GetColumnId() const { return m_nColumnId;} diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 32e0f519ad94..c16cba5d5568 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -59,7 +59,7 @@ class OTableGrantControl : public ::svt::EditBrowseBox ImplSVEvent * m_nDeactivateEvent; public: - OTableGrantControl( Window* pParent, WinBits nBits); + OTableGrantControl( vcl::Window* pParent, WinBits nBits); virtual ~OTableGrantControl(); void UpdateTables(); void setUserName(const OUString& _sUserName); diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 82028e1607be..7fc4bfdb70ae 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -48,7 +48,7 @@ namespace dbaui class OTableWindow : public ::cppu::BaseMutex ,public ::comphelper::OContainerListener - ,public Window + ,public vcl::Window { friend class OTableWindowTitle; friend class OTableWindowListBox; @@ -121,7 +121,7 @@ namespace dbaui */ void impl_updateImage(); - OTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData ); + OTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData ); public: virtual ~OTableWindow(); diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index 3761026ec4c7..3ded3cef2e91 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -49,7 +49,7 @@ class ODbDataSourceAdministrationHelper; SfxItemSet* m_pOutSet; public: - OTableSubscriptionDialog(Window* pParent + OTableSubscriptionDialog(vcl::Window* pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index e005461d8465..6e0cc172a7b7 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -196,7 +196,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xTargetRowUpdate; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; - Window* m_pParent; + vcl::Window* m_pParent; bool m_bAlreadyAsked; bool insertNewRow(); @@ -205,7 +205,7 @@ namespace dbaui public: // export data - ORowSetImportExport(Window* _pParent, + ORowSetImportExport(vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >& _xResultSetUpdate, const ::svx::ODataAccessDescriptor& _aDataDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rM, diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 7be8fd7b505c..ec384984cd0d 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -65,7 +65,7 @@ namespace svt class EditBrowseBox; } -class Window; +namespace vcl { class Window; } class ToolBox; namespace vcl { class Font; } class SvNumberFormatter; @@ -107,7 +107,7 @@ namespace dbaui @param _rxContext need to create the dialog */ void showError( const ::dbtools::SQLExceptionInfo& _rInfo, - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); /** fills a map and a vector with localized type names @@ -163,7 +163,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSourceByName( const OUString& _rDataSourceName, - Window* _pErrorMessageParent, + vcl::Window* _pErrorMessageParent, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo ); @@ -187,11 +187,11 @@ namespace dbaui void callColumnFormatDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xAffectedCol, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xField, SvNumberFormatter* _pFormatter, - Window* _pParent); + vcl::Window* _pParent); /** second variant of the function before */ - bool callColumnFormatDialog(Window* _pParent, + bool callColumnFormatDialog(vcl::Window* _pParent, SvNumberFormatter* _pFormatter, sal_Int32 _nDataType, sal_Int32& _nFormatKey, @@ -207,7 +207,7 @@ namespace dbaui bool appendToFilter(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const OUString& _sName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - Window* _pParent); + vcl::Window* _pParent); /** notifySystemWindow adds or remove the given window _pToRegister at the Systemwindow found when search _pWindow. @param _pWindow @@ -220,9 +220,9 @@ namespace dbaui ::comphelper::mem_fun(&TaskPaneList::AddWindow) ::comphelper::mem_fun(&TaskPaneList::RemoveWindow) */ - void notifySystemWindow(Window* _pWindow, - Window* _pToRegister, - ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc); + void notifySystemWindow(vcl::Window* _pWindow, + vcl::Window* _pToRegister, + ::comphelper::mem_fun1_t<TaskPaneList,vcl::Window*> _rMemFunc); /** adjustToolBoxSize checks if the size of the ToolBox is still valid. If not it will be resized. @param _pToolBox @@ -327,7 +327,7 @@ namespace dbaui @return RET_YES, RET_NO, RET_ALL */ - sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName); + sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName); /** creates a new view from a query or table @param _sName @@ -389,7 +389,7 @@ namespace dbaui <TRUE/> if the insert opertions was successful, otherwise <FALSE/>. */ bool insertHierachyElement( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XHierarchicalNameContainer>& _xNames, const OUString& _sParentFolder, diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 9e136c1968e4..a342856b7aad 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -53,7 +53,7 @@ namespace dbaui protected: virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE; public: - OUserAdminDlg( Window* _pParent + OUserAdminDlg( vcl::Window* _pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index cdc635e187cf..f34af430a936 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -25,11 +25,11 @@ class Splitter; namespace dbaui { - class OSplitterView : public Window + class OSplitterView : public vcl::Window { Splitter* m_pSplitter; - Window* m_pLeft; - Window* m_pRight; + vcl::Window* m_pLeft; + vcl::Window* m_pRight; bool m_bVertical; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); @@ -37,13 +37,13 @@ namespace dbaui protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: - OSplitterView(Window* _pParent,bool _bVertical = true); + OSplitterView(vcl::Window* _pParent,bool _bVertical = true); virtual ~OSplitterView(); // window overloads virtual void GetFocus() SAL_OVERRIDE; void setSplitter(Splitter* _pSplitter); - void set(Window* _pRight,Window* _pLeft = NULL); + void set(vcl::Window* _pRight,Window* _pLeft = NULL); virtual void Resize() SAL_OVERRIDE; }; } diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index 0c0e1ff3ea41..e99fcf810529 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -64,7 +64,7 @@ namespace dbaui virtual bool LeavePage() SAL_OVERRIDE; virtual OUString GetTitle() const SAL_OVERRIDE ; - OCopyTable( Window * pParent ); + OCopyTable( vcl::Window * pParent ); virtual ~OCopyTable(); bool IsOptionDefData() const { return m_pRB_DefData->IsChecked(); } diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index 20288dfb1c40..98f029c6c665 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -78,7 +78,7 @@ namespace dbaui virtual bool LeavePage() SAL_OVERRIDE; virtual OUString GetTitle() const SAL_OVERRIDE ; - OWizColumnSelect(Window* pParent); + OWizColumnSelect(vcl::Window* pParent); virtual ~OWizColumnSelect(); }; } diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 671bdc943e60..388ee1c27a1d 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -298,7 +298,7 @@ namespace dbaui public: // used for copy tables or queries OCopyTableWizard( - Window * pParent, + vcl::Window * pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ICopyTableSourceObject& _rSourceObject, @@ -310,7 +310,7 @@ namespace dbaui // used for importing rtf/html sources OCopyTableWizard( - Window* pParent, + vcl::Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ODatabaseExport::TColumns& _rDestColumns, diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx index effb2399bc8e..e9d19621457f 100644 --- a/dbaccess/source/ui/inc/WExtendPages.hxx +++ b/dbaccess/source/ui/inc/WExtendPages.hxx @@ -30,12 +30,12 @@ namespace dbaui protected: virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE; public: - OWizHTMLExtend(Window* pParent, SvStream& _rStream) + OWizHTMLExtend(vcl::Window* pParent, SvStream& _rStream) : OWizTypeSelect( pParent, &_rStream ) { } - static OWizTypeSelect* Create( Window* _pParent, SvStream& _rInput ) { return new OWizHTMLExtend( _pParent, _rInput ); } + static OWizTypeSelect* Create( vcl::Window* _pParent, SvStream& _rInput ) { return new OWizHTMLExtend( _pParent, _rInput ); } virtual ~OWizHTMLExtend(){} }; @@ -45,12 +45,12 @@ namespace dbaui protected: virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE; public: - OWizRTFExtend(Window* pParent,SvStream& _rStream) + OWizRTFExtend(vcl::Window* pParent,SvStream& _rStream) : OWizTypeSelect( pParent, &_rStream ) { } - static OWizTypeSelect* Create( Window* _pParent, SvStream& _rInput ) { return new OWizRTFExtend( _pParent, _rInput ); } + static OWizTypeSelect* Create( vcl::Window* _pParent, SvStream& _rInput ) { return new OWizRTFExtend( _pParent, _rInput ); } virtual ~OWizRTFExtend(){} }; @@ -61,7 +61,7 @@ namespace dbaui protected: virtual SvParser* createReader(sal_Int32 _nRows) SAL_OVERRIDE; public: - OWizNormalExtend(Window* pParent); + OWizNormalExtend(vcl::Window* pParent); }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WEXTENDPAGES_HXX diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index 0c713685c0d3..3feb7dc28e01 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -36,7 +36,7 @@ namespace dbaui virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) SAL_OVERRIDE; public: - OColumnTreeBox( Window* pParent, WinBits nBits = WB_BORDER ); + OColumnTreeBox( vcl::Window* pParent, WinBits nBits = WB_BORDER ); void FillListBox( const ODatabaseExport::TColumnVector& _rList); void SetReadOnly(bool _bRo=true) { m_bReadOnly = _bRo; } @@ -77,7 +77,7 @@ namespace dbaui virtual bool LeavePage() SAL_OVERRIDE; virtual OUString GetTitle() const SAL_OVERRIDE ; - OWizNameMatching(Window* pParent); + OWizNameMatching(vcl::Window* pParent); virtual ~OWizNameMatching(); }; diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx index 83398f7e385f..9a30d7c311fb 100644 --- a/dbaccess/source/ui/inc/WTabPage.hxx +++ b/dbaccess/source/ui/inc/WTabPage.hxx @@ -32,7 +32,7 @@ namespace dbaui OCopyTableWizard* m_pParent; bool m_bFirstTime; // Page wird das erste mal gerufen ; should be set in the reset methode - OWizardPage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); + OWizardPage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); public: virtual void Reset ( ) = 0; diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index 0967c5c06252..5f587481e867 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -37,7 +37,7 @@ namespace dbaui class OWizTypeSelectControl : public OFieldDescControl { protected: - Window* m_pParentTabPage; + vcl::Window* m_pParentTabPage; virtual void ActivateAggregate( EControlType eType ) SAL_OVERRIDE; virtual void DeactivateAggregate( EControlType eType ) SAL_OVERRIDE; @@ -51,7 +51,7 @@ namespace dbaui virtual OUString getAutoIncrementValue() const SAL_OVERRIDE; public: - OWizTypeSelectControl(Window* pParent, Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=NULL); + OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=NULL); virtual ~OWizTypeSelectControl(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE; @@ -69,15 +69,15 @@ namespace dbaui bool _bSet = false); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - Window* m_pParentTabPage; + vcl::Window* m_pParentTabPage; public: - OWizTypeSelectList( Window* pParent, WinBits nStyle = WB_BORDER ) + OWizTypeSelectList( vcl::Window* pParent, WinBits nStyle = WB_BORDER ) : MultiListBox(pParent,nStyle) , m_bPKey(false) , m_pParentTabPage(NULL) {} void SetPKey(bool bPKey) { m_bPKey = bPKey; } - void SetParentTabPage(Window* pParentTabPage) { m_pParentTabPage = pParentTabPage; } + void SetParentTabPage(vcl::Window* pParentTabPage) { m_pParentTabPage = pParentTabPage; } }; // Wizard Page: OWizTypeSelect @@ -116,14 +116,14 @@ namespace dbaui virtual bool LeavePage() SAL_OVERRIDE; virtual OUString GetTitle() const SAL_OVERRIDE; - OWizTypeSelect(Window* pParent, SvStream* _pStream = NULL ); + OWizTypeSelect(vcl::Window* pParent, SvStream* _pStream = NULL ); virtual ~OWizTypeSelect(); inline void setDisplayRow(sal_Int32 _nRow) { m_nDisplayRow = _nRow - 1; } inline void setDuplicateName(bool _bDuplicateName) { m_bDuplicateName = _bDuplicateName; } }; - typedef OWizTypeSelect* (*TypeSelectionPageFactory)( Window*, SvStream& ); + typedef OWizTypeSelect* (*TypeSelectionPageFactory)( vcl::Window*, SvStream& ); } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WTYPESELECT_HXX diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index d33ea5f0570a..360ee70fa9eb 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -50,7 +50,7 @@ namespace dbaui virtual bool allowQueries() const = 0; virtual bool allowAddition() const = 0; virtual void addTableWindow( const OUString& _rQualifiedTableName, const OUString& _rAliasName ) = 0; - virtual void onWindowClosing( const Window* _pWindow ) = 0; + virtual void onWindowClosing( const vcl::Window* _pWindow ) = 0; protected: ~IAddTableDialogContext() {} @@ -78,7 +78,7 @@ namespace dbaui public: OAddTableDlg( - Window* _pParent, + vcl::Window* _pParent, IAddTableDialogContext& _rContext ); virtual ~OAddTableDlg(); diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index ef0622bf0f62..3520485684be 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -45,7 +45,7 @@ namespace dbaui virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) SAL_OVERRIDE; public: - AdvancedSettingsDialog( Window* _pParent + AdvancedSettingsDialog( vcl::Window* _pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName); diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index bb2d19c087a6..f28f54185f1a 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -149,7 +149,7 @@ namespace dbaui UnoDataBrowserView* getBrowserView() const { return static_cast< UnoDataBrowserView*>(getView()); } // late construction - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // UNO virtual ::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; diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index 0f799f87075e..b0c9852de938 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -49,7 +49,7 @@ namespace dbaui DBTreeView* m_pTreeView; Splitter* m_pSplitter; mutable SbaGridControl* m_pVclControl; // our grid's VCL representation - Window* m_pStatus; + vcl::Window* m_pStatus; DECL_LINK( SplitHdl, void* ); // attribute access @@ -58,7 +58,7 @@ namespace dbaui SbaGridControl* getVclControl() const; public: - UnoDataBrowserView( Window* pParent, + UnoDataBrowserView( vcl::Window* pParent, IController& _rController, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~UnoDataBrowserView(); diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx index 990c9df4f4e2..78f2da4f4a28 100644 --- a/dbaccess/source/ui/inc/charsetlistbox.hxx +++ b/dbaccess/source/ui/inc/charsetlistbox.hxx @@ -33,7 +33,7 @@ namespace dbaui class CharSetListBox : public ListBox { public: - CharSetListBox( Window* _pParent, WinBits _nBits ); + CharSetListBox( vcl::Window* _pParent, WinBits _nBits ); virtual ~CharSetListBox(); void SelectEntryByIanaName( const OUString& _rIanaName ); diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index 4a1238dbb4ad..dc1a42986116 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -41,7 +41,7 @@ class OConnectionURLEdit : public Edit bool m_bShowPrefix; // when <TRUE> the prefix will be visible, otherwise not public: - OConnectionURLEdit(Window* pParent, WinBits _nBits,bool _bShowPrefix = false); + OConnectionURLEdit(vcl::Window* pParent, WinBits _nBits,bool _bShowPrefix = false); virtual ~OConnectionURLEdit(); public: diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index f87f4681a9ab..f5d64a0f48cd 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -30,7 +30,7 @@ namespace dbtools class SQLExceptionInfo; } -class Window; +namespace vcl { class Window; } namespace dbaui { @@ -38,7 +38,7 @@ namespace dbaui class ODatasourceConnector { protected: - Window* m_pErrorMessageParent; + vcl::Window* m_pErrorMessageParent; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; OUString m_sContextInformation; @@ -46,11 +46,11 @@ namespace dbaui public: ODatasourceConnector( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - Window* _pMessageParent + vcl::Window* _pMessageParent ); ODatasourceConnector( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - Window* _pMessageParent, + vcl::Window* _pMessageParent, const OUString& _rContextInformation ); diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index ddce2e2250ef..66989228b351 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -61,7 +61,7 @@ public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed after the dialog has been destroyed */ - ODbAdminDialog(Window* pParent, + ODbAdminDialog(vcl::Window* pParent, SfxItemSet* _pItems, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index ce9ad84ea2d4..ab15137087bb 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -80,7 +80,7 @@ namespace dbaui DECL_LINK( ScrollDownHdl, SvTreeListBox* ); public: - DBTreeListBox( Window* pParent + DBTreeListBox( vcl::Window* pParent ,WinBits nWinStyle=0 ,bool _bHandleEnterKey = false); virtual ~DBTreeListBox(); diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 124b6a8b6eb6..0f84ea6404f4 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -70,7 +70,7 @@ public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed after the dialog has been destroyed */ - ODbTypeWizDialog(Window* pParent + ODbTypeWizDialog(vcl::Window* pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 067907ca335f..bdd22395f9c6 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -96,7 +96,7 @@ public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed after the dialog has been destroyed */ - ODbTypeWizDialogSetup(Window* pParent + ODbTypeWizDialogSetup(vcl::Window* pParent ,SfxItemSet* _pItems ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index ef4aff479b3d..d27de6c58125 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -66,7 +66,7 @@ namespace dbaui public: DirectSQLDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn); virtual ~DirectSQLDialog(); diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx index f6956361fbdc..b6614cf62701 100644 --- a/dbaccess/source/ui/inc/dlgattr.hxx +++ b/dbaccess/source/ui/inc/dlgattr.hxx @@ -33,7 +33,7 @@ namespace dbaui sal_uInt32 m_nNumberFormatId; public: - SbaSbAttrDlg(Window * pParent, const SfxItemSet*, SvNumberFormatter*, bool bHasFormat, bool bRow = false); + SbaSbAttrDlg(vcl::Window * pParent, const SfxItemSet*, SvNumberFormatter*, bool bHasFormat, bool bRow = false); virtual ~SbaSbAttrDlg(); virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 5d30bd92bff5..5217e1fcb0a0 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -52,14 +52,14 @@ namespace dbaui OSaveAsDlgImpl* m_pImpl; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; public: - OSaveAsDlg( Window * pParent,const sal_Int32& _rType, + OSaveAsDlg( vcl::Window * pParent,const sal_Int32& _rType, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const OUString& rDefault, const IObjectNameCheck& _rObjectNameCheck, sal_Int32 _nFlags = SAD_DEFAULT | SAD_TITLE_STORE_AS); - OSaveAsDlg( Window* _pParent, + OSaveAsDlg( vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const OUString& _rDefault, const OUString& _sLabel, diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index 25e35964efe6..e145cf7675ad 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -43,7 +43,7 @@ namespace dbaui CheckBox* m_pCB_STANDARD; public: - DlgSize( Window * pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard = -1 ); + DlgSize( vcl::Window * pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard = -1 ); sal_Int32 GetValue(); }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 3aa05ffafe8e..f204c8c3cf89 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -48,7 +48,7 @@ namespace dbaui bool m_bSuspendSelectHdl; public: - DbaIndexList(Window* _pParent, WinBits nWinBits); + DbaIndexList(vcl::Window* _pParent, WinBits nWinBits); void SetSelectHdl(const Link& _rHdl) { m_aSelectHdl = _rHdl; } Link GetSelectHdl() const { return m_aSelectHdl; } @@ -103,7 +103,7 @@ namespace dbaui m_xContext; public: DbaIndexDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Sequence< OUString >& _rFieldNames, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 7151d6dc9b38..fb1347d2b3eb 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -50,7 +50,7 @@ namespace dbaui bool m_bAddIndexAppendix; public: - IndexFieldsControl( Window* _pParent, WinBits nWinStyle); + IndexFieldsControl( vcl::Window* _pParent, WinBits nWinStyle); virtual ~IndexFieldsControl(); void Init(const ::com::sun::star::uno::Sequence< OUString >& _rAvailableFields, sal_Int32 _nMaxColumnsInIndex,bool _bAddIndexAppendix); diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index ebe50f47c8e7..7c597b24624e 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <comphelper/namedvaluecollection.hxx> -class Window; +namespace vcl { class Window; } namespace dbaui { @@ -49,13 +49,13 @@ namespace dbaui m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI > m_xDocumentUI; - Window* m_pDialogParent; + vcl::Window* m_pDialogParent; OUString m_sCurrentlyEditing; OUString m_sDataSourceName; public: OLinkedDocumentsAccess( - Window* _pDialogParent, + vcl::Window* _pDialogParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& i_rDocumentUI, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index cd86e1a8eba1..2e10a99b82c6 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -38,7 +38,7 @@ class OMarkableTreeListBox : public DBTreeListBox Link m_aCheckButtonHandler; public: - OMarkableTreeListBox( Window* pParent, WinBits nWinStyle=0 ); + OMarkableTreeListBox( vcl::Window* pParent, WinBits nWinStyle=0 ); virtual ~OMarkableTreeListBox(); virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 1dcd219a818a..24d475cb8c3d 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -40,7 +40,7 @@ namespace dbaui OUString m_sModule; public: - OpenDocumentButton( Window* _pParent, const sal_Char* _pAsciiModuleName ); + OpenDocumentButton( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName ); protected: void impl_init( const sal_Char* _pAsciiModuleName ); @@ -57,7 +57,7 @@ namespace dbaui MapIndexToStringPair m_aURLs; public: - OpenDocumentListBox( Window* _pParent, const sal_Char* _pAsciiModuleName ); + OpenDocumentListBox( vcl::Window* _pParent, const sal_Char* _pAsciiModuleName ); OUString GetSelectedDocumentURL() const; OUString GetSelectedDocumentFilter() const; diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 71b1f4b347e9..edc37862a366 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -79,7 +79,7 @@ namespace dbaui m_aFinalValues; /// the final values as entered by the user public: - OParameterDialog(Window* _pParent, + OParameterDialog(vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & _rParamContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > & _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext); diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index e895a0dae32d..64f828ecb721 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -35,7 +35,7 @@ namespace dbaui class OBeamer : public DockingWindow { public: - OBeamer(Window* _pParent) : DockingWindow(_pParent,0){} + OBeamer(vcl::Window* _pParent) : DockingWindow(_pParent,0){} }; // OQueryContainerWindow @@ -48,7 +48,7 @@ namespace dbaui DECL_LINK( SplitHdl, void* ); public: - OQueryContainerWindow(Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); + OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); virtual ~OQueryContainerWindow(); virtual void Construct() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index 6d94e84fc02b..35d9165d0ae1 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -165,7 +165,7 @@ namespace dbaui ::connectivity::OSQLParser& getParser() { return m_aSqlParser; } ::connectivity::OSQLParseTreeIterator& getParseIterator() { return *m_pSqlIterator; } - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; DECLARE_XINTERFACE( ) DECLARE_XTYPEPROVIDER( ) diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index 25694f44ff76..b9d76cccca97 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -106,7 +106,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getQueryColumn( const OUString& _rFieldName ) const; public: - DlgFilterCrit( Window * pParent, + DlgFilterCrit( vcl::Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer, diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index a4a535ada1d0..007c42966a6a 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -79,7 +79,7 @@ namespace dbaui void EnableLines(); public: - DlgOrderCrit( Window * pParent, + DlgOrderCrit( vcl::Window * pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& _rxComposer, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxCols); diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index 467b09f040b0..0a05a3153b40 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -27,7 +27,7 @@ namespace dbaui class OQueryView : public OJoinDesignView { public: - OQueryView(Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); + OQueryView(vcl::Window* pParent, OQueryController& _rController,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ); virtual ~OQueryView(); virtual bool isCutAllowed() = 0; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index e9c7e3ba586e..3141c0cf96b3 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -88,7 +88,7 @@ namespace dbaui virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: - virtual FmXGridPeer* imp_CreatePeer(Window* pParent) SAL_OVERRIDE; + virtual FmXGridPeer* imp_CreatePeer(vcl::Window* pParent) SAL_OVERRIDE; }; // SbaXGridPeer @@ -127,7 +127,7 @@ namespace dbaui virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: - virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle) SAL_OVERRIDE; + virtual FmGridControl* imp_CreateControl(vcl::Window* pParent, WinBits nStyle) SAL_OVERRIDE; #ifdef _MSC_VER typedef ::com::sun::star::frame::XStatusListener xstlist_type; typedef ::com::sun::star::uno::Reference< xstlist_type > xlistener_type; diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 6a6387445e2b..d91ec74cac56 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -70,7 +70,7 @@ public: detailed field of an <type scope="com::sun::star::sdb">SQLContext</type>). */ OSQLMessageBox( - Window* _pParent, + vcl::Window* _pParent, const dbtools::SQLExceptionInfo& _rException, WinBits _nStyle = WB_OK | WB_DEF_OK, const OUString& _rHelpURL = OUString() @@ -82,7 +82,7 @@ public: @param rMessage the detailed message to display @param _eType determines the image to use. AUTO is disallowed in this constructor version */ - OSQLMessageBox(Window* pParent, + OSQLMessageBox(vcl::Window* pParent, const OUString& rTitle, const OUString& rMessage, WinBits nStyle = WB_OK | WB_DEF_OK, @@ -107,7 +107,7 @@ private: class OSQLWarningBox : public OSQLMessageBox { public: - OSQLWarningBox( Window* _pParent, + OSQLWarningBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle = WB_OK | WB_DEF_OK, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); @@ -117,7 +117,7 @@ public: class OSQLErrorBox : public OSQLMessageBox { public: - OSQLErrorBox( Window* _pParent, + OSQLErrorBox( vcl::Window* _pParent, const OUString& _rMessage, WinBits _nStyle = WB_OK | WB_DEF_OK, const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = NULL ); diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 3114ef511525..52afd2764b40 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -46,7 +46,7 @@ protected: bool m_bNoEmptyFolders; // should empty catalogs/schematas be prevented from being displayed? public: - OTableTreeListBox(Window* pParent, WinBits nWinStyle); + OTableTreeListBox(vcl::Window* pParent, WinBits nWinStyle); void init(bool bVirtualRoot) { m_bVirtualRoot = bVirtualRoot; } diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index 080025084dd6..40ab9616095b 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -37,7 +37,7 @@ namespace dbaui class TextConnectionSettingsDialog : public ModalDialog { public: - TextConnectionSettingsDialog( Window* _pParent, SfxItemSet& _rItems ); + TextConnectionSettingsDialog( vcl::Window* _pParent, SfxItemSet& _rItems ); virtual ~TextConnectionSettingsDialog(); /** initializes a set of PropertyStorage instaces, which are bound to diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 1c004917d8d8..e28f3e2adff5 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -147,7 +147,7 @@ namespace dbaui DECLARE_UNO3_DEFAULTS(SbaTableQueryBrowser,SbaXDataBrowserController) // late construction - virtual bool Construct(Window* pParent) SAL_OVERRIDE; + virtual bool Construct(vcl::Window* pParent) SAL_OVERRIDE; // XInterface virtual ::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; diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 5bae185c4528..45cfaf2ec921 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -69,7 +69,7 @@ protected: virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& _rConvertedValue, com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const com::sun::star::uno::Any& _rValue) throw(com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE; // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 6f374f003933..5a061ea0c448 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::lang; // export data -ORowSetImportExport::ORowSetImportExport( Window* _pParent, +ORowSetImportExport::ORowSetImportExport( vcl::Window* _pParent, const Reference< XResultSetUpdate >& _xResultSetUpdate, const ::svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XComponentContext >& _rM, diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index d0e69379d20e..83f6ac0298ac 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -208,7 +208,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP } Reference< XDataSource > getDataSourceByName( const OUString& _rDataSourceName, - Window* _pErrorMessageParent, Reference< XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo ) + vcl::Window* _pErrorMessageParent, Reference< XComponentContext > _rxContext, ::dbtools::SQLExceptionInfo* _pErrorInfo ) { Reference< XDatabaseContext > xDatabaseContext = DatabaseContext::create(_rxContext); @@ -280,7 +280,7 @@ Reference< XInterface > getDataSourceOrModel(const Reference< XInterface >& _xOb return xRet; } -void showError(const SQLExceptionInfo& _rInfo,Window* _pParent,const Reference< XComponentContext >& _rxContext) +void showError(const SQLExceptionInfo& _rInfo, vcl::Window* _pParent,const Reference< XComponentContext >& _rxContext) { OSL_ENSURE(_pParent,"showError: Parent window must be NOT NULL!"); ::dbtools::showError(_rInfo,VCLUnoHelper::GetInterface(_pParent), _rxContext); @@ -753,7 +753,7 @@ SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment) void callColumnFormatDialog(const Reference<XPropertySet>& xAffectedCol, const Reference<XPropertySet>& xField, SvNumberFormatter* _pFormatter, - Window* _pParent) + vcl::Window* _pParent) { if (xAffectedCol.is() && xField.is()) { @@ -786,7 +786,7 @@ void callColumnFormatDialog(const Reference<XPropertySet>& xAffectedCol, } } -bool callColumnFormatDialog(Window* _pParent, +bool callColumnFormatDialog(vcl::Window* _pParent, SvNumberFormatter* _pFormatter, sal_Int32 _nDataType, sal_Int32& _nFormatKey, @@ -908,7 +908,7 @@ const SfxFilter* getStandardDatabaseFilter() bool appendToFilter(const Reference<XConnection>& _xConnection, const OUString& _sName, const Reference< XComponentContext >& _rxContext, - Window* _pParent) + vcl::Window* _pParent) { bool bRet = false; Reference< XChild> xChild(_xConnection,UNO_QUERY); @@ -956,7 +956,7 @@ bool appendToFilter(const Reference<XConnection>& _xConnection, return bRet; } -void notifySystemWindow(Window* _pWindow,Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc) +void notifySystemWindow(vcl::Window* _pWindow, vcl::Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,vcl::Window*> _rMemFunc) { OSL_ENSURE(_pWindow,"Window can not be null!"); SystemWindow* pSystemWindow = _pWindow ? _pWindow->GetSystemWindow() : NULL; @@ -1281,7 +1281,7 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType return pTypeInfo; } -sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName) +sal_Int32 askForUserAction(vcl::Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,bool _bAll,const OUString& _sName) { SolarMutexGuard aGuard; OUString aMsg = ModuleRes(_nText); @@ -1385,7 +1385,7 @@ Reference<XPropertySet> createView( const OUString& _rName, const Reference< XCo return createView( _rName, _rxConnection, sCommand ); } -bool insertHierachyElement( Window* _pParent, const Reference< XComponentContext >& _rxContext, +bool insertHierachyElement( vcl::Window* _pParent, const Reference< XComponentContext >& _rxContext, const Reference<XHierarchicalNameContainer>& _xNames, const OUString& _sParentFolder, bool _bForm, diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index f73c73c2ca27..ae647cf79972 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star::sdbcx; namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOperation; // Klasse OCopyTable -OCopyTable::OCopyTable(Window * pParent) +OCopyTable::OCopyTable(vcl::Window * pParent) : OWizardPage(pParent, "CopyTablePage", "dbaccess/ui/copytablepage.ui") , m_nOldOperation(0) , m_pPage2(NULL) diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 62cce5672ff3..0df651f41212 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -43,7 +43,7 @@ namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOper OUString OWizColumnSelect::GetTitle() const { return ModuleRes(STR_WIZ_COLUMN_SELECT_TITEL); } -OWizardPage::OWizardPage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) +OWizardPage::OWizardPage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : TabPage(pParent, rID, rUIXMLDescription) ,m_pParent(static_cast<OCopyTableWizard*>(pParent)) ,m_bFirstTime(true) @@ -51,7 +51,7 @@ OWizardPage::OWizardPage(Window* pParent, const OString& rID, const OUString& rU } // OWizColumnSelect -OWizColumnSelect::OWizColumnSelect( Window* pParent) +OWizColumnSelect::OWizColumnSelect( vcl::Window* pParent) :OWizardPage( pParent, "ApplyColPage", "dbaccess/ui/applycolpage.ui") { get(m_pOrgColumnNames, "from"); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 755d22bbc7c4..505ef7793602 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -499,7 +499,7 @@ namespace } // OCopyTableWizard -OCopyTableWizard::OCopyTableWizard( Window * pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, +OCopyTableWizard::OCopyTableWizard( vcl::Window * pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ICopyTableSourceObject& _rSourceObject, const Reference< XConnection >& _xSourceConnection, const Reference< XConnection >& _xConnection, const Reference< XComponentContext >& _rxContext, const Reference< XInteractionHandler>& _xInteractionHandler) @@ -591,7 +591,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const OUString& _rDefaultN ActivatePage(); } -OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, +OCopyTableWizard::OCopyTableWizard( vcl::Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation, const ODatabaseExport::TColumns& _rSourceColumns, const ODatabaseExport::TColumnVector& _rSourceColVec, const Reference< XConnection >& _xConnection, const Reference< XNumberFormatter >& _xFormatter, TypeSelectionPageFactory _pTypeSelectionPageFactory, SvStream& _rTypeSelectionPageArg, const Reference< XComponentContext >& _rxContext ) diff --git a/dbaccess/source/ui/misc/WExtendPages.cxx b/dbaccess/source/ui/misc/WExtendPages.cxx index 9ec4d842f36f..6a21d512bd0f 100644 --- a/dbaccess/source/ui/misc/WExtendPages.cxx +++ b/dbaccess/source/ui/misc/WExtendPages.cxx @@ -48,7 +48,7 @@ SvParser* OWizRTFExtend::createReader(sal_Int32 _nRows) m_pParent->shouldCreatePrimaryKey()); } -OWizNormalExtend::OWizNormalExtend(Window* pParent) : OWizTypeSelect( pParent ) +OWizNormalExtend::OWizNormalExtend(vcl::Window* pParent) : OWizTypeSelect( pParent ) { EnableAuto(false); } diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index fcdd0ae60e2f..8126f1cf804a 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -30,7 +30,7 @@ using namespace ::dbaui; // OWizColumnSelect -OWizNameMatching::OWizNameMatching( Window* pParent) +OWizNameMatching::OWizNameMatching( vcl::Window* pParent) :OWizardPage( pParent, "NameMatching", "dbaccess/ui/namematchingpage.ui" ) , m_aImgUp(ModuleRes(IMG_UP)) , m_aImgDown(ModuleRes(IMG_DOWN)) @@ -344,7 +344,7 @@ void OColumnString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDa rDev.DrawText( rPos, GetText() ); } -OColumnTreeBox::OColumnTreeBox( Window* pParent, WinBits nBits ) +OColumnTreeBox::OColumnTreeBox( vcl::Window* pParent, WinBits nBits ) : OMarkableTreeListBox(pParent, nBits) , m_bReadOnly(false) { @@ -354,7 +354,7 @@ OColumnTreeBox::OColumnTreeBox( Window* pParent, WinBits nBits ) SetSelectionMode( SINGLE_SELECTION ); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOColumnTreeBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOColumnTreeBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new OColumnTreeBox(pParent); } diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index a0bca4b20eaa..46f952f2dd14 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::sdbc; // OWizTypeSelectControl -OWizTypeSelectControl::OWizTypeSelectControl(Window* pParent, Window* pParentTabPage, OTableDesignHelpBar* pHelpBar) +OWizTypeSelectControl::OWizTypeSelectControl(vcl::Window* pParent, vcl::Window* pParentTabPage, OTableDesignHelpBar* pHelpBar) : OFieldDescControl(pParent, pHelpBar) { @@ -211,7 +211,7 @@ OUString OWizTypeSelectControl::getAutoIncrementValue() const } #define IMG_PRIMARY_KEY 1 -OWizTypeSelect::OWizTypeSelect( Window* pParent, SvStream* _pStream ) +OWizTypeSelect::OWizTypeSelect( vcl::Window* pParent, SvStream* _pStream ) :OWizardPage( pParent, "TypeSelect", "dbaccess/ui/typeselectpage.ui") ,m_pTypeControl(new OWizTypeSelectControl(get<VclVBox>("control_container"), this) ) ,m_pParserStream( _pStream ) @@ -373,7 +373,7 @@ void OWizTypeSelectList::setPrimaryKey(OFieldDescription* _pFieldDescr, sal_uInt SetEntryData(_nPos,_pFieldDescr); } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOWizTypeSelectList(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeOWizTypeSelectList(vcl::Window *pParent, VclBuilder::stringmap &) { return new OWizTypeSelectList(pParent); } diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index 3bfd496321b1..fae7d7555961 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -262,7 +262,7 @@ namespace dbaui const Reference< XWindow > xContainerWindow( m_pData->m_xFrame->getContainerWindow(), UNO_SET_THROW ); if ( _bRegister ) { - const Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); + const vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow ); ENSURE_OR_THROW( pContainerWindow, "no Window implementation for the frame's container window!" ); m_pData->m_bIsTopLevelDocumentWindow = ( pContainerWindow->GetExtendedStyle() & WB_EXT_DOCUMENT ) != 0; diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 8150e76a7201..bd5de5f1c238 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -133,7 +133,7 @@ namespace dbaui // "ThisComponent"-game for the global application Basic. const Reference< XFrame > xFrame( m_xFrameLoader, UNO_QUERY_THROW ); const Reference< XWindow > xFrameWindow( xFrame->getContainerWindow(), UNO_SET_THROW ); - Window* pContainerWindow = VCLUnoHelper::GetWindow( xFrameWindow ); + vcl::Window* pContainerWindow = VCLUnoHelper::GetWindow( xFrameWindow ); ENSURE_OR_THROW( pContainerWindow, "no implementation access to the frame's container window!" ); pContainerWindow->SetExtendedStyle( pContainerWindow->GetExtendedStyle() | WB_EXT_DOCUMENT ); } diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index 9b072e4d7225..24eca91203af 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -57,13 +57,13 @@ namespace dbaui using ::svt::OFileNotation; // ODatasourceConnector - ODatasourceConnector::ODatasourceConnector(const Reference< XComponentContext >& _rxContext, Window* _pMessageParent) + ODatasourceConnector::ODatasourceConnector(const Reference< XComponentContext >& _rxContext, vcl::Window* _pMessageParent) :m_pErrorMessageParent(_pMessageParent) ,m_xContext(_rxContext) { } - ODatasourceConnector::ODatasourceConnector( const Reference< XComponentContext >& _rxContext, Window* _pMessageParent, + ODatasourceConnector::ODatasourceConnector( const Reference< XComponentContext >& _rxContext, vcl::Window* _pMessageParent, const OUString& _rContextInformation ) :m_pErrorMessageParent(_pMessageParent) ,m_xContext(_rxContext) diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index a9cc5e19de5c..edd50cf2534e 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -451,7 +451,7 @@ namespace dbaui { OUString aMessage(ModuleRes(RID_STR_CONNECTION_LOST)); Reference< XWindow > xWindow = getTopMostContainerWindow(); - Window* pWin = NULL; + vcl::Window* pWin = NULL; if ( xWindow.is() ) pWin = VCLUnoHelper::GetWindow(xWindow); if ( !pWin ) diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index e3bff76e76f8..04d417a67b2c 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -102,7 +102,7 @@ namespace dbaui } // OLinkedDocumentsAccess - OLinkedDocumentsAccess::OLinkedDocumentsAccess( Window* _pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI, + OLinkedDocumentsAccess::OLinkedDocumentsAccess( vcl::Window* _pDialogParent, const Reference< XDatabaseDocumentUI >& i_rDocumentUI, const Reference< XComponentContext >& _rxContext, const Reference< XNameAccess >& _rxContainer, const Reference< XConnection>& _xConnection, const OUString& _sDataSourceName ) :m_xContext(_rxContext) diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index c80ad3fbd40e..826a8a6203e6 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -96,7 +96,7 @@ public: virtual bool allowQueries() const SAL_OVERRIDE; virtual bool allowAddition() const SAL_OVERRIDE; virtual void addTableWindow( const OUString& _rQualifiedTableName, const OUString& _rAliasName ) SAL_OVERRIDE; - virtual void onWindowClosing( const Window* _pWindow ) SAL_OVERRIDE; + virtual void onWindowClosing( const vcl::Window* _pWindow ) SAL_OVERRIDE; private: OJoinTableView* getTableView() const; @@ -127,13 +127,13 @@ void AddTableDialogContext::addTableWindow( const OUString& _rQualifiedTableName getTableView()->AddTabWin( _rQualifiedTableName, _rAliasName, true ); } -void AddTableDialogContext::onWindowClosing( const Window* _pWindow ) +void AddTableDialogContext::onWindowClosing( const vcl::Window* _pWindow ) { if ( !m_rController.getView() ) return; ::dbaui::notifySystemWindow( - m_rController.getView(), const_cast< Window* >( _pWindow ), ::comphelper::mem_fun( &TaskPaneList::RemoveWindow ) ); + m_rController.getView(), const_cast< vcl::Window* >( _pWindow ), ::comphelper::mem_fun( &TaskPaneList::RemoveWindow ) ); m_rController.InvalidateFeature( ID_BROWSER_ADDTABLE ); m_rController.getView()->GrabFocus(); @@ -171,7 +171,7 @@ OJoinDesignView* OJoinController::getJoinView() void OJoinController::disposing() { { - boost::scoped_ptr< Window > pEnsureDelete( m_pAddTableDialog ); + boost::scoped_ptr< vcl::Window > pEnsureDelete( m_pAddTableDialog ); m_pAddTableDialog = NULL; } diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index 45014975512b..b61a512c1de6 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -51,7 +51,7 @@ namespace dbaui { // OJoinDesignView -OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController& _rController,const Reference< XComponentContext >& _rxContext) +OJoinDesignView::OJoinDesignView(vcl::Window* _pParent, OJoinController& _rController,const Reference< XComponentContext >& _rxContext) :ODataView( _pParent, _rController, _rxContext ) ,m_pTableView(NULL) ,m_rController( _rController ) @@ -61,9 +61,9 @@ OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController& _rController OJoinDesignView::~OJoinDesignView() { - boost::scoped_ptr<Window> aT3(m_pScrollWindow); + boost::scoped_ptr<vcl::Window> aT3(m_pScrollWindow); m_pScrollWindow = NULL; - boost::scoped_ptr<Window> aT2(m_pTableView); + boost::scoped_ptr<vcl::Window> aT2(m_pTableView); m_pTableView = NULL; } diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index e2531a5dce60..eb05f2009faa 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -43,7 +43,7 @@ namespace dbaui { } - void OJoinExchObj::StartDrag( Window* _pWindow, sal_Int8 _nDragSourceActions, IDragTransferableListener* _pListener ) + void OJoinExchObj::StartDrag( vcl::Window* _pWindow, sal_Int8 _nDragSourceActions, IDragTransferableListener* _pListener ) { m_pDragListener = _pListener; TransferableHelper::StartDrag(_pWindow, _nDragSourceActions); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 668d5434923c..8d64d01840ff 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -64,7 +64,7 @@ using namespace ::com::sun::star::lang; #define TABWIN_WIDTH_STD 120 #define TABWIN_HEIGHT_STD 120 -OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent) +OScrollWindowHelper::OScrollWindowHelper( vcl::Window* pParent) : Window( pParent) ,m_aHScrollBar( this, WB_HSCROLL|WB_REPEAT|WB_DRAG ) ,m_aVScrollBar( this, WB_VSCROLL|WB_REPEAT|WB_DRAG ) ,m_pCornerWindow(new ScrollBarBox(this, WB_3DLOOK)) @@ -89,7 +89,7 @@ OScrollWindowHelper::OScrollWindowHelper( Window* pParent) : Window( pParent) OScrollWindowHelper::~OScrollWindowHelper() { - boost::scoped_ptr<Window> aTemp(m_pCornerWindow); + boost::scoped_ptr<vcl::Window> aTemp(m_pCornerWindow); m_pCornerWindow = NULL; m_pTableView = NULL; } @@ -152,7 +152,7 @@ void OScrollWindowHelper::Resize() // class OJoinTableView -OJoinTableView::OJoinTableView( Window* pParent, OJoinDesignView* pView ) +OJoinTableView::OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView ) :Window( pParent,WB_BORDER ) ,DropTargetHelper(this) ,m_aDragOffset( Point(0,0) ) @@ -1391,10 +1391,10 @@ bool OJoinTableView::PreNotify(NotifyEvent& rNEvt) if (m_aTableMap.empty()) // no tab wins -> no conns -> no focus change break; - Window* pSource = rNEvt.GetWindow(); + vcl::Window* pSource = rNEvt.GetWindow(); if (pSource) { - Window* pSearchFor = NULL; + vcl::Window* pSearchFor = NULL; if (pSource->GetParent() == this) // it may be one of the tab wins pSearchFor = pSource; @@ -1517,7 +1517,7 @@ void OJoinTableView::clearLayoutInformation() { if ( aIter->second ) aIter->second->clearListBox(); - boost::scoped_ptr<Window> aTemp(aIter->second); + boost::scoped_ptr<vcl::Window> aTemp(aIter->second); aIter->second = NULL; } diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx index 194f029c2d32..4f4175be859b 100644 --- a/dbaccess/source/ui/querydesign/LimitBox.cxx +++ b/dbaccess/source/ui/querydesign/LimitBox.cxx @@ -32,7 +32,7 @@ namespace dbaui { -LimitBox::LimitBox( Window* pParent, WinBits nStyle ) +LimitBox::LimitBox( vcl::Window* pParent, WinBits nStyle ) : NumericBox( pParent, nStyle ) { SetShowTrailingZeros( false ); @@ -112,7 +112,7 @@ void LimitBox::LoadDefaultLimits() } } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLimitBox( Window *pParent, VclBuilder::stringmap & ) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLimitBox( vcl::Window *pParent, VclBuilder::stringmap & ) { LimitBox* pBox = new LimitBox( pParent, WB_DROPDOWN | WB_VSCROLL ); return pBox; diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index 77cb02340194..85a3e45bc2ca 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using namespace dbaui; // class OQueryTableWindow -OQueryTableWindow::OQueryTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias) +OQueryTableWindow::OQueryTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias) :OTableWindow( pParent, pTabWinData ) ,m_nAliasNum(0) { diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index e1b2d4b38cbd..95c674107e77 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -31,7 +31,7 @@ namespace dbaui sal_Int32 m_nAliasNum; OUString m_strInitialAlias; public: - OQueryTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias = NULL ); + OQueryTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData, sal_Unicode* pszInitialAlias = NULL ); virtual ~OQueryTableWindow(); OUString GetAliasName() const diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 3601fd0b0127..c095a73ee036 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2517,7 +2517,7 @@ OQueryDesignView::~OQueryDesignView() { if ( m_pTableView ) ::dbaui::notifySystemWindow(this,m_pTableView,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); - boost::scoped_ptr<Window> aTemp(m_pSelectionBox); + boost::scoped_ptr<vcl::Window> aTemp(m_pSelectionBox); m_pSelectionBox = NULL; } @@ -2776,7 +2776,7 @@ bool OQueryDesignView::PreNotify(NotifyEvent& rNEvt) case EVENT_GETFOCUS: #if OSL_DEBUG_LEVEL > 0 { - Window* pFocus = Application::GetFocusWindow(); + vcl::Window* pFocus = Application::GetFocusWindow(); (void)pFocus; } #endif diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 0d44b0ded818..a12731cb4786 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -222,7 +222,7 @@ namespace } // class OQueryTableView -OQueryTableView::OQueryTableView( Window* pParent,OQueryDesignView* pView) +OQueryTableView::OQueryTableView( vcl::Window* pParent,OQueryDesignView* pView) : OJoinTableView( pParent,pView) { SetHelpId(HID_CTL_QRYDGNTAB); diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 3d1f4b0cfcaa..eca9e830f14a 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -52,7 +52,7 @@ OQueryTextView::OQueryTextView(OQueryContainerWindow* _pParent) OQueryTextView::~OQueryTextView() { - boost::scoped_ptr<Window> aTemp(m_pEdit); + boost::scoped_ptr<vcl::Window> aTemp(m_pEdit); m_pEdit = NULL; } diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index 4d97d18297d9..e506dbeddbbd 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -43,11 +43,11 @@ OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryContro OQueryViewSwitch::~OQueryViewSwitch() { { - boost::scoped_ptr<Window> aTemp(m_pTextView); + boost::scoped_ptr<vcl::Window> aTemp(m_pTextView); m_pTextView = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pDesignView); + boost::scoped_ptr<vcl::Window> aTemp(m_pDesignView); m_pDesignView = NULL; } } @@ -167,7 +167,7 @@ void OQueryViewSwitch::paste() OQueryContainerWindow* OQueryViewSwitch::getContainer() const { - Window* pDesignParent = getDesignView() ? getDesignView()->GetParent() : NULL; + vcl::Window* pDesignParent = getDesignView() ? getDesignView()->GetParent() : NULL; return static_cast< OQueryContainerWindow* >( pDesignParent ); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 217604dc7529..97ca36ac2660 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -97,7 +97,7 @@ namespace } } -OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) +OSelectionBrowseBox::OSelectionBrowseBox( vcl::Window* pParent ) :EditBrowseBox( pParent,EBBF_NOROWPICTURE, WB_3DLOOK, BROWSER_COLUMNSELECTION | BROWSER_KEEPSELECTION | BROWSER_HIDESELECT | BROWSER_HIDECURSOR | BROWSER_HLINESFULL | BROWSER_VLINESFULL ) ,m_nSeekRow(0) diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index e42c24ee5507..fd84856e3092 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -78,7 +78,7 @@ namespace dbaui bool m_bInUndoMode; DECL_LINK(OnInvalidateTimer, void*); - public: OSelectionBrowseBox( Window* pParent ); + public: OSelectionBrowseBox( vcl::Window* pParent ); virtual ~OSelectionBrowseBox(); void initialize(); diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 027f49e4c311..78b212ff2437 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -66,7 +66,7 @@ namespace DatabaseObject = css::sdb::application::DatabaseObject; #define TABWIN_HEIGHT_MIN 80 // class OTableWindow -OTableWindow::OTableWindow( Window* pParent, const TTableWindowData::value_type& pTabWinData ) +OTableWindow::OTableWindow( vcl::Window* pParent, const TTableWindowData::value_type& pTabWinData ) : ::comphelper::OContainerListener(m_aMutex) ,Window( pParent, WB_3DLOOK|WB_MOVEABLE ) ,m_aTypeImage( this ) @@ -103,7 +103,7 @@ OTableWindow::~OTableWindow() if (m_pListBox) { OSL_ENSURE(m_pListBox->GetEntryCount()==0,"Forgot to call EmptyListbox()!"); - boost::scoped_ptr<Window> aTemp(m_pListBox); + boost::scoped_ptr<vcl::Window> aTemp(m_pListBox); m_pListBox = NULL; } if ( m_pContainerListener.is() ) diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 75ab9389f1c9..636dc9a26d7e 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -343,7 +343,7 @@ void OTableWindowListBox::GetFocus() IMPL_LINK( OTableWindowListBox, OnDoubleClick, SvTreeListBox *, /*pBox*/ ) { // tell my parent - Window* pParent = Window::GetParent(); + vcl::Window* pParent = Window::GetParent(); OSL_ENSURE(pParent != NULL, "OTableWindowListBox::OnDoubleClick : habe kein Parent !"); static_cast<OTableWindow*>(pParent)->OnEntryDoubleClicked(GetHdlEntry()); diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 4978043ef2ff..ed2768b958bc 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -32,7 +32,7 @@ namespace dbaui class LimitBoxImpl: public LimitBox { public: - LimitBoxImpl( Window* pParent, LimitBoxController* pCtrl ); + LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl ); virtual ~LimitBoxImpl(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; @@ -41,7 +41,7 @@ class LimitBoxImpl: public LimitBox LimitBoxController* m_pControl; }; -LimitBoxImpl::LimitBoxImpl( Window* pParent, LimitBoxController* pCtrl ) +LimitBoxImpl::LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl ) : LimitBox( pParent, WinBits( WB_DROPDOWN | WB_VSCROLL) ) , m_pControl( pCtrl ) { @@ -199,7 +199,7 @@ uno::Reference< awt::XWindow > SAL_CALL LimitBoxController::createItemWindow( uno::Reference< awt::XWindow > xItemWindow; uno::Reference< awt::XWindow > xParent( Parent ); - Window* pParent = VCLUnoHelper::GetWindow( xParent ); + vcl::Window* pParent = VCLUnoHelper::GetWindow( xParent ); if ( pParent ) { SolarMutexGuard aSolarMutexGuard; diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 87713caab9b5..5465148be499 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -42,7 +42,7 @@ namespace dbaui using namespace ::com::sun::star::beans; // OQueryContainerWindow - OQueryContainerWindow::OQueryContainerWindow(Window* pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext) + OQueryContainerWindow::OQueryContainerWindow(vcl::Window* pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext) :ODataView( pParent, _rController, _rxContext ) ,m_pViewSwitch(NULL) ,m_pBeamer(NULL) @@ -71,7 +71,7 @@ namespace dbaui xCloseable->close(sal_False); // false - holds the owner ship of this frame } - boost::scoped_ptr<Window> aTemp(m_pSplitter); + boost::scoped_ptr<vcl::Window> aTemp(m_pSplitter); m_pSplitter = NULL; } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 71bb2720d26a..f773f71c3354 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -289,7 +289,7 @@ namespace if (xUIElement.is()) { Reference< XWindow > xWindow(xUIElement->getRealInterface(), css::uno::UNO_QUERY); - Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); + vcl::Window* pWindow = VCLUnoHelper::GetWindow( xWindow ); if( pWindow || pWindow->HasChildPathFocus() ) { pWindow->GrabFocusToDocument(); @@ -762,7 +762,7 @@ void OQueryController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& ::connectivity::OSQLParseNode* pNode = m_aSqlParser.parseTree( aErrorMsg, m_sStatement, m_bGraphicalDesign ); if ( pNode ) { - Window* pView = getView(); + vcl::Window* pView = getView(); ModalDialog* pWindow = new ModalDialog( pView, WB_STDMODAL | WB_SIZEMOVE | WB_CENTER ); pWindow->SetSizePixel( ::Size( pView->GetSizePixel().Width() / 2, pView->GetSizePixel().Height() / 2 ) ); SvTreeListBox* pTreeBox = new SvTreeListBox( pWindow, WB_BORDER | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HASLINESATROOT | WB_VSCROLL ); @@ -1113,7 +1113,7 @@ void OQueryController::setQueryComposer() } } -bool OQueryController::Construct(Window* pParent) +bool OQueryController::Construct(vcl::Window* pParent) { // TODO: we have to check if we should create the text view or the design view diff --git a/dbaccess/source/ui/querydesign/queryview.cxx b/dbaccess/source/ui/querydesign/queryview.cxx index 4a125c0b877f..a10a73045a0b 100644 --- a/dbaccess/source/ui/querydesign/queryview.cxx +++ b/dbaccess/source/ui/querydesign/queryview.cxx @@ -24,7 +24,7 @@ using namespace dbaui; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -OQueryView::OQueryView(Window* _pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext) +OQueryView::OQueryView(vcl::Window* _pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext) :OJoinDesignView( _pParent, _rController, _rxContext ) { diff --git a/dbaccess/source/ui/relationdesign/RTableWindow.hxx b/dbaccess/source/ui/relationdesign/RTableWindow.hxx index e315edb4ee36..27d31189a098 100644 --- a/dbaccess/source/ui/relationdesign/RTableWindow.hxx +++ b/dbaccess/source/ui/relationdesign/RTableWindow.hxx @@ -26,7 +26,7 @@ namespace dbaui class ORelationTableWindow : public OTableWindow { public: - ORelationTableWindow( Window* pParent,const TTableWindowData::value_type& pTabWinData) + ORelationTableWindow( vcl::Window* pParent,const TTableWindowData::value_type& pTabWinData) : OTableWindow(pParent, pTabWinData) {} /** returns the name which should be used when displaying join or relations diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 0237d46212e4..184a20e27f0e 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -243,7 +243,7 @@ OUString ORelationController::getPrivateTitle( ) const return ::dbaui::getStrippedDatabaseName(getDataSource(),sName); } -bool ORelationController::Construct(Window* pParent) +bool ORelationController::Construct(vcl::Window* pParent) { setView( * new ORelationDesignView( pParent, *this, getORB() ) ); OJoinController::Construct(pParent); diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index 02a826e88dd5..0305b4603736 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; -ORelationDesignView::ORelationDesignView(Window* _pParent, ORelationController& _rController,const Reference< XComponentContext >& _rxContext) +ORelationDesignView::ORelationDesignView(vcl::Window* _pParent, ORelationController& _rController,const Reference< XComponentContext >& _rxContext) :OJoinDesignView( _pParent, _rController, _rxContext ) { } diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 84a84f5cc792..a5ce0cf4714e 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::accessibility; // class ORelationTableView -ORelationTableView::ORelationTableView( Window* pParent, ORelationDesignView* pView ) +ORelationTableView::ORelationTableView( vcl::Window* pParent, ORelationDesignView* pView ) :OJoinTableView( pParent, pView ) , ::comphelper::OContainerListener(m_aMutex) ,m_pExistingConnection(NULL) diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 167cc017574a..94f646154b58 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -28,7 +28,7 @@ using namespace dbaui; // class OFieldDescGenWin -OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp ) : +OFieldDescGenWin::OFieldDescGenWin( vcl::Window* pParent, OTableDesignHelpBar* pHelp ) : TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL ) { m_pFieldControl = new OTableFieldControl(this,pHelp); @@ -38,7 +38,7 @@ OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp OFieldDescGenWin::~OFieldDescGenWin() { - boost::scoped_ptr<Window> aTemp(m_pFieldControl); + boost::scoped_ptr<vcl::Window> aTemp(m_pFieldControl); m_pFieldControl = NULL; } diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx index e4a8c541515c..aaf01fd35d3c 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx @@ -37,7 +37,7 @@ namespace dbaui virtual void Resize() SAL_OVERRIDE; public: - OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelpBar ); + OFieldDescGenWin( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar ); virtual ~OFieldDescGenWin(); virtual void GetFocus() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 2f0a4572377e..566906a08aba 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -138,7 +138,7 @@ void OTableEditorCtrl::UpdateAll() Invalidate(); } -OTableEditorCtrl::OTableEditorCtrl(Window* pWindow) +OTableEditorCtrl::OTableEditorCtrl(vcl::Window* pWindow) :OTableRowView(pWindow) ,pNameCell(NULL) ,pTypeCell(NULL) diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index d09060a24458..623c48ea8aa3 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -122,7 +122,7 @@ namespace dbaui DECL_LINK(ControlPreNotifyHdl, NotifyEvent*); public: - OTableEditorCtrl(Window* pParentWin); + OTableEditorCtrl(vcl::Window* pParentWin); virtual ~OTableEditorCtrl(); virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) SAL_OVERRIDE; virtual void UpdateAll(); diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index dfdbcf4aa7dc..8dbaf5672843 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -538,7 +538,7 @@ void OTableController::impl_initialize() } } -bool OTableController::Construct(Window* pParent) +bool OTableController::Construct(vcl::Window* pParent) { setView( * new OTableDesignView( pParent, getORB(), *this ) ); OTableController_BASE::Construct(pParent); diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 9db53a80e726..f4348d5ebdfb 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::util; // Defines #define HANDLE_ID 0 -OTableRowView::OTableRowView(Window* pParent) +OTableRowView::OTableRowView(vcl::Window* pParent) :EditBrowseBox(pParent, ModuleRes(RID_DB_TAB_EDITOR),EBBF_NONE, BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_AUTOSIZE_LASTCOL | BROWSER_KEEPSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL) diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 36161117a219..5a69fc0b7ead 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -26,7 +26,7 @@ using namespace dbaui; #define STANDARD_MARGIN 6 // class OTableDesignHelpBar -OTableDesignHelpBar::OTableDesignHelpBar( Window* pParent ) : +OTableDesignHelpBar::OTableDesignHelpBar( vcl::Window* pParent ) : TabPage( pParent, WB_3DLOOK ) { m_pTextWin = new MultiLineEdit( this, WB_VSCROLL | WB_LEFT | WB_BORDER | WB_NOTABSTOP | WB_READONLY); @@ -38,7 +38,7 @@ OTableDesignHelpBar::OTableDesignHelpBar( Window* pParent ) : OTableDesignHelpBar::~OTableDesignHelpBar() { - boost::scoped_ptr<Window> aTemp(m_pTextWin); + boost::scoped_ptr<vcl::Window> aTemp(m_pTextWin); m_pTextWin = NULL; } diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 46d20a980e4e..b1743c5d35cd 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; // class OTableBorderWindow -OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORDER) +OTableBorderWindow::OTableBorderWindow(vcl::Window* pParent) : Window(pParent,WB_BORDER) ,m_aHorzSplitter( this ) { @@ -68,11 +68,11 @@ OTableBorderWindow::~OTableBorderWindow() m_pFieldDescWin->Hide(); { - boost::scoped_ptr<Window> aTemp(m_pEditorCtrl); + boost::scoped_ptr<vcl::Window> aTemp(m_pEditorCtrl); m_pEditorCtrl = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pFieldDescWin); + boost::scoped_ptr<vcl::Window> aTemp(m_pFieldDescWin); m_pFieldDescWin = NULL; } @@ -167,7 +167,7 @@ void OTableBorderWindow::GetFocus() } // class OTableDesignView -OTableDesignView::OTableDesignView( Window* pParent, +OTableDesignView::OTableDesignView( vcl::Window* pParent, const Reference< XComponentContext >& _rxOrb, OTableController& _rController ) : @@ -193,7 +193,7 @@ OTableDesignView::~OTableDesignView() m_pWin->Hide(); { - boost::scoped_ptr<Window> aTemp(m_pWin); + boost::scoped_ptr<vcl::Window> aTemp(m_pWin); m_pWin = NULL; } } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index 11e313bfea23..6016da7e79c7 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace dbaui; -OTableFieldControl::OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar) :OFieldDescControl(pParent,pHelpBar) +OTableFieldControl::OTableFieldControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar) :OFieldDescControl(pParent,pHelpBar) { } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx index 0e2a6d9ee8f8..80e6bd5aa114 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -46,7 +46,7 @@ namespace dbaui virtual OUString getAutoIncrementValue() const SAL_OVERRIDE; public: - OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar); + OTableFieldControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar); OUString BoolStringPersistent(const OUString& rUIString) const { return OFieldDescControl::BoolStringPersistent(rUIString); } OUString BoolStringUI(const OUString& rPersistentString) const { return OFieldDescControl::BoolStringUI(rPersistentString); } diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index aa3ab08bc6de..eef570c905d2 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -45,7 +45,7 @@ using namespace dbaui; // class OTableFieldDescWin -OTableFieldDescWin::OTableFieldDescWin( Window* pParent) +OTableFieldDescWin::OTableFieldDescWin( vcl::Window* pParent) : TabPage(pParent, WB_3DLOOK) , m_eChildFocus(NONE) { @@ -72,15 +72,15 @@ OTableFieldDescWin::~OTableFieldDescWin() m_pHeader->Hide(); { - boost::scoped_ptr<Window> aTemp(m_pGenPage); + boost::scoped_ptr<vcl::Window> aTemp(m_pGenPage); m_pGenPage = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pHeader); + boost::scoped_ptr<vcl::Window> aTemp(m_pHeader); m_pHeader = NULL; } { - boost::scoped_ptr<Window> aTemp(m_pHelpBar); + boost::scoped_ptr<vcl::Window> aTemp(m_pHelpBar); m_pHelpBar = NULL; } } diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index ac3beafa252d..8f1ef89bbaa0 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -53,7 +53,7 @@ namespace dbaui virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: - OTableFieldDescWin( Window* pParent); + OTableFieldDescWin( vcl::Window* pParent); virtual ~OTableFieldDescWin(); virtual void Init(); diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index c6d98828b4eb..cf90db45463b 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -63,7 +63,7 @@ namespace dbaui virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; OAdvancedSettingsDialog::OAdvancedSettingsDialog(const Reference< XComponentContext >& _rxORB) @@ -119,7 +119,7 @@ namespace dbaui describeProperties(aProps); return new ::cppu::OPropertyArrayHelper(aProps); } - Dialog* OAdvancedSettingsDialog::createDialog(Window* _pParent) + Dialog* OAdvancedSettingsDialog::createDialog(vcl::Window* _pParent) { AdvancedSettingsDialog* pDlg = new AdvancedSettingsDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection); return pDlg; diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index a91c0949c3d3..fe7a24e969c6 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -65,7 +65,7 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit { mbCreatingPeer = true; - Window* pParentWin = NULL; + vcl::Window* pParentWin = NULL; if (rParentPeer.is()) { VCLXWindow* pParent = VCLXWindow::GetImplementation(rParentPeer); diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index 2de839f8382b..1422c629b3a1 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; -OColumnPeer::OColumnPeer(Window* _pParent,const Reference<XComponentContext>& _rxContext) +OColumnPeer::OColumnPeer(vcl::Window* _pParent,const Reference<XComponentContext>& _rxContext) :m_pActFieldDescr(NULL) { osl_atomic_increment( &m_refCount ); diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx index 6ce446c385d7..5e15a10ed344 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.hxx +++ b/dbaccess/source/ui/uno/ColumnPeer.hxx @@ -33,7 +33,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xColumn; public: - OColumnPeer(Window* _pParent + OColumnPeer(vcl::Window* _pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext); void setColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn); diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index ef1d0cde8bf0..bc1873982ea0 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -92,7 +92,7 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialog::getPropertySetInfo() thr return new ::cppu::OPropertyArrayHelper(aProps); } -Dialog* ODBTypeWizDialog::createDialog(Window* _pParent) +Dialog* ODBTypeWizDialog::createDialog(vcl::Window* _pParent) { ODbTypeWizDialog* pDlg = new ODbTypeWizDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection); return pDlg; diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index 3958b98f8e9e..4a3a265a6a68 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -55,7 +55,7 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index ddc72538b3ec..a6db1563e1d3 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -106,7 +106,7 @@ Reference<XPropertySetInfo> SAL_CALL ODBTypeWizDialogSetup::getPropertySetInfo( return new ::cppu::OPropertyArrayHelper(aProps); } -Dialog* ODBTypeWizDialogSetup::createDialog(Window* _pParent) +Dialog* ODBTypeWizDialogSetup::createDialog(vcl::Window* _pParent) { return new ODbTypeWizDialogSetup(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection); } diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index e5a2b0945a65..8ed555e4014a 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -58,7 +58,7 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; virtual void executedDialog(sal_Int16 _nExecutionResult) SAL_OVERRIDE; }; diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index 0a2d346700ff..9f284263bb1e 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -92,7 +92,7 @@ Reference<XPropertySetInfo> SAL_CALL OTableFilterDialog::getPropertySetInfo() t return new ::cppu::OPropertyArrayHelper(aProps); } -Dialog* OTableFilterDialog::createDialog(Window* _pParent) +Dialog* OTableFilterDialog::createDialog(vcl::Window* _pParent) { OTableSubscriptionDialog* pDlg = new OTableSubscriptionDialog(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection); return pDlg; diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 1dc2bface661..408457ea8cc1 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -55,7 +55,7 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index 4ab1a5fa57db..e66d888c25a1 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -92,7 +92,7 @@ Reference<XPropertySetInfo> SAL_CALL OUserSettingsDialog::getPropertySetInfo() return new ::cppu::OPropertyArrayHelper(aProps); } -Dialog* OUserSettingsDialog::createDialog(Window* _pParent) +Dialog* OUserSettingsDialog::createDialog(vcl::Window* _pParent) { OUserAdminDlg* pDlg = new OUserAdminDlg(_pParent, m_pDatasourceItems, m_aContext, m_aInitialSelection, m_xActiveConnection); return pDlg; diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index f0440cfb5d95..043fa1a52410 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -55,7 +55,7 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index e14a46fcf8ae..f2f52d656174 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -92,7 +92,7 @@ Reference<XPropertySetInfo> SAL_CALL ODataSourcePropertyDialog::getPropertySetI return new ::cppu::OPropertyArrayHelper(aProps); } -Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent) +Dialog* ODataSourcePropertyDialog::createDialog(vcl::Window* _pParent) { ODbAdminDialog* pDialog = new ODbAdminDialog(_pParent, m_pDatasourceItems, m_aContext); diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index 352251e31ec3..c791129851f3 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -55,7 +55,7 @@ public: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; } // namespace dbaui diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index e5584465a520..7cf58cdec9d8 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -77,7 +77,7 @@ namespace dbaui IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ComposerDialog ) - Dialog* ComposerDialog::createDialog(Window* _pParent) + Dialog* ComposerDialog::createDialog(vcl::Window* _pParent) { // obtain all the objects needed for the dialog Reference< XConnection > xConnection; @@ -140,7 +140,7 @@ namespace dbaui return static_cast< XServiceInfo* >(new RowsetFilterDialog( comphelper::getComponentContext(_rxORB))); } - Dialog* RowsetFilterDialog::createComposerDialog( Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns ) + Dialog* RowsetFilterDialog::createComposerDialog( vcl::Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns ) { return new DlgFilterCrit( _pParent, m_aContext, _rxConnection, m_xComposer, _rxColumns ); } @@ -188,7 +188,7 @@ namespace dbaui return static_cast< XServiceInfo* >(new RowsetOrderDialog( comphelper::getComponentContext(_rxORB))); } - Dialog* RowsetOrderDialog::createComposerDialog( Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns ) + Dialog* RowsetOrderDialog::createComposerDialog( vcl::Window* _pParent, const Reference< XConnection >& _rxConnection, const Reference< XNameAccess >& _rxColumns ) { return new DlgOrderCrit( _pParent, _rxConnection, m_xComposer, _rxColumns ); } diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index 9d3b8580107a..4eb6fe8c2de1 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -63,14 +63,14 @@ namespace dbaui protected: // own overridables virtual Dialog* createComposerDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns ) = 0; private: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; + virtual Dialog* createDialog(vcl::Window* _pParent) SAL_OVERRIDE; }; // RowsetFilterDialog @@ -86,7 +86,7 @@ namespace dbaui protected: // own overridables virtual Dialog* createComposerDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns ) SAL_OVERRIDE; @@ -111,7 +111,7 @@ namespace dbaui protected: // own overridables virtual Dialog* createComposerDialog( - Window* _pParent, + vcl::Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 49dd9aef75c2..1f6f0b8cdb2b 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -193,7 +193,7 @@ namespace dbaui virtual ~CopyTableWizard(); // OGenericUnoDialog overridables - virtual Dialog* createDialog( Window* _pParent ) SAL_OVERRIDE; + virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE; virtual void executedDialog( sal_Int16 _nExecutionResult ) SAL_OVERRIDE; private: @@ -1521,7 +1521,7 @@ void SAL_CALL CopyTableWizard::initialize( const Sequence< Any >& _rArguments ) return new ::cppu::OPropertyArrayHelper( aProps ); } -Dialog* CopyTableWizard::createDialog( Window* _pParent ) +Dialog* CopyTableWizard::createDialog( vcl::Window* _pParent ) { OSL_PRECOND( isInitialized(), "CopyTableWizard::createDialog: not initialized!" ); // this should have been prevented in ::execute already diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 6e81e7667789..d0c4969b57fb 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -104,7 +104,7 @@ namespace dbaui 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; protected: using OTextConnectionSettingsDialog_BASE::getFastPropertyValue; @@ -204,7 +204,7 @@ namespace dbaui return new ::cppu::OPropertyArrayHelper( aProps ); } - Dialog* OTextConnectionSettingsDialog::createDialog(Window* _pParent) + Dialog* OTextConnectionSettingsDialog::createDialog(vcl::Window* _pParent) { return new TextConnectionSettingsDialog( _pParent, *m_pDatasourceItems ); } diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index bc58efbae59e..9c214d5a4dce 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -78,7 +78,7 @@ namespace dbaui IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( ODirectSQLDialog ) - Dialog* ODirectSQLDialog::createDialog(Window* _pParent) + Dialog* ODirectSQLDialog::createDialog(vcl::Window* _pParent) { // obtain all the objects needed for the dialog Reference< XConnection > xConnection = m_xActiveConnection; diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 4fa7ec69ff81..43844874009e 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -57,7 +57,7 @@ namespace dbaui 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; }; diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 9235528c52a4..7ba1725b0b16 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -141,7 +141,7 @@ Reference<XPropertySetInfo> SAL_CALL OSQLMessageDialog::getPropertySetInfo() th return new ::cppu::OPropertyArrayHelper(aProps); } -Dialog* OSQLMessageDialog::createDialog(Window* _pParent) +Dialog* OSQLMessageDialog::createDialog(vcl::Window* _pParent) { if ( m_aException.hasValue() ) return new OSQLMessageBox( _pParent, SQLExceptionInfo( m_aException ), WB_OK | WB_DEF_OK, m_sHelpURL ); |