incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arie...@apache.org
Subject svn commit: r1359185 - in /incubator/ooo/branches/AOO34: ./ main/ main/starmath/inc/edit.hxx main/starmath/source/edit.cxx
Date Mon, 09 Jul 2012 14:19:20 GMT
Author: arielch
Date: Mon Jul  9 14:19:19 2012
New Revision: 1359185

URL: http://svn.apache.org/viewvc?rev=1359185&view=rev
Log:
#i120149# - Merge fix from trunk into AOO34 branch

Modified:
    incubator/ooo/branches/AOO34/   (props changed)
    incubator/ooo/branches/AOO34/main/   (props changed)
    incubator/ooo/branches/AOO34/main/starmath/inc/edit.hxx
    incubator/ooo/branches/AOO34/main/starmath/source/edit.cxx

Propchange: incubator/ooo/branches/AOO34/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk:r1356190

Propchange: incubator/ooo/branches/AOO34/main/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk/main:r1356190

Modified: incubator/ooo/branches/AOO34/main/starmath/inc/edit.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/starmath/inc/edit.hxx?rev=1359185&r1=1359184&r2=1359185&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/starmath/inc/edit.hxx (original)
+++ incubator/ooo/branches/AOO34/main/starmath/inc/edit.hxx Mon Jul  9 14:19:19 2012
@@ -93,6 +93,7 @@ class SmEditWindow : public Window, publ
 	void 		SetScrollBarRanges();
 	void 		InitScrollBars();
 	void		InvalidateSlots();
+    void        UpdateStatus( bool bSetDocModified = false );
 
 public:
     SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin );

Modified: incubator/ooo/branches/AOO34/main/starmath/source/edit.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/starmath/source/edit.cxx?rev=1359185&r1=1359184&r2=1359185&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/starmath/source/edit.cxx (original)
+++ incubator/ooo/branches/AOO34/main/starmath/source/edit.cxx Mon Jul  9 14:19:19 2012
@@ -245,9 +245,7 @@ void SmEditWindow::DataChanged( const Da
 
 IMPL_LINK( SmEditWindow, ModifyTimerHdl, Timer *, EMPTYARG /*pTimer*/ )
 {
-    SmModule *pp = SM_MOD();
-	if (pp->GetConfig()->IsAutoRedraw())
-		Flush();
+    UpdateStatus();
     aModifyTimer.Stop();
 	return 0;
 }
@@ -877,13 +875,23 @@ sal_Bool SmEditWindow::IsSelected() cons
     return pEditView ? pEditView->HasSelection() : sal_False;
 }
 
+
+void SmEditWindow::UpdateStatus( bool bSetDocModified )
+{
+    SmModule *pMod = SM_MOD();
+    if (pMod && pMod->GetConfig()->IsAutoRedraw())
+        Flush();
+    if ( bSetDocModified )
+        GetDoc()->SetModified( sal_True );
+}
+
 void SmEditWindow::Cut()
 {
     DBG_ASSERT( pEditView, "EditView missing" );
     if (pEditView)
     {
         pEditView->Cut();
-        GetDoc()->SetModified( sal_True );
+        UpdateStatus( sal_True );
     }
 }
 
@@ -900,7 +908,7 @@ void SmEditWindow::Paste()
     if (pEditView)
     {
         pEditView->Paste();
-        GetDoc()->SetModified( sal_True );
+        UpdateStatus( sal_True );
     }
 }
 
@@ -910,7 +918,7 @@ void SmEditWindow::Delete()
     if (pEditView)
     {
         pEditView->DeleteSelected();
-        GetDoc()->SetModified( sal_True );
+        UpdateStatus( sal_True );
     }
 }
 



Mime
View raw message