Avoid reserved identifiers

Change-Id: I438a7f28ba6bc68ec4e6244a4343e4040ab1b997

3 files changed, 55 insertions, 55 deletions

diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index 26695dbc540d..4678c11b4eaf 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -182,7 +182,7 @@ merge XclDebugObjCounter with XclRootData
 merge XclExpFutureRecord with XclExpChFutureRecordBase
 merge XclExpSubStream with XclExpChart
 merge XclNumFmtBuffer with XclImpNumFmtBuffer
-merge _SdrItemBrowserWindow with SdrItemBrowser
+merge SdrItemBrowserWindow with SdrItemBrowser
 merge _SfxMacroTabPage with SfxMacroTabPage
 merge abp::OModuleResourceClient with abp::OABSPilotUno
 merge accessibility::GridControlAccessibleElement with accessibility::AccessibleGridControlTableBase
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 41fad873ab25..ff0bee4f3278 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -29,15 +29,15 @@ class SfxItemSet;
 class ImpItemListRow;
 class BrowserMouseEvent;
 
-class _SdrItemBrowserControl: public BrowseBox
+class SdrItemBrowserControl: public BrowseBox
 {
 friend class ImpItemEdit;
     std::vector<ImpItemListRow*> aList;
     long nAktPaintRow;
     VclPtr<Edit> pEditControl;
     OUString aWNamMerk;
-    Link<_SdrItemBrowserControl&,void> aEntryChangedHdl;
-    Link<_SdrItemBrowserControl&,void> aSetDirtyHdl;
+    Link<SdrItemBrowserControl&,void> aEntryChangedHdl;
+    Link<SdrItemBrowserControl&,void> aSetDirtyHdl;
     ImpItemListRow* pAktChangeEntry;
     long   nLastWhichOfs;
     sal_uInt16 nLastWhich;
@@ -69,8 +69,8 @@ protected:
     virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override;
     virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override;
 public:
-    _SdrItemBrowserControl(vcl::Window* pParent, WinBits nBits=WB_3DLOOK|WB_BORDER|WB_TABSTOP);
-    virtual ~_SdrItemBrowserControl();
+    SdrItemBrowserControl(vcl::Window* pParent, WinBits nBits=WB_3DLOOK|WB_BORDER|WB_TABSTOP);
+    virtual ~SdrItemBrowserControl();
     virtual void dispose() override;
     void Clear();
     void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=nullptr);
@@ -90,36 +90,36 @@ public:
 
     const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; }
     OUString GetNewEntryValue() const                 { return pEditControl->GetText(); }
-    void SetEntryChangedHdl(const Link<_SdrItemBrowserControl&,void>& rLink)    { aEntryChangedHdl=rLink; }
-    void SetSetDirtyHdl(const Link<_SdrItemBrowserControl&,void>& rLink)        { aSetDirtyHdl=rLink; }
+    void SetEntryChangedHdl(const Link<SdrItemBrowserControl&,void>& rLink)    { aEntryChangedHdl=rLink; }
+    void SetSetDirtyHdl(const Link<SdrItemBrowserControl&,void>& rLink)        { aSetDirtyHdl=rLink; }
 };
 
 #define WB_STDSIZEABLEDOCKWIN  (WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE)
 #define WB_STDSIZEABLEFLOATWIN (WB_STDFLOATWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE)
 
-class _SdrItemBrowserWindow: public FloatingWindow {
-    VclPtr<_SdrItemBrowserControl> aBrowse;
+class SdrItemBrowserWindow: public FloatingWindow {
+    VclPtr<SdrItemBrowserControl> aBrowse;
 public:
-    _SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits=WB_STDSIZEABLEDOCKWIN);
-    virtual ~_SdrItemBrowserWindow();
+    SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits=WB_STDSIZEABLEDOCKWIN);
+    virtual ~SdrItemBrowserWindow();
     virtual void dispose() override;
     virtual void Resize() override;
     virtual void GetFocus() override;
     void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=nullptr) { aBrowse->SetAttributes(pAttr,p2ndSet); }
-    _SdrItemBrowserControl *GetBrowserControl() { return aBrowse.get(); }
+    SdrItemBrowserControl *GetBrowserControl() { return aBrowse.get(); }
 };
 
 class SdrView;
 
