diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-11 13:41:56 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-11 13:42:42 +0100 |
| commit | 556f1eab63555019865803c055454b7b69c2d75b (patch) | |
| tree | d51d6db8b1e8cda466bc69759a096b51ab9fc946 /shell/source/win32 | |
| parent | b58b241f3a42255cce56ff14b5ce8fc7245d11ca (diff) | |
loplugin:externvar (clang-cl)
Change-Id: I9efdd5136fdf793e0075b91fcfae4fed42050109
Diffstat (limited to 'shell/source/win32')
4 files changed, 15 insertions, 17 deletions
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx index edb7ab25910c..1dd38a0973ea 100644 --- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx +++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx @@ -37,7 +37,7 @@ // Module global long g_DllRefCnt = 0; -HINSTANCE g_hModule = nullptr; +static HINSTANCE g_hModule = nullptr; // Map of property keys to the locations of their value(s) in the .??? XML schema struct PROPERTYMAP @@ -56,7 +56,7 @@ const PROPERTYMAP g_rgPROPERTYMAP[] = { PKEY_Comment, L"LibreOffice", L"Comments" }, }; -size_t gPropertyMapTableSize = SAL_N_ELEMENTS(g_rgPROPERTYMAP); +size_t const gPropertyMapTableSize = SAL_N_ELEMENTS(g_rgPROPERTYMAP); CPropertyHdl::CPropertyHdl( long nRefCnt ) : diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx index cba73c410145..24833812d821 100644 --- a/shell/source/win32/shlxthandler/shlxthdl.cxx +++ b/shell/source/win32/shlxthandler/shlxthdl.cxx @@ -37,18 +37,18 @@ HINSTANCE g_hModule = nullptr; namespace /* private */ { - const char* GUID_PLACEHOLDER = "{GUID}"; - const char* EXTENSION_PLACEHOLDER = "{EXT}"; - const char* FORWARDKEY_PLACEHOLDER = "{FWDKEY}"; - - const char* CLSID_ENTRY = "CLSID\\{GUID}\\InProcServer32"; - const char* SHELLEX_IID_ENTRY = "{EXT}\\shellex\\{GUID}"; - const char* SHELLEX_ENTRY = "{EXT}\\shellex"; - const char* FORWARD_PROPSHEET_MYPROPSHEET_ENTRY = "{FWDKEY}\\shellex\\PropertySheetHandlers\\MyPropSheet1"; - const char* FORWARD_PROPSHEET_ENTRY = "{FWDKEY}\\shellex\\PropertySheetHandlers"; - const char* FORWARD_SHELLEX_ENTRY = "{FWDKEY}\\shellex"; - - const char* SHELL_EXTENSION_APPROVED_KEY_NAME = "Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"; + const char* const GUID_PLACEHOLDER = "{GUID}"; + const char* const EXTENSION_PLACEHOLDER = "{EXT}"; + const char* const FORWARDKEY_PLACEHOLDER = "{FWDKEY}"; + + const char* const CLSID_ENTRY = "CLSID\\{GUID}\\InProcServer32"; + const char* const SHELLEX_IID_ENTRY = "{EXT}\\shellex\\{GUID}"; + const char* const SHELLEX_ENTRY = "{EXT}\\shellex"; + const char* const FORWARD_PROPSHEET_MYPROPSHEET_ENTRY = "{FWDKEY}\\shellex\\PropertySheetHandlers\\MyPropSheet1"; + const char* const FORWARD_PROPSHEET_ENTRY = "{FWDKEY}\\shellex\\PropertySheetHandlers"; + const char* const FORWARD_SHELLEX_ENTRY = "{FWDKEY}\\shellex"; + + const char* const SHELL_EXTENSION_APPROVED_KEY_NAME = "Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved"; // "String Placeholder" -> diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx index f7ddd6103346..740ae5708c93 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx +++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx @@ -48,8 +48,6 @@ #endif #include <memory> -extern HINSTANCE g_hModule; - namespace internal { /* The signet.png used for thumbnails of signed documents diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx index cb25d7c57e0d..1b0327dc18c8 100644 --- a/shell/source/win32/simplemail/senddoc.cxx +++ b/shell/source/win32/simplemail/senddoc.cxx @@ -170,7 +170,7 @@ void initMapiMessage( pMapiMessage->nFileCount = aMapiAttachmentList.size(); } -const char* KnownParameter[] = +const char* const KnownParameter[] = { "--to", "--cc", |