sal/osl/unx/nlsupport.cxx | 6 +++---
vcl/osx/DataFlavorMapping.cxx | 2 +-
vcl/quartz/salbmp.cxx | 8 ++++----
vcl/quartz/salgdicommon.cxx | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 4401f13a9e2d29503529c219f5f447c68b327007
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Jul 21 08:09:59 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Jul 21 09:19:33 2020 +0200
Improved oplugin:staticanonymous -> redundantstatic redux, macOS
Change-Id: I221351bdc43b48e714acca89bc84db007258299e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99115
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 3a0b1021e726..28d367c11ae9 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -650,7 +650,7 @@ void imp_getProcessLocale( rtl_Locale ** ppLocale )
* from the ISO language codes.
*/
-static const Pair full_locale_list[] = {
+const Pair full_locale_list[] = {
{ "ja_JP.eucJP", RTL_TEXTENCODING_EUC_JP },
{ "ja_JP.EUC", RTL_TEXTENCODING_EUC_JP },
{ "ko_KR.EUC", RTL_TEXTENCODING_EUC_KR },
@@ -658,7 +658,7 @@ static const Pair full_locale_list[] = {
{ "zh_TW.EUC", RTL_TEXTENCODING_EUC_TW }
};
-static const Pair locale_extension_list[] = {
+const Pair locale_extension_list[] = {
{ "big5", RTL_TEXTENCODING_BIG5 },
{ "big5hk", RTL_TEXTENCODING_BIG5_HKSCS },
{ "gb18030", RTL_TEXTENCODING_GB_18030 },
@@ -687,7 +687,7 @@ static const Pair locale_extension_list[] = {
{ "utf-8", RTL_TEXTENCODING_UTF8 }
};
-static const Pair iso_language_list[] = {
+const Pair iso_language_list[] = {
{ "af", RTL_TEXTENCODING_ISO_8859_1 },
{ "ar", RTL_TEXTENCODING_ISO_8859_6 },
{ "az", RTL_TEXTENCODING_ISO_8859_9 },
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index dfba27d20e31..07534d0c893b 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -109,7 +109,7 @@ namespace
/* At the moment it appears as if only MS Office pastes "public.html" to the
clipboard.
*/
- static const FlavorMap flavorMap[] =
+ const FlavorMap flavorMap[] =
{
{ NSPasteboardTypeString, "text/plain;charset=utf-16", "Unicode Text
(UTF-16)", true },
{ NSPasteboardTypeRTF, "text/rtf", "Rich Text Format", false },
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 43c39e66ca23..aa932de1fc69 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -45,9 +45,9 @@
#include "saldatabasic.hxx"
#endif
-static const unsigned long k32BitRedColorMask = 0x00ff0000;
-static const unsigned long k32BitGreenColorMask = 0x0000ff00;
-static const unsigned long k32BitBlueColorMask = 0x000000ff;
+const unsigned long k32BitRedColorMask = 0x00ff0000;
+const unsigned long k32BitGreenColorMask = 0x0000ff00;
+const unsigned long k32BitBlueColorMask = 0x000000ff;
static bool isValidBitCount( sal_uInt16 nBitCount )
{
@@ -610,7 +610,7 @@ struct pal_entry
}
-static pal_entry const aImplSalSysPalEntryAry[ 16 ] =
+pal_entry const aImplSalSysPalEntryAry[ 16 ] =
{
{ 0, 0, 0 },
{ 0, 0, 0x80 },
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 5acc4d4e4e77..c72e8ee5cabd 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -46,7 +46,7 @@
using namespace vcl;
-static const basegfx::B2DPoint aHalfPointOfs ( 0.5, 0.5 );
+const basegfx::B2DPoint aHalfPointOfs ( 0.5, 0.5 );
static void AddPolygonToPath( CGMutablePathRef xPath,
const basegfx::B2DPolygon& rPolygon,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
