tpbitmap.cxx (aa64976b) tpbitmap.cxx (1f69a0e2)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 383 unchanged lines hidden (view full) ---

392 aBtnAdd.Enable();
393
394 // Setzen des PixelControls
395 aCtlPixel.SetXBitmap(pGraphicObject->GetGraphic().GetBitmapEx());
396
397 Color aPixelColor = aFront;
398 Color aBackColor = aBack;
399
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 383 unchanged lines hidden (view full) ---

392 aBtnAdd.Enable();
393
394 // Setzen des PixelControls
395 aCtlPixel.SetXBitmap(pGraphicObject->GetGraphic().GetBitmapEx());
396
397 Color aPixelColor = aFront;
398 Color aBackColor = aBack;
399
400 aBitmapCtl.SetPixelColor( aPixelColor );
401 aBitmapCtl.SetBackgroundColor( aBackColor );
400 // #123564# This causes the wrong color to be selected
401 // as foreground color when the 1st bitmap in the bitmap
402 // list is selected. I see no reason why this is done,
403 // thus I will take it out
404 //
405 //if( 0 == aLbBitmaps.GetSelectEntryPos() )
406 //{
407 // aLbColor.SelectEntry( Color( COL_BLACK ) );
408 // ChangePixelColorHdl_Impl( this );
409 //}
410 //else
402
411
403 // Wenn der Eintrag nicht in der Listbox ist, wird die Farbe
404 // temporaer hinzugenommen
405 if( 0 == aLbBitmaps.GetSelectEntryPos() )
406 {
407 aLbColor.SelectEntry( Color( COL_BLACK ) );
408 ChangePixelColorHdl_Impl( this );
409 }
410 else
411 aLbColor.SelectEntry( aPixelColor );
412 if( aLbColor.GetSelectEntryCount() == 0 )
413 {
414 aLbColor.InsertEntry( aPixelColor, String() );
415 aLbColor.SelectEntry( aPixelColor );
416 }
417 aLbBackgroundColor.SelectEntry( aBackColor );
418 if( aLbBackgroundColor.GetSelectEntryCount() == 0 )
419 {
420 aLbBackgroundColor.InsertEntry( aBackColor, String() );
421 aLbBackgroundColor.SelectEntry( aBackColor );
422 }
423 }
412 aLbColor.SelectEntry( aPixelColor );
413
414 if( aLbColor.GetSelectEntryCount() == 0 )
415 {
416 aLbColor.InsertEntry( aPixelColor, String() );
417 aLbColor.SelectEntry( aPixelColor );
418 }
419
420 aLbBackgroundColor.SelectEntry( aBackColor );
421
422 if( aLbBackgroundColor.GetSelectEntryCount() == 0 )
423 {
424 aLbBackgroundColor.InsertEntry( aBackColor, String() );
425 aLbBackgroundColor.SelectEntry( aBackColor );
426 }
427
428 // update aBitmapCtl, rXFSet and aCtlPreview
429 aBitmapCtl.SetPixelColor( aPixelColor );
430 aBitmapCtl.SetBackgroundColor( aBackColor );
431 rXFSet.Put(XFillBitmapItem(String(), Graphic(aBitmapCtl.GetBitmapEx())));
432 aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() );
433 aCtlPreview.Invalidate();
434 }
424 else
425 {
426 aCtlPixel.Reset();
427 aCtlPixel.SetPaintable( sal_False );
428 aCtlPixel.Disable();
429 aFtPixelEdit.Disable();
430 aFtColor.Disable();
431 aLbColor.Disable();

--- 611 unchanged lines hidden --- 		435 else
436 {
437 aCtlPixel.Reset();
438 aCtlPixel.SetPaintable( sal_False );
439 aCtlPixel.Disable();
440 aFtPixelEdit.Disable();
441 aFtColor.Disable();
442 aLbColor.Disable();

--- 611 unchanged lines hidden ---