commit e0eecf8ad57aa207d1db7fc63d9ad8f8d54866e4
author Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 12:40:37 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 13:01:47 2015 +0100
tree a41e6056b34df52426e7134073812bb5c7ecdc31
parent 52789497db9f97beb8c95177fd2293287c5dc1e6

Cleanup a few issues with stack VirtualDevice conversion.

filter/source/graphicfilter/epict/epict.cxx

diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index df3a4f6..d978c45 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -1699,7 +1699,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )

                if ( aSrcFont.GetAlign() != ALIGN_BASELINE )
                {
                    ScopedVclPtr<VirtualDevice> pVirDev( new VirtualDevice() );
                    ScopedVclPtrInstance<VirtualDevice> pVirDev;
                    if (aSrcFont.GetAlign()==ALIGN_TOP)
                        aPt.Y()+=(long)pVirDev->GetFontMetric(aSrcFont).GetAscent();
                    else
@@ -1854,7 +1854,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )

            case META_GRADIENT_ACTION:
            {
                ScopedVclPtr<VirtualDevice> aVDev;
                ScopedVclPtrInstance<VirtualDevice> aVDev;
                GDIMetaFile                 aTmpMtf;
                const MetaGradientAction*   pA = static_cast<const MetaGradientAction*>(pMA);

@@ -1866,7 +1866,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )

            case META_HATCH_ACTION:
            {
                ScopedVclPtr<VirtualDevice> aVDev;
                ScopedVclPtrInstance<VirtualDevice> aVDev;
                GDIMetaFile             aTmpMtf;
                const MetaHatchAction*  pA = static_cast<const MetaHatchAction*>(pMA);

sc/source/ui/inc/autofmt.hxx

diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx
index 3cd9bc3..8227376 100644
--- a/sc/source/ui/inc/autofmt.hxx
+++ b/sc/source/ui/inc/autofmt.hxx
@@ -56,7 +56,7 @@ protected:

private:
    ScAutoFormatData*       pCurData;
    ScopedVclPtr<VirtualDevice> aVD;
    ScopedVclPtrInstance<VirtualDevice> aVD;
    SvtScriptedTextHelper   aScriptedText;
    ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > xBreakIter;
    bool                    bFitWidth;