[Libreoffice-commits] .: dbaccess/source reportdesign/source

Joseph Powers jpowers at kemper.freedesktop.org
Sat Nov 13 00:37:04 PST 2010


 dbaccess/source/ui/control/opendoccontrols.cxx |    4 -
 dbaccess/source/ui/dlg/CollectionView.cxx      |    4 -
 dbaccess/source/ui/dlg/CollectionView.src      |   35 ++++--------
 dbaccess/source/ui/dlg/dbfindex.cxx            |    8 --
 dbaccess/source/ui/dlg/dbfindex.src            |   58 ---------------------
 dbaccess/source/ui/inc/dbu_resource.hrc        |   10 ---
 dbaccess/source/ui/misc/WNameMatch.cxx         |   22 ++------
 dbaccess/source/ui/misc/WizardPages.src        |   68 -------------------------
 dbaccess/source/ui/querydesign/TableWindow.cxx |    7 +-
 reportdesign/source/ui/dlg/CondFormat.hrc      |    4 -
 reportdesign/source/ui/dlg/CondFormat.src      |   14 -----
 reportdesign/source/ui/dlg/Condition.cxx       |    5 -
 12 files changed, 34 insertions(+), 205 deletions(-)

New commits:
commit 8e1a52e95c3568d9d32abe782ebfd6b9a95c28a2
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Sat Nov 13 00:29:58 2010 -0800

    Purged BmpColorMode from libs-gui - base

diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 5672fc9..447710e 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -195,7 +195,7 @@ namespace dbaui
         SetText( sLabel );
 
         // Place icon left of text and both centered in the button.
-        SetModeImage( GetCommandIcon( ".uno:Open", m_sModule ), BMP_COLOR_NORMAL );
+        SetModeImage( GetCommandIcon( ".uno:Open", m_sModule ) );
         EnableImageDisplay( TRUE );
         EnableTextDisplay( TRUE );
         SetImageAlign( IMAGEALIGN_LEFT );
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 196a194..6eccad4 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -107,9 +107,7 @@ OCollectionView::OCollectionView( Window * pParent
 
     m_aNewFolder.SetStyle( m_aNewFolder.GetStyle() | WB_NOPOINTERFOCUS );
     m_aUp.SetModeImage(ModuleRes(IMG_NAVIGATION_BTN_UP_SC));
-    m_aUp.SetModeImage(ModuleRes(IMG_NAVIGATION_BTN_UP_SCH),BMP_COLOR_HIGHCONTRAST);
     m_aNewFolder.SetModeImage(ModuleRes(IMG_NAVIGATION_CREATEFOLDER_SC));
-    m_aNewFolder.SetModeImage(ModuleRes(IMG_NAVIGATION_CREATEFOLDER_SCH),BMP_COLOR_HIGHCONTRAST);
 
     m_aView.SetDoubleClickHdl( LINK( this, OCollectionView, Dbl_Click_FileView ) );
     m_aView.EnableAutoResize();
diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src
index 3b82d56..921a493 100644
--- a/dbaccess/source/ui/dlg/CollectionView.src
+++ b/dbaccess/source/ui/dlg/CollectionView.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -55,7 +55,7 @@ ModalDialog DLG_COLLECTION_VIEW
 
     Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
     Text [ en-US ] = "Save" ;
-    
+
     FixedText FT_EXPLORERFILE_CURRENTPATH
     {
         Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS ) ;
@@ -76,7 +76,7 @@ ModalDialog DLG_COLLECTION_VIEW
         Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ;
         QuickHelpText [ en-US ] = "Up One Level" ;
     };
-    
+
     Control CTRL_VIEW
     {
         TabStop = TRUE ;
@@ -98,13 +98,13 @@ ModalDialog DLG_COLLECTION_VIEW
         Border = TRUE ;
         TabStop = TRUE ;
     };
-    
+
     FixedLine FL_1
     {
         Pos = MAP_APPFONT ( 0 , WIN_Y - 2*UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT) ;
         Size = MAP_APPFONT ( WIN_X , FIXEDLINE_HEIGHT ) ;
     };
