[Libreoffice-commits] core.git: compilerplugins/clang cui/source
Stephan Bergmann
sbergman at redhat.com
Fri Apr 22 08:14:24 UTC 2016
compilerplugins/clang/mergeclasses.results | 2
cui/source/customize/eventdlg.cxx | 10 ++--
cui/source/customize/eventdlg.hxx | 2
cui/source/customize/macropg.cxx | 50 ++++++++++----------
cui/source/customize/macropg_impl.hxx | 4 -
cui/source/dialogs/hangulhanjadlg.cxx | 8 +--
cui/source/inc/macroass.hxx | 14 ++---
cui/source/inc/macropg.hxx | 16 +++---
cui/source/tabpages/align.cxx | 6 +-
cui/source/tabpages/macroass.cxx | 72 ++++++++++++++---------------
10 files changed, 92 insertions(+), 92 deletions(-)
New commits:
commit a57049915d32f549cbda6aa8c8d189531aec522b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Apr 22 10:13:56 2016 +0200
Avoid reserved identifiers
Change-Id: I263603fb81d368ebc8450b2d8cc01752fcd3f29d
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index 4678c11..6166e73 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -183,7 +183,7 @@ merge XclExpFutureRecord with XclExpChFutureRecordBase
merge XclExpSubStream with XclExpChart
merge XclNumFmtBuffer with XclImpNumFmtBuffer
merge SdrItemBrowserWindow with SdrItemBrowser
-merge _SfxMacroTabPage with SfxMacroTabPage
+merge SfxMacroTabPage_ with SfxMacroTabPage
merge abp::OModuleResourceClient with abp::OABSPilotUno
merge accessibility::GridControlAccessibleElement with accessibility::AccessibleGridControlTableBase
merge accessibility::IComboListBoxHelper with VCLListBoxHelper
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index ae2ef79..8a79ba5 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -56,7 +56,7 @@ using namespace ::com::sun::star;
SvxEventConfigPage::SvxEventConfigPage(vcl::Window *pParent, const SfxItemSet& rSet,
SvxEventConfigPage::EarlyInit)
- : _SvxMacroTabPage(pParent, "EventsConfigPage",
+ : SvxMacroTabPage_(pParent, "EventsConfigPage",
"cui/ui/eventsconfigpage.ui", rSet)
, bAppConfig(true)
{
@@ -118,7 +118,7 @@ void SvxEventConfigPage::dispose()
pE = SvTreeListBox::NextSibling( pE );
}
m_pSaveInListBox.clear();
- _SvxMacroTabPage::dispose();
+ SvxMacroTabPage_::dispose();
}
void SvxEventConfigPage::ImplInitDocument()
@@ -177,7 +177,7 @@ IMPL_LINK_NOARG_TYPED( SvxEventConfigPage, SelectHdl_Impl, ListBox&, void )
if ( *bApp )
{
SetReadOnly( false );
- _SvxMacroTabPage::DisplayAppEvents( true );
+ SvxMacroTabPage_::DisplayAppEvents( true );
}
else
{
@@ -203,7 +203,7 @@ IMPL_LINK_NOARG_TYPED( SvxEventConfigPage, SelectHdl_Impl, ListBox&, void )
}
SetReadOnly( isReadonly );
- _SvxMacroTabPage::DisplayAppEvents( false );
+ SvxMacroTabPage_::DisplayAppEvents( false );
}
mpImpl->pEventLB->SetUpdateMode( true );
@@ -211,7 +211,7 @@ IMPL_LINK_NOARG_TYPED( SvxEventConfigPage, SelectHdl_Impl, ListBox&, void )
bool SvxEventConfigPage::FillItemSet( SfxItemSet* rSet )
{
- return _SvxMacroTabPage::FillItemSet( rSet );
+ return SvxMacroTabPage_::FillItemSet( rSet );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index 61f2a9d..86c37c2 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/frame/XFrame.hpp>
-class SvxEventConfigPage : public _SvxMacroTabPage
+class SvxEventConfigPage : public SvxMacroTabPage_
{
VclPtr<ListBox> m_pSaveInListBox;
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 0034548..4447889 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -53,7 +53,7 @@ using namespace ::com::sun::star::uno;
static const char aVndSunStarUNO[] = "vnd.sun.star.UNO:";
static const char aVndSunStarScript[] = "vnd.sun.star.script:";
-_SvxMacroTabPage_Impl::_SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet )
+SvxMacroTabPage_Impl::SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet )
: pAssignPB(nullptr)
, pAssignComponentPB(nullptr)
, pDeletePB(nullptr)
@@ -211,7 +211,7 @@ void MacroEventListBox::Enable()
// assign button ("Add Command") is enabled only if it is not read only
// delete button ("Remove Command") is enabled if a current binding exists
// and it is not read only
-void _SvxMacroTabPage::EnableButtons()
+void SvxMacroTabPage_::EnableButtons()
{
const SvTreeListEntry* pE = mpImpl->pEventLB->GetListBox().FirstSelected();
if ( pE )
@@ -224,7 +224,7 @@ void _SvxMacroTabPage::EnableButtons()
}
}
-_SvxMacroTabPage::_SvxMacroTabPage(vcl::Window* pParent, const OString& rID,
+SvxMacroTabPage_::SvxMacroTabPage_(vcl::Window* pParent, const OString& rID,
const OUString& rUIXMLDescription, const SfxItemSet& rAttrSet)
: SfxTabPage( pParent, rID, rUIXMLDescription, &rAttrSet ),
m_xAppEvents(nullptr),
@@ -234,21 +234,21 @@ _SvxMacroTabPage::_SvxMacroTabPage(vcl::Window* pParent, const OString& rID,
bAppEvents(false),
bInitialized(false)
{
- mpImpl = new _SvxMacroTabPage_Impl( rAttrSet );
+ mpImpl = new SvxMacroTabPage_Impl( rAttrSet );
}
-_SvxMacroTabPage::~_SvxMacroTabPage()
+SvxMacroTabPage_::~SvxMacroTabPage_()
{
disposeOnce();
}
-void _SvxMacroTabPage::dispose()
+void SvxMacroTabPage_::dispose()
{
DELETEZ( mpImpl );
SfxTabPage::dispose();
}
-void _SvxMacroTabPage::InitResources()
+void SvxMacroTabPage_::InitResources()
{
// Note: the order here controls the order in which the events are displayed in the UI!
@@ -332,7 +332,7 @@ void _SvxMacroTabPage::InitResources()
// the following method is called when the user clicks OK
// We use the contents of the hashes to replace the settings
-bool _SvxMacroTabPage::FillItemSet( SfxItemSet* /*rSet*/ )
+bool SvxMacroTabPage_::FillItemSet( SfxItemSet* /*rSet*/ )
{
try
{
@@ -387,7 +387,7 @@ bool _SvxMacroTabPage::FillItemSet( SfxItemSet* /*rSet*/ )
}
// the following method clears the bindings in the hashes for both doc & app
-void _SvxMacroTabPage::Reset( const SfxItemSet* )
+void SvxMacroTabPage_::Reset( const SfxItemSet* )
{
// called once in creation - don't reset the data this time
if(!bInitialized)
@@ -429,12 +429,12 @@ void _SvxMacroTabPage::Reset( const SfxItemSet* )
DisplayAppEvents(bAppEvents);
}
-void _SvxMacroTabPage::SetReadOnly( bool bSet )
+void SvxMacroTabPage_::SetReadOnly( bool bSet )
{
mpImpl->bReadOnly = bSet;
}
-bool _SvxMacroTabPage::IsReadOnly() const
+bool SvxMacroTabPage_::IsReadOnly() const
{
return mpImpl->bReadOnly;
}
@@ -494,7 +494,7 @@ void IconLBoxString::Paint(const Point& aPos, SvTreeListBox& /*aDevice*/, vcl::R
// displays the app events if appEvents=true, otherwise displays the doc events
-void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
+void SvxMacroTabPage_::DisplayAppEvents( bool appEvents)
{
bAppEvents = appEvents;
@@ -538,7 +538,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
EventsHash::iterator h_it = eventsHash->find( sEventName );
if( h_it == eventsHash->end() )
{
- OSL_FAIL( "_SvxMacroTabPage::DisplayAppEvents: something's suspicious here!" );
+ OSL_FAIL( "SvxMacroTabPage_::DisplayAppEvents: something's suspicious here!" );
continue;
}
@@ -570,7 +570,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
}
// select event handler on the listbox
-IMPL_LINK_NOARG_TYPED( _SvxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void)
+IMPL_LINK_NOARG_TYPED( SvxMacroTabPage_, SelectEvent_Impl, SvTreeListBox*, void)
{
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
SvTreeListEntry* pE = rListBox.FirstSelected();
@@ -586,20 +586,20 @@ IMPL_LINK_NOARG_TYPED( _SvxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void)
EnableButtons();
}
-IMPL_LINK_TYPED( _SvxMacroTabPage, AssignDeleteHdl_Impl, Button*, pBtn, void )
+IMPL_LINK_TYPED( SvxMacroTabPage_, AssignDeleteHdl_Impl, Button*, pBtn, void )
{
GenericHandler_Impl( this, static_cast<PushButton*>(pBtn) );
}
-IMPL_LINK_NOARG_TYPED( _SvxMacroTabPage, DoubleClickHdl_Impl, SvTreeListBox*, bool)
+IMPL_LINK_NOARG_TYPED( SvxMacroTabPage_, DoubleClickHdl_Impl, SvTreeListBox*, bool)
{
return GenericHandler_Impl( this, nullptr );
}
// handler for double click on the listbox, and for the assign/delete buttons
-long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* pBtn )
+long SvxMacroTabPage_::GenericHandler_Impl( SvxMacroTabPage_* pThis, PushButton* pBtn )
{
- _SvxMacroTabPage_Impl* pImpl = pThis->mpImpl;
+ SvxMacroTabPage_Impl* pImpl = pThis->mpImpl;
SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox();
SvTreeListEntry* pE = rListBox.FirstSelected();
sal_uLong nPos;
@@ -711,21 +711,21 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
// pass in the XNameReplace.
// can remove the 3rd arg once issue ?? is fixed
-void _SvxMacroTabPage::InitAndSetHandler( const Reference< container::XNameReplace>& xAppEvents, const Reference< container::XNameReplace>& xDocEvents, const Reference< util::XModifiable >& xModifiable )
+void SvxMacroTabPage_::InitAndSetHandler( const Reference< container::XNameReplace>& xAppEvents, const Reference< container::XNameReplace>& xDocEvents, const Reference< util::XModifiable >& xModifiable )
{
m_xAppEvents = xAppEvents;
m_xDocEvents = xDocEvents;
m_xModifiable = xModifiable;
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
- Link<Button*,void> aLnk(LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl ));
+ Link<Button*,void> aLnk(LINK(this, SvxMacroTabPage_, AssignDeleteHdl_Impl ));
mpImpl->pDeletePB->SetClickHdl( aLnk );
mpImpl->pAssignPB->SetClickHdl( aLnk );
if( mpImpl->pAssignComponentPB )
mpImpl->pAssignComponentPB->SetClickHdl( aLnk );
- rListBox.SetDoubleClickHdl( LINK(this, _SvxMacroTabPage, DoubleClickHdl_Impl ) );
+ rListBox.SetDoubleClickHdl( LINK(this, SvxMacroTabPage_, DoubleClickHdl_Impl ) );
- rListBox.SetSelectHdl( LINK( this, _SvxMacroTabPage, SelectEvent_Impl ));
+ rListBox.SetSelectHdl( LINK( this, SvxMacroTabPage_, SelectEvent_Impl ));
rListBox.SetSelectionMode( SINGLE_SELECTION );
rListBox.SetTabs( &nTabs[0] );
@@ -780,7 +780,7 @@ void _SvxMacroTabPage::InitAndSetHandler( const Reference< container::XNameRepla
}
// returns the two props EventType & Script for a given event name
-Any _SvxMacroTabPage::GetPropsByName( const OUString& eventName, EventsHash& eventsHash )
+Any SvxMacroTabPage_::GetPropsByName( const OUString& eventName, EventsHash& eventsHash )
{
const ::std::pair< OUString, OUString >& rAssignedEvent( eventsHash[ eventName ] );
@@ -798,7 +798,7 @@ Any _SvxMacroTabPage::GetPropsByName( const OUString& eventName, EventsHash& eve
// converts the Any returned by GetByName into a pair which can be stored in
// the EventHash
-::std::pair< OUString, OUString > _SvxMacroTabPage::GetPairFromAny( const Any& aAny )
+::std::pair< OUString, OUString > SvxMacroTabPage_::GetPairFromAny( const Any& aAny )
{
Sequence< beans::PropertyValue > props;
OUString type, url;
@@ -816,7 +816,7 @@ SvxMacroTabPage::SvxMacroTabPage(vcl::Window* pParent,
const SfxItemSet& rSet,
Reference< container::XNameReplace > xNameReplace,
sal_uInt16 nSelectedIndex)
- : _SvxMacroTabPage(pParent, "MacroAssignPage", "cui/ui/macroassignpage.ui", rSet)
+ : SvxMacroTabPage_(pParent, "MacroAssignPage", "cui/ui/macroassignpage.ui", rSet)
{
mpImpl->sStrEvent = get<FixedText>("eventft")->GetText();
mpImpl->sAssignedMacro = get<FixedText>("assignft")->GetText();
diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx
index 514ba9c..2c8c87b 100644
--- a/cui/source/customize/macropg_impl.hxx
+++ b/cui/source/customize/macropg_impl.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_CUI_SOURCE_CUSTOMIZE_MACROPG_IMPL_HXX
#define INCLUDED_CUI_SOURCE_CUSTOMIZE_MACROPG_IMPL_HXX
-class _SvxMacroTabPage_Impl
+class SvxMacroTabPage_Impl
{
public:
- explicit _SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet );
+ explicit SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet );
VclPtr<PushButton> pAssignPB;
VclPtr<PushButton> pAssignComponentPB;
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 2e600ab..80c4be1 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1242,7 +1242,7 @@ namespace svx
// index of the internal iterator, used for First() and Next() methods
sal_uInt16 m_nAct;
- const OUString* _Next();
+ const OUString* Next_();
public:
SuggestionList();
~SuggestionList();
@@ -1322,7 +1322,7 @@ namespace svx
}
}
- const OUString* SuggestionList::_Next()
+ const OUString* SuggestionList::Next_()
{
const OUString* pRet = nullptr;
while( m_nAct < m_vElements.size() && !pRet )
@@ -1338,7 +1338,7 @@ namespace svx
const OUString* SuggestionList::First()
{
m_nAct = 0;
- return _Next();
+ return Next_();
}
const OUString* SuggestionList::Next()
@@ -1348,7 +1348,7 @@ namespace svx
if( m_nAct < m_nNumOfEntries )
{
++m_nAct;
- pRet = _Next();
+ pRet = Next_();
}
else
pRet = nullptr;
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index b406500..0dc1c9c 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -27,12 +27,12 @@
#include <vcl/lstbox.hxx>
#include <com/sun/star/frame/XFrame.hpp>
-class _SfxMacroTabPage;
+class SfxMacroTabPage_;
class SvTabListBox;
class SvTreeListBox;
-class _SfxMacroTabPage_Impl;
+class SfxMacroTabPage_Impl;
-class _SfxMacroTabPage : public SfxTabPage
+class SfxMacroTabPage_ : public SfxTabPage
{
SvxMacroTableDtor aTbl;
DECL_DLLPRIVATE_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void );
@@ -45,9 +45,9 @@ class _SfxMacroTabPage : public SfxTabPage
DECL_DLLPRIVATE_LINK_TYPED( TimeOut_Impl, Idle*, void );
protected:
- _SfxMacroTabPage_Impl* mpImpl;
+ SfxMacroTabPage_Impl* mpImpl;
- _SfxMacroTabPage( vcl::Window* pParent, const SfxItemSet& rItemSet );
+ SfxMacroTabPage_( vcl::Window* pParent, const SfxItemSet& rItemSet );
void InitAndSetHandler();
void FillEvents();
@@ -56,7 +56,7 @@ protected:
public:
- virtual ~_SfxMacroTabPage();
+ virtual ~SfxMacroTabPage_();
virtual void dispose() override;
void AddEvent( const OUString & rEventName, sal_uInt16 nEventId );
@@ -74,7 +74,7 @@ public:
bool IsReadOnly() const override;
};
-class SfxMacroTabPage : public _SfxMacroTabPage
+class SfxMacroTabPage : public SfxMacroTabPage_
{
public:
SfxMacroTabPage(
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 8f2afbd..2d3d119 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -51,22 +51,22 @@ struct EventDisplayName
};
typedef ::std::vector< EventDisplayName > EventDisplayNames;
-class _SvxMacroTabPage;
+class SvxMacroTabPage_;
class SvTabListBox;
-class _SvxMacroTabPage_Impl;
+class SvxMacroTabPage_Impl;
-class _SvxMacroTabPage : public SfxTabPage
+class SvxMacroTabPage_ : public SfxTabPage
{
DECL_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void );
DECL_LINK_TYPED( AssignDeleteHdl_Impl, Button *, void );
DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool );
- static long GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* pBtn );
+ static long GenericHandler_Impl( SvxMacroTabPage_* pThis, PushButton* pBtn );
protected:
- _SvxMacroTabPage_Impl* mpImpl;
+ SvxMacroTabPage_Impl* mpImpl;
css::uno::Reference< css::container::XNameReplace > m_xAppEvents;
css::uno::Reference< css::container::XNameReplace > m_xDocEvents;
css::uno::Reference< css::util::XModifiable > m_xModifiable;
@@ -75,7 +75,7 @@ protected:
bool bReadOnly, bDocModified, bAppEvents, bInitialized;
EventDisplayNames aDisplayNames;
- _SvxMacroTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet );
+ SvxMacroTabPage_( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet );
void EnableButtons();
static css::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash );
@@ -83,7 +83,7 @@ protected:
public:
- virtual ~_SvxMacroTabPage();
+ virtual ~SvxMacroTabPage_();
virtual void dispose() override;
void InitResources();
@@ -97,7 +97,7 @@ public:
bool IsReadOnly() const override;
};
-class SvxMacroTabPage : public _SvxMacroTabPage
+class SvxMacroTabPage : public SvxMacroTabPage_
{
public:
SvxMacroTabPage(
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index ed2e0dc..8b0e351 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -108,9 +108,9 @@ const sal_uInt16 AlignmentTabPage::s_pRanges[] =
namespace {
-template<typename _JustContainerType, typename _JustEnumType>
+template<typename JustContainerType, typename JustEnumType>
void lcl_MaybeResetAlignToDistro(
- ListBox& rLB, sal_uInt16 nListPos, const SfxItemSet& rCoreAttrs, sal_uInt16 nWhichAlign, sal_uInt16 nWhichJM, _JustEnumType eBlock)
+ ListBox& rLB, sal_uInt16 nListPos, const SfxItemSet& rCoreAttrs, sal_uInt16 nWhichAlign, sal_uInt16 nWhichJM, JustEnumType eBlock)
{
const SfxPoolItem* pItem;
if (rCoreAttrs.GetItemState(nWhichAlign, true, &pItem) != SfxItemState::SET)
@@ -118,7 +118,7 @@ void lcl_MaybeResetAlignToDistro(
return;
const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem);
- _JustContainerType eVal = static_cast<_JustContainerType>(p->GetEnumValue());
+ JustContainerType eVal = static_cast<JustContainerType>(p->GetEnumValue());
if (eVal != eBlock)
// alignment is not 'justify'. No need to go further.
return;
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 0100c81..0b2a038 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -40,10 +40,10 @@
using ::com::sun::star::uno::Reference;
using ::com::sun::star::frame::XFrame;
-class _SfxMacroTabPage_Impl
+class SfxMacroTabPage_Impl
{
public:
- _SfxMacroTabPage_Impl();
+ SfxMacroTabPage_Impl();
OUString maStaticMacroLBLabel;
VclPtr<PushButton> pAssignPB;
@@ -62,7 +62,7 @@ public:
bool m_bDummyActivated; ///< has this tab page already been activated
};
-_SfxMacroTabPage_Impl::_SfxMacroTabPage_Impl()
+SfxMacroTabPage_Impl::SfxMacroTabPage_Impl()
: pAssignPB(nullptr)
, pDeletePB(nullptr)
, pEventLB(nullptr)
@@ -117,7 +117,7 @@ OUString ConvertToUIName_Impl( SvxMacro *pMacro )
return aName;
}
-void _SfxMacroTabPage::EnableButtons()
+void SfxMacroTabPage_::EnableButtons()
{
// don't do anything as long as the eventbox is empty
const SvTreeListEntry* pE = mpImpl->pEventLB->GetListBox().FirstSelected();
@@ -136,24 +136,24 @@ void _SfxMacroTabPage::EnableButtons()
mpImpl->pAssignPB->Enable( false );
}
-_SfxMacroTabPage::_SfxMacroTabPage(vcl::Window* pParent, const SfxItemSet& rAttrSet)
+SfxMacroTabPage_::SfxMacroTabPage_(vcl::Window* pParent, const SfxItemSet& rAttrSet)
: SfxTabPage(pParent, "EventAssignPage", "cui/ui/eventassignpage.ui", &rAttrSet)
{
- mpImpl = new _SfxMacroTabPage_Impl;
+ mpImpl = new SfxMacroTabPage_Impl;
}
-_SfxMacroTabPage::~_SfxMacroTabPage()
+SfxMacroTabPage_::~SfxMacroTabPage_()
{
disposeOnce();
}
-void _SfxMacroTabPage::dispose()
+void SfxMacroTabPage_::dispose()
{
DELETEZ( mpImpl );
SfxTabPage::dispose();
}
-void _SfxMacroTabPage::AddEvent( const OUString & rEventName, sal_uInt16 nEventId )
+void SfxMacroTabPage_::AddEvent( const OUString & rEventName, sal_uInt16 nEventId )
{
OUString sTmp( rEventName );
sTmp += "\t";
@@ -170,7 +170,7 @@ void _SfxMacroTabPage::AddEvent( const OUString & rEventName, sal_uInt16 nEventI
pE->SetUserData( reinterpret_cast< void* >( sal::static_int_cast< sal_IntPtr >( nEventId )) );
}
-void _SfxMacroTabPage::ScriptChanged()
+void SfxMacroTabPage_::ScriptChanged()
{
// get new areas and their functions
mpImpl->pGroupFrame->Show();
@@ -179,7 +179,7 @@ void _SfxMacroTabPage::ScriptChanged()
EnableButtons();
}
-bool _SfxMacroTabPage::FillItemSet( SfxItemSet* rSet )
+bool SfxMacroTabPage_::FillItemSet( SfxItemSet* rSet )
{
SvxMacroItem aItem( GetWhich( aPageRg[0] ) );
((SvxMacroTableDtor&)aItem.GetMacroTable()) = aTbl;
@@ -194,17 +194,17 @@ bool _SfxMacroTabPage::FillItemSet( SfxItemSet* rSet )
return false;
}
-void _SfxMacroTabPage::LaunchFillGroup()
+void SfxMacroTabPage_::LaunchFillGroup()
{
if (!mpImpl->maFillGroupIdle.GetIdleHdl().IsSet())
{
- mpImpl->maFillGroupIdle.SetIdleHdl( LINK( this, _SfxMacroTabPage, TimeOut_Impl ) );
+ mpImpl->maFillGroupIdle.SetIdleHdl( LINK( this, SfxMacroTabPage_, TimeOut_Impl ) );
mpImpl->maFillGroupIdle.SetPriority( SchedulerPriority::HIGHEST );
mpImpl->maFillGroupIdle.Start();
}
}
-void _SfxMacroTabPage::ActivatePage( const SfxItemSet& )
+void SfxMacroTabPage_::ActivatePage( const SfxItemSet& )
{
// fdo#57553 lazily init script providers, because it is annoying if done
// on dialog open (SfxTabDialog::Start_Impl activates all tab pages once!)
@@ -216,7 +216,7 @@ void _SfxMacroTabPage::ActivatePage( const SfxItemSet& )
LaunchFillGroup();
}
-void _SfxMacroTabPage::PageCreated(const SfxAllItemSet& aSet)
+void SfxMacroTabPage_::PageCreated(const SfxAllItemSet& aSet)
{
const SfxPoolItem* pEventsItem;
if( !mpImpl->bGotEvents && SfxItemState::SET == aSet.GetItemState( SID_EVENTCONFIG, true, &pEventsItem ) )
@@ -231,7 +231,7 @@ void _SfxMacroTabPage::PageCreated(const SfxAllItemSet& aSet)
}
}
-void _SfxMacroTabPage::Reset( const SfxItemSet* rSet )
+void SfxMacroTabPage_::Reset( const SfxItemSet* rSet )
{
const SfxPoolItem* pItem;
if( SfxItemState::SET == rSet->GetItemState( GetWhich( aPageRg[0] ), true, &pItem ))
@@ -257,12 +257,12 @@ void _SfxMacroTabPage::Reset( const SfxItemSet* rSet )
rListBox.SetCurEntry( pE );
}
-bool _SfxMacroTabPage::IsReadOnly() const
+bool SfxMacroTabPage_::IsReadOnly() const
{
return mpImpl->bReadOnly;
}
-IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void)
+IMPL_LINK_NOARG_TYPED( SfxMacroTabPage_, SelectEvent_Impl, SvTreeListBox*, void)
{
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
SvTreeListEntry* pE = rListBox.FirstSelected();
@@ -278,7 +278,7 @@ IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectEvent_Impl, SvTreeListBox*, void)
EnableButtons();
}
-IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectGroup_Impl, SvTreeListBox*, void)
+IMPL_LINK_NOARG_TYPED( SfxMacroTabPage_, SelectGroup_Impl, SvTreeListBox*, void)
{
mpImpl->pGroupLB->GroupSelected();
const OUString sScriptURI = mpImpl->pMacroLB->GetSelectedScriptURI();
@@ -290,22 +290,22 @@ IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectGroup_Impl, SvTreeListBox*, void)
EnableButtons();
}
-IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectMacro_Impl, SvTreeListBox*, void)
+IMPL_LINK_NOARG_TYPED( SfxMacroTabPage_, SelectMacro_Impl, SvTreeListBox*, void)
{
EnableButtons();
}
-IMPL_LINK_TYPED( _SfxMacroTabPage, AssignDeleteClickHdl_Impl, Button*, pBtn, void )
+IMPL_LINK_TYPED( SfxMacroTabPage_, AssignDeleteClickHdl_Impl, Button*, pBtn, void )
{
AssignDeleteHdl(pBtn);
}
-IMPL_LINK_TYPED( _SfxMacroTabPage, AssignDeleteHdl_Impl, SvTreeListBox*, pBtn, bool )
+IMPL_LINK_TYPED( SfxMacroTabPage_, AssignDeleteHdl_Impl, SvTreeListBox*, pBtn, bool )
{
return AssignDeleteHdl(pBtn);
}
-bool _SfxMacroTabPage::AssignDeleteHdl(Control* pBtn)
+bool SfxMacroTabPage_::AssignDeleteHdl(Control* pBtn)
{
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
SvTreeListEntry* pE = rListBox.FirstSelected();
@@ -334,7 +334,7 @@ bool _SfxMacroTabPage::AssignDeleteHdl(Control* pBtn)
}
else
{
- OSL_ENSURE( false, "_SfxMacroTabPage::AssignDeleteHdl_Impl: this branch is *not* dead? (out of interest: tell fs, please!)" );
+ OSL_ENSURE( false, "SfxMacroTabPage_::AssignDeleteHdl_Impl: this branch is *not* dead? (out of interest: tell fs, please!)" );
aTbl.Insert(
nEvent, SvxMacro( sScriptURI, OUString( SVX_MACRO_LANGUAGE_STARBASIC ) ) );
}
@@ -351,7 +351,7 @@ bool _SfxMacroTabPage::AssignDeleteHdl(Control* pBtn)
return false;
}
-IMPL_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*,, void )
+IMPL_LINK_TYPED( SfxMacroTabPage_, TimeOut_Impl, Idle*,, void )
{
// FillMacroList() can take a long time -> show wait cursor and disable input
SfxTabDialog* pTabDlg = GetTabDialog();
@@ -369,19 +369,19 @@ IMPL_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*,, void )
}
}
-void _SfxMacroTabPage::InitAndSetHandler()
+void SfxMacroTabPage_::InitAndSetHandler()
{
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
- Link<SvTreeListBox*,bool> aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
+ Link<SvTreeListBox*,bool> aLnk(LINK(this, SfxMacroTabPage_, AssignDeleteHdl_Impl ));
mpImpl->pMacroLB->SetDoubleClickHdl( aLnk );
- mpImpl->pDeletePB->SetClickHdl( LINK(this, _SfxMacroTabPage, AssignDeleteClickHdl_Impl ) );
- mpImpl->pAssignPB->SetClickHdl( LINK(this, _SfxMacroTabPage, AssignDeleteClickHdl_Impl ) );
+ mpImpl->pDeletePB->SetClickHdl( LINK(this, SfxMacroTabPage_, AssignDeleteClickHdl_Impl ) );
+ mpImpl->pAssignPB->SetClickHdl( LINK(this, SfxMacroTabPage_, AssignDeleteClickHdl_Impl ) );
rListBox.SetDoubleClickHdl( aLnk );
- rListBox.SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectEvent_Impl ));
- mpImpl->pGroupLB->SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectGroup_Impl ));
- mpImpl->pMacroLB->SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectMacro_Impl ));
+ rListBox.SetSelectHdl( LINK( this, SfxMacroTabPage_, SelectEvent_Impl ));
+ mpImpl->pGroupLB->SetSelectHdl( LINK( this, SfxMacroTabPage_, SelectGroup_Impl ));
+ mpImpl->pMacroLB->SetSelectHdl( LINK( this, SfxMacroTabPage_, SelectMacro_Impl ));
rListBox.SetSelectionMode( SINGLE_SELECTION );
rListBox.SetTabs( &nTabs[0] );
@@ -402,7 +402,7 @@ void _SfxMacroTabPage::InitAndSetHandler()
}
-void _SfxMacroTabPage::FillMacroList()
+void SfxMacroTabPage_::FillMacroList()
{
mpImpl->pGroupLB->Init(
css::uno::Reference<
@@ -411,7 +411,7 @@ void _SfxMacroTabPage::FillMacroList()
OUString(), false);
}
-void _SfxMacroTabPage::FillEvents()
+void SfxMacroTabPage_::FillEvents()
{
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
@@ -424,7 +424,7 @@ void _SfxMacroTabPage::FillEvents()
if( pE )
{
SvLBoxString& rLItem = static_cast<SvLBoxString&>( pE->GetItem( LB_MACROS_ITEMPOS ) );
- DBG_ASSERT( SV_ITEM_ID_LBOXSTRING == rLItem.GetType(), "_SfxMacroTabPage::FillEvents(): no LBoxString" );
+ DBG_ASSERT( SV_ITEM_ID_LBOXSTRING == rLItem.GetType(), "SfxMacroTabPage_::FillEvents(): no LBoxString" );
OUString sOld( rLItem.GetText() );
OUString sNew;
@@ -442,7 +442,7 @@ void _SfxMacroTabPage::FillEvents()
}
SfxMacroTabPage::SfxMacroTabPage(vcl::Window* pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rSet )
- : _SfxMacroTabPage( pParent, rSet )
+ : SfxMacroTabPage_( pParent, rSet )
{
mpImpl->sStrEvent = get<FixedText>("eventft")->GetText();
mpImpl->sAssignedMacro = get<FixedText>("assignft")->GetText();
More information about the Libreoffice-commits
mailing list