CWS gnumake4: convert canvas to new build system

27 files changed, 1143 insertions, 223 deletions

diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
new file mode 100644
index 000000000000..e9a2c10da642
--- /dev/null
+++ b/canvas/Library_cairocanvas.mk
@@ -0,0 +1,141 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,cairocanvas))
+
+$(eval $(call gb_Library_set_componentfile,cairocanvas,canvas/source/cairo/cairocanvas))
+
+$(eval $(call gb_Library_set_include,cairocanvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,cairocanvas,\
+	$$(DEFS) \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,cairocanvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+ifeq ($(SYSTEM_CAIRO),YES)
+# FREETYPE_CLAGS from environment if ENABLE_CAIRO is used
+# $(CAIRO_CFLAGS) currently not set; taking usr/include directly
+$(eval $(call gb_Library_set_include,cairocanvas,\
+	$$(INCLUDE) \
+	$(FREETYPE_CFLAGS) \
+	-I/usr/include \
+))
+else
+$(eval $(call gb_Library_set_include,cairocanvas,\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/cairo \
+	$(FREETYPE_CFLAGS) \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
+	sal \
+	stl \
+	cppu \
+	basegfx \
+	cppuhelper \
+	comphelper \
+	vcl \
+	tk \
+	tl \
+	i18nisolang1 \
+	canvastools \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
+	canvas/source/cairo/cairo_cachedbitmap \
+	canvas/source/cairo/cairo_cairo \
+	canvas/source/cairo/cairo_canvas \
+	canvas/source/cairo/cairo_canvasbitmap \
+	canvas/source/cairo/cairo_canvascustomsprite \
+	canvas/source/cairo/cairo_canvasfont \
+	canvas/source/cairo/cairo_canvashelper \
+	canvas/source/cairo/cairo_canvashelper_text \
+	canvas/source/cairo/cairo_devicehelper \
+	canvas/source/cairo/cairo_services \
+	canvas/source/cairo/cairo_spritecanvas \
+	canvas/source/cairo/cairo_spritecanvashelper \
+	canvas/source/cairo/cairo_spritedevicehelper \
+	canvas/source/cairo/cairo_spritehelper \
+	canvas/source/cairo/cairo_textlayout \
+))
+
+
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
+	canvas/source/cairo/cairo_win32_cairo \
+))
+$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
+	cairo \
+	gdi32 \
+	msimg32 \
+))
+
+else
+
+$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
+	cairo \
+	pixman-1 \
+))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
+	canvas/source/cairo/cairo_quartz_cairo \
+))
+
+#CFLAGSCXX+=$(OBJCXXFLAGS)
+
+else
+
+$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
+	canvas/source/cairo/cairo_xlib_cairo \
+))
+
+# freetype? fontconfig? -> test on Solaris
+$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
+	X11 \
+	Xrender \
+))
+
+endif
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
new file mode 100644
index 000000000000..4992f9ca8e6c
--- /dev/null
+++ b/canvas/Library_canvasfactory.mk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,canvasfactory))
+
+$(eval $(call gb_Library_set_componentfile,canvasfactory,canvas/source/factory/canvasfactory))
+
+$(eval $(call gb_Library_set_include,canvasfactory,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,canvasfactory,\
+	$$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,canvasfactory,\
+	sal \
+	stl \
+	cppu \
+	cppuhelper \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,canvasfactory,\
+	canvas/source/factory/cf_service \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
new file mode 100644
index 000000000000..f686e749c8b9
--- /dev/null
+++ b/canvas/Library_canvastools.mk
@@ -0,0 +1,112 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,canvastools))
+
+$(eval $(call gb_Library_add_package_headers,canvastools,canvas_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,canvastools,$(SRCDIR)/canvas/inc/pch/precompiled_canvas))
+
+$(eval $(call gb_Library_set_include,canvastools,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,canvastools,\
+	$$(DEFS) \
+	-DCANVASTOOLS_DLLIMPLEMENTATION \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,canvastools,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+ifneq ($(strip $(PROFILER)$(profiler)),)
+$(eval $(call gb_Library_set_defs,canvastools,\
+	$$(DEFS) \
+	-DPROFILER \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,canvastools,\
+	sal \
+	stl \
+	cppu \
+	basegfx \
+	cppuhelper \
+	comphelper \
+	vcl \
+	tk \
+	tl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,canvastools,\
+	canvas/source/tools/cachedprimitivebase \
+	canvas/source/tools/canvascustomspritehelper \
+	canvas/source/tools/canvastools \
+	canvas/source/tools/elapsedtime \
+	canvas/source/tools/page \
+	canvas/source/tools/pagemanager \
+	canvas/source/tools/parametricpolypolygon \
+	canvas/source/tools/prioritybooster \
+	canvas/source/tools/propertysethelper \
+	canvas/source/tools/spriteredrawmanager \
+	canvas/source/tools/surface \
+	canvas/source/tools/surfaceproxy \
+	canvas/source/tools/surfaceproxymanager \
+	canvas/source/tools/verifyinput \
+))
+
+ifeq ($(strip $(ENABLE_AGG)),YES) 
+$(eval $(call gb_Library_add_exception_objects,canvastools,\
+	canvas/source/tools/bitmap \
+	canvas/source/tools/image \
+))
+$(eval $(call gb_Library_add_linked_libs,canvastools,\
+	agg \
+))
+ifneq ($(strip $(AGG_VERSION)),) 
+$(eval $(call gb_Library_set_defs,canvastools,\
+	$$(DEFS) \
+	-DAGG_VERSION=$(AGG_VERSION) \
+))
+endif
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,canvastools,\
+	winmm \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk
new file mode 100644
index 000000000000..c49aa5d07535
--- /dev/null
+++ b/canvas/Library_directx5canvas.mk
@@ -0,0 +1,110 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,directx5canvas))
+
+$(eval $(call gb_Library_set_componentfile,directx5canvas,canvas/source/directx/directx5canvas))
+
+$(eval $(call gb_Library_set_include,directx5canvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,directx5canvas,\
+	$$(DEFS) \
+	-DDIRECTX_VERSION=0x0500 \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,directx5canvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,directx5canvas,\
+	cppu \
+	tk \
+	sal \
+	comphelper \
+	cppuhelper \
+	stl \
+	basegfx \
+	canvastools \
+	vcl \
+	tl \
+	utl \
+	i18nisolang1 \
+    $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,directx5canvas,\
+	user32 \
+	gdi32 \
+	gdiplus \
+	ddraw \
+))
+ifneq ($(USE_MINGW),)
+$(eval $(call gb_Library_add_linked_libs,directx5canvas,\
+what is $(DIRECTXSDK_LIB)/d3dx.lib now? \
+))
+else
+$(eval $(call gb_Library_add_linked_libs,directx5canvas,\
+	d3dx \
+))
+endif
+endif
+
+$(eval $(call gb_Library_add_exception_objects,directx5canvas,\
+	canvas/source/directx/dx_5rm \
+	canvas/source/directx/dx_bitmap \
+	canvas/source/directx/dx_bitmapcanvashelper \
+	canvas/source/directx/dx_canvasbitmap \
+	canvas/source/directx/dx_canvascustomsprite \
+	canvas/source/directx/dx_canvasfont \
+	canvas/source/directx/dx_canvashelper \
+	canvas/source/directx/dx_canvashelper_texturefill \
+	canvas/source/directx/dx_config \
+	canvas/source/directx/dx_devicehelper \
+	canvas/source/directx/dx_gdiplususer \
+	canvas/source/directx/dx_impltools \
+	canvas/source/directx/dx_linepolypolygon \
+	canvas/source/directx/dx_spritecanvas \
+	canvas/source/directx/dx_spritecanvashelper \
+	canvas/source/directx/dx_spritedevicehelper \
+	canvas/source/directx/dx_spritehelper \
+	canvas/source/directx/dx_surfacebitmap \
+	canvas/source/directx/dx_surfacegraphics \
+	canvas/source/directx/dx_textlayout \
+	canvas/source/directx/dx_textlayout_drawhelper \
+	canvas/source/directx/dx_vcltools \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
new file mode 100644
index 000000000000..06a4dc064d9a
--- /dev/null
+++ b/canvas/Library_directx9canvas.mk
@@ -0,0 +1,110 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,directx9canvas))
+
+$(eval $(call gb_Library_set_componentfile,directx9canvas,canvas/source/directx/directx9canvas))
+
+$(eval $(call gb_Library_set_include,directx9canvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,directx9canvas,\
+	$$(DEFS) \
+	-DDIRECTX_VERSION=0x0900 \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,directx9canvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
+	cppu \
+	tk \
+	sal \
+	comphelper \
+	cppuhelper \
+	stl \
+	basegfx \
+	canvastools \
+	vcl \
+	tl \
+	utl \
+	i18nisolang1 \
+    $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
+	user32 \
+	gdi32 \
+	gdiplus \
+	ddraw \
+))
+ifneq ($(USE_MINGW),)
+$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
+what is $(DIRECTXSDK_LIB)/d3d9.lib now? \
+))
+else
+$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
+	d3d9 \
+))
+endif
+endif
+
+$(eval $(call gb_Library_add_exception_objects,directx9canvas,\
+	canvas/source/directx/dx_9rm \
+	canvas/source/directx/dx_bitmap \
+	canvas/source/directx/dx_bitmapcanvashelper \
+	canvas/source/directx/dx_canvasbitmap \
+	canvas/source/directx/dx_canvascustomsprite \
+	canvas/source/directx/dx_canvasfont \
+	canvas/source/directx/dx_canvashelper \
+	canvas/source/directx/dx_canvashelper_texturefill \
+	canvas/source/directx/dx_config \
+	canvas/source/directx/dx_devicehelper \
+	canvas/source/directx/dx_gdiplususer \
+	canvas/source/directx/dx_impltools \
+	canvas/source/directx/dx_linepolypolygon \
+	canvas/source/directx/dx_spritecanvas \
+	canvas/source/directx/dx_spritecanvashelper \
+	canvas/source/directx/dx_spritedevicehelper \
+	canvas/source/directx/dx_spritehelper \
+	canvas/source/directx/dx_surfacebitmap \
+	canvas/source/directx/dx_surfacegraphics \
+	canvas/source/directx/dx_textlayout \
+	canvas/source/directx/dx_textlayout_drawhelper \
+	canvas/source/directx/dx_vcltools \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
new file mode 100644
index 000000000000..db295261b73f
--- /dev/null
+++ b/canvas/Library_gdipluscanvas.mk
@@ -0,0 +1,92 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,gdipluscanvas))
+
+$(eval $(call gb_Library_set_componentfile,gdipluscanvas,canvas/source/directx/gdipluscanvas))
+
+$(eval $(call gb_Library_set_include,gdipluscanvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,gdipluscanvas,\
+	$$(DEFS) \
+	-DDIRECTX_VERSION=0x0900 \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,gdipluscanvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
+	cppu \
+	tk \
+	sal \
+	comphelper \
+	cppuhelper \
+	stl \
+	basegfx \
+	canvastools \
+	vcl \
+	tl \
+	utl \
+	i18nisolang1 \
+    $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
+	user32 \
+	gdi32 \
+	gdiplus \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,gdipluscanvas,\
+	canvas/source/directx/dx_bitmap \
+	canvas/source/directx/dx_bitmapcanvashelper \
+	canvas/source/directx/dx_canvas \
+	canvas/source/directx/dx_canvasbitmap \
+	canvas/source/directx/dx_canvasfont \
+	canvas/source/directx/dx_canvashelper \
+	canvas/source/directx/dx_canvashelper_texturefill \
+	canvas/source/directx/dx_devicehelper \
+	canvas/source/directx/dx_gdiplususer \
+	canvas/source/directx/dx_impltools \
+	canvas/source/directx/dx_linepolypolygon \
+	canvas/source/directx/dx_textlayout \
+	canvas/source/directx/dx_textlayout_drawhelper \
+	canvas/source/directx/dx_vcltools \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
new file mode 100644
index 000000000000..e2403d325c3f
--- /dev/null
+++ b/canvas/Library_nullcanvas.mk
@@ -0,0 +1,72 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,nullcanvas))
+
+$(eval $(call gb_Library_set_include,nullcanvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,nullcanvas,\
+	$$(DEFS) \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,nullcanvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,nullcanvas,\
+	cppu \
+	sal \
+	comphelper \
+	cppuhelper \
+	stl \
+	basegfx \
+	canvastools \
+	vcl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,nullcanvas,\
+	canvas/source/null/null_canvasbitmap \
+	canvas/source/null/null_canvascustomsprite \
+	canvas/source/null/null_canvasfont \
+	canvas/source/null/null_canvashelper \
+	canvas/source/null/null_devicehelper \
+	canvas/source/null/null_spritecanvas \
+	canvas/source/null/null_spritecanvashelper \
+	canvas/source/null/null_spritehelper \
+	canvas/source/null/null_textlayout \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
new file mode 100644
index 000000000000..570e728d2056
--- /dev/null
+++ b/canvas/Library_simplecanvas.mk
@@ -0,0 +1,65 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,simplecanvas))
+
+$(eval $(call gb_Library_set_componentfile,simplecanvas,canvas/source/simplecanvas/simplecanvas))
+
+$(eval $(call gb_Library_set_include,simplecanvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,simplecanvas,\
+	$$(DEFS) \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,simplecanvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,simplecanvas,\
+	sal \
+	stl \
+	cppu \
+	basegfx \
+	cppuhelper \
+	comphelper \
+	canvastools \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,simplecanvas,\
+	canvas/source/simplecanvas/simplecanvasimpl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
new file mode 100644
index 000000000000..501fe3a71b80
--- /dev/null
+++ b/canvas/Library_vclcanvas.mk
@@ -0,0 +1,99 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vclcanvas))
+
+$(eval $(call gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas))
+
+$(eval $(call gb_Library_set_include,vclcanvas,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,vclcanvas,\
+	$$(DEFS) \
+))
+
+ifneq ($(strip $(VERBOSE)$(verbose)),)
+$(eval $(call gb_Library_set_defs,vclcanvas,\
+	$$(DEFS) \
+	-DVERBOSE \
+))
+endif
+
+$(eval $(call gb_Library_add_linked_libs,vclcanvas,\
+	sal \
+	stl \
+	cppu \
+	basegfx \
+	cppuhelper \
+	comphelper \
+	vcl \
+	tk \
+	tl \
+	svt \
+	i18nisolang1 \
+	canvastools \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclcanvas,\
+	canvas/source/vcl/backbuffer \
+	canvas/source/vcl/bitmapbackbuffer \
+	canvas/source/vcl/cachedbitmap \
+	canvas/source/vcl/canvas \
+	canvas/source/vcl/canvasbitmap \
+	canvas/source/vcl/canvasbitmaphelper \
+	canvas/source/vcl/canvascustomsprite \
+	canvas/source/vcl/canvasfont \
+	canvas/source/vcl/canvashelper \
+	canvas/source/vcl/devicehelper \
+	canvas/source/vcl/impltools \
+	canvas/source/vcl/services \
+	canvas/source/vcl/spritecanvas \
+	canvas/source/vcl/spritecanvashelper \
+	canvas/source/vcl/spritedevicehelper \
+	canvas/source/vcl/spritehelper \
+	canvas/source/vcl/textlayout \
+	canvas/source/vcl/windowoutdevholder \
+))
+
+# Solaris Sparc with Sun Compiler: noopt
+ifneq ($(strip($OS)),SOLARIS)
+$(eval $(call gb_Library_add_exception_objects,vclcanvas,\
+	canvas/source/vcl/canvashelper_texturefill \
+))
+else
+$(eval $(call gb_Library_add_cxxobjects,vclcanvas,\
+	canvas/source/vcl/canvashelper_texturefill \
+    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/canvas/Makefile b/canvas/Makefile
new file mode 100644
index 000000000000..90947b2e5f48
--- /dev/null
+++ b/canvas/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk
new file mode 100644
index 000000000000..fb7dfce5eb36
--- /dev/null
+++ b/canvas/Module_canvas.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,canvas))
+
+$(eval $(call gb_Module_add_targets,canvas,\
+	Library_canvastools \
+	Library_nullcanvas \
+	Library_simplecanvas \
+	Library_vclcanvas \
+	Library_canvasfactory \
+	Package_inc \
+))
+
+ifeq ($(strip $(OS)),WNT)
+ifneq ($(strip $(ENABLE_DIRECTX)),)
+
+# currently not supported
+#ifneq ($(strip $(USE_DIRECTX5)),)
+#$(eval $(call gb_Module_add_targets,canvas,\
+#	Library_directx5canvas \
+#))
+#endif
+
+$(eval $(call gb_Module_add_targets,canvas,\
+	Library_directx9canvas \
+	Library_gdipluscanvas \
+))
+
+endif
+endif
+
+ifneq ($(strip $(ENABLE_CAIRO)),)
+$(eval $(call gb_Module_add_targets,canvas,\
+	Library_cairocanvas \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/canvas/Package_inc.mk b/canvas/Package_inc.mk
new file mode 100644
index 000000000000..d21817b9d347
--- /dev/null
+++ b/canvas/Package_inc.mk
@@ -0,0 +1,63 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,canvas_inc,$(SRCDIR)/canvas/inc))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/basemutexhelper.hxx,canvas/base/basemutexhelper.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/bitmapcanvasbase.hxx,canvas/base/bitmapcanvasbase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/bufferedgraphicdevicebase.hxx,canvas/base/bufferedgraphicdevicebase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/cachedprimitivebase.hxx,canvas/base/cachedprimitivebase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvasbase.hxx,canvas/base/canvasbase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvascustomspritebase.hxx,canvas/base/canvascustomspritebase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/canvascustomspritehelper.hxx,canvas/base/canvascustomspritehelper.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/doublebitmapbase.hxx,canvas/base/doublebitmapbase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/floatbitmapbase.hxx,canvas/base/floatbitmapbase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/graphicdevicebase.hxx,canvas/base/graphicdevicebase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/integerbitmapbase.hxx,canvas/base/integerbitmapbase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/sprite.hxx,canvas/base/sprite.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/spritecanvasbase.hxx,canvas/base/spritecanvasbase.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/base/spritesurface.hxx,canvas/base/spritesurface.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/canvastools.hxx,canvas/canvastools.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/canvastoolsdllapi.h,canvas/canvastoolsdllapi.h))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/debug.hxx,canvas/debug.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/elapsedtime.hxx,canvas/elapsedtime.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/parametricpolypolygon.hxx,canvas/parametricpolypolygon.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/prioritybooster.hxx,canvas/prioritybooster.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/propertysethelper.hxx,canvas/propertysethelper.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/bitmap.hxx,canvas/rendering/bitmap.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/icachedprimitive.hxx,canvas/rendering/icachedprimitive.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/icolorbuffer.hxx,canvas/rendering/icolorbuffer.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/irendermodule.hxx,canvas/rendering/irendermodule.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/isurface.hxx,canvas/rendering/isurface.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/isurfaceproxy.hxx,canvas/rendering/isurfaceproxy.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/rendering/isurfaceproxymanager.hxx,canvas/rendering/isurfaceproxymanager.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/spriteredrawmanager.hxx,canvas/spriteredrawmanager.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/vclwrapper.hxx,canvas/vclwrapper.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/verbosetrace.hxx,canvas/verbosetrace.hxx))
+$(eval $(call gb_Package_add_file,canvas_inc,inc/canvas/verifyinput.hxx,canvas/verifyinput.hxx))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/canvas/inc/canvas/base/cachedprimitivebase.hxx b/canvas/inc/canvas/base/cachedprimitivebase.hxx
index bfcd292615b9..6121fdb985c6 100644
--- a/canvas/inc/canvas/base/cachedprimitivebase.hxx
+++ b/canvas/inc/canvas/base/cachedprimitivebase.hxx
@@ -36,6 +36,7 @@
 #include <cppuhelper/compbase2.hxx>
 #include <comphelper/broadcasthelper.hxx>
 
+#include <canvas/canvastoolsdllapi.h>
 
 /* Definition of CachedPrimitiveBase class */
 
@@ -47,7 +48,7 @@ namespace canvas
     /** Base class, providing common functionality for implementers of
         the XCachedPrimitive interface.
      */
-    class CachedPrimitiveBase : public CachedPrimitiveBase_Base,
+    class CANVASTOOLS_DLLPUBLIC CachedPrimitiveBase : public CachedPrimitiveBase_Base,
                                 public ::comphelper::OBaseMutex
     {
     public:
diff --git a/canvas/inc/canvas/base/canvascustomspritehelper.hxx b/canvas/inc/canvas/base/canvascustomspritehelper.hxx
index 2dd034d4eb56..8c7b3648921f 100644
--- a/canvas/inc/canvas/base/canvascustomspritehelper.hxx
+++ b/canvas/inc/canvas/base/canvascustomspritehelper.hxx
@@ -35,7 +35,7 @@
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <canvas/base/spritesurface.hxx>
-
+#include <canvas/canvastoolsdllapi.h>
 
 namespace canvas
 {
@@ -44,7 +44,7 @@ namespace canvas
     /** Base class for an XSprite helper implementation - to be used
         in concert with CanvasCustomSpriteBase
      */
-    class CanvasCustomSpriteHelper
+    class CANVASTOOLS_DLLPUBLIC CanvasCustomSpriteHelper
     {
     public:
         CanvasCustomSpriteHelper();
diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx
index 6c9fdfee484a..a3491bb157da 100755
--- a/canvas/inc/canvas/canvastools.hxx
+++ b/canvas/inc/canvas/canvastools.hxx
@@ -42,6 +42,7 @@
 #include <limits>
 #include <algorithm>
 
+#include <canvas/canvastoolsdllapi.h>
 
 namespace basegfx
 {
@@ -153,56 +154,56 @@ namespace canvas
 
         /** Create a RealSize2D with both coordinate values set to +infinity
          */
-        ::com::sun::star::geometry::RealSize2D createInfiniteSize2D();
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::RealSize2D createInfiniteSize2D();
 
 
         // View- and RenderState utilities
         // ===================================================================
 
-        ::com::sun::star::rendering::RenderState&
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState&
             initRenderState( ::com::sun::star::rendering::RenderState&                      renderState );
 
-        ::com::sun::star::rendering::ViewState&
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState&
             initViewState( ::com::sun::star::rendering::ViewState&                          viewState );
 
-        ::basegfx::B2DHomMatrix&
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix&
             getViewStateTransform( ::basegfx::B2DHomMatrix&                                 transform,
                                    const ::com::sun::star::rendering::ViewState&            viewState );
 
-        ::com::sun::star::rendering::ViewState&
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState&
             setViewStateTransform( ::com::sun::star::rendering::ViewState&                  viewState,
                                    const ::basegfx::B2DHomMatrix&                           transform );
 
-        ::basegfx::B2DHomMatrix&
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix&
             getRenderStateTransform( ::basegfx::B2DHomMatrix&                               transform,
                                      const ::com::sun::star::rendering::RenderState&        renderState );
 
-        ::com::sun::star::rendering::RenderState&
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState&
             setRenderStateTransform( ::com::sun::star::rendering::RenderState&              renderState,
                                      const ::basegfx::B2DHomMatrix&                         transform );
 
-        ::com::sun::star::rendering::ViewState&
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState&
             appendToViewState( ::com::sun::star::rendering::ViewState&                      viewState,
                                const ::basegfx::B2DHomMatrix&                               transform );
 
-        ::com::sun::star::rendering::RenderState&
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState&
             appendToRenderState( ::com::sun::star::rendering::RenderState&                  renderState,
                                  const ::basegfx::B2DHomMatrix&                             transform );
 
-        ::com::sun::star::rendering::ViewState&
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState&
             prependToViewState( ::com::sun::star::rendering::ViewState&                     viewState,
                                 const ::basegfx::B2DHomMatrix&                              transform );
 
-        ::com::sun::star::rendering::RenderState&
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState&
             prependToRenderState( ::com::sun::star::rendering::RenderState&                 renderState,
                                   const ::basegfx::B2DHomMatrix&                            transform );
 
-        ::basegfx::B2DHomMatrix&
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix&
             mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix&                           transform,
                                          const ::com::sun::star::rendering::ViewState&      viewState,
                                          const ::com::sun::star::rendering::RenderState&    renderState );
 
-        ::com::sun::star::rendering::ViewState&
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState&
             mergeViewAndRenderState( ::com::sun::star::rendering::ViewState&                resultViewState,
                                      const ::com::sun::star::rendering::ViewState&          viewState,
                                      const ::com::sun::star::rendering::RenderState&        renderState,
@@ -213,10 +214,10 @@ namespace canvas
         // Matrix utilities
         // ===================================================================
 
-        ::com::sun::star::geometry::AffineMatrix2D&
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::AffineMatrix2D&
             setIdentityAffineMatrix2D( ::com::sun::star::geometry::AffineMatrix2D&  matrix );
 
-        ::com::sun::star::geometry::Matrix2D&
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::geometry::Matrix2D&
             setIdentityMatrix2D( ::com::sun::star::geometry::Matrix2D&              matrix );
 
 
@@ -242,7 +243,7 @@ namespace canvas
 
             @return a reference to the resulting rectangle
          */
-        ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange&            o_Rect,
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DRange& calcTransformedRectBounds( ::basegfx::B2DRange&          o_Rect,
                                                         const ::basegfx::B2DRange&      i_Rect,
                                                         const ::basegfx::B2DHomMatrix&  i_Transformation );
 
@@ -282,7 +283,7 @@ namespace canvas
 
             @see calcTransformedRectBounds()
         */
-        ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix&          o_transform,
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& calcRectToRectTransform( ::basegfx::B2DHomMatrix&            o_transform,
                                                           const ::basegfx::B2DRange&        i_destRect,
                                                           const ::basegfx::B2DRange&        i_srcRect,
                                                           const ::basegfx::B2DHomMatrix&    i_transformation );
@@ -314,7 +315,7 @@ namespace canvas
             @see calcRectToRectTransform()
             @see calcTransformedRectBounds()
         */
-        ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix&        o_transform,
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix& calcRectToOriginTransform( ::basegfx::B2DHomMatrix&      o_transform,
                                                             const ::basegfx::B2DRange&      i_srcRect,
                                                             const ::basegfx::B2DHomMatrix&  i_transformation );
 
@@ -338,7 +339,7 @@ namespace canvas
             @param rTransformation
             This transformation is applied to rTransformRect
          */
-        bool isInside( const ::basegfx::B2DRange&       rContainedRect,
+        CANVASTOOLS_DLLPUBLIC bool isInside( const ::basegfx::B2DRange&         rContainedRect,
                        const ::basegfx::B2DRange&       rTransformRect,
                        const ::basegfx::B2DHomMatrix&   rTransformation );
 
@@ -365,7 +366,7 @@ namespace canvas
 
             @return false, if the resulting scroll area is empty
          */
-        bool clipScrollArea( ::basegfx::B2IRange&                  io_rSourceArea,
+        CANVASTOOLS_DLLPUBLIC bool clipScrollArea( ::basegfx::B2IRange&                  io_rSourceArea,
                              ::basegfx::B2IPoint&                  io_rDestPoint,
                              ::std::vector< ::basegfx::B2IRange >& o_ClippedAreas,
                              const ::basegfx::B2IRange&            rBounds );
@@ -393,7 +394,7 @@ namespace canvas
             @return false, if the resulting blit is empty, i.e. fully
             clipped away.
          */
-        bool clipBlit( ::basegfx::B2IRange&       io_rSourceArea,
+        CANVASTOOLS_DLLPUBLIC bool clipBlit( ::basegfx::B2IRange&       io_rSourceArea,
                        ::basegfx::B2IPoint&       io_rDestPoint,
                        const ::basegfx::B2IRange& rSourceBounds,
                        const ::basegfx::B2IRange& rDestBounds );
@@ -413,7 +414,7 @@ namespace canvas
             @return the integer range, which is covered by the sprite
             given by rRange.
          */
-        ::basegfx::B2IRange spritePixelAreaFromB2DRange( const ::basegfx::B2DRange& rRange );
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2IRange spritePixelAreaFromB2DRange( const ::basegfx::B2DRange& rRange );
 
         /** Retrieve various internal properties of the actual canvas implementation.
 
@@ -433,7 +434,7 @@ namespace canvas
 
             @return A reference to the resulting sequence of parameters
         */
-        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo(
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getDeviceInfo(
             const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >& i_rxCanvas,
             ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& o_rxParams );
 
@@ -442,21 +443,21 @@ namespace canvas
             Use this method for dead-simple bitmap implementations,
             that map all their formats to 8888 RGBA color.
          */
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace> getStdColorSpace();
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerBitmapColorSpace> getStdColorSpace();
 
         /** Return a memory layout for a default RGBA integer format
 
             Use this method for dead-simple bitmap implementations,
             that map all their formats to 8888 RGBA color.
          */
-        ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout(
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::IntegerBitmapLayout getStdMemoryLayout(
             const ::com::sun::star::geometry::IntegerSize2D& rBitmapSize );
 
         /// Convert standard 8888 RGBA color to vcl color
-        ::Color stdIntSequenceToColor( const ::com::sun::star::uno::Sequence<sal_Int8>& rColor );
+        CANVASTOOLS_DLLPUBLIC ::Color stdIntSequenceToColor( const ::com::sun::star::uno::Sequence<sal_Int8>& rColor );
 
         /// Convert standard 8888 RGBA color to vcl color
-        ::com::sun::star::uno::Sequence<sal_Int8> colorToStdIntSequence( const ::Color& rColor );
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::uno::Sequence<sal_Int8> colorToStdIntSequence( const ::Color& rColor );
 
         // Modeled closely after boost::numeric_cast, only that we
         // issue some trace output here and throw a RuntimeException
@@ -489,13 +490,13 @@ namespace canvas
             return static_cast<Target>(arg);
         }
 
-        ::com::sun::star::awt::Rectangle getAbsoluteWindowRect(
+        CANVASTOOLS_DLLPUBLIC ::com::sun::star::awt::Rectangle getAbsoluteWindowRect(
             const ::com::sun::star::awt::Rectangle&                                    rRect,
             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow2 >& xWin  );
 
         /** Retrieve for small bound marks around each corner of the given rectangle
          */
-        ::basegfx::B2DPolyPolygon getBoundMarksPolyPolygon( const ::basegfx::B2DRange& rRange );
+        CANVASTOOLS_DLLPUBLIC ::basegfx::B2DPolyPolygon getBoundMarksPolyPolygon( const ::basegfx::B2DRange& rRange );
 
         /** Calculate number of gradient "strips" to generate (takes
            into account device resolution)
@@ -504,7 +505,7 @@ namespace canvas
            Maximal integer difference between all color stops, needed
            for smooth gradient color differences
          */
-        int calcGradientStepCount( ::basegfx::B2DHomMatrix&                        rTotalTransform,
+        CANVASTOOLS_DLLPUBLIC int calcGradientStepCount( ::basegfx::B2DHomMatrix&                        rTotalTransform,
                                    const ::com::sun::star::rendering::ViewState&   viewState,
                                    const ::com::sun::star::rendering::RenderState& renderState,
                                    const ::com::sun::star::rendering::Texture&     texture,
diff --git a/canvas/inc/canvas/canvastoolsdllapi.h b/canvas/inc/canvas/canvastoolsdllapi.h
new file mode 100644
index 000000000000..635aa4d454f3
--- /dev/null
+++ b/canvas/inc/canvas/canvastoolsdllapi.h
@@ -0,0 +1,37 @@
+/*************************************************************************

+ *

+ * 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.

+ *

+ ************************************************************************/

+#ifndef INCLUDED_CANVASTOOLSDLLAPI_H

+#define  INCLUDED_CANVASTOOLSDLLAPI_H

+

+#if defined CANVASTOOLS_DLLIMPLEMENTATION

+#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT

+#else

+#define CANVASTOOLS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT

+#endif

+#define CANVASTOOLS_DLLPRIVATE SAL_DLLPRIVATE

+

+#endif
\ No newline at end of file
diff --git a/canvas/inc/canvas/elapsedtime.hxx b/canvas/inc/canvas/elapsedtime.hxx
index c0ae5218eb64..4ba62fd1129b 100644
--- a/canvas/inc/canvas/elapsedtime.hxx
+++ b/canvas/inc/canvas/elapsedtime.hxx
@@ -31,6 +31,7 @@
 #include <sal/types.h>
 
 #include "boost/shared_ptr.hpp"
+#include <canvas/canvastoolsdllapi.h>
 
 namespace canvas
 {
@@ -42,7 +43,7 @@ namespace canvas
             -management functions. In its simplest use-case, it
             measures the time from its creation.
          */
-        class ElapsedTime
+        class CANVASTOOLS_DLLPUBLIC ElapsedTime
         {
         public:
             /** Create a new ElapsedTime object
diff --git a/canvas/inc/canvas/parametricpolypolygon.hxx b/canvas/inc/canvas/parametricpolypolygon.hxx
index aac98a67a713..11ad9cba7f04 100644
--- a/canvas/inc/canvas/parametricpolypolygon.hxx
+++ b/canvas/inc/canvas/parametricpolypolygon.hxx
@@ -36,6 +36,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 
 #include <boost/utility.hpp>
+#include <canvas/canvastoolsdllapi.h>
 
 namespace basegfx
 {
@@ -51,7 +52,7 @@ namespace canvas
     typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::rendering::XParametricPolyPolygon2D,
                                                    ::com::sun::star::lang::XServiceInfo > ParametricPolyPolygon_Base;
 
-    class ParametricPolyPolygon : public ::comphelper::OBaseMutex,
+    class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::comphelper::OBaseMutex,
                                   public ParametricPolyPolygon_Base,
                                   private ::boost::noncopyable
     {
diff --git a/canvas/inc/canvas/prioritybooster.hxx b/canvas/inc/canvas/prioritybooster.hxx
index 012c08138f4b..b490374af903 100644
--- a/canvas/inc/canvas/prioritybooster.hxx
+++ b/canvas/inc/canvas/prioritybooster.hxx
@@ -31,6 +31,7 @@
 #include <sal/types.h>
 
 #include <memory>
+#include <canvas/canvastoolsdllapi.h>
 
 
 namespace canvas
@@ -51,8 +52,8 @@ namespace canvas
                 Difference in execution priority. Positive values
                 increase prio, negative values decrease prio.
              */
-            explicit PriorityBooster( sal_Int32 nDelta );
-            ~PriorityBooster();
+             CANVASTOOLS_DLLPUBLIC explicit PriorityBooster( sal_Int32 nDelta );
+             CANVASTOOLS_DLLPUBLIC ~PriorityBooster();
 
         private:
             // also disables copy constructor and assignment operator
diff --git a/canvas/inc/canvas/propertysethelper.hxx b/canvas/inc/canvas/propertysethelper.hxx
index 6d486d3fee83..f3de97b58ea0 100644
--- a/canvas/inc/canvas/propertysethelper.hxx
+++ b/canvas/inc/canvas/propertysethelper.hxx
@@ -36,6 +36,7 @@
 #include <vector>
 #include <memory>
 
+#include <canvas/canvastoolsdllapi.h>
 
 namespace canvas
 {
@@ -54,7 +55,7 @@ namespace canvas
         The core responsibility of this this class is the name/value
         mapping for property sets.
      */
-    class PropertySetHelper
+    class CANVASTOOLS_DLLPUBLIC PropertySetHelper
     {
     public:
         typedef boost::function0< ::com::sun::star::uno::Any >            GetterType;
diff --git a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx b/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx
index 64eaca155d87..2cf071fd5aee 100644
--- a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx
+++ b/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx
@@ -33,6 +33,7 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include <canvas/canvastoolsdllapi.h>
 
 namespace canvas
 {
@@ -73,7 +74,7 @@ namespace canvas
 
     /** Create a surface proxy for the given render module.
      */
-    ISurfaceProxyManagerSharedPtr createSurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule );
+    CANVASTOOLS_DLLPUBLIC ISurfaceProxyManagerSharedPtr createSurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule );
 }
 
 #endif /* INCLUDED_CANVAS_ISURFACEPROXYMANAGER_HXX */
diff --git a/canvas/inc/canvas/spriteredrawmanager.hxx b/canvas/inc/canvas/spriteredrawmanager.hxx
index 41809a84272b..9e15bb7218e4 100644
--- a/canvas/inc/canvas/spriteredrawmanager.hxx
+++ b/canvas/inc/canvas/spriteredrawmanager.hxx
@@ -43,6 +43,7 @@
 #include <boost/utility.hpp>
 #include <boost/bind.hpp>
 
+#include <canvas/canvastoolsdllapi.h>
 
 /* Definition of SpriteRedrawManager class */
 
@@ -66,7 +67,7 @@ namespace canvas
         there) will reside in a common sprite area and handled
         together in the forEachSpriteArea functor call.
      */
-    class SpriteRedrawManager : private ::boost::noncopyable
+    class CANVASTOOLS_DLLPUBLIC SpriteRedrawManager : private ::boost::noncopyable
     {
     public:
         /** Data container for the connected components list
diff --git a/canvas/inc/canvas/verifyinput.hxx b/canvas/inc/canvas/verifyinput.hxx
index d9bd3f88233f..35bb13a4696d 100644
--- a/canvas/inc/canvas/verifyinput.hxx
+++ b/canvas/inc/canvas/verifyinput.hxx
@@ -38,6 +38,7 @@
 #include <boost/bind.hpp>
 #include <boost/current_function.hpp>
 
+#include <canvas/canvastoolsdllapi.h>
 
 namespace com { namespace sun { namespace star { namespace geometry
 {
@@ -95,7 +96,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::AffineMatrix2D&   rMatrix,
                           const char*                                       pStr,
                           const ::com::sun::star::uno::Reference<
                               ::com::sun::star::uno::XInterface >&          xIf,
@@ -118,7 +119,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::Matrix2D&   rMatrix,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::Matrix2D& rMatrix,
                           const char*                                   pStr,
                           const ::com::sun::star::uno::Reference<
                               ::com::sun::star::uno::XInterface >&      xIf,
@@ -141,7 +142,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealPoint2D&    rPoint,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealPoint2D&  rPoint,
                           const char*                                       pStr,
                           const ::com::sun::star::uno::Reference<
                               ::com::sun::star::uno::XInterface >&          xIf,
@@ -164,7 +165,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealSize2D& rSize,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealSize2D&   rSize,
                           const char*                                   pStr,
                           const ::com::sun::star::uno::Reference<
                               ::com::sun::star::uno::XInterface >&      xIf,
@@ -187,7 +188,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealBezierSegment2D&    rSegment,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealBezierSegment2D&  rSegment,
                           const char*                                               pStr,
                           const ::com::sun::star::uno::Reference<
                               ::com::sun::star::uno::XInterface >&                  xIf,
@@ -210,7 +211,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealPoint2D&    rPoint,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealPoint2D&  rPoint,
                           const char*                                       pStr,
                           const ::com::sun::star::uno::Reference<
                               ::com::sun::star::uno::XInterface >&          xIf,
@@ -233,7 +234,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::geometry::RealRectangle2D&    rRect,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::geometry::RealRectangle2D&  rRect,
                           const char*                                           pStr,
                           const ::com::sun::star::uno::Reference<
                               ::com::sun::star::uno::XInterface >&              xIf,
@@ -255,7 +256,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::ViewState& viewState,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::ViewState&   viewState,
                           const char*                                   pStr,
                           const ::com::sun::star::uno::Reference<
                                    ::com::sun::star::uno::XInterface >& xIf,
@@ -281,7 +282,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::RenderState&   renderState,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::RenderState& renderState,
                           const char*                                       pStr,
                           const ::com::sun::star::uno::Reference<
                                    ::com::sun::star::uno::XInterface >&     xIf,
@@ -304,7 +305,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::StrokeAttributes&  strokeAttributes,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::StrokeAttributes&    strokeAttributes,
                           const char*                                           pStr,
                           const ::com::sun::star::uno::Reference<
                                    ::com::sun::star::uno::XInterface >&         xIf,
@@ -326,7 +327,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::Texture&   texture,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::Texture&     texture,
                           const char*                                   pStr,
                           const ::com::sun::star::uno::Reference<
                                    ::com::sun::star::uno::XInterface >& xIf,
@@ -348,7 +349,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::IntegerBitmapLayout&   bitmapLayout,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::IntegerBitmapLayout&     bitmapLayout,
                           const char*                                               pStr,
                           const ::com::sun::star::uno::Reference<
                                    ::com::sun::star::uno::XInterface >&             xIf,
@@ -370,7 +371,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FloatingPointBitmapLayout& bitmapLayout,
                           const char*                                                   pStr,
                           const ::com::sun::star::uno::Reference<
                                    ::com::sun::star::uno::XInterface >&                 xIf,
@@ -392,7 +393,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::FontInfo&  fontInfo,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FontInfo&    fontInfo,
                           const char*                                   pStr,
                           const ::com::sun::star::uno::Reference<
                                    ::com::sun::star::uno::XInterface >& xIf,
@@ -414,7 +415,7 @@ namespace canvas
 
             @throws an lang::IllegalArgumentException, if anything is wrong
          */
-        void verifyInput( const ::com::sun::star::rendering::FontRequest&   fontRequest,
+        CANVASTOOLS_DLLPUBLIC void verifyInput( const ::com::sun::star::rendering::FontRequest& fontRequest,
                           const char*                                       pStr,
                           const ::com::sun::star::uno::Reference<
                                    ::com::sun::star::uno::XInterface >&     xIf,
@@ -677,7 +678,7 @@ namespace canvas
             @param size
             Given rectangle must be within ((0,0), (size.Width, size.Height))
          */
-        void verifyIndexRange( const ::com::sun::star::geometry::IntegerRectangle2D& rect,
+        CANVASTOOLS_DLLPUBLIC void verifyIndexRange( const ::com::sun::star::geometry::IntegerRectangle2D& rect,
                                const ::com::sun::star::geometry::IntegerSize2D&      size );
 
         /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when
@@ -689,7 +690,7 @@ namespace canvas
             @param size
             Given position must be within ((0,0), (size.Width, size.Height))
          */
-        void verifyIndexRange( const ::com::sun::star::geometry::IntegerPoint2D& pos,
+        CANVASTOOLS_DLLPUBLIC void verifyIndexRange( const ::com::sun::star::geometry::IntegerPoint2D& pos,
                                const ::com::sun::star::geometry::IntegerSize2D&  size );
 
         /** Range checker, which throws ::com::sun::star::lang::IndexOutOfBounds exception, when
@@ -698,7 +699,7 @@ namespace canvas
             @param size
             Size to verify
          */
-        void verifyBitmapSize( const ::com::sun::star::geometry::IntegerSize2D& size,
+        CANVASTOOLS_DLLPUBLIC void verifyBitmapSize( const ::com::sun::star::geometry::IntegerSize2D& size,
                                const char*                                      pStr,
                                const ::com::sun::star::uno::Reference<
                                        ::com::sun::star::uno::XInterface >&     xIf );
@@ -709,7 +710,7 @@ namespace canvas
             @param size
             Size to verify
          */
-        void verifySpriteSize( const ::com::sun::star::geometry::RealSize2D& size,
+        CANVASTOOLS_DLLPUBLIC void verifySpriteSize( const ::com::sun::star::geometry::RealSize2D& size,
                                const char*                                   pStr,
                                const ::com::sun::star::uno::Reference<
                                        ::com::sun::star::uno::XInterface >&  xIf );
diff --git a/canvas/prj/d.lst b/canvas/prj/d.lst
index 701b9967f92a..a545cf03e1de 100644
--- a/canvas/prj/d.lst
+++ b/canvas/prj/d.lst
@@ -25,6 +25,7 @@ mkdir: %_DEST%\inc%_EXT%\canvas\rendering
 
 mkdir: %_DEST%\inc%_EXT%\canvas
 ..\inc\canvas\*.hxx %_DEST%\inc%_EXT%\canvas\*.hxx
+..\inc\canvas\*.h %_DEST%\inc%_EXT%\canvas\*.h
 ..\%__SRC%\misc\canvasfactory.component %_DEST%\xml%_EXT%\canvasfactory.component
 ..\%__SRC%\misc\directx5canvas.component %_DEST%\xml%_EXT%\directx5canvas.component
 ..\%__SRC%\misc\directx9canvas.component %_DEST%\xml%_EXT%\directx9canvas.component
diff --git a/canvas/source/cairo/cairo_canvashelper_texturefill.cxx b/canvas/source/cairo/cairo_canvashelper_texturefill.cxx
deleted file mode 100644
index 43447645daf9..000000000000
--- a/canvas/source/cairo/cairo_canvashelper_texturefill.cxx
+++ /dev/null
@@ -1,144 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_canvas.hxx"
-
-#include <canvas/debug.hxx>
-
-#include <rtl/math.hxx>
-
-#include <com/sun/star/rendering/TextDirection.hpp>
-#include <com/sun/star/rendering/TexturingMode.hpp>
-#include <com/sun/star/rendering/PathCapType.hpp>
-#include <com/sun/star/rendering/PathJoinType.hpp>
-
-#include <tools/poly.hxx>
-#include <vcl/window.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/bmpacc.hxx>
-#include <vcl/canvastools.hxx>
-
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/range/b2drectangle.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2dsize.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/polygon/b2dlinegeometry.hxx>
-#include <basegfx/tools/canvastools.hxx>
-#include <basegfx/numeric/ftools.hxx>
-
-#include <utility>
-
-#include <comphelper/sequence.hxx>
-#include <canvas/canvastools.hxx>
-
-#include "cairo_textlayout.hxx"
-#include "cairo_parametricpolypolygon.hxx"
-#include "cairo_canvashelper.hxx"
-#include "cairo_canvasbitmap.hxx"
-#include "cairo_impltools.hxx"
-#include "cairo_canvasfont.hxx"
-
-using namespace ::com::sun::star;
-
-namespace cairocanvas
-{
-    namespace
-    {
-        bool textureFill( OutputDevice&         rOutDev,
-                          GraphicObject&        rGraphic,
-                          const ::Point&        rPosPixel,
-                          const ::Size&         rNextTileX,
-                          const ::Size&         rNextTileY,
-                          sal_Int32             nTilesX,
-                          sal_Int32             nTilesY,
-                          const ::Size&         rTileSize,
-                          const GraphicAttr&    rAttr)
-        {
-            bool bRet( false );
-            Point   aCurrPos;
-            int     nX, nY;
-
-            for( nY=0; nY < nTilesY; ++nY )
-            {
-                aCurrPos.X() = rPosPixel.X() + nY*rNextTileY.Width();
-                aCurrPos.Y() = rPosPixel.Y() + nY*rNextTileY.Height();
-
-                for( nX=0; nX < nTilesX; ++nX )
-                {
-                    // update return value. This method should return true, if
-                    // at least one of the looped Draws succeeded.
-                    bRet |= rGraphic.Draw( &rOutDev,
-                                           aCurrPos,
-                                           rTileSize,
-                                           &rAttr );
-
-                    aCurrPos.X() += rNextTileX.Width();
-                    aCurrPos.Y() += rNextTileX.Height();
-                }
-            }
-
-            return bRet;
-        }
-
-        inline sal_Int32 roundDown( const double& rVal )
-        {
-            return static_cast< sal_Int32 >( floor( rVal ) );
-        }
-
-        inline sal_Int32 roundUp( const double& rVal )
-        {
-            return static_cast< sal_Int32 >( ceil( rVal ) );
-        }
-    }
-
-    uno::Reference< rendering::XCachedPrimitive > CanvasHelper::fillTexturedPolyPolygon( const rendering::XCanvas&                          rCanvas,
-                                                                                         const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,
-                                                                                         const rendering::ViewState&                        viewState,
-                                                                                         const rendering::RenderState&                      renderState,
-                                                                                         const uno::Sequence< rendering::Texture >&         textures )
-    {
-        ENSURE_ARG_OR_THROW( xPolyPolygon.is(),
-                         "CanvasHelper::fillPolyPolygon(): polygon is NULL");
-        ENSURE_ARG_OR_THROW( textures.getLength(),
-                         "CanvasHelper::fillTexturedPolyPolygon: empty texture sequence");
-
-    cairo_save( mpCairo );
-
-    useStates( viewState, renderState, true );
-    mpTextures = &textures;
-    drawPolyPolygonPath( xPolyPolygon, Fill );
-    mpTextures = NULL;
-
-    cairo_restore( mpCairo );
-
-        return uno::Reference< rendering::XCachedPrimitive >(NULL);
-    }
-}
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index f4bbb57e0e7d..b2b72620af00 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -526,13 +526,13 @@ const ::cppu::ImplementationEntry s_entries [] = {
 
 extern "C" {
 
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     sal_Char const * pImplName,
     lang::XMultiServiceFactory * pServiceManager,
     registry::XRegistryKey * pRegistryKey )
diff --git a/canvas/source/tools/makefile.mk b/canvas/source/tools/makefile.mk
index 9d9e5ba002bf..cf621d96309c 100644
--- a/canvas/source/tools/makefile.mk
+++ b/canvas/source/tools/makefile.mk
@@ -30,6 +30,7 @@ PRJ=..$/..
 PRJNAME=canvas
 TARGET=canvastools
 ENABLE_EXCEPTIONS=TRUE
+LIBTARGET=NO
 
 # --- Settings -----------------------------------------------------------
 
@@ -44,10 +45,23 @@ CDEFS+= -DVERBOSE
 CDEFS+= -DPROFILER
 .ENDIF
 
+CDEFS+= -DCANVASTOOLS_DLLIMPLEMENTATION
+
 #CFLAGS +:= /Ox /Ot					# THIS IS IMPORTANT
 
 
 .IF "$(L10N_framework)"==""
+
+SHL1TARGET= 	$(TARGET)$(DLLPOSTFIX)
+SHL1IMPLIB= 	i$(TARGET)
+SHL1STDLIBS=	$(SALLIB) $(CPPULIB) $(BASEGFXLIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(VCLLIB) $(TKLIB) $(TOOLSLIB)
+.IF "$(GUI)" == "WNT"
+SHL1STDLIBS += $(WINMMLIB) $(KERNEL32LIB)
+.ENDIF
+SHL1USE_EXPORTS=name
+SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+DEF1NAME	=$(SHL1TARGET)
+
 SLOFILES =	\
     $(SLO)$/cachedprimitivebase.obj \
     $(SLO)$/canvascustomspritehelper.obj \
@@ -64,10 +78,6 @@ SLOFILES =	\
     $(SLO)$/page.obj \
     $(SLO)$/verifyinput.obj
 
-SHL1TARGET= 	$(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB= 	i$(TARGET)
-SHL1STDLIBS=	$(SALLIB) $(CPPULIB) $(BASEGFXLIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(VCLLIB) $(TKLIB) $(TOOLSLIB)
-
 .IF "$(ENABLE_AGG)"=="YES"
     SLOFILES += $(SLO)$/bitmap.obj \
                 $(SLO)$/image.obj
@@ -78,24 +88,11 @@ SHL1STDLIBS=	$(SALLIB) $(CPPULIB) $(BASEGFXLIB) $(CPPUHELPERLIB) $(COMPHELPERLIB
     SHL1STDLIBS += $(AGGLIB)
 .ENDIF
 
-SHL1LIBS=		$(SLB)$/$(TARGET).lib
+SHL1OBJS=	$(SLOFILES)
 
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-DEF1NAME	=$(SHL1TARGET)
-DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt \
-        $(LIB1TARGET)
-
-DEF1DES		=Canvastools
-DEFLIB1NAME	=$(TARGET)
-
-.IF "$(GUI)" == "WNT"
-SHL1STDLIBS += $(WINMMLIB) $(KERNEL32LIB)
-.ENDIF
 .ENDIF
 
 # ==========================================================================
 
 .INCLUDE :	target.mk
 
-$(MISC)$/$(SHL1TARGET).flt : makefile.mk $(TARGET).flt
-    @$(TYPE) $(TARGET).flt > $@