Purged BmpColorMode from libs-gui - components

4 files changed, 8 insertions, 57 deletions

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index c35b785c607b..eba35852b8b1 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -60,7 +60,6 @@
 #define RID_IMGBTN_REMOVEWATCH          ( RID_BASICIDE_START +  8 )
 #define RID_IMGBTN_GOTOCALL             ( RID_BASICIDE_START +  9 )
 #define RID_IMGLST_LAYOUT_HC            ( RID_BASICIDE_START + 14 )
-#define RID_IMG_REMOVEWATCH_HC          ( RID_BASICIDE_START + 15 )
 #define RID_IMG_INSTALLATION            ( RID_BASICIDE_START + 20 )
 #define RID_IMG_INSTALLATION_HC         ( RID_BASICIDE_START + 21 )
 #define RID_IMG_DOCUMENT                ( RID_BASICIDE_START + 22 )
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 2fa67b22fb48..8299fcfac775 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1223,8 +1223,6 @@ WatchWindow::WatchWindow( Window* pParent ) :
     aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) );
     aXEdit.Show();
 
-    aRemoveWatchButton.SetModeImage(Image(IDEResId(RID_IMG_REMOVEWATCH_HC)),
-                                    BMP_COLOR_HIGHCONTRAST);
     aRemoveWatchButton.SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
     aRemoveWatchButton.SetPosPixel( Point( nTextLen + aXEdit.GetSizePixel().Width() + 4, 2 ) );
     Size aSz( aRemoveWatchButton.GetModeImage().GetSizePixel() );
@@ -1535,7 +1533,6 @@ StackWindow::StackWindow( Window* pParent ) :
     aSz.Width() += 6;
     aSz.Height() += 6;
     aGotoCallButton.SetSizePixel( aSz );
-//  aGotoCallButton.Show(); // wird vom Basic noch nicht unterstuetzt!
     aGotoCallButton.Hide();
 
     // make stack window keyboard accessible
@@ -1697,11 +1694,6 @@ void __EXPORT ComplexEditorWindow::Resize()
     aEdtWindow.SetPosSizePixel( Point( DWBORDER+aBrkSz.Width()-1, DWBORDER ), aEWSz );
 
     aEWVScrollBar.SetPosSizePixel( Point( aOutSz.Width()-DWBORDER-nSBWidth, DWBORDER ), Size( nSBWidth, aSz.Height() ) );
-
-    // Macht das EditorWindow, ausserdem hier falsch, da Pixel
-//  aEWVScrollBar.SetPageSize( aEWSz.Height() * 8 / 10 );
-//  aEWVScrollBar.SetVisibleSize( aSz.Height() );
-//  Invalidate();
 }
 
 IMPL_LINK( ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar )
@@ -1845,7 +1837,6 @@ void WatchTreeListBox::RequestingChilds( SvLBoxEntry * pParent )
             pChildItem->maName = aBaseName;
 
             String aIndexStr = String( RTL_CONSTASCII_USTRINGPARAM( "(" ) );
-            // pChildItem->mpArray = pItem->mpArray;
             pChildItem->mpArrayParentItem = pItem;
             pChildItem->nDimLevel = nThisLevel;
             pChildItem->nDimCount = pItem->nDimCount;
@@ -1911,14 +1902,10 @@ SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvLBoxEntry* pEntry, bool& rbArra
         }
         // Array?
         else if( (pArray = pItem->GetRootArray()) != NULL )
-        // else if( (pArray = pItem->mpArray) != NULL )
         {
             rbArrayElement = true;
             if( pParentItem->nDimLevel + 1 == pParentItem->nDimCount )
-            // if( pItem->nDimLevel == pItem->nDimCount )
                 pSBX = pArray->Get( pItem->pIndices );
-            // else
-                // pSBX = pArray;
         }
     }
     else
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 3958faa94d1c..6b1ec9cfea16 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -234,9 +234,9 @@ void DialogWindow::KeyInput( const KeyEvent& rKEvt )
 
 void DialogWindow::Command( const CommandEvent& rCEvt )
 {
-    if ( ( rCEvt.GetCommand() == COMMAND_WHEEL ) ||
-            ( rCEvt.GetCommand() == COMMAND_STARTAUTOSCROLL ) ||
-            ( rCEvt.GetCommand() == COMMAND_AUTOSCROLL ) )
+    if ( ( rCEvt.GetCommand() == COMMAND_WHEEL           ) ||
+         ( rCEvt.GetCommand() == COMMAND_STARTAUTOSCROLL ) ||
+         ( rCEvt.GetCommand() == COMMAND_AUTOSCROLL      ) )
     {
         HandleScrollCommand( rCEvt, GetHScrollBar(), GetVScrollBar() );
     }
@@ -910,8 +910,7 @@ NameClashQueryBox::NameClashQueryBox( Window* pParent,
     AddButton( String( IDEResId( RID_STR_DLGIMP_CLASH_REPLACE ) ), RET_NO, 0 );
     AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
 
-    SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ?
-        QueryBox::GetStandardImageHC() : QueryBox::GetStandardImage() );
+    SetImage( QueryBox::GetStandardImage() );
 }
 
 
@@ -936,8 +935,7 @@ LanguageMismatchQueryBox::LanguageMismatchQueryBox( Window* pParent,
     AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
     AddButton( BUTTON_HELP, BUTTONID_HELP, BUTTONDIALOG_HELPBUTTON, 4 );
 
-    SetImage( GetSettings().GetStyleSettings().GetHighContrastMode() ?
-        QueryBox::GetStandardImageHC() : QueryBox::GetStandardImage() );
+    SetImage( QueryBox::GetStandardImage() );
 }
 
 BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocument& rDocument, const String& aLibName )
@@ -1032,7 +1030,7 @@ BOOL implImportDialog( Window* pWin, const String& rCurPath, const ScriptDocumen
             if( bDialogAlreadyExists )
             {
                 String aQueryBoxTitle( IDEResId( RID_STR_DLGIMP_CLASH_TITLE ) );
-                String aQueryBoxText( IDEResId( RID_STR_DLGIMP_CLASH_TEXT ) );
+                String aQueryBoxText(  IDEResId( RID_STR_DLGIMP_CLASH_TEXT  ) );
                 aQueryBoxText.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "$(ARG1)" ) ), aXmlDlgName );
 
                 NameClashQueryBox aQueryBox( pWin, aQueryBoxTitle, aQueryBoxText );
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 9b0c38d16081..9615f869f6b1 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -343,17 +343,14 @@ ImageButton RID_IMGBTN_REMOVEWATCH
     };
     QuickHelpText [ en-US ] = "Remove Watch" ;
 };
-Image RID_IMG_REMOVEWATCH_HC
-{
-    ImageBitmap = Bitmap { File = "baswatr_h.bmp" ; };
-    MASKCOLOR
-};
+
 ImageButton RID_IMGBTN_GOTOCALL
 {
     HelpId = HID_BASICIDE_GOTOALL ;
     SmallStyle = TRUE ;
     ButtonImage = Image { ImageBitmap = Bitmap { File = "basgocl.bmp" ; }; } ;
 };
+
 String RID_STR_REMOVEWATCH
 {
     Text [ en-US ] = "Watch:" ;
@@ -704,39 +701,9 @@ String RID_STR_DLGIMP_MISMATCH_TEXT
 #define MN_PLHELP       31
 #define MN_PLTEMPLATES  11
 
-
 /*
 
 The application menu bar resource has become obsolete. You can now find the menu bar definition at:
 <project>/basicide/menubar/menubar.xml.
 
 */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-