[Libreoffice-commits] .: vcl/generic

[Libreoffice Gerrit user]

 vcl/generic/glyphs/gcach_ftyp.cxx    |    3 +--
 vcl/generic/print/genpspgraphics.cxx |    2 +-
 vcl/generic/print/printerjob.cxx     |    3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 5ee129fbc039b0fc91048e62c7db1755b83aa01c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Dec 20 23:10:48 2012 +0100

    Some cppcheck
    
    Change-Id: Ifec449ea334d9055bb33beb0518ab2e01d885d0d

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index fa256aa..d7e693b 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -371,9 +371,8 @@ GraphiteFaceWrapper * FtFontInfo::GetGraphiteFace()
     // test for graphite here so that it is cached most efficiently
     if (GetTable("Silf", 0))
     {
-        int graphiteSegCacheSize = 10000;
         static const char* pGraphiteCacheStr = getenv( "SAL_GRAPHITE_CACHE_SIZE" );
-        graphiteSegCacheSize = pGraphiteCacheStr ? (atoi(pGraphiteCacheStr)) : 0;
+        int graphiteSegCacheSize = pGraphiteCacheStr ? (atoi(pGraphiteCacheStr)) : 0;
         gr_face * pGraphiteFace;
         if (graphiteSegCacheSize > 500)
             pGraphiteFace = gr_make_face_with_seg_cache(this, graphiteFontTable, graphiteSegCacheSize, gr_face_cacheCmap);
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 27db385..1a271a0 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -1250,7 +1250,6 @@ bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNew
 
     bool bRet = false;
     bool bStarted = false;
-    bool bStopped = false;
     sal_Int32 nPos;
     sal_Int32 nStart = 0;
     sal_Int32 nStop = rLen;
@@ -1269,6 +1268,7 @@ bool GenPspGraphics::filterText( const rtl::OUString& rOrig, rtl::OUString& rNew
     }
     if( m_bPhoneCollectionActive )
     {
+        bool bStopped = false;
         bRet = true;
         nPos = bStarted ? nStart + FAX_PHONE_TOKEN_LENGTH : 0;
         if( ( nPos = aPhone.indexOfAsciiL( FAX_END_TOKEN, FAX_END_TOKEN_LENGTH, nPos ) ) != -1 )
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/generic/print/printerjob.cxx
index 758b7e0..30ad0fd 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/generic/print/printerjob.cxx
@@ -96,12 +96,11 @@ AppendPS (FILE* pDst, osl::File* pSrc, sal_uChar* pBuffer,
 osl::File*
 PrinterJob::CreateSpoolFile (const rtl::OUString& rName, const rtl::OUString& rExtension)
 {
-    osl::File::RC nError = osl::File::E_None;
     osl::File*    pFile  = NULL;
 
     rtl::OUString aFile = rName + rExtension;
     rtl::OUString aFileURL;
-    nError = osl::File::getFileURLFromSystemPath( aFile, aFileURL );
+    osl::File::RC nError = osl::File::getFileURLFromSystemPath( aFile, aFileURL );
     if (nError != osl::File::E_None)
         return NULL;
     aFileURL = maSpoolDirName + rtl::OUString("/") + aFileURL;