[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - 2 commits - ios/shared sw/inc

[Tor Lillqvist]

 ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m                              |    2 -
 ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m |    1 
 sw/inc/swrect.hxx                                                                                           |   14 ++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 69953b5da66a7682c20db64a4c76ef190010bdb8
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Nov 3 17:39:20 2013 +0200

    Add operator<< for SAL_INFO and SAL_DEBUG use
    
    Change-Id: I1da8d2fcf503f60ef7947e8956009e09c4b5c867

diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx
index efe7edf..ca0cf91 100644
--- a/sw/inc/swrect.hxx
+++ b/sw/inc/swrect.hxx
@@ -18,8 +18,12 @@
  */
 #ifndef _SWRECT_HXX
 #define _SWRECT_HXX
+
+#include <ostream>
+
 #include <sal/log.hxx>
 #include <tools/gen.hxx>
+
 class SvStream;
 
 class SAL_WARN_UNUSED SwRect
@@ -350,6 +354,16 @@ inline SwRect::SwRect( long X, long Y, long W, long H ) :
 {
 }
 
+template< typename charT, typename traits >
+inline std::basic_ostream<charT, traits> & operator <<(
+    std::basic_ostream<charT, traits> & stream, const SwRect& rectangle )
+{
+    if (rectangle.IsEmpty())
+        return stream << "EMPTY";
+    else
+        return stream << rectangle.SSize()
+                      << "@(" << rectangle.Pos() << ")";
+}
 
 #endif  //_SWRECT_HXX
 
commit 0ee341359bca0180521746a90f90965fae92ad49
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Nov 3 17:38:04 2013 +0200

    Reduce NSLog verbiage a bit
    
    Change-Id: I362acb92da88f9e348b33414cdc31cd83bfe1eac

diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
index 89267e5..779b84d 100644
--- a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
+++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
@@ -181,7 +181,7 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
 -(void)extractMode:(MLOTestingTileParametersMode) mode{
     MLOTestingTileParameterExtractor extractor = [self getExtractor:mode];
     if(extractor!=nil){
-        NSLog(@"%@ extract %@",self,MLOTestingTileParametersModeString(mode));
+        // NSLog(@"%@ extract %@",self,MLOTestingTileParametersModeString(mode));
         extractor([self currentDataValue]);
     }
 }
diff --git a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
index 52d7b64..681693d 100644
--- a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
+++ b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
@@ -159,7 +159,6 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
 
 }
 -(void)renderTile{
-    NSLog(@"%@ renderTile",self);
     for (MLOTestingTileParameter * param in self.params) {
         [param extractMode:self.mode];
     }