diff options
-rw-r--r-- | filter/source/flash/swfexporter.cxx | 6 | ||||
-rw-r--r-- | filter/source/flash/swfwriter.cxx | 8 | ||||
-rw-r--r-- | filter/source/flash/swfwriter.hxx | 4 | ||||
-rw-r--r-- | filter/source/flash/swfwriter1.cxx | 22 | ||||
-rw-r--r-- | filter/source/flash/swfwriter2.cxx | 8 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/msoleexp.cxx | 8 | ||||
-rw-r--r-- | filter/source/xsltdialog/xmlfilterjar.cxx | 6 |
8 files changed, 33 insertions, 33 deletions
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 66ce94984dcf..3bdceb8d253b 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -321,9 +321,9 @@ sal_uInt16 FlashExporter::exportBackgrounds( const Reference< XDrawPage >& xDraw return ret; if (bExportObjects) - mpWriter->placeShape( maPagesMap[nPage].mnObjectsID, _uInt16(1), 0, 0 ); + mpWriter->placeShape( maPagesMap[nPage].mnObjectsID, uInt16_(1), 0, 0 ); else - mpWriter->placeShape( maPagesMap[nPage].mnBackgroundID, _uInt16(0), 0, 0 ); + mpWriter->placeShape( maPagesMap[nPage].mnBackgroundID, uInt16_(0), 0, 0 ); mpWriter->storeTo( xOutputStream ); @@ -629,7 +629,7 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster // pPageInfo->addShape( pShapeInfo ); - mpWriter->placeShape( pShapeInfo->mnID, _uInt16(nPlaceDepth++), pShapeInfo->mnX, pShapeInfo->mnY ); + mpWriter->placeShape( pShapeInfo->mnID, uInt16_(nPlaceDepth++), pShapeInfo->mnX, pShapeInfo->mnY ); } catch( const Exception& ) { diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index fbd90f721af1..7e58b2174cfe 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -163,7 +163,7 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream ) aHeader.addUI8( 0 ); aHeader.addUI8( 12 ); - aHeader.addUI16( _uInt16(mnFrames) ); + aHeader.addUI16( uInt16_(mnFrames) ); const sal_uInt32 nSize = aHeader.Tell() + mpFontsStream->Tell() + mpMovieStream->Tell(); @@ -227,8 +227,8 @@ void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int // #i73264# const basegfx::B2DHomMatrix aMatrix(basegfx::tools::createTranslateB2DHomMatrix( - _Int16(static_cast<long>(map100thmm(x)*mnDocXScale)), - _Int16(static_cast<long>(map100thmm(y)*mnDocYScale)))); + Int16_(static_cast<long>(map100thmm(x)*mnDocXScale)), + Int16_(static_cast<long>(map100thmm(y)*mnDocYScale)))); mpTag->addMatrix( aMatrix ); // transformation matrix endTag(); @@ -416,7 +416,7 @@ void Writer::stop() void Writer::waitOnClick( sal_uInt16 nDepth ) { - placeShape( _uInt16( mnPageButtonId ), nDepth, 0, 0 ); + placeShape( uInt16_( mnPageButtonId ), nDepth, 0, 0 ); stop(); showFrame(); removeShape( nDepth ); diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 5f8b4382cadd..69c66a7b7a5e 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -50,13 +50,13 @@ namespace tools class PolyPolygon; } -inline sal_uInt16 _uInt16( sal_Int32 nValue ) +inline sal_uInt16 uInt16_( sal_Int32 nValue ) { OSL_ENSURE( (nValue >= 0) && ((sal_uInt32)nValue <= 0xffff), "overflow while converting sal_Int32 to sal_uInt16" ); return (sal_uInt16)nValue; } -inline sal_Int16 _Int16( sal_Int32 nValue ) +inline sal_Int16 Int16_( sal_Int32 nValue ) { OSL_ENSURE( (nValue >= -32768) && (nValue <= 32767), "overflow while converting sal_Int32 to sal_Int16" ); return (sal_Int16)nValue; diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 05613b7c31ac..b113e31dd424 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -114,7 +114,7 @@ void Writer::Impl_addPolygon( BitStream& rBits, const tools::Polygon& rPoly, boo { Point aLastPoint( rPoly[0] ); - Impl_addShapeRecordChange( rBits, _Int16(aLastPoint.X()),_Int16(aLastPoint.Y()), bFilled ); + Impl_addShapeRecordChange( rBits, Int16_(aLastPoint.X()),Int16_(aLastPoint.Y()), bFilled ); sal_uInt16 i = 0, nSize = rPoly.GetSize(); @@ -148,7 +148,7 @@ void Writer::Impl_addPolygon( BitStream& rBits, const tools::Polygon& rPoly, boo const Point aPolyPoint( rPoly[ i ] ); if( aPolyPoint != aLastPoint ) { - Impl_addStraightEdgeRecord( rBits, _Int16(aPolyPoint.X() - aLastPoint.X()),_Int16(aPolyPoint.Y() - aLastPoint.Y())); + Impl_addStraightEdgeRecord( rBits, Int16_(aPolyPoint.X() - aLastPoint.X()),Int16_(aPolyPoint.Y() - aLastPoint.Y())); aLastPoint = aPolyPoint; } } @@ -158,7 +158,7 @@ void Writer::Impl_addPolygon( BitStream& rBits, const tools::Polygon& rPoly, boo const Point aPolyPoint( rPoly[ 0 ] ); if( aPolyPoint != aLastPoint ) { - Impl_addStraightEdgeRecord( rBits, _Int16(aPolyPoint.X() - aLastPoint.X()),_Int16(aPolyPoint.Y() - aLastPoint.Y())); + Impl_addStraightEdgeRecord( rBits, Int16_(aPolyPoint.X() - aLastPoint.X()),Int16_(aPolyPoint.Y() - aLastPoint.Y())); } } } @@ -599,7 +599,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon m.translate( double(aPt.X() / scale), double(aPt.Y()) ); m.scale( scale, scale ); - sal_Int16 nHeight = _Int16( map( Size( 0, aFont.GetFontHeight() ) ).Height() ); + sal_Int16 nHeight = Int16_( map( Size( 0, aFont.GetFontHeight() ) ).Height() ); startTag( TAG_DEFINETEXT ); @@ -619,7 +619,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon mpTag->addUI8( 0x8c ); mpTag->addUI16( rFlashFont.getID() ); mpTag->addRGB( aTextColor ); - mpTag->addUI16( _uInt16( nHeight ) ); + mpTag->addUI16( uInt16_( nHeight ) ); DBG_ASSERT( nLen <= 127, "TODO: handle text with more than 127 characters" ); @@ -643,7 +643,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon } aBits.writeUB( rFlashFont.getGlyph(rText[i],mpVDev), nGlyphBits ); - aBits.writeSB( _Int16(map( Size( (long)( nAdvance / scale ), 0 ) ).Width() ), nAdvanceBits ); + aBits.writeSB( Int16_(map( Size( (long)( nAdvance / scale ), 0 ) ).Width() ), nAdvanceBits ); } mpTag->addBits( aBits ); @@ -960,8 +960,8 @@ void Writer::Impl_writeBmp( sal_uInt16 nBitmapId, sal_uInt32 width, sal_uInt32 h mpTag->addUI16( nBitmapId ); mpTag->addUI8( 5 ); - mpTag->addUI16( _uInt16(width) ); - mpTag->addUI16( _uInt16(height) ); + mpTag->addUI16( uInt16_(width) ); + mpTag->addUI16( uInt16_(height) ); mpTag->Write( pCompressed, compressed_size ); @@ -1820,7 +1820,7 @@ void Writer::Impl_addStraightLine( BitStream& rBits, Point& rLastPoint, { Point aPoint( FRound(P2x), FRound(P2y) ); - Impl_addStraightEdgeRecord( rBits, _Int16(aPoint.X() - rLastPoint.X()),_Int16(aPoint.Y() - rLastPoint.Y())); + Impl_addStraightEdgeRecord( rBits, Int16_(aPoint.X() - rLastPoint.X()),Int16_(aPoint.Y() - rLastPoint.Y())); rLastPoint = aPoint; } @@ -1835,8 +1835,8 @@ void Writer::Impl_addQuadBezier( BitStream& rBits, Point& rLastPoint, Point aAnchorPoint( FRound(P3x), FRound(P3y) ); Impl_addCurvedEdgeRecord( rBits, - _Int16(aControlPoint.X() - rLastPoint.X()),_Int16(aControlPoint.Y() - rLastPoint.Y()), - _Int16(aAnchorPoint.X() - aControlPoint.X()),_Int16(aAnchorPoint.Y() - aControlPoint.Y()) ); + Int16_(aControlPoint.X() - rLastPoint.X()),Int16_(aControlPoint.Y() - rLastPoint.Y()), + Int16_(aAnchorPoint.X() - aControlPoint.X()),Int16_(aAnchorPoint.Y() - aControlPoint.Y()) ); rLastPoint = aAnchorPoint; } diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx index ec523c56fba9..3e06262d205c 100644 --- a/filter/source/flash/swfwriter2.cxx +++ b/filter/source/flash/swfwriter2.cxx @@ -140,7 +140,7 @@ void Tag::write( SvStream &out ) { bool bLarge = nSz > 62; - sal_uInt16 nCode = ( mnTagId << 6 ) | ( bLarge ? 0x3f : _uInt16(nSz) ); + sal_uInt16 nCode = ( mnTagId << 6 ) | ( bLarge ? 0x3f : uInt16_(nSz) ); out.WriteUChar( nCode ); out.WriteUChar( nCode >> 8 ); @@ -367,7 +367,7 @@ void Sprite::write( SvStream& out ) Tag aTag( TAG_DEFINESPRITE ); aTag.addUI16( mnId ); - aTag.addUI16( _uInt16( mnFrames ) ); + aTag.addUI16( uInt16_( mnFrames ) ); aTag.addStream( aTmp ); aTag.write( out ); } @@ -433,7 +433,7 @@ sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev ) tools::PolyPolygon aPolyPoly; pVDev->GetTextOutline( aPolyPoly, OUString(sal_Unicode(nChar)) ); - maGlyphOffsets.push_back( _uInt16( maGlyphData.getOffset() ) ); + maGlyphOffsets.push_back( uInt16_( maGlyphData.getOffset() ) ); // Number of fill and line index bits set to 1 maGlyphData.writeUB( 0x11, 8 ); @@ -474,7 +474,7 @@ void FlashFont::write( SvStream& out ) aTag.addUI16( mnId ); - sal_uInt16 nGlyphs = _uInt16( maGlyphOffsets.size() ); + sal_uInt16 nGlyphs = uInt16_( maGlyphOffsets.size() ); sal_uInt16 nOffset = nGlyphs * sizeof( sal_uInt16 ); for(vector< sal_uInt16 >::iterator i = maGlyphOffsets.begin(); i != maGlyphOffsets.end(); ++i) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 43b409bd0a70..8b2c1c3f69df 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6870,7 +6870,7 @@ css::uno::Reference < css::embed::XEmbeddedObject > SvxMSDffManager::CheckForCo sStarName = OUString::createFromAscii( pName ); else if ( nConvertFlags ) { - static struct _ObjImpType + static struct ObjImpType { sal_uInt32 nFlag; const char* pFactoryNm; @@ -6896,7 +6896,7 @@ css::uno::Reference < css::embed::XEmbeddedObject > SvxMSDffManager::CheckForCo 0, 0, 0, 0, 0, 0, 0, 0 } }; - for( const _ObjImpType* pArr = aArr; pArr->nFlag; ++pArr ) + for( const ObjImpType* pArr = aArr; pArr->nFlag; ++pArr ) { if( nConvertFlags & pArr->nFlag ) { diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index 54c6a86ad104..564058d93ec2 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -124,11 +124,11 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotSt SvGlobalName aObjName( rObj->getClassID() ); std::shared_ptr<const SfxFilter> pExpFilter; { - static struct _ObjExpType { + static struct ObjExpType { sal_uInt32 nFlag; const char* pFilterNm; // GlobalNameId - struct _GlobalNameIds { + struct GlobalNameIds { sal_uInt32 n1; sal_uInt16 n2, n3; sal_uInt8 b8, b9, b10, b11, b12, b13, b14, b15; @@ -159,11 +159,11 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotSt {SO3_SDRAW_CLASSID_60}, {SO3_SDRAW_CLASSID_50}}} }; - for( const _ObjExpType* pArr = aArr; !pExpFilter && ( pArr->nFlag != 0xffff ); ++pArr ) + for( const ObjExpType* pArr = aArr; !pExpFilter && ( pArr->nFlag != 0xffff ); ++pArr ) { for ( int n = 0; n < 4; ++n ) { - const _ObjExpType::_GlobalNameIds& rId = pArr->aGlNmIds[ n ]; + const ObjExpType::GlobalNameIds& rId = pArr->aGlNmIds[ n ]; SvGlobalName aGlbNm( rId.n1, rId.n2, rId.n3, rId.b8, rId.b9, rId.b10, rId.b11, rId.b12, rId.b13, rId.b14, rId.b15 ); diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx index effc2fb45131..6c0876fb2259 100644 --- a/filter/source/xsltdialog/xmlfilterjar.cxx +++ b/filter/source/xsltdialog/xmlfilterjar.cxx @@ -101,7 +101,7 @@ static Reference< XInterface > addFolder( Reference< XInterface >& xRootFolder, return xFolder; } -static void _addFile( Reference< XInterface >& xRootFolder, Reference< XSingleServiceFactory >& xFactory, Reference< XInputStream >& xInput, const OUString& aName ) throw( Exception ) +static void addFile_( Reference< XInterface >& xRootFolder, Reference< XSingleServiceFactory >& xFactory, Reference< XInputStream >& xInput, const OUString& aName ) throw( Exception ) { Reference< XActiveDataSink > xSink( xFactory->createInstance(), UNO_QUERY ); Reference< XUnoTunnel > xTunnel( xSink, UNO_QUERY ); @@ -133,7 +133,7 @@ void XMLFilterJarHelper::addFile( Reference< XInterface > xRootFolder, Reference SvFileStream* pStream = new SvFileStream(aFileURL, StreamMode::READ ); Reference< XInputStream > xInput( new utl::OSeekableInputStreamWrapper( pStream, true ) ); - _addFile( xRootFolder, xFactory, xInput, aName ); + addFile_( xRootFolder, xFactory, xInput, aName ); } } @@ -215,7 +215,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt Reference< XInputStream > XIS( new utl::OSeekableInputStreamWrapper( new SvFileStream(aTempFileURL, StreamMode::READ ), true ) ); OUString szTypeDetection( "TypeDetection.xcu" ); - _addFile( xRootFolder, xFactory, XIS, szTypeDetection ); + addFile_( xRootFolder, xFactory, XIS, szTypeDetection ); Reference< XChangesBatch > xBatch( xIfc, UNO_QUERY ); if( xBatch.is() ) |