diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-04-12 16:04:28 +0900 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-04-13 06:44:36 +0000 |
| commit | 3fbfddc6c98c82d98ce9b2cc9aa49104e354a987 (patch) | |
| tree | 687fc406ca531786f12a251f62600cfd7ef46b77 /vcl | |
| parent | b0e8f9ff2d59f5c1617f4c45ac457ec16a41cee5 (diff) | |
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@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/qa/cppunit/fontcharmap.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/filter/wmf/wmfwr.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/outdev/font.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/vcl/qa/cppunit/fontcharmap.cxx b/vcl/qa/cppunit/fontcharmap.cxx index 8b8f2e7a056e..157b56a21ff4 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 46464ac7c7e1..8e3519f8bc6c 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 7d9a14dcefb2..cb9ec331ae12 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 d7b4bd3f7c7f..7a660e7dbb0a 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; } } } |