-    
+
     PushButton BTN_EXPLORERFILE_SAVE
     {
         Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - RELATED_CONTROLS - 150, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
@@ -113,22 +113,22 @@ ModalDialog DLG_COLLECTION_VIEW
         TabStop = TRUE ;
         Text [ en-US ] = "Save" ;
     };
-    
+
     CancelButton PB_CANCEL
     {
         TabStop = TRUE ;
-        Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - 100, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;		
+        Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - 100, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
         Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ;
     };
-    
+
     HelpButton PB_HELP
     {
         TabStop = TRUE ;
-        Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - 50, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;		
+        Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - 50, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
         Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ;
     };
-    
-    
+
+
     String STR_PATHNAME
     {
         Text [ en-US ] = "~Path:" ;
@@ -141,12 +141,7 @@ String STR_NEW_FOLDER
 };
 Image IMG_NAVIGATION_BTN_UP_SC
 {
-    ImageBitmap = Bitmap { File = "fp010"; }; 
-    MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
-Image IMG_NAVIGATION_BTN_UP_SCH
-{
-    ImageBitmap = Bitmap { File = "fph010"; };
+    ImageBitmap = Bitmap { File = "fp010"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
 Image IMG_NAVIGATION_CREATEFOLDER_SC
@@ -154,14 +149,8 @@ Image IMG_NAVIGATION_CREATEFOLDER_SC
     ImageBitmap = Bitmap { File = "fp015"; };
     MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
 };
-Image IMG_NAVIGATION_CREATEFOLDER_SCH
-{
-    ImageBitmap = Bitmap { File = "fph015"; };
-    MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
-};
 
 String STR_ALREADYEXISTOVERWRITE
 {
     Text [ en-US ] = "The file already exists. Overwrite?" ;
 };
-
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 655c4cd..7577c9f 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -94,12 +94,6 @@ ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, String aDataSrcName )
     Init();
     SetCtrls();
     FreeResource();
-
-    // set Hi contrast bitmaps
-    aIB_Add.SetModeImage(		ModuleRes(IMG_ONE_LEFT_H),BMP_COLOR_HIGHCONTRAST);
-    aIB_AddAll.SetModeImage(	ModuleRes(IMG_ALL_LEFT_H),BMP_COLOR_HIGHCONTRAST);
-    aIB_Remove.SetModeImage(	ModuleRes(IMG_ONE_RIGHT_H),BMP_COLOR_HIGHCONTRAST);
-    aIB_RemoveAll.SetModeImage(	ModuleRes(IMG_ALL_RIGHT_H),BMP_COLOR_HIGHCONTRAST);
 }
 
 //-------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src
index 8f6ef6e..044ae6f 100644
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ b/dbaccess/source/ui/dlg/dbfindex.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,62 +35,6 @@
 #define WIN_X   264
 #define WIN_Y   149
 
