[Libreoffice-commits] .: cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 41c4585504f38a4b0eeb164f317ab71a7a742dd5 Author: Radek Doulik r...@novell.com Date: Wed Apr 18 19:17:11 2012 +0200 tune the guessed position a bit, so that it works better with test documents diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 88d281a..f0c272c 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -1512,7 +1512,7 @@ namespace cppcanvas TextActionFactory::createTextAction( // position is just rough guess for now // we should calculate it exactly from layoutRect or font -::vcl::unotools::pointFromB2DPoint ( Map( lx + 0.35*cellSize, ly + cellSize ) ), +::vcl::unotools::pointFromB2DPoint ( Map( lx + 0.15*cellSize, ly + cellSize ) ), ::Size(), ::Color(), ::Size(), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit e94e669bd3499827f19585b704e7c0ef4f21bd13 Author: Radek Doulik r...@novell.com Date: Fri Apr 13 16:24:25 2012 +0200 set minimal width if pen width is set to zero diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 8409d7f..0d8005c 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -608,7 +608,8 @@ namespace cppcanvas void SetStrokeAttributes (rendering::StrokeAttributes rStrokeAttributes, ImplRenderer rR, const OutDevState rState) { -rStrokeAttributes.StrokeWidth = (rState.mapModeTransform * rR.MapSize (width, 0)).getX (); +EMFP_DEBUG (if (width == 0.0) printf (EMF+\tTODO: pen with zero width - using minimal which might not be correct\n)); +rStrokeAttributes.StrokeWidth = (rState.mapModeTransform * rR.MapSize (width == 0.0 ? 0.05 : width, 0)).getX (); } void Read (SvStream s, ImplRenderer rR, sal_Int32, sal_Int32 ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppcanvas/source
cppcanvas/source/inc/action.hxx |4 - cppcanvas/source/mtfrenderer/bitmapaction.cxx| 20 ++--- cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx |4 - cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx |4 - cppcanvas/source/mtfrenderer/implrenderer.cxx|4 - cppcanvas/source/mtfrenderer/lineaction.cxx |8 +- cppcanvas/source/mtfrenderer/pointaction.cxx |8 +- cppcanvas/source/mtfrenderer/polypolyaction.cxx | 60 ++- cppcanvas/source/mtfrenderer/rendergraphicaction.cxx | 20 ++--- cppcanvas/source/mtfrenderer/textaction.cxx | 50 ++-- cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 14 +-- 11 files changed, 93 insertions(+), 103 deletions(-) New commits: commit 66aed6f470c795f172fa85b89ae9d25c76eb38bd Author: Tor Lillqvist t...@iki.fi Date: Wed Apr 4 06:55:01 2012 +0300 New try to sort out the overloaded virtual method weirdness Revert Clang WaE: -Woverloaded-virtual weirdness, this seems to help as that broke tinderboxes. Try another way instead, renaming two versions of the overloaded render() method, so that there is no longer any overloading. Compiles -Werror-clean with Clang, hopefully no problem with other compilers either. This reverts commit 86b99ab408c7235604a1a02d7bc531fe5d5f97f6. diff --git a/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx index 971cfcb..c961f82 100644 --- a/cppcanvas/source/inc/action.hxx +++ b/cppcanvas/source/inc/action.hxx @@ -114,8 +114,8 @@ namespace cppcanvas specified subset is invalid for this action, or if rendering failed for other reasons, false is returned. */ -virtual bool render( const ::basegfx::B2DHomMatrix rTransformation, - const Subset rSubset ) const = 0; +virtual bool renderSubset( const ::basegfx::B2DHomMatrix rTransformation, + const Subset rSubset ) const = 0; /** Query bounds of this action on the associated canvas diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx index 39f240a..83e7a0a 100644 --- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx +++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx @@ -60,8 +60,6 @@ namespace cppcanvas class BitmapAction : public CachedPrimitiveBase { public: -using CachedPrimitiveBase::render; - BitmapAction( const ::BitmapEx, const ::basegfx::B2DPoint rDstPoint, const CanvasSharedPtr, @@ -72,8 +70,8 @@ namespace cppcanvas const CanvasSharedPtr, const OutDevState ); -virtual bool render( const ::basegfx::B2DHomMatrix rTransformation, - const Subset rSubset ) const; +virtual bool renderSubset( const ::basegfx::B2DHomMatrix rTransformation, + const Subset rSubset ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix rTransformation ) const; virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix rTransformation, @@ -83,8 +81,8 @@ namespace cppcanvas private: using Action::render; -virtual bool render( uno::Reference rendering::XCachedPrimitive rCachedPrimitive, - const ::basegfx::B2DHomMatrix rTransformation ) const; +virtual bool renderPrimitive( uno::Reference rendering::XCachedPrimitive rCachedPrimitive, + const ::basegfx::B2DHomMatrix rTransformation ) const; uno::Reference rendering::XBitmap mxBitmap; CanvasSharedPtr mpCanvas; @@ -152,10 +150,10 @@ namespace cppcanvas NULL ); } -bool BitmapAction::render( uno::Reference rendering::XCachedPrimitive rCachedPrimitive, - const ::basegfx::B2DHomMatrix rTransformation ) const +bool BitmapAction::renderPrimitive( uno::Reference rendering::XCachedPrimitive rCachedPrimitive, +const ::basegfx::B2DHomMatrix rTransformation ) const { -RTL_LOGFILE_CONTEXT( aLog, ::cppcanvas::internal::BitmapAction::render() ); +RTL_LOGFILE_CONTEXT( aLog,
[Libreoffice-commits] .: cppcanvas/source hwpfilter/source Mesa/inc np_sdk/inc sal/inc sal/osl slideshow/source svl/inc sw/inc
Mesa/inc/gl.h |2 +- cppcanvas/source/mtfrenderer/textaction.cxx|5 + cppcanvas/source/uno/uno_mtfrenderer.cxx |6 -- hwpfilter/source/grammar.cxx |6 ++ np_sdk/inc/npapi.h |2 +- np_sdk/inc/npfunctions.h |3 +-- np_sdk/inc/nptypes.h | 10 -- sal/inc/sal/types.h|4 ++-- sal/osl/unx/file_stat.cxx |8 sal/osl/unx/process_impl.cxx |2 +- sal/osl/unx/system.h |3 --- slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm |6 -- slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx |6 -- slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx |8 +--- slideshow/source/engine/slideshowimpl.cxx |8 +--- svl/inc/svl/svarray.hxx|4 ++-- sw/inc/fmtfollowtextflow.hxx |4 17 files changed, 13 insertions(+), 74 deletions(-) New commits: commit 8963cc01f5267f3afc4e4a4ff5a65a67520f447b Author: Alexander Bergmann myadd...@gmx.de Date: Thu Feb 9 13:15:27 2012 +0100 EasyHack: Removed gcc conditionals diff --git a/Mesa/inc/gl.h b/Mesa/inc/gl.h index b427637..4945c03 100644 --- a/Mesa/inc/gl.h +++ b/Mesa/inc/gl.h @@ -62,7 +62,7 @@ #elif defined(__CYGWIN__) defined(USE_OPENGL32) /* use native windows opengl32 */ # define GLAPI extern # define GLAPIENTRY __stdcall -#elif defined(__GNUC__) (__GNUC__ * 100 + __GNUC_MINOR__) = 303 +#elif defined(__GNUC__) # define GLAPI __attribute__((visibility(default))) # define GLAPIENTRY #endif /* WIN32 !CYGWIN */ diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index 71c29ca..d6da081 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -2284,12 +2284,9 @@ namespace cppcanvas rState ) ); } } -#if defined __GNUC__ -#if __GNUC__ == 4 -// Unreachable; to avoid bogus warning: +#if defined(__GNUC__) return ActionSharedPtr(); #endif -#endif } } } diff --git a/cppcanvas/source/uno/uno_mtfrenderer.cxx b/cppcanvas/source/uno/uno_mtfrenderer.cxx index 596b5e7..dacaeab 100644 --- a/cppcanvas/source/uno/uno_mtfrenderer.cxx +++ b/cppcanvas/source/uno/uno_mtfrenderer.cxx @@ -66,14 +66,8 @@ MtfRenderer::MtfRenderer (uno::Sequenceuno::Any const aArgs, uno::Referenceu } namespace sdecl = comphelper::service_decl; -#if defined (__GNUC__) (__GNUC__ == 3 __GNUC_MINOR__ = 3) - sdecl::class_MtfRenderer, sdecl::with_argstrue serviceImpl; - const sdecl::ServiceDecl MtfRendererDecl( - serviceImpl, -#else const sdecl::ServiceDecl MtfRendererDecl( sdecl::class_MtfRenderer, sdecl::with_argstrue (), -#endif com.sun.star.comp.rendering.MtfRenderer, com.sun.star.rendering.MtfRenderer ); diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx index 2afc1d8..2285aab 100644 --- a/hwpfilter/source/grammar.cxx +++ b/hwpfilter/source/grammar.cxx @@ -539,11 +539,9 @@ int yydebug;/* nonzero means print parse trace */ definitions require. With GCC, __builtin_memcpy takes an arg of type size_t, but it can handle unsigned int. */ -#if defined __GNUC__ -#if __GNUC__ 1/* GNU C and GNU C++ define this. */ +#if defined(__GNUC__) #define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) -#endif -#else /* not GNU C or C++ */ +#else #ifndef __cplusplus /* This is the most reliable way to avoid incompatibilities diff --git a/np_sdk/inc/npapi.h b/np_sdk/inc/npapi.h index d67dcd3..7db9981 100644 --- a/np_sdk/inc/npapi.h +++ b/np_sdk/inc/npapi.h @@ -310,7 +310,7 @@ typedef enum { * gcc 3.x generated vtables on UNIX and OSX are incompatible with * previous compilers. */ -#if (defined(XP_UNIX) defined(__GNUC__) (__GNUC__ = 3)) +#if defined(XP_UNIX) defined(__GNUC__) #define _NP_ABI_MIXIN_FOR_GCC3 NP_ABI_GCC3_MASK #else #define _NP_ABI_MIXIN_FOR_GCC3 0 diff --git a/np_sdk/inc/npfunctions.h b/np_sdk/inc/npfunctions.h index abc1473..90faa3c 100644 --- a/np_sdk/inc/npfunctions.h +++ b/np_sdk/inc/npfunctions.h @@ -247,8 +247,7 @@ typedef OSErr (*BP_GetSupportedMIMETypesProcPtr)(BPSupportedMIMETypes*, UInt32); #endif #if defined(XP_UNIX) -/* GCC 3.3 and later support the visibility attribute. */ -#if defined(__GNUC__) ((__GNUC__ = 4) || (__GNUC__ == 3
[Libreoffice-commits] .: cppcanvas/source
cppcanvas/source/mtfrenderer/textaction.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 946090359b231f55e2498dcfe4fff7294c2b9504 Author: Stephan Bergmann sberg...@redhat.com Date: Sat Oct 8 23:46:03 2011 +0200 Added the unreachable code back in, even for GCC 4.0, so Mac OS X would not fail. diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index 2e0f78a..4fd78a9 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -2286,6 +2286,12 @@ namespace cppcanvas rState ) ); } } +#if defined __GNUC__ +#if __GNUC__ == 4 +// Unreachable; to avoid bogus warning: +return ActionSharedPtr(); +#endif +#endif } } } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits