toolkit/prj/build.lst | 2 +- toolkit/source/awt/vclxtoolkit.cxx | 5 +++++ touch/prj/build.lst | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-)
New commits: commit ed880251bd250b5eeaa28501cbcf05cb13f69ac2 Author: Tor Lillqvist <[email protected]> Date: Mon Jun 18 23:04:48 2012 +0300 WaE: unused parameters Change-Id: I8dc4dadd3e26578500b555cdf850c3fb95bc1401 diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index e027b23..b3b6828 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -585,7 +585,12 @@ void SAL_CALL VCLXToolkit::disposing() ByteBufferWrapper *bbw = (ByteBufferWrapper *) (intptr_t) addressOfMemoryBufferForSharedArrayWrapper; pV->SetOutputSizePixelScaleOffsetAndBuffer( Size( Width, Height ), Fraction(ScaleNumerator, ScaleDenominator), Point( XOffset, YOffset), basebmp::RawMemorySharedArray( bbw->pointer(), *bbw )); #else + (void) ScaleNumerator; + (void) ScaleDenominator; + (void) XOffset; + (void) YOffset; OSL_FAIL( "rendering to a pre-allocated buffer not done yet for this OS" ); + pV->SetOutputSizePixel( Size( Width, Height ) ); #endif } else { pV->SetOutputSizePixel( Size( Width, Height ) ); commit 533092a738a00a226006cc9343f2a0d27a856b0a Author: Tor Lillqvist <[email protected]> Date: Mon Jun 18 23:01:49 2012 +0300 touch depends on sal, toolkit depends on touch Change-Id: I77e108391b48a9dc50491f8e76de8f277f92dfc6 diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst index e8a7b48..1db10f6 100644 --- a/toolkit/prj/build.lst +++ b/toolkit/prj/build.lst @@ -1,2 +1,2 @@ -ti toolkit : LIBXSLT:libxslt vcl QADEVOOO:qadevOOo test NULL +ti toolkit : LIBXSLT:libxslt vcl touch QADEVOOO:qadevOOo test NULL ti toolkit\prj nmake - all ti_prj NULL diff --git a/touch/prj/build.lst b/touch/prj/build.lst index dfe282b..113bee3 100644 --- a/touch/prj/build.lst +++ b/touch/prj/build.lst @@ -1,2 +1,2 @@ -th touch : sw sc NULL +th touch : sal NULL th touch\prj nmake - all th_prj NULL _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
