include/vcl/outdev.hxx | 2 +- vcl/inc/PhysicalFontCollection.hxx | 4 ++-- vcl/source/font/PhysicalFontCollection.cxx | 4 ++-- vcl/source/gdi/embeddedfontshelper.cxx | 2 +- vcl/source/gdi/print.cxx | 24 ++++++++++++------------ vcl/source/gdi/virdev.cxx | 6 +++--- vcl/source/outdev/font.cxx | 16 ++++++++-------- vcl/source/outdev/outdev.cxx | 6 +++--- vcl/source/outdev/outdevstate.cxx | 6 +++--- vcl/win/gdi/salgdi3.cxx | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-)
New commits: commit 1ed5907b162daff49bbb195c870b1ac5c3f8e313 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Fri Dec 25 17:57:19 2015 +1100 vcl: Change GetDev{Font|Size}List to GetDevice{Font|Size}List Change-Id: I19af1ad7fb00de8c1ac224fec53f032d972b9c59 Reviewed-on: https://gerrit.libreoffice.org/20934 Reviewed-by: Chris Sherlock <chris.sherloc...@gmail.com> Tested-by: Chris Sherlock <chris.sherloc...@gmail.com> diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index c8b4fbd..9ef79f5 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -362,7 +362,7 @@ private: mutable ImplFontCache* mpFontCache; mutable PhysicalFontCollection* mpFontCollection; mutable ImplDeviceFontList* mpDeviceFontList; - mutable ImplGetDevSizeList* mpGetDevSizeList; + mutable ImplGetDevSizeList* mpDeviceSizeList; OutDevStateStack* mpOutDevStateStack; ImplOutDevData* mpOutDevData; std::vector< VCLXGraphics* >* mpUnoGraphicsList; diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx index 38b2973..5177d4a 100644 --- a/vcl/inc/PhysicalFontCollection.hxx +++ b/vcl/inc/PhysicalFontCollection.hxx @@ -62,8 +62,8 @@ public: // misc utilities PhysicalFontCollection* Clone( bool bScalable, bool bEmbeddable ) const; - ImplDeviceFontList* GetDevFontList() const; - ImplGetDevSizeList* GetDevSizeList( const OUString& rFontName ) const; + ImplDeviceFontList* GetDeviceFontList() const; + ImplGetDevSizeList* GetDeviceSizeList( const OUString& rFontName ) const; private: mutable bool mbMatchData; // true if matching attributes are initialized diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index df863b6..515c16f 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -953,7 +953,7 @@ PhysicalFontCollection* PhysicalFontCollection::Clone( bool bScalable, bool bEmb return pClonedCollection; } -ImplDeviceFontList* PhysicalFontCollection::GetDevFontList() const +ImplDeviceFontList* PhysicalFontCollection::GetDeviceFontList() const { ImplDeviceFontList* pDeviceFontList = new ImplDeviceFontList; @@ -967,7 +967,7 @@ ImplDeviceFontList* PhysicalFontCollection::GetDevFontList() const return pDeviceFontList; } -ImplGetDevSizeList* PhysicalFontCollection::GetDevSizeList( const OUString& rFontName ) const +ImplGetDevSizeList* PhysicalFontCollection::GetDeviceSizeList( const OUString& rFontName ) const { ImplGetDevSizeList* pGetDevSizeList = new ImplGetDevSizeList; diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx index 54bd9e2..48c506f 100644 --- a/vcl/source/gdi/embeddedfontshelper.cxx +++ b/vcl/source/gdi/embeddedfontshelper.cxx @@ -230,7 +230,7 @@ OUString EmbeddedFontsHelper::fontFileUrl( const OUString& familyName, FontFamil SalGraphics* graphics = Application::GetDefaultDevice()->GetGraphics(); PhysicalFontCollection fonts; graphics->GetDevFontList( &fonts ); - std::unique_ptr< ImplDeviceFontList > fontInfo( fonts.GetDevFontList()); + std::unique_ptr< ImplDeviceFontList > fontInfo( fonts.GetDeviceFontList()); PhysicalFontFace* selected = nullptr; for( int i = 0; i < fontInfo->Count(); diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index f4e106c..18dfe97 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -642,10 +642,10 @@ void Printer::ImplReleaseFonts() mpDeviceFontList = nullptr; } - if ( mpGetDevSizeList ) + if ( mpDeviceSizeList ) { - delete mpGetDevSizeList; - mpGetDevSizeList = nullptr; + delete mpDeviceSizeList; + mpDeviceSizeList = nullptr; } } @@ -1018,10 +1018,10 @@ void Printer::dispose() delete mpDeviceFontList; mpDeviceFontList = nullptr; } - if ( mpGetDevSizeList ) + if ( mpDeviceSizeList ) { - delete mpGetDevSizeList; - mpGetDevSizeList = nullptr; + delete mpDeviceSizeList; + mpDeviceSizeList = nullptr; } delete mpFontCache; mpFontCache = nullptr; @@ -1172,10 +1172,10 @@ bool Printer::SetPrinterProps( const Printer* pPrinter ) delete mpDeviceFontList; mpDeviceFontList = nullptr; } - if ( mpGetDevSizeList ) + if ( mpDeviceSizeList ) { - delete mpGetDevSizeList; - mpGetDevSizeList = nullptr; + delete mpDeviceSizeList; + mpDeviceSizeList = nullptr; } // clean up font list delete mpFontCache; @@ -1215,10 +1215,10 @@ bool Printer::SetPrinterProps( const Printer* pPrinter ) delete mpDeviceFontList; mpDeviceFontList = nullptr; } - if ( mpGetDevSizeList ) + if ( mpDeviceSizeList ) { - delete mpGetDevSizeList; - mpGetDevSizeList = nullptr; + delete mpDeviceSizeList; + mpDeviceSizeList = nullptr; } delete mpFontCache; delete mpFontCollection; diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index f97b810..e3b9b14 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 ( mpGetDevSizeList ) + if ( mpDeviceSizeList ) { - delete mpGetDevSizeList; - mpGetDevSizeList = nullptr; + delete mpDeviceSizeList; + mpDeviceSizeList = nullptr; } // preserve global font lists diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index b2ac6f2..aa3f7cb 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -95,7 +95,7 @@ int OutputDevice::GetDevFontCount() const if (!mpFontCollection) return 0; - mpDeviceFontList = mpFontCollection->GetDevFontList(); + mpDeviceFontList = mpFontCollection->GetDeviceFontList(); } return mpDeviceFontList->Count(); } @@ -108,11 +108,11 @@ bool OutputDevice::IsFontAvailable( const OUString& rFontName ) const int OutputDevice::GetDevFontSizeCount( const vcl::Font& rFont ) const { - delete mpGetDevSizeList; + delete mpDeviceSizeList; ImplInitFontList(); - mpGetDevSizeList = mpFontCollection->GetDevSizeList( rFont.GetName() ); - return mpGetDevSizeList->Count(); + mpDeviceSizeList = mpFontCollection->GetDeviceSizeList( rFont.GetName() ); + return mpDeviceSizeList->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, mpGetDevSizeList->Get( nSizeIndex ) ); + Size aSize( 0, mpDeviceSizeList->Get( nSizeIndex ) ); if ( mbMap ) { aSize.Height() *= 10; @@ -508,10 +508,10 @@ void OutputDevice::ImplClearFontData( const bool bNewFontLists ) delete mpDeviceFontList; mpDeviceFontList = nullptr; } - if ( mpGetDevSizeList ) + if ( mpDeviceSizeList ) { - delete mpGetDevSizeList; - mpGetDevSizeList = nullptr; + delete mpDeviceSizeList; + mpDeviceSizeList = nullptr; } // release all physically selected fonts on this device diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 14b6321..c1ce49c 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; - mpGetDevSizeList = nullptr; + mpDeviceSizeList = nullptr; mpOutDevStateStack = new OutDevStateStack; mpPDFWriter = nullptr; mpAlphaVDev = nullptr; @@ -242,8 +242,8 @@ void OutputDevice::dispose() delete mpDeviceFontList; mpDeviceFontList = nullptr; - delete mpGetDevSizeList; - mpGetDevSizeList = nullptr; + delete mpDeviceSizeList; + mpDeviceSizeList = 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 8175ea6..692ac13 100644 --- a/vcl/source/outdev/outdevstate.cxx +++ b/vcl/source/outdev/outdevstate.cxx @@ -645,10 +645,10 @@ void OutputDevice::ImplReleaseFonts() mpDeviceFontList = nullptr; } - if ( mpGetDevSizeList ) + if ( mpDeviceSizeList ) { - delete mpGetDevSizeList; - mpGetDevSizeList = nullptr; + delete mpDeviceSizeList; + mpDeviceSizeList = nullptr; } } diff --git a/vcl/win/gdi/salgdi3.cxx b/vcl/win/gdi/salgdi3.cxx index 43c3971..86689d0 100644 --- a/vcl/win/gdi/salgdi3.cxx +++ b/vcl/win/gdi/salgdi3.cxx @@ -559,7 +559,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon } // last level fallback, check each font type face one by one - ImplDeviceFontList* pTestFontList = pFontCollection->GetDevFontList(); + ImplDeviceFontList* pTestFontList = pFontCollection->GetDeviceFontList(); // limit the count of fonts to be checked to prevent hangs static const int MAX_GFBFONT_COUNT = 600; int nTestFontCount = pTestFontList->Count(); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits