ooo-build r11751 - in trunk: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Fri Feb 29 04:28:55 2008
New Revision: 11751
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11751&view=rev

Log:
2008-02-28  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/autocorrect-accidental-caps-lock-sw.diff: enable the
	caps lock key correction in Writer.

	* patches/src680/apply: apply the new patch for sw.
	
	* patches/src680/autocorrect-accidental-caps-lock-svx.diff: also enable
	it in Draw/Impress.


Added:
   trunk/patches/src680/autocorrect-accidental-caps-lock-sw.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/autocorrect-accidental-caps-lock-svx.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Fri Feb 29 04:28:55 2008
@@ -1990,6 +1990,7 @@
 autocorrect-accidental-caps-lock-offapi.diff
 autocorrect-accidental-caps-lock-officecfg.diff
 autocorrect-accidental-caps-lock-sc.diff
+autocorrect-accidental-caps-lock-sw.diff
 autocorrect-accidental-caps-lock-solenv.diff
 autocorrect-accidental-caps-lock-svx.diff
 autocorrect-accidental-caps-lock-vcl.diff

Modified: trunk/patches/src680/autocorrect-accidental-caps-lock-svx.diff
==============================================================================
--- trunk/patches/src680/autocorrect-accidental-caps-lock-svx.diff	(original)
+++ trunk/patches/src680/autocorrect-accidental-caps-lock-svx.diff	Fri Feb 29 04:28:55 2008
@@ -39,6 +39,18 @@
  
  	EESpellState	StartSpeller( BOOL bMultipleDoc = FALSE );
  	EESpellState	StartThesaurus();
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=svx.vpj svx.clean/inc/svx/outliner.hxx svx/inc/svx/outliner.hxx
+--- svx.clean/inc/svx/outliner.hxx	2008-02-25 11:50:16.000000000 -0500
++++ svx/inc/svx/outliner.hxx	2008-02-28 18:57:43.000000000 -0500
+@@ -274,7 +274,7 @@ public:
+ 	void        Scroll( long nHorzScroll, long nVertScroll );
+ 
+ 	void        Paint( const Rectangle& rRect );
+-	BOOL        PostKeyEvent( const KeyEvent& rKEvt );
++	BOOL        PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin = NULL );
+ 	BOOL        MouseButtonDown( const MouseEvent& );
+ 	BOOL        MouseButtonUp( const MouseEvent& );
+ 	BOOL        MouseMove( const MouseEvent& );
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=svx.vpj svx.clean/inc/svx/svxacorr.hxx svx/inc/svx/svxacorr.hxx
 --- svx.clean/inc/svx/svxacorr.hxx	2008-02-25 11:50:16.000000000 -0500
 +++ svx/inc/svx/svxacorr.hxx	2008-02-28 11:46:04.000000000 -0500
@@ -408,7 +420,7 @@
  	EditPaM			InsertLineBreak( EditSelection aEditSelection );
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=svx.vpj svx.clean/source/editeng/svxacorr.cxx svx/source/editeng/svxacorr.cxx
 --- svx.clean/source/editeng/svxacorr.cxx	2008-02-25 11:50:18.000000000 -0500
-+++ svx/source/editeng/svxacorr.cxx	2008-02-28 14:25:20.000000000 -0500
++++ svx/source/editeng/svxacorr.cxx	2008-02-28 22:39:51.000000000 -0500
 @@ -119,6 +119,7 @@
  #include <svx/escpitem.hxx>
  #include <svx/svxacorr.hxx>
@@ -477,31 +489,65 @@
  //The method below is renamed from _GetQuote to GetQuote by BerryJia for Bug95846 Time:2002-8-13 15:50
  sal_Unicode SvxAutoCorrect::GetQuote( sal_Unicode cInsChar, BOOL bSttQuote,
  										LanguageType eLang ) const
