diff options
Diffstat (limited to 'drawinglayer')
242 files changed, 2029 insertions, 2971 deletions
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk new file mode 100644 index 000000000000..7aab083fe94a --- /dev/null +++ b/drawinglayer/Library_drawinglayer.mk @@ -0,0 +1,182 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. <dtardon@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,drawinglayer)) + +$(eval $(call gb_Library_add_package_headers,drawinglayer,drawinglayer_inc)) + +$(eval $(call gb_Library_add_precompiled_header,drawinglayer,$(SRCDIR)/drawinglayer/inc/pch/precompiled_drawinglayer)) + +$(eval $(call gb_Library_set_include,drawinglayer,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/drawinglayer/inc/pch) \ + -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,drawinglayer,\ + $$(DEFS) \ + -DDRAWINGLAYER_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,drawinglayer,\ + avmedia \ + basegfx \ + canvastools \ + comphelper \ + cppcanvas \ + cppu \ + cppuhelper \ + i18nisolang1 \ + sal \ + svl \ + svt \ + tk \ + tl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,drawinglayer,\ + drawinglayer/source/animation/animationtiming \ + drawinglayer/source/attribute/fillbitmapattribute \ + drawinglayer/source/attribute/fillgradientattribute \ + drawinglayer/source/attribute/fillhatchattribute \ + drawinglayer/source/attribute/fontattribute \ + drawinglayer/source/attribute/lineattribute \ + drawinglayer/source/attribute/linestartendattribute \ + drawinglayer/source/attribute/materialattribute3d \ + drawinglayer/source/attribute/sdrallattribute3d \ + drawinglayer/source/attribute/sdrfillattribute \ + drawinglayer/source/attribute/sdrfillbitmapattribute \ + drawinglayer/source/attribute/sdrlightattribute3d \ + drawinglayer/source/attribute/sdrlightingattribute3d \ + drawinglayer/source/attribute/sdrlineattribute \ + drawinglayer/source/attribute/sdrlinestartendattribute \ + drawinglayer/source/attribute/sdrobjectattribute3d \ + drawinglayer/source/attribute/sdrsceneattribute3d \ + drawinglayer/source/attribute/sdrshadowattribute \ + drawinglayer/source/attribute/strokeattribute \ + drawinglayer/source/primitive2d/animatedprimitive2d \ + drawinglayer/source/primitive2d/backgroundcolorprimitive2d \ + drawinglayer/source/primitive2d/baseprimitive2d \ + drawinglayer/source/primitive2d/bitmapprimitive2d \ + drawinglayer/source/primitive2d/borderlineprimitive2d \ + drawinglayer/source/primitive2d/chartprimitive2d \ + drawinglayer/source/primitive2d/clippedborderlineprimitive2d \ + drawinglayer/source/primitive2d/controlprimitive2d \ + drawinglayer/source/primitive2d/discretebitmapprimitive2d \ + drawinglayer/source/primitive2d/discreteshadowprimitive2d \ + drawinglayer/source/primitive2d/embedded3dprimitive2d \ + drawinglayer/source/primitive2d/epsprimitive2d \ + drawinglayer/source/primitive2d/fillbitmapprimitive2d \ + drawinglayer/source/primitive2d/fillgradientprimitive2d \ + drawinglayer/source/primitive2d/fillhatchprimitive2d \ + drawinglayer/source/primitive2d/graphicprimitive2d \ + drawinglayer/source/primitive2d/gridprimitive2d \ + drawinglayer/source/primitive2d/groupprimitive2d \ + drawinglayer/source/primitive2d/helplineprimitive2d \ + drawinglayer/source/primitive2d/hiddengeometryprimitive2d \ + drawinglayer/source/primitive2d/invertprimitive2d \ + drawinglayer/source/primitive2d/markerarrayprimitive2d \ + drawinglayer/source/primitive2d/maskprimitive2d \ + drawinglayer/source/primitive2d/mediaprimitive2d \ + drawinglayer/source/primitive2d/metafileprimitive2d \ + drawinglayer/source/primitive2d/modifiedcolorprimitive2d \ + drawinglayer/source/primitive2d/pagepreviewprimitive2d \ + drawinglayer/source/primitive2d/pointarrayprimitive2d \ + drawinglayer/source/primitive2d/polygonprimitive2d \ + drawinglayer/source/primitive2d/polypolygonprimitive2d \ + drawinglayer/source/primitive2d/primitivetools2d \ + drawinglayer/source/primitive2d/rendergraphicprimitive2d \ + drawinglayer/source/primitive2d/sceneprimitive2d \ + drawinglayer/source/primitive2d/sdrdecompositiontools2d \ + drawinglayer/source/primitive2d/shadowprimitive2d \ + drawinglayer/source/primitive2d/structuretagprimitive2d \ + drawinglayer/source/primitive2d/textdecoratedprimitive2d \ + drawinglayer/source/primitive2d/texteffectprimitive2d \ + drawinglayer/source/primitive2d/textenumsprimitive2d \ + drawinglayer/source/primitive2d/texthierarchyprimitive2d \ + drawinglayer/source/primitive2d/textlayoutdevice \ + drawinglayer/source/primitive2d/textlineprimitive2d \ + drawinglayer/source/primitive2d/textprimitive2d \ + drawinglayer/source/primitive2d/textstrikeoutprimitive2d \ + drawinglayer/source/primitive2d/transformprimitive2d \ + drawinglayer/source/primitive2d/transparenceprimitive2d \ + drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d \ + drawinglayer/source/primitive2d/wallpaperprimitive2d \ + drawinglayer/source/primitive2d/wrongspellprimitive2d \ + drawinglayer/source/primitive3d/baseprimitive3d \ + drawinglayer/source/primitive3d/groupprimitive3d \ + drawinglayer/source/primitive3d/hatchtextureprimitive3d \ + drawinglayer/source/primitive3d/hiddengeometryprimitive3d \ + drawinglayer/source/primitive3d/modifiedcolorprimitive3d \ + drawinglayer/source/primitive3d/polygonprimitive3d \ + drawinglayer/source/primitive3d/polygontubeprimitive3d \ + drawinglayer/source/primitive3d/polypolygonprimitive3d \ + drawinglayer/source/primitive3d/sdrcubeprimitive3d \ + drawinglayer/source/primitive3d/sdrdecompositiontools3d \ + drawinglayer/source/primitive3d/sdrextrudelathetools3d \ + drawinglayer/source/primitive3d/sdrextrudeprimitive3d \ + drawinglayer/source/primitive3d/sdrlatheprimitive3d \ + drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d \ + drawinglayer/source/primitive3d/sdrprimitive3d \ + drawinglayer/source/primitive3d/sdrsphereprimitive3d \ + drawinglayer/source/primitive3d/shadowprimitive3d \ + drawinglayer/source/primitive3d/textureprimitive3d \ + drawinglayer/source/primitive3d/transformprimitive3d \ + drawinglayer/source/processor2d/baseprocessor2d \ + drawinglayer/source/processor2d/canvasprocessor \ + drawinglayer/source/processor2d/contourextractor2d \ + drawinglayer/source/processor2d/helperchartrenderer \ + drawinglayer/source/processor2d/helperwrongspellrenderer \ + drawinglayer/source/processor2d/hittestprocessor2d \ + drawinglayer/source/processor2d/linegeometryextractor2d \ + drawinglayer/source/processor2d/textaspolygonextractor2d \ + drawinglayer/source/processor2d/vclhelperbitmaprender \ + drawinglayer/source/processor2d/vclhelperbitmaptransform \ + drawinglayer/source/processor2d/vclhelperbufferdevice \ + drawinglayer/source/processor2d/vclhelpergradient \ + drawinglayer/source/processor2d/vclmetafileprocessor2d \ + drawinglayer/source/processor2d/vclpixelprocessor2d \ + drawinglayer/source/processor2d/vclprocessor2d \ + drawinglayer/source/processor3d/baseprocessor3d \ + drawinglayer/source/processor3d/cutfindprocessor3d \ + drawinglayer/source/processor3d/defaultprocessor3d \ + drawinglayer/source/processor3d/geometry2dextractor \ + drawinglayer/source/processor3d/shadow3dextractor \ + drawinglayer/source/processor3d/zbufferprocessor3d \ + drawinglayer/source/texture/texture3d \ + drawinglayer/source/texture/texture \ +)) + +$(eval $(call gb_Library_add_noexception_objects,drawinglayer,\ + drawinglayer/source/geometry/viewinformation2d \ + drawinglayer/source/geometry/viewinformation3d \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/drawinglayer/source/geometry/makefile.mk b/drawinglayer/Makefile index b88522166047..a79aff831024 100644 --- a/drawinglayer/source/geometry/makefile.mk +++ b/drawinglayer/Makefile @@ -25,20 +25,14 @@ # #************************************************************************* -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=geometry +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif -# --- Settings ---------------------------------- +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -.INCLUDE : settings.mk +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/viewinformation2d.obj \ - $(SLO)$/viewinformation3d.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/drawinglayer/Module_drawinglayer.mk b/drawinglayer/Module_drawinglayer.mk new file mode 100644 index 000000000000..86711645030d --- /dev/null +++ b/drawinglayer/Module_drawinglayer.mk @@ -0,0 +1,35 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. <dtardon@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Module_Module,drawinglayer)) + +$(eval $(call gb_Module_add_targets,drawinglayer,\ + Library_drawinglayer \ + Package_inc \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/drawinglayer/Package_inc.mk b/drawinglayer/Package_inc.mk new file mode 100644 index 000000000000..df4a75b607bb --- /dev/null +++ b/drawinglayer/Package_inc.mk @@ -0,0 +1,140 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. <dtardon@redhat.com> +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Package_Package,drawinglayer_inc,$(SRCDIR)/drawinglayer/inc)) + +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/animation/animationtiming.hxx,drawinglayer/animation/animationtiming.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fillbitmapattribute.hxx,drawinglayer/attribute/fillbitmapattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fillgradientattribute.hxx,drawinglayer/attribute/fillgradientattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fillhatchattribute.hxx,drawinglayer/attribute/fillhatchattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/fontattribute.hxx,drawinglayer/attribute/fontattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/lineattribute.hxx,drawinglayer/attribute/lineattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/linestartendattribute.hxx,drawinglayer/attribute/linestartendattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/materialattribute3d.hxx,drawinglayer/attribute/materialattribute3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrallattribute3d.hxx,drawinglayer/attribute/sdrallattribute3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrfillattribute.hxx,drawinglayer/attribute/sdrfillattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx,drawinglayer/attribute/sdrfillbitmapattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrlightattribute3d.hxx,drawinglayer/attribute/sdrlightattribute3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrlightingattribute3d.hxx,drawinglayer/attribute/sdrlightingattribute3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrlineattribute.hxx,drawinglayer/attribute/sdrlineattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrlinestartendattribute.hxx,drawinglayer/attribute/sdrlinestartendattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrobjectattribute3d.hxx,drawinglayer/attribute/sdrobjectattribute3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrsceneattribute3d.hxx,drawinglayer/attribute/sdrsceneattribute3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/sdrshadowattribute.hxx,drawinglayer/attribute/sdrshadowattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/attribute/strokeattribute.hxx,drawinglayer/attribute/strokeattribute.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/drawinglayerdllapi.h,drawinglayer/drawinglayerdllapi.h)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/geometry/viewinformation2d.hxx,drawinglayer/geometry/viewinformation2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/geometry/viewinformation3d.hxx,drawinglayer/geometry/viewinformation3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/animatedprimitive2d.hxx,drawinglayer/primitive2d/animatedprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx,drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/baseprimitive2d.hxx,drawinglayer/primitive2d/baseprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx,drawinglayer/primitive2d/bitmapprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx,drawinglayer/primitive2d/borderlineprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/chartprimitive2d.hxx,drawinglayer/primitive2d/chartprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx,drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/controlprimitive2d.hxx,drawinglayer/primitive2d/controlprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx,drawinglayer/primitive2d/discretebitmapprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx,drawinglayer/primitive2d/discreteshadowprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx,drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx,drawinglayer/primitive2d/embedded3dprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/epsprimitive2d.hxx,drawinglayer/primitive2d/epsprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx,drawinglayer/primitive2d/fillbitmapprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx,drawinglayer/primitive2d/fillgradientprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx,drawinglayer/primitive2d/fillhatchprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/graphicprimitive2d.hxx,drawinglayer/primitive2d/graphicprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/gridprimitive2d.hxx,drawinglayer/primitive2d/gridprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/groupprimitive2d.hxx,drawinglayer/primitive2d/groupprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/helplineprimitive2d.hxx,drawinglayer/primitive2d/helplineprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx,drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/invertprimitive2d.hxx,drawinglayer/primitive2d/invertprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx,drawinglayer/primitive2d/markerarrayprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/maskprimitive2d.hxx,drawinglayer/primitive2d/maskprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/mediaprimitive2d.hxx,drawinglayer/primitive2d/mediaprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/metafileprimitive2d.hxx,drawinglayer/primitive2d/metafileprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx,drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx,drawinglayer/primitive2d/pagepreviewprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx,drawinglayer/primitive2d/pointarrayprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/polygonprimitive2d.hxx,drawinglayer/primitive2d/polygonprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx,drawinglayer/primitive2d/polypolygonprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/primitivetools2d.hxx,drawinglayer/primitive2d/primitivetools2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/rendergraphicprimitive2d.hxx,drawinglayer/primitive2d/rendergraphicprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/sceneprimitive2d.hxx,drawinglayer/primitive2d/sceneprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx,drawinglayer/primitive2d/sdrdecompositiontools2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/shadowprimitive2d.hxx,drawinglayer/primitive2d/shadowprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx,drawinglayer/primitive2d/structuretagprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx,drawinglayer/primitive2d/textdecoratedprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx,drawinglayer/primitive2d/texteffectprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx,drawinglayer/primitive2d/textenumsprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx,drawinglayer/primitive2d/texthierarchyprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textlayoutdevice.hxx,drawinglayer/primitive2d/textlayoutdevice.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textlineprimitive2d.hxx,drawinglayer/primitive2d/textlineprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textprimitive2d.hxx,drawinglayer/primitive2d/textprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx,drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/transformprimitive2d.hxx,drawinglayer/primitive2d/transformprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx,drawinglayer/primitive2d/transparenceprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx,drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx,drawinglayer/primitive2d/wallpaperprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx,drawinglayer/primitive2d/wrongspellprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/baseprimitive3d.hxx,drawinglayer/primitive3d/baseprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx,drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/groupprimitive3d.hxx,drawinglayer/primitive3d/groupprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx,drawinglayer/primitive3d/hatchtextureprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx,drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx,drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/polygonprimitive3d.hxx,drawinglayer/primitive3d/polygonprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx,drawinglayer/primitive3d/polygontubeprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx,drawinglayer/primitive3d/polypolygonprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx,drawinglayer/primitive3d/sdrcubeprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx,drawinglayer/primitive3d/sdrdecompositiontools3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx,drawinglayer/primitive3d/sdrextrudelathetools3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx,drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx,drawinglayer/primitive3d/sdrlatheprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx,drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrprimitive3d.hxx,drawinglayer/primitive3d/sdrprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx,drawinglayer/primitive3d/sdrsphereprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/shadowprimitive3d.hxx,drawinglayer/primitive3d/shadowprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/textureprimitive3d.hxx,drawinglayer/primitive3d/textureprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive3d/transformprimitive3d.hxx,drawinglayer/primitive3d/transformprimitive3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/baseprocessor2d.hxx,drawinglayer/processor2d/baseprocessor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/canvasprocessor.hxx,drawinglayer/processor2d/canvasprocessor.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/contourextractor2d.hxx,drawinglayer/processor2d/contourextractor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/hittestprocessor2d.hxx,drawinglayer/processor2d/hittestprocessor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/linegeometryextractor2d.hxx,drawinglayer/processor2d/linegeometryextractor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx,drawinglayer/processor2d/textaspolygonextractor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx,drawinglayer/processor2d/vclmetafileprocessor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx,drawinglayer/processor2d/vclpixelprocessor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor2d/vclprocessor2d.hxx,drawinglayer/processor2d/vclprocessor2d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/baseprocessor3d.hxx,drawinglayer/processor3d/baseprocessor3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/cutfindprocessor3d.hxx,drawinglayer/processor3d/cutfindprocessor3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/defaultprocessor3d.hxx,drawinglayer/processor3d/defaultprocessor3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/geometry2dextractor.hxx,drawinglayer/processor3d/geometry2dextractor.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/shadow3dextractor.hxx,drawinglayer/processor3d/shadow3dextractor.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/processor3d/zbufferprocessor3d.hxx,drawinglayer/processor3d/zbufferprocessor3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/texture/texture3d.hxx,drawinglayer/texture/texture3d.hxx)) +$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/texture/texture.hxx,drawinglayer/texture/texture.hxx)) + +# vim: set noet ts=4 sw=4: diff --git a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx index 6368f60fe3e9..ff10eb5672ff 100644 --- a/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx +++ b/drawinglayer/inc/drawinglayer/animation/animationtiming.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ANIMATION_ANIMATIONTIMING_HXX #define INCLUDED_DRAWINGLAYER_ANIMATION_ANIMATIONTIMING_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <vector> @@ -39,7 +42,7 @@ namespace drawinglayer { ////////////////////////////////////////////////////////////////////////////// - class AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntry { private: AnimationEntry(const AnimationEntry&); @@ -58,7 +61,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryFixed : public AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntryFixed : public AnimationEntry { protected: double mfDuration; @@ -77,7 +80,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryLinear : public AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntryLinear : public AnimationEntry { protected: double mfDuration; @@ -98,7 +101,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryList : public AnimationEntry + class DRAWINGLAYER_DLLPUBLIC AnimationEntryList : public AnimationEntry { protected: double mfDuration; @@ -121,7 +124,7 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// - class AnimationEntryLoop : public AnimationEntryList + class DRAWINGLAYER_DLLPUBLIC AnimationEntryLoop : public AnimationEntryList { protected: sal_uInt32 mnRepeat; @@ -146,3 +149,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ANIMATION_ANIMATIONTIMING_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx index 1bb8a864fa81..96b181dbf18c 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillbitmapattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -50,7 +53,7 @@ namespace drawinglayer { namespace attribute { - class FillBitmapAttribute + class DRAWINGLAYER_DLLPUBLIC FillBitmapAttribute { private: ImpFillBitmapAttribute* mpFillBitmapAttribute; @@ -87,3 +90,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx index f7bddbfe0f89..1d0b1ce30cab 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillgradientattribute.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fillattribute.hxx,v $ - * - * $Revision: 1.3 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -74,7 +71,7 @@ namespace drawinglayer { namespace attribute { - class FillGradientAttribute + class DRAWINGLAYER_DLLPUBLIC FillGradientAttribute { private: ImpFillGradientAttribute* mpFillGradientAttribute; @@ -119,3 +116,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx index 9f147b36ef34..3828927ac8bc 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fillhatchattribute.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fillattribute.hxx,v $ - * - * $Revision: 1.3 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -71,7 +68,7 @@ namespace drawinglayer { namespace attribute { - class FillHatchAttribute + class DRAWINGLAYER_DLLPUBLIC FillHatchAttribute { private: ImpFillHatchAttribute* mpFillHatchAttribute; @@ -110,3 +107,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx index da7aedc6f983..2e3ebd5dad06 100644 --- a/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -50,7 +53,7 @@ namespace drawinglayer This attribute class is able to hold all parameters needed/used to completely define the parametrisation of a text portion. */ - class FontAttribute + class DRAWINGLAYER_DLLPUBLIC FontAttribute { private: ImpFontAttribute* mpFontAttribute; @@ -100,3 +103,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FONTATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx index 4e29cf05e27f..f9d7142e5c3d 100644 --- a/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/lineattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <basegfx/vector/b2enums.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -47,7 +50,7 @@ namespace drawinglayer { namespace attribute { - class LineAttribute + class DRAWINGLAYER_DLLPUBLIC LineAttribute { private: ImpLineAttribute* mpLineAttribute; @@ -82,3 +85,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINEATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx index 9f681afc7d51..ba6a45aaab6f 100644 --- a/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/linestartendattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -47,7 +50,7 @@ namespace drawinglayer { namespace attribute { - class LineStartEndAttribute + class DRAWINGLAYER_DLLPUBLIC LineStartEndAttribute { private: ImpLineStartEndAttribute* mpLineStartEndAttribute; @@ -83,3 +86,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_LINESTARTENDATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx index 2bb2256ee559..886d87e0d063 100644 --- a/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/materialattribute3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -47,7 +50,7 @@ namespace drawinglayer { namespace attribute { - class MaterialAttribute3D + class DRAWINGLAYER_DLLPUBLIC MaterialAttribute3D { private: ImpMaterialAttribute3D* mpMaterialAttribute3D; @@ -87,3 +90,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_MATERIALATTRIBUTE3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx index 583a01915662..1831b787f288 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrallattribute3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <drawinglayer/attribute/sdrlineattribute.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> @@ -44,7 +47,7 @@ namespace drawinglayer { namespace attribute { - class SdrLineFillShadowAttribute3D + class DRAWINGLAYER_DLLPUBLIC SdrLineFillShadowAttribute3D { private: const SdrLineAttribute maLine; @@ -84,3 +87,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx index 6ae2084d1d30..d9bb829fa698 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillattribute.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute.hxx,v $ - * - * $Revision: 1.4 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -58,7 +55,7 @@ namespace drawinglayer { namespace attribute { - class SdrFillAttribute + class DRAWINGLAYER_DLLPUBLIC SdrFillAttribute { private: ImpSdrFillAttribute* mpSdrFillAttribute; @@ -97,3 +94,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx index 10408b477317..ab7f003fee4d 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrfillbitmapattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -51,7 +54,7 @@ namespace drawinglayer { namespace attribute { - class SdrFillBitmapAttribute + class DRAWINGLAYER_DLLPUBLIC SdrFillBitmapAttribute { private: ImpSdrFillBitmapAttribute* mpSdrFillBitmapAttribute; @@ -99,3 +102,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRFILLBITMAPATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx index aad8c6ff62ec..03a731c607ba 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlightattribute3d.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute3d.hxx,v $ - * - * $Revision: 1.4 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTATTRIBUTE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -56,7 +53,7 @@ namespace drawinglayer { namespace attribute { - class Sdr3DLightAttribute + class DRAWINGLAYER_DLLPUBLIC Sdr3DLightAttribute { private: ImpSdr3DLightAttribute* mpSdr3DLightAttribute; @@ -94,3 +91,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTATTRIBUTE3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx index b4c84d7cc1b0..8de7688b5199 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlightingattribute3d.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute3d.hxx,v $ - * - * $Revision: 1.4 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTINGATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTINGATTRIBUTE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <vector> @@ -58,7 +55,7 @@ namespace drawinglayer { namespace attribute { - class SdrLightingAttribute + class DRAWINGLAYER_DLLPUBLIC SdrLightingAttribute { private: ImpSdrLightingAttribute* mpSdrLightingAttribute; @@ -97,3 +94,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLIGHTINGATTRIBUTE3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx index 5df511995e9f..6e39600e3dfa 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlineattribute.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute.hxx,v $ - * - * $Revision: 1.4 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINEATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINEATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <basegfx/vector/b2enums.hxx> #include <vector> @@ -57,7 +54,7 @@ namespace drawinglayer { namespace attribute { - class SdrLineAttribute + class DRAWINGLAYER_DLLPUBLIC SdrLineAttribute { private: ImpSdrLineAttribute* mpSdrLineAttribute; @@ -102,3 +99,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINEATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx index 76bd836ac770..02582b56a290 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrlinestartendattribute.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute.hxx,v $ - * - * $Revision: 1.4 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINESTARTENDATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINESTARTENDATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -55,7 +52,7 @@ namespace drawinglayer { namespace attribute { - class SdrLineStartEndAttribute + class DRAWINGLAYER_DLLPUBLIC SdrLineStartEndAttribute { private: ImpSdrLineStartEndAttribute* mpSdrLineStartEndAttribute; @@ -100,3 +97,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRLINESTARTENDATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx index d5ee84e8cfec..f92caa1c8ff1 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrobjectattribute3d.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute3d.hxx,v $ - * - * $Revision: 1.4 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDROBJECTATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDROBJECTATTRIBUTE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <com/sun/star/drawing/NormalsKind.hpp> #include <com/sun/star/drawing/TextureProjectionMode.hpp> @@ -56,7 +53,7 @@ namespace drawinglayer { namespace attribute { - class Sdr3DObjectAttribute + class DRAWINGLAYER_DLLPUBLIC Sdr3DObjectAttribute { private: ImpSdr3DObjectAttribute* mpSdr3DObjectAttribute; @@ -109,3 +106,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDROBJECTATTRIBUTE3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx index 7b25b6c48666..594b4c45de5f 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrsceneattribute3d.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute3d.hxx,v $ - * - * $Revision: 1.4 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSCENEATTRIBUTE3D_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSCENEATTRIBUTE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <com/sun/star/drawing/ProjectionMode.hpp> #include <com/sun/star/drawing/ShadeMode.hpp> @@ -53,7 +50,7 @@ namespace drawinglayer { namespace attribute { - class SdrSceneAttribute + class DRAWINGLAYER_DLLPUBLIC SdrSceneAttribute { private: ImpSdrSceneAttribute* mpSdrSceneAttribute; @@ -92,3 +89,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSCENEATTRIBUTE3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx index 72bdcd2af2c2..9c4b2ececdd9 100644 --- a/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/sdrshadowattribute.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute.hxx,v $ - * - * $Revision: 1.4 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> ////////////////////////////////////////////////////////////////////////////// @@ -56,7 +53,7 @@ namespace drawinglayer { namespace attribute { - class SdrShadowAttribute + class DRAWINGLAYER_DLLPUBLIC SdrShadowAttribute { private: ImpSdrShadowAttribute* mpSdrShadowAttribute; @@ -91,3 +88,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRSHADOWATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx index 0a8213c9bcf2..99e35ceec080 100644 --- a/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx +++ b/drawinglayer/inc/drawinglayer/attribute/strokeattribute.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <vector> @@ -44,7 +47,7 @@ namespace drawinglayer { namespace attribute { - class StrokeAttribute + class DRAWINGLAYER_DLLPUBLIC StrokeAttribute { private: ImpStrokeAttribute* mpStrokeAttribute; @@ -77,3 +80,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_STROKEATTRIBUTE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h b/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h new file mode 100644 index 000000000000..8badcbe1fe82 --- /dev/null +++ b/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h @@ -0,0 +1,45 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * David Tardon, Red Hat Inc. <dtardon@redhat.com> + * Portions created by the Initial Developer are Copyright (C) 2010 the + * Initial Developer. All Rights Reserved. + * + * Major Contributor(s): + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef INCLUDED_DRAWINGLAYER_DRAWINGLAYERDLLAPI_H +#define INCLUDED_DRAWINGLAYER_DRAWINGLAYERDLLAPI_H + +#include <sal/types.h> + +#if defined(DRAWINGLAYER_DLLIMPLEMENTATION) +#define DRAWINGLAYER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define DRAWINGLAYER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define DRAWINGLAYER_DLLPRIVATE SAL_DLLPRIVATE + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx index dd3bce88f25f..0a6b21e66f58 100644 --- a/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx +++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION2D_HXX #define INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + // the solaris compiler defines 'sun' as '1'. To avoid that (and to allow // pre-declarations of com/sun/star namespace), include sal/config.h here // where sun is redefined as 'sun' (so i guess the problem is known). @@ -62,7 +65,7 @@ namespace drawinglayer It is an implementation to support the sequence of PropertyValues used in a ::com::sun::star::graphic::XPrimitive2D for C++ implementations working with those */ - class ViewInformation2D + class DRAWINGLAYER_DLLPUBLIC ViewInformation2D { private: /// pointer to private implementation class @@ -181,3 +184,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx index 5b37c5a2fe50..8364577ee99d 100644 --- a/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx +++ b/drawinglayer/inc/drawinglayer/geometry/viewinformation3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION3D_HXX #define INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + // the solaris compiler defines 'sun' as '1'. To avoid that (and to allow // pre-declarations of com/sun/star namespace), include sal/config.h here // where sun is redefined as 'sun' (so i guess the problem is known). @@ -60,7 +63,7 @@ namespace drawinglayer It is an implementation to support the sequence of PropertyValues used in a ::com::sun::star::graphic::XPrimitive3D for C++ implementations working with those */ - class ViewInformation3D + class DRAWINGLAYER_DLLPUBLIC ViewInformation3D { private: /// pointer to private implementation class @@ -175,3 +178,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_GEOMETRY_VIEWINFORMATION3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx index cc59afbe9534..a43f12f17584 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_ANIMATEDPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_ANIMATEDPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> @@ -57,7 +60,7 @@ namespace drawinglayer for values of [0.0 .. 0.5] the first, else the last entry will be used. This mechanism is not limited to two entries, though. */ - class AnimatedSwitchPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC AnimatedSwitchPrimitive2D : public GroupPrimitive2D { private: /** @@ -114,7 +117,7 @@ namespace drawinglayer decomposition is specialized in delivering the children in the range [0.0.. 0.5] and an empty sequence else */ - class AnimatedBlinkPrimitive2D : public AnimatedSwitchPrimitive2D + class DRAWINGLAYER_DLLPUBLIC AnimatedBlinkPrimitive2D : public AnimatedSwitchPrimitive2D { protected: public: @@ -146,7 +149,7 @@ namespace drawinglayer will be linearly combined from the decomposed values and the animation value to allow a smooth animation. */ - class AnimatedInterpolatePrimitive2D : public AnimatedSwitchPrimitive2D + class DRAWINGLAYER_DLLPUBLIC AnimatedInterpolatePrimitive2D : public AnimatedSwitchPrimitive2D { private: /// the transformations @@ -176,3 +179,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index 3e405ef33804..441abf49f01c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BACKGROUNDCOLORPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BACKGROUNDCOLORPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> @@ -49,7 +52,7 @@ namespace drawinglayer It will try to buffer it's last decomposition using maLastViewport to detect changes in the get2DDecomposition call. */ - class BackgroundColorPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC BackgroundColorPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the fill color to use @@ -91,3 +94,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx index 8ef63d012780..12585e9202ce 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BASEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BASEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <cppuhelper/compbase1.hxx> #include <boost/utility.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> @@ -141,7 +144,7 @@ namespace drawinglayer for view-independent primitives which are defined by not using ViewInformation2D in their get2DDecomposition/getB2DRange implementations. */ - class BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC BasePrimitive2D : private boost::noncopyable, protected comphelper::OBaseMutex, public BasePrimitive2DImplBase @@ -226,7 +229,7 @@ namespace drawinglayer to identify if a new decomposition is needed at the next call (f) return maBuffered2DDecomposition */ - class BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC BufferedDecompositionPrimitive2D : public BasePrimitive2D { private: @@ -269,24 +272,24 @@ namespace drawinglayer namespace primitive2d { /// get B2DRange from a given Primitive2DReference - basegfx::B2DRange getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation); + basegfx::B2DRange DRAWINGLAYER_DLLPUBLIC getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate, const geometry::ViewInformation2D& aViewInformation); /// get B2DRange from a given Primitive2DSequence - basegfx::B2DRange getB2DRangeFromPrimitive2DSequence(const Primitive2DSequence& rCandidate, const geometry::ViewInformation2D& aViewInformation); + basegfx::B2DRange DRAWINGLAYER_DLLPUBLIC getB2DRangeFromPrimitive2DSequence(const Primitive2DSequence& rCandidate, const geometry::ViewInformation2D& aViewInformation); /** compare two Primitive2DReferences for equality, including trying to get implementations (BasePrimitive2D) and using compare operator */ - bool arePrimitive2DReferencesEqual(const Primitive2DReference& rA, const Primitive2DReference& rB); + bool DRAWINGLAYER_DLLPUBLIC arePrimitive2DReferencesEqual(const Primitive2DReference& rA, const Primitive2DReference& rB); /// compare two Primitive2DReferences for equality, uses arePrimitive2DReferencesEqual internally - bool arePrimitive2DSequencesEqual(const Primitive2DSequence& rA, const Primitive2DSequence& rB); + bool DRAWINGLAYER_DLLPUBLIC arePrimitive2DSequencesEqual(const Primitive2DSequence& rA, const Primitive2DSequence& rB); /// concatenate sequence - void appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DSequence& rSource); + void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DSequenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DSequence& rSource); /// concatenate single Primitive2D - void appendPrimitive2DReferenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DReference& rSource); + void DRAWINGLAYER_DLLPUBLIC appendPrimitive2DReferenceToPrimitive2DSequence(Primitive2DSequence& rDest, const Primitive2DReference& rSource); } // end of namespace primitive2d } // end of namespace drawinglayer @@ -297,3 +300,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx index e9cb7a87df80..c3650b3fd23a 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/bitmapprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BITMAPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BITMAPPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <vcl/bitmapex.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -46,7 +49,7 @@ namespace drawinglayer This may change in the future to any other, maybe more general base class providing 24bit RGBA. */ - class BitmapPrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC BitmapPrimitive2D : public BasePrimitive2D { private: /// the RGBA Bitmap-data @@ -85,3 +88,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx index cbad5fc40afc..0bd537de41b3 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,9 +29,12 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/polygon/b2dpolypolygon.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -46,7 +50,7 @@ namespace drawinglayer The LineStart/End overlap is defined by the Extend(Inner|Outer)(Start|End) definitions. */ - class BorderLinePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC BorderLinePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the line definition @@ -59,13 +63,18 @@ namespace drawinglayer double mfRightWidth; /// edge overlap sizes - double mfExtendInnerStart; - double mfExtendInnerEnd; - double mfExtendOuterStart; - double mfExtendOuterEnd; + double mfExtendLeftStart; + double mfExtendLeftEnd; + double mfExtendRightStart; + double mfExtendRightEnd; + + /// the line colors + basegfx::BColor maRGBColorRight; + basegfx::BColor maRGBColorLeft; + basegfx::BColor maRGBColorGap; + bool mbHasGapColor; - /// the line color - basegfx::BColor maRGBColor; + short mnStyle; /// bitfield /// flags to influence inside/outside creation @@ -114,6 +123,8 @@ namespace drawinglayer } protected: + virtual basegfx::B2DPolyPolygon getClipPolygon( ) const; + /// create local decomposition virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; @@ -125,13 +136,15 @@ namespace drawinglayer double fLeftWidth, double fDistance, double fRightWidth, - double fExtendInnerStart, - double fExtendInnerEnd, - double fExtendOuterStart, - double fExtendOuterEnd, - bool bCreateInside, - bool bCreateOutside, - const basegfx::BColor& rRGBColor); + double fExtendLeftStart, + double fExtendLeftEnd, + double fExtendRightStart, + double fExtendRightEnd, + const basegfx::BColor& rRGBColorRight, + const basegfx::BColor& rRGBColorLeft, + const basegfx::BColor& rRGBColorGap, + bool bHasGapColor, + const short nStyle ); /// data read access const basegfx::B2DPoint& getStart() const { return maStart; } @@ -139,13 +152,15 @@ namespace drawinglayer double getLeftWidth() const { return mfLeftWidth; } double getDistance() const { return mfDistance; } double getRightWidth() const { return mfRightWidth; } - double getExtendInnerStart() const { return mfExtendInnerStart; } - double getExtendInnerEnd() const { return mfExtendInnerEnd; } - double getExtendOuterStart() const { return mfExtendOuterStart; } - double getExtendOuterEnd() const { return mfExtendOuterEnd; } - bool getCreateInside() const { return mbCreateInside; } - bool getCreateOutside() const { return mbCreateOutside; } - const basegfx::BColor& getRGBColor() const { return maRGBColor; } + double getExtendLeftStart() const { return mfExtendLeftStart; } + double getExtendLeftEnd() const { return mfExtendLeftEnd; } + double getExtendRightStart() const { return mfExtendRightStart; } + double getExtendRightEnd() const { return mfExtendRightEnd; } + const basegfx::BColor& getRGBColorRight () const { return maRGBColorRight; } + const basegfx::BColor& getRGBColorLeft () const { return maRGBColorLeft; } + const basegfx::BColor& getRGBColorGap () const { return maRGBColorGap; } + bool hasGapColor( ) const { return mbHasGapColor; } + short getStyle () const { return mnStyle; } /// compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const; @@ -162,3 +177,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx index 71c4cc6ffe1e..b32c94291e26 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/chartprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CHARTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CHARTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <com/sun/star/frame/XModel.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -44,7 +47,7 @@ namespace drawinglayer visualisation. It is used to allow specific renderers to do something direct for visualising the chart. */ - class ChartPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ChartPrimitive2D : public GroupPrimitive2D { private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxChartModel; @@ -77,3 +80,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx new file mode 100644 index 000000000000..9c1495b0d582 --- /dev/null +++ b/drawinglayer/inc/drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx @@ -0,0 +1,82 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * [ Novell Inc. ] + * Portions created by the Initial Developer are Copyright (C) 2010 the + * Initial Developer. All Rights Reserved. + * + * Contributor(s): Cédric Bosdonnat <cbosdonnat@novell.com> + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CLIPPEDBORDERLINEPRIMITIVE2D_HXX +#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CLIPPEDBORDERLINEPRIMITIVE2D_HXX + +#include <drawinglayer/drawinglayerdllapi.h> + +#include <drawinglayer/primitive2d/borderlineprimitive2d.hxx> +#include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/polygon/b2dpolygon.hxx> + + +namespace drawinglayer +{ + namespace primitive2d + { + /** BorderLinePrimitive2D clipped by the intersection with a provided + polygon. + */ + class DRAWINGLAYER_DLLPUBLIC ClippedBorderLinePrimitive2D : public BorderLinePrimitive2D + { + private: + const basegfx::B2DPolygon maIntersection; + + protected: + virtual basegfx::B2DPolyPolygon getClipPolygon( ) const; + + public: + /// constructor + ClippedBorderLinePrimitive2D( + const basegfx::B2DPoint& rStart, + const basegfx::B2DPoint& rEnd, + double fLeftWidth, + double fDistance, + double fRightWidth, + const basegfx::B2DPolygon& rIntersection, + const basegfx::BColor& rRGBColorRight, + const basegfx::BColor& rRGBColorLeft, + const basegfx::BColor& rRGBColorGap, + bool bHasGapColor, + const short nStyle ); + + /// compare operator + virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + + /// provide unique ID + DeclPrimitrive2DIDBlock() + }; + } // end of namespace primitive2d +} // end of namespace drawinglayer + + +#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CLIPPEDBORDERLINEPRIMITIVE2D_HXX + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx index 8a8e6d503536..c4999883823e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CONTROLPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_CONTROLPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <com/sun/star/awt/XControlModel.hpp> @@ -46,7 +49,7 @@ namespace drawinglayer representation is limited to a quadratic pixel maximum defined in the applicatin settings. */ - class ControlPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ControlPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// object's base data @@ -118,3 +121,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx index 643a5905ede8..8e33c1530f8d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_DISCRETEBITMAPPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vcl/bitmapex.hxx> @@ -45,7 +48,7 @@ namespace drawinglayer painted in 1:1 pixel resolution. It will never be sheared, rotated or scaled with the view. */ - class DiscreteBitmapPrimitive2D : public ObjectAndViewTransformationDependentPrimitive2D + class DRAWINGLAYER_DLLPUBLIC DiscreteBitmapPrimitive2D : public ObjectAndViewTransformationDependentPrimitive2D { private: /// the RGBA Bitmap-data @@ -83,3 +86,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx index c30bff545ddb..795f4d97b130 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx @@ -28,6 +28,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_QUADRATICSHADOWPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vcl/bitmapex.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -42,7 +44,7 @@ namespace drawinglayer /** DiscreteShadow data class */ - class DiscreteShadow + class DRAWINGLAYER_DLLPUBLIC DiscreteShadow { private: /// the original shadow BitmapEx in a special form @@ -85,7 +87,7 @@ namespace drawinglayer /** DiscreteShadowPrimitive2D class */ - class DiscreteShadowPrimitive2D : public DiscreteMetricDependentPrimitive2D + class DRAWINGLAYER_DLLPUBLIC DiscreteShadowPrimitive2D : public DiscreteMetricDependentPrimitive2D { private: // the object transformation of the rectangular object diff --git a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx index 5b23c6fcfbc0..7862ae261d39 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,7 +104,8 @@ #define PRIMITIVE2D_ID_EPSPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 60) #define PRIMITIVE2D_ID_DISCRETESHADOWPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 61) #define PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 62) -#define PRIMITIVE2D_ID_RENDERGRAPHICPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 63) +#define PRIMITIVE2D_ID_CLIPPEDBORDERLINEPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 63) +#define PRIMITIVE2D_ID_RENDERGRAPHICPRIMITIVE2D (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 64) ////////////////////////////////////////////////////////////////////////////// @@ -111,3 +113,5 @@ ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx index d651af24047d..245a6d1bb8dc 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EMBEDDED3DPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EMBEDDED3DPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> @@ -50,7 +53,7 @@ namespace drawinglayer This primitive will not be visualized and decomposes to a yellow 2D rectangle to visualize that this should never be visualized */ - class Embedded3DPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC Embedded3DPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the sequence of 3d primitives @@ -127,3 +130,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx index 0c286557e0da..a1533a6d5633 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/epsprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EPSPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_EPSPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <vcl/gfxlink.hxx> @@ -40,7 +43,7 @@ namespace drawinglayer namespace primitive2d { /** EpsPrimitive2D class */ - class EpsPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC EpsPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometry definition @@ -86,3 +89,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx index 8af9606bdea5..503ab31d4ff5 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/attribute/fillbitmapattribute.hxx> @@ -52,7 +55,7 @@ namespace drawinglayer decomposition, but on pixel oututs the areas where the tiled pieces are aligned tend to show up (one overlapping or empty pixel) */ - class FillBitmapPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC FillBitmapPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometric definition @@ -93,3 +96,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index 868c5014cfde..2fe971b871ef 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRADIENTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLGRADIENTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> @@ -57,7 +60,7 @@ namespace drawinglayer version is used in the MetafilePrimitive2D decomposition when the old XOR paint was recorded. */ - class FillGradientPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC FillGradientPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometric definition @@ -114,3 +117,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx index 8b09540933ed..f7a37b2f5e3f 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLHATCHPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLHATCHPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/fillhatchattribute.hxx> #include <basegfx/color/bcolor.hxx> @@ -48,7 +51,7 @@ namespace drawinglayer The decomposition will deliver the hatch lines. */ - class FillHatchPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC FillHatchPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometric definition @@ -94,3 +97,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx index 00b44b4515f0..381d69b41fb6 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/graphicprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svtools/grfmgr.hxx> @@ -53,7 +56,7 @@ namespace drawinglayer The primitive geometry area is defined by Transform. */ - class GraphicPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC GraphicPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometric definition @@ -103,3 +106,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx index f8deb0903deb..fda8dd3e9fda 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/gridprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRIDPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRIDPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> @@ -49,7 +52,7 @@ namespace drawinglayer makes this primitive highly view-dependent and it dynamically buffers the last decomposition dependent from the Viewport used. */ - class GridPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC GridPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// The geometry definition for the grid area @@ -124,3 +127,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx index 0e95e7d15f2f..b2bec3c7c818 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/groupprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GROUPPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GROUPPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -69,7 +72,7 @@ namespace drawinglayer - ModifiedColorPrimitive2D (for a stack of color modifications) - TransformPrimitive2D (for a transformation stack) */ - class GroupPrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC GroupPrimitive2D : public BasePrimitive2D { private: /// the children. Declared private since this shall never be changed at all after construction @@ -100,3 +103,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx index e2323765b2e5..26587634eaf1 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/helplineprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HELPLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HELPLINEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -60,7 +63,7 @@ namespace drawinglayer The visualisation uses the two given colors to create a dashed line with the given dash length. */ - class HelplinePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC HelplinePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// Helpline geometry definition @@ -119,3 +122,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx index 08ddd8237688..341effddfc00 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hittestprimitive3d.hxx,v $ - * - * $Revision: 1.1.2.1 $ - * - * last change: $Author: aw $ $Date: 2008/09/24 14:27:39 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HIDDENGEOMETRYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_HIDDENGEOMETRYPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -52,7 +49,7 @@ namespace drawinglayer // filled nor lines' creation criteria. The whole primitive decomposes to nothing, // so no one not knowing it will be influenced. Only helper processors for hit test // (and maybe BoundRect extractors) will use it and it's children subcontent. - class HiddenGeometryPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC HiddenGeometryPrimitive2D : public GroupPrimitive2D { public: HiddenGeometryPrimitive2D(const Primitive2DSequence& rChildren); @@ -77,3 +74,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx index 71b0353623c6..2ef4a4184c92 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/invertprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INVERTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_INVERTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -46,7 +49,7 @@ namespace drawinglayer systems. XOR painting needs read access to the target, so modern graphic systems tend to not support it anymore. */ - class InvertPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC InvertPrimitive2D : public GroupPrimitive2D { public: /// constructor @@ -64,3 +67,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx index b531d5a66f3d..90d2ef9d3c5c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/markerarrayprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MARKERARRAYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MARKERARRAYPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> #include <vcl/bitmapex.hxx> @@ -52,7 +55,7 @@ namespace drawinglayer It decomposes to the needed number of BitmapPrimitive2D's, so it would be efficient to handle it directly in a renderer. */ - class MarkerArrayPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC MarkerArrayPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the positions for the marker @@ -93,3 +96,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx index b74a9212b64e..6f2dced65eef 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/maskprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MASKPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MASKPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -51,7 +54,7 @@ namespace drawinglayer The geometrc range of this primitive is completely defined by the Mask PolyPolygon since by definition nothing outside of the mask is visible. */ - class MaskPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC MaskPrimitive2D : public GroupPrimitive2D { private: /// the mask PolyPolygon @@ -84,3 +87,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx index 408268809c28..bc9dcb9a495e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MEDIAPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MEDIAPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> @@ -47,7 +50,7 @@ namespace drawinglayer background and the decomposition will try to create a graphic representation if te content (defined by the URL), e.g. a still frome for animated stuff. */ - class MediaPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC MediaPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometry definition @@ -98,3 +101,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx index 07ba73fd51f1..77fb8a8cf9d6 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_METAFILEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_METAFILEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <vcl/gdimtf.hxx> @@ -59,7 +62,7 @@ namespace drawinglayer have many advantages; Metafile would no longer have to be rendered by sub-systems and a standard way for converting Metafiles would exist. */ - class MetafilePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC MetafilePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the geometry definition @@ -99,3 +102,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx index fa24b5276959..770ed83fe160 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_MODIFIEDCOLORPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/color/bcolormodifier.hxx> @@ -54,7 +57,7 @@ namespace drawinglayer If a renderer does not handle this primitive, the content will be visualized unchanged. */ - class ModifiedColorPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ModifiedColorPrimitive2D : public GroupPrimitive2D { private: /// The ColorModifier to use @@ -84,3 +87,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index 99a0138699e9..e6d969651a68 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PAGEPREVIEWPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PAGEPREVIEWPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <com/sun/star/drawing/XDrawPage.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -46,7 +49,7 @@ namespace drawinglayer those primitives to be visualized correctly, Your renderer needs to locally correct it's ViewInformation2D to reference the new XDrawPage. */ - class PagePreviewPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PagePreviewPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the XDrawPage visualized by this primitive. When we go forward with primitives @@ -109,3 +112,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx index 47f8345832d7..d6a60fc95b7b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POINTARRAYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POINTARRAYPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> @@ -48,7 +51,7 @@ namespace drawinglayer should proccess it (Currently it is only used for grid visualisation, but this may change). */ - class PointArrayPrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PointArrayPrimitive2D : public BasePrimitive2D { private: /// the array of positions @@ -88,3 +91,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx index ee5de781be86..48acedc4613a 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYGONPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYGONPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/lineattribute.hxx> #include <drawinglayer/attribute/strokeattribute.hxx> @@ -51,7 +54,7 @@ namespace drawinglayer This is one of the non-decomposable primitives, so a renderer should proccess it. */ - class PolygonHairlinePrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonHairlinePrimitive2D : public BasePrimitive2D { private: /// the hairline geometry @@ -98,7 +101,7 @@ namespace drawinglayer It will be decomposed to the needed PolygonHairlinePrimitive2D if not handled directly by a renderer. */ - class PolygonMarkerPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonMarkerPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the marker hairline geometry @@ -160,7 +163,7 @@ namespace drawinglayer and stroke attributes. It will be decomposed dependent on the definition to the needed primitives, e.g. filled PolyPolygons for fat lines. */ - class PolygonStrokePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonStrokePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the line geometry @@ -217,7 +220,7 @@ namespace drawinglayer This primitive defines a waveline based on a PolygonStrokePrimitive2D where the wave is defined by wave width and wave length. */ - class PolygonWavePrimitive2D : public PolygonStrokePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonWavePrimitive2D : public PolygonStrokePrimitive2D { private: /// wave definition @@ -273,7 +276,7 @@ namespace drawinglayer eventually by start and end definitions which are normally used for arrows. */ - class PolygonStrokeArrowPrimitive2D : public PolygonStrokePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolygonStrokeArrowPrimitive2D : public PolygonStrokePrimitive2D { private: /// geometric definitions for line start and end @@ -322,3 +325,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index 4a48ae0d3e59..a8f046ddab6c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYPOLYGONPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_POLYPOLYGONPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/fillbitmapattribute.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -51,7 +54,7 @@ namespace drawinglayer just for convenience. The definition is not different from the single defined PolygonHairlinePrimitive2Ds. */ - class PolyPolygonHairlinePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonHairlinePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the hairline geometry @@ -97,7 +100,7 @@ namespace drawinglayer just for convenience. The definition is not different from the single defined PolygonMarkerPrimitive2Ds. */ - class PolyPolygonMarkerPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonMarkerPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the marker hairline geometry @@ -153,7 +156,7 @@ namespace drawinglayer just for convenience. The definition is not different from the single defined PolygonStrokePrimitive2Ds. */ - class PolyPolygonStrokePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonStrokePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the line geometry @@ -211,7 +214,7 @@ namespace drawinglayer just for convenience. The definition is not different from the single defined PolygonStrokeArrowPrimitive2Ds. */ - class PolyPolygonStrokeArrowPrimitive2D : public PolyPolygonStrokePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonStrokeArrowPrimitive2D : public PolyPolygonStrokePrimitive2D { private: /// geometric definitions for line start and end @@ -267,7 +270,7 @@ namespace drawinglayer This is one of the non-decomposable primitives, so a renderer should proccess it. */ - class PolyPolygonColorPrimitive2D : public BasePrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonColorPrimitive2D : public BasePrimitive2D { private: /// the PolyPolygon geometry @@ -311,7 +314,7 @@ namespace drawinglayer decomosition will create a MaskPrimitive2D containing a FillGradientPrimitive2D. */ - class PolyPolygonGradientPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonGradientPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the PolyPolygon geometry @@ -356,7 +359,7 @@ namespace drawinglayer decomosition will create a MaskPrimitive2D containing a FillHatchPrimitive2D. */ - class PolyPolygonHatchPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonHatchPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the PolyPolygon geometry @@ -406,7 +409,7 @@ namespace drawinglayer (including transparence). The decomosition will create a MaskPrimitive2D containing a FillBitmapPrimitive2D. */ - class PolyPolygonBitmapPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonBitmapPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the PolyPolygon geometry @@ -444,3 +447,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx index e74a051a794f..d8d1423da26c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/primitivetools2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVE2DTOOLS_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_PRIMITIVE2DTOOLS_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -44,7 +47,7 @@ namespace drawinglayer guards the buffered local decomposition and ensures that a create2DDecomposition implementation may use an up-to-date DiscreteUnit accessible using getDiscreteUnit() */ - class DiscreteMetricDependentPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC DiscreteMetricDependentPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the last used fDiscreteUnit definitions for decomposition. Since this @@ -83,7 +86,7 @@ namespace drawinglayer guards the buffered local decomposition and ensures that a create2DDecomposition implementation may use an up-to-date Viewport accessible using getViewport() */ - class ViewportDependentPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ViewportDependentPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the last used Viewport definition for decomposition. Since this @@ -122,7 +125,7 @@ namespace drawinglayer guards the buffered local decomposition and ensures that a create2DDecomposition implementation may use an up-to-date ViewTransformation accessible using getViewTransformation() */ - class ViewTransformationDependentPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ViewTransformationDependentPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the last used ViewTransformation definition for decomposition. Since this @@ -162,7 +165,7 @@ namespace drawinglayer implementation may use an up-to-date ViewTransformation accessible using getViewTransformation() and an object transformation via getObjectTransformation() */ - class ObjectAndViewTransformationDependentPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ObjectAndViewTransformationDependentPrimitive2D : public BufferedDecompositionPrimitive2D { private: /** the last used ViewTransformation and the last ObjectTransformation @@ -197,3 +200,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx index 278a1b0bfff2..2b67fd957ca9 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SCENEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SCENEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> @@ -59,7 +62,7 @@ namespace drawinglayer This is the class a renderer may process directly when he wants to implement an own (e.g. system-specific) 3D renderer. */ - class ScenePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ScenePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the 3D geometry definition @@ -164,3 +167,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx index e27a3b2b7725..0779cbb3a4b2 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrdecompositiontools3d.hxx,v $ - * - * $Revision: 1.5 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:18 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -53,24 +50,24 @@ namespace drawinglayer namespace primitive2d { // helpers to create HitTestPrimitives Line - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DHomMatrix& rMatrix); - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DPolyPolygon& rPolygon); - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DRange& rRange); - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DRange& rRange, const basegfx::B2DHomMatrix& rMatrix); - Primitive2DReference createHiddenGeometryPrimitives2D( + Primitive2DReference DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives2D( bool bFilled, const basegfx::B2DPolyPolygon& rPolygon, const basegfx::B2DHomMatrix& rMatrix); @@ -83,3 +80,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx index 1f7c6aecab08..8f5b479d8b7a 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/shadowprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SHADOWPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_SHADOWPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> @@ -52,7 +55,7 @@ namespace drawinglayer are needed for the shadow itself; all the local decompositions of the original geometry can be reused from the renderer for shadow visualisation. */ - class ShadowPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC ShadowPrimitive2D : public GroupPrimitive2D { private: /// the shadow transformation, normally just an offset @@ -93,3 +96,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx index 247df9a7dd13..23970f580baa 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/structuretagprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_STRUCTURETAGPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_STRUCTURETAGPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <vcl/pdfwriter.hxx> @@ -49,7 +52,7 @@ namespace drawinglayer If a renderer ignores this, it just decomposes to it's child content. */ - class StructureTagPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC StructureTagPrimitive2D : public GroupPrimitive2D { private: /// the PDF structure element this grouping represents @@ -76,3 +79,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index 5c1093bc333a..57c6c748f21b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTDECORATEDPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTDECORATEDPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> @@ -55,7 +58,7 @@ namespace drawinglayer a TextSimplePortionPrimitive2D and all the contained decorations (if used) as geometry. */ - class TextDecoratedPortionPrimitive2D : public TextSimplePortionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextDecoratedPortionPrimitive2D : public TextSimplePortionPrimitive2D { private: /// decoration definitions @@ -155,3 +158,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx index 3adae8615db7..6770ecb96b5d 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/texteffectprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTEFFECTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTEFFECTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -53,7 +56,7 @@ namespace drawinglayer also be used for any other primitives) which have some TextEffect applied and create the needed geometry and embedding on decomposition. */ - class TextEffectPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextEffectPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// the text (or other) content @@ -111,3 +114,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx index 5beed89a9ac6..8d3100bf7ff1 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textenumsprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTENUMSPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTENUMSPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <vcl/vclenum.hxx> @@ -64,8 +67,8 @@ namespace drawinglayer }; /** helper to convert LineStyle */ - TextLine mapFontUnderlineToTextLine(FontUnderline eLineStyle); - FontUnderline mapTextLineToFontUnderline(TextLine eLineStyle); + TextLine DRAWINGLAYER_DLLPUBLIC mapFontUnderlineToTextLine(FontUnderline eLineStyle); + FontUnderline DRAWINGLAYER_DLLPUBLIC mapTextLineToFontUnderline(TextLine eLineStyle); /** FontStrikeout definition */ enum TextStrikeout @@ -79,8 +82,8 @@ namespace drawinglayer }; /** helper to convert FontStrikeout */ - TextStrikeout mapFontStrikeoutToTextStrikeout(::FontStrikeout eFontStrikeout); - ::FontStrikeout mapTextStrikeoutToFontStrikeout(TextStrikeout eFontStrikeout); + TextStrikeout DRAWINGLAYER_DLLPUBLIC mapFontStrikeoutToTextStrikeout(::FontStrikeout eFontStrikeout); + ::FontStrikeout DRAWINGLAYER_DLLPUBLIC mapTextStrikeoutToFontStrikeout(TextStrikeout eFontStrikeout); /** TextEmphasisMark definition */ enum TextEmphasisMark @@ -109,3 +112,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx index 4ce00205f49f..bf9ed2c5e41f 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTHIERARCHYPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTHIERARCHYPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <tools/string.hxx> @@ -46,7 +49,7 @@ namespace drawinglayer This primitive encapsulates text lines. */ - class TextHierarchyLinePrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyLinePrimitive2D : public GroupPrimitive2D { private: public: @@ -69,7 +72,7 @@ namespace drawinglayer This primitive encapsulates text bullets. */ - class TextHierarchyBulletPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyBulletPrimitive2D : public GroupPrimitive2D { private: public: @@ -92,7 +95,7 @@ namespace drawinglayer This primitive encapsulates text paragraphs. */ - class TextHierarchyParagraphPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyParagraphPrimitive2D : public GroupPrimitive2D { private: public: @@ -115,7 +118,7 @@ namespace drawinglayer This primitive encapsulates text blocks. */ - class TextHierarchyBlockPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyBlockPrimitive2D : public GroupPrimitive2D { private: public: @@ -156,7 +159,7 @@ namespace drawinglayer type. Also added is a String which is type-dependent. E.g. for URL fields, it contains the URL. */ - class TextHierarchyFieldPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyFieldPrimitive2D : public GroupPrimitive2D { private: FieldType meType; @@ -198,7 +201,7 @@ namespace drawinglayer content. To suppress, this primitive needs to be parsed by the renderer without taking any action. */ - class TextHierarchyEditPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextHierarchyEditPrimitive2D : public GroupPrimitive2D { private: public: @@ -217,3 +220,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx index 3325e25dc913..1a3fa97bae73 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textlayoutdevice.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX #define INCLUDED_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <sal/types.h> #include <tools/solar.h> #include <tools/poly.hxx> @@ -66,7 +69,7 @@ namespace drawinglayer When in the future FontHandling may move to an own library independent from VCL, primitives will be prepared. */ - class TextLayouterDevice + class DRAWINGLAYER_DLLPUBLIC TextLayouterDevice { /// internally used VirtualDevice VirtualDevice& mrDevice; @@ -138,7 +141,7 @@ namespace drawinglayer both defines FontStretching, where no stretching happens at fFontScaleY == fFontScaleX */ - Font getVclFontFromFontAttribute( + Font DRAWINGLAYER_DLLPUBLIC getVclFontFromFontAttribute( const attribute::FontAttribute& rFontAttribute, double fFontScaleX, double fFontScaleY, @@ -150,7 +153,7 @@ namespace drawinglayer above) will be set in return parameter o_rSize to allow further processing */ - attribute::FontAttribute getFontAttributeFromVclFont( + attribute::FontAttribute DRAWINGLAYER_DLLPUBLIC getFontAttributeFromVclFont( basegfx::B2DVector& o_rSize, const Font& rFont, bool bRTL, @@ -162,3 +165,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// #endif //_DRAWINGLAYER_TEXTLAYOUTDEVICE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx index de364ccc128a..08b184e7208c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textlineprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTLINEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTLINEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -39,7 +42,7 @@ namespace drawinglayer { namespace primitive2d { - class TextLinePrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextLinePrimitive2D : public BufferedDecompositionPrimitive2D { private: /// geometric definitions @@ -89,3 +92,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx index 6c67bded2b17..c48f18b32c31 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <tools/string.hxx> @@ -100,7 +103,7 @@ namespace drawinglayer @param rFontColor The font color to use */ - class TextSimplePortionPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextSimplePortionPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// text transformation (FontCoordinateSystem) @@ -129,6 +132,8 @@ namespace drawinglayer /// #i96669# internal: add simple range buffering for this primitive basegfx::B2DRange maB2DRange; + bool mbFilled; // Whether to fill a given width with the text + long mnWidthToFill; // the width to fill protected: /// local decomposition. @@ -144,7 +149,9 @@ namespace drawinglayer const ::std::vector< double >& rDXArray, const attribute::FontAttribute& rFontAttribute, const ::com::sun::star::lang::Locale& rLocale, - const basegfx::BColor& rFontColor); + const basegfx::BColor& rFontColor, + bool bFilled = false, + long nWidthToFill = 0); /// helpers /** get text outlines as polygons and their according ObjectTransformation. Handles all @@ -161,6 +168,8 @@ namespace drawinglayer const attribute::FontAttribute& getFontAttribute() const { return maFontAttribute; } const ::com::sun::star::lang::Locale& getLocale() const { return maLocale; } const basegfx::BColor& getFontColor() const { return maFontColor; } + bool isFilled() const { return mbFilled; } + long getWidthToFill() const { return mnWidthToFill; } /// compare operator virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; @@ -173,7 +182,7 @@ namespace drawinglayer }; /// small helper to have a compare operator for Locale - bool LocalesAreEqual(const ::com::sun::star::lang::Locale& rA, const ::com::sun::star::lang::Locale& rB); + bool DRAWINGLAYER_DLLPUBLIC LocalesAreEqual(const ::com::sun::star::lang::Locale& rA, const ::com::sun::star::lang::Locale& rB); } // end of namespace primitive2d } // end of namespace drawinglayer @@ -184,3 +193,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx index 4ee3bc34c359..401b00176c0c 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTSTRIKEOUTPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTSTRIKEOUTPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/textenumsprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -41,7 +44,7 @@ namespace drawinglayer { namespace primitive2d { - class BaseTextStrikeoutPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC BaseTextStrikeoutPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// geometric definitions @@ -75,7 +78,7 @@ namespace drawinglayer { namespace primitive2d { - class TextCharacterStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextCharacterStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D { private: sal_Unicode maStrikeoutChar; @@ -116,7 +119,7 @@ namespace drawinglayer { namespace primitive2d { - class TextGeometryStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TextGeometryStrikeoutPrimitive2D : public BaseTextStrikeoutPrimitive2D { private: double mfHeight; @@ -157,3 +160,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx index c488a883a9ce..8f2a7daafc4e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/transformprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSFORMPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSFORMPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -56,7 +59,7 @@ namespace drawinglayer different, transformed states without the need to create those thousand primitive contents. */ - class TransformPrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TransformPrimitive2D : public GroupPrimitive2D { private: // the transformation to apply to the child geometry @@ -89,3 +92,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx index 85032d0bd202..f6141884dc9b 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/transparenceprimitive2d.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: alphaprimitive2d.hxx,v $ - * - * $Revision: 1.3 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:16 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSPARENCEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TRANSPARENCEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -61,7 +58,7 @@ namespace drawinglayer rendering, not the transparent one. The transparent one should/will be clipped accordingly. */ - class TransparencePrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC TransparencePrimitive2D : public GroupPrimitive2D { private: /// The transparence-Mask who's RGB-Values are interpreted as Luminance @@ -101,3 +98,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx index 52f3747ddba2..94a95785638e 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: UnifiedTransparencePrimitive2D.hxx,v $ - * - * $Revision: 1.3 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:17 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_UNIFIEDTRANSPARENCEPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_UNIFIEDTRANSPARENCEPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/groupprimitive2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -53,7 +50,7 @@ namespace drawinglayer regions of combined transparency, but be all rendered with the defined, single transparency. */ - class UnifiedTransparencePrimitive2D : public GroupPrimitive2D + class DRAWINGLAYER_DLLPUBLIC UnifiedTransparencePrimitive2D : public GroupPrimitive2D { private: /// the unified transparence @@ -89,3 +86,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx index 1914b3b33fe6..aa0fb20e8e03 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/wallpaperprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WALLPAPERPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WALLPAPERPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/primitivetools2d.hxx> #include <vcl/bitmapex.hxx> #include <vcl/wall.hxx> @@ -51,7 +54,7 @@ namespace drawinglayer layouting which is dependent from WallpaperStyle; thus it does not need to be handled anywhere else in the future. */ - class WallpaperBitmapPrimitive2D : public ViewTransformationDependentPrimitive2D + class DRAWINGLAYER_DLLPUBLIC WallpaperBitmapPrimitive2D : public ViewTransformationDependentPrimitive2D { private: basegfx::B2DRange maObjectRange; @@ -92,3 +95,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx index daf134771f30..31ac1a7d7b80 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/wrongspellprimitive2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WRONGSPELLPRIMITIVE2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_WRONGSPELLPRIMITIVE2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -53,7 +56,7 @@ namespace drawinglayer The geometric definition defines a line on the X-Axis (no Y-coordinates) which will when transformed by Transformation, create the coordinate data. */ - class WrongSpellPrimitive2D : public BufferedDecompositionPrimitive2D + class DRAWINGLAYER_DLLPUBLIC WrongSpellPrimitive2D : public BufferedDecompositionPrimitive2D { private: /// geometry definition @@ -97,3 +100,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx index f3b5c418f12c..02c7eb598329 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_BASEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_BASEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <cppuhelper/compbase1.hxx> #include <boost/utility.hpp> #include <com/sun/star/graphic/XPrimitive3D.hpp> @@ -82,7 +85,7 @@ namespace drawinglayer That's all for 3D! */ - class BasePrimitive3D + class DRAWINGLAYER_DLLPUBLIC BasePrimitive3D : private boost::noncopyable, protected comphelper::OBaseMutex, public BasePrimitive3DImplBase @@ -147,7 +150,7 @@ namespace drawinglayer The description/functionality is identical with the 2D case in baseprimitive2d.hxx, please see there for detailed information */ - class BufferedDecompositionPrimitive3D + class DRAWINGLAYER_DLLPUBLIC BufferedDecompositionPrimitive3D : public BasePrimitive3D { private: @@ -190,24 +193,24 @@ namespace drawinglayer namespace primitive3d { /// get B3DRange from a given Primitive3DReference - basegfx::B3DRange getB3DRangeFromPrimitive3DReference(const Primitive3DReference& rCandidate, const geometry::ViewInformation3D& aViewInformation); + basegfx::B3DRange DRAWINGLAYER_DLLPUBLIC getB3DRangeFromPrimitive3DReference(const Primitive3DReference& rCandidate, const geometry::ViewInformation3D& aViewInformation); /// get range3D from a given Primitive3DSequence - basegfx::B3DRange getB3DRangeFromPrimitive3DSequence(const Primitive3DSequence& rCandidate, const geometry::ViewInformation3D& aViewInformation); + basegfx::B3DRange DRAWINGLAYER_DLLPUBLIC getB3DRangeFromPrimitive3DSequence(const Primitive3DSequence& rCandidate, const geometry::ViewInformation3D& aViewInformation); /** compare two Primitive2DReferences for equality, including trying to get implementations (BasePrimitive2D) and using compare operator */ - bool arePrimitive3DReferencesEqual(const Primitive3DReference& rA, const Primitive3DReference& rB); + bool DRAWINGLAYER_DLLPUBLIC arePrimitive3DReferencesEqual(const Primitive3DReference& rA, const Primitive3DReference& rB); /// compare two Primitive3DReferences for equality, uses arePrimitive3DReferencesEqual internally - bool arePrimitive3DSequencesEqual(const Primitive3DSequence& rA, const Primitive3DSequence& rB); + bool DRAWINGLAYER_DLLPUBLIC arePrimitive3DSequencesEqual(const Primitive3DSequence& rA, const Primitive3DSequence& rB); /// concatenate sequence - void appendPrimitive3DSequenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DSequence& rSource); + void DRAWINGLAYER_DLLPUBLIC appendPrimitive3DSequenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DSequence& rSource); /// concatenate single Primitive3D - void appendPrimitive3DReferenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DReference& rSource); + void DRAWINGLAYER_DLLPUBLIC appendPrimitive3DReferenceToPrimitive3DSequence(Primitive3DSequence& rDest, const Primitive3DReference& rSource); } // end of namespace primitive3d } // end of namespace drawinglayer @@ -218,3 +221,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx index 71db55657b3b..0255cf3ddb3b 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,5 @@ ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx index a61c36b8bd8a..0c93b4295071 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_GROUPPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_GROUPPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/baseprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -55,7 +58,7 @@ namespace drawinglayer - HatchTexturePrimitive3D (for 3D hatch fill) - TransformPrimitive3D (for a transformation stack) */ - class GroupPrimitive3D : public BasePrimitive3D + class DRAWINGLAYER_DLLPUBLIC GroupPrimitive3D : public BasePrimitive3D { private: /// the children. Declared private since this shall never be changed at all after construction @@ -86,3 +89,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx index b986c12adad3..586a590d3d74 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HATCHTEXTUREPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/textureprimitive3d.hxx> #include <drawinglayer/attribute/fillhatchattribute.hxx> @@ -44,7 +47,7 @@ namespace drawinglayer primitive has no default buffering, it is necessary here to add a local buffering mechanism for the decomposition */ - class HatchTexturePrimitive3D : public TexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC HatchTexturePrimitive3D : public TexturePrimitive3D { private: /// the hatch definition @@ -91,3 +94,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx index 287bfcc689e4..bb9ab4f1352d 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hittestprimitive3d.hxx,v $ - * - * $Revision: 1.1.2.1 $ - * - * last change: $Author: aw $ $Date: 2008/09/24 14:27:39 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -36,6 +31,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_HIDDENGEOMETRYPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/groupprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -54,7 +51,7 @@ namespace drawinglayer // decomposes to nothing, so no one not knowing it will be influenced. Only // helper processors for hit test (and maybe BoundRect extractors) will // use it and it's children subcontent. - class HiddenGeometryPrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC HiddenGeometryPrimitive3D : public GroupPrimitive3D { public: HiddenGeometryPrimitive3D(const Primitive3DSequence& rChildren); @@ -79,3 +76,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx index 12082a95bfc9..61e5123baf61 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_MODIFIEDCOLORPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_MODIFIEDCOLORPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <basegfx/color/bcolormodifier.hxx> @@ -44,7 +47,7 @@ namespace drawinglayer visualisation. Please see the ModifiedColorPrimitive2D description for more info. */ - class ModifiedColorPrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC ModifiedColorPrimitive3D : public GroupPrimitive3D { private: /// The ColorModifier to use @@ -74,3 +77,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx index 23b318c520d2..bae55721ebdb 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <basegfx/color/bcolor.hxx> #include <basegfx/polygon/b3dpolygon.hxx> @@ -48,7 +51,7 @@ namespace drawinglayer This is one of the non-decomposable 3D primitives, so a renderer should proccess it. */ - class PolygonHairlinePrimitive3D : public BasePrimitive3D + class DRAWINGLAYER_DLLPUBLIC PolygonHairlinePrimitive3D : public BasePrimitive3D { private: /// the hairline geometry @@ -91,7 +94,7 @@ namespace drawinglayer and stroke attributes. It will be decomposed dependent on the definition to the needed primitives, e.g. filled Tubes for fat lines. */ - class PolygonStrokePrimitive3D : public BufferedDecompositionPrimitive3D + class DRAWINGLAYER_DLLPUBLIC PolygonStrokePrimitive3D : public BufferedDecompositionPrimitive3D { private: /// the line geometry @@ -139,3 +142,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index 76fb7b99c909..4666f3d61b1d 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYGONTUBEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/polygonprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -51,7 +54,7 @@ namespace drawinglayer 3D objects needed for the line tubes and the edge roundings in full 3D. */ - class PolygonTubePrimitive3D : public PolygonHairlinePrimitive3D + class DRAWINGLAYER_DLLPUBLIC PolygonTubePrimitive3D : public PolygonHairlinePrimitive3D { private: /// hold the last decompositon since it's expensive @@ -109,3 +112,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index fae21dd4b198..c9d6a650e9f3 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYPOLYGONPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_POLYPOLYGONPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <basegfx/polygon/b3dpolypolygon.hxx> #include <drawinglayer/attribute/materialattribute3d.hxx> @@ -46,7 +49,7 @@ namespace drawinglayer It is assumed here that the PolyPolgon is a single plane in 3D. */ - class PolyPolygonMaterialPrimitive3D : public BasePrimitive3D + class DRAWINGLAYER_DLLPUBLIC PolyPolygonMaterialPrimitive3D : public BasePrimitive3D { private: /// the PolyPolygon geometry @@ -88,3 +91,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index f1f680e11574..a63322b5e29a 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRCUBEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRCUBEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -42,7 +45,7 @@ namespace drawinglayer The cube is implicitely in unit coordinates and the given transformation defines it's geometry in space. */ - class SdrCubePrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrCubePrimitive3D : public SdrPrimitive3D { protected: /// local decomposition. @@ -74,3 +77,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx index 4ccd863de69f..512f1c5b6a91 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <com/sun/star/drawing/TextureProjectionMode.hpp> #include <vector> @@ -57,25 +60,25 @@ namespace drawinglayer namespace primitive3d { // #i98295# - basegfx::B3DRange getRangeFrom3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); - void applyNormalsKindSphereTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange); - void applyNormalsKindFlatTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); - void applyNormalsInvertTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); + basegfx::B3DRange DRAWINGLAYER_DLLPUBLIC getRangeFrom3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); + void DRAWINGLAYER_DLLPUBLIC applyNormalsKindSphereTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange); + void DRAWINGLAYER_DLLPUBLIC applyNormalsKindFlatTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); + void DRAWINGLAYER_DLLPUBLIC applyNormalsInvertTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); // #i98314# - void applyTextureTo3DGeometry( + void DRAWINGLAYER_DLLPUBLIC applyTextureTo3DGeometry( ::com::sun::star::drawing::TextureProjectionMode eModeX, ::com::sun::star::drawing::TextureProjectionMode eModeY, ::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange, const basegfx::B2DVector& rTextureSize); - Primitive3DSequence create3DPolyPolygonLinePrimitives( + Primitive3DSequence DRAWINGLAYER_DLLPUBLIC create3DPolyPolygonLinePrimitives( const basegfx::B3DPolyPolygon& rUnitPolyPolygon, const basegfx::B3DHomMatrix& rObjectTransform, const attribute::SdrLineAttribute& rLine); - Primitive3DSequence create3DPolyPolygonFillPrimitives( + Primitive3DSequence DRAWINGLAYER_DLLPUBLIC create3DPolyPolygonFillPrimitives( const ::std::vector< basegfx::B3DPolyPolygon >& r3DPolyPolygonVector, const basegfx::B3DHomMatrix& rObjectTransform, const basegfx::B2DVector& rTextureSize, @@ -83,12 +86,12 @@ namespace drawinglayer const attribute::SdrFillAttribute& rFill, const attribute::FillGradientAttribute& rFillGradient); - Primitive3DSequence createShadowPrimitive3D( + Primitive3DSequence DRAWINGLAYER_DLLPUBLIC createShadowPrimitive3D( const Primitive3DSequence& rSource, const attribute::SdrShadowAttribute& rShadow, bool bShadow3D); - Primitive3DSequence createHiddenGeometryPrimitives3D( + Primitive3DSequence DRAWINGLAYER_DLLPUBLIC createHiddenGeometryPrimitives3D( const ::std::vector< basegfx::B3DPolyPolygon >& r3DPolyPolygonVector, const basegfx::B3DHomMatrix& rObjectTransform, const basegfx::B2DVector& rTextureSize, @@ -102,3 +105,5 @@ namespace drawinglayer #endif //_DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx index 257c0029b475..bf72befcd0bc 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <basegfx/polygon/b3dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <vector> @@ -54,7 +57,7 @@ namespace drawinglayer }; /// class to hold one Slice3D - class Slice3D + class DRAWINGLAYER_DLLPUBLIC Slice3D { protected: basegfx::B3DPolyPolygon maPolyPolygon; @@ -88,7 +91,7 @@ namespace drawinglayer typedef ::std::vector< Slice3D > Slice3DVector; /// helpers for creation - void createLatheSlices( + void DRAWINGLAYER_DLLPUBLIC createLatheSlices( Slice3DVector& rSliceVector, const basegfx::B2DPolyPolygon& rSource, double fBackScale, @@ -99,7 +102,7 @@ namespace drawinglayer bool bCloseFront, bool bCloseBack); - void createExtrudeSlices( + void DRAWINGLAYER_DLLPUBLIC createExtrudeSlices( Slice3DVector& rSliceVector, const basegfx::B2DPolyPolygon& rSource, double fBackScale, @@ -110,10 +113,10 @@ namespace drawinglayer bool bCloseBack); /// helpers for geometry extraction - basegfx::B3DPolyPolygon extractHorizontalLinesFromSlice(const Slice3DVector& rSliceVector, bool bCloseHorLines); - basegfx::B3DPolyPolygon extractVerticalLinesFromSlice(const Slice3DVector& rSliceVector); + basegfx::B3DPolyPolygon DRAWINGLAYER_DLLPUBLIC extractHorizontalLinesFromSlice(const Slice3DVector& rSliceVector, bool bCloseHorLines); + basegfx::B3DPolyPolygon DRAWINGLAYER_DLLPUBLIC extractVerticalLinesFromSlice(const Slice3DVector& rSliceVector); - void extractPlanesFromSlice( + void DRAWINGLAYER_DLLPUBLIC extractPlanesFromSlice( ::std::vector< basegfx::B3DPolyPolygon >& rFill, const Slice3DVector& rSliceVector, bool bCreateNormals, @@ -126,7 +129,7 @@ namespace drawinglayer bool bCreateTextureCoordinates, const basegfx::B2DHomMatrix& rTexTransform); - void createReducedOutlines( + void DRAWINGLAYER_DLLPUBLIC createReducedOutlines( const geometry::ViewInformation3D& rViewInformation, const basegfx::B3DHomMatrix& rObjectTransform, const basegfx::B3DPolygon& rLoopA, @@ -141,3 +144,5 @@ namespace drawinglayer #endif //_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 254254a0055c..22ab9b358416 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -48,7 +51,7 @@ namespace drawinglayer The decomposition will create all necessary 3D planes for visualisation. */ - class SdrExtrudePrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrExtrudePrimitive3D : public SdrPrimitive3D { private: /// geometry helper for slices @@ -134,3 +137,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index 28a483a5b5b2..aa21580d364f 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRLATHEPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRLATHEPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -48,7 +51,7 @@ namespace drawinglayer The decomposition will create all necessary 3D planes for visualisation. */ - class SdrLathePrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrLathePrimitive3D : public SdrPrimitive3D { private: /// geometry helper for slices @@ -152,3 +155,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx index 5c2a4e6b2575..450b6a7ec61a 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPOLYPOLYGONPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPOLYPOLYGONPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -46,7 +49,7 @@ namespace drawinglayer The decomposition will include all needed 3D data for visualisation, including FatLines and fill styles. */ - class SdrPolyPolygonPrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrPolyPolygonPrimitive3D : public SdrPrimitive3D { private: /// the planar polyPolygon evtl with normals and texture coordinates @@ -86,3 +89,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx index fbef979d4b92..0f3b66fb6308 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> #include <basegfx/vector/b2dvector.hxx> @@ -47,7 +50,7 @@ namespace drawinglayer */ namespace primitive3d { - class SdrPrimitive3D : public BufferedDecompositionPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrPrimitive3D : public BufferedDecompositionPrimitive3D { private: /// object surface attributes @@ -93,3 +96,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx index 510c29b4de07..919cbefd5a33 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRSPHEREPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SDRSPHEREPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/sdrprimitive3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -42,7 +45,7 @@ namespace drawinglayer The sphere is implicitely in unit coordinates and the given transformation defines it's geometry in space. */ - class SdrSpherePrimitive3D : public SdrPrimitive3D + class DRAWINGLAYER_DLLPUBLIC SdrSpherePrimitive3D : public SdrPrimitive3D { private: /// additional geometry definitions @@ -85,3 +88,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx index b519dd1b2931..d72e83493267 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolor.hxx> @@ -48,7 +51,7 @@ namespace drawinglayer combined with the scene and camera definition to create the correct projected shadow 2D-Polygons. */ - class ShadowPrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC ShadowPrimitive3D : public GroupPrimitive3D { protected: /// 2D shadow definition @@ -89,3 +92,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx index a2e57da2cf1a..8c816733d36c 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <drawinglayer/attribute/fillbitmapattribute.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -46,7 +49,7 @@ namespace drawinglayer 3d geometry by embedding it. It is used as bae class for extended texture definitions */ - class TexturePrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC TexturePrimitive3D : public GroupPrimitive3D { private: /// texture geometry definition @@ -90,7 +93,7 @@ namespace drawinglayer transparence texture definition. All 3D primitives embedded here will be shown with the given transparency. */ - class UnifiedTransparenceTexturePrimitive3D : public TexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC UnifiedTransparenceTexturePrimitive3D : public TexturePrimitive3D { private: /// transparency definition @@ -132,7 +135,7 @@ namespace drawinglayer definition. All 3D primitives embedded here will be shown with the defined gradient. */ - class GradientTexturePrimitive3D : public TexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC GradientTexturePrimitive3D : public TexturePrimitive3D { private: /// the gradient definition @@ -171,7 +174,7 @@ namespace drawinglayer definition. All 3D primitives embedded here will be shown with the defined bitmap (maybe tiled if defined). */ - class BitmapTexturePrimitive3D : public TexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC BitmapTexturePrimitive3D : public TexturePrimitive3D { private: /// bitmap fill attribute @@ -211,7 +214,7 @@ namespace drawinglayer that gradient will be interpreted as luminance Transparence-Values. All 3D primitives embedded here will be shown with the defined transparence. */ - class TransparenceTexturePrimitive3D : public GradientTexturePrimitive3D + class DRAWINGLAYER_DLLPUBLIC TransparenceTexturePrimitive3D : public GradientTexturePrimitive3D { public: /// constructor @@ -235,3 +238,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx index 903a01881ed4..d559fab5048c 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TRANSFORMPRIMITIVE3D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE3D_TRANSFORMPRIMITIVE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> @@ -46,7 +49,7 @@ namespace drawinglayer Please see the description for TransformPrimitive2D since these primitives are pretty similar. */ - class TransformPrimitive3D : public GroupPrimitive3D + class DRAWINGLAYER_DLLPUBLIC TransformPrimitive3D : public GroupPrimitive3D { private: // the 3D transformation to apply @@ -79,3 +82,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx index d93fb68c932c..bbe54c03a6dd 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/baseprocessor2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> @@ -159,7 +162,7 @@ namespace drawinglayer be helpful to add many for the purpose not interesting higher level primitives to not force their decomposition to be created and/or parsed. */ - class BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC BaseProcessor2D { private: /// The ViewInformation2D itself. It's private to isolate accesses to it @@ -197,44 +200,8 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// -namespace drawinglayer -{ - namespace processor2d - { - /** CollectingProcessor2D class - - A processor which just collects all primitives given to it in - process(..) calls to maPrimitive2DSequence. This can e.g. be used to - hand around as instance over various methods where every called - method can add graphic content to it. - */ - class CollectingProcessor2D : public BaseProcessor2D - { - private: - primitive2d::Primitive2DSequence maPrimitive2DSequence; - - public: - CollectingProcessor2D(const geometry::ViewInformation2D& rViewInformation); - virtual ~CollectingProcessor2D(); - - /// the central processing method - virtual void process(const primitive2d::Primitive2DSequence& rSource); - - /// helpers for adding to local sequence - void appendPrimitive2DReference(const primitive2d::Primitive2DReference& rSource) - { - primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(maPrimitive2DSequence, rSource); - } - - /// data access and reset - const primitive2d::Primitive2DSequence& getPrimitive2DSequence() const { return maPrimitive2DSequence; } - void reset() { maPrimitive2DSequence = primitive2d::Primitive2DSequence(); } - }; - } // end of namespace processor2d -} // end of namespace drawinglayer - -////////////////////////////////////////////////////////////////////////////// - #endif //INCLUDED_DRAWINGLAYER_PROCESSOR2D_BASEPROCESSOR2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx index d218b7737c2b..4dedb400d563 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/canvasprocessor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef _DRAWINGLAYER_PROCESSOR_CANVASPROCESSOR_HXX #define _DRAWINGLAYER_PROCESSOR_CANVASPROCESSOR_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolormodifier.hxx> @@ -74,7 +77,7 @@ namespace drawinglayer A basic implementation of a renderer for com::sun::star::rendering::XCanvas as a target */ - class canvasProcessor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC canvasProcessor2D : public BaseProcessor2D { private: // The Pixel renderer resets the original MapMode from the OutputDevice. @@ -132,3 +135,5 @@ namespace drawinglayer #endif //_DRAWINGLAYER_PROCESSOR_CANVASPROCESSOR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx index 9ec44d324187..e0b95eb6c450 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/contourextractor2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_CONTOUREXTRACTOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_CONTOUREXTRACTOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -43,7 +46,7 @@ namespace drawinglayer A processor who extracts the contour of the primtives feeded to it in the single local PolyPolygon */ - class ContourExtractor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC ContourExtractor2D : public BaseProcessor2D { private: /// the extracted contour @@ -66,3 +69,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_CONTOUREXTRACTOR2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx index be0b40ff2139..96da21a9b6d3 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/hittestprocessor2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_HITTESTPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_HITTESTPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/baseprocessor2d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -48,7 +51,7 @@ namespace drawinglayer This processor implements a HitTest with the feeded primitives, given tolerance and extras */ - class HitTestProcessor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC HitTestProcessor2D : public BaseProcessor2D { private: /// discrete HitTest position @@ -112,3 +115,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_HITTESTPROCESSOR2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx index 9ea9313c8743..66c0a52021ce 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/linegeometryextractor2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_LINEGEOMETRYEXTRACTOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_LINEGEOMETRYEXTRACTOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -42,7 +45,7 @@ namespace drawinglayer This processor can extract the line geometry from feeded primpitives. The hairlines and the fille geometry from fat lines are separated. */ - class LineGeometryExtractor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC LineGeometryExtractor2D : public BaseProcessor2D { private: std::vector< basegfx::B2DPolygon > maExtractedHairlines; @@ -69,3 +72,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_LINEGEOMETRYEXTRACTOR2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx index 2fa0bc47862c..3dbb9d17a0a5 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/textaspolygonextractor2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_TEXTASPOLYGONEXTRACTOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_TEXTASPOLYGONEXTRACTOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/color/bcolor.hxx> @@ -72,7 +75,7 @@ namespace drawinglayer This processor extracts text in the feeded primitives to filled polygons */ - class TextAsPolygonExtractor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC TextAsPolygonExtractor2D : public BaseProcessor2D { private: // extraction target @@ -102,3 +105,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_TEXTASPOLYGONEXTRACTOR2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx index db5a70e9b4d7..b28b1da17519 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclmetafileprocessor2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLMETAFILEPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLMETAFILEPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -75,7 +78,7 @@ namespace drawinglayer and the extra-data added to it (which can be seen mostly as 'extensions' or simply as 'hacks'). */ - class VclMetafileProcessor2D : public VclProcessor2D + class DRAWINGLAYER_DLLPUBLIC VclMetafileProcessor2D : public VclProcessor2D { private: /// local helper(s) @@ -152,3 +155,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLMETAFILEPROCESSOR2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx index a237f5d289d7..8ee535ac652d 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPIXELPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPIXELPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <vcl/outdev.hxx> @@ -43,7 +46,7 @@ namespace drawinglayer all feeded primitives to a VCL Window. It is the currently used renderer for all VCL editing output from the DrawingLayer. */ - class VclPixelProcessor2D : public VclProcessor2D + class DRAWINGLAYER_DLLPUBLIC VclPixelProcessor2D : public VclProcessor2D { private: /* The Pixel renderer resets the original MapMode from the OutputDevice. @@ -75,3 +78,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPIXELPROCESSOR2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx index 9e9a827d2518..fe615f3a4cb6 100644 --- a/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx +++ b/drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPROCESSOR2D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPROCESSOR2D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/color/bcolormodifier.hxx> @@ -71,7 +74,7 @@ namespace drawinglayer This processor is the base class for VCL-Based processors. It has no processBasePrimitive2D implementation and thus is not usable directly. */ - class VclProcessor2D : public BaseProcessor2D + class DRAWINGLAYER_DLLPUBLIC VclProcessor2D : public BaseProcessor2D { protected: // the destination OutDev @@ -138,3 +141,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLPROCESSOR2D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx index 6ed00c337ef3..d021236f391d 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/baseprocessor3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> @@ -44,7 +47,7 @@ namespace drawinglayer Please have a look at baseprocessor2d.hxx for more comments. */ - class BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC BaseProcessor3D { private: geometry::ViewInformation3D maViewInformation3D; @@ -87,7 +90,7 @@ namespace drawinglayer hand around as instance over various methods where every called method can add graphic content to it. */ - class CollectingProcessor3D : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC CollectingProcessor3D : public BaseProcessor3D { private: primitive3d::Primitive3DSequence maPrimitive3DSequence; @@ -117,3 +120,5 @@ namespace drawinglayer #endif //_DRAWINGLAYER_PROCESSOR3D_BASEPROCESSOR3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx index 918634af5e35..ad66dcbb9bd3 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/cutfindprocessor3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor3d/defaultprocessor3d.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -41,7 +44,7 @@ namespace drawinglayer This processor extracts all cuts of 3D plane geometries in the feeded primitives with the given cut vector, based on the ViewInformation3D given. */ - class CutFindProcessor : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC CutFindProcessor : public BaseProcessor3D { private: /// the start and stop point for the cut vector @@ -95,3 +98,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx index af8de431f191..be3278f0e167 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/defaultprocessor3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor3d/baseprocessor3d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> @@ -77,7 +80,7 @@ namespace drawinglayer rasterconvertB3DPolyPolygon for filled geometry is called. It is a beseclass to e.g. base a Z-Buffer supported renderer on the 3D primitive processing. */ - class DefaultProcessor3D : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC DefaultProcessor3D : public BaseProcessor3D { protected: /// read-only scene infos (normal handling, etc...) @@ -162,3 +165,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx index f07eaa5c245c..91131a92a0a7 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/geometry2dextractor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_GEOMETRY2DEXTRACTOR_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_GEOMETRY2DEXTRACTOR_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor3d/baseprocessor3d.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> @@ -46,7 +49,7 @@ namespace drawinglayer It is e.g. used as sub-processor for contour extraction where 3D geometry is only useful as 2D projected geometry. */ - class Geometry2DExtractingProcessor : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC Geometry2DExtractingProcessor : public BaseProcessor3D { private: /// result holding vector (2D) @@ -79,3 +82,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_PROCESSOR3D_GEOMETRY2DEXTRACTOR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx index 93ebfeab48e7..f245d93caeab 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/shadow3dextractor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_SHADOW3DEXTRACTOR_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_SHADOW3DEXTRACTOR_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor3d/baseprocessor3d.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> @@ -51,7 +54,7 @@ namespace drawinglayer some data to do so since we do not only offer flat projected 2D shadow, but also projections dependent on the light source */ - class Shadow3DExtractingProcessor : public BaseProcessor3D + class DRAWINGLAYER_DLLPUBLIC Shadow3DExtractingProcessor : public BaseProcessor3D { private: /// typedef for data handling @@ -121,3 +124,5 @@ namespace drawinglayer #endif //_DRAWINGLAYER_PROCESSOR3D_SHADOW3DEXTRACTOR_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx index aefeddbb38a9..d070e9d643d8 100644 --- a/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx +++ b/drawinglayer/inc/drawinglayer/processor3d/zbufferprocessor3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/processor3d/defaultprocessor3d.hxx> #include <vcl/bitmapex.hxx> @@ -64,7 +67,7 @@ namespace drawinglayer raster bitmap using a Z-Buffer based approach. It is able to supersample and to handle transparent content. */ - class ZBufferProcessor3D : public DefaultProcessor3D + class DRAWINGLAYER_DLLPUBLIC ZBufferProcessor3D : public DefaultProcessor3D { private: /// the raster target, a Z-Buffer @@ -117,3 +120,5 @@ namespace drawinglayer #endif //INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/texture/texture.hxx b/drawinglayer/inc/drawinglayer/texture/texture.hxx index a14a80e5ab2c..27117ded3412 100644 --- a/drawinglayer/inc/drawinglayer/texture/texture.hxx +++ b/drawinglayer/inc/drawinglayer/texture/texture.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE_HXX #define INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/color/bcolor.hxx> @@ -39,7 +42,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvx { public: GeoTexSvx(); @@ -63,7 +66,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradient : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradient : public GeoTexSvx { protected: basegfx::ODFGradientInfo maGradientInfo; @@ -99,7 +102,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientLinear : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientLinear : public GeoTexSvxGradient { public: GeoTexSvxGradientLinear(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fAngle); @@ -118,7 +121,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientAxial : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientAxial : public GeoTexSvxGradient { public: GeoTexSvxGradientAxial(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fAngle); @@ -137,7 +140,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientRadial : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientRadial : public GeoTexSvxGradient { public: GeoTexSvxGradientRadial(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY); @@ -156,7 +159,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientElliptical : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientElliptical : public GeoTexSvxGradient { public: GeoTexSvxGradientElliptical(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY, double fAngle); @@ -175,7 +178,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientSquare : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientSquare : public GeoTexSvxGradient { public: GeoTexSvxGradientSquare(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY, double fAngle); @@ -194,7 +197,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxGradientRect : public GeoTexSvxGradient + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientRect : public GeoTexSvxGradient { public: GeoTexSvxGradientRect(const basegfx::B2DRange& rTargetRange, const basegfx::BColor& rStart, const basegfx::BColor& rEnd, sal_uInt32 nSteps, double fBorder, double fOffsetX, double fOffsetY, double fAngle); @@ -213,7 +216,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxHatch : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxHatch : public GeoTexSvx { protected: basegfx::B2DHomMatrix maTextureTransform; @@ -241,7 +244,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxTiled : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxTiled : public GeoTexSvx { protected: basegfx::B2DPoint maTopLeft; @@ -264,3 +267,5 @@ namespace drawinglayer #endif //_DRAWINGLAYER_TEXTURE_TEXTURE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx index 94b082096090..258653c97191 100644 --- a/drawinglayer/inc/drawinglayer/texture/texture3d.hxx +++ b/drawinglayer/inc/drawinglayer/texture/texture3d.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,6 +29,8 @@ #ifndef INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX #define INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX +#include <drawinglayer/drawinglayerdllapi.h> + #include <drawinglayer/texture/texture.hxx> #include <vcl/bitmap.hxx> @@ -44,7 +47,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxMono : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxMono : public GeoTexSvx { protected: basegfx::BColor maSingleColor; @@ -67,7 +70,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxBitmap : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxBitmap : public GeoTexSvx { protected: Bitmap maBitmap; @@ -95,7 +98,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxBitmapTiled : public GeoTexSvxBitmap + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxBitmapTiled : public GeoTexSvxBitmap { protected: // helpers @@ -131,7 +134,7 @@ namespace drawinglayer { namespace texture { - class GeoTexSvxMultiHatch : public GeoTexSvx + class DRAWINGLAYER_DLLPUBLIC GeoTexSvxMultiHatch : public GeoTexSvx { protected: basegfx::BColor maColor; @@ -163,3 +166,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_TEXTURE_TEXTURE3D_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/makefile.mk b/drawinglayer/inc/makefile.mk deleted file mode 100644 index ebfd7269391c..000000000000 --- a/drawinglayer/inc/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=drawinglayer -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.cxx b/drawinglayer/inc/pch/precompiled_drawinglayer.cxx index c340f36adc3d..54fb0ea8b53a 100644 --- a/drawinglayer/inc/pch/precompiled_drawinglayer.cxx +++ b/drawinglayer/inc/pch/precompiled_drawinglayer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_drawinglayer.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx index 45f87434590d..f1c1f59f06f5 100644 --- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx +++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,3 +31,4 @@ #ifdef PRECOMPILED_HEADERS #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/prj/build.lst b/drawinglayer/prj/build.lst index d685c262e337..73993b99e5ee 100644 --- a/drawinglayer/prj/build.lst +++ b/drawinglayer/prj/build.lst @@ -1,13 +1,4 @@ dl drawinglayer : sal vcl basegfx offuh cppuhelper cppu svtools avmedia canvas cppcanvas NULL dl drawinglayer usr1 - all dl_mkout NULL -dl drawinglayer\inc nmake - all dl_inc NULL -dl drawinglayer\prj get - all dl_prj NULL -dl drawinglayer\source\primitive2d nmake - all dl_primitive2d dl_inc NULL -dl drawinglayer\source\primitive3d nmake - all dl_primitive3d dl_inc NULL -dl drawinglayer\source\animation nmake - all dl_animation dl_inc NULL -dl drawinglayer\source\geometry nmake - all dl_geometry dl_inc NULL -dl drawinglayer\source\processor2d nmake - all dl_processor2d dl_inc NULL -dl drawinglayer\source\processor3d nmake - all dl_processor3d dl_inc NULL -dl drawinglayer\source\attribute nmake - all dl_attribute dl_inc NULL -dl drawinglayer\source\texture nmake - all dl_texture dl_inc NULL -dl drawinglayer\util nmake - all dl_util dl_primitive2d dl_primitive3d dl_animation dl_geometry dl_processor2d dl_processor3d dl_attribute dl_texture NULL +dl drawinglayer\prj nmake - all dl_prj NULL + diff --git a/drawinglayer/prj/d.lst b/drawinglayer/prj/d.lst index 10e692785a81..b384ab67c046 100644 --- a/drawinglayer/prj/d.lst +++ b/drawinglayer/prj/d.lst @@ -1,122 +1,2 @@ -..\%__SRC%\lib\idrawinglayer.lib %_DEST%\lib%_EXT%\idrawinglayer.lib -..\%__SRC%\bin\drawingl*.dll %_DEST%\bin%_EXT%\drawingl*.dll -..\%__SRC%\lib\libdrawinglayer?????.* %_DEST%\lib%_EXT%\libdrawinglayer?????.* -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -mkdir: %_DEST%\inc%_EXT%\drawinglayer - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\primitive2d -..\inc\drawinglayer\primitive2d\drawinglayer_primitivetypes2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\drawinglayer_primitivetypes2d.hxx -..\inc\drawinglayer\primitive2d\transparenceprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\transparenceprimitive2d.hxx -..\inc\drawinglayer\primitive2d\animatedprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\animatedprimitive2d.hxx -..\inc\drawinglayer\primitive2d\backgroundcolorprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\backgroundcolorprimitive2d.hxx -..\inc\drawinglayer\primitive2d\baseprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\baseprimitive2d.hxx -..\inc\drawinglayer\primitive2d\bitmapprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\bitmapprimitive2d.hxx -..\inc\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx -..\inc\drawinglayer\primitive2d\borderlineprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\borderlineprimitive2d.hxx -..\inc\drawinglayer\primitive2d\chartprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\chartprimitive2d.hxx -..\inc\drawinglayer\primitive2d\controlprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\controlprimitive2d.hxx -..\inc\drawinglayer\primitive2d\discretebitmapprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\discretebitmapprimitive2d.hxx -..\inc\drawinglayer\primitive2d\discreteshadowprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\discreteshadowprimitive2d.hxx -..\inc\drawinglayer\primitive2d\embedded3dprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\embedded3dprimitive2d.hxx -..\inc\drawinglayer\primitive2d\fillbitmapprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\fillbitmapprimitive2d.hxx -..\inc\drawinglayer\primitive2d\fillgradientprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\fillgradientprimitive2d.hxx -..\inc\drawinglayer\primitive2d\fillhatchprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\fillhatchprimitive2d.hxx -..\inc\drawinglayer\primitive2d\graphicprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\graphicprimitive2d.hxx -..\inc\drawinglayer\primitive2d\gridprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\gridprimitive2d.hxx -..\inc\drawinglayer\primitive2d\groupprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\groupprimitive2d.hxx -..\inc\drawinglayer\primitive2d\helplineprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\helplineprimitive2d.hxx -..\inc\drawinglayer\primitive2d\hiddengeometryprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\hiddengeometryprimitive2d.hxx -..\inc\drawinglayer\primitive2d\invertprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\invertprimitive2d.hxx -..\inc\drawinglayer\primitive2d\markerarrayprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\markerarrayprimitive2d.hxx -..\inc\drawinglayer\primitive2d\maskprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\maskprimitive2d.hxx -..\inc\drawinglayer\primitive2d\mediaprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\mediaprimitive2d.hxx -..\inc\drawinglayer\primitive2d\metafileprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\metafileprimitive2d.hxx -..\inc\drawinglayer\primitive2d\modifiedcolorprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\modifiedcolorprimitive2d.hxx -..\inc\drawinglayer\primitive2d\pagepreviewprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\pagepreviewprimitive2d.hxx -..\inc\drawinglayer\primitive2d\pointarrayprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\pointarrayprimitive2d.hxx -..\inc\drawinglayer\primitive2d\polygonprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\polygonprimitive2d.hxx -..\inc\drawinglayer\primitive2d\polypolygonprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\polypolygonprimitive2d.hxx -..\inc\drawinglayer\primitive2d\primitivetools2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\primitivetools2d.hxx -..\inc\drawinglayer\primitive2d\sdrdecompositiontools2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\sdrdecompositiontools2d.hxx -..\inc\drawinglayer\primitive2d\sceneprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\sceneprimitive2d.hxx -..\inc\drawinglayer\primitive2d\shadowprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\shadowprimitive2d.hxx -..\inc\drawinglayer\primitive2d\structuretagprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\structuretagprimitive2d.hxx -..\inc\drawinglayer\primitive2d\textenumsprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\textenumsprimitive2d.hxx -..\inc\drawinglayer\primitive2d\texteffectprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\texteffectprimitive2d.hxx -..\inc\drawinglayer\primitive2d\textlayoutdevice.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\textlayoutdevice.hxx -..\inc\drawinglayer\primitive2d\textprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\textprimitive2d.hxx -..\inc\drawinglayer\primitive2d\textdecoratedprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\textdecoratedprimitive2d.hxx -..\inc\drawinglayer\primitive2d\texthierarchyprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\texthierarchyprimitive2d.hxx -..\inc\drawinglayer\primitive2d\transformprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\transformprimitive2d.hxx -..\inc\drawinglayer\primitive2d\unifiedtransparenceprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\unifiedtransparenceprimitive2d.hxx -..\inc\drawinglayer\primitive2d\wrongspellprimitive2d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive2d\wrongspellprimitive2d.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\primitive3d -..\inc\drawinglayer\primitive3d\drawinglayer_primitivetypes3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\drawinglayer_primitivetypes3d.hxx -..\inc\drawinglayer\primitive3d\baseprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\baseprimitive3d.hxx -..\inc\drawinglayer\primitive3d\groupprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\groupprimitive3d.hxx -..\inc\drawinglayer\primitive3d\hatchtextureprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\hatchtextureprimitive3d.hxx -..\inc\drawinglayer\primitive3d\modifiedcolorprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\modifiedcolorprimitive3d.hxx -..\inc\drawinglayer\primitive3d\polygonprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\polygonprimitive3d.hxx -..\inc\drawinglayer\primitive3d\polygontubeprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\polygontubeprimitive3d.hxx -..\inc\drawinglayer\primitive3d\polypolygonprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\polypolygonprimitive3d.hxx -..\inc\drawinglayer\primitive3d\sdrcubeprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrcubeprimitive3d.hxx -..\inc\drawinglayer\primitive3d\sdrdecompositiontools3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrdecompositiontools3d.hxx -..\inc\drawinglayer\primitive3d\sdrextrudelathetools3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrextrudelathetools3d.hxx -..\inc\drawinglayer\primitive3d\sdrextrudeprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrextrudeprimitive3d.hxx -..\inc\drawinglayer\primitive3d\sdrlatheprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrlatheprimitive3d.hxx -..\inc\drawinglayer\primitive3d\sdrpolypolygonprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrpolypolygonprimitive3d.hxx -..\inc\drawinglayer\primitive3d\sdrprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrprimitive3d.hxx -..\inc\drawinglayer\primitive3d\sdrsphereprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\sdrsphereprimitive3d.hxx -..\inc\drawinglayer\primitive3d\shadowprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\shadowprimitive3d.hxx -..\inc\drawinglayer\primitive3d\textureprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\textureprimitive3d.hxx -..\inc\drawinglayer\primitive3d\transformprimitive3d.hxx %_DEST%\inc%_EXT%\drawinglayer\primitive3d\transformprimitive3d.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\animation -..\inc\drawinglayer\animation\animationtiming.hxx %_DEST%\inc%_EXT%\drawinglayer\animation\animationtiming.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\geometry -..\inc\drawinglayer\geometry\viewinformation2d.hxx %_DEST%\inc%_EXT%\drawinglayer\geometry\viewinformation2d.hxx -..\inc\drawinglayer\geometry\viewinformation3d.hxx %_DEST%\inc%_EXT%\drawinglayer\geometry\viewinformation3d.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\processor2d -..\inc\drawinglayer\processor2d\baseprocessor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\baseprocessor2d.hxx -..\inc\drawinglayer\processor2d\vclprocessor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\vclprocessor2d.hxx -..\inc\drawinglayer\processor2d\vclpixelprocessor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\vclpixelprocessor2d.hxx -..\inc\drawinglayer\processor2d\vclmetafileprocessor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\vclmetafileprocessor2d.hxx -..\inc\drawinglayer\processor2d\canvasprocessor.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\canvasprocessor.hxx -..\inc\drawinglayer\processor2d\contourextractor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\contourextractor2d.hxx -..\inc\drawinglayer\processor2d\linegeometryextractor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\linegeometryextractor2d.hxx -..\inc\drawinglayer\processor2d\hittestprocessor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\hittestprocessor2d.hxx -..\inc\drawinglayer\processor2d\textaspolygonextractor2d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor2d\textaspolygonextractor2d.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\processor3d -..\inc\drawinglayer\processor3d\baseprocessor3d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor3d\baseprocessor3d.hxx -..\inc\drawinglayer\processor3d\cutfindprocessor3d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor3d\cutfindprocessor3d.hxx -..\inc\drawinglayer\processor3d\defaultprocessor3d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor3d\defaultprocessor3d.hxx -..\inc\drawinglayer\processor3d\zbufferprocessor3d.hxx %_DEST%\inc%_EXT%\drawinglayer\processor3d\zbufferprocessor3d.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\attribute -..\inc\drawinglayer\attribute\fillgradientattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\fillgradientattribute.hxx -..\inc\drawinglayer\attribute\fillhatchattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\fillhatchattribute.hxx -..\inc\drawinglayer\attribute\fillbitmapattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\fillbitmapattribute.hxx -..\inc\drawinglayer\attribute\fontattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\fontattribute.hxx -..\inc\drawinglayer\attribute\materialattribute3d.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\materialattribute3d.hxx -..\inc\drawinglayer\attribute\sdrallattribute3d.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrallattribute3d.hxx -..\inc\drawinglayer\attribute\sdrlineattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrlineattribute.hxx -..\inc\drawinglayer\attribute\sdrlinestartendattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrlinestartendattribute.hxx -..\inc\drawinglayer\attribute\sdrshadowattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrshadowattribute.hxx -..\inc\drawinglayer\attribute\sdrfillattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrfillattribute.hxx -..\inc\drawinglayer\attribute\sdrobjectattribute3d.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrobjectattribute3d.hxx -..\inc\drawinglayer\attribute\sdrlightattribute3d.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrlightattribute3d.hxx -..\inc\drawinglayer\attribute\sdrlightingattribute3d.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrlightingattribute3d.hxx -..\inc\drawinglayer\attribute\sdrsceneattribute3d.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrsceneattribute3d.hxx -..\inc\drawinglayer\attribute\sdrfillbitmapattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\sdrfillbitmapattribute.hxx -..\inc\drawinglayer\attribute\strokeattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\strokeattribute.hxx -..\inc\drawinglayer\attribute\lineattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\lineattribute.hxx -..\inc\drawinglayer\attribute\linestartendattribute.hxx %_DEST%\inc%_EXT%\drawinglayer\attribute\linestartendattribute.hxx - -mkdir: %_DEST%\inc%_EXT%\drawinglayer\texture -..\inc\drawinglayer\texture\texture.hxx %_DEST%\inc%_EXT%\drawinglayer\texture\texture.hxx +..\inc\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx %_DEST%\inc\drawinglayer\primitive2d\rendergraphicprimitive2d.hxx
\ No newline at end of file diff --git a/drawinglayer/source/animation/makefile.mk b/drawinglayer/prj/makefile.mk index 07f64fab65e2..e312a7ccab65 100644..100755 --- a/drawinglayer/source/animation/makefile.mk +++ b/drawinglayer/prj/makefile.mk @@ -25,20 +25,16 @@ # #************************************************************************* -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=animation -ENABLE_EXCEPTIONS=TRUE +PRJ=.. +TARGET=prj -# --- Settings ---------------------------------- +.INCLUDE : settings.mk -.INCLUDE : settings.mk +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/animationtiming.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/drawinglayer/source/animation/animationtiming.cxx b/drawinglayer/source/animation/animationtiming.cxx index 084a014c9bd7..348e9b4a37cc 100644 --- a/drawinglayer/source/animation/animationtiming.cxx +++ b/drawinglayer/source/animation/animationtiming.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -368,3 +369,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/fillbitmapattribute.cxx b/drawinglayer/source/attribute/fillbitmapattribute.cxx index 34927a3a746c..89e5b721eae1 100644 --- a/drawinglayer/source/attribute/fillbitmapattribute.cxx +++ b/drawinglayer/source/attribute/fillbitmapattribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -197,3 +198,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/fillgradientattribute.cxx b/drawinglayer/source/attribute/fillgradientattribute.cxx index 17e0cd6c098b..8e50e7ae0028 100644 --- a/drawinglayer/source/attribute/fillgradientattribute.cxx +++ b/drawinglayer/source/attribute/fillgradientattribute.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fillattribute.cxx,v $ - * - * $Revision: 1.4 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -248,3 +243,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/fillhatchattribute.cxx b/drawinglayer/source/attribute/fillhatchattribute.cxx index 4a82ef5594ab..1f2b5892f401 100644 --- a/drawinglayer/source/attribute/fillhatchattribute.cxx +++ b/drawinglayer/source/attribute/fillhatchattribute.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fillattribute.cxx,v $ - * - * $Revision: 1.4 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -217,3 +212,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/fontattribute.cxx b/drawinglayer/source/attribute/fontattribute.cxx index d4246376d9ca..2554a6bb0d0c 100644 --- a/drawinglayer/source/attribute/fontattribute.cxx +++ b/drawinglayer/source/attribute/fontattribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -263,3 +264,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/lineattribute.cxx b/drawinglayer/source/attribute/lineattribute.cxx index baa57811f469..20fd9308ff06 100644 --- a/drawinglayer/source/attribute/lineattribute.cxx +++ b/drawinglayer/source/attribute/lineattribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -183,3 +184,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/linestartendattribute.cxx b/drawinglayer/source/attribute/linestartendattribute.cxx index 05e607616bae..0f022b8c9d1b 100644 --- a/drawinglayer/source/attribute/linestartendattribute.cxx +++ b/drawinglayer/source/attribute/linestartendattribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -192,3 +193,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/makefile.mk b/drawinglayer/source/attribute/makefile.mk deleted file mode 100644 index 32cef7c7b49c..000000000000 --- a/drawinglayer/source/attribute/makefile.mk +++ /dev/null @@ -1,61 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=attribute -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/fillgradientattribute.obj \ - $(SLO)$/fillhatchattribute.obj \ - $(SLO)$/fillbitmapattribute.obj \ - $(SLO)$/fontattribute.obj \ - $(SLO)$/materialattribute3d.obj \ - $(SLO)$/sdrallattribute3d.obj \ - $(SLO)$/sdrlineattribute.obj \ - $(SLO)$/sdrlinestartendattribute.obj \ - $(SLO)$/sdrshadowattribute.obj \ - $(SLO)$/sdrfillattribute.obj \ - $(SLO)$/sdrobjectattribute3d.obj \ - $(SLO)$/sdrlightattribute3d.obj \ - $(SLO)$/sdrlightingattribute3d.obj \ - $(SLO)$/sdrsceneattribute3d.obj \ - $(SLO)$/sdrfillbitmapattribute.obj \ - $(SLO)$/lineattribute.obj \ - $(SLO)$/linestartendattribute.obj \ - $(SLO)$/strokeattribute.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/drawinglayer/source/attribute/materialattribute3d.cxx b/drawinglayer/source/attribute/materialattribute3d.cxx index 4dbb152130ff..0b56ace5df24 100644 --- a/drawinglayer/source/attribute/materialattribute3d.cxx +++ b/drawinglayer/source/attribute/materialattribute3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -205,3 +206,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/sdrallattribute3d.cxx b/drawinglayer/source/attribute/sdrallattribute3d.cxx index c3ad3db80add..33b5a3155089 100644 --- a/drawinglayer/source/attribute/sdrallattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrallattribute3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/sdrfillattribute.cxx b/drawinglayer/source/attribute/sdrfillattribute.cxx index bd99ba2c4ba4..abe6f7e40539 100644 --- a/drawinglayer/source/attribute/sdrfillattribute.cxx +++ b/drawinglayer/source/attribute/sdrfillattribute.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute.cxx,v $ - * - * $Revision: 1.5 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -219,3 +214,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx b/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx index abc34cfd87b5..f718ce8f81ab 100644 --- a/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx +++ b/drawinglayer/source/attribute/sdrfillbitmapattribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -402,3 +403,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/sdrlightattribute3d.cxx b/drawinglayer/source/attribute/sdrlightattribute3d.cxx index bc22d0a5f183..e9cfcaae13e1 100644 --- a/drawinglayer/source/attribute/sdrlightattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrlightattribute3d.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute3d.cxx,v $ - * - * $Revision: 1.5 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -194,3 +189,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx index 25407d52f282..06d814b72d9d 100644 --- a/drawinglayer/source/attribute/sdrlightingattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrlightingattribute3d.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute3d.cxx,v $ - * - * $Revision: 1.5 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -233,3 +228,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/sdrlineattribute.cxx b/drawinglayer/source/attribute/sdrlineattribute.cxx index 1850d919069f..f466709e859d 100644 --- a/drawinglayer/source/attribute/sdrlineattribute.cxx +++ b/drawinglayer/source/attribute/sdrlineattribute.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute.cxx,v $ - * - * $Revision: 1.5 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -248,3 +243,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx index ce85bdff5678..1a1fe39be3b0 100644 --- a/drawinglayer/source/attribute/sdrlinestartendattribute.cxx +++ b/drawinglayer/source/attribute/sdrlinestartendattribute.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute.cxx,v $ - * - * $Revision: 1.5 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -252,3 +247,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx index a51e333236bc..a6c80cc0f674 100644 --- a/drawinglayer/source/attribute/sdrobjectattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrobjectattribute3d.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute3d.cxx,v $ - * - * $Revision: 1.5 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -290,3 +285,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx index 141f4c904873..c9d9f88ff4ff 100644 --- a/drawinglayer/source/attribute/sdrsceneattribute3d.cxx +++ b/drawinglayer/source/attribute/sdrsceneattribute3d.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute3d.cxx,v $ - * - * $Revision: 1.5 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -216,3 +211,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/sdrshadowattribute.cxx b/drawinglayer/source/attribute/sdrshadowattribute.cxx index 9b31b5c6d348..6dc30f743266 100644 --- a/drawinglayer/source/attribute/sdrshadowattribute.cxx +++ b/drawinglayer/source/attribute/sdrshadowattribute.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrattribute.cxx,v $ - * - * $Revision: 1.5 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:19 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -191,3 +186,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/attribute/strokeattribute.cxx b/drawinglayer/source/attribute/strokeattribute.cxx index 3c2a5a2bc18f..667f6e1b463e 100644 --- a/drawinglayer/source/attribute/strokeattribute.cxx +++ b/drawinglayer/source/attribute/strokeattribute.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -180,3 +181,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx index f3f6dc7cc953..2cce8af48e62 100644 --- a/drawinglayer/source/geometry/viewinformation2d.cxx +++ b/drawinglayer/source/geometry/viewinformation2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -590,3 +591,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx index 3ce81680f7c1..cce7d7070716 100644 --- a/drawinglayer/source/geometry/viewinformation3d.cxx +++ b/drawinglayer/source/geometry/viewinformation3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -597,3 +598,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx index 2d696e5f6600..35cdc7e95bf8 100644 --- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -222,3 +223,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx index be13f6229f1c..44f8a138d5f5 100644 --- a/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx index 051f51f9731a..00dc22cd89a3 100644 --- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -276,3 +277,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx index 730a29749d23..8e780ce2d38a 100644 --- a/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/bitmapprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -79,3 +80,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx index 86c2ef1db123..9738e14b503d 100644 --- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,9 +32,12 @@ #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx> #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> #include <basegfx/polygon/b2dpolygon.hxx> +#include <basegfx/polygon/b2dpolygonclipper.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> +#include <svtools/borderhelper.hxx> #include <numeric> +#include <algorithm> ////////////////////////////////////////////////////////////////////////////// @@ -41,131 +45,226 @@ namespace drawinglayer { namespace primitive2d { + basegfx::B2DPolyPolygon BorderLinePrimitive2D::getClipPolygon( ) const + { + basegfx::B2DPolygon clipPolygon; + + // Get the vectors + basegfx::B2DVector aVector( getEnd() - getStart() ); + aVector.normalize(); + const basegfx::B2DVector aPerpendicular(basegfx::getPerpendicular(aVector)); + + // Get the points + const basegfx::B2DVector aLeftOff(aPerpendicular * (-0.5 * (getWidth()))); + const basegfx::B2DVector aRightOff(aPerpendicular * (0.5 * (getWidth()))); + + const basegfx::B2DVector aSLVector( aLeftOff - ( getExtendLeftStart() * aVector ) ); + clipPolygon.append( basegfx::B2DPoint( getStart() + aSLVector * 2.0 ) ); + + clipPolygon.append( getStart( ) ); + + const basegfx::B2DVector aSRVector( aRightOff - ( getExtendRightStart() * aVector ) ); + clipPolygon.append( basegfx::B2DPoint( getStart() + aSRVector * 2.0 ) ); + + const basegfx::B2DVector aERVector( aRightOff + ( getExtendRightEnd() * aVector ) ); + clipPolygon.append( basegfx::B2DPoint( getEnd() + aERVector * 2.0 ) ); + + clipPolygon.append( getEnd( ) ); + + const basegfx::B2DVector aELVector( aLeftOff + ( getExtendLeftEnd() * aVector ) ); + clipPolygon.append( basegfx::B2DPoint( getEnd() + aELVector * 2.0 ) ); + + clipPolygon.setClosed( true ); + + return basegfx::B2DPolyPolygon( clipPolygon ); + } + Primitive2DSequence BorderLinePrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const { Primitive2DSequence xRetval; - if(!getStart().equal(getEnd()) && (getCreateInside() || getCreateOutside())) + if(!getStart().equal(getEnd()) && ( isInsideUsed() || isOutsideUsed() ) ) { - if(isInsideUsed()) + // get data and vectors + const double fWidth(getWidth()); + basegfx::B2DVector aVector(getEnd() - getStart()); + aVector.normalize(); + const basegfx::B2DVector aPerpendicular(basegfx::getPerpendicular(aVector)); + + const basegfx::B2DPolyPolygon& aClipRegion = getClipPolygon( ); + + if(isOutsideUsed() && isInsideUsed()) { - // get data and vectors - const double fWidth(getWidth()); - basegfx::B2DVector aVector(getEnd() - getStart()); - aVector.normalize(); - const basegfx::B2DVector aPerpendicular(basegfx::getPerpendicular(aVector)); + const double fExt = getWidth( ); // Extend a lot: it'll be clipped after + + // both used, double line definition. Create left and right offset + xRetval.realloc(2); + sal_uInt32 nInsert(0); + + basegfx::B2DPolygon aGap; - if(isOutsideUsed()) { - // both used, double line definition. Create left and right offset - xRetval.realloc(getCreateInside() && getCreateOutside() ? 2 : 1); - sal_uInt32 nInsert(0); + // create geometry for left + const basegfx::B2DVector aLeftOff(aPerpendicular * (0.5 * (getCorrectedLeftWidth() - fWidth + 1))); + const basegfx::B2DPoint aTmpStart(getStart() + aLeftOff - ( fExt * aVector)); + const basegfx::B2DPoint aTmpEnd(getEnd() + aLeftOff + ( fExt * aVector)); + basegfx::B2DPolygon aLeft; - if(getCreateInside()) + if(leftIsHairline()) { - // create geometry for left - const basegfx::B2DVector aLeftOff(aPerpendicular * (0.5 * (getCorrectedLeftWidth() - fWidth))); - const basegfx::B2DPoint aTmpStart(getStart() + aLeftOff - (getExtendInnerStart() * aVector)); - const basegfx::B2DPoint aTmpEnd(getEnd() + aLeftOff + (getExtendInnerEnd() * aVector)); - basegfx::B2DPolygon aLeft; - - if(leftIsHairline()) - { - // create hairline primitive - aLeft.append(aTmpStart); - aLeft.append(aTmpEnd); - - xRetval[nInsert++] = Primitive2DReference(new PolygonHairlinePrimitive2D( - aLeft, - getRGBColor())); - } - else - { - // create filled polygon primitive. Already tried to create thick lines - // with the correct LineWidth, but this leads to problems when no AA - // is available and fat line special case reductions between 0.5 < x < 2.5 line widths - // are executed due to the FilledPolygon-do-not-paint-their-bottom-and-right-lines. - const basegfx::B2DVector aLineWidthOffset((getCorrectedLeftWidth() * 0.5) * aPerpendicular); - - aLeft.append(aTmpStart + aLineWidthOffset); - aLeft.append(aTmpEnd + aLineWidthOffset); - aLeft.append(aTmpEnd - aLineWidthOffset); - aLeft.append(aTmpStart - aLineWidthOffset); - aLeft.setClosed(true); - - xRetval[nInsert++] = Primitive2DReference(new PolyPolygonColorPrimitive2D( - basegfx::B2DPolyPolygon(aLeft), getRGBColor())); - } - } + // create hairline primitive + aLeft.append(aTmpStart); + aLeft.append(aTmpEnd); - if(getCreateOutside()) + xRetval[nInsert++] = Primitive2DReference(new PolygonHairlinePrimitive2D( + aLeft, + getRGBColorLeft())); + + aGap.append( getStart() - getExtendLeftStart() * aVector ); + aGap.append( getEnd() + getExtendLeftEnd() * aVector ); + } + else { - // create geometry for right - const basegfx::B2DVector aRightOff(aPerpendicular * (0.5 * (fWidth - getCorrectedRightWidth()))); - const basegfx::B2DPoint aTmpStart(getStart() + aRightOff - (getExtendOuterStart() * aVector)); - const basegfx::B2DPoint aTmpEnd(getEnd() + aRightOff + (getExtendOuterEnd() * aVector)); - basegfx::B2DPolygon aRight; - - if(rightIsHairline()) - { - // create hairline primitive - aRight.append(aTmpStart); - aRight.append(aTmpEnd); - - xRetval[nInsert++] = Primitive2DReference(new PolygonHairlinePrimitive2D( - aRight, - getRGBColor())); - } - else - { - // create filled polygon primitive - const basegfx::B2DVector aLineWidthOffset((getCorrectedRightWidth() * 0.5) * aPerpendicular); - - aRight.append(aTmpStart + aLineWidthOffset); - aRight.append(aTmpEnd + aLineWidthOffset); - aRight.append(aTmpEnd - aLineWidthOffset); - aRight.append(aTmpStart - aLineWidthOffset); - aRight.setClosed(true); - - xRetval[nInsert++] = Primitive2DReference(new PolyPolygonColorPrimitive2D( - basegfx::B2DPolyPolygon(aRight), getRGBColor())); - } + // create filled polygon primitive. Already tried to create thick lines + // with the correct LineWidth, but this leads to problems when no AA + // is available and fat line special case reductions between 0.5 < x < 2.5 line widths + // are executed due to the FilledPolygon-do-not-paint-their-bottom-and-right-lines. + const basegfx::B2DVector aLineWidthOffset((getCorrectedLeftWidth() * 0.5) * aPerpendicular); + + aLeft.append(aTmpStart + aLineWidthOffset); + aLeft.append(aTmpEnd + aLineWidthOffset); + aLeft.append(aTmpEnd - aLineWidthOffset); + aLeft.append(aTmpStart - aLineWidthOffset); + aLeft.setClosed(true); + + basegfx::B2DPolyPolygon aClipped = basegfx::tools::clipPolygonOnPolyPolygon( + aLeft, aClipRegion, true, false ); + + aGap.append( aTmpStart + aLineWidthOffset ); + aGap.append( aTmpEnd + aLineWidthOffset ); + + xRetval[nInsert++] = Primitive2DReference(new PolyPolygonColorPrimitive2D( + aClipped, getRGBColorLeft())); } } - else + { - // single line, create geometry - basegfx::B2DPolygon aPolygon; - const double fMaxExtStart(::std::max(getExtendInnerStart(), getExtendOuterStart())); - const double fMaxExtEnd(::std::max(getExtendInnerEnd(), getExtendOuterEnd())); - const basegfx::B2DPoint aTmpStart(getStart() - (fMaxExtStart * aVector)); - const basegfx::B2DPoint aTmpEnd(getEnd() + (fMaxExtEnd * aVector)); - xRetval.realloc(1); + // create geometry for right + const basegfx::B2DVector aRightOff(aPerpendicular * (0.5 * (fWidth - getCorrectedRightWidth() + 1))); + const basegfx::B2DPoint aTmpStart(getStart() + aRightOff - ( fExt * aVector)); + const basegfx::B2DPoint aTmpEnd(getEnd() + aRightOff + ( fExt * aVector)); + basegfx::B2DPolygon aRight; - if(leftIsHairline()) + if(rightIsHairline()) { // create hairline primitive - aPolygon.append(aTmpStart); - aPolygon.append(aTmpEnd); + aRight.append(aTmpStart); + aRight.append(aTmpEnd); - xRetval[0] = Primitive2DReference(new PolygonHairlinePrimitive2D( - aPolygon, - getRGBColor())); + xRetval[nInsert++] = Primitive2DReference(new PolygonHairlinePrimitive2D( + aRight, + getRGBColorRight())); + + aGap.append( getStart() - getExtendRightStart() * aVector ); + aGap.append( getEnd() + getExtendRightEnd() * aVector ); } else { // create filled polygon primitive - const basegfx::B2DVector aLineWidthOffset((getCorrectedLeftWidth() * 0.5) * aPerpendicular); + const basegfx::B2DVector aLineWidthOffset((getCorrectedRightWidth() * 0.5) * aPerpendicular); + + aRight.append(aTmpStart + aLineWidthOffset); + aRight.append(aTmpEnd + aLineWidthOffset); + aRight.append(aTmpEnd - aLineWidthOffset); + aRight.append(aTmpStart - aLineWidthOffset); + aRight.setClosed(true); + + basegfx::B2DPolyPolygon aClipped = basegfx::tools::clipPolygonOnPolyPolygon( + aRight, aClipRegion, true, false ); + + xRetval[nInsert++] = Primitive2DReference(new PolyPolygonColorPrimitive2D( + aClipped, getRGBColorRight())); + + aGap.append( aTmpEnd - aLineWidthOffset ); + aGap.append( aTmpStart - aLineWidthOffset ); + } + } + + if (hasGapColor() && aGap.count() == 4) + { + xRetval.realloc( xRetval.getLength() + 1 ); + // create geometry for filled gap + aGap.setClosed( true ); + + basegfx::B2DPolyPolygon aClipped = basegfx::tools::clipPolygonOnPolyPolygon( + aGap, aClipRegion, true, false ); + + xRetval[nInsert++] = Primitive2DReference( new PolyPolygonColorPrimitive2D( + aClipped, getRGBColorGap() ) ); + } + } + else + { + // single line, create geometry + basegfx::B2DPolygon aPolygon; + const double fExt = getWidth( ); // Extend a lot: it'll be clipped after + const basegfx::B2DPoint aTmpStart(getStart() - (fExt * aVector)); + const basegfx::B2DPoint aTmpEnd(getEnd() + (fExt * aVector)); + xRetval.realloc(1); - aPolygon.append(aTmpStart + aLineWidthOffset); - aPolygon.append(aTmpEnd + aLineWidthOffset); - aPolygon.append(aTmpEnd - aLineWidthOffset); - aPolygon.append(aTmpStart - aLineWidthOffset); - aPolygon.setClosed(true); + // Get which is the line to show + bool bIsHairline = leftIsHairline(); + double nWidth = getCorrectedLeftWidth(); + basegfx::BColor aColor = getRGBColorLeft(); + if ( basegfx::fTools::equal( 0.0, mfLeftWidth ) ) + { + bIsHairline = rightIsHairline(); + nWidth = getCorrectedRightWidth(); + aColor = getRGBColorRight(); + } + + if(bIsHairline) + { + // create hairline primitive + aPolygon.append( getStart() ); + aPolygon.append( getEnd() ); + + xRetval[0] = Primitive2DReference(new PolygonHairlinePrimitive2D( + aPolygon, + aColor)); + } + else + { + // create filled polygon primitive + const basegfx::B2DVector aLineWidthOffset(((nWidth + 1) * 0.5) * aPerpendicular); - xRetval[0] = Primitive2DReference(new PolyPolygonColorPrimitive2D( - basegfx::B2DPolyPolygon(aPolygon), getRGBColor())); + aPolygon.append( aTmpStart ); + aPolygon.append( aTmpEnd ); + + basegfx::B2DPolyPolygon aDashed = svtools::ApplyLineDashing( + aPolygon, getStyle(), MAP_100TH_MM ); + for (sal_uInt32 i = 0; i < aDashed.count(); i++ ) + { + basegfx::B2DPolygon aDash = aDashed.getB2DPolygon( i ); + basegfx::B2DPoint aDashStart = aDash.getB2DPoint( 0 ); + basegfx::B2DPoint aDashEnd = aDash.getB2DPoint( aDash.count() - 1 ); + + basegfx::B2DPolygon aDashPolygon; + aDashPolygon.append( aDashStart + aLineWidthOffset ); + aDashPolygon.append( aDashEnd + aLineWidthOffset ); + aDashPolygon.append( aDashEnd - aLineWidthOffset ); + aDashPolygon.append( aDashStart - aLineWidthOffset ); + aDashPolygon.setClosed( true ); + + basegfx::B2DPolyPolygon aClipped = basegfx::tools::clipPolygonOnPolyPolygon( + aDashPolygon, aClipRegion, true, false ); + + if ( aClipped.count() ) + aDashed.setB2DPolygon( i, aClipped.getB2DPolygon( 0 ) ); } + + xRetval[0] = Primitive2DReference(new PolyPolygonColorPrimitive2D( + basegfx::B2DPolyPolygon( aDashed ), aColor)); } } } @@ -179,26 +278,30 @@ namespace drawinglayer double fLeftWidth, double fDistance, double fRightWidth, - double fExtendInnerStart, - double fExtendInnerEnd, - double fExtendOuterStart, - double fExtendOuterEnd, - bool bCreateInside, - bool bCreateOutside, - const basegfx::BColor& rRGBColor) + double fExtendLeftStart, + double fExtendLeftEnd, + double fExtendRightStart, + double fExtendRightEnd, + const basegfx::BColor& rRGBColorRight, + const basegfx::BColor& rRGBColorLeft, + const basegfx::BColor& rRGBColorGap, + bool bHasGapColor, + const short nStyle) : BufferedDecompositionPrimitive2D(), maStart(rStart), maEnd(rEnd), mfLeftWidth(fLeftWidth), mfDistance(fDistance), mfRightWidth(fRightWidth), - mfExtendInnerStart(fExtendInnerStart), - mfExtendInnerEnd(fExtendInnerEnd), - mfExtendOuterStart(fExtendOuterStart), - mfExtendOuterEnd(fExtendOuterEnd), - maRGBColor(rRGBColor), - mbCreateInside(bCreateInside), - mbCreateOutside(bCreateOutside) + mfExtendLeftStart(fExtendLeftStart), + mfExtendLeftEnd(fExtendLeftEnd), + mfExtendRightStart(fExtendRightStart), + mfExtendRightEnd(fExtendRightEnd), + maRGBColorRight(rRGBColorRight), + maRGBColorLeft(rRGBColorLeft), + maRGBColorGap(rRGBColorGap), + mbHasGapColor(bHasGapColor), + mnStyle(nStyle) { } @@ -213,13 +316,15 @@ namespace drawinglayer && getLeftWidth() == rCompare.getLeftWidth() && getDistance() == rCompare.getDistance() && getRightWidth() == rCompare.getRightWidth() - && getExtendInnerStart() == rCompare.getExtendInnerStart() - && getExtendInnerEnd() == rCompare.getExtendInnerEnd() - && getExtendOuterStart() == rCompare.getExtendOuterStart() - && getExtendOuterEnd() == rCompare.getExtendOuterEnd() - && getCreateInside() == rCompare.getCreateInside() - && getCreateOutside() == rCompare.getCreateOutside() - && getRGBColor() == rCompare.getRGBColor()); + && getExtendLeftStart() == rCompare.getExtendLeftStart() + && getExtendLeftEnd() == rCompare.getExtendLeftEnd() + && getExtendRightStart() == rCompare.getExtendRightStart() + && getExtendRightEnd() == rCompare.getExtendRightEnd() + && getRGBColorRight() == rCompare.getRGBColorRight() + && getRGBColorLeft() == rCompare.getRGBColorLeft() + && getRGBColorGap() == rCompare.getRGBColorGap() + && hasGapColor() == rCompare.hasGapColor() + && getStyle() == rCompare.getStyle()); } return false; @@ -233,3 +338,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/chartprimitive2d.cxx b/drawinglayer/source/primitive2d/chartprimitive2d.cxx index 5bb7b8c860a0..87fdd094b8e9 100644 --- a/drawinglayer/source/primitive2d/chartprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/chartprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx new file mode 100644 index 000000000000..874c61746d48 --- /dev/null +++ b/drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx @@ -0,0 +1,81 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Initial Developer of the Original Code is + * [ Novell Inc. ] + * Portions created by the Initial Developer are Copyright (C) 2010 the + * Initial Developer. All Rights Reserved. + * + * Contributor(s): Cédric Bosdonnat <cbosdonnat@novell.com> + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#include <drawinglayer/primitive2d/clippedborderlineprimitive2d.hxx> +#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx> + +namespace drawinglayer +{ + namespace primitive2d + { + basegfx::B2DPolyPolygon ClippedBorderLinePrimitive2D::getClipPolygon( ) const + { + basegfx::B2DPolyPolygon aPolyPolygon; + aPolyPolygon.append( maIntersection ); + return aPolyPolygon; + } + + ClippedBorderLinePrimitive2D::ClippedBorderLinePrimitive2D( + const basegfx::B2DPoint& rStart, + const basegfx::B2DPoint& rEnd, + double fLeftWidth, + double fDistance, + double fRightWidth, + const basegfx::B2DPolygon& rIntersection, + const basegfx::BColor& rRGBColorRight, + const basegfx::BColor& rRGBColorLeft, + const basegfx::BColor& rRGBColorGap, + bool bHasGapColor, + const short nStyle) + : BorderLinePrimitive2D( rStart, rEnd, fLeftWidth,fDistance, fRightWidth, + 0.0, 0.0, 0.0, 0.0, rRGBColorRight, rRGBColorLeft, + rRGBColorGap, bHasGapColor, nStyle), + maIntersection( rIntersection ) + { + } + + bool ClippedBorderLinePrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const + { + if(BorderLinePrimitive2D::operator==(rPrimitive)) + { + const ClippedBorderLinePrimitive2D& rCompare = (ClippedBorderLinePrimitive2D&)rPrimitive; + + return maIntersection == rCompare.maIntersection; + } + + return false; + } + + // provide unique ID + ImplPrimitrive2DIDBlock(ClippedBorderLinePrimitive2D, PRIMITIVE2D_ID_CLIPPEDBORDERLINEPRIMITIVE2D) + + + } // namespace primitive2d +} // namespace drawinglayer + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/controlprimitive2d.cxx b/drawinglayer/source/primitive2d/controlprimitive2d.cxx index 589b2c24bbb8..96ca10484549 100644 --- a/drawinglayer/source/primitive2d/controlprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/controlprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,7 +67,7 @@ namespace drawinglayer if(xSet.is()) { - uno::Any aValue(xSet->getPropertyValue(rtl::OUString::createFromAscii("DefaultControl"))); + uno::Any aValue(xSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultControl")))); rtl::OUString aUnoControlTypeName; if(aValue >>= aUnoControlTypeName) @@ -381,3 +382,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx index cf7b0339e966..167497181de3 100644 --- a/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/discretebitmapprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx index ed82ed45e233..7e6964db7f55 100644 --- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -166,3 +167,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx b/drawinglayer/source/primitive2d/epsprimitive2d.cxx index 7b23d4a9db96..b399b98e33ba 100644 --- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,7 +44,7 @@ namespace drawinglayer Primitive2DSequence xRetval; const GDIMetaFile& rSubstituteContent = getMetaFile(); - if(rSubstituteContent.GetActionCount()) + if( rSubstituteContent.GetActionSize() ) { // the default decomposition will use the Metafile replacement visualisation. // To really use the Eps data, a renderer has to know and interpret this primitive @@ -101,3 +102,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx b/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx index 66497a1aef5e..dc5a228be2ba 100644 --- a/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillbitmapprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx index 8659eb356405..fb19bebc87e7 100644 --- a/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -296,3 +297,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx index 4466081cae32..91e68f04e003 100644 --- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -159,3 +160,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx index 3b52f2340f17..c6a8e35682b0 100644 --- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,15 +53,6 @@ ////////////////////////////////////////////////////////////////////////////// // includes for testing MetafilePrimitive2D::create2DDecomposition -// this switch defines if the test code is included or not -#undef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE - -#ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE -#include <vcl/gradient.hxx> -#include <vcl/pngread.hxx> -#include <vcl/lineinfo.hxx> -#endif // USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE - ////////////////////////////////////////////////////////////////////////////// namespace @@ -218,11 +210,6 @@ namespace drawinglayer namespace primitive2d { Primitive2DSequence GraphicPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D& -#ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE - rViewInformation -#else - /*rViewInformation*/ -#endif // USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE ) const { Primitive2DSequence aRetval; @@ -307,445 +294,6 @@ namespace drawinglayer case GRAPHIC_GDIMETAFILE : { -#ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE - static bool bDoTest(false); - - if(bDoTest) - { - // All this is/was test code for testing MetafilePrimitive2D::create2DDecomposition - // extensively. It may be needed again when diverse actions need debugging, so i leave - // it in here, but take it out using USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE. - // Use it by compiling with the code, insert any DrawObject, convert to Metafile. The - // debugger will then stop here (when breakpoint set, of course). You may enter single - // parts of actions and/or change to true what You want to check. - GDIMetaFile aMtf; - VirtualDevice aOut; - const basegfx::B2DRange aRange(getB2DRange(rViewInformation)); - const Rectangle aRectangle( - basegfx::fround(aRange.getMinX()), basegfx::fround(aRange.getMinY()), - basegfx::fround(aRange.getMaxX()), basegfx::fround(aRange.getMaxY())); - const Point aOrigin(aRectangle.TopLeft()); - const Fraction aScaleX(aRectangle.getWidth()); - const Fraction aScaleY(aRectangle.getHeight()); - MapMode aMapMode(MAP_100TH_MM, aOrigin, aScaleX, aScaleY); - - Size aDummySize(2, 2); - aOut.SetOutputSizePixel(aDummySize); - aOut.EnableOutput(FALSE); - aOut.SetMapMode(aMapMode); - - aMtf.Clear(); - aMtf.Record(&aOut); - - const Fraction aNeutralFraction(1, 1); - const MapMode aRelativeMapMode( - MAP_RELATIVE, - Point(-aRectangle.Left(), -aRectangle.Top()), - aNeutralFraction, aNeutralFraction); - aOut.SetMapMode(aRelativeMapMode); - - if(false) - { - const sal_Int32 nHor(aRectangle.getWidth() / 4); - const sal_Int32 nVer(aRectangle.getHeight() / 4); - const Rectangle aCenteredRectangle( - aRectangle.Left() + nHor, aRectangle.Top() + nVer, - aRectangle.Right() - nHor, aRectangle.Bottom() - nVer); - aOut.SetClipRegion(aCenteredRectangle); - } - - if(false) - { - const Rectangle aRightRectangle(aRectangle.TopCenter(), aRectangle.BottomRight()); - aOut.IntersectClipRegion(aRightRectangle); - } - - if(false) - { - const Rectangle aRightRectangle(aRectangle.TopCenter(), aRectangle.BottomRight()); - const Rectangle aBottomRectangle(aRectangle.LeftCenter(), aRectangle.BottomRight()); - Region aRegion(aRightRectangle); - aRegion.Intersect(aBottomRectangle); - aOut.IntersectClipRegion(aRegion); - } - - if(false) - { - const sal_Int32 nHor(aRectangle.getWidth() / 10); - const sal_Int32 nVer(aRectangle.getHeight() / 10); - aOut.MoveClipRegion(nHor, nVer); - } - - if(false) - { - Wallpaper aWallpaper(Color(COL_BLACK)); - aOut.DrawWallpaper(aRectangle, aWallpaper); - } - - if(false) - { - Wallpaper aWallpaper(Gradient(GRADIENT_LINEAR, Color(COL_RED), Color(COL_GREEN))); - aOut.DrawWallpaper(aRectangle, aWallpaper); - } - - if(false) - { - SvFileStream aRead((const String&)String(ByteString( "c:\\test.png" ), RTL_TEXTENCODING_UTF8), STREAM_READ); - vcl::PNGReader aPNGReader(aRead); - BitmapEx aBitmapEx(aPNGReader.Read()); - Wallpaper aWallpaper(aBitmapEx); - aOut.DrawWallpaper(aRectangle, aWallpaper); - } - - if(false) - { - const double fHor(aRectangle.getWidth()); - const double fVer(aRectangle.getHeight()); - Color aColor(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)); - - for(sal_uInt32 a(0); a < 5000; a++) - { - const Point aPoint( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), - aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); - - if(!(a % 3)) - { - aColor = Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0)); - } - - aOut.DrawPixel(aPoint, aColor); - } - } - - if(false) - { - const double fHor(aRectangle.getWidth()); - const double fVer(aRectangle.getHeight()); - - aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.SetFillColor(); - - for(sal_uInt32 a(0); a < 5000; a++) - { - const Point aPoint( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), - aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); - aOut.DrawPixel(aPoint); - } - } - - if(false) - { - const double fHor(aRectangle.getWidth()); - const double fVer(aRectangle.getHeight()); - - aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.SetFillColor(); - - Point aStart( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), - aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); - Point aStop( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), - aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); - - LineInfo aLineInfo(LINE_SOLID, basegfx::fround(fHor / 50.0)); - bool bUseLineInfo(false); - - for(sal_uInt32 a(0); a < 20; a++) - { - if(!(a%6)) - { - bUseLineInfo = !bUseLineInfo; - } - - if(!(a%4)) - { - aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - } - - if(a%3) - { - aStart = aStop; - aStop = Point( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), - aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); - } - else - { - aStart = Point( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), - aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); - aStop = Point( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), - aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); - } - - if(bUseLineInfo) - { - aOut.DrawLine(aStart, aStop, aLineInfo); - } - else - { - aOut.DrawLine(aStart, aStop); - } - } - } - - if(false) - { - aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.DrawRect(aRectangle); - } - - if(false) - { - aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - const sal_uInt32 nHor(aRectangle.getWidth() / 10); - const sal_uInt32 nVer(aRectangle.getHeight() / 10); - aOut.DrawRect(aRectangle, nHor, nVer); - } - - if(false) - { - aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.DrawEllipse(aRectangle); - } - - if(false) - { - aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.DrawArc(aRectangle, aRectangle.TopLeft(), aRectangle.BottomCenter()); - } - - if(false) - { - aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.DrawPie(aRectangle, aRectangle.TopLeft(), aRectangle.BottomCenter()); - } - - if(false) - { - aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.DrawChord(aRectangle, aRectangle.TopLeft(), aRectangle.BottomCenter()); - } - - if(false) - { - const double fHor(aRectangle.getWidth()); - const double fVer(aRectangle.getHeight()); - - for(sal_uInt32 b(0); b < 5; b++) - { - const sal_uInt32 nCount(basegfx::fround(rand() * (20 / 32767.0))); - const bool bClose(basegfx::fround(rand() / 32767.0)); - Polygon aPolygon(nCount + (bClose ? 1 : 0)); - - for(sal_uInt32 a(0); a < nCount; a++) - { - const Point aPoint( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), - aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); - aPolygon[a] = aPoint; - } - - if(bClose) - { - aPolygon[aPolygon.GetSize() - 1] = aPolygon[0]; - } - - aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - - if(!(b%2)) - { - const LineInfo aLineInfo(LINE_SOLID, basegfx::fround(fHor / 50.0)); - aOut.DrawPolyLine(aPolygon, aLineInfo); - } - else - { - aOut.DrawPolyLine(aPolygon); - } - } - } - - if(false) - { - const double fHor(aRectangle.getWidth()); - const double fVer(aRectangle.getHeight()); - - for(sal_uInt32 b(0); b < 5; b++) - { - const sal_uInt32 nCount(basegfx::fround(rand() * (20 / 32767.0))); - const bool bClose(basegfx::fround(rand() / 32767.0)); - Polygon aPolygon(nCount + (bClose ? 1 : 0)); - - for(sal_uInt32 a(0); a < nCount; a++) - { - const Point aPoint( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), - aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); - aPolygon[a] = aPoint; - } - - if(bClose) - { - aPolygon[aPolygon.GetSize() - 1] = aPolygon[0]; - } - - aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.DrawPolygon(aPolygon); - } - } - - if(false) - { - const double fHor(aRectangle.getWidth()); - const double fVer(aRectangle.getHeight()); - PolyPolygon aPolyPolygon; - - for(sal_uInt32 b(0); b < 3; b++) - { - const sal_uInt32 nCount(basegfx::fround(rand() * (6 / 32767.0))); - const bool bClose(basegfx::fround(rand() / 32767.0)); - Polygon aPolygon(nCount + (bClose ? 1 : 0)); - - for(sal_uInt32 a(0); a < nCount; a++) - { - const Point aPoint( - aRectangle.Left() + basegfx::fround(rand() * (fHor / 32767.0)), - aRectangle.Top() + basegfx::fround(rand() * (fVer / 32767.0))); - aPolygon[a] = aPoint; - } - - if(bClose) - { - aPolygon[aPolygon.GetSize() - 1] = aPolygon[0]; - } - - aPolyPolygon.Insert(aPolygon); - } - - aOut.SetLineColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.SetFillColor(Color(basegfx::BColor(rand() / 32767.0, rand() / 32767.0, rand() / 32767.0))); - aOut.DrawPolyPolygon(aPolyPolygon); - } - - if(false) - { - SvFileStream aRead((const String&)String(ByteString( "c:\\test.png" ), RTL_TEXTENCODING_UTF8), STREAM_READ); - vcl::PNGReader aPNGReader(aRead); - BitmapEx aBitmapEx(aPNGReader.Read()); - aOut.DrawBitmapEx(aRectangle.TopLeft(), aBitmapEx); - } - - if(false) - { - SvFileStream aRead((const String&)String(ByteString( "c:\\test.png" ), RTL_TEXTENCODING_UTF8), STREAM_READ); - vcl::PNGReader aPNGReader(aRead); - BitmapEx aBitmapEx(aPNGReader.Read()); - aOut.DrawBitmapEx(aRectangle.TopLeft(), aRectangle.GetSize(), aBitmapEx); - } - - if(false) - { - SvFileStream aRead((const String&)String(ByteString( "c:\\test.png" ), RTL_TEXTENCODING_UTF8), STREAM_READ); - vcl::PNGReader aPNGReader(aRead); - BitmapEx aBitmapEx(aPNGReader.Read()); - const Size aSizePixel(aBitmapEx.GetSizePixel()); - aOut.DrawBitmapEx( - aRectangle.TopLeft(), - aRectangle.GetSize(), - Point(0, 0), - Size(aSizePixel.Width() /2, aSizePixel.Height() / 2), - aBitmapEx); - } - - if(false) - { - const double fHor(aRectangle.getWidth()); - const double fVer(aRectangle.getHeight()); - const Point aPointA( - aRectangle.Left() + basegfx::fround(fHor * 0.2), - aRectangle.Top() + basegfx::fround(fVer * 0.3)); - const Point aPointB( - aRectangle.Left() + basegfx::fround(fHor * 0.2), - aRectangle.Top() + basegfx::fround(fVer * 0.5)); - const Point aPointC( - aRectangle.Left() + basegfx::fround(fHor * 0.2), - aRectangle.Top() + basegfx::fround(fVer * 0.7)); - const String aText(ByteString("Hello, World!"), RTL_TEXTENCODING_UTF8); - - const String aFontName(ByteString("Comic Sans MS"), RTL_TEXTENCODING_UTF8); - Font aFont(aFontName, Size(0, 1000)); - aFont.SetAlign(ALIGN_BASELINE); - aFont.SetColor(COL_RED); - //sal_Int32* pDXArray = new sal_Int32[aText.Len()]; - - aFont.SetOutline(true); - aOut.SetFont(aFont); - aOut.DrawText(aPointA, aText, 0, aText.Len()); - - aFont.SetShadow(true); - aOut.SetFont(aFont); - aOut.DrawText(aPointB, aText, 0, aText.Len()); - - aFont.SetRelief(RELIEF_EMBOSSED); - aOut.SetFont(aFont); - aOut.DrawText(aPointC, aText, 0, aText.Len()); - - //delete pDXArray; - } - - if(false) - { - const double fHor(aRectangle.getWidth()); - const double fVer(aRectangle.getHeight()); - const Point aPointA( - aRectangle.Left() + basegfx::fround(fHor * 0.2), - aRectangle.Top() + basegfx::fround(fVer * 0.3)); - const Point aPointB( - aRectangle.Left() + basegfx::fround(fHor * 0.2), - aRectangle.Top() + basegfx::fround(fVer * 0.5)); - const Point aPointC( - aRectangle.Left() + basegfx::fround(fHor * 0.2), - aRectangle.Top() + basegfx::fround(fVer * 0.7)); - const String aText(ByteString("Hello, World!"), RTL_TEXTENCODING_UTF8); - - const String aFontName(ByteString("Comic Sans MS"), RTL_TEXTENCODING_UTF8); - Font aFont(aFontName, Size(0, 1000)); - aFont.SetAlign(ALIGN_BASELINE); - aFont.SetColor(COL_RED); - - aOut.SetFont(aFont); - const sal_Int32 nWidth(aOut.GetTextWidth(aText, 0, aText.Len())); - aOut.DrawText(aPointA, aText, 0, aText.Len()); - aOut.DrawTextLine(aPointA, nWidth, STRIKEOUT_SINGLE, UNDERLINE_SINGLE, UNDERLINE_SMALLWAVE); - aOut.DrawTextLine(aPointB, nWidth, STRIKEOUT_SINGLE, UNDERLINE_SINGLE, UNDERLINE_SMALLWAVE); - aOut.DrawTextLine(aPointC, nWidth, STRIKEOUT_SINGLE, UNDERLINE_SINGLE, UNDERLINE_SMALLWAVE); - } - - aMtf.Stop(); - aMtf.WindStart(); - aMtf.SetPrefMapMode(MapMode(MAP_100TH_MM)); - aMtf.SetPrefSize(Size(aRectangle.getWidth(), aRectangle.getHeight())); - - xPrimitive = Primitive2DReference( - new MetafilePrimitive2D( - aTransform, - aMtf)); - } - else - { -#endif // USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE // create MetafilePrimitive2D const GDIMetaFile& rMetafile = aTransformedGraphic.GetGDIMetaFile(); @@ -785,9 +333,6 @@ namespace drawinglayer aChildContent)); } } -#ifdef USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE - } -#endif // USE_DEBUG_CODE_TO_TEST_METAFILE_DECOMPOSE break; } @@ -953,3 +498,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx b/drawinglayer/source/primitive2d/gridprimitive2d.cxx index fabf6a3e3f12..0439aa2436cf 100644 --- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -318,3 +319,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/groupprimitive2d.cxx b/drawinglayer/source/primitive2d/groupprimitive2d.cxx index 324007a6c7f3..25908a5b4c98 100644 --- a/drawinglayer/source/primitive2d/groupprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/groupprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx index 69e40ac5799b..e5d861806721 100644 --- a/drawinglayer/source/primitive2d/helplineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/helplineprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -220,3 +221,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx index 2b3afeb0f8ed..c7bb66f60fdf 100644 --- a/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hittestprimitive3d.cxx,v $ - * - * $Revision: 1.1.2.1 $ - * - * last change: $Author: aw $ $Date: 2008/09/25 17:12:14 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -73,3 +68,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/invertprimitive2d.cxx b/drawinglayer/source/primitive2d/invertprimitive2d.cxx index a1db78747cf4..7bd3be3cc596 100644 --- a/drawinglayer/source/primitive2d/invertprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/invertprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/makefile.mk b/drawinglayer/source/primitive2d/makefile.mk deleted file mode 100644 index 77e59dca2469..000000000000 --- a/drawinglayer/source/primitive2d/makefile.mk +++ /dev/null @@ -1,91 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=primitive2d -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/transparenceprimitive2d.obj \ - $(SLO)$/animatedprimitive2d.obj \ - $(SLO)$/baseprimitive2d.obj \ - $(SLO)$/backgroundcolorprimitive2d.obj \ - $(SLO)$/bitmapprimitive2d.obj \ - $(SLO)$/rendergraphicprimitive2d.obj \ - $(SLO)$/borderlineprimitive2d.obj \ - $(SLO)$/chartprimitive2d.obj \ - $(SLO)$/controlprimitive2d.obj \ - $(SLO)$/discretebitmapprimitive2d.obj \ - $(SLO)$/discreteshadowprimitive2d.obj \ - $(SLO)$/embedded3dprimitive2d.obj \ - $(SLO)$/epsprimitive2d.obj \ - $(SLO)$/fillbitmapprimitive2d.obj \ - $(SLO)$/fillgradientprimitive2d.obj \ - $(SLO)$/fillhatchprimitive2d.obj \ - $(SLO)$/graphicprimitive2d.obj \ - $(SLO)$/gridprimitive2d.obj \ - $(SLO)$/groupprimitive2d.obj \ - $(SLO)$/helplineprimitive2d.obj \ - $(SLO)$/hiddengeometryprimitive2d.obj \ - $(SLO)$/invertprimitive2d.obj \ - $(SLO)$/markerarrayprimitive2d.obj \ - $(SLO)$/pointarrayprimitive2d.obj \ - $(SLO)$/maskprimitive2d.obj \ - $(SLO)$/mediaprimitive2d.obj \ - $(SLO)$/metafileprimitive2d.obj \ - $(SLO)$/modifiedcolorprimitive2d.obj \ - $(SLO)$/pagepreviewprimitive2d.obj \ - $(SLO)$/polypolygonprimitive2d.obj \ - $(SLO)$/polygonprimitive2d.obj \ - $(SLO)$/primitivetools2d.obj \ - $(SLO)$/sceneprimitive2d.obj \ - $(SLO)$/sdrdecompositiontools2d.obj \ - $(SLO)$/shadowprimitive2d.obj \ - $(SLO)$/structuretagprimitive2d.obj \ - $(SLO)$/texteffectprimitive2d.obj \ - $(SLO)$/textenumsprimitive2d.obj \ - $(SLO)$/textlayoutdevice.obj \ - $(SLO)$/textlineprimitive2d.obj \ - $(SLO)$/textprimitive2d.obj \ - $(SLO)$/textstrikeoutprimitive2d.obj \ - $(SLO)$/textdecoratedprimitive2d.obj \ - $(SLO)$/texthierarchyprimitive2d.obj \ - $(SLO)$/transformprimitive2d.obj \ - $(SLO)$/unifiedtransparenceprimitive2d.obj \ - $(SLO)$/wallpaperprimitive2d.obj \ - $(SLO)$/wrongspellprimitive2d.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx index 89ac404247ae..3bc4f8a4bafe 100644 --- a/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/markerarrayprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -155,3 +156,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/maskprimitive2d.cxx b/drawinglayer/source/primitive2d/maskprimitive2d.cxx index f1aae04d232f..a864cd7cd89e 100644 --- a/drawinglayer/source/primitive2d/maskprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/maskprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx index dc867171a9b9..70b09b504118 100644 --- a/drawinglayer/source/primitive2d/mediaprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/mediaprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,3 +162,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 9988eb884679..9b35f8109ddb 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -365,7 +366,7 @@ namespace ~PropertyHolders() { - while(maPropertyHolders.size()) + while(!maPropertyHolders.empty()) { delete maPropertyHolders.back(); maPropertyHolders.pop_back(); @@ -527,7 +528,7 @@ namespace void Pop() { OSL_ENSURE(maTargetHolders.size(), "TargetHolders: POP with no property holders (!)"); - if(maTargetHolders.size()) + if(!maTargetHolders.empty()) { delete maTargetHolders.back(); maTargetHolders.pop_back(); @@ -542,7 +543,7 @@ namespace ~TargetHolders() { - while(maTargetHolders.size()) + while(!maTargetHolders.empty()) { delete maTargetHolders.back(); maTargetHolders.pop_back(); @@ -632,7 +633,7 @@ namespace PropertyHolder& rProperties, basegfx::BColor aBColor) { - if(rPositions.size()) + if(!rPositions.empty()) { if(rProperties.getTransformation().isIdentity()) { @@ -1589,7 +1590,7 @@ namespace } } - if(aTargetVector.size()) + if(!aTargetVector.empty()) { // add created text primitive to target if(rProperty.getTransformation().isIdentity()) @@ -1662,9 +1663,9 @@ namespace PropertyHolders& rPropertyHolders, const drawinglayer::geometry::ViewInformation2D& rViewInformation) { - const sal_uInt32 nCount(rMetaFile.GetActionCount()); + const size_t nCount(rMetaFile.GetActionSize()); - for(sal_uInt32 nAction(0); nAction < nCount; nAction++) + for(size_t nAction(0); nAction < nCount; nAction++) { MetaAction* pAction = rMetaFile.GetAction(nAction); @@ -1687,7 +1688,7 @@ namespace if(pA->GetColor() != aLastColor) { - if(aPositions.size()) + if(!aPositions.empty()) { createPointArrayPrimitive(aPositions, rTargetHolders.Current(), rPropertyHolders.Current(), aLastColor.getBColor()); aPositions.clear(); @@ -1703,7 +1704,7 @@ namespace nAction--; - if(aPositions.size()) + if(!aPositions.empty()) { createPointArrayPrimitive(aPositions, rTargetHolders.Current(), rPropertyHolders.Current(), aLastColor.getBColor()); } @@ -1727,7 +1728,7 @@ namespace nAction--; - if(aPositions.size()) + if(!aPositions.empty()) { createPointArrayPrimitive(aPositions, rTargetHolders.Current(), rPropertyHolders.Current(), rPropertyHolders.Current().getLineColor()); } @@ -2115,7 +2116,7 @@ namespace case META_TEXTRECT_ACTION : { /** CHECKED, WORKS WELL */ - // OSL_ENSURE(false, "META_TEXTRECT_ACTION requested (!)"); + // OSL_FAIL("META_TEXTRECT_ACTION requested (!)"); const MetaTextRectAction* pA = (const MetaTextRectAction*)pAction; const Rectangle& rRectangle = pA->GetRect(); const sal_uInt32 nStringLength(pA->GetText().Len()); @@ -2140,7 +2141,7 @@ namespace aTextLayouterDevice.addTextRectActions( rRectangle, pA->GetText(), pA->GetStyle(), aGDIMetaFile); - if(aGDIMetaFile.GetActionCount()) + if(aGDIMetaFile.GetActionSize()) { // cerate sub-content drawinglayer::primitive2d::Primitive2DSequence xSubContent; @@ -2729,7 +2730,7 @@ namespace } default : { - OSL_ENSURE(false, "interpretMetafile: META_MAPMODE_ACTION with unsupported MapUnit (!)"); + OSL_FAIL("interpretMetafile: META_MAPMODE_ACTION with unsupported MapUnit (!)"); break; } } @@ -2980,7 +2981,7 @@ namespace { const GDIMetaFile& rContent = pA->GetGDIMetaFile(); - if(rContent.GetActionCount()) + if(rContent.GetActionSize()) { // create the sub-content with no embedding specific to the // sub-metafile, this seems not to be used. @@ -3174,7 +3175,7 @@ namespace } default: { - OSL_ENSURE(false, "Unknown MetaFile Action (!)"); + OSL_FAIL("Unknown MetaFile Action (!)"); break; } } @@ -3282,3 +3283,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx index 73c647ea3c8c..2d7e22ffd542 100644 --- a/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx index 795ac14b1f91..dd4bc359adb7 100644 --- a/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -181,3 +182,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx index cf618c269569..94b3f9cb7a9a 100644 --- a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx index 9623c02dc5bd..6a656445db40 100644 --- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -508,10 +509,11 @@ namespace drawinglayer { // copy local polygon, it may be changed basegfx::B2DPolygon aLocalPolygon(getB2DPolygon()); + aLocalPolygon.removeDoublePoints(); basegfx::B2DPolyPolygon aArrowA; basegfx::B2DPolyPolygon aArrowB; - if(!aLocalPolygon.isClosed()) + if(!aLocalPolygon.isClosed() && aLocalPolygon.count() > 1) { // apply arrows const double fPolyLength(basegfx::tools::getLength(aLocalPolygon)); @@ -636,3 +638,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx index 4e01d5285c7a..e1102f8eeb35 100644 --- a/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -570,3 +571,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx b/drawinglayer/source/primitive2d/primitivetools2d.cxx index 5da1cd9a816c..af73fcf278a8 100644 --- a/drawinglayer/source/primitive2d/primitivetools2d.cxx +++ b/drawinglayer/source/primitive2d/primitivetools2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -168,3 +169,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx index 0820d6ba09c0..7d83868fa784 100644 --- a/drawinglayer/source/primitive2d/sceneprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/sceneprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -478,3 +479,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx index 9d90c35103d9..42c5d545f092 100644 --- a/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx +++ b/drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdrdecompositiontools3d.cxx,v $ - * - * $Revision: 1.7 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:21 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -128,3 +123,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx index a9bfec89b490..1247ba2785b6 100644 --- a/drawinglayer/source/primitive2d/shadowprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/shadowprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx index 8adcb6a10b82..e6a0a1ce8dc9 100644 --- a/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/structuretagprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -57,3 +58,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx index a0d763e9e63f..6c60b3f22281 100644 --- a/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -209,7 +210,7 @@ namespace drawinglayer if(!xLocalBreakIterator.is()) { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF(::comphelper::getProcessServiceFactory()); - xLocalBreakIterator.set(xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator")), ::com::sun::star::uno::UNO_QUERY); + xLocalBreakIterator.set(xMSF->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator"))), ::com::sun::star::uno::UNO_QUERY); } if(xLocalBreakIterator.is() && getTextLength()) @@ -235,6 +236,7 @@ namespace drawinglayer getFontAttribute().getSymbol(), getFontAttribute().getVertical(), getFontAttribute().getItalic(), + getFontAttribute().getMonospaced(), false, // no outline anymore, handled locally getFontAttribute().getRTL(), getFontAttribute().getBiDiStrong()); @@ -604,3 +606,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx index 94926f1043a4..41e51c6e9e2f 100644 --- a/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texteffectprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -237,3 +238,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx index 7172e38c0c2e..b9ad03531206 100644 --- a/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textenumsprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -119,3 +120,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx index fb26a8d463f4..4653a0437a3b 100644 --- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -156,3 +157,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 9aafd195a707..330d597ba700 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,6 +30,8 @@ #include "precompiled_drawinglayer.hxx" #include <drawinglayer/primitive2d/textlayoutdevice.hxx> +#include <comphelper/processfactory.hxx> +#include <comphelper/scoped_disposing_ptr.hxx> #include <vcl/timer.hxx> #include <vcl/virdev.hxx> #include <vcl/font.hxx> @@ -42,14 +45,33 @@ namespace { + class ImpTimedRefDev; + + //the scoped_timed_RefDev owns a ImpTimeRefDev and releases it on dtor + //or disposing of the default XComponentContext which causes the underlying + //OutputDevice to get released + // + //The ImpTimerRefDev itself, if the timeout ever gets hit, will call + //reset on the scoped_timed_RefDev to release the ImpTimerRefDev early + //if its unused for a few minutes + class scoped_timed_RefDev : public comphelper::scoped_disposing_ptr<ImpTimedRefDev> + { + public: + scoped_timed_RefDev() : comphelper::scoped_disposing_ptr<ImpTimedRefDev>((::com::sun::star::uno::Reference<com::sun::star::lang::XComponent>(::comphelper::getProcessComponentContext(), ::com::sun::star::uno::UNO_QUERY_THROW))) + { + } + }; + + class the_scoped_timed_RefDev : public rtl::Static<scoped_timed_RefDev, the_scoped_timed_RefDev> {}; + class ImpTimedRefDev : public Timer { - ImpTimedRefDev** mppStaticPointerOnMe; + scoped_timed_RefDev& mrOwnerOfMe; VirtualDevice* mpVirDev; sal_uInt32 mnUseCount; public: - ImpTimedRefDev(ImpTimedRefDev** ppStaticPointerOnMe); + ImpTimedRefDev(scoped_timed_RefDev& rOwnerofMe); ~ImpTimedRefDev(); virtual void Timeout(); @@ -57,8 +79,8 @@ namespace void releaseVirtualDevice(); }; - ImpTimedRefDev::ImpTimedRefDev(ImpTimedRefDev** ppStaticPointerOnMe) - : mppStaticPointerOnMe(ppStaticPointerOnMe), + ImpTimedRefDev::ImpTimedRefDev(scoped_timed_RefDev& rOwnerOfMe) + : mrOwnerOfMe(rOwnerOfMe), mpVirDev(0L), mnUseCount(0L) { @@ -69,22 +91,13 @@ namespace ImpTimedRefDev::~ImpTimedRefDev() { OSL_ENSURE(0L == mnUseCount, "destruction of a still used ImpTimedRefDev (!)"); - - if(mppStaticPointerOnMe && *mppStaticPointerOnMe) - { - *mppStaticPointerOnMe = 0L; - } - - if(mpVirDev) - { - delete mpVirDev; - } + delete mpVirDev; } void ImpTimedRefDev::Timeout() { // for obvious reasons, do not call anything after this - delete (this); + mrOwnerOfMe.reset(); } VirtualDevice& ImpTimedRefDev::acquireVirtualDevice() @@ -124,24 +137,23 @@ namespace drawinglayer { namespace primitive2d { - // static pointer here - static ImpTimedRefDev* pImpGlobalRefDev = 0L; - // static methods here VirtualDevice& acquireGlobalVirtualDevice() { - if(!pImpGlobalRefDev) - { - pImpGlobalRefDev = new ImpTimedRefDev(&pImpGlobalRefDev); - } + scoped_timed_RefDev& rStdRefDevice = the_scoped_timed_RefDev::get(); + + if(!rStdRefDevice) + rStdRefDevice.reset(new ImpTimedRefDev(rStdRefDevice)); - return pImpGlobalRefDev->acquireVirtualDevice(); + return rStdRefDevice->acquireVirtualDevice(); } void releaseGlobalVirtualDevice() { - OSL_ENSURE(pImpGlobalRefDev, "releaseGlobalVirtualDevice() without prior acquireGlobalVirtualDevice() call(!)"); - pImpGlobalRefDev->releaseVirtualDevice(); + scoped_timed_RefDev& rStdRefDevice = the_scoped_timed_RefDev::get(); + + OSL_ENSURE(rStdRefDevice, "releaseGlobalVirtualDevice() without prior acquireGlobalVirtualDevice() call(!)"); + rStdRefDevice->releaseVirtualDevice(); } TextLayouterDevice::TextLayouterDevice() @@ -346,13 +358,9 @@ namespace drawinglayer if(nTextLength) { aRetval.reserve(nTextLength); - sal_Int32* pArray = new sal_Int32[nTextLength]; - mrDevice.GetTextArray(rText, pArray, nIndex, nLength); - - for(sal_uInt32 a(0); a < nTextLength; a++) - { - aRetval.push_back(pArray[a]); - } + ::std::vector<sal_Int32> aArray(nTextLength); + mrDevice.GetTextArray(rText, &aArray[0], nIndex, nLength); + aRetval.assign(aArray.begin(), aArray.end()); } return aRetval; @@ -491,3 +499,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx index 74e4e3dbf1be..b76056b5a219 100644 --- a/drawinglayer/source/primitive2d/textlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textlineprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -307,3 +308,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index f5566246ef91..b830f8fc01c9 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -237,7 +238,9 @@ namespace drawinglayer const ::std::vector< double >& rDXArray, const attribute::FontAttribute& rFontAttribute, const ::com::sun::star::lang::Locale& rLocale, - const basegfx::BColor& rFontColor) + const basegfx::BColor& rFontColor, + bool bFilled, + long nWidthToFill) : BufferedDecompositionPrimitive2D(), maTextTransform(rNewTransform), maText(rText), @@ -247,9 +250,11 @@ namespace drawinglayer maFontAttribute(rFontAttribute), maLocale(rLocale), maFontColor(rFontColor), - maB2DRange() + maB2DRange(), + mbFilled(bFilled), + mnWidthToFill(nWidthToFill) { -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 0 const xub_StrLen aStringLength(getText().Len()); OSL_ENSURE(aStringLength >= getTextPosition() && aStringLength >= getTextPosition() + getTextLength(), "TextSimplePortionPrimitive2D with text out of range (!)"); @@ -276,7 +281,9 @@ namespace drawinglayer && getDXArray() == rCompare.getDXArray() && getFontAttribute() == rCompare.getFontAttribute() && LocalesAreEqual(getLocale(), rCompare.getLocale()) - && getFontColor() == rCompare.getFontColor()); + && getFontColor() == rCompare.getFontColor() + && mbFilled == rCompare.mbFilled + && mnWidthToFill == rCompare.mnWidthToFill); } return false; @@ -337,3 +344,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx index 855b1bf178fa..98d7a64e2dfc 100644 --- a/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -284,3 +285,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/transformprimitive2d.cxx b/drawinglayer/source/primitive2d/transformprimitive2d.cxx index 39905ad42b5b..b3f1e2e1b0a3 100644 --- a/drawinglayer/source/primitive2d/transformprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/transformprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx index cfe1e184e89e..d5aec4d7434e 100644 --- a/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/transparenceprimitive2d.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: alphaprimitive2d.cxx,v $ - * - * $Revision: 1.5 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -76,3 +71,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx index 6d930e40f5d7..b96c8967bdaf 100644 --- a/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: UnifiedTransparencePrimitive2D.cxx,v $ - * - * $Revision: 1.5 $ - * - * last change: $Author: aw $ $Date: 2008-05-27 14:11:20 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -134,3 +129,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx index efa51c75b611..0213ba90a6c6 100644 --- a/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -267,3 +268,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx index 10c6e1e7263e..825251036d7a 100644 --- a/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -120,3 +121,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx index d63d906139c6..c14fc8bfc2e6 100644 --- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -276,3 +277,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/groupprimitive3d.cxx b/drawinglayer/source/primitive3d/groupprimitive3d.cxx index 8ad65676cf24..328916da6dda 100644 --- a/drawinglayer/source/primitive3d/groupprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/groupprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx index d94fbb5f893c..4f942fae7978 100644 --- a/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -317,3 +318,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx index e94eeb99f764..a46920e4d438 100644 --- a/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx @@ -1,13 +1,8 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: hittestprimitive3d.cxx,v $ - * - * $Revision: 1.1.2.1 $ - * - * last change: $Author: aw $ $Date: 2008/09/25 17:12:14 $ - * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. * @@ -74,3 +69,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/makefile.mk b/drawinglayer/source/primitive3d/makefile.mk deleted file mode 100644 index afad990c0e28..000000000000 --- a/drawinglayer/source/primitive3d/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=primitive3d -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/baseprimitive3d.obj \ - $(SLO)$/groupprimitive3d.obj \ - $(SLO)$/hatchtextureprimitive3d.obj \ - $(SLO)$/hiddengeometryprimitive3d.obj \ - $(SLO)$/modifiedcolorprimitive3d.obj \ - $(SLO)$/polypolygonprimitive3d.obj \ - $(SLO)$/polygonprimitive3d.obj \ - $(SLO)$/polygontubeprimitive3d.obj \ - $(SLO)$/sdrcubeprimitive3d.obj \ - $(SLO)$/sdrdecompositiontools3d.obj \ - $(SLO)$/sdrextrudelathetools3d.obj \ - $(SLO)$/sdrextrudeprimitive3d.obj \ - $(SLO)$/sdrlatheprimitive3d.obj \ - $(SLO)$/sdrpolypolygonprimitive3d.obj \ - $(SLO)$/sdrprimitive3d.obj \ - $(SLO)$/sdrsphereprimitive3d.obj \ - $(SLO)$/shadowprimitive3d.obj \ - $(SLO)$/textureprimitive3d.obj \ - $(SLO)$/transformprimitive3d.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx index d840aaf49278..948891643738 100644 --- a/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx index 9899e565f69c..db906e6c8e51 100644 --- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -176,3 +177,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 7b5f183575b2..5f9c780fb3ab 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -577,3 +578,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx index b3e6655a001a..0d94e75ae25a 100644 --- a/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx index 6dcea7b0d759..a52e74057c11 100644 --- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -220,3 +221,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx index 471d18ed846e..ae682f72a21b 100644 --- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -337,3 +338,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx index 98ce52b5c0a7..4bbf11748246 100644 --- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -989,3 +990,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx index 2485d467b7f4..b33bb0038a43 100644 --- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -524,3 +525,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx index d2ca2f5786bc..2ddccd4ea01d 100644 --- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -385,3 +386,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx index 825bd6ee4671..5fc1bbad3e67 100644 --- a/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -192,3 +193,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx index e5f722126d42..90b39586b297 100644 --- a/drawinglayer/source/primitive3d/sdrprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -123,3 +124,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx index b10b4ad6164b..1f00496678b5 100644 --- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -222,3 +223,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx index 97ac5d930d62..282deb4332cc 100644 --- a/drawinglayer/source/primitive3d/shadowprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/shadowprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/textureprimitive3d.cxx b/drawinglayer/source/primitive3d/textureprimitive3d.cxx index d10fc52b8bb2..5edd40806a21 100644 --- a/drawinglayer/source/primitive3d/textureprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/textureprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -225,3 +226,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/primitive3d/transformprimitive3d.cxx b/drawinglayer/source/primitive3d/transformprimitive3d.cxx index f50fb061df04..c1d18bb22ae3 100644 --- a/drawinglayer/source/primitive3d/transformprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/transformprimitive3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/baseprocessor2d.cxx b/drawinglayer/source/processor2d/baseprocessor2d.cxx index ffa58ada0d03..71c46039ca26 100644 --- a/drawinglayer/source/processor2d/baseprocessor2d.cxx +++ b/drawinglayer/source/processor2d/baseprocessor2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/canvasprocessor.cxx b/drawinglayer/source/processor2d/canvasprocessor.cxx index 23661fe3747b..dce0b8533e68 100644 --- a/drawinglayer/source/processor2d/canvasprocessor.cxx +++ b/drawinglayer/source/processor2d/canvasprocessor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,1203 +77,6 @@ using namespace com::sun::star; ////////////////////////////////////////////////////////////////////////////// -// AW: Adding the canvas example from THB here to extract stuff later -/* - // TODO(Q3): share impCreateEmptyBitmapWithPattern() and other - // helper methods with vclprocessor.cxx - Bitmap impCreateEmptyBitmapWithPattern(Bitmap aSource, const Size& aTargetSizePixel) - { - Bitmap aRetval; - BitmapReadAccess* pReadAccess = aSource.AcquireReadAccess(); - - if(pReadAccess) - { - if(aSource.GetBitCount() <= 8) - { - BitmapPalette aPalette(pReadAccess->GetPalette()); - aRetval = Bitmap(aTargetSizePixel, aSource.GetBitCount(), &aPalette); - } - else - { - aRetval = Bitmap(aTargetSizePixel, aSource.GetBitCount()); - } - - delete pReadAccess; - } - - return aRetval; - } - - Bitmap impModifyBitmap(const basegfx::BColorModifier& rModifier, const Bitmap& rSource) - { - Bitmap aRetval(rSource); - - switch(rModifier.getMode()) - { - case basegfx::BCOLORMODIFYMODE_REPLACE : - { - aRetval = impCreateEmptyBitmapWithPattern(aRetval, Size(1L, 1L)); - aRetval.Erase(Color(rModifier.getBColor())); - break; - } - - default : // BCOLORMODIFYMODE_INTERPOLATE, BCOLORMODIFYMODE_GRAY, BCOLORMODIFYMODE_BLACKANDWHITE - { - BitmapWriteAccess* pContent = aRetval.AcquireWriteAccess(); - - if(pContent) - { - for(sal_uInt32 y(0L); y < (sal_uInt32)pContent->Height(); y++) - { - for(sal_uInt32 x(0L); x < (sal_uInt32)pContent->Width(); x++) - { - const Color aColor = pContent->GetPixel(y, x); - const basegfx::BColor aBColor(rModifier.getModifiedColor(aColor.getBColor())); - pContent->SetPixel(y, x, BitmapColor(Color(aBColor))); - } - } - - delete pContent; - } - - break; - } - } - - return aRetval; - } - - Bitmap impModifyBitmap(const basegfx::BColorModifierStack& rBColorModifierStack, const Bitmap& rSource) - { - Bitmap aRetval(rSource); - - for(sal_uInt32 a(rBColorModifierStack.count()); a; ) - { - const basegfx::BColorModifier& rModifier = rBColorModifierStack.getBColorModifier(--a); - aRetval = impModifyBitmap(rModifier, aRetval); - } - - return aRetval; - } - - sal_uInt32 impCalcGradientSteps(sal_uInt32 nSteps, const basegfx::B2DRange& rRange, sal_uInt32 nMaxDist) - { - if(nSteps == 0L) - nSteps = (sal_uInt32)(rRange.getWidth() + rRange.getHeight()) / 8; - - if(nSteps < 2L) - { - nSteps = 2L; - } - - if(nSteps > nMaxDist) - { - nSteps = nMaxDist; - } - - return nSteps; - } - - void canvasProcessor::impDrawGradientSimple( - const basegfx::B2DPolyPolygon& rTargetForm, - const ::std::vector< basegfx::B2DHomMatrix >& rMatrices, - const ::std::vector< basegfx::BColor >& rColors, - const basegfx::B2DPolygon& rUnitPolygon) - { - uno::Reference< rendering::XPolyPolygon2D > xPoly( - basegfx::unotools::xPolyPolygonFromB2DPolygon( - mxCanvas->getDevice(), - rUnitPolygon)); - uno::Reference< rendering::XPolyPolygon2D > xTargetPoly( - basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( - mxCanvas->getDevice(), - rTargetForm)); - - for(sal_uInt32 a(0L); a < rColors.size(); a++) - { - // set correct color - const basegfx::BColor aFillColor(rColors[a]); - - maRenderState.DeviceColor = basegfx::unotools::colorToDoubleSequence( - mxCanvas->getDevice(), - aFillColor); - - if(a) - { - if(a - 1L < rMatrices.size()) - { - canvas::tools::setRenderStateTransform( maRenderState, - rMatrices[a - 1L] ); - mxCanvas->fillPolyPolygon(xPoly,maViewState,maRenderState); - } - } - else - { - canvas::tools::setRenderStateTransform( maRenderState, - basegfx::B2DHomMatrix() ); - mxCanvas->fillPolyPolygon(xTargetPoly,maViewState,maRenderState); - } - } - } - - void canvasProcessor::impDrawGradientComplex( - const basegfx::B2DPolyPolygon& rTargetForm, - const ::std::vector< basegfx::B2DHomMatrix >& rMatrices, - const ::std::vector< basegfx::BColor >& rColors, - const basegfx::B2DPolygon& rUnitPolygon) - { - uno::Reference< rendering::XPolyPolygon2D > xPoly( - basegfx::unotools::xPolyPolygonFromB2DPolygon( - mxCanvas->getDevice(), - rUnitPolygon)); - uno::Reference< rendering::XPolyPolygon2D > xTargetPoly( - basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( - mxCanvas->getDevice(), - rTargetForm)); - - maRenderState.Clip = xTargetPoly; - - // draw gradient PolyPolygons - for(std::size_t a = 0L; a < rMatrices.size(); a++) - { - // set correct color - if(rColors.size() > a) - { - const basegfx::BColor aFillColor(rColors[a]); - - maRenderState.DeviceColor = basegfx::unotools::colorToDoubleSequence( - mxCanvas->getDevice(), - aFillColor); - } - - canvas::tools::setRenderStateTransform( maRenderState, - rMatrices[a] ); - - if(a) - mxCanvas->fillPolyPolygon(xPoly,maViewState,maRenderState); - else - mxCanvas->fillPolyPolygon(xTargetPoly,maViewState,maRenderState); - } - - maRenderState.Clip.clear(); - } - - void canvasProcessor::impDrawGradient( - const basegfx::B2DPolyPolygon& rTargetForm, - ::drawinglayer::primitive::GradientStyle eGradientStyle, - sal_uInt32 nSteps, - const basegfx::BColor& rStart, - const basegfx::BColor& rEnd, - double fBorder, double fAngle, double fOffsetX, double fOffsetY, bool bSimple) - { - fprintf(stderr,"impDrawGradient\n"); - - basegfx::B2DPolyPolygon aTmp(rTargetForm); - aTmp.transform( maWorldToView ); - const basegfx::B2DRange aOutlineRangePixel(basegfx::tools::getRange(aTmp)); - const basegfx::B2DRange aOutlineRange(basegfx::tools::getRange(rTargetForm)); - - fprintf(stderr,"impDrawGradient: #%d\n",nSteps); - - if( // step count is infinite, can use native canvas - // gradients here - nSteps == 0 || - // step count is sufficiently high, such that no - // discernible difference should be visible. - nSteps > 64 ) - { - uno::Reference< rendering::XParametricPolyPolygon2DFactory > xFactory( - mxCanvas->getDevice()->getParametricPolyPolygonFactory() ); - - if( xFactory.is() ) - { - fprintf(stderr,"native gradient #1\n"); - - basegfx::B2DHomMatrix aTextureTransformation; - rendering::Texture aTexture; - - aTexture.RepeatModeX = rendering::TexturingMode::CLAMP; - aTexture.RepeatModeY = rendering::TexturingMode::CLAMP; - aTexture.Alpha = 1.0; - - - // setup start/end color values - // ---------------------------- - - const uno::Sequence< double > aStartColor( - basegfx::unotools::colorToDoubleSequence( mxCanvas->getDevice(), - rStart )); - const uno::Sequence< double > aEndColor( - basegfx::unotools::colorToDoubleSequence( mxCanvas->getDevice(), - rEnd )); - - // Setup texture transformation - // ---------------------------- - - const basegfx::B2DRange& rBounds( - basegfx::tools::getRange( rTargetForm )); - - // setup rotation angle. VCL rotates - // counter-clockwise, while canvas transformation - // rotates clockwise - //fAngle = -fAngle; - - switch(eGradientStyle) - { - case ::drawinglayer::primitive::GRADIENTSTYLE_LINEAR: - // FALLTHROUGH intended - case ::drawinglayer::primitive::GRADIENTSTYLE_AXIAL: - { - // standard orientation for VCL linear - // gradient is vertical, thus, rotate 90 - // degrees - fAngle += M_PI/2.0; - - // shrink texture, to account for border - // (only in x direction, linear gradient - // is constant in y direction, anyway) - aTextureTransformation.scale( - basegfx::pruneScaleValue(1.0 - fBorder), - 1.0 ); - - double fBorderX(0.0); - - // determine type of gradient (and necessary - // transformation matrix, should it be emulated by a - // generic gradient) - switch(eGradientStyle) - { - case ::drawinglayer::primitive::GRADIENTSTYLE_LINEAR: - // linear gradients don't respect - // offsets (they are implicitely - // assumed to be 50%). linear - // gradients don't have border on - // both sides, only on the - // startColor side. Gradient is - // invariant in y direction: leave - // y offset alone. - fBorderX = fBorder; - aTexture.Gradient = xFactory->createLinearHorizontalGradient( aStartColor, - aEndColor ); - break; - - case ::drawinglayer::primitive::GRADIENTSTYLE_AXIAL: - // axial gradients have border on - // both sides. Gradient is - // invariant in y direction: leave - // y offset alone. - fBorderX = fBorder * .5; - aTexture.Gradient = xFactory->createAxialHorizontalGradient( aStartColor, - aEndColor ); - break; - } - - // apply border offset values - aTextureTransformation.translate( fBorderX, - 0.0 ); - - // rotate texture according to gradient rotation - aTextureTransformation.translate( -0.5, -0.5 ); - aTextureTransformation.rotate( fAngle ); - - // to let the first strip of a rotated - // gradient start at the _edge_ of the - // bound rect (and not, due to rotation, - // slightly inside), slightly enlarge the - // gradient: - // - // y/2 sin(transparence) + x/2 cos(transparence) - // - // (values to change are not actual - // gradient scales, but original bound - // rect dimensions. Since we still want - // the border setting to apply after that, - // we multiply with that as above for - // nScaleX) - const double nScale( - basegfx::pruneScaleValue( - fabs( rBounds.getHeight()*sin(fAngle) ) + - fabs( rBounds.getWidth()*cos(fAngle) ))); - - aTextureTransformation.scale( nScale, nScale ); - - // translate back origin to center of - // primitive - aTextureTransformation.translate( 0.5*rBounds.getWidth(), - 0.5*rBounds.getHeight() ); - break; - } - - case ::drawinglayer::primitive::GRADIENTSTYLE_RADIAL: - // FALLTHROUGH intended - case ::drawinglayer::primitive::GRADIENTSTYLE_ELLIPTICAL: - // FALLTHROUGH intended - case ::drawinglayer::primitive::GRADIENTSTYLE_SQUARE: - // FALLTHROUGH intended - case ::drawinglayer::primitive::GRADIENTSTYLE_RECT: - { - fprintf(stderr,"native gradient #2\n"); - - // determine scale factors for the gradient (must - // be scaled up from [0,1]x[0,1] rect to object - // bounds). Will potentially changed in switch - // statement below. - // Respect border value, while doing so, the VCL - // gradient's border will effectively shrink the - // resulting gradient. - double nScaleX( rBounds.getWidth() * (1.0 - fBorder) ); - double nScaleY( rBounds.getHeight()* (1.0 - fBorder) ); - - // determine offset values. Since the - // border is divided half-by-half to both - // sides of the gradient, divide - // translation offset by an additional - // factor of 2. Also respect offset here, - // but since VCL gradients have their - // center at [0,0] for zero offset, but - // canvas gradients have their top, left - // edge aligned with the primitive, and - // offset of 50% effectively must yield - // zero shift. Both values will - // potentially be adapted in switch - // statement below. - double nOffsetX( rBounds.getWidth() * - (2.0 * fOffsetX - 1.0 + fBorder)*.5 ); - double nOffsetY( rBounds.getHeight() * - (2.0 * fOffsetY - 1.0 + fBorder)*.5 ); - - // determine type of gradient (and necessary - // transformation matrix, should it be emulated by a - // generic gradient) - switch(eGradientStyle) - { - case ::drawinglayer::primitive::GRADIENTSTYLE_RADIAL: - { - // create isotrophic scaling - if( nScaleX > nScaleY ) - { - nOffsetY -= (nScaleX - nScaleY) * 0.5; - nScaleY = nScaleX; - } - else - { - nOffsetX -= (nScaleY - nScaleX) * 0.5; - nScaleX = nScaleY; - } - - // enlarge gradient to match bound rect diagonal - aTextureTransformation.translate( -0.5, -0.5 ); - const double nScale( hypot(rBounds.getWidth(), - rBounds.getHeight()) / nScaleX ); - aTextureTransformation.scale( nScale, nScale ); - aTextureTransformation.translate( 0.5, 0.5 ); - - aTexture.Gradient = xFactory->createEllipticalGradient( - aEndColor, - aStartColor, - cssgeom::RealRectangle2D(0.0,0.0, - 1.0,1.0) ); - } - break; - - case ::drawinglayer::primitive::GRADIENTSTYLE_ELLIPTICAL: - { - // enlarge gradient slightly - aTextureTransformation.translate( -0.5, -0.5 ); - const double nSqrt2( sqrt(2.0) ); - aTextureTransformation.scale( nSqrt2,nSqrt2 ); - aTextureTransformation.translate( 0.5, 0.5 ); - - aTexture.Gradient = xFactory->createEllipticalGradient( - aEndColor, - aStartColor, - cssgeom::RealRectangle2D( rBounds.getMinX(), - rBounds.getMinY(), - rBounds.getMaxX(), - rBounds.getMaxY() )); - } - break; - - case ::drawinglayer::primitive::GRADIENTSTYLE_SQUARE: - { - // create isotrophic scaling - if( nScaleX > nScaleY ) - { - nOffsetY -= (nScaleX - nScaleY) * 0.5; - nScaleY = nScaleX; - } - else - { - nOffsetX -= (nScaleY - nScaleX) * 0.5; - nScaleX = nScaleY; - } - - aTexture.Gradient = xFactory->createRectangularGradient( - aEndColor, - aStartColor, - cssgeom::RealRectangle2D(0.0,0.0, - 1.0,1.0)); - } - break; - - case ::drawinglayer::primitive::GRADIENTSTYLE_RECT: - { - aTexture.Gradient = xFactory->createRectangularGradient( - aEndColor, - aStartColor, - cssgeom::RealRectangle2D( rBounds.getMinX(), - rBounds.getMinY(), - rBounds.getMaxX(), - rBounds.getMaxY() )); - } - break; - } - - nScaleX = basegfx::pruneScaleValue( nScaleX ); - nScaleY = basegfx::pruneScaleValue( nScaleY ); - - aTextureTransformation.scale( nScaleX, nScaleY ); - - // rotate texture according to gradient rotation - aTextureTransformation.translate( -0.5*nScaleX, -0.5*nScaleY ); - aTextureTransformation.rotate( fAngle ); - aTextureTransformation.translate( 0.5*nScaleX, 0.5*nScaleY ); - - aTextureTransformation.translate( nOffsetX, nOffsetY ); - } - break; - - default: - OSL_ENSURE( false, - "canvasProcessor::impDrawGradient(): Unexpected gradient type" ); - break; - } - - // As the texture coordinate space is relative to - // the polygon coordinate space (NOT to the - // polygon itself), move gradient to the start of - // the actual polygon. If we skip this, the - // gradient will always display at the origin, and - // not within the polygon bound (which might be - // miles away from the origin). - aTextureTransformation.translate( rBounds.getMinX(), - rBounds.getMinY() ); - - basegfx::unotools::affineMatrixFromHomMatrix( aTexture.AffineTransform, - aTextureTransformation ); - uno::Sequence< rendering::Texture > aSeq(1); - aSeq[0] = aTexture; - - mxCanvas->fillTexturedPolyPolygon( - basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( - mxCanvas->getDevice(), - rTargetForm), - maViewState, - maRenderState, - aSeq ); - - // done, using native gradients - return; - } - } - else - { - // make sure steps is not too high/low - nSteps = impCalcGradientSteps(nSteps, - aOutlineRangePixel, - sal_uInt32((rStart.getMaximumDistance(rEnd) * 127.5) + 0.5)); - - - ::std::vector< basegfx::B2DHomMatrix > aMatrices; - ::std::vector< basegfx::BColor > aColors; - basegfx::B2DPolygon aUnitPolygon; - - if( drawinglayer::primitive::GRADIENTSTYLE_RADIAL == eGradientStyle || - drawinglayer::primitive::GRADIENTSTYLE_ELLIPTICAL == eGradientStyle) - { - const basegfx::B2DPoint aCircleCenter(0.5, 0.5); - aUnitPolygon = basegfx::tools::createPolygonFromEllipse(aCircleCenter, 0.5, 0.5); - aUnitPolygon = basegfx::tools::adaptiveSubdivideByAngle(aUnitPolygon); - } - else - { - aUnitPolygon = basegfx::tools::createUnitPolygon(); - } - - // create geometries - switch(eGradientStyle) - { - case ::drawinglayer::primitive::GRADIENTSTYLE_LINEAR: - { - ::drawinglayer::primitive::geoTexSvxGradientLinear aGradient(aOutlineRange, rStart, rEnd, nSteps, fBorder, fAngle); - aGradient.appendTransformations(aMatrices); - aGradient.appendColors(aColors); - break; - } - case ::drawinglayer::primitive::GRADIENTSTYLE_AXIAL: - { - ::drawinglayer::primitive::geoTexSvxGradientAxial aGradient(aOutlineRange, rStart, rEnd, nSteps, fBorder, fAngle); - aGradient.appendTransformations(aMatrices); - aGradient.appendColors(aColors); - break; - } - case ::drawinglayer::primitive::GRADIENTSTYLE_RADIAL: - { - ::drawinglayer::primitive::geoTexSvxGradientRadial aGradient(aOutlineRange, rStart, rEnd, nSteps, fBorder, fOffsetX, fOffsetY); - aGradient.appendTransformations(aMatrices); - aGradient.appendColors(aColors); - break; - } - case ::drawinglayer::primitive::GRADIENTSTYLE_ELLIPTICAL: - { - ::drawinglayer::primitive::geoTexSvxGradientElliptical aGradient(aOutlineRange, rStart, rEnd, nSteps, fBorder, fOffsetX, fOffsetX, fAngle); - aGradient.appendTransformations(aMatrices); - aGradient.appendColors(aColors); - break; - } - case ::drawinglayer::primitive::GRADIENTSTYLE_SQUARE: - { - ::drawinglayer::primitive::geoTexSvxGradientSquare aGradient(aOutlineRange, rStart, rEnd, nSteps, fBorder, fOffsetX, fOffsetX, fAngle); - aGradient.appendTransformations(aMatrices); - aGradient.appendColors(aColors); - break; - } - case ::drawinglayer::primitive::GRADIENTSTYLE_RECT: - { - ::drawinglayer::primitive::geoTexSvxGradientRect aGradient(aOutlineRange, rStart, rEnd, nSteps, fBorder, fOffsetX, fOffsetX, fAngle); - aGradient.appendTransformations(aMatrices); - aGradient.appendColors(aColors); - break; - } - } - - // paint them with mask using the XOR method - if(aMatrices.size()) - { - if(bSimple) - { - impDrawGradientSimple(rTargetForm, aMatrices, aColors, aUnitPolygon); - } - else - { - impDrawGradientComplex(rTargetForm, aMatrices, aColors, aUnitPolygon); - } - } - } - } - - - ////////////////////////////////////////////////////////////////////////////// - // rendering support - - // directdraw of text simple portion - void canvasProcessor::impRender_STXP(const textSimplePortionPrimitive& rTextCandidate) - { - const fontAttributes& rFontAttrs( rTextCandidate.getFontAttribute() ); - rendering::FontRequest aFontRequest; - - aFontRequest.FontDescription.FamilyName = rFontAttrs.maFamilyName; - aFontRequest.FontDescription.StyleName = rFontAttrs.maStyleName; - aFontRequest.FontDescription.IsSymbolFont = rFontAttrs.mbSymbol ? util::TriState_YES : util::TriState_NO; - aFontRequest.FontDescription.IsVertical = rFontAttrs.mbVertical ? util::TriState_YES : util::TriState_NO; - - // TODO(F2): improve vclenum->panose conversion - aFontRequest.FontDescription.FontDescription.Weight = - rFontAttrs.mnWeight; - aFontRequest.FontDescription.FontDescription.Letterform = - rFontAttrs.mbItalic ? 9 : 0; - - // font matrix should only be used for glyph rotations etc. - css::geometry::Matrix2D aFontMatrix; - canvas::tools::setIdentityMatrix2D( aFontMatrix ); - - uno::Reference<rendering::XCanvasFont> xFont( - mxCanvas->createFont( aFontRequest, - uno::Sequence< beans::PropertyValue >(), - aFontMatrix )); - - if( !xFont.is() ) - return; - - uno::Reference<rendering::XTextLayout> xLayout( - xFont->createTextLayout( - rendering::StringContext( rTextCandidate.getText(), - 0, - rTextCandidate.getText().Len() ), - // TODO(F3): Is this sufficient? - rendering::TextDirection::WEAK_LEFT_TO_RIGHT, - 0 )); - if( !xLayout.is() ) - return; - - xLayout->applyLogicalAdvancements( - uno::Sequence<double>(&rTextCandidate.getDXArray()[0], - rTextCandidate.getDXArray().size() )); - - const basegfx::BColor aRGBColor( - maBColorModifierStack.getModifiedColor( - rTextCandidate.getFontColor())); - - maRenderState.DeviceColor = basegfx::unotools::colorToDoubleSequence( - mxCanvas->getDevice(), - aRGBColor); - - // get render parameters and paint - mxCanvas->drawTextLayout( xLayout, - maViewState, - maRenderState ); - } - - // direct draw of hairline - void canvasProcessor::impRender_POHL(const polygonHairlinePrimitive& rPolygonCandidate) - { - const basegfx::BColor aRGBColor( - maBColorModifierStack.getModifiedColor( - rPolygonCandidate.getBColor())); - - maRenderState.DeviceColor = basegfx::unotools::colorToDoubleSequence( - mxCanvas->getDevice(), - aRGBColor); - - mxCanvas->drawPolyPolygon( basegfx::unotools::xPolyPolygonFromB2DPolygon( - mxCanvas->getDevice(), - rPolygonCandidate.getB2DPolygon()), - maViewState, - maRenderState ); - } - - // direct draw of transformed BitmapEx primitive - void canvasProcessor::impRender_BMPR(const bitmapPrimitive& rBitmapCandidate) - { - BitmapEx aBitmapEx(rBitmapCandidate.getBitmapEx()); - - if(maBColorModifierStack.count()) - { - // TODO(Q3): Share common bmp modification code with - // vclprocessor.cxx - Bitmap aChangedBitmap(impModifyBitmap(maBColorModifierStack, aBitmapEx.GetBitmap())); - - if(aBitmapEx.IsTransparent()) - { - if(aBitmapEx.IsAlpha()) - aBitmapEx = BitmapEx(aChangedBitmap, aBitmapEx.GetAlpha()); - else - aBitmapEx = BitmapEx(aChangedBitmap, aBitmapEx.GetMask()); - } - else - aBitmapEx = BitmapEx(aChangedBitmap); - } - - mxCanvas->drawBitmap( - vcl::unotools::xBitmapFromBitmapEx( mxCanvas->getDevice(), - aBitmapEx ), - maViewState, - maRenderState); - } - - void canvasProcessor::impRender_PPLB(const polyPolygonBitmapPrimitive& rPolyBitmapCandidate ) - { - const fillBitmapAttribute& rFillBmpAttr( rPolyBitmapCandidate.getFillBitmap() ); - const basegfx::B2DPolyPolygon& rPoly( rPolyBitmapCandidate.getB2DPolyPolygon() ); - - // TODO(Q3): Share common bmp modification code with - // vclprocessor.cxx - Bitmap aChangedBitmap( - impModifyBitmap(maBColorModifierStack, - rFillBmpAttr.getBitmap())); - - rendering::Texture aTexture; - const basegfx::B2DVector aBmpSize( rFillBmpAttr.getSize() ); - - const basegfx::B2DRange& rBounds( - basegfx::tools::getRange( rPoly )); - - basegfx::B2DHomMatrix aScale; - aScale.scale( aBmpSize.getX() * rBounds.getWidth(), - aBmpSize.getY() * rBounds.getHeight() ); - - basegfx::unotools::affineMatrixFromHomMatrix( - aTexture.AffineTransform, - aScale ); - - aTexture.Alpha = 1.0; - aTexture.Bitmap = - ::vcl::unotools::xBitmapFromBitmapEx( - mxCanvas->getDevice(), - aChangedBitmap ); - aTexture.RepeatModeX = rendering::TexturingMode::REPEAT; - aTexture.RepeatModeY = rendering::TexturingMode::REPEAT; - - uno::Sequence< rendering::Texture > aSeq(1); - aSeq[0] = aTexture; - - mxCanvas->fillTexturedPolyPolygon( - basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( - mxCanvas->getDevice(), - rPoly), - maViewState, - maRenderState, - aSeq ); - } - - // direct draw of gradient - void canvasProcessor::impRender_PPLG(const polyPolygonGradientPrimitive& rPolygonCandidate) - { - const fillGradientAttribute& rGradient(rPolygonCandidate.getFillGradient()); - basegfx::BColor aStartColor(maBColorModifierStack.getModifiedColor(rGradient.getStartColor())); - basegfx::BColor aEndColor(maBColorModifierStack.getModifiedColor(rGradient.getEndColor())); - basegfx::B2DPolyPolygon aLocalPolyPolygon(rPolygonCandidate.getB2DPolyPolygon()); - - if(aStartColor == aEndColor) - { - // no gradient at all, draw as polygon - - maRenderState.DeviceColor = basegfx::unotools::colorToDoubleSequence( - mxCanvas->getDevice(), - aStartColor); - - mxCanvas->drawPolyPolygon( basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( - mxCanvas->getDevice(), - aLocalPolyPolygon), - maViewState, - maRenderState ); - } - else - { - // TODO(F3): if rGradient.getSteps() > 0, render - // gradient manually! - impDrawGradient( - aLocalPolyPolygon, rGradient.getStyle(), rGradient.getSteps(), - aStartColor, aEndColor, rGradient.getBorder(), - -rGradient.getAngle(), rGradient.getOffsetX(), rGradient.getOffsetY(), false); - } - } - - // direct draw of PolyPolygon with color - void canvasProcessor::impRender_PPLC(const polyPolygonColorPrimitive& rPolygonCandidate) - { - const basegfx::BColor aRGBColor( - maBColorModifierStack.getModifiedColor( - rPolygonCandidate.getBColor())); - - maRenderState.DeviceColor = basegfx::unotools::colorToDoubleSequence( - mxCanvas->getDevice(), - aRGBColor); - - mxCanvas->fillPolyPolygon( basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( - mxCanvas->getDevice(), - rPolygonCandidate.getB2DPolyPolygon()), - maViewState, - maRenderState ); - } - - // direct draw of MetaFile - void canvasProcessor::impRender_META(const metafilePrimitive& rMetaCandidate) - { - // get metafile (copy it) - GDIMetaFile aMetaFile; - - // TODO(Q3): Share common metafile modification code with - // vclprocessor.cxx - if(maBColorModifierStack.count()) - { - const basegfx::BColor aRGBBaseColor(0, 0, 0); - const basegfx::BColor aRGBColor(maBColorModifierStack.getModifiedColor(aRGBBaseColor)); - aMetaFile = rMetaCandidate.getMetaFile().GetMonochromeMtf(Color(aRGBColor)); - } - else - { - aMetaFile = rMetaCandidate.getMetaFile(); - } - - cppcanvas::BitmapCanvasSharedPtr pCanvas( - cppcanvas::VCLFactory::getInstance().createCanvas( - uno::Reference<rendering::XBitmapCanvas>( - mxCanvas, - uno::UNO_QUERY_THROW) )); - cppcanvas::RendererSharedPtr pMtfRenderer( - cppcanvas::VCLFactory::getInstance().createRenderer( - pCanvas, - aMetaFile, - cppcanvas::Renderer::Parameters() )); - if( pMtfRenderer ) - { - pCanvas->setTransformation(maWorldToView); - pMtfRenderer->setTransformation(rMetaCandidate.getTransform()); - pMtfRenderer->draw(); - } - } - - // mask group. Set mask polygon as clip - void canvasProcessor::impRender_MASK(const maskPrimitive& rMaskCandidate) - { - const primitiveVector& rSubList = rMaskCandidate.getPrimitiveVector(); - - if(!rSubList.empty()) - { - // TODO(F3): cannot use state-global renderstate, when recursing! - maRenderState.Clip = - basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( - mxCanvas->getDevice(), - rMaskCandidate.getMask()); - - // paint to it - process(rSubList); - - maRenderState.Clip.clear(); - } - } - - // modified color group. Force output to unified color. - void canvasProcessor::impRender_MCOL(const modifiedColorPrimitive& rModifiedCandidate) - { - const primitiveVector& rSubList = rModifiedCandidate.getPrimitiveVector(); - - if(!rSubList.empty()) - { - maBColorModifierStack.push(rModifiedCandidate.getColorModifier()); - process(rModifiedCandidate.getPrimitiveVector()); - maBColorModifierStack.pop(); - } - } - - // sub-transparence group. Draw to bitmap device first. - void canvasProcessor::impRender_TRPR(const transparencePrimitive& rTransCandidate) - { - const primitiveVector& rSubList = rTransCandidate.getPrimitiveVector(); - - if(!rSubList.empty()) - { - basegfx::B2DRange aRange( - get2DRangeFromVector(rSubList, - getViewInformation())); - aRange.transform(maWorldToView); - const basegfx::B2I64Tuple& rSize( - canvas::tools::spritePixelAreaFromB2DRange(aRange).getRange()); - uno::Reference< rendering::XCanvas > xBitmap( - mxCanvas->getDevice()->createCompatibleAlphaBitmap( - css::geometry::IntegerSize2D(rSize.getX(), - rSize.getY())), - uno::UNO_QUERY_THROW); - - // remember last worldToView and add pixel offset - basegfx::B2DHomMatrix aLastWorldToView(maWorldToView); - basegfx::B2DHomMatrix aPixelOffset; - aPixelOffset.translate(aRange.getMinX(), - aRange.getMinY()); - setWorldToView(aPixelOffset * maWorldToView); - - // remember last canvas, set bitmap as target - uno::Reference< rendering::XCanvas > xLastCanvas( mxCanvas ); - mxCanvas = xBitmap; - - // paint content to it - process(rSubList); - - // TODO(F3): render transparent list to transparence - // channel. Note that the OutDev implementation has a - // shortcoming, in that nested transparency groups - // don't work - transparence is not combined properly. - - // process(rTransCandidate.getTransparenceList()); - - // back to old OutDev and worldToView - mxCanvas = xLastCanvas; - setWorldToView(aLastWorldToView); - - // DUMMY: add transparence modulation value to DeviceColor - // TODO(F3): color management - canvas::tools::setDeviceColor( maRenderState, - 1.0, 1.0, 1.0, 0.5 ); - // finally, draw bitmap - mxCanvas->drawBitmapModulated( - uno::Reference< rendering::XBitmap >( - xBitmap, - uno::UNO_QUERY_THROW), - maViewState, - maRenderState ); - } - } - - // transform group. - void canvasProcessor::impRender_TRN2(const transformPrimitive& rTransformCandidate) - { - // remember current transformation - basegfx::B2DHomMatrix aLastWorldToView(maWorldToView); - - // create new transformations - setWorldToView(maWorldToView * rTransformCandidate.getTransformation()); - - // let break down - process(rTransformCandidate.getPrimitiveVector()); - - // restore transformations - setWorldToView(aLastWorldToView); - } - - // marker - void canvasProcessor::impRender_MARK(const markerPrimitive& rMarkCandidate) - { - const basegfx::BColor aRGBColor(maBColorModifierStack.getModifiedColor(rMarkCandidate.getRGBColor())); - - canvas::tools::initRenderState(maMarkerRenderState); - maMarkerRenderState.DeviceColor = basegfx::unotools::colorToDoubleSequence( - mxCanvas->getDevice(), - aRGBColor); - - // Markers are special objects - their position is - // determined by the view transformation, but their size - // is always the same - const basegfx::B2DPoint aViewPos(maWorldToView * rMarkCandidate.getPosition()); - - uno::Reference< rendering::XPolyPolygon2D > xMarkerPoly; - uno::Reference< rendering::XPolyPolygon2D > xHighlightMarkerPoly; - switch(rMarkCandidate.getStyle()) - { - default: - case MARKERSTYLE_POINT: - mxCanvas->drawPoint( basegfx::unotools::point2DFromB2DPoint(aViewPos), - maMarkerViewState, - maMarkerRenderState ); - return; - - case MARKERSTYLE_CROSS: - if( !mxCrossMarkerPoly.is() ) - { - basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD( - aPoly, - rtl::OUString::createFromAscii( - "m-1 0 h2 m0 -1 v2" )); - mxCrossMarkerPoly = - basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( - mxCanvas->getDevice(), - aPoly ); - } - xMarkerPoly = mxCrossMarkerPoly; - break; - - case MARKERSTYLE_GLUEPOINT : - if( !mxGluePointPoly.is() ) - { - basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD( - aPoly, - rtl::OUString::createFromAscii( - "m-2 -3 l5 5 m-3 -2 l5 5 m-3 2 l5 -5 m-2 3 l5 -5" )); - mxGluePointPoly = - basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( - mxCanvas->getDevice(), - aPoly ); - } - if( !mxGluePointHighlightPoly.is() ) - { - basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD( - aPoly, - rtl::OUString::createFromAscii( - "m-2 -2 l4 4 m-2 2 l4 -4" )); - mxGluePointHighlightPoly = - basegfx::unotools::xPolyPolygonFromB2DPolyPolygon( - mxCanvas->getDevice(), - aPoly ); - } - xMarkerPoly = mxGluePointPoly; - xHighlightMarkerPoly = mxGluePointHighlightPoly; - break; - } - - basegfx::B2DRange aRange; - rMarkCandidate.getRealtiveViewRange(aRange); - const basegfx::B2DPoint aCenter(aRange.getCenter()); - - basegfx::B2DHomMatrix aTranslate; - aTranslate.translate(aViewPos.getX()+aCenter.getX(), - aViewPos.getY()+aCenter.getY()); - - canvas::tools::setRenderStateTransform( maMarkerRenderState, - aTranslate ); - - - mxCanvas->drawPolyPolygon( xMarkerPoly, - maMarkerViewState, - maMarkerRenderState ); - if( xHighlightMarkerPoly.is() ) - { - // TODO(F3): color management - canvas::tools::setDeviceColor(maMarkerRenderState, - 0.0, 0.0, 1.0, 1.0); - mxCanvas->drawPolyPolygon( xMarkerPoly, - maMarkerViewState, - maMarkerRenderState ); - } - } - - void canvasProcessor::setWorldToView(const basegfx::B2DHomMatrix& rMat) - { - maWorldToView = rMat; - canvas::tools::setViewStateTransform(maViewState, - maWorldToView); - } - - ////////////////////////////////////////////////////////////////////////////// - // internal processing support - - void canvasProcessor::process(const primitiveVector& rSource) - { - primitiveVector::const_iterator aCurr = rSource.begin(); - const primitiveVector::const_iterator aEnd = rSource.end(); - while( aCurr != aEnd ) - { - const referencedPrimitive& rCandidate = *aCurr; - - switch(rCandidate.getID()) - { - case CreatePrimitiveID('S', 'T', 'X', 'P'): - { - // directdraw of text simple portion - impRender_STXP(static_cast< const textSimplePortionPrimitive& >(rCandidate.getBasePrimitive())); - break; - } - - case CreatePrimitiveID('P', 'O', 'H', 'L'): - { - // direct draw of hairline - impRender_POHL(static_cast< const polygonHairlinePrimitive& >(rCandidate.getBasePrimitive())); - break; - } - - case CreatePrimitiveID('B', 'M', 'P', 'R'): - { - // direct draw of transformed BitmapEx primitive - impRender_BMPR(static_cast< const bitmapPrimitive& >(rCandidate.getBasePrimitive())); - break; - } - - case CreatePrimitiveID('F', 'B', 'M', 'P'): - { - OSL_ENSURE(false,"fillBitmapPrimitive not yet implemented"); - break; - } - - case CreatePrimitiveID('P', 'P', 'L', 'B'): - { - // direct draw of polygon with bitmap fill - impRender_PPLB(static_cast< const polyPolygonBitmapPrimitive& >(rCandidate.getBasePrimitive())); - break; - } - - case CreatePrimitiveID('P', 'P', 'L', 'G'): - { - // direct draw of gradient - impRender_PPLG(static_cast< const polyPolygonGradientPrimitive& >(rCandidate.getBasePrimitive())); - break; - } - - case CreatePrimitiveID('P', 'P', 'L', 'C'): - { - // direct draw of PolyPolygon with color - impRender_PPLC(static_cast< const polyPolygonColorPrimitive& >(rCandidate.getBasePrimitive())); - break; - } - - case CreatePrimitiveID('M', 'E', 'T', 'A'): - { - // direct draw of MetaFile - impRender_META(static_cast< const metafilePrimitive& >(rCandidate.getBasePrimitive())); - break; - } - - case CreatePrimitiveID('M', 'A', 'S', 'K'): - { - // mask group. Force output to VDev and create mask from given mask - impRender_MASK(static_cast< const maskPrimitive& >(rCandidate.getBasePrimitive())); - break; - } - - case CreatePrimitiveID('M', 'C', 'O', 'L'): - { - // modified color group. Force output to unified color. - impRender_MCOL(static_cast< const modifiedColorPrimitive& >(rCandidate.getBasePrimitive())); - break; - } - - case CreatePrimitiveID('T', 'R', 'P', 'R'): - { - // sub-transparence group. Draw to VDev first. - impRender_TRPR(static_cast< const transparencePrimitive& >(rCandidate.getBasePrimitive())); - break; - } - - case CreatePrimitiveID('T', 'R', 'N', '2'): - { - // transform group. - impRender_TRN2(static_cast< const transformPrimitive& >(rCandidate.getBasePrimitive())); - break; - } - - case CreatePrimitiveID('M', 'A', 'R', 'K'): - { - // marker - impRender_MARK(static_cast< const markerPrimitive& >(rCandidate.getBasePrimitive())); - break; - } - - case CreatePrimitiveID('A', 'N', 'S', 'W'): - case CreatePrimitiveID('A', 'N', 'B', 'L'): - case CreatePrimitiveID('A', 'N', 'I', 'N'): - { - // check timing, but do not accept - const animatedSwitchPrimitive& rAnimatedCandidate(static_cast< const animatedSwitchPrimitive& >(rCandidate.getBasePrimitive())); - const ::drawinglayer::animation::animationEntryList& rAnimationList = rAnimatedCandidate.getAnimationList(); - const double fNewTime(rAnimationList.getNextEventTime(getViewInformation().getViewTime())); - - // let break down - process(rAnimatedCandidate.getDecomposition(getViewInformation())); - - break; - } - - default: - { - // let break down - process(rCandidate.getBasePrimitive().getDecomposition(getViewInformation())); - } - } - - ++aCurr; - } - } - - canvasProcessor::canvasProcessor( const ::drawinglayer::geometry::viewInformation& rViewInformation, - const uno::Reference<rendering::XCanvas>& rCanvas ) : - processor(rViewInformation), - mxCanvas( rCanvas ), - mxCrossMarkerPoly(), - mxGluePointPoly(), - mxGluePointHighlightPoly(), - maBColorModifierStack(), - maWorldToView(), - maViewState(), - maRenderState(), - maMarkerViewState(), - maMarkerRenderState() - { - canvas::tools::initViewState(maViewState); - canvas::tools::initRenderState(maRenderState); - canvas::tools::initViewState(maMarkerViewState); - canvas::tools::initRenderState(maMarkerRenderState); - - maWorldToView = maViewInformation.getViewTransformation(); - - canvas::tools::setViewStateTransform(maViewState, - maWorldToView); - } - - canvasProcessor::~canvasProcessor() - {} -*/ -////////////////////////////////////////////////////////////////////////////// namespace drawinglayer { @@ -2221,3 +1025,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/contourextractor2d.cxx b/drawinglayer/source/processor2d/contourextractor2d.cxx index d87b13551e1a..11eb9ac310a4 100644 --- a/drawinglayer/source/processor2d/contourextractor2d.cxx +++ b/drawinglayer/source/processor2d/contourextractor2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -201,3 +202,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/helperchartrenderer.cxx b/drawinglayer/source/processor2d/helperchartrenderer.cxx index 43af1f9f2f85..163fc9a8a17f 100644 --- a/drawinglayer/source/processor2d/helperchartrenderer.cxx +++ b/drawinglayer/source/processor2d/helperchartrenderer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,7 +145,7 @@ namespace drawinglayer catch( uno::Exception& e ) { (void)e; - DBG_ERROR( "Chart cannot be painted pretty!" ); + OSL_FAIL( "Chart cannot be painted pretty!" ); } return bChartRendered; @@ -153,3 +154,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/helperchartrenderer.hxx b/drawinglayer/source/processor2d/helperchartrenderer.hxx index b93eeebaee4e..e6dce19355c6 100644 --- a/drawinglayer/source/processor2d/helperchartrenderer.hxx +++ b/drawinglayer/source/processor2d/helperchartrenderer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_HELPERCHARTRENDER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx index a678a3fa12b9..a1d886790c47 100644 --- a/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx +++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx b/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx index 1f669775b866..476ea4b5692c 100644 --- a/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx +++ b/drawinglayer/source/processor2d/helperwrongspellrenderer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_HELPERWRONGSPELLRENDER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx index 74166d4fba33..7106cd62e503 100644 --- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx +++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -605,3 +606,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx index 6eac340a7aab..db9244da3554 100644 --- a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx +++ b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -143,3 +144,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/makefile.mk b/drawinglayer/source/processor2d/makefile.mk deleted file mode 100644 index ec7b8aef647b..000000000000 --- a/drawinglayer/source/processor2d/makefile.mk +++ /dev/null @@ -1,58 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=processor2d -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/baseprocessor2d.obj \ - $(SLO)$/vclhelpergradient.obj \ - $(SLO)$/vclhelperbitmaptransform.obj \ - $(SLO)$/vclhelperbitmaprender.obj \ - $(SLO)$/vclhelperbufferdevice.obj \ - $(SLO)$/vclprocessor2d.obj \ - $(SLO)$/helperchartrenderer.obj \ - $(SLO)$/helperwrongspellrenderer.obj \ - $(SLO)$/vclpixelprocessor2d.obj \ - $(SLO)$/vclmetafileprocessor2d.obj \ - $(SLO)$/contourextractor2d.obj \ - $(SLO)$/linegeometryextractor2d.obj \ - $(SLO)$/canvasprocessor.obj \ - $(SLO)$/hittestprocessor2d.obj \ - $(SLO)$/textaspolygonextractor2d.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx index 73b5189979ff..3cb805bb1f04 100644 --- a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx +++ b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -246,3 +247,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx index 752bf6d13849..3ea20b94f7e6 100644 --- a/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx +++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -275,3 +276,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx b/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx index 915e40427aeb..cca5d19f72f0 100644 --- a/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx +++ b/drawinglayer/source/processor2d/vclhelperbitmaprender.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLHELPERBITMAPRENDER_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx b/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx index ce81fb73ed6f..3e4b98655f18 100644 --- a/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx +++ b/drawinglayer/source/processor2d/vclhelperbitmaptransform.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -429,3 +430,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx b/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx index 7a3df9e4fb06..d1529aee6acf 100644 --- a/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx +++ b/drawinglayer/source/processor2d/vclhelperbitmaptransform.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLHELPERBITMAPTRANSFORM_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx index 87b33b16c53d..317170fbb66d 100644 --- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx +++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,29 +97,16 @@ namespace drawinglayer const Point aEmptyPoint; const Size aSizePixel(maContent.GetOutputSizePixel()); const bool bWasEnabledDst(mrOutDev.IsMapModeEnabled()); - static bool bDoSaveForVisualControl(false); mrOutDev.EnableMapMode(false); maContent.EnableMapMode(false); Bitmap aContent(maContent.GetBitmap(aEmptyPoint, aSizePixel)); - if(bDoSaveForVisualControl) - { - SvFileStream aNew((const String&)String(ByteString( "c:\\content.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC); - aNew << aContent; - } - if(mpAlpha) { mpAlpha->EnableMapMode(false); const AlphaMask aAlphaMask(mpAlpha->GetBitmap(aEmptyPoint, aSizePixel)); - if(bDoSaveForVisualControl) - { - SvFileStream aNew((const String&)String(ByteString( "c:\\transparence.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC); - aNew << aAlphaMask.GetBitmap(); - } - mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aAlphaMask)); } else if(mpMask) @@ -126,12 +114,6 @@ namespace drawinglayer mpMask->EnableMapMode(false); const Bitmap aMask(mpMask->GetBitmap(aEmptyPoint, aSizePixel)); - if(bDoSaveForVisualControl) - { - SvFileStream aNew((const String&)String(ByteString( "c:\\mask.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC); - aNew << aMask; - } - mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aMask)); } else if(0.0 != fTrans) @@ -180,3 +162,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx index 857b673e36ad..adf54a42671e 100644 --- a/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx +++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLHELPERBUFFERDEVICE_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclhelpergradient.cxx b/drawinglayer/source/processor2d/vclhelpergradient.cxx index 6c318dbcedc9..15475db15746 100644 --- a/drawinglayer/source/processor2d/vclhelpergradient.cxx +++ b/drawinglayer/source/processor2d/vclhelpergradient.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -283,3 +284,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclhelpergradient.hxx b/drawinglayer/source/processor2d/vclhelpergradient.hxx index d02b20d54e4e..562eb7e53865 100644 --- a/drawinglayer/source/processor2d/vclhelpergradient.hxx +++ b/drawinglayer/source/processor2d/vclhelpergradient.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ namespace drawinglayer #endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_VCLHELPERGRADIENT_HXX // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index ed2b6e2e8244..bcb4655b3ddf 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -850,7 +851,7 @@ namespace drawinglayer } catch(const uno::Exception&) { - OSL_ENSURE(false, "VclMetafileProcessor2D: No access to printable flag of Control, caught an exception!"); + OSL_FAIL("VclMetafileProcessor2D: No access to printable flag of Control, caught an exception!"); } } @@ -927,7 +928,7 @@ namespace drawinglayer } catch( const uno::Exception& ) { - OSL_ENSURE(false, "VclMetafileProcessor2D: Printing of Control failed, caught an exception!"); + OSL_FAIL("VclMetafileProcessor2D: Printing of Control failed, caught an exception!"); } } @@ -1076,7 +1077,7 @@ namespace drawinglayer if(!mxBreakIterator.is()) { uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMSF(::comphelper::getProcessServiceFactory()); - mxBreakIterator.set(xMSF->createInstance(rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator")), uno::UNO_QUERY); + mxBreakIterator.set(xMSF->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator"))), uno::UNO_QUERY); } if(mxBreakIterator.is()) @@ -1934,15 +1935,6 @@ namespace drawinglayer aBufferProcessor.process(rTransparence); const AlphaMask aBmAlpha(aBufferDevice.GetBitmap(aEmptyPoint, aSizePixel)); -#ifdef DBG_UTIL - static bool bDoSaveForVisualControl(false); - if(bDoSaveForVisualControl) - { - SvFileStream aNew(String(ByteString( "c:\\test.bmp" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC); - aNew << aBmContent; - } -#endif - // paint mpOutputDevice->DrawBitmapEx( aRectLogic.TopLeft(), @@ -2035,3 +2027,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index a08f718e4283..6c5ba31774f7 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -235,8 +236,10 @@ namespace drawinglayer mpOutputDevice->SetAntialiasing(nOldAntiAliase | ANTIALIASING_PIXELSNAPHAIRLINE); } - static bool bTestMetaFilePrimitiveDecomposition(true); - if(bTestMetaFilePrimitiveDecomposition) + const primitive2d::MetafilePrimitive2D& rMetafilePrimitive( static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate) ); + + static bool bTestMetaFilePrimitiveDecomposition( true ); + if( bTestMetaFilePrimitiveDecomposition && !rMetafilePrimitive.getMetaFile().GetUseCanvas() ) { // use new Metafile decomposition process(rCandidate.get2DDecomposition(getViewInformation2D())); @@ -244,7 +247,7 @@ namespace drawinglayer else { // direct draw of MetaFile - RenderMetafilePrimitive2D(static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate)); + RenderMetafilePrimitive2D( rMetafilePrimitive ); } if(bForceLineSnap) @@ -618,3 +621,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index bcfa4b6776a3..7087ea406cb5 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -252,22 +253,49 @@ namespace drawinglayer mpOutputDevice->SetFont(aFont); mpOutputDevice->SetTextColor(Color(aRGBFontColor)); + String aText( rTextCandidate.getText() ); + xub_StrLen nPos = rTextCandidate.getTextPosition(); + xub_StrLen nLen = rTextCandidate.getTextLength(); + + sal_Int32* pDXArray = aTransformedDXArray.size() ? &(aTransformedDXArray[0]) : NULL ; + + if ( rTextCandidate.isFilled() ) + { + basegfx::B2DVector aOldFontScaling, aOldTranslate; + double fOldRotate, fOldShearX; + rTextCandidate.getTextTransform().decompose(aOldFontScaling, aOldTranslate, fOldRotate, fOldShearX); + + long nWidthToFill = static_cast<long>(rTextCandidate.getWidthToFill( ) * aFontScaling.getX() / aOldFontScaling.getX()); + + long nWidth = mpOutputDevice->GetTextArray( + rTextCandidate.getText(), pDXArray, 0, 1 ); + long nChars = 2; + if ( nWidth ) + nChars = nWidthToFill / nWidth; + + String aFilled; + aFilled.Fill( (sal_uInt16)nChars, aText.GetChar( 0 ) ); + aText = aFilled; + nPos = 0; + nLen = nChars; + } + if(aTransformedDXArray.size()) { mpOutputDevice->DrawTextArray( aStartPoint, - rTextCandidate.getText(), - &(aTransformedDXArray[0]), - rTextCandidate.getTextPosition(), - rTextCandidate.getTextLength()); + aText, + pDXArray, + nPos, + nLen); } else { mpOutputDevice->DrawText( aStartPoint, - rTextCandidate.getText(), - rTextCandidate.getTextPosition(), - rTextCandidate.getTextLength()); + aText, + nPos, + nLen); } if(rTextCandidate.getFontAttribute().getRTL()) @@ -1157,7 +1185,7 @@ namespace drawinglayer mpOutputDevice->EnableMapMode(false); - for(std::vector< basegfx::B2DPoint >::const_iterator aIter(rPositions.begin()); aIter != rPositions.end(); aIter++) + for(std::vector< basegfx::B2DPoint >::const_iterator aIter(rPositions.begin()); aIter != rPositions.end(); ++aIter) { const basegfx::B2DPoint aDiscreteTopLeft((maCurrentTransformation * (*aIter)) - aDiscreteHalfSize); const Point aDiscretePoint(basegfx::fround(aDiscreteTopLeft.getX()), basegfx::fround(aDiscreteTopLeft.getY())); @@ -1177,7 +1205,7 @@ namespace drawinglayer const basegfx::BColor aRGBColor(maBColorModifierStack.getModifiedColor(rPointArrayCandidate.getRGBColor())); const Color aVCLColor(aRGBColor); - for(std::vector< basegfx::B2DPoint >::const_iterator aIter(rPositions.begin()); aIter != rPositions.end(); aIter++) + for(std::vector< basegfx::B2DPoint >::const_iterator aIter(rPositions.begin()); aIter != rPositions.end(); ++aIter) { const basegfx::B2DPoint aViewPosition(maCurrentTransformation * (*aIter)); const Point aPos(basegfx::fround(aViewPosition.getX()), basegfx::fround(aViewPosition.getY())); @@ -1561,3 +1589,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor3d/baseprocessor3d.cxx b/drawinglayer/source/processor3d/baseprocessor3d.cxx index e2c91c181621..ef89074852cc 100644 --- a/drawinglayer/source/processor3d/baseprocessor3d.cxx +++ b/drawinglayer/source/processor3d/baseprocessor3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx index 8d0f63de93de..4589d21dab16 100644 --- a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx +++ b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -223,3 +224,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx index 13d50a63878b..624a25ff8c36 100644 --- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx +++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -564,3 +565,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx index 44ce55f13b8a..827bee0173ce 100644 --- a/drawinglayer/source/processor3d/geometry2dextractor.cxx +++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -168,3 +169,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor3d/makefile.mk b/drawinglayer/source/processor3d/makefile.mk deleted file mode 100644 index 6b739b6e3d9d..000000000000 --- a/drawinglayer/source/processor3d/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=processor3d -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/baseprocessor3d.obj \ - $(SLO)$/cutfindprocessor3d.obj \ - $(SLO)$/defaultprocessor3d.obj \ - $(SLO)$/shadow3dextractor.obj \ - $(SLO)$/geometry2dextractor.obj \ - $(SLO)$/zbufferprocessor3d.obj - - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx index 9e0c0674ea66..b7f7447051da 100644 --- a/drawinglayer/source/processor3d/shadow3dextractor.cxx +++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -340,3 +341,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx index b06718d01ccb..5b6536ea2d28 100644 --- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx +++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,8 +130,8 @@ namespace } } - delete pContent; - delete pAlpha; + aContent.ReleaseAccess(pContent); + aAlpha.ReleaseAccess(pAlpha); } aRetval = BitmapEx(aContent, aAlpha); @@ -603,15 +604,6 @@ namespace drawinglayer aTransform.identity(); aTransform.scale(fScaleUp, fScaleUp, 1.0); - if(false) - { - // when really want to go to single pixel lines, move to center. - // Without this translation, all hor/ver hairlines will be centered exactly - // between two pixel lines (which looks best) - const double fTranslateToCenter(mnAntiAlialize * 0.5); - aTransform.translate(fTranslateToCenter, fTranslateToCenter, 0.0); - } - aSnappedHairline.transform(aTransform); mpZBufferRasterConverter3D->rasterconvertB3DPolygon(aSnappedHairline, 0, mpBZPixelRaster->getHeight(), mnAntiAlialize); @@ -773,7 +765,7 @@ namespace drawinglayer if(mpRasterPrimitive3Ds) { - OSL_ASSERT("ZBufferProcessor3D: destructed, but there are unrendered transparent geometries. Use ZBufferProcessor3D::finish() to render these (!)"); + OSL_FAIL("ZBufferProcessor3D: destructed, but there are unrendered transparent geometries. Use ZBufferProcessor3D::finish() to render these (!)"); delete mpRasterPrimitive3Ds; } } @@ -838,3 +830,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/texture/makefile.mk b/drawinglayer/source/texture/makefile.mk deleted file mode 100644 index d0cf722afcd9..000000000000 --- a/drawinglayer/source/texture/makefile.mk +++ /dev/null @@ -1,45 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=drawinglayer -TARGET=texture -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/texture.obj \ - $(SLO)$/texture3d.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/drawinglayer/source/texture/texture.cxx b/drawinglayer/source/texture/texture.cxx index 107072b712dd..07a5000ce201 100644 --- a/drawinglayer/source/texture/texture.cxx +++ b/drawinglayer/source/texture/texture.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -642,3 +643,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx index cf85b53bad43..ac667f5660df 100644 --- a/drawinglayer/source/texture/texture3d.cxx +++ b/drawinglayer/source/texture/texture3d.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -260,3 +261,5 @@ namespace drawinglayer ////////////////////////////////////////////////////////////////////////////// // eof + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/drawinglayer/util/drawinglayer.flt b/drawinglayer/util/drawinglayer.flt index 28a1dd1b65c6..28a1dd1b65c6 100644..100755 --- a/drawinglayer/util/drawinglayer.flt +++ b/drawinglayer/util/drawinglayer.flt diff --git a/drawinglayer/util/makefile.mk b/drawinglayer/util/makefile.mk deleted file mode 100644 index 3de5c47603f1..000000000000 --- a/drawinglayer/util/makefile.mk +++ /dev/null @@ -1,85 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=drawinglayer -TARGET=drawinglayer - -# --- Settings --------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Allgemein --------------------------------------------------- - -LIB1TARGET=$(SLB)$/drawinglayer.lib -LIB1FILES=\ - $(SLB)$/primitive2d.lib \ - $(SLB)$/primitive3d.lib \ - $(SLB)$/geometry.lib \ - $(SLB)$/processor2d.lib \ - $(SLB)$/processor3d.lib \ - $(SLB)$/attribute.lib \ - $(SLB)$/animation.lib \ - $(SLB)$/texture.lib - -SHL1TARGET= drawinglayer$(DLLPOSTFIX) -SHL1IMPLIB= idrawinglayer - -SHL1STDLIBS=\ - $(VCLLIB) \ - $(BASEGFXLIB) \ - $(TOOLSLIB) \ - $(SVLLIB) \ - $(TKLIB) \ - $(CANVASTOOLSLIB) \ - $(CPPCANVASLIB) \ - $(SVTOOLLIB) \ - $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(AVMEDIALIB) \ - $(I18NISOLANGLIB) \ - $(COMPHELPERLIB) - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1LIBS= $(SLB)$/drawinglayer.lib - -DEF1NAME =$(SHL1TARGET) -DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt \ - $(LIB1TARGET) - -DEF1DES =DrawingLayer -DEFLIB1NAME =drawinglayer - -# --- Targets ----------------------------------------------------------- - -.INCLUDE : target.mk - -$(MISC)$/$(SHL1TARGET).flt : makefile.mk - @+$(TYPE) $(TARGET).flt > $@ - |