remvove vos/macros.h usage
This commit is contained in:
parent
c21186c38d
commit
854ff7bfc8
9 changed files with 23 additions and 31 deletions
|
@ -36,7 +36,6 @@
|
|||
#endif
|
||||
#include <osl/mutex.hxx>
|
||||
#include <osl/diagnose.h>
|
||||
#include <vos/macros.hxx>
|
||||
#include <comphelper/eventattachermgr.hxx>
|
||||
#include <com/sun/star/beans/XIntrospection.hpp>
|
||||
#include <com/sun/star/io/XObjectInputStream.hpp>
|
||||
|
|
|
@ -36,7 +36,6 @@
|
|||
#if defined(_MSC_VER) && (_MSC_VER<1200)
|
||||
#include <tools/postsys.h>
|
||||
#endif
|
||||
#include <vos/macros.hxx>
|
||||
|
||||
#include <string.h>
|
||||
#include <osl/endian.h>
|
||||
|
@ -56,7 +55,7 @@ typedef std::hash_map
|
|||
INT32,
|
||||
StgPage *,
|
||||
std::hash< INT32 >,
|
||||
NAMESPACE_STD(equal_to)< INT32 >
|
||||
std::equal_to< INT32 >
|
||||
> UsrStgPagePtr_Impl;
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning( disable: 4786 )
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
|
||||
#include <list>
|
||||
|
||||
#include <vos/macros.hxx>
|
||||
#include <osl/mutex.hxx>
|
||||
|
||||
#include <vcl/svapp.hxx>
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
// MARKER(update_precomp.py): autogen include statement, do not remove
|
||||
#include "precompiled_svtools.hxx"
|
||||
|
||||
#include <vos/macros.hxx>
|
||||
#include <vcl/bmpacc.hxx>
|
||||
#include <tools/poly.hxx>
|
||||
#include <vcl/outdev.hxx>
|
||||
|
|
|
@ -87,7 +87,6 @@
|
|||
#include "sys/stat.h"
|
||||
#include "sys/types.h"
|
||||
|
||||
#include "vos/macros.hxx"
|
||||
#include "osl/mutex.hxx"
|
||||
#include "vos/process.hxx"
|
||||
//---MARKER---
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
#include "precompiled_tools.hxx"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <vos/macros.hxx>
|
||||
#include <tools/color.hxx>
|
||||
#include <tools/debug.hxx>
|
||||
#include <tools/stream.hxx>
|
||||
|
@ -89,18 +88,18 @@ UINT8 Color::GetColorError( const Color& rCompareColor ) const
|
|||
|
||||
void Color::IncreaseLuminance( UINT8 cLumInc )
|
||||
{
|
||||
SetRed( (UINT8) VOS_BOUND( (long) COLORDATA_RED( mnColor ) + cLumInc, 0L, 255L ) );
|
||||
SetGreen( (UINT8) VOS_BOUND( (long) COLORDATA_GREEN( mnColor ) + cLumInc, 0L, 255L ) );
|
||||
SetBlue( (UINT8) VOS_BOUND( (long) COLORDATA_BLUE( mnColor ) + cLumInc, 0L, 255L ) );
|
||||
SetRed( (UINT8) SAL_BOUND( (long) COLORDATA_RED( mnColor ) + cLumInc, 0L, 255L ) );
|
||||
SetGreen( (UINT8) SAL_BOUND( (long) COLORDATA_GREEN( mnColor ) + cLumInc, 0L, 255L ) );
|
||||
SetBlue( (UINT8) SAL_BOUND( (long) COLORDATA_BLUE( mnColor ) + cLumInc, 0L, 255L ) );
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
void Color::DecreaseLuminance( UINT8 cLumDec )
|
||||
{
|
||||
SetRed( (UINT8) VOS_BOUND( (long) COLORDATA_RED( mnColor ) - cLumDec, 0L, 255L ) );
|
||||
SetGreen( (UINT8) VOS_BOUND( (long) COLORDATA_GREEN( mnColor ) - cLumDec, 0L, 255L ) );
|
||||
SetBlue( (UINT8) VOS_BOUND( (long) COLORDATA_BLUE( mnColor ) - cLumDec, 0L, 255L ) );
|
||||
SetRed( (UINT8) SAL_BOUND( (long) COLORDATA_RED( mnColor ) - cLumDec, 0L, 255L ) );
|
||||
SetGreen( (UINT8) SAL_BOUND( (long) COLORDATA_GREEN( mnColor ) - cLumDec, 0L, 255L ) );
|
||||
SetBlue( (UINT8) SAL_BOUND( (long) COLORDATA_BLUE( mnColor ) - cLumDec, 0L, 255L ) );
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
@ -112,9 +111,9 @@ void Color::IncreaseContrast( UINT8 cContInc )
|
|||
const double fM = 128.0 / ( 128.0 - 0.4985 * cContInc );
|
||||
const double fOff = 128.0 - fM * 128.0;
|
||||
|
||||
SetRed( (UINT8) VOS_BOUND( _FRound( COLORDATA_RED( mnColor ) * fM + fOff ), 0L, 255L ) );
|
||||
SetGreen( (UINT8) VOS_BOUND( _FRound( COLORDATA_GREEN( mnColor ) * fM + fOff ), 0L, 255L ) );
|
||||
SetBlue( (UINT8) VOS_BOUND( _FRound( COLORDATA_BLUE( mnColor ) * fM + fOff ), 0L, 255L ) );
|
||||
SetRed( (UINT8) SAL_BOUND( _FRound( COLORDATA_RED( mnColor ) * fM + fOff ), 0L, 255L ) );
|
||||
SetGreen( (UINT8) SAL_BOUND( _FRound( COLORDATA_GREEN( mnColor ) * fM + fOff ), 0L, 255L ) );
|
||||
SetBlue( (UINT8) SAL_BOUND( _FRound( COLORDATA_BLUE( mnColor ) * fM + fOff ), 0L, 255L ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -127,9 +126,9 @@ void Color::DecreaseContrast( UINT8 cContDec )
|
|||
const double fM = ( 128.0 - 0.4985 * cContDec ) / 128.0;
|
||||
const double fOff = 128.0 - fM * 128.0;
|
||||
|
||||
SetRed( (UINT8) VOS_BOUND( _FRound( COLORDATA_RED( mnColor ) * fM + fOff ), 0L, 255L ) );
|
||||
SetGreen( (UINT8) VOS_BOUND( _FRound( COLORDATA_GREEN( mnColor ) * fM + fOff ), 0L, 255L ) );
|
||||
SetBlue( (UINT8) VOS_BOUND( _FRound( COLORDATA_BLUE( mnColor ) * fM + fOff ), 0L, 255L ) );
|
||||
SetRed( (UINT8) SAL_BOUND( _FRound( COLORDATA_RED( mnColor ) * fM + fOff ), 0L, 255L ) );
|
||||
SetGreen( (UINT8) SAL_BOUND( _FRound( COLORDATA_GREEN( mnColor ) * fM + fOff ), 0L, 255L ) );
|
||||
SetBlue( (UINT8) SAL_BOUND( _FRound( COLORDATA_BLUE( mnColor ) * fM + fOff ), 0L, 255L ) );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -57,16 +57,16 @@ static bool bLoggerStarted = false;
|
|||
|
||||
sal_uInt32 GetCommandLineParamCount()
|
||||
{
|
||||
NAMESPACE_VOS( OStartupInfo ) aStartInfo;
|
||||
vos::OStartupInfo aStartInfo;
|
||||
return aStartInfo.getCommandArgCount();
|
||||
}
|
||||
|
||||
String GetCommandLineParam( sal_uInt32 nParam )
|
||||
{
|
||||
NAMESPACE_VOS( OStartupInfo ) aStartInfo;
|
||||
vos::OStartupInfo aStartInfo;
|
||||
::rtl::OUString aParam;
|
||||
NAMESPACE_VOS( OStartupInfo )::TStartupError eError = aStartInfo.getCommandArg( nParam, aParam );
|
||||
if ( eError == NAMESPACE_VOS( OStartupInfo )::E_None )
|
||||
vos::OStartupInfo::TStartupError eError = aStartInfo.getCommandArg( nParam, aParam );
|
||||
if ( eError == vos::OStartupInfo::E_None )
|
||||
return String( aParam );
|
||||
else
|
||||
{
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
#include "precompiled_vcl.hxx"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <vos/macros.hxx>
|
||||
#include <vcl/bmpacc.hxx>
|
||||
#include <vcl/bitmap.hxx>
|
||||
|
||||
|
@ -475,7 +474,7 @@ BOOL Bitmap::ImplSobelGrey( const BmpFilterParam* /*pFilterParam*/, const Link*
|
|||
nSum2 += nMask332 * nGrey33;
|
||||
|
||||
nSum1 = (long) sqrt( (double)( nSum1 * nSum1 + nSum2 * nSum2 ) );
|
||||
aGrey.SetIndex( ~(BYTE) VOS_BOUND( nSum1, 0, 255 ) );
|
||||
aGrey.SetIndex( ~(BYTE) SAL_BOUND( nSum1, 0, 255 ) );
|
||||
pWriteAcc->SetPixel( nY, nX, aGrey );
|
||||
|
||||
if( nX < ( nWidth - 1 ) )
|
||||
|
@ -550,7 +549,7 @@ BOOL Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* /*p
|
|||
const long nLz = FRound( sin( fElev ) * 255.0 );
|
||||
const long nZ2 = ( ( 6 * 255 ) / 4 ) * ( ( 6 * 255 ) / 4 );
|
||||
const long nNzLz = ( ( 6 * 255 ) / 4 ) * nLz;
|
||||
const BYTE cLz = (BYTE) VOS_BOUND( nLz, 0, 255 );
|
||||
const BYTE cLz = (BYTE) SAL_BOUND( nLz, 0, 255 );
|
||||
|
||||
// fill mapping tables
|
||||
pHMap[ 0 ] = 0;
|
||||
|
@ -587,7 +586,7 @@ BOOL Bitmap::ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* /*p
|
|||
else
|
||||
{
|
||||
const double fGrey = nDotL / sqrt( (double)(nNx * nNx + nNy * nNy + nZ2) );
|
||||
aGrey.SetIndex( (BYTE) VOS_BOUND( fGrey, 0, 255 ) );
|
||||
aGrey.SetIndex( (BYTE) SAL_BOUND( fGrey, 0, 255 ) );
|
||||
}
|
||||
|
||||
pWriteAcc->SetPixel( nY, nX, aGrey );
|
||||
|
@ -688,7 +687,7 @@ BOOL Bitmap::ImplSepia( const BmpFilterParam* pFilterParam, const Link* /*pProgr
|
|||
{
|
||||
long nSepiaPercent = ( pFilterParam && pFilterParam->meFilter == BMP_FILTER_SEPIA ) ?
|
||||
pFilterParam->mcSolarGreyThreshold : 10;
|
||||
const long nSepia = 10000 - 100 * VOS_BOUND( nSepiaPercent, 0, 100 );
|
||||
const long nSepia = 10000 - 100 * SAL_BOUND( nSepiaPercent, 0, 100 );
|
||||
BitmapPalette aSepiaPal( 256 );
|
||||
|
||||
DBG_ASSERT( nSepiaPercent <= 100, "Bitmap::ImplSepia(): sepia value out of range; defaulting to 100%" );
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
|
||||
// MARKER(update_precomp.py): autogen include statement, do not remove
|
||||
#include "precompiled_vcl.hxx"
|
||||
#include <vos/macros.hxx>
|
||||
#include <rtl/crc.h>
|
||||
#include <tools/stream.hxx>
|
||||
#include <tools/vcompat.hxx>
|
||||
|
@ -957,12 +956,12 @@ BOOL GDIMetaFile::Mirror( ULONG nMirrorFlags )
|
|||
BOOL bRet;
|
||||
|
||||
if( nMirrorFlags & MTF_MIRROR_HORZ )
|
||||
nMoveX = VOS_ABS( aOldPrefSize.Width() ) - 1, fScaleX = -1.0;
|
||||
nMoveX = SAL_ABS( aOldPrefSize.Width() ) - 1, fScaleX = -1.0;
|
||||
else
|
||||
nMoveX = 0, fScaleX = 1.0;
|
||||
|
||||
if( nMirrorFlags & MTF_MIRROR_VERT )
|
||||
nMoveY = VOS_ABS( aOldPrefSize.Height() ) - 1, fScaleY = -1.0;
|
||||
nMoveY = SAL_ABS( aOldPrefSize.Height() ) - 1, fScaleY = -1.0;
|
||||
else
|
||||
nMoveY = 0, fScaleY = 1.0;
|
||||
|
||||
|
|
Loading…
Reference in a new issue