summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-12-06 16:50:38 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-12-06 19:21:21 +0100
commitb1acb9c62701d8f09fafdf5b7c2b690249a277b8 (patch)
tree09816a74d80cb004f6074da763b725f53672390a /vcl
parent0a803c0a41f46be4019ddd2768b4be5669b7ab59 (diff)
loplugin:external (macOS)
* OldEntry in fpicker/source/aqua/resourceprovider.mm was apparently unused ever since it got introduced with 00657aef09d854c74fb426a935a3e8b1fc390bb0 "migrate to boost::gettext" * impl_throwError is used from multiple TU, connectivity/source/drivers/macab/MacabStatement.cxx just missed the relevant #include Change-Id: Iba131da57aa20085bb1c634ba9a3a59566070abd Reviewed-on: https://gerrit.libreoffice.org/84653 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/osx/DataFlavorMapping.cxx25
-rw-r--r--vcl/osx/printaccessoryview.mm12
-rw-r--r--vcl/osx/salinst.cxx4
-rw-r--r--vcl/osx/salobj.cxx4
-rw-r--r--vcl/quartz/ctfonts.cxx4
-rw-r--r--vcl/quartz/salbmp.cxx9
-rw-r--r--vcl/quartz/salgdi.cxx4
7 files changed, 58 insertions, 4 deletions
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 48dc56a3037c..c63bc3321d16 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -146,8 +146,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
return (theType == cppu::UnoType<OUString>::get() );
}
-} // unnamed namespace
-
/* A base class for other data provider.
*/
class DataProviderBaseImpl : public DataProvider
@@ -163,6 +161,8 @@ protected:
id mSystemData;
};
+} // unnamed namespace
+
DataProviderBaseImpl::DataProviderBaseImpl(const Any& data) :
mData(data),
mSystemData(nil)
@@ -183,6 +183,8 @@ DataProviderBaseImpl::~DataProviderBaseImpl()
}
}
+namespace {
+
class UniDataProvider : public DataProviderBaseImpl
{
public:
@@ -195,6 +197,8 @@ public:
virtual Any getOOoData() override;
};
+}
+
UniDataProvider::UniDataProvider(const Any& data) :
DataProviderBaseImpl(data)
{
@@ -234,6 +238,8 @@ Any UniDataProvider::getOOoData()
return oOOData;
}
+namespace {
+
class ByteSequenceDataProvider : public DataProviderBaseImpl
{
public:
@@ -246,6 +252,8 @@ public:
virtual Any getOOoData() override;
};
+}
+
ByteSequenceDataProvider::ByteSequenceDataProvider(const Any& data) :
DataProviderBaseImpl(data)
{
@@ -284,6 +292,8 @@ Any ByteSequenceDataProvider::getOOoData()
return oOOData;
}
+namespace {
+
class HTMLFormatDataProvider : public DataProviderBaseImpl
{
public:
@@ -294,6 +304,8 @@ public:
virtual Any getOOoData() override;
};
+}
+
HTMLFormatDataProvider::HTMLFormatDataProvider(NSData* data) :
DataProviderBaseImpl(data)
{
@@ -340,6 +352,9 @@ Any HTMLFormatDataProvider::getOOoData()
return oOOData;
}
+namespace {
+
+
class PNGDataProvider : public DataProviderBaseImpl
{
NSBitmapImageFileType meImageType;
@@ -353,6 +368,8 @@ public:
virtual Any getOOoData() override;
};
+}
+
PNGDataProvider::PNGDataProvider( const Any& data, NSBitmapImageFileType eImageType) :
DataProviderBaseImpl(data),
meImageType( eImageType )
@@ -404,6 +421,8 @@ Any PNGDataProvider::getOOoData()
return oOOData;
}
+namespace {
+
class FileListDataProvider : public DataProviderBaseImpl
{
public:
@@ -414,6 +433,8 @@ public:
virtual Any getOOoData() override;
};
+}
+
FileListDataProvider::FileListDataProvider(const Any& data) :
DataProviderBaseImpl(data)
{
diff --git a/vcl/osx/printaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index c494ec7b2b7c..48d99ec384ba 100644
--- a/vcl/osx/printaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -46,8 +46,12 @@ using namespace com::sun::star;
using namespace com::sun::star::beans;
using namespace com::sun::star::uno;
+namespace {
+
class ControllerProperties;
+}
+
@interface ControlTarget : NSObject
{
ControllerProperties* mpController;
@@ -149,6 +153,8 @@ class ControllerProperties;
@end
+namespace {
+
class ControllerProperties
{
std::map< int, OUString > maTagToPropertyName;
@@ -315,6 +321,8 @@ public:
};
+}
+
static OUString filterAccelerator( OUString const & rText )
{
OUStringBuffer aBuf( rText.getLength() );
@@ -419,6 +427,8 @@ static OUString filterAccelerator( OUString const & rText )
@end
+namespace {
+
struct ColumnItem
{
NSControl* pControl;
@@ -450,6 +460,8 @@ struct ColumnItem
}
};
+}
+
static void adjustViewAndChildren( NSView* pNSView, NSSize& rMaxSize,
std::vector< ColumnItem >& rLeftColumn,
std::vector< ColumnItem >& rRightColumn
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index ae8074295c59..6b5c177bc755 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -83,6 +83,8 @@ static int* gpnInit = nullptr;
static NSMenu* pDockMenu = nil;
static bool bLeftMain = false;
+namespace {
+
class AquaDelayedSettingsChanged : public Idle
{
bool mbInvalidate;
@@ -113,6 +115,8 @@ public:
}
};
+}
+
void AquaSalInstance::delayedSettingsChanged( bool bInvalidate )
{
osl::Guard< comphelper::SolarMutex > aGuard( *GetYieldMutex() );
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index 34679dcdbaf7..75969d4e6b8c 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -287,6 +287,8 @@ const SystemEnvData* AquaSalObject::GetSystemData() const
return &maSysData;
}
+namespace {
+
class AquaOpenGLContext : public OpenGLContext
{
public:
@@ -310,6 +312,8 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
virtual void swapBuffers() override;
};
+}
+
void AquaOpenGLContext::resetCurrent()
{
OSX_SALDATA_RUNINMAIN( resetCurrent() )
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 252720a0aa4e..d100e03b8910 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -143,9 +143,13 @@ bool CoreTextStyle::ImplGetGlyphBoundRect(sal_GlyphId nId, tools::Rectangle& rRe
return true;
}
+namespace {
+
// callbacks from CTFontCreatePathForGlyph+CGPathApply for GetGlyphOutline()
struct GgoData { basegfx::B2DPolygon maPolygon; basegfx::B2DPolyPolygon* mpPolyPoly; };
+}
+
static void MyCGPathApplierFunc( void* pData, const CGPathElement* pElement )
{
basegfx::B2DPolygon& rPolygon = static_cast<GgoData*>(pData)->maPolygon;
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 117c038c844e..2f6820b2877e 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -599,13 +599,18 @@ sal_uInt16 QuartzSalBitmap::GetBitCount() const
return mnBits;
}
-static struct pal_entry
+namespace {
+
+struct pal_entry
{
sal_uInt8 mnRed;
sal_uInt8 mnGreen;
sal_uInt8 mnBlue;
+};
+
}
-const aImplSalSysPalEntryAry[ 16 ] =
+
+static pal_entry const aImplSalSysPalEntryAry[ 16 ] =
{
{ 0, 0, 0 },
{ 0, 0, 0x80 },
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index b6df53319e28..000141123d7e 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -57,6 +57,8 @@
using namespace vcl;
+namespace {
+
class CoreTextGlyphFallbackSubstititution
: public ImplGlyphFallbackFontSubstitution
{
@@ -64,6 +66,8 @@ public:
bool FindFontSubstitute(FontSelectPattern&, LogicalFontInstance* pLogicalFont, OUString&) const override;
};
+}
+
bool CoreTextGlyphFallbackSubstititution::FindFontSubstitute(FontSelectPattern& rPattern, LogicalFontInstance* pLogicalFont,
OUString& rMissingChars) const
{