Files
libreoffice/drawinglayer/source/attribute/sdrfillattribute.cxx
Armin Le Grand 37aa7d81aa Resolves: #i121194# Better support for graphic fill styles...
which are not bitmaps (svg, metafiles, ..)

(cherry picked from commit 7a652a2b2ab5e0d37e32185c8c5fac3af482bb76)

Conflicts:
	drawinglayer/Library_drawinglayer.mk
	drawinglayer/Package_inc.mk
	drawinglayer/inc/drawinglayer/attribute/fillgraphicattribute.hxx
	drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx
	drawinglayer/inc/drawinglayer/attribute/sdrfillgraphicattribute.hxx
	drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
	drawinglayer/inc/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx
	drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
	drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx
	drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
	drawinglayer/inc/drawinglayer/texture/texture.hxx
	drawinglayer/inc/drawinglayer/texture/texture3d.hxx
	drawinglayer/source/attribute/fillbitmapattribute.cxx
	drawinglayer/source/attribute/sdrfillattribute.cxx
	drawinglayer/source/attribute/sdrfillgraphicattribute.cxx
	drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx
	drawinglayer/source/primitive2d/graphicprimitive2d.cxx
	drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx
	drawinglayer/source/processor2d/canvasprocessor.cxx
	svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
	svx/source/sdr/contact/objectcontacttools.cxx
	vcl/inc/vcl/graph.hxx

unused file _vclmetafileprocessor2d.cxx deleted, was added by error

(cherry picked from commit ed0d53f8283cd3ce579a90b599118884d0db6119)

Conflicts:
	drawinglayer/source/processor2d/_vclmetafileprocessor2d.cxx

Corrected canvasProcessor usage

(cherry picked from commit 7903c33f31c457eb6ff506958c4233f2a5d39bcf)

Conflicts:
	svx/source/sdr/contact/objectcontacttools.cxx

Change-Id: I80008050b98dafc92fde043524843c13a75fe22c
d2fa667d7c127b4d735334e56093d1d4553b0a5b
e20c60c7d6472da1295a162d9a629be998861f62
2013-06-11 20:00:34 +01:00

160 lines
5.8 KiB
C++

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <drawinglayer/attribute/sdrfillattribute.hxx>
#include <basegfx/color/bcolor.hxx>
#include <drawinglayer/attribute/sdrfillgraphicattribute.hxx>
#include <drawinglayer/attribute/fillhatchattribute.hxx>
#include <drawinglayer/attribute/fillgradientattribute.hxx>
#include <rtl/instance.hxx>
//////////////////////////////////////////////////////////////////////////////
namespace drawinglayer
{
namespace attribute
{
class ImpSdrFillAttribute
{
public:
// fill definitions
double mfTransparence; // [0.0 .. 1.0], 0.0==no transp.
basegfx::BColor maColor; // fill color
FillGradientAttribute maGradient; // fill gradient (if used)
FillHatchAttribute maHatch; // fill hatch (if used)
SdrFillGraphicAttribute maFillGraphic; // fill graphic (if used)
public:
ImpSdrFillAttribute(
double fTransparence,
const basegfx::BColor& rColor,
const FillGradientAttribute& rGradient,
const FillHatchAttribute& rHatch,
const SdrFillGraphicAttribute& rFillGraphic)
: mfTransparence(fTransparence),
maColor(rColor),
maGradient(rGradient),
maHatch(rHatch),
maFillGraphic(rFillGraphic)
{
}
ImpSdrFillAttribute()
: mfTransparence(0.0),
maColor(basegfx::BColor()),
maGradient(FillGradientAttribute()),
maHatch(FillHatchAttribute()),
maFillGraphic(SdrFillGraphicAttribute())
{
}
// data read access
double getTransparence() const { return mfTransparence; }
const basegfx::BColor& getColor() const { return maColor; }
const FillGradientAttribute& getGradient() const { return maGradient; }
const FillHatchAttribute& getHatch() const { return maHatch; }
const SdrFillGraphicAttribute& getFillGraphic() const { return maFillGraphic; }
// compare operator
bool operator==(const ImpSdrFillAttribute& rCandidate) const
{
return(getTransparence() == rCandidate.getTransparence()
&& getColor() == rCandidate.getColor()
&& getGradient() == rCandidate.getGradient()
&& getHatch() == rCandidate.getHatch()
&& getFillGraphic() == rCandidate.getFillGraphic());
}
};
namespace
{
struct theGlobalDefault :
public rtl::Static< SdrFillAttribute::ImplType, theGlobalDefault > {};
}
SdrFillAttribute::SdrFillAttribute(
double fTransparence,
const basegfx::BColor& rColor,
const FillGradientAttribute& rGradient,
const FillHatchAttribute& rHatch,
const SdrFillGraphicAttribute& rFillGraphic)
: mpSdrFillAttribute(ImpSdrFillAttribute(
fTransparence, rColor, rGradient, rHatch, rFillGraphic))
{
}
SdrFillAttribute::SdrFillAttribute()
: mpSdrFillAttribute(theGlobalDefault::get())
{
}
SdrFillAttribute::SdrFillAttribute(const SdrFillAttribute& rCandidate)
: mpSdrFillAttribute(rCandidate.mpSdrFillAttribute)
{
}
SdrFillAttribute::~SdrFillAttribute()
{
}
bool SdrFillAttribute::isDefault() const
{
return mpSdrFillAttribute.same_object(theGlobalDefault::get());
}
SdrFillAttribute& SdrFillAttribute::operator=(const SdrFillAttribute& rCandidate)
{
mpSdrFillAttribute = rCandidate.mpSdrFillAttribute;
return *this;
}
bool SdrFillAttribute::operator==(const SdrFillAttribute& rCandidate) const
{
return rCandidate.mpSdrFillAttribute == mpSdrFillAttribute;
}
double SdrFillAttribute::getTransparence() const
{
return mpSdrFillAttribute->getTransparence();
}
const basegfx::BColor& SdrFillAttribute::getColor() const
{
return mpSdrFillAttribute->getColor();
}
const FillGradientAttribute& SdrFillAttribute::getGradient() const
{
return mpSdrFillAttribute->getGradient();
}
const FillHatchAttribute& SdrFillAttribute::getHatch() const
{
return mpSdrFillAttribute->getHatch();
}
const SdrFillGraphicAttribute& SdrFillAttribute::getFillGraphic() const
{
return mpSdrFillAttribute->getFillGraphic();
}
} // end of namespace attribute
} // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */