[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source

[Miklos Vajna]

 sw/source/core/crsr/viscrs.cxx |   43 -----------------------------------------
 1 file changed, 1 insertion(+), 42 deletions(-)

New commits:
commit 8fc976698e4d3d04f61cbad96c0c977ef15115d6
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Feb 11 10:23:20 2015 +0100

    Enable LOK_CALLBACK_TEXT_SELECTION_START/END on Android
    
    Change-Id: Id00fcb6fb74652ed38d43b83338ddb0c549c5ae6

diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 0b0d63c..46b740b 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -284,7 +284,7 @@ void SwSelPaintRects::Show()
         SwRects::clear();
         FillRects();
 
-#if HAVE_FEATURE_DESKTOP
+#if HAVE_FEATURE_DESKTOP || defined(ANDROID)
         // get new rects
         std::vector< basegfx::B2DRange > aNewRanges;
 
@@ -365,47 +365,6 @@ void SwSelPaintRects::Show()
         }
 
         HighlightInputFld();
-#else
-
-#if 0 // Totally unclear what we want to do here?
-
-        const OutputDevice* pOut = GetShell()->GetWin();
-        if ( ! pOut )
-            pOut = GetShell()->GetOut();
-        SwWrtShell *pWrtShell = dynamic_cast<SwWrtShell*>(const_cast<SwCrsrShell*>(GetShell()));
-        if (!empty())
-        {
-            if (pWrtShell)
-            {
-
-                // Buffer will be deallocated in the UI layer
-                MLORect *rects = (MLORect *) malloc((sizeof(MLORect))*size());
-                for (size_t i = 0; i < size(); ++i)
-                {
-                    Point origin = pOut->LogicToPixel((*this)[i].Pos());
-                    Size ssize = pOut->LogicToPixel((*this)[i].SSize());
-#ifdef IOS
-                    rects[i] = CGRectMake(origin.X(), origin.Y(),
-                                          ssize.Width(), ssize.Height());
-#else
-                    // Not yet implemented
-                    (void) origin;
-                    (void) ssize;
-#endif
-                }
-                // GetShell returns a SwCrsrShell which actually is a SwWrtShell
-
-                // touch_ui_selection_start() was dummy both in TiledLibreOffice (iOS) and for Android
-                // touch_ui_selection_start(MLOSelectionText, pWrtShell, rects, size(), NULL);
-            }
-        }
-        else
-        {
-            // touch_ui_selection_none was dummy both in TiledLibreOffice (iOS) and for Android
-            // touch_ui_selection_none();
-        }
-#endif
-
 #endif
     }
 }