[ooo-build-commit] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/sc-overwrite-char-font-attrs.diff |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 2a0a488537da62ac77fabb4d3a05e7f6c4859d98
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Apr 16 10:47:58 2010 -0400

    Don't attempt to remove character attributes unless it's necessary.
    
    * patches/dev300/sc-overwrite-char-font-attrs.diff: when pDataArray
      is NULL, there is no need to call the expensive RemoveCellCharAttribs
      which causes Calc to stop responding during row removal within
      merged areas. (n#596414, lp#558968)

diff --git a/patches/dev300/sc-overwrite-char-font-attrs.diff b/patches/dev300/sc-overwrite-char-font-attrs.diff
index 3c56ca3..31407c6 100644
--- a/patches/dev300/sc-overwrite-char-font-attrs.diff
+++ b/patches/dev300/sc-overwrite-char-font-attrs.diff
@@ -255,16 +255,15 @@
  {
      if (ValidRow(nStartRow) && ValidRow(nEndRow))
      {
-@@ -473,6 +497,13 @@ void ScAttrArray::SetPatternArea(SCROW n
+@@ -473,6 +497,12 @@ void ScAttrArray::SetPatternArea(SCROW n
                      pData[nInsert-1].nRow = nStartRow - 1;
                  pData[nInsert].nRow = nEndRow;
                  pData[nInsert].pPattern = pPattern;
 +
 +                // Remove character attributes from these cells if the pattern
-+                // is applied during normal session.  We don't want to do this
-+                // while importing document.
-+                if (!pDocument->IsLoadingMedium())
-+                    RemoveCellCharAttribs(nStartRow, nEndRow, pPattern ,pDataArray);
++                // is applied during normal session.
++                if (pDataArray)
++                    RemoveCellCharAttribs(nStartRow, nEndRow, pPattern, pDataArray);
 +
                  nCount++;
              }