[Libreoffice-commits] core.git: desktop/source dtrans/source extensions/source fpicker/source sal/osl setup_native/source shell/source vcl/win
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 4 18:21:29 UTC 2020
desktop/source/minidump/minidump.cxx | 2
dtrans/source/win32/ftransl/ftransl.cxx | 2
extensions/source/scanner/scanwin.cxx | 2
fpicker/source/win32/VistaFilePickerEventHandler.cxx | 4
fpicker/source/win32/VistaFilePickerImpl.cxx | 32 ++--
fpicker/source/win32/VistaFilePickerImpl.hxx | 68 +++++-----
sal/osl/w32/file_dirvol.cxx | 6
sal/osl/w32/file_error.cxx | 2
setup_native/source/win32/customactions/inst_msu/inst_msu.cxx | 2
setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx | 10 -
setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx | 2
shell/source/win32/spsupp/spsuppServ.cxx | 2
vcl/win/gdi/salfont.cxx | 4
vcl/win/gdi/salprn.cxx | 4
vcl/win/window/keynames.cxx | 16 +-
vcl/win/window/salframe.cxx | 2
16 files changed, 80 insertions(+), 80 deletions(-)
New commits:
commit 924341e2c73e28b92fb927f2a4b5494ded5f257a
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Aug 4 15:42:52 2020 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Aug 4 20:20:41 2020 +0200
Improved loplugin:staticanonymous -> redundantstatic redux, clang-cl
Change-Id: Ie6dc22edbcfdf05ab8d7d668cb7cc33b5b747995
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100100
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/desktop/source/minidump/minidump.cxx b/desktop/source/minidump/minidump.cxx
index cdf7bf049ecb..5c245abde693 100644
--- a/desktop/source/minidump/minidump.cxx
+++ b/desktop/source/minidump/minidump.cxx
@@ -16,7 +16,7 @@
#include <curl/curl.h>
-static const char kUserAgent[] = "Breakpad/1.0 (Linux)";
+const char kUserAgent[] = "Breakpad/1.0 (Linux)";
static std::map<std::string, std::string> readStrings(std::istream& file)
{
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index f2c5d6487e48..991bc2d2c10f 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -89,7 +89,7 @@ FormatEntry::FormatEntry(
// format number we can stop if we find the first
// CF_INVALID
-static const std::vector< FormatEntry > g_TranslTable {
+const std::vector< FormatEntry > g_TranslTable {
//SotClipboardFormatId::DIF
FormatEntry("application/x-openoffice-dif;windows_formatname=\"DIF\"", "DIF", "DIF", CF_DIF, CPPUTYPE_DEFAULT),
// SotClipboardFormatId::BITMAP
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 58fca685fac3..bfe4c3c37006 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -125,7 +125,7 @@ private:
void Reset(); // cleanup thread and manager
};
-static Twain aTwain;
+Twain aTwain;
Twain::ShimListenerThread::ShimListenerThread(const VclPtr<vcl::Window>& xTopWindow)
: salhelper::Thread("TWAINShimListenerThread")
diff --git a/fpicker/source/win32/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/VistaFilePickerEventHandler.cxx
index a116a69092c2..4275adf3b749 100644
--- a/fpicker/source/win32/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/VistaFilePickerEventHandler.cxx
@@ -233,8 +233,8 @@ void VistaFilePickerEventHandler::stopListening()
}
}
-static const char PROP_CONTROL_ID[] = "control_id";
-static const char PROP_PICKER_LISTENER[] = "picker_listener";
+const char PROP_CONTROL_ID[] = "control_id";
+const char PROP_PICKER_LISTENER[] = "picker_listener";
namespace {
diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx b/fpicker/source/win32/VistaFilePickerImpl.cxx
index 3b8443a40c65..6c0c6b53856f 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -78,19 +78,19 @@ namespace vista{
// types, const etcpp.
-static const ::sal_Int16 INVALID_CONTROL_ID = -1;
-static const ::sal_Int16 INVALID_CONTROL_ACTION = -1;
+const ::sal_Int16 INVALID_CONTROL_ID = -1;
+const ::sal_Int16 INVALID_CONTROL_ACTION = -1;
// Guids used for IFileDialog::SetClientGuid
-static const GUID CLIENTID_FILEDIALOG_SIMPLE = {0xB8628FD3, 0xA3F5, 0x4845, 0x9B, 0x62, 0xD5, 0x1E, 0xDF, 0x97, 0xC4, 0x83};
-static const GUID CLIENTID_FILEDIALOG_OPTIONS = {0x93ED486F, 0x0D04, 0x4807, 0x8C, 0x44, 0xAC, 0x26, 0xCB, 0x6C, 0x5D, 0x36};
-static const GUID CLIENTID_FILESAVE_PASSWORD = {0xC12D4F4C, 0x4D41, 0x4D4F, 0x97, 0xEF, 0x87, 0xF9, 0x8D, 0xB6, 0x1E, 0xA6};
-static const GUID CLIENTID_FILESAVE_SELECTION = {0x5B2482B3, 0x0358, 0x4E09, 0xAA, 0x64, 0x2B, 0x76, 0xB2, 0xA0, 0xDD, 0xFE};
-static const GUID CLIENTID_FILESAVE_TEMPLATE = {0x9996D877, 0x20D5, 0x424B, 0x9C, 0x2E, 0xD3, 0xB6, 0x31, 0xEC, 0xF7, 0xCE};
-static const GUID CLIENTID_FILEOPEN_LINK_TEMPLATE = {0x32237796, 0x1509, 0x49D1, 0xBB, 0x7E, 0x63, 0xAD, 0x36, 0xAE, 0x86, 0x8C};
-static const GUID CLIENTID_FILEOPEN_LINK_ANCHOR = {0xBE3188CB, 0x399A, 0x45AE, 0x8F, 0x78, 0x75, 0x17, 0xAF, 0x26, 0x81, 0xEA};
-static const GUID CLIENTID_FILEOPEN_PLAY = {0x32CFB147, 0xF5AE, 0x4F90, 0xA1, 0xF1, 0x81, 0x20, 0x72, 0xBB, 0x2F, 0xC5};
-static const GUID CLIENTID_FILEOPEN_LINK = {0x39AC4BAE, 0x7D2D, 0x46BC, 0xBE, 0x2E, 0xF8, 0x8C, 0xB5, 0x65, 0x5E, 0x6A};
+const GUID CLIENTID_FILEDIALOG_SIMPLE = {0xB8628FD3, 0xA3F5, 0x4845, 0x9B, 0x62, 0xD5, 0x1E, 0xDF, 0x97, 0xC4, 0x83};
+const GUID CLIENTID_FILEDIALOG_OPTIONS = {0x93ED486F, 0x0D04, 0x4807, 0x8C, 0x44, 0xAC, 0x26, 0xCB, 0x6C, 0x5D, 0x36};
+const GUID CLIENTID_FILESAVE_PASSWORD = {0xC12D4F4C, 0x4D41, 0x4D4F, 0x97, 0xEF, 0x87, 0xF9, 0x8D, 0xB6, 0x1E, 0xA6};
+const GUID CLIENTID_FILESAVE_SELECTION = {0x5B2482B3, 0x0358, 0x4E09, 0xAA, 0x64, 0x2B, 0x76, 0xB2, 0xA0, 0xDD, 0xFE};
+const GUID CLIENTID_FILESAVE_TEMPLATE = {0x9996D877, 0x20D5, 0x424B, 0x9C, 0x2E, 0xD3, 0xB6, 0x31, 0xEC, 0xF7, 0xCE};
+const GUID CLIENTID_FILEOPEN_LINK_TEMPLATE = {0x32237796, 0x1509, 0x49D1, 0xBB, 0x7E, 0x63, 0xAD, 0x36, 0xAE, 0x86, 0x8C};
+const GUID CLIENTID_FILEOPEN_LINK_ANCHOR = {0xBE3188CB, 0x399A, 0x45AE, 0x8F, 0x78, 0x75, 0x17, 0xAF, 0x26, 0x81, 0xEA};
+const GUID CLIENTID_FILEOPEN_PLAY = {0x32CFB147, 0xF5AE, 0x4F90, 0xA1, 0xF1, 0x81, 0x20, 0x72, 0xBB, 0x2F, 0xC5};
+const GUID CLIENTID_FILEOPEN_LINK = {0x39AC4BAE, 0x7D2D, 0x46BC, 0xBE, 0x2E, 0xF8, 0x8C, 0xB5, 0x65, 0x5E, 0x6A};
static OUString lcl_getURLFromShellItem (IShellItem* pItem)
@@ -533,11 +533,11 @@ void VistaFilePickerImpl::impl_sta_CreateFolderPicker(const RequestRef& rRequest
}
-static const ::sal_Int32 GROUP_VERSION = 1;
-static const ::sal_Int32 GROUP_TEMPLATE = 2;
-static const ::sal_Int32 GROUP_IMAGETEMPLATE = 3;
-static const ::sal_Int32 GROUP_CHECKBOXES = 4;
-static const ::sal_Int32 GROUP_IMAGEANCHOR = 5;
+const ::sal_Int32 GROUP_VERSION = 1;
+const ::sal_Int32 GROUP_TEMPLATE = 2;
+const ::sal_Int32 GROUP_IMAGETEMPLATE = 3;
+const ::sal_Int32 GROUP_CHECKBOXES = 4;
+const ::sal_Int32 GROUP_IMAGEANCHOR = 5;
static void setLabelToControl(TFileDialogCustomize iCustom, sal_uInt16 nControlId)
diff --git a/fpicker/source/win32/VistaFilePickerImpl.hxx b/fpicker/source/win32/VistaFilePickerImpl.hxx
index 0fee8587c89e..d60e3acbe020 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.hxx
@@ -47,40 +47,40 @@ namespace vista{
// types, const etcpp
-static const ::sal_Int32 FEATURE_AUTOEXTENSION = 1;
-static const ::sal_Int32 FEATURE_PASSWORD = 2;
-static const ::sal_Int32 FEATURE_FILTEROPTIONS = 4;
-static const ::sal_Int32 FEATURE_SELECTION = 8;
-static const ::sal_Int32 FEATURE_TEMPLATE = 16;
-static const ::sal_Int32 FEATURE_LINK = 32;
-static const ::sal_Int32 FEATURE_PREVIEW = 64;
-static const ::sal_Int32 FEATURE_IMAGETEMPLATE = 128;
-static const ::sal_Int32 FEATURE_PLAY = 256;
-static const ::sal_Int32 FEATURE_READONLY = 512;
-static const ::sal_Int32 FEATURE_VERSION = 1024;
-static const ::sal_Int32 FEATURE_GPGPASSWORD = 2048;
-static const ::sal_Int32 FEATURE_IMAGEANCHOR = 4096;
-
-static const OUString PROP_PICKER_LISTENER("picker_listener" ); // [XFilePickerListenert]
-static const OUString PROP_DIALOG_SHOW_RESULT("dialog_show_result" ); // [sal_Bool] true=OK, false=CANCEL
-static const OUString PROP_SELECTED_FILES("selected_files" ); // [seq< OUString >] contains all user selected files (can be empty!)
-static const OUString PROP_MULTISELECTION_MODE("multiselection_mode"); // [sal_Bool] true=ON, false=OFF
-static const OUString PROP_TITLE("title" ); // [OUString]
-static const OUString PROP_FILENAME("filename" ); // [OUString]
-static const OUString PROP_DIRECTORY("directory" ); // [OUString]
-static const OUString PROP_FEATURES("features" ); // [sal_Int32]
-static const OUString PROP_TEMPLATE_DESCR("templatedescription"); // [sal_Int32]
-static const OUString PROP_FILTER_TITLE("filter_title" ); // [OUString]
-static const OUString PROP_FILTER_VALUE("filter_value" ); // [OUString]
-static const OUString PROP_FILTER_GROUP("filter-group" ); // [seq< css:beans::StringPair >] contains a group of filters
-
-static const OUString PROP_CONTROL_ID("control_id" ); // [sal_Int16]
-static const OUString PROP_CONTROL_ACTION("control_action" ); // [sal_Int16]
-static const OUString PROP_CONTROL_VALUE("control_value" ); // [Any]
-static const OUString PROP_CONTROL_LABEL("control_label" ); // [OUString]
-static const OUString PROP_CONTROL_ENABLE("control_enable" ); // [sal_Bool] true=ON, false=OFF
-static const OUString PROP_PARENT_WINDOW("ParentWindow"); //[css::awt::XWindow] preferred parent window
-static const OUString STRING_SEPARATOR("------------------------------------------" );
+const ::sal_Int32 FEATURE_AUTOEXTENSION = 1;
+const ::sal_Int32 FEATURE_PASSWORD = 2;
+const ::sal_Int32 FEATURE_FILTEROPTIONS = 4;
+const ::sal_Int32 FEATURE_SELECTION = 8;
+const ::sal_Int32 FEATURE_TEMPLATE = 16;
+const ::sal_Int32 FEATURE_LINK = 32;
+const ::sal_Int32 FEATURE_PREVIEW = 64;
+const ::sal_Int32 FEATURE_IMAGETEMPLATE = 128;
+const ::sal_Int32 FEATURE_PLAY = 256;
+const ::sal_Int32 FEATURE_READONLY = 512;
+const ::sal_Int32 FEATURE_VERSION = 1024;
+const ::sal_Int32 FEATURE_GPGPASSWORD = 2048;
+const ::sal_Int32 FEATURE_IMAGEANCHOR = 4096;
+
+const OUString PROP_PICKER_LISTENER("picker_listener" ); // [XFilePickerListenert]
+const OUString PROP_DIALOG_SHOW_RESULT("dialog_show_result" ); // [sal_Bool] true=OK, false=CANCEL
+const OUString PROP_SELECTED_FILES("selected_files" ); // [seq< OUString >] contains all user selected files (can be empty!)
+const OUString PROP_MULTISELECTION_MODE("multiselection_mode"); // [sal_Bool] true=ON, false=OFF
+const OUString PROP_TITLE("title" ); // [OUString]
+const OUString PROP_FILENAME("filename" ); // [OUString]
+const OUString PROP_DIRECTORY("directory" ); // [OUString]
+const OUString PROP_FEATURES("features" ); // [sal_Int32]
+const OUString PROP_TEMPLATE_DESCR("templatedescription"); // [sal_Int32]
+const OUString PROP_FILTER_TITLE("filter_title" ); // [OUString]
+const OUString PROP_FILTER_VALUE("filter_value" ); // [OUString]
+const OUString PROP_FILTER_GROUP("filter-group" ); // [seq< css:beans::StringPair >] contains a group of filters
+
+const OUString PROP_CONTROL_ID("control_id" ); // [sal_Int16]
+const OUString PROP_CONTROL_ACTION("control_action" ); // [sal_Int16]
+const OUString PROP_CONTROL_VALUE("control_value" ); // [Any]
+const OUString PROP_CONTROL_LABEL("control_label" ); // [OUString]
+const OUString PROP_CONTROL_ENABLE("control_enable" ); // [sal_Bool] true=ON, false=OFF
+const OUString PROP_PARENT_WINDOW("ParentWindow"); //[css::awt::XWindow] preferred parent window
+const OUString STRING_SEPARATOR("------------------------------------------" );
/** native implementation of the file picker on Vista and upcoming windows versions.
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index d581e1536595..bf8e8fbcd9d6 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -31,9 +31,9 @@
#include <sal/log.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
-static const wchar_t UNC_PREFIX[] = L"\\\\";
-static const wchar_t BACKSLASH = '\\';
-static const wchar_t SLASH = '/';
+const wchar_t UNC_PREFIX[] = L"\\\\";
+const wchar_t BACKSLASH = '\\';
+const wchar_t SLASH = '/';
BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime)
{
diff --git a/sal/osl/w32/file_error.cxx b/sal/osl/w32/file_error.cxx
index c9f8b8a3cc3e..feefaca388ce 100644
--- a/sal/osl/w32/file_error.cxx
+++ b/sal/osl/w32/file_error.cxx
@@ -31,7 +31,7 @@ struct osl_file_error_entry
}
-static const struct osl_file_error_entry errtable[] = {
+const struct osl_file_error_entry errtable[] = {
{ ERROR_SUCCESS, osl_File_E_None }, /* 0 */
{ ERROR_INVALID_FUNCTION, osl_File_E_INVAL }, /* 1 */
{ ERROR_FILE_NOT_FOUND, osl_File_E_NOENT }, /* 2 */
diff --git a/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx b/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
index 26f7668ff069..5dc47993a132 100644
--- a/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
+++ b/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx
@@ -112,7 +112,7 @@ void WriteLogElem(MSIHANDLE hInst, MSIHANDLE hRec, std::ostringstream& sTmpl, UI
WriteLogElem(hInst, hRec, sTmpl, nField, elem.c_str(), others...);
}
-static std::string sLogPrefix;
+std::string sLogPrefix;
template <class... StrType> void WriteLog(MSIHANDLE hInst, const StrType&... elements)
{
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 1a2e82eb7c54..70ba1cc5246c 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -62,11 +62,11 @@ static const WCHAR* g_Extensions[] =
nullptr
};
-static const int WORD_START = 0;
-static const int EXCEL_START = 9;
-static const int POWERPOINT_START = 20;
-static const int VISIO_START = 30;
-static const int VISIO_END = 32;
+const int WORD_START = 0;
+const int EXCEL_START = 9;
+const int POWERPOINT_START = 20;
+const int VISIO_START = 30;
+const int VISIO_END = 32;
// ".xlam", // Office Excel 2007 XML macro-enabled add-in
// ".ppam", // Office PowerPoint 2007 macro-enabled XML add-in
diff --git a/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx b/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx
index c7b1cc742938..e7e7013f3471 100644
--- a/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx
+++ b/setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx
@@ -111,7 +111,7 @@ void WriteLogElem(MSIHANDLE hInst, MSIHANDLE hRec, std::ostringstream& sTmpl, UI
WriteLogElem(hInst, hRec, sTmpl, nField, elem.c_str(), others...);
}
-static std::string sLogPrefix;
+std::string sLogPrefix;
template <class... StrType> void WriteLog(MSIHANDLE hInst, const StrType&... elements)
{
diff --git a/shell/source/win32/spsupp/spsuppServ.cxx b/shell/source/win32/spsupp/spsuppServ.cxx
index c5b10e53b943..abd5ec6070d2 100644
--- a/shell/source/win32/spsupp/spsuppServ.cxx
+++ b/shell/source/win32/spsupp/spsuppServ.cxx
@@ -87,7 +87,7 @@ BOOL APIENTRY DllMain( HANDLE hinstDLL,
namespace {
// {F1924D0C-9B35-4A46-BCDE-CFEF2CE67A17}
- static const IID CLSID_spsupp =
+ const IID CLSID_spsupp =
{ 0xf1924d0c, 0x9b35, 0x4a46, { 0xbc, 0xde, 0xcf, 0xef, 0x2c, 0xe6, 0x7a, 0x17 } };
}
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index ce1a8bd610a0..be4af132db1d 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -65,7 +65,7 @@
using namespace vcl;
-static const int MAXFONTHEIGHT = 2048;
+const int MAXFONTHEIGHT = 2048;
static FIXED FixedFromDouble( double d )
{
@@ -254,7 +254,7 @@ namespace
// with a font that is supported and always available.
// Based on:
// https://dxr.mozilla.org/mozilla-esr10/source/gfx/thebes/gfxDWriteFontList.cpp#1057
-static const std::map<OUString, OUString> aBitmapFontSubs =
+const std::map<OUString, OUString> aBitmapFontSubs =
{
{ "MS Sans Serif", "Microsoft Sans Serif" },
{ "MS Serif", "Times New Roman" },
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index 7947cd9a6406..053c503b1671 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -87,8 +87,8 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::ui::dialogs;
-static const wchar_t aImplWindows[] = L"windows";
-static const wchar_t aImplDevice[] = L"device";
+const wchar_t aImplWindows[] = L"windows";
+const wchar_t aImplDevice[] = L"device";
static DEVMODEW const * SAL_DEVMODE_W( const ImplJobSetup* pSetupData )
{
diff --git a/vcl/win/window/keynames.cxx b/vcl/win/window/keynames.cxx
index 0d4f12f82cb8..d1dac8f08c5c 100644
--- a/vcl/win/window/keynames.cxx
+++ b/vcl/win/window/keynames.cxx
@@ -72,7 +72,7 @@ namespace vcl_sal {
// Every string value in the replacements tables must be in UTF-8
// but with the UTF-8 bytes encoded, not as such! Be careful!
- static const struct KeysNameReplacement aImplReplacements_Asturian[] =
+ const struct KeysNameReplacement aImplReplacements_Asturian[] =
{
{ PAPUGA_KEY_BACK, "Retrocesu" },
{ PAPUGA_KEY_ENTER, "Intro" },
@@ -90,7 +90,7 @@ namespace vcl_sal {
{ PAPUGA_KEY_SHIFT, "May\xc3\xba" "s" },
};
- static const struct KeysNameReplacement aImplReplacements_Catalan[] =
+ const struct KeysNameReplacement aImplReplacements_Catalan[] =
{
{ PAPUGA_KEY_BACK, "Retroc\xc3\xa9" "s" },
{ PAPUGA_KEY_ENTER, "Retorn" },
@@ -108,7 +108,7 @@ namespace vcl_sal {
{ PAPUGA_KEY_SHIFT, "Maj" },
};
- static const struct KeysNameReplacement aImplReplacements_Estonian[] =
+ const struct KeysNameReplacement aImplReplacements_Estonian[] =
{
{ PAPUGA_KEY_RIGHT, "Nool paremale" },
{ PAPUGA_KEY_LEFT, "Nool vasakule" },
@@ -119,7 +119,7 @@ namespace vcl_sal {
{ PAPUGA_KEY_SPACEBAR, "T\xc3\xbc" "hik" },
};
- static const struct KeysNameReplacement aImplReplacements_Lithuanian[] =
+ const struct KeysNameReplacement aImplReplacements_Lithuanian[] =
{
{ PAPUGA_KEY_ESC, "Gr" },
{ PAPUGA_KEY_BACK, "Naikinti" },
@@ -140,7 +140,7 @@ namespace vcl_sal {
{ PAPUGA_KEY_ALT, "Alt" },
};
- static const struct KeysNameReplacement aImplReplacements_Slovenian[] =
+ const struct KeysNameReplacement aImplReplacements_Slovenian[] =
{
{ PAPUGA_KEY_ESC, "Ube\xc5\xbe" "nica" },
{ PAPUGA_KEY_BACK, "Vra\xc4\x8d" "alka" },
@@ -161,7 +161,7 @@ namespace vcl_sal {
{ PAPUGA_KEY_ALT, "Izmenjalka" },
};
- static const struct KeysNameReplacement aImplReplacements_Spanish[] =
+ const struct KeysNameReplacement aImplReplacements_Spanish[] =
{
{ PAPUGA_KEY_BACK, "Retroceso" },
{ PAPUGA_KEY_ENTER, "Intro" },
@@ -179,7 +179,7 @@ namespace vcl_sal {
{ PAPUGA_KEY_SHIFT, "May\xc3\xba" "s" },
};
- static const struct KeysNameReplacement aImplReplacements_Hungarian[] =
+ const struct KeysNameReplacement aImplReplacements_Hungarian[] =
{
{ PAPUGA_KEY_RIGHT, "Jobbra" },
{ PAPUGA_KEY_LEFT, "Balra" },
@@ -189,7 +189,7 @@ namespace vcl_sal {
{ PAPUGA_KEY_SPACEBAR, "Sz\xc3\xb3" "k\xc3\xb6" "z" },
};
- static const struct KeyboardReplacements aKeyboards[] =
+ const struct KeyboardReplacements aKeyboards[] =
{
{ "ast",aImplReplacements_Asturian, SAL_N_ELEMENTS(aImplReplacements_Asturian) },
{ "ca", aImplReplacements_Catalan, SAL_N_ELEMENTS(aImplReplacements_Catalan) },
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index dc7f50f4a0f7..287863129a9f 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -525,7 +525,7 @@ HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, bool bAsChild )
// translation table from System keycodes into StartView keycodes
#define KEY_TAB_SIZE 146
-static const sal_uInt16 aImplTranslateKeyTab[KEY_TAB_SIZE] =
+const sal_uInt16 aImplTranslateKeyTab[KEY_TAB_SIZE] =
{
// StarView-Code System-Code Index
0, // 0
More information about the Libreoffice-commits
mailing list