-class SdrItemBrowser: public _SdrItemBrowserWindow {
+class SdrItemBrowser: public SdrItemBrowserWindow {
     Idle aIdle;
     SdrView* pView;
     bool bDirty;
 private:
     static vcl::Window* ImpGetViewWin(SdrView& rView);
     DECL_LINK_TYPED(IdleHdl, Idle *, void);
-    DECL_LINK_TYPED(ChangedHdl, _SdrItemBrowserControl&, void);
-    DECL_LINK_TYPED(SetDirtyHdl, _SdrItemBrowserControl&, void);
+    DECL_LINK_TYPED(ChangedHdl, SdrItemBrowserControl&, void);
+    DECL_LINK_TYPED(SetDirtyHdl, SdrItemBrowserControl&, void);
 public:
     SdrItemBrowser(SdrView& rView);
     void ForceParent();
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 55524839631f..6073806daa55 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -163,10 +163,10 @@ bool ImpItemListRow::operator==(const ImpItemListRow& rEntry) const
 
 class ImpItemEdit: public Edit
 {
-    VclPtr<_SdrItemBrowserControl>     pBrowse;
+    VclPtr<SdrItemBrowserControl>     pBrowse;
 
 public:
-    ImpItemEdit(vcl::Window* pParent, _SdrItemBrowserControl* pBrowse_, WinBits nBits=0)
+    ImpItemEdit(vcl::Window* pParent, SdrItemBrowserControl* pBrowse_, WinBits nBits=0)
     :   Edit(pParent, nBits),
         pBrowse(pBrowse_)
     {}
@@ -177,7 +177,7 @@ public:
 
 void ImpItemEdit::KeyInput(const KeyEvent& rKEvt)
 {
-    _SdrItemBrowserControl* pBrowseMerk = pBrowse;
+    SdrItemBrowserControl* pBrowseMerk = pBrowse;
 
     sal_uInt16 nKeyCode(rKEvt.GetKeyCode().GetCode() + rKEvt.GetKeyCode().GetModifier());
 
@@ -201,23 +201,23 @@ void ImpItemEdit::KeyInput(const KeyEvent& rKEvt)
         Edit::KeyInput(rKEvt);
 }
 
-// - _SdrItemBrowserControl -
+// - SdrItemBrowserControl -
 
 #define MYBROWSEMODE (BrowserMode::THUMBDRAGGING|BrowserMode::KEEPHIGHLIGHT|BrowserMode::NO_HSCROLL|BrowserMode::HIDECURSOR)
 
-_SdrItemBrowserControl::_SdrItemBrowserControl(vcl::Window* pParent, WinBits nBits):
+SdrItemBrowserControl::SdrItemBrowserControl(vcl::Window* pParent, WinBits nBits):
     BrowseBox(pParent,nBits,MYBROWSEMODE),
     aList()
 {
     ImpCtor();
 }
 
-_SdrItemBrowserControl::~_SdrItemBrowserControl()
+SdrItemBrowserControl::~SdrItemBrowserControl()
 {
     disposeOnce();
 }
 
-void _SdrItemBrowserControl::dispose()
+void SdrItemBrowserControl::dispose()
 {
     pEditControl.disposeAndClear();
 
@@ -227,7 +227,7 @@ void _SdrItemBrowserControl::dispose()
     BrowseBox::dispose();
 }
 
-void _SdrItemBrowserControl::ImpCtor()
+void SdrItemBrowserControl::ImpCtor()
 {
     pEditControl = nullptr;
     pAktChangeEntry = nullptr;
@@ -278,7 +278,7 @@ void _SdrItemBrowserControl::ImpCtor()
     SetOutputSizePixel(Size(nWdt,nHgt));
 }
 
-void _SdrItemBrowserControl::Clear()
+void SdrItemBrowserControl::Clear()
 {
     const std::size_t nCount=aList.size();
     for (std::size_t nNum=0; nNum<nCount; ++nNum) {
@@ -288,18 +288,18 @@ void _SdrItemBrowserControl::Clear()
     BrowseBox::Clear();
 }
 
-long _SdrItemBrowserControl::GetRowCount() const
+long SdrItemBrowserControl::GetRowCount() const
 {
     return aList.size();
 }
 
-bool _SdrItemBrowserControl::SeekRow(long nRow)
+bool SdrItemBrowserControl::SeekRow(long nRow)
 {
     nAktPaintRow = nRow;
     return true;
 }
 
-OUString _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
+OUString SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
 {
     OUString sRet;
     if ( _nRow >= 0 && _nRow < (sal_Int32)aList.size() )
@@ -341,7 +341,7 @@ OUString _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) con
     return sRet;
 }
 
-void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const
+void SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const
 {
     if (nAktPaintRow<0 || static_cast<std::size_t>(nAktPaintRow)>=aList.size()) {
         return;
@@ -367,11 +367,11 @@ void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRe
     }
 }
 
-std::size_t _SdrItemBrowserControl::GetCurrentPos() const
+std::size_t SdrItemBrowserControl::GetCurrentPos() const
 {
     std::size_t nRet=ITEM_NOT_FOUND;
     if (GetSelectRowCount()==1) {
-        long nPos=static_cast<BrowseBox*>(const_cast<_SdrItemBrowserControl *>(this))->FirstSelectedRow();
+        long nPos=static_cast<BrowseBox*>(const_cast<SdrItemBrowserControl *>(this))->FirstSelectedRow();
         if (nPos>=0 && static_cast<std::size_t>(nPos)<aList.size()) {
             nRet = static_cast<std::size_t>(nPos);
         }
@@ -379,7 +379,7 @@ std::size_t _SdrItemBrowserControl::GetCurrentPos() const
     return nRet;
 }
 
-sal_uInt16 _SdrItemBrowserControl::GetCurrentWhich() const
+sal_uInt16 SdrItemBrowserControl::GetCurrentWhich() const
 {
     sal_uInt16 nRet=0;
     const std::size_t nPos=GetCurrentPos();
@@ -389,7 +389,7 @@ sal_uInt16 _SdrItemBrowserControl::GetCurrentWhich() const
     return nRet;
 }
 
-void _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&)
+void SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&)
 {
     const std::size_t nPos=GetCurrentPos();
     if (nPos!=ITEM_NOT_FOUND) {
@@ -397,7 +397,7 @@ void _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&)
     }
 }
 
-void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
+void SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
 {
     sal_uInt16 nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier();
     bool bAusgewertet = false;
@@ -425,31 +425,31 @@ void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
     if (!bAusgewertet) BrowseBox::KeyInput(rKEvt);
 }
 
-void _SdrItemBrowserControl::SetDirty()
+void SdrItemBrowserControl::SetDirty()
 {
     aSetDirtyHdl.Call(*this);
 }
 
-Rectangle _SdrItemBrowserControl::GetFieldCharacterBounds(sal_Int32 /*_nRow*/,sal_Int32 /*_nColumnPos*/,sal_Int32 /*nIndex*/)
+Rectangle SdrItemBrowserControl::GetFieldCharacterBounds(sal_Int32 /*_nRow*/,sal_Int32 /*_nColumnPos*/,sal_Int32 /*nIndex*/)
 {
     // no accessibility implementation required
     return Rectangle();
 }
 
-sal_Int32 _SdrItemBrowserControl::GetFieldIndexAtPoint(sal_Int32 /*_nRow*/,sal_Int32 /*_nColumnPos*/,const Point& /*_rPoint*/)
+sal_Int32 SdrItemBrowserControl::GetFieldIndexAtPoint(sal_Int32 /*_nRow*/,sal_Int32 /*_nColumnPos*/,const Point& /*_rPoint*/)
 {
     // no accessibility implementation required
     return -1;
 }
 
-void _SdrItemBrowserControl::Select()
+void SdrItemBrowserControl::Select()
 {
     EndChangeEntry();
     BrowseBox::Select();
     ImpSaveWhich();
 }
 
-void _SdrItemBrowserControl::ImpSaveWhich()
+void SdrItemBrowserControl::ImpSaveWhich()
 {
     sal_uInt16 nWh=GetCurrentWhich();
     if (nWh!=0) {
@@ -465,7 +465,7 @@ void _SdrItemBrowserControl::ImpSaveWhich()
     }
 }
 
-void _SdrItemBrowserControl::ImpRestoreWhich()
+void SdrItemBrowserControl::ImpRestoreWhich()
 {
     if (nLastWhich!=0) {
         bool bFnd = false;
@@ -489,7 +489,7 @@ void _SdrItemBrowserControl::ImpRestoreWhich()
     }
 }
 
-bool _SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos)
+bool SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos)
 {
     BreakChangeEntry();
     bool bRet = false;
@@ -528,7 +528,7 @@ bool _SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos)
     return bRet;
 }
 
