You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/03/11 00:23:00 UTC
svn commit: r1734481 - in /openoffice/branches/gbuild-reintegration: ./
main/ main/basegfx/inc/basegfx/ main/canvas/ main/canvas/inc/canvas/
main/canvas/inc/canvas/base/ main/canvas/inc/canvas/rendering/
main/canvas/prj/ main/canvas/source/factory/ mai...
Author: damjan
Date: Thu Mar 10 23:22:59 2016
New Revision: 1734481
URL: http://svn.apache.org/viewvc?rev=1734481&view=rev
Log:
Merge from branches/gbuild:
* r1409497: convert canvas to new build system
* r1409498: convert canvas to new build system
* r1409511: CWS gnumake4: build directx a second time for dx5
* r1409514: CWS gnumake4: fixes for building with ENABLE_CAIRO on windows
* r1409524: gnumake4: remove DOS lineendings from new dllapi files, add terminating newline
Also fixed usage of ENABLE_CAIRO_CANVAS in main/canvas/Module_canvas.mk
BUILDS (with --disable-cairo-canvas)
Build updates by: me
Added:
openoffice/branches/gbuild-reintegration/main/canvas/Library_cairocanvas.mk
- copied, changed from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_canvasfactory.mk
- copied unchanged from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_canvasfactory.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_canvastools.mk
- copied, changed from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_canvastools.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_directx5canvas.mk
- copied, changed from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_directx9canvas.mk
- copied, changed from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_directx9canvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_gdipluscanvas.mk
- copied, changed from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_gdipluscanvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_nullcanvas.mk
- copied unchanged from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_nullcanvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_simplecanvas.mk
- copied unchanged from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_simplecanvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Library_vclcanvas.mk
- copied, changed from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_vclcanvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Makefile
- copied unchanged from r1409498, incubator/ooo/branches/gbuild/main/canvas/Makefile
openoffice/branches/gbuild-reintegration/main/canvas/Module_canvas.mk
- copied, changed from r1409498, incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk
openoffice/branches/gbuild-reintegration/main/canvas/Package_inc.mk
- copied unchanged from r1409498, incubator/ooo/branches/gbuild/main/canvas/Package_inc.mk
openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/canvastoolsdllapi.h
- copied, changed from r1409498, incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastoolsdllapi.h
openoffice/branches/gbuild-reintegration/main/canvas/prj/makefile.mk
- copied unchanged from r1409498, incubator/ooo/branches/gbuild/main/canvas/prj/makefile.mk
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
openoffice/branches/gbuild-reintegration/main/Repository.mk
openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/basegfxdllapi.h
openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/base/cachedprimitivebase.hxx
openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx
openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/canvastools.hxx
openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/elapsedtime.hxx
openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/parametricpolypolygon.hxx
openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/prioritybooster.hxx
openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/propertysethelper.hxx
openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx
openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/spriteredrawmanager.hxx
openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/verifyinput.hxx
openoffice/branches/gbuild-reintegration/main/canvas/prj/build.lst
openoffice/branches/gbuild-reintegration/main/canvas/prj/d.lst
openoffice/branches/gbuild-reintegration/main/canvas/source/factory/cf_service.cxx
openoffice/branches/gbuild-reintegration/main/canvas/source/tools/makefile.mk
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 23:22:59 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409510,1409513,1409515,1409523,1409526,1409529-1409530,1409538-1409541,1409543-1409544,1409546-1409547
+/incubator/ooo/branches/gbuild:1409313-1409495,1409497-1409515,1409523-1409524,1409526,1409529-1409530,1409538-1409541,1409543-1409544,1409546-1409547
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Module_ooo.mk?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Module_ooo.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Module_ooo.mk Thu Mar 10 23:22:59 2016
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
basebmp \
basegfx \
+ canvas \
comphelper \
cppcanvas \
drawinglayer \
Modified: openoffice/branches/gbuild-reintegration/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/Repository.mk?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Repository.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Repository.mk Thu Mar 10 23:22:59 2016
@@ -41,9 +41,10 @@ $(eval $(call gb_Helper_register_executa
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
AppleRemote \
+ agg \
avmedia \
- basegfx \
basebmp \
+ basegfx \
canvastools \
cppcanvas \
cui \
@@ -129,11 +130,19 @@ $(eval $(call gb_Helper_register_librari
))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+ cairocanvas \
+ canvasfactory \
+ directx5canvas \
+ directx9canvas \
fsstorage \
+ gdipluscanvas \
hatchwindowfactory \
+ nullcanvas \
passwordcontainer \
+ simplecanvas \
vbaswobj \
msforms \
+ vclcanvas \
writerfilter_debug \
))
Modified: openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/RepositoryFixes.mk Thu Mar 10 23:22:59 2016
@@ -81,6 +81,7 @@ gb_Library_NOILIBFILENAMES:=\
icuuc \
sot \
uwinapi \
+ winmm \
gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
@@ -88,6 +89,7 @@ gb_Library_FILENAMES += $(foreach lib,$(
gb_Library_ILIBFILENAMES:=\
gdiplus \
uuid \
+ winmm \
gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
@@ -124,6 +126,10 @@ gb_Library_FILENAMES := $(patsubst stl:i
gb_Library_NOILIBFILENAMES:=\
advapi32 \
+ cairo \
+ d3d9 \
+ d3dx \
+ ddraw \
gdi32 \
gdiplus \
gnu_getopt \
@@ -256,4 +262,9 @@ ifeq ($(SYSTEM_ICU),YES)
gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
endif
+ifeq ($(SYSTEM_CAIRO),YES)
+gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS))
+gb_Library_TARGETS := $(filter-out pixman-1,$(gb_Library_TARGETS))
+endif
+
# vim: set noet sw=4 ts=4:
Modified: openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/basegfxdllapi.h
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/basegfxdllapi.h?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/basegfxdllapi.h (original)
+++ openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/basegfxdllapi.h Thu Mar 10 23:22:59 2016
@@ -1,45 +1,47 @@
-/*************************************************************************
- *
- * 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_BASEGFXDLLAPI_H
-#define INCLUDED_BASEGFXDLLAPI_H
-
-#if defined BASEGFX_STATICLIBRARY
-#define BASEGFX_DLLPUBLIC
-#define BASEGFX_DLLPRIVATE
-
-#else
-
-#if defined BASEGFX_DLLIMPLEMENTATION
-#define BASEGFX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define BASEGFX_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-#define BASEGFX_DLLPRIVATE SAL_DLLPRIVATE
-
-#endif
-
-#endif
\ No newline at end of file
+/*************************************************************************
+ *
+ * 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_BASEGFXDLLAPI_H
+#define INCLUDED_BASEGFXDLLAPI_H
+
+#if defined BASEGFX_STATICLIBRARY
+
+#define BASEGFX_DLLPUBLIC
+#define BASEGFX_DLLPRIVATE
+
+#else /*BASEGFX_STATICLIBRARY*/
+
+#if defined BASEGFX_DLLIMPLEMENTATION
+#define BASEGFX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define BASEGFX_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define BASEGFX_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /*BASEGFX_STATICLIBRARY*/
+
+#endif
+
Copied: openoffice/branches/gbuild-reintegration/main/canvas/Library_cairocanvas.mk (from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_cairocanvas.mk?p2=openoffice/branches/gbuild-reintegration/main/canvas/Library_cairocanvas.mk&p1=incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk&r1=1409498&r2=1734481&rev=1734481&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_cairocanvas.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/Library_cairocanvas.mk Thu Mar 10 23:22:59 2016
@@ -75,7 +75,7 @@ $(eval $(call gb_Library_add_linked_libs
cppuhelper \
comphelper \
vcl \
- tk \
+ ootk \
tl \
i18nisolang1 \
canvastools \
@@ -109,7 +109,7 @@ $(eval $(call gb_Library_add_exception_o
$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
cairo \
gdi32 \
- msimg32 \
+ user32 \
))
else
Copied: openoffice/branches/gbuild-reintegration/main/canvas/Library_canvastools.mk (from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_canvastools.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_canvastools.mk?p2=openoffice/branches/gbuild-reintegration/main/canvas/Library_canvastools.mk&p1=incubator/ooo/branches/gbuild/main/canvas/Library_canvastools.mk&r1=1409498&r2=1734481&rev=1734481&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_canvastools.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/Library_canvastools.mk Thu Mar 10 23:22:59 2016
@@ -69,7 +69,7 @@ $(eval $(call gb_Library_add_linked_libs
cppuhelper \
comphelper \
vcl \
- tk \
+ ootk \
tl \
$(gb_STDLIBS) \
))
Copied: openoffice/branches/gbuild-reintegration/main/canvas/Library_directx5canvas.mk (from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_directx5canvas.mk?p2=openoffice/branches/gbuild-reintegration/main/canvas/Library_directx5canvas.mk&p1=incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk&r1=1409498&r2=1734481&rev=1734481&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_directx5canvas.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/Library_directx5canvas.mk Thu Mar 10 23:22:59 2016
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_include,dir
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
-I$(SRCDIR)/canvas/inc/pch \
+ -I$(SRCDIR)/canvas/source/directx \
))
$(eval $(call gb_Library_set_defs,directx5canvas,\
@@ -54,7 +55,7 @@ endif
$(eval $(call gb_Library_add_linked_libs,directx5canvas,\
cppu \
- tk \
+ ootk \
sal \
comphelper \
cppuhelper \
@@ -86,29 +87,33 @@ $(eval $(call gb_Library_add_linked_libs
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 \
+$(WORKDIR)/CustomTarget/canvas/source/directx/%.cxx : $(SRCDIR)/canvas/source/directx/%.cxx
+ mkdir -p $(dir $@) && \
+ cp $< $@
+
+$(eval $(call gb_Library_add_generated_exception_objects,directx5canvas,\
+ CustomTarget/canvas/source/directx/dx_5rm \
+ CustomTarget/canvas/source/directx/dx_bitmap \
+ CustomTarget/canvas/source/directx/dx_bitmapcanvashelper \
+ CustomTarget/canvas/source/directx/dx_canvasbitmap \
+ CustomTarget/canvas/source/directx/dx_canvascustomsprite \
+ CustomTarget/canvas/source/directx/dx_canvasfont \
+ CustomTarget/canvas/source/directx/dx_canvashelper \
+ CustomTarget/canvas/source/directx/dx_canvashelper_texturefill \
+ CustomTarget/canvas/source/directx/dx_config \
+ CustomTarget/canvas/source/directx/dx_devicehelper \
+ CustomTarget/canvas/source/directx/dx_gdiplususer \
+ CustomTarget/canvas/source/directx/dx_impltools \
+ CustomTarget/canvas/source/directx/dx_linepolypolygon \
+ CustomTarget/canvas/source/directx/dx_spritecanvas \
+ CustomTarget/canvas/source/directx/dx_spritecanvashelper \
+ CustomTarget/canvas/source/directx/dx_spritedevicehelper \
+ CustomTarget/canvas/source/directx/dx_spritehelper \
+ CustomTarget/canvas/source/directx/dx_surfacebitmap \
+ CustomTarget/canvas/source/directx/dx_surfacegraphics \
+ CustomTarget/canvas/source/directx/dx_textlayout \
+ CustomTarget/canvas/source/directx/dx_textlayout_drawhelper \
+ CustomTarget/canvas/source/directx/dx_vcltools \
))
# vim: set noet sw=4 ts=4:
Copied: openoffice/branches/gbuild-reintegration/main/canvas/Library_directx9canvas.mk (from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_directx9canvas.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_directx9canvas.mk?p2=openoffice/branches/gbuild-reintegration/main/canvas/Library_directx9canvas.mk&p1=incubator/ooo/branches/gbuild/main/canvas/Library_directx9canvas.mk&r1=1409498&r2=1734481&rev=1734481&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_directx9canvas.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/Library_directx9canvas.mk Thu Mar 10 23:22:59 2016
@@ -54,7 +54,7 @@ endif
$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
cppu \
- tk \
+ ootk \
sal \
comphelper \
cppuhelper \
Copied: openoffice/branches/gbuild-reintegration/main/canvas/Library_gdipluscanvas.mk (from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_gdipluscanvas.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_gdipluscanvas.mk?p2=openoffice/branches/gbuild-reintegration/main/canvas/Library_gdipluscanvas.mk&p1=incubator/ooo/branches/gbuild/main/canvas/Library_gdipluscanvas.mk&r1=1409498&r2=1734481&rev=1734481&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_gdipluscanvas.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/Library_gdipluscanvas.mk Thu Mar 10 23:22:59 2016
@@ -54,7 +54,7 @@ endif
$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
cppu \
- tk \
+ ootk \
sal \
comphelper \
cppuhelper \
Copied: openoffice/branches/gbuild-reintegration/main/canvas/Library_vclcanvas.mk (from r1409498, incubator/ooo/branches/gbuild/main/canvas/Library_vclcanvas.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Library_vclcanvas.mk?p2=openoffice/branches/gbuild-reintegration/main/canvas/Library_vclcanvas.mk&p1=incubator/ooo/branches/gbuild/main/canvas/Library_vclcanvas.mk&r1=1409498&r2=1734481&rev=1734481&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Library_vclcanvas.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/Library_vclcanvas.mk Thu Mar 10 23:22:59 2016
@@ -59,7 +59,7 @@ $(eval $(call gb_Library_add_linked_libs
cppuhelper \
comphelper \
vcl \
- tk \
+ ootk \
tl \
svt \
i18nisolang1 \
Copied: openoffice/branches/gbuild-reintegration/main/canvas/Module_canvas.mk (from r1409498, incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/Module_canvas.mk?p2=openoffice/branches/gbuild-reintegration/main/canvas/Module_canvas.mk&p1=incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk&r1=1409498&r2=1734481&rev=1734481&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/Module_canvas.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/Module_canvas.mk Thu Mar 10 23:22:59 2016
@@ -39,12 +39,11 @@ $(eval $(call gb_Module_add_targets,canv
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
+ifneq ($(strip $(USE_DIRECTX5)),)
+$(eval $(call gb_Module_add_targets,canvas,\
+ Library_directx5canvas \
+))
+endif
$(eval $(call gb_Module_add_targets,canvas,\
Library_directx9canvas \
@@ -54,7 +53,7 @@ $(eval $(call gb_Module_add_targets,canv
endif
endif
-ifneq ($(strip $(ENABLE_CAIRO_CANVAS)),)
+ifeq ($(strip $(ENABLE_CAIRO_CANVAS)),TRUE)
$(eval $(call gb_Module_add_targets,canvas,\
Library_cairocanvas \
))
Modified: openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/base/cachedprimitivebase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/base/cachedprimitivebase.hxx?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/base/cachedprimitivebase.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/base/cachedprimitivebase.hxx Thu Mar 10 23:22:59 2016
@@ -32,6 +32,7 @@
#include <cppuhelper/compbase2.hxx>
#include <comphelper/broadcasthelper.hxx>
+#include <canvas/canvastoolsdllapi.h>
/* Definition of CachedPrimitiveBase class */
@@ -43,7 +44,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:
Modified: openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/base/canvascustomspritehelper.hxx Thu Mar 10 23:22:59 2016
@@ -31,7 +31,7 @@
#include <basegfx/range/b2drange.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <canvas/base/spritesurface.hxx>
-
+#include <canvas/canvastoolsdllapi.h>
namespace canvas
{
@@ -40,7 +40,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();
Modified: openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/canvastools.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/canvastools.hxx?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/canvastools.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/canvastools.hxx Thu Mar 10 23:22:59 2016
@@ -38,6 +38,7 @@
#include <limits>
#include <algorithm>
+#include <canvas/canvastoolsdllapi.h>
namespace basegfx
{
@@ -149,56 +150,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,
@@ -209,10 +210,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 );
@@ -238,7 +239,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 );
@@ -278,7 +279,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 );
@@ -310,7 +311,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 );
@@ -334,7 +335,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 );
@@ -361,7 +362,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 );
@@ -389,7 +390,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 );
@@ -409,7 +410,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.
@@ -429,7 +430,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 );
@@ -438,21 +439,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 );
// Modelled closely after boost::numeric_cast, only that we
// issue some trace output here and throw a RuntimeException
@@ -485,13 +486,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)
@@ -500,7 +501,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,
Copied: openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/canvastoolsdllapi.h (from r1409498, incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastoolsdllapi.h)
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/canvastoolsdllapi.h?p2=openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/canvastoolsdllapi.h&p1=incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastoolsdllapi.h&r1=1409498&r2=1734481&rev=1734481&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/canvas/inc/canvas/canvastoolsdllapi.h (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/canvastoolsdllapi.h Thu Mar 10 23:22:59 2016
@@ -1,37 +1,38 @@
-/*************************************************************************
- *
- * 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
+/*************************************************************************
+ *
+ * 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
+
Modified: openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/elapsedtime.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/elapsedtime.hxx?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/elapsedtime.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/elapsedtime.hxx Thu Mar 10 23:22:59 2016
@@ -27,6 +27,7 @@
#include <sal/types.h>
#include "boost/shared_ptr.hpp"
+#include <canvas/canvastoolsdllapi.h>
namespace canvas
{
@@ -38,7 +39,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
Modified: openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/parametricpolypolygon.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/parametricpolypolygon.hxx?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/parametricpolypolygon.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/parametricpolypolygon.hxx Thu Mar 10 23:22:59 2016
@@ -32,6 +32,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <boost/utility.hpp>
+#include <canvas/canvastoolsdllapi.h>
namespace basegfx
{
@@ -47,7 +48,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
{
Modified: openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/prioritybooster.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/prioritybooster.hxx?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/prioritybooster.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/prioritybooster.hxx Thu Mar 10 23:22:59 2016
@@ -27,6 +27,7 @@
#include <sal/types.h>
#include <memory>
+#include <canvas/canvastoolsdllapi.h>
namespace canvas
@@ -47,8 +48,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
Modified: openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/propertysethelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/propertysethelper.hxx?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/propertysethelper.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/propertysethelper.hxx Thu Mar 10 23:22:59 2016
@@ -32,6 +32,7 @@
#include <vector>
#include <memory>
+#include <canvas/canvastoolsdllapi.h>
namespace canvas
{
@@ -50,7 +51,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;
Modified: openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx Thu Mar 10 23:22:59 2016
@@ -29,6 +29,7 @@
#include <boost/shared_ptr.hpp>
+#include <canvas/canvastoolsdllapi.h>
namespace canvas
{
@@ -69,7 +70,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 */
Modified: openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/spriteredrawmanager.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/spriteredrawmanager.hxx?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/spriteredrawmanager.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/spriteredrawmanager.hxx Thu Mar 10 23:22:59 2016
@@ -39,6 +39,7 @@
#include <boost/utility.hpp>
#include <boost/bind.hpp>
+#include <canvas/canvastoolsdllapi.h>
/* Definition of SpriteRedrawManager class */
@@ -62,7 +63,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
Modified: openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/verifyinput.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/verifyinput.hxx?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/verifyinput.hxx (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/inc/canvas/verifyinput.hxx Thu Mar 10 23:22:59 2016
@@ -34,6 +34,7 @@
#include <boost/bind.hpp>
#include <boost/current_function.hpp>
+#include <canvas/canvastoolsdllapi.h>
namespace com { namespace sun { namespace star { namespace geometry
{
@@ -91,7 +92,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,
@@ -114,7 +115,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,
@@ -137,7 +138,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,
@@ -160,7 +161,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,
@@ -183,7 +184,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,
@@ -206,7 +207,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,
@@ -229,7 +230,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,
@@ -251,7 +252,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,
@@ -277,7 +278,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,
@@ -300,7 +301,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,
@@ -322,7 +323,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,
@@ -344,7 +345,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,
@@ -366,7 +367,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,
@@ -388,7 +389,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,
@@ -410,7 +411,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,
@@ -673,7 +674,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
@@ -685,7 +686,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
@@ -694,7 +695,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 );
@@ -705,7 +706,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 );
Modified: openoffice/branches/gbuild-reintegration/main/canvas/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/prj/build.lst?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/prj/build.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/prj/build.lst Thu Mar 10 23:22:59 2016
@@ -1,10 +1,2 @@
cv canvas : javaunohelper comphelper cppuhelper offapi unoil tools svtools vcl basegfx CAIRO:cairo LIBXSLT:libxslt NULL
-cv canvas usr1 - all cv_mkout NULL
-cv canvas\inc nmake - all cv_inc NULL
-cv canvas\source\tools nmake - all cv_tools cv_inc NULL
-cv canvas\source\vcl nmake - all cv_vcl cv_tools cv_inc NULL
-cv canvas\source\simplecanvas nmake - all cv_simplecanvas cv_tools cv_inc NULL
-cv canvas\source\cairo nmake - all cv_cairo cv_tools cv_inc NULL
-cv canvas\source\directx nmake - w cv_directx cv_tools cv_inc NULL
-cv canvas\source\null nmake - all cv_null cv_tools cv_inc NULL
-cv canvas\source\factory nmake - all cv_factory cv_inc NULL
+cv canvas\prj nmake - all cv_prj NULL
Modified: openoffice/branches/gbuild-reintegration/main/canvas/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/prj/d.lst?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/prj/d.lst Thu Mar 10 23:22:59 2016
@@ -1,34 +0,0 @@
-..\%__SRC%\bin\canvasto*.dll %_DEST%\bin%_EXT%\canvasto*.dll
-..\%__SRC%\bin\cairocan*.dll %_DEST%\bin%_EXT%\cairocan*.dll
-..\%__SRC%\bin\directx*.dll %_DEST%\bin%_EXT%\directx*.dll
-..\%__SRC%\bin\gdiplus*.dll %_DEST%\bin%_EXT%\gdiplus*.dll
-..\%__SRC%\bin\vclcanva*.dll %_DEST%\bin%_EXT%\vclcanva*.dll
-..\%__SRC%\bin\nullcanv*.dll %_DEST%\bin%_EXT%\nullcanv*.dll
-..\%__SRC%\bin\simpleca*.dll %_DEST%\bin%_EXT%\simpleca*.dll
-..\%__SRC%\bin\canvasfa*.dll %_DEST%\bin%_EXT%\canvasfa*.dll
-..\%__SRC%\lib\icanvastools.lib %_DEST%\lib%_EXT%\icanvastools.lib
-..\%__SRC%\lib\canvastools.lib %_DEST%\lib%_EXT%\canvastools.lib
-..\%__SRC%\lib\libcanvastools*.so %_DEST%\lib%_EXT%\
-..\%__SRC%\lib\cairocanvas.uno.so %_DEST%\lib%_EXT%\cairocanvas.uno.so
-..\%__SRC%\lib\vclcanvas.uno.so %_DEST%\lib%_EXT%\vclcanvas.uno.so
-..\%__SRC%\lib\nullcanvas.uno.so %_DEST%\lib%_EXT%\nullcanvas.uno.so
-..\%__SRC%\lib\simplecanvas.uno.so %_DEST%\lib%_EXT%\simplecanvas.uno.so
-..\%__SRC%\lib\canvasfactory.uno.so %_DEST%\lib%_EXT%\canvasfactory.uno.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\class\javacanvas.uno.jar %_DEST%\bin%_EXT%\javacanvas.uno.jar
-..\%__SRC%\misc\cairocanvas.component %_DEST%\xml%_EXT%\cairocanvas.component
-
-mkdir: %_DEST%\inc%_EXT%\canvas\base
-..\inc\canvas\base\*.hxx %_DEST%\inc%_EXT%\canvas\base\*.hxx
-
-mkdir: %_DEST%\inc%_EXT%\canvas\rendering
-..\inc\canvas\rendering\*.hxx %_DEST%\inc%_EXT%\canvas\rendering\*.hxx
-
-mkdir: %_DEST%\inc%_EXT%\canvas
-..\inc\canvas\*.hxx %_DEST%\inc%_EXT%\canvas\*.hxx
-..\%__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
-..\%__SRC%\misc\gdipluscanvas.component %_DEST%\xml%_EXT%\gdipluscanvas.component
-..\%__SRC%\misc\simplecanvas.component %_DEST%\xml%_EXT%\simplecanvas.component
-..\%__SRC%\misc\vclcanvas.component %_DEST%\xml%_EXT%\vclcanvas.component
Modified: openoffice/branches/gbuild-reintegration/main/canvas/source/factory/cf_service.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/source/factory/cf_service.cxx?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/source/factory/cf_service.cxx (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/source/factory/cf_service.cxx Thu Mar 10 23:22:59 2016
@@ -522,13 +522,13 @@ const ::cppu::ImplementationEntry s_entr
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 )
Modified: openoffice/branches/gbuild-reintegration/main/canvas/source/tools/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/canvas/source/tools/makefile.mk?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/canvas/source/tools/makefile.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/canvas/source/tools/makefile.mk Thu Mar 10 23:22:59 2016
@@ -26,6 +26,7 @@ PRJ=..$/..
PRJNAME=canvas
TARGET=canvastools
ENABLE_EXCEPTIONS=TRUE
+LIBTARGET=NO
# --- Settings -----------------------------------------------------------
@@ -40,10 +41,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 \
@@ -60,28 +74,11 @@ SLOFILES = \
$(SLO)$/page.obj \
$(SLO)$/verifyinput.obj
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB= i$(TARGET)
-SHL1STDLIBS= $(SALLIB) $(CPPULIB) $(BASEGFXLIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(VCLLIB) $(TKLIB) $(TOOLSLIB)
+SHL1OBJS= $(SLOFILES)
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-
-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 > $@
Modified: openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk Thu Mar 10 23:22:59 2016
@@ -63,11 +63,13 @@ my_components = \
bib \
cached1 \
calc \
- canvasfactory \
chartcontroller \
chartmodel \
charttools \
chartview \
+ component/canvas/source/factory/canvasfactory \
+ component/canvas/source/simplecanvas/simplecanvas \
+ component/canvas/source/vcl/vclcanvas \
component/comphelper/util/comphelp \
component/cui/util/cui \
component/drawinglayer/drawinglayer \
@@ -163,7 +165,6 @@ my_components = \
sdbc2 \
sdbt \
sdd \
- simplecanvas \
slideshow \
spl \
srtrs1 \
@@ -187,7 +188,6 @@ my_components = \
uui \
vbaevents \
vbaobj \
- vclcanvas \
xmlfa \
xmlfd \
xmx \
@@ -244,7 +244,7 @@ my_components += emboleobj
.END
.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
-my_components += cairocanvas
+my_components += component/canvas/source/cairo/cairocanvas
.END
.IF "$(ENABLE_GCONF)" != ""
@@ -351,12 +351,12 @@ my_components += \
.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
my_components += \
avmediawin \
- directx9canvas \
+ component/canvas/source/directx/directx9canvas \
component/canvas/source/directx/gdipluscanvas
.END
.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" && "$(USE_DIRECTX5)" != ""
-my_components += directx5canvas
+my_components += component/canvas/source/directx/directx5canvas
.END
.IF "$(OS)" == "LINUX" || "$(OS)" == "NETBSD" || \
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/freebsd.mk Thu Mar 10 23:22:59 2016
@@ -296,6 +296,10 @@ gb_Library_UNOEXT := .uno$(gb_Library_PL
endif
gb_Library_PLAINLIBS_NONE += \
+ cairo \
+ fontconfig \
+ Xrender \
+ pixman-1 \
dl \
freetype \
jpeg \
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/linux.mk Thu Mar 10 23:22:59 2016
@@ -279,6 +279,10 @@ gb_Library_UNOEXT := .uno$(gb_Library_PL
endif
gb_Library_PLAINLIBS_NONE += \
+ cairo \
+ fontconfig \
+ Xrender \
+ pixman-1 \
dl \
freetype \
jpeg \
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/windows.mk Thu Mar 10 23:22:59 2016
@@ -76,7 +76,6 @@ gb_CFLAGS := \
-GR \
-Gs \
-GS \
- -Gy \
-nologo \
-Wall \
-wd4005 \
@@ -453,6 +452,10 @@ gb_Library_PLAINEXT := .lib
gb_Library_PLAINLIBS_NONE += \
advapi32 \
+ cairo \
+ d3d9 \
+ d3dx \
+ ddraw \
gdi32 \
gdiplus \
gnu_getopt \
@@ -468,6 +471,7 @@ gb_Library_PLAINLIBS_NONE += \
user32 \
uuid \
uwinapi \
+ winmm \
winspool \
z
Modified: openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk?rev=1734481&r1=1734480&r2=1734481&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/gbuild/platform/winmingw.mk Thu Mar 10 23:22:59 2016
@@ -496,6 +496,7 @@ gb_Library_PLAINLIBS_NONE += \
user32 \
uuid \
uwinapi \
+ winmm \
winspool \
z