summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-12-05 09:55:56 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-12-05 13:31:39 +0100
commit55e596956e56b175ab17b682e7c8ac7daeb9289a (patch)
tree3691e2f43d50019b5e0f0e0145714afb13bcc685 /shell
parent6a10149c5fef13721e3f83727a828556f8e1ec9a (diff)
loplugin:external (clang-cl)
...plus loplugin:consttobool and loplugin:fakebool fallout Change-Id: Ie3d8121815c080b13bea6d9deca1eb138ca56138 Reviewed-on: https://gerrit.libreoffice.org/84515 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/source/backends/wininetbe/wininetbackend.cxx5
-rw-r--r--shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx4
-rw-r--r--shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx4
-rw-r--r--shell/source/win32/zipfile/zipfile.cxx6
4 files changed, 12 insertions, 7 deletions
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index 7bc211747ec2..0a89b18507d7 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -46,17 +46,12 @@ struct Library {
~Library() { if (module) FreeLibrary(module); }
};
-}
-
struct ProxyEntry
{
OUString Server;
OUString Port;
};
-
-namespace
-{
ProxyEntry ReadProxyEntry(const OUString& aProxy, sal_Int32& i)
{
ProxyEntry aProxyEntry;
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 80f1d3bc2555..ae547afd2973 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -39,6 +39,8 @@
long g_DllRefCnt = 0;
static HINSTANCE g_hModule = nullptr;
+namespace {
+
// Map of property keys to the locations of their value(s) in the .??? XML schema
struct PROPERTYMAP
{
@@ -47,6 +49,8 @@ struct PROPERTYMAP
PCWSTR pszValueNodeName;
};
+}
+
const PROPERTYMAP g_rgPROPERTYMAP[] =
{
{ PKEY_Title, L"LibreOffice", L"Title" },
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 4ea6f7e06577..484b7236f3e0 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -95,8 +95,6 @@ Gdiplus::Rect CalcScaledAspectRatio(const Gdiplus::Rect& src, const Gdiplus::Rec
return result;
}
-}
-
class StreamOnZipBuffer final : public IStream
{
public:
@@ -126,6 +124,8 @@ private:
size_t pos_;
};
+}
+
StreamOnZipBuffer::StreamOnZipBuffer(const ZipFile::ZipContentBuffer_t& zip_buffer) :
ref_count_(1),
ref_zip_buffer_(zip_buffer),
diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx
index 13f79a041018..1462c161a900 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -323,6 +323,9 @@ bool isZipStream(StreamInterface *stream)
namespace internal
{
+
+namespace {
+
/* for case in-sensitive string comparison */
struct stricmp
{
@@ -336,6 +339,9 @@ struct stricmp
std::string str_;
};
+
+}
+
} // namespace internal
/** Checks whether a file is a zip file or not