Kaydet (Commit) 290c59b3 authored tarafından Kurt Zenker's avatar Kurt Zenker

INTEGRATION: CWS dba30d (1.12.30); FILE MERGED

2008/05/29 11:25:58 fs 1.12.30.1: during #i80943#: refactoring: IController now passed around as reference, not as pointer
üst 5595864c
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: TableDesignView.hxx,v $ * $RCSfile: TableDesignView.hxx,v $
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
...@@ -86,7 +86,7 @@ namespace dbaui ...@@ -86,7 +86,7 @@ namespace dbaui
private: private:
::com::sun::star::lang::Locale m_aLocale; ::com::sun::star::lang::Locale m_aLocale;
OTableBorderWindow* m_pWin; OTableBorderWindow* m_pWin;
OTableController* m_pController; OTableController& m_rController;
ChildFocusState m_eChildFocus; ChildFocusState m_eChildFocus;
IClipboardTest* getActiveChild() const; IClipboardTest* getActiveChild() const;
...@@ -99,7 +99,7 @@ namespace dbaui ...@@ -99,7 +99,7 @@ namespace dbaui
public: public:
OTableDesignView( Window* pParent, OTableDesignView( Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&,
OTableController* _pController); OTableController& _rController);
virtual ~OTableDesignView(); virtual ~OTableDesignView();
// window overloads // window overloads
...@@ -108,7 +108,7 @@ namespace dbaui ...@@ -108,7 +108,7 @@ namespace dbaui
OTableEditorCtrl* GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : NULL; } OTableEditorCtrl* GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : NULL; }
OTableFieldDescWin* GetDescWin() const { return m_pWin ? m_pWin->GetDescWin() : NULL; } OTableFieldDescWin* GetDescWin() const { return m_pWin ? m_pWin->GetDescWin() : NULL; }
OTableController* getController() const { return m_pController; } OTableController& getController() const { return m_rController; }
::com::sun::star::lang::Locale getLocale() const { return m_aLocale;} ::com::sun::star::lang::Locale getLocale() const { return m_aLocale;}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment