diff options
Diffstat (limited to 'dbaccess/source/ui/tabledesign')
12 files changed, 21 insertions, 21 deletions
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(); |