EnhancedCustomShape2d.cxx (f6e50924) | EnhancedCustomShape2d.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 --- 37 unchanged lines hidden (view full) --- 46#include <svx/xlnstwit.hxx> 47#include <svx/xlnedwit.hxx> 48#include <svx/xlnstcit.hxx> 49#include <svx/xlnedcit.hxx> 50#include <svx/xflgrit.hxx> 51#include <svx/xflhtit.hxx> 52#include <svx/xbtmpit.hxx> 53#include <svx/xgrad.hxx> | 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 --- 37 unchanged lines hidden (view full) --- 46#include <svx/xlnstwit.hxx> 47#include <svx/xlnedwit.hxx> 48#include <svx/xlnstcit.hxx> 49#include <svx/xlnedcit.hxx> 50#include <svx/xflgrit.hxx> 51#include <svx/xflhtit.hxx> 52#include <svx/xbtmpit.hxx> 53#include <svx/xgrad.hxx> |
54#include <svx/xbitmap.hxx> | |
55#include <svx/xhatch.hxx> 56#include <com/sun/star/awt/Size.hpp> 57#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> 58#ifndef __COM_SUN_STAR_DRAWING_ENHANCEDCUSTOMSHAPESEGMENTCOMMAND_HPP__ 59#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> 60#endif 61#ifndef BOOST_SHARED_PTR_HPP_INCLUDED 62#include <boost/shared_ptr.hpp> --- 1892 unchanged lines hidden (view full) --- 1955 std::min(nColorIndex, nColorCount-1) )); 1956 } 1957 1958 rObj.SetMergedItem( XFillHatchItem( String(), aXHatch ) ); 1959 break; 1960 } 1961 case XFILL_BITMAP: 1962 { | 54#include <svx/xhatch.hxx> 55#include <com/sun/star/awt/Size.hpp> 56#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> 57#ifndef __COM_SUN_STAR_DRAWING_ENHANCEDCUSTOMSHAPESEGMENTCOMMAND_HPP__ 58#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> 59#endif 60#ifndef BOOST_SHARED_PTR_HPP_INCLUDED 61#include <boost/shared_ptr.hpp> --- 1892 unchanged lines hidden (view full) --- 1954 std::min(nColorIndex, nColorCount-1) )); 1955 } 1956 1957 rObj.SetMergedItem( XFillHatchItem( String(), aXHatch ) ); 1958 break; 1959 } 1960 case XFILL_BITMAP: 1961 { |
1963 Bitmap aBitmap(((const XFillBitmapItem&)rObj.GetMergedItem(XATTR_FILLBITMAP)).GetBitmapValue().GetBitmap()); | |
1964 if ( nColorCount ) 1965 { | 1962 if ( nColorCount ) 1963 { |
1964 Bitmap aBitmap(((const XFillBitmapItem&)rObj.GetMergedItem(XATTR_FILLBITMAP)).GetGraphicObject().GetGraphic().GetBitmapEx().GetBitmap()); 1965 |
|
1966 aBitmap.Adjust( 1967 static_cast< short > ( GetLuminanceChange( 1968 std::min(nColorIndex, nColorCount-1)))); | 1966 aBitmap.Adjust( 1967 static_cast< short > ( GetLuminanceChange( 1968 std::min(nColorIndex, nColorCount-1)))); |
1969 1970 rObj.SetMergedItem(XFillBitmapItem(String(), Graphic(aBitmap))); |
|
1969 } 1970 | 1971 } 1972 |
1971 rObj.SetMergedItem( XFillBitmapItem( String(), aBitmap ) ); | |
1972 break; 1973 } 1974 } 1975 1976 if ( nColorIndex < nColorCount ) 1977 nColorIndex++; 1978 } 1979} --- 192 unchanged lines hidden --- | 1973 break; 1974 } 1975 } 1976 1977 if ( nColorIndex < nColorCount ) 1978 nColorIndex++; 1979 } 1980} --- 192 unchanged lines hidden --- |