[Libreoffice-commits] core.git: cui/source
Stephan Bergmann
sbergman at redhat.com
Sun May 10 07:00:23 PDT 2015
cui/source/tabpages/macroass.cxx | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
New commits:
commit 1f43eab48a0397d9f7c272116aeb150694b1721d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sun May 10 15:59:31 2015 +0200
SfxMacroTabPage::mpImpl is never assigned to...
...so these must be redundant aliases
Change-Id: I6c48f24f7808f336e206d8cba257f9bc063bdfc7
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index b882722..2e90ed8 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -263,8 +263,7 @@ bool _SfxMacroTabPage::IsReadOnly() const
IMPL_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, )
{
- _SfxMacroTabPage_Impl* pImpl = mpImpl;
- SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox();
+ SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
SvTreeListEntry* pE = rListBox.FirstSelected();
sal_uLong nPos;
if( !pE || LISTBOX_ENTRY_NOTFOUND ==
@@ -281,13 +280,12 @@ IMPL_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox*, )
IMPL_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, )
{
- _SfxMacroTabPage_Impl* pImpl = mpImpl;
- pImpl->pGroupLB->GroupSelected();
- const OUString sScriptURI = pImpl->pMacroLB->GetSelectedScriptURI();
+ mpImpl->pGroupLB->GroupSelected();
+ const OUString sScriptURI = mpImpl->pMacroLB->GetSelectedScriptURI();
OUString aLabelText;
if( !sScriptURI.isEmpty() )
- aLabelText = pImpl->maStaticMacroLBLabel;
- pImpl->pMacroFrame->set_label( aLabelText );
+ aLabelText = mpImpl->maStaticMacroLBLabel;
+ mpImpl->pMacroFrame->set_label( aLabelText );
EnableButtons();
return 0;
@@ -301,8 +299,7 @@ IMPL_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox*, )
IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
{
- _SfxMacroTabPage_Impl* pImpl = mpImpl;
- SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox();
+ SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
SvTreeListEntry* pE = rListBox.FirstSelected();
sal_uLong nPos;
if( !pE || LISTBOX_ENTRY_NOTFOUND ==
@@ -312,7 +309,7 @@ IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
return 0;
}
- const bool bAssEnabled = pBtn != pImpl->pDeletePB && pImpl->pAssignPB->IsEnabled();
+ const bool bAssEnabled = pBtn != mpImpl->pDeletePB && mpImpl->pAssignPB->IsEnabled();
// remove from the table
sal_uInt16 nEvent = (sal_uInt16)reinterpret_cast<sal_uLong>(pE->GetUserData());
@@ -321,7 +318,7 @@ IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
OUString sScriptURI;
if( bAssEnabled )
{
- sScriptURI = pImpl->pMacroLB->GetSelectedScriptURI();
+ sScriptURI = mpImpl->pMacroLB->GetSelectedScriptURI();
if( sScriptURI.startsWith( "vnd.sun.star.script:" ) )
{
aTbl.Insert(
@@ -335,7 +332,7 @@ IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
}
}
- pImpl->pEventLB->SetUpdateMode( false );
+ mpImpl->pEventLB->SetUpdateMode( false );
pE->ReplaceItem( new SvLBoxString( pE, 0, sScriptURI ), LB_MACROS_ITEMPOS );
rListBox.GetModel()->InvalidateEntry( pE );
rListBox.Select( pE );
More information about the Libreoffice-commits
mailing list