[Libreoffice-commits] .: 2 commits - sc/source ucb/source

[Markus Mohrhard]

 sc/source/core/data/table1.cxx       |   28 +++++++++++++++-------------
 ucb/source/ucp/gvfs/gvfs_content.cxx |    2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

New commits:
commit 1932c3ce0c498afed30d28efc88d820dcb4553a2
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Aug 27 01:59:35 2011 +0200

    don't use macro here

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 770ff55..c1bea20 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1679,6 +1679,19 @@ public:
     }
 };
 
+void setPrintRange(ScRange* pRange1, const ScRange* pRange2)
+{
+    if (pRange2)
+    {
+        if (pRange1)
+            *pRange1 = *pRange2;
+        else
+            pRange1 = new ScRange(*pRange2);
+    }
+    else
+        DELETEZ(pRange1);
+}
+
 }
 
 void ScTable::CopyPrintRange(const ScTable& rTable)
@@ -1716,20 +1729,9 @@ void ScTable::DoColResize( SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd )
         aCol[nCol].Resize(aCol[nCol].GetCellCount() + nAdd);
 }
 
-#define SET_PRINTRANGE( p1, p2 ) \
-    if ( (p2) )                             \
-    {                                       \
-        if ( (p1) )                         \
-            *(p1) = *(p2);                  \
-        else                                \
-            (p1) = new ScRange( *(p2) );    \
-    }                                       \
-    else                                    \
-        DELETEZ( (p1) )
-
 void ScTable::SetRepeatColRange( const ScRange* pNew )
 {
-    SET_PRINTRANGE( pRepeatColRange, pNew );
+    setPrintRange( pRepeatColRange, pNew );
 
     if (IsStreamValid())
         SetStreamValid(false);
@@ -1739,7 +1741,7 @@ void ScTable::SetRepeatColRange( const ScRange* pNew )
 
 void ScTable::SetRepeatRowRange( const ScRange* pNew )
 {
-    SET_PRINTRANGE( pRepeatRowRange, pNew );
+    setPrintRange( pRepeatRowRange, pNew );
 
     if (IsStreamValid())
         SetStreamValid(false);
commit 888a4519c30bed7ca9896f367d5d48fae96bae2d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Aug 27 01:09:11 2011 +0200

    fix debug build for now

diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index 324638f..45ef143 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -696,7 +696,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
     }
 #ifdef DEBUG
     g_warning ("getPropertyValues on '%s' %d properties returned (of %d)",
-           getURI(), (int)xRow->getLength(), (int)nProps);
+           getURI(), 0, (int)nProps);
 #endif
 
     return uno::Reference< sdbc::XRow >( xRow.get() );