ManageNames: set the color of the info text field for warnings

3 files changed, 17 insertions, 12 deletions

diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index b373a1b19d6f..f57bd8214579 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -164,14 +164,17 @@ bool ScNameDefDlg::IsNameValid()
         pRangeName = maRangeMap.find(aScope)->second;
     }
 
+    maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor());
     if (!ScRangeData::IsNameValid( aName, mpDoc ))
     {
+        maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
         maFtInfo.SetText(maErrInvalidNameStr);
         maBtnAdd.Disable();
         return false;
     }
     else if (pRangeName->findByUpperName(ScGlobal::pCharClass->upper(aName)))
     {
+        maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
         maFtInfo.SetText(maErrNameInUse);
         maBtnAdd.Disable();
         return false;
@@ -179,6 +182,7 @@ bool ScNameDefDlg::IsNameValid()
 
     if (!IsFormulaValid())
     {
+        maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
         maBtnAdd.Disable();
         return false;
     }
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index a3a27147c17b..03b61a7d1971 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -142,7 +142,7 @@ void ScNameDlg::Init()
     OSL_ENSURE( mpViewData && mpDoc, "ViewData oder Document nicht gefunden!" );
 
     //init UI
-
+    maFtInfo.SetStyle(WB_VCENTER);
 
     mpRangeManagerTable = new ScRangeManagerTable(&maNameMgrCtrl, maRangeMap);
     mpRangeManagerTable->SetSelectHdl( LINK( this, ScNameDlg, SelectionChangedHdl_Impl ) );
@@ -288,17 +288,16 @@ bool ScNameDlg::IsNameValid()
 
     if (!ScRangeData::IsNameValid( aName, mpDoc ))
     {
-        maEdName.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
+        maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
         maFtInfo.SetText(maErrInvalidNameStr);
         return false;
     }
     else if (pRangeName && pRangeName->findByUpperName(ScGlobal::pCharClass->upper(aName)))
     {
-        maEdName.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
+        maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
         maFtInfo.SetText(maErrNameInUse);
         return false;
     }
-    maEdName.SetControlBackground(GetSettings().GetStyleSettings().GetFieldColor());
     maFtInfo.SetText( maStrInfoDefault );
     return true;
 }
@@ -310,6 +309,7 @@ bool ScNameDlg::IsFormulaValid()
     ScTokenArray* pCode = aComp.CompileString(maEdAssign.GetText());
     if (pCode->GetCodeError())
     {
+        maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
         delete pCode;
         return false;
     }
@@ -393,23 +393,24 @@ void ScNameDlg::RemovePushed()
 
 void ScNameDlg::NameModified()
 {
-    if (!IsFormulaValid())
-    {
-        //TODO: implement an info text
-        return;
-    }
-
     ScRangeNameLine aLine;
     mpRangeManagerTable->GetCurrentLine(aLine);
     rtl::OUString aOldName = aLine.aName;
     rtl::OUString aNewName = maEdName.GetText();
     aNewName = aNewName.trim();
+    maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor());
     if (aNewName != aOldName)
     {
         if (!IsNameValid())
             return;
     }
 
+    if (!IsFormulaValid())
+    {
+        //TODO: implement an info text
+        return;
+    }
+
     rtl::OUString aOldScope = aLine.aScope;
     //empty table
     if (aOldScope.isEmpty())
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index 077a7cb398d7..3e2eb421faad 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -171,8 +171,8 @@ ModelessDialog RID_SCDLG_NAMES
 
     FixedText FT_INFO
     {
-        Pos = MAP_APPFONT( 5, 127 );
-        Size = MAP_APPFONT( 210, 15 );
+        Pos = MAP_APPFONT( 5, 125 );
+        Size = MAP_APPFONT( 210, 12 );
         TabStop = FALSE;
     };