-void _SdrItemBrowserControl::EndChangeEntry()
+void SdrItemBrowserControl::EndChangeEntry()
 {
     if (!pEditControl)
         return;
@@ -537,7 +537,7 @@ void _SdrItemBrowserControl::EndChangeEntry()
     BreakChangeEntry();
 }
 
-void _SdrItemBrowserControl::BreakChangeEntry()
+void SdrItemBrowserControl::BreakChangeEntry()
 {
     if (pEditControl!=nullptr) {
         pEditControl.disposeAndClear();
@@ -549,7 +549,7 @@ void _SdrItemBrowserControl::BreakChangeEntry()
     }
 }
 
-void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, std::size_t nEntryNum)
+void SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, std::size_t nEntryNum)
 {
     SAL_WARN_IF(nEntryNum > aList.size(), "svx", "trying to set item " << nEntryNum << "in a vector of size " << aList.size());
     if (nEntryNum >= aList.size()) {
@@ -899,7 +899,7 @@ sal_uInt16 ImpSortWhich(sal_uInt16 nWhich)
 #define INSERTCOMMENT(nStartId,nEndId,aStr) \
     { if (nWhich0<nStartId && nWhich>=nStartId && nWhich<=nEndId) aCommentStr=aStr; }
 
-void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemSet* p2ndSet)
+void SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItemSet* p2ndSet)
 {
     SetMode(MYBROWSEMODE & BrowserMode(~BrowserMode::KEEPHIGHLIGHT));
     if (pSet!=nullptr) {
@@ -1037,41 +1037,41 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
     SetMode(MYBROWSEMODE);
 }
 
-// - _SdrItemBrowserWindow -
+// - SdrItemBrowserWindow -
 
-_SdrItemBrowserWindow::_SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits):
+SdrItemBrowserWindow::SdrItemBrowserWindow(vcl::Window* pParent, WinBits nBits):
     FloatingWindow(pParent,nBits),
