[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/source

[Chris Sherlock]

 include/vcl/vclptr.hxx          |    2 ++
 vcl/source/control/combobox.cxx |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 86338fbb94324ede329e1d232eeaf70f2fde696e
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Jan 8 10:47:05 2016 +1100

    vcl: ComboBox::ImplUserDrawHandler was in the void namespace...
    
    I'm amazed that C++ allows you to do this, but I checked the draft
    standard and there appears to be no restrictions around using a
    C++ keyword as a namespace identifier!
    
    This hasn't been an issue it appears because we don't have any
    user-defined draw signals for combobox's currently.
    
    This was picked up by Doxygen, which spat out the following error:
    
    /home/chris/repos/libreoffice/vcl/source/control/combobox.cxx:1322 warning: no uniquely matching class member found for
      void::ComboBox::Impl::ImplUserDrawHandler(UserDrawEvent *pEvent)
    
    Issue introduced in commit d6a83d3f913, I checked it and it was the
    only place this occured in the patch.
    
    Change-Id: Ie4272e5c4e3dba13ed82457bba8579971a5345d0

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 9327e35..7e46076 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1319,7 +1319,7 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, D
 
 }
 
-void::ComboBox::Impl::ImplUserDrawHandler( UserDrawEvent* pEvent )
+void ComboBox::Impl::ImplUserDrawHandler( UserDrawEvent* pEvent )
 {
     m_rThis.UserDraw(*pEvent);
 }
commit f666550ba2c00323020127a4b7446f92e5d0d91a
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Fri Jan 8 10:31:46 2016 +1100

    vcl: doxygen issue - missing @endcond in vclptr.hxx
    
    Change-Id: I5cb9566e372568a8836803807e730f983bdff4cd

diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 392d847..3309cb5 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -62,6 +62,8 @@ public:
 
 }; }; // namespace detail, namespace vcl
 
+/// @endcond
+
 /**
  * A thin wrapper around rtl::Reference to implement the acquire and dispose semantics we want for references to vcl::Window subclasses.
  *