diff options
author | Muhammet Kara <muhammet.kara@collabora.com> | 2020-05-24 03:03:37 +0300 |
---|---|---|
committer | Muhammet Kara <muhammet.kara@collabora.com> | 2020-05-25 01:35:57 +0200 |
commit | 21875558f6c478f07d68ff39e025d7ffd451674f (patch) | |
tree | 3ca2f78c0d4e4758e64f8a052cab8d3926ccbfb2 | |
parent | 787a6c2244af5646a9d1177ae294bfb891e2373b (diff) |
clang-format sc with under 5-percent lines of change
Files which could become clang-format conformant with
under 5-percent lines of change relative to the total
count of lines in the file are found by using bin/find-clang-format.py,
and fixed with /opt/lo/bin/clang-format -i <path-of-the-file>
There will be follow-up patches to fix all 'under-5-percent' files.
Change-Id: I2d37d9c94116d2823f9a21024bdb7ff1a6207d5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94744
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
41 files changed, 111 insertions, 140 deletions
diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx index b8edefe25acf..09e607ea88b8 100644 --- a/sc/inc/drawpage.hxx +++ b/sc/inc/drawpage.hxx @@ -35,7 +35,7 @@ public: virtual ScDrawPage* CloneSdrPage(SdrModel& rTargetModel) const override; - virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override; + virtual css::uno::Reference<css::uno::XInterface> createUnoPage() override; }; #endif diff --git a/sc/inc/globalnames.hxx b/sc/inc/globalnames.hxx index fb4c2dad4e2b..91745dae742a 100644 --- a/sc/inc/globalnames.hxx +++ b/sc/inc/globalnames.hxx @@ -10,7 +10,7 @@ #ifndef INCLUDED_SC_INC_GLOBALNAMES_HXX #define INCLUDED_SC_INC_GLOBALNAMES_HXX -#define STR_DB_LOCAL_NONAME "__Anonymous_Sheet_DB__" +#define STR_DB_LOCAL_NONAME "__Anonymous_Sheet_DB__" #define STR_DB_GLOBAL_NONAME "__Anonymous_DB__" #define STR_GLOBAL_RANGE_NAME "__Global_Range_Name__" diff --git a/sc/inc/refupdatecontext.hxx b/sc/inc/refupdatecontext.hxx index 39a46f6ac0ac..b8baf8622ebc 100644 --- a/sc/inc/refupdatecontext.hxx +++ b/sc/inc/refupdatecontext.hxx @@ -19,8 +19,8 @@ class ScDocument; -namespace sc { - +namespace sc +{ struct ColumnBlockPosition; class ColumnBlockPositionSet; @@ -86,7 +86,7 @@ struct RefUpdateContext bool isInserted() const; bool isDeleted() const; - void setBlockPositionReference( ColumnBlockPositionSet* blockPos ); + void setBlockPositionReference(ColumnBlockPositionSet* blockPos); ColumnBlockPosition* getBlockPosition(SCTAB nTab, SCCOL nCol); }; @@ -159,7 +159,6 @@ struct SetFormulaDirtyContext SetFormulaDirtyContext(); }; - } #endif diff --git a/sc/inc/simplerangelist.hxx b/sc/inc/simplerangelist.hxx index 442d5c4e7a68..bb4ae9a02a3f 100644 --- a/sc/inc/simplerangelist.hxx +++ b/sc/inc/simplerangelist.hxx @@ -43,7 +43,7 @@ public: SCCOL mnCol2; explicit Range(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); }; - typedef std::shared_ptr< ::std::list<Range> > RangeListRef; + typedef std::shared_ptr<::std::list<Range>> RangeListRef; typedef ::std::map<SCTAB, RangeListRef> TabType; ScSimpleRangeList(); diff --git a/sc/inc/undorangename.hxx b/sc/inc/undorangename.hxx index 3576c5449dd3..ac366b5d1219 100644 --- a/sc/inc/undorangename.hxx +++ b/sc/inc/undorangename.hxx @@ -23,9 +23,8 @@ class ScDocShell; class ScUndoAllRangeNames final : public ScSimpleUndo { public: - ScUndoAllRangeNames(ScDocShell* pDocSh, - const std::map<OUString, ScRangeName*>& rOldNames, - const std::map<OUString, std::unique_ptr<ScRangeName>>& rNewNames); + ScUndoAllRangeNames(ScDocShell* pDocSh, const std::map<OUString, ScRangeName*>& rOldNames, + const std::map<OUString, std::unique_ptr<ScRangeName>>& rNewNames); virtual ~ScUndoAllRangeNames() override; diff --git a/sc/inc/warnpassword.hxx b/sc/inc/warnpassword.hxx index fa2f1f6c9b5b..8897d220e2a5 100644 --- a/sc/inc/warnpassword.hxx +++ b/sc/inc/warnpassword.hxx @@ -30,7 +30,7 @@ public: an encrypted password is imported. @return true if yes and false if no. default to true. */ - static bool WarningOnPassword( SfxMedium& rMedium ); + static bool WarningOnPassword(SfxMedium& rMedium); }; #endif diff --git a/sc/qa/extras/scarealinkobj.cxx b/sc/qa/extras/scarealinkobj.cxx index 359dd2ce69de..ccde1b55079f 100644 --- a/sc/qa/extras/scarealinkobj.cxx +++ b/sc/qa/extras/scarealinkobj.cxx @@ -86,7 +86,9 @@ uno::Reference<uno::XInterface> ScAreaLinkObj::init() uno::UNO_QUERY_THROW); table::CellAddress aCellAddress(1, 2, 3); - xLinks->insertAtPosition(aCellAddress, m_directories.getURLFromSrc("/sc/qa/extras/testdocuments/scarealinkobj.ods"), "a2:b5", "", ""); + xLinks->insertAtPosition( + aCellAddress, m_directories.getURLFromSrc("/sc/qa/extras/testdocuments/scarealinkobj.ods"), + "a2:b5", "", ""); uno::Reference<sheet::XAreaLink> xLink(xLinks->getByIndex(0), uno::UNO_QUERY_THROW); return xLink; diff --git a/sc/qa/extras/sctabviewobj.cxx b/sc/qa/extras/sctabviewobj.cxx index b2002655610b..9fb100388653 100644 --- a/sc/qa/extras/sctabviewobj.cxx +++ b/sc/qa/extras/sctabviewobj.cxx @@ -49,7 +49,7 @@ class ScTabViewObj : public CalcUnoApiTest, public: ScTabViewObj(); - virtual uno::Reference< uno::XInterface > init() override; + virtual uno::Reference<uno::XInterface> init() override; virtual uno::Reference<uno::XInterface> getXSpreadsheet(const sal_Int16 nNumber = 0) override; virtual void setUp() override; @@ -90,7 +90,7 @@ public: CPPUNIT_TEST_SUITE_END(); private: - uno::Reference< lang::XComponent > mxComponent; + uno::Reference<lang::XComponent> mxComponent; }; ScTabViewObj::ScTabViewObj() @@ -100,7 +100,7 @@ ScTabViewObj::ScTabViewObj() { } -uno::Reference< uno::XInterface > ScTabViewObj::init() +uno::Reference<uno::XInterface> ScTabViewObj::init() { uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW); uno::Reference<frame::XModel> xModel(xDoc, uno::UNO_QUERY_THROW); diff --git a/sc/qa/unit/datacache.cxx b/sc/qa/unit/datacache.cxx index 078e2421f110..462408d7c651 100644 --- a/sc/qa/unit/datacache.cxx +++ b/sc/qa/unit/datacache.cxx @@ -20,7 +20,6 @@ class ScCacheTest : public CppUnit::TestFixture { public: - void testCacheSimple(); void testCacheString(); void testCacheFormula(); @@ -106,7 +105,7 @@ void ScCacheTest::testCacheFormula() aNewDoc.InsertTab(0, "test"); aNewDoc.RestoreTabFromCache(0, aStrm); - std::vector<OUString> aFormulas = {"=B1", "=B2", "=B3", "=B4", "=B5", "=B1"}; + std::vector<OUString> aFormulas = { "=B1", "=B2", "=B3", "=B4", "=B5", "=B1" }; for (SCROW nRow = 0; nRow <= 5; ++nRow) { OUString aFormula; diff --git a/sc/qa/unit/pivottable_filters_test.cxx b/sc/qa/unit/pivottable_filters_test.cxx index ff9df79980b5..3e26fca4058d 100644 --- a/sc/qa/unit/pivottable_filters_test.cxx +++ b/sc/qa/unit/pivottable_filters_test.cxx @@ -860,7 +860,7 @@ void ScPivotTableFiltersTest::testPivotCacheExportXLSX() std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocUniquePtr pCacheDef = XPathHelper::parseExport(pXPathFile, m_xSFactory, - "xl/pivotCache/pivotCacheDefinition1.xml"); + "xl/pivotCache/pivotCacheDefinition1.xml"); CPPUNIT_ASSERT(pCacheDef); assertXPath(pCacheDef, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField", 6); @@ -1192,9 +1192,9 @@ void ScPivotTableFiltersTest::testPivotTableXLSX() pSaveData->GetAllDimensionsByOrientation(sheet::DataPilotFieldOrientation_PAGE, aDims); if (aDims.size() != 2 || aDims[0]->GetName() != "F7" || aDims[1]->GetName() != "F6") { - cerr - << "Pivot table should have two page fields labelled 'F7' and 'F6' in this order." - << endl; + cerr << "Pivot table should have two page fields labelled 'F7' and 'F6' in this " + "order." + << endl; return false; } @@ -2395,17 +2395,21 @@ void ScPivotTableFiltersTest::testPivotTableDuplicateFields() std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); - xmlDocUniquePtr pCacheDef - = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/pivotCache/pivotCacheDefinition1.xml"); + xmlDocUniquePtr pCacheDef = XPathHelper::parseExport(pXPathFile, m_xSFactory, + "xl/pivotCache/pivotCacheDefinition1.xml"); CPPUNIT_ASSERT(pCacheDef); assertXPath(pCacheDef, "/x:pivotCacheDefinition/x:cacheFields", "count", "6"); assertXPath(pCacheDef, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]", "name", "ID"); assertXPath(pCacheDef, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField[2]", "name", "Name"); - assertXPath(pCacheDef, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField[3]", "name", "Score"); - assertXPath(pCacheDef, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField[4]", "name", "Method"); - assertXPath(pCacheDef, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField[5]", "name", "method2"); - assertXPath(pCacheDef, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField[6]", "name", "Method3"); + assertXPath(pCacheDef, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField[3]", "name", + "Score"); + assertXPath(pCacheDef, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField[4]", "name", + "Method"); + assertXPath(pCacheDef, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField[5]", "name", + "method2"); + assertXPath(pCacheDef, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField[6]", "name", + "Method3"); xShell->DoClose(); } @@ -2432,7 +2436,7 @@ void ScPivotTableFiltersTest::testTdf112106() // Check that we have an existing data layout dimension const ScDPSaveDimension* pDim = pSaveData->GetExistingDataLayoutDimension(); CPPUNIT_ASSERT(pDim); - const std::optional<OUString> & pLayoutName = pDim->GetLayoutName(); + const std::optional<OUString>& pLayoutName = pDim->GetLayoutName(); CPPUNIT_ASSERT(pLayoutName); CPPUNIT_ASSERT_EQUAL(ScResId(STR_PIVOT_DATA), (*pLayoutName)); @@ -2449,7 +2453,7 @@ void ScPivotTableFiltersTest::testTdf123923() std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocUniquePtr pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory, - "xl/pivotCache/pivotCacheDefinition1.xml"); + "xl/pivotCache/pivotCacheDefinition1.xml"); CPPUNIT_ASSERT(pTable); assertXPath(pTable, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:sharedItems/x:e", @@ -2466,7 +2470,7 @@ void ScPivotTableFiltersTest::testTdf123939() std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocUniquePtr pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory, - "xl/pivotCache/pivotCacheDefinition1.xml"); + "xl/pivotCache/pivotCacheDefinition1.xml"); CPPUNIT_ASSERT(pTable); assertXPathNoAttribute(pTable, @@ -2489,7 +2493,7 @@ void ScPivotTableFiltersTest::testTdf124651() CPPUNIT_ASSERT(xDocSh.is()); xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory, - "xl/pivotTables/pivotTable1.xml", FORMAT_XLSX); + "xl/pivotTables/pivotTable1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); // We have to export name attribute, even though it's optional according to ECMA-376 standard, // because Excel (at least 2016) seems to require it. @@ -2507,7 +2511,7 @@ void ScPivotTableFiltersTest::testTdf124736() xDocSh->DoClose(); xmlDocUniquePtr pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory, - "xl/pivotCache/pivotCacheDefinition1.xml"); + "xl/pivotCache/pivotCacheDefinition1.xml"); CPPUNIT_ASSERT(pTable); assertXPath(pTable, @@ -2583,8 +2587,8 @@ void ScPivotTableFiltersTest::testTdf124810() ScDocShellRef xDocSh = loadDoc("pivot_dark1.", FORMAT_XLSX); CPPUNIT_ASSERT(xDocSh.is()); - xmlDocUniquePtr pTable = XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory, - "xl/pivotTables/pivotTable1.xml", FORMAT_XLSX); + xmlDocUniquePtr pTable = XPathHelper::parseExport2( + *this, *xDocSh, m_xSFactory, "xl/pivotTables/pivotTable1.xml", FORMAT_XLSX); xDocSh->DoClose(); CPPUNIT_ASSERT(pTable); @@ -2605,8 +2609,8 @@ void ScPivotTableFiltersTest::testTdf124810() ScDocShellRef xDocSh = loadDoc("tdf124651_simplePivotTable.", FORMAT_ODS); CPPUNIT_ASSERT(xDocSh.is()); - xmlDocUniquePtr pTable = XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory, - "xl/pivotTables/pivotTable1.xml", FORMAT_XLSX); + xmlDocUniquePtr pTable = XPathHelper::parseExport2( + *this, *xDocSh, m_xSFactory, "xl/pivotTables/pivotTable1.xml", FORMAT_XLSX); xDocSh->DoClose(); CPPUNIT_ASSERT(pTable); @@ -2626,8 +2630,8 @@ void ScPivotTableFiltersTest::testTdf124883() ScDocShellRef xDocSh = loadDoc("pivot-table/two-data-fields.", FORMAT_XLSX); CPPUNIT_ASSERT(xDocSh.is()); - xmlDocUniquePtr pTable = XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory, - "xl/pivotTables/pivotTable1.xml", FORMAT_XLSX); + xmlDocUniquePtr pTable = XPathHelper::parseExport2( + *this, *xDocSh, m_xSFactory, "xl/pivotTables/pivotTable1.xml", FORMAT_XLSX); xDocSh->DoClose(); CPPUNIT_ASSERT(pTable); @@ -2692,7 +2696,7 @@ void ScPivotTableFiltersTest::testTdf125086() CPPUNIT_ASSERT(xDocSh.is()); xmlDocUniquePtr pDoc = XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory, - "xl/pivotTables/pivotTable1.xml", FORMAT_XLSX); + "xl/pivotTables/pivotTable1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); assertXPath(pDoc, "/x:pivotTableDefinition/x:pivotFields/x:pivotField[2]", "axis", "axisRow"); // "dataField" attribute was not written for this "axisRow" field diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx index ad04681d61f0..2f2b8bc5501c 100644 --- a/sc/qa/unit/ucalc.hxx +++ b/sc/qa/unit/ucalc.hxx @@ -27,6 +27,7 @@ class FormulaGrammarSwitch { ScDocument* mpDoc; formula::FormulaGrammar::Grammar meOldGrammar; + public: FormulaGrammarSwitch(ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar); ~FormulaGrammarSwitch(); @@ -43,15 +44,21 @@ public: }; static ScDocShell* findLoadedDocShellByName(const OUString& rName); - static bool insertRangeNames(ScDocument* pDoc, ScRangeName* pNames, const RangeNameDef* p, const RangeNameDef* pEnd); + static bool insertRangeNames(ScDocument* pDoc, ScRangeName* pNames, const RangeNameDef* p, + const RangeNameDef* pEnd); static void printRange(ScDocument* pDoc, const ScRange& rRange, const char* pCaption); static void clearRange(ScDocument* pDoc, const ScRange& rRange); static void clearSheet(ScDocument* pDoc, SCTAB nTab); - static ScUndoCut* cutToClip(ScDocShell& rDocSh, const ScRange& rRange, ScDocument* pClipDoc, bool bCreateUndo); + static ScUndoCut* cutToClip(ScDocShell& rDocSh, const ScRange& rRange, ScDocument* pClipDoc, + bool bCreateUndo); static void copyToClip(ScDocument* pSrcDoc, const ScRange& rRange, ScDocument* pClipDoc); - static void pasteFromClip(ScDocument* pDestDoc, const ScRange& rDestRange, ScDocument* pClipDoc); - static void pasteOneCellFromClip(ScDocument* pDestDoc, const ScRange& rDestRange, ScDocument* pClipDoc, InsertDeleteFlags eFlags = InsertDeleteFlags::ALL); - static ScUndoPaste* createUndoPaste(ScDocShell& rDocSh, const ScRange& rRange, ScDocumentUniquePtr pUndoDoc); + static void pasteFromClip(ScDocument* pDestDoc, const ScRange& rDestRange, + ScDocument* pClipDoc); + static void pasteOneCellFromClip(ScDocument* pDestDoc, const ScRange& rDestRange, + ScDocument* pClipDoc, + InsertDeleteFlags eFlags = InsertDeleteFlags::ALL); + static ScUndoPaste* createUndoPaste(ScDocShell& rDocSh, const ScRange& rRange, + ScDocumentUniquePtr pUndoDoc); /** * Enable or disable expand reference options which controls how @@ -61,18 +68,18 @@ public: static void setCalcAsShown(ScDocument* pDoc, bool bCalcAsShown); - void checkPrecisionAsShown( OUString& rCode, double fValue, double fExpectedRoundVal ); + void checkPrecisionAsShown(OUString& rCode, double fValue, double fExpectedRoundVal); - static ScRange insertRangeData( - ScDocument* pDoc, const ScAddress& rPos, const std::vector<std::vector<const char*>>& rData ); + static ScRange insertRangeData(ScDocument* pDoc, const ScAddress& rPos, + const std::vector<std::vector<const char*>>& rData); - template<size_t Size> - static ScRange insertRangeData( - ScDocument* pDoc, const ScAddress& rPos, const char* aData[][Size], size_t nRowCount ) + template <size_t Size> + static ScRange insertRangeData(ScDocument* pDoc, const ScAddress& rPos, + const char* aData[][Size], size_t nRowCount) { ScRange aRange(rPos); - aRange.aEnd.SetCol(rPos.Col()+Size-1); - aRange.aEnd.SetRow(rPos.Row()+nRowCount-1); + aRange.aEnd.SetCol(rPos.Col() + Size - 1); + aRange.aEnd.SetRow(rPos.Row() + nRowCount - 1); clearRange(pDoc, aRange); @@ -105,9 +112,9 @@ public: ScDocShell& getDocShell(); /** Get a separate new ScDocShell with ScDocument that suits unit test needs. */ - void getNewDocShell( ScDocShellRef& rDocShellRef ); + void getNewDocShell(ScDocShellRef& rDocShellRef); /** Close such new ScDocShell. */ - void closeDocShell( ScDocShellRef& rDocShellRef ); + void closeDocShell(ScDocShellRef& rDocShellRef); virtual void setUp() override; virtual void tearDown() override; @@ -174,7 +181,7 @@ public: void testFormulaRefUpdateNameExpandRef2(); void testFormulaRefUpdateNameDeleteRow(); void testFormulaRefUpdateNameCopySheet(); - void testFormulaRefUpdateNameCopySheetCheckTab( SCTAB Tab, bool bCheckNames ); + void testFormulaRefUpdateNameCopySheetCheckTab(SCTAB Tab, bool bCheckNames); void testFormulaRefUpdateSheetLocalMove(); void testFormulaRefUpdateNameDelete(); void testFormulaRefUpdateValidity(); @@ -872,7 +879,7 @@ public: private: std::unique_ptr<TestImpl> m_pImpl; - ScDocument *m_pDoc; + ScDocument* m_pDoc; }; #endif diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx index 939b011cb5c4..7d60faefcaac 100644 --- a/sc/source/filter/inc/orcusfiltersimpl.hxx +++ b/sc/source/filter/inc/orcusfiltersimpl.hxx @@ -25,7 +25,8 @@ public: virtual bool importODS_Styles(ScDocument& rDoc, OUString& aFileName) const override; - virtual std::unique_ptr<ScOrcusXMLContext> createXMLContext(ScDocument& rDoc, const OUString& rPath) const override; + virtual std::unique_ptr<ScOrcusXMLContext> + createXMLContext(ScDocument& rDoc, const OUString& rPath) const override; }; class ScOrcusXMLContextImpl : public ScOrcusXMLContext diff --git a/sc/source/filter/inc/rtfimp.hxx b/sc/source/filter/inc/rtfimp.hxx index f248f9908f5a..4ff5f0d2e08f 100644 --- a/sc/source/filter/inc/rtfimp.hxx +++ b/sc/source/filter/inc/rtfimp.hxx @@ -25,7 +25,7 @@ class ScRTFImport : public ScEEImport { public: - ScRTFImport( ScDocument* pDoc, const ScRange& rRange ); + ScRTFImport(ScDocument* pDoc, const ScRange& rRange); }; #endif diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx index 1560dc232322..ce90954388ea 100644 --- a/sc/source/filter/orcus/orcusfiltersimpl.cxx +++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx @@ -30,8 +30,8 @@ using namespace com::sun::star; -namespace { - +namespace +{ uno::Reference<task::XStatusIndicator> getStatusIndicator(const SfxMedium& rMedium) { uno::Reference<task::XStatusIndicator> xStatusIndicator; @@ -49,7 +49,7 @@ bool loadFileContent(SfxMedium& rMedium, orcus::iface::import_filter& filter) { SvStream* pStream = rMedium.GetInStream(); pStream->Seek(0); - static const size_t nReadBuffer = 1024*32; + static const size_t nReadBuffer = 1024 * 32; OStringBuffer aBuffer((int(nReadBuffer))); size_t nRead = 0; do @@ -57,8 +57,7 @@ bool loadFileContent(SfxMedium& rMedium, orcus::iface::import_filter& filter) char pData[nReadBuffer]; nRead = pStream->ReadBytes(pData, nReadBuffer); aBuffer.append(pData, nRead); - } - while (nRead == nReadBuffer); + } while (nRead == nReadBuffer); try { @@ -72,7 +71,6 @@ bool loadFileContent(SfxMedium& rMedium, orcus::iface::import_filter& filter) return true; } - } bool ScOrcusFiltersImpl::importCSV(ScDocument& rDoc, SfxMedium& rMedium) const @@ -141,7 +139,8 @@ bool ScOrcusFiltersImpl::importODS_Styles(ScDocument& rDoc, OUString& aPath) con return true; } -std::unique_ptr<ScOrcusXMLContext> ScOrcusFiltersImpl::createXMLContext(ScDocument& rDoc, const OUString& rPath) const +std::unique_ptr<ScOrcusXMLContext> ScOrcusFiltersImpl::createXMLContext(ScDocument& rDoc, + const OUString& rPath) const { return std::make_unique<ScOrcusXMLContextImpl>(rDoc, rPath); } diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index a6a9e689d865..ac98c6fc4b2e 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.cxx @@ -88,7 +88,7 @@ #include <svx/sdprcitm.hxx> #include <svx/sdmetitm.hxx> -#define avmedia_MediaItem ::avmedia::MediaItem +#define avmedia_MediaItem ::avmedia::MediaItem #ifdef DISABLE_DYNLOADING /* Avoid clash with the ones from svx/source/form/typemap.cxx */ diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx index 51b1e3879246..b4e91150d970 100644 --- a/sc/source/ui/drawfunc/futext2.cxx +++ b/sc/source/ui/drawfunc/futext2.cxx @@ -38,7 +38,7 @@ std::unique_ptr<SdrOutliner> FuText::MakeOutliner() // so the device must be taken from the model here. OutputDevice* pRef = pDrDoc->GetRefDevice(); if (pRef && pRef != pWindow) - pRef->SetMapMode( MapMode(MapUnit::Map100thMM) ); + pRef->SetMapMode(MapMode(MapUnit::Map100thMM)); return pOutl; } diff --git a/sc/source/ui/inc/PivotLayoutTreeList.hxx b/sc/source/ui/inc/PivotLayoutTreeList.hxx index 42f090faa5d9..ab1ce9c93ae7 100644 --- a/sc/source/ui/inc/PivotLayoutTreeList.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeList.hxx @@ -18,7 +18,7 @@ class ScPivotLayoutTreeList : public ScPivotLayoutTreeListBase { private: - std::vector<std::unique_ptr<ScItemValue> > maItemValues; + std::vector<std::unique_ptr<ScItemValue>> maItemValues; DECL_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_LINK(DoubleClickHdl, weld::TreeView&, bool); @@ -31,6 +31,7 @@ public: void FillFields(ScPivotFieldVector& rFieldVector); virtual void InsertEntryForSourceTarget(weld::TreeView& rSource, int nTarget) override; + protected: void InsertEntryForItem(const ScItemValue* pItemValue, int nPosition); }; diff --git a/sc/source/ui/inc/PivotLayoutTreeListData.hxx b/sc/source/ui/inc/PivotLayoutTreeListData.hxx index c5a3fb07ce44..5041ff12b8ea 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListData.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListData.hxx @@ -35,7 +35,7 @@ private: void AdjustDuplicateCount(ScItemValue* pInputItemValue); - std::vector<std::unique_ptr<ScItemValue> > maDataItemValues; + std::vector<std::unique_ptr<ScItemValue>> maDataItemValues; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx index 96fda896fd1f..70c48efb58b5 100644 --- a/sc/source/ui/inc/auditsh.hxx +++ b/sc/source/ui/inc/auditsh.hxx @@ -30,7 +30,7 @@ class ScAuditingShell : public SfxShell { private: ScViewData* pViewData; - sal_uInt16 nFunction; + sal_uInt16 nFunction; public: SFX_DECL_INTERFACE(SCID_AUDITING_SHELL) diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index 13aac159618f..bf887cc3aaec 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -25,7 +25,7 @@ private: SvNumberFormatter* mpNumberFormatter; ScDocument* mpDoc; - ScAddress maPos; + ScAddress maPos; std::unique_ptr<weld::Button> mxBtnOk; std::unique_ptr<weld::Button> mxBtnCancel; @@ -55,7 +55,8 @@ private: void Init(); public: - ScDataBarSettingsDlg(weld::Window* pParent, const ScDataBarFormatData& rData, ScDocument* pDoc, const ScAddress& rPos); + ScDataBarSettingsDlg(weld::Window* pParent, const ScDataBarFormatData& rData, ScDocument* pDoc, + const ScAddress& rPos); virtual ~ScDataBarSettingsDlg() override; ScDataBarFormatData* GetData(); @@ -64,4 +65,3 @@ public: #endif // INCLUDED_SC_SOURCE_UI_INC_COLORFORMAT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - diff --git a/sc/source/ui/inc/corodlg.hxx b/sc/source/ui/inc/corodlg.hxx index b0c91b4009fe..0c8280e3d34e 100644 --- a/sc/source/ui/inc/corodlg.hxx +++ b/sc/source/ui/inc/corodlg.hxx @@ -26,7 +26,8 @@ class ScColRowLabelDlg : public weld::GenericDialogController { public: ScColRowLabelDlg(weld::Window* pParent, bool bCol, bool bRow) - : GenericDialogController(pParent, "modules/scalc/ui/changesourcedialog.ui", "ChangeSourceDialog") + : GenericDialogController(pParent, "modules/scalc/ui/changesourcedialog.ui", + "ChangeSourceDialog") , m_xBtnRow(m_xBuilder->weld_check_button("row")) , m_xBtnCol(m_xBuilder->weld_check_button("col")) { diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index 6ddb6bb03466..3aab042061e0 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.hxx @@ -27,6 +27,7 @@ class ScColOrRowDlg : public weld::GenericDialogController public: ScColOrRowDlg(weld::Window* pParent, const OUString& rStrTitle, const OUString& rStrLabel); virtual ~ScColOrRowDlg() override; + private: std::unique_ptr<weld::Frame> m_xFrame; std::unique_ptr<weld::RadioButton> m_xBtnRows; diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index 27c30e1e9773..fbe7cfdc1cf5 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.hxx @@ -31,7 +31,7 @@ private: std::unique_ptr<weld::ComboBox> m_xCbObject; std::unique_ptr<weld::ComboBox> m_xLbType; - void FillObjects(); + void FillObjects(); DECL_LINK(SelectHdl, weld::ComboBox&, void); @@ -39,7 +39,7 @@ public: ScDataPilotDatabaseDlg(weld::Window* pParent); virtual ~ScDataPilotDatabaseDlg() override; - void GetValues( ScImportSourceDesc& rDesc ); + void GetValues(ScImportSourceDesc& rDesc); }; #endif diff --git a/sc/source/ui/inc/datatableview.hxx b/sc/source/ui/inc/datatableview.hxx index df0bf376885e..fe415439eef7 100644 --- a/sc/source/ui/inc/datatableview.hxx +++ b/sc/source/ui/inc/datatableview.hxx @@ -35,7 +35,6 @@ class ScDataTableColView : public ScHeaderControl SCCOL mnCol; public: - ScDataTableColView(vcl::Window* pParent, SelectionEngine* pSelectionEngine); void SetPos(SCCOLROW nRow); @@ -55,7 +54,6 @@ class ScDataTableRowView : public ScHeaderControl SCROW mnRow; public: - ScDataTableRowView(vcl::Window* pParent, SelectionEngine* pSelectionEngine); void SetPos(SCCOLROW nRow); @@ -93,10 +91,10 @@ class ScDataTableView : public Control std::unique_ptr<MouseEvent> mpMouseEvent; - DECL_LINK( ScrollHdl, ScrollBar*, void ); + DECL_LINK(ScrollHdl, ScrollBar*, void); public: - ScDataTableView(const css::uno::Reference<css::awt::XWindow> &rParent); + ScDataTableView(const css::uno::Reference<css::awt::XWindow>& rParent); void Init(std::shared_ptr<ScDocument> pDoc); diff --git a/sc/source/ui/inc/drformsh.hxx b/sc/source/ui/inc/drformsh.hxx index c6aad34d8e23..63ee223df8c1 100644 --- a/sc/source/ui/inc/drformsh.hxx +++ b/sc/source/ui/inc/drformsh.hxx @@ -28,7 +28,7 @@ class SfxModule; #include "drawsh.hxx" -class ScDrawFormShell: public ScDrawShell +class ScDrawFormShell : public ScDrawShell { public: SFX_DECL_INTERFACE(SCID_FORM_SHELL) diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx index 1986790ad953..ca5bab36f814 100644 --- a/sc/source/ui/inc/editfield.hxx +++ b/sc/source/ui/inc/editfield.hxx @@ -27,6 +27,7 @@ class ScDoubleField { private: std::unique_ptr<weld::Entry> m_xEntry; + public: explicit ScDoubleField(std::unique_ptr<weld::Entry> xEntry); diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index 62bec0d291c5..84699d555760 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -30,7 +30,7 @@ private: DECL_LINK(DblClkHdl, weld::TreeView&, bool); public: - ScSelEntryDlg(weld::Window* pParent, const std::vector<OUString> &rEntryList); + ScSelEntryDlg(weld::Window* pParent, const std::vector<OUString>& rEntryList); virtual ~ScSelEntryDlg() override; OUString GetSelectedEntry() const; diff --git a/sc/source/ui/inc/mediash.hxx b/sc/source/ui/inc/mediash.hxx index 86737cc103c8..6d75a4b682b6 100644 --- a/sc/source/ui/inc/mediash.hxx +++ b/sc/source/ui/inc/mediash.hxx @@ -28,7 +28,7 @@ class SfxModule; #include "drawsh.hxx" -class ScMediaShell: public ScDrawShell +class ScMediaShell : public ScDrawShell { public: SFX_DECL_INTERFACE(SCID_MEDIA_SHELL) @@ -42,7 +42,7 @@ public: virtual ~ScMediaShell() override; void ExecuteMedia(const SfxRequest& rReq); - void GetMediaState(SfxItemSet &rSet); + void GetMediaState(SfxItemSet& rSet); }; #endif diff --git a/sc/source/ui/inc/mergecellsdialog.hxx b/sc/source/ui/inc/mergecellsdialog.hxx index 87d030ca4e25..6dde67680e78 100644 --- a/sc/source/ui/inc/mergecellsdialog.hxx +++ b/sc/source/ui/inc/mergecellsdialog.hxx @@ -33,7 +33,6 @@ public: ScMergeCellsOption GetMergeCellsOption() const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx index a2bcbe7f0394..c5d6d8892924 100644 --- a/sc/source/ui/inc/namecrea.hxx +++ b/sc/source/ui/inc/namecrea.hxx @@ -29,8 +29,9 @@ class ScNameCreateDlg final : public weld::GenericDialogController std::unique_ptr<weld::CheckButton> m_xLeftBox; std::unique_ptr<weld::CheckButton> m_xBottomBox; std::unique_ptr<weld::CheckButton> m_xRightBox; + public: - ScNameCreateDlg(weld::Window * pParent, CreateNameFlags nFlags); + ScNameCreateDlg(weld::Window* pParent, CreateNameFlags nFlags); virtual ~ScNameCreateDlg() override; CreateNameFlags GetFlags() const; }; diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index 67a4776eef6a..b5f09be8b628 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -43,7 +43,7 @@ private: std::map<OUString, std::unique_ptr<ScRangeName>> m_RangeMap; public: - ScNamePasteDlg(weld::Window * pParent, ScDocShell* pShell); + ScNamePasteDlg(weld::Window* pParent, ScDocShell* pShell); virtual ~ScNamePasteDlg() override; diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx index fa449b4f2edf..07daf4215cc2 100644 --- a/sc/source/ui/inc/oleobjsh.hxx +++ b/sc/source/ui/inc/oleobjsh.hxx @@ -28,7 +28,7 @@ class SfxModule; #include "drawsh.hxx" -class ScOleObjectShell: public ScDrawShell +class ScOleObjectShell : public ScDrawShell { public: SFX_DECL_INTERFACE(SCID_OLEOBJECT_SHELL) @@ -40,7 +40,6 @@ private: public: ScOleObjectShell(ScViewData* pData); virtual ~ScOleObjectShell() override; - }; #endif diff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxx index 08276622c1bf..90dd34684141 100644 --- a/sc/source/ui/inc/pgbrksh.hxx +++ b/sc/source/ui/inc/pgbrksh.hxx @@ -39,7 +39,6 @@ private: public: ScPageBreakShell(ScTabViewShell* pView); virtual ~ScPageBreakShell() override; - }; #endif diff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx index 16e5eba32c25..9a6e9698e82b 100644 --- a/sc/source/ui/inc/pivotsh.hxx +++ b/sc/source/ui/inc/pivotsh.hxx @@ -47,7 +47,7 @@ public: private: ScTabViewShell* pViewShell; - ScDPObject* GetCurrDPObject(); + ScDPObject* GetCurrDPObject(); }; #endif diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 5b821c3b6190..d06c4ef2e57a 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -27,6 +27,7 @@ class ScSubTotalDlg : public SfxTabDialogController public: ScSubTotalDlg(weld::Window* pParent, const SfxItemSet* pArgSet); virtual ~ScSubTotalDlg() override; + private: std::unique_ptr<weld::Button> m_xBtnRemove; DECL_LINK(RemoveHdl, weld::Button&, void); diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx index 634f97e9e602..ec839abbfdf0 100644 --- a/sc/source/ui/inc/warnbox.hxx +++ b/sc/source/ui/inc/warnbox.hxx @@ -27,6 +27,7 @@ class ScReplaceWarnBox : public weld::MessageDialogController { std::unique_ptr<weld::CheckButton> m_xWarningOnBox; + public: ScReplaceWarnBox(weld::Window* pParent); diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index dc73b0382a1e..452bac0f8946 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -28,13 +28,13 @@ struct CustomCompare : mrLbTree(rLbTree) { } - bool operator()(const std::unique_ptr<weld::TreeIter>& lhs, const std::unique_ptr<weld::TreeIter>& rhs) const + bool operator()(const std::unique_ptr<weld::TreeIter>& lhs, + const std::unique_ptr<weld::TreeIter>& rhs) const { return mrLbTree.iter_compare(*lhs, *rhs) == -1; } }; - class ScXMLSourceDlg : public ScAnyRefDlgController { OUString maSrcPath; @@ -75,7 +75,6 @@ public: virtual void Close() override; private: - void SelectSourceFile(); void LoadSourceFileStructure(const OUString& rPath); void TreeItemSelected(); diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 1f26e6489619..11b9f7f5477e 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -24,8 +24,8 @@ public: DECL_LINK(SyntaxModifiedHdl, weld::ComboBox&, void); DECL_LINK(CurrentDocOnlyHdl, weld::ToggleButton&, void); - const ScCalcConfig& GetConfig() const { return maConfig;} - bool GetWriteCalcConfig() const { return mbWriteConfig;} + const ScCalcConfig& GetConfig() const { return maConfig; } + bool GetWriteCalcConfig() const { return mbWriteConfig; } private: void CoupleEmptyAsZeroToStringConversion(); diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx index 8db91ea32891..cadce62cc8a5 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx @@ -24,8 +24,8 @@ class SfxDispatcher; -namespace sc::sidebar { - +namespace sc::sidebar +{ class CellBorderStylePopup : public WeldToolbarPopup { private: diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index 693641ae9d38..97bf480b4bfa 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -25,8 +25,8 @@ class SfxDispatcher; -namespace sc::sidebar { - +namespace sc::sidebar +{ class CellLineStylePopup : public WeldToolbarPopup { private: diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 119728d0a667..60e2d1cc03ed 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -9252,7 +9252,6 @@ sc/inc/dptabres.hxx sc/inc/dptabsrc.hxx sc/inc/dputil.hxx sc/inc/dragdata.hxx -sc/inc/drawpage.hxx sc/inc/drdefuno.hxx sc/inc/drwlayer.hxx sc/inc/editdataarray.hxx @@ -9282,7 +9281,6 @@ sc/inc/funcdesc.hxx sc/inc/funcuno.hxx sc/inc/generalfunction.hxx sc/inc/global.hxx -sc/inc/globalnames.hxx sc/inc/grouparealistener.hxx sc/inc/helpids.h sc/inc/hints.hxx @@ -9337,7 +9335,6 @@ sc/inc/refhint.hxx sc/inc/refreshtimer.hxx sc/inc/refreshtimerprotector.hxx sc/inc/reftokenhelper.hxx -sc/inc/refupdatecontext.hxx sc/inc/reordermap.hxx sc/inc/rowheightcontext.hxx sc/inc/scabstdlg.hxx @@ -9358,7 +9355,6 @@ sc/inc/sheetdata.hxx sc/inc/sheetevents.hxx sc/inc/shellids.hxx sc/inc/simpleformulacalc.hxx -sc/inc/simplerangelist.hxx sc/inc/sortparam.hxx sc/inc/spellcheckcontext.hxx sc/inc/srchuno.hxx @@ -9383,7 +9379,6 @@ sc/inc/tokenstringcontext.hxx sc/inc/tokenuno.hxx sc/inc/typedstrdata.hxx sc/inc/types.hxx -sc/inc/undorangename.hxx sc/inc/unitconv.hxx sc/inc/unonames.hxx sc/inc/unoreflist.hxx @@ -9394,7 +9389,6 @@ sc/inc/validat.hxx sc/inc/viewopti.hxx sc/inc/viewuno.hxx sc/inc/waitoff.hxx -sc/inc/warnpassword.hxx sc/inc/xmlwrap.hxx sc/inc/zforauto.hxx sc/qa/extras/check_data_pilot_field.cxx @@ -9406,7 +9400,6 @@ sc/qa/extras/new_cond_format.cxx sc/qa/extras/recordchanges-test.cxx sc/qa/extras/regression-test.cxx sc/qa/extras/scannotationsobj.cxx -sc/qa/extras/scarealinkobj.cxx sc/qa/extras/sccellcursorobj.cxx sc/qa/extras/sccellrangesobj.cxx sc/qa/extras/scdatabaserangeobj.cxx @@ -9416,11 +9409,9 @@ sc/qa/extras/scnamedrangeobj.cxx sc/qa/extras/scoutlineobj.cxx sc/qa/extras/scsubtotalfieldobj.cxx sc/qa/extras/sctablesheetobj.cxx -sc/qa/extras/sctabviewobj.cxx sc/qa/perf/scperfobj.cxx sc/qa/unit/bugfix-test.cxx sc/qa/unit/copy_paste_test.cxx -sc/qa/unit/datacache.cxx sc/qa/unit/dataproviders_test.cxx sc/qa/unit/datatransformation_test.cxx sc/qa/unit/filters-test.cxx @@ -9448,7 +9439,6 @@ sc/qa/unit/helper/xpath.hxx sc/qa/unit/mark_test.cxx sc/qa/unit/opencl-test.cxx sc/qa/unit/parallelism.cxx -sc/qa/unit/pivottable_filters_test.cxx sc/qa/unit/range.cxx sc/qa/unit/rangelst_test.cxx sc/qa/unit/screenshots/screenshots.cxx @@ -9457,7 +9447,6 @@ sc/qa/unit/subsequent_filters-test.cxx sc/qa/unit/test_ScChartListenerCollection.cxx sc/qa/unit/tiledrendering/tiledrendering.cxx sc/qa/unit/ucalc.cxx -sc/qa/unit/ucalc.hxx sc/qa/unit/ucalc_column.cxx sc/qa/unit/ucalc_condformat.cxx sc/qa/unit/ucalc_formula.cxx @@ -9824,7 +9813,6 @@ sc/source/filter/inc/numberformatsbuffer.hxx sc/source/filter/inc/ooxformulaparser.hxx sc/source/filter/inc/op.h sc/source/filter/inc/optab.h -sc/source/filter/inc/orcusfiltersimpl.hxx sc/source/filter/inc/orcusinterface.hxx sc/source/filter/inc/otlnbuff.hxx sc/source/filter/inc/pagesettings.hxx @@ -9842,7 +9830,6 @@ sc/source/filter/inc/richstring.hxx sc/source/filter/inc/richstringcontext.hxx sc/source/filter/inc/root.hxx sc/source/filter/inc/rtfexp.hxx -sc/source/filter/inc/rtfimp.hxx sc/source/filter/inc/rtfparse.hxx sc/source/filter/inc/scenariobuffer.hxx sc/source/filter/inc/scenariocontext.hxx @@ -9994,7 +9981,6 @@ sc/source/filter/oox/worksheethelper.cxx sc/source/filter/oox/worksheetsettings.cxx sc/source/filter/orcus/filterdetect.cxx sc/source/filter/orcus/interface.cxx -sc/source/filter/orcus/orcusfiltersimpl.cxx sc/source/filter/orcus/xmlcontext.cxx sc/source/filter/qpro/qpro.cxx sc/source/filter/qpro/qproform.cxx @@ -10168,7 +10154,6 @@ sc/source/ui/app/scdll.cxx sc/source/ui/app/scmod.cxx sc/source/ui/app/seltrans.cxx sc/source/ui/app/transobj.cxx -sc/source/ui/app/typemap.cxx sc/source/ui/app/uiitems.cxx sc/source/ui/attrdlg/attrdlg.cxx sc/source/ui/attrdlg/scabstdlg.cxx @@ -10275,7 +10260,6 @@ sc/source/ui/drawfunc/fupoor.cxx sc/source/ui/drawfunc/fusel.cxx sc/source/ui/drawfunc/fusel2.cxx sc/source/ui/drawfunc/futext.cxx -sc/source/ui/drawfunc/futext2.cxx sc/source/ui/drawfunc/futext3.cxx sc/source/ui/drawfunc/graphsh.cxx sc/source/ui/drawfunc/mediash.cxx @@ -10314,9 +10298,7 @@ sc/source/ui/inc/IAnyRefDialog.hxx sc/source/ui/inc/MatrixComparisonGenerator.hxx sc/source/ui/inc/MovingAverageDialog.hxx sc/source/ui/inc/PivotLayoutDialog.hxx -sc/source/ui/inc/PivotLayoutTreeList.hxx sc/source/ui/inc/PivotLayoutTreeListBase.hxx -sc/source/ui/inc/PivotLayoutTreeListData.hxx sc/source/ui/inc/PivotLayoutTreeListLabel.hxx sc/source/ui/inc/RandomNumberGeneratorDialog.hxx sc/source/ui/inc/RegressionDialog.hxx @@ -10332,7 +10314,6 @@ sc/source/ui/inc/areasave.hxx sc/source/ui/inc/areasdlg.hxx sc/source/ui/inc/asciiopt.hxx sc/source/ui/inc/attrdlg.hxx -sc/source/ui/inc/auditsh.hxx sc/source/ui/inc/autofmt.hxx sc/source/ui/inc/autostyl.hxx sc/source/ui/inc/cbutton.hxx @@ -10342,7 +10323,6 @@ sc/source/ui/inc/chartsh.hxx sc/source/ui/inc/checklistmenu.hxx sc/source/ui/inc/client.hxx sc/source/ui/inc/cliputil.hxx -sc/source/ui/inc/colorformat.hxx sc/source/ui/inc/colrowba.hxx sc/source/ui/inc/condformatdlg.hxx sc/source/ui/inc/condformatdlgentry.hxx @@ -10353,22 +10333,18 @@ sc/source/ui/inc/condformatuno.hxx sc/source/ui/inc/conflictsdlg.hxx sc/source/ui/inc/consdlg.hxx sc/source/ui/inc/content.hxx -sc/source/ui/inc/corodlg.hxx -sc/source/ui/inc/crdlg.hxx sc/source/ui/inc/crnrdlg.hxx sc/source/ui/inc/csvcontrol.hxx sc/source/ui/inc/csvgrid.hxx sc/source/ui/inc/csvruler.hxx sc/source/ui/inc/csvsplits.hxx sc/source/ui/inc/csvtablebox.hxx -sc/source/ui/inc/dapidata.hxx sc/source/ui/inc/dapitype.hxx sc/source/ui/inc/datafdlg.hxx sc/source/ui/inc/dataprovider.hxx sc/source/ui/inc/dataproviderdlg.hxx sc/source/ui/inc/datastream.hxx sc/source/ui/inc/datastreamdlg.hxx -sc/source/ui/inc/datatableview.hxx sc/source/ui/inc/datatransformation.hxx sc/source/ui/inc/dbdocfun.hxx sc/source/ui/inc/dbfunc.hxx @@ -10382,12 +10358,10 @@ sc/source/ui/inc/dpgroupdlg.hxx sc/source/ui/inc/drawsh.hxx sc/source/ui/inc/drawutil.hxx sc/source/ui/inc/drawview.hxx -sc/source/ui/inc/drformsh.hxx sc/source/ui/inc/drtxtob.hxx sc/source/ui/inc/drwtrans.hxx sc/source/ui/inc/dwfunctr.hxx sc/source/ui/inc/editable.hxx -sc/source/ui/inc/editfield.hxx sc/source/ui/inc/editsh.hxx sc/source/ui/inc/filldlg.hxx sc/source/ui/inc/filtdlg.hxx @@ -10420,24 +10394,18 @@ sc/source/ui/inc/inputwin.hxx sc/source/ui/inc/inscodlg.hxx sc/source/ui/inc/instbdlg.hxx sc/source/ui/inc/invmerge.hxx -sc/source/ui/inc/lbseldlg.hxx sc/source/ui/inc/linkarea.hxx sc/source/ui/inc/lnktrans.hxx -sc/source/ui/inc/mediash.hxx -sc/source/ui/inc/mergecellsdialog.hxx sc/source/ui/inc/msgpool.hxx sc/source/ui/inc/mtrindlg.hxx sc/source/ui/inc/mvtabdlg.hxx -sc/source/ui/inc/namecrea.hxx sc/source/ui/inc/namedefdlg.hxx sc/source/ui/inc/namedlg.hxx sc/source/ui/inc/namemgrtable.hxx -sc/source/ui/inc/namepast.hxx sc/source/ui/inc/navcitem.hxx sc/source/ui/inc/navipi.hxx sc/source/ui/inc/navsett.hxx sc/source/ui/inc/notemark.hxx -sc/source/ui/inc/oleobjsh.hxx sc/source/ui/inc/olinefun.hxx sc/source/ui/inc/olinewin.hxx sc/source/ui/inc/opredlin.hxx @@ -10447,8 +10415,6 @@ sc/source/ui/inc/overlayobject.hxx sc/source/ui/inc/pagedata.hxx sc/source/ui/inc/pfiltdlg.hxx sc/source/ui/inc/pfuncache.hxx -sc/source/ui/inc/pgbrksh.hxx -sc/source/ui/inc/pivotsh.hxx sc/source/ui/inc/pntlock.hxx sc/source/ui/inc/preview.hxx sc/source/ui/inc/prevloc.hxx @@ -10486,7 +10452,6 @@ sc/source/ui/inc/spelleng.hxx sc/source/ui/inc/spellparam.hxx sc/source/ui/inc/strindlg.hxx sc/source/ui/inc/styledlg.hxx -sc/source/ui/inc/subtdlg.hxx sc/source/ui/inc/tabbgcolordlg.hxx sc/source/ui/inc/tabcont.hxx sc/source/ui/inc/tabopdlg.hxx @@ -10528,8 +10493,6 @@ sc/source/ui/inc/validate.hxx sc/source/ui/inc/viewdata.hxx sc/source/ui/inc/viewfunc.hxx sc/source/ui/inc/viewutil.hxx -sc/source/ui/inc/warnbox.hxx -sc/source/ui/inc/xmlsourcedlg.hxx sc/source/ui/miscdlgs/acredlin.cxx sc/source/ui/miscdlgs/anyrefdg.cxx sc/source/ui/miscdlgs/autofmt.cxx @@ -10579,7 +10542,6 @@ sc/source/ui/navipi/navcitem.cxx sc/source/ui/navipi/navipi.cxx sc/source/ui/navipi/scenwnd.cxx sc/source/ui/optdlg/calcoptionsdlg.cxx -sc/source/ui/optdlg/calcoptionsdlg.hxx sc/source/ui/optdlg/opredlin.cxx sc/source/ui/optdlg/tpcalc.cxx sc/source/ui/optdlg/tpcompatibility.cxx @@ -10599,9 +10561,7 @@ sc/source/ui/sidebar/AlignmentPropertyPanel.hxx sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx sc/source/ui/sidebar/CellBorderStyleControl.cxx -sc/source/ui/sidebar/CellBorderStyleControl.hxx sc/source/ui/sidebar/CellLineStyleControl.cxx -sc/source/ui/sidebar/CellLineStyleControl.hxx sc/source/ui/sidebar/CellLineStyleValueSet.cxx sc/source/ui/sidebar/CellLineStyleValueSet.hxx sc/source/ui/sidebar/NumberFormatControl.cxx |