diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-11-10 15:06:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-11-10 15:06:12 +0000 |
| commit | 7f5f6b548d071d412efb78e9fee21d68ad6700bc (patch) | |
| tree | 49c7255c440b542ccffd5af0f72387afa34eaa43 /vcl/source | |
| parent | f00cc0b3ee98e5213707c04fe4e84bc8e4fa9932 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes50
2008-11-10 13:31:50 +0100 cmc r263517 : gio doesn't do anything useful for remote stuff wrt info
2008-11-06 00:11:47 +0100 cmc r263359 : #i93436# pile of other 64bit new gcc warnings
2008-11-05 00:39:03 +0100 cmc r263340 : i95856 let a ppc64 vanilla build succeed
2008-11-04 14:00:25 +0100 cmc r263320 : #i93436# useless const
2008-11-04 11:53:10 +0100 cmc r263314 : #i93436# ambiguous
2008-11-04 11:48:05 +0100 cmc r263313 : #i93436# add some braces
2008-11-04 11:29:24 +0100 cmc r263312 : #i93436# ambiguous
2008-11-04 10:53:46 +0100 cmc r263311 :
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/svmain.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/bitmap3.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/outmap.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/region.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index bc06fcb535d6..e1ca08cfbd65 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -300,7 +300,7 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM // SV bei den Tools anmelden InitTools(); - DBG_ASSERT( !pSVData->maAppData.mxMSF.is(), "VCL service factory already set" ) + DBG_ASSERT( !pSVData->maAppData.mxMSF.is(), "VCL service factory already set" ); pSVData->maAppData.mxMSF = rSMgr; // Main-Thread-Id merken diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 550477bbfc6e..5a65aac25d99 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -516,7 +516,7 @@ BOOL Bitmap::ImplMakeMonoDither() BOOL Bitmap::ImplMakeGreyscales( USHORT nGreys ) { - DBG_ASSERT( nGreys == 16 || nGreys == 256, "Only 16 or 256 greyscales are supported!" ) + DBG_ASSERT( nGreys == 16 || nGreys == 256, "Only 16 or 256 greyscales are supported!" ); BitmapReadAccess* pReadAcc = AcquireReadAccess(); BOOL bRet = FALSE; diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 6ff1cf8ac706..dfa346dbab05 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -987,11 +987,11 @@ void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) { if ( eOld > MAP_PIXEL ) { - DBG_ERRORFILE( "Not implemented MapUnit" ) + DBG_ERRORFILE( "Not implemented MapUnit" ); } else if ( eNew > MAP_PIXEL ) { - DBG_ERRORFILE( "Not implemented MapUnit" ) + DBG_ERRORFILE( "Not implemented MapUnit" ); } else { diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index fa9cf7d1fa54..fd14b5224206 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -223,7 +223,7 @@ ImplRegion::ImplRegion( const ImplRegion& rImplRegion ) ImplRegion::~ImplRegion() { DBG_ASSERT( (this != &aImplEmptyRegion) && (this != &aImplNullRegion), - "ImplRegion::~ImplRegion() - Empty oder NULL-Region" ) + "ImplRegion::~ImplRegion() - Empty oder NULL-Region" ); ImplRegionBand* pBand = mpFirstBand; while ( pBand ) |