diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-08-23 13:33:53 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-28 08:48:38 +0100 |
commit | e1f31827afa040487a6f72e182947fa852b691ac (patch) | |
tree | 444b370d5766f2963b9d076a558da415df4067a6 | |
parent | d86c8c058f00991a449542ea43e75f2fbf424def (diff) |
c++11ism won't wash
Change-Id: I86ce5203998f8e23533c01243b5aac5ac6b4fc53
-rw-r--r-- | sw/source/ui/misc/linenum.cxx | 4 | ||||
-rw-r--r-- | vcl/inc/vcl/builder.hxx | 2 | ||||
-rw-r--r-- | vcl/source/window/builder.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index a5899f17b8fa..e2c9117c0ec9 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -69,8 +69,8 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw) sIntervalName += rtl::OUString(")"); m_pDivIntervalNF->SetAccessibleName(sIntervalName); - Window *pNumIntervalFT = m_pUIBuilder->get("interval"); - Window *pNumRowsFT = m_pUIBuilder->get("intervallines"); + Window *pNumIntervalFT = m_pUIBuilder->get<Window>("interval"); + Window *pNumRowsFT = m_pUIBuilder->get<Window>("intervallines"); sIntervalName = pNumIntervalFT->GetAccessibleName(); sIntervalName += rtl::OUString("("); sIntervalName += pNumRowsFT->GetAccessibleName(); diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx index f8703cce41b2..7ee38b504bcd 100644 --- a/vcl/inc/vcl/builder.hxx +++ b/vcl/inc/vcl/builder.hxx @@ -145,7 +145,7 @@ public: return ret; } - template <typename T=Window> T* get(rtl::OString sID) + template <typename T /*=Window if we had c++11*/> T* get(rtl::OString sID) { Window *w = get_by_name(sID); T* ret = static_cast<T*>(w); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 6f0c9afbb030..379a6fc07cc5 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -119,7 +119,7 @@ VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUIDir, rtl::OUString sUIF for (std::vector<SpinButtonAdjustmentMap>::iterator aI = m_aAdjustmentMaps.begin(), aEnd = m_aAdjustmentMaps.end(); aI != aEnd; ++aI) { - NumericFormatter *pTarget = dynamic_cast<NumericFormatter*>(get(aI->m_sID)); + NumericFormatter *pTarget = dynamic_cast<NumericFormatter*>(get<Window>(aI->m_sID)); Adjustment *pAdjustment = get_adjustment_by_name(aI->m_sValue); SAL_WARN_IF(!pTarget || !pAdjustment, "vcl", "missing elements of spinbutton/adjustment"); if (pTarget && pAdjustment) |