[Libreoffice-commits] core.git: vcl/inc vcl/source

Stephan Bergmann sbergman at redhat.com
Fri Jul 10 03:44:43 PDT 2015


 vcl/inc/outdev.h                           |    5 ++---
 vcl/source/font/PhysicalFontCollection.cxx |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit ac46405ca62fcc7d7a7e8004c0c44b330956e39c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jul 10 12:44:11 2015 +0200

    -Werror,-Wunused-private-field
    
    Change-Id: Ie3feae1a6bac2e5a51d38fb402525097483313e2

diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 256e19e..a4cc54f 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -55,12 +55,11 @@ public:
 class ImplGetDevSizeList
 {
 private:
-    OUString            maFontName;
     std::vector<int>    maSizeList;
 
 public:
-                        ImplGetDevSizeList( const OUString& rFontName )
-                        : maFontName( rFontName ) { maSizeList.reserve( 32 ); }
+                        ImplGetDevSizeList()
+                        { maSizeList.reserve( 32 ); }
     void                Add( int nHeight )      { maSizeList.push_back( nHeight ); }
     int                 Count() const           { return maSizeList.size(); }
     int                 Get( int nIndex ) const { return maSizeList[ nIndex ]; }
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 942e508..dc4c185 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -983,7 +983,7 @@ ImplGetDevFontList* PhysicalFontCollection::GetDevFontList() const
 
 ImplGetDevSizeList* PhysicalFontCollection::GetDevSizeList( const OUString& rFontName ) const
 {
-    ImplGetDevSizeList* pGetDevSizeList = new ImplGetDevSizeList( rFontName );
+    ImplGetDevSizeList* pGetDevSizeList = new ImplGetDevSizeList;
 
     PhysicalFontFamily* pFontFamily = FindFontFamily( rFontName );
     if( pFontFamily != NULL )


More information about the Libreoffice-commits mailing list