diff options
| author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 12:50:27 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-22 01:57:32 +0100 |
| commit | 79b6055acd1ea27a9f054e6980abbe2024cdc4a2 (patch) | |
| tree | 1f441f303313ef5500e4b24a596c33640837b787 /chart2 | |
| parent | 315f270d2db7541e9400852b070afb30f371f644 (diff) | |
tdf#123936 Formatting files in module chart2 with clang-format
Change-Id: Ie4dea73190040e5716fe531cf35fae20d7e175db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105650
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'chart2')
60 files changed, 445 insertions, 453 deletions
diff --git a/chart2/inc/SpecialCharacters.hxx b/chart2/inc/SpecialCharacters.hxx index b02ab1049ca6..26d2b118730f 100644 --- a/chart2/inc/SpecialCharacters.hxx +++ b/chart2/inc/SpecialCharacters.hxx @@ -12,6 +12,7 @@ #include <sal/types.h> const sal_Unicode aMinusSign = 0x2212; -const sal_Unicode aSuperscriptFigures[10]={ 0x2070, 0x00B9, 0x00B2, 0x00B3, 0x2074, 0x2075, 0x2076, 0x2077, 0x2078, 0x2079 }; +const sal_Unicode aSuperscriptFigures[10] + = { 0x2070, 0x00B9, 0x00B2, 0x00B3, 0x2074, 0x2075, 0x2076, 0x2077, 0x2078, 0x2079 }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/qa/extras/xshape/chart2xshape.cxx b/chart2/qa/extras/xshape/chart2xshape.cxx index a4f24e666691..68dcc1e7e030 100644 --- a/chart2/qa/extras/xshape/chart2xshape.cxx +++ b/chart2/qa/extras/xshape/chart2xshape.cxx @@ -22,7 +22,6 @@ class Chart2XShapeTest : public ChartTest, public XmlTestTools { public: - void testFdo75075(); void testPropertyMappingBarChart(); void testPieChartLabels1(); @@ -45,31 +44,29 @@ public: CPPUNIT_TEST_SUITE_END(); private: - void compareAgainstReference(const OUString& rReferenceFile, bool bCreateReference = false); OUString getXShapeDumpString(); xmlDocUniquePtr getXShapeDumpXmlDoc(); }; -namespace { - -bool checkDumpAgainstFile( const OUString& rDump, const OUString& aFilePath) +namespace +{ +bool checkDumpAgainstFile(const OUString& rDump, const OUString& aFilePath) { OString aOFile = OUStringToOString(aFilePath, RTL_TEXTENCODING_UTF8); CPPUNIT_ASSERT_MESSAGE("dump is empty", !rDump.isEmpty()); OString aDump = OUStringToOString(rDump, RTL_TEXTENCODING_UTF8); - return doXMLDiff(aOFile.getStr(), aDump.getStr(), - static_cast<int>(rDump.getLength()), nullptr); + return doXMLDiff(aOFile.getStr(), aDump.getStr(), static_cast<int>(rDump.getLength()), nullptr); } - } OUString Chart2XShapeTest::getXShapeDumpString() { - uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW); - uno::Reference< qa::XDumper > xDumper( xChartDoc, UNO_QUERY_THROW ); + uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, mxComponent), + UNO_QUERY_THROW); + uno::Reference<qa::XDumper> xDumper(xChartDoc, UNO_QUERY_THROW); return xDumper->dump(); } @@ -80,12 +77,14 @@ xmlDocUniquePtr Chart2XShapeTest::getXShapeDumpXmlDoc() return xmlDocUniquePtr(xmlParseDoc(reinterpret_cast<const xmlChar*>(aXmlDump.getStr()))); } -void Chart2XShapeTest::compareAgainstReference(const OUString& rReferenceFile, bool bCreateReference) +void Chart2XShapeTest::compareAgainstReference(const OUString& rReferenceFile, + bool bCreateReference) { OUString aDump = getXShapeDumpString(); - OUString aReference = m_directories.getPathFromSrc("/chart2/qa/extras/xshape/data/reference/") + rReferenceFile; - if(bCreateReference) + OUString aReference + = m_directories.getPathFromSrc("/chart2/qa/extras/xshape/data/reference/") + rReferenceFile; + if (bCreateReference) { OString aOFile = OUStringToOString(aReference, RTL_TEXTENCODING_UTF8); OString aODump = OUStringToOString(aDump, RTL_TEXTENCODING_UTF8); @@ -183,14 +182,14 @@ void Chart2XShapeTest::testTdf76649TrendLineBug() void Chart2XShapeTest::testTdf88154LabelRotatedLayout() { load("chart2/qa/extras/xshape/data/pptx/", "tdf88154_LabelRotatedLayout.pptx"); - uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromDrawImpress(0,6); - uno::Reference< qa::XDumper > xDumper( xChartDoc, UNO_QUERY_THROW ); + uno::Reference<chart::XChartDocument> xChartDoc = getChartDocFromDrawImpress(0, 6); + uno::Reference<qa::XDumper> xDumper(xChartDoc, UNO_QUERY_THROW); OUString rDump = xDumper->dump(); OString aXmlDump = OUStringToOString(rDump, RTL_TEXTENCODING_UTF8); xmlDocUniquePtr pXmlDoc(xmlParseDoc(reinterpret_cast<const xmlChar*>(aXmlDump.getStr()))); { - OString aPath( "//XShape[@text='Oct-12']/Transformation" ); + OString aPath("//XShape[@text='Oct-12']/Transformation"); assertXPath(pXmlDoc, aPath, 1); double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble(); double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble(); @@ -201,7 +200,7 @@ void Chart2XShapeTest::testTdf88154LabelRotatedLayout() CPPUNIT_ASSERT_DOUBLES_EQUAL(fT12, fT22, 1e-8); } { - OString aPath( "//XShape[@text='Nov-12']/Transformation" ); + OString aPath("//XShape[@text='Nov-12']/Transformation"); assertXPath(pXmlDoc, aPath, 1); double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble(); double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble(); @@ -212,7 +211,7 @@ void Chart2XShapeTest::testTdf88154LabelRotatedLayout() CPPUNIT_ASSERT_DOUBLES_EQUAL(fT12, fT22, 1e-8); } { - OString aPath( "//XShape[@text='Dec-12']/Transformation" ); + OString aPath("//XShape[@text='Dec-12']/Transformation"); assertXPath(pXmlDoc, aPath, 1); double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble(); double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble(); @@ -223,7 +222,7 @@ void Chart2XShapeTest::testTdf88154LabelRotatedLayout() CPPUNIT_ASSERT_DOUBLES_EQUAL(fT12, fT22, 1e-8); } { - OString aPath( "//XShape[@text='May-13']/Transformation" ); + OString aPath("//XShape[@text='May-13']/Transformation"); assertXPath(pXmlDoc, aPath, 1); double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble(); double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble(); @@ -234,7 +233,7 @@ void Chart2XShapeTest::testTdf88154LabelRotatedLayout() CPPUNIT_ASSERT_DOUBLES_EQUAL(fT12, fT22, 1e-8); } { - OString aPath( "//XShape[@text='Jan-14']/Transformation" ); + OString aPath("//XShape[@text='Jan-14']/Transformation"); assertXPath(pXmlDoc, aPath, 1); double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble(); double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble(); diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx index 69cb8fd4f655..5bfbd06ad6e2 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx @@ -22,33 +22,35 @@ #include <vcl/vclptr.hxx> #include <svx/IAccessibleViewForwarder.hxx> -namespace vcl { class Window; } +namespace vcl +{ +class Window; +} namespace chart { - class AccessibleChartView; class AccessibleViewForwarder : public ::accessibility::IAccessibleViewForwarder { public: - AccessibleViewForwarder( AccessibleChartView* pAccChartView, vcl::Window* pWindow ); + AccessibleViewForwarder(AccessibleChartView* pAccChartView, vcl::Window* pWindow); virtual ~AccessibleViewForwarder() override; // ________ IAccessibleViewforwarder ________ virtual tools::Rectangle GetVisibleArea() const override; - virtual Point LogicToPixel( const Point& rPoint ) const override; - virtual Size LogicToPixel( const Size& rSize ) const override; + virtual Point LogicToPixel(const Point& rPoint) const override; + virtual Size LogicToPixel(const Size& rSize) const override; private: - AccessibleViewForwarder( AccessibleViewForwarder const & ) = delete; - AccessibleViewForwarder& operator=( AccessibleViewForwarder const & ) = delete; + AccessibleViewForwarder(AccessibleViewForwarder const&) = delete; + AccessibleViewForwarder& operator=(AccessibleViewForwarder const&) = delete; AccessibleChartView* m_pAccChartView; VclPtr<vcl::Window> m_pWindow; MapMode m_aMapMode; }; -} // namespace chart +} // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/accessibility/ChartElementFactory.cxx b/chart2/source/controller/accessibility/ChartElementFactory.cxx index c935074e4b11..cd6c4eed340d 100644 --- a/chart2/source/controller/accessibility/ChartElementFactory.cxx +++ b/chart2/source/controller/accessibility/ChartElementFactory.cxx @@ -23,17 +23,16 @@ namespace chart { - -AccessibleBase* ChartElementFactory::CreateChartElement( const AccessibleElementInfo& rAccInfo ) +AccessibleBase* ChartElementFactory::CreateChartElement(const AccessibleElementInfo& rAccInfo) { - ObjectIdentifier aOID( rAccInfo.m_aOID ); - ObjectType eType( aOID.getObjectType() ); + ObjectIdentifier aOID(rAccInfo.m_aOID); + ObjectType eType(aOID.getObjectType()); - switch( eType ) + switch (eType) { case OBJECTTYPE_DATA_POINT: case OBJECTTYPE_LEGEND_ENTRY: - return new AccessibleChartElement( rAccInfo, false ); + return new AccessibleChartElement(rAccInfo, false); case OBJECTTYPE_PAGE: case OBJECTTYPE_TITLE: case OBJECTTYPE_LEGEND: @@ -56,7 +55,7 @@ AccessibleBase* ChartElementFactory::CreateChartElement( const AccessibleElement case OBJECTTYPE_DATA_STOCK_LOSS: case OBJECTTYPE_DATA_STOCK_GAIN: case OBJECTTYPE_DATA_CURVE_EQUATION: - return new AccessibleChartElement( rAccInfo, true ); + return new AccessibleChartElement(rAccInfo, true); case OBJECTTYPE_UNKNOWN: break; default: diff --git a/chart2/source/controller/accessibility/ChartElementFactory.hxx b/chart2/source/controller/accessibility/ChartElementFactory.hxx index e3e72b37865b..0177809c40cf 100644 --- a/chart2/source/controller/accessibility/ChartElementFactory.hxx +++ b/chart2/source/controller/accessibility/ChartElementFactory.hxx @@ -20,7 +20,6 @@ namespace chart { - class AccessibleBase; struct AccessibleElementInfo; @@ -30,9 +29,9 @@ public: /** @return a newly created object (using the new operator) that corresponds to the given unique id */ - static AccessibleBase* CreateChartElement( const AccessibleElementInfo& rAccInfo ); + static AccessibleBase* CreateChartElement(const AccessibleElementInfo& rAccInfo); }; -} // namespace chart +} // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx index ec04c5414178..a98a0aa72bc0 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx @@ -23,17 +23,22 @@ #include <memory> #include <vector> -namespace chart { class WrappedProperty; } -namespace com::sun::star::beans { struct Property; } +namespace chart +{ +class WrappedProperty; +} +namespace com::sun::star::beans +{ +struct Property; +} namespace chart::wrapper { - class WrappedAutomaticPositionProperties { public: - static void addProperties( std::vector< css::beans::Property >& rOutProperties ); - static void addWrappedProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ); + static void addProperties(std::vector<css::beans::Property>& rOutProperties); + static void addWrappedProperties(std::vector<std::unique_ptr<WrappedProperty>>& rList); }; } //namespace chart::wrapper diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx index 522f54525937..48287dd5927d 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx @@ -22,18 +22,18 @@ namespace chart { - class WrappedTextRotationProperty final : public WrappedProperty { public: - explicit WrappedTextRotationProperty( bool bDirectState=false ); + explicit WrappedTextRotationProperty(bool bDirectState = false); virtual ~WrappedTextRotationProperty() override; - virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; + virtual css::beans::PropertyState getPropertyState( + const css::uno::Reference<css::beans::XPropertyState>& xInnerPropertyState) const override; private: - virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override; - virtual css::uno::Any convertOuterToInnerValue( const css::uno::Any& rOuterValue ) const override; + virtual css::uno::Any convertInnerToOuterValue(const css::uno::Any& rInnerValue) const override; + virtual css::uno::Any convertOuterToInnerValue(const css::uno::Any& rOuterValue) const override; bool m_bDirectState; }; diff --git a/chart2/source/controller/dialogs/ChangingResource.cxx b/chart2/source/controller/dialogs/ChangingResource.cxx index c50f274dadd4..4cbbe569ccf8 100644 --- a/chart2/source/controller/dialogs/ChangingResource.cxx +++ b/chart2/source/controller/dialogs/ChangingResource.cxx @@ -21,19 +21,14 @@ namespace chart { - -ResourceChangeListener::~ResourceChangeListener() -{ -} +ResourceChangeListener::~ResourceChangeListener() {} ChangingResource::ChangingResource() - : m_pChangeListener(nullptr) -{ -} -ChangingResource::~ChangingResource() + : m_pChangeListener(nullptr) { } -void ChangingResource::setChangeListener( ResourceChangeListener* pListener ) +ChangingResource::~ChangingResource() {} +void ChangingResource::setChangeListener(ResourceChangeListener* pListener) { m_pChangeListener = pListener; } diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx index 166846da6c99..1215e7b40cdf 100644 --- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx +++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx @@ -23,29 +23,26 @@ namespace chart { - using namespace ::com::sun::star; -TimerTriggeredControllerLock::TimerTriggeredControllerLock( const uno::Reference< frame::XModel >& xModel ) - : m_xModel( xModel ) +TimerTriggeredControllerLock::TimerTriggeredControllerLock( + const uno::Reference<frame::XModel>& xModel) + : m_xModel(xModel) , m_apControllerLockGuard() , m_aTimer() { - m_aTimer.SetTimeout( 4*EDIT_UPDATEDATA_TIMEOUT ); - m_aTimer.SetInvokeHandler( LINK( this, TimerTriggeredControllerLock, TimerTimeout ) ); -} -TimerTriggeredControllerLock::~TimerTriggeredControllerLock() -{ - m_aTimer.Stop(); + m_aTimer.SetTimeout(4 * EDIT_UPDATEDATA_TIMEOUT); + m_aTimer.SetInvokeHandler(LINK(this, TimerTriggeredControllerLock, TimerTimeout)); } +TimerTriggeredControllerLock::~TimerTriggeredControllerLock() { m_aTimer.Stop(); } void TimerTriggeredControllerLock::startTimer() { if (!m_apControllerLockGuard) - m_apControllerLockGuard.reset( new ControllerLockGuardUNO(m_xModel) ); + m_apControllerLockGuard.reset(new ControllerLockGuardUNO(m_xModel)); m_aTimer.Start(); } -IMPL_LINK_NOARG(TimerTriggeredControllerLock, TimerTimeout, Timer *, void) +IMPL_LINK_NOARG(TimerTriggeredControllerLock, TimerTimeout, Timer*, void) { m_apControllerLockGuard.reset(); } diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index d1c2acc3c14d..324eb06c8373 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -21,30 +21,25 @@ #include "tp_ChartType.hxx" #include <com/sun/star/chart2/XChartDocument.hpp> - namespace chart { using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; ChartTypeDialog::ChartTypeDialog(weld::Window* pParent, - const uno::Reference< frame::XModel >& xChartModel) + const uno::Reference<frame::XModel>& xChartModel) : GenericDialogController(pParent, "modules/schart/ui/charttypedialog.ui", "ChartTypeDialog") , m_xChartModel(xChartModel) , m_xContentArea(m_xDialog->weld_content_area()) { m_xChartTypeTabPage = std::make_unique<ChartTypeTabPage>( - m_xContentArea.get(), this, - uno::Reference<XChartDocument>::query(m_xChartModel), - false/*don't show title description*/); + m_xContentArea.get(), this, uno::Reference<XChartDocument>::query(m_xChartModel), + false /*don't show title description*/); m_xChartTypeTabPage->initializePage(); } -ChartTypeDialog::~ChartTypeDialog() -{ - m_xChartTypeTabPage.reset(); -} +ChartTypeDialog::~ChartTypeDialog() { m_xChartTypeTabPage.reset(); } } //namespace chart diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx index 65dc9010e294..f718366d7c8b 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx @@ -22,23 +22,22 @@ namespace chart { - using namespace ::com::sun::star; -SchLegendDlg::SchLegendDlg(weld::Window* pWindow, const uno::Reference< uno::XComponentContext>& xCC) +SchLegendDlg::SchLegendDlg(weld::Window* pWindow, const uno::Reference<uno::XComponentContext>& xCC) : GenericDialogController(pWindow, "modules/schart/ui/dlg_InsertLegend.ui", "dlg_InsertLegend") , m_xLegendPositionResources(new LegendPositionResources(*m_xBuilder, xCC)) { } -void SchLegendDlg::init( const uno::Reference< frame::XModel >& xChartModel ) +void SchLegendDlg::init(const uno::Reference<frame::XModel>& xChartModel) { - m_xLegendPositionResources->writeToResources( xChartModel ); + m_xLegendPositionResources->writeToResources(xChartModel); } -void SchLegendDlg::writeToModel( const uno::Reference< frame::XModel >& xChartModel ) const +void SchLegendDlg::writeToModel(const uno::Reference<frame::XModel>& xChartModel) const { - m_xLegendPositionResources->writeToModel( xChartModel ); + m_xLegendPositionResources->writeToModel(xChartModel); } } //namespace chart diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx index f228e037d32a..03f942945823 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx @@ -23,18 +23,17 @@ namespace chart { - SchTitleDlg::SchTitleDlg(weld::Window* pWindow, const TitleDialogData& rInput) : GenericDialogController(pWindow, "modules/schart/ui/inserttitledlg.ui", "InsertTitleDialog") , m_xTitleResources(new TitleResources(*m_xBuilder, true)) { m_xDialog->set_title(ObjectNameProvider::getName(OBJECTTYPE_TITLE, true)); - m_xTitleResources->writeToResources( rInput ); + m_xTitleResources->writeToResources(rInput); } -void SchTitleDlg::getResult( TitleDialogData& rOutput ) +void SchTitleDlg::getResult(TitleDialogData& rOutput) { - m_xTitleResources->readFromResources( rOutput ); + m_xTitleResources->readFromResources(rOutput); } } //namespace chart diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx index 5a5f66417572..3cb5107158b8 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.hxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.hxx @@ -20,19 +20,21 @@ #include <sfx2/basedlgs.hxx> -namespace weld { class Window; } +namespace weld +{ +class Window; +} class SfxItemSet; class SfxItemPool; namespace chart { - class NumberFormatDialog : public SfxSingleTabDialogController { public: NumberFormatDialog(weld::Window* pParent, SfxItemSet& rSet); - static SfxItemSet CreateEmptyItemSetForNumberFormatDialog( SfxItemPool& rItemPool ); + static SfxItemSet CreateEmptyItemSetForNumberFormatDialog(SfxItemPool& rItemPool); }; } //namespace chart diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx index 6b0a7eac2208..da48f4ca608a 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.cxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx @@ -23,7 +23,6 @@ namespace chart { - BarGeometryResources::BarGeometryResources(weld::Builder* pBuilder) : m_xFT_Geometry(pBuilder->weld_label("shapeft")) , m_xLB_Geometry(pBuilder->weld_tree_view("shape")) @@ -33,21 +32,21 @@ BarGeometryResources::BarGeometryResources(weld::Builder* pBuilder) m_xLB_Geometry->set_size_request(-1, m_xLB_Geometry->get_height_rows(4)); } -void BarGeometryResources::connect_changed(const Link<weld::TreeView&,void>& rLink) +void BarGeometryResources::connect_changed(const Link<weld::TreeView&, void>& rLink) { m_xLB_Geometry->connect_changed(rLink); } -void BarGeometryResources::set_visible( bool bShow ) +void BarGeometryResources::set_visible(bool bShow) { - m_xFT_Geometry->set_visible( bShow ); - m_xLB_Geometry->set_visible( bShow ); + m_xFT_Geometry->set_visible(bShow); + m_xLB_Geometry->set_visible(bShow); } -void BarGeometryResources::set_sensitive( bool bEnable ) +void BarGeometryResources::set_sensitive(bool bEnable) { - m_xFT_Geometry->set_sensitive( bEnable ); - m_xLB_Geometry->set_sensitive( bEnable ); + m_xFT_Geometry->set_sensitive(bEnable); + m_xLB_Geometry->set_sensitive(bEnable); } sal_Int32 BarGeometryResources::get_selected_index() const diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx index e4cbe6d526e3..7665e9ae4a5b 100644 --- a/chart2/source/controller/dialogs/res_Titles.cxx +++ b/chart2/source/controller/dialogs/res_Titles.cxx @@ -23,7 +23,6 @@ namespace chart { - TitleResources::TitleResources(weld::Builder& rBuilder, bool bShowSecondaryAxesTitle) : m_xFT_Main(rBuilder.weld_label("labelMainTitle")) , m_xFT_Sub(rBuilder.weld_label("labelSubTitle")) @@ -40,36 +39,33 @@ TitleResources::TitleResources(weld::Builder& rBuilder, bool bShowSecondaryAxesT , m_xEd_SecondaryXAxis(rBuilder.weld_entry("secondaryXaxis")) , m_xEd_SecondaryYAxis(rBuilder.weld_entry("secondaryYaxis")) { - m_xFT_SecondaryXAxis->set_visible( bShowSecondaryAxesTitle ); - m_xFT_SecondaryYAxis->set_visible( bShowSecondaryAxesTitle ); - m_xEd_SecondaryXAxis->set_visible( bShowSecondaryAxesTitle ); - m_xEd_SecondaryYAxis->set_visible( bShowSecondaryAxesTitle ); + m_xFT_SecondaryXAxis->set_visible(bShowSecondaryAxesTitle); + m_xFT_SecondaryYAxis->set_visible(bShowSecondaryAxesTitle); + m_xEd_SecondaryXAxis->set_visible(bShowSecondaryAxesTitle); + m_xEd_SecondaryYAxis->set_visible(bShowSecondaryAxesTitle); } -TitleResources::~TitleResources() -{ -} +TitleResources::~TitleResources() {} -void TitleResources::connect_changed( const Link<weld::Entry&,void>& rLink ) +void TitleResources::connect_changed(const Link<weld::Entry&, void>& rLink) { - m_xEd_Main->connect_changed( rLink ); - m_xEd_Sub->connect_changed( rLink ); - m_xEd_XAxis->connect_changed( rLink ); - m_xEd_YAxis->connect_changed( rLink ); - m_xEd_ZAxis->connect_changed( rLink ); - m_xEd_SecondaryXAxis->connect_changed( rLink ); - m_xEd_SecondaryYAxis->connect_changed( rLink ); + m_xEd_Main->connect_changed(rLink); + m_xEd_Sub->connect_changed(rLink); + m_xEd_XAxis->connect_changed(rLink); + m_xEd_YAxis->connect_changed(rLink); + m_xEd_ZAxis->connect_changed(rLink); + m_xEd_SecondaryXAxis->connect_changed(rLink); + m_xEd_SecondaryYAxis->connect_changed(rLink); } bool TitleResources::get_value_changed_from_saved() const { - return m_xEd_Main->get_value_changed_from_saved() - || m_xEd_Sub->get_value_changed_from_saved() - || m_xEd_XAxis->get_value_changed_from_saved() - || m_xEd_YAxis->get_value_changed_from_saved() - || m_xEd_ZAxis->get_value_changed_from_saved() - || m_xEd_SecondaryXAxis->get_value_changed_from_saved() - || m_xEd_SecondaryYAxis->get_value_changed_from_saved(); + return m_xEd_Main->get_value_changed_from_saved() || m_xEd_Sub->get_value_changed_from_saved() + || m_xEd_XAxis->get_value_changed_from_saved() + || m_xEd_YAxis->get_value_changed_from_saved() + || m_xEd_ZAxis->get_value_changed_from_saved() + || m_xEd_SecondaryXAxis->get_value_changed_from_saved() + || m_xEd_SecondaryYAxis->get_value_changed_from_saved(); } void TitleResources::save_value() @@ -83,23 +79,23 @@ void TitleResources::save_value() m_xEd_SecondaryYAxis->save_value(); } -void TitleResources::writeToResources( const TitleDialogData& rInput ) +void TitleResources::writeToResources(const TitleDialogData& rInput) { - m_xFT_Main->set_sensitive( rInput.aPossibilityList[0] ); - m_xFT_Sub->set_sensitive( rInput.aPossibilityList[1] ); - m_xFT_XAxis->set_sensitive( rInput.aPossibilityList[2] ); - m_xFT_YAxis->set_sensitive( rInput.aPossibilityList[3] ); - m_xFT_ZAxis->set_sensitive( rInput.aPossibilityList[4] ); - m_xFT_SecondaryXAxis->set_sensitive( rInput.aPossibilityList[5] ); - m_xFT_SecondaryYAxis->set_sensitive( rInput.aPossibilityList[6] ); + m_xFT_Main->set_sensitive(rInput.aPossibilityList[0]); + m_xFT_Sub->set_sensitive(rInput.aPossibilityList[1]); + m_xFT_XAxis->set_sensitive(rInput.aPossibilityList[2]); + m_xFT_YAxis->set_sensitive(rInput.aPossibilityList[3]); + m_xFT_ZAxis->set_sensitive(rInput.aPossibilityList[4]); + m_xFT_SecondaryXAxis->set_sensitive(rInput.aPossibilityList[5]); + m_xFT_SecondaryYAxis->set_sensitive(rInput.aPossibilityList[6]); - m_xEd_Main->set_sensitive( rInput.aPossibilityList[0] ); - m_xEd_Sub->set_sensitive( rInput.aPossibilityList[1] ); - m_xEd_XAxis->set_sensitive( rInput.aPossibilityList[2] ); - m_xEd_YAxis->set_sensitive( rInput.aPossibilityList[3] ); - m_xEd_ZAxis->set_sensitive( rInput.aPossibilityList[4] ); - m_xEd_SecondaryXAxis->set_sensitive( rInput.aPossibilityList[5] ); - m_xEd_SecondaryYAxis->set_sensitive( rInput.aPossibilityList[6] ); + m_xEd_Main->set_sensitive(rInput.aPossibilityList[0]); + m_xEd_Sub->set_sensitive(rInput.aPossibilityList[1]); + m_xEd_XAxis->set_sensitive(rInput.aPossibilityList[2]); + m_xEd_YAxis->set_sensitive(rInput.aPossibilityList[3]); + m_xEd_ZAxis->set_sensitive(rInput.aPossibilityList[4]); + m_xEd_SecondaryXAxis->set_sensitive(rInput.aPossibilityList[5]); + m_xEd_SecondaryYAxis->set_sensitive(rInput.aPossibilityList[6]); m_xEd_Main->set_text(rInput.aTextList[0]); m_xEd_Sub->set_text(rInput.aTextList[1]); @@ -110,7 +106,7 @@ void TitleResources::writeToResources( const TitleDialogData& rInput ) m_xEd_SecondaryYAxis->set_text(rInput.aTextList[6]); } -void TitleResources::readFromResources( TitleDialogData& rOutput ) +void TitleResources::readFromResources(TitleDialogData& rOutput) { rOutput.aExistenceList[0] = !m_xEd_Main->get_text().isEmpty(); rOutput.aExistenceList[1] = !m_xEd_Sub->get_text().isEmpty(); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index a64c900b397b..29cc518631ad 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -23,14 +23,16 @@ #include <vcl/weld.hxx> #include <svx/dlgctl3d.hxx> -namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::beans +{ +class XPropertySet; +} class ColorListBox; class LightButton; namespace chart { - struct LightSourceInfo; class ThreeD_SceneIllumination_TabPage @@ -38,32 +40,32 @@ class ThreeD_SceneIllumination_TabPage public: ThreeD_SceneIllumination_TabPage( weld::Container* pParent, weld::Window* pTopLevel, - const css::uno::Reference< css::beans::XPropertySet > & xSceneProperties, - const css::uno::Reference< css::frame::XModel >& xChartModel ); + const css::uno::Reference<css::beans::XPropertySet>& xSceneProperties, + const css::uno::Reference<css::frame::XModel>& xChartModel); ~ThreeD_SceneIllumination_TabPage(); private: - DECL_LINK( ClickLightSourceButtonHdl, weld::Button&, void ); - DECL_LINK( SelectColorHdl, ColorListBox&, void ); - DECL_LINK( ColorDialogHdl, weld::Button&, void ); - DECL_LINK( PreviewChangeHdl, SvxLightCtl3D*, void ); - DECL_LINK( PreviewSelectHdl, SvxLightCtl3D*, void ); + DECL_LINK(ClickLightSourceButtonHdl, weld::Button&, void); + DECL_LINK(SelectColorHdl, ColorListBox&, void); + DECL_LINK(ColorDialogHdl, weld::Button&, void); + DECL_LINK(PreviewChangeHdl, SvxLightCtl3D*, void); + DECL_LINK(PreviewSelectHdl, SvxLightCtl3D*, void); void updatePreview(); private: - DECL_LINK(fillControlsFromModel, void *, void); + DECL_LINK(fillControlsFromModel, void*, void); - void applyLightSourceToModel( sal_uInt32 nLightNumber ); + void applyLightSourceToModel(sal_uInt32 nLightNumber); void applyLightSourcesToModel(); std::unique_ptr<LightSourceInfo[]> m_pLightSourceInfoList; - css::uno::Reference< css::beans::XPropertySet > m_xSceneProperties; + css::uno::Reference<css::beans::XPropertySet> m_xSceneProperties; - TimerTriggeredControllerLock m_aTimerTriggeredControllerLock; + TimerTriggeredControllerLock m_aTimerTriggeredControllerLock; - bool m_bInCommitToModel; + bool m_bInCommitToModel; ModifyListenerCallBack m_aModelChangeListener; css::uno::Reference<css::frame::XModel> m_xChartModel; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 011d2cf5b3b5..d7f18242dd42 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -22,38 +22,39 @@ namespace chart { - class AxisPositionsTabPage : public SfxTabPage { public: - AxisPositionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs); + AxisPositionsTabPage(weld::Container* pPage, weld::DialogController* pController, + const SfxItemSet& rInAttrs); virtual ~AxisPositionsTabPage() override; - static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs ); - virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override; - virtual void Reset( const SfxItemSet* rInAttrs ) override; - virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet ) override; + static std::unique_ptr<SfxTabPage> + Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs); + virtual bool FillItemSet(SfxItemSet* rOutAttrs) override; + virtual void Reset(const SfxItemSet* rInAttrs) override; + virtual DeactivateRC DeactivatePage(SfxItemSet* pItemSet) override; - void SetNumFormatter( SvNumberFormatter* pFormatter ); + void SetNumFormatter(SvNumberFormatter* pFormatter); - void SetCrossingAxisIsCategoryAxis( bool bCrossingAxisIsCategoryAxis ); - void SetCategories( const css::uno::Sequence< OUString >& rCategories ); + void SetCrossingAxisIsCategoryAxis(bool bCrossingAxisIsCategoryAxis); + void SetCategories(const css::uno::Sequence<OUString>& rCategories); - void SupportAxisPositioning( bool bSupportAxisPositioning ); - void SupportCategoryPositioning( bool bSupportCategoryPositioning ); + void SupportAxisPositioning(bool bSupportAxisPositioning); + void SupportCategoryPositioning(bool bSupportCategoryPositioning); private: //methods: DECL_LINK(CrossesAtSelectHdl, weld::ComboBox&, void); DECL_LINK(PlaceLabelsSelectHdl, weld::ComboBox&, void); private: //member: - SvNumberFormatter* m_pNumFormatter; + SvNumberFormatter* m_pNumFormatter; - bool m_bCrossingAxisIsCategoryAxis; - css::uno::Sequence< OUString > m_aCategories; + bool m_bCrossingAxisIsCategoryAxis; + css::uno::Sequence<OUString> m_aCategories; - bool m_bSupportAxisPositioning; - bool m_bSupportCategoryPositioning; + bool m_bSupportAxisPositioning; + bool m_bSupportCategoryPositioning; std::unique_ptr<weld::Frame> m_xFL_AxisLine; std::unique_ptr<weld::ComboBox> m_xLB_CrossesAt; diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx index 169c150db733..200063af9663 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.hxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx @@ -25,21 +25,22 @@ class SvNumberFormatter; namespace chart { - class DataLabelsTabPage : public SfxTabPage { public: - DataLabelsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs); + DataLabelsTabPage(weld::Container* pPage, weld::DialogController* pController, + const SfxItemSet& rInAttrs); - static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs); + static std::unique_ptr<SfxTabPage> + Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs); - void SetNumberFormatter( SvNumberFormatter* pFormatter ); + void SetNumberFormatter(SvNumberFormatter* pFormatter); virtual void Reset(const SfxItemSet* rInAttrs) override; virtual bool FillItemSet(SfxItemSet* rOutAttrs) override; private: - DataLabelResources m_aDataLabelResources; + DataLabelResources m_aDataLabelResources; }; } //namespace chart diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx index f026aaf658d5..326cc902593e 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx @@ -22,15 +22,16 @@ namespace chart { - class BarGeometryResources; class SchLayoutTabPage : public SfxTabPage { public: - SchLayoutTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs); + SchLayoutTabPage(weld::Container* pPage, weld::DialogController* pController, + const SfxItemSet& rInAttrs); virtual ~SchLayoutTabPage() override; - static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs); + static std::unique_ptr<SfxTabPage> + Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs); virtual bool FillItemSet(SfxItemSet* rOutAttrs) override; virtual void Reset(const SfxItemSet* rInAttrs) override; diff --git a/chart2/source/controller/inc/ConfigurationAccess.hxx b/chart2/source/controller/inc/ConfigurationAccess.hxx index 63b3652b3e7a..2fb4636d2217 100644 --- a/chart2/source/controller/inc/ConfigurationAccess.hxx +++ b/chart2/source/controller/inc/ConfigurationAccess.hxx @@ -23,7 +23,7 @@ namespace chart::ConfigurationAccess { - /** @descr Retrieve the FieldUnit to be used for the UI. This unit is retrieved +/** @descr Retrieve the FieldUnit to be used for the UI. This unit is retrieved from the registry settings of the Calc application. If this setting can not be found there is a fallback to cm which is the most @@ -31,7 +31,7 @@ namespace chart::ConfigurationAccess @return the FieldUnit enum. See <vcl/fldunit.hxx> for definition */ - FieldUnit getFieldUnit(); +FieldUnit getFieldUnit(); } //namespace chart diff --git a/chart2/source/controller/inc/ItemPropertyMap.hxx b/chart2/source/controller/inc/ItemPropertyMap.hxx index ab3f76afde5f..7bee6ae814b5 100644 --- a/chart2/source/controller/inc/ItemPropertyMap.hxx +++ b/chart2/source/controller/inc/ItemPropertyMap.hxx @@ -24,11 +24,11 @@ #include <map> -namespace chart::wrapper { - -typedef std::map< ItemConverter::tWhichIdType, std::pair< ItemConverter::tPropertyNameType, ItemConverter::tMemberIdType > > +namespace chart::wrapper +{ +typedef std::map<ItemConverter::tWhichIdType, + std::pair<ItemConverter::tPropertyNameType, ItemConverter::tMemberIdType>> ItemPropertyMapType; - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index 3618f20e4a6e..f060a2aa95d3 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -22,42 +22,41 @@ #include <cppuhelper/implbase.hxx> #include <com/sun/star/sheet/XRangeSelectionListener.hpp> -namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::frame +{ +class XModel; +} namespace chart { - class RangeSelectionListenerParent { public: - virtual void listeningFinished( const OUString & rNewRange ) = 0; + virtual void listeningFinished(const OUString& rNewRange) = 0; virtual void disposingRangeSelection() = 0; protected: ~RangeSelectionListenerParent() {} }; -class RangeSelectionListener : public - ::cppu::WeakImplHelper< - css::sheet::XRangeSelectionListener > +class RangeSelectionListener : public ::cppu::WeakImplHelper<css::sheet::XRangeSelectionListener> { public: explicit RangeSelectionListener( - RangeSelectionListenerParent & rParent, - const OUString & rInitialRange, - const css::uno::Reference< css::frame::XModel >& xModelToLockController ); + RangeSelectionListenerParent& rParent, const OUString& rInitialRange, + const css::uno::Reference<css::frame::XModel>& xModelToLockController); virtual ~RangeSelectionListener() override; protected: // ____ XRangeSelectionListener ____ - virtual void SAL_CALL done( const css::sheet::RangeSelectionEvent& aEvent ) override; - virtual void SAL_CALL aborted( const css::sheet::RangeSelectionEvent& aEvent ) override; + virtual void SAL_CALL done(const css::sheet::RangeSelectionEvent& aEvent) override; + virtual void SAL_CALL aborted(const css::sheet::RangeSelectionEvent& aEvent) override; // ____ XEventListener ____ - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) override; private: - RangeSelectionListenerParent & m_rParent; + RangeSelectionListenerParent& m_rParent; OUString m_aRange; ControllerLockGuardUNO m_aControllerLockGuard; }; diff --git a/chart2/source/controller/inc/TabPageNotifiable.hxx b/chart2/source/controller/inc/TabPageNotifiable.hxx index 20a9c4e3ea58..440cda2de9aa 100644 --- a/chart2/source/controller/inc/TabPageNotifiable.hxx +++ b/chart2/source/controller/inc/TabPageNotifiable.hxx @@ -27,12 +27,11 @@ class BuilderPage; namespace chart { - class TabPageNotifiable { public: - virtual void setInvalidPage( BuilderPage * pTabPage ) = 0; - virtual void setValidPage( BuilderPage * pTabPage ) = 0; + virtual void setInvalidPage(BuilderPage* pTabPage) = 0; + virtual void setValidPage(BuilderPage* pTabPage) = 0; protected: ~TabPageNotifiable() {} diff --git a/chart2/source/controller/inc/TextDirectionListBox.hxx b/chart2/source/controller/inc/TextDirectionListBox.hxx index f1fffd870a6b..208e0df6cf02 100644 --- a/chart2/source/controller/inc/TextDirectionListBox.hxx +++ b/chart2/source/controller/inc/TextDirectionListBox.hxx @@ -23,14 +23,12 @@ namespace chart { - class TextDirectionListBox : public svx::FrameDirectionListBox { public: explicit TextDirectionListBox(std::unique_ptr<weld::ComboBox> pControl); }; - } //namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx index e8018ae4370a..f8e899df1d19 100644 --- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx +++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx @@ -24,26 +24,31 @@ #include <memory> -namespace com::sun::star::frame { class XModel; } -namespace chart { class ControllerLockGuardUNO; } - +namespace com::sun::star::frame +{ +class XModel; +} namespace chart { +class ControllerLockGuardUNO; +} +namespace chart +{ class TimerTriggeredControllerLock final { public: - TimerTriggeredControllerLock( const css::uno::Reference< css::frame::XModel >& xModel ); + TimerTriggeredControllerLock(const css::uno::Reference<css::frame::XModel>& xModel); ~TimerTriggeredControllerLock(); void startTimer(); private: - css::uno::Reference< css::frame::XModel > m_xModel; - std::unique_ptr< ControllerLockGuardUNO > m_apControllerLockGuard; - AutoTimer m_aTimer; + css::uno::Reference<css::frame::XModel> m_xModel; + std::unique_ptr<ControllerLockGuardUNO> m_apControllerLockGuard; + AutoTimer m_aTimer; - DECL_LINK( TimerTimeout, Timer*, void ); + DECL_LINK(TimerTimeout, Timer*, void); }; } //namespace chart diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index ca430e49751c..d2864f3fd577 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -20,17 +20,19 @@ #include <vcl/weld.hxx> -namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::frame +{ +class XModel; +} namespace chart { - class ChartTypeTabPage; class ChartTypeDialog : public weld::GenericDialogController { public: ChartTypeDialog(weld::Window* pWindow, - const css::uno::Reference< css::frame::XModel >& xChartModel); + const css::uno::Reference<css::frame::XModel>& xChartModel); virtual ~ChartTypeDialog() override; private: diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index 312afc7e0f71..a8edc627e860 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -26,15 +26,20 @@ #include <memory> -namespace com::sun::star::chart2 { class XChartDocument; } -namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::chart2 +{ +class XChartDocument; +} +namespace com::sun::star::uno +{ +class XComponentContext; +} using vcl::WizardTypes::WizardState; using vcl::WizardTypes::CommitPageReason; namespace chart { - class DialogModel; class ChartTypeTemplateProvider; @@ -42,18 +47,18 @@ class CreationWizard : public vcl::RoadmapWizardMachine, public TabPageNotifiabl { public: CreationWizard(weld::Window* pParent, - const css::uno::Reference<css::frame::XModel>& xChartModel, - const css::uno::Reference<css::uno::XComponentContext>& xContext); + const css::uno::Reference<css::frame::XModel>& xChartModel, + const css::uno::Reference<css::uno::XComponentContext>& xContext); CreationWizard() = delete; virtual ~CreationWizard() override; // TabPageNotifiable - virtual void setInvalidPage(BuilderPage * pTabPage) override; - virtual void setValidPage(BuilderPage * pTabPage) override; + virtual void setInvalidPage(BuilderPage* pTabPage) override; + virtual void setValidPage(BuilderPage* pTabPage) override; protected: - virtual bool leaveState( WizardState _nState ) override; + virtual bool leaveState(WizardState _nState) override; virtual WizardState determineNextState(WizardState nCurrentState) const override; virtual void enterState(WizardState nState) override; diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx index db8e48d63a64..d799f1765078 100644 --- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx +++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx @@ -23,11 +23,10 @@ namespace chart { - struct InsertAxisOrGridDialogData { - css::uno::Sequence< sal_Bool > aPossibilityList; - css::uno::Sequence< sal_Bool > aExistenceList; + css::uno::Sequence<sal_Bool> aPossibilityList; + css::uno::Sequence<sal_Bool> aExistenceList; InsertAxisOrGridDialogData(); }; @@ -48,8 +47,9 @@ protected: std::unique_ptr<weld::CheckButton> m_xCbSecondaryZ; public: - SchAxisDlg(weld::Window* pParent, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg = true); - void getResult( InsertAxisOrGridDialogData& rOutput ); + SchAxisDlg(weld::Window* pParent, const InsertAxisOrGridDialogData& rInput, + bool bAxisDlg = true); + void getResult(InsertAxisOrGridDialogData& rOutput); }; /************************************************************************* diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index ae546df704a0..d4ef7ec80ef2 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -24,29 +24,31 @@ #include "res_ErrorBar.hxx" -namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::frame +{ +class XModel; +} namespace chart { - class InsertErrorBarsDialog : public weld::GenericDialogController { public: InsertErrorBarsDialog(weld::Window* pParent, const SfxItemSet& rMyAttrs, - const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument, + const css::uno::Reference<css::chart2::XChartDocument>& xChartDocument, ErrorBarResources::tErrorBarType eType); - void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth ); + void SetAxisMinorStepWidthForErrorBarDecimals(double fMinorStepWidth); static double getAxisMinorStepWidthForErrorBarDecimals( - const css::uno::Reference< css::frame::XModel >& xChartModel, - const css::uno::Reference< css::uno::XInterface >& xChartView, - const OUString& rSelectedObjectCID ); + const css::uno::Reference<css::frame::XModel>& xChartModel, + const css::uno::Reference<css::uno::XInterface>& xChartView, + const OUString& rSelectedObjectCID); - void FillItemSet( SfxItemSet& rOutAttrs ); + void FillItemSet(SfxItemSet& rOutAttrs); private: - std::unique_ptr< ErrorBarResources > m_apErrorBarResources; + std::unique_ptr<ErrorBarResources> m_apErrorBarResources; }; } //namespace chart diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index a4c9e876ae65..e31668e01f38 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -21,7 +21,10 @@ #include <vcl/weld.hxx> #include <ControllerLockGuard.hxx> -namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::frame +{ +class XModel; +} namespace chart { @@ -32,7 +35,7 @@ class ThreeD_SceneIllumination_TabPage; class View3DDialog : public weld::GenericDialogController { public: - View3DDialog(weld::Window* pWindow, const css::uno::Reference<css::frame::XModel> & xChartModel); + View3DDialog(weld::Window* pWindow, const css::uno::Reference<css::frame::XModel>& xChartModel); virtual ~View3DDialog() override; virtual short run() override; @@ -40,7 +43,7 @@ public: private: DECL_LINK(ActivatePageHdl, const OString&, void); - ControllerLockHelper m_aControllerLocker; + ControllerLockHelper m_aControllerLocker; static sal_uInt16 m_nLastPageId; diff --git a/chart2/source/controller/inc/res_Titles.hxx b/chart2/source/controller/inc/res_Titles.hxx index 7b5596c26191..a7a2eba57277 100644 --- a/chart2/source/controller/inc/res_Titles.hxx +++ b/chart2/source/controller/inc/res_Titles.hxx @@ -21,23 +21,31 @@ #include "TitleDialogData.hxx" template <typename Arg, typename Ret> class Link; -namespace weld { class Builder; } -namespace weld { class Entry; } -namespace weld { class Label; } +namespace weld +{ +class Builder; +} +namespace weld +{ +class Entry; +} +namespace weld +{ +class Label; +} namespace chart { - class TitleResources final { public: TitleResources(weld::Builder& rParent, bool bShowSecondaryAxesTitle); ~TitleResources(); - void writeToResources( const TitleDialogData& rInput ); - void readFromResources( TitleDialogData& rOutput ); + void writeToResources(const TitleDialogData& rInput); + void readFromResources(TitleDialogData& rOutput); - void connect_changed( const Link<weld::Entry&,void>& rLink ); + void connect_changed(const Link<weld::Entry&, void>& rLink); bool get_value_changed_from_saved() const; void save_value(); diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx index 5cc6b5beac99..adee06ddd51a 100644 --- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx +++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx @@ -9,20 +9,16 @@ #include "ChartSidebarModifyListener.hxx" -namespace chart::sidebar { - -ChartSidebarModifyListenerParent::~ChartSidebarModifyListenerParent() +namespace chart::sidebar { -} +ChartSidebarModifyListenerParent::~ChartSidebarModifyListenerParent() {} -ChartSidebarModifyListener::ChartSidebarModifyListener(ChartSidebarModifyListenerParent* pParent): - mpParent(pParent) +ChartSidebarModifyListener::ChartSidebarModifyListener(ChartSidebarModifyListenerParent* pParent) + : mpParent(pParent) { } -ChartSidebarModifyListener::~ChartSidebarModifyListener() -{ -} +ChartSidebarModifyListener::~ChartSidebarModifyListener() {} void ChartSidebarModifyListener::modified(const css::lang::EventObject& /*rEvent*/) { @@ -38,7 +34,6 @@ void ChartSidebarModifyListener::disposing(const css::lang::EventObject& /*rEven mpParent->modelInvalid(); mpParent = nullptr; } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx index ffd7ca39ed18..afcbbdab510c 100644 --- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx +++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx @@ -12,8 +12,8 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <cppuhelper/implbase.hxx> -namespace chart::sidebar { - +namespace chart::sidebar +{ class ChartSidebarModifyListenerParent { public: @@ -27,7 +27,6 @@ public: class ChartSidebarModifyListener : public cppu::WeakImplHelper<css::util::XModifyListener> { public: - explicit ChartSidebarModifyListener(ChartSidebarModifyListenerParent* pParent); virtual ~ChartSidebarModifyListener() override; @@ -38,7 +37,6 @@ public: private: ChartSidebarModifyListenerParent* mpParent; }; - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx index 5c24c5a18f16..44bae13651e1 100644 --- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx +++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx @@ -16,8 +16,8 @@ #include <vector> -namespace chart::sidebar { - +namespace chart::sidebar +{ class ChartSidebarSelectionListenerParent { public: @@ -26,10 +26,10 @@ public: virtual void selectionChanged(bool bSelected) = 0; }; -class ChartSidebarSelectionListener : public cppu::WeakImplHelper<css::view::XSelectionChangeListener> +class ChartSidebarSelectionListener + : public cppu::WeakImplHelper<css::view::XSelectionChangeListener> { public: - // listen to all chart selection changes explicit ChartSidebarSelectionListener(ChartSidebarSelectionListenerParent* pParent); // only listen to the changes of eType @@ -47,7 +47,6 @@ private: std::vector<ObjectType> maTypes; }; - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/ChartViewHelper.hxx b/chart2/source/inc/ChartViewHelper.hxx index c2415baaebb9..54d23e8107a0 100644 --- a/chart2/source/inc/ChartViewHelper.hxx +++ b/chart2/source/inc/ChartViewHelper.hxx @@ -20,16 +20,21 @@ #include "charttoolsdllapi.hxx" -namespace com::sun::star::uno { template <class interface_type> class Reference; } -namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::uno +{ +template <class interface_type> class Reference; +} +namespace com::sun::star::frame +{ +class XModel; +} namespace chart { - class OOO_DLLPUBLIC_CHARTTOOLS ChartViewHelper { public: - static void setViewToDirtyState( const css::uno::Reference< css::frame::XModel >& xChartModel ); + static void setViewToDirtyState(const css::uno::Reference<css::frame::XModel>& xChartModel); }; } //namespace chart diff --git a/chart2/source/inc/ControllerLockGuard.hxx b/chart2/source/inc/ControllerLockGuard.hxx index dfaaf9f13123..c84e87af36ad 100644 --- a/chart2/source/inc/ControllerLockGuard.hxx +++ b/chart2/source/inc/ControllerLockGuard.hxx @@ -21,12 +21,17 @@ #include "charttoolsdllapi.hxx" #include <com/sun/star/uno/Reference.h> -namespace chart { class ChartModel; } -namespace com::sun::star::frame { class XModel; } - namespace chart { +class ChartModel; +} +namespace com::sun::star::frame +{ +class XModel; +} +namespace chart +{ /** This guard calls lockControllers at the given Model in the CTOR and unlockControllers in the DTOR. Using this ensures that controllers do not remain locked when leaving a function even in case an exception is thrown. @@ -34,17 +39,17 @@ namespace chart class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockGuardUNO { public: - explicit ControllerLockGuardUNO( const css::uno::Reference< css::frame::XModel > & xModel ); + explicit ControllerLockGuardUNO(const css::uno::Reference<css::frame::XModel>& xModel); ~ControllerLockGuardUNO(); private: - css::uno::Reference< css::frame::XModel > mxModel; + css::uno::Reference<css::frame::XModel> mxModel; }; class ControllerLockGuard { public: - explicit ControllerLockGuard( ChartModel& rModel ); + explicit ControllerLockGuard(ChartModel& rModel); ~ControllerLockGuard(); private: @@ -60,15 +65,14 @@ private: class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockHelper { public: - explicit ControllerLockHelper( - const css::uno::Reference< css::frame::XModel > & xModel ); + explicit ControllerLockHelper(const css::uno::Reference<css::frame::XModel>& xModel); ~ControllerLockHelper(); SAL_DLLPRIVATE void lockControllers(); SAL_DLLPRIVATE void unlockControllers(); private: - css::uno::Reference< css::frame::XModel > m_xModel; + css::uno::Reference<css::frame::XModel> m_xModel; }; /** This guard calls lockControllers at the given ControllerLockHelper in the @@ -79,11 +83,11 @@ private: class OOO_DLLPUBLIC_CHARTTOOLS ControllerLockHelperGuard { public: - explicit ControllerLockHelperGuard( ControllerLockHelper & rHelper ); + explicit ControllerLockHelperGuard(ControllerLockHelper& rHelper); ~ControllerLockHelperGuard(); private: - ControllerLockHelper & m_rHelper; + ControllerLockHelper& m_rHelper; }; } // namespace chart diff --git a/chart2/source/inc/DisposeHelper.hxx b/chart2/source/inc/DisposeHelper.hxx index 8877f435e609..8c9b0b7d47f3 100644 --- a/chart2/source/inc/DisposeHelper.hxx +++ b/chart2/source/inc/DisposeHelper.hxx @@ -23,26 +23,22 @@ namespace chart::DisposeHelper { - -template<class T> -void Dispose(const T & xInterface) +template <class T> void Dispose(const T& xInterface) { css::uno::Reference<css::lang::XComponent> xComponent(xInterface, css::uno::UNO_QUERY); if (xComponent.is()) xComponent->dispose(); } -template<class T> -void DisposeAndClear(css::uno::Reference<T> & rInterface) +template <class T> void DisposeAndClear(css::uno::Reference<T>& rInterface) { Dispose<css::uno::Reference<T>>(rInterface); rInterface.set(nullptr); } -template<class Container> -void DisposeAllElements(Container & rContainer) +template <class Container> void DisposeAllElements(Container& rContainer) { - for (const auto & rElement : rContainer) + for (const auto& rElement : rContainer) { Dispose<typename Container::value_type>(rElement); } diff --git a/chart2/source/inc/FastPropertyIdRanges.hxx b/chart2/source/inc/FastPropertyIdRanges.hxx index 333c9df6c7e4..d06809e44c1f 100644 --- a/chart2/source/inc/FastPropertyIdRanges.hxx +++ b/chart2/source/inc/FastPropertyIdRanges.hxx @@ -20,19 +20,18 @@ namespace chart { - enum FastPropertyIdRanges { FAST_PROPERTY_ID_START = 10000, FAST_PROPERTY_ID_START_DATA_SERIES = FAST_PROPERTY_ID_START + 1000, - FAST_PROPERTY_ID_START_DATA_POINT = FAST_PROPERTY_ID_START + 2000, - FAST_PROPERTY_ID_START_CHAR_PROP = FAST_PROPERTY_ID_START + 3000, - FAST_PROPERTY_ID_START_LINE_PROP = FAST_PROPERTY_ID_START + 4000, - FAST_PROPERTY_ID_START_FILL_PROP = FAST_PROPERTY_ID_START + 5000, - FAST_PROPERTY_ID_START_USERDEF_PROP= FAST_PROPERTY_ID_START + 6000, - FAST_PROPERTY_ID_START_SCENE_PROP = FAST_PROPERTY_ID_START + 7000, -// FAST_PROPERTY_ID_START_NAMED_FILL_PROP = FAST_PROPERTY_ID_START + 8000, -// FAST_PROPERTY_ID_START_NAMED_LINE_PROP = FAST_PROPERTY_ID_START + 9000, + FAST_PROPERTY_ID_START_DATA_POINT = FAST_PROPERTY_ID_START + 2000, + FAST_PROPERTY_ID_START_CHAR_PROP = FAST_PROPERTY_ID_START + 3000, + FAST_PROPERTY_ID_START_LINE_PROP = FAST_PROPERTY_ID_START + 4000, + FAST_PROPERTY_ID_START_FILL_PROP = FAST_PROPERTY_ID_START + 5000, + FAST_PROPERTY_ID_START_USERDEF_PROP = FAST_PROPERTY_ID_START + 6000, + FAST_PROPERTY_ID_START_SCENE_PROP = FAST_PROPERTY_ID_START + 7000, + // FAST_PROPERTY_ID_START_NAMED_FILL_PROP = FAST_PROPERTY_ID_START + 8000, + // FAST_PROPERTY_ID_START_NAMED_LINE_PROP = FAST_PROPERTY_ID_START + 9000, FAST_PROPERTY_ID_START_CHART_STATISTIC_PROP = FAST_PROPERTY_ID_START + 12000, FAST_PROPERTY_ID_START_CHART_SYMBOL_PROP = FAST_PROPERTY_ID_START + 13000, FAST_PROPERTY_ID_START_CHART_DATACAPTION_PROP = FAST_PROPERTY_ID_START + 14000, diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx index f53f10fbb9ad..5e6926d6295e 100644 --- a/chart2/source/inc/ModifyListenerCallBack.hxx +++ b/chart2/source/inc/ModifyListenerCallBack.hxx @@ -25,8 +25,8 @@ #include <com/sun/star/util/XModifyListener.hpp> #include "charttoolsdllapi.hxx" -namespace chart { - +namespace chart +{ /** Use this class as a member if you want to listen on a XModifyBroadcaster without becoming a XModifyListener yourself */ @@ -36,19 +36,21 @@ class ModifyListenerCallBack_impl; class OOO_DLLPUBLIC_CHARTTOOLS ModifyListenerCallBack { public: - explicit ModifyListenerCallBack( const Link<void*,void>& rCallBack ); + explicit ModifyListenerCallBack(const Link<void*, void>& rCallBack); virtual ~ModifyListenerCallBack(); - void startListening( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyBroadcaster >& xBroadcaster ); + void startListening( + const ::com::sun::star::uno::Reference<::com::sun::star::util::XModifyBroadcaster>& + xBroadcaster); SAL_DLLPRIVATE void stopListening(); private: //methods - ModifyListenerCallBack( const ModifyListenerCallBack& ) = delete; + ModifyListenerCallBack(const ModifyListenerCallBack&) = delete; private: //member ModifyListenerCallBack_impl* pModifyListener_impl; - css::uno::Reference< css::util::XModifyListener > m_xModifyListener; + css::uno::Reference<css::util::XModifyListener> m_xModifyListener; }; } // namespace chart diff --git a/chart2/source/inc/PopupRequest.hxx b/chart2/source/inc/PopupRequest.hxx index 5cbf4eb599cc..729cc3a941fc 100644 --- a/chart2/source/inc/PopupRequest.hxx +++ b/chart2/source/inc/PopupRequest.hxx @@ -17,12 +17,9 @@ namespace chart { - namespace impl { - typedef cppu::WeakComponentImplHelper<css::awt::XRequestCallback> PopupRequest_Base; - } class OOO_DLLPUBLIC_CHARTTOOLS PopupRequest : public MutexContainer, public impl::PopupRequest_Base @@ -31,14 +28,11 @@ public: explicit PopupRequest(); virtual ~PopupRequest() override; - css::uno::Reference<css::awt::XCallback> const & getCallback() const - { - return m_xCallback; - } + css::uno::Reference<css::awt::XCallback> const& getCallback() const { return m_xCallback; } protected: // ____ XRequestCallback ____ - virtual void SAL_CALL addCallback(const css::uno::Reference< ::css::awt::XCallback >& xCallback, + virtual void SAL_CALL addCallback(const css::uno::Reference<::css::awt::XCallback>& xCallback, const css::uno::Any& aData) override; // ____ WeakComponentImplHelperBase ____ diff --git a/chart2/source/inc/ResId.hxx b/chart2/source/inc/ResId.hxx index f5a4734d362b..bb057866118f 100644 --- a/chart2/source/inc/ResId.hxx +++ b/chart2/source/inc/ResId.hxx @@ -23,8 +23,7 @@ namespace chart { - -OUString OOO_DLLPUBLIC_CHARTTOOLS SchResId(const char *pId); +OUString OOO_DLLPUBLIC_CHARTTOOLS SchResId(const char* pId); } // namespace chart diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx index acff6a8bb985..28398efd8155 100644 --- a/chart2/source/inc/WrappedDirectStateProperty.hxx +++ b/chart2/source/inc/WrappedDirectStateProperty.hxx @@ -23,17 +23,14 @@ namespace chart { - -class OOO_DLLPUBLIC_CHARTTOOLS WrappedDirectStateProperty : - public WrappedProperty +class OOO_DLLPUBLIC_CHARTTOOLS WrappedDirectStateProperty : public WrappedProperty { public: - explicit WrappedDirectStateProperty( - const OUString& rOuterName, const OUString& rInnerName ); + explicit WrappedDirectStateProperty(const OUString& rOuterName, const OUString& rInnerName); virtual ~WrappedDirectStateProperty() override; virtual css::beans::PropertyState getPropertyState( - const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; + const css::uno::Reference<css::beans::XPropertyState>& xInnerPropertyState) const override; }; } // namespace chart diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx index 0a19a050c5dc..1aa9a26c46d6 100644 --- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx +++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx @@ -25,11 +25,13 @@ #include <tools/date.hxx> #include <vector> -namespace com::sun::star::chart2 { class XScaling; } +namespace com::sun::star::chart2 +{ +class XScaling; +} namespace chart { - /** This structure contains the explicit values for a scale like Minimum and Maximum. See also css::chart2::ScaleData. */ @@ -41,14 +43,14 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitScaleData double Maximum; double Origin; - css::chart2::AxisOrientation Orientation; + css::chart2::AxisOrientation Orientation; - css::uno::Reference< css::chart2::XScaling > Scaling; + css::uno::Reference<css::chart2::XScaling> Scaling; - sal_Int32 AxisType;//see css::chart2::AxisType - bool ShiftedCategoryPosition; - sal_Int32 TimeResolution; //constant of type <type>css::chart::TimeUnit</type> - Date NullDate; + sal_Int32 AxisType; //see css::chart2::AxisType + bool ShiftedCategoryPosition; + sal_Int32 TimeResolution; //constant of type <type>css::chart::TimeUnit</type> + Date NullDate; }; struct ExplicitSubIncrement @@ -77,8 +79,8 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData /** the following two members are only for date-time axis */ - css::chart::TimeInterval MajorTimeInterval; - css::chart::TimeInterval MinorTimeInterval; + css::chart::TimeInterval MajorTimeInterval; + css::chart::TimeInterval MinorTimeInterval; /** the other members are for *not* date-time axis */ @@ -103,7 +105,7 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData <p><member>PostEquidistant</member> rules whether the <member>Distance</member> is meant to be a value before or after scaling.</p> */ - double Distance; + double Distance; /** <member>PostEquidistant</member> rules whether the member <member>Distance</member> @@ -115,7 +117,7 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData If <member>PostEquidistant</member> equals <FALSE/> <member>Distance</member> is given in values before <type>XScaling</type> is applied.</p> */ - bool PostEquidistant; + bool PostEquidistant; /** The <member>BaseValue</member> gives a starting point on the scale to which all further main tickmarks are relatively positioned. @@ -133,7 +135,7 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData And setting BaseValue to 2, -2, 4, -4 etc. in this example leads to the same result as BaseValue=0.</p> */ - double BaseValue; + double BaseValue; /** <member>SubIncrements</member> describes the positioning of further sub tickmarks on the scale of an axis. @@ -144,7 +146,7 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData positions of subsequent tickmarks in relation to their parent tickmarks given by the preceding SubIncrement.</p> */ - std::vector< ExplicitSubIncrement > SubIncrements; + std::vector<ExplicitSubIncrement> SubIncrements; }; } //namespace chart diff --git a/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx index 573ce60fc326..0318104ec683 100644 --- a/chart2/source/inc/servicenames_charttypes.hxx +++ b/chart2/source/inc/servicenames_charttypes.hxx @@ -18,8 +18,8 @@ */ #pragma once -namespace chart { - +namespace chart +{ #define CHART2_SERVICE_NAME_CHARTTYPE_AREA "com.sun.star.chart2.AreaChartType" #define CHART2_SERVICE_NAME_CHARTTYPE_BAR "com.sun.star.chart2.BarChartType" #define CHART2_SERVICE_NAME_CHARTTYPE_COLUMN "com.sun.star.chart2.ColumnChartType" diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index 1631b9eaa0b0..ac8571441557 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -22,12 +22,11 @@ namespace chart { - class CartesianCoordinateSystem : public BaseCoordinateSystem { public: - explicit CartesianCoordinateSystem( sal_Int32 nDimensionCount ); - explicit CartesianCoordinateSystem( const CartesianCoordinateSystem & rSource ); + explicit CartesianCoordinateSystem(sal_Int32 nDimensionCount); + explicit CartesianCoordinateSystem(const CartesianCoordinateSystem& rSource); virtual ~CartesianCoordinateSystem() override; // ____ XCoordinateSystem ____ @@ -35,12 +34,12 @@ public: virtual OUString SAL_CALL getViewServiceName() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; + virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone() override; // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; class CartesianCoordinateSystem2d : public CartesianCoordinateSystem @@ -51,8 +50,8 @@ public: // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; class CartesianCoordinateSystem3d : public CartesianCoordinateSystem @@ -63,10 +62,10 @@ public: // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; -} // namespace chart +} // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index 5c6dfb26c513..ff0ff040d3b1 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -22,12 +22,11 @@ namespace chart { - class PolarCoordinateSystem : public BaseCoordinateSystem { public: - explicit PolarCoordinateSystem( sal_Int32 nDimensionCount ); - explicit PolarCoordinateSystem( const PolarCoordinateSystem & rSource ); + explicit PolarCoordinateSystem(sal_Int32 nDimensionCount); + explicit PolarCoordinateSystem(const PolarCoordinateSystem& rSource); virtual ~PolarCoordinateSystem() override; // ____ XCoordinateSystem ____ @@ -35,12 +34,12 @@ public: virtual OUString SAL_CALL getViewServiceName() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; + virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone() override; // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; class PolarCoordinateSystem2d : public PolarCoordinateSystem @@ -51,8 +50,8 @@ public: // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; class PolarCoordinateSystem3d : public PolarCoordinateSystem @@ -63,10 +62,10 @@ public: // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; -} // namespace chart +} // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.hxx b/chart2/source/model/template/ColumnLineDataInterpreter.hxx index 85722733570b..43801bc249d3 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.hxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.hxx @@ -22,20 +22,19 @@ namespace chart { - class ColumnLineDataInterpreter : public DataInterpreter { public: - explicit ColumnLineDataInterpreter( - sal_Int32 nNumberOfLines ); + explicit ColumnLineDataInterpreter(sal_Int32 nNumberOfLines); virtual ~ColumnLineDataInterpreter() override; protected: // ____ XDataInterpreter ____ virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( - const css::uno::Reference< css::chart2::data::XDataSource >& xSource, - const css::uno::Sequence< css::beans::PropertyValue >& aArguments, - const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override; + const css::uno::Reference<css::chart2::data::XDataSource>& xSource, + const css::uno::Sequence<css::beans::PropertyValue>& aArguments, + const css::uno::Sequence<css::uno::Reference<css::chart2::XDataSeries>>& aSeriesToReUse) + override; private: sal_Int32 m_nNumberOfLines; diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 48c641bfccdf..0ca41b60ba55 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -22,28 +22,24 @@ namespace chart { - class FilledNetChartType final : public NetChartType_Base { public: explicit FilledNetChartType(); virtual ~FilledNetChartType() override; - virtual OUString SAL_CALL - getImplementationName() override; - virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; private: - explicit FilledNetChartType( const FilledNetChartType & rOther ); + explicit FilledNetChartType(const FilledNetChartType& rOther); // ____ XChartType ____ virtual OUString SAL_CALL getChartType() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; + virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/tools/ChartViewHelper.cxx b/chart2/source/tools/ChartViewHelper.cxx index f11ea7421c5a..8caaeddb1e94 100644 --- a/chart2/source/tools/ChartViewHelper.cxx +++ b/chart2/source/tools/ChartViewHelper.cxx @@ -30,23 +30,23 @@ namespace chart using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; -void ChartViewHelper::setViewToDirtyState( const uno::Reference< frame::XModel >& xChartModel ) +void ChartViewHelper::setViewToDirtyState(const uno::Reference<frame::XModel>& xChartModel) { try { - uno::Reference< lang::XMultiServiceFactory > xFact( xChartModel, uno::UNO_QUERY ); - if( xFact.is() ) + uno::Reference<lang::XMultiServiceFactory> xFact(xChartModel, uno::UNO_QUERY); + if (xFact.is()) { - Reference< util::XModifyListener > xModifyListener( - xFact->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); - if( xModifyListener.is() ) + Reference<util::XModifyListener> xModifyListener( + xFact->createInstance(CHART_VIEW_SERVICE_NAME), uno::UNO_QUERY); + if (xModifyListener.is()) { - lang::EventObject aEvent( xChartModel ); - xModifyListener->modified( aEvent ); + lang::EventObject aEvent(xChartModel); + xModifyListener->modified(aEvent); } } } - catch( const uno::Exception & ) + catch (const uno::Exception&) { DBG_UNHANDLED_EXCEPTION("chart2"); } diff --git a/chart2/source/tools/PopupRequest.cxx b/chart2/source/tools/PopupRequest.cxx index 1d3a36d5c43a..685dac49369c 100644 --- a/chart2/source/tools/PopupRequest.cxx +++ b/chart2/source/tools/PopupRequest.cxx @@ -14,14 +14,12 @@ using namespace css; namespace chart { - PopupRequest::PopupRequest() : impl::PopupRequest_Base(m_aMutex) { } -PopupRequest::~PopupRequest() -{} +PopupRequest::~PopupRequest() {} // ____ XRequestCallback ____ @@ -33,9 +31,7 @@ void SAL_CALL PopupRequest::addCallback(const uno::Reference<awt::XCallback>& xC // ____ WeakComponentImplHelperBase ____ // is called when dispose() is called at this component -void SAL_CALL PopupRequest::disposing() -{ -} +void SAL_CALL PopupRequest::disposing() {} } // namespace chart diff --git a/chart2/source/tools/TrueGuard.cxx b/chart2/source/tools/TrueGuard.cxx index f4acf35742d4..3fca959e78c2 100644 --- a/chart2/source/tools/TrueGuard.cxx +++ b/chart2/source/tools/TrueGuard.cxx @@ -21,17 +21,13 @@ namespace chart { - -TrueGuard::TrueGuard( bool& rbTrueDuringGuardedTime ) - : m_rbTrueDuringGuardedTime( rbTrueDuringGuardedTime ) +TrueGuard::TrueGuard(bool& rbTrueDuringGuardedTime) + : m_rbTrueDuringGuardedTime(rbTrueDuringGuardedTime) { m_rbTrueDuringGuardedTime = true; } -TrueGuard::~TrueGuard() -{ - m_rbTrueDuringGuardedTime = false; -} +TrueGuard::~TrueGuard() { m_rbTrueDuringGuardedTime = false; } } // namespace chart diff --git a/chart2/source/view/axes/TickmarkProperties.hxx b/chart2/source/view/axes/TickmarkProperties.hxx index 17f8d473eb23..cbb0398b6a19 100644 --- a/chart2/source/view/axes/TickmarkProperties.hxx +++ b/chart2/source/view/axes/TickmarkProperties.hxx @@ -23,11 +23,11 @@ namespace chart { - struct TickmarkProperties { - sal_Int32 RelativePos;//Position in screen values relative to the axis where the tickmark line starts - sal_Int32 Length;//Length of the tickmark line in screen values + sal_Int32 + RelativePos; //Position in screen values relative to the axis where the tickmark line starts + sal_Int32 Length; //Length of the tickmark line in screen values VLineProperties aLineProperties; }; diff --git a/chart2/source/view/charttypes/BarPositionHelper.hxx b/chart2/source/view/charttypes/BarPositionHelper.hxx index 0819560b0105..961ea988f604 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.hxx +++ b/chart2/source/view/charttypes/BarPositionHelper.hxx @@ -24,20 +24,19 @@ namespace chart { - class BarPositionHelper : public CategoryPositionHelper, public PlottingPositionHelper { public: explicit BarPositionHelper(); - BarPositionHelper( const BarPositionHelper& rSource ); + BarPositionHelper(const BarPositionHelper& rSource); virtual ~BarPositionHelper() override; virtual std::unique_ptr<PlottingPositionHelper> clone() const override; - void updateSeriesCount( double fSeriesCount ); /*only enter the size of x stacked series*/ + void updateSeriesCount(double fSeriesCount); /*only enter the size of x stacked series*/ - virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const override; - virtual void setScaledCategoryWidth( double fScaledCategoryWidth ) override; + virtual double getScaledSlotPos(double fCategoryX, double fSeriesNumber) const override; + virtual void setScaledCategoryWidth(double fScaledCategoryWidth) override; }; } //namespace chart diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.hxx b/chart2/source/view/charttypes/CategoryPositionHelper.hxx index a25e230f59e1..ebc784ef66cc 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.hxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.hxx @@ -21,33 +21,33 @@ namespace chart { - class CategoryPositionHelper { public: - CategoryPositionHelper( double fSeriesCount, double CategoryWidth = 1.0); + CategoryPositionHelper(double fSeriesCount, double CategoryWidth = 1.0); virtual ~CategoryPositionHelper(); - CategoryPositionHelper(CategoryPositionHelper const &) = default; - CategoryPositionHelper(CategoryPositionHelper &&) = default; - CategoryPositionHelper & operator =(CategoryPositionHelper const &) = default; - CategoryPositionHelper & operator =(CategoryPositionHelper &&) = default; + CategoryPositionHelper(CategoryPositionHelper const&) = default; + CategoryPositionHelper(CategoryPositionHelper&&) = default; + CategoryPositionHelper& operator=(CategoryPositionHelper const&) = default; + CategoryPositionHelper& operator=(CategoryPositionHelper&&) = default; double getScaledSlotWidth() const; - virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const; - void setCategoryWidth( double fCategoryWidth ); + virtual double getScaledSlotPos(double fCategoryX, double fSeriesNumber) const; + void setCategoryWidth(double fCategoryWidth); //Distance between two neighboring bars in same category, seen relative to width of the bar - void setInnerDistance( double fInnerDistance ); + void setInnerDistance(double fInnerDistance); //Distance between two neighboring bars in different category, seen relative to width of the bar: - void setOuterDistance( double fOuterDistance ); + void setOuterDistance(double fOuterDistance); protected: double m_fSeriesCount; double m_fCategoryWidth; //Distance between two neighboring bars in same category, seen relative to width of the bar: - double m_fInnerDistance; //[-1,1] m_fInnerDistance=1 --> distance == width; m_fInnerDistance=-1-->all rects are painted on the same position + double + m_fInnerDistance; //[-1,1] m_fInnerDistance=1 --> distance == width; m_fInnerDistance=-1-->all rects are painted on the same position //Distance between two neighboring bars in different category, seen relative to width of the bar: double m_fOuterDistance; //>=0 m_fOuterDistance=1 --> distance == width }; diff --git a/chart2/source/view/inc/LabelAlignment.hxx b/chart2/source/view/inc/LabelAlignment.hxx index c7dc980489c1..425f5c6c3eaa 100644 --- a/chart2/source/view/inc/LabelAlignment.hxx +++ b/chart2/source/view/inc/LabelAlignment.hxx @@ -19,9 +19,10 @@ #pragma once -namespace chart { - -enum LabelAlignment { +namespace chart +{ +enum LabelAlignment +{ LABEL_ALIGN_CENTER, LABEL_ALIGN_LEFT, LABEL_ALIGN_TOP, @@ -32,7 +33,6 @@ enum LabelAlignment { LABEL_ALIGN_RIGHT_TOP, LABEL_ALIGN_RIGHT_BOTTOM }; - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/VLineProperties.hxx b/chart2/source/view/inc/VLineProperties.hxx index 259bba3d932b..aa1c88ce74f2 100644 --- a/chart2/source/view/inc/VLineProperties.hxx +++ b/chart2/source/view/inc/VLineProperties.hxx @@ -22,22 +22,24 @@ #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Reference.h> -namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::beans +{ +class XPropertySet; +} namespace chart { - struct VLineProperties { css::uno::Any Color; //type sal_Int32 UNO_NAME_LINECOLOR css::uno::Any LineStyle; //type drawing::LineStyle for property UNO_NAME_LINESTYLE - css::uno::Any Transparence;//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE - css::uno::Any Width;//type sal_Int32 for property UNO_NAME_LINEWIDTH - css::uno::Any DashName;//type OUString for property "LineDashName" + css::uno::Any Transparence; //type sal_Int16 for property UNO_NAME_LINETRANSPARENCE + css::uno::Any Width; //type sal_Int32 for property UNO_NAME_LINEWIDTH + css::uno::Any DashName; //type OUString for property "LineDashName" css::uno::Any LineCap; //type drawing::LineCap for property UNO_NAME_LINECAP VLineProperties(); - void initFromPropertySet( const css::uno::Reference< css::beans::XPropertySet >& xProp ); + void initFromPropertySet(const css::uno::Reference<css::beans::XPropertySet>& xProp); bool isLineVisible() const; }; diff --git a/chart2/source/view/inc/ViewDefines.hxx b/chart2/source/view/inc/ViewDefines.hxx index c79aea42b709..b8b82be956c5 100644 --- a/chart2/source/view/inc/ViewDefines.hxx +++ b/chart2/source/view/inc/ViewDefines.hxx @@ -22,15 +22,14 @@ namespace chart { - #define CHART_3DOBJECT_SEGMENTCOUNT (sal_Int32(32)) //There needs to be a little distance between grid lines and walls in 3D, otherwise the lines are partly hidden by the walls #define GRID_TO_WALL_DISTANCE (1.0) -const double ZDIRECTION = 1.0; -const sal_Int32 AXIS2D_TICKLENGTH = 150;//value like in old chart -const sal_Int32 AXIS2D_TICKLABELSPACING = 100;//value like in old chart +const double ZDIRECTION = 1.0; +const sal_Int32 AXIS2D_TICKLENGTH = 150; //value like in old chart +const sal_Int32 AXIS2D_TICKLABELSPACING = 100; //value like in old chart -}//end namespace chart +} //end namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx index 66765b96e7b1..b424ed89e8e4 100644 --- a/chart2/source/view/main/ChartItemPool.hxx +++ b/chart2/source/view/main/ChartItemPool.hxx @@ -27,17 +27,18 @@ namespace chart class ChartItemPool : public SfxItemPool { private: - std::unique_ptr<SfxItemInfo[]> pItemInfos; + std::unique_ptr<SfxItemInfo[]> pItemInfos; public: ChartItemPool(); ChartItemPool(const ChartItemPool& rPool); + protected: virtual ~ChartItemPool() override; -public: +public: virtual SfxItemPool* Clone() const override; - MapUnit GetMetric( sal_uInt16 nWhich ) const override; + MapUnit GetMetric(sal_uInt16 nWhich) const override; /// creates a pure chart item pool static SfxItemPool* CreateChartItemPool(); diff --git a/chart2/source/view/main/VButton.cxx b/chart2/source/view/main/VButton.cxx index 5e609348b914..a628899c04e5 100644 --- a/chart2/source/view/main/VButton.cxx +++ b/chart2/source/view/main/VButton.cxx @@ -26,7 +26,6 @@ namespace chart { - using namespace css; VButton::VButton() @@ -37,7 +36,7 @@ VButton::VButton() } void VButton::init(const uno::Reference<drawing::XShapes>& xTargetPage, - const uno::Reference<lang::XMultiServiceFactory>& xFactory) + const uno::Reference<lang::XMultiServiceFactory>& xFactory) { m_xTarget = xTargetPage; m_xShapeFactory = xFactory; @@ -46,7 +45,8 @@ void VButton::init(const uno::Reference<drawing::XShapes>& xTargetPage, uno::Reference<drawing::XShape> VButton::createTriangle(awt::Size aSize) { uno::Reference<drawing::XShape> xShape; - xShape.set(m_xShapeFactory->createInstance("com.sun.star.drawing.PolyPolygonShape"), uno::UNO_QUERY); + xShape.set(m_xShapeFactory->createInstance("com.sun.star.drawing.PolyPolygonShape"), + uno::UNO_QUERY); if (!xShape.is()) return xShape; @@ -83,7 +83,8 @@ uno::Reference<drawing::XShape> VButton::createTriangle(awt::Size aSize) pInnerSequenceZ[2] = 0.0; xproperties->setPropertyValue("Name", uno::makeAny(m_sCID)); - xproperties->setPropertyValue(UNO_NAME_POLYPOLYGON, uno::Any(PolyToPointSequence(aPolyPolygon))); + xproperties->setPropertyValue(UNO_NAME_POLYPOLYGON, + uno::Any(PolyToPointSequence(aPolyPolygon))); xproperties->setPropertyValue("LineStyle", uno::makeAny(drawing::LineStyle_NONE)); xproperties->setPropertyValue("FillColor", uno::makeAny(m_nArrowColor)); @@ -125,8 +126,8 @@ void VButton::createShapes(const uno::Reference<beans::XPropertySet>& xTextProp) PropertyMapper::getMultiPropertyListsFromValueMap(*pPropNames, *pPropValues, aTextValueMap); - uno::Reference<drawing::XShape> xEntry = pShapeFactory->createText( - xContainer, m_sLabel, *pPropNames, *pPropValues, uno::Any()); + uno::Reference<drawing::XShape> xEntry + = pShapeFactory->createText(xContainer, m_sLabel, *pPropNames, *pPropValues, uno::Any()); if (xEntry.is()) { @@ -137,14 +138,15 @@ void VButton::createShapes(const uno::Reference<beans::XPropertySet>& xTextProp) if (!m_bShowArrow) return; - awt::Size aPolySize {280, 180}; + awt::Size aPolySize{ 280, 180 }; uno::Reference<drawing::XShape> xPoly = createTriangle(aPolySize); if (xPoly.is()) { xPoly->setSize(aPolySize); - xPoly->setPosition({ sal_Int32(m_aPosition.X + m_aSize.Width - aPolySize.Width - 100), - sal_Int32(m_aPosition.Y + (m_aSize.Height / 2.0) - (aPolySize.Height / 2.0)) }); + xPoly->setPosition( + { sal_Int32(m_aPosition.X + m_aSize.Width - aPolySize.Width - 100), + sal_Int32(m_aPosition.Y + (m_aSize.Height / 2.0) - (aPolySize.Height / 2.0)) }); xContainer->add(xPoly); } } diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx index e86c5f7b810f..49a3b4e77642 100644 --- a/chart2/source/view/main/VLineProperties.cxx +++ b/chart2/source/view/main/VLineProperties.cxx @@ -32,28 +32,29 @@ using namespace ::com::sun::star; VLineProperties::VLineProperties() { Color <<= sal_Int32(0x000000); //type sal_Int32 UNO_NAME_LINECOLOR - LineStyle <<= drawing::LineStyle_SOLID; //type drawing::LineStyle for property UNO_NAME_LINESTYLE - Transparence <<= sal_Int16(0);//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE - Width <<= sal_Int32(0);//type sal_Int32 for property UNO_NAME_LINEWIDTH + LineStyle + <<= drawing::LineStyle_SOLID; //type drawing::LineStyle for property UNO_NAME_LINESTYLE + Transparence <<= sal_Int16(0); //type sal_Int16 for property UNO_NAME_LINETRANSPARENCE + Width <<= sal_Int32(0); //type sal_Int32 for property UNO_NAME_LINEWIDTH LineCap <<= drawing::LineCap_BUTT; //type drawing::LineCap for property UNO_NAME_LINECAP } -void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp ) +void VLineProperties::initFromPropertySet(const uno::Reference<beans::XPropertySet>& xProp) { - if(xProp.is()) + if (xProp.is()) { try { - Color = xProp->getPropertyValue( "LineColor" ); - LineStyle = xProp->getPropertyValue( "LineStyle" ); - Transparence = xProp->getPropertyValue( "LineTransparence" ); - Width = xProp->getPropertyValue( "LineWidth" ); - DashName = xProp->getPropertyValue( "LineDashName" ); - LineCap = xProp->getPropertyValue( "LineCap" ); + Color = xProp->getPropertyValue("LineColor"); + LineStyle = xProp->getPropertyValue("LineStyle"); + Transparence = xProp->getPropertyValue("LineTransparence"); + Width = xProp->getPropertyValue("LineWidth"); + DashName = xProp->getPropertyValue("LineDashName"); + LineCap = xProp->getPropertyValue("LineCap"); } - catch( const uno::Exception& ) + catch (const uno::Exception&) { - TOOLS_WARN_EXCEPTION("chart2", "" ); + TOOLS_WARN_EXCEPTION("chart2", ""); } } else @@ -66,11 +67,11 @@ bool VLineProperties::isLineVisible() const drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID); LineStyle >>= aLineStyle; - if( aLineStyle != drawing::LineStyle_NONE ) + if (aLineStyle != drawing::LineStyle_NONE) { - sal_Int16 nLineTransparence=0; + sal_Int16 nLineTransparence = 0; Transparence >>= nLineTransparence; - if(nLineTransparence!=100) + if (nLineTransparence != 100) { bRet = true; } |