[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source
Chris Sherlock
chris.sherlock79 at gmail.com
Sat Dec 26 05:22:04 PST 2015
include/vcl/outdev.hxx | 4 ++--
vcl/inc/PhysicalFontCollection.hxx | 2 +-
vcl/inc/outdev.h | 4 ++--
vcl/source/font/PhysicalFontCollection.cxx | 8 ++++----
vcl/source/gdi/print.cxx | 24 ++++++++++++------------
vcl/source/gdi/virdev.cxx | 6 +++---
vcl/source/outdev/font.cxx | 14 +++++++-------
vcl/source/outdev/outdev.cxx | 6 +++---
vcl/source/outdev/outdevstate.cxx | 6 +++---
9 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit 0a9503ed688e258cee5407061a1406d11eb7c258
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sat Dec 26 07:18:20 2015 +1100
vcl: change device font size variable/fn names
Change-Id: I389b5a5a220d1a23bcf53156c6fc791d756a740c
Reviewed-on: https://gerrit.libreoffice.org/20944
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 9ef79f5..14e292e 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -66,7 +66,7 @@ struct SystemTextLayoutData;
class ImplFontCache;
class PhysicalFontCollection;
class ImplDeviceFontList;
-class ImplGetDevSizeList;
+class ImplDeviceFontSizeList;
class ImplMultiTextLineInfo;
class SalGraphics;
class Gradient;
@@ -362,7 +362,7 @@ private:
mutable ImplFontCache* mpFontCache;
mutable PhysicalFontCollection* mpFontCollection;
mutable ImplDeviceFontList* mpDeviceFontList;
- mutable ImplGetDevSizeList* mpDeviceSizeList;
+ mutable ImplDeviceFontSizeList* mpDeviceFontSizeList;
OutDevStateStack* mpOutDevStateStack;
ImplOutDevData* mpOutDevData;
std::vector< VCLXGraphics* >* mpUnoGraphicsList;
diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx
index 5177d4a..4495673 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -63,7 +63,7 @@ public:
// misc utilities
PhysicalFontCollection* Clone( bool bScalable, bool bEmbeddable ) const;
ImplDeviceFontList* GetDeviceFontList() const;
- ImplGetDevSizeList* GetDeviceSizeList( const OUString& rFontName ) const;
+ ImplDeviceFontSizeList* GetDeviceFontSizeList( const OUString& rFontName ) const;
private:
mutable bool mbMatchData; // true if matching attributes are initialized
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 90fad99..5814b7c 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -50,13 +50,13 @@ public:
int Count() const { return maDevFontVector.size(); }
};
-class ImplGetDevSizeList
+class ImplDeviceFontSizeList
{
private:
std::vector<int> maSizeList;
public:
- ImplGetDevSizeList()
+ ImplDeviceFontSizeList()
{ maSizeList.reserve( 32 ); }
void Add( int nHeight ) { maSizeList.push_back( nHeight ); }
int Count() const { return maSizeList.size(); }
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 515c16f..0b86c8c 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -967,9 +967,9 @@ ImplDeviceFontList* PhysicalFontCollection::GetDeviceFontList() const
return pDeviceFontList;
}
-ImplGetDevSizeList* PhysicalFontCollection::GetDeviceSizeList( const OUString& rFontName ) const
+ImplDeviceFontSizeList* PhysicalFontCollection::GetDeviceFontSizeList( const OUString& rFontName ) const
{
- ImplGetDevSizeList* pGetDevSizeList = new ImplGetDevSizeList;
+ ImplDeviceFontSizeList* pDeviceFontSizeList = new ImplDeviceFontSizeList;
PhysicalFontFamily* pFontFamily = FindFontFamily( rFontName );
if( pFontFamily != nullptr )
@@ -979,10 +979,10 @@ ImplGetDevSizeList* PhysicalFontCollection::GetDeviceSizeList( const OUString& r
std::set<int>::const_iterator it = rHeights.begin();
for(; it != rHeights.begin(); ++it )
- pGetDevSizeList->Add( *it );
+ pDeviceFontSizeList->Add( *it );
}
- return pGetDevSizeList;
+ return pDeviceFontSizeList;
}
PhysicalFontFamily* PhysicalFontCollection::FindFontFamilyByFont( FontSelectPattern& rFSD ) const
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 18dfe97..01bfe3a 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -642,10 +642,10 @@ void Printer::ImplReleaseFonts()
mpDeviceFontList = nullptr;
}
- if ( mpDeviceSizeList )
+ if ( mpDeviceFontSizeList )
{
- delete mpDeviceSizeList;
- mpDeviceSizeList = nullptr;
+ delete mpDeviceFontSizeList;
+ mpDeviceFontSizeList = nullptr;
}
}
@@ -1018,10 +1018,10 @@ void Printer::dispose()
delete mpDeviceFontList;
mpDeviceFontList = nullptr;
}
- if ( mpDeviceSizeList )
+ if ( mpDeviceFontSizeList )
{
- delete mpDeviceSizeList;
- mpDeviceSizeList = nullptr;
+ delete mpDeviceFontSizeList;
+ mpDeviceFontSizeList = nullptr;
}
delete mpFontCache;
mpFontCache = nullptr;
@@ -1172,10 +1172,10 @@ bool Printer::SetPrinterProps( const Printer* pPrinter )
delete mpDeviceFontList;
mpDeviceFontList = nullptr;
}
- if ( mpDeviceSizeList )
+ if ( mpDeviceFontSizeList )
{
- delete mpDeviceSizeList;
- mpDeviceSizeList = nullptr;
+ delete mpDeviceFontSizeList;
+ mpDeviceFontSizeList = nullptr;
}
// clean up font list
delete mpFontCache;
@@ -1215,10 +1215,10 @@ bool Printer::SetPrinterProps( const Printer* pPrinter )
delete mpDeviceFontList;
mpDeviceFontList = nullptr;
}
- if ( mpDeviceSizeList )
+ if ( mpDeviceFontSizeList )
{
- delete mpDeviceSizeList;
- mpDeviceSizeList = nullptr;
+ delete mpDeviceFontSizeList;
+ mpDeviceFontSizeList = nullptr;
}
delete mpFontCache;
delete mpFontCollection;
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index e3b9b14..ca0fcbc 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -519,10 +519,10 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32
delete mpDeviceFontList;
mpDeviceFontList = nullptr;
}
- if ( mpDeviceSizeList )
+ if ( mpDeviceFontSizeList )
{
- delete mpDeviceSizeList;
- mpDeviceSizeList = nullptr;
+ delete mpDeviceFontSizeList;
+ mpDeviceFontSizeList = nullptr;
}
// preserve global font lists
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index aa3f7cb..da787d1 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -108,11 +108,11 @@ bool OutputDevice::IsFontAvailable( const OUString& rFontName ) const
int OutputDevice::GetDevFontSizeCount( const vcl::Font& rFont ) const
{
- delete mpDeviceSizeList;
+ delete mpDeviceFontSizeList;
ImplInitFontList();
- mpDeviceSizeList = mpFontCollection->GetDeviceSizeList( rFont.GetName() );
- return mpDeviceSizeList->Count();
+ mpDeviceFontSizeList = mpFontCollection->GetDeviceFontSizeList( rFont.GetName() );
+ return mpDeviceFontSizeList->Count();
}
Size OutputDevice::GetDevFontSize( const vcl::Font& rFont, int nSizeIndex ) const
@@ -123,7 +123,7 @@ Size OutputDevice::GetDevFontSize( const vcl::Font& rFont, int nSizeIndex ) cons
return Size();
// when mapping is enabled round to .5 points
- Size aSize( 0, mpDeviceSizeList->Get( nSizeIndex ) );
+ Size aSize( 0, mpDeviceFontSizeList->Get( nSizeIndex ) );
if ( mbMap )
{
aSize.Height() *= 10;
@@ -508,10 +508,10 @@ void OutputDevice::ImplClearFontData( const bool bNewFontLists )
delete mpDeviceFontList;
mpDeviceFontList = nullptr;
}
- if ( mpDeviceSizeList )
+ if ( mpDeviceFontSizeList )
{
- delete mpDeviceSizeList;
- mpDeviceSizeList = nullptr;
+ delete mpDeviceFontSizeList;
+ mpDeviceFontSizeList = nullptr;
}
// release all physically selected fonts on this device
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index c1ce49c..9b6996a 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -97,7 +97,7 @@ OutputDevice::OutputDevice() :
mpFontCache = nullptr;
mpFontCollection = nullptr;
mpDeviceFontList = nullptr;
- mpDeviceSizeList = nullptr;
+ mpDeviceFontSizeList = nullptr;
mpOutDevStateStack = new OutDevStateStack;
mpPDFWriter = nullptr;
mpAlphaVDev = nullptr;
@@ -242,8 +242,8 @@ void OutputDevice::dispose()
delete mpDeviceFontList;
mpDeviceFontList = nullptr;
- delete mpDeviceSizeList;
- mpDeviceSizeList = nullptr;
+ delete mpDeviceFontSizeList;
+ mpDeviceFontSizeList = nullptr;
// release ImplFontCache specific to this OutputDevice
// TODO: refcount ImplFontCache
diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx
index 692ac13..6f9d708 100644
--- a/vcl/source/outdev/outdevstate.cxx
+++ b/vcl/source/outdev/outdevstate.cxx
@@ -645,10 +645,10 @@ void OutputDevice::ImplReleaseFonts()
mpDeviceFontList = nullptr;
}
- if ( mpDeviceSizeList )
+ if ( mpDeviceFontSizeList )
{
- delete mpDeviceSizeList;
- mpDeviceSizeList = nullptr;
+ delete mpDeviceFontSizeList;
+ mpDeviceFontSizeList = nullptr;
}
}
More information about the Libreoffice-commits
mailing list