From d2c5d317f037a0c4fa5b72eb874cd299d4007e03 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Thu, 2 Aug 2007 12:59:22 +0000
Subject: INTEGRATION: CWS tl40 (1.115.272); FILE MERGED 2007/07/23 16:06:58 tl
 1.115.272.3: RESYNC: (1.115-1.117); FILE MERGED 2007/07/19 12:34:22 tl
 1.115.272.2: #i69346# fix for highlighting preedit of IME text on white
 background while editing 2007/07/18 07:44:48 tl 1.115.272.1: #i69346# fix for
 highlighting preedit of IME text on white background while editing

---
 svx/source/editeng/impedit3.cxx | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'svx')

diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx
index 0a072b0e865e..f9a0afa11ae8 100644
--- a/svx/source/editeng/impedit3.cxx
+++ b/svx/source/editeng/impedit3.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: impedit3.cxx,v $
  *
- *  $Revision: 1.117 $
+ *  $Revision: 1.118 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 17:59:31 $
+ *  last change: $Author: hr $ $Date: 2007-08-02 13:59:22 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -3510,6 +3510,18 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRec, sal_Bool b
             if( aFontColor == COL_AUTO )
                 aFontColor = GetAutoColor();
 
+            // #i69346# check for reverse color of input method attribute
+            if( mpIMEInfos && (mpIMEInfos->aPos.GetNode() == pNode &&
+                mpIMEInfos->pAttribs))
+            {
+                sal_uInt16 nAttr = mpIMEInfos->pAttribs[ 0 ];
+                if ( nAttr & EXTTEXTINPUT_ATTR_HIGHLIGHT )
+                {
+                    const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
+                    aFontColor = rStyleSettings.GetHighlightColor() ;
+                }
+            }
+
             UINT8 nColorDiff = aFontColor.GetColorError( aBackgroundColor );
             if( nColorDiff < 8 )
                 aBackgroundColor = aFontColor.IsDark() ? COL_WHITE : COL_BLACK;
-- 
cgit