summaryrefslogtreecommitdiffstats
path: root/basctl/source/basicide/baside3.cxx
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2016-04-16 15:42:17 +0200
committerJulien Nabet <serval2412@yahoo.fr>2016-04-16 14:17:11 +0000
commit5b72c4ce7fce353f42e7c8d1798514d49997d920 (patch)
tree18426fe830f6c348579ca8045a5c21c801a2f219 /basctl/source/basicide/baside3.cxx
parentswitch to a row based storage (diff)
downloadcore-5b72c4ce7fce353f42e7c8d1798514d49997d920.tar.gz
core-5b72c4ce7fce353f42e7c8d1798514d49997d920.zip
basctl: prefix some members
Change-Id: I59660153a33e83dc9457fbee082e8da444b04b58 Reviewed-on: https://gerrit.libreoffice.org/24126 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'basctl/source/basicide/baside3.cxx')
-rw-r--r--basctl/source/basicide/baside3.cxx84
1 files changed, 42 insertions, 42 deletions
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index a8b08986ddc8..d4a4b95ed881 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -74,15 +74,15 @@ DialogWindow::DialogWindow(DialogWindowLayout* pParent, ScriptDocument const& rD
const OUString& aLibName, const OUString& aName,
css::uno::Reference<css::container::XNameContainer> const& xDialogModel)
: BaseWindow(pParent, rDocument, aLibName, aName)
- ,rLayout(*pParent)
- ,pEditor(new DlgEditor(*this, rLayout, rDocument.isDocument()
+ ,m_rLayout(*pParent)
+ ,m_pEditor(new DlgEditor(*this, m_rLayout, rDocument.isDocument()
? rDocument.getDocument()
: Reference<frame::XModel>(), xDialogModel))
- ,pUndoMgr(new SfxUndoManager)
+ ,m_pUndoMgr(new SfxUndoManager)
{
InitSettings();
- pEditor->GetModel().SetNotifyUndoActionHdl(
+ m_pEditor->GetModel().SetNotifyUndoActionHdl(
LINK(this, DialogWindow, NotifyUndoActionHdl)
);
@@ -99,7 +99,7 @@ DialogWindow::DialogWindow(DialogWindowLayout* pParent, ScriptDocument const& rD
void DialogWindow::dispose()
{
- pEditor.reset();
+ m_pEditor.reset();
BaseWindow::dispose();
}
@@ -113,20 +113,20 @@ void DialogWindow::LoseFocus()
void DialogWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
{
- pEditor->Paint(rRenderContext, rRect);
+ m_pEditor->Paint(rRenderContext, rRect);
}
void DialogWindow::Resize()
{
if (GetHScrollBar() && GetVScrollBar())
{
- pEditor->SetScrollBars( GetHScrollBar(), GetVScrollBar() );
+ m_pEditor->SetScrollBars( GetHScrollBar(), GetVScrollBar() );
}
}
void DialogWindow::MouseButtonDown( const MouseEvent& rMEvt )
{
- pEditor->MouseButtonDown( rMEvt );
+ m_pEditor->MouseButtonDown( rMEvt );
if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_SHOW_PROPERTYBROWSER );
@@ -134,10 +134,10 @@ void DialogWindow::MouseButtonDown( const MouseEvent& rMEvt )
void DialogWindow::MouseButtonUp( const MouseEvent& rMEvt )
{
- pEditor->MouseButtonUp( rMEvt );
- if( (pEditor->GetMode() == DlgEditor::INSERT) && !pEditor->IsCreateOK() )
+ m_pEditor->MouseButtonUp( rMEvt );
+ if( (m_pEditor->GetMode() == DlgEditor::INSERT) && !m_pEditor->IsCreateOK() )
{
- pEditor->SetMode( DlgEditor::SELECT );
+ m_pEditor->SetMode( DlgEditor::SELECT );
if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_CHOOSE_CONTROLS );
}
@@ -153,7 +153,7 @@ void DialogWindow::MouseButtonUp( const MouseEvent& rMEvt )
void DialogWindow::MouseMove( const MouseEvent& rMEvt )
{
- pEditor->MouseMove( rMEvt );
+ m_pEditor->MouseMove( rMEvt );
}
void DialogWindow::KeyInput( const KeyEvent& rKEvt )
@@ -170,7 +170,7 @@ void DialogWindow::KeyInput( const KeyEvent& rKEvt )
if( pBindings && rKEvt.GetKeyCode() == KEY_TAB )
pBindings->Invalidate( SID_SHOW_PROPERTYBROWSER );
- if( !pEditor->KeyInput( rKEvt ) )
+ if( !m_pEditor->KeyInput( rKEvt ) )
{
if( !SfxViewShell::Current()->KeyInput( rKEvt ) )
Window::KeyInput( rKEvt );
@@ -230,12 +230,12 @@ void DialogWindow::DoInit()
{
GetHScrollBar()->Show();
GetVScrollBar()->Show();
- pEditor->SetScrollBars( GetHScrollBar(), GetVScrollBar() );
+ m_pEditor->SetScrollBars( GetHScrollBar(), GetVScrollBar() );
}
void DialogWindow::DoScroll( ScrollBar* pCurScrollBar )
{
- pEditor->DoScroll( pCurScrollBar );
+ m_pEditor->DoScroll( pCurScrollBar );
}
void DialogWindow::GetState( SfxItemSet& rSet )
@@ -269,7 +269,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
case SID_COPY:
{
// any object selected?
- if ( !pEditor->GetView().AreObjectsMarked() )
+ if ( !m_pEditor->GetView().AreObjectsMarked() )
rSet.DisableItem( nWh );
}
break;
@@ -278,7 +278,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
case SID_BACKSPACE:
{
// any object selected?
- if ( !pEditor->GetView().AreObjectsMarked() )
+ if ( !m_pEditor->GetView().AreObjectsMarked() )
rSet.DisableItem( nWh );
if ( IsReadOnly() )
@@ -287,7 +287,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
break;
case SID_REDO:
{
- if ( !pUndoMgr->GetUndoActionCount() )
+ if ( !m_pUndoMgr->GetUndoActionCount() )
rSet.DisableItem( nWh );
}
break;
@@ -296,7 +296,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
{
// is the IDE still active?
bool const bBool = GetShell()->GetFrame() &&
- pEditor->GetMode() == DlgEditor::TEST;
+ m_pEditor->GetMode() == DlgEditor::TEST;
rSet.Put(SfxBoolItem(SID_DIALOG_TESTMODE, bBool));
}
break;
@@ -315,7 +315,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
else
{
sal_uInt16 nObj;
- switch( pEditor->GetInsertObj() )
+ switch( m_pEditor->GetInsertObj() )
{
case OBJ_DLG_PUSHBUTTON: nObj = SVX_SNAP_PUSHBUTTON; break;
case OBJ_DLG_RADIOBUTTON: nObj = SVX_SNAP_RADIOBUTTON; break;
@@ -355,7 +355,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
{
Shell* pShell = GetShell();
SfxViewFrame* pViewFrame = pShell ? pShell->GetViewFrame() : nullptr;
- if ( pViewFrame && !pViewFrame->HasChildWindow( SID_SHOW_PROPERTYBROWSER ) && !pEditor->GetView().AreObjectsMarked() )
+ if ( pViewFrame && !pViewFrame->HasChildWindow( SID_SHOW_PROPERTYBROWSER ) && !m_pEditor->GetView().AreObjectsMarked() )
rSet.DisableItem( nWh );
if ( IsReadOnly() )
@@ -651,7 +651,7 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq )
Reference< container::XNameContainer > DialogWindow::GetDialog() const
{
- return pEditor->GetDialog();
+ return m_pEditor->GetDialog();
}
bool DialogWindow::RenameDialog( const OUString& rNewName )
@@ -667,12 +667,12 @@ bool DialogWindow::RenameDialog( const OUString& rNewName )
void DialogWindow::DisableBrowser()
{
- rLayout.DisablePropertyBrowser();
+ m_rLayout.DisablePropertyBrowser();
}
void DialogWindow::UpdateBrowser()
{
- rLayout.UpdatePropertyBrowser();
+ m_rLayout.UpdatePropertyBrowser();
}
void DialogWindow::SaveDialog()
@@ -686,8 +686,8 @@ void DialogWindow::SaveDialog()
aValue <<= true;
xFPControl->setValue(ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, aValue);
- if ( !aCurPath.isEmpty() )
- xFP->setDisplayDirectory ( aCurPath );
+ if ( !m_sCurPath.isEmpty() )
+ xFP->setDisplayDirectory ( m_sCurPath );
xFP->setDefaultName( GetName() );
@@ -699,7 +699,7 @@ void DialogWindow::SaveDialog()
if( xFP->execute() == RET_OK )
{
Sequence< OUString > aPaths = xFP->getSelectedFiles();
- aCurPath = aPaths[0];
+ m_sCurPath = aPaths[0];
// export dialog model to xml
Reference< container::XNameContainer > xDialogModel = GetDialog();
@@ -711,9 +711,9 @@ void DialogWindow::SaveDialog()
Reference< XOutputStream > xOutput;
try
{
- if( xSFI->exists( aCurPath ) )
- xSFI->kill( aCurPath );
- xOutput = xSFI->openFileWrite( aCurPath );
+ if( xSFI->exists( m_sCurPath ) )
+ xSFI->kill( m_sCurPath );
+ xOutput = xSFI->openFileWrite( m_sCurPath );
}
catch(const Exception& )
{}
@@ -757,7 +757,7 @@ void DialogWindow::SaveDialog()
if( bResource )
{
- INetURLObject aURLObj( aCurPath );
+ INetURLObject aURLObj( m_sCurPath );
aURLObj.removeExtension();
OUString aDialogName( aURLObj.getName() );
aURLObj.removeSegment();
@@ -1210,32 +1210,32 @@ void DialogWindow::ImportDialog()
{
const ScriptDocument& rDocument = GetDocument();
OUString aLibName = GetLibName();
- implImportDialog( this, aCurPath, rDocument, aLibName );
+ implImportDialog( this, m_sCurPath, rDocument, aLibName );
}
DlgEdModel& DialogWindow::GetModel() const
{
- return pEditor->GetModel();
+ return m_pEditor->GetModel();
}
DlgEdPage& DialogWindow::GetPage() const
{
- return pEditor->GetPage();
+ return m_pEditor->GetPage();
}
DlgEdView& DialogWindow::GetView() const
{
- return pEditor->GetView();
+ return m_pEditor->GetView();
}
bool DialogWindow::IsModified()
{
- return pEditor->IsModified();
+ return m_pEditor->IsModified();
}
::svl::IUndoManager* DialogWindow::GetUndoManager()
{
- return pUndoMgr.get();
+ return m_pUndoMgr.get();
}
OUString DialogWindow::GetTitle()
@@ -1254,17 +1254,17 @@ EntryDescriptor DialogWindow::CreateEntryDescriptor()
void DialogWindow::SetReadOnly (bool bReadOnly)
{
- pEditor->SetMode(bReadOnly ? DlgEditor::READONLY : DlgEditor::SELECT);
+ m_pEditor->SetMode(bReadOnly ? DlgEditor::READONLY : DlgEditor::SELECT);
}
bool DialogWindow::IsReadOnly ()
{
- return pEditor->GetMode() == DlgEditor::READONLY;
+ return m_pEditor->GetMode() == DlgEditor::READONLY;
}
bool DialogWindow::IsPasteAllowed()
{
- return pEditor->IsPasteAllowed();
+ return m_pEditor->IsPasteAllowed();
}
void DialogWindow::StoreData()
@@ -1277,7 +1277,7 @@ void DialogWindow::StoreData()
if( xLib.is() )
{
- Reference< container::XNameContainer > xDialogModel = pEditor->GetDialog();
+ Reference< container::XNameContainer > xDialogModel = m_pEditor->GetDialog();
if( xDialogModel.is() )
{
@@ -1293,7 +1293,7 @@ void DialogWindow::StoreData()
DBG_UNHANDLED_EXCEPTION();
}
MarkDocumentModified( GetDocument() );
- pEditor->ClearModifyFlag();
+ m_pEditor->ClearModifyFlag();
}
}