editeng/inc/editeng/editeng.hxx    |    1 +
 editeng/source/editeng/editeng.cxx |    5 +++++
 editeng/source/editeng/impedit.cxx |    2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 89de9dfe27d6a406fb67570c3507a8ea2e387d24
Author: Kohei Yoshida <[email protected]>
Date:   Sat Apr 14 02:03:46 2012 -0400

    Really fix the build.

diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index f3be3d2..8cdc6ef 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -139,6 +139,7 @@ private:
 
     EDITENG_DLLPRIVATE void CursorMoved(ContentNode* pPrevNode);
     EDITENG_DLLPRIVATE void CheckIdleFormatter();
+    EDITENG_DLLPRIVATE bool IsIdleFormatterActive() const;
     EDITENG_DLLPRIVATE ParaPortion* FindParaPortion(ContentNode* pNode);
     EDITENG_DLLPRIVATE const ParaPortion* FindParaPortion(ContentNode* pNode) 
const;
     EDITENG_DLLPRIVATE const ParaPortion* GetPrevVisPortion(const ParaPortion* 
pCurPortion) const;
diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 0adfec1..3410fba 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -702,6 +702,11 @@ void EditEngine::CheckIdleFormatter()
     pImpEditEngine->CheckIdleFormatter();
 }
 
+bool EditEngine::IsIdleFormatterActive() const
+{
+    return pImpEditEngine->aIdleFormatter.IsActive();
+}
+
 ParaPortion* EditEngine::FindParaPortion(ContentNode* pNode)
 {
     return pImpEditEngine->FindParaPortion(pNode);
diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 81edb23..3b31282 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -174,7 +174,7 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, 
Region* pRegion )
             pOutWin->GetCursor()->Hide();
     }
 
-    DBG_ASSERT( !pEditEngine->aIdleFormatter.IsActive(), "DrawSelection: Not 
formatted!" );
+    DBG_ASSERT( !pEditEngine->IsIdleFormatterActive(), "DrawSelection: Not 
formatted!" );
     aTmpSel.Adjust( pEditEngine->pImpEditEngine->GetEditDoc() );
 
     ContentNode* pStartNode = aTmpSel.Min().GetNode();
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to