[Libreoffice-commits] .: formula/source

[Caolán McNamara]

 formula/source/ui/dlg/formdlgs.hrc |    2 --
 formula/source/ui/dlg/formdlgs.src |   10 ----------
 formula/source/ui/dlg/structpg.cxx |    8 +++-----
 formula/source/ui/dlg/structpg.hxx |    3 ---
 4 files changed, 3 insertions(+), 20 deletions(-)

New commits:
commit 1d175a6e9be512876991dd14e83056e06348fc23
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Nov 15 09:44:10 2010 +0000

    Remove more unused hiconstrast args

diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc
index 0801a88..09f8bdf 100644
--- a/formula/source/ui/dlg/formdlgs.hrc
+++ b/formula/source/ui/dlg/formdlgs.hrc
@@ -68,8 +68,6 @@
 #define BMP_STR_OPEN		2
 #define BMP_STR_END  		3
 #define BMP_STR_ERROR		4
-#define BMP_STR_END_H       13
-#define BMP_STR_ERROR_H     14
 
 // Texte
 #define STR_STRUCT_ERR1		1
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 31c99e8..7955fdd 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -121,21 +121,11 @@ TabPage RID_FORMULATAB_STRUCT
         ImageBitmap = Bitmap { File = "fapok.bmp"; };
         MaskColor = STD_MASKCOLOR;
     };
-    Image BMP_STR_END_H
-    {
-        ImageBitmap = Bitmap { File = "fapok_h.bmp"; };
-        MaskColor = STD_MASKCOLOR;
-    };
     Image BMP_STR_ERROR
     {
         ImageBitmap = Bitmap { File = "faperror.bmp"; };
         MaskColor = STD_MASKCOLOR;
     };
-    Image BMP_STR_ERROR_H
-    {
-        ImageBitmap = Bitmap { File = "faperror_h.bmp"; };
-        MaskColor = STD_MASKCOLOR;
-    };
     String STR_STRUCT_ERR1
     {
         Text [ en-US ] = "=?" ;
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index d8497c5..7ef6743 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -61,7 +61,7 @@ StructListBox::StructListBox(Window* pParent, const ResId& rResId ):
 
 SvLBoxEntry* StructListBox::InsertStaticEntry(
         const XubString& rText,
-        const Image& rEntryImg, const Image& rEntryImgHC,
+        const Image& rEntryImg,
         SvLBoxEntry* pParent, ULONG nPos, IFormulaToken* pToken )
 {
     SvLBoxEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, FALSE, nPos, pToken );
@@ -105,8 +105,6 @@ StructPage::StructPage(Window* pParent):
     aTlbStruct		( this, ModuleRes( TLB_STRUCT ) ),
     maImgEnd        ( ModuleRes( BMP_STR_END ) ),
     maImgError      ( ModuleRes( BMP_STR_ERROR ) ),
-    maImgEndHC      ( ModuleRes( BMP_STR_END_H ) ),
-    maImgErrorHC    ( ModuleRes( BMP_STR_ERROR_H ) ),
     pSelectedToken	( NULL )
 {
     aTlbStruct.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|
@@ -139,10 +137,10 @@ SvLBoxEntry* StructPage::InsertEntry( const XubString& rText, SvLBoxEntry* pPare
             pEntry = aTlbStruct.InsertEntry( rText, pParent, FALSE, nPos, pIFormulaToken );
         break;
         case STRUCT_END:
-            pEntry = aTlbStruct.InsertStaticEntry( rText, maImgEnd, maImgEndHC, pParent, nPos, pIFormulaToken );
+            pEntry = aTlbStruct.InsertStaticEntry( rText, maImgEnd, pParent, nPos, pIFormulaToken );
         break;
         case STRUCT_ERROR:
-            pEntry = aTlbStruct.InsertStaticEntry( rText, maImgError, maImgErrorHC, pParent, nPos, pIFormulaToken );
+            pEntry = aTlbStruct.InsertStaticEntry( rText, maImgError, pParent, nPos, pIFormulaToken );
         break;
     }
 
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index d5677fd..2aadec0 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -63,7 +63,6 @@ public:
     SvLBoxEntry*    InsertStaticEntry(
                         const XubString& rText,
                         const Image& rEntryImg,
-                        const Image& rEntryImgHC,
                         SvLBoxEntry* pParent = NULL,
                         ULONG nPos = LIST_APPEND,
                         IFormulaToken* pToken = NULL );
@@ -87,8 +86,6 @@ private:
     StructListBox	aTlbStruct;
     Image           maImgEnd;
     Image           maImgError;
-    Image           maImgEndHC;
-    Image           maImgErrorHC;
 
     IFormulaToken*	pSelectedToken;