[Libreoffice-commits] .: vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Dec 12 06:01:09 PST 2012
vcl/source/gdi/gdimtf.cxx | 1 -
vcl/source/gdi/pdfwriter_impl.cxx | 9 ++++++---
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 0ec2577476fd6633a24d0daab4a7f8848f3fc217
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 12 14:00:25 2012 +0000
loplugin: some unused variables, etc.
Change-Id: I2bf601bae34285675e19551781d4fdaca88d3dc6
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 42ed63c..cd17d51 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -3023,7 +3023,6 @@ sal_Bool GDIMetaFile::CreateThumbnail( sal_uInt32 nMaximumExtent,
const Point aBRPix( aVDev.LogicToPixel( Point( GetPrefSize().Width() - 1, GetPrefSize().Height() - 1 ), GetPrefMapMode() ) );
Size aDrawSize( aVDev.LogicToPixel( GetPrefSize(), GetPrefMapMode() ) );
Size aSizePix( labs( aBRPix.X() - aTLPix.X() ) + 1, labs( aBRPix.Y() - aTLPix.Y() ) + 1 );
- Point aPosPix;
if ( !rBmpEx.IsEmpty() )
rBmpEx.SetEmpty();
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index e93b111..e24bf26 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3376,7 +3376,9 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical
pFontData[nIndex+4] != 'c'
)
)
- nIndex++;
+ {
+ ++nIndex;
+ }
// check whether we are in a excluded section
for( it = aSections.begin(); it != aSections.end() && (nIndex < *it || nIndex > ((*it) + 5) ); ++it )
;
@@ -3705,8 +3707,10 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical
}
if( nStreamObject )
+ {
// write font descriptor
- nFontDescriptor = emitFontDescriptor( pFont, aInfo, 0, nStreamObject );
+ nFontDescriptor = emitFontDescriptor( pFont, aInfo, 0, nStreamObject );
+ }
if( nFontDescriptor )
{
@@ -6797,7 +6801,6 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata()
bool PDFWriterImpl::emitTrailer()
{
// emit doc info
- OString aInfoValuesOut;
sal_Int32 nDocInfoObject = emitInfoDict( );
sal_Int32 nSecObject = 0;
More information about the Libreoffice-commits
mailing list