svdetc.cxx (f6e50924) svdetc.cxx (70d3707a)
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

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

533 const basegfx::BColor aAverageColor(basegfx::average(aCol1.getBColor(), aCol2.getBColor()));
534 rCol = Color(aAverageColor);
535 bRetval = sal_True;
536
537 break;
538 }
539 case XFILL_BITMAP:
540 {
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

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

533 const basegfx::BColor aAverageColor(basegfx::average(aCol1.getBColor(), aCol2.getBColor()));
534 rCol = Color(aAverageColor);
535 bRetval = sal_True;
536
537 break;
538 }
539 case XFILL_BITMAP:
540 {
541 const Bitmap& rBitmap = ((XFillBitmapItem&)rSet.Get(XATTR_FILLBITMAP)).GetBitmapValue().GetBitmap();
542 const Size aSize(rBitmap.GetSizePixel());
541 Bitmap aBitmap(((XFillBitmapItem&)rSet.Get(XATTR_FILLBITMAP)).GetGraphicObject().GetGraphic().GetBitmapEx().GetBitmap());
542 const Size aSize(aBitmap.GetSizePixel());
543 const sal_uInt32 nWidth = aSize.Width();
544 const sal_uInt32 nHeight = aSize.Height();
543 const sal_uInt32 nWidth = aSize.Width();
544 const sal_uInt32 nHeight = aSize.Height();
545 Bitmap aBitmap(rBitmap);
546 BitmapReadAccess* pAccess = aBitmap.AcquireReadAccess();
547
548 if(pAccess && nWidth > 0 && nHeight > 0)
549 {
550 sal_uInt32 nRt(0L);
551 sal_uInt32 nGn(0L);
552 sal_uInt32 nBl(0L);
553 const sal_uInt32 nMaxSteps(8L);

--- 561 unchanged lines hidden --- 		545 BitmapReadAccess* pAccess = aBitmap.AcquireReadAccess();
546
547 if(pAccess && nWidth > 0 && nHeight > 0)
548 {
549 sal_uInt32 nRt(0L);
550 sal_uInt32 nGn(0L);
551 sal_uInt32 nBl(0L);
552 const sal_uInt32 nMaxSteps(8L);

--- 561 unchanged lines hidden ---