[Libreoffice-commits] core.git: sw/inc

Michael Stahl mstahl at redhat.com
Thu Jan 21 03:58:22 PST 2016


 sw/inc/IMark.hxx |   26 --------------------------
 1 file changed, 26 deletions(-)

New commits:
commit d6d5c6057ffaccf82b7060a46ded573b46ab5fed
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jan 21 12:45:50 2016 +0100

    sw: MSVC 2013 --enable-dbgutil does not need 3 overloads...
    
    ... of these structs so remove them again, sorry for the noise.
    
    Change-Id: Ic1b5fc0fd3d778cf8ab915774a12efecd5c5b451

diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 5f891b8..a132b6a 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -137,22 +137,8 @@ namespace sw { namespace mark
         {
             return pMark->StartsAfter(rPos);
         }
-#ifdef DBG_UTIL
-        bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark,
-                        SwPosition const& rPos)
-        {
-            return pMark->StartsBefore(rPos);
-        }
-        bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark1,
-                        std::shared_ptr<sw::mark::IMark> const& pMark2)
-        {
-            return (*pMark1) < (*pMark2);
-        }
-#endif
     };
 
-    // MSVC 2008 with _DEBUG calls this with parameters in wrong order
-    // so it needs 3 overloads...
     struct CompareIMarkStartsBefore
     {
         bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark,
@@ -160,18 +146,6 @@ namespace sw { namespace mark
         {
             return pMark->StartsBefore(rPos);
         }
-#ifdef DBG_UTIL
-        bool operator()(SwPosition const& rPos,
-                        std::shared_ptr<sw::mark::IMark> const& pMark)
-        {
-            return pMark->StartsAfter(rPos);
-        }
-        bool operator()(std::shared_ptr<sw::mark::IMark> const& pMark1,
-                        std::shared_ptr<sw::mark::IMark> const& pMark2)
-        {
-            return (*pMark1) < (*pMark2);
-        }
-#endif
     };
 
     OUString ExpandFieldmark(IFieldmark* pBM);


More information about the Libreoffice-commits mailing list