-    aBrowse(VclPtr<_SdrItemBrowserControl>::Create(this))
+    aBrowse(VclPtr<SdrItemBrowserControl>::Create(this))
 {
     SetOutputSizePixel(aBrowse->GetSizePixel());
     SetText("Joe's ItemBrowser");
     aBrowse->Show();
 }
 
-_SdrItemBrowserWindow::~_SdrItemBrowserWindow()
+SdrItemBrowserWindow::~SdrItemBrowserWindow()
 {
     disposeOnce();
 }
 
-void _SdrItemBrowserWindow::dispose()
+void SdrItemBrowserWindow::dispose()
 {
     aBrowse.disposeAndClear();
     FloatingWindow::dispose();
 }
 
-void _SdrItemBrowserWindow::Resize()
+void SdrItemBrowserWindow::Resize()
 {
     aBrowse->SetSizePixel(GetOutputSizePixel());
 }
 
-void _SdrItemBrowserWindow::GetFocus()
+void SdrItemBrowserWindow::GetFocus()
 {
     aBrowse->GrabFocus();
 }
 
 
 SdrItemBrowser::SdrItemBrowser(SdrView& rView):
-    _SdrItemBrowserWindow(ImpGetViewWin(rView)),
+    SdrItemBrowserWindow(ImpGetViewWin(rView)),
     pView(&rView),
     bDirty(false)
 {
@@ -1139,7 +1139,7 @@ IMPL_LINK_NOARG_TYPED(SdrItemBrowser, IdleHdl, Idle *, void)
     Undirty();
 }
 
-IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, _SdrItemBrowserControl&, rBrowse, void)
+IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, SdrItemBrowserControl&, rBrowse, void)
 {
     const ImpItemListRow* pEntry = rBrowse.GetAktChangeEntry();
     if (pEntry!=nullptr)
@@ -1253,7 +1253,7 @@ IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, _SdrItemBrowserControl&, rBrowse, vo
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SdrItemBrowser, SetDirtyHdl, _SdrItemBrowserControl&, void)
+IMPL_LINK_NOARG_TYPED(SdrItemBrowser, SetDirtyHdl, SdrItemBrowserControl&, void)
 {
     SetDirty();
 }