Author: damjan
Date: Sun Mar 6 13:04:10 2016
New Revision: 1733806
URL: http://svn.apache.org/viewvc?rev=1733806&view=rev
Log:
Merge r1409499 from branches/gbuild.
Also fix library naming for ucbhelper.
Build updates by: me
Added:
openoffice/branches/gbuild-reintegration/main/cppcanvas/Library_cppcanvas.mk
- copied unchanged from r1409499,
incubator/ooo/branches/gbuild/main/cppcanvas/Library_cppcanvas.mk
openoffice/branches/gbuild-reintegration/main/cppcanvas/Makefile
- copied unchanged from r1409499,
incubator/ooo/branches/gbuild/main/cppcanvas/Makefile
openoffice/branches/gbuild-reintegration/main/cppcanvas/Module_cppcanvas.mk
- copied unchanged from r1409499,
incubator/ooo/branches/gbuild/main/cppcanvas/Module_cppcanvas.mk
openoffice/branches/gbuild-reintegration/main/cppcanvas/Package_inc.mk
- copied unchanged from r1409499,
incubator/ooo/branches/gbuild/main/cppcanvas/Package_inc.mk
openoffice/branches/gbuild-reintegration/main/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
- copied unchanged from r1409499,
incubator/ooo/branches/gbuild/main/cppcanvas/inc/cppcanvas/cppcanvasdllapi.h
openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/makefile.mk
- copied unchanged from r1409499,
incubator/ooo/branches/gbuild/main/cppcanvas/prj/makefile.mk
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/Module_ooo.mk
openoffice/branches/gbuild-reintegration/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
openoffice/branches/gbuild-reintegration/main/cppcanvas/inc/cppcanvas/vclfactory.hxx
openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/build.lst
openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/d.lst
openoffice/branches/gbuild-reintegration/main/solenv/inc/libs.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 6 13:04:10 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495
+/incubator/ooo/branches/gbuild:1409313-1409495,1409499
/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=1733806&r1=1733805&r2=1733806&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/Module_ooo.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/Module_ooo.mk Sun Mar 6
13:04:10 2016
@@ -25,6 +25,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
comphelper \
+ cppcanvas \
drawinglayer \
editeng \
framework \
Modified:
openoffice/branches/gbuild-reintegration/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx?rev=1733806&r1=1733805&r2=1733806&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
Sun Mar 6 13:04:10 2016
@@ -34,6 +34,7 @@
#include <cppcanvas/sprite.hxx>
#include <basegfx/vector/b2isize.hxx>
+#include <cppcanvas/cppcanvasdllapi.h>
namespace basegfx
{
@@ -58,7 +59,7 @@ namespace cppcanvas
only be drawn on exactly that canvas. You have to regenerate
them for different canvases.
*/
- class BaseGfxFactory
+ class CPPCANVAS_DLLPUBLIC BaseGfxFactory
{
public:
static BaseGfxFactory& getInstance();
Modified:
openoffice/branches/gbuild-reintegration/main/cppcanvas/inc/cppcanvas/vclfactory.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/cppcanvas/inc/cppcanvas/vclfactory.hxx?rev=1733806&r1=1733805&r2=1733806&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/cppcanvas/inc/cppcanvas/vclfactory.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/cppcanvas/inc/cppcanvas/vclfactory.hxx
Sun Mar 6 13:04:10 2016
@@ -33,6 +33,7 @@
#include <cppcanvas/text.hxx>
#include <cppcanvas/sprite.hxx>
+#include <cppcanvas/cppcanvasdllapi.h>
class Window;
class Bitmap;
@@ -66,7 +67,7 @@ namespace cppcanvas
only be drawn on exactly that canvas. You have to regenerate
them for different canvases.
*/
- class VCLFactory
+ class CPPCANVAS_DLLPUBLIC VCLFactory
{
public:
static VCLFactory& getInstance();
Modified: openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/build.lst?rev=1733806&r1=1733805&r2=1733806&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/build.lst
(original)
+++ openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/build.lst Sun
Mar 6 13:04:10 2016
@@ -1,7 +1,2 @@
cx cppcanvas : comphelper cppuhelper offapi tools vcl basegfx
canvas NULL
-cx cppcanvas usr1
- all cx_mkout NULL
-cx cppcanvas\inc nmake -
all cx_inc NULL
-cx cppcanvas\source\tools nmake - all
cx_tools cx_inc NULL
-cx cppcanvas\source\wrapper nmake - all
cx_wrapper cx_inc NULL
-cx cppcanvas\source\mtfrenderer nmake - all
cx_mtfrenderer cx_inc NULL
-cx cppcanvas\util nmake -
all cx_util cx_tools cx_wrapper cx_mtfrenderer NULL
+cx cppcanvas\prj nmake -
all cx_prj NULL
Modified: openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/d.lst?rev=1733806&r1=1733805&r2=1733806&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/d.lst (original)
+++ openoffice/branches/gbuild-reintegration/main/cppcanvas/prj/d.lst Sun Mar
6 13:04:10 2016
@@ -1,20 +0,0 @@
-..\%__SRC%\bin\cppcanv*.dll %_DEST%\bin%_EXT%\cppcanv*.dll
-..\%__SRC%\lib\icppcanvas.lib %_DEST%\lib%_EXT%\icppcanvas.lib
-..\%__SRC%\lib\cppcanvas.lib %_DEST%\lib%_EXT%\cppcanvas.lib
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-
-mkdir: %_DEST%\inc%_EXT%\cppcanvas
-..\inc\cppcanvas\bitmap.hxx %_DEST%\inc%_EXT%\cppcanvas\bitmap.hxx
-..\inc\cppcanvas\bitmapcanvas.hxx %_DEST%\inc%_EXT%\cppcanvas\bitmapcanvas.hxx
-..\inc\cppcanvas\canvas.hxx %_DEST%\inc%_EXT%\cppcanvas\canvas.hxx
-..\inc\cppcanvas\canvasgraphic.hxx
%_DEST%\inc%_EXT%\cppcanvas\canvasgraphic.hxx
-..\inc\cppcanvas\color.hxx %_DEST%\inc%_EXT%\cppcanvas\color.hxx
-..\inc\cppcanvas\customsprite.hxx %_DEST%\inc%_EXT%\cppcanvas\customsprite.hxx
-..\inc\cppcanvas\font.hxx %_DEST%\inc%_EXT%\cppcanvas\font.hxx
-..\inc\cppcanvas\polypolygon.hxx %_DEST%\inc%_EXT%\cppcanvas\polypolygon.hxx
-..\inc\cppcanvas\renderer.hxx %_DEST%\inc%_EXT%\cppcanvas\renderer.hxx
-..\inc\cppcanvas\sprite.hxx %_DEST%\inc%_EXT%\cppcanvas\sprite.hxx
-..\inc\cppcanvas\spritecanvas.hxx %_DEST%\inc%_EXT%\cppcanvas\spritecanvas.hxx
-..\inc\cppcanvas\text.hxx %_DEST%\inc%_EXT%\cppcanvas\text.hxx
-..\inc\cppcanvas\vclfactory.hxx %_DEST%\inc%_EXT%\cppcanvas\vclfactory.hxx
-..\inc\cppcanvas\basegfxfactory.hxx
%_DEST%\inc%_EXT%\cppcanvas\basegfxfactory.hxx
Modified: openoffice/branches/gbuild-reintegration/main/solenv/inc/libs.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/solenv/inc/libs.mk?rev=1733806&r1=1733805&r2=1733806&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/solenv/inc/libs.mk (original)
+++ openoffice/branches/gbuild-reintegration/main/solenv/inc/libs.mk Sun Mar 6
13:04:10 2016
@@ -85,7 +85,7 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
.IF "$(GUI)"=="OS2"
UCBHELPERLIB=-lucbh$(UCBHELPER_MAJOR)
.ELSE
-UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
+UCBHELPERLIB=-lucbhelper$(COMID)
.ENDIF
.IF "$(SYSTEM_OPENSSL)" == "YES"
OPENSSLLIB=$(OPENSSL_LIBS)
