Kaydet (Commit) 5b72c4ce authored tarafından Julien Nabet's avatar Julien Nabet

basctl: prefix some members

Change-Id: I59660153a33e83dc9457fbee082e8da444b04b58
Reviewed-on: https://gerrit.libreoffice.org/24126Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst 603a9ada
......@@ -300,13 +300,13 @@ public:
class ModulWindow: public BaseWindow
{
private:
ModulWindowLayout& rLayout;
StarBASICRef xBasic;
short nValid;
VclPtr<ComplexEditorWindow> aXEditorWindow;
BasicStatus aStatus;
SbModuleRef xModule;
OUString aCurPath;
ModulWindowLayout& m_rLayout;
StarBASICRef m_xBasic;
short m_nValid;
VclPtr<ComplexEditorWindow> m_aXEditorWindow;
BasicStatus m_aStatus;
SbModuleRef m_xModule;
OUString m_sCurPath;
OUString m_aModule;
void CheckCompileBasic();
......@@ -345,10 +345,10 @@ public:
virtual void SetReadOnly (bool bReadOnly) override;
virtual bool IsReadOnly() override;
StarBASIC* GetBasic() { XModule(); return xBasic; }
StarBASIC* GetBasic() { XModule(); return m_xBasic; }
SbModule* GetSbModule() { return xModule; }
void SetSbModule( SbModule* pModule ) { xModule = pModule; }
SbModule* GetSbModule() { return m_xModule; }
void SetSbModule( SbModule* pModule ) { m_xModule = pModule; }
OUString GetSbModuleName();
void CompileBasic();
......@@ -375,7 +375,7 @@ public:
void ToggleBreakPoint( sal_uLong nLine );
BasicStatus& GetBasicStatus() { return aStatus; }
BasicStatus& GetBasicStatus() { return m_aStatus; }
virtual bool IsModified () override;
virtual bool IsPasteAllowed () override;
......@@ -385,14 +385,14 @@ public:
virtual SearchOptionFlags GetSearchOptions() override;
virtual sal_uInt16 StartSearchAndReplace (SvxSearchItem const&, bool bFromStart = false) override;
EditorWindow& GetEditorWindow() { return aXEditorWindow->GetEdtWindow(); }
BreakPointWindow& GetBreakPointWindow() { return aXEditorWindow->GetBrkWindow(); }
LineNumberWindow& GetLineNumberWindow() { return aXEditorWindow->GetLineNumberWindow(); }
ScrollBar& GetEditVScrollBar() { return aXEditorWindow->GetEWVScrollBar(); }
EditorWindow& GetEditorWindow() { return m_aXEditorWindow->GetEdtWindow(); }
BreakPointWindow& GetBreakPointWindow() { return m_aXEditorWindow->GetBrkWindow(); }
LineNumberWindow& GetLineNumberWindow() { return m_aXEditorWindow->GetLineNumberWindow(); }
ScrollBar& GetEditVScrollBar() { return m_aXEditorWindow->GetEWVScrollBar(); }
ExtTextEngine* GetEditEngine() { return GetEditorWindow().GetEditEngine(); }
ExtTextView* GetEditView() { return GetEditorWindow().GetEditView(); }
BreakPointList& GetBreakPoints() { return GetBreakPointWindow().GetBreakPoints(); }
ModulWindowLayout& GetLayout () { return rLayout; }
ModulWindowLayout& GetLayout () { return m_rLayout; }
virtual void BasicStarted() override;
virtual void BasicStopped() override;
......
......@@ -56,10 +56,10 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script
class DialogWindow: public BaseWindow
{
private:
DialogWindowLayout& rLayout;
std::unique_ptr<DlgEditor> pEditor;
std::unique_ptr<SfxUndoManager> pUndoMgr; // never nullptr
OUString aCurPath;
DialogWindowLayout& m_rLayout;
std::unique_ptr<DlgEditor> m_pEditor;
std::unique_ptr<SfxUndoManager> m_pUndoMgr; // never nullptr
OUString m_sCurPath;
protected:
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
......@@ -85,7 +85,7 @@ public:
virtual void ExecuteCommand( SfxRequest& rReq ) override;
virtual void GetState( SfxItemSet& ) override;
DlgEditor& GetEditor() const { return *pEditor; }
DlgEditor& GetEditor() const { return *m_pEditor; }
css::uno::Reference< css::container::XNameContainer > GetDialog() const;
DlgEdModel& GetModel() const;
DlgEdPage& GetPage() const;
......
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