-@@ -1226,8 +1271,10 @@ String SvxAutoCorrect::GetQuote( SvxAuto
+@@ -1226,7 +1271,7 @@ String SvxAutoCorrect::GetQuote( SvxAuto
  
  ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
  									xub_StrLen nInsPos, sal_Unicode cChar,
 -									BOOL bInsert )
 +									BOOL bInsert, Window* pFrameWin )
  {
-+    bool bLockKeyOn = pFrameWin && (pFrameWin->GetIndicatorState() & INDICATOR_CAPSLOCK);
-+
  	ULONG nRet = 0;
  	do{		                            // only for middle check loop !!
- 		if( cChar )
-@@ -1383,6 +1430,15 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAu
- 			if( IsAutoCorrFlag( ChgToEnEmDash ) &&
- 				FnChgToEnEmDash( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) )
- 				nRet |= ChgToEnEmDash;
+@@ -1369,7 +1414,19 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAu
+ 			;
+ 		else
+ 		{
++            bool bLockKeyOn = pFrameWin && (pFrameWin->GetIndicatorState() & INDICATOR_CAPSLOCK);
 +
+ 			nRet = 0;
 +            if ( bLockKeyOn && IsAutoCorrFlag( CorrectCapsLock ) &&
 +                 FnCorrectCapsLock( rDoc, rTxt, nCapLttrPos, nInsPos, eLang ) )
-+                // Correct accidental use of cAPS LOCK key (do this only when 
-+                // the caps or shift lock key is pressed).
 +            {
++                // Correct accidental use of cAPS LOCK key (do this only when 
++                // the caps or shift lock key is pressed).  Turn off the caps
++                // lock afterwords.
 +                nRet |= CorrectCapsLock;
 +                pFrameWin->SimulateKeyPress( KEY_CAPSLOCK );
 +            }
++
+ 			// Grossbuchstabe am Satz-Anfang ??
+ 			if( IsAutoCorrFlag( CptlSttSntnc ) &&
+ 				FnCptlSttSntnc( rDoc, rTxt, TRUE, nCapLttrPos, nInsPos, eLang ) )
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=svx.vpj svx.clean/source/outliner/outlvw.cxx svx/source/outliner/outlvw.cxx
+--- svx.clean/source/outliner/outlvw.cxx	2008-02-25 11:50:19.000000000 -0500
++++ svx/source/outliner/outlvw.cxx	2008-02-28 18:58:04.000000000 -0500
+@@ -109,7 +109,7 @@ void OutlinerView::Paint( const Rectangl
+ 	pEditView->Paint( rRect );
+ }
+ 
+-BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt )
++BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
+ {
+ 	DBG_CHKTHIS( OutlinerView, 0 );
+ 
+@@ -274,7 +274,7 @@ BOOL OutlinerView::PostKeyEvent( const K
  		}
+ 	}
+ 
+-	return bKeyProcessed ? TRUE : pEditView->PostKeyEvent( rKEvt );
++	return bKeyProcessed ? TRUE : pEditView->PostKeyEvent( rKEvt, pFrameWin );
+ }
+ 
  
- 	} while( FALSE );
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=svx.vpj svx.clean/source/svdraw/svdedxv.cxx svx/source/svdraw/svdedxv.cxx
+--- svx.clean/source/svdraw/svdedxv.cxx	2008-02-25 11:50:19.000000000 -0500
++++ svx/source/svdraw/svdedxv.cxx	2008-02-28 18:58:41.000000000 -0500
+@@ -1203,7 +1203,7 @@ BOOL SdrObjEditView::KeyInput(const KeyE
+ 				ShowItemBrowser();
+         }
+ #endif
+-		if (pTextEditOutlinerView->PostKeyEvent(rKEvt))
++		if (pTextEditOutlinerView->PostKeyEvent(rKEvt, pWin))
+ 		{
+ 			if( pMod && !pMod->IsChanged() )
+ 			{

Added: trunk/patches/src680/autocorrect-accidental-caps-lock-sw.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/autocorrect-accidental-caps-lock-sw.diff	Fri Feb 29 04:28:55 2008
@@ -0,0 +1,12 @@
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sw.vpj sw.clean/source/core/edit/edws.cxx sw/source/core/edit/edws.cxx
+--- sw.clean/source/core/edit/edws.cxx	2008-02-28 19:19:41.000000000 -0500
++++ sw/source/core/edit/edws.cxx	2008-02-28 22:12:10.000000000 -0500
+@@ -364,7 +364,7 @@ void SwEditShell::AutoCorrect( SvxAutoCo
+ 	SwAutoCorrDoc aSwAutoCorrDoc( *this, *pCrsr, cChar );
+ 	rACorr.AutoCorrect( aSwAutoCorrDoc,
+ 					pTNd->GetTxt(), pCrsr->GetPoint()->nContent.GetIndex(),
+-					cChar, bInsert );
++					cChar, bInsert, GetWin() );
+ 	if( cChar )
+ 		SaveTblBoxCntnt( pCrsr->GetPoint() );
+ 	EndAllAction();