[PATCH 1/2] Revert "This is also part of the merge."

Kohei Yoshida kyoshida at novell.com
Thu Jan 13 08:04:14 PST 2011


This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c.
---
 sc/source/core/data/table3.cxx |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 55974e2..d92c2a8 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1645,6 +1645,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
                             aParam.nDestCol, aParam.nDestRow, aParam.nDestTab );
     }
 
+    InitializeNoteCaptions();
     if (aParam.bInplace)
         IncRecalcLevel();       // #i116164# once for all entries
 
@@ -1785,7 +1786,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub)
         DecRecalcLevel();
 
     delete[] pSpecial;
-
+    SetDrawPageSize();
     return nCount;
 }
 
-- 
1.7.3.1


--=-+GjgoCxLRI2Qs+Umtm98
Content-Disposition: attachment; filename*0=0002-Reverting-the-merge-commit-0fe55349b05fae496a86a3fa9.pat; filename*1=ch
Content-Type: text/x-patch; name="0002-Reverting-the-merge-commit-0fe55349b05fae496a86a3fa9.patch"; charset="UTF-8"
Content-Transfer-Encoding: 7bit



More information about the LibreOffice mailing list