[Libreoffice-commits] .: Branch 'feature/cmclayouttrans' - sw/source vcl/inc vcl/source

[Libreoffice Gerrit user]

 sw/source/ui/misc/linenum.cxx |    4 ++--
 vcl/inc/vcl/builder.hxx       |    2 +-
 vcl/source/window/builder.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 45a8c44d5f39d8055003130595f7201b2cd8645a
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Aug 23 13:33:53 2012 +0100

    c++11ism won't wash
    
    Change-Id: I86ce5203998f8e23533c01243b5aac5ac6b4fc53

diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 45ceb9d..22196bc 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -75,8 +75,8 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
     sIntervalName += String::CreateFromAscii(")");
     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 += String::CreateFromAscii("(");
     sIntervalName += pNumRowsFT->GetAccessibleName();
diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index f8703cc..7ee38b5 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 6f0c9af..379a6fc 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)

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits