merge commit for m65

1 files changed, 13 insertions, 13 deletions

diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index bca2ec34498d..fc92757e0925 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2159,15 +2159,15 @@ static void ImplSalToTop( HWND hWnd, USHORT nFlags )
 
     if ( nFlags & SAL_FRAME_TOTOP_FOREGROUNDTASK )
     {
-        // This magic code is necessary to connect the input focus of the

-        // current window thread and the thread which owns the window that

-        // should be the new foreground window.

-        HWND   hCurrWnd     = GetForegroundWindow();

-        DWORD  myThreadID   = GetCurrentThreadId();

-        DWORD  currThreadID = GetWindowThreadProcessId(hCurrWnd,NULL);

-        AttachThreadInput(myThreadID, currThreadID,TRUE);

-        SetForegroundWindow(hWnd);

-        AttachThreadInput(myThreadID,currThreadID,FALSE);

+        // This magic code is necessary to connect the input focus of the
+        // current window thread and the thread which owns the window that
+        // should be the new foreground window.
+        HWND   hCurrWnd     = GetForegroundWindow();
+        DWORD  myThreadID   = GetCurrentThreadId();
+        DWORD  currThreadID = GetWindowThreadProcessId(hCurrWnd,NULL);
+        AttachThreadInput(myThreadID, currThreadID,TRUE);
+        SetForegroundWindow(hWnd);
+        AttachThreadInput(myThreadID,currThreadID,FALSE);
     }
 
     if ( nFlags & SAL_FRAME_TOTOP_RESTOREWHENMIN )
@@ -5437,7 +5437,7 @@ static BOOL ImplHandleIMECompositionInput( WinSalFrame* pFrame,
             WCHAR* pTextBuf = new WCHAR[nTextLen];
             ImmGetCompositionStringW( hIMC, GCS_RESULTSTR, pTextBuf, nTextLen*sizeof( WCHAR ) );
             aEvt.maText = XubString( reinterpret_cast<const xub_Unicode*>(pTextBuf), (xub_StrLen)nTextLen );
-            delete pTextBuf;
+            delete [] pTextBuf;
         }
 
         aEvt.mnCursorPos = aEvt.maText.Len();
@@ -5463,7 +5463,7 @@ static BOOL ImplHandleIMECompositionInput( WinSalFrame* pFrame,
             WCHAR* pTextBuf = new WCHAR[nTextLen];
             ImmGetCompositionStringW( hIMC, GCS_COMPSTR, pTextBuf, nTextLen*sizeof( WCHAR ) );
             aEvt.maText = XubString( reinterpret_cast<const xub_Unicode*>(pTextBuf), (xub_StrLen)nTextLen );
-            delete pTextBuf;
+            delete [] pTextBuf;
 
             WIN_BYTE*   pAttrBuf = NULL;
             LONG        nAttrLen = ImmGetCompositionStringW( hIMC, GCS_COMPATTR, 0, 0 );
@@ -5499,7 +5499,7 @@ static BOOL ImplHandleIMECompositionInput( WinSalFrame* pFrame,
                 }
 
                 aEvt.mpTextAttr = pSalAttrAry;
-                delete pAttrBuf;
+                delete [] pAttrBuf;
             }
         }
 
@@ -5536,7 +5536,7 @@ static BOOL ImplHandleIMECompositionInput( WinSalFrame* pFrame,
         }
 
         if ( pSalAttrAry )
-            delete pSalAttrAry;
+            delete [] pSalAttrAry;
     }
 
     return !bDef;