-Image IMG_ONE_LEFT_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "one_left_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-Image IMG_ALL_LEFT_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "all_left_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-Image IMG_ONE_RIGHT_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "one_right_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-Image IMG_ALL_RIGHT_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "all_right_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
 ModalDialog DLG_DBASE_INDEXES
 {
     OutputSize = TRUE ;
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 8228be7..52edf0f 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -269,12 +269,6 @@
 #define BMP_EXCEPTION_INFO_SCH			RID_IMAGE_START + 30
 #define	IMG_PKEYICON_SCH				RID_IMAGE_START + 31
 #define	IMG_JOINS_H						RID_IMAGE_START + 32
-#define	IMG_ALL_LEFT_H					RID_IMAGE_START + 33
-#define	IMG_ONE_LEFT_H					RID_IMAGE_START + 34
-#define	IMG_ONE_RIGHT_H					RID_IMAGE_START + 35
-#define	IMG_ALL_RIGHT_H					RID_IMAGE_START + 36
-#define	IMG_SORTUP_H					RID_IMAGE_START + 37
-#define	IMG_SORTDOWN_H					RID_IMAGE_START + 38
 #define	IMG_FORMFOLDER_TREE_L			RID_IMAGE_START + 39
 #define	IMG_REPORTFOLDER_TREE_L			RID_IMAGE_START + 40
 #define	IMG_QUERYFOLDER_TREE_L			RID_IMAGE_START + 41
@@ -284,9 +278,7 @@
 #define	IMG_QUERYFOLDER_TREE_LHC		RID_IMAGE_START + 45
 #define	IMG_TABLEFOLDER_TREE_LHC		RID_IMAGE_START + 46
 #define	IMG_NAVIGATION_BTN_UP_SC		RID_IMAGE_START + 47
-#define	IMG_NAVIGATION_BTN_UP_SCH		RID_IMAGE_START + 48
 #define	IMG_NAVIGATION_CREATEFOLDER_SC	RID_IMAGE_START + 49
-#define	IMG_NAVIGATION_CREATEFOLDER_SCH	RID_IMAGE_START + 50
 #define	FORM_TREE_ICON					RID_IMAGE_START + 51
 #define	REPORT_TREE_ICON				RID_IMAGE_START + 52
 #define	FORM_TREE_ICON_SCH				RID_IMAGE_START + 53
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 9c2e653..ed287bd 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -81,12 +81,6 @@ OWizNameMatching::OWizNameMatching( Window* pParent)
     m_sDestText		= m_FT_TABLE_RIGHT.GetText();
     m_sDestText.AppendAscii("\n");
 
-    // set hiContrast
-    m_ibColumn_up.SetModeImage(ModuleRes(IMG_SORTUP_H),BMP_COLOR_HIGHCONTRAST);
-    m_ibColumn_down.SetModeImage(ModuleRes(IMG_SORTDOWN_H),BMP_COLOR_HIGHCONTRAST);
-    m_ibColumn_up_right.SetModeImage(ModuleRes(IMG_SORTUP_H),BMP_COLOR_HIGHCONTRAST);
-    m_ibColumn_down_right.SetModeImage(ModuleRes(IMG_SORTDOWN_H),BMP_COLOR_HIGHCONTRAST);
-
     FreeResource();
 }
 // -----------------------------------------------------------------------
@@ -107,10 +101,10 @@ void OWizNameMatching::Reset()
         m_CTRL_RIGHT.SetEntryHeight(m_CTRL_LEFT.GetEntryHeight());
         m_CTRL_RIGHT.SetIndent(m_CTRL_LEFT.GetIndent());
         m_CTRL_RIGHT.SetSpaceBetweenEntries(m_CTRL_LEFT.GetSpaceBetweenEntries());
-        
+
         m_bFirstTime = sal_False;
     }
-    
+
 }
 // -----------------------------------------------------------------------
 void OWizNameMatching::ActivatePage( )
@@ -120,7 +114,7 @@ void OWizNameMatching::ActivatePage( )
     // set source table name
     String aName = m_sSourceText;
     aName += String(m_pParent->m_sSourceName);
-    
+
     m_FT_TABLE_LEFT.SetText(aName);
 
     // set dest table name
@@ -128,7 +122,7 @@ void OWizNameMatching::ActivatePage( )
     aName += String(m_pParent->m_sName);
     m_FT_TABLE_RIGHT.SetText(aName);
 
-    
+
     m_CTRL_LEFT.FillListBox(*m_pParent->getSrcVector());
     m_CTRL_RIGHT.FillListBox(*m_pParent->getDestVector());
 
@@ -137,7 +131,7 @@ void OWizNameMatching::ActivatePage( )
 
     m_ibColumn_up_right.Enable( m_CTRL_RIGHT.GetEntryCount() > 1 );
     m_ibColumn_down_right.Enable( m_CTRL_RIGHT.GetEntryCount() > 1 );
-        
+
 
     m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_False);
     m_CTRL_LEFT.GrabFocus();
@@ -148,13 +142,13 @@ sal_Bool OWizNameMatching::LeavePage()
     DBG_CHKTHIS(OWizNameMatching,NULL);
 
     const ODatabaseExport::TColumnVector* pSrcColumns = m_pParent->getSrcVector();
-    
+
     m_pParent->m_vColumnPos.clear();
     m_pParent->m_vColumnTypes.clear();
     m_pParent->m_vColumnPos.resize( pSrcColumns->size(), ODatabaseExport::TPositions::value_type( COLUMN_POSITION_NOT_FOUND, COLUMN_POSITION_NOT_FOUND ) );
     m_pParent->m_vColumnTypes.resize( pSrcColumns->size(), COLUMN_POSITION_NOT_FOUND );
 
-    
+
     sal_Int32 nParamPos = 0;
     SvLBoxEntry* pLeftEntry = m_CTRL_LEFT.GetModel()->First();
     SvLBoxEntry* pRightEntry = m_CTRL_RIGHT.GetModel()->First();
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index 7afd288..6709753 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -562,69 +562,3 @@ String STR_INVALID_TABLE_NAME_LENGTH
 {
     Text [ en-US ] = "Please change the table name. It is too long.";
 };
-
-Image IMG_SORTUP_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "sortup_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-Image IMG_SORTDOWN_H
-{
-    ImageBitmap = Bitmap
-    {
-        File = "sortdown_h.bmp" ;
-    };
-    MaskColor = Color
-    {
-        Red = 0xFFFF ;
-        Green = 0x0000 ;
-        Blue = 0xFFFF ;
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 3e44c65..01c8c3b 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -124,7 +124,7 @@ OTableWindow::~OTableWindow()
     } // if (m_pListBox)
     if ( m_pContainerListener.is() )
         m_pContainerListener->dispose();
-    
+
     m_pAccessible = NULL;
 }
 // -----------------------------------------------------------------------------
@@ -282,8 +282,7 @@ void OTableWindow::impl_updateImage()
         return;
     }
 
-    m_aTypeImage.SetModeImage( aImage, BMP_COLOR_NORMAL );
-    m_aTypeImage.SetModeImage( aImageHC, BMP_COLOR_HIGHCONTRAST );
+    m_aTypeImage.SetModeImage( aImage );
     m_aTypeImage.Show();
 }
 
diff --git a/reportdesign/source/ui/dlg/CondFormat.hrc b/reportdesign/source/ui/dlg/CondFormat.hrc
index 3c3b2ad..1f3eac2 100644
--- a/reportdesign/source/ui/dlg/CondFormat.hrc
+++ b/reportdesign/source/ui/dlg/CondFormat.hrc
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -67,8 +67,6 @@
 #define BTN_MOVE_DOWN               21
 #define BTN_ADD_CONDITION           22
 #define BTN_REMOVE_CONDITION        23
-#define IMG_MOVE_UP_HC              24
-#define IMG_MOVE_DOWN_HC            25
 
 #define ROW_0_POS       ( RELATED_CONTROLS )
 #define ROW_0_HEIGTH    ( FIXEDTEXT_HEIGHT )
diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src
index 58af87f..0bb9da4 100644
--- a/reportdesign/source/ui/dlg/CondFormat.src
+++ b/reportdesign/source/ui/dlg/CondFormat.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -190,16 +190,6 @@ Control WIN_CONDITION
         Size = MAP_APPFONT( IMAGE_BUTTON_WIDTH, IMAGE_BUTTON_HEIGHT );
         Text = "-";
     };
-
-    Image IMG_MOVE_UP_HC
-    {
-        ImageBitmap = Bitmap { File = "arrow_move_up_hc" ; };
-    };
-
-    Image IMG_MOVE_DOWN_HC
-    {
-        ImageBitmap = Bitmap { File = "arrow_move_down_hc" ; };
-    };
 };
 
 ModalDialog RID_CONDFORMAT
@@ -434,7 +424,7 @@ FixedLine ADDFIELD_FL_HELP_SEPARATOR
     Size = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS ) ;
     Text [ en-US ] = "Help";
 };
-    
+
 FixedText ADDFIELD_HELP_FIELD
 {
     SVLook = TRUE ;
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index e56351c..cc5d7ab 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -259,9 +259,6 @@ Condition::Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rp
     ,m_nLastKnownWindowWidth( -1 )
     ,m_bInDestruction( false )
 {
-    m_aMoveUp.SetModeImage( ModuleRes( IMG_MOVE_UP_HC ), BMP_COLOR_HIGHCONTRAST );
-    m_aMoveDown.SetModeImage( ModuleRes( IMG_MOVE_DOWN_HC ), BMP_COLOR_HIGHCONTRAST );
-
     FreeResource();
     m_aActions.SetStyle(m_aActions.GetStyle()|WB_LINESPACING);
     m_aCondLHS.GrabFocus();


More information about the Libreoffice-commits mailing list