From af5ebbf7835441c767f91a620f109ee6722e57bd Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 6 Oct 2014 14:48:16 +0200 Subject: create a macro library for implementing bit-flags types Signed-off-by: Stephan Bergmann , changed from a macro- to a template-based solution. (Unfortunately MSVC 2012 does not support explicit conversion operators. Worked around that with explicit #ifs rather than some HAVE_EXPLICIT_CONVERSION_OPERATORS and SAL_EXPLICIT_CONVERSION_OPERATOR ainticipating we hopefully soon move to a baseline that requires unconditional support for them.) Change-Id: I4a89643b218d247e8e4a861faba458ec6dfe1396 --- sw/source/core/txtnode/fntcache.cxx | 2 +- sw/source/core/txtnode/fntcap.cxx | 2 +- sw/source/core/txtnode/swfont.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sw/source/core/txtnode') diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index f3b648bc2af0..c7216d1e190c 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -868,7 +868,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) ! rInf.IsIgnoreFrmRTL(); const ComplexTextLayoutMode nMode = rInf.GetOut().GetLayoutMode(); const bool bBidiPor = ( bSwitchL2R != - ( 0 != ( TEXT_LAYOUT_BIDI_RTL & nMode ) ) ); + ( TEXT_LAYOUT_DEFAULT != ( TEXT_LAYOUT_BIDI_RTL & nMode ) ) ); // be sure to have the correct layout mode at the printer if ( pPrinter ) diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 92d7d7e8035c..4dd6e4099c10 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -284,7 +284,7 @@ void SwDoDrawCapital::DrawSpace( Point &rPos ) const ComplexTextLayoutMode nMode = rInf.GetpOut()->GetLayoutMode(); const bool bBidiPor = ( bSwitchL2R != - ( 0 != ( TEXT_LAYOUT_BIDI_RTL & nMode ) ) ); + ( TEXT_LAYOUT_DEFAULT != ( TEXT_LAYOUT_BIDI_RTL & nMode ) ) ); if ( bBidiPor ) nDiff = -nDiff; diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index 24afd66d7d7c..3975cc371518 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1481,7 +1481,7 @@ void SwDrawTextInfo::Shift( sal_uInt16 nDir ) #endif const bool bBidiPor = ( GetFrm() && GetFrm()->IsRightToLeft() ) != - ( 0 != ( TEXT_LAYOUT_BIDI_RTL & GetpOut()->GetLayoutMode() ) ); + ( TEXT_LAYOUT_DEFAULT != ( TEXT_LAYOUT_BIDI_RTL & GetpOut()->GetLayoutMode() ) ); nDir = bBidiPor ? 1800 : -- cgit v1.2.3