include/unotools/fontcfg.hxx | 3 +--
unotools/source/config/fontcfg.cxx | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 211a63a780659b404541cae619d10f204a8bfe65
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun May 2 12:45:42 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 2 18:00:02 2021 +0200
sal_uLong->sal_uInt32 in ImplFontAttrs
Change-Id: If0f9304eee98b442a5d3b4cdbf71230461e830bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114994
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx
index bf457e02ba13..99520e39528b 100644
--- a/include/unotools/fontcfg.hxx
+++ b/include/unotools/fontcfg.hxx
@@ -21,7 +21,6 @@
#include <config_options.h>
#include <unotools/unotoolsdllapi.h>
-#include <tools/solar.h>
#include <tools/fontenum.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <o3tl/typed_flags_set.hxx>
@@ -46,7 +45,7 @@ enum class DefaultFontType;
// Note that the bit flags must match the entries in the pAttribNames array in
// unotools/source/config/fontcfg.cxx.
-enum class ImplFontAttrs : sal_uLong
+enum class ImplFontAttrs : sal_uInt32
{
None = 0x00000000,
Default = 0x00000001, ///< Default-Font like Andale Sans UI, Palace
Script, Albany, Thorndale, Cumberland, ...
diff --git a/unotools/source/config/fontcfg.cxx
b/unotools/source/config/fontcfg.cxx
index d94a7bfdc661..7f6d68e8a40f 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -939,7 +939,7 @@ FontWidth FontSubstConfiguration::getSubstWidth( const
css::uno::Reference< XNam
ImplFontAttrs FontSubstConfiguration::getSubstType( const css::uno::Reference<
XNameAccess >& rFont,
const OUString& rType )
const
{
- sal_uLong type = 0;
+ sal_uInt32 type = 0;
try
{
Any aAny = rFont->getByName( rType );
@@ -955,7 +955,7 @@ ImplFontAttrs FontSubstConfiguration::getSubstType( const
css::uno::Reference< X
for( int k = 0; k < 32; k++ )
if( aToken.equalsIgnoreAsciiCaseAscii( pAttribNames[k] ) )
{
- type |= sal_uLong(1) << k;
+ type |= sal_uInt32(1) << k;
break;
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
