7 files changed, 34 insertions, 0 deletions
diff --git a/sc/qa/extras/scddelinkobj.cxx b/sc/qa/extras/scddelinkobj.cxx
index 49a8fda8c244..a64104e661f1 100644
--- a/sc/qa/extras/scddelinkobj.cxx
+++ b/sc/qa/extras/scddelinkobj.cxx
@@ -45,6 +45,8 @@ static utl::TempFile createTempCopy(OUString const& url)
     return tmp;
 }
 
+namespace
+{
 struct TempFileBase
 {
     utl::TempFile m_TempFile;
@@ -53,6 +55,7 @@ struct TempFileBase
     {
     }
 };
+}
 
 class ScDDELinkObj : public CalcUnoApiTest,
                      public TempFileBase,
diff --git a/sc/qa/extras/scuniquecellformatsenumeration.cxx b/sc/qa/extras/scuniquecellformatsenumeration.cxx
index c0a8f9cdf8fa..ea6a76e7680d 100644
--- a/sc/qa/extras/scuniquecellformatsenumeration.cxx
+++ b/sc/qa/extras/scuniquecellformatsenumeration.cxx
@@ -30,6 +30,8 @@ using namespace css::uno;
 
 namespace sc_apitest
 {
+namespace
+{
 struct RGBColor
 {
     int m_nRed;
@@ -45,6 +47,7 @@ struct RGBColor
 
     sal_Int32 hashCode() const { return (255 << 24) | (m_nRed << 16) | (m_nGreen << 8) | m_nBlue; }
 };
+}
 
 class ScUniqueCellFormatsEnumeration : public CalcUnoApiTest, public apitest::XEnumeration
 {
diff --git a/sc/qa/unit/mark_test.cxx b/sc/qa/unit/mark_test.cxx
index f6c2e81ef356..6c2d3e870370 100644
--- a/sc/qa/unit/mark_test.cxx
+++ b/sc/qa/unit/mark_test.cxx
@@ -16,10 +16,20 @@
 #include <markdata.hxx>
 #include "../../source/core/data/markarr.cxx"
 #include "../../source/core/data/markmulti.cxx"
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsubobject-linkage"
+    // automatically suppressed in the main .cxx, but not in this included one
+#endif
 #include "../../source/core/data/segmenttree.cxx"
+#if defined __GNUC__ && !defined __clang__
+#pragma GCC diagnostic push
+#endif
 
 #include <utility>
 
+namespace {
+
 struct MarkTestData  // To represent a single rectangle part of a multiselection
 {
     ScRange aRange;
@@ -80,6 +90,8 @@ struct MultiMarkTestData
     std::vector<std::pair<SCCOL,SCCOL>> aColsWithUnequalMarksList;
 };
 
+}
+
 class Test : public CppUnit::TestFixture
 {
 public:
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 9110505667fc..e3c7bfae4d82 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1015,6 +1015,8 @@ void ScFiltersTest::testBorderODS()
     xDocSh->DoClose();
 }
 
+namespace {
+
 struct Border
 {
     sal_Int16 column;
@@ -1049,6 +1051,8 @@ struct Border
     lStyle(static_cast<SvxBorderLineStyle>(lSt)), tStyle(static_cast<SvxBorderLineStyle>(tSt)), rStyle(static_cast<SvxBorderLineStyle>(rSt)), bStyle(static_cast<SvxBorderLineStyle>(bSt)) {};
 };
 
+}
+
 void ScFiltersTest::testBordersOoo33()
 {
     std::vector<Border> borders;
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index ae28aadeae31..5f5e79cb7933 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1677,6 +1677,8 @@ static void checkMatrixElements(const ScMatrix& rMat)
     }
 }
 
+namespace {
+
 struct AllZeroMatrix
 {
     void operator() (SCSIZE /*nCol*/, SCSIZE /*nRow*/, const ScMatrixValue& rVal) const
@@ -1743,6 +1745,8 @@ struct PartiallyFilledEmptyMatrix
     }
 };
 
+}
+
 void Test::testMatrix()
 {
     svl::SharedStringPool& rPool = m_pDoc->GetSharedStringPool();
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 6bbe59d067ea..a8a98ce2fa44 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -5437,11 +5437,15 @@ void Test::testFuncVLOOKUP()
     m_pDoc->DeleteTab(0);
 }
 
+namespace {
+
 struct StrStrCheck {
     const char* pVal;
     const char* pRes;
 };
 
+}
+
 template<size_t DataSize, size_t FormulaSize, int Type>
 static void runTestMATCH(ScDocument* pDoc, const char* aData[DataSize], const StrStrCheck aChecks[FormulaSize])
 {
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index 7cb85e8c9bbf..b67880171d63 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -599,6 +599,8 @@ void Test::testSharedFormulasRefUpdateRange()
     m_pDoc->DeleteTab(0);
 }
 
+namespace {
+
 struct SortByArea
 {
     bool operator ()( const sc::AreaListener& rLeft, const sc::AreaListener& rRight ) const
@@ -622,6 +624,8 @@ struct SortByArea
     }
 };
 
+}
+
 void Test::testSharedFormulasRefUpdateRangeDeleteRow()
 {
     sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc.