Author: damjan
Date: Mon Mar 7 03:46:54 2016
New Revision: 1733865
URL: http://svn.apache.org/viewvc?rev=1733865&view=rev
Log:
Merge r1409510 from branches/gbuild:
CWS gnumake4: some fixes for basegfx+canvas
BUILDS
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dpoint.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b2drange.hxx
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tuple/b2dtuple.hxx
openoffice/branches/gbuild-reintegration/main/cppcanvas/Library_cppcanvas.mk
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 7 03:46:54 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409508
+/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409510
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dpoint.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dpoint.hxx?rev=1733865&r1=1733864&r2=1733865&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dpoint.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/point/b2dpoint.hxx
Mon Mar 7 03:46:54 2016
@@ -43,7 +43,7 @@ namespace basegfx
@see B2DTuple
*/
- class BASEGFX_DLLPUBLIC B2DPoint : public ::basegfx::B2DTuple
+ class B2DPoint : public ::basegfx::B2DTuple
{
public:
/** Create a 2D Point
@@ -117,14 +117,14 @@ namespace basegfx
/** assignment operator to allow assigning the results
of B2DTuple calculations
*/
- B2DPoint& operator=( const ::basegfx::B2DTuple& rPoint );
+ BASEGFX_DLLPUBLIC B2DPoint& operator=( const
::basegfx::B2DTuple& rPoint );
/** Transform point by given transformation matrix.
The translational components of the matrix are, in
contrast to B2DVector, applied.
*/
- B2DPoint& operator*=( const ::basegfx::B2DHomMatrix& rMat );
+ BASEGFX_DLLPUBLIC B2DPoint& operator*=( const
::basegfx::B2DHomMatrix& rMat );
static const B2DPoint& getEmptyPoint()
{
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b2drange.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b2drange.hxx?rev=1733865&r1=1733864&r2=1733865&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b2drange.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/range/b2drange.hxx
Mon Mar 7 03:46:54 2016
@@ -38,7 +38,7 @@ namespace basegfx
class B2IRange;
class B2DHomMatrix;
- class BASEGFX_DLLPUBLIC B2DRange
+ class B2DRange
{
public:
typedef double ValueType;
@@ -79,7 +79,7 @@ namespace basegfx
{
}
- explicit B2DRange(const B2IRange& rRange);
+ BASEGFX_DLLPUBLIC explicit B2DRange(const B2IRange& rRange);
bool isEmpty() const
{
@@ -248,7 +248,7 @@ namespace basegfx
maRangeY.grow(fValue);
}
- void transform(const B2DHomMatrix& rMatrix);
+ BASEGFX_DLLPUBLIC void transform(const B2DHomMatrix& rMatrix);
private:
typedef ::basegfx::BasicRange< ValueType, TraitsType > MyBasicRange;
Modified:
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tuple/b2dtuple.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tuple/b2dtuple.hxx?rev=1733865&r1=1733864&r2=1733865&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tuple/b2dtuple.hxx
(original)
+++
openoffice/branches/gbuild-reintegration/main/basegfx/inc/basegfx/tuple/b2dtuple.hxx
Mon Mar 7 03:46:54 2016
@@ -43,7 +43,7 @@ namespace basegfx
@derive Use this class to implement Points or Vectors
which are based on two double values
*/
- class BASEGFX_DLLPUBLIC B2DTuple
+ class B2DTuple
{
protected:
double
mfX;
@@ -89,7 +89,7 @@ namespace basegfx
@param rTup
The 2D Tuple which will be copied.
*/
- explicit B2DTuple(const B2ITuple& rTup);
+ BASEGFX_DLLPUBLIC explicit B2DTuple(const B2ITuple& rTup);
~B2DTuple()
{}
@@ -235,9 +235,9 @@ namespace basegfx
return *this;
}
- void correctValues(const double fCompareValue = 0.0);
+ BASEGFX_DLLPUBLIC void correctValues(const double fCompareValue
= 0.0);
- static const B2DTuple& getEmptyTuple();
+ BASEGFX_DLLPUBLIC static const B2DTuple& getEmptyTuple();
};
// external operators
Modified:
openoffice/branches/gbuild-reintegration/main/cppcanvas/Library_cppcanvas.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/cppcanvas/Library_cppcanvas.mk?rev=1733865&r1=1733864&r2=1733865&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/cppcanvas/Library_cppcanvas.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/cppcanvas/Library_cppcanvas.mk
Mon Mar 7 03:46:54 2016
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,cppcanv
$(eval $(call gb_Library_add_package_headers,cppcanvas,cppcanvas_inc))
-$(eval $(call
gb_Library_add_precompiled_header,cppcanvas,$(SRCDIR)/cppcanvas/inc/precompiled_cppcanvas))
+$(eval $(call
gb_Library_add_precompiled_header,cppcanvas,$(SRCDIR)/cppcanvas/inc/pch/precompiled_cppcanvas))
$(eval $(call gb_Library_add_api,cppcanvas,\
udkapi \
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=1733865&r1=1733864&r2=1733865&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
(original)
+++
openoffice/branches/gbuild-reintegration/main/postprocess/packcomponents/makefile.mk
Mon Mar 7 03:46:54 2016
@@ -352,7 +352,7 @@ my_components += \
my_components += \
avmediawin \
directx9canvas \
- gdipluscanvas
+ component/canvas/source/directx/gdipluscanvas
.END
.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" && "$(USE_DIRECTX5)" != ""
