diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-05-25 13:42:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-25 14:24:20 +0100 |
commit | 07f1a395098a7a3ac75eb5f05c35aa3982e33e67 (patch) | |
tree | de5521de6b2bc6c9a09ddfab61942a8e27214ebb /reportdesign | |
parent | d9ac7def8ba320853e8865535a7a14f9af77521e (diff) |
(nearly) nothing uses GetUniqueId anymore, so remove it.
The odd one out is the usage in Formula, which attempts
to restore focus to a particular window identified by
an unique id. In this case restore focus by keeping a VclPtr
to the desired window.
Change-Id: I1dc335325c109d75745c6bba2e12662e6ae50638
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/inc/helpids.hrc | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/EndMarker.cxx | 3 | ||||
-rw-r--r-- | reportdesign/source/ui/report/SectionWindow.cxx | 1 | ||||
-rw-r--r-- | reportdesign/source/ui/report/StartMarker.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 2 |
5 files changed, 1 insertions, 11 deletions
diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc index 7a41d18e997c..8cfa5b979424 100644 --- a/reportdesign/inc/helpids.hrc +++ b/reportdesign/inc/helpids.hrc @@ -29,14 +29,10 @@ #define UID_RPT_SCROLLWINDOW "REPORTDESIGN_UID_RPT_SCROLLWINDOW" #define UID_RPT_REPORTWINDOW "REPORTDESIGN_UID_RPT_REPORTWINDOW" #define HID_RPT_HORZ_RULER "REPORTDESIGN_HID_RPT_HORZ_RULER" -#define UID_RPT_SECTIONSWINDOW "REPORTDESIGN_UID_RPT_SECTIONSWINDOW" -#define UID_RPT_VIEWSWINDOW "REPORTDESIGN_UID_RPT_VIEWSWINDOW" -#define HID_RPT_ENDMARKER "REPORTDESIGN_HID_RPT_ENDMARKER" #define HID_RPT_SPLITTER "REPORTDESIGN_HID_RPT_SPLITTER" #define HID_REPORTSECTION "REPORTDESIGN_HID_REPORTSECTION" #define HID_RPT_HORZ_SCROLLBAR "REPORTDESIGN_HID_RPT_HORZ_SCROLLBAR" #define HID_RPT_VERT_SCROLLBAR "REPORTDESIGN_HID_RPT_VERT_SCROLLBAR" -#define HID_RPT_STARTMARKER "REPORTDESIGN_HID_RPT_STARTMARKER" #define HID_RPT_FIELDEXPRESSION "REPORTDESIGN_HID_RPT_FIELDEXPRESSION" #define HID_RPT_SORTORDER "REPORTDESIGN_HID_RPT_SORTORDER" #define HID_RPT_POPUP_COLOR_CTRL "REPORTDESIGN_HID_RPT_POPUP_COLOR_CTRL" diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index 0be8a7341d36..cdf9681eac7f 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -33,9 +33,8 @@ namespace rptui { OEndMarker::OEndMarker(vcl::Window* _pParent ,const OUString& _sColorEntry) -: OColorListener(_pParent,_sColorEntry) + : OColorListener(_pParent, _sColorEntry) { - SetUniqueId(HID_RPT_ENDMARKER); ImplInitSettings(); } diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 2c6de371290f..b4c1ea9a0789 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -53,7 +53,6 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep ,m_aSplitter(VclPtr<Splitter>::Create(this)) ,m_aEndMarker( VclPtr<rptui::OEndMarker>::Create(this,_sColorEntry)) { - SetUniqueId(UID_RPT_SECTIONSWINDOW); const MapMode& rMapMode = _pParent->GetMapMode(); SetMapMode( rMapMode ); ImplInitSettings(); diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 05486068bc1a..2d794da3f5c0 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -54,8 +54,6 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry ,m_pParent(_pParent) ,m_bShowRuler(true) { - SetUniqueId(HID_RPT_STARTMARKER); - osl_atomic_increment(&s_nImageRefCount); initDefaultNodeImages(); ImplInitSettings(); diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 3db7fc4a1b0d..ef331d475adb 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -167,14 +167,12 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd return bMoveAllowed; } - OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow) : Window( _pReportWindow,WB_DIALOGCONTROL) , m_pParent(_pReportWindow) , m_bInUnmark(false) { SetPaintTransparent(true); - SetUniqueId(UID_RPT_VIEWSWINDOW); SetMapMode(MapMode(MAP_100TH_MM)); m_aColorConfig.AddListener(this); ImplInitSettings(); |