include/vcl/font.hxx | 2 -- vcl/qa/cppunit/font.cxx | 18 +++--------------- vcl/source/font/font.cxx | 18 ------------------ 3 files changed, 3 insertions(+), 35 deletions(-)
New commits: commit e2dc54a9016a03aa94c54836e67250454cf2bf68 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Nov 18 12:18:32 2022 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Nov 18 15:55:49 2022 +0100 remove unused Font::SetSymbolFlag not used outside cppunit tests and it's not something to encourage to toggle Change-Id: I6519de48dfaa20293afc0874702653439e142285 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142940 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index 222f7d962774..a49005050d67 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -85,8 +85,6 @@ public: void SetAlignment( TextAlign ); void SetCharSet( rtl_TextEncoding ); - void SetSymbolFlag( bool ); - // Device dependent functions int GetQuality() const; diff --git a/vcl/qa/cppunit/font.cxx b/vcl/qa/cppunit/font.cxx index d989b01cb051..24fd1c6126a1 100644 --- a/vcl/qa/cppunit/font.cxx +++ b/vcl/qa/cppunit/font.cxx @@ -145,28 +145,16 @@ void VclFontTest::testSymbolFlagAndCharSet() CPPUNIT_ASSERT_EQUAL_MESSAGE( "Character set should be RTL_TEXTENCODING_DONTKNOW after default constructor called", RTL_TEXTENCODING_DONTKNOW, aFont.GetCharSet() ); - aFont.SetSymbolFlag(true); + aFont.SetCharSet( RTL_TEXTENCODING_SYMBOL ); CPPUNIT_ASSERT_MESSAGE( "Test 1: Symbol font flag should be on", aFont.IsSymbolFont() ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Test 1: Character set should be RTL_TEXTENCODING_SYMBOL", RTL_TEXTENCODING_SYMBOL, aFont.GetCharSet() ); - aFont.SetSymbolFlag(false); - - CPPUNIT_ASSERT_MESSAGE( "Test 2: Symbol font flag should be off", !aFont.IsSymbolFont() ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Test 2: Character set should be RTL_TEXTENCODING_DONTKNOW", - RTL_TEXTENCODING_DONTKNOW, aFont.GetCharSet() ); - - aFont.SetCharSet( RTL_TEXTENCODING_SYMBOL ); - - CPPUNIT_ASSERT_MESSAGE( "Test 3: Symbol font flag should be on", aFont.IsSymbolFont() ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Test 3: Character set should be RTL_TEXTENCODING_SYMBOL", - RTL_TEXTENCODING_SYMBOL, aFont.GetCharSet() ); - aFont.SetCharSet( RTL_TEXTENCODING_UNICODE ); - CPPUNIT_ASSERT_MESSAGE( "Test 4: Symbol font flag should be off", !aFont.IsSymbolFont() ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Test 4: Character set should be RTL_TEXTENCODING_UNICODE", + CPPUNIT_ASSERT_MESSAGE( "Test 2: Symbol font flag should be off", !aFont.IsSymbolFont() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Test 2: Character set should be RTL_TEXTENCODING_UNICODE", RTL_TEXTENCODING_UNICODE, aFont.GetCharSet() ); } diff --git a/vcl/source/font/font.cxx b/vcl/source/font/font.cxx index c858048e5b23..afaa430e19f7 100644 --- a/vcl/source/font/font.cxx +++ b/vcl/source/font/font.cxx @@ -176,24 +176,6 @@ bool Font::IsSymbolFont() const return mpImplFont->IsSymbolFont(); } -void Font::SetSymbolFlag( bool bSymbol ) -{ - if (const_cast<const ImplType&>(mpImplFont)->mbSymbolFlag != bSymbol) - { - mpImplFont->SetSymbolFlag( bSymbol ); - - if ( IsSymbolFont() ) - { - mpImplFont->SetCharSet( RTL_TEXTENCODING_SYMBOL ); - } - else - { - if ( std::as_const(mpImplFont)->GetCharSet() == RTL_TEXTENCODING_SYMBOL ) - mpImplFont->SetCharSet( RTL_TEXTENCODING_DONTKNOW ); - } - } -} - void Font::SetLanguageTag( const LanguageTag& rLanguageTag ) { if (const_cast<const ImplType&>(mpImplFont)->maLanguageTag != rLanguageTag)
