[Libreoffice-commits] core.git: 2 commits - svx/source sw/source

[Tor Lillqvist]

 svx/source/sdr/contact/objectcontactofpageview.cxx |    5 +++++
 sw/source/core/edit/edws.cxx                       |    2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 6e18d56c77b705bafa0754e057a8048afa70dad8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Sep 13 16:43:36 2016 +0300

    Remove totally bogus comment
    
    Was initially in German with glorious ASCII graphics, but equally
    bogus.
    
    Change-Id: I9f7286049ed6a0ec7c1511dd3da018e5f6442b15

diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index 6c9ac86..8cb0c59 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -145,8 +145,6 @@ bool SwEditShell::HasOtherCnt() const
     return false;
 }
 
-// access control functions for file name handling
-
 SwActContext::SwActContext(SwEditShell *pShell)
     : m_rShell(*pShell)
 {
commit 647360d9489c0589467aad18008ddb347d1ebf85
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Sep 13 12:14:20 2016 +0300

    Add comment wondering whether a #if makes sense
    
    Change-Id: Ib6e6ab79632325dd3d592265a9ee859b1bc2c3ca

diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 2497750e..efeaad6 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -259,6 +259,11 @@ namespace sdr
             // and may use the MapMode from the Target OutDev in the DisplayInfo
             xPrimitiveSequence = rDrawPageVOContact.getPrimitive2DSequenceHierarchy(rDisplayInfo);
 #else
+            // Hmm, !HAVE_FEATURE_DESKTOP && !ANDROID means iOS,
+            // right? But does it make sense to use a different code
+            // path for iOS than for Android; both use tiled rendering
+            // etc now.
+
             // HACK: this only works when we are drawing sdr shapes via
             // drawinglayer; but it can happen that the hierarchy contains
             // more than just the shapes, and then it fails.