[Libreoffice-commits] core.git: sc/source starmath/source svtools/source vcl/qa vcl/source vcl/unx

[Takeshi Abe]

 sc/source/filter/excel/xistyle.cxx          |    2 --
 starmath/source/dialog.cxx                  |    2 --
 svtools/source/misc/sampletext.cxx          |    2 --
 vcl/qa/cppunit/fontcharmap.cxx              |    2 --
 vcl/source/filter/wmf/wmfwr.cxx             |    2 --
 vcl/source/outdev/font.cxx                  |    2 --
 vcl/unx/generic/fontmanager/fontmanager.cxx |    2 --
 7 files changed, 14 deletions(-)

New commits:
commit 3fbfddc6c98c82d98ce9b2cc9aa49104e354a987
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Apr 12 16:04:28 2016 +0900

    Stop assigning null to intrusive_ptr
    
    which added at f6d61562d41b8a49449d881da66a3d8fa519487f.
    But they seems unnecessay because, even without them,
    soon the intrusive_ptr goes out of scope then its dtor
    decrements refcount.
    
    Change-Id: I6e35ecb7d5a0b5ccaef6ea9b7507300dcb589801
    Reviewed-on: https://gerrit.libreoffice.org/24013
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 9262d27..d53c75b 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -495,8 +495,6 @@ void XclImpFont::GuessScriptType()
             // Western fonts
             mbHasWstrn = (!mbHasAsian && !mbHasCmplx) || xFontCharMap->HasChar( 'A' );
         }
-
-        xFontCharMap = nullptr;
     }
 }
 
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index bf452d2..d3dbffd 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -2311,8 +2311,6 @@ void SmSymDefineDialog::SetFont(const OUString &rFontName, const OUString &rStyl
     if( bFirst )
         pFontsSubsetLB->SetNoSelection();
     pFontsSubsetLB->Enable( !bFirst );
-
-    xFontCharMap = nullptr;
 }
 
 
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index dce3024..fe1e755 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -194,8 +194,6 @@ OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice &rDevice)
 
             return OUString(aText);
         }
-
-        xFontCharMap = nullptr;
     }
 
     static const sal_Unicode aImplSymbolFontText[] = {
diff --git a/vcl/qa/cppunit/fontcharmap.cxx b/vcl/qa/cppunit/fontcharmap.cxx
index 8b8f2e7..157b56a 100644
--- a/vcl/qa/cppunit/fontcharmap.cxx
+++ b/vcl/qa/cppunit/fontcharmap.cxx
@@ -39,8 +39,6 @@ void VclFontCharMapTest::testDefaultFontCharMap()
     CPPUNIT_ASSERT( nStartBMPPlane == 0x0020 );
     CPPUNIT_ASSERT( nStartSupBMPPlane == 0xE000 );
     CPPUNIT_ASSERT( nEndBMPPlane == 0xFFF0-1 );
-
-    xfcmap = nullptr;
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(VclFontCharMapTest);
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 46464ac..8e3519f 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -961,8 +961,6 @@ void WMFWriter::SetAllAttr()
                 else if ( aSrcFont.GetCharSet() == RTL_TEXTENCODING_SYMBOL )
                     aSrcFont.SetCharSet( RTL_TEXTENCODING_MS_1252 );
             }
-
-            xFontCharMap = nullptr;
         }
 
         aDstFont = aSrcFont;
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 7d9a14d..cb9ec33 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1530,8 +1530,6 @@ sal_Int32 OutputDevice::HasGlyphs( const vcl::Font& rTempFont, const OUString& r
         if( ! xFontCharMap->HasChar( rStr[i] ) )
             return nIndex;
 
-    xFontCharMap = nullptr;
-
     return -1;
 }
 
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index d7b4bd3..7a660e7 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -2125,8 +2125,6 @@ void PrintFontManager::getGlyphWidths( fontID nFont,
                         // update the requested map
                         rUnicodeEnc[ (sal_Unicode)c ] = aGlyphId;
                     }
-
-                    xFontCharMap = nullptr;
                 }
             }
         }