Ported autocorrect-accidental-caps-lock-svx.diff from ooo-build.

4 files changed, 11 insertions, 5 deletions

diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 563da3cb74be..de32033115b7 100755
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -53,6 +53,7 @@ class Rectangle;
 class SvStream;
 class Link;
 class OutputDevice;
+class Window;
 class SvUShorts;
 class SfxPoolItem;
 class SvxNumBulletItem;
@@ -124,7 +125,7 @@ private:
     EDITENG_DLLPRIVATE EditEngine&      operator=( const EditEngine& );
 
 //#if 0 // _SOLAR__PRIVATE
-    EDITENG_DLLPRIVATE BOOL             PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView );
+    EDITENG_DLLPRIVATE BOOL             PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pView, Window* pFrameWin = NULL );
 //#endif
 
 protected:
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index 15052ecc3c0c..1b2076d161c9 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -145,7 +145,7 @@ public:
 
     void            InsertText( const String& rNew, BOOL bSelect = FALSE );
 
-    BOOL            PostKeyEvent( const KeyEvent& rKeyEvent );
+    BOOL            PostKeyEvent( const KeyEvent& rKeyEvent, Window* pFrameWin = NULL );
 
     BOOL            MouseButtonUp( const MouseEvent& rMouseEvent );
     BOOL            MouseButtonDown( const MouseEvent& rMouseEvent );
@@ -208,7 +208,7 @@ public:
 
     BOOL            MatchGroup();
 
-    void            CompleteAutoCorrect();
+    void            CompleteAutoCorrect( Window* pFrameWin = NULL );
 
     EESpellState    StartSpeller( BOOL bMultipleDoc = FALSE );
     EESpellState    StartThesaurus();
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index 1825c74e302c..f7b63bc35814 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -259,7 +259,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 --git a/editeng/inc/editeng/svxacorr.hxx b/editeng/inc/editeng/svxacorr.hxx
index 1ef6bad09d9b..9989ac6fcc2d 100644
--- a/editeng/inc/editeng/svxacorr.hxx
+++ b/editeng/inc/editeng/svxacorr.hxx
@@ -47,6 +47,7 @@ class SvxAutoCorrLanguageTable_Impl;
 class SvxAutoCorrLastFileAskTable_Impl;
 class SotStorageRef;
 class SotStorage;
+class Window;
 
 // Flags fuer die AutoKorrekt-Flags
 const long CptlSttSntnc     = 0x00000001;   // Gross-Buchstaben am SatzAnfang
@@ -62,6 +63,7 @@ const long SaveWordCplSttLst= 0x00000200;   // GrB. am SatzAnf. auto. aufnehmen
 const long SaveWordWrdSttLst= 0x00000400;   // 2 GrB. am WortAnf. auto. aufnehmen
 const long IgnoreDoubleSpace= 0x00000800;   // 2 Spaces ignorieren
 const long ChgSglQuotes     = 0x00001000;   // einfache Quotes ersetzen
+const long CorrectCapsLock  = 0x00002000;   // Correct accidental use of cAPS LOCK key
 
 const long ChgWordLstLoad   = 0x20000000;   // Ersetzungsliste geladen
 const long CplSttLstLoad    = 0x40000000;   // Exceptionlist fuer CplStart geladen
@@ -250,7 +252,7 @@ public:
     // fuehre eine AutoKorrektur aus.
     // returnt was ausgefuehrt wurde; entsprechend den obigen Flags
     ULONG AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt,
-                        xub_StrLen nPos, sal_Unicode cInsChar, BOOL bInsert );
+                        xub_StrLen nPos, sal_Unicode cInsChar, BOOL bInsert, Window* pFrameWin = NULL );
 
     // return fuer die Autotext Expandierung das vorherige Wort, was dem
     // AutoCorrect - Algorythmus entspricht.
@@ -375,6 +377,9 @@ public:
     BOOL FnCptlSttSntnc( SvxAutoCorrDoc&, const String&, BOOL bNormalPos,
                                 xub_StrLen nSttPos, xub_StrLen nEndPos,
                                 LanguageType eLang  = LANGUAGE_SYSTEM);
+    bool FnCorrectCapsLock( SvxAutoCorrDoc&, const String&,
+                            xub_StrLen nSttPos, xub_StrLen nEndPos,
+                            LanguageType eLang  = LANGUAGE_SYSTEM );
 
     bool                HasRunNext() { return bRunNext; }