summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-03-31 14:54:00 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-03-31 15:25:11 +0100
commitf4b7338f989bd5f7e934c4dc38045e812eb3d59f (patch)
tree55a930451f27fa3e3c38c0b1cdfbd909d3a68c36
parente3aa0e4c567afc734c45c715e44d9e3040cb9f29 (diff)
Resolves: tdf#106515 use OpenSymbol, not StarSymbol as the default bullet font
For choosing a bullet from a real font it matters while otherwise its a synonym. Of course we have this code duplicated three times. Change-Id: I2428b9a23d997925de3e731b8afe9fb8cf18ed54
-rw-r--r--cui/source/tabpages/numpages.cxx4
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx2
-rw-r--r--svx/source/sidebar/nbdtmg.cxx2
3 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 3da5e1033da7..4516054ff2c8 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -130,7 +130,7 @@ static SvxNumSettings_Impl* lcl_CreateNumSettingsPtr(const Sequence<PropertyValu
return pNew;
}
-// the selection of bullets from the StarSymbol
+// the selection of bullets from the OpenSymbol
static const sal_Unicode aBulletTypes[] =
{
0x2022,
@@ -160,7 +160,7 @@ static bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask)
static vcl::Font& lcl_GetDefaultBulletFont()
{
static bool bInit = false;
- static vcl::Font aDefBulletFont( "StarSymbol", OUString(), Size( 0, 14 ) );
+ static vcl::Font aDefBulletFont("OpenSymbol", "", Size(0, 14));
if(!bInit)
{
aDefBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL );
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index f4c27d362f19..79791f414242 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -81,7 +81,7 @@ static const sal_Unicode aBulletTypes[] =
static vcl::Font& lcl_GetDefaultBulletFont()
{
static bool bInit = false;
- static vcl::Font aDefBulletFont( "StarSymbol", "", Size( 0, 14 ) );
+ static vcl::Font aDefBulletFont("OpenSymbol", "", Size(0, 14));
if(!bInit)
{
aDefBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL );
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index b1c1f6a4386f..170032fea9a5 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -66,7 +66,7 @@ namespace svx { namespace sidebar {
vcl::Font& lcl_GetDefaultBulletFont()
{
static bool bInit = false;
- static vcl::Font aDefBulletFont( "StarSymbol", "", Size( 0, 14 ) );
+ static vcl::Font aDefBulletFont("OpenSymbol", "", Size(0, 14));
if(!bInit)
{
aDefBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL );