diff options
Diffstat (limited to 'sc/source')
29 files changed, 45 insertions, 44 deletions
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: |